feat: 【光环助手】极光推送测试华为厂商服务 https://jira.shanqu.cc/browse/GHZSCY-5608

Signed-off-by: chenjuntao <chenjuntao@ghzhushou.com>

.gitlab-ci.yml

@@ -71,7 +71,7 @@ android_build:
     exit_codes: 137
   only:
     - dev
-    - release
+    - pack/v5.35.5-1055/GHZSCY-5608
 
 # 代码检查
 sonarqube_analysis:
@@ -152,4 +152,4 @@ oss-upload&send-email:
         - /usr/local/bin/python /ci-android-mail-jira-comment.py
     only:
         - dev
-        - release
+        - pack/v5.35.5-1055/GHZSCY-5608

app/agconnect-services.json

@@ -0,0 +1,96 @@
+{
+	"agcgw":{
+		"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.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":"900086000033218490",
+		"product_id":"388421841222059091",
+		"client_id":"1387728832454239616",
+		"client_secret":"9AABADC7747C59E5695235B31D58502E9E86CC5B9A33091FB374012D77A1FA90",
+		"project_id":"388421841222059091",
+		"app_id":"111067805",
+		"api_key":"DAEDALb/n88PGmVZSR7nbIjMGkWbWCBPJfMOEg7w2LFdEo+aviyu0pstSKATVzVR4yHeo3nLKDcwDetdYDLHpbNPtmwJufUjtfDPUQ==",
+		"package_name":"com.ghzs.gamecenter"
+	},
+	"oauth_client":{
+		"client_id":"111067805",
+		"client_type":1
+	},
+	"app_info":{
+		"app_id":"111067805",
+		"package_name":"com.ghzs.gamecenter"
+	},
+	"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":""
+		},
+		"edukit":{
+			"edu_url":"edukit.cloud.huawei.com.cn",
+			"dh_url":"edukit.cloud.huawei.com.cn"
+		},
+		"search":{
+			"url":"https://search-drcn.cloud.huawei.com"
+		},
+		"cloudstorage":{
+			"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"
+		}
+	},
+	"region":"CN",
+	"configuration_version":"3.0",
+	"appInfos":[
+		{
+			"package_name":"com.ghzs.gamecenter",
+			"client":{
+				"app_id":"111067805"
+			},
+			"app_info":{
+				"package_name":"com.ghzs.gamecenter",
+				"app_id":"111067805"
+			},
+			"oauth_client":{
+				"client_type":1,
+				"client_id":"111067805"
+			}
+		}
+	]
+}

app/build.gradle

@@ -4,6 +4,7 @@ apply plugin: 'kotlin-android' // kotlin
 apply plugin: 'kotlin-parcelize'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'AndResGuard'
+apply plugin: 'com.huawei.agconnect'
 
 import groovy.xml.XmlUtil
 
@@ -409,13 +410,13 @@ dependencies {
     }
     internalImplementation(project(':module_internal_test'))
 
-//    def pushProperty = findProperty('BUILD_PUSH_TYPE')
-//    // 根据BUILD_PUSH_TYPE决定使用哪个推送SDK，目前默认使用极光推送
-//    def pushProject = (pushProperty == null || pushProperty == 'jg')
-//            ? project(':feature:jg_push') : project(':feature:acloud_push')
-//    implementation(pushProject) {
-//        exclude group: 'androidx.swiperefreshlayout'
-//    }
+    def pushProperty = findProperty('BUILD_PUSH_TYPE')
+    // 根据BUILD_PUSH_TYPE决定使用哪个推送SDK，目前默认使用极光推送
+    def pushProject = (pushProperty == null || pushProperty == 'jg')
+            ? project(':feature:jg_push') : project(':feature:acloud_push')
+    implementation(pushProject) {
+        exclude group: 'androidx.swiperefreshlayout'
+    }
 }
 
 File propFile = file('sign.properties')
