From f78b2701f7f3f97be41dc4b5b6cb66fd2d5e4686 Mon Sep 17 00:00:00 2001 From: Daisy <> Date: Mon, 18 Mar 2024 17:15:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E6=9F=A5=E6=96=AF=E5=87=AF=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=EF=BC=8C=E4=B8=8D=E8=83=BD=E6=8E=A5=E6=94=B6=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E9=97=AE=E9=A2=98=20=E5=B9=B6=E4=BF=AE=E5=A4=8D=20?= =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E5=AE=89=E5=8D=93=E6=8E=A8=E9=80=81=E7=9A=84?= =?UTF-8?q?json=E6=96=87=E4=BB=B6=20=E5=B0=8F=E7=B1=B3=E8=BE=85=E5=8A=A9?= =?UTF-8?q?=E9=80=9A=E9=81=93=E7=9A=84=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=8F=8A=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../android/app/aliyun-emas-services.json | 46 +++++++++---------- star_lock/android/app/build.gradle | 4 +- .../android/app/src/main/AndroidManifest.xml | 12 ++--- .../skychip}/lock/MainActivity.kt | 5 +- .../skychip}/lock/MyMessageReceiver.kt | 2 +- .../com/skychip/lock/PopupPushActivity.kt | 25 ++++++++++ star_lock/lib/app.dart | 30 ++++++++++-- star_lock/lib/main.dart | 2 - .../main/lockMian/lockMain/lockMain_page.dart | 32 ++----------- star_lock/lib/tools/xs_aliyunPush.dart | 20 ++++++-- 10 files changed, 109 insertions(+), 69 deletions(-) rename star_lock/android/app/src/main/kotlin/{cn/starlock => com/skychip}/lock/MainActivity.kt (95%) rename star_lock/android/app/src/main/kotlin/{cn/starlock => com/skychip}/lock/MyMessageReceiver.kt (98%) create mode 100644 star_lock/android/app/src/main/kotlin/com/skychip/lock/PopupPushActivity.kt diff --git a/star_lock/android/app/aliyun-emas-services.json b/star_lock/android/app/aliyun-emas-services.json index 6079f77f..66605471 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":"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" -}, + "emas.appKey":"334068743", + "emas.appSecret":"64de537f14984159a66ada10e54c6b63", + "emas.packageName":"com.skychip.lock", + "hotfix.idSecret":"334068743-1", + "hotfix.rsaSecret":"MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCrcYP7FeYbeYakUMBa2Z5PtVh7LsuS+CfAM6GUjNUDByktVz2lFmZatFvMHn7xuxg6rgsRMrZ9IFziLC4xGltwHhSsCkr6cNoVZODAIXpowq+/Uwg3Gdbw/SOOT5dV70h5Dt3ztORVlobghCb5D74jgn6pqQVmhpSbrS+7zZTzcyKhsvRbQEx3tLa98uCDdIOjym4Jk0+dANCpVOTCPYbQtxewUKZv4ZcpIF0vwqVmAmNjjK04Bp6rhpM1pSxfIo3k6jwng9E+9iwmQkjk7NsexqyzXGmBywUBpSqFBo4bLLrGByqN/kAMAXpchRCBpx9Q311RHJb1T98n0wRimT5HAgMBAAECggEAClNE2ptgB2mTRVQjsZUHps9KK+kOk6RkaHvzkEnHDm6g+T0W1ll6Ap54JNv1U0OsWuRegEOon/KSBYEZqxVmSmNVZWMdTuX7DGzN6GRbxfFruj8a8I6a1lq4iHqcp61IlRnjHilX0xvEtcLfwgJDtknGrRsj2x/h1Vph1JK2FM9RqupT7O7Jy0ehkpVeyGWYLHcFKFThECRPFLHqAwBIY3aU6wp1G8NxkDRxj+C2cF4/cIEHFa7ZsEmVpNOI01qjntlFylNumuR+Ehz6DBKKT72eeVz+gMpnHs+ILGe0ov54soMobBTisw2dFdP9StHnnjoRwOH/KZx3iySerCqK6QKBgQD8cYrCvGlNl0x/fen1Er0Lfks5yVoYQ1ilMag82W8odNjBlcRFwZ+tCjowh55sA2tlQ+cYJxIhQXa7ukk/ILCz9DIHgmwJy4xDRrXonuUKRIkG7859H2/cA2hFAIgNIl6GxJXhGucnWarwbtgX5I7fdLgWAQrAAPjYgET9E4fJfQKBgQCt29cQp63keXKaV2NPVr+axwyOpF0wBQ5frdUVEsBE0hvtkymWThmdnAMuhFJA9+qb4LPxYUFS/MGPl01KhNoU/t2nJdMIWqGPt5eFf+lvzfyk/Jmr7YzpvcpKgfj0orrlIz5gZO5QajGwjlPYtxcu7FLdh7w46uT+P4J+28ySEwKBgQCn9JcAt0BMalRwIoMNFdmHExDTsp5ptCz/Q4mOao/lV9B7A7zhOFCXXU2XyjNh4+iJKGNRk3UhgR+RCQEAqixGnjrG+kQNREre2+XdjhIPAcg1QEmev9K5i97MwezC6FIB0jtx2Gdgq+zqKKVHSD6yd0KfCTRwyHTH/pdn1Z2rNQKBgHeF/nmdvUeoUqhW0ZhWvAztMO3Tg5kisLoIaMg/Bt2JUNfoZxvE/4lCG1HceCvgBHM7bJnSUbV6vJs52lITuVXbzYg+0bEZlZ6XCd0mjdZmV30Zh5ASFOEQsES+y+drBG/I5fYhDVFNYHHPt0bywEZrA6D20uiSW/GKuez6sM3vAoGATm3cLmUCauphKbaVjUB8bh6w9fvgFJnU5c12wytCy9D6TyxtHO6vL1r/KN51ejp5Ht6MuqOBTJztDcXjLbQMBvmw/SRSqQfeiBzAnUDt9MTy2c8GH135jlhBxgSF6JpeQ56uIXc4/rdM5XH5M5qmM7HJtKcLjlC7GCDIhWEvZM0=", + "httpdns.accountId":"100674", + "httpdns.secretKey":"6cd4984095d53f6f311424cc9299257b", + "appmonitor.tlog.rsaSecret":"MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCW084k+HG1OOaSY2B2N6aj4AOz8RhInqlaFr7BbQrqmPwzHC2Co0N/jmbBbxGP7oPsy7yF9zn/hJiuvzlQfjtK85IXAYUKj7IcLashQUT5lrGYlObCznH2qOPkw8OP+cboP51uWIeXFMYatwXRR05vtWVLEeUhaFE1onzQtcG0YwIDAQAB", + "appmonitor.rsaSecret":"MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCW084k+HG1OOaSY2B2N6aj4AOz8RhInqlaFr7BbQrqmPwzHC2Co0N/jmbBbxGP7oPsy7yF9zn/hJiuvzlQfjtK85IXAYUKj7IcLashQUT5lrGYlObCznH2qOPkw8OP+cboP51uWIeXFMYatwXRR05vtWVLEeUhaFE1onzQtcG0YwIDAQAB" +}, "services": { "hotfix_service":{ - "status":0, - "version":"3.3.9" + "status":1, + "version":"3.4.0" }, "ha-adapter_service":{ - "status":0, + "status":1, "version":"1.2.3.0-open" }, "feedback_service":{ - "status":0, + "status":1, "version":"3.4.2" }, "tlog_service":{ - "status":0, + "status":1, "version":"1.1.7.0-open" }, "httpdns_service":{ - "status":0, - "version":"2.3.3" + "status":1, + "version":"2.3.5" }, "apm_service":{ - "status":0, + "status":1, "version":"1.1.3.0-open" }, "man_service":{ - "status":0, + "status":1, "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 de479b6e..93273b5f 100644 --- a/star_lock/android/app/build.gradle +++ b/star_lock/android/app/build.gradle @@ -163,5 +163,7 @@ 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' + implementation 'com.aliyun.ams:alicloud-android-push:3.8.7' + //小米依赖 + implementation 'com.aliyun.ams:alicloud-android-third-push-xiaomi:3.8.7' } diff --git a/star_lock/android/app/src/main/AndroidManifest.xml b/star_lock/android/app/src/main/AndroidManifest.xml index 06212362..25941a2b 100644 --- a/star_lock/android/app/src/main/AndroidManifest.xml +++ b/star_lock/android/app/src/main/AndroidManifest.xml @@ -38,7 +38,7 @@ - + - + - + @@ -68,8 +68,8 @@ - - + + @@ -79,7 +79,7 @@ - + diff --git a/star_lock/android/app/src/main/kotlin/cn/starlock/lock/MainActivity.kt b/star_lock/android/app/src/main/kotlin/com/skychip/lock/MainActivity.kt similarity index 95% rename from star_lock/android/app/src/main/kotlin/cn/starlock/lock/MainActivity.kt rename to star_lock/android/app/src/main/kotlin/com/skychip/lock/MainActivity.kt index 59482b41..f3c4205b 100644 --- a/star_lock/android/app/src/main/kotlin/cn/starlock/lock/MainActivity.kt +++ b/star_lock/android/app/src/main/kotlin/com/skychip/lock/MainActivity.kt @@ -1,4 +1,4 @@ -package cn.starlock.lock +package com.skychip.lock import android.content.Intent import android.net.Uri @@ -11,12 +11,15 @@ import io.flutter.plugin.common.MethodChannel import io.flutter.embedding.engine.FlutterEngine; import io.flutter.plugins.GeneratedPluginRegistrant import android.bluetooth.BluetoothAdapter; +import com.alibaba.sdk.android.push.register.MiPushRegister class MainActivity: FlutterActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) initAliyunPushService() + MiPushRegister.register(applicationContext, "2882303761520287291", "5352028744291"); + GeneratedPluginRegistrant.registerWith(flutterEngine!!) MethodChannel(flutterEngine?.dartExecutor!!.binaryMessenger, "starLockFlutterSend").setMethodCallHandler { call, result -> if (call.method == "loadNativeShare") { diff --git a/star_lock/android/app/src/main/kotlin/cn/starlock/lock/MyMessageReceiver.kt b/star_lock/android/app/src/main/kotlin/com/skychip/lock/MyMessageReceiver.kt similarity index 98% rename from star_lock/android/app/src/main/kotlin/cn/starlock/lock/MyMessageReceiver.kt rename to star_lock/android/app/src/main/kotlin/com/skychip/lock/MyMessageReceiver.kt index d57ed3b1..4b58b259 100644 --- a/star_lock/android/app/src/main/kotlin/cn/starlock/lock/MyMessageReceiver.kt +++ b/star_lock/android/app/src/main/kotlin/com/skychip/lock/MyMessageReceiver.kt @@ -1,4 +1,4 @@ -package cn.starlock.lock +package com.skychip.lock import android.content.Context import android.util.Log diff --git a/star_lock/android/app/src/main/kotlin/com/skychip/lock/PopupPushActivity.kt b/star_lock/android/app/src/main/kotlin/com/skychip/lock/PopupPushActivity.kt new file mode 100644 index 00000000..85442a7b --- /dev/null +++ b/star_lock/android/app/src/main/kotlin/com/skychip/lock/PopupPushActivity.kt @@ -0,0 +1,25 @@ +import android.os.Bundle +import android.util.Log +import com.alibaba.sdk.android.push.AndroidPopupActivity + +class PopupPushActivity : AndroidPopupActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + } + + /** + * 实现通知打开回调方法，获取通知相关信息 + * @param title 标题 + * @param summary 内容 + * @param extMap 额外参数 + */ + override fun onSysNoticeOpened(title: String, summary: String, extMap: Map) { + Log.e( + "PopupPushActivity", + "OnMiPushSysNoticeOpened, title: $title, content: $summary, extMap: $extMap" + ) } + + companion object { + const val TAG = "PopupPushActivity" + } +} \ No newline at end of file diff --git a/star_lock/lib/app.dart b/star_lock/lib/app.dart index 9dee37e3..ff5793ef 100644 --- a/star_lock/lib/app.dart +++ b/star_lock/lib/app.dart @@ -1,3 +1,4 @@ +import 'package:aliyun_push/aliyun_push.dart'; import 'package:flutter/material.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; @@ -7,6 +8,8 @@ import 'package:permission_handler/permission_handler.dart'; import 'package:star_lock/flavors.dart'; import 'package:star_lock/tools/app_manager.dart'; import 'package:star_lock/tools/bindings/app_binding.dart'; +import 'package:star_lock/tools/storage.dart'; +import 'package:star_lock/tools/xs_aliyunPush.dart'; import 'package:star_lock/translations/app_dept.dart'; import 'package:star_lock/translations/trans_lib.dart'; @@ -16,8 +19,6 @@ import 'baseWidget.dart'; import 'tools/appRouteObserver.dart'; import 'dart:io'; -import 'versionUndate/versionUndateTool.dart'; - class MyApp extends StatefulWidget { const MyApp({GlobalKey? key}) : super(key: key); @@ -100,7 +101,7 @@ class _MyAppState extends State with WidgetsBindingObserver, BaseWidget { void initState() { super.initState(); WidgetsBinding.instance.addObserver(this); - + initFlutterAliyunPush(); } @override @@ -145,3 +146,26 @@ Future getMicrophonePermission() async { } return false; } + +//初始化阿里云推送 +Future initFlutterAliyunPush() async { + final data = await Storage.getString(saveUserLoginData); + if (data != null) { + final aliyunPush = AliyunPush(); + XSAliyunPushProvider().init(aliyunPush); + XSAliyunPushProvider().initAliyunPush(); + + if (Platform.isAndroid) { + XSAliyunPushProvider().initAliyunThirdPush(); + } + + //暂使用DeviceID推送 + aliyunPush.getDeviceId().then((deviceId) async { + print('得到的DeviceId$deviceId'); + if (deviceId.isNotEmpty) { + XSAliyunPushProvider() + .pushBindDeviceID(deviceId, Platform.isAndroid ? 10 : 20); + } + }); + } +} diff --git a/star_lock/lib/main.dart b/star_lock/lib/main.dart index ff3eacf9..652ef00a 100644 --- a/star_lock/lib/main.dart +++ b/star_lock/lib/main.dart @@ -10,8 +10,6 @@ import 'app_settings/app_settings.dart'; import 'tools/store_service.dart'; import 'package:get/get.dart'; -import 'versionUndate/versionUndateTool.dart'; - // 该文件不可作为编译入口，请查看 flavorizr.yaml 中的说明 FutureOr main() async { await _setCommonServices(); diff --git a/star_lock/lib/main/lockMian/lockMain/lockMain_page.dart b/star_lock/lib/main/lockMian/lockMain/lockMain_page.dart index d3946e64..db44b226 100644 --- a/star_lock/lib/main/lockMian/lockMain/lockMain_page.dart +++ b/star_lock/lib/main/lockMian/lockMain/lockMain_page.dart @@ -1,7 +1,4 @@ import 'dart:async'; -import 'dart:io'; - -import 'package:aliyun_push/aliyun_push.dart'; import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; @@ -9,7 +6,6 @@ import 'package:get/get.dart'; import 'package:star_lock/app_settings/app_colors.dart'; import 'package:star_lock/tools/noData.dart'; import 'package:star_lock/tools/submitBtn.dart'; -import 'package:star_lock/tools/xs_aliyunPush.dart'; import '../../../appRouters.dart'; import '../../../baseWidget.dart'; @@ -53,7 +49,6 @@ class _StarLockMainPageState extends State with BaseWidget { WidgetsBinding.instance!.addPostFrameCallback((_) { getHttpData(); }); - initAliyunPush(); _initLoadDataAction(); } @@ -146,12 +141,14 @@ class _StarLockMainPageState extends State with BaseWidget { Storage.setBool(ifIsDemoModeOrNot, false); returnWidget = LockDetailPage( isOnlyOneData: true, - lockListInfoItemEntity: state.lockListInfoEntity.value.data!.groupList![0].lockList![0]); + lockListInfoItemEntity: state + .lockListInfoEntity.value.data!.groupList![0].lockList![0]); break; case 2: // 有多条数据 Storage.setBool(ifIsDemoModeOrNot, false); - returnWidget = LockListPage(lockListInfoGroupEntity: state.lockListInfoEntity.value.data!); + returnWidget = LockListPage( + lockListInfoGroupEntity: state.lockListInfoEntity.value.data!); break; default: returnWidget = NoData(); @@ -236,27 +233,6 @@ class _StarLockMainPageState extends State with BaseWidget { void onHide() {} - //初始化阿里云推送 - void initAliyunPush() { - final aliyunPush = AliyunPush(); - XSAliyunPushProvider().init(aliyunPush); - XSAliyunPushProvider().initAliyunPush(); - - if (Platform.isAndroid) { - XSAliyunPushProvider().initAliyunThirdPush(); - } - - //暂使用DeviceID推送 - aliyunPush.getDeviceId().then((deviceId) async { - // print('得到的DeviceId$deviceId'); - final data = await Storage.getString(saveUserLoginData); - if (data!.isNotEmpty && deviceId.isNotEmpty) { - XSAliyunPushProvider() - .pushBindDeviceID(deviceId, Platform.isAndroid ? 10 : 20); - } - }); - } - late StreamSubscription _teamEvent; void _initLoadDataAction() { _teamEvent = eventBus.on().listen((event) { diff --git a/star_lock/lib/tools/xs_aliyunPush.dart b/star_lock/lib/tools/xs_aliyunPush.dart index 11ff6e0b..600dfc94 100644 --- a/star_lock/lib/tools/xs_aliyunPush.dart +++ b/star_lock/lib/tools/xs_aliyunPush.dart @@ -1,6 +1,7 @@ import 'dart:io'; import 'package:aliyun_push/aliyun_push.dart'; +import 'package:star_lock/flavors.dart'; import 'package:star_lock/network/api_repository.dart'; import 'package:star_lock/tools/baseGetXController.dart'; @@ -71,12 +72,23 @@ class XSAliyunPushProvider { Future initAliyunPush() async { String appKey; String appSecret; + if (Platform.isIOS) { - appKey = "333904046"; - appSecret = "3eead09a7fc7416cb4082319aa6f48c6"; + if (F.appFlavor == Flavor.sky) { + appKey = "334068745"; + appSecret = "bee9c200835e4951a85dc8709c319560"; + } else { + appKey = "333904046"; + appSecret = "3eead09a7fc7416cb4082319aa6f48c6"; + } } else { - appKey = "333904040"; - appSecret = "c316965fe0a74fc9a481a5c44a535dc2"; + if (F.appFlavor == Flavor.sky) { + appKey = "334068743"; + appSecret = "64de537f14984159a66ada10e54c6b63"; + } else { + appKey = "333904040"; + appSecret = "c316965fe0a74fc9a481a5c44a535dc2"; + } } _aliyunPush