diff --git a/star_lock/android/app/aliyun-emas-services.json b/star_lock/android/app/aliyun-emas-services.json index 63eaf6db..6079f77f 100644 --- a/star_lock/android/app/aliyun-emas-services.json +++ b/star_lock/android/app/aliyun-emas-services.json @@ -1,49 +1,49 @@ -{ +{ "config": { "emas.appKey":"333904040", "emas.appSecret":"c316965fe0a74fc9a481a5c44a535dc2", - "emas.packageName":"com.example.star_lock", + "emas.packageName":"cn.starlock.lock", "hotfix.idSecret":"333904040-1", "hotfix.rsaSecret":"MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCTjeqT4cX/VTcInnWLLxo2f+0W1vKfPLwpHr9rYeW1pELlySFFeDusdaV8vBBYRE2A4Mti6wuVRCw67YIif7gK+ZLipALWob/cPxC4pcbqJ0S5QznM8qPW2nheWhvuZA9SenO5OyNnQvhBeSMK0VaGBnCBrznm52Mq7yb1cQDlosGtTwDgezt5073xDJFhefYg7BzurAlCgmS4BRX0l1i5GWsv+R5hWLWyhO+dI2deArgbYiW0575f5L1zywJ4BJ/3qOgsJoSflLgtTVLlmbAXI1Xo023UWtfnnowH71avDn+SQ5agqZepp6pkoXiFhC7DN9gLTknHTb03mDHODOW1AgMBAAECggEADrs5c0A0M1S/pNWlKJswQ8ar1f7pxCodIwHV3JOuil726tgUwUnKs2Iffn+MJjPThQ1sYNjUlDd1LwDtYCJeLoJSPtxfCCyn6gZF1hl+7Xu0Kcbja2nCH746DDl01m0Y9oQRL6oO081k2ayNahQSTlkwPFJRNpNdXDj6K8D3dPWPCBw7ECFKYpoDmPt+lNwqPPIWlVwYFRwhhCRuSPZsejO+a65gWZhm6uWDkh/EtPzdCIkrpfxbfqSnM6t+WHKmA3Gmm6AiwNLrzUGJ5lIsLXNuvaXFpsjBpVq7x9Ff86Cj0vJ7wdIRn7sP1Wlw6SosKZZwn9+zDLQU0Prge0Mn9QKBgQDKFXnzWqdmG6PxykyHJrXeLvQyMBdy6x91lmNSYGxYYEG2Tr1LR+P5r1oL/VRmuT43qWxubL7gEMqMGOVEMwKN6cEBTFDIOyqpNgR5Nnt0DrYMDhca3Wxc1/SkzuaVsRPHAKn8bChWGtq58/VuuZIY8SRVTWLgRWrnXFWCbKq0QwKBgQC67AVJwymxxIYt7UVRxtihd84SIGhRluEXG3O8PzK7Je5qDgBkLc+khnTvnGQyG7AJwtMpIbzmzJyu76pjiga1XJnYCO1QXhayMRlieSkrk2C4u9hnmeni24iGDUkV7yCnwsTjFaQ3lq1XtrJJKB9rUeBndXwuN06lTIqokSuapwKBgQCYCEpEHCqediMEMDcc4rGmo1qSO34Yte1oEKlOez5nypsFZf2hmkdYPGUZahBKbAjz5WGvPd7oQZmwhrZNdbbxPzA2Is0Ppvu0a/A3pRaBvOOW9C7LxlPVEZ97MjFl4t/HMqewQUqjZPazOWenUrMoUpsMFflSUsdXoi6uvcQ7cwKBgGNS1tyDH7yeOM5erd7uUl46Uv2+yq/QBHtK0wzMaCCZ3z3rgrm4vgUmjSxlZbhajgghxiKtErtxLjCmmVubFEV6lyT8WV3DITw+asawqvfEsDh5WFx0pJsvHDRfCt7k2e1KyWQBM+l131Ykdkf5Ufis4RkYjIviR5/+NA+uVAUxAoGAEIrRsaTDij9AX3/wD0XpDavFJdHzkvX259b6v0aASVoYlzAfj5bh1fZI90ex+MDibx3UyhHOVS2kk6q/TPAoevVlfS6IDfV0VJJZvie52qumfhttBpvH302rzrdEiZEhRd2UuKkBw7hsW+NlJEmoV0tj3xiP2vLLPnsaua9F3/g=", "httpdns.accountId":"125761", "httpdns.secretKey":"f77f39c6f0e66d7c169aa7e8d87dfe13", "appmonitor.tlog.rsaSecret":"MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCEYcyLDY/8H6714r5FuRuv94oWLod90sa5dwcJ5l8GmRMscFPxMXt9cNiKwL7zqPCWws+ApSfHczFnRgvZQX/p/t0U1nPNdotLqkLuzXNBim+TpfNnCvIoiVujAGXwdIGo7oaxci9+VV/1TFs5lm9M1wsreT2u+62cCqi/h16ZkQIDAQAB", "appmonitor.rsaSecret":"MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCEYcyLDY/8H6714r5FuRuv94oWLod90sa5dwcJ5l8GmRMscFPxMXt9cNiKwL7zqPCWws+ApSfHczFnRgvZQX/p/t0U1nPNdotLqkLuzXNBim+TpfNnCvIoiVujAGXwdIGo7oaxci9+VV/1TFs5lm9M1wsreT2u+62cCqi/h16ZkQIDAQAB" -}, +}, "services": { "hotfix_service":{ - "status":1, + "status":0, "version":"3.3.9" }, "ha-adapter_service":{ - "status":1, + "status":0, "version":"1.2.3.0-open" }, "feedback_service":{ - "status":1, + "status":0, "version":"3.4.2" }, "tlog_service":{ - "status":1, + "status":0, "version":"1.1.7.0-open" }, "httpdns_service":{ - "status":1, + "status":0, "version":"2.3.3" }, "apm_service":{ - "status":1, + "status":0, "version":"1.1.3.0-open" }, "man_service":{ - "status":1, + "status":0, "version":"1.2.7" }, "cps_service":{ "status":1, "version":"3.8.8.1" } -}, - "use_maven":true, - "proguard_keeplist":"\n#httpdns\n-keep class com.taobao.** {*;}\n-keep class com.alibaba.** {*;}\n-keep class com.ta.**{*;}\n-keep class com.ut.**{*;}\n-dontwarn com.taobao.**\n-dontwarn com.alibaba.**\n-dontwarn com.ta.**\n-dontwarn com.ut.**\n\n#cps\n-keep class com.taobao.** {*;}\n-keep class com.alibaba.** {*;}\n-keep class com.ta.**{*;}\n-keep class com.ut.**{*;}\n-dontwarn com.taobao.**\n-dontwarn com.alibaba.**\n-dontwarn com.ta.**\n-dontwarn com.ut.**\n-keepclasseswithmembernames class ** {\nnative ;\n}\n-keepattributes Signature\n-keep class sun.misc.Unsafe { *; }\n-keep class com.alipay.** {*;}\n-dontwarn com.alipay.**\n-keep class anet.**{*;}\n-keep class org.android.spdy.**{*;}\n-keep class org.android.agoo.**{*;}\n-dontwarn anet.**\n-dontwarn org.android.spdy.**\n-dontwarn org.android.agoo.**\n\n#hotfix\n#基线包使用，生成mapping.txt\n-printmapping mapping.txt\n#生成的mapping.txt在app/buidl/outputs/mapping/release路径下，移动到/app路径下\n#修复后的项目使用，保证混淆结果一致\n#-applymapping mapping.txt\n#hotfix\n-keep class com.taobao.sophix.**{*;}\n-keep class com.ta.utdid2.device.**{*;}\n#防止inline\n-dontoptimize\n\n#man\n-keep class com.taobao.** {*;}\n-keep class com.alibaba.** {*;}\n-keep class com.ta.**{*;}\n-keep class com.ut.**{*;}\n-dontwarn com.taobao.**\n-dontwarn com.alibaba.**\n-dontwarn com.ta.**\n-dontwarn com.ut.**\n\n#feedback\n-keep class com.taobao.** {*;}\n-keep class com.alibaba.** {*;}\n-keep class com.ta.**{*;}\n-keep class com.ut.**{*;}\n-dontwarn com.taobao.**\n-dontwarn com.alibaba.**\n-dontwarn com.ta.**\n-dontwarn com.ut.**\n" +}, + "use_maven":true, + "proguard_keeplist":"\n#httpdns\n-keep class com.taobao.** {*;}\n-keep class com.alibaba.** {*;}\n-keep class com.ta.**{*;}\n-keep class com.ut.**{*;}\n-dontwarn com.taobao.**\n-dontwarn com.alibaba.**\n-dontwarn com.ta.**\n-dontwarn com.ut.**\n\n#cps\n-keep class com.taobao.** {*;}\n-keep class com.alibaba.** {*;}\n-keep class com.ta.**{*;}\n-keep class com.ut.**{*;}\n-dontwarn com.taobao.**\n-dontwarn com.alibaba.**\n-dontwarn com.ta.**\n-dontwarn com.ut.**\n-keepclasseswithmembernames class ** {\nnative ;\n}\n-keepattributes Signature\n-keep class sun.misc.Unsafe { *; }\n-keep class com.alipay.** {*;}\n-dontwarn com.alipay.**\n-keep class anet.**{*;}\n-keep class org.android.spdy.**{*;}\n-keep class org.android.agoo.**{*;}\n-dontwarn anet.**\n-dontwarn org.android.spdy.**\n-dontwarn org.android.agoo.**\n\n#hotfix\n#基线包使用，生成mapping.txt\n-printmapping mapping.txt\n#生成的mapping.txt在app/buidl/outputs/mapping/release路径下，移动到/app路径下\n#修复后的项目使用，保证混淆结果一致\n#-applymapping mapping.txt\n#hotfix\n-keep class com.taobao.sophix.**{*;}\n-keep class com.ta.utdid2.device.**{*;}\n#防止inline\n-dontoptimize\n\n#man\n-keep class com.taobao.** {*;}\n-keep class com.alibaba.** {*;}\n-keep class com.ta.**{*;}\n-keep class com.ut.**{*;}\n-dontwarn com.taobao.**\n-dontwarn com.alibaba.**\n-dontwarn com.ta.**\n-dontwarn com.ut.**\n\n#feedback\n-keep class com.taobao.** {*;}\n-keep class com.alibaba.** {*;}\n-keep class com.ta.**{*;}\n-keep class com.ut.**{*;}\n-dontwarn com.taobao.**\n-dontwarn com.alibaba.**\n-dontwarn com.ta.**\n-dontwarn com.ut.**\n" } \ No newline at end of file diff --git a/star_lock/android/app/build.gradle b/star_lock/android/app/build.gradle index b8265947..d6cc2826 100644 --- a/star_lock/android/app/build.gradle +++ b/star_lock/android/app/build.gradle @@ -23,6 +23,7 @@ if (flutterVersionName == null) { } apply plugin: 'com.android.application' +apply plugin: 'com.aliyun.ams.emas-services' // 引用emas-services插件 apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" @@ -105,4 +106,5 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation('com.amap.api:location:5.6.0') implementation('com.amap.api:3dmap:8.1.0') + implementation 'com.aliyun.ams:alicloud-android-push:3.1.9.1' } diff --git a/star_lock/android/app/src/main/AndroidManifest.xml b/star_lock/android/app/src/main/AndroidManifest.xml index 5c89068b..3a99482b 100644 --- a/star_lock/android/app/src/main/AndroidManifest.xml +++ b/star_lock/android/app/src/main/AndroidManifest.xml @@ -44,6 +44,12 @@ + + + + + + + + + diff --git a/star_lock/android/app/src/main/kotlin/cn/starlock/lock/MainActivity.kt b/star_lock/android/app/src/main/kotlin/cn/starlock/lock/MainActivity.kt new file mode 100644 index 00000000..ddc1df7b --- /dev/null +++ b/star_lock/android/app/src/main/kotlin/cn/starlock/lock/MainActivity.kt @@ -0,0 +1,33 @@ +package cn.starlock.lock + +import android.os.Bundle +import android.util.Log +import com.alibaba.sdk.android.push.noonesdk.PushServiceFactory +import com.aliyun.ams.emas.push.CommonCallback +import io.flutter.embedding.android.FlutterActivity +import io.flutter.plugins.GeneratedPluginRegistrant + + +class MainActivity: FlutterActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + initAliyunPushService() + } + + private fun initAliyunPushService() { + PushServiceFactory.init(applicationContext) + val pushService = PushServiceFactory.getCloudPushService() + + val callback = object : CommonCallback, com.alibaba.sdk.android.push.CommonCallback { + override fun onSuccess(response: String?) { + Log.e("TAG","success $response") + } + + override fun onFailed(errorCode: String?, errorMessage: String?) { + Log.e("TAG","error $errorMessage") + } + } + + pushService.register(applicationContext,callback) + } +} diff --git a/star_lock/android/app/src/main/kotlin/com/example/star_lock/MyMessageReceiver.kt b/star_lock/android/app/src/main/kotlin/cn/starlock/lock/MyMessageReceiver.kt similarity index 98% rename from star_lock/android/app/src/main/kotlin/com/example/star_lock/MyMessageReceiver.kt rename to star_lock/android/app/src/main/kotlin/cn/starlock/lock/MyMessageReceiver.kt index 9ef434be..d57ed3b1 100644 --- a/star_lock/android/app/src/main/kotlin/com/example/star_lock/MyMessageReceiver.kt +++ b/star_lock/android/app/src/main/kotlin/cn/starlock/lock/MyMessageReceiver.kt @@ -1,4 +1,4 @@ -package com.example.star_lock +package cn.starlock.lock import android.content.Context import android.util.Log diff --git a/star_lock/android/app/src/main/kotlin/com/example/star_lock/MainActivity.kt b/star_lock/android/app/src/main/kotlin/com/example/star_lock/MainActivity.kt deleted file mode 100644 index 7cc68c46..00000000 --- a/star_lock/android/app/src/main/kotlin/com/example/star_lock/MainActivity.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.example.star_lock - -import io.flutter.embedding.android.FlutterActivity - -class MainActivity: FlutterActivity() { -} diff --git a/star_lock/android/app/src/profile/AndroidManifest.xml b/star_lock/android/app/src/profile/AndroidManifest.xml index bdb57586..bd99c894 100644 --- a/star_lock/android/app/src/profile/AndroidManifest.xml +++ b/star_lock/android/app/src/profile/AndroidManifest.xml @@ -45,7 +45,7 @@ diff --git a/star_lock/android/build.gradle b/star_lock/android/build.gradle index 571c17ca..bb5a7cca 100644 --- a/star_lock/android/build.gradle +++ b/star_lock/android/build.gradle @@ -3,13 +3,17 @@ buildscript { repositories { google() mavenCentral() - mavenCentral() mavenLocal() + maven { // 添加Maven仓库地址 + url 'https://maven.aliyun.com/nexus/content/repositories/releases/' + } } dependencies { classpath 'com.android.tools.build:gradle:7.1.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + // 添加emas-services插件 + classpath 'com.aliyun.ams:emas-services:1.0.4' } } @@ -19,6 +23,9 @@ allprojects { google() // mavenCentral() jcenter() + maven { // 添加Maven仓库地址 + url 'https://maven.aliyun.com/nexus/content/repositories/releases/' + } } } diff --git a/star_lock/lib/tools/xs_aliyunPush.dart b/star_lock/lib/tools/xs_aliyunPush.dart index d735ad18..4114ab5c 100644 --- a/star_lock/lib/tools/xs_aliyunPush.dart +++ b/star_lock/lib/tools/xs_aliyunPush.dart @@ -10,7 +10,7 @@ class XSAliyunPushProvider { Future init(AliyunPush aliyunPush) async { _aliyunPush = aliyunPush; if (Platform.isAndroid) { - _aliyunPush.createAndroidChannel('8.0up', '测试通道A', 3, '测试创建通知通道'); + _aliyunPush.createAndroidChannel('1', '测试通道A', 3, '测试创建通知通道'); } _addPushCallback(); }