From 5368aec141da805103774c7ab39c55f3c3920d92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 13 Oct 2021 11:13:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BE=93=E5=87=BA=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=94=AF=E4=B8=80=E6=A0=87=E8=AF=86=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?SN=EF=BC=8CToken=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- .../eagle/core/function/hmi/ui/setting/DebugSettingView.kt | 5 ++++- .../main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt | 4 +++- foudations/mogo-commons/src/main/AndroidManifest.xml | 5 ++++- .../src/main/java/com/mogo/commons/network/Utils.java | 3 ++- foudations/mogo-utils/src/main/AndroidManifest.xml | 1 + 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index 0440c6ba07..ea791a701e 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -17,6 +17,7 @@ import com.mogo.eagle.core.function.call.obu.CallerOBUManager import com.mogo.eagle.core.function.call.obu.CallerObuListenerManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.util.AppUtils +import com.mogo.eagle.core.utilcode.util.DeviceUtils import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.map.MogoMap @@ -67,7 +68,9 @@ class DebugSettingView @JvmOverloads constructor( appConfigInfo.appVersionCode = AppUtils.getAppVersionCode() appConfigInfo.appVersionName = AppUtils.getAppVersionName() appConfigInfo.appPackageName = AppUtils.getAppPackageName() - appConfigInfo.devicesSN = MoGoAiCloudClient.getInstance().aiCloudClientConfig.sn + appConfigInfo.uniqueDeviceId = DeviceUtils.getUniqueDeviceId() + appConfigInfo.mogoSN = MoGoAiCloudClient.getInstance().aiCloudClientConfig.sn + appConfigInfo.mogoToken = MoGoAiCloudClient.getInstance().aiCloudClientConfig.token appConfigInfo.mapVersion = MogoMap.getInstance().mogoMap.mapVersion // 将数据绘制 diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt index ea5d82f0f2..1a70a97423 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt @@ -12,7 +12,9 @@ class AppConfigInfo { var appVersionCode = 0 var appVersionName: String? = null var appPackageName: String? = null - var devicesSN: String? = null + var uniqueDeviceId: String? = null + var mogoToken: String? = null + var mogoSN: String? = null /*依赖的SDK版本信息*/ var mapVersion: String? = null diff --git a/foudations/mogo-commons/src/main/AndroidManifest.xml b/foudations/mogo-commons/src/main/AndroidManifest.xml index ddb5e04218..b4d9c66476 100644 --- a/foudations/mogo-commons/src/main/AndroidManifest.xml +++ b/foudations/mogo-commons/src/main/AndroidManifest.xml @@ -1,2 +1,5 @@ + package="com.mogo.commons" > + + + diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java index 42fc7b5c52..436f3c192d 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java @@ -11,6 +11,7 @@ import android.telephony.gsm.GsmCellLocation; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.debug.DebugConfig; +import com.mogo.eagle.core.utilcode.util.DeviceUtils; import com.mogo.utils.DeviceIdUtils; import java.lang.reflect.InvocationTargetException; @@ -66,7 +67,7 @@ public class Utils { public static String getDevicesId() { if ( DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE ) { - return DeviceIdUtils.getDeviceId(AbsMogoApplication.getApp()); + return DeviceUtils.getUniqueDeviceId(); } return getSystemProperties( GSM_SERIAL ); } diff --git a/foudations/mogo-utils/src/main/AndroidManifest.xml b/foudations/mogo-utils/src/main/AndroidManifest.xml index 900eeecdf7..9febd3d8f7 100644 --- a/foudations/mogo-utils/src/main/AndroidManifest.xml +++ b/foudations/mogo-utils/src/main/AndroidManifest.xml @@ -2,4 +2,5 @@ package="com.mogo.utils" > +