From 576c66c19dcff38eef0790bfdc7f6dd7e278482c Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Mon, 16 Oct 2023 19:25:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=9B=B8=E6=9C=BA=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/navinfo/omqs/ui/dialog/CommonDialog.java | 12 ++++++------ app/src/main/java/com/navinfo/omqs/util/SignUtil.kt | 5 ++--- .../chk_icon_camera_contect_discontect_xml.xml | 9 +++++++++ app/src/main/res/layout/activity_main.xml | 10 +++++++++- app/src/main/res/layout/connect_out_camera.xml | 1 + 5 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 app/src/main/res/drawable/chk_icon_camera_contect_discontect_xml.xml diff --git a/app/src/main/java/com/navinfo/omqs/ui/dialog/CommonDialog.java b/app/src/main/java/com/navinfo/omqs/ui/dialog/CommonDialog.java index 5168b7e0..e39d47d9 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/dialog/CommonDialog.java +++ b/app/src/main/java/com/navinfo/omqs/ui/dialog/CommonDialog.java @@ -710,10 +710,10 @@ public class CommonDialog extends Dialog implements SurfaceHolder.Callback, IVid * 更新相机状态资源 */ public void updateCameraResources(int statusType, int indexClentCamera) { - int resId = R.id.main_activity_camera; + int resId = R.id.main_activity_status_camera; if (indexClentCamera == 2) - resId = R.id.main_activity_camera2; + resId = R.id.main_activity_status_camera; Drawable drawable = context.getResources().getDrawable(R.drawable.icon_page_video_a0); @@ -770,10 +770,10 @@ public class CommonDialog extends Dialog implements SurfaceHolder.Callback, IVid } public void updateCameraBackgroundResources(int drawable, int indexClentCamera) { - int resId = R.id.main_activity_camera; + int resId = R.id.main_activity_status_camera; if (indexClentCamera == 2) - resId = R.id.main_activity_camera2; + resId = R.id.main_activity_status_camera; ImageView ivStatus = (ImageView) findViewById(resId); @@ -1547,9 +1547,9 @@ public class CommonDialog extends Dialog implements SurfaceHolder.Callback, IVid private int getResId() { if (getmDeviceNum() == 2) - return R.id.main_activity_camera2; + return R.id.main_activity_status_camera; - return R.id.main_activity_camera; + return R.id.main_activity_status_camera; } public ShareUtil getmShareUtil() { diff --git a/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt b/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt index 6ff34752..81d67890 100644 --- a/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt +++ b/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt @@ -111,9 +111,8 @@ class SignUtil { } //常规点限速,条件点限速 - DataCodeEnum.OMDB_SPEEDLIMIT.code, DataCodeEnum.OMDB_SPEEDLIMIT_COND.code -> getSpeedLimitMaxText( - data - ) + DataCodeEnum.OMDB_SPEEDLIMIT.code, DataCodeEnum.OMDB_SPEEDLIMIT_COND.code -> getSpeedLimitMaxText(data) + //上下线分离 DataCodeEnum.OMDB_MULTI_DIGITIZED.code -> { if (data.properties["multiDigitized"] == "1") "上下线" else " " diff --git a/app/src/main/res/drawable/chk_icon_camera_contect_discontect_xml.xml b/app/src/main/res/drawable/chk_icon_camera_contect_discontect_xml.xml new file mode 100644 index 00000000..d69f80bf --- /dev/null +++ b/app/src/main/res/drawable/chk_icon_camera_contect_discontect_xml.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 655c668c..0e6504c1 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -102,7 +102,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginRight="@dimen/top_right_drawer_btns_mr" - app:constraint_referenced_ids="main_activity_add_new,main_activity_task_line,main_activity_serach,main_activity_2d_3d,main_activity_camera,main_activity_trace,main_activity_calc_distance,main_activity_menu" + app:constraint_referenced_ids="main_activity_add_new,main_activity_task_line,main_activity_serach,main_activity_2d_3d,main_activity_camera,main_activity_trace,main_activity_calc_distance,main_activity_menu,main_activity_status_camera" app:flow_horizontalGap="6dp" app:flow_wrapMode="aligned" app:layout_constraintRight_toLeftOf="@id/main_activity_right_fragment" @@ -165,6 +165,14 @@ android:elevation="2dp" android:onClick="@{()->mainActivity.onClickMenu()}" /> + +