中建365-二期开发-合并代码

app/src/main/AndroidManifest.xml

@@ -3,6 +3,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.zj365.dc">
 
+    <!--joperate_permission_start-->
+    <permission android:name="com.zj365.dc.permission.JOPERATE_MESSAGE" android:protectionLevel="signature"/>
+    <uses-permission android:name="com.zj365.dc.permission.JOPERATE_MESSAGE" />
     <uses-permission android:name="android.permission.VIBRATE" />
 
     <!-- Required  一些系统要求的权限，如访问网络等-->

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

@@ -181,7 +181,7 @@ class DynamicManagementFrag : BaseVmFrag<DynamicManagementVm>() , EasyPermission
         binding.mGriddingList.mGridView.setOnItemClickListener { _, _, position, _ ->
             val index = mHealthAdapter.getItem(position).type
             val functionType = mHealthAdapter.getItem(position).functionType
-            onEventObject(requireContext(), UmengEventId.HealthMonitor, pageNames[index])
+            onEventObject(requireContext(), UmengEventId.HealthMonitor, mHealthAdapter.getItem(position).buttonName)
             when (functionType) {
                 //（   ）0.心率、1.血氧、2.呼吸率、3.体温、4.步数、5.睡眠、6.血压、7.血糖、8.心电、9.尿酸、10.血脂。
                 //（U32）0.心率、1.血氧、2.呼吸率、3.体温、     、4.睡眠、5.血压、6.血糖、7.尿酸、8.心电,9血脂
@@ -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

base/src/main/java/com/xty/base/act/BaseVmAct.kt

@@ -7,6 +7,7 @@ import com.xty.base.R
 import com.xty.base.vm.BaseVm
 import com.xty.base.weight.DeleteDialog
 import com.xty.base.weight.TipDialog
+import com.xty.common.LogUtils
 import com.xty.common.MMkvHelper
 import com.xty.common.ReflexUtils
 import com.xty.common.arouter.ARouterUrl
@@ -16,7 +17,7 @@ import com.xty.common.weight.LoadingView
 import org.greenrobot.eventbus.EventBus
 import pub.devrel.easypermissions.EasyPermissions
 
-abstract class BaseVmAct<V:BaseVm>: IBaseAct() , EasyPermissions.PermissionCallbacks {
+abstract class BaseVmAct<V:BaseVm>: IBaseAct() , EasyPermissions.PermissionCallbacks ,EasyPermissions.RationaleCallbacks {
 
     lateinit var mViewModel:V
     val loadingView by lazy {   LoadingView.Builder(this).setCancelable(true).cteated() }
@@ -52,9 +53,20 @@ abstract class BaseVmAct<V:BaseVm>: IBaseAct() , EasyPermissions.PermissionCallb
 
     open fun onSuccess(requestCode: Int) {}
     override fun onPermissionsGranted(requestCode: Int, perms: MutableList<String>) {
+        LogUtils.e("BaseVmAct","onPermissionsGranted${perms.size}")
         onSuccess(requestCode)
     }
 
     override fun onPermissionsDenied(requestCode: Int, perms: MutableList<String>) {
+        LogUtils.e("BaseVmAct","onPermissionsDenied${perms.size}")
+    }
+
+
+    override fun onRationaleAccepted(requestCode: Int) {
+        LogUtils.e("BaseVmAct","onRationaleAccepted")
+    }
+
+    override fun onRationaleDenied(requestCode: Int) {
+        LogUtils.e("BaseVmAct","onRationaleDenied")
     }
 }

base/src/main/java/com/xty/base/dialog/DialogActivities.kt

@@ -42,6 +42,7 @@ class DialogActivities (context:Context,var bannerBean: BannerBean?): BaseDialog
 
         binding.imgActivies.setOnClickListener {
             bannerBean?.let {
+                if(it.bannerType != 5 &&it.linkAddress.startsWith("http")){
                     var bundle = Bundle()
                     bundle.putString("title", it.title)
                     bundle.putString("url", it.linkAddress)
@@ -49,5 +50,7 @@ class DialogActivities (context:Context,var bannerBean: BannerBean?): BaseDialog
                 }
 
             }
+
+        }
     }
 }

base/src/main/java/com/xty/base/fragment/BaseVmFrag.kt

@@ -29,7 +29,7 @@ abstract class BaseVmFrag<T : BaseVm> : IBaseFrag() {
 
         mViewModel.nowData.observe(this) {
             loadingView.dismiss()
-            ToastUtils.show(R.string.again_login)
+//            ToastUtils.show(R.string.again_login)
 
             //RxActivityTool.finishAllActivity()
             MMkvHelper.clearUserInfo()

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

@@ -9,7 +9,7 @@ import com.tencent.mm.opensdk.utils.Log
  */
 object LogUtils {
 
-    private const val TAG = "HealthUser"
+    private const val TAG = "ZJ365"
 
     /**
      * 得到tag
@@ -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))
     }
 

common/src/main/res/layout/layout_health_body.xml

@@ -19,8 +19,8 @@
         tools:background="@mipmap/icon_health_women_1"/>
 
     <ImageView
-        android:layout_width="@dimen/dp_260"
-        android:layout_height="@dimen/dp_260"
+        android:layout_width="@dimen/dp_240"
+        android:layout_height="@dimen/dp_240"
         android:layout_gravity="center"
         android:background="@mipmap/bg_health_body"/>
 

common/src/main/res/layout/layout_health_body_child.xml

@@ -3,6 +3,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:gravity="center"
+    android:layout_gravity="center"
     android:orientation="vertical">
     <ImageView
         android:layout_width="@dimen/dp_30"

config.gradle

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

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

@@ -53,7 +53,7 @@ class HealthMainAct : BaseVmAct<HealthMainVm>() {
     var page = 0
     val binding by lazy { ActHealthMainBinding.inflate(layoutInflater) }
     var listFragment = mutableListOf<Fragment>()
-    var tabName = arrayOf<Int>()
+   // var tabName = arrayOf<Int>()
     var id = ""
     var sex = "1"
     var functionType:String = ""
@@ -91,12 +91,12 @@ class HealthMainAct : BaseVmAct<HealthMainVm>() {
             initTab(functionList)
             initVp2(functionList)
         }
-        tabName =  arrayOf(
+        /*tabName =  arrayOf(
             R.string.info_1, R.string.info_3, R.string.info_7,
             R.string.info_4, R.string.info_6, R.string.info_2,
-            R.string.info_8, R.string.info_11/*, R.string.info_5,
-                    R.string.info_10*/
-        )
+            R.string.info_8, R.string.info_11*//*, R.string.info_5,
+                    R.string.info_10*//*
+        )*/
 
         statusBar(binding.title.mView)
         initTitle()
@@ -138,6 +138,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
@@ -219,11 +220,11 @@ class HealthMainAct : BaseVmAct<HealthMainVm>() {
             override fun onPageSelected(position: Int) {
                 super.onPageSelected(position)
                 //   binding.xTablayout.getTabAt(position)!!.select()
-                /*onEventObject(
+                onEventObject(
                     baseContext,
                     UmengEventId.HealthMonitor,
-                    "${getString(tabName[position])}监测详情页"
-                )*/
+                    "${functionList[position].name}监测详情页"
+                )
                 changeTitle(position)
             }
         })

