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/functions/aicloudservices.gradle b/app/functions/aicloudservices.gradle
index 8e231d6f34..27db3d472c 100644
--- a/app/functions/aicloudservices.gradle
+++ b/app/functions/aicloudservices.gradle
@@ -18,8 +18,8 @@ project.dependencies {
em3Implementation rootProject.ext.dependencies.mogoaicloudserviceapk
fochtaxiImplementation rootProject.ext.dependencies.mogoaicloudserviceapk
fochbusImplementation rootProject.ext.dependencies.mogoaicloudserviceapk
- fPadLenovoOchTaxi rootProject.ext.dependencies.mogoaicloudserviceapk
- fPadLenovoOchBus rootProject.ext.dependencies.mogoaicloudserviceapk
+ fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.mogoaicloudserviceapk
+ fPadLenovoOchBusImplementation rootProject.ext.dependencies.mogoaicloudserviceapk
} else {
bydautoImplementation project(':foudations:mogo-aicloud-services-sdk')
phoneImplementation project(':foudations:mogo-aicloud-services-sdk')
diff --git a/app/functions/basedmap.gradle b/app/functions/basedmap.gradle
index 8c8272a1bd..f860cd50f0 100644
--- a/app/functions/basedmap.gradle
+++ b/app/functions/basedmap.gradle
@@ -8,8 +8,8 @@ project.dependencies {
f80xImplementation rootProject.ext.dependencies.mapcustom
fochtaxiImplementation rootProject.ext.dependencies.mapcustom
fochbusImplementation rootProject.ext.dependencies.mapcustom
- fPadLenovoOchTaxi rootProject.ext.dependencies.mapcustom
- fPadLenovoOchBus rootProject.ext.dependencies.mapcustom
+ fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.mapcustom
+ fPadLenovoOchBusImplementation rootProject.ext.dependencies.mapcustom
phoneImplementation rootProject.ext.dependencies.mapcustom
f8AmapImplementation rootProject.ext.dependencies.mapamap
diff --git a/app/functions/baseservices.gradle b/app/functions/baseservices.gradle
index 899c325566..d55ecb16bb 100644
--- a/app/functions/baseservices.gradle
+++ b/app/functions/baseservices.gradle
@@ -19,8 +19,8 @@ project.dependencies {
em3Implementation rootProject.ext.dependencies.mogobaseserviceapk
fochtaxiImplementation rootProject.ext.dependencies.mogobaseserviceapk
fochbusImplementation rootProject.ext.dependencies.mogobaseserviceapk
- fPadLenovoOchTaxi rootProject.ext.dependencies.mogobaseserviceapk
- fPadLenovoOchBus rootProject.ext.dependencies.mogobaseserviceapk
+ fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.mogobaseserviceapk
+ fPadLenovoOchBusImplementation rootProject.ext.dependencies.mogobaseserviceapk
} else {
bydautoImplementation project(':foudations:mogo-base-services-sdk')
phoneImplementation project(':foudations:mogo-base-services-sdk')
diff --git a/app/functions/bizguide.gradle b/app/functions/bizguide.gradle
index 3e99b88ceb..2c745ec561 100644
--- a/app/functions/bizguide.gradle
+++ b/app/functions/bizguide.gradle
@@ -15,8 +15,8 @@ project.dependencies {
em3Implementation rootProject.ext.dependencies.mogomoduleguide
fochtaxiImplementation rootProject.ext.dependencies.mogomoduleguide
fochbusImplementation rootProject.ext.dependencies.mogomoduleguide
- fPadLenovoOchTaxi rootProject.ext.dependencies.mogomoduleguide
- fPadLenovoOchBus rootProject.ext.dependencies.mogomoduleguide
+ fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.mogomoduleguide
+ fPadLenovoOchBusImplementation rootProject.ext.dependencies.mogomoduleguide
} else {
bydautoImplementation project(':modules:mogo-module-guide')
phoneImplementation project(':modules:mogo-module-guide')
diff --git a/app/functions/leftpanel.gradle b/app/functions/leftpanel.gradle
index 490bba4fca..f2db9e564a 100644
--- a/app/functions/leftpanel.gradle
+++ b/app/functions/leftpanel.gradle
@@ -19,8 +19,8 @@ project.dependencies {
em3Implementation rootProject.ext.dependencies.moduleleftpanelnoop
fochtaxiImplementation rootProject.ext.dependencies.moduleleftpanelnoop
fochbusImplementation rootProject.ext.dependencies.moduleleftpanelnoop
- fPadLenovoOchTaxi rootProject.ext.dependencies.moduleleftpanelnoop
- fPadLenovoOchBus rootProject.ext.dependencies.moduleleftpanelnoop
+ fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.moduleleftpanelnoop
+ fPadLenovoOchBusImplementation rootProject.ext.dependencies.moduleleftpanelnoop
phoneImplementation rootProject.ext.dependencies.moduleleftpanelnoop
} else {
bydautoImplementation project(':modules:mogo-module-left-panel')
diff --git a/app/functions/och.gradle b/app/functions/och.gradle
index 04832b3026..cdcffebd93 100644
--- a/app/functions/och.gradle
+++ b/app/functions/och.gradle
@@ -17,8 +17,8 @@ project.dependencies {
e8xxImplementation rootProject.ext.dependencies.mogoochnoop
fochtaxiImplementation rootProject.ext.dependencies.mogoochtaxi
fochbusImplementation rootProject.ext.dependencies.mogoochbus
- fPadLenovoOchTaxi rootProject.ext.dependencies.mogoochtaxi
- fPadLenovoOchBus rootProject.ext.dependencies.mogoochbus
+ fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.mogoochtaxi
+ fPadLenovoOchBusImplementation rootProject.ext.dependencies.mogoochbus
} else {
bydautoImplementation project(':OCH:mogo-och-noop')
phoneImplementation project(':OCH:mogo-och-noop')
diff --git a/app/functions/skin.gradle b/app/functions/skin.gradle
index fdb734d1d0..31cd21d8b1 100644
--- a/app/functions/skin.gradle
+++ b/app/functions/skin.gradle
@@ -17,8 +17,8 @@ project.dependencies {
e8xxImplementation rootProject.ext.dependencies.skinsupportimpl
fochtaxiImplementation rootProject.ext.dependencies.skinsupportimpl
fochbusImplementation rootProject.ext.dependencies.skinsupportimpl
- fPadLenovoOchTaxi rootProject.ext.dependencies.skinsupportimpl
- fPadLenovoOchBus rootProject.ext.dependencies.skinsupportimpl
+ fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.skinsupportimpl
+ fPadLenovoOchBusImplementation rootProject.ext.dependencies.skinsupportimpl
phoneImplementation rootProject.ext.dependencies.skinsupportimpl
f8xxImplementation rootProject.ext.dependencies.skinsupportlight
@@ -32,8 +32,8 @@ project.dependencies {
em3Implementation rootProject.ext.dependencies.skinsupportlight
fochtaxiImplementation rootProject.ext.dependencies.skinsupportlight
fochbusImplementation rootProject.ext.dependencies.skinsupportlight
- fPadLenovoOchTaxi rootProject.ext.dependencies.skinsupportlight
- fPadLenovoOchBus rootProject.ext.dependencies.skinsupportlight
+ fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.skinsupportlight
+ fPadLenovoOchBusImplementation rootProject.ext.dependencies.skinsupportlight
phoneImplementation rootProject.ext.dependencies.skinsupportlight
} else {
diff --git a/app/functions/tts.gradle b/app/functions/tts.gradle
index 6b1cac3804..4d0abe06d9 100644
--- a/app/functions/tts.gradle
+++ b/app/functions/tts.gradle
@@ -15,8 +15,8 @@ project.dependencies {
e8xxImplementation rootProject.ext.dependencies.ttszhi
fochtaxiImplementation rootProject.ext.dependencies.ttszhi
fochbusImplementation rootProject.ext.dependencies.ttszhi
- fPadLenovoOchTaxi rootProject.ext.dependencies.ttszhi
- fPadLenovoOchBus rootProject.ext.dependencies.ttszhi
+ fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.ttszhi
+ fPadLenovoOchBusImplementation rootProject.ext.dependencies.ttszhi
phoneImplementation rootProject.ext.dependencies.ttszhi
} else {
bydautoImplementation project(':tts:tts-di')
diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index a16f097341..af999d77fc 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,26 @@ 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_SELF_INNOVATE:
+ clientConfig.setThirdPartyAppKey("wbvpzgar");
+ break;
+ // 比亚迪
+ case DebugConfig.CAR_MACHINE_TYPE_BYD:
+ clientConfig.setThirdPartyAppKey("bydauto");
+ break;
+ // 衡阳-鹰眼项目
+ case DebugConfig.CAR_MACHINE_TYPE_LENOVO:
+ clientConfig.setThirdPartyAppKey("pfieouqg");
+ break;
+ }
// 设置应用服务AppId 长链、鉴权
clientConfig.setServiceAppId("com.mogo.launcher");
// 设置AI云平台分配给三方应用的签名密钥，需要从AI云平台申请
@@ -230,7 +241,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/gradle.properties b/gradle.properties
index 8610c31a25..40e096cda8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -146,7 +146,7 @@ MOGO_OCH_TAXI_VERSION=1.0.0
######## 外部依赖引用
# 车聊聊
-CARCHATTING_VERSION=2.2.321
+CARCHATTING_VERSION=2.2.324
# 车聊聊接口
CARCHATTINGPROVIDER_VERSION=1.1.11
# websocket
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/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml
index 2036bdec17..aef6b12987 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml
@@ -2,8 +2,9 @@
-
- 227px
+ 1100px
+ 227px
187px
30px
133px
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
index d274966902..6fc0fe97ff 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
@@ -97,7 +97,8 @@
80px
- 182px
+ 882px
+ 182px
64px
60px
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'