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 bc31fd8..ed51d7f 100644 --- a/health/src/main/java/com/zj365/health/act/DuihuanmaAct.kt +++ b/health/src/main/java/com/zj365/health/act/DuihuanmaAct.kt @@ -17,13 +17,14 @@ import com.zj365.health.R import com.zj365.health.databinding.ActDuihuanmaBinding import com.zj365.health.vm.PayCancerVm import com.xuexiang.xqrcode.XQRCode +import com.zj365.health.weight.DialogTip import pub.devrel.easypermissions.EasyPermissions /** * 已填问卷列表 */ @Route(path = ARouterUrl.DUIHUAN) -class DuihuanmaAct : BaseVmAct() { +class DuihuanmaAct : BaseVmAct() , EasyPermissions.PermissionCallbacks ,EasyPermissions.RationaleCallbacks { val binding by lazy { ActDuihuanmaBinding.inflate(layoutInflater) } override fun setLayout() = binding.root @@ -64,9 +65,15 @@ class DuihuanmaAct : BaseVmAct() { R.style.XQRCodeTheme_Custom ) }else{ - EasyPermissions.requestPermissions(this,"", - 0x00011, - Manifest.permission.CAMERA) + DialogTip( + this, + "中健365需要相机权限,以便您使用扫一扫功能" + ) { + EasyPermissions.requestPermissions(this,"", + 0x00011, + Manifest.permission.CAMERA) + }.show() + } } private fun confirm() { @@ -129,12 +136,26 @@ class DuihuanmaAct : BaseVmAct() { } } - override fun onSuccess(requestCode: Int) { - super.onSuccess(requestCode) + + override fun onPermissionsGranted(requestCode: Int, perms: MutableList) { XQRCodeAct.start( this@DuihuanmaAct, QRCODE_AGREEMENT, R.style.XQRCodeTheme_Custom ) } + + override fun onPermissionsDenied(requestCode: Int, perms: MutableList) { + } + + override fun onRationaleAccepted(requestCode: Int) { + XQRCodeAct.start( + this@DuihuanmaAct, + QRCODE_AGREEMENT, + R.style.XQRCodeTheme_Custom + ) + } + + override fun onRationaleDenied(requestCode: Int) { + } } \ No newline at end of file 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 14ddd52..430e82a 100644 --- a/health/src/main/java/com/zj365/health/act/NSuanOpenAct.kt +++ b/health/src/main/java/com/zj365/health/act/NSuanOpenAct.kt @@ -18,6 +18,7 @@ import com.zj365.health.R import com.zj365.health.databinding.ActNsuanOpenBinding import com.zj365.health.vm.NSuanVm import com.xuexiang.xqrcode.XQRCode +import com.zj365.health.weight.DialogTip import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode @@ -27,7 +28,7 @@ import pub.devrel.easypermissions.EasyPermissions * 尿酸开通 */ @Route(path = ARouterUrl.NS_OPEN) -class NSuanOpenAct : BaseVmAct() { +class NSuanOpenAct : BaseVmAct() , EasyPermissions.PermissionCallbacks ,EasyPermissions.RationaleCallbacks { val binding by lazy { ActNsuanOpenBinding.inflate(layoutInflater) } override fun setLayout(): View = binding.root @@ -98,20 +99,19 @@ class NSuanOpenAct : BaseVmAct() { R.style.XQRCodeTheme_Custom ) }else{ - EasyPermissions.requestPermissions(this,"", - 0x00011, - Manifest.permission.CAMERA) + + DialogTip( + this, + "中健365需要相机权限,以便您使用扫一扫功能" + ) { + EasyPermissions.requestPermissions(this,"", + 0x00011, + Manifest.permission.CAMERA) + }.show() + } } - override fun onSuccess(requestCode: Int) { - super.onSuccess(requestCode) - XQRCodeAct.start( - this@NSuanOpenAct, - QRCODE_AGREEMENT, - R.style.XQRCodeTheme_Custom - ) - } private fun confirm() { if (binding.mTvActCode.text.isNullOrEmpty()) { @@ -195,4 +195,26 @@ class NSuanOpenAct : BaseVmAct() { fun onRefresh(event: NSuanOpenEvent) { finish() } + + override fun onPermissionsGranted(requestCode: Int, perms: MutableList) { + XQRCodeAct.start( + this@NSuanOpenAct, + QRCODE_AGREEMENT, + R.style.XQRCodeTheme_Custom + ) + } + + override fun onPermissionsDenied(requestCode: Int, perms: MutableList) { + } + + override fun onRationaleAccepted(requestCode: Int) { + XQRCodeAct.start( + this@NSuanOpenAct, + QRCODE_AGREEMENT, + R.style.XQRCodeTheme_Custom + ) + } + + override fun onRationaleDenied(requestCode: Int) { + } } \ No newline at end of file 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 86756f1..a48219f 100644 --- a/health/src/main/java/com/zj365/health/act/XTangOpenAct.kt +++ b/health/src/main/java/com/zj365/health/act/XTangOpenAct.kt @@ -21,6 +21,7 @@ import com.zj365.health.R import com.zj365.health.databinding.ActXtangOpenBinding import com.zj365.health.vm.XTangVm import com.xuexiang.xqrcode.XQRCode +import com.zj365.health.weight.DialogTip import org.greenrobot.eventbus.EventBus import pub.devrel.easypermissions.EasyPermissions @@ -28,7 +29,7 @@ import pub.devrel.easypermissions.EasyPermissions * 血糖开通 */ @Route(path = ARouterUrl.XT_OPEN) -class XTangOpenAct : BaseVmAct() { +class XTangOpenAct : BaseVmAct(), EasyPermissions.PermissionCallbacks ,EasyPermissions.RationaleCallbacks { val binding by lazy { ActXtangOpenBinding.inflate(layoutInflater) } var isOpen = false var userId = "" @@ -77,20 +78,18 @@ class XTangOpenAct : BaseVmAct() { R.style.XQRCodeTheme_Custom ) }else{ - EasyPermissions.requestPermissions(this,"", - 0x00011, - Manifest.permission.CAMERA) + DialogTip( + this, + "中健365要相机权限,以便您使用扫一扫功能" + ) { + EasyPermissions.requestPermissions(this,"", + 0x00011, + Manifest.permission.CAMERA) + }.show() + } } - override fun onSuccess(requestCode: Int) { - super.onSuccess(requestCode) - XQRCodeAct.start( - this@XTangOpenAct, - QRCODE_AGREEMENT, - R.style.XQRCodeTheme_Custom - ) - } private val onClickListener = View.OnClickListener { when (it.id) { @@ -218,4 +217,26 @@ class XTangOpenAct : BaseVmAct() { } } } + + override fun onPermissionsGranted(requestCode: Int, perms: MutableList) { + XQRCodeAct.start( + this@XTangOpenAct, + QRCODE_AGREEMENT, + R.style.XQRCodeTheme_Custom + ) + } + + override fun onPermissionsDenied(requestCode: Int, perms: MutableList) { + } + + override fun onRationaleAccepted(requestCode: Int) { + XQRCodeAct.start( + this@XTangOpenAct, + QRCODE_AGREEMENT, + R.style.XQRCodeTheme_Custom + ) + } + + override fun onRationaleDenied(requestCode: Int) { + } } \ No newline at end of file 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 a4db4d3..3c4d4cc 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 @@ -14,10 +14,11 @@ import com.zj365.health.R import com.zj365.health.databinding.ActBindDeviceBinding import com.zj365.health.vm.BindDeviceVm import com.xuexiang.xqrcode.XQRCode +import com.zj365.health.weight.DialogTip import org.greenrobot.eventbus.EventBus import pub.devrel.easypermissions.EasyPermissions -open class BaseDeviceBindAct : BaseVmAct() { +open class BaseDeviceBindAct : BaseVmAct() , EasyPermissions.PermissionCallbacks ,EasyPermissions.RationaleCallbacks{ val binding by lazy{ ActBindDeviceBinding.inflate(layoutInflater)} @@ -56,19 +57,17 @@ open class BaseDeviceBindAct : BaseVmAct() { R.style.XQRCodeTheme_Custom ) }else{ - EasyPermissions.requestPermissions(this,"", - 0x00011, - Manifest.permission.CAMERA) - } - } - override fun onSuccess(requestCode: Int) { - super.onSuccess(requestCode) - XQRCodeAct.start( - this@BaseDeviceBindAct, - QRCODE_AGREEMENT, - R.style.XQRCodeTheme_Custom - ) + DialogTip( + this, + "中健365需要相机权限,以便您使用扫一扫功能" + ) { + EasyPermissions.requestPermissions(this,"", + 0x00011, + Manifest.permission.CAMERA) + }.show() + + } } override fun setLayout()= binding.root @@ -103,4 +102,26 @@ open class BaseDeviceBindAct : BaseVmAct() { } } } + + override fun onPermissionsGranted(requestCode: Int, perms: MutableList) { + XQRCodeAct.start( + this@BaseDeviceBindAct, + QRCODE_AGREEMENT, + R.style.XQRCodeTheme_Custom + ) + } + + override fun onPermissionsDenied(requestCode: Int, perms: MutableList) { + } + + override fun onRationaleAccepted(requestCode: Int) { + XQRCodeAct.start( + this@BaseDeviceBindAct, + QRCODE_AGREEMENT, + R.style.XQRCodeTheme_Custom + ) + } + + override fun onRationaleDenied(requestCode: Int) { + } } \ No newline at end of file diff --git a/health/src/main/java/com/zj365/health/adapter/healthrecord/HealthRecordsAdapter.kt b/health/src/main/java/com/zj365/health/adapter/healthrecord/HealthRecordsAdapter.kt index a853c1a..63a4cde 100644 --- a/health/src/main/java/com/zj365/health/adapter/healthrecord/HealthRecordsAdapter.kt +++ b/health/src/main/java/com/zj365/health/adapter/healthrecord/HealthRecordsAdapter.kt @@ -21,7 +21,7 @@ class HealthRecordsAdapter : BaseAdapter( holder.setText(R.id.tv_report_type,"体检报告") } 2->{ - holder.setText(R.id.tv_report_type,"病例报告") + holder.setText(R.id.tv_report_type,"病历报告") } else->{ holder.setText(R.id.tv_report_type,"CT或其他影像")