From 332b7e2cef976efd90a952b2b8033f92bd367eb0 Mon Sep 17 00:00:00 2001 From: huangjian Date: Mon, 27 Sep 2021 15:47:21 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E6=88=90=E5=A4=B4=E6=9D=A1=E5=88=86?= =?UTF-8?q?=E5=8C=85SDK?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 ++ app/libs/humesdk-1.0.0.aar | Bin 0 -> 7527 bytes .../erban/application/XChatApplication.java | 24 ++++++++++++------ .../utils/config/BasicConfig.java | 14 ++++++++-- 4 files changed, 30 insertions(+), 10 deletions(-) create mode 100644 app/libs/humesdk-1.0.0.aar diff --git a/app/build.gradle b/app/build.gradle index 044b0d9e2..58c3dd1d2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -295,6 +295,8 @@ dependencies { implementation project(path: ':flutter_boost') implementation 'me.jessyan:autosize:1.2.1' + + implementation files('libs/humesdk-1.0.0.aar') } repositories { diff --git a/app/libs/humesdk-1.0.0.aar b/app/libs/humesdk-1.0.0.aar new file mode 100644 index 0000000000000000000000000000000000000000..2db40915dcf76bffe307b34f148f8aabfac24262 GIT binary patch literal 7527 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 C*F?Dh literal 0 HcmV?d00001 diff --git a/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java b/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java index 5873182d8..3ba630029 100644 --- a/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java +++ b/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java @@ -24,6 +24,7 @@ import com.alibaba.security.realidentity.activity.RPTakePhotoActivity; import com.alibaba.security.realidentity.activity.RPWebViewActivity; import com.alibaba.security.rp.RPSDK; import com.bumptech.glide.request.target.ViewTarget; +import com.bytedance.hume.readapk.HumeSDK; import com.coorchice.library.utils.LogUtils; import com.huawei.hms.support.common.ActivityMgr; import com.idlefish.flutterboost.FlutterBoost; @@ -171,7 +172,7 @@ public class XChatApplication extends Application { long startTime = System.currentTimeMillis(); super.onCreate(); instance = this; - String channel = "official"; + String channel = ""; try { ApplicationInfo appInfo = getPackageManager().getApplicationInfo(getPackageName(), PackageManager.GET_META_DATA); channel = appInfo.metaData.getString("CHANNEL"); @@ -181,8 +182,20 @@ public class XChatApplication extends Application { if (TextUtils.isEmpty(channel)) { channel = "official"; } + + BasicConfig.INSTANCE.setOriginalChannel(channel); + + //头条分包渠道 + if (BasicConfig.INSTANCE.isByteDanceChannel()) { + String byteDanceChannel = HumeSDK.getChannel(this); + if (!TextUtils.isEmpty(byteDanceChannel)) { + channel = byteDanceChannel; + } + } + BasicConfig.INSTANCE.setChannel(channel); + LogUtils.d(channel + ""); - initEnv(channel); + initEnv(); //延迟初始化云信 NIMClient.init(this, null, options()); @@ -315,24 +328,19 @@ public class XChatApplication extends Application { LinkedME.getInstance().setHandleActivity(MiddleActivity.class.getName()); } - private void initEnv(String channel) { + private void initEnv() { BasicConfig.INSTANCE.setAppContext(this.getApplicationContext()); //首先初始化环境 Env.initEnv(BuildConfig.BUILD_TYPE, BuildConfig.DEBUG); - //切换生产坏境和测试环境 true/测试环境 false/生产环境 BasicConfig.INSTANCE.setDebuggable(Env.isDebug()); - BasicConfig.INSTANCE.setChannel(channel); - BasicConfig.INSTANCE.setRootDir(Constants.ERBAN_DIR_NAME); BasicConfig.INSTANCE.setLogDir(Constants.LOG_DIR); BasicConfig.INSTANCE.setConfigDir(Constants.CONFIG_DIR); BasicConfig.INSTANCE.setVoiceDir(Constants.VOICE_DIR); BasicConfig.INSTANCE.setCacheDir(Constants.CACHE_DIR); BasicConfig.INSTANCE.setImageDir(Constants.IMAGE_CACHE_DIR); - - } diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/config/BasicConfig.java b/library/src/main/java/com/yizhuan/xchat_android_library/utils/config/BasicConfig.java index db73177a8..820eb64a5 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/config/BasicConfig.java +++ b/library/src/main/java/com/yizhuan/xchat_android_library/utils/config/BasicConfig.java @@ -29,6 +29,8 @@ public enum BasicConfig { private File mCacheDir; private File mVoiceDir; private String channel; + //apk的原始渠道,用于判断是不是头条,快手等渠道 + private String originalChannel; /*是否是审查中*/ private boolean isCheck; @@ -85,12 +87,20 @@ public enum BasicConfig { return channel; } + public String getOriginalChannel() { + return originalChannel; + } + + public void setOriginalChannel(String originalChannel) { + this.originalChannel = originalChannel; + } + public boolean isByteDanceChannel() { - return !TextUtils.isEmpty(channel) && channel.contains("toutiao"); + return !TextUtils.isEmpty(originalChannel) && originalChannel.contains("toutiao"); } public boolean isKwaiChannel() { - return !TextUtils.isEmpty(channel) && channel.contains("kuaishou"); + return !TextUtils.isEmpty(originalChannel) && originalChannel.contains("kuaishou"); } /**