From b87593ce06893a6236653d8fe32c90824aaab513 Mon Sep 17 00:00:00 2001 From: wlh <646507849@qq.com> Date: Wed, 21 Feb 2024 11:02:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=BB=BA365-=E4=BA=8C=E6=9C=9F?= =?UTF-8?q?=E5=BC=80=E5=8F=91-=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/zj365/dc/activity/LoginAct.kt | 2 ++ app/src/main/java/com/zj365/dc/activity/RegisterAct.kt | 2 ++ app/src/main/java/com/zj365/dc/fragment/MineFrag.kt | 1 + .../main/java/com/xty/base/dialog/AppUpdateDialog.kt | 10 ++++++++-- common/src/main/java/com/xty/common/Const.kt | 2 ++ .../com/zj365/health/act/HealthSkyHourReportAct.kt | 2 +- .../zj365/health/act/HealthWeekMonthHourReportAct.kt | 2 +- 7 files changed, 17 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/zj365/dc/activity/LoginAct.kt b/app/src/main/java/com/zj365/dc/activity/LoginAct.kt index 1b4befb..43fd587 100644 --- a/app/src/main/java/com/zj365/dc/activity/LoginAct.kt +++ b/app/src/main/java/com/zj365/dc/activity/LoginAct.kt @@ -168,6 +168,7 @@ class LoginAct : BaseVmAct() { 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() { 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) } diff --git a/app/src/main/java/com/zj365/dc/activity/RegisterAct.kt b/app/src/main/java/com/zj365/dc/activity/RegisterAct.kt index c575997..c1b3e35 100644 --- a/app/src/main/java/com/zj365/dc/activity/RegisterAct.kt +++ b/app/src/main/java/com/zj365/dc/activity/RegisterAct.kt @@ -129,6 +129,7 @@ class RegisterAct : BaseVmAct() { 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() { 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) } diff --git a/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt b/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt index 2f3c862..49a1959 100644 --- a/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt +++ b/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt @@ -689,6 +689,7 @@ class MineFrag : BaseVmFrag() , EasyPermissions.PermissionCallbacks{ fun refreshLogoutUI(){ user = null + showIdInfo = "" binding.mIntegral.text = "--" binding.mName.text = "" binding.mPhone.text = "" diff --git a/base/src/main/java/com/xty/base/dialog/AppUpdateDialog.kt b/base/src/main/java/com/xty/base/dialog/AppUpdateDialog.kt index dbb2c3e..8eed349 100644 --- a/base/src/main/java/com/xty/base/dialog/AppUpdateDialog.kt +++ b/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 diff --git a/common/src/main/java/com/xty/common/Const.kt b/common/src/main/java/com/xty/common/Const.kt index 2ae5938..9f3dd78 100644 --- a/common/src/main/java/com/xty/common/Const.kt +++ b/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" diff --git a/health/src/main/java/com/zj365/health/act/HealthSkyHourReportAct.kt b/health/src/main/java/com/zj365/health/act/HealthSkyHourReportAct.kt index 0f936f9..1f605f7 100644 --- a/health/src/main/java/com/zj365/health/act/HealthSkyHourReportAct.kt +++ b/health/src/main/java/com/zj365/health/act/HealthSkyHourReportAct.kt @@ -726,7 +726,7 @@ class HealthSkyHourReportAct : BaseVmAct() { } 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( diff --git a/health/src/main/java/com/zj365/health/act/HealthWeekMonthHourReportAct.kt b/health/src/main/java/com/zj365/health/act/HealthWeekMonthHourReportAct.kt index 0e1de92..72ddd73 100644 --- a/health/src/main/java/com/zj365/health/act/HealthWeekMonthHourReportAct.kt +++ b/health/src/main/java/com/zj365/health/act/HealthWeekMonthHourReportAct.kt @@ -1134,7 +1134,7 @@ class HealthWeekMonthHourReportAct : BaseVmAct() { 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(