From 1df231fd6aafa221aef3532d069c7e27d4331be7 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期日, 27 八月 2023 19:21:01 +0800
Subject: [PATCH] 功能全部完成
---
app/src/main/java/com/application/zhangshi_app_android/ui/main/MainActivity.java | 49 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 40 insertions(+), 9 deletions(-)
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/main/MainActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/main/MainActivity.java
index 6875b77..d5c7235 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/main/MainActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/main/MainActivity.java
@@ -19,10 +19,15 @@
import com.android.app_base.base.view.BaseFragment;
import com.android.app_base.helper.DoubleClickHelper;
import com.android.app_base.manager.AppManager;
+import com.android.app_base.manager.UserManager;
+import com.android.app_base.utils.rxbus.MessageEvent;
+import com.android.app_base.utils.rxbus.RxBus;
import com.application.zhangshi_app_android.BR;
import com.application.zhangshi_app_android.R;
+import com.application.zhangshi_app_android.bean.GrowthExperienceInformationBean;
import com.application.zhangshi_app_android.bean.UpdateVersionBean;
import com.application.zhangshi_app_android.databinding.ActivityMainBinding;
+import com.application.zhangshi_app_android.ui.dialog.UpdateDialog;
import com.application.zhangshi_app_android.ui.dialog.VersionUpdateDialog;
import com.application.zhangshi_app_android.ui.function.FunctionFragment;
import com.application.zhangshi_app_android.ui.home.HomeFragment;
@@ -96,6 +101,9 @@
@Override
public void initData() {
viewModel.getUpdateVersion();
+ if (TextUtils.isEmpty(UserManager.getInstance().getUserName()) || TextUtils.isEmpty(UserManager.getInstance().getUserAvatar())) {
+ viewModel.getInfo();
+ }
}
@Override
@@ -104,19 +112,42 @@
@Override
public void onChanged(UpdateVersionBean updateVersionBean) {
if(updateVersionBean != null && updateVersionBean.getVersionCode()> AppUtils.getAppVersionCode()&&!TextUtils.isEmpty(updateVersionBean.getAppUrl())){
- VersionUpdateDialog.Builder dialogBuilder = new VersionUpdateDialog.Builder(getSelfActivity())
- .setContent(updateVersionBean.getContent())
- .setDownloadUrl(updateVersionBean.getAppUrl())
- ;
- if(updateVersionBean.isForceUpdate()){
- dialogBuilder.setCancelable(false);
- dialogBuilder.setCanceledOnTouchOutside(false);
+// VersionUpdateDialog.Builder dialogBuilder = new VersionUpdateDialog.Builder(getSelfActivity())
+// .setContent(updateVersionBean.getContent())
+// .setDownloadUrl(updateVersionBean.getAppUrl())
+// ;
+// if(updateVersionBean.getForceUpdate() == 1){
+// dialogBuilder.setCancelable(false);
+// dialogBuilder.setCanceledOnTouchOutside(false);
+// }
+// dialogBuilder.show();
- }
- dialogBuilder.show();
+ new UpdateDialog.Builder(getSelfActivity())
+ // 鐗堟湰鍚�
+ .setVersionName(updateVersionBean.getVersionName())
+ // 鏄惁寮哄埗鏇存柊
+ .setForceUpdate(updateVersionBean.getForceUpdate()==1)
+ // 鏇存柊鏃ュ織
+ .setUpdateLog(updateVersionBean.getContent())
+ // 涓嬭浇 URL
+ .setDownloadUrl(updateVersionBean.getAppUrl())
+ .show();
}
}
});
+
+ viewModel.getInfoLiveData().observe(this, new Observer<GrowthExperienceInformationBean>() {
+ @Override
+ public void onChanged(GrowthExperienceInformationBean informationBean) {
+ if(informationBean != null){
+ UserManager.getInstance().setUserName(informationBean.getNickName());
+ UserManager.getInstance().setUserAvatar(informationBean.getUrl());
+ RxBus.getInstance().post(new MessageEvent(MessageEvent.EVENT_UPDATE_USER_INFO,informationBean));
+ }
+
+ }
+ });
+
}
@Override
--
Gitblit v1.9.1