From da09ca77e5f92cc5c8b0e8e18fc5150baa90c1b5 Mon Sep 17 00:00:00 2001
From: donghongyu <donghongyu@zhidaoauto.om>
Date: Tue, 5 Nov 2024 19:31:19 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=8CSkin=E3=80=8D=201=E3=80=81=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=90=88=E5=B9=B6id=E7=9A=84=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=EF=BC=9B=202=E3=80=81=E4=BF=AE=E5=A4=8D=E5=B4=A9=E6=BA=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                      | 10 +++++-----
 app/src/main/java/com/mogo/cloud/MainActivity.java    |  4 ++++
 app/src/main/java/com/mogo/cloud/MoGoApplication.java |  6 ++++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1cc3036..ac22fe6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -32,23 +32,23 @@
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true">
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
         <activity
             android:name=".NSDNettyActivity"
             android:exported="false" />
         <activity
-            android:exported="true"
             android:name=".MainActivity"
             android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"
             android:enabled="true"
+            android:exported="true"
             android:hardwareAccelerated="true"
             android:launchMode="singleTask"
             android:resizeableActivity="false"
-            android:screenOrientation="landscape"
             android:resumeWhilePausing="true"
+            android:screenOrientation="landscape"
             android:stateNotNeeded="true"
-            android:windowSoftInputMode="adjustPan|stateHidden"
-            android:theme="@style/AppTheme">
+            android:windowSoftInputMode="adjustPan|stateHidden">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/com/mogo/cloud/MainActivity.java b/app/src/main/java/com/mogo/cloud/MainActivity.java
index 49fca3e..7eadaa1 100644
--- a/app/src/main/java/com/mogo/cloud/MainActivity.java
+++ b/app/src/main/java/com/mogo/cloud/MainActivity.java
@@ -30,6 +30,8 @@ import com.mogo.v2x.event.V2XEvent;
 
 import java.util.concurrent.TimeUnit;
 
+import ly.count.android.sdk.Countly;
+
 public class MainActivity extends AppCompatActivity {
 
     private static final String TAG = "MainActivity";
@@ -321,6 +323,8 @@ public class MainActivity extends AppCompatActivity {
                     btnV2XFunctionTest.setVisibility(View.VISIBLE);
                 }
                 initPassportInfo();
+                // 通过服务器合并更改设备 ID, 首次安装app的设备没有蘑菇sn，临时用devicesID，待生成蘑菇ID后修改已上传的信息
+                Countly.sharedInstance().deviceId().changeWithMerge(sn);
             }
 
             @Override
diff --git a/app/src/main/java/com/mogo/cloud/MoGoApplication.java b/app/src/main/java/com/mogo/cloud/MoGoApplication.java
index 01ddd01..4dd5dc0 100644
--- a/app/src/main/java/com/mogo/cloud/MoGoApplication.java
+++ b/app/src/main/java/com/mogo/cloud/MoGoApplication.java
@@ -91,8 +91,10 @@ public class MoGoApplication extends MultiDexApplication {
                         COUNTLY_APP_KEY,
                         COUNTLY_SERVER_URL
                 );
-        // 设置设备唯一标志
-        countlyConfig.setDeviceId("202309055W83WSZ")
+        // 设置设备唯一标志,后面获取了蘑菇平台的SN后将重新设置
+        // 通过服务器合并更改设备 ID, 首次安装app的设备没有蘑菇sn，临时用devicesID，待生成蘑菇ID后修改已上传的信息
+        // Countly.sharedInstance().deviceId().changeWithMerge(sn);
+        countlyConfig.setDeviceId("2502a9a72cb281b8")
                 // 获取您在 Countly 服务器中设置的一些配置
                 .enableServerConfiguration()
                 // 自动视图跟踪