From d4a420f14b7733d7b7ffb10b7fe3459b0251daba Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Wed, 18 Jun 2025 14:36:41 +0800 Subject: [PATCH] =?UTF-8?q?[8.1.0][fmd]=20FMD=20UI=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rviz/common/config/SSHAccountConfig.kt | 9 +-- .../rviz/dialog/ChangeDefaultConfigDialog.kt | 14 +--- .../rviz/dialog/DockersDialog.java | 2 +- .../rviz/dialog/ShowConfigDialog.java | 2 +- .../rviz/dialog/StartupConfigDialog.java | 2 +- .../FaultManagementDiagnosisService.kt | 4 +- .../rviz/ui/activity/FmdAct.kt | 10 +++ .../rviz/widgets/ros/host/RosHostView.java | 2 +- ...lector_default_config_input_text_color.xml | 6 ++ .../res/drawable/rviz_common_bg_dialog.xml | 10 +-- .../rviz_common_bg_dockers_item_header.xml | 2 +- .../rviz_common_bg_fmd_dialog_btn.xml | 12 +-- ..._common_dialog_default_config_input_bg.xml | 16 ++-- ...select_dialog_default_config_button_bg.xml | 4 +- .../res/drawable/rviz_fmd_bg_dialog_btn.xml | 12 +-- .../rviz_fmd_bg_dialog_fault_code_details.xml | 2 +- ..._fmd_bg_dialog_fault_code_details_item.xml | 2 +- .../main/res/drawable/rviz_fmd_bg_fm_btn.xml | 4 +- .../rviz_fmd_bg_fm_data_show_data.xml | 4 +- .../drawable/rviz_fmd_bg_fmd_dialog_btn.xml | 12 +-- .../res/drawable/rviz_fmd_bg_item_btn.xml | 8 +- .../rviz_fmd_bg_item_dockers_even.xml | 2 +- .../drawable/rviz_fmd_bg_item_dockers_odd.xml | 2 +- .../res/drawable/rviz_fmd_bg_item_host.xml | 10 +-- .../rviz_fmd_bg_item_host_loading.xml | 14 ++-- .../drawable/rviz_fmd_bg_ros_host_view.xml | 10 +-- .../rviz_fmd_bg_show_config_value.xml | 12 +-- ...viz_fmd_dialog_default_config_input_bg.xml | 8 +- .../rviz_fmd_ic_fault_code_normal.xml | 4 +- .../rviz_fmd_ic_fault_code_unknown.xml | 4 +- .../main/res/drawable/rviz_fmd_icon_error.xml | 4 +- .../res/drawable/rviz_fmd_icon_normal.xml | 4 +- .../res/drawable/rviz_fmd_progress_bar.xml | 10 +-- .../rviz_common_dialog_default_config.xml | 78 +++++++++---------- .../src/main/res/layout/rviz_fmd_act_home.xml | 32 ++++---- .../layout/rviz_fmd_dialog_common_loading.xml | 8 +- .../res/layout/rviz_fmd_dialog_dockers.xml | 36 ++++----- .../rviz_fmd_dialog_fault_code_details.xml | 48 ++++++------ .../layout/rviz_fmd_dialog_fm_data_show.xml | 34 ++++---- .../layout/rviz_fmd_dialog_fmd_user_pwd.xml | 64 +++++++-------- .../layout/rviz_fmd_dialog_show_config.xml | 28 +++---- .../res/layout/rviz_fmd_frag_fault_code.xml | 8 +- .../res/layout/rviz_fmd_frag_overview.xml | 36 ++++----- ...d_item_car_status_module_sensor_status.xml | 6 +- ...rviz_fmd_item_child_fault_code_details.xml | 40 +++++----- .../res/layout/rviz_fmd_item_color_hint.xml | 6 +- .../main/res/layout/rviz_fmd_item_dockers.xml | 20 ++--- .../res/layout/rviz_fmd_item_fault_code.xml | 42 +++++----- ...rviz_fmd_item_group_fault_code_details.xml | 10 +-- .../src/main/res/layout/rviz_fmd_item_ros.xml | 56 ++++++------- .../layout/rviz_fmd_item_startup_config.xml | 30 +++---- .../res/layout/rviz_fmd_view_progress_bar.xml | 4 +- .../res/layout/rviz_fmd_view_ros_host.xml | 12 +-- .../res/layout/rviz_fmd_view_state_bar.xml | 6 +- .../src/main/res/values-v26/styles.xml | 31 ++++++++ .../src/main/res/values/styles.xml | 29 +++---- 56 files changed, 459 insertions(+), 428 deletions(-) create mode 100644 core/function-impl/mogo-core-function-devatools-rviz/src/main/res/color/rviz_fmd_selector_default_config_input_text_color.xml create mode 100644 core/function-impl/mogo-core-function-devatools-rviz/src/main/res/values-v26/styles.xml diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/config/SSHAccountConfig.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/config/SSHAccountConfig.kt index 1a94482508..2e2da935ba 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/config/SSHAccountConfig.kt +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/config/SSHAccountConfig.kt @@ -12,7 +12,6 @@ object SSHAccountConfig { private const val USER_NAME = "ros_user_name" private const val PASSWORD = "ros_password" - private const val ROS_MASTER_IP = "ros_master_ip_address" private var ssh_ip = "4JbUOUFpOo2eKdhLmFnfog==" private var ssh_user_name = "DmIfr6unQRyOkNg7//DWgQ==" @@ -76,7 +75,7 @@ object SSHAccountConfig { * @param rosMasterIp 主控制器IP */ fun setRosMasterIp(rosMasterIp: String) { - mmkvUtils.put(ROS_MASTER_IP, AESUtil.encryptAES(rosMasterIp)) + ssh_ip = AESUtil.encryptAES(rosMasterIp) } @@ -85,10 +84,6 @@ object SSHAccountConfig { * @return 主控制器IP */ fun getRosMasterIp(): String { - return AESUtil.decryptAES(mmkvUtils.getString(ROS_MASTER_IP, ssh_ip)) - } - - fun removeRosMasterIp() { - MMKVUtils.getInstance().removeKey(ROS_MASTER_IP) + return AESUtil.decryptAES(ssh_ip) } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/ChangeDefaultConfigDialog.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/ChangeDefaultConfigDialog.kt index 5d3dff7d1b..c2ddfbb0b4 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/ChangeDefaultConfigDialog.kt +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/ChangeDefaultConfigDialog.kt @@ -32,7 +32,7 @@ class ChangeDefaultConfigDialog( setContentView(R.layout.rviz_common_dialog_default_config) window?.setBackgroundDrawable(null) window?.setLayout( - 700, + 900, WindowManager.LayoutParams.WRAP_CONTENT ) // window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN) @@ -65,18 +65,6 @@ class ChangeDefaultConfigDialog( } private fun onConfirm() { - val enableIp = inputIp.text - if (TextUtils.isEmpty(enableIp)) { - SSHAccountConfig.removeRosMasterIp() - } else { - if (RegexUtils.isIP(enableIp)) { - val ip = enableIp.toString().trim() - SSHAccountConfig.setRosMasterIp(ip) - } else { - ToastUtils.showShort("请输入正确的IP") - return - } - } val enableUserName = inputSshUsername.text if (TextUtils.isEmpty(enableUserName)) { SSHAccountConfig.removeUserName() diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/DockersDialog.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/DockersDialog.java index edac4d089f..7c7c01c27f 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/DockersDialog.java +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/DockersDialog.java @@ -53,7 +53,7 @@ public class DockersDialog extends BaseDialog { protected void onViewInitBefore() { super.onViewInitBefore(); WindowManager.LayoutParams layoutParams = getWindow().getAttributes(); - layoutParams.width = SizeUtils.dp2px(getContext().getResources().getDimension(R.dimen.dp_600)); + layoutParams.width = SizeUtils.dp2px(getContext().getResources().getDimension(R.dimen.dp_1200)); layoutParams.height = ViewGroup.LayoutParams.WRAP_CONTENT; getWindow().setAttributes(layoutParams); } diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/ShowConfigDialog.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/ShowConfigDialog.java index 773ffa39c0..077f2928d3 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/ShowConfigDialog.java +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/ShowConfigDialog.java @@ -45,7 +45,7 @@ public class ShowConfigDialog extends BaseDialog { super.onViewInitBefore(); Window window = getWindow(); if (window != null) { - window.setLayout(SizeUtils.dp2px(getContext().getResources().getDimension(R.dimen.dp_600)), WindowManager.LayoutParams.WRAP_CONTENT); + window.setLayout(SizeUtils.dp2px(getContext().getResources().getDimension(R.dimen.dp_1200)), WindowManager.LayoutParams.WRAP_CONTENT); // 可以尝试设置其他窗口属性 } // WindowManager.LayoutParams layoutParams = getWindow().getAttributes(); diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/StartupConfigDialog.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/StartupConfigDialog.java index 8557e5ad34..e3c220053d 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/StartupConfigDialog.java +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/StartupConfigDialog.java @@ -76,7 +76,7 @@ public class StartupConfigDialog extends BaseDialog implements LifecycleOwner { lifecycle.setCurrentState(Lifecycle.State.CREATED); getWindow().setBackgroundDrawableResource(R.drawable.rviz_common_bg_dialog); WindowManager.LayoutParams layoutParams = getWindow().getAttributes(); - layoutParams.width = SizeUtils.dp2px(getContext().getResources().getDimension(R.dimen.dp_600)); + layoutParams.width = SizeUtils.dp2px(getContext().getResources().getDimension(R.dimen.dp_1200)); layoutParams.height = ViewGroup.LayoutParams.WRAP_CONTENT; getWindow().setAttributes(layoutParams); } diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/service/FaultManagementDiagnosisService.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/service/FaultManagementDiagnosisService.kt index 14a1b17177..bdc4f2f461 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/service/FaultManagementDiagnosisService.kt +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/service/FaultManagementDiagnosisService.kt @@ -137,15 +137,16 @@ class FaultManagementDiagnosisService : BaseService(), OnSshConnectionListener, override fun onCreate() { super.onCreate() initHandler(false)//初始化了个子线程Handler + initFMData() CallerAutoPilotStatusListenerManager.addListener(TAG, adasConnectionStatuslistener) CallerAutopilotCarConfigListenerManager.addListener(TAG, this) CallerFaultManagementStateListenerManager.addListener(TAG, this) - initFMData() Log.i(TAG, "故障管理诊断服务已启动") } override fun onBind(intent: Intent?): IBinder { + initHandler(false)//初始化了个子线程Handler Log.i(TAG, "故障管理诊断服务已绑定") return binder } @@ -172,6 +173,7 @@ class FaultManagementDiagnosisService : BaseService(), OnSshConnectionListener, } private fun initFMData() { + fmDataMap.clear() fmDataMap[FaultModuleId.HardwareDriver.name] = FmEntity("硬件驱动(HardwareDriver)") fmDataMap[FaultModuleId.Perception.name] = diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/activity/FmdAct.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/activity/FmdAct.kt index a7e9834d7c..3052e6671a 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/activity/FmdAct.kt +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/activity/FmdAct.kt @@ -100,6 +100,16 @@ class FmdAct : BaseActivity() { R.id.frameContainerLayout, mFragments ) +// for (i in mTabEntities.indices) { +// val view = tbCheckTypeView.getMsgView(i) +// view.textSize = 18F +// val params = view.layoutParams +// params.width = 50 +// params.height = 50 +// view.setLayoutParams(params); +//// tbCheckTypeView.getMsgView(i).cornerRadius=100 +//// tbCheckTypeView.getMsgView(i).setBgSelector() +// } tbCheckTypeView.setOnTabSelectListener(object : OnTabSelectListener { override fun onTabSelect(position: Int) { btnColorHint.visibility = diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/widgets/ros/host/RosHostView.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/widgets/ros/host/RosHostView.java index 5bcdcfef9c..2aa39eed13 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/widgets/ros/host/RosHostView.java +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/widgets/ros/host/RosHostView.java @@ -79,7 +79,7 @@ public class RosHostView extends ConstraintLayout implements LifecycleOwner, OnR rosHostAdapter.setOnItemClickListener(this); rosHosts.setAdapter(rosHostAdapter); // 设置项目之间的间距 - rosHosts.addItemDecoration(new SpacesItemDecoration(getResources().getDimension(R.dimen.dp_4))); + rosHosts.addItemDecoration(new SpacesItemDecoration(getResources().getDimension(R.dimen.dp_8))); FlowBus.INSTANCE.with(EventKey.QUERY_ROS_HOST_STATUS).register(this, this::notifyItemChanged); FlowBus.INSTANCE.with(EventKey.REMOVE_ROS_HOST_ITEM).register(this, it -> { diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/color/rviz_fmd_selector_default_config_input_text_color.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/color/rviz_fmd_selector_default_config_input_text_color.xml new file mode 100644 index 0000000000..a93c386e9d --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/color/rviz_fmd_selector_default_config_input_text_color.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_common_bg_dialog.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_common_bg_dialog.xml index 073268238c..4b6567500e 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_common_bg_dialog.xml +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_common_bg_dialog.xml @@ -2,13 +2,13 @@ + android:bottomLeftRadius="@dimen/dp_30" + android:bottomRightRadius="@dimen/dp_30" + android:topLeftRadius="@dimen/dp_30" + android:topRightRadius="@dimen/dp_30" /> diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_common_bg_dockers_item_header.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_common_bg_dockers_item_header.xml index 0ec9aaa96d..ec00f699c2 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_common_bg_dockers_item_header.xml +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_common_bg_dockers_item_header.xml @@ -6,7 +6,7 @@ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_common_bg_fmd_dialog_btn.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_common_bg_fmd_dialog_btn.xml index 199b05f019..047e3d7c34 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_common_bg_fmd_dialog_btn.xml +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_common_bg_fmd_dialog_btn.xml @@ -3,8 +3,8 @@ - - + + @@ -12,16 +12,16 @@ - - + + - - + + diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_common_dialog_default_config_input_bg.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_common_dialog_default_config_input_bg.xml index fc93cfad8c..ff8d91d972 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_common_dialog_default_config_input_bg.xml +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_common_dialog_default_config_input_bg.xml @@ -1,11 +1,17 @@ - + + + + + + + - - + + @@ -13,8 +19,8 @@ - - + + diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_common_select_dialog_default_config_button_bg.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_common_select_dialog_default_config_button_bg.xml index b19e3d5114..12128f7194 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_common_select_dialog_default_config_button_bg.xml +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_common_select_dialog_default_config_button_bg.xml @@ -3,13 +3,13 @@ - + - + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_dialog_btn.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_dialog_btn.xml index 199b05f019..047e3d7c34 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_dialog_btn.xml +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_dialog_btn.xml @@ -3,8 +3,8 @@ - - + + @@ -12,16 +12,16 @@ - - + + - - + + diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_dialog_fault_code_details.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_dialog_fault_code_details.xml index 6335534c96..f27a006bcb 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_dialog_fault_code_details.xml +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_dialog_fault_code_details.xml @@ -2,7 +2,7 @@ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_dialog_fault_code_details_item.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_dialog_fault_code_details_item.xml index 84e903d3ab..dade08cddc 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_dialog_fault_code_details_item.xml +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_dialog_fault_code_details_item.xml @@ -7,7 +7,7 @@ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_fm_btn.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_fm_btn.xml index 2347dc3e56..2393d37b14 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_fm_btn.xml +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_fm_btn.xml @@ -4,14 +4,14 @@ - + - + diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_fm_data_show_data.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_fm_data_show_data.xml index 49998a1556..2107d3431c 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_fm_data_show_data.xml +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_fm_data_show_data.xml @@ -11,9 +11,9 @@ - + diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_fmd_dialog_btn.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_fmd_dialog_btn.xml index 199b05f019..047e3d7c34 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_fmd_dialog_btn.xml +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_fmd_dialog_btn.xml @@ -3,8 +3,8 @@ - - + + @@ -12,16 +12,16 @@ - - + + - - + + diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_btn.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_btn.xml index c03996766d..8d2c1102a0 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_btn.xml +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_btn.xml @@ -4,16 +4,16 @@ - - + + - - + + diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_dockers_even.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_dockers_even.xml index cea175ac06..18795fd45e 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_dockers_even.xml +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_dockers_even.xml @@ -7,7 +7,7 @@ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_dockers_odd.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_dockers_odd.xml index 1841e7506a..ff1b015478 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_dockers_odd.xml +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_dockers_odd.xml @@ -7,7 +7,7 @@ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_host.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_host.xml index 802ff1b2a4..b779b75e0e 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_host.xml +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_host.xml @@ -2,13 +2,13 @@ + android:bottomLeftRadius="@dimen/dp_30" + android:bottomRightRadius="@dimen/dp_30" + android:topLeftRadius="@dimen/dp_30" + android:topRightRadius="@dimen/dp_30" /> diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_host_loading.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_host_loading.xml index 77e1eed8c0..fdcaba4d9c 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_host_loading.xml +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_host_loading.xml @@ -2,16 +2,16 @@ + android:width="@dimen/dp_1284" + android:height="@dimen/dp_680" /> + android:bottomLeftRadius="@dimen/dp_30" + android:bottomRightRadius="@dimen/dp_30" + android:topLeftRadius="@dimen/dp_30" + android:topRightRadius="@dimen/dp_30" /> diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_ros_host_view.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_ros_host_view.xml index 802ff1b2a4..b779b75e0e 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_ros_host_view.xml +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_ros_host_view.xml @@ -2,13 +2,13 @@ + android:bottomLeftRadius="@dimen/dp_30" + android:bottomRightRadius="@dimen/dp_30" + android:topLeftRadius="@dimen/dp_30" + android:topRightRadius="@dimen/dp_30" /> diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_show_config_value.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_show_config_value.xml index 49994d8c22..36e34d5f7f 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_show_config_value.xml +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_show_config_value.xml @@ -4,14 +4,14 @@ - + android:bottom="@dimen/dp_24" + android:left="@dimen/dp_20" + android:right="@dimen/dp_20" + android:top="@dimen/dp_24" /> + diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_dialog_default_config_input_bg.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_dialog_default_config_input_bg.xml index fc93cfad8c..c78e36ee32 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_dialog_default_config_input_bg.xml +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_dialog_default_config_input_bg.xml @@ -4,8 +4,8 @@ - - + + @@ -13,8 +13,8 @@ - - + + diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_ic_fault_code_normal.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_ic_fault_code_normal.xml index 3b1bf33219..d11e08576b 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_ic_fault_code_normal.xml +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_ic_fault_code_normal.xml @@ -1,6 +1,6 @@ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_ic_fault_code_unknown.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_ic_fault_code_unknown.xml index 1b6e3ee320..06e70a1959 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_ic_fault_code_unknown.xml +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_ic_fault_code_unknown.xml @@ -1,6 +1,6 @@ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_icon_normal.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_icon_normal.xml index 79e94d5fde..75a3587f4c 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_icon_normal.xml +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_icon_normal.xml @@ -1,6 +1,6 @@ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_progress_bar.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_progress_bar.xml index e7ff3ebbbe..5f90911094 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_progress_bar.xml +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_progress_bar.xml @@ -6,13 +6,13 @@ + android:bottom="@dimen/dp_2" + android:left="@dimen/dp_2" + android:right="@dimen/dp_2" + android:top="@dimen/dp_2" /> diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/rviz_common_dialog_default_config.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/rviz_common_dialog_default_config.xml index 03d1acb7a3..d33b18afeb 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/rviz_common_dialog_default_config.xml +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/rviz_common_dialog_default_config.xml @@ -6,7 +6,7 @@ android:layout_gravity="center" android:background="@drawable/rviz_common_bg_dialog" android:fitsSystemWindows="false" - android:padding="@dimen/dp_20"> + android:padding="@dimen/dp_40"> @@ -24,7 +24,7 @@ android:id="@+id/layout_ip" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/dp_20" + android:layout_marginTop="@dimen/dp_40" android:orientation="horizontal" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -37,7 +37,7 @@ android:gravity="center|end" android:text="ROS Master IP：" android:textColor="@color/rvizFmdColorBlock" - android:textSize="@dimen/sp_18" /> + android:textSize="@dimen/sp_36" /> @@ -70,9 +70,9 @@ android:id="@+id/hint" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="注意：修改IP需要到 控制中心->开发者模式->域控制器->输入IP地址->点击连接工控机" + android:text="注意：修改IP需要到 控制中心->开发者模式->域控制器->输入IP地址->点击“连接工控机”" android:textColor="@color/rviz_fmd_fm_fault_level4" - android:textSize="@dimen/sp_14" + android:textSize="@dimen/sp_28" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/layout_ip" /> @@ -81,7 +81,7 @@ android:id="@+id/layout_ssh_username" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/dp_20" + android:layout_marginTop="@dimen/dp_40" android:orientation="horizontal" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -94,7 +94,7 @@ android:gravity="center|end" android:text="SSH用户名：" android:textColor="@color/rvizFmdColorBlock" - android:textSize="@dimen/sp_18" /> + android:textSize="@dimen/sp_36" /> @@ -123,7 +123,7 @@ android:id="@+id/layout_ssh_userpwd" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/dp_20" + android:layout_marginTop="@dimen/dp_40" android:orientation="horizontal" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -136,7 +136,7 @@ android:gravity="center|end" android:text="SSH密码：" android:textColor="@color/rvizFmdColorBlock" - android:textSize="@dimen/sp_18" /> + android:textSize="@dimen/sp_36" />