2025-02-10 修改

修改:
1. 部分bug修改，适配新KotlinCore

.idea/kotlinc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.9.0" />
+    <option name="version" value="2.0.0" />
   </component>
 </project>

app/build.gradle

@@ -14,6 +14,7 @@ android {
     defaultConfig {
         applicationId "com.pan_american.android"
         minSdk 24
+        //noinspection OldTargetApi
         targetSdk 34
         versionCode 9
         versionName "1.0.8"
@@ -65,24 +66,24 @@ dependencies {
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'com.android.tools:r8:8.3.37'
+    implementation 'com.android.tools:r8:8.7.18'
 
-    implementation 'androidx.core:core-ktx:1.13.1'
+    implementation 'androidx.core:core-ktx:1.15.0'
     implementation 'androidx.appcompat:appcompat:1.7.0'
-    implementation 'com.google.android.material:material:1.10.0'
+    implementation 'com.google.android.material:material:1.12.0'
 
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.recyclerview:recyclerview:1.3.1'
-    implementation 'androidx.activity:activity:1.9.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
+    implementation 'androidx.recyclerview:recyclerview:1.4.0'
+    implementation 'androidx.activity:activity-ktx:1.10.0'
 
     testImplementation 'junit:junit:4.13.2'
 
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
 
     //底部导航栏实现
-    implementation 'androidx.viewpager2:viewpager2:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.3.1'
+    implementation 'androidx.viewpager2:viewpager2:1.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.4.0'
 
     //日历组件
     implementation 'com.haibin:calendarview:3.7.1'

app/src/main/java/com/pan_american/android/data/model/common/adapter/GroupInfoSimpleAdapter.kt

@@ -63,8 +63,8 @@ class GroupInfoSimpleAdapter(private val groupInfoList: ArrayList<GroupInfoSimpl
             holder.customerName.text = clientName
             holder.customerLevel.text = teamLev
             holder.visitTime.text = visitDate.substring(0, 10)
-            holder.visitDays.text = visitDays.toString()
-            holder.visitMembers.text = visitPNumber.toString()
+            holder.visitDays.text = "$visitDays"
+            holder.visitMembers.text = "$visitPNumber"
             holder.groupAffiliation.text = department
 
             holder.groupStatus.apply {

app/src/main/java/com/pan_american/android/data/model/financial_module/accounts_receivable_report/adapter/AccountsReceivableReportAdapter.kt

@@ -49,10 +49,22 @@ class AccountsReceivableReportAdapter(private val itemList: ArrayList<AccountRec
                 holder.parentView.visibility = View.VISIBLE
                 holder.groupName.text = it.teamName
                 holder.departmentName.text = it.clientUnit
-                holder.receivables.text = it.frPrice + " RMB"
-                holder.paymentCollected.text = it.prPrice + " RMB"
-                holder.paymentRefund.text = it.refundAmount + " RMB"
-                holder.paymentBalance.text = it.balPrice + " RMB"
+                holder.receivables.text = buildString {
+                    append(it.frPrice)
+                    append(" RMB")
+                }
+                holder.paymentCollected.text = buildString {
+                    append(it.prPrice)
+                    append(" RMB")
+                }
+                holder.paymentRefund.text = buildString {
+                    append(it.refundAmount)
+                    append(" RMB")
+                }
+                holder.paymentBalance.text = buildString {
+                    append(it.balPrice)
+                    append(" RMB")
+                }
                 holder.paymentCollectionProgress.text = it.schedule.ifBlank { "-" }
             }
         }

app/src/main/java/com/pan_american/android/data/model/group_common_modle/commission_confirm/adapter/CommissionConfirmListAdapter.kt

@@ -58,7 +58,7 @@ class CommissionConfirmListAdapter(private val itemList: ArrayList<CommissionCon
             holder.groupName.text = teamName
             holder.customerLevel.text = teamLvStr
             holder.endDate.text = visitDate.substring(0, 10)
-            holder.commissionAmount.text = price.toString()
+            holder.commissionAmount.text = "$price"
 
             when(isConfirm) {
                 0 -> {

app/src/main/java/com/pan_american/android/data/model/group_op/ground_convey_payment_insert/adapter/GroundConveyTableAdapter.kt

@@ -155,9 +155,9 @@ class GroundConveyTableAdapter(private val itemList: ArrayList<GroundConveyTable
             }
         }
 
-        holder.price.setText(item.price.toString())
+        holder.price.setText("${item.price}")
         holder.priceUnit.text = item.currencyStr
-        holder.count.setText(item.count.toString())
+        holder.count.setText("${item.count}")
 
         for (checkedItem in OASystem.groundConveyUnitList) {
             if (checkedItem.id == item.units) {
@@ -180,7 +180,7 @@ class GroundConveyTableAdapter(private val itemList: ArrayList<GroundConveyTable
         holder.price.onFocusChangeListener = View.OnFocusChangeListener { _, flag ->
             if (!flag) {
                 if (holder.price.text.isNullOrBlank()) {
-                    holder.price.setText(item.price.toString())
+                    holder.price.setText("${item.price}")
                 }
             }
         }
@@ -188,7 +188,7 @@ class GroundConveyTableAdapter(private val itemList: ArrayList<GroundConveyTable
         holder.count.onFocusChangeListener = View.OnFocusChangeListener { _, flag ->
             if (!flag) {
                 if (holder.count.text.isNullOrBlank()) {
-                    holder.count.setText(item.count.toString())
+                    holder.count.setText("${item.count}")
                 }
             }
         }

app/src/main/java/com/pan_american/android/data/model/personnel_module/materials_operate/adapter/MaterialListAdapter.kt

@@ -61,7 +61,7 @@ class MaterialListAdapter(private val list: ArrayList<MaterialListItem>): Recycl
             list[position].also {
                 materialName.text = it.name
                 materialType.text = it.typeName
-                materialCount.text = it.stockQuantity.toString()
+                materialCount.text = "${it.stockQuantity}"
                 creator.text = it.lastUpdateUserName
                 createTime.text = it.lastUpdateTime
                 remark.setText(it.remark)

app/src/main/java/com/pan_american/android/ui/customer_resource/company_customer/AddNewCustomerActivity.kt

@@ -396,8 +396,8 @@ class AddNewCustomerActivity : BaseActivity<ActivityAddNewCustomerBinding>() {
                                 passportCode.setText(marketCustomer.passport)
                                 passportDeadline.text = marketCustomer.passportDate
                                 customerBirthday.text = marketCustomer.birthday
-                                customerEstimate.setText(marketCustomer.predele.toString())
-                                customerFinished.setText(marketCustomer.finlishedDele.toString())
+                                customerEstimate.setText("${marketCustomer.predele}")
+                                customerFinished.setText("${marketCustomer.finlishedDele}")
 
                                 if (marketCustomer.ascribedUser.size != 0) {
 

app/src/main/java/com/pan_american/android/ui/customer_resource/market_sales_revenue/SalesRevenueListFragment.kt

@@ -66,7 +66,7 @@ class SalesRevenueListFragment : BaseFragment<FragmentSalesRevenueListBinding>()
 
             year = calendar.get(Calendar.YEAR)
 
-            binding.year.text = year.toString()
+            binding.year.text = "$year"
 
             for (item in OASystem.marketSalesRevenueCompanyList) {
                 if (OASystem.userInfo.companyName == item.name) {
@@ -101,7 +101,7 @@ class SalesRevenueListFragment : BaseFragment<FragmentSalesRevenueListBinding>()
                     setLayoutId(R.layout.item_selector)
                     addBindView { itemView, data ->
                         itemView.findViewById<TextView>(R.id.selector_item_name).apply {
-                            text = data.year.toString()
+                            text = "${data.year}"
 
                             if (year == data.year) {
                                 setTextColor(ResourcesCompat.getColor(resources, R.color.text_color_blue, null))
@@ -117,7 +117,7 @@ class SalesRevenueListFragment : BaseFragment<FragmentSalesRevenueListBinding>()
                 adapter.onRecyclerViewItemClick = object : ListAdapter.OnRecyclerViewItemClick<YearQuarterlyData> {
                     override fun onItemClick(position: Int) {
                         OASystem.marketSalesRevenueDateList[position].apply {
-                            binding.year.text = year.toString()
+                            binding.year.text = "$year"
 
                             this@SalesRevenueListFragment.year = year
 
@@ -287,9 +287,9 @@ class SalesRevenueListFragment : BaseFragment<FragmentSalesRevenueListBinding>()
             setLayoutId(R.layout.item_sales_group_list)
             addBindView { itemView, data ->
                 itemView.findViewById<TextView>(R.id.group_name).text = data.teamName
-                itemView.findViewById<TextView>(R.id.turnover).text = data.groupSales.toString()
+                itemView.findViewById<TextView>(R.id.turnover).text = "${data.groupSales}"
                 itemView.findViewById<TextView>(R.id.visit_date).text = String.format(resources.getString(R.string.during_format), data.visitDate.substring(0, 10), data.visitEndDate.substring(0, 10))
-                itemView.findViewById<TextView>(R.id.group_members).text = data.visitPNumber.toString()
+                itemView.findViewById<TextView>(R.id.group_members).text = "${data.visitPNumber}"
                 itemView.findViewById<TextView>(R.id.payment_date).text = data.collectionDays
             }
         }.create()

app/src/main/java/com/pan_american/android/ui/customer_resource/market_sales_revenue/SalesRevenueRankFragment.kt

@@ -49,7 +49,7 @@ class SalesRevenueRankFragment : BaseFragment<FragmentSalesRevenueRankBinding>()
 
             year = calendar.get(Calendar.YEAR)
 
-            binding.year.text = year.toString()
+            binding.year.text = "$year"
 
             for (item in OASystem.marketSalesRevenueCompanyList) {
                 if (OASystem.userInfo.companyName == item.name) {
@@ -73,7 +73,7 @@ class SalesRevenueRankFragment : BaseFragment<FragmentSalesRevenueRankBinding>()
                     setLayoutId(R.layout.item_selector)
                     addBindView { itemView, data ->
                         itemView.findViewById<TextView>(R.id.selector_item_name).apply {
-                            text = data.year.toString()
+                            text = "${data.year}"
 
                             if (year == data.year) {
                                 setTextColor(ResourcesCompat.getColor(resources, R.color.text_color_blue, null))
@@ -90,7 +90,7 @@ class SalesRevenueRankFragment : BaseFragment<FragmentSalesRevenueRankBinding>()
                 adapter.onRecyclerViewItemClick = object : ListAdapter.OnRecyclerViewItemClick<YearQuarterlyData> {
                     override fun onItemClick(position: Int) {
                         OASystem.marketSalesRevenueDateList[position].apply {
-                            binding.year.text = year.toString()
+                            binding.year.text = "$year"
                             this@SalesRevenueRankFragment.year = year
                         }
 

app/src/main/java/com/pan_american/android/ui/customer_resource/market_sales_revenue/SalesRevenueTotalFragment.kt

@@ -99,7 +99,7 @@ class SalesRevenueTotalFragment : BaseFragment<FragmentSalesRevenueTotalBinding>
                 }
             }
 
-            binding.year.text = year.toString()
+            binding.year.text = "$year"
 
             yearStartDate = "$year-01-01"
             yearEndDate = "$year-12-31"
@@ -324,7 +324,7 @@ class SalesRevenueTotalFragment : BaseFragment<FragmentSalesRevenueTotalBinding>
                     setLayoutId(R.layout.item_selector)
                     addBindView { itemView, data ->
                         itemView.findViewById<TextView>(R.id.selector_item_name).apply {
-                            text = data.year.toString()
+                            text = "${data.year}"
 
                             if (year == data.year) {
                                 setTextColor(ResourcesCompat.getColor(resources, R.color.text_color_blue, null))
@@ -345,7 +345,7 @@ class SalesRevenueTotalFragment : BaseFragment<FragmentSalesRevenueTotalBinding>
 
                             month = 1
 
-                            binding.year.text = year.toString()
+                            binding.year.text = "$year"
 
                             yearStartDate = "$year-01-01"
                             yearEndDate = "$year-12-31"

app/src/main/java/com/pan_american/android/ui/customer_resource/related_invitee/RelatedInviteeListFragment.kt

@@ -145,8 +145,8 @@ class RelatedInviteeListFragment : BaseFragment<FragmentRelatedInviteeListBindin
                 itemView.findViewById<TextView>(R.id.client_name).text = data.clientName
                 itemView.findViewById<TextView>(R.id.start_time).text = data.visitStartDate.substring(0, 10)
                 itemView.findViewById<TextView>(R.id.end_time).text = data.visitEndDate.substring(0, 10)
-                itemView.findViewById<TextView>(R.id.days).text = data.visitDays.toString()
-                itemView.findViewById<TextView>(R.id.members).text = data.visitPNumber.toString()
+                itemView.findViewById<TextView>(R.id.days).text = "${data.visitDays}"
+                itemView.findViewById<TextView>(R.id.members).text = "${data.visitPNumber}"
                 itemView.findViewById<TextView>(R.id.country).text = data.visitCountry
                 itemView.findViewById<TextView>(R.id.director).text = data.jietuanOperator
             }

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

@@ -259,8 +259,7 @@ class ExchangeToolActivity : BaseActivity<ActivityExchangeToolBinding>() {
                     val currencyExchangeResponse = response.body()
                     if (currencyExchangeResponse != null) {
                         if (currencyExchangeResponse.code == 200) {
-                            binding.exchangeOutput.text =
-                                currencyExchangeResponse.data.moneySuf.toString()
+                            binding.exchangeOutput.text = "${currencyExchangeResponse.data.moneySuf}"
                             binding.refreshTime.text = String.format(
                                 resources.getString(R.string.update_time),
                                 currencyExchangeResponse.data.updateTime

app/src/main/java/com/pan_american/android/ui/financial_module/collection_bill/AddCollectionBillPaymentActivity.kt

@@ -108,19 +108,19 @@ class AddCollectionBillPaymentActivity : BaseActivity<ActivityAddCollectionBillP
                     }
                 }
 
-                binding.perPrice.setText(price.toString())
+                binding.perPrice.setText("$price")
 
                 binding.paymentCurrency.text = currencyStr
 
-                binding.count.setText(count.toString())
+                binding.count.setText("$count")
 
                 binding.unit.setText(unit)
 
-                binding.exchangeRate.setText(rate.toString())
+                binding.exchangeRate.setText("$rate")
 
                 binding.notes.setText(remark)
 
-                binding.totalPrice.text = itemSumPrice.toString()
+                binding.totalPrice.text = "$itemSumPrice"
             }
 
             binding.commit.setText(resources.getString(R.string.update))
@@ -462,6 +462,6 @@ class AddCollectionBillPaymentActivity : BaseActivity<ActivityAddCollectionBillP
 
         collectionBillItem.itemSumPrice = sumPrice
 
-        binding.totalPrice.text = collectionBillItem.itemSumPrice.toString()
+        binding.totalPrice.text = "${collectionBillItem.itemSumPrice}"
     }
 }

app/src/main/java/com/pan_american/android/ui/financial_module/collection_bill/CollectionBillPaymentListActivity.kt

@@ -158,8 +158,8 @@ class CollectionBillPaymentListActivity : BaseActivity<ActivityCollectionBillPay
             binding.groupName.text = teamName
             binding.groupCustomer.text = clientName
             binding.visitCountry.text = visitCountry
-            binding.visitDays.text = visitDays.toString()
-            binding.visitMembers.text = visitPNumber.toString()
+            binding.visitDays.text = "$visitDays"
+            binding.visitMembers.text = "$visitPNumber"
             binding.duringTime.text = String.format(
                 resources.getString(R.string.during_format),
                 visitStartDate.substring(0, 10),
@@ -218,12 +218,12 @@ class CollectionBillPaymentListActivity : BaseActivity<ActivityCollectionBillPay
             addBindView { itemView, data ->
                 itemView.findViewById<TextView>(R.id.price_name).text = data.priceName
                 itemView.findViewById<TextView>(R.id.add_mode).text = data.addingModeName
-                itemView.findViewById<TextView>(R.id.per_price).text = data.price.toString()
+                itemView.findViewById<TextView>(R.id.per_price).text = "${data.price}"
                 itemView.findViewById<TextView>(R.id.unit).text = data.unit
                 itemView.findViewById<TextView>(R.id.currency).text = data.currencyStr
-                itemView.findViewById<TextView>(R.id.rate).text = data.rate.toString()
-                itemView.findViewById<TextView>(R.id.count).text = data.count.toString()
-                itemView.findViewById<TextView>(R.id.receivables).text = data.itemSumPrice.toString()
+                itemView.findViewById<TextView>(R.id.rate).text = "${data.rate}"
+                itemView.findViewById<TextView>(R.id.count).text = "${data.count}"
+                itemView.findViewById<TextView>(R.id.receivables).text = "${data.itemSumPrice}"
                 itemView.findViewById<TextView>(R.id.create_time).text = data.createTime
                 itemView.findViewById<ScrollEditText>(R.id.notes).apply {
                     isEnabled(false)

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

@@ -607,7 +607,7 @@ class AddDailyPaymentActivity : BaseActivity<ActivityAddDailyPaymentBinding>() {
                         paymentItemName.setText(item.priceName)
                         paymentItemName.isEnabled = false
 
-                        paymentItemCount.setText(item.quantity.toString())
+                        paymentItemCount.setText("${item.quantity}")
                         paymentItemCount.isEnabled = false
 
                         paymentItemPrice.setText(

app/src/main/java/com/pan_american/android/ui/financial_module/expense_approval/ExpenseApprovalFragment.kt

@@ -311,8 +311,8 @@ class ExpenseApprovalFragment : BaseFragment<FragmentExpenseApprovalBinding>() {
                             binding.groupName.text = teamName
                             binding.groupCustomer.text = clientName
                             binding.visitCountry.text = visitCountry
-                            binding.visitDays.text = visitDays.toString()
-                            binding.visitMembers.text = visitPNumber.toString()
+                            binding.visitDays.text = "$visitDays"
+                            binding.visitMembers.text = "$visitPNumber"
                             binding.duringTime.text = String.format(resources.getString(R.string.during_format), visitStartDate.substring(0, 10), visitEndDate.substring(0, 10))
                         }
 

app/src/main/java/com/pan_american/android/ui/financial_module/expense_approval/ExpenseApprovalGroupListFragment.kt

@@ -159,9 +159,8 @@ class ExpenseApprovalGroupListFragment : BaseFragment<FragmentExpenseApprovalGro
                 itemView.findViewById<TextView>(R.id.client_name).text = data.clientName
                 itemView.findViewById<TextView>(R.id.client_company).text = data.clientUnit
                 itemView.findViewById<TextView>(R.id.visit_date).text = data.visitDateStr
-                itemView.findViewById<TextView>(R.id.visit_days).text = data.visitDays.toString()
-                itemView.findViewById<TextView>(R.id.visit_members).text =
-                    data.visitPNumber.toString()
+                itemView.findViewById<TextView>(R.id.visit_days).text = "${data.visitDays}"
+                itemView.findViewById<TextView>(R.id.visit_members).text = "${data.visitPNumber}"
                 itemView.findViewById<TextView>(R.id.group_operator).text = data.jietuanOperator
             }
         }.create()

app/src/main/java/com/pan_american/android/ui/financial_module/payment_refund/AddPaymentRefundActivity.kt

@@ -342,7 +342,7 @@ class AddPaymentRefundActivity : BaseActivity<ActivityAddPaymentRefundBinding>()
                             paymentTypeId = payType
 
                             binding.paymentName.setText(priceName)
-                            binding.price.setText(price.toString())
+                            binding.price.setText("$price")
                             binding.payee.setText(payee)
                             binding.otherBankName.setText(otherBankName)
                             binding.otherSideNo.setText(otherSideNo)

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

@@ -203,7 +203,7 @@ class AddAirplaneTicketActivity : BaseActivity<ActivityAddAirplaneTicketBinding>
                                         airplaneItineraryList = costResponse.data.modulePromptInfos[0].data.airInitData
 
                                         currencyAbbr.text = airplaneCostCurrency
-                                        exchangeRate.text = airplaneCostExchangeRate.toString()
+                                        exchangeRate.text = "$airplaneCostExchangeRate"
 
                                         airplaneCostTable.setData(airplaneCostList)
                                         airplaneItineraryTable.setData(airplaneItineraryList)
@@ -222,7 +222,7 @@ class AddAirplaneTicketActivity : BaseActivity<ActivityAddAirplaneTicketBinding>
                         })
                     } else {
                         currencyAbbr.text = airplaneCostCurrency
-                        exchangeRate.text = airplaneCostExchangeRate.toString()
+                        exchangeRate.text = "$airplaneCostExchangeRate"
 
                         airplaneCostTable.setData(airplaneCostList)
                         airplaneItineraryTable.setData(airplaneItineraryList)
@@ -335,15 +335,13 @@ class AddAirplaneTicketActivity : BaseActivity<ActivityAddAirplaneTicketBinding>
 
             }
 
-            override fun afterTextChanged(p0: Editable?) {
-                if (p0.toString().isNotBlank()) {
-                    binding.paymentSum.text = (binding.unitPrice.text.trim().toString()
-                        .toDouble() * customerList.size).toString()
-                    unitPriceCorrect = true
-                } else {
-                    showMessage(resources.getString(R.string.airplane_price_input_hint))
-                    binding.paymentSum.text = ""
-                }
+            override fun afterTextChanged(p0: Editable?) = if (p0.toString().isNotBlank()) {
+                (binding.unitPrice.text.trim().toString()
+                    .toDouble() * customerList.size).toString().also { binding.paymentSum.text = it }
+                unitPriceCorrect = true
+            } else {
+                showMessage(resources.getString(R.string.airplane_price_input_hint))
+                binding.paymentSum.text = ""
             }
         })
 
@@ -1204,8 +1202,8 @@ class AddAirplaneTicketActivity : BaseActivity<ActivityAddAirplaneTicketBinding>
                 binding.customerList.adapter!!.notifyItemRemoved(position)
                 binding.customerList.adapter!!.notifyItemRangeChanged(position, customerList.size - position)
 
-                binding.paymentSum.text = (binding.unitPrice.text.trim().toString()
-                    .toDouble() * customerList.size).toString()
+                (binding.unitPrice.text.trim().toString()
+                    .toDouble() * customerList.size).toString().also { binding.paymentSum.text = it }
             }
         }
     }
@@ -1277,7 +1275,7 @@ class AddAirplaneTicketActivity : BaseActivity<ActivityAddAirplaneTicketBinding>
                                 }
                             }
 
-                            binding.unitPrice.setText(airplaneTicketResource.prePrice.toString())
+                            binding.unitPrice.setText("${airplaneTicketResource.prePrice}")
                             unitPriceCorrect = true
 
                             run {
@@ -1382,7 +1380,7 @@ class AddAirplaneTicketActivity : BaseActivity<ActivityAddAirplaneTicketBinding>
                                 binding.consumeDate.text = cardPaymentResource.consumptionDate
                             }
 
-                            binding.paymentSum.text = cardPaymentResource.payMoney.toString()
+                            binding.paymentSum.text = "${cardPaymentResource.payMoney}"
 
                             run {
                                 for (item in OASystem.currency) {

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

@@ -260,7 +260,7 @@ class AirplaneTicketListFragment : BaseFragment<FragmentAirplaneTicketListBindin
             addBindView { itemView, data ->
                 itemView.findViewById<TextView>(R.id.flight_code).text = data.flightsCode
                 itemView.findViewById<TextView>(R.id.service_car_tel).text = data.cTypeName
-                itemView.findViewById<TextView>(R.id.members).text = data.clientNum.toString()
+                itemView.findViewById<TextView>(R.id.members).text = "${data.clientNum}"
                 itemView.findViewById<TextView>(R.id.flight_city).text = data.flightsCity
                 itemView.findViewById<TextView>(R.id.take_off_time).text = String.format(
                     resources.getString(R.string.with_space_format),

app/src/main/java/com/pan_american/android/ui/group_hotel/hotel_predetermine/AddHotelPredetermineActivity.kt

@@ -158,7 +158,7 @@ class AddHotelPredetermineActivity : BaseActivity<ActivityAddHotelPredetermineBi
                                         hotelCostList = costResponse.data.modulePromptInfos[0].data
 
                                         currencyAbbr.text = hotelCostCurrency
-                                        exchangeRate.text = hotelCostExchangeRate.toString()
+                                        exchangeRate.text = "$hotelCostExchangeRate"
 
                                         hotelCostTable.setData(hotelCostList)
 
@@ -176,7 +176,7 @@ class AddHotelPredetermineActivity : BaseActivity<ActivityAddHotelPredetermineBi
                         })
                     } else {
                         currencyAbbr.text = hotelCostCurrency
-                        exchangeRate.text = hotelCostExchangeRate.toString()
+                        exchangeRate.text = "$hotelCostExchangeRate"
 
                         hotelCostTable.setData(hotelCostList)
                     }

app/src/main/java/com/pan_american/android/ui/group_hotel/hotel_predetermine/HotelPredeterminePaymentFragment.kt

@@ -178,24 +178,24 @@ class HotelPredeterminePaymentFragment : BaseFragment<FragmentHotelPredetermineP
         }
 
         binding.hotelPredetermine.apply {
-            realitySingleRoom.setText(OASystem.hotelPredetermineRequest.singleRoomCount.toString())
+            realitySingleRoom.setText("${OASystem.hotelPredetermineRequest.singleRoomCount}")
             singleRoomCount = OASystem.hotelPredetermineRequest.singleRoomCount
-            singleRoomPrice.setText(OASystem.hotelPredetermineRequest.singleRoomPrice.toString())
+            singleRoomPrice.setText("${OASystem.hotelPredetermineRequest.singleRoomPrice}")
             singleRoomUnitPrice = OASystem.hotelPredetermineRequest.singleRoomPrice
 
-            realityDoubleRoom.setText(OASystem.hotelPredetermineRequest.doubleRoomCount.toString())
+            realityDoubleRoom.setText("${OASystem.hotelPredetermineRequest.doubleRoomCount}")
             doubleRoomCount = OASystem.hotelPredetermineRequest.doubleRoomCount
-            doubleRoomPrice.setText(OASystem.hotelPredetermineRequest.doubleRoomPrice.toString())
+            doubleRoomPrice.setText("${OASystem.hotelPredetermineRequest.doubleRoomPrice}")
             doubleRoomUnitPrice = OASystem.hotelPredetermineRequest.doubleRoomPrice
 
-            realitySuiteRoom.setText(OASystem.hotelPredetermineRequest.suiteRoomCount.toString())
+            realitySuiteRoom.setText("${OASystem.hotelPredetermineRequest.suiteRoomCount}")
             suiteRoomCount = OASystem.hotelPredetermineRequest.suiteRoomCount
-            suiteRoomPrice.setText(OASystem.hotelPredetermineRequest.suiteRoomPrice.toString())
+            suiteRoomPrice.setText("${OASystem.hotelPredetermineRequest.suiteRoomPrice}")
             suiteRoomUnitPrice = OASystem.hotelPredetermineRequest.suiteRoomPrice
 
-            realityOtherRoom.setText(OASystem.hotelPredetermineRequest.otherRoomCount.toString())
+            realityOtherRoom.setText("${OASystem.hotelPredetermineRequest.otherRoomCount}")
             otherRoomCount = OASystem.hotelPredetermineRequest.otherRoomCount
-            otherRoomPrice.setText(OASystem.hotelPredetermineRequest.otherRoomPrice.toString())
+            otherRoomPrice.setText("${OASystem.hotelPredetermineRequest.otherRoomPrice}")
             otherRoomUnitPrice = OASystem.hotelPredetermineRequest.otherRoomPrice
         }
 
@@ -243,7 +243,7 @@ class HotelPredeterminePaymentFragment : BaseFragment<FragmentHotelPredetermineP
                 }
 
                 2 -> {
-                    binding.hotelBreakfast.setText(item.price.toString())
+                    binding.hotelBreakfast.setText("${item.price}")
 
                     breakfastPrice = item.price
                     breakfastUnitId = item.currency
@@ -272,7 +272,7 @@ class HotelPredeterminePaymentFragment : BaseFragment<FragmentHotelPredetermineP
                 }
 
                 3 -> {
-                    binding.localTax.setText(item.price.toString())
+                    binding.localTax.setText("${item.price}")
 
                     localTaxPayment = item.price
                     localTaxUnitId = item.currency
@@ -300,7 +300,7 @@ class HotelPredeterminePaymentFragment : BaseFragment<FragmentHotelPredetermineP
                 }
 
                 4 -> {
-                    binding.cityTax.setText(item.price.toString())
+                    binding.cityTax.setText("${item.price}")
 
                     cityTaxPayment = item.price
                     cityTaxUnitId = item.currency

app/src/main/java/com/pan_american/android/ui/group_invite_official/invite_official_payment_insert/AddInvitePaymentActivity.kt

@@ -203,7 +203,7 @@ class AddInvitePaymentActivity : BaseActivity<ActivityAddInvitePaymentBinding>()
                                         invitePaymentCostList = costResponse.data.modulePromptInfos[0].data
 
                                         currencyAbbr.text = invitePaymentCostCurrency
-                                        exchangeRate.text = invitePaymentCostExchangeRate.toString()
+                                        exchangeRate.text = "$invitePaymentCostExchangeRate"
 
                                         inviteOfficialCostTable.setData(invitePaymentCostList)
 
@@ -221,7 +221,7 @@ class AddInvitePaymentActivity : BaseActivity<ActivityAddInvitePaymentBinding>()
                         })
                     } else {
                         currencyAbbr.text = invitePaymentCostCurrency
-                        exchangeRate.text = invitePaymentCostExchangeRate.toString()
+                        exchangeRate.text = "$invitePaymentCostExchangeRate"
 
                         inviteOfficialCostTable.setData(invitePaymentCostList)
                     }
@@ -1069,7 +1069,7 @@ class AddInvitePaymentActivity : BaseActivity<ActivityAddInvitePaymentBinding>()
         val decimalFormat = DecimalFormat("#.##")
         totalPayment = decimalFormat.format(totalPayment).toDouble()
 
-        binding.paymentSum.text = totalPayment.toString()
+        binding.paymentSum.text = "$totalPayment"
     }
 
     private fun getInviteOfficialDetail() {
@@ -1113,7 +1113,7 @@ class AddInvitePaymentActivity : BaseActivity<ActivityAddInvitePaymentBinding>()
                                 binding.otherInfo.setText(otherInformation)
 
                                 invitePayment = inviteCost
-                                binding.invitePayment.setText(invitePayment.toString())
+                                binding.invitePayment.setText("$invitePayment")
                                 inviteCurrencyId = inviteCurrency
 
                                 run {
@@ -1127,7 +1127,7 @@ class AddInvitePaymentActivity : BaseActivity<ActivityAddInvitePaymentBinding>()
                                 }
 
                                 expressPayment = sendCost
-                                binding.expressFee.setText(expressPayment.toString())
+                                binding.expressFee.setText("$expressPayment")
                                 expressCurrencyId = sendCurrency
 
                                 run {
@@ -1141,7 +1141,7 @@ class AddInvitePaymentActivity : BaseActivity<ActivityAddInvitePaymentBinding>()
                                 }
 
                                 activityPayment = eventsCost
-                                binding.officialActivityPayment.setText(activityPayment.toString())
+                                binding.officialActivityPayment.setText("$activityPayment")
                                 activityCurrencyId = eventsCurrency
 
                                 run {
@@ -1155,7 +1155,7 @@ class AddInvitePaymentActivity : BaseActivity<ActivityAddInvitePaymentBinding>()
                                 }
 
                                 translatePayment = translateCost
-                                binding.officialTranslatePayment.setText(translatePayment.toString())
+                                binding.officialTranslatePayment.setText("$translatePayment")
                                 translateCurrencyId = translateCurrency
 
                                 run {
@@ -1169,7 +1169,7 @@ class AddInvitePaymentActivity : BaseActivity<ActivityAddInvitePaymentBinding>()
                                 }
 
                                 totalPayment = payMoney
-                                binding.paymentSum.text = totalPayment.toString()
+                                binding.paymentSum.text = "$totalPayment"
                                 totalCurrencyId = paymentCurrency
 
                                 run {
@@ -1193,7 +1193,7 @@ class AddInvitePaymentActivity : BaseActivity<ActivityAddInvitePaymentBinding>()
                                 binding.consumeWay.setText(consumptionPatterns)
                                 binding.consumeDate.text = consumptionDate
 
-                                binding.paymentSum.text = payMoney.toString()
+                                binding.paymentSum.text = "$payMoney"
                                 totalCurrencyId
 
                                 when (paymentWayId) {

app/src/main/java/com/pan_american/android/ui/group_invite_official/official_visits/AddOfficialVisitsActivity.kt

@@ -1030,7 +1030,7 @@ class AddOfficialVisitsActivity : BaseActivity<ActivityAddOfficialVisitsBinding>
 
                             binding.translateLanguage.setText(translatorInfo.language)
 
-                            binding.translatePayment.setText(translatorInfo.price.toString())
+                            binding.translatePayment.setText("${translatorInfo.price}")
 
                             translateCurrencyId = translatorInfo.currency
 

app/src/main/java/com/pan_american/android/ui/group_invite_official/official_visits/InviteVisitsActivity.kt

@@ -186,8 +186,8 @@ class InviteVisitsActivity : BaseActivity<ActivityInviteVisitsBinding>() {
                                     binding.groupNameSelector.text = name
                                     binding.groupCustomer.text = clientName
                                     binding.visitCountry.text = visitCountry
-                                    binding.visitDays.text = visitDays.toString()
-                                    binding.visitMembers.text = visitPNumber.toString()
+                                    binding.visitDays.text = "$visitDays"
+                                    binding.visitMembers.text = "$visitPNumber"
                                     binding.duringTime.text = String.format(resources.getString(R.string.during_format), this.visitStartDate.substring(0, 10), this.visitEndDate.substring(0, 10))
 
                                     groupId = id
@@ -243,8 +243,8 @@ class InviteVisitsActivity : BaseActivity<ActivityInviteVisitsBinding>() {
                                                     binding.groupNameSelector.text = name
                                                     binding.groupCustomer.text = clientName
                                                     binding.visitCountry.text = visitCountry
-                                                    binding.visitDays.text = visitDays.toString()
-                                                    binding.visitMembers.text = visitPNumber.toString()
+                                                    binding.visitDays.text = "$visitDays"
+                                                    binding.visitMembers.text = "$visitPNumber"
                                                     binding.duringTime.text = String.format(resources.getString(R.string.during_format), this.visitStartDate.substring(0, 10), this.visitEndDate.substring(0, 10))
 
                                                     groupId = id

app/src/main/java/com/pan_american/android/ui/group_management/entry_and_exit_fee_detail/EntryAndExitPaymentDetailActivity.kt

@@ -122,9 +122,9 @@ class EntryAndExitPaymentDetailActivity : BaseActivity<ActivityEntryAndExitPayme
             binding.commit.text = resources.getString(R.string.update)
 
             updateEntryAndExitPaymentDetailRequest.apply {
-                binding.nights.setText(days.toString())
-                binding.paymentPrinciple.setText(cost.toString())
-                binding.totalPayment.text = subTotal.toString()
+                binding.nights.setText("$days")
+                binding.paymentPrinciple.setText("$cost")
+                binding.totalPayment.text = "$subTotal"
             }
 
         } else {
@@ -299,7 +299,7 @@ class EntryAndExitPaymentDetailActivity : BaseActivity<ActivityEntryAndExitPayme
                                                         when (type) {
                                                             3 -> {
                                                                 binding.paymentPrinciple.setText(
-                                                                    roomCost.toString()
+                                                                    "$roomCost"
                                                                 )
 
                                                                 paymentPrinciple = roomCost
@@ -307,7 +307,7 @@ class EntryAndExitPaymentDetailActivity : BaseActivity<ActivityEntryAndExitPayme
 
                                                             4 -> {
                                                                 binding.paymentPrinciple.setText(
-                                                                    foodCost.toString()
+                                                                    "$foodCost"
                                                                 )
 
                                                                 paymentPrinciple = foodCost
@@ -315,7 +315,7 @@ class EntryAndExitPaymentDetailActivity : BaseActivity<ActivityEntryAndExitPayme
 
                                                             5 -> {
                                                                 binding.paymentPrinciple.setText(
-                                                                    publicCost.toString()
+                                                                    "$publicCost"
                                                                 )
 
                                                                 paymentPrinciple = publicCost

app/src/main/java/com/pan_american/android/ui/group_management/entry_and_exit_fee_detail/EntryAndExitPaymentListFragment.kt

@@ -197,9 +197,9 @@ class EntryAndExitPaymentListFragment : BaseFragment<FragmentEntryAndExitPayment
                 itemView.findViewById<TextView>(R.id.days).text =
                     String.format(resources.getString(R.string.nights_format), data.days)
                 itemView.findViewById<TextView>(R.id.city).text = data.arae
-                itemView.findViewById<TextView>(R.id.payment_principle).text = data.cost.toString()
+                itemView.findViewById<TextView>(R.id.payment_principle).text = "${data.cost}"
                 itemView.findViewById<TextView>(R.id.currency).text = data.currencyName
-                itemView.findViewById<TextView>(R.id.total_payment).text = data.subTotal.toString()
+                itemView.findViewById<TextView>(R.id.total_payment).text = "${data.subTotal}"
             }
         }.create()
 
@@ -390,15 +390,15 @@ class EntryAndExitPaymentListFragment : BaseFragment<FragmentEntryAndExitPayment
 
             for (item in OASystem.entryAndExitDetailResponse.currencys) {
                 when (item.currencyCode) {
-                    "USD" -> usdCurrency.setText(item.rate.toString())
+                    "USD" -> usdCurrency.setText("${item.rate}")
 
-                    "EUR" -> eurCurrency.setText(item.rate.toString())
+                    "EUR" -> eurCurrency.setText("${item.rate}")
 
-                    "GBP" -> gbpCurrency.setText(item.rate.toString())
+                    "GBP" -> gbpCurrency.setText("${item.rate}")
 
-                    "JPY" -> jpyCurrency.setText(item.rate.toString())
+                    "JPY" -> jpyCurrency.setText("${item.rate}")
 
-                    "HKD" -> hkdCurrency.setText(item.rate.toString())
+                    "HKD" -> hkdCurrency.setText("${item.rate}")
                 }
             }
 

app/src/main/java/com/pan_american/android/ui/group_management/entry_and_exit_fee_detail/InBoardFeeFragment.kt

@@ -99,13 +99,13 @@ class InBoardFeeFragment : BaseFragment<FragmentInBoardFeeBinding>() {
                             paymentId = id
 
                             binding.isSelected.isChecked = choiceOne == 1
-                            binding.visaPrice.setText(visa.toString())
+                            binding.visaPrice.setText("$visa")
                             binding.visaDescription.setText(visaRemark)
-                            binding.vaccinePrice.setText(yiMiao.toString())
-                            binding.nucleicAcidTestingPrice.setText(heSuan.toString())
-                            binding.servicePrice.setText(service.toString())
-                            binding.insurancePrice.setText(safe.toString())
-                            binding.ticketPrice.setText(ticket.toString())
+                            binding.vaccinePrice.setText("$yiMiao")
+                            binding.nucleicAcidTestingPrice.setText("$heSuan")
+                            binding.servicePrice.setText("$service")
+                            binding.insurancePrice.setText("$safe")
+                            binding.ticketPrice.setText("$ticket")
                         }
 
                     } else {
@@ -204,7 +204,7 @@ class InBoardFeeFragment : BaseFragment<FragmentInBoardFeeBinding>() {
                         if (detailResponse.code == 200) {
 
                             detailResponse.data.apply {
-                                binding.visaPrice.setText(feeTotal.toString())
+                                binding.visaPrice.setText("$feeTotal")
 
                                 binding.visaDescription.setText(remark)
 

app/src/main/java/com/pan_american/android/ui/group_management/entry_and_exit_fee_detail/InternationalTravelFeeFragment.kt

@@ -100,15 +100,15 @@ class InternationalTravelFeeFragment : BaseFragment<FragmentInternationalTravelF
                             paymentId = id
 
                             binding.economyClassSelected.isChecked = choiceTwoJJ == 1
-                            binding.economyClassPrice.setText(airJJ.toString())
+                            binding.economyClassPrice.setText("$airJJ")
 
                             binding.businessClassSelected.isChecked = choiceTwoGW == 1
-                            binding.businessClassPrice.setText(airGW.toString())
+                            binding.businessClassPrice.setText("$airGW")
 
                             binding.firstClassSelected.isChecked = choiceTwoTD == 1
-                            binding.firstClassPrice.setText(airTD.toString())
+                            binding.firstClassPrice.setText("$airTD")
 
-                            binding.cityTrafficPayment.setText(cityTranffic.toString())
+                            binding.cityTrafficPayment.setText("$cityTranffic")
 
                             getInternationalTravelTips()
                         }
@@ -171,9 +171,9 @@ class InternationalTravelFeeFragment : BaseFragment<FragmentInternationalTravelF
     override fun initEvents() {
 
         binding.putIn.setOnClickListener {
-            binding.economyClassPrice.setText(economyClassTip.toString())
+            binding.economyClassPrice.setText("$economyClassTip")
 
-            binding.businessClassPrice.setText(businessClassTip.toString())
+            binding.businessClassPrice.setText("$businessClassTip")
         }
 
         binding.commit.setOnClickListener {

app/src/main/java/com/pan_american/android/ui/group_management/entry_and_exit_fee_detail/OtherPaymentDetailActivity.kt

@@ -55,7 +55,7 @@ class OtherPaymentDetailActivity : BaseActivity<ActivityOtherPaymentDetailBindin
 
             groupId = updateOtherPaymentRequest.diid
 
-            binding.index.text = updateOtherPaymentRequest.index.toString()
+            binding.index.text = "${updateOtherPaymentRequest.index}"
         }
 
         if (fromList) {
@@ -106,8 +106,8 @@ class OtherPaymentDetailActivity : BaseActivity<ActivityOtherPaymentDetailBindin
         binding.paymentPrinciple.filters = arrayOf(MoneyInputFilter(2))
 
         updateOtherPaymentRequest.apply {
-            binding.paymentPrinciple.setText(cost.toString())
-            binding.totalPayment.text = subTotal.toString()
+            binding.paymentPrinciple.setText("$cost")
+            binding.totalPayment.text = "$subTotal"
             binding.remark.setText(remark)
         }
 

app/src/main/java/com/pan_american/android/ui/group_management/entry_and_exit_fee_detail/OtherPaymentFragment.kt

@@ -180,9 +180,9 @@ class OtherPaymentFragment : BaseFragment<FragmentOtherPaymentBinding>() {
                 itemView.findViewById<TextView>(R.id.index).text =
                     String.format(resources.getString(R.string.index_format), data.index)
                 itemView.findViewById<TextView>(R.id.payment_type).text = data.setDataName
-                itemView.findViewById<TextView>(R.id.payment_principle).text = data.cost.toString()
+                itemView.findViewById<TextView>(R.id.payment_principle).text = "${data.cost}"
                 itemView.findViewById<TextView>(R.id.currency).text = data.currencyName
-                itemView.findViewById<TextView>(R.id.total_payment).text = data.subTotal.toString()
+                itemView.findViewById<TextView>(R.id.total_payment).text = "${data.subTotal}"
                 itemView.findViewById<ScrollEditText>(R.id.remark).apply {
                     setText(data.remark.ifBlank { "-" })
                     isEnabled(false)
@@ -265,15 +265,15 @@ class OtherPaymentFragment : BaseFragment<FragmentOtherPaymentBinding>() {
 
             for (item in OASystem.entryAndExitDetailResponse.currencys) {
                 when (item.currencyCode) {
-                    "USD" -> usdCurrency.setText(item.rate.toString())
+                    "USD" -> usdCurrency.setText("${item.rate}")
 
-                    "EUR" -> eurCurrency.setText(item.rate.toString())
+                    "EUR" -> eurCurrency.setText("${item.rate}")
 
-                    "GBP" -> gbpCurrency.setText(item.rate.toString())
+                    "GBP" -> gbpCurrency.setText("${item.rate}")
 
-                    "JPY" -> jpyCurrency.setText(item.rate.toString())
+                    "JPY" -> jpyCurrency.setText("${item.rate}")
 
-                    "HKD" -> hkdCurrency.setText(item.rate.toString())
+                    "HKD" -> hkdCurrency.setText("${item.rate}")
                 }
             }
 

app/src/main/java/com/pan_american/android/ui/group_management/group_info/GroupInfoBaseFragment.kt

@@ -65,8 +65,8 @@ class GroupInfoBaseFragment : BaseFragment<FragmentGroupInfoBaseBinding>() {
             customerDepartment.setText(OASystem.groupOperationRequest.clientUnit)
             visitCountry.setText(OASystem.groupOperationRequest.visitCountry)
             visitDate.text = OASystem.groupOperationRequest.visitDate
-            visitDays.setText(OASystem.groupOperationRequest.visitDays.toString())
-            visitMembers.setText(OASystem.groupOperationRequest.visitPNumber.toString())
+            visitDays.setText("${OASystem.groupOperationRequest.visitDays}")
+            visitMembers.setText("${OASystem.groupOperationRequest.visitPNumber}")
             contractDate.text = OASystem.groupOperationRequest.tontractTime
 
             when(OASystem.groupOperationRequest.isBid) {
@@ -81,8 +81,8 @@ class GroupInfoBaseFragment : BaseFragment<FragmentGroupInfoBaseBinding>() {
                 }
             }
 
-            visitDaysBefore.setText(OASystem.groupOperationRequest.payDay.toString())
-            prePayment.setText(OASystem.groupOperationRequest.paymentMoney.toString())
+            visitDaysBefore.setText("${OASystem.groupOperationRequest.payDay}")
+            prePayment.setText("${OASystem.groupOperationRequest.paymentMoney}")
 
             for (item in OASystem.groupInfoOpPercentageLevel) {
                 if (OASystem.groupOperationRequest.opRoyaltyLv == item.id) {

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

@@ -179,7 +179,7 @@ class GroundConveyPaymentDetailActivity : BaseActivity<ActivityGroundConveyPayme
                                         groundConveyCostList = costResponse.data.modulePromptInfos[0].data
 
                                         currencyAbbr.text = groundConveyCostCurrency
-                                        exchangeRate.text = groundConveyCostExchangeRate.toString()
+                                        exchangeRate.text = "$groundConveyCostExchangeRate"
 
                                         groundConveyCostTable.setData(groundConveyCostList)
 
@@ -197,7 +197,7 @@ class GroundConveyPaymentDetailActivity : BaseActivity<ActivityGroundConveyPayme
                         })
                     } else {
                         currencyAbbr.text = groundConveyCostCurrency
-                        exchangeRate.text = groundConveyCostExchangeRate.toString()
+                        exchangeRate.text = "$groundConveyCostExchangeRate"
 
                         groundConveyCostTable.setData(groundConveyCostList)
                     }

app/src/main/java/com/pan_american/android/ui/group_simple_info/GroupSimpleInfoFragment.kt

@@ -184,9 +184,8 @@ class GroupSimpleInfoFragment : BaseFragment<FragmentSimpleGroupBinding>() {
                 itemView.findViewById<TextView>(R.id.group_name).text = data.teamName
                 itemView.findViewById<TextView>(R.id.group_customer).text = data.clientName
                 itemView.findViewById<TextView>(R.id.visit_country).text = data.visitCountry
-                itemView.findViewById<TextView>(R.id.visit_days).text = data.visitDays.toString()
-                itemView.findViewById<TextView>(R.id.visit_members).text =
-                    data.visitPNumber.toString()
+                itemView.findViewById<TextView>(R.id.visit_days).text = "${data.visitDays}"
+                itemView.findViewById<TextView>(R.id.visit_members).text = "${data.visitPNumber}"
                 itemView.findViewById<TextView>(R.id.during_time).text = String.format(
                     resources.getString(
                         R.string.during_format

app/src/main/java/com/pan_american/android/ui/group_visa/insurance_payment_insert/AddInsurancePaymentActivity.kt

@@ -802,7 +802,7 @@ class AddInsurancePaymentActivity : BaseActivity<ActivityAddInsurancePaymentBind
 
                                 initCustomerList()
 
-                                binding.insurancePayment.setText(insuranceCosts.toString())
+                                binding.insurancePayment.setText("$insuranceCosts")
 
                                 run {
                                     for (item in currencyList) {
@@ -841,7 +841,7 @@ class AddInsurancePaymentActivity : BaseActivity<ActivityAddInsurancePaymentBind
                                     binding.consumeDate.text = consumptionDate
                                 }
 
-                                binding.paymentSum.text = payMoney.toString()
+                                binding.paymentSum.text = "$payMoney"
 
                                 run {
                                     for (item in currencyList) {

app/src/main/java/com/pan_american/android/ui/group_visa/visa_payment_insert/AddVisaPaymentActivity.kt

@@ -186,7 +186,7 @@ class AddVisaPaymentActivity : BaseActivity<ActivityAddVisaPaymentBinding>() {
 
             initCustomerList()
 
-            binding.visaHandleNumber.setText(customerSelectList.size.toString())
+            binding.visaHandleNumber.setText("${customerSelectList.size}")
 
             binding.visaExemptionNumber.setText("0")
 
@@ -1101,7 +1101,7 @@ class AddVisaPaymentActivity : BaseActivity<ActivityAddVisaPaymentBinding>() {
 
                                 initCustomerList()
 
-                                binding.visaPrice.setText(visaPrice.toString())
+                                binding.visaPrice.setText("$visaPrice")
 
                                 priceUnit = visaCurrency
 
@@ -1126,8 +1126,8 @@ class AddVisaPaymentActivity : BaseActivity<ActivityAddVisaPaymentBinding>() {
                                     }
                                 }
 
-                                binding.visaHandleNumber.setText(visaNumber.toString())
-                                binding.visaExemptionNumber.setText(visaFreeNumber.toString())
+                                binding.visaHandleNumber.setText("$visaNumber")
+                                binding.visaExemptionNumber.setText("$visaFreeNumber")
 
                                 binding.notes.setText(remark)
                             }

app/src/main/java/com/pan_american/android/ui/group_visa/visa_payment_insert/VisaPaymentListFragment.kt

@@ -236,9 +236,8 @@ class VisaPaymentListFragment : BaseFragment<FragmentVisaPaymentListBinding>() {
                     data.visaPrice.toString(),
                     data.visaCurrencyStr
                 )
-                itemView.findViewById<TextView>(R.id.visa_number).text = data.visaNumber.toString()
-                itemView.findViewById<TextView>(R.id.visa_free_number).text =
-                    data.visaFreeNumber.toString()
+                itemView.findViewById<TextView>(R.id.visa_number).text = "${data.visaNumber}"
+                itemView.findViewById<TextView>(R.id.visa_free_number).text = "${data.visaFreeNumber}"
 
                 when (data.isThird) {
                     0 -> {

app/src/main/java/com/pan_american/android/ui/message/MessageFragment.kt

@@ -64,7 +64,7 @@ class MessageFragment : BaseFragment<FragmentMessageBinding>() {
                     text = resources.getString(R.string.message_max_count)
                     return@apply
                 }
-                text = taskMessageUnReadCount.toString()
+                text = "$taskMessageUnReadCount"
             } else {
                 visibility = View.GONE
             }
@@ -77,7 +77,7 @@ class MessageFragment : BaseFragment<FragmentMessageBinding>() {
                     text = resources.getString(R.string.message_max_count)
                     return@apply
                 }
-                text = groupMessageUnReadCount.toString()
+                text = "$groupMessageUnReadCount"
             } else {
                 visibility = View.GONE
             }

app/src/main/java/com/pan_american/android/ui/personnel_module/materials_operate/MaterialApplicationActivity.kt

@@ -60,7 +60,7 @@ class MaterialApplicationActivity : BaseActivity<ActivityMaterialApplicationBind
             materialId = getIntExtra("material_id", 0)
             binding.materialType.text = getStringExtra("material_type_name")
             materialTypeId = getIntExtra("material_type_id", 0)
-            binding.materialCount.text = getDoubleExtra("material_count", 0.0).toString()
+            binding.materialCount.text = "${getDoubleExtra("material_count", 0.0)}"
         }
 
         initTitle()

app/src/main/java/com/pan_american/android/ui/personnel_module/materials_operate/MaterialHistoryListFragment.kt

@@ -146,7 +146,7 @@ class MaterialHistoryListFragment : BaseFragment<FragmentMaterialHistoryListBind
             addBindView { itemView, data ->
                 itemView.findViewById<TextView>(R.id.material_name).text = data.goodsName
                 itemView.findViewById<TextView>(R.id.material_type).text = data.goodsType
-                itemView.findViewById<TextView>(R.id.material_counts).text = data.quantity.toString()
+                itemView.findViewById<TextView>(R.id.material_counts).text = "${data.quantity}"
                 itemView.findViewById<TextView>(R.id.create_time).text = data.createTime.substring(0, 10)
                 itemView.findViewById<TextView>(R.id.verify_status).apply {
                     text = data.auditStatusText
@@ -194,7 +194,7 @@ class MaterialHistoryListFragment : BaseFragment<FragmentMaterialHistoryListBind
                         materialName.text = goodsName
                         materialType.text = goodsType
                         associationGroup.text = groupName
-                        materialCount.text = quantity.toString()
+                        materialCount.text = "$quantity"
                         applicationReason.setText(reason)
                         notes.setText(remark)
 

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

@@ -234,7 +234,7 @@ class AddCarResourceActivity : BaseActivity<ActivityAddCarResourceBinding>() {
                             carCompany.setText(carResource.unitName)
                             for (item in OASystem.score) {
                                 if (item == carResource.score.toString()) {
-                                    companyScore.text = carResource.score.toString()
+                                    companyScore.text = "${carResource.score}"
                                     isChose = true
                                 }
                             }

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

@@ -157,7 +157,7 @@ class CarResourceListFragment : BaseFragment<FragmentCarResourceListBinding>() {
                 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 {
+                itemView.findViewById<TextView>(R.id.service_score).text = "${data.score}".ifBlank {
                     resources.getString(R.string.no_info)
                 }
                 itemView.findViewById<TextView>(R.id.refresh_time).text = data.createTime.ifBlank {

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

@@ -160,7 +160,7 @@ class GuideResourceListFragment : BaseFragment<FragmentGuideResourceListBinding>
                 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 {
+                itemView.findViewById<TextView>(R.id.service_score).text = "${data.score}".ifBlank {
                     resources.getString(R.string.no_info)
                 }
                 itemView.findViewById<TextView>(R.id.refresh_time).text = data.createTime.ifBlank {

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"

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

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/white"

build.gradle

@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.4.0' apply false
-    id 'com.android.library' version '8.4.0' apply false
-    id 'org.jetbrains.kotlin.android' version '1.9.0' apply false
+    id 'com.android.application' version '8.4.2' apply false
+    id 'com.android.library' version '8.4.2' apply false
+    id 'org.jetbrains.kotlin.android' version '2.0.0' apply false
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Thu Dec 19 13:53:43 CST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists

settings.gradle

@@ -20,7 +20,7 @@ dependencyResolutionManagement {
         //noinspection JcenterRepositoryObsolete
         jcenter()
         mavenCentral()
-        maven {url 'https://jitpack.io'}
+        maven { url 'https://jitpack.io'}
         maven { url 'https://maven.aliyun.com/repository/releases'}
         maven { url 'https://maven.aliyun.com/repository/google' }
         maven { url 'https://maven.aliyun.com/repository/central' }