2024-05-13 修改

修改

1. 部分UI界面调整

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

@@ -1,7 +1,6 @@
 package com.pan_american.android.ui.resource_management.airplane_three_code
 
 import android.os.Bundle
-import android.text.InputType
 import android.view.View
 import com.pan_american.android.OASystem
 import com.pan_american.android.R
@@ -93,13 +92,13 @@ class AddAirplaneThreeCodeActivity : BaseActivity<ActivityAddAirplaneThreeCodeBi
             otherInfo.setText(airplaneThreeCode.remark)
 
             if (!OASystem.authorization(OASystem.THREE_CODE_RESOURCE, OASystem.EDIT)) {
-                threeCode.inputType = InputType.TYPE_NULL
-                fourCode.inputType = InputType.TYPE_NULL
-                airplaneCountry.inputType = InputType.TYPE_NULL
-                airplaneCity.inputType = InputType.TYPE_NULL
-                airplaneName.setInputType(InputType.TYPE_NULL)
-                airplaneNameEn.setInputType(InputType.TYPE_NULL)
-                otherInfo.setInputType(InputType.TYPE_NULL)
+                threeCode.isEnabled = false
+                fourCode.isEnabled = false
+                airplaneCountry.isEnabled = false
+                airplaneCity.isEnabled = false
+                airplaneName.isEnabled = false
+                airplaneNameEn.isEnabled = false
+                otherInfo.isEnabled = false
 
                 commit.visibility = View.GONE
             }

app/src/main/res/layout/activity_add_airplane_three_code.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>
@@ -86,6 +87,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>
@@ -121,6 +123,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>
@@ -157,6 +160,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>
@@ -185,8 +189,7 @@
                     android:id="@+id/airplane_name"
                     android:layout_width="match_parent"
                     android:layout_height="60dp"
-                    android:layout_marginTop="@dimen/common_padding"
-                    android:scrollbars="none" />
+                    android:layout_marginTop="@dimen/common_padding" />
             </LinearLayout>
 
             <View
@@ -213,8 +216,7 @@
                     android:id="@+id/airplane_name_en"
                     android:layout_width="match_parent"
                     android:layout_height="60dp"
-                    android:layout_marginTop="@dimen/common_padding"
-                    android:scrollbars="none" />
+                    android:layout_marginTop="@dimen/common_padding" />
             </LinearLayout>
 
             <View
@@ -242,9 +244,7 @@
                     android:id="@+id/other_info"
                     android:layout_width="match_parent"
                     android:layout_height="120dp"
-                    android:layout_marginTop="@dimen/common_padding"
-                    android:background="@drawable/shape_large_edit_text_background"
-                    android:scrollbars="none" />
+                    android:layout_marginTop="@dimen/common_padding" />
             </LinearLayout>
 
             <LinearLayout

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

@@ -383,8 +383,8 @@
                     android:id="@+id/flight_description"
                     android:layout_width="match_parent"
                     android:layout_height="120dp"
-                    android:layout_marginTop="@dimen/common_padding"
-                    android:scrollbars="none" />
+                    android:layout_marginTop="@dimen/common_padding" />
+
             </LinearLayout>
 
             <View
@@ -858,8 +858,8 @@
                     android:id="@+id/payment_sketch"
                     android:layout_width="match_parent"
                     android:layout_height="120dp"
-                    android:layout_marginTop="@dimen/common_padding"
-                    android:scrollbars="none" />
+                    android:layout_marginTop="@dimen/common_padding" />
+
             </LinearLayout>
 
             <View
@@ -887,8 +887,8 @@
                     android:id="@+id/notes"
                     android:layout_width="match_parent"
                     android:layout_height="120dp"
-                    android:layout_marginTop="@dimen/common_padding"
-                    android:scrollbars="none" />
+                    android:layout_marginTop="@dimen/common_padding" />
+
             </LinearLayout>
 
             <View
@@ -1611,8 +1611,8 @@
                     android:id="@+id/payment_apply_notes"
                     android:layout_width="match_parent"
                     android:layout_height="120dp"
-                    android:layout_marginTop="@dimen/common_padding"
-                    android:scrollbars="none" />
+                    android:layout_marginTop="@dimen/common_padding" />
+
             </LinearLayout>
 
             <View

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

