diff --git a/app/build.gradle b/app/build.gradle index 3f6f5916..ea9d1a71 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -216,7 +216,7 @@ dependencies { implementation 'com.zzhoujay.richtext:richtext:3.0.8' //美团多渠道打包 - implementation 'com.meituan.android.walle:library:1.1.6' + //implementation 'com.meituan.android.walle:library:1.1.6' api("androidx.work:work-multiprocess:2.7.1") api("androidx.work:work-runtime-ktx:2.7.1") @@ -250,7 +250,7 @@ dependencies { testImplementation "androidx.paging:paging-common-ktx:$paging_version" //权限请求框架:https://github.com/getActivity/XXPermissions - implementation 'com.github.getActivity:XXPermissions:15.0' + implementation 'com.github.getActivity:XXPermissions:16.2' def mail_version = '1.6.7' implementation "com.sun.mail:android-mail:$mail_version" @@ -267,6 +267,6 @@ dependencies { //自动添加X-Library依赖 apply from: 'x-library.gradle' //walle多渠道打包 -apply from: 'multiple-channel.gradle' +//apply from: 'multiple-channel.gradle' diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/sdkinit/UMengInit.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/sdkinit/UMengInit.kt index d82a4b77..ee5898c9 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/sdkinit/UMengInit.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/sdkinit/UMengInit.kt @@ -4,7 +4,7 @@ import android.app.Application import android.content.Context import com.idormy.sms.forwarder.BuildConfig import com.idormy.sms.forwarder.utils.SettingUtils.Companion.isAgreePrivacy -import com.meituan.android.walle.WalleChannelReader +//import com.meituan.android.walle.WalleChannelReader import com.umeng.analytics.MobclickAgent import com.umeng.commonsdk.UMConfigure import com.xuexiang.xui.XUI @@ -79,7 +79,8 @@ class UMengInit private constructor() { * @return */ private fun getChannel(context: Context?): String? { - return WalleChannelReader.getChannel(context!!, DEFAULT_CHANNEL_ID) + //return WalleChannelReader.getChannel(context!!, DEFAULT_CHANNEL_ID) + return DEFAULT_CHANNEL_ID } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6e48cf9e..8a2fab25 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -649,7 +649,7 @@ No --- 刷新 - 请确认应用权限【获取手机信息】为【始终允许】 + 请确认应用权限【获取手机信息】为【始终允许】或手动填写 未获取到卡槽%s中的SIM卡信息 添加 检查更新