@@ -486,6 +487,19 @@ andResGuard {
     // 打开这个开关会合并所有哈希值相同的资源，但请不要过度依赖这个功能去除去冗余资源
     mergeDuplicatedRes = true
     whiteList = [
+            "R.string.hms*",
+            "R.string.connect_server_fail_prompt_toast",
+            "R.string.getting_message_fail_prompt_toast",
+            "R.string.no_available_network_prompt_toast",
+            "R.string.third_app_*",
+            "R.string.upsdk_*",
+            "R.layout.hms*",
+            "R.layout.upsdk_*",
+            "R.drawable.upsdk*",
+            "R.color.upsdk*",
+            "R.dimen.upsdk*",
+            "R.style.upsdk*",
+            "R.string.agc*",
             "R.xml.jpush*",
             "R.drawable.jpush*",
             "R.layout.jpush*",

app/src/main/res/values/strings.xml

@@ -313,7 +313,7 @@
     <string name="info_list_url">https://and-static.ghzs66.com/page/privacy_policies/Personal_information_collection_list.html</string>
     <string name="sdk_list_url">https://and-static.ghzs66.com/page/privacy_policies/sdk_directory.html</string>
     <string name="permission_and_usage_url">https://and-static.ghzs66.com/page/privacy_policies/Permission_Usage.html</string>
-    <string name="children_policy_url">https://and-static.ghzs66.com/page/privacy_policies/Child_privacy_statement.html</string>
+    <string name="children_policy_url">https://resource.ghzs.com/page/privacy_policies/6654395d1a37bb528503842d.html</string>
 
     <string name="community_rule_title">问答版块规则</string>
     <string name="community_rule_url">https://and-static.ghzs66.com/page/section_rule/section_rule.html</string>

build.gradle

@@ -11,6 +11,7 @@ buildscript {
         jcenter()
         mavenCentral()
         maven { url 'https://jitpack.io' }
+        maven { url 'https://developer.huawei.com/repo/' }
         maven { url "https://maven.google.com" }
     }
 
@@ -20,6 +21,7 @@ buildscript {
         // 使用了 1.2.21 在蓝叠模拟器上无法进入首页? 但是不使用又会出现触发 V3 签名...
         classpath 'io.github.leon406:AndResGuard-gradle-plugin:1.2.23'
         classpath 'com.sensorsdata.analytics.android:android-gradle-plugin2:3.5.3'
+        classpath 'com.huawei.agconnect:agcp:1.9.1.301'
     }
 }
 
@@ -70,7 +72,7 @@ subprojects {
                                 tencentAppId         : "${TENCENT_APPID}",
 
                                 JPUSH_PKGNAME: "${applicationId}",
-                                JPUSH_APPKEY : "529559b0a2907f0bea50f982",
+                                JPUSH_APPKEY : "c14ce4539c1db96142fdb3d0",
                                 JPUSH_CHANNEL: "developer-default",
 
                                 HONOR_APPID  : "104438304",

dependencies.gradle

@@ -9,7 +9,7 @@ ext {
     // application info (每个大版本之间的 versionCode 增加 20)
     versionCode = 1055
     versionName = "5.35.5"
-    applicationId = "com.gh.gamecenter"
+    applicationId = "com.ghzs.gamecenter"
     applicationIdGat = "com.gh.gamecenter.intl"
 
     // AndroidX
@@ -138,4 +138,5 @@ ext {
 
     acloudPush = "3.8.8.1"
     jpushVersion = "5.2.4"
+    hmsPush = "6.12.0.300"
 }

feature/jg_push/build.gradle

@@ -55,6 +55,10 @@ dependencies {
 
     implementation "cn.jiguang.sdk:jpush:$jpushVersion"
 
+    // 华为通道
+    implementation "com.huawei.hms:push:$hmsPush"
+    implementation "cn.jiguang.sdk.plugin:huawei:$jpushVersion"
+
     // 荣耀通道
     implementation "cn.jiguang.sdk.plugin:honor:$jpushVersion"
 

feature/jg_push/proguard-rules.pro

@@ -51,4 +51,15 @@
 # VIVO通道
 -dontwarn com.vivo.push.**
 -keep class com.vivo.push.**{*; }
--keep class com.vivo.vms.**{*; }
+-keep class com.vivo.vms.**{*; }
+
+#华为通道
+-ignorewarnings
+-keepattributes *Annotation*
+-keepattributes Exceptions
+-keepattributes InnerClasses
+-keepattributes Signature
+-keepattributes SourceFile,LineNumberTable
+-keep class com.hianalytics.android.**{*;}
+-keep class com.huawei.updatesdk.**{*;}
+-keep class com.huawei.hms.**{*;}

feature/jg_push/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.gh.gamecenter.jg.push">
 
-    <uses-sdk tools:overrideLibrary="com.hihonor.push.sdk,com.heytap.mcssdk" />
+    <uses-sdk tools:overrideLibrary="com.hihonor.push.sdk,com.heytap.mcssdk,com.huawei.android.hms.push" />
 
     <application>
         <!-- Since JCore2.0.0 Required SDK核心功能-->

feature/jg_push/src/main/java/com/gh/gamecenter/jg/push/JPushHelper.kt

@@ -3,6 +3,7 @@ package com.gh.gamecenter.jg.push
 import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Build
+import cn.jiguang.api.utils.JCollectionAuth
 import cn.jpush.android.api.JPushInterface
 import com.alibaba.android.arouter.launcher.ARouter
 import com.gh.gamecenter.common.constant.RouteConsts
@@ -18,6 +19,9 @@ object JPushHelper {
     private var badgeCount = 0 // 角标计数
 
     fun init(applicationContext: Context) {
+        // 关闭SDK自启动 (https://docs.jiguang.cn/jverification/guideline/jghgzy)
+        JCollectionAuth.enableAutoWakeup(applicationContext, false)
+
         JPushInterface.setDebugMode(BuildConfig.DEBUG)
         JPushInterface.init(applicationContext)
     }

init.gradle

@@ -22,7 +22,7 @@ allprojects { project ->
 
             // booster
             classpath "com.didiglobal.booster:booster-gradle-plugin:$booster_version"
-            classpath "com.didiglobal.booster:booster-transform-shared-preferences:$booster_version"
+//            classpath "com.didiglobal.booster:booster-transform-shared-preferences:$booster_version"
 //            classpath "com.didiglobal.booster:booster-transform-r-inline:$booster_version"
             classpath "com.didiglobal.booster:booster-transform-finalizer-watchdog-daemon:$booster_version"
             classpath "com.didiglobal.booster:booster-transform-res-check:$booster_version"

init.internal.gradle

@@ -22,7 +22,7 @@ allprojects { project ->
 
             // booster
             classpath "com.didiglobal.booster:booster-gradle-plugin:$booster_version"
-            classpath "com.didiglobal.booster:booster-transform-shared-preferences:$booster_version"
+//            classpath "com.didiglobal.booster:booster-transform-shared-preferences:$booster_version"
 //            classpath "com.didiglobal.booster:booster-transform-r-inline:$booster_version"
             classpath "com.didiglobal.booster:booster-transform-finalizer-watchdog-daemon:$booster_version"
             classpath "com.didiglobal.booster:booster-transform-res-check:$booster_version"

module_common/src/main/res/values/strings.xml

@@ -45,12 +45,12 @@
     <string name="disclaimer_title">用户协议与免责声明</string>
     <string name="disclaimer_url">https://and-static.ghzs66.com/page/privacy_policies/User_agreement.html</string>
     <string name="privacy_policy_title">隐私政策</string>
-    <string name="privacy_policy_url">https://and-static.ghzs66.com/page/privacy_policies/privacy_policies.html</string>
+    <string name="privacy_policy_url">https://resource.ghzs.com/page/privacy_policies/665438aa4e1d964893033838.html</string>
 
     <string name="icp">备案查询入口</string>
     <string name="icp_url">https://beian.miit.gov.cn/</string>
-    <string name="icp_serial_number">粤ICP备17080876号-5A</string>
-    <string name="icp_serial_numb_desc">APP备案号：粤ICP备17080876号-5A</string>
+    <string name="icp_serial_number">粤ICP备16042195号-5A</string>
+    <string name="icp_serial_numb_desc">APP备案号：粤ICP备16042195号-5A</string>
 
     <string name="loading">加载中...</string>
     <string name="loading_more_hint">上拉加载</string>