2024-09-29 修改

修改：
1. 部分UI逻辑修改
2. 部分请求体修改

app/src/main/java/com/pan_american/android/data/model/currency/network/CurrencyExchangeResponse.kt

@@ -3,7 +3,7 @@ package com.pan_american.android.data.model.currency.network
 import com.pan_american.android.base.BaseResponse
 
 class CurrencyExchangeResponse(val data: Data): BaseResponse() {
-    inner class Data(val currencyCodePre: String, val currencyNamePre: String, val moneyPre: Float,
-                     val currencyCodeSuf: String, val currencyNameSuf: String, val moneySuf: Float,
-                     val updateTime: String)
+    inner class Data(
+        val moneySuf: Float, val updateTime: String
+    )
 }

app/src/main/java/com/pan_american/android/data/model/customer_resource/company_customer/entity/MarketCustomer.kt

@@ -31,5 +31,5 @@ class MarketCustomer {
     var ascribedUser = ArrayList<Int>()
     var ascribedDepartment = ArrayList<Int>()
 
-    var otherInfo = ""
+//    var otherInfo = ""
 }

app/src/main/java/com/pan_american/android/data/model/customer_resource/market_sales_revenue/network/MarketSalesStatisticsResponse.kt

@@ -4,6 +4,6 @@ import com.pan_american.android.base.BaseResponse
 
 class MarketSalesStatisticsResponse(val data: Data): BaseResponse() {
 
-    inner class Data(val thisYearSales: Double, val lastYearSales: Double, val yoy: Double)
+    inner class Data(val thisYearSales: Double, val yoy: Double)
 
 }

app/src/main/java/com/pan_american/android/data/model/daily_payment/network/DailyPaymentListResponse.kt

@@ -5,5 +5,9 @@ import com.pan_american.android.data.model.daily_payment.entity.DailyPaymentCard
 
 class DailyPaymentListResponse(val data: Data):BaseResponse() {
 
-    inner class Data(val currPageIndex: Int, val currPageSize: Int, val dataCount: Int, val dataList:List<DailyPaymentCardListItem>)
+    inner class Data(
+        val currPageSize: Int,
+        val dataCount: Int,
+        val dataList: List<DailyPaymentCardListItem>
+    )
 }

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

@@ -7,5 +7,9 @@ class AirplaneTicketListResponse(val data: Data): BaseResponse() {
 
     inner class Data(val airData: AirData)
 
-    inner class AirData(val currPageIndex: Int, val currPageSize: Int, val dataCount: Int, val dataList: ArrayList<GroupAirplaneTicketListItem>)
+    inner class AirData(
+        val currPageSize: Int,
+        val dataCount: Int,
+        val dataList: ArrayList<GroupAirplaneTicketListItem>
+    )
 }

app/src/main/java/com/pan_american/android/data/model/group_invite_official/invite_official_payment_insert/network/InviteOfficialListResponse.kt

@@ -5,7 +5,10 @@ import com.pan_american.android.data.model.group_invite_official.invite_official
 
 class InviteOfficialListResponse(val data: Data): BaseResponse() {
 
-    inner class Data(val currPageIndex: Int, val currPageSize: Int, val dataCount: Int, val dataList: ArrayList<InviteOfficialListItem>,
-                     val receiveDt: String, val returnDt: String)
+    inner class Data(
+        val currPageSize: Int,
+        val dataCount: Int,
+        val dataList: ArrayList<InviteOfficialListItem>
+    )
 
 }

app/src/main/java/com/pan_american/android/data/model/group_visa/visa_payment_insert/network/VisaPaymentListResponse.kt

@@ -5,6 +5,10 @@ import com.pan_american.android.data.model.group_visa.visa_payment_insert.entity
 
 class VisaPaymentListResponse(val data: Data): BaseResponse() {
 
-    inner class Data(val dataCount: Int, val currPageIndex: Int, val currPageSize: Int, val dataList: ArrayList<VisaPaymentListItem>)
+    inner class Data(
+        val dataCount: Int,
+        val currPageSize: Int,
+        val dataList: ArrayList<VisaPaymentListItem>
+    )
 
 }

