From b00720cebdab2e75fb71640faaf07b3c61bf79cc Mon Sep 17 00:00:00 2001 From: huangjian Date: Fri, 14 Oct 2022 14:26:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E7=9B=B8=E5=85=B3key?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/agconnect-services.json | 70 ++++++++++++------- app/src/main/AndroidManifest.xml | 4 +- .../moshen/application/XChatApplication.java | 8 +-- .../other/dialog/PrivacyAgreementDialog.java | 1 - .../XChatConstants.java | 27 +++---- 5 files changed, 60 insertions(+), 50 deletions(-) diff --git a/app/agconnect-services.json b/app/agconnect-services.json index 226314887..38aeb8b77 100644 --- a/app/agconnect-services.json +++ b/app/agconnect-services.json @@ -1,41 +1,55 @@ { "agcgw":{ - "backurl":"connect-drcn.dbankcloud.cn", - "url":"connect-drcn.hispace.hicloud.com", - "websocketbackurl":"connect-ws-drcn.hispace.dbankcloud.cn", - "websocketurl":"connect-ws-drcn.hispace.dbankcloud.com" + "backurl":"connect-drcn.hispace.hicloud.com", + "url":"connect-drcn.dbankcloud.cn", + "websocketbackurl":"connect-ws-drcn.hispace.dbankcloud.com", + "websocketurl":"connect-ws-drcn.hispace.dbankcloud.cn" }, "agcgw_all":{ - "CN":"connect-drcn.hispace.hicloud.com", - "CN_back":"connect-drcn.dbankcloud.cn", - "DE":"connect-dre.hispace.hicloud.com", - "DE_back":"connect-dre.dbankcloud.cn", - "RU":"connect-drru.hispace.hicloud.com", - "RU_back":"connect-drru.dbankcloud.cn", - "SG":"connect-dra.hispace.hicloud.com", - "SG_back":"connect-dra.dbankcloud.cn" + "CN":"connect-drcn.dbankcloud.cn", + "CN_back":"connect-drcn.hispace.hicloud.com", + "DE":"connect-dre.dbankcloud.cn", + "DE_back":"connect-dre.hispace.hicloud.com", + "RU":"connect-drru.hispace.dbankcloud.ru", + "RU_back":"connect-drru.hispace.dbankcloud.cn", + "SG":"connect-dra.dbankcloud.cn", + "SG_back":"connect-dra.hispace.hicloud.com" + }, + "websocketgw_all":{ + "CN":"connect-ws-drcn.hispace.dbankcloud.cn", + "CN_back":"connect-ws-drcn.hispace.dbankcloud.com", + "DE":"connect-ws-dre.hispace.dbankcloud.cn", + "DE_back":"connect-ws-dre.hispace.dbankcloud.com", + "RU":"connect-ws-drru.hispace.dbankcloud.ru", + "RU_back":"connect-ws-drru.hispace.dbankcloud.cn", + "SG":"connect-ws-dra.hispace.dbankcloud.cn", + "SG_back":"connect-ws-dra.hispace.dbankcloud.com" }, "client":{ "cp_id":"890086000300337421", - "product_id":"736430079245711652", - "client_id":"625842227532282816", - "client_secret":"B23D0CD85C92ADC6676AF6CC8671628F0F155D29A527E7BDF2A53E26F0B5A720", - "project_id":"736430079245711652", - "app_id":"104321113", - "api_key":"CwEAAAAAZgS4/Nw1+/PybMG5CZXzJmlHHHnj0Tp2FOXQG3RtKUdpAsiQiXttqCXlHWA8GdUzGjtnq6oQh2Ogfe8JOs8ihePgJLg=", + "product_id":"736430079244645870", + "client_id":"458482081706542080", + "client_secret":"3573E319CDA06E85137A91CF68CF90BA850A639BCA6655A5310B2BCD81BC7213", + "project_id":"736430079244645870", + "app_id":"102953045", + "api_key":"DAEDAN1bqknzqRuvualUo98vO7U9uXBJtBZ0rNQHgSo03bXgkl98tD4sytVBCBB1Y7ha0NcY++dSp9JLsws9BzDN+/fS3v8J9We3nA==", "package_name":"com.voice.magic" }, "oauth_client":{ - "client_id":"104321113", + "client_id":"102953045", "client_type":1 }, "app_info":{ - "app_id":"104321113", + "app_id":"102953045", "package_name":"com.voice.magic" }, "service":{ "analytics":{ "collector_url":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn", + "collector_url_ru":"datacollector-drru.dt.dbankcloud.ru,datacollector-drru.dt.hicloud.com", + "collector_url_sg":"datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn", + "collector_url_de":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn", + "collector_url_cn":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn", "resource_id":"p1", "channel_id":"" }, @@ -43,7 +57,15 @@ "url":"https://search-drcn.cloud.huawei.com" }, "cloudstorage":{ - "storage_url":"https://agc-storage-drcn.platform.dbankcloud.cn" + "storage_url_sg_back":"https://agc-storage-dra.cloud.huawei.asia", + "storage_url_ru_back":"https://agc-storage-drru.cloud.huawei.ru", + "storage_url_ru":"https://agc-storage-drru.cloud.huawei.ru", + "storage_url_de_back":"https://agc-storage-dre.cloud.huawei.eu", + "storage_url_de":"https://ops-dre.agcstorage.link", + "storage_url":"https://agc-storage-drcn.platform.dbankcloud.cn", + "storage_url_sg":"https://ops-dra.agcstorage.link", + "storage_url_cn_back":"https://agc-storage-drcn.cloud.huawei.com.cn", + "storage_url_cn":"https://agc-storage-drcn.platform.dbankcloud.cn" }, "ml":{ "mlservice_url":"ml-api-drcn.ai.dbankcloud.com,ml-api-drcn.ai.dbankcloud.cn" @@ -55,15 +77,15 @@ { "package_name":"com.voice.magic", "client":{ - "app_id":"104321113" + "app_id":"102953045" }, "app_info":{ "package_name":"com.voice.magic", - "app_id":"104321113" + "app_id":"102953045" }, "oauth_client":{ "client_type":1, - "client_id":"104321113" + "client_id":"102953045" } } ] diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5162f5cb5..226a3dc1f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -285,10 +285,10 @@ + android:value="8de0df98690ba00225b88313aaee754f" /> + android:value="104560655" /> diff --git a/app/src/main/java/com/mango/moshen/application/XChatApplication.java b/app/src/main/java/com/mango/moshen/application/XChatApplication.java index 928a6b945..a52c9eebd 100644 --- a/app/src/main/java/com/mango/moshen/application/XChatApplication.java +++ b/app/src/main/java/com/mango/moshen/application/XChatApplication.java @@ -2,9 +2,6 @@ package com.mango.moshen.application; import static com.mango.xchat_android_constants.XChatConstants.HW_APP_ID; import static com.mango.xchat_android_constants.XChatConstants.HW_CERTIFICATE_NAME; -import static com.mango.xchat_android_constants.XChatConstants.MZ_APP_ID; -import static com.mango.xchat_android_constants.XChatConstants.MZ_APP_KEY; -import static com.mango.xchat_android_constants.XChatConstants.MZ_CERTIFICATE_NAME; import static com.mango.xchat_android_constants.XChatConstants.OPPO_APP_ID; import static com.mango.xchat_android_constants.XChatConstants.OPPO_APP_KEY; import static com.mango.xchat_android_constants.XChatConstants.OPPO_CERTIFICATE_NAME; @@ -415,10 +412,7 @@ public class XChatApplication extends Application { mixPushConfig.xmAppId = XM_APP_ID; mixPushConfig.xmAppKey = XM_APP_KEY; mixPushConfig.xmCertificateName = XM_CERTIFICATE_NAME; - //魅族推送 - mixPushConfig.mzAppId = MZ_APP_ID; - mixPushConfig.mzAppKey = MZ_APP_KEY; - mixPushConfig.mzCertificateName = MZ_CERTIFICATE_NAME; + //vivo推送 mixPushConfig.vivoCertificateName = VIVO_CERTIFICATE_NAME; //oppo推送 diff --git a/app/src/main/java/com/mango/moshen/other/dialog/PrivacyAgreementDialog.java b/app/src/main/java/com/mango/moshen/other/dialog/PrivacyAgreementDialog.java index 40dfce167..af8fa71b7 100644 --- a/app/src/main/java/com/mango/moshen/other/dialog/PrivacyAgreementDialog.java +++ b/app/src/main/java/com/mango/moshen/other/dialog/PrivacyAgreementDialog.java @@ -43,7 +43,6 @@ public class PrivacyAgreementDialog extends Dialog implements View.OnClickListen super.onCreate(savedInstanceState); setContentView(R.layout.dialog_privacy_agreement); TextView tvConfirm = findViewById(R.id.tv_confirm); - tvConfirm.setEnabled(false); tvConfirm.setOnClickListener(this); findViewById(R.id.btn_cancel).setOnClickListener(this); TextView tvDesc = findViewById(R.id.tv_desc); diff --git a/core/src/diff_src_erban/java/com/mango/xchat_android_constants/XChatConstants.java b/core/src/diff_src_erban/java/com/mango/xchat_android_constants/XChatConstants.java index 5778dcbd5..a5372d2f0 100644 --- a/core/src/diff_src_erban/java/com/mango/xchat_android_constants/XChatConstants.java +++ b/core/src/diff_src_erban/java/com/mango/xchat_android_constants/XChatConstants.java @@ -242,31 +242,26 @@ public class XChatConstants { /** * 小米推送 */ - public static final String XM_APP_ID = "2882303761519916917"; - public static final String XM_APP_KEY = "5181991688917"; - public static final String XM_CERTIFICATE_NAME = "yinyouxiaomi"; - /** - * 魅族推送 - */ - public static final String MZ_APP_ID = "133017"; - public static final String MZ_APP_KEY = "402fef6295cc493fbd6d7b9b179df7b5"; - public static final String MZ_CERTIFICATE_NAME = "accompanyMeizu"; + 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 = "104321113"; - public static final String HW_CERTIFICATE_NAME = "yinyouhuawei"; + public static final String HW_APP_ID = "102953045"; + public static final String HW_CERTIFICATE_NAME = "magichuawei"; /** * vivo推送 */ - public static final String VIVO_CERTIFICATE_NAME = "yinyouvivo"; + public static final String VIVO_CERTIFICATE_NAME = "magicvivo"; /** * oppo推送 */ - public static final String OPPO_CERTIFICATE_NAME = "yinyouoppo"; - public static final String OPPO_APP_ID = "30517179"; - public static final String OPPO_APP_KEY = "8323a62958a34ac682096712566f5329"; - public static final String OPPO_SECRET = "4b65e2f7f7c8419fbbe7b920367814a9"; + 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)