中建365-二期开发-bug优化

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

@@ -1,6 +1,7 @@
 package com.xty.common
 
 import android.content.Context
+import android.text.TextUtils
 import com.umeng.analytics.MobclickAgent
 import com.xty.common.util.CommonUtils
 
@@ -13,10 +14,14 @@ import com.xty.common.util.CommonUtils
  */
 fun onEventObject(context: Context, event:UmengEventId, params: String = ""){
     val value: MutableMap<String, Any?> = HashMap()
+
+    CommonUtils.getMyUserInfo()?.let {
         value["userId"] = CommonUtils.getMyUserId()//用户id
-    value["userName"] = CommonUtils.getMyUserInfo()?.name //用户名称
+        value["userName"] = it.name //用户名称
-    value["watchName"] = CommonUtils.getMyUserInfo()?.watchName
+      //  value["watchName"] = it.watchName
+    }
     value["params"] = params
+
     MobclickAgent.onEventObject(context, event.eventId, value)
 }
 

config.gradle

@@ -6,8 +6,8 @@ ext {
             appId            : "com.zj365.dc",
             minSdk           : 23,
             targetSdk        : 32,
-            versionCode      : 116,
+            versionCode      : 118,
-            versionName      : "1.1.2"
+            versionName      : "1.2.0"
     ]
 
 
@@ -25,27 +25,27 @@ ext {
     url = [
             releaseTime:    String.valueOf(new Date().format("ddHHmm")),
             //正式环境
-            /*debug_url  : "https://app.zhongjian365.com/app/",
+            debug_url  : "https://app.zhongjian365.com/app/",
             release_url: "https://app.zhongjian365.com/app/",
 
             h5_debug_url : "https://built.zhongjian365.com/",
-            h5_release_url : "https://built.zhongjian365.com/"*/
+            h5_release_url : "https://built.zhongjian365.com/"
             //测试环境
-            debug_url  : "http://java01.zhongjian365.com/app/",
+            /*debug_url  : "http://java01.zhongjian365.com/app/",
             release_url: "http://java01.zhongjian365.com/app/",
 
             h5_debug_url : "http://testbuilt.zhongjian365.com/",
-            h5_release_url : "http://testbuilt.zhongjian365.com/"
+            h5_release_url : "http://testbuilt.zhongjian365.com/"*/
 
 
     ]
 
     image_preifx = [
-            debug_url  : "http://java01.zhongjian365.com/app/",
+            /*debug_url  : "http://java01.zhongjian365.com/app/",
-            release_url: "http://java01.zhongjian365.com/app/"
+            release_url: "http://java01.zhongjian365.com/app/"*/
 
-   /*         debug_url  : "https://app.zhongjian365.com/app/",
+            debug_url  : "https://app.zhongjian365.com/app/",
-            release_url: "https://app.zhongjian365.com/app/"*/
+            release_url: "https://app.zhongjian365.com/app/"
 
 
     ]

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

@@ -788,6 +788,8 @@ class HealthSkyHourReportAct : BaseVmAct<ReportVm>() {
 
             xiyiList.clear()
             mTitless.clear()
+            mAdapter.data.clear()
+            binding.xTablayout.removeAllTabs()
 //            mTitless.add("用户信息")
             mTitless.add("器官功能分析")
 //            mTitless.add("睡眠监测")

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

@@ -1153,6 +1153,7 @@ class HealthWeekMonthHourReportAct : BaseVmAct<ReportVm>() {
 
             xiyiList.clear()
             mTitless.clear()
+            binding.xTablayout.removeAllTabs()
 //            mTitless.add("用户信息")
 //            mTitless.add("健康状态趋势")
             mTitless.add("器官功能分析")