moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Modify]修复首页底部文案显示问题

Browse Source
This commit is contained in:
wushaocheng
2023-05-25 11:34:01 +08:00
parent 0ba4e18f89
commit 1716ae6951
3 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/com/yizhuan/erban/MainActivity.java
View File

@@ -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.channel_page.model.ChannelPageModel;
import com.yizhuan.xchat_android_core.community.event.SquareTaskEvent; import com.yizhuan.xchat_android_core.community.event.SquareTaskEvent;
import com.yizhuan.xchat_android_core.community.event.UnReadCountEvent; 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.bean.MainTabType;
import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent; import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent;
import com.yizhuan.xchat_android_core.home.event.VisitorUnreadCountEvent; import com.yizhuan.xchat_android_core.home.event.VisitorUnreadCountEvent;
@@ -248,11 +249,15 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
.doOnError(throwable -> onNeedLogin()) .doOnError(throwable -> onNeedLogin())
.subscribe(); .subscribe();
initView(); initView();
InitialModel.get().getMainTabInfosLiveData().observeForever(mainTabInfo -> { // InitialModel.get().getMainTabInfosLiveData().observeForever(mainTabInfo -> {
if (mainTabInfo != null) { // if (mainTabInfo != null) {
mMainTabLayout.setMainTabInfoList(mainTabInfo); // mMainTabLayout.setMainTabInfoList(mainTabInfo);
} // }
}); // });
List<MainTabInfo> tabInfoList = InitialModel.get().getDefaultMainTab();
if (tabInfoList != null) {
mMainTabLayout.setMainTabInfoList(tabInfoList);
}
//检测更新 //检测更新
AppUpgradeHelper.checkAppUpgrade(this); AppUpgradeHelper.checkAppUpgrade(this);
initMaterialView(); initMaterialView();

1
core/src/main/java/com/yizhuan/xchat_android_core/initial/IInitialModel.java
View File

@@ -78,4 +78,5 @@ public interface IInitialModel extends IModel {
@Nullable @Nullable
FairyOpenInfo getFairyOpenInfo(); FairyOpenInfo getFairyOpenInfo();
List<MainTabInfo> getDefaultMainTab();
} }

16
core/src/main/java/com/yizhuan/xchat_android_core/initial/InitialModel.java
View File

@@ -133,12 +133,13 @@ public class InitialModel extends BaseModel implements IInitialModel {
private InitialModel() { private InitialModel() {
api = RxNet.create(Api.class); api = RxNet.create(Api.class);
loadMainTabInfoList(); // loadMainTabInfoList();
List<MainTabInfo> tabInfoList = DemoCache.readMainTabInfoList(); // List<MainTabInfo> tabInfoList = DemoCache.readMainTabInfoList();
if (ListUtils.isListEmpty(tabInfoList)) { // if (ListUtils.isListEmpty(tabInfoList)) {
tabInfoList = getDefaultMainTab(); // tabInfoList = getDefaultMainTab();
DemoCache.saveMainTabInfoList(tabInfoList); // DemoCache.saveMainTabInfoList(tabInfoList);
} // }
List<MainTabInfo> tabInfoList = getDefaultMainTab();
mainTabInfosLiveData.setValue(tabInfoList); mainTabInfosLiveData.setValue(tabInfoList);
IntentFilter filter = new IntentFilter("android.net.conn.CONNECTIVITY_CHANGE"); IntentFilter filter = new IntentFilter("android.net.conn.CONNECTIVITY_CHANGE");
receiver = new BroadcastReceiver() { 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( return new ArrayList<>(Arrays.asList(
new MainTabInfo( new MainTabInfo(
"", "",