2024-05-13 修改

修改

1. 部分UI界面调整

app/src/main/java/com/pan_american/android/ui/resource_management/airplane_three_code/AddAirplaneThreeCodeActivity.kt

@@ -96,9 +96,9 @@ class AddAirplaneThreeCodeActivity : BaseActivity<ActivityAddAirplaneThreeCodeBi
                 fourCode.isEnabled = false
                 airplaneCountry.isEnabled = false
                 airplaneCity.isEnabled = false
-                airplaneName.isEnabled = false
-                airplaneNameEn.isEnabled = false
-                otherInfo.isEnabled = false
+                airplaneName.isEnabled(false)
+                airplaneNameEn.isEnabled(false)
+                otherInfo.isEnabled(false)
 
                 commit.visibility = View.GONE
             }

app/src/main/java/com/pan_american/android/ui/resource_management/car_resource/AddCarResourceActivity.kt

@@ -70,17 +70,16 @@ class AddCarResourceActivity : BaseActivity<ActivityAddCarResourceBinding>() {
 
             if (!OASystem.authorization(OASystem.CAR_RESOURCE, OASystem.EDIT)) {
                 binding.apply {
-                    carCompany.inputType = InputType.TYPE_NULL
+                    carCompany.isEnabled = false
                     companyScore.isEnabled = false
-                    departmentArea.inputType = InputType.TYPE_NULL
-                    departmentLocation.setInputType(InputType.TYPE_NULL)
-                    contactsName.inputType = InputType.TYPE_NULL
-                    contactsPhone.inputType = InputType.TYPE_NULL
-                    contactsEmail.inputType = InputType.TYPE_NULL
-                    contactsFax.inputType = InputType.TYPE_NULL
-                    carDescription.setInputType(InputType.TYPE_NULL)
-                    otherInfo.setInputType(InputType.TYPE_NULL)
-                    otherInfo.setSingleLine(false)
+                    departmentArea.isEnabled = false
+                    departmentLocation.isEnabled(false)
+                    contactsName.isEnabled = false
+                    contactsPhone.isEnabled = false
+                    contactsEmail.isEnabled = false
+                    contactsFax.isEnabled = false
+                    carDescription.isEnabled(false)
+                    otherInfo.isEnabled(false)
 
                     carQualificationA.isEnabled = false
                     carQualificationB.isEnabled = false

app/src/main/java/com/pan_american/android/ui/resource_management/guide_resource/AddGuideResourceActivity.kt

@@ -77,7 +77,7 @@ class AddGuideResourceActivity : BaseActivity<ActivityAddGuideResourceBinding>()
                     serviceScore.isEnabled = false
                     unitArea.isEnabled = false
                     departmentName.isEnabled = false
-                    supplierLocation.setInputType(InputType.TYPE_NULL)
+                    supplierLocation.isEnabled(false)
                     contactsName.isEnabled = false
                     contactsPhone.isEnabled = false
                     contactsEmail.isEnabled = false

app/src/main/res/layout/activity_add_car_resource.xml

@@ -50,6 +50,7 @@
                     android:hint="@string/please_input"
                     android:importantForAutofill="no"
                     android:inputType="text"
+                    android:textColor="@color/text_color"
                     android:textColorHint="@color/hint_text_color"
                     android:textSize="@dimen/text_size_medium" />
             </LinearLayout>
@@ -84,6 +85,7 @@
                     android:gravity="end"
                     android:hint="@string/please_select"
                     android:singleLine="true"
+                    android:textColor="@color/text_color"
                     android:textColorHint="@color/hint_text_color"
                     android:textSize="@dimen/text_size_medium" />
             </LinearLayout>
@@ -120,6 +122,7 @@
                     android:importantForAutofill="no"
                     android:inputType="text"
                     android:singleLine="true"
+                    android:textColor="@color/text_color"
                     android:textColorHint="@color/hint_text_color"
                     android:textSize="@dimen/text_size_medium" />
             </LinearLayout>
@@ -187,6 +190,7 @@
                     android:importantForAutofill="no"
                     android:inputType="text"
                     android:singleLine="true"
+                    android:textColor="@color/text_color"
                     android:textColorHint="@color/hint_text_color"
                     android:textSize="@dimen/text_size_medium" />
             </LinearLayout>
@@ -223,6 +227,7 @@
                     android:importantForAutofill="no"
                     android:inputType="phone"
                     android:singleLine="true"
+                    android:textColor="@color/text_color"
                     android:textColorHint="@color/hint_text_color"
                     android:textSize="@dimen/text_size_medium" />
             </LinearLayout>
@@ -259,6 +264,7 @@
                     android:importantForAutofill="no"
                     android:inputType="textEmailAddress"
                     android:singleLine="true"
+                    android:textColor="@color/text_color"
                     android:textColorHint="@color/hint_text_color"
                     android:textSize="@dimen/text_size_medium" />
             </LinearLayout>
@@ -295,6 +301,7 @@
                     android:importantForAutofill="no"
                     android:inputType="text"
                     android:singleLine="true"
+                    android:textColor="@color/text_color"
                     android:textColorHint="@color/hint_text_color"
                     android:textSize="@dimen/text_size_medium" />
             </LinearLayout>
@@ -363,6 +370,7 @@
                     android:importantForAutofill="no"
                     android:inputType="text"
                     android:singleLine="true"
+                    android:textColor="@color/text_color"
                     android:textColorHint="@color/hint_text_color"
                     android:textSize="@dimen/text_size_medium" />
             </LinearLayout>
@@ -491,7 +499,8 @@
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
                         android:checked="true"
-                        android:text="@string/score_A" />
+                        android:text="@string/score_A"
+                        android:textColor="@color/text_color" />
 
                     <RadioButton
                         android:id="@+id/car_qualification_b"
@@ -500,7 +509,8 @@
                         android:layout_marginStart="@dimen/common_padding"
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
-                        android:text="@string/score_B" />
+                        android:text="@string/score_B"
+                        android:textColor="@color/text_color" />
 
                     <RadioButton
                         android:id="@+id/car_qualification_c"
@@ -509,7 +519,8 @@
                         android:layout_marginStart="@dimen/common_padding"
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
-                        android:text="@string/score_C" />
+                        android:text="@string/score_C"
+                        android:textColor="@color/text_color" />
                 </RadioGroup>
             </LinearLayout>
 
@@ -550,7 +561,8 @@
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
                         android:checked="true"
-                        android:text="@string/score_A" />
+                        android:text="@string/score_A"
+                        android:textColor="@color/text_color" />
 
                     <RadioButton
                         android:id="@+id/car_age_b"
@@ -559,7 +571,8 @@
                         android:layout_marginStart="@dimen/common_padding"
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
-                        android:text="@string/score_B" />
+                        android:text="@string/score_B"
+                        android:textColor="@color/text_color" />
 
                     <RadioButton
                         android:id="@+id/car_age_c"
@@ -568,7 +581,8 @@
                         android:layout_marginStart="@dimen/common_padding"
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
-                        android:text="@string/score_C" />
+                        android:text="@string/score_C"
+                        android:textColor="@color/text_color" />
                 </RadioGroup>
             </LinearLayout>
 
@@ -608,7 +622,8 @@
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
                         android:checked="true"
-                        android:text="@string/score_A" />
+                        android:text="@string/score_A"
+                        android:textColor="@color/text_color" />
 
                     <RadioButton
                         android:id="@+id/car_surface_b"
@@ -617,7 +632,8 @@
                         android:layout_marginStart="@dimen/common_padding"
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
-                        android:text="@string/score_B" />
+                        android:text="@string/score_B"
+                        android:textColor="@color/text_color" />
 
                     <RadioButton
                         android:id="@+id/car_surface_c"
@@ -626,7 +642,8 @@
                         android:layout_marginStart="@dimen/common_padding"
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
-                        android:text="@string/score_C" />
+                        android:text="@string/score_C"
+                        android:textColor="@color/text_color" />
                 </RadioGroup>
             </LinearLayout>
 
@@ -666,7 +683,8 @@
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
                         android:checked="true"
-                        android:text="@string/score_A" />
+                        android:text="@string/score_A"
+                        android:textColor="@color/text_color" />
 
                     <RadioButton
                         android:id="@+id/car_inner_b"
@@ -675,7 +693,8 @@
                         android:layout_marginStart="@dimen/common_padding"
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
-                        android:text="@string/score_B" />
+                        android:text="@string/score_B"
+                        android:textColor="@color/text_color" />
 
                     <RadioButton
                         android:id="@+id/car_inner_c"
@@ -684,7 +703,8 @@
                         android:layout_marginStart="@dimen/common_padding"
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
-                        android:text="@string/score_C" />
+                        android:text="@string/score_C"
+                        android:textColor="@color/text_color" />
                 </RadioGroup>
             </LinearLayout>
 
@@ -724,7 +744,8 @@
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
                         android:checked="true"
-                        android:text="@string/score_A" />
+                        android:text="@string/score_A"
+                        android:textColor="@color/text_color" />
 
                     <RadioButton
                         android:id="@+id/car_prepare_b"
@@ -733,7 +754,8 @@
                         android:layout_marginStart="@dimen/common_padding"
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
-                        android:text="@string/score_B" />
+                        android:text="@string/score_B"
+                        android:textColor="@color/text_color" />
 
                     <RadioButton
                         android:id="@+id/car_prepare_c"
@@ -742,7 +764,8 @@
                         android:layout_marginStart="@dimen/common_padding"
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
-                        android:text="@string/score_C" />
+                        android:text="@string/score_C"
+                        android:textColor="@color/text_color" />
                 </RadioGroup>
             </LinearLayout>
 
@@ -782,7 +805,8 @@
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
                         android:checked="true"
-                        android:text="@string/score_A" />
+                        android:text="@string/score_A"
+                        android:textColor="@color/text_color" />
 
                     <RadioButton
                         android:id="@+id/car_dispose_b"
@@ -791,7 +815,8 @@
                         android:layout_marginStart="@dimen/common_padding"
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
-                        android:text="@string/score_B" />
+                        android:text="@string/score_B"
+                        android:textColor="@color/text_color" />
 
                     <RadioButton
                         android:id="@+id/car_dispose_c"
@@ -800,7 +825,8 @@
                         android:layout_marginStart="@dimen/common_padding"
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
-                        android:text="@string/score_C" />
+                        android:text="@string/score_C"
+                        android:textColor="@color/text_color" />
                 </RadioGroup>
             </LinearLayout>
 
@@ -840,7 +866,8 @@
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
                         android:checked="true"
-                        android:text="@string/score_A" />
+                        android:text="@string/score_A"
+                        android:textColor="@color/text_color" />
 
                     <RadioButton
                         android:id="@+id/time_concept_b"
@@ -849,7 +876,8 @@
                         android:layout_marginStart="@dimen/common_padding"
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
-                        android:text="@string/score_B" />
+                        android:text="@string/score_B"
+                        android:textColor="@color/text_color" />
 
                     <RadioButton
                         android:id="@+id/time_concept_c"
@@ -858,7 +886,8 @@
                         android:layout_marginStart="@dimen/common_padding"
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
-                        android:text="@string/score_C" />
+                        android:text="@string/score_C"
+                        android:textColor="@color/text_color" />
                 </RadioGroup>
             </LinearLayout>
 
@@ -898,7 +927,8 @@
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
                         android:checked="true"
-                        android:text="@string/score_A" />
+                        android:text="@string/score_A"
+                        android:textColor="@color/text_color" />
 
                     <RadioButton
                         android:id="@+id/safety_concept_b"
@@ -907,7 +937,8 @@
                         android:layout_marginStart="@dimen/common_padding"
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
-                        android:text="@string/score_B" />
+                        android:text="@string/score_B"
+                        android:textColor="@color/text_color" />
 
                     <RadioButton
                         android:id="@+id/safety_concept_c"
@@ -916,7 +947,8 @@
                         android:layout_marginStart="@dimen/common_padding"
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
-                        android:text="@string/score_C" />
+                        android:text="@string/score_C"
+                        android:textColor="@color/text_color" />
                 </RadioGroup>
             </LinearLayout>
 
@@ -956,7 +988,8 @@
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
                         android:checked="true"
-                        android:text="@string/score_A" />
+                        android:text="@string/score_A"
+                        android:textColor="@color/text_color" />
 
                     <RadioButton
                         android:id="@+id/driver_b"
@@ -965,7 +998,8 @@
                         android:layout_marginStart="@dimen/common_padding"
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
-                        android:text="@string/score_B" />
+                        android:text="@string/score_B"
+                        android:textColor="@color/text_color" />
 
                     <RadioButton
                         android:id="@+id/driver_c"
@@ -974,7 +1008,8 @@
                         android:layout_marginStart="@dimen/common_padding"
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
-                        android:text="@string/score_C" />
+                        android:text="@string/score_C"
+                        android:textColor="@color/text_color" />
                 </RadioGroup>
             </LinearLayout>
 
@@ -1031,6 +1066,7 @@
                         android:gravity="end"
                         android:hint="@string/please_select"
                         android:singleLine="true"
+                        android:textColor="@color/text_color"
                         android:textColorHint="@color/hint_text_color"
                         android:textSize="@dimen/text_size_medium" />
                 </LinearLayout>
@@ -1066,6 +1102,7 @@
                         android:gravity="end"
                         android:hint="@string/please_select"
                         android:singleLine="true"
+                        android:textColor="@color/text_color"
                         android:textColorHint="@color/hint_text_color"
                         android:textSize="@dimen/text_size_medium" />
                 </LinearLayout>
@@ -1101,6 +1138,7 @@
                         android:gravity="end"
                         android:hint="@string/please_select"
                         android:singleLine="true"
+                        android:textColor="@color/text_color"
                         android:textColorHint="@color/hint_text_color"
                         android:textSize="@dimen/text_size_medium" />
                 </LinearLayout>
@@ -1137,6 +1175,7 @@
                         android:importantForAutofill="no"
                         android:inputType="numberDecimal"
                         android:singleLine="true"
+                        android:textColor="@color/text_color"
                         android:textColorHint="@color/hint_text_color"
                         android:textSize="@dimen/text_size_medium" />
                 </LinearLayout>