mine/src/main/java/com/zj365/mime/act/BaseInfoChangeAct.kt

@@ -669,6 +669,8 @@ class BaseInfoChangeAct : BaseVmAct<BaseInfoVm>(){
 
     override fun onSuccess(requestCode: Int) {
         super.onSuccess(requestCode)
+
+        LogUtils.e("BaseInfoChangeAct","onSuccess${requestCode}")
         if(requestCode == 0x00011){
             PictureUtils.openCamera(this@BaseInfoChangeAct)
         }else{

mine/src/main/res/layout/act_about.xml

@@ -110,7 +110,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginTop="@dimen/dp_8"
-                android:text="ICP备案：京ICP备2021023958号"
+                android:text="ICP备案：湘ICP备2024041733号"
                 android:textColor="@color/col_c7c"
                 android:textSize="@dimen/sp_13" />
 

network/src/main/java/com/xty/network/TokenIntercept.kt

@@ -2,6 +2,8 @@ package com.xty.network
 
 import android.util.Log
 import com.tencent.mmkv.MMKV
+import com.xty.network.utils.NetWorkLogUtils
+import com.youth.banner.util.LogUtils
 import okhttp3.Interceptor
 import okhttp3.Response
 
@@ -14,9 +16,9 @@ class TokenIntercept:Interceptor {
         var request=chain.request()
         val newBuilder = request.newBuilder()
         mmkv!!.decodeString("Auth-Token")?.let {
-            Log.e("token", "${mmkv!!.decodeString("Auth-Token")!!} "  )
-            Log.e("token_id", "${mmkv!!.decodeString("Auth-Id")!!} "  )
-            Log.e("mac_address", MyRetrofit.get().BLUETOOTH_MAC  )
+            NetWorkLogUtils.e("token", "${mmkv!!.decodeString("Auth-Token")!!} "  )
+            NetWorkLogUtils.e("token_id", "${mmkv!!.decodeString("Auth-Id")!!} "  )
+            NetWorkLogUtils.e("mac_address", MyRetrofit.get().BLUETOOTH_MAC  )
             newBuilder.header("auth-token",mmkv!!.decodeString("Auth-Token")!!)
             newBuilder.header("auth-id",mmkv!!.decodeString("Auth-Id")!!)
             newBuilder.header("mark",MyRetrofit.get().BLUETOOTH_MAC)

network/src/main/java/com/xty/network/utils/NetWorkLogUtils.kt

@@ -0,0 +1,82 @@
+package com.xty.network.utils
+
+import android.text.TextUtils
+import com.tencent.mm.opensdk.utils.Log
+import com.youth.banner.BuildConfig
+
+object NetWorkLogUtils {
+
+    private const val TAG = "ZJ365"
+
+    private const val DEBUG = BuildConfig.DEBUG
+
+    /**
+     * 得到tag
+     * @return 所在类->方法:行
+     */
+    private fun generateTag(): String {
+        val stackTraceElement = Thread.currentThread().stackTrace[6]
+//        val callerClazzName =
+//            stackTraceElement.className.substring(stackTraceElement.className.lastIndexOf(".") + 1)
+        val fileName = stackTraceElement.fileName
+//        val methodName = stackTraceElement.methodName
+        val lineNumber = stackTraceElement.lineNumber
+        return "($fileName:$lineNumber)"
+    }
+
+
+    fun d(msg: String) {
+        d(null, msg)
+    }
+
+    fun i(msg: String) {
+        i(null, msg)
+    }
+
+    fun e(msg: String) {
+        e(null, msg)
+    }
+
+    fun w(msg: String) {
+        w(null, msg)
+    }
+
+    fun v(msg: String) {
+        v(null, msg)
+    }
+
+    fun d(tag: String?, msg: String) {//测试环境输出日志
+        if (DEBUG) {
+            Log.d(TAG, getMsg(tag, msg))
+        }
+    }
+
+    fun i(tag: String?, msg: String) {//测试环境输出日志
+        if (DEBUG) {
+            Log.i(TAG, getMsg(tag, msg))
+        }
+    }
+
+    fun e(tag: String?, msg: String) {
+        if (DEBUG) {
+            Log.e(TAG, getMsg(tag, msg))
+        }
+    }
+
+    fun w(tag: String?, msg: String) {//测试环境输出日志
+        if (DEBUG) {
+            Log.w(TAG, getMsg(tag, msg))
+        }
+    }
+
+    fun v(tag: String?, msg: String) {//测试环境输出日志
+        if (DEBUG) {
+            Log.v(TAG, getMsg(tag, msg))
+        }
+    }
+
+    private fun getMsg(tag: String?, msg: String): String{
+        val tagStr = if (TextUtils.isEmpty(tag)) generateTag() else generateTag() + ":$tag"
+        return "$msg:$tagStr"
+    }
+}