From 1716ae6951bf051dc3200e4b69882a1fd3add0dd Mon Sep 17 00:00:00 2001
From: wushaocheng <15876365887@163.com>
Date: Thu, 25 May 2023 11:34:01 +0800
Subject: [PATCH] =?UTF-8?q?[Modify]=E4=BF=AE=E5=A4=8D=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E5=BA=95=E9=83=A8=E6=96=87=E6=A1=88=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yizhuan/erban/MainActivity.java     | 15 ++++++++++-----
 .../initial/IInitialModel.java                   |  1 +
 .../xchat_android_core/initial/InitialModel.java | 16 +++++++++-------
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/yizhuan/erban/MainActivity.java b/app/src/main/java/com/yizhuan/erban/MainActivity.java
index 4507b2487..9d816620f 100644
--- a/app/src/main/java/com/yizhuan/erban/MainActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/MainActivity.java
@@ -90,6 +90,7 @@ import com.yizhuan.xchat_android_core.auth.event.LogoutEvent;
 import com.yizhuan.xchat_android_core.channel_page.model.ChannelPageModel;
 import com.yizhuan.xchat_android_core.community.event.SquareTaskEvent;
 import com.yizhuan.xchat_android_core.community.event.UnReadCountEvent;
+import com.yizhuan.xchat_android_core.home.bean.MainTabInfo;
 import com.yizhuan.xchat_android_core.home.bean.MainTabType;
 import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent;
 import com.yizhuan.xchat_android_core.home.event.VisitorUnreadCountEvent;
@@ -248,11 +249,15 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
                 .doOnError(throwable -> onNeedLogin())
                 .subscribe();
         initView();
-        InitialModel.get().getMainTabInfosLiveData().observeForever(mainTabInfo -> {
-            if (mainTabInfo != null) {
-                mMainTabLayout.setMainTabInfoList(mainTabInfo);
-            }
-        });
+//        InitialModel.get().getMainTabInfosLiveData().observeForever(mainTabInfo -> {
+//            if (mainTabInfo != null) {
+//                mMainTabLayout.setMainTabInfoList(mainTabInfo);
+//            }
+//        });
+        List<MainTabInfo> tabInfoList = InitialModel.get().getDefaultMainTab();
+        if (tabInfoList != null) {
+            mMainTabLayout.setMainTabInfoList(tabInfoList);
+        }
         //检测更新
         AppUpgradeHelper.checkAppUpgrade(this);
         initMaterialView();
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/initial/IInitialModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/initial/IInitialModel.java
index f974a857d..6c222c996 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/initial/IInitialModel.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/initial/IInitialModel.java
@@ -78,4 +78,5 @@ public interface IInitialModel extends IModel {
     @Nullable
     FairyOpenInfo getFairyOpenInfo();
 
+    List<MainTabInfo> getDefaultMainTab();
 }
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/initial/InitialModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/initial/InitialModel.java
index d98958d3a..9365dc6f3 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/initial/InitialModel.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/initial/InitialModel.java
@@ -133,12 +133,13 @@ public class InitialModel extends BaseModel implements IInitialModel {
 
     private InitialModel() {
         api = RxNet.create(Api.class);
-        loadMainTabInfoList();
-        List<MainTabInfo> tabInfoList = DemoCache.readMainTabInfoList();
-        if (ListUtils.isListEmpty(tabInfoList)) {
-            tabInfoList = getDefaultMainTab();
-            DemoCache.saveMainTabInfoList(tabInfoList);
-        }
+//        loadMainTabInfoList();
+//        List<MainTabInfo> tabInfoList = DemoCache.readMainTabInfoList();
+//        if (ListUtils.isListEmpty(tabInfoList)) {
+//            tabInfoList = getDefaultMainTab();
+//            DemoCache.saveMainTabInfoList(tabInfoList);
+//        }
+        List<MainTabInfo> tabInfoList = getDefaultMainTab();
         mainTabInfosLiveData.setValue(tabInfoList);
         IntentFilter filter = new IntentFilter("android.net.conn.CONNECTIVITY_CHANGE");
         receiver = new BroadcastReceiver() {
@@ -430,7 +431,8 @@ public class InitialModel extends BaseModel implements IInitialModel {
     }
 
 
-    private List<MainTabInfo> getDefaultMainTab() {
+    @Override
+    public List<MainTabInfo> getDefaultMainTab() {
         return new ArrayList<>(Arrays.asList(
                 new MainTabInfo(
                         "",