From 294edc6fe3616768193968f3ce01a7e41d497a3c Mon Sep 17 00:00:00 2001
From: donghongyu <donghongyu@zhidaoauto.com>
Date: Wed, 17 Nov 2021 17:38:51 +0800
Subject: [PATCH] =?UTF-8?q?[Fix]=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E7=8A=B6=E6=80=81=E6=8C=89=E9=92=AE=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=B1=95=E7=A4=BA=20=E4=BF=AE=E5=A4=8D=E8=B7=AF?=
 =?UTF-8?q?=E5=8F=A3=E7=9B=B4=E6=92=AD=E6=B5=81=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
---
 .idea/misc.xml                                                | 1 +
 .../mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt  | 4 ++--
 .../src/main/res/layout/view_autopilot_status.xml             | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index b00d5af9ff..ccf2008fd8 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -26,6 +26,7 @@
         <entry key="core/function-impl/mogo-core-function-map/src/main/res/layout/function_map_fragment_hd_map.xml" value="0.29322916666666665" />
         <entry key="core/function-impl/mogo-core-function-smp/src/main/res/layout/module_small_map_fragment.xml" value="0.44166666666666665" />
         <entry key="core/mogo-core-network/src/main/res/layout/item_v2x_crossroad_live_video.xml" value="0.1984375" />
+        <entry key="core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_autopilot_status_bg.xml" value="0.18020833333333333" />
         <entry key="foudations/mogo-commons/src/main/res/layout/module_commons_layout_toast.xml" value="0.3117283950617284" />
         <entry key="modules/mogo-module-authorize/src/main/res/layout/module_authorize_fragment.xml" value="0.273046875" />
         <entry key="modules/mogo-module-carchatting/src/main/res/drawable/module_carchatting_vr_calling_bg.xml" value="0.231875" />
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt
index d2dbbc4571..f42e1f0c49 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt
@@ -91,9 +91,9 @@ class CameraListView : FrameLayout {
                             // 开启摄像头推流
                             cameraEntity.ip?.let { ip ->
                                 // 华哥那边现在只支持一个ip"183.242.46.150"
-                                CallerMonitorManager.openCameraStream(ip)
+//                                CallerMonitorManager.openCameraStream(ip)
                                 // 测试一直打开的顺义摄像头,不需要调接口让摄像头开启推流
-//                                if (!cameraEntity.flvUrl.isNullOrEmpty()) gsyVideoPlay(cameraEntity.flvUrl!!)
+                                if (!cameraEntity.flvUrl.isNullOrEmpty()) gsyVideoPlay(cameraEntity.flvUrl!!)
                             }
                         }
                         else -> {
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_autopilot_status.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_autopilot_status.xml
index 4fb61803e9..68066352ba 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_autopilot_status.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_autopilot_status.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="@dimen/module_mogo_autopilot_status_bg_width"
     android:layout_height="@dimen/module_mogo_autopilot_status_bg_height"
-    android:background="@drawable/module_hmi_autopilot_status_bg">
+    >
 
     <ImageView
         android:id="@+id/ivStatusIcon"