中建365-二期开发-优化

app/src/main/java/com/zj365/dc/activity/LoginAct.kt

@@ -168,6 +168,7 @@ class LoginAct : BaseVmAct<LoginVm>() {
 
                 bundle.clear()
                 bundle.putString("title", "用户协议")
+                bundle.putBoolean("isAgree", false)
                 bundle.putString("url", "https://dc.zhongjian365.com/agreement.html")
                 RouteManager.goAct(ARouterUrl.AGREEMNT_READ_WEB_ACT, bundle)
             }
@@ -182,6 +183,7 @@ class LoginAct : BaseVmAct<LoginVm>() {
             override fun onClick(widget: View) {
                 bundle.clear()
                 bundle.putString("title", "隐私政策")
+                bundle.putBoolean("isAgree", false)
                 bundle.putString("url", "https://dc.zhongjian365.com/privacy.html")
                 RouteManager.goAct(ARouterUrl.AGREEMNT_READ_WEB_ACT, bundle)
             }

app/src/main/java/com/zj365/dc/activity/RegisterAct.kt

@@ -129,6 +129,7 @@ class RegisterAct : BaseVmAct<RegisterVm>() {
             override fun onClick(widget: View) {
                 bundle.clear()
                 bundle.putString("title", "用户协议")
+                bundle.putBoolean("isAgree", false)
                 bundle.putString("url", "https://dc.zhongjian365.com/agreement.html")
                 RouteManager.goAct(ARouterUrl.AGREEMNT_READ_WEB_ACT, bundle)
             }
@@ -144,6 +145,7 @@ class RegisterAct : BaseVmAct<RegisterVm>() {
             override fun onClick(widget: View) {
                 bundle.clear()
                 bundle.putString("title", "隐私政策")
+                bundle.putBoolean("isAgree", false)
                 bundle.putString("url", "https://dc.zhongjian365.com/privacy.html")
                 RouteManager.goAct(ARouterUrl.AGREEMNT_READ_WEB_ACT, bundle)
             }

app/src/main/java/com/zj365/dc/fragment/MineFrag.kt

@@ -689,6 +689,7 @@ class MineFrag : BaseVmFrag<SettingVm>() , EasyPermissions.PermissionCallbacks{
 
     fun refreshLogoutUI(){
         user = null
+        showIdInfo = ""
         binding.mIntegral.text = "--"
         binding.mName.text = ""
         binding.mPhone.text = ""

base/src/main/java/com/xty/base/dialog/AppUpdateDialog.kt

@@ -50,10 +50,16 @@ class AppUpdateDialog(
         }
 
         binding.mCancelUpdate.setOnClickListener {
+            if(!isUpdate){
+                MMkvHelper.put(Const.IS_NEED_UPDATE, isUpdate)
+            }
             closeUploadDialog()
         }
 
         binding.mClose.setOnClickListener {
+            if(!isUpdate){
+                MMkvHelper.put(Const.IS_NEED_UPDATE, isUpdate)
+            }
             closeUploadDialog()
         }
 
@@ -74,10 +80,10 @@ class AppUpdateDialog(
         isUpdate = (updateFlag == 1)
         binding.mProgress.progress = 0
                 //如果当前地址用户忽略取消过并且当前版本非强制更新，则不弹出dialog
-        if (MMkvHelper.getString(Const.IS_UPDATE_URL_FLAG) == url && !isUpdate) {
+      /*  if (MMkvHelper.getString(Const.IS_UPDATE_URL_FLAG) == url && !isUpdate) {
             isShow.invoke(false)
             return
-        }
+        }*/
         binding.mClose.visibility = if (isUpdate) View.GONE else View.VISIBLE
         isShow.invoke(true)
         loadPath = url

common/src/main/java/com/xty/common/Const.kt

@@ -120,6 +120,8 @@ class Const {
         //版本更新标签
         const val IS_UPDATE_URL_FLAG = "APP_UPDATE_URL"
 
+        const val IS_NEED_UPDATE = "APP_IS_NEED_UPDATE";
+
         //TOKen 标签
         const val Auth_Token = "Auth-Token"
         const val Auth_Id = "Auth-Id"

health/src/main/java/com/zj365/health/act/HealthSkyHourReportAct.kt

@@ -726,7 +726,7 @@ class HealthSkyHourReportAct : BaseVmAct<ReportVm>() {
             }
 
             val ageHtml =
-                String.format(getString(R.string.info_msg), "年龄", it.data.user.age + "岁")
+                String.format(getString(R.string.info_msg), "年龄", if(it.data.user.age == null) "--岁" else it.data.user.age + "岁")
             binding.mAge.text = Html.fromHtml(ageHtml)
             val heightHtml =
                 String.format(

health/src/main/java/com/zj365/health/act/HealthWeekMonthHourReportAct.kt

@@ -1134,7 +1134,7 @@ class HealthWeekMonthHourReportAct : BaseVmAct<ReportVm>() {
 
             setHealthStatuAndStarInfo(it)
 
-            val ageHtml = String.format(getString(R.string.info_msg), "年龄", it.data.user.age)
+            val ageHtml = String.format(getString(R.string.info_msg), "年龄",if(it.data.user.age == null) "--" else it.data.user.age)
             binding.mAge.text = Html.fromHtml(ageHtml + "岁")
             val heightHtml =
                 String.format(