diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index c7f1cc8..c80166b 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -1,45 +1,56 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index c7f1cc8..c80166b 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -1,45 +1,56 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/agconnect-services.json b/app/agconnect-services.json new file mode 100644 index 0000000..4242bb3 --- /dev/null +++ b/app/agconnect-services.json @@ -0,0 +1,57 @@ +{ + "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": "30086000558859867", + "product_id": "388421841222116309", + "client_id": "1406558438749670144", + "client_secret": "7D95257CF30935DFFABEB7E486B9A678CBA07553F538D45347CE77DFD08AA62E", + "project_id": "388421841222116309", + "app_id": "110858775", + "api_key": "DQEDAI/F8p8FKBtqKbThKAexZj9cQVYr++ExXw2xbWvF0C5gAze1uNsYploOUDYETgPUiOFN5R05gS9/8xqkSQq+8U6sLcwmkM7NjA==", + "package_name": "com.casic.zq.smartwell" + }, + "oauth_client": { + "client_id": "110858775", + "client_type": 1 + }, + "app_info": { + "app_id": "110858775", + "package_name": "com.casic.zq.smartwell" + }, + "configuration_version": "3.0", + "appInfos": [ + { + "package_name": "com.casic.zq.smartwell", + "client": { + "app_id": "110858775" + }, + "app_info": { + "package_name": "com.casic.zq.smartwell", + "app_id": "110858775" + }, + "oauth_client": { + "client_type": 1, + "client_id": "110858775" + } + } + ] +} \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index c7f1cc8..c80166b 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -1,45 +1,56 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/agconnect-services.json b/app/agconnect-services.json new file mode 100644 index 0000000..4242bb3 --- /dev/null +++ b/app/agconnect-services.json @@ -0,0 +1,57 @@ +{ + "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": "30086000558859867", + "product_id": "388421841222116309", + "client_id": "1406558438749670144", + "client_secret": "7D95257CF30935DFFABEB7E486B9A678CBA07553F538D45347CE77DFD08AA62E", + "project_id": "388421841222116309", + "app_id": "110858775", + "api_key": "DQEDAI/F8p8FKBtqKbThKAexZj9cQVYr++ExXw2xbWvF0C5gAze1uNsYploOUDYETgPUiOFN5R05gS9/8xqkSQq+8U6sLcwmkM7NjA==", + "package_name": "com.casic.zq.smartwell" + }, + "oauth_client": { + "client_id": "110858775", + "client_type": 1 + }, + "app_info": { + "app_id": "110858775", + "package_name": "com.casic.zq.smartwell" + }, + "configuration_version": "3.0", + "appInfos": [ + { + "package_name": "com.casic.zq.smartwell", + "client": { + "app_id": "110858775" + }, + "app_info": { + "package_name": "com.casic.zq.smartwell", + "app_id": "110858775" + }, + "oauth_client": { + "client_type": 1, + "client_id": "110858775" + } + } + ] +} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index db0844d..3f26bc1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,6 +3,8 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'org.greenrobot.greendao' +//华为推送 +apply plugin: 'com.huawei.agconnect' android { signingConfigs { @@ -26,10 +28,10 @@ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", // 华为 相关应用参数 - HUAWEI_APP_ID : "", + HUAWEI_APP_ID : "110858775", // 荣耀相关应用参数 - HONOR_APP_ID : "", + HONOR_APP_ID : "104442055", // OPPO 相关应用参数 OPPO_APP_KEY : "", @@ -59,6 +61,9 @@ } buildTypes { + debug { + signingConfig signingConfigs.release + } release { minifyEnabled false signingConfig signingConfigs.release @@ -151,13 +156,15 @@ implementation 'com.getui:gtsdk:3.2.15.0' //个推SDK implementation 'com.getui:gtc:3.2.1.0' //个推核心组件 //各手机厂商选择集成 -// implementation 'com.getui.opt:hwp:3.1.2' // 华为 + implementation 'com.getui.opt:hwp:3.1.2' // 华为 + implementation 'com.huawei.hms:push:6.11.0.300' + implementation 'com.getui.opt:honor:3.6.0' // 荣耀 + implementation 'com.hihonor.mcs:push:7.0.61.303' // implementation 'com.getui.opt:xmp:3.3.1' // 小米 // implementation 'com.assist-v3:oppo:3.4.0' // oppo // implementation 'com.assist-v3:vivo:3.1.2' // vivo -// implementation 'com.getui.opt:mzp:3.2.3' // 魅族 // implementation 'com.getui.opt:ups:3.0.3' // ups，ups目前支持坚果，索尼，海信手机 -// implementation 'com.getui.opt:honor:3.6.0' // 荣耀 + //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //数据库升级 diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index c7f1cc8..c80166b 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -1,45 +1,56 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/agconnect-services.json b/app/agconnect-services.json new file mode 100644 index 0000000..4242bb3 --- /dev/null +++ b/app/agconnect-services.json @@ -0,0 +1,57 @@ +{ + "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": "30086000558859867", + "product_id": "388421841222116309", + "client_id": "1406558438749670144", + "client_secret": "7D95257CF30935DFFABEB7E486B9A678CBA07553F538D45347CE77DFD08AA62E", + "project_id": "388421841222116309", + "app_id": "110858775", + "api_key": "DQEDAI/F8p8FKBtqKbThKAexZj9cQVYr++ExXw2xbWvF0C5gAze1uNsYploOUDYETgPUiOFN5R05gS9/8xqkSQq+8U6sLcwmkM7NjA==", + "package_name": "com.casic.zq.smartwell" + }, + "oauth_client": { + "client_id": "110858775", + "client_type": 1 + }, + "app_info": { + "app_id": "110858775", + "package_name": "com.casic.zq.smartwell" + }, + "configuration_version": "3.0", + "appInfos": [ + { + "package_name": "com.casic.zq.smartwell", + "client": { + "app_id": "110858775" + }, + "app_info": { + "package_name": "com.casic.zq.smartwell", + "app_id": "110858775" + }, + "oauth_client": { + "client_type": 1, + "client_id": "110858775" + } + } + ] +} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index db0844d..3f26bc1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,6 +3,8 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'org.greenrobot.greendao' +//华为推送 +apply plugin: 'com.huawei.agconnect' android { signingConfigs { @@ -26,10 +28,10 @@ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", // 华为 相关应用参数 - HUAWEI_APP_ID : "", + HUAWEI_APP_ID : "110858775", // 荣耀相关应用参数 - HONOR_APP_ID : "", + HONOR_APP_ID : "104442055", // OPPO 相关应用参数 OPPO_APP_KEY : "", @@ -59,6 +61,9 @@ } buildTypes { + debug { + signingConfig signingConfigs.release + } release { minifyEnabled false signingConfig signingConfigs.release @@ -151,13 +156,15 @@ implementation 'com.getui:gtsdk:3.2.15.0' //个推SDK implementation 'com.getui:gtc:3.2.1.0' //个推核心组件 //各手机厂商选择集成 -// implementation 'com.getui.opt:hwp:3.1.2' // 华为 + implementation 'com.getui.opt:hwp:3.1.2' // 华为 + implementation 'com.huawei.hms:push:6.11.0.300' + implementation 'com.getui.opt:honor:3.6.0' // 荣耀 + implementation 'com.hihonor.mcs:push:7.0.61.303' // implementation 'com.getui.opt:xmp:3.3.1' // 小米 // implementation 'com.assist-v3:oppo:3.4.0' // oppo // implementation 'com.assist-v3:vivo:3.1.2' // vivo -// implementation 'com.getui.opt:mzp:3.2.3' // 魅族 // implementation 'com.getui.opt:ups:3.0.3' // ups，ups目前支持坚果，索尼，海信手机 -// implementation 'com.getui.opt:honor:3.6.0' // 荣耀 + //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //数据库升级 diff --git a/build.gradle b/build.gradle index c413638..c2d449a 100644 --- a/build.gradle +++ b/build.gradle @@ -7,12 +7,18 @@ //依赖库 maven { url 'https://jitpack.io' } google() + //华为推送 + maven { url 'https://developer.huawei.com/repo/' } + //荣耀推送 + maven { url 'https://developer.hihonor.com/repo/' } mavenCentral() } dependencies { classpath 'com.android.tools.build:gradle:4.2.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'org.greenrobot:greendao-gradle-plugin:3.3.0' + //华为推送 + classpath 'com.huawei.agconnect:agcp:1.6.0.300' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -25,7 +31,11 @@ //依赖库 maven { url 'https://jitpack.io' } google() - maven { url "https://mvn.getui.com/nexus/content/repositories/releases/"} + maven { url "https://mvn.getui.com/nexus/content/repositories/releases/" } + //华为推送 + maven { url 'https://developer.huawei.com/repo/' } + //荣耀推送 + maven { url 'https://developer.hihonor.com/repo/' } mavenCentral() } }