From a7b61aa124bc89e653ad0e50b2324efad8faf0c5 Mon Sep 17 00:00:00 2001
From: donghongyu <donghongyu@zhidaoauto.com>
Date: Tue, 18 Apr 2023 20:58:19 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=8Cdev=5Fopt=5F2.15.0=E3=80=8D=201?=
 =?UTF-8?q?=E3=80=81=E5=AE=8C=E6=88=90bus=E5=8F=B8=E6=9C=BA=E5=B1=8F?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=85=B3=E6=8E=A7=E5=88=B6bus?=
 =?UTF-8?q?=E4=B9=98=E5=AE=A2=E5=B1=8F=E5=B1=95=E7=A4=BA=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E6=B5=81=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/BusPassengerBaseFragment.java          | 33 +++++++++++++++++++
 .../autopilot/telematic/TeleMsgHandler.kt     |  5 +++
 .../hmi/ui/setting/DebugSettingView.kt        | 12 +++++++
 .../main/res/layout/view_debug_setting.xml    | 18 ++++++++--
 .../data/multidisplay/TelematicConstant.kt    |  1 +
 .../call/telematic/CallerTelematicManager.kt  |  2 +-
 6 files changed, 68 insertions(+), 3 deletions(-)

diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java
index 88fdfe533b..6de6ceb031 100644
--- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java
+++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java
@@ -9,13 +9,17 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.core.widget.ContentLoadingProgressBar;
 
 import com.mogo.commons.mvp.IView;
 import com.mogo.commons.mvp.MvpFragment;
 
 import com.mogo.commons.mvp.Presenter;
+import com.mogo.eagle.core.data.multidisplay.TelematicConstant;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
+import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener;
+import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager;
 import com.mogo.eagle.core.function.hmi.ui.widget.DriverMonitorView;
 import com.mogo.eagle.core.function.view.MapBizView;
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
@@ -44,6 +48,11 @@ public abstract class BusPassengerBaseFragment<V extends IView, P extends Presen
     private View mLiveBtn;
     private View mLiveShadow;
     private DriverMonitorView driverMonitorView;
+
+    // 记录司机端是否打开了显示开关,
+    // 开关开启时，有视频流的车辆持续常驻展示视频流，无视频流的车辆不展示（无占位）；
+    // 开关关闭时，无论是否有视频流，均不展示（无占位）；开关默认关闭
+    private boolean driverToggle = false;
     /**
      * 改变自动驾驶状态
      *
@@ -88,6 +97,30 @@ public abstract class BusPassengerBaseFragment<V extends IView, P extends Presen
                 return true;
             }
         });
+        CallerTelematicListenerManager.INSTANCE.addListener(TAG, new IReceivedMsgListener() {
+            @Override
+            public void onReceivedServerSn(@Nullable String sn) {
+
+            }
+
+            @Override
+            public void onReceivedMsg(int type, @NonNull byte[] byteArray) {
+                if (type == TelematicConstant.CONTROL_PASSENGER_DRIVER_MONITOR) {
+                    switch (new String(byteArray)) {
+                        // 乘客端开启漫游
+                        case "0": {
+                            mLiveShadow.setVisibility(View.GONE);
+                            break;
+                        }
+                        // 乘客端关闭漫游
+                        case "1": {
+                            mLiveShadow.setVisibility(View.VISIBLE);
+                            break;
+                        }
+                    }
+                }
+            }
+        });
 
         showRouteFragment();
 
diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt
index 4a6c46f7d9..af46c9d815 100644
--- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt
+++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt
@@ -149,6 +149,11 @@ class TeleMsgHandler : IMsgHandler {
                         CallerTelematicListenerManager.invokeReceivedMsg(TelematicConstant.OPEN_ROMA_STATUS,it.body)
                     }
                 }
+                TelematicConstant.CONTROL_PASSENGER_DRIVER_MONITOR -> {
+                    ThreadUtils.runOnUiThread {
+                        CallerTelematicListenerManager.invokeReceivedMsg(TelematicConstant.CONTROL_PASSENGER_DRIVER_MONITOR,it.body)
+                    }
+                }
                 else -> {
                 }
             }
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
index d7173cbe6c..a6ff3ad01a 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
@@ -45,6 +45,7 @@ import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.data.obu.MogoObuConst
 import com.mogo.eagle.core.data.obu.ObuStatusInfo
 import com.mogo.eagle.core.data.deva.report.ReportEntity
+import com.mogo.eagle.core.data.multidisplay.TelematicConstant
 import com.mogo.eagle.core.function.api.autopilot.*
 import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsFuncConfigListener
 import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener
@@ -581,6 +582,17 @@ internal class DebugSettingView @JvmOverloads constructor(
             }
         }
 
+        /**
+         * 控制乘客屏直播监控
+         */
+        tbControlPassengerDriverMonitor.setOnCheckedChangeListener { _, isChecked ->
+            if (isChecked) {
+                CallerTelematicManager.sendMsgToAllClients(TelematicConstant.CONTROL_PASSENGER_DRIVER_MONITOR, "1".toByteArray())
+            } else {
+                CallerTelematicManager.sendMsgToAllClients(TelematicConstant.CONTROL_PASSENGER_DRIVER_MONITOR, "0".toByteArray())
+            }
+        }
+
         //设置鹰眼本地参数配置监听
         setEagleEyeConfigListener()
         //域控制器中心事件点击监听
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
index 61166d3c1d..937c4e07c3 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
@@ -1355,8 +1355,8 @@
                     android:background="@drawable/setting_toggle_button_background"
                     android:drawableEnd="@drawable/icon_right"
                     android:padding="@dimen/dp_20"