@@ -428,9 +428,8 @@
                     android:id="@+id/other_info"
                     android:layout_width="match_parent"
                     android:layout_height="120dp"
-                    android:layout_marginTop="@dimen/common_padding"
-                    android:background="@drawable/shape_large_edit_text_background"
-                    android:scrollbars="none" />
+                    android:layout_marginTop="@dimen/common_padding" />
+
             </LinearLayout>
 
             <View

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

@@ -225,9 +225,7 @@
                 android:id="@+id/payment_notes"
                 android:layout_width="match_parent"
                 android:layout_height="120dp"
-                android:layout_marginTop="@dimen/common_padding"
-                android:background="@drawable/shape_large_edit_text_background"
-                android:scrollbars="none" />
+                android:layout_marginTop="@dimen/common_padding" />
 
         </LinearLayout>
 

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

@@ -360,9 +360,8 @@
                 <com.pan_american.android.util.ScrollEditText
                     android:id="@+id/other_info"
                     android:layout_width="match_parent"
-                    android:layout_height="120dp"
-                    android:background="@drawable/shape_large_edit_text_background"
-                    android:scrollbars="none" />
+                    android:layout_height="120dp" />
+
             </LinearLayout>
 
             <View
@@ -932,9 +931,7 @@
                     <com.pan_american.android.util.ScrollEditText
                         android:id="@+id/notes"
                         android:layout_width="match_parent"
-                        android:layout_height="120dp"
-                        android:background="@drawable/shape_large_edit_text_background"
-                        android:scrollbars="none" />
+                        android:layout_height="120dp" />
                 </LinearLayout>
 
             </LinearLayout>

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

@@ -470,8 +470,8 @@
                     android:id="@+id/hotel_location"
                     android:layout_width="match_parent"
                     android:layout_height="60dp"
-                    android:layout_marginTop="@dimen/common_padding"
-                    android:scrollbars="none" />
+                    android:layout_marginTop="@dimen/common_padding" />
+
             </LinearLayout>
 
             <View
@@ -647,8 +647,8 @@
                     android:id="@+id/room_introduction"
                     android:layout_width="match_parent"
                     android:layout_height="120dp"
-                    android:layout_marginTop="@dimen/common_padding"
-                    android:scrollbars="none" />
+                    android:layout_marginTop="@dimen/common_padding" />
+
             </LinearLayout>
 
             <View
@@ -676,8 +676,8 @@
                     android:id="@+id/hotel_notes"
                     android:layout_width="match_parent"
                     android:layout_height="120dp"
-                    android:layout_marginTop="@dimen/common_padding"
-                    android:scrollbars="none" />
+                    android:layout_marginTop="@dimen/common_padding" />
+
             </LinearLayout>
 
             <LinearLayout
@@ -2188,8 +2188,8 @@
                     android:id="@+id/payment_apply_notes"
                     android:layout_width="match_parent"
                     android:layout_height="120dp"
-                    android:layout_marginTop="@dimen/common_padding"
-                    android:scrollbars="none" />
+                    android:layout_marginTop="@dimen/common_padding" />
+
             </LinearLayout>
 
             <LinearLayout

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

@@ -323,8 +323,8 @@
                     android:id="@+id/insurance_notes"
                     android:layout_width="match_parent"
                     android:layout_height="120dp"
-                    android:layout_marginTop="@dimen/common_padding"
-                    android:scrollbars="none" />
+                    android:layout_marginTop="@dimen/common_padding" />
+
             </LinearLayout>
 
             <LinearLayout
@@ -1004,8 +1004,8 @@
                     android:id="@+id/payment_apply_notes"
                     android:layout_width="match_parent"
                     android:layout_height="120dp"
-                    android:layout_marginTop="@dimen/common_padding"
-                    android:scrollbars="none" />
+                    android:layout_marginTop="@dimen/common_padding" />
+
             </LinearLayout>
 
             <LinearLayout

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

@@ -234,8 +234,8 @@
                     android:id="@+id/invitee_location"
                     android:layout_width="match_parent"
                     android:layout_height="120dp"
-                    android:layout_marginTop="@dimen/common_padding"
-                    android:scrollbars="none" />
+                    android:layout_marginTop="@dimen/common_padding" />
+
             </LinearLayout>
 
             <View
