Rewrite backup and restore - part 7

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

@@ -86,13 +86,17 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit
         mBinding.vodUrl.setText(VodConfig.getDesc());
         mBinding.liveUrl.setText(LiveConfig.getDesc());
         mBinding.wallUrl.setText(WallConfig.getDesc());
-        mBinding.dohText.setText(getDohList()[getDohIndex()]);
         mBinding.versionText.setText(BuildConfig.VERSION_NAME);
+        setCacheText();
+        setOtherText();
+    }
+
+    private void setOtherText() {
+        mBinding.dohText.setText(getDohList()[getDohIndex()]);
         mBinding.proxyText.setText(getProxy(Setting.getProxy()));
         mBinding.incognitoText.setText(getSwitch(Setting.isIncognito()));
         mBinding.sizeText.setText((size = ResUtil.getStringArray(R.array.select_size))[Setting.getSize()]);
         mBinding.qualityText.setText((quality = ResUtil.getStringArray(R.array.select_quality))[Setting.getQuality()]);
-        setCacheText();
     }
 
     private void setCacheText() {
@@ -334,8 +338,8 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit
         Setting.putProxy(proxy);
         OkHttp.get().setProxy(proxy);
         Notify.progress(getActivity());
-        VodConfig.load(Config.vod(), getCallback(0));
         mBinding.proxyText.setText(getProxy(proxy));
+        VodConfig.load(Config.vod(), getCallback(0));
     }
 
     private void onCache(View view) {
@@ -367,6 +371,7 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit
             public void success() {
                 Notify.show(R.string.restore_success);
                 Notify.progress(getActivity());
+                setOtherText();
                 initConfig();
             }
 

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

@@ -94,12 +94,16 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit
         mBinding.vodUrl.setText(VodConfig.getDesc());
         mBinding.liveUrl.setText(LiveConfig.getDesc());
         mBinding.wallUrl.setText(WallConfig.getDesc());
-        mBinding.dohText.setText(getDohList()[getDohIndex()]);
         mBinding.versionText.setText(BuildConfig.VERSION_NAME);
+        setOtherText();
+        setCacheText();
+    }
+
+    private void setOtherText() {
+        mBinding.dohText.setText(getDohList()[getDohIndex()]);
         mBinding.proxyText.setText(getProxy(Setting.getProxy()));
         mBinding.incognitoText.setText(getSwitch(Setting.isIncognito()));
         mBinding.sizeText.setText((size = ResUtil.getStringArray(R.array.select_size))[Setting.getSize()]);
-        setCacheText();
     }
 
     private void setCacheText() {
@@ -338,8 +342,8 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit
         OkHttp.selector().clear();
         OkHttp.get().setProxy(proxy);
         Notify.progress(getActivity());
-        VodConfig.load(Config.vod(), getCallback(0));
         mBinding.proxyText.setText(getProxy(proxy));
+        VodConfig.load(Config.vod(), getCallback(0));
     }
 
     private void onCache(View view) {
@@ -371,6 +375,7 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit
             public void success() {
                 Notify.show(R.string.restore_success);
                 Notify.progress(getActivity());
+                setOtherText();
                 initConfig();
             }
 
@@ -393,7 +398,6 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit
         mBinding.vodUrl.setText(VodConfig.getDesc());
         mBinding.liveUrl.setText(LiveConfig.getDesc());
         mBinding.wallUrl.setText(WallConfig.getDesc());
-        mBinding.dohText.setText(getDohList()[getDohIndex()]);
         setCacheText();
     }
 

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

@@ -50,12 +50,12 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
 
     @Override
     protected void initView() {
-        setVisible();
         format = new DecimalFormat("0.#");
         mBinding.uaText.setText(Setting.getUa());
         mBinding.tunnelText.setText(getSwitch(Setting.isTunnel()));
         mBinding.speedText.setText(format.format(Setting.getSpeed()));
         mBinding.bufferText.setText(String.valueOf(Setting.getBuffer()));
+        mBinding.caption.setVisibility(Setting.hasCaption() ? View.VISIBLE : View.GONE);
         mBinding.rtspText.setText((rtsp = ResUtil.getStringArray(R.array.select_rtsp))[Setting.getRtsp()]);
         mBinding.scaleText.setText((scale = ResUtil.getStringArray(R.array.select_scale))[Setting.getScale()]);
         mBinding.renderText.setText((render = ResUtil.getStringArray(R.array.select_render))[Setting.getRender()]);
@@ -77,10 +77,6 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
         mBinding.background.setOnClickListener(this::onBackground);
     }
 
-    private void setVisible() {
-        mBinding.caption.setVisibility(Setting.hasCaption() ? View.VISIBLE : View.GONE);
-    }
-
     private void onUa(View view) {
         UaDialog.create(this).show();
     }
@@ -158,6 +154,6 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
 
     @Override
     public void onHiddenChanged(boolean hidden) {
-        if (!hidden) setVisible();
+        if (!hidden) initView();
     }
 }

catvod/src/main/java/com/github/catvod/utils/Prefers.java

@@ -75,7 +75,8 @@ public class Prefers {
             getPrefers().edit().putLong(key, (Long) obj).apply();
         } else if (obj instanceof LazilyParsedNumber) {
             LazilyParsedNumber number = (LazilyParsedNumber) obj;
-            put(key, number.toString().contains(".") ? number.floatValue() : number.intValue());
+            if (number.toString().contains(".")) put(key, number.floatValue());
+            else put(key, number.intValue());
         }
     }