2024-05-16 修改

修改

1. 部分代码修改

2. 地接费用详细UI调整

app/src/main/java/com/pan_american/android/data/model/common/network/GroupCurrencyResponse.kt

@@ -6,5 +6,4 @@ import com.pan_american.android.data.model.common.entity.Selector
 class GroupCurrencyResponse(val data: Data): BaseResponse() {
 
     inner class Data (val teamRates: ArrayList<Selector>)
-
 }

app/src/main/java/com/pan_american/android/data/model/group_airplane_ticket/airplane_payment_insert/network/BerthCustomerRequest.kt

@@ -1,3 +0,0 @@
-package com.pan_american.android.data.model.group_airplane_ticket.airplane_payment_insert.network
-
-class BerthCustomerRequest(val id: Int)

app/src/main/java/com/pan_american/android/data/model/group_common_modle/insurance_payment_insert/network/InsurancePaymentResourceRequest.kt

@@ -1,5 +1,5 @@
 package com.pan_american.android.data.model.group_common_modle.insurance_payment_insert.network
 
-class InsurancePaymentResourceRequest(val diId: Int) {
-    val portType = 2
-}
+import com.pan_american.android.base.BaseRequest
+
+class InsurancePaymentResourceRequest(val diId: Int): BaseRequest()

app/src/main/java/com/pan_american/android/data/model/group_hotel/hotel_payment_insert/network/GetHotelPredetermineDetailRequest.kt

@@ -1,9 +1,9 @@
 package com.pan_american.android.data.model.group_hotel.hotel_payment_insert.network
 
 import com.pan_american.android.OASystem
+import com.pan_american.android.base.BaseRequest
 
-class GetHotelPredetermineDetailRequest(val diId: Int, val id: Int) {
-    val portType = 2
+class GetHotelPredetermineDetailRequest(val diId: Int, val id: Int): BaseRequest() {
     val userId = OASystem.userInfo.userId
     val pageId = OASystem.HOTEL_PREDETERMINE
 }

app/src/main/java/com/pan_american/android/data/model/group_invite_official/invite_data/network/InviteDataListRequest.kt

@@ -2,7 +2,7 @@ package com.pan_american.android.data.model.group_invite_official.invite_data.ne
 
 import com.pan_american.android.base.BaseRequest
 
-class InviteDataListRequest(): BaseRequest() {
+class InviteDataListRequest: BaseRequest() {
 
     var country = ""
     var unitName = ""

app/src/main/java/com/pan_american/android/data/model/group_management/group_info/network/GetSellCodeResponse.kt

@@ -5,5 +5,4 @@ import com.pan_american.android.base.BaseResponse
 class GetSellCodeResponse(val data: Data): BaseResponse() {
 
     inner class Data(val salesQuoteNo: String)
-
 }

app/src/main/java/com/pan_american/android/data/model/group_management/group_info/network/GroupOperationRequest.kt

@@ -1,10 +1,10 @@
 package com.pan_american.android.data.model.group_management.group_info.network
 
 import com.pan_american.android.OASystem
+import com.pan_american.android.base.BaseRequest
 
-class GroupOperationRequest {
+class GroupOperationRequest: BaseRequest() {
 
-    var portType = 2
     var status = 1
     var id = 0
     var userId = OASystem.userInfo.userId

app/src/main/java/com/pan_american/android/data/model/group_management/group_info/network/GroupStatusChangeRequest.kt

@@ -1,9 +1,9 @@
 package com.pan_american.android.data.model.group_management.group_info.network
 
 import com.pan_american.android.OASystem
+import com.pan_american.android.base.BaseRequest
 
-class GroupStatusChangeRequest(val groupId: Int) {
+class GroupStatusChangeRequest(val groupId: Int): BaseRequest() {
 
-    val portType = 2
     val groupsOperator = OASystem.userInfo.userId
 }

app/src/main/java/com/pan_american/android/data/model/group_management/group_info/network/NameSpellGenerateRequest.kt

@@ -1,4 +1,3 @@
 package com.pan_american.android.data.model.group_management.group_info.network
 
-class NameSpellGenerateRequest(val originalText: ArrayList<String>, val isUp: Boolean) {
-}
+class NameSpellGenerateRequest(val originalText: ArrayList<String>, val isUp: Boolean)

app/src/main/java/com/pan_american/android/ui/efficiency_tools/address_book/AddressBookActivity.kt

@@ -82,7 +82,9 @@ class AddressBookActivity : BaseActivity<ActivityAddressBookBinding>() {
 
             memberName.text = member.cnName
             jobName.text = member.jobName
-            phoneNumber.text = member.phone
+            phoneNumber.text = member.phone.ifBlank {
+                resources.getString(R.string.no_info)
+            }
             phoneNumberEmergency.text = member.urgentPhone.ifBlank {
                 resources.getString(R.string.no_info)
             }

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

@@ -1182,7 +1182,6 @@ class AddAirplaneTicketActivity : BaseActivity<ActivityAddAirplaneTicketBinding>
                             binding.unitPrice.setText(airplaneTicketResource.prePrice.toString())
                             unitPriceCorrect = true
 
-
                             run {
                                 for (item in OASystem.currency) {
                                     if (airplaneTicketResource.preCurrency == item.currencyId) {

app/src/main/java/com/pan_american/android/ui/group_op/ground_convey_payment_insert/GroundConveyPaymentDetailActivity.kt

@@ -120,6 +120,8 @@ class GroundConveyPaymentDetailActivity : BaseActivity<ActivityGroundConveyPayme
 
         if (!canBeEdit()) {
             binding.commit.setText(resources.getString(R.string.back))
+        } else {
+            binding.commit.setText(resources.getString(R.string.submit))
         }
 
         headerAdapter.setCanBeEdit(canBeEdit())