-                    android:textOff="HMI控制"
-                    android:textOn="HMI控制"
+                    android:textOff="打开HMI控制"
+                    android:textOn="关闭HMI控制"
                     android:textSize="@dimen/dp_24" />
 
                 <GridLayout
@@ -1367,6 +1367,20 @@
                     android:visibility="gone"
                     tools:visibility="visible">
 
+                    <ToggleButton
+                        android:id="@+id/tbControlPassengerDriverMonitor"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_columnWeight="1"
+                        android:layout_margin="2dp"
+                        android:gravity="center"
+                        android:textOff="开启乘客屏直播监控"
+                        android:textOn="关闭乘客屏直播监控"
+                        android:padding="@dimen/dp_20"
+                        android:textSize="@dimen/dp_24"
+                        app:layout_constraintLeft_toRightOf="@+id/tbChangeCurrentCarIcon"
+                        app:layout_constraintTop_toTopOf="@id/tbChangeCurrentCarIcon" />
+
                     <ToggleButton
                         android:id="@+id/tbChangeCurrentSkinMode"
                         android:layout_width="wrap_content"
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/multidisplay/TelematicConstant.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/multidisplay/TelematicConstant.kt
index b6f7e195bf..f5b05b667d 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/multidisplay/TelematicConstant.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/multidisplay/TelematicConstant.kt
@@ -12,5 +12,6 @@ class TelematicConstant {
         const val HIDE_TRAFFIC_LIGHT = 102
         const val OPEN_ROMA_STATUS = 103
         const val ROMA_UPDATE = 104
+        const val CONTROL_PASSENGER_DRIVER_MONITOR = 105
     }
 }
\ No newline at end of file
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/telematic/CallerTelematicManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/telematic/CallerTelematicManager.kt
index b70b90befc..52fa082b05 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/telematic/CallerTelematicManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/telematic/CallerTelematicManager.kt
@@ -41,7 +41,7 @@ object CallerTelematicManager {
 
     /**
      * 发送数据给所有客户端
-     * type：保存在TelematicConstant中
+     * type：保存在 TelematicConstant 中
      */
     fun sendMsgToAllClients(type: Int, byteArray: ByteArray) {
         providerApi?.sendMsgToAllClients(type, byteArray)