diff --git a/app/build.gradle b/app/build.gradle index f007e17f1..94c0600be 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -297,14 +297,14 @@ android.applicationVariants.all { variant -> print("variant.name=" + variant.name) if (variant.name.contains("release") || variant.name.contains("Release")) { androidJunkCode.configMap.put(variant.name, { - packageBase = "com.nnbc123.plugin.ui" //生成java类根包名 + packageBase = "app.yinm.plugin.ui" //生成java类根包名 packageCount = 30 //生成包数量 activityCountPerPackage = 30 //每个包下生成Activity类数量 excludeActivityJavaFile = false //是否排除生成Activity的Java文件,默认false(layout和写入AndroidManifest.xml还会执行)，主要用于处理类似神策全埋点编译过慢问题 otherCountPerPackage = 50 //每个包下生成其它类的数量 methodCountPerClass = 20 //每个类下生成方法数量 - resPrefix = "mango_" //生成的layout、drawable、string等资源名前缀 + resPrefix = "yinmchat_" //生成的layout、drawable、string等资源名前缀 drawableCount = 300 //生成drawable资源数量 stringCount = 300 //生成string数量 }) diff --git a/app/src/main/java/com/nnbc123/app/application/XChatApplication.java b/app/src/main/java/com/nnbc123/app/application/XChatApplication.java index 929ad6ec7..12cfc3777 100644 --- a/app/src/main/java/com/nnbc123/app/application/XChatApplication.java +++ b/app/src/main/java/com/nnbc123/app/application/XChatApplication.java @@ -1,15 +1,5 @@ package com.nnbc123.app.application; -import static com.nnbc123.xchat_android_constants.XChatConstants.HW_APP_ID; -import static com.nnbc123.xchat_android_constants.XChatConstants.HW_CERTIFICATE_NAME; -import static com.nnbc123.xchat_android_constants.XChatConstants.OPPO_APP_ID; -import static com.nnbc123.xchat_android_constants.XChatConstants.OPPO_APP_KEY; -import static com.nnbc123.xchat_android_constants.XChatConstants.OPPO_CERTIFICATE_NAME; -import static com.nnbc123.xchat_android_constants.XChatConstants.OPPO_SECRET; -import static com.nnbc123.xchat_android_constants.XChatConstants.VIVO_CERTIFICATE_NAME; -import static com.nnbc123.xchat_android_constants.XChatConstants.XM_APP_ID; -import static com.nnbc123.xchat_android_constants.XChatConstants.XM_APP_KEY; -import static com.nnbc123.xchat_android_constants.XChatConstants.XM_CERTIFICATE_NAME; import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_OPEN_ROOM_NOTI; import android.annotation.SuppressLint; @@ -396,21 +386,6 @@ public class XChatApplication extends BaseApp { DemoCache.setNotificationConfig(config); MixPushConfig mixPushConfig = new MixPushConfig(); - //华为推送 - mixPushConfig.hwAppId = HW_APP_ID; - mixPushConfig.hwCertificateName = HW_CERTIFICATE_NAME; - //小米推送 - mixPushConfig.xmAppId = XM_APP_ID; - mixPushConfig.xmAppKey = XM_APP_KEY; - mixPushConfig.xmCertificateName = XM_CERTIFICATE_NAME; - - //vivo推送 - mixPushConfig.vivoCertificateName = VIVO_CERTIFICATE_NAME; - //oppo推送 - mixPushConfig.oppoAppId = OPPO_APP_ID; - mixPushConfig.oppoAppKey = OPPO_APP_KEY; - mixPushConfig.oppoAppSercet = OPPO_SECRET; - mixPushConfig.oppoCertificateName = OPPO_CERTIFICATE_NAME; options.mixPushConfig = mixPushConfig; return options; diff --git a/app/src/main/java/com/nnbc123/app/avroom/game/AppConfig.java b/app/src/main/java/com/nnbc123/app/avroom/game/AppConfig.java index 3130b6ba4..10d130ffd 100644 --- a/app/src/main/java/com/nnbc123/app/avroom/game/AppConfig.java +++ b/app/src/main/java/com/nnbc123/app/avroom/game/AppConfig.java @@ -8,8 +8,8 @@ import com.nnbc123.app.BuildConfig; public class AppConfig { - protected static final String APP_ID = "1735573973195948033"; - protected static final String APP_KEY = "r23OylNqnjOBPM0SDgVBfq6RCKMWAc0X"; + protected static final String APP_ID = "1746741906623631362"; + protected static final String APP_KEY = "L5WQjy0Xg2fcN0DhIig78qt0cPCMnS9W"; protected static boolean isTestEnv = BuildConfig.DEBUG; } diff --git a/core/src/diff_src_erban/java/com/nnbc123/core/manager/trtc/SDKConfig.java b/core/src/diff_src_erban/java/com/nnbc123/core/manager/trtc/SDKConfig.java index 6f2275850..0350d7c9d 100644 --- a/core/src/diff_src_erban/java/com/nnbc123/core/manager/trtc/SDKConfig.java +++ b/core/src/diff_src_erban/java/com/nnbc123/core/manager/trtc/SDKConfig.java @@ -11,7 +11,7 @@ public class SDKConfig { * 进入腾讯云云通信[控制台](https://console.cloud.tencent.com/avc) 创建应用，即可看到 SDKAppId， * 它是腾讯云用于区分客户的唯一标识。 */ - public static int TX_SDKAPPID = 1400798783;// + public static int TX_SDKAPPID = 1600020320;// /** * 腾讯云 bizid和appid diff --git a/core/src/diff_src_erban/java/com/nnbc123/xchat_android_constants/XChatConstants.java b/core/src/diff_src_erban/java/com/nnbc123/xchat_android_constants/XChatConstants.java index 4858e18e2..150a8953c 100644 --- a/core/src/diff_src_erban/java/com/nnbc123/xchat_android_constants/XChatConstants.java +++ b/core/src/diff_src_erban/java/com/nnbc123/xchat_android_constants/XChatConstants.java @@ -11,7 +11,7 @@ public class XChatConstants { /** * 包名(各种缓存目录的根目录) */ - public static final String XCHAT_DIR_NAME = "com.nnbc123.app"; + public static final String XCHAT_DIR_NAME = "app.yinm.chat"; /** * sp名字 @@ -32,36 +32,21 @@ public class XChatConstants { * 本地数据库的名字(目前是用 realm 数据库) */ public static final String XCHAT_DATABASE_NAME = "accompany.db"; - - /** - * bugly key (DEBUG) - */ - public static final String BUGLY_KEY_DEBUG = "6222885c55"; - - /** - * bugly key (RELEASE) - */ - public static final String BUGLY_KEY_RELEASE = "6222885c55"; /** * 云信 key (DEBUG) */ - public static final String NIM_KEY_DEBUG = "5d5a833a2d0ff1304a5d8bed53d2af5b";//已更换 + public static final String NIM_KEY_DEBUG = "f47ca9adaa90ac0ede099f71234aa7a7";//已更换 /** * 云信 key (RELEASE) */ - public static final String NIM_KEY_RELEASE = "5e76ec47632d86c30ce18eabfa332b6a"; - - /** - * 网易易盾 业务 ID 注册 - */ - public static final String QUICK_PASS_BUSINESS_ID = "200c83103d4a413591c7969dd8d4d6e2"; + public static final String NIM_KEY_RELEASE = "f47ca9adaa90ac0ede099f71234aa7a7"; /** * 声网 key */ - public static final String AGORA_KEY = "5b4d929b6c4e4af190550c4a2ec5cd4c"; + public static final String AGORA_KEY = "9600d31b6caf4a4a9d5907cc64f8e76e"; /** * 友盟统计 key @@ -189,31 +174,6 @@ public class XChatConstants { public static final String REPORT_TYPE_PERSONAL_DYNAMIC = "PERSONAL_DYNAMIC"; // 个人页动态 public static final String REPORT_TYPE_DYNAMIC_SQUARE = "DYNAMIC_SQUARE";//广场动态 - - /** - * 小米推送 - */ - public static final String XM_APP_ID = "2882303761518689612"; - public static final String XM_APP_KEY = "5421868975612"; - public static final String XM_CERTIFICATE_NAME = "magicxiaomi"; - - /** - * 华为推送 - */ - public static final String HW_APP_ID = "102953045"; - public static final String HW_CERTIFICATE_NAME = "magichuawei"; - /** - * vivo推送 - */ - public static final String VIVO_CERTIFICATE_NAME = "magicvivo"; - /** - * oppo推送 - */ - public static final String OPPO_CERTIFICATE_NAME = "magicoppo"; - public static final String OPPO_APP_ID = "30364561"; - public static final String OPPO_APP_KEY = "f47c7282060c42d0af41a198649075b6"; - public static final String OPPO_SECRET = "3c64373f915f4481b82c94e61a3c537d"; - /** * Referer (DEBUG) */ @@ -223,14 +183,13 @@ public class XChatConstants { * Referer (RELEASE) */ public static final String KEY_REFERER_RELEASE = "https://api.lecheng163.com/"; - public static final String APP_MARK = "yinmeng"; + public static final String APP_MARK = "yinm"; /** * 聊天室文本消息易盾反垃圾业务id */ - public static final String CHAT_ROOM_ANTI_SPAM_CONFIG_ID = BuildConfig.DEBUG ? "d6ee07a01d458ac212962a01f13d1996" : "d6ee07a01d458ac212962a01f13d1996"; + public static final String CHAT_ROOM_ANTI_SPAM_CONFIG_ID = BuildConfig.DEBUG ? "fa3291498e0c5c34ca67ff1bf8dbaa83" : "fa3291498e0c5c34ca67ff1bf8dbaa83"; public static final int KICK_OUT_ROOM_LIMIT_ENTER_TIME = 5 * 60 * 1000; - public static final String QI_YU_KF_KEY = "b6b7ca22f8ce319dea3a7456dc211fec"; public static int SELECT_ANIM_DURATION = 2500; diff --git a/mob.gradle b/mob.gradle index 8e3637743..59449b1d7 100644 --- a/mob.gradle +++ b/mob.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.mob.sdk' MobSDK { - appKey "37a065a03f499" - appSecret "6e211fcc6f586b9a9e01f02aeaecb757" + appKey "391a13e3d2f0f" + appSecret "66c1b96ec3546d4df709154dc3069a7d" appBundleMode true MobLink { uriScheme "yinmapp://sharesdk" - appLinkHost "xxx.xx.cn" + appLinkHost "cmmh.t4m.cn" } ShareSDK { //平台配置信息