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 @@ + 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"> + >