Merge remote-tracking branch 'origin/dev_minibus-d_230425_3.2.0' into dev_minibus-d_230425_3.2.0

2023-05-17 19:24:38 +08:00
parent 26e70f41e6 23518a662a
commit f61fc45f16
15 changed files with 34 additions and 18 deletions
--- a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_center_normal.png
+++ b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_center_normal.png
--- a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_center_press.png
+++ b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_center_press.png
--- a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_2.png
+++ b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_2.png
--- a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_3.png
+++ b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_3.png
--- a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_4.png
+++ b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_4.png
--- a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_select_line_bg.png
+++ b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_select_line_bg.png
--- a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_selct_site_bottom_corner.xml
+++ b/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_selct_site_bottom_corner.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
    android:shape="rectangle">
-    <corners android:bottomRightRadius="@dimen/dp_36" />
+    <corners android:bottomRightRadius="@dimen/dp_26" />
    <gradient
        android:angle="-90"
        android:endColor="@color/bus_p_m1_d7e5f5"
--- a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_shape_line_switch_left.xml
+++ b/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_shape_line_switch_left.xml
@@ -2,10 +2,10 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
    android:shape="rectangle">
    <corners
-        android:bottomLeftRadius="@dimen/dp_36"
-        android:topLeftRadius="@dimen/dp_36" />
-    <gradient
-        android:centerColor="@color/bus_p_m1_91EFF6FF"
-        android:endColor="@color/bus_p_m1_91EFF6FF"
-        android:startColor="@color/bus_p_m1_91EFF6FF" />
+        android:bottomLeftRadius="@dimen/dp_26"
+        android:topLeftRadius="@dimen/dp_26" />
+<!--    <gradient-->
+<!--        android:centerColor="@color/bus_p_m1_91EFF6FF"-->
+<!--        android:endColor="@color/bus_p_m1_91EFF6FF"-->
+<!--        android:startColor="@color/bus_p_m1_91EFF6FF" />-->
 </shape>
--- a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_bottom_go.xml
+++ b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_bottom_go.xml
@@ -27,6 +27,7 @@
        app:layout_constraintEnd_toEndOf="parent"
        android:textSize="@dimen/dp_48"
        android:textColor="@android:color/white"
+        android:layout_marginEnd="@dimen/dp_7"
        android:text="出发"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"/>
--- a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_main_fragment.xml
+++ b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_main_fragment.xml
@@ -221,6 +221,7 @@
        android:src="@drawable/charter_p_video"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/viewBusPM1MsgBoxButton"
+        android:layout_marginTop="-20dp"
        android:layout_width="@dimen/dp_147"
        android:layout_height="@dimen/dp_149"/>

--- a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_fragment.xml
+++ b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_fragment.xml
@@ -11,7 +11,7 @@
        android:layout_width="0dp"
        android:layout_height="0dp"
        android:layout_marginStart="@dimen/dp_286"
-        android:background="@drawable/bus_p_function_setting_soft_b_shape"
+        android:background="@drawable/charter_p_select_line_bg"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintDimensionRatio="936:500"
        app:layout_constraintStart_toStartOf="parent"
@@ -56,7 +56,8 @@
                    android:id="@+id/rv_site_list"
                    android:layout_width="match_parent"
                    android:layout_height="match_parent"
