xieyongming
/
anyu_zhongjian_android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
develop
wlh 1 year ago
parent 1529d70ae3
commit 1374c0ced3
21 changed files with 115 additions and 191 deletions
Show Stats Download Patch File Download Diff File

7
.idea/gradle.xml
Unescape Escape View File

@ -10,13 +10,6 @@
<option name="gradleJvm" value="11" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$/../TUIKit/TIMCommon/timcommon" />
<option value="$PROJECT_DIR$/../TUIKit/TUIChat/tuichat" />
<option value="$PROJECT_DIR$/../TUIKit/TUIContact/tuicontact" />
<option value="$PROJECT_DIR$/../TUIKit/TUIConversation/tuiconversation" />
<option value="$PROJECT_DIR$/../TUIKit/TUICore/tuicore" />
<option value="$PROJECT_DIR$/../TUIKit/TUIGroup/tuigroup" />
<option value="$PROJECT_DIR$/../TUIKit/TUIOfflinePush/tuiofflinepush" />
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/AYCrashGuard" />
<option value="$PROJECT_DIR$/Health" />

8
app/src/main/java/com/zj365/dc/activity/InfoSimpleAct.kt
Unescape Escape View File

@ -10,8 +10,6 @@ import com.luck.picture.lib.PictureSelector
import com.luck.picture.lib.config.PictureConfig
import com.tamsiree.rxkit.RxActivityTool
import com.tamsiree.rxkit.RxKeyboardTool
import com.tencent.qcloud.tuicore.TUILogin
import com.tencent.qcloud.tuicore.interfaces.TUICallback
import com.xty.base.act.BaseVmAct
import com.xty.common.TimeSelect
import com.xty.common.TimeUtils
@ -150,9 +148,9 @@ class InfoSimpleAct : BaseVmAct<InfoSimpleVm>() {
mViewModel.getImUserSig.observe(this) {
Log.e("simon", "login" + it.data)
TUILogin.login(
/*TUILogin.login(
applicationContext,
1400807230,
0,
it.paramsData,
it.data,
object : TUICallback() {
@ -171,7 +169,7 @@ class InfoSimpleAct : BaseVmAct<InfoSimpleVm>() {
override fun onError(errorCode: Int, errorMessage: String?) {
Log.e("simon", "onError")
}
})
})*/
}
}

7
app/src/main/java/com/zj365/dc/activity/MainActivity.kt
Unescape Escape View File

@ -28,8 +28,6 @@ import com.lifesense.android.ble.core.serializer.AbstractMeasureData
import com.lifesense.android.ble.device.fatscale.model.WeightMeasureData
import com.tamsiree.rxkit.RxActivityTool
import com.tamsiree.rxkit.RxSPTool
import com.tencent.qcloud.tuicore.TUIConstants
import com.tencent.qcloud.tuikit.tuichat.util.PermissionHelper
import com.xty.base.act.BaseVmAct
import com.xty.base.dialog.AppUpdateDialog
import com.xty.base.dialog.DialogActivities
@ -66,7 +64,6 @@ import kotlinx.coroutines.launch
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
import pub.devrel.easypermissions.EasyPermissions
import java.util.Date
@Route(path = ARouterUrl.MAIN_ACT)
@ -112,7 +109,7 @@ class MainActivity : BaseVmAct<MainVm>(), Consumer<AbstractMeasureData> {
private fun initUnreadCountReceiver() {
unreadCountReceiver = object : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) {
val unreadCount = intent.getLongExtra(TUIConstants.UNREAD_COUNT_EXTRA, 0)
val unreadCount = intent.getLongExtra(Const.UNREAD_COUNT_EXTRA, 0)
// if (unreadCount > 0) {
// isShowReadAllButton = true
imunreadCount = unreadCount.toInt()
@ -124,7 +121,7 @@ class MainActivity : BaseVmAct<MainVm>(), Consumer<AbstractMeasureData> {
}
}
val unreadCountFilter = IntentFilter()
unreadCountFilter.addAction(TUIConstants.CONVERSATION_UNREAD_COUNT_ACTION)
unreadCountFilter.addAction(Const.CONVERSATION_UNREAD_COUNT_ACTION)
LocalBroadcastManager.getInstance(this)
.registerReceiver(unreadCountReceiver as BroadcastReceiver, unreadCountFilter)
}

26
app/src/main/java/com/zj365/dc/activity/OneKeyBinderDeviceAct.kt
Unescape Escape View File

@ -5,17 +5,19 @@ import android.view.View
import com.alibaba.android.arouter.facade.annotation.Route
import com.google.gson.Gson
import com.tamsiree.rxkit.RxActivityTool
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.event.BindDevEvent
import com.xty.common.util.CommonToastUtils
import com.xty.common.util.PermissionUtils
import com.xty.common.xqr_code.XQRCodeAct
import com.xuexiang.xqrcode.XQRCode
import com.yanzhenjie.permission.runtime.Permission
import com.zj365.dc.databinding.ActBinderDeviceOneKeyBinding
import com.zj365.dc.model.ScanInfoBean
import com.zj365.dc.vm.OneKeyBinderDeviceVm
import com.zj365.health.R
import org.greenrobot.eventbus.EventBus
@Route(path = ARouterUrl.DEVICE_ACTIVE)
@ -52,21 +54,15 @@ class OneKeyBinderDeviceAct : BaseVmAct<OneKeyBinderDeviceVm>() {
}
private fun startScan() {
PermissionHelper.requestPermission(PermissionHelper.PERMISSION_CAMERA, object :
PermissionHelper.PermissionCallback {
override fun onGranted() {
// XQRCode.startScan(this@DeviceActiveAct, QRCODE_AGREEMENT)
XQRCodeAct.start(
this@OneKeyBinderDeviceAct,
XQRCodeAct.QRCODE_AGREEMENT,
com.zj365.health.R.style.XQRCodeTheme_Custom
)
}
override fun onDenied() {
}
})
PermissionUtils.requestPermission(this,
{
XQRCodeAct.start(
this@OneKeyBinderDeviceAct,
XQRCodeAct.QRCODE_AGREEMENT,
com.zj365.health.R.style.XQRCodeTheme_Custom
)
}, Permission.CAMERA)
}
override fun setLayout() = binding.root

1
app/src/main/java/com/zj365/dc/activity/RegisterAct.kt
Unescape Escape View File

@ -14,7 +14,6 @@ import com.alibaba.android.arouter.facade.annotation.Route
import com.google.gson.Gson
import com.tamsiree.rxkit.RxActivityTool
import com.tamsiree.rxkit.RxKeyboardTool
import com.tencent.qcloud.tuikit.tuichat.util.PermissionHelper
import com.xty.base.act.BaseVmAct
import com.xty.common.Const
import com.xty.common.LogUtils

1
app/src/main/java/com/zj365/dc/adapter/RecognizeResultAdapter.kt
Unescape Escape View File

@ -2,7 +2,6 @@ package com.zj365.dc.adapter
import android.widget.ImageView
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.setImage
import com.xty.network.model.FoodRecoginzeInfo

47
app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt
Unescape Escape View File

@ -51,8 +51,10 @@ import com.xty.common.onEventObject
import com.xty.common.setImageUser
import com.xty.common.util.CommonToastUtils
import com.xty.common.util.CommonUtils
import com.xty.common.util.PermissionUtils
import com.xty.common.weight.CenterImageSpan
import com.xty.common.work.MyWorkManger
import com.xty.common.xqr_code.XQRCodeAct
import com.zj365.mime.weight.NoticeSettingDialog
import com.xty.network.MyRetrofit
import com.xty.network.model.FamilyBean
@ -60,6 +62,7 @@ import com.xty.network.model.HealthMonitoringListBean
import com.xty.network.model.MainBean
import com.xty.network.model.MessageBean
import com.xty.network.model.ReportBean
import com.yanzhenjie.permission.runtime.Permission
import com.zj365.dc.BuildConfig
import com.zj365.dc.R
import com.zj365.dc.activity.MainActivity
@ -79,7 +82,6 @@ import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
import org.json.JSONArray
import org.json.JSONObject
import pub.devrel.easypermissions.EasyPermissions
import java.text.SimpleDateFormat
import java.util.regex.Matcher
import java.util.regex.Pattern
@ -89,7 +91,7 @@ import kotlin.math.min
/**
* 动态管理页面
*/
class DynamicManagementFrag : BaseVmFrag<DynamicManagementVm>() , EasyPermissions.PermissionCallbacks{
class DynamicManagementFrag : BaseVmFrag<DynamicManagementVm>(){
val binding by lazy { FragDynamicManagementBinding.inflate(layoutInflater) }
override fun setLayout(): View = binding.root
@ -521,23 +523,20 @@ class DynamicManagementFrag : BaseVmFrag<DynamicManagementVm>() , EasyPermission
if (showIdInfo == ""){
}else{
if(EasyPermissions.hasPermissions(requireContext(), Manifest.permission.ACCESS_COARSE_LOCATION,
Manifest.permission.ACCESS_FINE_LOCATION)) {
AmapInit.startLocation(requireContext()) {
LogUtils.e("DynamicManagementFrag","${it.city}")
MMkvHelper.put(Const.LONGITUDE,it.longitude)
MMkvHelper.put(Const.LATITUDE,it.latitude)
MMkvHelper.put(Const.PROVINCE,it.province)
MMkvHelper.put(Const.CITY,it.city)
MMkvHelper.put(Const.DISTRICT,it.district)
mViewModel.getWeather()
PermissionUtils.requestPermission(requireContext(),
{
AmapInit.startLocation(requireContext()) {
LogUtils.e("DynamicManagementFrag","${it.city}")
MMkvHelper.put(Const.LONGITUDE,it.longitude)
MMkvHelper.put(Const.LATITUDE,it.latitude)
MMkvHelper.put(Const.PROVINCE,it.province)
MMkvHelper.put(Const.CITY,it.city)
MMkvHelper.put(Const.DISTRICT,it.district)
mViewModel.getWeather()
}
}, Permission.ACCESS_COARSE_LOCATION,Permission.ACCESS_FINE_LOCATION)
}
}else{
EasyPermissions.requestPermissions(this,"获取天气信息需要申请定位权限",
0x00022,
Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION);
}
}
}
@ -1526,18 +1525,6 @@ class DynamicManagementFrag : BaseVmFrag<DynamicManagementVm>() , EasyPermission
}
override fun onPermissionsGranted(requestCode: Int, perms: MutableList<String>) {
AmapInit.startLocation(requireContext()) {
MMkvHelper.put(Const.LONGITUDE,it.longitude)
MMkvHelper.put(Const.LATITUDE,it.latitude)
mViewModel.getWeather()
}
}
override fun onPermissionsDenied(requestCode: Int, perms: MutableList<String>) {
}
@Subscribe(threadMode = ThreadMode.MAIN)
fun addSuccess(event: AddSuccessEvent){
request()

6
app/src/main/java/com/zj365/dc/fragment/MessageFragment.kt
Unescape Escape View File

@ -5,8 +5,8 @@ import android.graphics.Color
import android.view.View
import androidx.localbroadcastmanager.content.LocalBroadcastManager
import androidx.recyclerview.widget.LinearLayoutManager
import com.tencent.qcloud.tuicore.TUIConstants
import com.xty.base.fragment.BaseFragList
import com.xty.common.Const
import com.xty.common.R
import com.xty.common.arouter.ARouterUrl
import com.xty.common.arouter.RouteManager
@ -108,8 +108,8 @@ class MessageFragment : BaseFragList<MessageVm>() {
mViewModel.msgData.observe(this){
adapter.setNewInstance(it.data.list)
val intent = Intent()
intent.action = TUIConstants.CONVERSATION_UNREAD_COUNT_ACTION
intent.putExtra(TUIConstants.UNREAD_COUNT_EXTRA, it.data.unReadCount)
intent.action = Const.CONVERSATION_UNREAD_COUNT_ACTION
intent.putExtra(Const.UNREAD_COUNT_EXTRA, it.data.unReadCount)
LocalBroadcastManager.getInstance(requireContext())
.sendBroadcast(intent)
}

23
app/src/main/java/com/zj365/dc/fragment/MineFrag.kt
Unescape Escape View File

@ -19,9 +19,11 @@ import com.xty.common.event.LoginOutEvent
import com.xty.common.event.MyInfoEvent
import com.xty.common.util.CommonToastUtils
import com.xty.common.util.CommonUtils
import com.xty.common.util.PermissionUtils
import com.xty.network.model.InviteCustodyBean
import com.xty.network.model.SettingBean
import com.yanzhenjie.permission.runtime.Permission
import com.zj365.dc.BuildConfig
import com.zj365.dc.activity.MainActivity
import com.zj365.dc.databinding.FragMineBinding
@ -33,14 +35,13 @@ import com.zj365.mime.vm.SettingVm
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
import pub.devrel.easypermissions.EasyPermissions
/**
** 我的
*/
class MineFrag : BaseVmFrag<SettingVm>(),EasyPermissions.PermissionCallbacks {
class MineFrag : BaseVmFrag<SettingVm>() {
private val binding by lazy { FragMineBinding.inflate(layoutInflater) }
@ -359,15 +360,12 @@ class MineFrag : BaseVmFrag<SettingVm>(),EasyPermissions.PermissionCallbacks {
}
binding.llCustomerService.setOnClickListener {
if(EasyPermissions.hasPermissions(requireContext(), Manifest.permission.CALL_PHONE)){
startActivity(Intent(Intent.ACTION_CALL, Uri.parse("tel:4000063365")))
}else{
EasyPermissions.requestPermissions(this,"申请打电话权限",
DevInfoAct.perssionCode,
Manifest.permission.CALL_PHONE);
PermissionUtils.requestPermission(requireContext(),
{
startActivity(Intent(Intent.ACTION_CALL, Uri.parse("tel:4000063365")))
}
}, Permission.CALL_PHONE)
}
}
@ -546,11 +544,4 @@ class MineFrag : BaseVmFrag<SettingVm>(),EasyPermissions.PermissionCallbacks {
binding.mImage.setImageResource(defaultIcon[0])
}
override fun onPermissionsGranted(requestCode: Int, perms: MutableList<String>) {
startActivity(Intent(Intent.ACTION_CALL, Uri.parse("tel:4000063365")))
}
override fun onPermissionsDenied(requestCode: Int, perms: MutableList<String>) {
}
}

5
common/build.gradle
Unescape Escape View File

@ -94,17 +94,16 @@ dependencies {
kapt rely.RWidgetHelper
kapt rely.AndroidGifDrawable
api project(':tuiconversation')
/* api project(':tuiconversation')
api project(':tuicontact')
api project(':tuichat')
api project(':tuigroup')
api project(':tuiofflinepush')
api project(':tuiofflinepush')*/
api 'com.liulishuo.filedownloader:library:1.7.7'
api 'com.google.zxing:core:3.3.3'
api 'com.github.maning0303:MNZXingCode:V2.1.9'
api 'pub.devrel:easypermissions:3.0.0'
api 'com.alipay.sdk:alipaysdk-android:+@aar'
api 'me.chunyu.call_kit:call_kit:2.0.1'

3
common/src/main/java/com/xty/common/Const.kt
Unescape Escape View File

@ -135,6 +135,9 @@ class Const {
const val DISTRICT ="district" //区
var DeviceIdNum : String = ""
const val CONVERSATION_UNREAD_COUNT_ACTION = "conversation_unread_count_action"
const val UNREAD_COUNT_EXTRA = "unread_count_extra"
// const val userName = "User_Name"
// const val userBean = "UserUser"
}

4
common/src/main/java/com/xty/common/util/PermissionUtils.java
Unescape Escape View File

@ -137,8 +137,6 @@ public class PermissionUtils {
/**
* @description：默认权限设置提示dialog
* @author： 张慧彪
* @time 18-7-26 下午2:15
**/
public final static class DefaultRationale implements Rationale<List<String>> {
@ -158,8 +156,6 @@ public class PermissionUtils {
/**
* @description：权限设置dialog
* @author： 张慧彪
* @time 18-7-26 下午2:14
**/
public final static class PermissionSetting {

1
common/src/main/res/values/colors.xml
Unescape Escape View File

@ -23,6 +23,7 @@
<color name="col_19a">#19A9B2</color>
<color name="col_edf">#EDF1F1</color>
<color name="col_76e">#76EEED</color>
<color name="transparent">>#00000000</color>
<color name="transparent_50">#80000000</color>
<color name="start_col">#13A2AE</color>
<color name="end_col">#32C6C3</color>

1
common/src/main/res/values/strings.xml
Unescape Escape View File

@ -555,6 +555,7 @@
<string name="message_permission_always_failed">我们需要以下权限，请在设置中为我们开启：\n\n%1$s</string>
<string name="resume">继续</string>
<string name="no">否</string>
<string name="setting">设置中</string>
<string name="prev_title">中健三六五用户个人信息保护指引</string>

61
mine/src/main/java/com/zj365/mime/act/BaseInfoChangeAct.kt
Unescape Escape View File

@ -18,7 +18,6 @@ import com.mylhyl.acp.AcpListener
import com.mylhyl.acp.AcpOptions
import com.tamsiree.rxkit.RxKeyboardTool
import com.tamsiree.rxkit.RxRegTool
import com.tencent.qcloud.tuikit.tuichat.util.PermissionHelper
import com.xty.base.act.BaseVmAct
import com.xty.base.weight.GpsToastDialog
import com.xty.base.weight.TipDialog
@ -36,17 +35,17 @@ import com.xty.common.picture.PictureUtils
import com.xty.common.setImage
import com.xty.common.setImageUser
import com.xty.common.util.CommonToastUtils
import com.xty.common.util.CommonUtils
import com.xty.common.util.GetJsonDataUtil
import com.xty.common.util.JsonBean
import com.xty.common.util.PermissionUtils
import com.xty.common.weight.AreaSelectDialog
import com.yanzhenjie.permission.runtime.Permission
import com.zj365.mime.R
import com.zj365.mime.databinding.ActBaseInfoChangeBinding
import com.zj365.mime.vm.BaseInfoVm
import org.greenrobot.eventbus.EventBus
import org.json.JSONArray
import org.json.JSONObject
import pub.devrel.easypermissions.EasyPermissions
import java.util.regex.Pattern
/**
@ -159,16 +158,8 @@ class BaseInfoChangeAct : BaseVmAct<BaseInfoVm>() {
binding.title.mIvBack.setOnClickListener { finish() }
timeSelect.startDate?.set(1922, 0, 1)
binding.mImage.setOnClickListener {
PermissionHelper.requestPermission(PermissionHelper.PERMISSION_CAMERA, object :
PermissionHelper.PermissionCallback {
override fun onGranted() {
PictureUtils.openCamera(this@BaseInfoChangeAct)
}
override fun onDenied() {
}
})
PermissionUtils.requestPermission(this,
{ PictureUtils.openCamera(this@BaseInfoChangeAct) }, Permission.CAMERA)
}
@ -636,30 +627,28 @@ class BaseInfoChangeAct : BaseVmAct<BaseInfoVm>() {
binding.mArea.text = "$open_province $open_city $open_area"
}else{
if(EasyPermissions.hasPermissions(this, Manifest.permission.ACCESS_COARSE_LOCATION,
Manifest.permission.ACCESS_FINE_LOCATION)) {
AmapInit.startLocation(this) {
LogUtils.e("DynamicManagementFrag","${it.city}")
MMkvHelper.put(Const.LONGITUDE,it.longitude)
MMkvHelper.put(Const.LATITUDE,it.latitude)
MMkvHelper.put(Const.PROVINCE,it.province)
MMkvHelper.put(Const.CITY,it.city)
MMkvHelper.put(Const.DISTRICT,it.district)
open_province = MMkvHelper.getString(Const.PROVINCE) //表示省
provincey = MMkvHelper.getString(Const.PROVINCE) //表示省
open_city =MMkvHelper.getString(Const.CITY) //市
city = MMkvHelper.getString(Const.CITY) //市
open_area = MMkvHelper.getString(Const.DISTRICT) //区
district = MMkvHelper.getString(Const.DISTRICT) //区
binding.mArea.text = "$open_province $open_city $open_area"
}
}else{
EasyPermissions.requestPermissions(this,"申请定位权限",
0x00022,
Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION);
}
PermissionUtils.requestPermission(this,
{
AmapInit.startLocation(this) {
LogUtils.e("DynamicManagementFrag","${it.city}")
MMkvHelper.put(Const.LONGITUDE,it.longitude)
MMkvHelper.put(Const.LATITUDE,it.latitude)
MMkvHelper.put(Const.PROVINCE,it.province)
MMkvHelper.put(Const.CITY,it.city)
MMkvHelper.put(Const.DISTRICT,it.district)
open_province = MMkvHelper.getString(Const.PROVINCE) //表示省
provincey = MMkvHelper.getString(Const.PROVINCE) //表示省
open_city =MMkvHelper.getString(Const.CITY) //市
city = MMkvHelper.getString(Const.CITY) //市
open_area = MMkvHelper.getString(Const.DISTRICT) //区
district = MMkvHelper.getString(Const.DISTRICT) //区
binding.mArea.text = "$open_province $open_city $open_area"
}
}, *Permission.Group.LOCATION)
}
}

23
mine/src/main/java/com/zj365/mime/act/DevInfoAct.kt
Unescape Escape View File

@ -13,16 +13,20 @@ import androidx.core.content.ContextCompat
import com.alibaba.android.arouter.facade.annotation.Route
import com.xty.base.act.BaseVmAct
import com.xty.common.Const
import com.xty.common.LogUtils
import com.xty.common.MMkvHelper
import com.xty.common.MyLinkedMovementMethod
import com.xty.common.aMapUtils.AmapInit
import com.xty.common.arouter.ARouterUrl
import com.xty.common.arouter.RouteManager
import com.xty.common.bracelet.YCBBlueConnectHelper
import com.xty.common.event.BlueToothConnectEvent
import com.xty.common.event.MyInfoEvent
import com.xty.common.event.ReChangeEvent
import com.xty.common.util.PermissionUtils
import com.xty.network.MyRetrofit
import com.xty.network.model.SettingBean
import com.yanzhenjie.permission.runtime.Permission
import com.zj365.mime.BuildConfig
import com.zj365.mime.R
import com.zj365.mime.databinding.ActDevInfoBinding
@ -31,14 +35,13 @@ import com.zj365.mime.weight.FactorySettingDialog
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
import pub.devrel.easypermissions.EasyPermissions
/**
* 设备解绑 设备信息
*/
@Route(path = ARouterUrl.DEV_INFO)
class DevInfoAct : BaseVmAct<SettingVm>(),EasyPermissions.PermissionCallbacks {
class DevInfoAct : BaseVmAct<SettingVm>() {
val binding by lazy { ActDevInfoBinding.inflate(layoutInflater) }
override fun setLayout() = binding.root
@ -104,13 +107,12 @@ class DevInfoAct : BaseVmAct<SettingVm>(),EasyPermissions.PermissionCallbacks {
span.setSpan(object : ClickableSpan() {
override fun onClick(widget: View) {
if(EasyPermissions.hasPermissions(this@DevInfoAct,Manifest.permission.CALL_PHONE)){
startActivity(Intent(Intent.ACTION_CALL, Uri.parse("tel:4000063365")))
PermissionUtils.requestPermission(this@DevInfoAct,
{
startActivity(Intent(Intent.ACTION_CALL, Uri.parse("tel:4000063365")))
}else{
EasyPermissions.requestPermissions(this@DevInfoAct,"申请打电话权限",perssionCode,Manifest.permission.CALL_PHONE);
}, Permission.CALL_PHONE)
}
}
override fun updateDrawState(ds: TextPaint) {
@ -194,13 +196,6 @@ class DevInfoAct : BaseVmAct<SettingVm>(),EasyPermissions.PermissionCallbacks {
}
}
override fun onPermissionsGranted(requestCode: Int, perms: MutableList<String>) {
startActivity(Intent(Intent.ACTION_CALL, Uri.parse("tel:4000063365")))
}
override fun onPermissionsDenied(requestCode: Int, perms: MutableList<String>) {
}
@Subscribe(threadMode = ThreadMode.MAIN)
fun refreshUI(event: ReChangeEvent){
user?.let {

46
mine/src/main/java/com/zj365/mime/act/InviteFriendsAct.kt
Unescape Escape View File

@ -5,20 +5,20 @@ import android.view.View
import androidx.core.view.isVisible
import com.alibaba.android.arouter.facade.annotation.Route
import com.google.zxing.client.android.utils.ZXingUtils
import com.tencent.qcloud.tuikit.tuichat.util.PermissionHelper
import com.xty.base.act.BaseVmAct
import com.xty.common.BuildConfig
import com.xty.common.arouter.ARouterUrl
import com.xty.common.arouter.RouteManager
import com.xty.common.setImageUser
import com.xty.common.util.CommonUtils
import com.xty.common.util.PermissionUtils
import com.xty.common.util.ViewScreenshotUtils
import com.xty.network.model.SettingBean
import com.yanzhenjie.permission.runtime.Permission
import com.zj365.mime.R
import com.zj365.mime.databinding.ActInviteFriendsBinding
import com.zj365.mime.vm.InviteFriendsVm
import com.zj365.mime.weight.InviteFriendShareDialog
import com.xty.network.model.SettingBean
import com.xuexiang.xqrcode.XQRCode
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
@ -142,37 +142,25 @@ class InviteFriendsAct : BaseVmAct<InviteFriendsVm>() {
//保存图片
binding.styleOne.tvSave.setOnClickListener {
mainScope.launch(Dispatchers.IO) {
PermissionHelper.requestPermission(PermissionHelper.PERMISSION_STORAGE,
object : PermissionHelper.PermissionCallback {
override fun onGranted() {
ViewScreenshotUtils.viewSaveToImage(
binding.styleOne.clOneSave,
this@InviteFriendsAct
)
}
override fun onDenied() {
}
}
)
PermissionUtils.requestPermission(this@InviteFriendsAct,
{ViewScreenshotUtils.viewSaveToImage(
binding.styleOne.clOneSave,
this@InviteFriendsAct
)}, Permission.READ_EXTERNAL_STORAGE, Permission.WRITE_EXTERNAL_STORAGE)
}
}
binding.styleTwo.tvSave.setOnClickListener {
mainScope.launch(Dispatchers.IO) {
PermissionHelper.requestPermission(PermissionHelper.PERMISSION_STORAGE,
object : PermissionHelper.PermissionCallback {
override fun onGranted() {
ViewScreenshotUtils.viewSaveToImage(
binding.styleTwo.clTwoSave,
this@InviteFriendsAct
)
}
override fun onDenied() {
}
}
)
PermissionUtils.requestPermission(this@InviteFriendsAct,
{ViewScreenshotUtils.viewSaveToImage(
binding.styleOne.clOneSave,
this@InviteFriendsAct
)}, Permission.READ_EXTERNAL_STORAGE, Permission.WRITE_EXTERNAL_STORAGE)
}
}

5
mine/src/main/java/com/zj365/mime/act/MyKeeperAct.kt
Unescape Escape View File

@ -2,7 +2,6 @@ package com.zj365.mime.act
import android.view.View
import com.alibaba.android.arouter.facade.annotation.Route
import com.tencent.qcloud.tuikit.tuiconversation.classicui.util.TUIConversationUtils
import com.xty.base.act.BaseVmAct
import com.xty.common.arouter.ARouterUrl
import com.xty.common.arouter.RouteManager
@ -67,11 +66,11 @@ class MyKeeperAct : BaseVmAct<MyKeeperVm>() {
)
}
binding.llLeft.setOnClickListener { itt ->
TUIConversationUtils.startAYSingleChatActivity(
/* TUIConversationUtils.startAYSingleChatActivity(
"man_" + it.data[0].id,
it.data[0].realname,
it.data[0].avatar
);
);*/
}

24
mine/src/main/java/com/zj365/mime/act/MyOrganAct.kt
Unescape Escape View File

@ -4,19 +4,21 @@ 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.base.weight.TipDialog
import com.xty.common.Const
import com.xty.common.LogUtils
import com.xty.common.arouter.ARouterUrl
import com.xty.common.picture.PictureUtils
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.mime.R
import com.zj365.mime.databinding.ActMyOrganBinding
import com.zj365.mime.vm.MyOrganVm
import com.xuexiang.xqrcode.XQRCode
import com.yanzhenjie.permission.runtime.Permission
/**
* 我的机构
@ -99,21 +101,13 @@ class MyOrganAct: BaseVmAct<MyOrganVm>() {
}
private fun startScan() {
PermissionHelper.requestPermission(PermissionHelper.PERMISSION_CAMERA,object :
PermissionHelper.PermissionCallback {
override fun onGranted() {
// XQRCode.startScan(this@MyOrganAct, QRCODE_AGREEMENT)
XQRCodeAct.start(
this@MyOrganAct,
QRCODE_AGREEMENT,
R.style.XQRCodeTheme_Custom
)
}
override fun onDenied() {
}
PermissionUtils.requestPermission(this,
{ XQRCodeAct.start(
this@MyOrganAct,
QRCODE_AGREEMENT,
R.style.XQRCodeTheme_Custom
) }, Permission.CAMERA)
})
}
override fun liveObserver() {

3
server/src/main/java/com/xty/server/act/HousekeepInfoAct.kt
Unescape Escape View File

@ -1,7 +1,6 @@
package com.xty.server.act
import com.alibaba.android.arouter.facade.annotation.Route
import com.tencent.qcloud.tuikit.tuiconversation.classicui.util.TUIConversationUtils
import com.xty.base.act.IBaseAct
import com.xty.common.R
import com.xty.common.TextUtils
@ -53,7 +52,7 @@ class HousekeepInfoAct: IBaseAct() {
)
}
binding.llLeft.setOnClickListener {
TUIConversationUtils.startAYSingleChatActivity("man_"+it1.id, it1.realname, it1.avatar);
// TUIConversationUtils.startAYSingleChatActivity("man_"+it1.id, it1.realname, it1.avatar);
}
}

4
settings.gradle
Unescape Escape View File

@ -11,7 +11,7 @@ include ':mine'
include ':server'
// 引入内部组件通信模块 (必要模块)
include ':tuicore'
/*include ':tuicore'
project(':tuicore').projectDir = new File(settingsDir, '../TUIKit/TUICore/tuicore')
// 引入 IM 组件公共模块（必要模块）
@ -45,4 +45,4 @@ project(':tuigroup').projectDir = new File(settingsDir, '../TUIKit/TUIGroup/tuig
// 引入离线推送功能模块
include ':tuiofflinepush'
project(':tuiofflinepush').projectDir = new File(settingsDir, '../TUIKit/TUIOfflinePush/tuiofflinepush')
project(':tuiofflinepush').projectDir = new File(settingsDir, '../TUIKit/TUIOfflinePush/tuiofflinepush')*/

Write Preview
Loading…
Cancel
Save