diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 904f2b0e0d..fd91e149ef 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -25,8 +25,6 @@
-
-
diff --git a/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1600/dimens.xml b/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1440/dimens.xml
similarity index 100%
rename from OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1600/dimens.xml
rename to OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1440/dimens.xml
diff --git a/OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1600/dimens.xml b/OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1440/dimens.xml
similarity index 100%
rename from OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1600/dimens.xml
rename to OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1440/dimens.xml
diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_base_icon_not_in_autopilot.png b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_mogo_och_base_icon_not_in_autopilot.png
similarity index 100%
rename from OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_base_icon_not_in_autopilot.png
rename to OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_mogo_och_base_icon_not_in_autopilot.png
diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_icon_arrived_station.png b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_mogo_och_icon_arrived_station.png
similarity index 100%
rename from OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_icon_arrived_station.png
rename to OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_mogo_och_icon_arrived_station.png
diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_icon_arriving_station.png b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_mogo_och_icon_arriving_station.png
similarity index 100%
rename from OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_icon_arriving_station.png
rename to OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_mogo_och_icon_arriving_station.png
diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_base_slide_block.png b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_och_base_slide_block.png
similarity index 100%
rename from OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_base_slide_block.png
rename to OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_och_base_slide_block.png
diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_dot_line.png b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_och_dot_line.png
similarity index 100%
rename from OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_dot_line.png
rename to OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_och_dot_line.png
diff --git a/OCH/mogo-och/src/main/res/values-xhdpi-2560x1600/dimens.xml b/OCH/mogo-och/src/main/res/values-xhdpi-2560x1440/dimens.xml
similarity index 100%
rename from OCH/mogo-och/src/main/res/values-xhdpi-2560x1600/dimens.xml
rename to OCH/mogo-och/src/main/res/values-xhdpi-2560x1440/dimens.xml
diff --git a/app/build.gradle b/app/build.gradle
index f2d477d65d..7307c7ffd3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -251,6 +251,64 @@ android {
// 是否需要使用工控机的rtk定位
buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'true'
}
+ // f系列-网约车-出租车
+ fPadLenovoOchTaxi {
+ // 应用包名
+ applicationId rootProject.ext.android.fLauncherApplicationId
+ dimension "product"
+ buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
+ // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为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自定义导航
+ buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false'
+ // 是否支持换肤
+ buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true'
+ // 是否支持查询导航目的地车友
+ buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true'
+ // 是否支持桌面卡片刷新
+ buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false'
+ // 是否基于地图
+ buildConfigField 'boolean', 'IS_MAP_BASED', 'true'
+ // 是否加载引导模块
+ buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'false'
+ // 分享时是否隐藏 adas
+ buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false'
+ // 是否需要实时上报坐标
+ buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true'
+ // 是否需要使用工控机的rtk定位
+ buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'true'
+ }
+ // f系列-网约车-小巴车
+ fPadLenovoOchBus {
+ // 应用包名
+ applicationId rootProject.ext.android.fLauncherApplicationId
+ dimension "product"
+ buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
+ // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为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自定义导航
+ buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false'
+ // 是否支持换肤
+ buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true'
+ // 是否支持查询导航目的地车友
+ buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true'
+ // 是否支持桌面卡片刷新
+ buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false'
+ // 是否基于地图
+ buildConfigField 'boolean', 'IS_MAP_BASED', 'true'
+ // 是否加载引导模块
+ buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'false'
+ // 分享时是否隐藏 adas
+ buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false'
+ // 是否需要实时上报坐标
+ buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true'
+ // 是否需要使用工控机的rtk定位
+ buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'true'
+ }
// f系列-分体机
phone {
// 应用包名
@@ -649,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')
@@ -665,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/abiFilters.gradle b/app/functions/abiFilters.gradle
index 8243a5905d..d66359ad19 100644
--- a/app/functions/abiFilters.gradle
+++ b/app/functions/abiFilters.gradle
@@ -37,6 +37,24 @@ project.android.productFlavors {
}
}
}
+ // 联想Pad
+ fPadLenovoOchTaxi {
+ externalNativeBuild {
+ ndk {
+ // 设置支持的SO库架构
+ abiFilters "arm64-v8a"
+ }
+ }
+ }
+ // 联想Pad
+ fPadLenovoOchBus {
+ externalNativeBuild {
+ ndk {
+ // 设置支持的SO库架构
+ abiFilters "arm64-v8a"
+ }
+ }
+ }
// f系列-分体机
f80x {
externalNativeBuild {
diff --git a/app/functions/aicloudservices.gradle b/app/functions/aicloudservices.gradle
index a50fc6fae7..27db3d472c 100644
--- a/app/functions/aicloudservices.gradle
+++ b/app/functions/aicloudservices.gradle
@@ -18,6 +18,8 @@ project.dependencies {
em3Implementation rootProject.ext.dependencies.mogoaicloudserviceapk
fochtaxiImplementation rootProject.ext.dependencies.mogoaicloudserviceapk
fochbusImplementation 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')
@@ -36,5 +38,7 @@ project.dependencies {
em3Implementation project(':foudations:mogo-aicloud-services-apk')
fochtaxiImplementation project(':foudations:mogo-aicloud-services-apk')
fochbusImplementation project(':foudations:mogo-aicloud-services-apk')
+ fPadLenovoOchTaxiImplementation project(':foudations:mogo-aicloud-services-apk')
+ fPadLenovoOchBusImplementation project(':foudations:mogo-aicloud-services-apk')
}
}
\ No newline at end of file
diff --git a/app/functions/basedmap.gradle b/app/functions/basedmap.gradle
index 320d8a4e27..f860cd50f0 100644
--- a/app/functions/basedmap.gradle
+++ b/app/functions/basedmap.gradle
@@ -8,6 +8,8 @@ project.dependencies {
f80xImplementation rootProject.ext.dependencies.mapcustom
fochtaxiImplementation rootProject.ext.dependencies.mapcustom
fochbusImplementation rootProject.ext.dependencies.mapcustom
+ fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.mapcustom
+ fPadLenovoOchBusImplementation rootProject.ext.dependencies.mapcustom
phoneImplementation rootProject.ext.dependencies.mapcustom
f8AmapImplementation rootProject.ext.dependencies.mapamap
@@ -27,6 +29,8 @@ project.dependencies {
f80xImplementation project(':libraries:map-custom')
fochtaxiImplementation project(':libraries:map-custom')
fochbusImplementation project(':libraries:map-custom')
+ fPadLenovoOchTaxiImplementation project(':libraries:map-custom')
+ fPadLenovoOchBusImplementation project(':libraries:map-custom')
phoneImplementation project(':libraries:map-custom')
f8AmapImplementation project(':libraries:map-amap')
diff --git a/app/functions/baseservices.gradle b/app/functions/baseservices.gradle
index f5a0f534a5..d55ecb16bb 100644
--- a/app/functions/baseservices.gradle
+++ b/app/functions/baseservices.gradle
@@ -19,6 +19,8 @@ project.dependencies {
em3Implementation rootProject.ext.dependencies.mogobaseserviceapk
fochtaxiImplementation rootProject.ext.dependencies.mogobaseserviceapk
fochbusImplementation 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')
@@ -37,5 +39,7 @@ project.dependencies {
em3Implementation project(':foudations:mogo-base-services-apk')
fochtaxiImplementation project(':foudations:mogo-base-services-apk')
fochbusImplementation project(':foudations:mogo-base-services-apk')
+ fPadLenovoOchTaxiImplementation project(':foudations:mogo-base-services-apk')
+ fPadLenovoOchBusImplementation project(':foudations:mogo-base-services-apk')
}
}
\ No newline at end of file
diff --git a/app/functions/bizguide.gradle b/app/functions/bizguide.gradle
index 3ac507dd4a..2c745ec561 100644
--- a/app/functions/bizguide.gradle
+++ b/app/functions/bizguide.gradle
@@ -15,6 +15,8 @@ project.dependencies {
em3Implementation rootProject.ext.dependencies.mogomoduleguide
fochtaxiImplementation rootProject.ext.dependencies.mogomoduleguide
fochbusImplementation 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')
@@ -29,5 +31,7 @@ project.dependencies {
em3Implementation project(':modules:mogo-module-guide')
fochtaxiImplementation project(':modules:mogo-module-guide')
fochbusImplementation project(':modules:mogo-module-guide')
+ fPadLenovoOchTaxiImplementation project(':modules:mogo-module-guide')
+ fPadLenovoOchBusImplementation project(':modules:mogo-module-guide')
}
}
\ No newline at end of file
diff --git a/app/functions/crashreport.gradle b/app/functions/crashreport.gradle
index 9390b9e7ee..2462fb32a3 100644
--- a/app/functions/crashreport.gradle
+++ b/app/functions/crashreport.gradle
@@ -5,11 +5,11 @@ project.dependencies {
implementation rootProject.ext.dependencies.crashreport
implementation rootProject.ext.dependencies.crashreportupgrade
debugImplementation rootProject.ext.dependencies.crashreportbugly
- releaseImplementation rootProject.ext.dependencies.crashreportnoop
+ releaseImplementation rootProject.ext.dependencies.crashreportbugly
} else {
implementation project(':test:crashreport')
implementation project(':test:crashreport-upgrade')
- debugImplementation project(':test:crashreport-bugly')
- releaseImplementation project(':test:crashreport-noop')
+ implementation project(':test:crashreport-bugly')
+ releaseImplementation project(':test:crashreport-bugly')
}
}
\ No newline at end of file
diff --git a/app/functions/leftpanel.gradle b/app/functions/leftpanel.gradle
index 8fbdf3da82..f2db9e564a 100644
--- a/app/functions/leftpanel.gradle
+++ b/app/functions/leftpanel.gradle
@@ -19,6 +19,8 @@ project.dependencies {
em3Implementation rootProject.ext.dependencies.moduleleftpanelnoop
fochtaxiImplementation rootProject.ext.dependencies.moduleleftpanelnoop
fochbusImplementation 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')
@@ -37,6 +39,8 @@ project.dependencies {
em3Implementation project(':modules:mogo-module-left-panel-noop')
fochtaxiImplementation project(':modules:mogo-module-left-panel-noop')
fochbusImplementation project(':modules:mogo-module-left-panel-noop')
+ fPadLenovoOchTaxiImplementation project(':modules:mogo-module-left-panel-noop')
+ fPadLenovoOchBusImplementation project(':modules:mogo-module-left-panel-noop')
phoneImplementation project(':modules:mogo-module-left-panel-noop')
}
}
\ No newline at end of file
diff --git a/app/functions/och.gradle b/app/functions/och.gradle
index 2a4c8dd1fc..cdcffebd93 100644
--- a/app/functions/och.gradle
+++ b/app/functions/och.gradle
@@ -17,6 +17,8 @@ project.dependencies {
e8xxImplementation rootProject.ext.dependencies.mogoochnoop
fochtaxiImplementation rootProject.ext.dependencies.mogoochtaxi
fochbusImplementation 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')
@@ -34,5 +36,7 @@ project.dependencies {
e8xxImplementation project(':OCH:mogo-och-noop')
fochtaxiImplementation project(':OCH:mogo-och-taxi')
fochbusImplementation project(':OCH:mogo-och-bus')
+ fPadLenovoOchTaxiImplementation project(':OCH:mogo-och-taxi')
+ fPadLenovoOchBusImplementation project(':OCH:mogo-och-bus')
}
}
\ No newline at end of file
diff --git a/app/functions/skin.gradle b/app/functions/skin.gradle
index 0d5cbb0ef0..31cd21d8b1 100644
--- a/app/functions/skin.gradle
+++ b/app/functions/skin.gradle
@@ -17,6 +17,8 @@ project.dependencies {
e8xxImplementation rootProject.ext.dependencies.skinsupportimpl
fochtaxiImplementation rootProject.ext.dependencies.skinsupportimpl
fochbusImplementation rootProject.ext.dependencies.skinsupportimpl
+ fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.skinsupportimpl
+ fPadLenovoOchBusImplementation rootProject.ext.dependencies.skinsupportimpl
phoneImplementation rootProject.ext.dependencies.skinsupportimpl
f8xxImplementation rootProject.ext.dependencies.skinsupportlight
@@ -30,6 +32,8 @@ project.dependencies {
em3Implementation rootProject.ext.dependencies.skinsupportlight
fochtaxiImplementation rootProject.ext.dependencies.skinsupportlight
fochbusImplementation rootProject.ext.dependencies.skinsupportlight
+ fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.skinsupportlight
+ fPadLenovoOchBusImplementation rootProject.ext.dependencies.skinsupportlight
phoneImplementation rootProject.ext.dependencies.skinsupportlight
} else {
@@ -51,6 +55,8 @@ project.dependencies {
e8xxImplementation project(':skin:mogo-skin-support-impl')
fochtaxiImplementation project(':skin:mogo-skin-support-impl')
fochbusImplementation project(':skin:mogo-skin-support-impl')
+ fPadLenovoOchTaxiImplementation project(':skin:mogo-skin-support-impl')
+ fPadLenovoOchBusImplementation project(':skin:mogo-skin-support-impl')
phoneImplementation project(':skin:mogo-skin-support-impl')
f8xxImplementation project(':skin:mogo-skin-light')
@@ -64,6 +70,8 @@ project.dependencies {
em3Implementation project(':skin:mogo-skin-light')
fochtaxiImplementation project(':skin:mogo-skin-light')
fochbusImplementation project(':skin:mogo-skin-light')
+ fPadLenovoOchTaxiImplementation project(':skin:mogo-skin-light')
+ fPadLenovoOchBusImplementation project(':skin:mogo-skin-light')
phoneImplementation project(':skin:mogo-skin-light')
}
}
\ No newline at end of file
diff --git a/app/functions/tts.gradle b/app/functions/tts.gradle
index 17412804cd..4d0abe06d9 100644
--- a/app/functions/tts.gradle
+++ b/app/functions/tts.gradle
@@ -15,6 +15,8 @@ project.dependencies {
e8xxImplementation rootProject.ext.dependencies.ttszhi
fochtaxiImplementation rootProject.ext.dependencies.ttszhi
fochbusImplementation 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')
@@ -32,6 +34,8 @@ project.dependencies {
e8xxImplementation project(':tts:tts-zhi')
fochtaxiImplementation project(':tts:tts-zhi')
fochbusImplementation project(':tts:tts-zhi')
+ fPadLenovoOchTaxiImplementation project(':tts:tts-zhi')
+ fPadLenovoOchBusImplementation project(':tts:tts-zhi')
phoneImplementation project(':tts:tts-zhi')
}
}
\ No newline at end of file
diff --git a/app/regroup.gradle b/app/regroup.gradle
index e3632ceefd..71bf5ac173 100644
--- a/app/regroup.gradle
+++ b/app/regroup.gradle
@@ -3,7 +3,7 @@
afterEvaluate {
def independent = ["em3", "em1", "d80x", "d82x", "bydauto", "em2", "phone"]
- def launcher = ["f80x", "f8xx", "f8amap", "em4", "e8xx", "fochtaxi", "fochbus", "fPadLenovo"]
+ def launcher = ["f80x", "f8xx", "f8amap", "em4", "e8xx", "fochtaxi", "fochbus", "fPadLenovo", "fPadLenovoOchTaxi", "fPadLenovoOchBus"]
it.getTasks().iterator().forEachRemaining {
def task = it
diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index a16f097341..bcfd7314b8 100644
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -1,9 +1,9 @@
package com.mogo.launcher;
+import android.content.ComponentName;
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 +34,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;
@@ -123,6 +122,17 @@ public class MogoApplication extends AbsMogoApplication {
ARouter.getInstance().navigation(ITestCrashReportProvider.class);
}
Log.i("timer", "cost " + (System.currentTimeMillis() - start) + "ms");
+
+ try {
+ if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_LENOVO) {
+ Intent intent = new Intent();
+ intent.setComponent(new ComponentName("com.zhidao.speech", "com.zhidao.speech.MainActivity"));
+ intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ startActivity(intent);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
@Override
@@ -213,13 +223,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 +253,6 @@ public class MogoApplication extends AbsMogoApplication {
// 设置是否使用MoGoAiCloud SDK内部定位进行实时数据上报
clientConfig.setIsUseExternalLocation(true);
-
// 设置DNS经纬度位置
clientConfig.setIHttpDnsCurrentLocation(new IHttpDnsCurrentLocation() {
@Override
diff --git a/config.gradle b/config.gradle
index ee642a7c90..45564447f1 100644
--- a/config.gradle
+++ b/config.gradle
@@ -12,8 +12,8 @@ ext {
commonIndependentAmapApiValue : "1c3fbc5f5e183619ffb1e7bc01e6751f",
compileSdkVersion : 28,
buildToolsVersion : "29.0.2",
- minSdkVersion : 19,
- targetSdkVersion : 22,
+ minSdkVersion : 22,
+ targetSdkVersion : 23,
]
dependencies = [
// androidx
diff --git a/foudations/mogo-commons/build.gradle b/foudations/mogo-commons/build.gradle
index 7f4fbc1edc..ec4465a808 100644
--- a/foudations/mogo-commons/build.gradle
+++ b/foudations/mogo-commons/build.gradle
@@ -43,6 +43,7 @@ dependencies {
implementation rootProject.ext.dependencies.rxjava
implementation rootProject.ext.dependencies.accountsdk
api rootProject.ext.dependencies.mogoaicloudrealtime
+ implementation rootProject.ext.dependencies.amapnavi3dmap
if (Boolean.valueOf(RELEASE)) {
implementation rootProject.ext.dependencies.mogoutils
diff --git a/modules/mogo-module-smp/src/main/java/com/android/internal/policy/MyPhoneLayoutInflater.java b/foudations/mogo-commons/src/main/java/com/android/internal/policy/MyPhoneLayoutInflater.java
similarity index 100%
rename from modules/mogo-module-smp/src/main/java/com/android/internal/policy/MyPhoneLayoutInflater.java
rename to foudations/mogo-commons/src/main/java/com/android/internal/policy/MyPhoneLayoutInflater.java
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
index 0681470777..f25f6a8ed4 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
@@ -11,6 +11,8 @@ import android.widget.ImageView;
import android.widget.TextView;
import com.alibaba.android.arouter.launcher.ARouter;
+import com.amap.api.navi.AMapNaviView;
+import com.android.internal.policy.MyPhoneLayoutInflater;
import com.mogo.commons.analytics.AnalyticsUtils;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.device.Devices;
@@ -59,9 +61,17 @@ public abstract class AbsMogoApplication extends Application {
return sApp;
}
+ public static AMapNaviView aMapNaviView;
+
+ public static AMapNaviView getMapNaviView() {
+ return aMapNaviView;
+ }
+
@Override
public void onCreate() {
super.onCreate();
+ aMapNaviView = new AMapNaviView(this);
+ aMapNaviView.onCreate(null);
// 在设置皮肤布局填充器之前进行克隆一个出来
mLayoutInflaterNoSkin = LayoutInflater.from(new ContextThemeWrapper(this, R.style.Theme_AppCompat)).cloneInContext(new ContextThemeWrapper(this, R.style.Theme_AppCompat));
sApp = this;
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
index 8f165549a0..2b8f50d889 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
@@ -1,8 +1,10 @@
package com.mogo.commons.mvp;
import android.content.Context;
+import android.os.Build;
import android.os.Bundle;
import android.view.MotionEvent;
+import android.view.View;
import android.view.Window;
import android.view.WindowManager;
@@ -40,6 +42,24 @@ public abstract class MvpActivity< V extends IView, P extends Presenter< V > >
getLifecycle().addObserver( mPresenter );
}
+ @Override
+ protected void onResume() {
+ super.onResume();
+ hideBottomUIMenu();
+ }
+
+ //隐藏导航栏
+ protected void hideBottomUIMenu() {
+ //隐藏虚拟按键
+ if (Build.VERSION.SDK_INT >= 19) {
+ //for new api versions.
+ View decorView = getWindow().getDecorView();
+ int uiOptions = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+ | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY ;
+ decorView.setSystemUiVisibility(uiOptions);
+ }
+ }
+
protected void beforeSetContentView(Bundle savedInstanceState){
}
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 65c68bc372..6257d2ee0d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -146,7 +146,7 @@ MOGO_OCH_TAXI_VERSION=1.0.0
######## 外部依赖引用
# 车聊聊
-CARCHATTING_VERSION=2.2.320
+CARCHATTING_VERSION=2.2.325
# 车聊聊接口
CARCHATTINGPROVIDER_VERSION=1.1.11
# websocket
diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle
index d91b1cb832..bea3924d3d 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.29'
+ implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.31'
// 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/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java
index a38eff0242..b2eaad0e6d 100644
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java
@@ -95,7 +95,7 @@ class CustomMapApiBuilder implements IMogoMapApiBuilder {
public IMogoMapView getMapView( Context context ) {
Log.d(TAG,"setDebugMode==true");
NavAutoApi.INSTANCE.init( context, MapParams.Companion.init()
- .setDebugMode( true )
+ .setDebugMode( false )
.setCoordinateType( MapParams.COORDINATETYPE_GCJ02 )
.setPerspectiveMode( MapParams.MAP_PERSPECTIVE_2D )
.setZoom( 20 )
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt
index ac1a0a8a49..7487c07477 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt
@@ -68,11 +68,15 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
}
fun initCarCorderController() {
- zdCarCoderController =
- ZdCarCoderController.getInstance(AbsMogoApplication.getApp().applicationContext)
- zdCarCoderController.addCallback(this)
- zdCarCoderController.addVideoCallback(this)
- zdCarCoderController.init()
+ try {
+ zdCarCoderController =
+ ZdCarCoderController.getInstance(AbsMogoApplication.getApp().applicationContext)
+ zdCarCoderController.addCallback(this)
+ zdCarCoderController.addVideoCallback(this)
+ zdCarCoderController.init()
+ } catch (e: Exception) {
+ e.printStackTrace()
+ }
}
diff --git a/main-extensions/mogo-module-main-launcher/build.gradle b/main-extensions/mogo-module-main-launcher/build.gradle
index efd300157a..bda491d407 100644
--- a/main-extensions/mogo-module-main-launcher/build.gradle
+++ b/main-extensions/mogo-module-main-launcher/build.gradle
@@ -44,10 +44,12 @@ dependencies {
api rootProject.ext.dependencies.modulemain
implementation rootProject.ext.dependencies.mogooch
implementation rootProject.ext.dependencies.moduleservice
+ implementation rootProject.ext.dependencies.moduleSmallMap
} else {
api project(":modules:mogo-module-main")
implementation project(":OCH:mogo-och")
implementation project(':modules:mogo-module-service')
+ implementation project(':modules:mogo-module-smp')
}
}
diff --git a/main-extensions/mogo-module-main-launcher/src/main/AndroidManifest.xml b/main-extensions/mogo-module-main-launcher/src/main/AndroidManifest.xml
index bbca1838ed..0524f236a8 100644
--- a/main-extensions/mogo-module-main-launcher/src/main/AndroidManifest.xml
+++ b/main-extensions/mogo-module-main-launcher/src/main/AndroidManifest.xml
@@ -1,6 +1,11 @@
+
+
+
+
+
-
+
diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
index 096a4d23dc..6e2af4a54a 100644
--- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
+++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
@@ -26,8 +26,8 @@
-
+
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintLeft_toLeftOf="parent">
-
+
+
+
+
+
+
36px
393px
700px
- 108px
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml
new file mode 100644
index 0000000000..a66eeed6a0
--- /dev/null
+++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml
@@ -0,0 +1,16 @@
+
+
+ 1100px
+ 460px
+ 460px
+ 320px
+ 320px
+ 15px
+ 110px
+ 40px
+ 279px
+ 119px
+ 22px
+ 36px
+ 50px
+
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1600/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1600/dimens.xml
deleted file mode 100644
index 027820a732..0000000000
--- a/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1600/dimens.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-
-
-
- 90px
- 32px
- 2px
- 16px
- 26px
- 26px
- 32px
-
- 90px
- 32px
- 2px
- 100px
- 90px
- 2px
- 54px
- 100px
- 90px
- 8px
-
- 180px
- 180px
- 2px
- 60px
- 60px
- 28px
-
- 32px
- 2px
-
- 140px
- 32px
- 60px
- 92px
- 24px
- 48px
- 2px
- 140px
- 140px
- 120px
- 20px
- 30px
- 32px
- 32px
-
- 120px
- 120px
- 32px
- 60px
- 32px
- 60px
- 32px
- 30px
- 20px
-
-
- 120px
- 60px
- 60px
- 32px
- 48px
- 80px
- 28px
- 26px
- 44px
- 44px
- 18px
- 34px
- 26px
- 28px
- 30px
- 30px
- 30px
- 20px
-
- 103px
- 103px
-
-
- 1058px
- 210px
- 144px
- 159px
- 159px
- 70px
- 70px
- 56px
- 83px
- 24px
- 40px
- 60px
- 50px
- 12px
- 10px
- 40px
- 30px
- 34px
- 24px
- 28px
- 23px
- 17px
- 17px
- 36px
- 36px
- -2px
- 95px
-
- 30px
- 40px
- 40px
- 15px
- 15px
- 5px
- 50px
- 56px
- 30px
- 56px
- 30px
- 56px
- 30px
- 15px
- 15px
-
-
- 1000px
- 390px
- 200px
- 200px
- 240px
- 30px
- 120px
- 120px
- 10px
- 22px
- 28px
- 28px
- 30px
- 90px
- 90px
- 6dp
- 15px
- 4px
- 10px
- 20px
-
- 40px
- 45px
- 100px
- 134px
- 30px
- 20px
- 20px
- 8px
- 21px
- 31px
- 1920px
-
- -1
- 0px
-
- 36px
- 393px
- 700px
- 145px
-
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
index ca44fd8dcb..010482f882 100644
--- a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
@@ -98,7 +98,8 @@
40px
30px
34px
- 24px
+ 24px
+
28px
24px
17px
@@ -181,4 +182,13 @@
393px
700px
+ 300px
+ 300px
+
+ 200px
+ 200px
+ 10px
+ 80px
+ 28px
+
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/values/colors.xml b/modules/mogo-module-extensions/src/main/res/values/colors.xml
index 74cf309afe..66347a003a 100644
--- a/modules/mogo-module-extensions/src/main/res/values/colors.xml
+++ b/modules/mogo-module-extensions/src/main/res/values/colors.xml
@@ -14,5 +14,5 @@
#DB3137
#3E77F6
- #3B4577
+ #323C6F
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml
index 54c5195205..b0d6433655 100644
--- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml
@@ -243,6 +243,9 @@
11px
400px
300px
-
- 108px
+ 279px
+ 119px
+ 23px
+ 35px
+ 50px
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/values/strings.xml b/modules/mogo-module-extensions/src/main/res/values/strings.xml
index 65e4b58ae8..9b05b089d1 100644
--- a/modules/mogo-module-extensions/src/main/res/values/strings.xml
+++ b/modules/mogo-module-extensions/src/main/res/values/strings.xml
@@ -69,4 +69,7 @@
- 提前看看出行路况，试试唤醒小智说，“中关村路况怎么样”
+ 默认视角
+ 远距视角
+
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
index 3e28dc2f18..843a95a9e6 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
@@ -229,6 +229,9 @@ public class MainActivity extends MvpActivity implement
MapCenterPointStrategy.setMapCenterPointByScene(mServiceApis.getMapServiceApi().getMapUIController(), Scene.AIMLESS);
}
+ /**
+ * 加载其它模块
+ */
protected void loadOthersModules() {
// 加载地图，触发地图加载完毕回调，在初始化其他卡片模块，保证卡片模块可以正确获取地图相关服务。
loadContainerModules();
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/utils/DisplayEffectsHelper.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/utils/DisplayEffectsHelper.java
index 683134de62..36fdbfc26e 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/utils/DisplayEffectsHelper.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/utils/DisplayEffectsHelper.java
@@ -2,6 +2,8 @@ package com.mogo.module.main.utils;
import android.animation.AnimatorSet;
import android.animation.ObjectAnimator;
+import android.content.res.Resources;
+import android.util.DisplayMetrics;
import android.view.View;
import com.mogo.module.main.R;
@@ -44,4 +46,9 @@ public class DisplayEffectsHelper {
public void display() {
animatorSet.start();
}
+
+ private float dp2px(float dp) {
+ DisplayMetrics metrics = Resources.getSystem().getDisplayMetrics();
+ return dp * metrics.density;
+ }
}
diff --git a/modules/mogo-module-main/src/main/res/drawable-xhdpi-2560x1440/wu1.png b/modules/mogo-module-main/src/main/res/drawable-xhdpi-2560x1440/wu1.png
new file mode 100644
index 0000000000..0ab8e44e21
Binary files /dev/null and b/modules/mogo-module-main/src/main/res/drawable-xhdpi-2560x1440/wu1.png differ
diff --git a/modules/mogo-module-main/src/main/res/drawable-xhdpi-2560x1440/wu2.png b/modules/mogo-module-main/src/main/res/drawable-xhdpi-2560x1440/wu2.png
new file mode 100644
index 0000000000..aff4543048
Binary files /dev/null and b/modules/mogo-module-main/src/main/res/drawable-xhdpi-2560x1440/wu2.png differ
diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
index 148d071f3a..5456d236a3 100644
--- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
+++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
@@ -141,6 +141,12 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
+
+
+
uploadDelayData(@FieldMap Map parameters);
+}
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/MockSocketReceiverData.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/MockSocketReceiverData.java
new file mode 100644
index 0000000000..0655504e6c
--- /dev/null
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/MockSocketReceiverData.java
@@ -0,0 +1,50 @@
+package com.mogo.module.service.network.bean;
+
+public class MockSocketReceiverData {
+
+ public static final int MOCK_RECEIVER_STATUS_START = 0;
+ public static final int MOCK_RECEIVER_STATUS_STOP = 1;
+
+ private int status;
+ private double lat;
+ private double lon;
+ private double heading;
+ private long systemTime;
+ private long satelliteTime;
+
+ public int getStatus() {
+ return status;
+ }
+
+ public double getLat() {
+ return lat;
+ }
+
+ public double getLon() {
+ return lon;
+ }
+
+ public double getHeading() {
+ return heading;
+ }
+
+ public long getSystemTime() {
+ return systemTime;
+ }
+
+ public long getSatelliteTime() {
+ return satelliteTime;
+ }
+
+ @Override
+ public String toString() {
+ return "MockSocketReceiverData{" +
+ "status=" + status +
+ ", lat=" + lat +
+ ", lon=" + lon +
+ ", heading=" + heading +
+ ", systemTime=" + systemTime +
+ ", satelliteTime=" + satelliteTime +
+ '}';
+ }
+}
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/MockSocketSendData.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/MockSocketSendData.java
new file mode 100644
index 0000000000..262b7b2d54
--- /dev/null
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/MockSocketSendData.java
@@ -0,0 +1,37 @@
+package com.mogo.module.service.network.bean;
+
+public class MockSocketSendData {
+ private long systemTime;
+ private String uuid;
+ private long satelliteTime;
+
+ public MockSocketSendData(long systemTime, String uuid, long satelliteTime) {
+ this.systemTime = systemTime;
+ this.uuid = uuid;
+ this.satelliteTime = satelliteTime;
+ }
+
+ public long getSystemTime() {
+ return systemTime;
+ }
+
+ public void setSystemTime(long systemTime) {
+ this.systemTime = systemTime;
+ }
+
+ public String getUuid() {
+ return uuid;
+ }
+
+ public void setUuid(String uuid) {
+ this.uuid = uuid;
+ }
+
+ public long getSatelliteTime() {
+ return satelliteTime;
+ }
+
+ public void setSatelliteTime(long satelliteTime) {
+ this.satelliteTime = satelliteTime;
+ }
+}
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/MockDataDelayUploadHttpConstant.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/MockDataDelayUploadHttpConstant.java
new file mode 100644
index 0000000000..ae5f0c3170
--- /dev/null
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/MockDataDelayUploadHttpConstant.java
@@ -0,0 +1,24 @@
+package com.mogo.module.service.timedelay;
+
+import com.mogo.commons.debug.DebugConfig;
+
+public class MockDataDelayUploadHttpConstant {
+
+ public static final String HOST_DEV = "http://dzt-test.zhidaozhixing.com";
+ public static final String HOST_TEST = "http://dzt-test.zhidaozhixing.com";
+ public static final String HOST_DEMO = "http://dzt-show.zhidaozhixing.com";
+ public static final String HOST_PRODUCT = "http://dzt.zhidaozhixing.com";
+
+ public static String getBaseUrl() {
+ switch (DebugConfig.getNetMode()) {
+ case DebugConfig.NET_MODE_DEV:
+ return HOST_DEV;
+ case DebugConfig.NET_MODE_QA:
+ return HOST_TEST;
+ case DebugConfig.NET_MODE_DEMO:
+ return HOST_DEMO;
+ default:
+ return HOST_PRODUCT;
+ }
+ }
+}
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
index fd8c1947e7..891d6bd9a6 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
@@ -1,23 +1,64 @@
package com.mogo.module.service.timedelay;
import android.content.Context;
+import android.os.Build;
+import android.os.Handler;
+import android.os.Message;
+import androidx.annotation.RequiresApi;
+
+import com.mogo.commons.data.BaseData;
+import com.mogo.commons.network.SubscribeImpl;
+import com.mogo.commons.network.Utils;
import com.mogo.module.common.MogoApisHandler;
+import com.mogo.module.common.uploadintime.SnapshotLocationController;
+import com.mogo.module.service.MarkerServiceHandler;
+import com.mogo.module.service.network.TimeDelayApiService;
+import com.mogo.module.service.network.bean.MockSocketReceiverData;
+import com.mogo.module.service.network.bean.MockSocketSendData;
+import com.mogo.realtime.api.MoGoAiCloudRealTime;
+import com.mogo.realtime.entity.CloudRoadData;
+import com.mogo.realtime.entity.MogoSnapshotSetData;
+import com.mogo.realtime.socket.IMogoCloudOnMsgListener;
import com.mogo.service.connection.IMogoOnMessageListener;
+import com.mogo.utils.WorkThreadHandler;
+import com.mogo.utils.logger.Logger;
+import com.mogo.utils.network.RequestOptions;
+import com.mogo.utils.network.utils.GsonUtil;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
+
+import static com.mogo.commons.AbsMogoApplication.getApp;
+import static com.mogo.module.service.network.bean.MockSocketReceiverData.MOCK_RECEIVER_STATUS_START;
/**
* 接收服务端模拟定位数据，对下发数据做实时Post上报，统计时延
*/
-public class TimeDelayUploadManager implements IMogoOnMessageListener {
+public class TimeDelayUploadManager implements IMogoOnMessageListener, IMogoCloudOnMsgListener {
+
+ private static final String TAG = "TimeDelayUploadManager";
private volatile static TimeDelayUploadManager timeDelayUploadManager;
private static final int MSG_SOCKET_TYPE = 403000;
+ private static final int MOCK_MSG = 1;
+ private boolean isMockData = false;
+ private MockSocketReceiverData mMockData;
+ private long mRecordSatelliteTime; //todo 后续多点模拟用
+
+ private TimeDelayApiService timeDelayApiService;
private TimeDelayUploadManager() {
}
- public TimeDelayUploadManager getInstance() {
+ public static TimeDelayUploadManager getInstance() {
if (timeDelayUploadManager == null) {
synchronized (TimeDelayUploadManager.class) {
if (timeDelayUploadManager == null) {
@@ -31,16 +72,103 @@ public class TimeDelayUploadManager implements IMogoOnMessageListener {
public void init(Context mContext) {
MogoApisHandler.getInstance()
.getApis()
- .getSocketManagerApi(mContext).registerOnMessageListener(MSG_SOCKET_TYPE,this);
+ .getSocketManagerApi(mContext).registerOnMessageListener(MSG_SOCKET_TYPE, this);
+ MoGoAiCloudRealTime.registerOnMsgListener(this);
+ }
+
+ private final Handler mockHandler = new Handler(WorkThreadHandler.newInstance("mock-algorithm-work-thread").getLooper()) {
+ @Override
+ public void handleMessage(Message msg) {
+ super.handleMessage(msg);
+ if (msg.what == MOCK_MSG) {
+ //改变地图定位数据，触发自车移动
+ JSONObject jo = new JSONObject();
+ try {
+ jo.put("lon", mMockData.getLon());
+ jo.put("lat", mMockData.getLat());
+ jo.put("heading", mMockData.getHeading());
+ jo.put("systemTime", System.currentTimeMillis());
+ jo.put("satelliteTime", System.currentTimeMillis());
+ } catch (JSONException e) {
+ e.printStackTrace();
+ }
+ MarkerServiceHandler.getApis().getMapServiceApi().getMapUIController().syncLocation2Map(jo);
+ SnapshotLocationController.getInstance().syncAdasLocationInfo(jo);
+ mockHandler.sendEmptyMessageDelayed(MOCK_MSG, 50);
+ }
+ }
+ };
+
+ @Override
+ public Class target() {
+ return MockSocketReceiverData.class;
+ }
+
+ //接收socket数据
+ @Override
+ public void onMsgReceived(MockSocketReceiverData mockData) {
+ Logger.d(TAG, "onMsgReceived obj : " + mockData.toString());
+ if (mockData.getStatus() == MOCK_RECEIVER_STATUS_START) { //todo 暂时以单条数据发送，后续多点实时发送Message
+ isMockData = true;
+ //开启定位模拟
+ mMockData = mockData;
+ mRecordSatelliteTime = mockData.getSatelliteTime();
+ mockHandler.sendEmptyMessage(MOCK_MSG);
+ if (timeDelayApiService == null) {
+ timeDelayApiService = MogoApisHandler.getInstance().getApis().getNetworkApi().create(TimeDelayApiService.class, MockDataDelayUploadHttpConstant.getBaseUrl());
+ }
+ } else {
+ isMockData = false;
+ //停止定位模拟
+ if (mockHandler.hasMessages(MOCK_MSG)) {
+ mockHandler.removeMessages(MOCK_MSG);
+ mMockData = null;
+ mRecordSatelliteTime = 0;
+ timeDelayApiService = null;
+ }
+ }
}
@Override
- public Class target() {
- return null;
+ public void onMsgSend(long id) {
+
}
+ //接收实时数据监听回调，用于给服务端上报时延
+ @RequiresApi(api = Build.VERSION_CODES.N)
@Override
- public void onMsgReceived(Object obj) {
+ public void onMsgReceived(MogoSnapshotSetData mogoSnapshotSetData) {
+ if (isMockData) {
+ //接口数据上报
+ CloudRoadData result = mogoSnapshotSetData.getAllList()
+ .stream()
+ .filter(cloudRoadData -> cloudRoadData.getUuid().contains("serialNumber_"))
+ .findAny()
+ .orElse(null);
+ if (result == null) {
+ Logger.d(TAG, "未找到与之匹配数据");
+ return;
+ }
+ MockSocketSendData mockSocketSendData = new MockSocketSendData(System.currentTimeMillis(), result.getUuid(), result.getSatelliteTime());
+ Map map = new HashMap<>();
+ map.put("sn", Utils.getSn());
+ map.put("data", GsonUtil.jsonFromObject(mockSocketSendData));
+ Logger.d(TAG, "mockSocketSendData : " + GsonUtil.jsonFromObject(mockSocketSendData));
+ Logger.d(TAG, "data uuid : " + result.getUuid() + " duration : " + (System.currentTimeMillis() - result.getSatelliteTime()));
+ timeDelayApiService.uploadDelayData(map)
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(new SubscribeImpl(RequestOptions.create(getApp())) {
+ @Override
+ public void onNext(BaseData o) {
+ super.onNext(o);
+ }
+ @Override
+ public void onError(Throwable e) {
+ super.onError(e);
+ }
+ });
+ }
}
}
diff --git a/modules/mogo-module-smp/consumer-rules.pro b/modules/mogo-module-smp/consumer-rules.pro
index c3051b66d0..b294e7f5c4 100644
--- a/modules/mogo-module-smp/consumer-rules.pro
+++ b/modules/mogo-module-smp/consumer-rules.pro
@@ -1,4 +1,4 @@
--keep class com.mogo.module.small.map.SmallMapDirectionView{*;}
--keep class com.amap.api.col.n3.*{*;}
+-keep class com.mogo.module.small.map.*{*;}
-keep class com.android.internal.policy.MyPhoneLayoutInflater{*;}
--keep class com.mogo.module.small.map.SmallVisionProvider{*;}
+-keep class com.amap.api.col.n3.*{*;}
+
diff --git a/modules/mogo-module-smp/src/main/AndroidManifest.xml b/modules/mogo-module-smp/src/main/AndroidManifest.xml
index 33c6adff88..3f004d131a 100644
--- a/modules/mogo-module-smp/src/main/AndroidManifest.xml
+++ b/modules/mogo-module-smp/src/main/AndroidManifest.xml
@@ -2,10 +2,4 @@
-
\ No newline at end of file
diff --git a/modules/mogo-module-smp/src/main/java/com/amap/api/col/n3/le2.java b/modules/mogo-module-smp/src/main/java/com/amap/api/col/n3/le2.java
deleted file mode 100644
index cd406be8a7..0000000000
--- a/modules/mogo-module-smp/src/main/java/com/amap/api/col/n3/le2.java
+++ /dev/null
@@ -1,186 +0,0 @@
-//
-// Source code recreated from a .class file by IntelliJ IDEA
-// (powered by Fernflower decompiler)
-//
-
-package com.amap.api.col.n3;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.content.res.Resources.Theme;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.ContextThemeWrapper;
-import android.view.LayoutInflater;
-import android.view.LayoutInflater.Factory;
-import android.view.View;
-import android.view.ViewStub;
-
-import com.android.internal.policy.MyPhoneLayoutInflater;
-
-import java.lang.reflect.Constructor;
-import java.util.HashMap;
-import java.util.HashSet;
-
-public final class le2 extends ContextThemeWrapper {
- private Resources a = lg.a();
- private Theme b;
- private LayoutInflater c;
- private ClassLoader d;
- private int e;
- private static final String[] f = new String[]{"android.widget", "android.webkit", "android.app"};
- private le2.a g = new le2.a();
- private Factory h = new Factory() {
- public final View onCreateView(String var1, Context var2, AttributeSet var3) {
- return le2.this.a(var1, var2, var3);
- }
- };
-
- public le2(Context var1, int var2, ClassLoader var3) {
- super(var1, var2);
- this.d = var3;
- this.b = lg.b();
- this.e = var2;
- super.onApplyThemeResource(this.b, this.e, true);
- (new StringBuilder("classloader:")).append(this.d);
- }
-
- public final Resources getResources() {
- return this.a != null ? this.a : super.getResources();
- }
-
- public final void a(int var1) {
- if (var1 != this.e) {
- this.e = var1;
- super.onApplyThemeResource(this.b, this.e, true);
- }
-
- }
-
- public final Theme getTheme() {
- return this.b != null ? this.b : super.getTheme();
- }
-
- public final Object getSystemService(String var1) {
- if ("layout_inflater".equals(var1)) {
- if (this.c == null) {
- // 这里构建一个自己对的布局填充器
- // 与已经被修改的context.getSystemService(Context.LAYOUT_INFLATER_SERVICE)
- // 隔离从而保证高德地图SDK能正常初始化
- LayoutInflater var2 = new MyPhoneLayoutInflater(getBaseContext());
- this.c = var2.cloneInContext(this);
- this.c.setFactory(this.h);
- this.c = this.c.cloneInContext(this);
- }
-
- return this.c;
- } else {
- return super.getSystemService(var1);
- }
- }
-
- private final View a(String var1, Context var2, AttributeSet var3) {
- if (this.g.a.contains(var1)) {
- return null;
- } else {
- Constructor var4;
- if ((var4 = (Constructor) this.g.b.get(var1)) == null) {
- Class var5 = null;
- boolean var6 = false;
- String var7 = "api.navi";
-
- label71:
- {
- label70:
- {
- Throwable var10000;
- label79:
- {
- boolean var10001;
- try {
- if (var1.contains(var7)) {
- var5 = this.d.loadClass(var1);
- } else {
- String[] var17;
- int var8 = (var17 = f).length;
- int var9 = 0;
-
- while (var9 < var8) {
- String var10 = var17[var9];
-
- try {
- var5 = this.d.loadClass(var10 + "." + var1);
- break;
- } catch (Throwable var13) {
- ++var9;
- }
- }
- }
-
- if (var5 == null) {
- break label71;
- }
- } catch (Throwable var15) {
- var10000 = var15;
- var10001 = false;
- break label79;
- }
-
- if (var5 == ViewStub.class) {
- break label71;
- }
-
- try {
- if (var5.getClassLoader() != this.d) {
- break label71;
- }
- break label70;
- } catch (Throwable var14) {
- var10000 = var14;
- var10001 = false;
- }
- }
-
- Throwable var18 = var10000;
- (new StringBuilder("load view err:")).append(Log.getStackTraceString(var18));
- break label71;
- }
-
- var6 = true;
- }
-
- if (!var6) {
- this.g.a.add(var1);
- return null;
- }
-
- try {
- var4 = var5.getConstructor(Context.class, AttributeSet.class);
- this.g.b.put(var1, var4);
- } catch (Throwable var12) {
- (new StringBuilder("create view err:")).append(Log.getStackTraceString(var12));
- }
- }
-
- try {
- View var16 = null;
- if (var4 != null) {
- var16 = (View) var4.newInstance(var2, var3);
- }
-
- return var16;
- } catch (Throwable var11) {
- (new StringBuilder("create view err:")).append(Log.getStackTraceString(var11));
- return null;
- }
- }
- }
-
- public static class a {
- public HashSet a = new HashSet();
- public HashMap> b = new HashMap();
-
- public a() {
- }
- }
-}
diff --git a/modules/mogo-module-smp/src/main/java/com/amap/api/col/n3/lg2.java b/modules/mogo-module-smp/src/main/java/com/amap/api/col/n3/lg2.java
deleted file mode 100644
index 347f98ddc6..0000000000
--- a/modules/mogo-module-smp/src/main/java/com/amap/api/col/n3/lg2.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.amap.api.col.n3;
-
-import android.content.Context;
-import android.content.res.XmlResourceParser;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-/**
- * 这里是为了解决 使用换肤框架后，高德地图初始化有问题加入的
- * 问题原因是：
- * skin 框架会替换 LayoutInflater 中的 setFactory2 从而导致高德 le 中的 setFactory 失效。
- * 解决方案为：
- * 直接通过内存地址替换整个 ArtMethod，来将需要修改的高德SDK中的方法指向我们修改过后的方法。
- */
-public class lg2 extends lg {
- static le2 b;
-
- public static View a(Context var0, int var1, ViewGroup var2) {
- XmlResourceParser var9 = a().getXml(var1);
- if (!a) {
- return LayoutInflater.from(var0).inflate(var9, var2);
- } else {
- try {
- if (b == null) {
- b = new le2(var0, c == -1 ? 0 : c, lg.class.getClassLoader());
- }
- b.a(c == -1 ? 0 : c);
- View var3 = LayoutInflater.from(b).inflate(var9, var2);
- return var3;
- } catch (Throwable var7) {
- var7.printStackTrace();
- np.c(var7, "ResourcesUtil", "selfInflate(Activity activity, int resource, ViewGroup root)");
- } finally {
- var9.close();
- }
- return null;
- }
- }
-}
diff --git a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
index 00010d9dd0..c0a3c3650d 100644
--- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
+++ b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
@@ -4,8 +4,10 @@ import android.content.Context;
import android.graphics.BitmapFactory;
import android.util.AttributeSet;
import android.util.Log;
+import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.ViewGroup;
+import android.widget.FrameLayout;
import android.widget.RelativeLayout;
import androidx.annotation.Nullable;
@@ -17,7 +19,9 @@ import com.amap.api.maps.UiSettings;
import com.amap.api.navi.AMapNaviView;
import com.amap.api.navi.AMapNaviViewOptions;
import com.mogo.commons.AbsMogoApplication;
+import com.mogo.commons.debug.DebugConfig;
import com.mogo.module.common.MogoApisHandler;
+import com.mogo.module.common.view.RoundLayout;
import com.mogo.utils.FileUtils;
import java.io.IOException;
@@ -31,8 +35,10 @@ import java.io.IOException;
public class SmallMapDirectionView extends RelativeLayout {
private String styleFilePath = "/mnt/sdcard/amap/small_map_style.data";
+ private RoundLayout rlSmallMapBorder;
private AMapNaviView mAMapNaviView;
private int zoomLevel = 15;
+ private boolean mapIsLoaded = false;
public SmallMapDirectionView(Context context) {
this(context, null);
@@ -52,11 +58,11 @@ public class SmallMapDirectionView extends RelativeLayout {
}
private void initView(Context context) {
+ LayoutInflater.from(context).inflate(R.layout.module_small_map_view, this);
- AbsMogoApplication.getLayoutInflaterNoSkin().inflate(R.layout.module_small_map_view, this);
-
- mAMapNaviView = findViewById(R.id.aMapNaviView);
- mAMapNaviView.onCreate(null);
+ mAMapNaviView = AbsMogoApplication.getMapNaviView();
+ rlSmallMapBorder = findViewById(R.id.rlSmallMapBorder);
+ rlSmallMapBorder.addView(mAMapNaviView);
// 车头朝上
mAMapNaviView.setNaviMode(AMapNaviView.CAR_UP_MODE);
@@ -133,7 +139,7 @@ public class SmallMapDirectionView extends RelativeLayout {
// 2D模式
options.setTilt(0);
// 黑夜模式
- // options.setNaviNight(true);
+ //options.setNaviNight(true);
// 自定义地图样式
options.setCustomMapStylePath(styleFilePath);
mAMapNaviView.setViewOptions(options);
@@ -143,23 +149,6 @@ public class SmallMapDirectionView extends RelativeLayout {
CameraUpdate cameraUpdate = CameraUpdateFactory.zoomTo(zoomLevel);
aMap.moveCamera(cameraUpdate);
- aMap.setOnMapLoadedListener(new AMap.OnMapLoadedListener() {
-
- @Override
- public void onMapLoaded() {
- //Log.w("onMapLoaded", "===onMapLoaded====");
- // 高德地图有bug，所以需要多次调用设置皮肤才能成功
- if (options != null) {
- options.setCustomMapStylePath(styleFilePath);
- mAMapNaviView.setViewOptions(options);
- }
-
- //设置希望展示的地图缩放级别
- CameraUpdate cameraUpdate = CameraUpdateFactory.zoomTo(zoomLevel);
- aMap.moveCamera(cameraUpdate);
- }
- });
-
try {
// 判断是否有样式文件存在
FileUtils.copy(
@@ -205,16 +194,39 @@ public class SmallMapDirectionView extends RelativeLayout {
e.printStackTrace();
}
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ Thread.sleep(1000L);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ // 高德地图有bug，所以需要多次调用设置皮肤才能成功
+ if (options != null) {
+ options.setCustomMapStylePath(styleFilePath);
+ mAMapNaviView.setViewOptions(options);
+ }
+
+ //设置希望展示的地图缩放级别
+ CameraUpdate cameraUpdate = CameraUpdateFactory.zoomTo(zoomLevel);
+ aMap.moveCamera(cameraUpdate);
+ }
+ }).start();
+
+
setOnClickListener(view -> {
- MogoApisHandler.getInstance().getApis()
- .getMapServiceApi()
- .getMapUIController()
- .changeMapMode(
- MogoApisHandler.getInstance()
- .getApis()
- .getAdasControllerApi()
- .getCurrentSkinMode()
- );
+ if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_LENOVO ) {
+ MogoApisHandler.getInstance().getApis()
+ .getMapServiceApi()
+ .getMapUIController()
+ .changeMapMode(
+ MogoApisHandler.getInstance()
+ .getApis()
+ .getAdasControllerApi()
+ .getCurrentSkinMode()
+ );
+ }
});
}
diff --git a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapFragment.java b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapFragment.java
new file mode 100644
index 0000000000..1aecd0d01f
--- /dev/null
+++ b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapFragment.java
@@ -0,0 +1,43 @@
+package com.mogo.module.small.map;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import com.mogo.commons.AbsMogoApplication;
+
+/**
+ * @author donghongyu
+ * @date 2021/5/19 10:50 上午
+ */
+public class SmallMapFragment extends Fragment {
+ private Context mContext;
+ protected View mRootView;
+
+ @Override
+ public void onAttach(Context context) {
+ super.onAttach(context);
+ mContext = context;
+ }
+
+ @Nullable
+ @Override
+ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+ if (mRootView == null) {
+ mRootView = AbsMogoApplication.getLayoutInflaterNoSkin()
+ .inflate(R.layout.module_small_map_fragment, container, false);
+ } else {
+ ViewGroup viewGroup = (ViewGroup) mRootView.getParent();
+ if (viewGroup != null) {
+ viewGroup.removeView(mRootView);
+ }
+ }
+ return mRootView;
+ }
+}
diff --git a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapProvider.java b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapProvider.java
new file mode 100644
index 0000000000..0dac09d276
--- /dev/null
+++ b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapProvider.java
@@ -0,0 +1,101 @@
+package com.mogo.module.small.map;
+
+import android.content.Context;
+import android.util.Log;
+
+import androidx.fragment.app.FragmentActivity;
+
+import com.alibaba.android.arouter.facade.annotation.Route;
+import com.mogo.module.common.MogoApisHandler;
+import com.mogo.service.MogoServicePaths;
+import com.mogo.service.map.IMogoSmallMapProvider;
+import com.mogo.service.statusmanager.IMogoStatusChangedListener;
+import com.mogo.service.statusmanager.StatusDescriptor;
+import com.mogo.utils.logger.Logger;
+
+/**
+ * @author donghongyu
+ * @date 12/10/20 1:34 PM
+ */
+@Route(path = MogoServicePaths.PATH_SMALL_MAP)
+public class SmallMapProvider implements IMogoSmallMapProvider, IMogoStatusChangedListener {
+ private final String TAG = "SmallVisionProvider";
+
+ private Context mContext;
+ private int mContainerId;
+ private FragmentActivity mActivity;
+
+ private SmallMapFragment mSmallMapFragment;
+
+ @Override
+ public void init(FragmentActivity activity, int containerId) {
+ Log.d(TAG, "小地图模块初始化……init(FragmentActivity activity, int containerId)");
+ mActivity = activity;
+ mContainerId = containerId;
+
+ Logger.d(TAG, "addSmallMapView");
+
+ }
+
+ @Override
+ public void init(Context context) {
+ Log.d(TAG, "小地图模块初始化……init(Context context)");
+ mContext = context;
+
+ MogoApisHandler.getInstance()
+ .getApis()
+ .getStatusManagerApi()
+ .registerStatusChangedListener(
+ MogoServicePaths.PATH_SMALL_MAP,
+ StatusDescriptor.VR_MODE,
+ this);
+
+ MogoApisHandler.getInstance()
+ .getApis()
+ .getStatusManagerApi()
+ .registerStatusChangedListener(
+ MogoServicePaths.PATH_SMALL_MAP,
+ StatusDescriptor.MAIN_PAGE_RESUME,
+ this);
+ }
+
+ @Override
+ public void showPanel() {
+ Log.d(TAG, "小地图模块触发展示……");
+ if (mSmallMapFragment == null) {
+ Logger.d(TAG, "准备add fragment======");
+ mSmallMapFragment = new SmallMapFragment();
+ mActivity.getSupportFragmentManager().beginTransaction().add(mContainerId, mSmallMapFragment).commit();
+ return;
+ }
+ Logger.d(TAG, "准备show fragment");
+ mActivity.getSupportFragmentManager().beginTransaction().show(mSmallMapFragment).commit();
+ }
+
+ @Override
+ public void hidePanel() {
+ Log.d(TAG, "小地图模块触发隐藏……");
+ if (mSmallMapFragment != null) {
+ Logger.d(TAG, "准备hide fragment");
+ mActivity.getSupportFragmentManager().beginTransaction().hide(mSmallMapFragment).commit();
+ }
+ }
+
+ @Override
+ public void changeAngle(double angle) {
+
+ }
+
+ @Override
+ public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
+ Log.d(TAG, "onStatusChanged……descriptor=" + descriptor + "，isTrue=" + isTrue);
+
+ if (descriptor == StatusDescriptor.VR_MODE) {
+ if (isTrue) {
+ showPanel();
+ } else {
+ hidePanel();
+ }
+ }
+ }
+}
diff --git a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapService.java b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapService.java
deleted file mode 100644
index 122c6d8c5f..0000000000
--- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapService.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.mogo.module.small.map;
-
-import android.app.Service;
-import android.content.Intent;
-import android.os.IBinder;
-import android.view.Gravity;
-import android.view.WindowManager;
-
-import androidx.annotation.Nullable;
-
-import com.mogo.module.common.wm.WindowManagerView;
-import com.mogo.utils.logger.Logger;
-
-/**
- * @author donghongyu
- * @date 12/10/20 1:35 PM
- */
-public class SmallMapService extends Service {
- private static final String TAG = "MachineVisionMapService";
-
- private WindowManagerView mWindowManagerView;
- private SmallMapDirectionView mSmallMapDirectionView;
-
- @Override
- public void onCreate() {
- super.onCreate();
- Logger.d(TAG, "onCreate");
- addSmallMapView();
- }
-
- @Nullable
- @Override
- public IBinder onBind(Intent intent) {
- Logger.d(TAG, "onBind");
- return null;
- }
-
- @Override
- public void onRebind(Intent intent) {
- super.onRebind(intent);
- addSmallMapView();
- Logger.d(TAG, "onRebind");
- }
-
- @Override
- public boolean onUnbind(Intent intent) {
- Logger.d(TAG, "onUnbind");
- if (mWindowManagerView != null && mWindowManagerView.isShowing()) {
- mWindowManagerView.dismiss();
- }
- mWindowManagerView = null;
- return true;
- }
-
- @Override
- public void onDestroy() {
- super.onDestroy();
- Logger.d(TAG, "onDestroy");
- if (mWindowManagerView != null) {
- mWindowManagerView.dismiss();
- }
- }
-
- /**
- * 添加小地图View
- */
- private void addSmallMapView() {
- Logger.d(TAG, "addSmallMapView");
-
- // 初始化小地图控件
- mSmallMapDirectionView = new SmallMapDirectionView(getApplicationContext());
-
- mWindowManagerView = new WindowManagerView.Builder(getApplicationContext())
- .contentView(mSmallMapDirectionView)
- .size(
- WindowManager.LayoutParams.WRAP_CONTENT,
- WindowManager.LayoutParams.WRAP_CONTENT
- )
- .position(
- getResources().getDimensionPixelOffset(R.dimen.module_small_map_view_x),
- getResources().getDimensionPixelOffset(R.dimen.module_small_map_view_y)
- )
- .gravity(Gravity.TOP | Gravity.LEFT)
- .showInWindowManager();
- mWindowManagerView.show();
- }
-
-}
diff --git a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallVisionProvider.java b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallVisionProvider.java
deleted file mode 100644
index 9dc29557a2..0000000000
--- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallVisionProvider.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package com.mogo.module.small.map;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowManager;
-
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-
-import com.alibaba.android.arouter.facade.annotation.Route;
-import com.amap.api.col.n3.lg;
-import com.amap.api.col.n3.lg2;
-import com.mogo.hook.HookManager;
-import com.mogo.module.common.MogoApisHandler;
-import com.mogo.module.common.wm.WindowManagerView;
-import com.mogo.service.MogoServicePaths;
-import com.mogo.service.map.IMogoSmallMapProvider;
-import com.mogo.service.module.ModuleType;
-import com.mogo.service.statusmanager.IMogoStatusChangedListener;
-import com.mogo.service.statusmanager.StatusDescriptor;
-import com.mogo.utils.logger.Logger;
-
-import java.lang.reflect.Method;
-
-/**
- * @author donghongyu
- * @date 12/10/20 1:34 PM
- */
-@Route(path = MogoServicePaths.PATH_SMALL_MAP)
-public class SmallVisionProvider implements IMogoSmallMapProvider, IMogoStatusChangedListener {
- private final String TAG = "SmallVisionProvider";
-
- private Context mContext;
-
- private WindowManagerView mWindowManagerView;
- private SmallMapDirectionView mSmallMapDirectionView;
-
- @Override
- public Fragment createFragment(Context context, Bundle data) {
- return null;
- }
-
- @Override
- public View createView(Context context) {
- return null;
- }
-
- @NonNull
- @Override
- public String getModuleName() {
- return TAG;
- }
-
- @Override
- public int getType() {
- return ModuleType.TYPE_SERVICE;
- }
-
- @Override
- public void init(Context context) {
- Log.d(TAG, "小地图模块初始化……");
- mContext = context;
-
- MogoApisHandler.getInstance()
- .getApis()
- .getStatusManagerApi()
- .registerStatusChangedListener(
- MogoServicePaths.PATH_SMALL_MAP,
- StatusDescriptor.VR_MODE,
- this);
-
- MogoApisHandler.getInstance()
- .getApis()
- .getStatusManagerApi()
- .registerStatusChangedListener(
- MogoServicePaths.PATH_SMALL_MAP,
- StatusDescriptor.MAIN_PAGE_RESUME,
- this);
- }
-
- @Override
- public void onDestroy() {
- Log.d(TAG, "小地图模块销毁……");
- hidePanel();
- // 释放组件内存
- mSmallMapDirectionView = null;
- mWindowManagerView = null;
- }
-
- @Override
- public void showPanel() {
- Log.d(TAG, "小地图模块触发展示……");
- addSmallMapView();
- }
-
- @Override
- public void hidePanel() {
- Log.d(TAG, "小地图模块触发隐藏……");
- if (mWindowManagerView != null && mWindowManagerView.isShowing()) {
- mWindowManagerView.dismiss();
- }
- }
-
- @Override
- public void changeAngle(double angle) {
-
- }
-
- @Override
- public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
- Log.d(TAG, "onStatusChanged……descriptor=" + descriptor + "，isTrue=" + isTrue);
-
- if (descriptor == StatusDescriptor.VR_MODE) {
- if (isTrue) {
- showPanel();
- } else {
- hidePanel();
- }
- }
- if (descriptor == StatusDescriptor.MAIN_PAGE_RESUME) {
- // 只有 VR 模式下才进行展示
- if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
- if (isTrue) {
- showPanel();
- } else {
- hidePanel();
- }
- }
- }
- }
-
-
- /**
- * 添加小地图View
- */
- private void addSmallMapView() {
- Logger.d(TAG, "addSmallMapView");
-
- try {
- // 替换高德地图的方法，解决因为加入换肤框架导致地图初始化失败
- Method srcMethod = lg.class.getDeclaredMethod("a", Context.class, int.class, ViewGroup.class);
- Method destMethod = lg2.class.getDeclaredMethod("a", Context.class, int.class, ViewGroup.class);
- HookManager.get().hookMethod(srcMethod, destMethod);
- Logger.d(TAG, "hook 高德地图成功");
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- // 初始化小地图控件
- if (mSmallMapDirectionView == null) {
- mSmallMapDirectionView = new SmallMapDirectionView(mContext);
- }
-
- if (mWindowManagerView == null) {
- mWindowManagerView = new WindowManagerView.Builder(mContext)
- .contentView(mSmallMapDirectionView)
- .size(
- WindowManager.LayoutParams.WRAP_CONTENT,
- WindowManager.LayoutParams.WRAP_CONTENT
- )
- .position(
- mContext.getResources().getDimensionPixelOffset(R.dimen.module_small_map_view_x),
- mContext.getResources().getDimensionPixelOffset(R.dimen.module_small_map_view_y)
- )
- .gravity(Gravity.TOP | Gravity.LEFT)
- .showInWindowManager();
- }
- mWindowManagerView.show();
- }
-
-}
diff --git a/modules/mogo-module-smp/src/main/res/layout/module_small_map_direction_view.xml b/modules/mogo-module-smp/src/main/res/layout/module_small_map_direction_view.xml
deleted file mode 100644
index dfd4d52a64..0000000000
--- a/modules/mogo-module-smp/src/main/res/layout/module_small_map_direction_view.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
diff --git a/modules/mogo-module-smp/src/main/res/layout/module_small_map_fragment.xml b/modules/mogo-module-smp/src/main/res/layout/module_small_map_fragment.xml
new file mode 100644
index 0000000000..e782c5d0af
--- /dev/null
+++ b/modules/mogo-module-smp/src/main/res/layout/module_small_map_fragment.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-smp/src/main/res/layout/module_small_map_view.xml b/modules/mogo-module-smp/src/main/res/layout/module_small_map_view.xml
index 587bffa950..bc57026070 100644
--- a/modules/mogo-module-smp/src/main/res/layout/module_small_map_view.xml
+++ b/modules/mogo-module-smp/src/main/res/layout/module_small_map_view.xml
@@ -6,7 +6,6 @@
android:layout_height="wrap_content"
tools:parentTag="RelativeLayout">
-
-
-
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-smp/src/main/res/values-xhdpi-2560x1440/dimens.xml b/modules/mogo-module-smp/src/main/res/values-xhdpi-2560x1440/dimens.xml
new file mode 100644
index 0000000000..bce5be42b0
--- /dev/null
+++ b/modules/mogo-module-smp/src/main/res/values-xhdpi-2560x1440/dimens.xml
@@ -0,0 +1,18 @@
+
+
+ 40px
+
+ 400px
+ 400px
+
+ 370px
+ 370px
+
+ 1620px
+ 780px
+
+ 0px
+ 0px
+ 1920px
+ 1080px
+
\ No newline at end of file
diff --git a/modules/mogo-module-smp/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-smp/src/main/res/values-xhdpi/dimens.xml
index fd5d8ff737..62836ac9d0 100644
--- a/modules/mogo-module-smp/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-smp/src/main/res/values-xhdpi/dimens.xml
@@ -2,14 +2,12 @@
30px
- 400px
- 400px
-
288px
288px
260px
260px
+
1620px
780px
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java
index 0986ac3deb..0ff47b0d6e 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java
@@ -570,8 +570,8 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager {
}
if (V2XServiceManager.getMoGoStatusManager().isVrMode()) {
mAlarmInfoMarker = MarkerDrawer.getInstance().drawMapMarkerImpl(markerShowEntity, MarkerDrawer.MARKER_Z_INDEX_HIGH, clickListener);
- mAlarmInfoMarker.setInfoWindowAdapter(new RoadConditionInfoWindow3DAdapter(markerShowEntity, AbsMogoApplication.getApp(), mAlarmInfoMarker.getMogoMarkerOptions()));
- mAlarmInfoMarker.showInfoWindow();
+// mAlarmInfoMarker.setInfoWindowAdapter(new RoadConditionInfoWindow3DAdapter(markerShowEntity, AbsMogoApplication.getApp(), mAlarmInfoMarker.getMogoMarkerOptions()));
+// mAlarmInfoMarker.showInfoWindow();
} else {
optionsRipple.icon(V2XMarkerAdapter.getV2XRoadEventViewPng(context, roadEventEntity));
mAlarmInfoMarker = V2XServiceManager.getMarkerManager().addMarker(V2X_EVENT_ALARM_POI, optionsRipple);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/TestPanelBroadcastReceiver.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/TestPanelBroadcastReceiver.java
index 1f7b980c21..18e243ccdd 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/TestPanelBroadcastReceiver.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/TestPanelBroadcastReceiver.java
@@ -25,6 +25,7 @@ import com.zhidao.carchattingprovider.MogoDriverInfo;
import java.util.List;
import static android.text.style.TtsSpan.GENDER_MALE;
+import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
/**
* V2X 测试面板广播接收，目的是可以通过广播调用起来面板
@@ -102,7 +103,7 @@ public class TestPanelBroadcastReceiver extends BroadcastReceiver {
LocalBroadcastManager.getInstance(mContext).sendBroadcast(intent);
} else if (sceneType == 6) {//查看前车直播
V2XVoiceCallLiveBiz.getInstance().getFrontCarLive();
- } else if (sceneType == 7) {//查看前车直播
+ } else if (sceneType == 7) {//查看前方路口直播
V2XVoiceCallLiveBiz.getInstance().getOpenRoadCameraLive();
} else if (sceneType == 8) {//触发疲劳驾驶
V2XMessageEntity v2XMessageEntity =
@@ -166,6 +167,13 @@ public class TestPanelBroadcastReceiver extends BroadcastReceiver {
V2XServiceManager.getMapService().getMapUIController().changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT);
} else if (sceneType == 20) { //test visualAngle UI
V2XServiceManager.getMapService().getMapUIController().changeMapVisualAngle(VisualAngleMode.MODE_CLOSE_SIGHT);
+ } else if (sceneType == 21) {// 自车求助
+ V2XMessageEntity v2XMessageEntity =
+ TestOnLineCarUtils.getV2XScenarioCarForHelpEventData();
+ Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION);
+ intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity);
+ LocalBroadcastManager.getInstance(mContext).sendBroadcast(intent);
+ V2XServiceManager.getMoGoStatusManager().setSeekHelping(MODULE_NAME, true);
}
}
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java
index 13be5af0ac..9c7a04a9f3 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java
@@ -84,7 +84,7 @@ public class V2XSeekHelpButton implements IV2XButton {
doAction();
});
ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
- (int) V2XUtils.getApp().getResources().getDimension(R.dimen.dp_150));
+ (int) V2XUtils.getApp().getResources().getDimension(R.dimen.module_v2x_car_for_help_window_height));
V2XServiceManager.getMogoTopViewManager().addView(topView, layoutParams);
}
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java
index f4c0dedff9..381d9d460f 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java
@@ -465,4 +465,25 @@ public class TestOnLineCarUtils {
}
return null;
}
+ /**
+ * 自车求助测试数据
+ */
+ public static V2XMessageEntity getV2XScenarioCarForHelpEventData() {
+ try {
+
+ V2XMessageEntity v2xMessageEntity = new V2XMessageEntity<>();
+ // 控制类型
+ v2xMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_CAR_FOR_HELP);
+ // 设置数据
+ v2xMessageEntity.setContent(true);
+ // 控制展示状态
+ v2xMessageEntity.setShowState(true);
+ return v2xMessageEntity;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+
}
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/icon_play.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/icon_play.png
new file mode 100644
index 0000000000..bd17c2a12c
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/icon_play.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/module_v2x_vr_close.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/module_v2x_vr_close.png
new file mode 100644
index 0000000000..95a08f52f4
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/module_v2x_vr_close.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_daolushigong_vr.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_daolushigong_vr.png
new file mode 100644
index 0000000000..3b658c62d3
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_daolushigong_vr.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiaotongjiancha_vr.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiaotongjiancha_vr.png
new file mode 100644
index 0000000000..4510b5c3c1
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiaotongjiancha_vr.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiaotongshigu_vr.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiaotongshigu_vr.png
new file mode 100644
index 0000000000..d5cca39f45
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiaotongshigu_vr.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_nongwu_vr.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_nongwu_vr.png
new file mode 100644
index 0000000000..3ed7564641
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_nongwu_vr.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_yongdu_vr.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_yongdu_vr.png
new file mode 100644
index 0000000000..3c2b759b40
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_yongdu_vr.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_optimal_route_warning.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_optimal_route_warning.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_optimal_route_warning.png
rename to modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_optimal_route_warning.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_car_warning.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_car_warning.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_car_warning.png
rename to modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_car_warning.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_dead_zone.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_dead_zone.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_dead_zone.png
rename to modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_dead_zone.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_m_warning.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_m_warning.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_m_warning.png
rename to modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_m_warning.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_p_warning.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_p_warning.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_p_warning.png
rename to modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_p_warning.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_bg.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_bg.xml
index b7428f06fb..707a1b5291 100644
--- a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_bg.xml
+++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_bg.xml
@@ -2,5 +2,5 @@
-
+
\ No newline at end of file
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 adfeb53772..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 @@
+ android:textSize="@dimen/module_v2x_road_event_text_size" />
@@ -273,9 +274,9 @@
android:id="@+id/tv_line"
android:layout_width="@dimen/dp_0_5"
android:layout_height="@dimen/dp_70"
+ android:alpha="0.3"
android:background="@color/v2x_line_color"
android:visibility="gone"
- android:alpha="0.3"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/tv_play"
app:layout_constraintStart_toEndOf="@+id/ll_event"
@@ -284,14 +285,12 @@
@@ -83,7 +83,7 @@
android:layout_marginRight="@dimen/dp_42"
android:gravity="center_vertical"
android:textColor="#FFFFFF"
- android:textSize="@dimen/dp_42"
+ android:textSize="@dimen/module_v2x_fault_help_distance_text_size"
app:layout_constraintBottom_toBottomOf="@+id/ivFaultHelpEventCall"
app:layout_constraintEnd_toStartOf="@+id/ivFaultHelpEventCall"
app:layout_constraintTop_toTopOf="@+id/ivFaultHelpEventCall"
@@ -91,8 +91,8 @@
diff --git a/modules/mogo-module-v2x/src/main/res/layout/vr_window_top_tips.xml b/modules/mogo-module-v2x/src/main/res/layout/vr_window_top_tips.xml
index c99774a6e4..446e5c311e 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/vr_window_top_tips.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/vr_window_top_tips.xml
@@ -28,7 +28,7 @@
android:layout_marginRight="@dimen/dp_20"
android:text="为您推荐最优路线"
android:textColor="#FFFFFF"
- android:textSize="@dimen/dp_32"
+ android:textSize="@dimen/module_v2x_event_warning_type_text_size"
app:layout_constraintBottom_toBottomOf="@+id/warning_type_image"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/warning_type_image"
diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_carforhelp_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/window_carforhelp_detail.xml
index 5207ad83c3..dc05c04fc2 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/window_carforhelp_detail.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_carforhelp_detail.xml
@@ -5,10 +5,10 @@
android:layout_height="match_parent">
diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail_vr.xml
index 4411a57baf..8c54bdc86a 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail_vr.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail_vr.xml
@@ -2,14 +2,14 @@
19px
- 133px
- 42px
+ 100px
+ 32px
diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
index 2344ee5dea..af1575dcd3 100644
--- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
@@ -101,8 +101,8 @@
19px
- 133px
- 42px
+ 100px
+ 32px
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml
new file mode 100644
index 0000000000..bd5d9c6937
--- /dev/null
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml
@@ -0,0 +1,50 @@
+
+
+ 1100px
+ 227px
+ 187px
+ 30px
+ 133px
+ 133px
+ 38px
+ 42px
+ 12px
+ 40px
+
+ 778px
+ 687px
+ 200px
+ 10px
+ 487px
+ 778px
+
+ 234px
+ 1067px
+ 187px
+
+ 107px
+ 47px
+
+ 35px
+ 48px
+ 35px
+ 36px
+ 64px
+ 108px
+
+ 53px
+
+ 200px
+ 854px
+ 187px
+ 133px
+ 133px
+ 480px
+ 42px
+ 40px
+
+
+ 133px
+ 42px
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml
deleted file mode 100644
index e5e04824ef..0000000000
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-
- 800px
-
- 32px
- 32px
-
- 390px
- 410px
-
-
- 160px
-
-
- 60px
- 40px
-
- 80px
-
- 15px
- 550px
- 200px
- 200px
- 100px
- 90px
- 162px
- 64px
- 80px
- 26px
- 270px
- 86px
- 58px
- 48px
- 48px
- 349px
- 465px
- 306px
- 77px
- 50px
- 28px
- 16px
- 5px
- 80px
- 22px
-
- 20px
- 30px
-
- 42px
- 30px
- 36px
- 30px
- 50px
-
- 120px
-
- 158px
-
-
- 20px
- 36px
- 28px
- 55px
- 36px
- 310px
- 110px
- 120px
-
-
- 270px
- 480px
- 330px
- 450px
-
-
- 200px
-
- 75px
- 32px
- 26px
- 80px
- 34px
-
-
- 133px
- 42px
-
-
-
- 940px
- 701px
- 150px
- 46px
- 26px
-
-
-
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 6c0cad7db0..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
@@ -17,6 +17,8 @@
670px
526px
+ 20px
+
147px
60px
40px
@@ -95,7 +97,8 @@
80px
- 182px
+ 882px
+ 182px
64px
60px
@@ -115,8 +118,8 @@
34px
- 133px
- 42px
+ 100px
+ 32px
@@ -133,4 +136,34 @@
46px
26px
+ 140px
+ 20px
+ 100px
+ 100px
+ 30px
+ 32px
+ 8px
+ 30px
+
+ 800px
+ 140px
+
+ 80px
+ 35px
+
+ 27px
+ 40px
+ 27px
+ 24px
+ 42px
+ 80px
+ 40px
+ 150px
+ 640px
+ 140px
+ 100px
+ 100px
+ 480px
+ 32px
+ 30px
diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/map/IMogoSmallMapProvider.java b/services/mogo-service-api/src/main/java/com/mogo/service/map/IMogoSmallMapProvider.java
index 4ec381d393..61aa1e5b35 100644
--- a/services/mogo-service-api/src/main/java/com/mogo/service/map/IMogoSmallMapProvider.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/map/IMogoSmallMapProvider.java
@@ -1,13 +1,24 @@
package com.mogo.service.map;
+import androidx.annotation.IdRes;
+import androidx.fragment.app.FragmentActivity;
+
+import com.alibaba.android.arouter.facade.template.IProvider;
import com.mogo.service.module.IMogoModuleProvider;
/**
* @author donghongyu
* @date 12/10/20 1:36 PM
*/
-public interface IMogoSmallMapProvider extends IMogoModuleProvider {
+public interface IMogoSmallMapProvider extends IProvider {
+ /**
+ * 初始化网约车容器
+ *
+ * @param activity
+ * @param containerId 容器ID
+ */
+ void init(FragmentActivity activity, @IdRes int containerId );
/**
* 显示面板
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'