2024-05-14 修改

修改

1. 酒店资料界面bug修改

2. 车导地接资料UI修改

app/src/main/java/com/pan_american/android/data/model/resource_management/hotel_resource/entity/HotelResourceDetail.kt

@@ -1,7 +1,7 @@
 package com.pan_american.android.data.model.resource_management.hotel_resource.entity
 
 open class HotelResourceDetail {
-    val id: Int = 0
+    var id: Int = 0
     var city = ""
     var name = ""
     var level = ""

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

@@ -38,6 +38,7 @@ class AddCarResourceActivity : BaseActivity<ActivityAddCarResourceBinding>() {
 
         fromList = intent.getBooleanExtra("fromList", false)
 
+        initTitle()
         initViews()
         initEvents()
     }
@@ -123,6 +124,8 @@ class AddCarResourceActivity : BaseActivity<ActivityAddCarResourceBinding>() {
 
         } else {
 
+            binding.commit.setText(resources.getString(R.string.add))
+
             carResource = CarResource()
         }
 
@@ -165,7 +168,7 @@ class AddCarResourceActivity : BaseActivity<ActivityAddCarResourceBinding>() {
         binding.commit.setOnClickListener {
 
             if (fromList) {
-                if (OASystem.authorization(OASystem.CAR_RESOURCE, OASystem.EDIT)) {
+                if (!OASystem.authorization(OASystem.CAR_RESOURCE, OASystem.EDIT)) {
                     back()
                     return@setOnClickListener
                 }
@@ -210,7 +213,12 @@ class AddCarResourceActivity : BaseActivity<ActivityAddCarResourceBinding>() {
     private fun initCarResourceInfo() {
         binding.apply {
             carCompany.setText(carResource.unitName)
-            companyScore.text = carResource.score.toString()
+            for (item in OASystem.score) {
+                if (item == carResource.score.toString()) {
+                    companyScore.text = carResource.score.toString()
+                    isChose = true
+                }
+            }
             departmentArea.setText(carResource.unitArea)
             departmentLocation.setText(carResource.address)
             contactsName.setText(carResource.contact)

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

@@ -220,11 +220,9 @@ class CarResourceListFragment : BaseFragment<FragmentCarResourceListBinding>() {
                     val baseResponse = response.body()
                     if (baseResponse != null) {
                         if (baseResponse.code == 200) {
-                            binding.carResourceList.removeViewAt(position)
+                            carList.removeAt(position)
                             binding.carResourceList.adapter!!.notifyItemRemoved(position)
-                            binding.carResourceList.adapter!!.notifyItemRangeChanged(
-                                position, carList.size
-                            )
+                            binding.carResourceList.adapter!!.notifyItemRangeChanged(position, carList.size)
                             showMessage(resources.getString(R.string.delete_success))
                         } else {
                             showMessage(baseResponse.msg)

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

@@ -23,7 +23,7 @@ class AddHotelResourceActivity : BaseActivity<ActivityAddHotelResourceBinding>()
 
     private lateinit var titleBinding: LayoutTitleBinding
 
-    private var id = 0
+    private var hotelResourceId = 0
 
     val apiService = ServiceCreator.create<APIService>()
 
@@ -41,7 +41,7 @@ class AddHotelResourceActivity : BaseActivity<ActivityAddHotelResourceBinding>()
 
         intent.apply {
             fromList = getBooleanExtra("fromList", false)
-            id = getIntExtra("id", 0)
+            hotelResourceId = getIntExtra("id", 0)
         }
 
         initTitle()
@@ -183,7 +183,7 @@ class AddHotelResourceActivity : BaseActivity<ActivityAddHotelResourceBinding>()
 
     private fun getHotelDataDetailById() {
 
-        apiService.getHotelResourceDetail(HotelResourceDetailRequest(id)).enqueue(object : Callback<HotelResourceDetailResponse> {
+        apiService.getHotelResourceDetail(HotelResourceDetailRequest(hotelResourceId)).enqueue(object : Callback<HotelResourceDetailResponse> {
             override fun onResponse(
                 call: Call<HotelResourceDetailResponse>,
                 response: Response<HotelResourceDetailResponse>
@@ -224,6 +224,7 @@ class AddHotelResourceActivity : BaseActivity<ActivityAddHotelResourceBinding>()
 
     private fun initHotelResource(type: Int) {
         updateHotelResource.apply {
+            id = hotelResourceId
             name = binding.hotelName.text.toString()
             city = binding.hotelLocation.text.toString()
             address = binding.hotelAddress.getText()

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

@@ -338,43 +338,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/car_age"
-                    android:textSize="@dimen/text_size_medium" />
-
-                <EditText
-                    android:id="@+id/car_years"
-                    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:singleLine="true"
-                    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"

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

@@ -27,7 +27,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="50dp"
                 android:layout_toStartOf="@id/delete"
-                android:text="捷克"
                 android:textColor="@color/text_color_blue"
                 android:textSize="@dimen/text_size_medium"
                 android:textStyle="bold" />
@@ -38,7 +37,8 @@
                 android:layout_height="@dimen/common_padding_heavy"
                 android:layout_alignParentEnd="true"
                 android:layout_marginEnd="@dimen/common_padding"
-                android:src="@mipmap/icon_delete" />
+                android:src="@mipmap/icon_delete"
+                tools:ignore="ContentDescription" />
 
         </RelativeLayout>
 
@@ -49,7 +49,7 @@
             android:layout_marginBottom="@dimen/common_padding"
             android:background="@color/line_color" />
 
-        <RelativeLayout
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/common_padding"
@@ -59,21 +59,19 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:text="单位地区"
+                android:text="@string/unit_area"
                 android:textSize="@dimen/text_size_medium" />
 
             <TextView
                 android:id="@+id/unit_area"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:background="@color/white"
+                android:layout_weight="1"
                 android:gravity="end"
                 android:singleLine="true"
-                android:text="捷克"
                 android:textSize="@dimen/text_size_medium" />
 
-        </RelativeLayout>
+        </LinearLayout>
 
         <View
             android:layout_width="match_parent"
@@ -82,7 +80,7 @@
             android:layout_marginBottom="@dimen/common_padding"
             android:background="@color/line_color" />
 
-        <RelativeLayout
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/common_padding"
@@ -92,21 +90,19 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:text="联系人"
+                android:text="@string/contacts"
                 android:textSize="@dimen/text_size_medium" />
 
             <TextView
                 android:id="@+id/contacts_name"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:background="@color/white"
+                android:layout_weight="1"
                 android:gravity="end"
                 android:singleLine="true"
-                android:text="黄珊珊"
                 android:textSize="@dimen/text_size_medium" />
 
-        </RelativeLayout>
+        </LinearLayout>
 
         <View
             android:layout_width="match_parent"
@@ -115,7 +111,7 @@
             android:layout_marginBottom="@dimen/common_padding"
             android:background="@color/line_color" />
 
-        <RelativeLayout
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/common_padding"
@@ -125,21 +121,19 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:text="电话"
+                android:text="@string/contacts_phone"
                 android:textSize="@dimen/text_size_medium" />
 
             <TextView
                 android:id="@+id/contacts_phone"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:background="@color/white"
+                android:layout_weight="1"
                 android:gravity="end"
                 android:singleLine="true"
-                android:text="18780100243"
                 android:textSize="@dimen/text_size_medium" />
 
-        </RelativeLayout>
+        </LinearLayout>
 
         <View
             android:layout_width="match_parent"
@@ -148,7 +142,7 @@
             android:layout_marginBottom="@dimen/common_padding"
             android:background="@color/line_color" />
 
-        <RelativeLayout
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/common_padding"
@@ -158,21 +152,20 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:text="评分"
+                android:text="@string/score"
                 android:textSize="@dimen/text_size_medium" />
 
             <TextView
                 android:id="@+id/service_score"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
+                android:layout_weight="1"
                 android:background="@color/white"
                 android:gravity="end"
                 android:singleLine="true"
-                android:text="5"
                 android:textSize="@dimen/text_size_medium" />
 
-        </RelativeLayout>
+        </LinearLayout>
 
         <View
             android:layout_width="match_parent"
@@ -181,7 +174,7 @@
             android:layout_marginBottom="@dimen/common_padding"
             android:background="@color/line_color" />
 
-        <RelativeLayout
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/common_padding"
@@ -192,21 +185,20 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:text="创建时间"
+                android:text="@string/refresh_time"
                 android:textSize="@dimen/text_size_medium" />
 
             <TextView
                 android:id="@+id/create_time"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
+                android:layout_weight="1"
                 android:background="@color/white"
                 android:gravity="end"
                 android:singleLine="true"
-                android:text="2023/07/18  17:03:55"
                 android:textSize="@dimen/text_size_medium" />
 
-        </RelativeLayout>
+        </LinearLayout>
 
     </LinearLayout>
 

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

@@ -66,6 +66,9 @@
     <string name="during">至</string>
 
     <string name="create_time">创建时间</string>
+    <string name="refresh_time">更新时间</string>
+
+    <string name="score">评分</string>
 
     <string name="creator">录入人</string>