From 6c665893d1f13e109e1d1778ec01e1399a66469f Mon Sep 17 00:00:00 2001 From: wlh <646507849@qq.com> Date: Fri, 5 Jan 2024 11:45:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=BB=BA365-=E4=BA=8C=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96-=E5=8E=BB=E6=8E=89=E8=85=BE=E8=AE=AFIM?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84=EF=BC=8C=E6=B2=A1=E6=9C=89=E8=AF=A5?= =?UTF-8?q?=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zj365/health/act/DuihuanmaAct.kt | 23 +++++++----------- .../java/com/zj365/health/act/NSuanOpenAct.kt | 24 +++++++------------ .../java/com/zj365/health/act/XTangOpenAct.kt | 24 +++++++------------ .../act/binddevice/BaseDeviceBindAct.kt | 24 ++++++++----------- .../FamilyHealth/HealthFamilyAdapter.kt | 3 --- .../FamilyHealth/HealthFamilyTargetAdapter.kt | 1 - .../com/zj365/health/fragment/MyKeeperFrag.kt | 5 ++-- 7 files changed, 37 insertions(+), 67 deletions(-) diff --git a/health/src/main/java/com/zj365/health/act/DuihuanmaAct.kt b/health/src/main/java/com/zj365/health/act/DuihuanmaAct.kt index 288c860..8f8efdd 100644 --- a/health/src/main/java/com/zj365/health/act/DuihuanmaAct.kt +++ b/health/src/main/java/com/zj365/health/act/DuihuanmaAct.kt @@ -3,18 +3,19 @@ package com.zj365.health.act import android.content.Intent import com.alibaba.android.arouter.facade.annotation.Route import com.google.gson.Gson -import com.tencent.qcloud.tuikit.tuichat.util.PermissionHelper import com.xty.base.act.BaseVmAct import com.xty.common.LogUtils import com.xty.common.arouter.ARouterUrl import com.xty.common.arouter.RouteManager import com.xty.common.util.CommonToastUtils +import com.xty.common.util.PermissionUtils import com.xty.common.xqr_code.XQRCodeAct import com.xty.common.xqr_code.XQRCodeAct.Companion.QRCODE_AGREEMENT import com.zj365.health.R import com.zj365.health.databinding.ActDuihuanmaBinding import com.zj365.health.vm.PayCancerVm import com.xuexiang.xqrcode.XQRCode +import com.yanzhenjie.permission.runtime.Permission /** * 已填问卷列表 @@ -53,21 +54,13 @@ class DuihuanmaAct : BaseVmAct() { * 扫码 */ private fun startScan() { - PermissionHelper.requestPermission(PermissionHelper.PERMISSION_CAMERA,object : - PermissionHelper.PermissionCallback { - override fun onGranted() { -// XQRCode.startScan(this@DuihuanmaAct, QRCODE_AGREEMENT) - XQRCodeAct.start( - this@DuihuanmaAct, - QRCODE_AGREEMENT, - R.style.XQRCodeTheme_Custom - ) - } - - override fun onDenied() { - } - }) + PermissionUtils.requestPermission(this, + { XQRCodeAct.start( + this@DuihuanmaAct, + QRCODE_AGREEMENT, + R.style.XQRCodeTheme_Custom + )}, Permission.CAMERA) } private fun confirm() { diff --git a/health/src/main/java/com/zj365/health/act/NSuanOpenAct.kt b/health/src/main/java/com/zj365/health/act/NSuanOpenAct.kt index 10c99d8..c360640 100644 --- a/health/src/main/java/com/zj365/health/act/NSuanOpenAct.kt +++ b/health/src/main/java/com/zj365/health/act/NSuanOpenAct.kt @@ -4,19 +4,20 @@ import android.content.Intent import android.view.View import com.alibaba.android.arouter.facade.annotation.Route import com.google.gson.Gson -import com.tencent.qcloud.tuikit.tuichat.util.PermissionHelper import com.xty.base.act.BaseVmAct import com.xty.common.LogUtils import com.xty.common.arouter.ARouterUrl import com.xty.common.arouter.RouteManager import com.xty.common.event.NSuanOpenEvent import com.xty.common.util.CommonToastUtils +import com.xty.common.util.PermissionUtils import com.xty.common.xqr_code.XQRCodeAct import com.xty.common.xqr_code.XQRCodeAct.Companion.QRCODE_AGREEMENT import com.zj365.health.R import com.zj365.health.databinding.ActNsuanOpenBinding import com.zj365.health.vm.NSuanVm import com.xuexiang.xqrcode.XQRCode +import com.yanzhenjie.permission.runtime.Permission import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode @@ -88,21 +89,12 @@ class NSuanOpenAct : BaseVmAct() { * 扫码 */ private fun startScan() { - PermissionHelper.requestPermission(PermissionHelper.PERMISSION_CAMERA, object : - PermissionHelper.PermissionCallback { - override fun onGranted() { -// XQRCode.startScan(this@NSuanOpenAct, QRCODE_AGREEMENT) - XQRCodeAct.start( - this@NSuanOpenAct, - QRCODE_AGREEMENT, - R.style.XQRCodeTheme_Custom - ) - } - - override fun onDenied() { - } - - }) + PermissionUtils.requestPermission(this, + { XQRCodeAct.start( + this@NSuanOpenAct, + QRCODE_AGREEMENT, + R.style.XQRCodeTheme_Custom + )}, Permission.CAMERA) } private fun confirm() { diff --git a/health/src/main/java/com/zj365/health/act/XTangOpenAct.kt b/health/src/main/java/com/zj365/health/act/XTangOpenAct.kt index 52150af..f1d9cb3 100644 --- a/health/src/main/java/com/zj365/health/act/XTangOpenAct.kt +++ b/health/src/main/java/com/zj365/health/act/XTangOpenAct.kt @@ -4,7 +4,6 @@ import android.content.Intent import android.view.View import com.alibaba.android.arouter.facade.annotation.Route import com.google.gson.Gson -import com.tencent.qcloud.tuikit.tuichat.util.PermissionHelper import com.xty.base.act.BaseVmAct import com.xty.common.LogUtils import com.xty.common.arouter.ARouterUrl @@ -14,12 +13,14 @@ import com.xty.common.event.OpenOrRenewEvent import com.xty.common.event.XTangOpenEvent import com.xty.common.event.XTangUploadEvent import com.xty.common.util.CommonToastUtils +import com.xty.common.util.PermissionUtils import com.xty.common.xqr_code.XQRCodeAct import com.xty.common.xqr_code.XQRCodeAct.Companion.QRCODE_AGREEMENT import com.zj365.health.R import com.zj365.health.databinding.ActXtangOpenBinding import com.zj365.health.vm.XTangVm import com.xuexiang.xqrcode.XQRCode +import com.yanzhenjie.permission.runtime.Permission import org.greenrobot.eventbus.EventBus /** @@ -67,21 +68,14 @@ class XTangOpenAct : BaseVmAct() { * 扫码 */ private fun startScan() { - PermissionHelper.requestPermission(PermissionHelper.PERMISSION_CAMERA, object : - PermissionHelper.PermissionCallback { - override fun onGranted() { -// XQRCode.startScan(this@XTangOpenAct, QRCODE_AGREEMENT) - XQRCodeAct.start( - this@XTangOpenAct, - QRCODE_AGREEMENT, - R.style.XQRCodeTheme_Custom - ) - } - - override fun onDenied() { - } - }) + PermissionUtils.requestPermission(this, + { XQRCodeAct.start( + this@XTangOpenAct, + QRCODE_AGREEMENT, + R.style.XQRCodeTheme_Custom + ) + }, Permission.CAMERA) } private val onClickListener = View.OnClickListener { diff --git a/health/src/main/java/com/zj365/health/act/binddevice/BaseDeviceBindAct.kt b/health/src/main/java/com/zj365/health/act/binddevice/BaseDeviceBindAct.kt index 041e4e8..cb6076c 100644 --- a/health/src/main/java/com/zj365/health/act/binddevice/BaseDeviceBindAct.kt +++ b/health/src/main/java/com/zj365/health/act/binddevice/BaseDeviceBindAct.kt @@ -2,19 +2,19 @@ package com.zj365.health.act.binddevice import android.content.Intent import com.google.gson.Gson -import com.tencent.qcloud.tuikit.tuichat.util.PermissionHelper -import com.tencent.qcloud.tuikit.tuichat.util.PermissionHelper.PermissionCallback import com.xty.base.act.BaseVmAct import com.xty.common.LogUtils import com.xty.common.event.BindDevEvent import com.xty.common.event.WorkManagerEvent import com.xty.common.util.CommonToastUtils +import com.xty.common.util.PermissionUtils import com.xty.common.xqr_code.XQRCodeAct import com.xty.common.xqr_code.XQRCodeAct.Companion.QRCODE_AGREEMENT import com.zj365.health.R import com.zj365.health.databinding.ActBindDeviceBinding import com.zj365.health.vm.BindDeviceVm import com.xuexiang.xqrcode.XQRCode +import com.yanzhenjie.permission.runtime.Permission import org.greenrobot.eventbus.EventBus open class BaseDeviceBindAct : BaseVmAct() { @@ -48,19 +48,15 @@ open class BaseDeviceBindAct : BaseVmAct() { * 扫码 */ private fun startScan() { - PermissionHelper.requestPermission(PermissionHelper.PERMISSION_CAMERA,object : PermissionCallback{ - override fun onGranted() { -// XQRCode.startScan(this@BaseDeviceBindAct, QRCODE_AGREEMENT) - XQRCodeAct.start( - this@BaseDeviceBindAct, - QRCODE_AGREEMENT, - R.style.XQRCodeTheme_Custom - ) - } - override fun onDenied() { - } - }) + PermissionUtils.requestPermission(this, + { + XQRCodeAct.start( + this@BaseDeviceBindAct, + QRCODE_AGREEMENT, + R.style.XQRCodeTheme_Custom + ) + }, Permission.CAMERA) } override fun setLayout()= binding.root diff --git a/health/src/main/java/com/zj365/health/adapter/FamilyHealth/HealthFamilyAdapter.kt b/health/src/main/java/com/zj365/health/adapter/FamilyHealth/HealthFamilyAdapter.kt index d54e1cc..3ac6ae3 100644 --- a/health/src/main/java/com/zj365/health/adapter/FamilyHealth/HealthFamilyAdapter.kt +++ b/health/src/main/java/com/zj365/health/adapter/FamilyHealth/HealthFamilyAdapter.kt @@ -4,10 +4,7 @@ import android.widget.TextView import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.chad.library.adapter.base.viewholder.BaseViewHolder -import com.tencent.qcloud.tuikit.timcommon.component.impl.GlideEngine import com.xty.base.adapter.BaseAdapter -import com.xty.common.arouter.ARouterUrl -import com.xty.common.arouter.RouteManager import com.xty.common.setImageUser import com.xty.network.model.FamilyHealthBean import com.zj365.health.R diff --git a/health/src/main/java/com/zj365/health/adapter/FamilyHealth/HealthFamilyTargetAdapter.kt b/health/src/main/java/com/zj365/health/adapter/FamilyHealth/HealthFamilyTargetAdapter.kt index 5630802..c692862 100644 --- a/health/src/main/java/com/zj365/health/adapter/FamilyHealth/HealthFamilyTargetAdapter.kt +++ b/health/src/main/java/com/zj365/health/adapter/FamilyHealth/HealthFamilyTargetAdapter.kt @@ -6,7 +6,6 @@ import android.widget.ImageView import android.widget.TextView import androidx.core.content.ContextCompat import com.chad.library.adapter.base.viewholder.BaseViewHolder -import com.tencent.qcloud.tuikit.timcommon.component.impl.GlideEngine import com.xty.base.adapter.BaseAdapter import com.xty.common.LogUtils import com.xty.common.util.SpannableUtils diff --git a/health/src/main/java/com/zj365/health/fragment/MyKeeperFrag.kt b/health/src/main/java/com/zj365/health/fragment/MyKeeperFrag.kt index 101c8bd..31b8c07 100644 --- a/health/src/main/java/com/zj365/health/fragment/MyKeeperFrag.kt +++ b/health/src/main/java/com/zj365/health/fragment/MyKeeperFrag.kt @@ -1,7 +1,6 @@ package com.zj365.health.fragment import android.widget.Toast -import com.tencent.qcloud.tuikit.tuiconversation.classicui.util.TUIConversationUtils import com.xty.base.fragment.BaseVmFrag import com.xty.common.arouter.ARouterUrl import com.xty.common.arouter.RouteManager @@ -60,11 +59,11 @@ class MyKeeperFrag : BaseVmFrag() { ) } binding.llLeft.setOnClickListener { itt -> - TUIConversationUtils.startAYSingleChatActivity( + /* TUIConversationUtils.startAYSingleChatActivity( "man_" + it.data[0].id, it.data[0].realname, it.data[0].avatar - ); + );*/ }