From dfe4bc9bf9c85803ea7c75063a1cd646efee8094 Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Tue, 23 Apr 2024 18:37:38 +0800
Subject: [PATCH] =?UTF-8?q?[6.4.0]=E4=BA=A7=E5=93=81=E9=9C=80=E6=B1=82?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=97=AE=E9=A2=98=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workorder/WorkOrderWindow.kt              | 17 ++++++++-------
 .../src/main/res/layout/view_work_order.xml   | 21 +++++++++++++------
 .../src/main/res/values/strings.xml           |  9 ++++----
 3 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderWindow.kt
index c8c5615b28..266fa91225 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderWindow.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderWindow.kt
@@ -142,17 +142,20 @@ class WorkOrderWindow constructor(activity: Activity) : View.OnTouchListener,
 
         rgType.setOnCheckedChangeListener{_, checkedId ->
             when(checkedId){
-                R.id.rb_type_perception->{
-                    workOrderType = "感知"
+                R.id.rb_type_software->{
+                    workOrderType = "软件"
                 }
-                R.id.rb_type_hardware->{
-                    workOrderType = "硬件"
+                R.id.rb_type_kit->{
+                    workOrderType = "套件"
                 }
                 R.id.rb_type_vehicle->{
-                    workOrderType = "原车"
+                    workOrderType = "车辆"
                 }
-                R.id.rb_type_service->{
-                    workOrderType = "服务"
+                R.id.rb_type_capacity->{
+                    workOrderType = "运力"
+                }
+                R.id.rb_type_environment->{
+                    workOrderType = "环境"
                 }
                 R.id.rb_type_other->{
                     workOrderType = "其他"
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_work_order.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_work_order.xml
index 00e407bedb..bc0b1519ff 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_work_order.xml
+++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_work_order.xml
@@ -79,18 +79,19 @@
         >
 
         <RadioButton
-            android:id="@+id/rb_type_perception"
+            android:id="@+id/rb_type_software"
             android:layout_width="@dimen/dp_0"
             android:layout_height="@dimen/dp_70"
-            android:text="@string/work_order_type_perception"
+            android:text="@string/work_order_type_software"
             style="@style/work_order_type_radio_style"
             />
 
+
         <RadioButton
-            android:id="@+id/rb_type_hardware"
+            android:id="@+id/rb_type_kit"
             android:layout_width="@dimen/dp_0"
             android:layout_height="@dimen/dp_70"
-            android:text="@string/work_order_type_hardware"
+            android:text="@string/work_order_type_kit"
             style="@style/work_order_type_radio_style"
             />
 
@@ -103,10 +104,18 @@
             />
 
         <RadioButton
-            android:id="@+id/rb_type_service"
+            android:id="@+id/rb_type_capacity"
             android:layout_width="@dimen/dp_0"
             android:layout_height="@dimen/dp_70"
-            android:text="@string/work_order_type_service"
+            android:text="@string/work_order_type_capacity"
+            style="@style/work_order_type_radio_style"
+            />
+
+        <RadioButton
+            android:id="@+id/rb_type_environment"
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="@dimen/dp_70"
+            android:text="@string/work_order_type_environment"
             style="@style/work_order_type_radio_style"
             />
 
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/values/strings.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/values/strings.xml
index 4c1d9a6abd..de843c7a8f 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/res/values/strings.xml
+++ b/core/function-impl/mogo-core-function-devatools/src/main/res/values/strings.xml
@@ -9,10 +9,11 @@
     <string name="work_order_report">上报</string>
     <string name="work_order_cancel">取消</string>
     <string name="work_order_time">时间：</string>
-    <string name="work_order_type_perception">感知</string>
-    <string name="work_order_type_hardware">硬件</string>
-    <string name="work_order_type_vehicle">原车</string>
-    <string name="work_order_type_service">服务</string>
+    <string name="work_order_type_software">软件</string>
+    <string name="work_order_type_kit">套件</string>
+    <string name="work_order_type_vehicle">车辆</string>
+    <string name="work_order_type_capacity">运力</string>
+    <string name="work_order_type_environment">环境</string>
     <string name="work_order_type_other">其他</string>
 
 </resources>
\ No newline at end of file