中健365-x2手表上线优化

app/src/main/java/com/zj365/dc/adapter/BannerCustomAdapter.kt

@@ -82,6 +82,12 @@ class BannerCustomAdapter(var context: Context)
                     mVHMap.append(position, imageHolder)
                     context?.let { imageHolder.imageView.setBigImage(it, data?.imgUrl) }
                 }
+
+                else ->{
+                    val imageHolder: ImageHolder = holder as ImageHolder
+                    mVHMap.append(position, imageHolder)
+                    context?.let { imageHolder.imageView.setBigImage(it, data?.imgUrl) }
+                }
             }
         }
     }

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

@@ -726,6 +726,7 @@ class DynamicManagementFrag : BaseVmFrag<DynamicManagementVm>() , EasyPermission
 
         mViewModel.functionLiveData.observe(this){
             LogUtils.e("DynamicManagementFrag","functionList:${it.data.size}")
+            functionList.clear()
             functionList.addAll(it.data)
             if (showIdInfo ==MMkvHelper.getLong(Const.USER_ID).toString()) {
                 Const.functionListDate.value = functionList

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

@@ -609,6 +609,25 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
         mViewModel.videoDoctorLive.observe(this){
             if (it.data.type == 2){
                 CallKit.startCallKitLogic(requireActivity(),it.data.data)
+            }else{
+               /* val appId = "wx032bacb749c0dcb0" // 填移动应用(App)的 AppId，非小程序的 AppID
+
+                val api = WXAPIFactory.createWXAPI(requireContext(), appId)
+
+                val req = WXLaunchMiniProgram.Req()
+                req.userName = contentData.wxId // 填小程序原始id
+
+//                req.path = contentData.jumpUrl ////拉起小程序页面的可带参路径，不填默认拉起小程序首页，对于小游戏，可以只传入 query 部分，来实现传参效果，如：传入 "?foo=bar"。
+//                if(contentData.wxType == 3){
+                    req.miniprogramType =
+                        WXLaunchMiniProgram.Req.MINIPTOGRAM_TYPE_RELEASE // 可选打开 开发版，体验版和正式版
+                *//*}else{
+                    req.miniprogramType =
+                        WXLaunchMiniProgram.Req.MINIPROGRAM_TYPE_PREVIEW // 可选打开 开发版，体验版和正式版
+                }*//*
+
+
+                api.sendReq(req)*/
             }
         }
     }

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

@@ -26,8 +26,8 @@ object LogUtils {
     }
 
     private fun isDebug(): Boolean {
-//        return BuildConfig.isDebug || MMkvHelper.getBoolean("openLog", false)
-        return true
+        return BuildConfig.isDebug || MMkvHelper.getBoolean("openLog", false)
+//        return true
     }
 
 
@@ -62,6 +62,7 @@ object LogUtils {
     }
 
     fun e(tag: String?, msg: String) {
+        if (!isDebug()) return
         Log.e(TAG, getMsg(tag, msg))
     }
 

config.gradle

@@ -6,8 +6,8 @@ ext {
             appId            : "com.zj365.dc",
             minSdk           : 23,
             targetSdk        : 32,
-            versionCode      : 114,
-            versionName      : "1.1.0"
+            versionCode      : 115,
+            versionName      : "1.1.1"
     ]
 
 

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

@@ -110,6 +110,7 @@ class HealthMainAct : BaseVmAct<HealthMainVm>() {
     override fun liveObserver() {
         mViewModel.functionLiveData.observe(this){
             it.data.let {
+                functionList.clear()
                 functionList.addAll(it)
                 initTab(functionList)
                 initVp2(functionList)
@@ -138,6 +139,7 @@ class HealthMainAct : BaseVmAct<HealthMainVm>() {
     //设置tab
     private val mTabEntities: java.util.ArrayList<CustomTabEntity> = java.util.ArrayList()
     private fun initTab(functionList :MutableList<DeviceFunctionBean>) {
+        binding.xTablayout.removeAllTabs()
         functionList.forEach {
             if (it.type == "step" || it.type == "bloodFat"){
                 return@forEach