app/src/main/java/com/pan_american/android/data/model/group_visa/visa_payment_insert/network/VisaPaymentSelectorResourceResponse.kt

@@ -5,6 +5,10 @@ import com.pan_american.android.data.model.common.entity.Selector
 
 class VisaPaymentSelectorResourceResponse(val data: Data): BaseResponse() {
 
-    inner class Data(val payment: ArrayList<Selector>, val currencyList: ArrayList<Selector>, val passengerType: ArrayList<Selector>, val bankCard: ArrayList<Selector>)
+    inner class Data(
+        val payment: ArrayList<Selector>,
+        val passengerType: ArrayList<Selector>,
+        val bankCard: ArrayList<Selector>
+    )
 
 }

app/src/main/java/com/pan_american/android/data/model/resource_management/airplane_three_code/network/AirplaneThreeCodeResponse.kt

@@ -4,5 +4,10 @@ import com.pan_american.android.base.BaseResponse
 import com.pan_american.android.data.model.resource_management.airplane_three_code.entity.AirplaneThreeCode
 
 class AirplaneThreeCodeResponse(val data: Data): BaseResponse() {
-    inner class Data(val pageCount: Int, val totalPage: Int, val pageIndex: Int, val pageSize: Int, val pageSource: List<AirplaneThreeCode>)
+    inner class Data(
+        val totalPage: Int,
+        val pageIndex: Int,
+        val pageSize: Int,
+        val pageSource: List<AirplaneThreeCode>
+    )
 }

app/src/main/java/com/pan_american/android/data/model/resource_management/car_resource/network/CarResourceResponse.kt

@@ -4,5 +4,10 @@ import com.pan_american.android.base.BaseResponse
 import com.pan_american.android.data.model.resource_management.car_resource.entity.CarResource
 
 class CarResourceResponse(val data: Data): BaseResponse() {
-    inner class Data(val pageCount: Int, val totalPage: Int, val pageIndex: Int, val pageSize: Int, val pageSource: List<CarResource>)
+    inner class Data(
+        val totalPage: Int,
+        val pageIndex: Int,
+        val pageSize: Int,
+        val pageSource: List<CarResource>
+    )
 }

app/src/main/java/com/pan_american/android/data/model/resource_management/guide_resource/network/GuideResourceResponse.kt

@@ -4,5 +4,10 @@ import com.pan_american.android.base.BaseResponse
 import com.pan_american.android.data.model.resource_management.guide_resource.entity.GuideResource
 
 class GuideResourceResponse(val data: Data): BaseResponse() {
-    inner class Data(val pageCount: Int, val totalPage: Int, val pageIndex: Int, val pageSize: Int, val pageSource: ArrayList<GuideResource>)
+    inner class Data(
+        val totalPage: Int,
+        val pageIndex: Int,
+        val pageSize: Int,
+        val pageSource: ArrayList<GuideResource>
+    )
 }

app/src/main/java/com/pan_american/android/util/ScrollEditText.kt

@@ -103,13 +103,13 @@ class ScrollEditText(context: Context, attrs: AttributeSet?) : LinearLayout(cont
 
     fun getText(): String = editTextField.text.toString()
 
-    fun setInputType(inputType: Int) {
-        editTextField.inputType = inputType
-    }
-
-    fun setSingleLine(flag: Boolean) {
-        editTextField.isSingleLine = flag
-    }
+//    fun setInputType(inputType: Int) {
+//        editTextField.inputType = inputType
+//    }
+//
+//    fun setSingleLine(flag: Boolean) {
+//        editTextField.isSingleLine = flag
+//    }
 
     fun isEnabled(flag: Boolean) {
 

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

@@ -29,6 +29,7 @@
                 android:layout_height="match_parent"
                 android:layout_marginEnd="50dp"
                 android:layout_weight="1"
+                android:maxLines="1"
                 android:textColor="@color/text_color_blue"
                 android:textSize="@dimen/text_size_medium"
                 android:textStyle="bold" />
@@ -411,7 +412,7 @@
                 android:text="@string/verify_pass"
                 android:textColor="@color/white"
                 android:textSize="@dimen/text_size_medium"
-                android:textStyle="bold"/>
+                android:textStyle="bold" />
 
         </LinearLayout>