From ad11f62f875b06a51917bb40e52f603f32fc4599 Mon Sep 17 00:00:00 2001 From: wlh <646507849@qq.com> Date: Thu, 22 Feb 2024 09:34:11 +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 --- .../com/zj365/dc/adapter/HealthMonitoringAdapter.kt | 2 +- .../com/zj365/dc/fragment/DynamicManagementFrag.kt | 8 ++++++++ app/src/main/java/com/zj365/dc/fragment/MineFrag.kt | 4 ++-- .../main/java/com/xty/common/event/UnBinderEvent.kt | 4 ++++ .../src/main/res/mipmap-xxhdpi/ic_fat.png | Bin .../FamilyHealth/HealthFamilyTargetAdapter.kt | 5 ++++- .../main/res/layout/act_upload_health_record.xml | 4 ++++ mine/src/main/java/com/zj365/mime/act/DevInfoAct.kt | 2 ++ mine/src/main/java/com/zj365/mime/vm/SettingVm.kt | 1 - 9 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 common/src/main/java/com/xty/common/event/UnBinderEvent.kt rename {app => common}/src/main/res/mipmap-xxhdpi/ic_fat.png (100%) diff --git a/app/src/main/java/com/zj365/dc/adapter/HealthMonitoringAdapter.kt b/app/src/main/java/com/zj365/dc/adapter/HealthMonitoringAdapter.kt index 71790d1..9248cd8 100644 --- a/app/src/main/java/com/zj365/dc/adapter/HealthMonitoringAdapter.kt +++ b/app/src/main/java/com/zj365/dc/adapter/HealthMonitoringAdapter.kt @@ -33,7 +33,7 @@ class HealthMonitoringAdapter( R.string.info_1_unit, R.string.info_3_unit, R.string.info_7_unit, R.string.info_4_unit, R.string.info_9_unit, R.string.info_6_unit, R.string.info_2_unit, R.string.info_8_unit, R.string.info_5_unit, - R.string.info_10_unit, R.string.info_6_unit + R.string.info_10_unit, R.string.info_2_unit ) override fun getCount(): Int { diff --git a/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt b/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt index 49ec39b..b79dba3 100644 --- a/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt +++ b/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt @@ -42,6 +42,7 @@ import com.xty.common.event.Health24HourStatusEvent import com.xty.common.event.LoginOrRegisterEvent import com.xty.common.event.LoginOutEvent import com.xty.common.event.MyInfoEvent +import com.xty.common.event.UnBinderEvent import com.xty.common.event.WorkManagerEvent import com.xty.common.marqueen.SimpleMF import com.xty.common.onEventObject @@ -1573,6 +1574,13 @@ class DynamicManagementFrag : BaseVmFrag() , EasyPermission } } + @Subscribe(threadMode = ThreadMode.MAIN) + fun unBinderSuccess(event:UnBinderEvent){ + isJob = false + cancelTimer() + refresh() + } + //workmanager 后台上传任务 @Subscribe(threadMode = ThreadMode.MAIN) fun workManagerSuccess(event: WorkManagerEvent) { 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 49a1959..51a92b5 100644 --- a/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt +++ b/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt @@ -277,7 +277,7 @@ class MineFrag : BaseVmFrag() , EasyPermissions.PermissionCallbacks{ bundle.clear() bundle.putString("id", showIdInfo) bundle.putSerializable("index", ReportVm.ReportInfoType.Day) - bundle.putBoolean("isDemonstrate", isDemonstrate) + bundle.putBoolean("isDemonstrate", (requireActivity() as MainActivity).isDemonstrate) bundle.putInt("pageType", 0) bundle.putString("titleName", "日报") Const.functionListDate.value?.let { @@ -506,7 +506,7 @@ class MineFrag : BaseVmFrag() , EasyPermissions.PermissionCallbacks{ private fun refresh() { refresh.setRefresh(binding.mRefresh) { if (!TextUtils.isEmpty(showIdInfo)) { - // mViewModel.getMySetting() + mViewModel.getMySetting() mViewModel.getUserOtherInfo() // mViewModel.getAllInfo(showIdInfo, false) mViewModel.searchInviteInfo() diff --git a/common/src/main/java/com/xty/common/event/UnBinderEvent.kt b/common/src/main/java/com/xty/common/event/UnBinderEvent.kt new file mode 100644 index 0000000..ea79d0d --- /dev/null +++ b/common/src/main/java/com/xty/common/event/UnBinderEvent.kt @@ -0,0 +1,4 @@ +package com.xty.common.event + +class UnBinderEvent { +} \ No newline at end of file diff --git a/app/src/main/res/mipmap-xxhdpi/ic_fat.png b/common/src/main/res/mipmap-xxhdpi/ic_fat.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/ic_fat.png rename to common/src/main/res/mipmap-xxhdpi/ic_fat.png diff --git a/health/src/main/java/com/zj365/health/adapter/FamilyHealth/HealthFamilyTargetAdapter.kt b/health/src/main/java/com/zj365/health/adapter/FamilyHealth/HealthFamilyTargetAdapter.kt index c692862..7d72825 100644 --- a/health/src/main/java/com/zj365/health/adapter/FamilyHealth/HealthFamilyTargetAdapter.kt +++ b/health/src/main/java/com/zj365/health/adapter/FamilyHealth/HealthFamilyTargetAdapter.kt @@ -19,7 +19,7 @@ class HealthFamilyTargetAdapter : BaseAdapter R.string.info_1_unit, R.string.info_3_unit, R.string.info_7_unit, R.string.info_4_unit, R.string.info_2_unit, R.string.info_9_unit, R.string.info_8_unit, - R.string.info_10_unit, R.string.info_6_unit + R.string.info_10_unit, R.string.info_8_unit ) override fun convert(holder: BaseViewHolder, item: FamilyHealthBean.FamilyTargetBean) { @@ -105,6 +105,9 @@ class HealthFamilyTargetAdapter : BaseAdapter } + 9->{ + imgTarget.setImageResource(R.mipmap.ic_fat) + } } } diff --git a/health/src/main/res/layout/act_upload_health_record.xml b/health/src/main/res/layout/act_upload_health_record.xml index f3743b1..4c616a8 100644 --- a/health/src/main/res/layout/act_upload_health_record.xml +++ b/health/src/main/res/layout/act_upload_health_record.xml @@ -87,6 +87,7 @@ android:layout_height="@dimen/dp_50" > diff --git a/mine/src/main/java/com/zj365/mime/act/DevInfoAct.kt b/mine/src/main/java/com/zj365/mime/act/DevInfoAct.kt index 27a6008..9bae99d 100644 --- a/mine/src/main/java/com/zj365/mime/act/DevInfoAct.kt +++ b/mine/src/main/java/com/zj365/mime/act/DevInfoAct.kt @@ -23,6 +23,7 @@ import com.xty.common.bracelet.YCBBlueConnectHelper import com.xty.common.event.BlueToothConnectEvent import com.xty.common.event.MyInfoEvent import com.xty.common.event.ReChangeEvent +import com.xty.common.event.UnBinderEvent import com.xty.common.setImage import com.xty.common.util.PermissionUtils import com.xty.network.MyRetrofit @@ -173,6 +174,7 @@ class DevInfoAct : BaseVmAct() , EasyPermissions.PermissionCallbacks MMkvHelper.remove(Const.Blue_Tooth)//清除蓝牙信息 /* YCBBlueConnectHelper.disconnect() YCBBlueConnectHelper.cancelTimer()*/ + EventBus.getDefault().post(UnBinderEvent()) MMkvHelper.clearWhatchInfo()//删除手表信息 EventBus.getDefault().post(BlueToothConnectEvent())//刷新蓝牙连接信息 EventBus.getDefault().post(MyInfoEvent()) //刷新个人信息 diff --git a/mine/src/main/java/com/zj365/mime/vm/SettingVm.kt b/mine/src/main/java/com/zj365/mime/vm/SettingVm.kt index 6af4e1e..01453ed 100644 --- a/mine/src/main/java/com/zj365/mime/vm/SettingVm.kt +++ b/mine/src/main/java/com/zj365/mime/vm/SettingVm.kt @@ -74,7 +74,6 @@ class SettingVm : BaseVm() { */ fun getMySetting() { startHttp { - LogUtils.e("eeeeee","请求个人中心数据啦") val body = apiInterface().getMySetting() body.getCodeStatus(settingLive, nowData) }