From 95361ebc410e9077e434d73ec136a07a3adcd8b7 Mon Sep 17 00:00:00 2001 From: donghongyu-pc Date: Tue, 5 Nov 2024 19:36:07 +0800 Subject: [PATCH] =?UTF-8?q?[6.7.3]=201=E3=80=81=E5=A2=9E=E5=8A=A0countly?= =?UTF-8?q?=E6=9B=B4=E6=94=B9deviceID=E7=9A=84=E6=97=B6=E6=9C=BA=E3=80=82?= =?UTF-8?q?=E4=BF=9D=E8=AF=81=E4=B8=8A=E6=8A=A5=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E4=B8=8E=E8=98=91=E8=8F=87=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E7=9A=84SN=E5=AF=B9=E5=BA=94=E4=B8=8A=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 3 --- .../core/function/startup/stageone/HttpDnsStartUp.kt | 8 ++++++++ foudations/mogo-commons/build.gradle | 3 +++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index dfc40af614..5603bbbcb4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -227,9 +227,6 @@ dependencies { implementation project(':OCH:facade') - implementation 'com.mogo.cloud:countly-sdk:1.4.7.49.18-debug' - implementation 'com.mogo.cloud:countly-sdk-native:1.4.7.49.18-debug' - androidTestImplementation rootProject.ext.dependencies.androidx_test_core androidTestImplementation rootProject.ext.dependencies.androidx_test_core_ktx androidTestImplementation rootProject.ext.dependencies.androidx_unit_ext diff --git a/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt index f0c53e67a8..be67dfc23c 100644 --- a/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt +++ b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt @@ -43,6 +43,7 @@ import com.mogo.eagle.core.utilcode.util.ThreadPoolService import com.mogo.eagle.core.utilcode.util.TimeUtils import com.rousetime.android_startup.AndroidStartup import com.zhjt.service.chain.ChainLog +import ly.count.android.sdk.Countly import kotlin.properties.Delegates class HttpDnsStartUp : AndroidStartup(), IMoGoCloudListener { @@ -237,6 +238,13 @@ class HttpDnsStartUp : AndroidStartup(), IMoGoCloudListener { uploadLocPerFiveSecond() gotToken = true } + + try { + // 通过服务器合并更改设备 ID, 首次安装app的设备没有蘑菇sn，临时用devicesID，待生成蘑菇ID后修改已上传的信息 + Countly.sharedInstance().deviceId().changeWithMerge(sn) + } catch (e: Exception) { + e.printStackTrace() + } } override fun onError(code: Int, msg: String) { diff --git a/foudations/mogo-commons/build.gradle b/foudations/mogo-commons/build.gradle index f182270d1b..95da3f4ef5 100644 --- a/foudations/mogo-commons/build.gradle +++ b/foudations/mogo-commons/build.gradle @@ -70,6 +70,9 @@ dependencies { } + api 'com.mogo.cloud:countly-sdk:1.4.7.49.18-debug' + api 'com.mogo.cloud:countly-sdk-native:1.4.7.49.18-debug' + } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() \ No newline at end of file