中建365-二期优化-去掉腾讯IM相关的,没有该需求

develop
wlh 2 years ago
parent 1374c0ced3
commit 6c665893d1

@ -3,18 +3,19 @@ package com.zj365.health.act
import android.content.Intent import android.content.Intent
import com.alibaba.android.arouter.facade.annotation.Route import com.alibaba.android.arouter.facade.annotation.Route
import com.google.gson.Gson import com.google.gson.Gson
import com.tencent.qcloud.tuikit.tuichat.util.PermissionHelper
import com.xty.base.act.BaseVmAct import com.xty.base.act.BaseVmAct
import com.xty.common.LogUtils import com.xty.common.LogUtils
import com.xty.common.arouter.ARouterUrl import com.xty.common.arouter.ARouterUrl
import com.xty.common.arouter.RouteManager import com.xty.common.arouter.RouteManager
import com.xty.common.util.CommonToastUtils 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
import com.xty.common.xqr_code.XQRCodeAct.Companion.QRCODE_AGREEMENT import com.xty.common.xqr_code.XQRCodeAct.Companion.QRCODE_AGREEMENT
import com.zj365.health.R import com.zj365.health.R
import com.zj365.health.databinding.ActDuihuanmaBinding import com.zj365.health.databinding.ActDuihuanmaBinding
import com.zj365.health.vm.PayCancerVm import com.zj365.health.vm.PayCancerVm
import com.xuexiang.xqrcode.XQRCode import com.xuexiang.xqrcode.XQRCode
import com.yanzhenjie.permission.runtime.Permission
/** /**
* 已填问卷列表 * 已填问卷列表
@ -53,21 +54,13 @@ class DuihuanmaAct : BaseVmAct<PayCancerVm>() {
* 扫码 * 扫码
*/ */
private fun startScan() { private fun startScan() {
PermissionHelper.requestPermission(PermissionHelper.PERMISSION_CAMERA,object :
PermissionHelper.PermissionCallback { PermissionUtils.requestPermission(this,
override fun onGranted() { { XQRCodeAct.start(
// XQRCode.startScan(this@DuihuanmaAct, QRCODE_AGREEMENT)
XQRCodeAct.start(
this@DuihuanmaAct, this@DuihuanmaAct,
QRCODE_AGREEMENT, QRCODE_AGREEMENT,
R.style.XQRCodeTheme_Custom R.style.XQRCodeTheme_Custom
) )}, Permission.CAMERA)
}
override fun onDenied() {
}
})
} }
private fun confirm() { private fun confirm() {

@ -4,19 +4,20 @@ import android.content.Intent
import android.view.View import android.view.View
import com.alibaba.android.arouter.facade.annotation.Route import com.alibaba.android.arouter.facade.annotation.Route
import com.google.gson.Gson import com.google.gson.Gson
import com.tencent.qcloud.tuikit.tuichat.util.PermissionHelper
import com.xty.base.act.BaseVmAct import com.xty.base.act.BaseVmAct
import com.xty.common.LogUtils import com.xty.common.LogUtils
import com.xty.common.arouter.ARouterUrl import com.xty.common.arouter.ARouterUrl
import com.xty.common.arouter.RouteManager import com.xty.common.arouter.RouteManager
import com.xty.common.event.NSuanOpenEvent import com.xty.common.event.NSuanOpenEvent
import com.xty.common.util.CommonToastUtils 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
import com.xty.common.xqr_code.XQRCodeAct.Companion.QRCODE_AGREEMENT import com.xty.common.xqr_code.XQRCodeAct.Companion.QRCODE_AGREEMENT
import com.zj365.health.R import com.zj365.health.R
import com.zj365.health.databinding.ActNsuanOpenBinding import com.zj365.health.databinding.ActNsuanOpenBinding
import com.zj365.health.vm.NSuanVm import com.zj365.health.vm.NSuanVm
import com.xuexiang.xqrcode.XQRCode import com.xuexiang.xqrcode.XQRCode
import com.yanzhenjie.permission.runtime.Permission
import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode import org.greenrobot.eventbus.ThreadMode
@ -88,21 +89,12 @@ class NSuanOpenAct : BaseVmAct<NSuanVm>() {
* 扫码 * 扫码
*/ */
private fun startScan() { private fun startScan() {
PermissionHelper.requestPermission(PermissionHelper.PERMISSION_CAMERA, object : PermissionUtils.requestPermission(this,
PermissionHelper.PermissionCallback { { XQRCodeAct.start(
override fun onGranted() {
// XQRCode.startScan(this@NSuanOpenAct, QRCODE_AGREEMENT)
XQRCodeAct.start(
this@NSuanOpenAct, this@NSuanOpenAct,
QRCODE_AGREEMENT, QRCODE_AGREEMENT,
R.style.XQRCodeTheme_Custom R.style.XQRCodeTheme_Custom
) )}, Permission.CAMERA)
}
override fun onDenied() {
}
})
} }
private fun confirm() { private fun confirm() {

@ -4,7 +4,6 @@ import android.content.Intent
import android.view.View import android.view.View
import com.alibaba.android.arouter.facade.annotation.Route import com.alibaba.android.arouter.facade.annotation.Route
import com.google.gson.Gson import com.google.gson.Gson
import com.tencent.qcloud.tuikit.tuichat.util.PermissionHelper
import com.xty.base.act.BaseVmAct import com.xty.base.act.BaseVmAct
import com.xty.common.LogUtils import com.xty.common.LogUtils
import com.xty.common.arouter.ARouterUrl 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.XTangOpenEvent
import com.xty.common.event.XTangUploadEvent import com.xty.common.event.XTangUploadEvent
import com.xty.common.util.CommonToastUtils 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
import com.xty.common.xqr_code.XQRCodeAct.Companion.QRCODE_AGREEMENT import com.xty.common.xqr_code.XQRCodeAct.Companion.QRCODE_AGREEMENT
import com.zj365.health.R import com.zj365.health.R
import com.zj365.health.databinding.ActXtangOpenBinding import com.zj365.health.databinding.ActXtangOpenBinding
import com.zj365.health.vm.XTangVm import com.zj365.health.vm.XTangVm
import com.xuexiang.xqrcode.XQRCode import com.xuexiang.xqrcode.XQRCode
import com.yanzhenjie.permission.runtime.Permission
import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.EventBus
/** /**
@ -67,21 +68,14 @@ class XTangOpenAct : BaseVmAct<XTangVm>() {
* 扫码 * 扫码
*/ */
private fun startScan() { private fun startScan() {
PermissionHelper.requestPermission(PermissionHelper.PERMISSION_CAMERA, object :
PermissionHelper.PermissionCallback { PermissionUtils.requestPermission(this,
override fun onGranted() { { XQRCodeAct.start(
// XQRCode.startScan(this@XTangOpenAct, QRCODE_AGREEMENT)
XQRCodeAct.start(
this@XTangOpenAct, this@XTangOpenAct,
QRCODE_AGREEMENT, QRCODE_AGREEMENT,
R.style.XQRCodeTheme_Custom R.style.XQRCodeTheme_Custom
) )
} }, Permission.CAMERA)
override fun onDenied() {
}
})
} }
private val onClickListener = View.OnClickListener { private val onClickListener = View.OnClickListener {

@ -2,19 +2,19 @@ package com.zj365.health.act.binddevice
import android.content.Intent import android.content.Intent
import com.google.gson.Gson 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.base.act.BaseVmAct
import com.xty.common.LogUtils import com.xty.common.LogUtils
import com.xty.common.event.BindDevEvent import com.xty.common.event.BindDevEvent
import com.xty.common.event.WorkManagerEvent import com.xty.common.event.WorkManagerEvent
import com.xty.common.util.CommonToastUtils 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
import com.xty.common.xqr_code.XQRCodeAct.Companion.QRCODE_AGREEMENT import com.xty.common.xqr_code.XQRCodeAct.Companion.QRCODE_AGREEMENT
import com.zj365.health.R import com.zj365.health.R
import com.zj365.health.databinding.ActBindDeviceBinding import com.zj365.health.databinding.ActBindDeviceBinding
import com.zj365.health.vm.BindDeviceVm import com.zj365.health.vm.BindDeviceVm
import com.xuexiang.xqrcode.XQRCode import com.xuexiang.xqrcode.XQRCode
import com.yanzhenjie.permission.runtime.Permission
import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.EventBus
open class BaseDeviceBindAct<V: BindDeviceVm> : BaseVmAct<V>() { open class BaseDeviceBindAct<V: BindDeviceVm> : BaseVmAct<V>() {
@ -48,19 +48,15 @@ open class BaseDeviceBindAct<V: BindDeviceVm> : BaseVmAct<V>() {
* 扫码 * 扫码
*/ */
private fun startScan() { private fun startScan() {
PermissionHelper.requestPermission(PermissionHelper.PERMISSION_CAMERA,object : PermissionCallback{
override fun onGranted() { PermissionUtils.requestPermission(this,
// XQRCode.startScan(this@BaseDeviceBindAct, QRCODE_AGREEMENT) {
XQRCodeAct.start( XQRCodeAct.start(
this@BaseDeviceBindAct, this@BaseDeviceBindAct,
QRCODE_AGREEMENT, QRCODE_AGREEMENT,
R.style.XQRCodeTheme_Custom R.style.XQRCodeTheme_Custom
) )
} }, Permission.CAMERA)
override fun onDenied() {
}
})
} }
override fun setLayout()= binding.root override fun setLayout()= binding.root

@ -4,10 +4,7 @@ import android.widget.TextView
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.chad.library.adapter.base.viewholder.BaseViewHolder 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.base.adapter.BaseAdapter
import com.xty.common.arouter.ARouterUrl
import com.xty.common.arouter.RouteManager
import com.xty.common.setImageUser import com.xty.common.setImageUser
import com.xty.network.model.FamilyHealthBean import com.xty.network.model.FamilyHealthBean
import com.zj365.health.R import com.zj365.health.R

@ -6,7 +6,6 @@ import android.widget.ImageView
import android.widget.TextView import android.widget.TextView
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import com.chad.library.adapter.base.viewholder.BaseViewHolder 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.base.adapter.BaseAdapter
import com.xty.common.LogUtils import com.xty.common.LogUtils
import com.xty.common.util.SpannableUtils import com.xty.common.util.SpannableUtils

@ -1,7 +1,6 @@
package com.zj365.health.fragment package com.zj365.health.fragment
import android.widget.Toast import android.widget.Toast
import com.tencent.qcloud.tuikit.tuiconversation.classicui.util.TUIConversationUtils
import com.xty.base.fragment.BaseVmFrag import com.xty.base.fragment.BaseVmFrag
import com.xty.common.arouter.ARouterUrl import com.xty.common.arouter.ARouterUrl
import com.xty.common.arouter.RouteManager import com.xty.common.arouter.RouteManager
@ -60,11 +59,11 @@ class MyKeeperFrag : BaseVmFrag<MyKeeperVm>() {
) )
} }
binding.llLeft.setOnClickListener { itt -> binding.llLeft.setOnClickListener { itt ->
TUIConversationUtils.startAYSingleChatActivity( /* TUIConversationUtils.startAYSingleChatActivity(
"man_" + it.data[0].id, "man_" + it.data[0].id,
it.data[0].realname, it.data[0].realname,
it.data[0].avatar it.data[0].avatar
); );*/
} }

Loading…
Cancel
Save