@@ -263,8 +263,8 @@
                     android:id="@+id/invitee_info"
                     android:layout_width="match_parent"
                     android:layout_height="120dp"
-                    android:layout_marginTop="@dimen/common_padding"
-                    android:scrollbars="none" />
+                    android:layout_marginTop="@dimen/common_padding" />
+
             </LinearLayout>
 
             <View
@@ -636,8 +636,8 @@
                     android:id="@+id/other_info"
                     android:layout_width="match_parent"
                     android:layout_height="120dp"
-                    android:layout_marginTop="@dimen/common_padding"
-                    android:scrollbars="none" />
+                    android:layout_marginTop="@dimen/common_padding" />
+
             </LinearLayout>
 
             <View

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

@@ -529,8 +529,8 @@
                     android:id="@+id/invitee_location"
                     android:layout_width="match_parent"
                     android:layout_height="120dp"
-                    android:layout_marginTop="@dimen/common_padding"
-                    android:scrollbars="none" />
+                    android:layout_marginTop="@dimen/common_padding" />
+
             </LinearLayout>
 
             <View
@@ -558,8 +558,8 @@
                     android:id="@+id/other_info"
                     android:layout_width="match_parent"
                     android:layout_height="120dp"
-                    android:layout_marginTop="@dimen/common_padding"
-                    android:scrollbars="none" />
+                    android:layout_marginTop="@dimen/common_padding" />
+
             </LinearLayout>
 
             <View
@@ -1532,8 +1532,8 @@
                     android:id="@+id/notes"
                     android:layout_width="match_parent"
                     android:layout_height="120dp"
-                    android:layout_marginTop="@dimen/common_padding"
-                    android:scrollbars="none" />
+                    android:layout_marginTop="@dimen/common_padding" />
+
             </LinearLayout>
 
             <LinearLayout

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

@@ -838,8 +838,7 @@
                     android:id="@+id/notes"
                     android:layout_width="match_parent"
                     android:layout_height="120dp"
-                    android:layout_marginTop="@dimen/common_padding"
-                    android:scrollbars="none" />
+                    android:layout_marginTop="@dimen/common_padding" />
 
             </LinearLayout>
 

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

@@ -179,8 +179,8 @@
                     android:id="@+id/visa_description"
                     android:layout_width="match_parent"
                     android:layout_height="120dp"
-                    android:layout_marginTop="@dimen/common_padding"
-                    android:scrollbars="none" />
+                    android:layout_marginTop="@dimen/common_padding" />
+
             </LinearLayout>
 
             <View
@@ -485,8 +485,8 @@
                     android:id="@+id/notes"
                     android:layout_width="match_parent"
                     android:layout_height="120dp"
-                    android:layout_marginTop="@dimen/common_padding"
-                    android:scrollbars="none" />
+                    android:layout_marginTop="@dimen/common_padding" />
+
             </LinearLayout>
 
             <View
@@ -1187,8 +1187,8 @@
                     android:id="@+id/payment_apply_notes"
                     android:layout_width="match_parent"
                     android:layout_height="120dp"
-                    android:layout_marginTop="@dimen/common_padding"
-                    android:scrollbars="none" />
+                    android:layout_marginTop="@dimen/common_padding" />
+
             </LinearLayout>
 
             <View

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

@@ -436,9 +436,8 @@
                 <com.pan_american.android.util.ScrollEditText
                     android:id="@+id/berth_notes"
                     android:layout_width="match_parent"
-                    android:layout_height="120dp"
-                    android:background="@drawable/shape_large_edit_text_background"
-                    android:scrollbars="none" />
+                    android:layout_height="120dp" />
+
             </LinearLayout>
 
             <View
@@ -466,9 +465,8 @@
                 <com.pan_american.android.util.ScrollEditText
                     android:id="@+id/room_notes"
                     android:layout_width="match_parent"
-                    android:layout_height="120dp"
-                    android:background="@drawable/shape_large_edit_text_background"
-                    android:scrollbars="none" />
+                    android:layout_height="120dp" />
+
             </LinearLayout>
 
             <View
@@ -496,9 +494,8 @@
                 <com.pan_american.android.util.ScrollEditText
                     android:id="@+id/meal_notes"
                     android:layout_width="match_parent"
