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 .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 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 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 tabInfoList = DemoCache.readMainTabInfoList(); - if (ListUtils.isListEmpty(tabInfoList)) { - tabInfoList = getDefaultMainTab(); - DemoCache.saveMainTabInfoList(tabInfoList); - } +// loadMainTabInfoList(); +// List tabInfoList = DemoCache.readMainTabInfoList(); +// if (ListUtils.isListEmpty(tabInfoList)) { +// tabInfoList = getDefaultMainTab(); +// DemoCache.saveMainTabInfoList(tabInfoList); +// } + List 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 getDefaultMainTab() { + @Override + public List getDefaultMainTab() { return new ArrayList<>(Arrays.asList( new MainTabInfo( "",