diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 904f2b0e0d..e768208a07 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -25,8 +25,6 @@
-
-
@@ -91,7 +89,6 @@
-
diff --git a/app/build.gradle b/app/build.gradle
index 081adfd4df..7307c7ffd3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -229,7 +229,7 @@ android {
dimension "product"
buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
// 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
- buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
+ buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true'
manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue,CHANNEL_VALUE: "f8xx"]
// 是否使用高德sdk自定义导航
@@ -258,7 +258,7 @@ android {
dimension "product"
buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
// 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
- buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
+ buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true'
manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fochtaxi"]
// 是否使用高德sdk自定义导航
@@ -287,7 +287,7 @@ android {
dimension "product"
buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
// 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
- buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
+ buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true'
manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue,CHANNEL_VALUE: "fochbus"]
// 是否使用高德sdk自定义导航
@@ -707,7 +707,6 @@ dependencies {
implementation project(':modules:mogo-module-search')
implementation project(':modules:mogo-module-authorize')
implementation project(':modules:mogo-module-service')
-// implementation project(':modules:mogo-module-obu')
implementation project(':modules:mogo-module-splash')
implementation project(':modules:mogo-module-service')
implementation project(':modules:mogo-module-v2x')
@@ -723,14 +722,12 @@ dependencies {
apply from: "./functions/aicloudservices.gradle"
apply from: "./functions/basedmap.gradle"
apply from: "./functions/perform.gradle"
-// apply from: "./functions/baseservices.gradle"
apply from: "./functions/socketpush.gradle"
apply from: "./functions/leftpanel.gradle"
apply from: "./functions/skin.gradle"
apply from: "./functions/crashreport.gradle"
apply from: "./functions/widgets.gradle"
apply from: "./functions/tts.gradle"
-// apply from: "./functions/httpdns.gradle"
apply from: "./functions/backwidget.gradle"
apply from: "./functions/mediaui.gradle"
apply from: "./functions/bizguide.gradle"
diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index a16f097341..a25c82bec0 100644
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -3,7 +3,6 @@ package com.mogo.launcher;
import android.content.Context;
import android.content.Intent;
import android.os.Process;
-import android.text.TextUtils;
import android.util.Log;
import com.alibaba.android.arouter.launcher.ARouter;
@@ -34,7 +33,6 @@ import com.mogo.service.MogoServicePaths;
import com.mogo.test.crashreport.ITestCrashReportProvider;
import com.mogo.test.crashreport.upgrade.UpgradeReportProvider;
import com.mogo.utils.ProcessUtils;
-import com.mogo.utils.UiThreadHandler;
import com.mogo.utils.httpdns.HttpSimpleLocation;
import com.mogo.utils.logger.LogLevel;
import com.mogo.utils.logger.Logger;
@@ -213,13 +211,25 @@ public class MogoApplication extends AbsMogoApplication {
clientConfig.setNetMode(MogoHttpDnsConfig.HTTP_DNS_ENV_RELEASE);
}
// 设置是否是第三APP登录
- clientConfig.setThirdLogin(false);
+ clientConfig.setThirdLogin(DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE);
// 设置是否输出日志
clientConfig.setShowDebugLog(true);
// 设置是否是直播推流的主播
clientConfig.setAnchor(false);
// 设置从蘑菇AI开放平台获取的APPKey
- clientConfig.setThirdPartyAppKey("wbvpzgar");
+ switch (DebugConfig.getCarMachineType()) {
+ // 衡阳-鹰眼项目
+ case DebugConfig.CAR_MACHINE_TYPE_LENOVO:
+ clientConfig.setThirdPartyAppKey("pfieouqg");
+ break;
+ // 比亚迪
+ case DebugConfig.CAR_MACHINE_TYPE_BYD:
+ clientConfig.setThirdPartyAppKey("bydauto");
+ break;
+ default:
+ // 默认使用智慧驾驶的AppKey
+ clientConfig.setThirdPartyAppKey("wbvpzgar");
+ }
// 设置应用服务AppId 长链、鉴权
clientConfig.setServiceAppId("com.mogo.launcher");
// 设置AI云平台分配给三方应用的签名密钥，需要从AI云平台申请
@@ -230,7 +240,6 @@ public class MogoApplication extends AbsMogoApplication {
// 设置是否使用MoGoAiCloud SDK内部定位进行实时数据上报
clientConfig.setIsUseExternalLocation(true);
-
// 设置DNS经纬度位置
clientConfig.setIHttpDnsCurrentLocation(new IHttpDnsCurrentLocation() {
@Override
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 90bc9e507d..6e3225295c 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
@@ -2,17 +2,15 @@ package com.mogo.commons.network;
import android.Manifest;
import android.content.Context;
-import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.telephony.CellLocation;
import android.telephony.TelephonyManager;
import android.telephony.cdma.CdmaCellLocation;
import android.telephony.gsm.GsmCellLocation;
-import android.text.TextUtils;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.commons.debug.DebugConfig;
-import com.mogo.utils.storage.SharedPrefsMgr;
+import com.mogo.utils.DeviceIdUtils;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -66,9 +64,8 @@ public class Utils {
public static final String PROPERTIES = "android.os.SystemProperties";
public static String getSn() {
-
if ( DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE ) {
- return SharedPrefsMgr.getInstance( AbsMogoApplication.getApp() ).getString( "allocated_sn" );
+ return DeviceIdUtils.getDeviceId(AbsMogoApplication.getApp());
}
return getSystemProperties( GSM_SERIAL );
}
diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle
index 0b22d19eb9..246dc89190 100644
--- a/libraries/map-custom/build.gradle
+++ b/libraries/map-custom/build.gradle
@@ -67,7 +67,7 @@ dependencies {
implementation project(':foudations:mogo-commons')
}
- implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.24'
+ implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.25'
// implementation 'com.zhidaoauto.machine:map:1.0.0-vr-test-3.4'
}
diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
index d6cefd890a..3297bf8e5d 100644
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
@@ -766,7 +766,7 @@ public class AMapViewWrapper implements IMogoMapView,
if (!mIsDelayed) {
mIsDelayed = true;
UiThreadHandler.postDelayed(() -> {
- Logger.d(TAG, "倒计时结束");
+ //Logger.d(TAG, "倒计时结束");
mIsFirstLocated = false;
}, 5_000L);
}
diff --git a/modules.txt b/modules.txt
index a5a9ea1689..0abf7fea3b 100644
--- a/modules.txt
+++ b/modules.txt
@@ -45,7 +45,6 @@
:modules:mogo-module-left-panel
:modules:mogo-module-left-panel-noop
:foudations:mogo-base-services-apk
-:foudations:mogo-base-services-sdk
:modules:mogo-module-push-base
:modules:mogo-module-push-noop
:modules:mogo-module-push
diff --git a/settings.gradle b/settings.gradle
index 5513b6d948..108f29c378 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -25,8 +25,6 @@ include ':skin:mogo-skin-support-noop'
include ':skin:mogo-skin-support'
include ':modules:mogo-module-widgets'
include ':modules:mogo-module-monitor'
-include ':foudations:mogo-base-services-apk'
-include ':foudations:mogo-base-services-sdk'
include ':modules:mogo-module-splash-noop'
include ':modules:mogo-module-splash'
include ':modules:mogo-module-left-panel-noop'