-                    android:layout_height="120dp"
-                    android:background="@drawable/shape_large_edit_text_background"
-                    android:scrollbars="none" />
+                    android:layout_height="120dp" />
+
             </LinearLayout>
 
             <View
@@ -526,9 +523,8 @@
                 <com.pan_american.android.util.ScrollEditText
                     android:id="@+id/notes"
                     android:layout_width="match_parent"
-                    android:layout_height="120dp"
-                    android:background="@drawable/shape_large_edit_text_background"
-                    android:scrollbars="none" />
+                    android:layout_height="120dp" />
+
             </LinearLayout>
 
             <View

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

@@ -36,9 +36,8 @@
                 <com.pan_american.android.util.ScrollEditText
                     android:id="@+id/visit_purpose"
                     android:layout_width="match_parent"
-                    android:layout_height="120dp"
-                    android:background="@drawable/shape_large_edit_text_background"
-                    android:scrollbars="none" />
+                    android:layout_height="120dp" />
+
             </LinearLayout>
 
             <View
@@ -66,9 +65,8 @@
                 <com.pan_american.android.util.ScrollEditText
                     android:id="@+id/special_demand"
                     android:layout_width="match_parent"
-                    android:layout_height="120dp"
-                    android:background="@drawable/shape_large_edit_text_background"
-                    android:scrollbars="none" />
+                    android:layout_height="120dp" />
+
             </LinearLayout>
 
             <View
@@ -96,9 +94,8 @@
                 <com.pan_american.android.util.ScrollEditText
                     android:id="@+id/official_business_demand"
                     android:layout_width="match_parent"
-                    android:layout_height="120dp"
-                    android:background="@drawable/shape_large_edit_text_background"
-                    android:scrollbars="none" />
+                    android:layout_height="120dp" />
+
             </LinearLayout>
 
             <View
@@ -126,9 +123,8 @@
                 <com.pan_american.android.util.ScrollEditText
                     android:id="@+id/other_demand"
                     android:layout_width="match_parent"
-                    android:layout_height="120dp"
-                    android:background="@drawable/shape_large_edit_text_background"
-                    android:scrollbars="none" />
+                    android:layout_height="120dp" />
+
             </LinearLayout>
 
             <View
@@ -156,9 +152,8 @@
                 <com.pan_american.android.util.ScrollEditText
                     android:id="@+id/notes"
                     android:layout_width="match_parent"
-                    android:layout_height="120dp"
-                    android:background="@drawable/shape_large_edit_text_background"
-                    android:scrollbars="none" />
+                    android:layout_height="120dp" />
+
             </LinearLayout>
 
             <View
@@ -186,9 +181,8 @@
                 <com.pan_american.android.util.ScrollEditText
                     android:id="@+id/phone_number"
                     android:layout_width="match_parent"
-                    android:layout_height="120dp"
-                    android:background="@drawable/shape_large_edit_text_background"
-                    android:scrollbars="none" />
+                    android:layout_height="120dp" />
+
             </LinearLayout>
 
             <View
@@ -216,9 +210,8 @@
                 <com.pan_american.android.util.ScrollEditText
                     android:id="@+id/wechat"
                     android:layout_width="match_parent"
-                    android:layout_height="120dp"
-                    android:background="@drawable/shape_large_edit_text_background"
-                    android:scrollbars="none" />
+                    android:layout_height="120dp" />
+
             </LinearLayout>
 
             <View

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

@@ -243,8 +243,7 @@
                 android:id="@+id/cost_detail"
                 android:layout_width="match_parent"
                 android:layout_height="100dp"
-                android:layout_marginTop="@dimen/common_padding"
-                android:scrollbars="none" />
+                android:layout_marginTop="@dimen/common_padding" />
 
         </LinearLayout>
 

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

@@ -147,9 +147,7 @@
                 android:id="@+id/payment_remark"
                 android:layout_width="match_parent"
                 android:layout_height="120dp"
-                android:layout_marginTop="@dimen/common_padding"
-                android:background="@drawable/shape_large_edit_text_background"
-                android:scrollbars="none" />
+                android:layout_marginTop="@dimen/common_padding" />
 
         </LinearLayout>