2024-08-30 修改

修改：
1. 接团信息/接团客户名单 客户名单新增字段 是否陪同
2. 接团信息/接团客户名单 部分UI更改

app/src/main/java/com/pan_american/android/data/model/group_management/group_info/entity/GroupCustomerInfo.kt

@@ -4,6 +4,7 @@ class GroupCustomerInfo {
 
     var id = 0
 
+    var isAccompany = 1
     var lastName = ""
     var firstName = ""
     var pinyin = ""
@@ -12,7 +13,7 @@ class GroupCustomerInfo {
     var phone = ""
     var sex = -1
     var idCardNo = ""
-    var birthday = ""
+    var birthDay = ""
     var shippingSpaceTypeId = 460
 
     var shippingSpaceSpecialNeeds = ""

app/src/main/java/com/pan_american/android/ui/group_management/group_info/GroupCustomerDetailFragment.kt

@@ -53,6 +53,7 @@ class GroupCustomerDetailFragment : BaseFragment<FragmentGroupCustomerDetailBind
     override fun initViews() {
 
         if (fromList) {
+
             binding.title.text = resources.getString(R.string.customer_info_detail)
             binding.commit.text = resources.getString(R.string.update)
 
@@ -67,7 +68,6 @@ class GroupCustomerDetailFragment : BaseFragment<FragmentGroupCustomerDetailBind
 
             binding.departmentName.setText(groupCustomerInfo.companyFullName)
             binding.job.setText(groupCustomerInfo.job)
-            binding.phoneNumber.setText(groupCustomerInfo.phone)
 
             when (groupCustomerInfo.sex) {
                 0 -> {
@@ -79,8 +79,7 @@ class GroupCustomerDetailFragment : BaseFragment<FragmentGroupCustomerDetailBind
                 }
             }
 
-            binding.idCard.setText(groupCustomerInfo.idCardNo)
-            binding.customerBirthday.text = groupCustomerInfo.birthday
+            binding.customerBirthday.text = groupCustomerInfo.birthDay
 
             for (item in OASystem.groupInfoBerthType) {
                 if (item.id == groupCustomerInfo.shippingSpaceTypeId) {
@@ -88,6 +87,19 @@ class GroupCustomerDetailFragment : BaseFragment<FragmentGroupCustomerDetailBind
                 }
             }
 
+            binding.phoneNumber.setText(groupCustomerInfo.phone)
+            binding.idCard.setText(groupCustomerInfo.idCardNo)
+
+            when(groupCustomerInfo.isAccompany) {
+                1 -> {
+                    binding.isAccompanyNo.isChecked = true
+                }
+
+                2 -> {
+                    binding.isAccompanyYes.isChecked = true
+                }
+            }
+
             binding.berthNotes.setText(groupCustomerInfo.shippingSpaceSpecialNeeds)
             binding.roomNotes.setText(groupCustomerInfo.hotelSpecialNeeds)
             binding.mealNotes.setText(groupCustomerInfo.mealSpecialNeeds)
@@ -112,13 +124,14 @@ class GroupCustomerDetailFragment : BaseFragment<FragmentGroupCustomerDetailBind
                 nameSpell.isEnabled = false
                 departmentName.isEnabled = false
                 job.isEnabled = false
-                phoneNumber.isEnabled = false
                 male.isEnabled = false
                 female.isEnabled = false
-                idCard.isEnabled = false
                 customerBirthday.isEnabled = false
-
                 berthType.isEnabled = false
+                isAccompanyYes.isEnabled = false
+                isAccompanyNo.isEnabled = false
+                phoneNumber.isEnabled = false
+                idCard.isEnabled = false
 
                 berthNotes.isEnabled = false
                 roomNotes.isEnabled = false
@@ -253,7 +266,6 @@ class GroupCustomerDetailFragment : BaseFragment<FragmentGroupCustomerDetailBind
                     pinyin = binding.nameSpell.text.toString()
                     companyFullName = binding.departmentName.text.toString()
                     job = binding.job.text.toString()
-                    phone = binding.phoneNumber.text.toString()
 
                     when (binding.gender.checkedRadioButtonId) {
                         binding.male.id -> {
@@ -265,8 +277,20 @@ class GroupCustomerDetailFragment : BaseFragment<FragmentGroupCustomerDetailBind
                         }
                     }
 
+                    birthDay = binding.customerBirthday.text.toString()
+
+                    when(binding.isAccompany.checkedRadioButtonId) {
+                        binding.isAccompanyYes.id -> {
+                            isAccompany = 2
+                        }
+
+                        binding.isAccompanyNo.id -> {
+                            isAccompany = 1
+                        }
+                    }
+
+                    phone = binding.phoneNumber.text.toString()
                     idCardNo = binding.idCard.text.toString()
-                    birthday = binding.customerBirthday.text.toString()
 
                     shippingSpaceSpecialNeeds = binding.berthNotes.getText()
                     hotelSpecialNeeds = binding.roomNotes.getText()
@@ -275,6 +299,7 @@ class GroupCustomerDetailFragment : BaseFragment<FragmentGroupCustomerDetailBind
 
                     showMessage(resources.getString(R.string.update_success))
                 }
+
             } else {
 
                 binding.lastName.text.apply {
@@ -318,7 +343,6 @@ class GroupCustomerDetailFragment : BaseFragment<FragmentGroupCustomerDetailBind
                     pinyin = binding.nameSpell.text.toString()
                     companyFullName = binding.departmentName.text.toString()
                     job = binding.job.text.toString()
-                    phone = binding.phoneNumber.text.toString()
 
                     when (binding.gender.checkedRadioButtonId) {
                         binding.male.id -> {
@@ -330,8 +354,21 @@ class GroupCustomerDetailFragment : BaseFragment<FragmentGroupCustomerDetailBind
                         }
                     }
 
+                    birthDay = binding.customerBirthday.text.toString()
+
+                    when(binding.isAccompany.checkedRadioButtonId) {
+                        binding.isAccompanyYes.id -> {
+                            isAccompany = 2
+                        }
+
+                        binding.isAccompanyNo.id -> {
+                            isAccompany = 1
+                        }
+                    }
+
+                    phone = binding.phoneNumber.text.toString()
                     idCardNo = binding.idCard.text.toString()
-                    birthday = binding.customerBirthday.text.toString()
+
 
                     shippingSpaceSpecialNeeds = binding.berthNotes.getText()
                     hotelSpecialNeeds = binding.roomNotes.getText()

app/src/main/java/com/pan_american/android/ui/group_management/group_info/GroupCustomerListFragment.kt

@@ -161,32 +161,43 @@ class GroupCustomerListFragment : BaseFragment<FragmentGroupCustomerListBinding>
                     resources.getString(R.string.with_space_format), data.lastName, data.firstName
                 )
 
+                itemView.findViewById<TextView>(R.id.customer_unit).text = data.companyFullName.ifBlank {
+                    resources.getString(R.string.no_info)
+                }
+
+                itemView.findViewById<TextView>(R.id.customer_job).text = data.job.ifBlank {
+                    resources.getString(R.string.no_info)
+                }
+
+                itemView.findViewById<TextView>(R.id.id_number).text = data.idCardNo.ifBlank {
+                    resources.getString(R.string.no_info)
+                }
+
                 when (data.sex) {
                     0 -> {
-                        itemView.findViewById<TextView>(R.id.customer_gender).text =
-                            resources.getString(R.string.male)
+                        itemView.findViewById<TextView>(R.id.customer_gender).text = resources.getString(R.string.male)
                     }
 
                     1 -> {
-                        itemView.findViewById<TextView>(R.id.customer_gender).text =
-                            resources.getString(R.string.female)
+                        itemView.findViewById<TextView>(R.id.customer_gender).text = resources.getString(R.string.female)
                     }
 
                     else -> {
-                        itemView.findViewById<TextView>(R.id.customer_gender).text =
-                            resources.getString(R.string.no_info)
+                        itemView.findViewById<TextView>(R.id.customer_gender).text = resources.getString(R.string.no_info)
                     }
                 }
 
-                itemView.findViewById<TextView>(R.id.customer_unit).apply {
-                    text = data.companyFullName.ifBlank {
-                        resources.getString(R.string.no_info)
+                when (data.isAccompany) {
+                    1 -> {
+                        itemView.findViewById<TextView>(R.id.is_accompany).text = resources.getString(R.string.no)
                     }
-                }
 
-                itemView.findViewById<TextView>(R.id.customer_job).apply {
-                    text = data.job.ifBlank {
-                        resources.getString(R.string.no_info)
+                    2 -> {
+                        itemView.findViewById<TextView>(R.id.is_accompany).text = resources.getString(R.string.yes)
+                    }
+
+                    else -> {
+                        itemView.findViewById<TextView>(R.id.is_accompany).text = resources.getString(R.string.no_info)
                     }
                 }
 

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

@@ -221,42 +221,6 @@
                     android:textSize="@dimen/text_size_medium" />
             </LinearLayout>
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/line"
-                android:layout_marginTop="@dimen/common_padding_huge"
-                android:layout_marginBottom="@dimen/common_padding"
-                android:background="@color/line_color" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/common_padding"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:text="@string/phone_number"
-                    android:textSize="@dimen/text_size_medium" />
-
-                <EditText
-                    android:id="@+id/phone_number"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/common_padding"
-                    android:layout_weight="1"
-                    android:background="@color/white"
-                    android:gravity="end"
-                    android:hint="@string/please_input"
-                    android:importantForAutofill="no"
-                    android:inputType="phone"
-                    android:textColor="@color/text_color"
-                    android:textColorHint="@color/hint_text_color"
-                    android:textSize="@dimen/text_size_medium" />
-            </LinearLayout>
-
             <View
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/line"
@@ -273,7 +237,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/common_padding_small"
+                    android:layout_gravity="center"
                     android:text="@string/gender"
                     android:textSize="@dimen/text_size_medium" />
 
@@ -324,20 +288,18 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:text="@string/ID_number"
+                    android:text="@string/birthday"
                     android:textSize="@dimen/text_size_medium" />
 
-                <EditText
-                    android:id="@+id/id_card"
+                <TextView
+                    android:id="@+id/customer_birthday"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/common_padding"
                     android:layout_weight="1"
                     android:background="@color/white"
                     android:gravity="end"
-                    android:hint="@string/please_input"
-                    android:importantForAutofill="no"
-                    android:inputType="text"
+                    android:hint="@string/please_select"
                     android:textColor="@color/text_color"
                     android:textColorHint="@color/hint_text_color"
                     android:textSize="@dimen/text_size_medium" />
@@ -360,11 +322,11 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:text="@string/birthday"
+                    android:text="@string/berth_name"
                     android:textSize="@dimen/text_size_medium" />
 
                 <TextView
-                    android:id="@+id/customer_birthday"
+                    android:id="@+id/berth_type"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/common_padding"
@@ -377,6 +339,57 @@
                     android:textSize="@dimen/text_size_medium" />
             </LinearLayout>
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/line"
+                android:layout_marginTop="@dimen/common_padding_huge"
+                android:layout_marginBottom="@dimen/common_padding"
+                android:background="@color/line_color" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/common_padding_small"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:text="@string/is_accompany"
+                    android:textSize="@dimen/text_size_medium" />
+
+                <RadioGroup
+                    android:id="@+id/is_accompany"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/common_padding"
+                    android:layout_weight="1"
+                    android:gravity="end"
+                    android:orientation="horizontal">
+
+                    <RadioButton
+                        android:id="@+id/is_accompany_yes"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/style_radio_button"
+                        android:buttonTint="@color/title_background_color"
+                        android:text="@string/yes"
+                        android:textColor="@color/text_color" />
+
+                    <RadioButton
+                        android:id="@+id/is_accompany_no"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/common_padding"
+                        android:background="@drawable/style_radio_button"
+                        android:buttonTint="@color/title_background_color"
+                        android:checked="true"
+                        android:text="@string/no"
+                        android:textColor="@color/text_color" />
+                </RadioGroup>
+            </LinearLayout>
+
             <View
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/line"
@@ -394,18 +407,56 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:text="@string/berth_name"
+                    android:text="@string/phone_number"
                     android:textSize="@dimen/text_size_medium" />
 
+                <EditText
+                    android:id="@+id/phone_number"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/common_padding"
+                    android:layout_weight="1"
+                    android:background="@color/white"
+                    android:gravity="end"
+                    android:hint="@string/please_input"
+                    android:importantForAutofill="no"
+                    android:inputType="phone"
+                    android:textColor="@color/text_color"
+                    android:textColorHint="@color/hint_text_color"
+                    android:textSize="@dimen/text_size_medium" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/line"
+                android:layout_marginTop="@dimen/common_padding_huge"
+                android:layout_marginBottom="@dimen/common_padding"
+                android:background="@color/line_color" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/common_padding"
+                android:orientation="horizontal">
+
                 <TextView
-                    android:id="@+id/berth_type"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:text="@string/ID_number"
+                    android:textSize="@dimen/text_size_medium" />
+
+                <EditText
+                    android:id="@+id/id_card"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/common_padding"
                     android:layout_weight="1"
                     android:background="@color/white"
                     android:gravity="end"
-                    android:hint="@string/please_select"
+                    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" />
@@ -527,32 +578,27 @@
 
             </LinearLayout>
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/line"
-                android:layout_marginTop="@dimen/common_padding_huge"
-                android:layout_marginBottom="@dimen/common_padding"
-                android:background="@color/line_color" />
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="80dp"
-                android:layout_marginBottom="@dimen/common_padding"
+                android:layout_marginTop="50dp"
+                android:layout_marginBottom="@dimen/common_padding_huge"
                 android:orientation="horizontal">
 
                 <TextView
                     android:id="@+id/commit"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/button_height"
-                    android:layout_marginStart="@dimen/common_padding_huge"
-                    android:layout_marginEnd="@dimen/common_padding_huge"
                     android:background="@drawable/shape_corner_solid_blue"
                     android:gravity="center"
                     android:textColor="@color/white"
                     android:textSize="@dimen/text_size_large"
                     android:textStyle="bold" />
+
             </LinearLayout>
+
         </LinearLayout>
+
     </ScrollView>
+
 </LinearLayout>

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

@@ -158,17 +158,10 @@
                 android:textSize="@dimen/text_size_medium" />
         </LinearLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:layout_marginTop="@dimen/common_padding_huge"
-            android:layout_marginBottom="@dimen/common_padding"
-            android:background="@color/line_color" />
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="@dimen/button_height"
-            android:layout_marginTop="80dp"
+            android:layout_marginTop="50dp"
             android:layout_marginBottom="50dp"
             android:background="@drawable/shape_corner_solid_blue"
             android:orientation="horizontal">

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

@@ -214,17 +214,10 @@
 
             </LinearLayout>
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/line"
-                android:layout_marginTop="@dimen/common_padding_huge"
-                android:layout_marginBottom="@dimen/common_padding"
-                android:background="@color/line_color" />
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="80dp"
+                android:layout_marginTop="50dp"
                 android:layout_marginBottom="@dimen/common_padding"
                 android:orientation="horizontal">
 

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

@@ -30,7 +30,7 @@
                 android:ellipsize="marquee"
                 android:maxLines="1"
                 android:textColor="@color/text_color_blue"
-                android:textSize="@dimen/text_size_medium"
+                android:textSize="@dimen/text_size_large"
                 android:textStyle="bold" />
 
             <ImageView
@@ -61,11 +61,12 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:text="@string/gender"
-                android:textSize="@dimen/text_size_medium" />
+                android:text="@string/unit"
+                android:textSize="@dimen/text_size_medium"
+                android:textStyle="bold" />
 
             <TextView
-                android:id="@+id/customer_gender"
+                android:id="@+id/customer_unit"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_marginStart="@dimen/common_padding"
@@ -95,11 +96,12 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:text="@string/unit"
-                android:textSize="@dimen/text_size_medium" />
+                android:text="@string/job_name"
+                android:textSize="@dimen/text_size_medium"
+                android:textStyle="bold"/>
 
             <TextView
-                android:id="@+id/customer_unit"
+                android:id="@+id/customer_job"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_marginStart="@dimen/common_padding"
@@ -129,11 +131,12 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:text="@string/job_name"
-                android:textSize="@dimen/text_size_medium" />
+                android:text="@string/ID_number"
+                android:textSize="@dimen/text_size_medium"
+                android:textStyle="bold"/>
 
             <TextView
-                android:id="@+id/customer_job"
+                android:id="@+id/id_number"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_marginStart="@dimen/common_padding"
@@ -145,6 +148,82 @@
 
         </LinearLayout>
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/line"
+            android:layout_marginTop="@dimen/common_padding_huge"
+            android:layout_marginBottom="@dimen/common_padding"
+            android:background="@color/line_color" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/common_padding"
+            android:baselineAligned="false"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:text="@string/gender"
+                    android:textSize="@dimen/text_size_medium"
+                    android:textStyle="bold"/>
+
+                <TextView
+                    android:id="@+id/customer_gender"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="@dimen/common_padding"
+                    android:layout_marginEnd="@dimen/common_padding_heavy"
+                    android:background="@color/white"
+                    android:gravity="end"
+                    android:singleLine="true"
+                    android:textSize="@dimen/text_size_medium" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="@dimen/line"
+                android:layout_height="match_parent"
+                android:background="@color/line_color" />
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/common_padding_heavy"
+                android:layout_weight="1"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:text="@string/is_accompany"
+                    android:textSize="@dimen/text_size_medium"
+                    android:textStyle="bold"/>
+
+                <TextView
+                    android:id="@+id/is_accompany"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="@dimen/common_padding"
+                    android:layout_marginEnd="@dimen/common_padding"
+                    android:background="@color/white"
+                    android:gravity="end"
+                    android:singleLine="true"
+                    android:textSize="@dimen/text_size_medium" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/line"
@@ -164,7 +243,8 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:text="@string/berth_name"
-                android:textSize="@dimen/text_size_medium" />
+                android:textSize="@dimen/text_size_medium"
+                android:textStyle="bold"/>
 
             <TextView
                 android:id="@+id/berth_name"

app/src/main/res/values/strings.xml

@@ -493,7 +493,8 @@
     <string name="name_spell">拼音</string>
     <string name="name_spell_generate">生成拼音</string>
     <string name="name_spell_format">%s/%s</string>
-
+    <string name="is_accompany">是否陪同</string>
+    
     <string name="berth_notes">舱位备注</string>
     <string name="room_notes">房间备注</string>
     <string name="meal_notes">餐食备注</string>