-                    android:paddingTop="@dimen/dp_20" />
+                    android:layout_marginTop="@dimen/dp_26"
+                    />
                
                <View
                    app:layout_constraintBottom_toBottomOf="parent"
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/FuncBizProvider.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/FuncBizProvider.kt
@@ -37,7 +37,9 @@ class FuncBizProvider : IMoGoFuncBizProvider {
        dispatchAutoPilotManager.init(context)
        cronTaskManager.startCronTask()
        OverviewDb.getDb(context)
-        MogoTrafficLightManager.INSTANCE.initServer(context)
+        if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
+            MogoTrafficLightManager.INSTANCE.initServer(context)
+        }
        VipCarManager.INSTANCE.initServer(context)
        if(!(AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)
            && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode))){
--- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt
+++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt
@@ -270,10 +270,15 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
                    if (alertContent.isEmpty() || ttsContent.isEmpty()) {
                        return
                    }
-                    //大于10m，才提示rsi
-                    if (Math.round(rsiWarningData.warningMsgList[0].distance) > 10) {
+                    //大于10m，才提示rsi,超速不限制
+                    if (appId == "1") {
                        saveObuToDcData(appId, alertContent, ttsContent)
                        showWarning(appId, alertContent, ttsContent, direction)
+                    } else {
+                        if (Math.round(rsiWarningData.warningMsgList[0].distance) > 10) {
+                            saveObuToDcData(appId, alertContent, ttsContent)
+                            showWarning(appId, alertContent, ttsContent, direction)
+                        }
                    }
                }

--- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt
+++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt
@@ -557,10 +557,15 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
                                if (alertContent.isEmpty() || ttsContent.isEmpty()) {
                                    return
                                }
-                                //大于10m，才提示rsi
-                                if (Math.round(data.warningMsgList[0].distance) > 10) {
+                                //大于10m，才提示rsi。超速不限制
+                                if (appId == "1") {
                                    saveObuData(appId, alertContent, ttsContent)
                                    showWarning(appId, alertContent, ttsContent, direction)
+                                } else {
+                                    if (Math.round(data.warningMsgList[0].distance) > 10) {
+                                        saveObuData(appId, alertContent, ttsContent)
+                                        showWarning(appId, alertContent, ttsContent, direction)
+                                    }
                                }

                                // 更新数据
--- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt
+++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt
@@ -76,6 +76,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
     * @param trafficLights 感知红绿灯
     */
    override fun onAutopilotPerceptionTrafficLight(trafficLights: TrafficLightOuterClass.TrafficLights?) {
+        CallerLogger.d("${SceneConstant.M_OBU}${TAG}", "onAutopilotPerceptionTrafficLight ---- hasObuLightStatus = $hasObuLightStatus ----hasAiLightStatus = $hasAiLightStatus ")
        if (!hasObuLightStatus) {
            if (!hasAiLightStatus) {
                trafficLights?.let { it ->
@@ -159,7 +160,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
     * 是否重置红绿灯数据,需要确保，在obu的红绿灯显示的时候，不执行。否则会闪屏
     */
    override fun resetTrafficLight(isReset: Boolean) {
-        CallerLogger.d("${SceneConstant.M_OBU}${TAG}", "resetTrafficLight ------> isReset = $isReset ")
+        CallerLogger.d("${SceneConstant.M_OBU}${TAG}", "resetTrafficLight ------> isReset = $isReset ---hasObuLightStatus = $hasObuLightStatus")
        if (!hasObuLightStatus) {
            if(isReset){
                hide()
@@ -168,7 +169,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
    }

    private fun hide(){
-        CallerLogger.d("${SceneConstant.M_OBU}${TAG}", "hide() -------> ")
+        CallerLogger.d("${SceneConstant.M_OBU}${TAG}", "hide() ---------> ")
        CallerTrafficLightListenerManager.disableTrafficLight()
        if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
            CallerTelematicManager.sendMsgToAllClients(TelematicConstant.HIDE_TRAFFIC_LIGHT, "0".toByteArray())
@@ -184,11 +185,10 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
        lightSource: DataSourceType
    ) {
        super.onTrafficLightPlusSource(light, remain, lightSource)
-//        CallerLogger.d("${SceneConstant.M_OBU}${TAG}", "onTrafficLightPlusSource ----- light = $light ---remain = $remain ---lightSource = $lightSource")
        if (lightSource == DataSourceType.OBU) {
            hasObuLightStatus = true
        }
-
+        CallerLogger.d("${SceneConstant.M_OBU}${TAG}", "onTrafficLightPlusSource ----- light = $light ---remain = $remain ---lightSource = $lightSource ---hasObuLightStatus = $hasObuLightStatus ---hasAiLightStatus = $hasAiLightStatus")
        CallerTrafficLightListenerManager.showTrafficLight(light, lightSource)
        if (remain == -1) {
            CallerTrafficLightListenerManager.disableTrafficLightCountDown()
@@ -217,6 +217,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight

    private fun updateTrafficLight(trafficLightResult: TrafficLightResult) {
        val currentTrafficLight = trafficLightResult.currentRoadTrafficLight()
+        CallerLogger.d("${SceneConstant.M_OBU}${TAG}", "updateTrafficLight ----- currentTrafficLight = $currentTrafficLight")
        currentTrafficLight?.let {
            val remain = if (it.remain > 99) {
                99