Merge branch 'dev' into release

app/build.gradle

@@ -11,7 +11,7 @@ android {
         minSdk 21
         targetSdk 28
         versionCode 232
-        versionName "0408"
+        versionName "0412"
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
@@ -73,6 +73,14 @@ android {
         }
     }
 
+    android.applicationVariants.all { variant ->
+        if (variant.buildType.name == 'release' && variant.productFlavors[0].name == 'mobile') {
+            variant.mergeAssets.doLast {
+                delete(fileTree(dir: variant.mergeAssets.outputDir, includes: ['x5.tbs.apk']))
+            }
+        }
+    }
+
     configurations.configureEach {
         resolutionStrategy {
             force 'com.squareup.okhttp3:okhttp:' + okhttpVersion

app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java

@@ -221,6 +221,7 @@ public class LiveActivity extends BaseActivity implements Clock.Callback, GroupP
 
     private void setDisplayView() {
         mBinding.display.getRoot().setVisibility(View.VISIBLE);
+        mBinding.display.progress.setVisibility(View.GONE);
         showDisplayInfo();
     }
 

app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java

@@ -345,7 +345,8 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit
             @Override
             public void success() {
                 setCacheText();
-                setConfig(VodConfig.get().getConfig().json("").save());
+                Config config = VodConfig.get().getConfig().json("").save();
+                if (!config.isEmpty()) setConfig();
             }
         });
         return true;

app/src/leanback/java/com/fongmi/android/tv/ui/dialog/SiteDialog.java

@@ -57,11 +57,11 @@ public class SiteDialog implements SiteAdapter.OnClickListener{
     }
 
     private boolean list() {
-        return Setting.getSiteMode() == 0 || adapter.getItemCount() < 20;
+        return Setting.getSiteMode() == 0 || adapter.getItemCount() < 10;
     }
 
     private int getCount() {
-        return list() ? 1 : Math.max(1, Math.min((int) (Math.ceil(adapter.getItemCount() / 20.0f)), 3));
+        return list() ? 1 : Math.max(1, Math.min((int) (Math.ceil(adapter.getItemCount() / 10.0f)), 3));
     }
 
     private int getIcon() {

app/src/leanback/res/layout/adapter_type.xml

@@ -9,5 +9,5 @@
     android:focusableInTouchMode="true"
     android:gravity="center"
     android:textColor="@color/white"
-    android:textSize="16sp"
+    android:textSize="18sp"
     tools:text="電影" />

app/src/main/java/com/fongmi/android/tv/Setting.java

@@ -194,7 +194,7 @@ public class Setting {
     }
 
     public static int getSiteMode() {
-        return Prefers.getInt("site_mode");
+        return Prefers.getInt("site_mode", 1);
     }
 
     public static void putSiteMode(int mode) {
@@ -442,7 +442,7 @@ public class Setting {
     }
 
     public static int getHomeUI() {
-        return Prefers.getInt("home_ui", 0);
+        return Prefers.getInt("home_ui", 1);
     }
 
     public static void putHomeButtons(String buttons) {
@@ -474,7 +474,7 @@ public class Setting {
     }
 
     public static int getConfigCache() {
-        return Math.min(Prefers.getInt("config_cache", 0), 8);
+        return Math.min(Prefers.getInt("config_cache", 0), 2);
     }
 
     public static void putParseWebView(int key) {

app/src/main/java/com/fongmi/android/tv/bean/Config.java

@@ -121,7 +121,7 @@ public class Config {
     }
 
     public boolean isCache() {
-        return getTime() + (long)(3600*1000 * Setting.getConfigCache()) > System.currentTimeMillis();
+        return getTime() + (long)(3600*1000*12 * Setting.getConfigCache()) > System.currentTimeMillis();
     }
 
     public Config type(int type) {

app/src/main/java/com/fongmi/android/tv/ui/custom/CustomWebView.java

@@ -80,6 +80,7 @@ public class CustomWebView extends WebView {
         getSettings().setSupportZoom(true);
         getSettings().setUseWideViewPort(true);
         getSettings().setDatabaseEnabled(true);
+        getSettings().setBlockNetworkImage(true);
         getSettings().setDomStorageEnabled(true);
         getSettings().setJavaScriptEnabled(true);
         getSettings().setBuiltInZoomControls(true);

app/src/main/java/com/fongmi/android/tv/utils/Tbs.java

@@ -51,6 +51,7 @@ public class Tbs {
 
     public static void init() {
         if (Setting.getParseWebView() == 0) return;
+        if (QbSdk.isTbsCoreInited()) return;
         App.post(() -> tbsInit());
     }
 

app/src/main/java/com/fongmi/android/tv/utils/UrlUtil.java

@@ -36,7 +36,7 @@ public class UrlUtil {
 
     public static String convert(String url) {
         String scheme = scheme(url);
-        if ("clan".equals(scheme)) fixUrl(url);
+        if ("clan".equals(scheme)) return convert(fixUrl(url));
         if ("local".equals(scheme)) return url.replace("local://", Server.get().getAddress(""));
         if ("assets".equals(scheme)) return url.replace("assets://", Server.get().getAddress(""));
         if ("file".equals(scheme)) return url.replace("file://", Server.get().getAddress("file/"));

app/src/main/res/values-zh-rCN/strings.xml

@@ -276,10 +276,8 @@
 
     <string-array name="select_config_cache">
         <item>关闭</item>
-        <item>1小时</item>
+        <item>12小时</item>
-        <item>2小时</item>
+        <item>24小时</item>
-        <item>3小时</item>
-        <item>4小时</item>
     </string-array>
 
     <string-array name="select_caption">

app/src/main/res/values-zh-rTW/strings.xml

@@ -251,12 +251,12 @@
         <item>選項彈窗</item>
         <item>切換站源</item>
         <item>切換線路</item>
-        <item>直播页面</item>
+        <item>直播頁面</item>
         <item>歷史頁面</item>
         <item>搜索頁面</item>
         <item>推送頁面</item>
         <item>收藏頁面</item>
-        <item>设置頁面</item>
+        <item>設置頁面</item>
     </string-array>
 
     <string-array name="select_parse_webview">
@@ -276,10 +276,8 @@
 
     <string-array name="select_config_cache">
         <item>關閉</item>
-        <item>1小時</item>
+        <item>12小時</item>
-        <item>2小時</item>
+        <item>24小時</item>
-        <item>3小時</item>
-        <item>4小時</item>
     </string-array>
 
     <string-array name="select_caption">

app/src/main/res/values/strings.xml

@@ -281,10 +281,8 @@
 
     <string-array name="select_config_cache">
         <item>Close</item>
-        <item>1 Hour</item>
+        <item>12 Hour</item>
-        <item>2 Hour</item>
+        <item>24 Hour</item>
-        <item>3 Hour</item>
-        <item>4 Hour</item>
     </string-array>
 
     <string-array name="select_caption">

app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java

@@ -240,6 +240,7 @@ public class LiveActivity extends BaseActivity implements Clock.Callback, Custom
 
     private void setDisplayView() {
         mBinding.display.getRoot().setVisibility(View.VISIBLE);
+        mBinding.display.progress.setVisibility(View.GONE);
         showDisplayInfo();
     }
 

app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java

@@ -351,7 +351,8 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit
             @Override
             public void success() {
                 setCacheText();
-                setConfig(VodConfig.get().getConfig().json("").save());
+                Config config = VodConfig.get().getConfig().json("").save();
+                if (!config.isEmpty()) setConfig();
             }
         });
         return true;