2024-09-29 修改

修改：
1. 部分UI逻辑修改

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

@@ -1,55 +0,0 @@
-package com.pan_american.android.data.model.common.adapter
-
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.recyclerview.widget.RecyclerView
-import com.pan_american.android.R
-import com.pan_american.android.data.model.common.entity.ServiceResourceListItem
-
-class ServiceResourceAdapter(private val listItem: List<ServiceResourceListItem>): RecyclerView.Adapter<ServiceResourceAdapter.ViewHolder>() {
-
-    lateinit var onRecyclerViewItemClick: OnRecyclerViewItemClick<ServiceResourceListItem>
-
-    inner class ViewHolder(view: View): RecyclerView.ViewHolder(view) {
-        val city: TextView = view.findViewById(R.id.service_resource_city)
-        val deleteIcon:ImageView = view.findViewById(R.id.delete)
-        val name: TextView = view.findViewById(R.id.supplier_name)
-        val scope: TextView = view.findViewById(R.id.supplier_scope)
-        val phone: TextView = view.findViewById(R.id.supplier_phone)
-        val email: TextView = view.findViewById(R.id.supplier_email)
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val view = LayoutInflater.from(parent.context).inflate(R.layout.item_service_resource_list, parent, false)
-        val viewHolder = ViewHolder(view)
-        val position = viewHolder.absoluteAdapterPosition
-
-        viewHolder.itemView.setOnClickListener {
-            onRecyclerViewItemClick.onItemClick(position)
-        }
-        viewHolder.deleteIcon.setOnClickListener {
-            onRecyclerViewItemClick.onItemDelete(position)
-        }
-        return viewHolder
-    }
-
-    override fun getItemCount() = listItem.size
-
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        val item = listItem[position]
-        holder.city.text = item.city
-        holder.deleteIcon.visibility = View.VISIBLE
-        holder.name.text = item.name
-        holder.scope.text = item.scope
-        holder.phone.text = item.phone
-        holder.email.text = item.email
-    }
-
-    interface OnRecyclerViewItemClick<T> {
-        fun onItemClick(position: Int)
-        fun onItemDelete(position: Int)
-    }
-}

app/src/main/java/com/pan_american/android/data/model/common/entity/SimpleGroupData.kt

@@ -1,5 +1,4 @@
 package com.pan_american.android.data.model.common.entity
 
 class SimpleGroupData(val id: Int, val tourCode: String, val teamName: String, val clientName: String,
-                      val visitStartDate: String, val visitEndDate: String, val visitCountry: String, val visitDays: Int, val visitPNumber: Int) {
-}
+                      val visitStartDate: String, val visitEndDate: String, val visitCountry: String, val visitDays: Int, val visitPNumber: Int)

app/src/main/java/com/pan_american/android/data/model/customer_resource/market_sales_revenue/entity/QuarterlyMonthData.kt

@@ -1,6 +1,6 @@
 package com.pan_american.android.data.model.customer_resource.market_sales_revenue.entity
 
