Optimize config load

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

@@ -187,9 +187,9 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
     }
 
     private void initConfig() {
-        WallConfig.get().init();
-        LiveConfig.get().init().load();
         VodConfig.get().init().load(getCallback());
+        LiveConfig.get().init().load();
+        WallConfig.get().init();
     }
 
     private Callback getCallback() {

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

@@ -706,7 +706,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
 
             @Override
             public void error(String msg) {
-                LiveConfig.get().config(config).load();
+                LiveConfig.load(config, new Callback());
                 Notify.show(msg);
                 hideProgress();
             }

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

@@ -326,9 +326,9 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit
     }
 
     private void initConfig() {
-        WallConfig.get().init().load();
-        LiveConfig.get().init().load();
         VodConfig.get().init().load(getCallback(0));
+        LiveConfig.get().init().load();
+        WallConfig.get().init().load();
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)

app/src/main/java/com/fongmi/android/tv/api/config/LiveConfig.java

@@ -119,6 +119,7 @@ public class LiveConfig {
     }
 
     public void load() {
+        if (sync) return;
         load(new Callback());
     }
 

app/src/main/java/com/fongmi/android/tv/api/config/VodConfig.java

@@ -46,7 +46,6 @@ public class VodConfig {
     private List<String> flags;
     private List<Parse> parses;
     private Future<?> future;
-    private boolean loadLive;
 
     private static class Loader {
         static volatile VodConfig INSTANCE = new VodConfig();
@@ -77,14 +76,13 @@ public class VodConfig {
     }
 
     public static void load(Config config, Callback callback) {
-        get().clear().config(config).live(true).load(callback);
+        get().clear().config(config).load(callback);
     }
 
     public VodConfig init() {
         this.wall = null;
         this.home = null;
         this.parse = null;
-        this.loadLive = false;
         this.config = Config.vod();
         this.ads = new ArrayList<>();
         this.doh = new ArrayList<>();
@@ -100,11 +98,6 @@ public class VodConfig {
         return this;
     }
 
-    public VodConfig live(boolean loadLive) {
-        this.loadLive = loadLive;
-        return this;
-    }
-
     public VodConfig clear() {
         this.wall = null;
         this.home = null;
@@ -171,7 +164,7 @@ public class VodConfig {
             initOther(object);
             config.logo(Json.safeString(object, "logo"));
             String notice = Json.safeString(object, "notice");
-            if (loadLive && !Json.isEmpty(object, "lives")) initLive(object);
+            if (!Json.isEmpty(object, "lives")) initLive(object);
             App.post(() -> callback.success(notice));
             App.post(callback::success);
         } catch (Throwable e) {

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

@@ -114,9 +114,9 @@ public class HomeActivity extends BaseActivity implements NavigationBarView.OnIt
     }
 
     private void initConfig() {
-        WallConfig.get().init();
-        LiveConfig.get().init().load();
         VodConfig.get().init().load(getCallback());
+        LiveConfig.get().init().load();
+        WallConfig.get().init();
     }
 
     private Callback getCallback() {

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

@@ -740,7 +740,7 @@ public class LiveActivity extends BaseActivity implements CustomKeyDown.Listener
 
             @Override
             public void error(String msg) {
-                LiveConfig.get().config(config).load();
+                LiveConfig.load(config, new Callback());
                 Notify.show(msg);
                 hideProgress();
             }

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

@@ -337,9 +337,9 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit
     }
 
     private void initConfig() {
-        WallConfig.get().init().load();
-        LiveConfig.get().init().load();
         VodConfig.get().init().load(getCallback(0));
+        LiveConfig.get().init().load();
+        WallConfig.get().init().load();
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)