From 9cbe7c9e0c1013b05eb0543b154feaa8a2d4bb24 Mon Sep 17 00:00:00 2001
From: wlh <646507849@qq.com>
Date: Sat, 13 Jan 2024 09:34:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=81=A5365-x2=E6=89=8B=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 base/src/main/java/com/xty/base/act/BaseVmAct.kt   | 14 +++++++++++++-
 common/src/main/res/layout/layout_health_body.xml  |  4 ++--
 .../main/res/layout/layout_health_body_child.xml   |  1 +
 config.gradle                                      |  2 +-
 .../java/com/zj365/mime/act/BaseInfoChangeAct.kt   |  2 ++
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/base/src/main/java/com/xty/base/act/BaseVmAct.kt b/base/src/main/java/com/xty/base/act/BaseVmAct.kt
index 5631072..67f6233 100644
--- a/base/src/main/java/com/xty/base/act/BaseVmAct.kt
+++ b/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")
     }
 }
\ No newline at end of file
diff --git a/common/src/main/res/layout/layout_health_body.xml b/common/src/main/res/layout/layout_health_body.xml
index cc135e7..4b257d9 100644
--- a/common/src/main/res/layout/layout_health_body.xml
+++ b/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"/>
 
diff --git a/common/src/main/res/layout/layout_health_body_child.xml b/common/src/main/res/layout/layout_health_body_child.xml
index 44e7a8d..1aa2b0c 100644
--- a/common/src/main/res/layout/layout_health_body_child.xml
+++ b/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"
diff --git a/config.gradle b/config.gradle
index 823c8c6..d1f8e13 100644
--- a/config.gradle
+++ b/config.gradle
@@ -31,7 +31,7 @@ ext {
             h5_debug_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/",
diff --git a/mine/src/main/java/com/zj365/mime/act/BaseInfoChangeAct.kt b/mine/src/main/java/com/zj365/mime/act/BaseInfoChangeAct.kt
index 262c258..12bf467 100644
--- a/mine/src/main/java/com/zj365/mime/act/BaseInfoChangeAct.kt
+++ b/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{