-class QuarterlyMonthData() {
+class QuarterlyMonthData {
     val name = ""
     val beginDt = ""
     val endDt = ""

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

@@ -3,7 +3,7 @@ package com.pan_american.android.data.model.customer_resource.market_sales_reven
 import com.pan_american.android.OASystem
 import com.pan_american.android.base.BaseRequest
 
-class MarketSalesAddVisitHistoryRequest(): BaseRequest() {
+class MarketSalesAddVisitHistoryRequest : BaseRequest() {
     val userId = OASystem.userInfo.userId
     val pageId = OASystem.MARKET_SALES_REVENUE
 

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

@@ -3,7 +3,7 @@ package com.pan_american.android.data.model.customer_resource.market_sales_reven
 import com.pan_american.android.OASystem
 import com.pan_american.android.base.BaseRequest
 
-class MarketSalesVisitHistoryRequest(): BaseRequest() {
+class MarketSalesVisitHistoryRequest : BaseRequest() {
 
     val userId = OASystem.userInfo.userId
     val pageId = OASystem.MARKET_SALES_REVENUE

app/src/main/java/com/pan_american/android/data/model/customer_resource/related_invitee/network/RelatedInviteeCityDataResourceRequest.kt

@@ -1,5 +1,5 @@
 package com.pan_american.android.data.model.customer_resource.related_invitee.network
 
-class RelatedInviteeCityDataResourceRequest(): RelatedInviteeDataResourceRequest() {
+class RelatedInviteeCityDataResourceRequest : RelatedInviteeDataResourceRequest() {
     var countiesId = 0
 }

app/src/main/java/com/pan_american/android/data/model/daily_payment/entity/DailyPaymentDetail.kt

@@ -1,5 +1,4 @@
 package com.pan_american.android.data.model.daily_payment.entity
 
 class DailyPaymentDetail(val id: Int, var companyId: Int, var transferTypeId: Int, var priceTypeId: Int,
-                         var instructions: String, var sumPrice:Double, val createUserId: Int, var feeContents: ArrayList<DailyPaymentListItem>) {
-}
+                         var instructions: String, var sumPrice:Double, val createUserId: Int, var feeContents: ArrayList<DailyPaymentListItem>)

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

@@ -62,10 +62,13 @@ class GroundConveyListAdapter(private val groundConveyList: ArrayList<GroundConv
             holder.paymentName.text = priceName.ifBlank {
                 "暂无"
             }
-            holder.servicePrice.text = String.format("%.2f (%s)", payMoney, currencyStr)
-            holder.thisTimePayment.text = String.format("%.2f (%s)", payThenMoney, currencyStr)
-            holder.balancePayment.text = String.format("%.2f (%s)", remainingBalance, currencyStr)
-            holder.serviceDuringTime.text = String.format("%s - %s", serviceStartTime, serviceEndTime)
+            String.format(OASystem.context.resources.getString(R.string.price_and_currency_format), payMoney, currencyStr).also { holder.servicePrice.text = it }
+            String.format(OASystem.context.resources.getString(R.string.price_and_currency_format), payThenMoney, currencyStr)
+                .also { holder.thisTimePayment.text = it }
+            String.format(OASystem.context.resources.getString(R.string.price_and_currency_format), remainingBalance, currencyStr)
+                .also { holder.balancePayment.text = it }
+            String.format("%s - %s", serviceStartTime, serviceEndTime)
+                .also { holder.serviceDuringTime.text = it }
             holder.priceType.text = priceTypeStr.ifBlank {
                 "暂无"
             }

app/src/main/java/com/pan_american/android/data/model/personnel_module/materials_operate/network/MaterialApplicationResponse.kt

@@ -2,4 +2,4 @@ package com.pan_american.android.data.model.personnel_module.materials_operate.n
 
 import com.pan_american.android.base.BaseResponse
 
-class MaterialApplicationResponse(): BaseResponse()
+class MaterialApplicationResponse : BaseResponse()

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

@@ -659,7 +659,7 @@ class SalesRevenueTotalFragment : BaseFragment<FragmentSalesRevenueTotalBinding>
                                 return if (!isEmpty) {
                                     String.format(resources.getString(R.string.currency_name_code_format), itemValue.toString(), percentageString)
                                 } else {
-                                    String.format(resources.getString(R.string.currency_name_code_format), 0, "0.00%")
+                                    String.format(resources.getString(R.string.price_and_currency_format), 0, "0.00%")
                                 }
                             }
                         }
@@ -805,8 +805,7 @@ class SalesRevenueTotalFragment : BaseFragment<FragmentSalesRevenueTotalBinding>
                                 return if (!isEmpty) {
                                     String.format(resources.getString(R.string.currency_name_code_format), itemValue.toString(), percentageString)
                                 } else {
-                                    String.format(resources.getString(R.string.currency_name_code_format), 0, "0.00%")
-
+                                    String.format(resources.getString(R.string.price_and_currency_format), 0, "0.00%")
                                 }
                             }
                         }

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

@@ -11,7 +11,6 @@ import android.widget.PopupWindow
 import android.widget.TextView
 import androidx.core.content.res.ResourcesCompat
 import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
 import com.pan_american.android.R
 import com.pan_american.android.base.BaseActivity
 import com.pan_american.android.base.ListAdapter

app/src/main/java/com/pan_american/android/ui/efficiency_tools/itinerary/ItineraryActivity.kt

@@ -66,7 +66,7 @@ class ItineraryActivity : BaseActivity<ActivityItineraryBinding>(),
     override fun initViews() {
         //日程日期显示
         itineraryListTitle = binding.itineraryListTitle
-        itineraryListTitle.text = String.format(resources.getString(R.string.today, month, day))
+        itineraryListTitle.text = String.format(resources.getString(R.string.today), month, day)
     }
 
     private fun initCalendar() {
@@ -77,7 +77,7 @@ class ItineraryActivity : BaseActivity<ActivityItineraryBinding>(),
         month = itineraryCalendar.curMonth
         day = itineraryCalendar.curDay
 
-        yearMonthText.text = String.format(resources.getString(R.string.year_month, year, month))
+        yearMonthText.text = String.format(resources.getString(R.string.year_month), year, month)
 
         itineraryCalendar.setOnYearChangeListener(this)
         itineraryCalendar.setOnMonthChangeListener(this)
@@ -86,12 +86,12 @@ class ItineraryActivity : BaseActivity<ActivityItineraryBinding>(),
 
     override fun onYearChange(year: Int) {
         this.year = year
-        yearMonthText.text = String.format(resources.getString(R.string.year_month, year, month))
+        yearMonthText.text = String.format(resources.getString(R.string.year_month), year, month)
     }
 
     override fun onMonthChange(year: Int, month: Int) {
         this.month = month
-        yearMonthText.text = String.format(resources.getString(R.string.year_month, year, month))
+        yearMonthText.text = String.format(resources.getString(R.string.year_month), year, month)
     }
 
     override fun onCalendarOutOfRange(calendar: Calendar?) {
@@ -102,13 +102,9 @@ class ItineraryActivity : BaseActivity<ActivityItineraryBinding>(),
         if (calendar != null) {
             if (calendar.month == itineraryCalendar.curMonth && calendar.day == itineraryCalendar.curDay) {
                 itineraryListTitle.text =
-                    String.format(resources.getString(R.string.today, calendar.month, calendar.day))
+                    String.format(resources.getString(R.string.today), calendar.month, calendar.day)
             } else {
-                itineraryListTitle.text = String.format(
-                    resources.getString(
-                        R.string.month_day, calendar.month, calendar.day
-                    )
-                )
+                itineraryListTitle.text = String.format(resources.getString(R.string.month_day), calendar.month, calendar.day)
             }
         }
     }

app/src/main/java/com/pan_american/android/ui/login/LoginActivity.kt

@@ -48,9 +48,9 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>() {
         binding.loginButton.setText(resources.getString(R.string.login))
 
         binding.systemInfo.text = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            String.format(getString(R.string.system_info, packageManager.getPackageInfo(packageName, PackageManager.PackageInfoFlags.of(0)).versionName))
+            String.format(getString(R.string.system_info), packageManager.getPackageInfo(packageName, PackageManager.PackageInfoFlags.of(0)).versionName)
         } else {
-            String.format(getString(R.string.system_info, packageManager.getPackageInfo(packageName, 0).versionName))
+            String.format(getString(R.string.system_info), packageManager.getPackageInfo(packageName, 0).versionName)
         }
     }
 

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

@@ -16,9 +16,10 @@ import com.pan_american.android.R
 
 class ScrollEditText(context: Context, attrs: AttributeSet?) : LinearLayout(context, attrs) {
 
-    private val view: View
+    private val view: View =
+        LayoutInflater.from(context).inflate(R.layout.layout_scroll_edit_text, this)
 
-    private val editTextField: EditText
+    private val editTextField: EditText = view.findViewById(R.id.edit_text_field)
 
     private val textField: TextView
 
@@ -27,8 +28,6 @@ class ScrollEditText(context: Context, attrs: AttributeSet?) : LinearLayout(cont
     private var isEnabled = true
 
     init {
-        view = LayoutInflater.from(context).inflate(R.layout.layout_scroll_edit_text, this)
-        editTextField = view.findViewById(R.id.edit_text_field)
         editTextField.setSelection(editTextField.text.length)
         textField = view.findViewById(R.id.text_field)
     }

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/white"
@@ -685,7 +686,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_padding_small"
-                android:orientation="horizontal">
+                android:orientation="horizontal"
+                tools:ignore="TooManyViews">
 
                 <TextView
                     android:layout_width="0dp"

app/src/main/res/layout/activity_add_customer_visit_history.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:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"

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

@@ -295,6 +295,7 @@
                     android:background="@color/white"
                     android:gravity="end"
                     android:hint="@string/please_input"
+                    android:importantForAutofill="no"
                     android:inputType="phone"
                     android:singleLine="true"
                     android:textColor="@color/text_color"

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

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

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

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

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

@@ -1,7 +1,6 @@
 <?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:orientation="vertical">

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

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

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

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

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

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

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

@@ -1,7 +1,6 @@
 <?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:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"

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

@@ -1,7 +1,6 @@
 <?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"

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

@@ -1,7 +1,6 @@
 <?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:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"

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

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/black"
-    android:orientation="vertical">
-
-    <include
-        layout="@layout/layout_title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/image_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="fitCenter"
-        android:adjustViewBounds="true" />
-
-<!--    <TextView-->
-<!--        android:id="@+id/image_name"-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="wrap_content"-->
-<!--        android:layout_marginTop="@dimen/common_padding_huge"-->
-<!--        android:layout_marginBottom="@dimen/common_padding_huge"-->
-<!--        android:gravity="center"-->
-<!--        android:padding="@dimen/common_padding_large"-->
-<!--        android:textColor="@color/white"-->
-<!--        android:textSize="@dimen/text_size_large"-->
-<!--        android:textStyle="bold" />-->
-
-</LinearLayout>

app/src/main/res/layout/activity_related_invitee.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:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"

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

@@ -44,7 +44,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/common_padding"
-            android:text="%"
+            android:text="@string/percentage"
             android:textColor="@color/text_color"
             android:textSize="@dimen/text_size_medium" />
     </LinearLayout>

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

@@ -1,7 +1,6 @@
 <?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/background_color"

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

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

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

@@ -1,7 +1,6 @@
 <?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:orientation="vertical"

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

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

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

@@ -1,7 +1,6 @@
 <?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:orientation="vertical"

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

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

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

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

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

@@ -1,7 +1,6 @@
 <?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">
 

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

@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/common_padding"
-    android:layout_marginBottom="@dimen/common_padding"
-    android:background="@drawable/shape_corner_stroke_white"
-    android:orientation="vertical"
-    tools:viewBindingIgnore="true">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/common_padding"
-        android:orientation="vertical">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/common_padding"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/service_resource_city"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="四川省成都市"
-                android:textColor="@color/text_color_blue"
-                android:textSize="@dimen/text_size_medium"
-                android:textStyle="bold" />
-
-            <ImageView
-                android:id="@+id/delete"
-                android:layout_width="@dimen/common_padding_heavy"
-                android:layout_height="@dimen/common_padding_heavy"
-                android:layout_alignParentEnd="true"
-                android:layout_marginEnd="@dimen/common_padding"
-                android:src="@mipmap/icon_delete"
-                tools:ignore="ContentDescription" />
-
-        </RelativeLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:layout_marginTop="@dimen/common_padding"
-            android:layout_marginBottom="@dimen/common_padding"
-            android:background="@color/line_color" />
-
-        <RelativeLayout
-            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="供应商名称"
-                android:textSize="@dimen/text_size_medium" />
-
-            <TextView
-                android:id="@+id/supplier_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:background="@color/white"
-                android:gravity="end"
-                android:singleLine="true"
-                android:text="四川沃赛服饰有限公司"
-                android:textSize="@dimen/text_size_medium" />
-
-        </RelativeLayout>
-
-        <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" />
-
-        <RelativeLayout
-            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="供应范围"
-                android:textSize="@dimen/text_size_medium" />
-
-            <TextView
-                android:id="@+id/supplier_scope"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:background="@color/white"
-                android:gravity="end"
-                android:singleLine="true"
-                android:text="行李推车"
-                android:textSize="@dimen/text_size_medium" />
-
-        </RelativeLayout>
-
-        <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" />
-
-        <RelativeLayout
-            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="电话"
-                android:textSize="@dimen/text_size_medium" />
-
-            <TextView
-                android:id="@+id/supplier_phone"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:background="@color/white"
-                android:gravity="end"
-                android:singleLine="true"
-                android:text="18780100243"
-                android:textSize="@dimen/text_size_medium" />
-
-        </RelativeLayout>
-
-        <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" />
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/common_padding"
-            android:layout_marginBottom="@dimen/common_padding_huge"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="邮箱"
-                android:textSize="@dimen/text_size_medium" />
-
-            <TextView
-                android:id="@+id/supplier_email"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:background="@color/white"
-                android:gravity="end"
-                android:singleLine="true"
-                android:text="782440144@qq.com"
-                android:textSize="@dimen/text_size_medium" />
-
-        </RelativeLayout>
-
-    </LinearLayout>
-
-</LinearLayout>

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <monochrome  android:drawable="@color/black" />
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

app/src/main/res/values-night/themes.xml

@@ -1,3 +1,3 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <!-- Base application theme. -->
 </resources>

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

@@ -73,6 +73,8 @@
 
     <string name="decimal_format">%.2f</string>
 
+    <string name="percentage">%</string>
+
     <string name="during">至</string>
 
     <string name="create_time">创建时间</string>

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

@@ -1,3 +1,3 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <!-- Base application theme. -->
 </resources>