[6.7.3]

1、增加countly更改deviceID的时机。保证上报的问题可以与蘑菇平台的SN对应上。

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

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<Boolean>(), IMoGoCloudListener {
@@ -237,6 +238,13 @@ class HttpDnsStartUp : AndroidStartup<Boolean>(), 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) {

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()