2024-05-14 修改

修改

1. 日付费用申请 部分逻辑调整 UI调整

2. 酒店资料，接口更改，对接新接口，部分逻辑修改

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

@@ -1,10 +1,7 @@
 package com.pan_american.android.data.model.resource_management.hotel_resource.entity
 
-import com.pan_american.android.OASystem
-import java.io.Serializable
-
-class HotelResource: Serializable {
-
+open class HotelResourceDetail {
+    val id: Int = 0
     var city = ""
     var name = ""
     var level = ""
@@ -14,10 +11,5 @@ class HotelResource: Serializable {
     var contact = ""
     var contactPhone = ""
     var otherInformation = ""
-    var createUserId = OASystem.userInfo.userId
     var remark = ""
-
-    var status: Int = 0
-    val id: Int = 0
-    val createTime: String = ""
 }

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

@@ -0,0 +1,9 @@
+package com.pan_american.android.data.model.resource_management.hotel_resource.entity
+
+import com.pan_american.android.OASystem
+
+class UpdateHotelResource: HotelResourceDetail() {
+    var status: Int = 0
+    var createUserId = OASystem.userInfo.userId
+    val createTime: String = ""
+}

app/src/main/java/com/pan_american/android/data/model/resource_management/hotel_resource/network/HotelResourceRequest.kt

@@ -2,4 +2,4 @@ package com.pan_american.android.data.model.resource_management.hotel_resource.n
 
 import com.pan_american.android.base.BaseRequest
 
-class HotelResourceRequest(val name: String, val city: String, val contact: String, val contactPhone: String): BaseRequest()
+class HotelResourceDetailRequest(val id: Int): BaseRequest()

app/src/main/java/com/pan_american/android/data/model/resource_management/hotel_resource/network/HotelResourceDetailResponse.kt

@@ -0,0 +1,6 @@
+package com.pan_american.android.data.model.resource_management.hotel_resource.network
+
+import com.pan_american.android.base.BaseResponse
+import com.pan_american.android.data.model.resource_management.hotel_resource.entity.HotelResourceDetail
+
+class HotelResourceDetailResponse(val data: HotelResourceDetail): BaseResponse()

app/src/main/java/com/pan_american/android/data/model/resource_management/hotel_resource/network/HotelResourceListRequest.kt

@@ -0,0 +1,5 @@
+package com.pan_american.android.data.model.resource_management.hotel_resource.network
+
+import com.pan_american.android.base.BaseRequest
+
+class HotelResourceListRequest(val name: String, val city: String, val contact: String, val contactPhone: String): BaseRequest()

app/src/main/java/com/pan_american/android/data/model/resource_management/hotel_resource/network/HotelResourceListResponse.kt

@@ -0,0 +1,6 @@
+package com.pan_american.android.data.model.resource_management.hotel_resource.network
+
+import com.pan_american.android.base.BaseResponse
+import com.pan_american.android.data.model.resource_management.hotel_resource.entity.UpdateHotelResource
+
+class HotelResourceListResponse(val data: List<UpdateHotelResource>): BaseResponse()

app/src/main/java/com/pan_american/android/data/model/resource_management/hotel_resource/network/HotelResourceResponse.kt

@@ -1,8 +0,0 @@
-package com.pan_american.android.data.model.resource_management.hotel_resource.network
-
-import com.pan_american.android.base.BaseResponse
-import com.pan_american.android.data.model.resource_management.hotel_resource.entity.HotelResource
-
-class HotelResourceResponse(val data: Data): BaseResponse() {
-    inner class Data(val pageCount: Int, val totalPage: Int, val pageIndex: Int, val pageSize: Int, val pageSource: List<HotelResource>)
-}

app/src/main/java/com/pan_american/android/data/network/APIService.kt

@@ -104,9 +104,11 @@ import com.pan_american.android.data.model.resource_management.car_resource.enti
 import com.pan_american.android.data.model.resource_management.car_resource.network.CarResourceResponse
 import com.pan_american.android.data.model.resource_management.guide_resource.entity.GuideResource
 import com.pan_american.android.data.model.resource_management.guide_resource.network.GuideResourceResponse
-import com.pan_american.android.data.model.resource_management.hotel_resource.entity.HotelResource
-import com.pan_american.android.data.model.resource_management.hotel_resource.network.HotelResourceRequest
-import com.pan_american.android.data.model.resource_management.hotel_resource.network.HotelResourceResponse
+import com.pan_american.android.data.model.resource_management.hotel_resource.entity.UpdateHotelResource
+import com.pan_american.android.data.model.resource_management.hotel_resource.network.HotelResourceDetailRequest
+import com.pan_american.android.data.model.resource_management.hotel_resource.network.HotelResourceDetailResponse
+import com.pan_american.android.data.model.resource_management.hotel_resource.network.HotelResourceListRequest
+import com.pan_american.android.data.model.resource_management.hotel_resource.network.HotelResourceListResponse
 import com.pan_american.android.data.model.resource_management.market_customer.entity.MarketCustomer
 import com.pan_american.android.data.model.resource_management.market_customer.network.BatchAssignmentRequest
 import com.pan_american.android.data.model.resource_management.market_customer.network.BusinessCardInfoRequest
@@ -204,23 +206,29 @@ interface APIService {
     fun deleteGuideData(@Body deleteRequest: DeleteRequest): Call<BaseResponse>
 
     /**
-     * 酒店资料数据，酒店资料列表 酒店地址
+     * 酒店资料数据，酒店资料列表 基础数据源
      */
     @POST("/api/Resource/QueryHotelDataSelect")
     fun getHotelSelect(): Call<SelectorResponse>
 
     /**
-     * 酒店资料数据，酒店资料信息查询
+     * 酒店资料数据，酒店资料列表查询
      */
     @POST("/api/Resource/QueryHotelData")
-    fun getHotelData(@Body hotelResourceRequest: HotelResourceRequest): Call<HotelResourceResponse>
+    fun getHotelResourceList(@Body hotelResourceListRequest: HotelResourceListRequest): Call<HotelResourceListResponse>
+
+    /**
+     * 酒店资料数据，根据ID查询酒店资料详情
+     */
+    @POST("/api/Resource/QueryHotelDataInfo")
+    fun getHotelResourceDetail(@Body hotelResourceDetailRequest: HotelResourceDetailRequest): Call<HotelResourceDetailResponse>
 
     /**
      * 酒店资料数据，酒店资料信息操作
      * status: 1.新增     2.修改
      */
     @POST("/api/Resource/OperationHotelData")
-    fun hotelDataOperation(@Body hotelResource: HotelResource): Call<BaseResponse>
+    fun hotelDataOperation(@Body updateHotelResource: UpdateHotelResource): Call<BaseResponse>
 
     /**
      * 酒店资料数据，酒店资料信息删除

app/src/main/java/com/pan_american/android/ui/efficiency_tools/daily_payment/AddDailyPaymentActivity.kt

@@ -483,14 +483,14 @@ class AddDailyPaymentActivity : BaseActivity<ActivityAddDailyPaymentBinding>() {
                     showMessage(resources.getString(R.string.payment_name_select_hint))
                 }
 
-                dailyPaymentList.size == 0 -> {
-                    showMessage(resources.getString(R.string.payment_item_add_hint))
-                }
-
                 binding.paymentNotes.getText().trim().isEmpty() -> {
                     showMessage(resources.getString(R.string.payment_notes_hint))
                 }
 
+                dailyPaymentList.size == 0 -> {
+                    showMessage(resources.getString(R.string.payment_item_add_hint))
+                }
+
                 else -> {
 
                     binding.commit.setButtonStatus(1)
@@ -822,6 +822,10 @@ class AddDailyPaymentActivity : BaseActivity<ActivityAddDailyPaymentBinding>() {
     }
 
     private fun canBeEdit(): Boolean {
-        return OASystem.authorization(OASystem.DAILY_PAYMENT, OASystem.EDIT) and (financeStatus == 0) and (managerStatus == 0)
+        if (fromList) {
+            return OASystem.authorization(OASystem.DAILY_PAYMENT, OASystem.EDIT) and (financeStatus == 0) and (managerStatus == 0)
+        } else {
+            return true
+        }
     }
 }

app/src/main/java/com/pan_american/android/ui/efficiency_tools/exchange_tool/ExchangeToolActivity.kt

@@ -144,7 +144,7 @@ class ExchangeToolActivity : BaseActivity<ActivityExchangeToolBinding>() {
                 }
 
                 override fun onFailure(call: Call<CurrencyResponse>, t: Throwable) {
-                    showErrorInfo(R.string.currency_list_get_error)
+                    showErrorInfo(R.string.currency_list_get_failed)
                 }
             })
         } else {

app/src/main/java/com/pan_american/android/ui/group_airplane_ticket/airplane_payment_insert/AirplaneTicketListFragment.kt

@@ -239,7 +239,7 @@ class AirplaneTicketListFragment : BaseFragment<FragmentAirplaneTicketListBindin
                     }
 
                     override fun onFailure(call: Call<AirplaneTicketListResponse>, t: Throwable) {
-                        showErrorInfo(R.string.airplane_ticket_list_get_error)
+                        showErrorInfo(R.string.airplane_ticket_list_get_failed)
                     }
                 })
         } else {

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

@@ -1,8 +1,6 @@
 package com.pan_american.android.ui.resource_management.hotel_resource
 
 import android.os.Bundle
-import android.text.InputType
-import android.view.View
 import android.widget.TextView
 import androidx.core.content.res.ResourcesCompat
 import com.pan_american.android.OASystem
@@ -10,7 +8,9 @@ import com.pan_american.android.R
 import com.pan_american.android.base.BaseActivity
 import com.pan_american.android.base.BaseResponse
 import com.pan_american.android.base.ListAdapter
-import com.pan_american.android.data.model.resource_management.hotel_resource.entity.HotelResource
+import com.pan_american.android.data.model.resource_management.hotel_resource.entity.UpdateHotelResource
+import com.pan_american.android.data.model.resource_management.hotel_resource.network.HotelResourceDetailRequest
+import com.pan_american.android.data.model.resource_management.hotel_resource.network.HotelResourceDetailResponse
 import com.pan_american.android.data.network.APIService
 import com.pan_american.android.data.network.ServiceCreator
 import com.pan_american.android.databinding.ActivityAddHotelResourceBinding
@@ -23,7 +23,11 @@ class AddHotelResourceActivity : BaseActivity<ActivityAddHotelResourceBinding>()
 
     private lateinit var titleBinding: LayoutTitleBinding
 
-    private lateinit var hotelResource: HotelResource
+    private var id = 0
+
+    val apiService = ServiceCreator.create<APIService>()
+
+    private val updateHotelResource = UpdateHotelResource()
 
     private var isChose = false
 
@@ -35,7 +39,10 @@ class AddHotelResourceActivity : BaseActivity<ActivityAddHotelResourceBinding>()
         super.onCreate(savedInstanceState)
         screenAdaptation(binding)
 
-        fromList = intent.getBooleanExtra("fromList", false)
+        intent.apply {
+            fromList = getBooleanExtra("fromList", false)
+            id = getIntExtra("id", 0)
+        }
 
         initTitle()
         initViews()
@@ -60,40 +67,29 @@ class AddHotelResourceActivity : BaseActivity<ActivityAddHotelResourceBinding>()
 
         if (fromList) {
 
-            hotelResource = intent.getSerializableExtra("hotelResource", HotelResource::class.java) as HotelResource
+            getHotelDataDetailById()
 
-            initHotelResourceInfo()
+            binding.commit.setText(resources.getString(R.string.update))
 
-            if (OASystem.authorization(OASystem.HOTEL_RESOURCE, OASystem.EDIT)) {
+            if (!OASystem.authorization(OASystem.HOTEL_RESOURCE, OASystem.EDIT)) {
+                binding.apply {
+                    hotelName.isEnabled = false
+                    hotelLocation.isEnabled = false
+                    hotelAddress.isEnabled(false)
+                    hotelPhone.isEnabled = false
+                    hotelFax.isEnabled = false
+                    hotelLevel.isEnabled = false
+                    contactsName.isEnabled = false
+                    contactsPhone.isEnabled = false
+                    otherInfo.isEnabled(false)
 
-                if (!OASystem.authorization(OASystem.HOTEL_RESOURCE, OASystem.EDIT)) {
-                    binding.apply {
-                        hotelName.isEnabled = false
-                        hotelLocation.isEnabled = false
-                        hotelAddress.isEnabled(false)
-                        hotelPhone.isEnabled = false
-                        hotelFax.isEnabled = false
-                        hotelLevel.isEnabled = false
-                        contactsName.isEnabled = false
-                        contactsPhone.isEnabled = false
-                        otherInfo.isEnabled(false)
-
-                        commit.setText(resources.getString(R.string.update))
-                    }
+                    commit.setText(resources.getString(R.string.back))
                 }
-            } else {
-                binding.commit.setText(resources.getString(R.string.back))
             }
 
-            isChose = true
-
         } else {
-
             binding.commit.setText(resources.getString(R.string.add))
-
-            hotelResource = HotelResource()
         }
-
     }
 
     override fun initEvents() {
@@ -185,22 +181,49 @@ class AddHotelResourceActivity : BaseActivity<ActivityAddHotelResourceBinding>()
         }
     }
 
-    private fun initHotelResourceInfo() {
-        binding.apply {
-            hotelName.setText(hotelResource.name)
-            hotelLocation.setText(hotelResource.city)
-            hotelAddress.setText(hotelResource.address)
-            hotelPhone.setText(hotelResource.tel)
-            hotelFax.setText(hotelResource.fax)
-            hotelLevel.text = hotelResource.level
-            contactsName.setText(hotelResource.contact)
-            contactsPhone.setText(hotelResource.contactPhone)
-            otherInfo.setText(hotelResource.otherInformation)
-        }
+    private fun getHotelDataDetailById() {
+
+        apiService.getHotelResourceDetail(HotelResourceDetailRequest(id)).enqueue(object : Callback<HotelResourceDetailResponse> {
+            override fun onResponse(
+                call: Call<HotelResourceDetailResponse>,
+                response: Response<HotelResourceDetailResponse>
+            ) {
+                val detailResponse = response.body()
+
+                if (detailResponse != null) {
+                    if (detailResponse.code == 200) {
+                        val hotelResourceDetail = detailResponse.data
+
+                        binding.apply {
+                            hotelName.setText(hotelResourceDetail.name)
+                            hotelLocation.setText(hotelResourceDetail.city)
+                            hotelAddress.setText(hotelResourceDetail.address)
+                            hotelPhone.setText(hotelResourceDetail.tel)
+                            hotelFax.setText(hotelResourceDetail.fax)
+
+                            for (item in OASystem.level) {
+                                if (item == hotelResourceDetail.level) {
+                                    hotelLevel.text = hotelResourceDetail.level
+                                    isChose = true
+                                }
+                            }
+
+                            contactsName.setText(hotelResourceDetail.contact)
+                            contactsPhone.setText(hotelResourceDetail.contactPhone)
+                            otherInfo.setText(hotelResourceDetail.otherInformation)
+                        }
+                    }
+                }
+            }
+
+            override fun onFailure(call: Call<HotelResourceDetailResponse>, t: Throwable) {
+                showErrorInfo(R.string.hotel_resource_detail_get_failed)
+            }
+        })
     }
 
     private fun initHotelResource(type: Int) {
-        hotelResource.apply {
+        updateHotelResource.apply {
             name = binding.hotelName.text.toString()
             city = binding.hotelLocation.text.toString()
             address = binding.hotelAddress.getText()
@@ -217,14 +240,12 @@ class AddHotelResourceActivity : BaseActivity<ActivityAddHotelResourceBinding>()
 
     private fun updateHotelResourceInfo() {
 
-        val apiService = ServiceCreator.create<APIService>()
-
-        apiService.hotelDataOperation(hotelResource).enqueue(object : Callback<BaseResponse> {
+        apiService.hotelDataOperation(updateHotelResource).enqueue(object : Callback<BaseResponse> {
             override fun onResponse(call: Call<BaseResponse>, response: Response<BaseResponse>) {
                 val baseResponse = response.body()
                 if (baseResponse != null) {
                     if (baseResponse.code == 200) {
-                        if (hotelResource.status == 1) {
+                        if (updateHotelResource.status == 1) {
                             showMessage(resources.getString(R.string.insert_success))
                         } else {
                             showMessage(resources.getString(R.string.update_success))

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

@@ -13,9 +13,9 @@ import com.pan_american.android.base.BaseResponse
 import com.pan_american.android.base.CardAdapter
 import com.pan_american.android.base.CustomAlertDialog
 import com.pan_american.android.data.model.common.network.DeleteRequest
-import com.pan_american.android.data.model.resource_management.hotel_resource.entity.HotelResource
-import com.pan_american.android.data.model.resource_management.hotel_resource.network.HotelResourceRequest
-import com.pan_american.android.data.model.resource_management.hotel_resource.network.HotelResourceResponse
+import com.pan_american.android.data.model.resource_management.hotel_resource.entity.UpdateHotelResource
+import com.pan_american.android.data.model.resource_management.hotel_resource.network.HotelResourceListRequest
+import com.pan_american.android.data.model.resource_management.hotel_resource.network.HotelResourceListResponse
 import com.pan_american.android.data.network.APIService
 import com.pan_american.android.data.network.ServiceCreator
 import com.pan_american.android.databinding.FragmentHotelResourceListBinding
@@ -31,11 +31,11 @@ class HotelResourceListFragment : BaseFragment<FragmentHotelResourceListBinding>
 
     val apiService = ServiceCreator.create<APIService>()
 
-    private var hotelList = ArrayList<HotelResource>()
+    private var hotelList = ArrayList<UpdateHotelResource>()
 
     private var listInit = false
 
-    private lateinit var hotelResourceRequest: HotelResourceRequest
+    private lateinit var hotelResourceListRequest: HotelResourceListRequest
 
     private var pageIndex = 1
 
@@ -49,7 +49,7 @@ class HotelResourceListFragment : BaseFragment<FragmentHotelResourceListBinding>
         super.onStart()
 
         requireArguments().apply {
-            hotelResourceRequest = HotelResourceRequest(
+            hotelResourceListRequest = HotelResourceListRequest(
                 getString("hotel_name").toString(),
                 getString("hotel_location").toString(),
                 getString("contacts_name").toString(),
@@ -57,8 +57,8 @@ class HotelResourceListFragment : BaseFragment<FragmentHotelResourceListBinding>
             )
         }
 
-        hotelResourceRequest.pageIndex = pageIndex
-        hotelResourceRequest.pageSize = 10
+        hotelResourceListRequest.pageIndex = pageIndex
+        hotelResourceListRequest.pageSize = 10
 
         initViews()
     }
@@ -77,15 +77,15 @@ class HotelResourceListFragment : BaseFragment<FragmentHotelResourceListBinding>
         }
 
         if (!listInit) {
-            apiService.getHotelData(hotelResourceRequest)
-                .enqueue(object : Callback<HotelResourceResponse> {
+            apiService.getHotelResourceList(hotelResourceListRequest)
+                .enqueue(object : Callback<HotelResourceListResponse> {
                     override fun onResponse(
-                        call: Call<HotelResourceResponse>, response: Response<HotelResourceResponse>
+                        call: Call<HotelResourceListResponse>, response: Response<HotelResourceListResponse>
                     ) {
                         val guideResourceResponse = response.body()
                         if (guideResourceResponse != null) {
                             if (guideResourceResponse.code == 200) {
-                                for (item in guideResourceResponse.data.pageSource) {
+                                for (item in guideResourceResponse.data) {
                                     hotelList.add(item)
                                 }
 
@@ -96,23 +96,29 @@ class HotelResourceListFragment : BaseFragment<FragmentHotelResourceListBinding>
 
                                 when (type) {
                                     1 -> {
-                                        totalPage = guideResourceResponse.data.totalPage
-                                        binding.hotelResourceListContainer.setEnableLoadMore(pageIndex < totalPage)
+                                        totalPage = getTotalPage(guideResourceResponse.count)
+                                        binding.hotelResourceListContainer.setEnableLoadMore(
+                                            pageIndex < totalPage
+                                        )
                                         listInit = true
                                         initList()
                                     }
 
                                     2 -> {
                                         binding.hotelResourceListContainer.finishRefresh()
-                                        totalPage = guideResourceResponse.data.totalPage
-                                        binding.hotelResourceListContainer.setEnableLoadMore(pageIndex < totalPage)
+                                        totalPage = getTotalPage(guideResourceResponse.count)
+                                        binding.hotelResourceListContainer.setEnableLoadMore(
+                                            pageIndex < totalPage
+                                        )
                                         initList()
                                         listInit = true
                                     }
 
                                     3 -> {
                                         binding.hotelResourceListContainer.finishLoadMore()
-                                        binding.hotelResourceListContainer.setEnableLoadMore(pageIndex < totalPage)
+                                        binding.hotelResourceListContainer.setEnableLoadMore(
+                                            pageIndex < totalPage
+                                        )
                                         binding.hotelResourceList.adapter!!.notifyItemInserted(
                                             hotelList.size
                                         )
@@ -125,14 +131,14 @@ class HotelResourceListFragment : BaseFragment<FragmentHotelResourceListBinding>
                         }
                     }
 
-                    override fun onFailure(call: Call<HotelResourceResponse>, t: Throwable) {
+                    override fun onFailure(call: Call<HotelResourceListResponse>, t: Throwable) {
                         showErrorInfo(R.string.hotel_resource_list_get_failed)
                     }
                 })
         } else {
             if (OASystem.needRefresh) {
                 pageIndex = 1
-                hotelResourceRequest.pageIndex = pageIndex
+                hotelResourceListRequest.pageIndex = pageIndex
                 hotelList.clear()
                 listInit = false
                 initHotelResourceList(2)
@@ -145,26 +151,35 @@ class HotelResourceListFragment : BaseFragment<FragmentHotelResourceListBinding>
         val layoutManager = LinearLayoutManager(OASystem.context)
         binding.hotelResourceList.layoutManager = layoutManager
 
-        val adapter = CardAdapter.Builder<HotelResource>().apply {
+        val adapter = CardAdapter.Builder<UpdateHotelResource>().apply {
             setLayoutId(R.layout.item_hotel_list)
             setData(hotelList)
             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
-                itemView.findViewById<TextView>(R.id.hotel_phone).text = data.tel
-                itemView.findViewById<TextView>(R.id.hotel_level).text = data.level
-                itemView.findViewById<TextView>(R.id.create_time).text = data.createTime
+                if (data.tel.isNotBlank()) {
+                    itemView.findViewById<TextView>(R.id.hotel_phone).text = data.tel
+                }
+                if (data.fax.isNotBlank()) {
+                    itemView.findViewById<TextView>(R.id.hotel_fax).text = data.fax
+                }
+                if (data.contact.isNotBlank()){
+                    itemView.findViewById<TextView>(R.id.contacts).text = data.contact
+                }
+                if (data.contactPhone.isNotBlank()) {
+                    itemView.findViewById<TextView>(R.id.contacts_phone).text = data.contactPhone
+                }
             }
         }.create()
         binding.hotelResourceList.adapter = adapter
 
         adapter.onRecyclerViewItemClick =
-            object : CardAdapter.OnRecyclerViewItemClick<HotelResource> {
+            object : CardAdapter.OnRecyclerViewItemClick<UpdateHotelResource> {
                 override fun onItemClick(position: Int) {
                     val intent =
                         Intent(OASystem.context, AddHotelResourceActivity::class.java).apply {
-                            putExtra("hotelResource", hotelList[position])
+                            putExtra("id", hotelList[position].id)
                             putExtra("fromList", true)
                         }
 
@@ -195,7 +210,7 @@ class HotelResourceListFragment : BaseFragment<FragmentHotelResourceListBinding>
             OnRefreshLoadMoreListener {
             override fun onRefresh(refreshLayout: RefreshLayout) {
                 pageIndex = 1
-                hotelResourceRequest.pageIndex = pageIndex
+                hotelResourceListRequest.pageIndex = pageIndex
                 hotelList.clear()
                 listInit = false
                 initHotelResourceList(2)
@@ -204,7 +219,7 @@ class HotelResourceListFragment : BaseFragment<FragmentHotelResourceListBinding>
             override fun onLoadMore(refreshLayout: RefreshLayout) {
                 if (pageIndex < totalPage) {
                     pageIndex += 1
-                    hotelResourceRequest.pageIndex = pageIndex
+                    hotelResourceListRequest.pageIndex = pageIndex
                     listInit = false
                     initHotelResourceList(3)
                 }
@@ -241,4 +256,12 @@ class HotelResourceListFragment : BaseFragment<FragmentHotelResourceListBinding>
             })
     }
 
+    private fun getTotalPage(dataCount: Int): Int {
+        var totalPage = dataCount / 10
+        if (dataCount % 10 != 0) {
+            totalPage++
+        }
+
+        return totalPage
+    }
 }

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

@@ -338,6 +338,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/common_padding"
+            android:layout_marginBottom="@dimen/common_padding"
             android:orientation="horizontal">
 
             <TextView

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

@@ -37,7 +37,7 @@
                 android:layout_height="@dimen/common_padding_heavy"
                 android:layout_marginEnd="@dimen/common_padding"
                 android:src="@mipmap/icon_delete"
-                tools:ignore="ContentDescription"/>
+                tools:ignore="ContentDescription" />
 
         </LinearLayout>
 
@@ -90,7 +90,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:text="@string/phone"
+                android:text="@string/hotel_tel"
                 android:textSize="@dimen/text_size_medium" />
 
             <TextView
@@ -100,7 +100,9 @@
                 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" />
 
         </LinearLayout>
@@ -122,17 +124,53 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:text="星级"
+                android:text="@string/hotel_fax"
                 android:textSize="@dimen/text_size_medium" />
 
             <TextView
-                android:id="@+id/hotel_level"
+                android:id="@+id/hotel_fax"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 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" />
+
+        </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/contacts"
+                android:textSize="@dimen/text_size_medium" />
+
+            <TextView
+                android:id="@+id/contacts"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                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" />
 
         </LinearLayout>
@@ -155,17 +193,21 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:text="@string/create_time"
+                android:hint="@string/no_info"
+                android:text="@string/contacts_phone"
+                android:textColorHint="@color/hint_text_color"
                 android:textSize="@dimen/text_size_medium" />
 
             <TextView
-                android:id="@+id/create_time"
+                android:id="@+id/contacts_phone"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 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" />
 
         </LinearLayout>

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

@@ -293,7 +293,7 @@
     <string name="exchange_tool_hint">*以上汇率来自于聚合API，仅供参考</string>
 
     <!-- 汇率换算，错误信息 -->
-    <string name="currency_list_get_error">币种汇率列表获取失败</string>
+    <string name="currency_list_get_failed">币种汇率列表获取失败</string>
 
     <!-- 市场客户资料 -->
     <string name="customer_sift">客户筛选</string>
@@ -407,12 +407,14 @@
     <!-- 酒店资料数据 -->
     <string name="add_hotel_resource">新增酒店资料数据</string>
     <string name="hotel_resource_detail">酒店资料数据详情</string>
+    <string name="hotel_fax">酒店传真</string>
 
     <string name="hotel_level">酒店等级</string>
     <string name="hotel_level_select_hint">请选择酒店等级</string>
 
     <!-- 酒店资料，错误信息 -->
     <string name="hotel_resource_list_get_failed">酒店资料列表获取失败</string>
+    <string name="hotel_resource_detail_get_failed">酒店资料详情获取失败</string>
 
     <!-- 机场三字码 -->
     <string name="add_three_code">新增机场三字码数据</string>
@@ -591,7 +593,7 @@
     <string name="airplane_ticket_payment_list">机票费用列表</string>
 
     <!-- 机票费用列表，错误信息 -->
-    <string name="airplane_ticket_list_get_error">获取机票费用列表失败</string>
+    <string name="airplane_ticket_list_get_failed">获取机票费用列表失败</string>
 
     <string name="add_airplane_ticket_payment">新增机票费用</string>
     <string name="airplane_ticket_payment_detail">机票费用详情</string>