2024-05-14 修改

修改

1. 酒店资料列表界面UI调整

2. 车导地接资料列表界面UI调整

3. 机票三字码列表界面UI调整

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

@@ -147,11 +147,21 @@ class AirplaneThreeCodeListFragment : BaseFragment<FragmentAirplaneThreeCodeList
             setData(airplaneList)
             setCanDelete(OASystem.authorization(OASystem.THREE_CODE_RESOURCE, OASystem.DELETE))
             addBindView { itemView, data ->
-                itemView.findViewById<TextView>(R.id.airplane_name).text = data.airPort
-                itemView.findViewById<TextView>(R.id.airplane_country).text = data.country
-                itemView.findViewById<TextView>(R.id.airplane_city).text = data.city
-                itemView.findViewById<TextView>(R.id.airplane_three_code).text = data.three
-                itemView.findViewById<TextView>(R.id.create_time).text = data.createTime
+                itemView.findViewById<TextView>(R.id.airplane_name).text = data.airPort.ifBlank {
+                    resources.getString(R.string.no_info)
+                }
+                itemView.findViewById<TextView>(R.id.airplane_country).text = data.country.ifBlank {
+                    resources.getString(R.string.no_info)
+                }
+                itemView.findViewById<TextView>(R.id.airplane_city).text = data.city.ifBlank {
+                    resources.getString(R.string.no_info)
+                }
+                itemView.findViewById<TextView>(R.id.airplane_three_code).text = data.three.ifBlank {
+                    resources.getString(R.string.no_info)
+                }
+                itemView.findViewById<TextView>(R.id.create_time).text = data.createTime.ifBlank {
+                    resources.getString(R.string.no_info)
+                }
             }
         }.create()
         binding.airplaneResourceList.adapter = adapter

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

@@ -147,12 +147,24 @@ class CarResourceListFragment : BaseFragment<FragmentCarResourceListBinding>() {
             setData(carList)
             setCanDelete(OASystem.authorization(OASystem.CAR_RESOURCE, OASystem.DELETE))
             addBindView { itemView, data ->
-                itemView.findViewById<TextView>(R.id.supplier_name).text = data.unitName
-                itemView.findViewById<TextView>(R.id.unit_area).text = data.unitArea
-                itemView.findViewById<TextView>(R.id.contacts_name).text = data.contact
-                itemView.findViewById<TextView>(R.id.contacts_phone).text = data.contactTel
-                itemView.findViewById<TextView>(R.id.service_score).text = data.score.toString()
-                itemView.findViewById<TextView>(R.id.create_time).text = data.createTime
+                itemView.findViewById<TextView>(R.id.supplier_name).text = data.unitName.ifBlank {
+                    resources.getString(R.string.no_info)
+                }
+                itemView.findViewById<TextView>(R.id.unit_area).text = data.unitArea.ifBlank {
+                    resources.getString(R.string.no_info)
+                }
+                itemView.findViewById<TextView>(R.id.contacts_name).text = data.contact.ifBlank {
+                    resources.getString(R.string.no_info)
+                }
+                itemView.findViewById<TextView>(R.id.contacts_phone).text = data.contactTel.ifBlank {
+                    resources.getString(R.string.no_info)
+                }
+                itemView.findViewById<TextView>(R.id.service_score).text = data.score.toString().ifBlank {
+                    resources.getString(R.string.no_info)
+                }
+                itemView.findViewById<TextView>(R.id.refresh_time).text = data.createTime.ifBlank {
+                    resources.getString(R.string.no_info)
+                }
             }
         }.create()
         binding.carResourceList.adapter = adapter

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

