中建365-二期开发-优化

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 {

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<DynamicManagementVm>() , EasyPermission
         }
     }
 
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun unBinderSuccess(event:UnBinderEvent){
+        isJob = false
+        cancelTimer()
+        refresh()
+    }
+
     //workmanager 后台上传任务
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun workManagerSuccess(event: WorkManagerEvent) {

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

@@ -277,7 +277,7 @@ class MineFrag : BaseVmFrag<SettingVm>() , 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<SettingVm>() , 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()

common/src/main/java/com/xty/common/event/UnBinderEvent.kt

@@ -0,0 +1,4 @@
+package com.xty.common.event
+
+class UnBinderEvent {
+}

health/src/main/java/com/zj365/health/adapter/FamilyHealth/HealthFamilyTargetAdapter.kt

@@ -19,7 +19,7 @@ class HealthFamilyTargetAdapter : BaseAdapter<FamilyHealthBean.FamilyTargetBean>
         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<FamilyHealthBean.FamilyTargetBean>
 
 
             }
+            9->{
+                imgTarget.setImageResource(R.mipmap.ic_fat)
+            }
         }
 
     }

health/src/main/res/layout/act_upload_health_record.xml

@@ -87,6 +87,7 @@
                     android:layout_height="@dimen/dp_50"
                     >
                     <TextView
+                        android:id="@+id/tv_report_desc"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="报告标题"
@@ -103,8 +104,11 @@
                         android:textColor="@color/col_313"
                         android:background="@null"
                         android:gravity="right"
+                        android:layout_marginLeft="@dimen/dp_10"
                         android:textColorHint="@color/col_6B6"
                         android:hint="例：血常规报告"
+                        android:layout_toRightOf="@+id/tv_report_desc"
+                        android:singleLine="true"
                         android:layout_centerVertical="true"
                         android:layout_alignParentEnd="true"/>
 

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<SettingVm>() , 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())  //刷新个人信息

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)
         }