diff --git a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_biz.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_biz.xml
index 5e1fca3986..f5b1760fd2 100644
--- a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_biz.xml
+++ b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_biz.xml
@@ -2,9 +2,20 @@
+ android:layout_height="match_parent"
+ xmlns:tools="http://schemas.android.com/tools">
+
+
+ android:layout_height="0dp"/>
+ android:layout_height="0dp"/>
+ android:layout_height="0dp"/>
\ No newline at end of file
diff --git a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_line.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_line.xml
index 2aa5f7ad18..1c0e065ac9 100644
--- a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_line.xml
+++ b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_line.xml
@@ -2,7 +2,8 @@
diff --git a/OCH/shuttle/driver_weaknet/src/main/res/values/dimens.xml b/OCH/shuttle/driver_weaknet/src/main/res/values/dimens.xml
index fd1ec0cd92..c45fa5d21e 100644
--- a/OCH/shuttle/driver_weaknet/src/main/res/values/dimens.xml
+++ b/OCH/shuttle/driver_weaknet/src/main/res/values/dimens.xml
@@ -22,7 +22,6 @@
#323C6F
10dp
20dp
- 200dp
52dp
65dp
20dp
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningView.kt
index e22fefd1c3..f89b04ef30 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningView.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningView.kt
@@ -34,7 +34,6 @@ import kotlinx.android.synthetic.main.unmanned_routing_running.view.actv_distanc
import kotlinx.android.synthetic.main.unmanned_routing_running.view.actv_end_routing
import kotlinx.android.synthetic.main.unmanned_routing_running.view.actv_routing_name
import kotlinx.android.synthetic.main.unmanned_routing_running.view.actv_submit_task
-import kotlinx.android.synthetic.main.unmanned_routing_running.view.actv_time_end
import kotlinx.android.synthetic.main.unmanned_routing_running.view.goutp_show_routing_info
import kotlinx.android.synthetic.main.unmanned_routing_running.view.include_empty
import kotlinx.android.synthetic.main.unmanned_routing_running.view.naviToStart
@@ -196,8 +195,7 @@ class RoutingRunningView: ConstraintLayout, RoutingRunningModel.RoutingRuningCal
)
}"
)
- actv_distance_end.text =TaskUtils.getCurrentTaskDistance(meters)
- actv_time_end.text =TaskUtils.getCurrentTaskTime(timeInSecond)
+ actv_distance_end.text = "${TaskUtils.getCurrentTaskDistance(meters)} ${TaskUtils.getCurrentTaskTime(timeInSecond)}"
}
}
diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_running.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_running.xml
index c53c29dd26..865a2f1d6e 100644
--- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_running.xml
+++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_running.xml
@@ -3,7 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"
android:layout_width="@dimen/dp_880"
- android:layout_height="@dimen/dp_966"
+ android:layout_height="match_parent"
+ tools:layout_height="@dimen/dp_966"
tools:background="@drawable/shape_itinerary_bg_default"
xmlns:tools="http://schemas.android.com/tools">
@@ -41,7 +42,7 @@
android:layout_marginEnd="@dimen/dp_52"
android:layout_width="match_parent"
android:background="@drawable/shape_itinerary_bg_default"
- android:layout_height="@dimen/dp_351"/>
+ android:layout_height="@dimen/dp_272"/>
+ android:layout_height="@dimen/dp_92"/>
+
-
-
-
diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_select.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_select.xml
index 481fb6f4e7..b41c1767a4 100644
--- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_select.xml
+++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_select.xml
@@ -3,7 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"
android:layout_width="@dimen/dp_880"
- android:layout_height="@dimen/dp_966"
+ android:layout_height="match_parent"
+ tools:layout_height="@dimen/dp_966"
tools:background="@drawable/shape_itinerary_bg_default"
xmlns:tools="http://schemas.android.com/tools">
diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_switch.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_switch.xml
index f123ba232c..7e1a136add 100644
--- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_switch.xml
+++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_switch.xml
@@ -2,7 +2,8 @@
diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_biz.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_biz.xml
index bdbf10549f..15b1f5a5ab 100644
--- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_biz.xml
+++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_biz.xml
@@ -2,9 +2,20 @@
+ android:layout_height="match_parent"
+ xmlns:tools="http://schemas.android.com/tools">
+
+
+ android:layout_height="0dp"/>
+ android:layout_height="0dp"/>
\ No newline at end of file
diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_itinerary.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_itinerary.xml
index d2790945a0..4dd327a9aa 100644
--- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_itinerary.xml
+++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_itinerary.xml
@@ -2,7 +2,8 @@
diff --git a/app/src/androidTest/java/com/mogo/functions/test/V2NTest.kt b/app/src/androidTest/java/com/mogo/functions/test/V2NTest.kt
index 32f1ad3a4a..5f63bae62c 100644
--- a/app/src/androidTest/java/com/mogo/functions/test/V2NTest.kt
+++ b/app/src/androidTest/java/com/mogo/functions/test/V2NTest.kt
@@ -59,11 +59,15 @@ class V2NTest {
delay(millis)
}
FunctionBuildConfig.v2nTotalSwitch = true
- runCatching {
- val map = HashMap().also {
- it["f1"] = FunctionBuildConfig.v2nTotalSwitch
+ val isDriver = arguments.getString("isDriver", "1").toInt() == 1
+ val times = arguments.getString("times", "100").toInt()
+ if (isDriver) {
+ runCatching {
+ val map = HashMap().also {
+ it["f1"] = FunctionBuildConfig.v2nTotalSwitch
+ }
+ CallerTelematicManager.sendMsgToAllClients(TelematicConstant.V2N_NEW_LINK_SWITCH, GsonUtils.toJson(map).toByteArray())
}
- CallerTelematicManager.sendMsgToAllClients(TelematicConstant.V2N_NEW_LINK_SWITCH, GsonUtils.toJson(map).toByteArray())
}
delay(2000)
val targetX = arguments.getString("lon", "0").toDouble()
@@ -83,10 +87,43 @@ class V2NTest {
car = CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84()
val point = DrivingDirectionUtils.calculateNewPoint(car.longitude, car.latitude, car.heading , eventDistance)
val polygon = generateTriangle(point.first, point.second, car.heading, r * 1e-5)
- val data = TrackedObject.getDefaultInstance().toBuilder().setType(501).setLongitude(point.first).setLatitude(point.second).setAltitude(0.0).setSystemTime(System.currentTimeMillis() * 1.0 / 1000).setSatelliteTime(1.0).setUuid(10).setCarID("1").setColor("#ffffff").setHeading(car.heading).setSpeed(0.0).setDrawLevel(1).setDriverTime(1.0).setCameraIp("172.18.7.40").setVideoUrl("").addAllImageUrl(Collections.singletonList("http://www.baidu.com")).addAllPolygon(polygon.map { Location.getDefaultInstance().toBuilder().setLongitude(it.first).setLatitude(it.second).setAltitude(0.0).setHeading(0.0).setStation(false).build() }).setDetectStartTime(System.currentTimeMillis()).setV2XUuid("xxxxx1").setStrUuid("xxxxx2").build()
+ var data = TrackedObject.getDefaultInstance().toBuilder()
+ .setType(501)
+ .setLongitude(point.first)
+ .setLatitude(point.second)
+ .setAltitude(0.0)
+ .setSystemTime(System.currentTimeMillis() * 1.0 / 1000)
+ .setSatelliteTime(1.0)
+ .setUuid(10)
+ .setCarID("1")
+ .setColor("#ffffff")
+ .setHeading(car.heading)
+ .setSpeed(0.0)
+ .setDrawLevel(1)
+ .setDriverTime(1.0)
+ .setCameraIp("172.18.7.40")
+ .setVideoUrl("")
+ .addTrackedSource(MessagePad.TrackedSource.getDefaultInstance().toBuilder().setSource(2).addSubSource(MessagePad.SubSource.getDefaultInstance().toBuilder().setSource(1)).build())
+ .addAllImageUrl(Collections.singletonList("http://www.baidu.com"))
+ .addAllPolygon(polygon.map { Location.getDefaultInstance().toBuilder().setLongitude(it.first).setLatitude(it.second).setAltitude(0.0).setHeading(0.0).setStation(false).build() })
+ .setDetectStartTime(System.currentTimeMillis())
+ .setV2XUuid("xxxxx1")
+ .setStrUuid("xxxxx2")
+ .build()
val trafficData = Collections.singletonList(data)
- CallerTelematicManager.sendMsgToAllClients(TelematicConstant.V2N_AI_ROAD_SHI_GONG, data.toByteArray())
- CallerAutopilotIdentifyListenerManager.invokeAutopilotIdentifyDataUpdate(trafficData)
+ if (isDriver) {
+ CallerTelematicManager.sendMsgToAllClients(TelematicConstant.V2N_AI_ROAD_SHI_GONG, data.toByteArray())
+ }
+ var cur = 0
+ while (cur < times) {
+ cur ++
+ FunctionBuildConfig.v2nTotalSwitch = true
+ FunctionBuildConfig.v2nNewLinkedToPNC = true
+ FunctionBuildConfig.v2xTotalSwitch = true
+ CallerAutopilotIdentifyListenerManager.invokeAutopilotIdentifyDataUpdate(trafficData)
+ data = data.newBuilderForType().build()
+ delay(50)
+ }
delay(TimeUnit.MINUTES.toMillis(10))
}
diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XAiRoadEventMarker.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XAiRoadEventMarker.kt
index 5b7c1267b1..b852a692d3 100644
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XAiRoadEventMarker.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XAiRoadEventMarker.kt
@@ -55,7 +55,7 @@ class V2XAiRoadEventMarker {
.set3DMode(true)
.isUseGps(true)
.icon3DRes(R.raw.taxi_sanjiaozui)
- .scale(1.0f)
+ .scale(0.5f)
.build().let {
CallerMapUIServiceManager.getOverlayManager()?.showOrUpdatePoint(it)
}?.also {
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt
index eccde5f3ba..fb71bff54c 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt
@@ -1263,9 +1263,9 @@ class OperatePanelLayout : LinearLayout {
prevCheckedKeyForFusionMode?.takeIf { it != KEY_ALL_MERGE_MODE }?.let {
preferenceScreen.findPreferenceReal(it)
}?.also {
- prevCheckedKeyForFusionMode = KEY_ALL_MERGE_MODE
changeValue(it, false)
}
+ prevCheckedKeyForFusionMode = KEY_ALL_MERGE_MODE
hmiAction("SOP 融合模式, ", FunctionBuildConfig.fusionMode)
clickEventAnalytics("融合模式", true)
CallerAutoPilotControlManager.sendFusionMode(FunctionBuildConfig.fusionMode)
@@ -1283,9 +1283,9 @@ class OperatePanelLayout : LinearLayout {
prevCheckedKeyForFusionMode?.takeIf { it != KEY_BLIND_AREA_MODE }?.let {
preferenceScreen.findPreferenceReal(it)
}?.also {
- prevCheckedKeyForFusionMode = KEY_BLIND_AREA_MODE
changeValue(it, false)
}
+ prevCheckedKeyForFusionMode = KEY_BLIND_AREA_MODE
hmiAction("SOP 融合模式, ", FunctionBuildConfig.fusionMode)
clickEventAnalytics("融合模式", true)
CallerAutoPilotControlManager.sendFusionMode(FunctionBuildConfig.fusionMode)
@@ -1303,9 +1303,9 @@ class OperatePanelLayout : LinearLayout {
prevCheckedKeyForFusionMode?.takeIf { it != KEY_BEYOND_VISUAL_RANGE_MODE }?.let {
preferenceScreen.findPreferenceReal(it)
}?.also {
- prevCheckedKeyForFusionMode = KEY_BEYOND_VISUAL_RANGE_MODE
changeValue(it, false)
}
+ prevCheckedKeyForFusionMode = KEY_BEYOND_VISUAL_RANGE_MODE
hmiAction("SOP 融合模式, ", FunctionBuildConfig.fusionMode)
clickEventAnalytics("融合模式", true)
CallerAutoPilotControlManager.sendFusionMode(FunctionBuildConfig.fusionMode)
@@ -1323,9 +1323,9 @@ class OperatePanelLayout : LinearLayout {
prevCheckedKeyForFusionMode?.takeIf { it != KEY_TRANSPARENT_TRANSFER_MODE }?.let {
preferenceScreen.findPreferenceReal(it)
}?.also {
- prevCheckedKeyForFusionMode = KEY_TRANSPARENT_TRANSFER_MODE
changeValue(it, false)
}
+ prevCheckedKeyForFusionMode = KEY_TRANSPARENT_TRANSFER_MODE
hmiAction("SOP 融合模式, ", FunctionBuildConfig.fusionMode)
clickEventAnalytics("融合模式", true)
CallerAutoPilotControlManager.sendFusionMode(FunctionBuildConfig.fusionMode)
@@ -1343,9 +1343,9 @@ class OperatePanelLayout : LinearLayout {
prevCheckedKeyForFusionMode?.takeIf { it != KEY_PURE_OBU_MODE }?.let {
preferenceScreen.findPreferenceReal(it)
}?.also {
- prevCheckedKeyForFusionMode = KEY_PURE_OBU_MODE
changeValue(it, false)
}
+ prevCheckedKeyForFusionMode = KEY_PURE_OBU_MODE
hmiAction("SOP 融合模式, ", FunctionBuildConfig.fusionMode)
clickEventAnalytics("融合模式", true)
CallerAutoPilotControlManager.sendFusionMode(FunctionBuildConfig.fusionMode)
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt
index ab50574284..2cf4a7e7aa 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt
@@ -56,8 +56,8 @@ class ColdStartView @JvmOverloads constructor(
companion object {
const val TAG = "ColdStartView"
- const val LOAD_SSM_WAITING_TIME = 60000L //SSM加载超时等待时间
- const val COLD_START_WAITING_TIME = 300000L //冷启动超时等待时间
+ const val LOAD_SSM_WAITING_TIME = 180000L //SSM加载超时等待时间
+ const val COLD_START_WAITING_TIME = 600000L //冷启动超时等待时间
}
private var ipcConnectStatus = false //连接域控状态，默认是未连接
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml
index 5e5fef813b..2f2f5e8065 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml
@@ -19,10 +19,11 @@
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/CrossRoad.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/CrossRoad.kt
index af3b7f4fd7..09758f2ec0 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/CrossRoad.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/CrossRoad.kt
@@ -18,7 +18,7 @@ class CrossRoad(private val delayTime: Long = 0, unit: TimeUnit = TimeUnit.SECON
override fun getVisualAngleMode(): VisualAngleMode {
if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode) && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
- return VisualAngleMode.MAP_STYLE_VR_ANGLE_CROSS
+ return VisualAngleMode.MAP_STYLE_VR_ANGLE_CROSS_B2_PASSENGER
}
return MAP_STYLE_VR_ANGLE_CROSS_NEW
}
diff --git a/core/mogo-core-res/src/main/res/raw/taxi_sanjiaozui.nt3d b/core/mogo-core-res/src/main/res/raw/taxi_sanjiaozui.nt3d
index 9db52cc348..e09b556cad 100644
Binary files a/core/mogo-core-res/src/main/res/raw/taxi_sanjiaozui.nt3d and b/core/mogo-core-res/src/main/res/raw/taxi_sanjiaozui.nt3d differ
diff --git a/gradle.properties b/gradle.properties
index 29baa00412..d78ebb8fd0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -83,7 +83,7 @@ MOGO_TELEMATIC_VERSION=1.4.7.42
MOGO_SKIN_VERSION=1.4.7.49.11-debug
######## MogoAiCloudSDK Version ########
# 自研地图
-MAP_SDK_VERSION=3.4.1.16
+MAP_SDK_VERSION=3.4.1.17
MAP_SDK_DATA_VERSION=1.0.0.9
MAP_SDK_OPERATION_VERSION=1.1.4.1
# websocket
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/VisualAngleMode.kt b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/VisualAngleMode.kt
index 1917ad497b..cf98aa87de 100644
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/VisualAngleMode.kt
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/VisualAngleMode.kt
@@ -62,8 +62,14 @@ enum class VisualAngleMode(val code: Int) : IMogoMapVisualAngle {
/**
* 十字路口视角-新版
+ * 适用于其它非B2乘客屏的车型
*/
- MAP_STYLE_VR_ANGLE_CROSS_NEW(12);
+ MAP_STYLE_VR_ANGLE_CROSS_NEW(12),
+
+ /**
+ * 十字路口视角-B2乘客
+ */
+ MAP_STYLE_VR_ANGLE_CROSS_B2_PASSENGER(13);
override val isLongSight: Boolean
get() = code == MODE_LONG_SIGHT.code