@@ -149,12 +149,24 @@ class GuideResourceListFragment : BaseFragment<FragmentGuideResourceListBinding>
             setData(guideList)
             setCanDelete(OASystem.authorization(OASystem.GUIDE_RESOURCE, OASystem.DELETE))
             addBindView { itemView, data ->
-                itemView.findViewById<TextView>(R.id.supplier_name).text = data.unitName
-                itemView.findViewById<TextView>(R.id.unit_area).text = data.unitArea
-                itemView.findViewById<TextView>(R.id.contacts_name).text = data.contact
-                itemView.findViewById<TextView>(R.id.contacts_phone).text = data.contactTel
-                itemView.findViewById<TextView>(R.id.service_score).text = data.score.toString()
-                itemView.findViewById<TextView>(R.id.create_time).text = data.createTime
+                itemView.findViewById<TextView>(R.id.supplier_name).text = data.unitName.ifBlank {
+                    resources.getString(R.string.no_info)
+                }
+                itemView.findViewById<TextView>(R.id.unit_area).text = data.unitArea.ifBlank {
+                    resources.getString(R.string.no_info)
+                }
+                itemView.findViewById<TextView>(R.id.contacts_name).text = data.contact.ifBlank {
+                    resources.getString(R.string.no_info)
+                }
+                itemView.findViewById<TextView>(R.id.contacts_phone).text = data.contactTel.ifBlank {
+                    resources.getString(R.string.no_info)
+                }
+                itemView.findViewById<TextView>(R.id.service_score).text = data.score.toString().ifBlank {
+                    resources.getString(R.string.no_info)
+                }
+                itemView.findViewById<TextView>(R.id.refresh_time).text = data.createTime.ifBlank {
+                    resources.getString(R.string.no_info)
+                }
             }
         }.create()
         binding.guideResourceList.adapter = adapter

app/src/main/java/com/pan_american/android/ui/resource_management/hotel_resource/HotelResourceListFragment.kt

@@ -157,18 +157,20 @@ class HotelResourceListFragment : BaseFragment<FragmentHotelResourceListBinding>
             setCanDelete(OASystem.authorization(OASystem.HOTEL_RESOURCE, OASystem.DELETE))
             addBindView { itemView, data ->
                 itemView.findViewById<TextView>(R.id.hotel_name).text = data.name
-                itemView.findViewById<TextView>(R.id.hotel_location).text = data.city
-                if (data.tel.isNotBlank()) {
-                    itemView.findViewById<TextView>(R.id.hotel_phone).text = data.tel
+                itemView.findViewById<TextView>(R.id.hotel_location).text = data.city.ifBlank {
+                    resources.getString(R.string.no_info)
                 }
-                if (data.fax.isNotBlank()) {
-                    itemView.findViewById<TextView>(R.id.hotel_fax).text = data.fax
+                itemView.findViewById<TextView>(R.id.hotel_phone).text = data.tel.ifBlank {
+                    resources.getString(R.string.no_info)
                 }
-                if (data.contact.isNotBlank()){
-                    itemView.findViewById<TextView>(R.id.contacts).text = data.contact
+                itemView.findViewById<TextView>(R.id.hotel_fax).text = data.fax.ifBlank {
+                    resources.getString(R.string.no_info)
                 }
-                if (data.contactPhone.isNotBlank()) {
-                    itemView.findViewById<TextView>(R.id.contacts_phone).text = data.contactPhone
+                itemView.findViewById<TextView>(R.id.contacts).text = data.contact.ifBlank {
+                    resources.getString(R.string.no_info)
+                }
+                itemView.findViewById<TextView>(R.id.contacts_phone).text = data.contactPhone.ifBlank {
+                    resources.getString(R.string.no_info)
                 }
             }
         }.create()

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

@@ -189,7 +189,7 @@
                 android:textSize="@dimen/text_size_medium" />
 
             <TextView
-                android:id="@+id/create_time"
+                android:id="@+id/refresh_time"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"

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

@@ -100,7 +100,6 @@
                 android:layout_weight="1"
                 android:background="@color/white"
                 android:gravity="end"
-                android:hint="@string/no_info"
                 android:singleLine="true"
                 android:textColorHint="@color/hint_text_color"
                 android:textSize="@dimen/text_size_medium" />
@@ -134,7 +133,6 @@
                 android:layout_weight="1"
                 android:background="@color/white"
                 android:gravity="end"
-                android:hint="@string/no_info"
                 android:singleLine="true"
                 android:textColorHint="@color/hint_text_color"
                 android:textSize="@dimen/text_size_medium" />
@@ -168,7 +166,6 @@
                 android:layout_weight="1"
                 android:background="@color/white"
                 android:gravity="end"
-                android:hint="@string/no_info"
                 android:singleLine="true"
                 android:textColorHint="@color/hint_text_color"
                 android:textSize="@dimen/text_size_medium" />
@@ -205,7 +202,6 @@
                 android:layout_weight="1"
                 android:background="@color/white"
                 android:gravity="end"
-                android:hint="@string/no_info"
                 android:singleLine="true"
                 android:textColorHint="@color/hint_text_color"
                 android:textSize="@dimen/text_size_medium" />