From 83c46a3f59486029a541d1f4ce0cbec0d36ea6e6 Mon Sep 17 00:00:00 2001
From: 18034727885 <973609879@qq.com>
Date: 星期三, 20 五月 2026 20:17:20 +0800
Subject: [PATCH] 优化支付方式
---
app/src/main/res/layout/dialog_pay.xml | 2
app/src/main/res/values-fr/strings.xml | 2
app/src/main/res/values/strings.xml | 2
app/src/main/res/layout/fragment_logistics.xml | 373 ++++++++++++++++++++++++++++++----------------------
app/src/main/res/values-en/strings.xml | 2
app/src/main/java/com/igo/user/ui/logistics/LogisticsFragment.kt | 22 +-
app/src/main/res/values/colors.xml | 1
7 files changed, 232 insertions(+), 172 deletions(-)
diff --git a/app/src/main/java/com/igo/user/ui/logistics/LogisticsFragment.kt b/app/src/main/java/com/igo/user/ui/logistics/LogisticsFragment.kt
index 8a4af3f..a7b6e14 100644
--- a/app/src/main/java/com/igo/user/ui/logistics/LogisticsFragment.kt
+++ b/app/src/main/java/com/igo/user/ui/logistics/LogisticsFragment.kt
@@ -22,7 +22,6 @@
import cn.sinata.xldutils.fragment.BaseFragment
import cn.sinata.xldutils.gone
import cn.sinata.xldutils.toBrowser
-import cn.sinata.xldutils.utils.SPUtils
import cn.sinata.xldutils.utils.SpanBuilder
import cn.sinata.xldutils.utils.myToast
import cn.sinata.xldutils.utils.optInt
@@ -34,10 +33,7 @@
import com.google.android.gms.maps.GoogleMap
import com.google.android.gms.maps.SupportMapFragment
import com.google.android.gms.maps.model.LatLng
-import com.google.gson.Gson
import com.igo.user.IGoApplication
-import com.igo.user.IGoApplication.Companion.chooseCityLat
-import com.igo.user.IGoApplication.Companion.chooseCityLon
import com.igo.user.IGoApplication.Companion.currentLatLng
import com.igo.user.IGoApplication.Companion.lat
import com.igo.user.IGoApplication.Companion.lon
@@ -48,15 +44,12 @@
import com.igo.user.interfaces.StringCallback
import com.igo.user.network.HttpManager
import com.igo.user.network.entity.GeoBean
-import com.igo.user.network.request
import com.igo.user.network.requestByF
import com.igo.user.ui.MainActivity
-import com.igo.user.ui.mine.FinishMailActivity
import com.igo.user.ui.mine.OrderActivity
import com.igo.user.ui.mine.TripOrderFragment
import com.igo.user.ui.trip.ChoosePositionActivity
import com.igo.user.ui.trip.OrderDetailActivity
-import com.igo.user.ui.trip.TripActivity
import com.igo.user.utils.Const
import com.igo.user.utils.google.AMapKit
import com.igo.user.utils.pay.PayListener
@@ -66,13 +59,12 @@
import org.jetbrains.anko.backgroundResource
import org.jetbrains.anko.find
import org.jetbrains.anko.sdk27.coroutines.onClick
-import org.jetbrains.anko.startActivity
import org.jetbrains.anko.support.v4.dip
import org.jetbrains.anko.support.v4.find
import org.jetbrains.anko.support.v4.runOnUiThread
import org.jetbrains.anko.support.v4.startActivity
import org.jetbrains.anko.support.v4.startActivityForResult
-import org.jetbrains.anko.support.v4.toast
+import java.math.RoundingMode
class LogisticsFragment : BaseFragment(), PayListener {
override fun contentViewId() = R.layout.fragment_logistics
@@ -136,6 +128,8 @@
private val tv_error by lazy { find<View>(R.id.tv_error) }
private val tv_retry by lazy { find<View>(R.id.tv_retry) }
private val ll_type by lazy { find<LinearLayout>(R.id.ll_type) }
+ private val ll_estimate_price by lazy { find<LinearLayout>(R.id.ll_estimate_price) }
+ private val tv_estimate_price by lazy { find<TextView>(R.id.tv_estimate_price) }
private val tipsDialog by lazy {
val dialog = SingleWheelDialog()
@@ -527,6 +521,7 @@
.requestByF(this, true, { _, data ->
if (data?.isEmpty() == true) {
tv_empty.visible()
+ ll_estimate_price.gone()
tv_action.isEnabled = false
} else {
tv_action.isEnabled = true
@@ -543,6 +538,14 @@
tv_price.text =
getString(R.string.预估价格, it.amount).replace(",", ".")
iv_car.setImageURI(it.img)
+ ll_estimate_price.visible()
+ tv_estimate_price.visible()
+ tv_estimate_price.text = "FCFA ${
+ it.amount.toBigDecimal().setScale(
+ 2,
+ RoundingMode.HALF_UP
+ )
+ }"
if (index == 0) { //默认选择第一个
carTypeId = it.id
carTypeIndex = 0
@@ -578,6 +581,7 @@
}) { _, _ ->
tv_error.visible()
tv_retry.visible()
+ ll_estimate_price.gone()
tv_action.isEnabled = false
}
}
diff --git a/app/src/main/res/layout/dialog_pay.xml b/app/src/main/res/layout/dialog_pay.xml
index 4fe51f0..ea47d35 100644
--- a/app/src/main/res/layout/dialog_pay.xml
+++ b/app/src/main/res/layout/dialog_pay.xml
@@ -159,6 +159,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:checked="true"
+ android:visibility="gone"
android:drawableEnd="@drawable/selector_radio"
android:text="@string/余额支付" />
@@ -169,7 +170,6 @@
style="@style/style_text_dialog_pay"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:visibility="gone"
android:drawableEnd="@drawable/selector_radio"
android:text="@string/现金支付" />
diff --git a/app/src/main/res/layout/fragment_logistics.xml b/app/src/main/res/layout/fragment_logistics.xml
index d53837d..df8ffd9 100644
--- a/app/src/main/res/layout/fragment_logistics.xml
+++ b/app/src/main/res/layout/fragment_logistics.xml
@@ -1,299 +1,354 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout 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"
- xmlns:app="http://schemas.android.com/apk/res-auto">
- <fragment
+ android:layout_height="match_parent">
+
+ <fragment xmlns:map="http://schemas.android.com/apk/res-auto"
android:id="@+id/mMapView"
- xmlns:map="http://schemas.android.com/apk/res-auto"
android:name="com.google.android.gms.maps.SupportMapFragment"
android:layout_width="match_parent"
android:layout_height="0dp"
- map:layout_constraintTop_toBottomOf="@id/cl_bottom_logistics"
- map:layout_constraintBottom_toBottomOf="parent"
- map:uiRotateGestures="true"
map:cameraBearing="112.5"
map:cameraTargetLat="5.6037168"
map:cameraTargetLng="-0.1869644"
map:cameraTilt="0"
map:cameraZoom="13"
+ map:layout_constraintBottom_toBottomOf="parent"
+ map:layout_constraintTop_toBottomOf="@id/cl_bottom_logistics"
map:mapType="normal"
map:uiCompass="false"
+ map:uiRotateGestures="true"
map:uiScrollGestures="true"
map:uiTiltGestures="true"
map:uiZoomGestures="true" />
<androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/cl_bottom_logistics"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:id="@+id/cl_bottom_logistics"
+ android:layout_marginTop="108dp"
+ android:background="@color/white"
android:focusable="true"
android:focusableInTouchMode="true"
- app:layout_constraintTop_toTopOf="parent"
- android:layout_marginTop="108dp"
- android:background="@color/white">
+ app:layout_constraintTop_toTopOf="parent">
+
<TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- app:layout_constraintTop_toTopOf="parent"
- android:hint="@string/选择领取点"
- style="@style/style_common_text"
- android:textStyle="bold"
- android:paddingTop="14dp"
- android:paddingBottom="14dp"
- android:layout_marginTop="3dp"
android:id="@+id/tv_start"
- android:singleLine="true"
- android:drawablePadding="11dp"
+ style="@style/style_common_text"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:layout_marginStart="12dp"
- android:drawableStart="@mipmap/icon_position"/>
+ android:layout_marginTop="3dp"
+ android:drawableStart="@mipmap/icon_position"
+ android:drawablePadding="11dp"
+ android:hint="@string/选择领取点"
+ android:paddingTop="14dp"
+ android:paddingBottom="14dp"
+ android:singleLine="true"
+ android:textStyle="bold"
+ app:layout_constraintTop_toTopOf="parent" />
+
<View
android:layout_width="match_parent"
android:layout_height="1px"
+ android:layout_marginStart="34dp"
android:background="@color/dividing_line_color"
- app:layout_constraintTop_toBottomOf="@id/tv_start"
- android:layout_marginStart="34dp"/>
+ app:layout_constraintTop_toBottomOf="@id/tv_start" />
+
<TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- app:layout_constraintTop_toBottomOf="@id/tv_start"
- android:hint="@string/完善收货人信息"
- style="@style/style_common_text"
- android:textStyle="bold"
- android:paddingTop="14dp"
- android:layout_marginStart="12dp"
- android:paddingBottom="14dp"
- android:layout_marginTop="3dp"
android:id="@+id/tv_receiver"
- android:maxLines="3"
- android:ellipsize="end"
- android:drawablePadding="11dp"
- android:lineSpacingExtra="6dp"
- android:drawableStart="@mipmap/icon_receiver"/>
- <View
- android:layout_width="match_parent"
- android:layout_height="1px"
- android:background="@color/dividing_line_color"
- app:layout_constraintTop_toBottomOf="@id/tv_receiver"
- android:layout_marginStart="34dp"/>
- <EditText
+ style="@style/style_common_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:layout_constraintTop_toBottomOf="@id/tv_receiver"
- android:hint="@string/选填物品信息和数量"
- style="@style/style_common_text"
- android:textStyle="bold"
- android:paddingTop="14dp"
android:layout_marginStart="12dp"
- android:singleLine="true"
- android:paddingBottom="14dp"
android:layout_marginTop="3dp"
- android:id="@+id/tv_type"
- android:background="@null"
+ android:drawableStart="@mipmap/icon_receiver"
android:drawablePadding="11dp"
- android:drawableStart="@mipmap/icon_types"/>
+ android:ellipsize="end"
+ android:hint="@string/完善收货人信息"
+ android:lineSpacingExtra="6dp"
+ android:maxLines="3"
+ android:paddingTop="14dp"
+ android:paddingBottom="14dp"
+ android:textStyle="bold"
+ app:layout_constraintTop_toBottomOf="@id/tv_start" />
+
<View
android:layout_width="match_parent"
android:layout_height="1px"
+ android:layout_marginStart="34dp"
android:background="@color/dividing_line_color"
- app:layout_constraintTop_toBottomOf="@id/tv_type"
- android:layout_marginStart="34dp"/>
- <TextView
+ app:layout_constraintTop_toBottomOf="@id/tv_receiver" />
+
+ <EditText
+ android:id="@+id/tv_type"
+ style="@style/style_common_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:layout_constraintTop_toBottomOf="@id/tv_type"
- android:hint="请选择司机取货时间"
+ android:layout_marginStart="12dp"
+ android:layout_marginTop="3dp"
+ android:background="@null"
+ android:drawableStart="@mipmap/icon_types"
+ android:drawablePadding="11dp"
+ android:hint="@string/选填物品信息和数量"
+ android:paddingTop="14dp"
+ android:paddingBottom="14dp"
+ android:singleLine="true"
+ android:textStyle="bold"
+ app:layout_constraintTop_toBottomOf="@id/tv_receiver" />
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1px"
+ android:layout_marginStart="34dp"
+ android:background="@color/dividing_line_color"
+ app:layout_constraintTop_toBottomOf="@id/tv_type" />
+
+ <TextView
+ android:id="@+id/tv_time"
style="@style/style_common_text"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="12dp"
+ android:layout_marginTop="3dp"
+ android:drawableStart="@mipmap/logistics_time"
+ android:drawablePadding="11dp"
+ android:hint="请选择司机取货时间"
+ android:paddingTop="14dp"
+ android:paddingBottom="14dp"
android:textStyle="bold"
android:visibility="gone"
- android:paddingTop="14dp"
- android:layout_marginStart="12dp"
- android:paddingBottom="14dp"
- android:layout_marginTop="3dp"
- android:id="@+id/tv_time"
- android:drawablePadding="11dp"
- android:drawableStart="@mipmap/logistics_time"/>
+ app:layout_constraintTop_toBottomOf="@id/tv_type" />
+
<View
android:layout_width="match_parent"
android:layout_height="1px"
+ android:layout_marginStart="34dp"
android:background="@color/dividing_line_color"
- app:layout_constraintTop_toBottomOf="@id/tv_time"
- android:layout_marginStart="34dp"/>
+ app:layout_constraintTop_toBottomOf="@id/tv_time" />
+
<TextView
+ android:id="@+id/tv_tips"
+ style="@style/style_common_text"
android:layout_width="200dp"
android:layout_height="wrap_content"
- app:layout_constraintTop_toBottomOf="@id/tv_time"
- android:hint="选择加急费用"
- style="@style/style_common_text"
- app:layout_constraintEnd_toEndOf="parent"
- android:textStyle="bold"
- android:paddingTop="14dp"
- android:layout_marginEnd="12dp"
- android:paddingBottom="14dp"
android:layout_marginTop="3dp"
- android:id="@+id/tv_tips"
+ android:layout_marginEnd="12dp"
+ android:drawableEnd="@mipmap/icon_more_grey"
android:drawablePadding="11dp"
android:gravity="end"
- android:drawableEnd="@mipmap/icon_more_grey"/>
+ android:hint="选择加急费用"
+ android:paddingTop="14dp"
+ android:paddingBottom="14dp"
+ android:textStyle="bold"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/tv_time" />
+
<View
android:layout_width="match_parent"
android:layout_height="1px"
+ android:layout_marginStart="34dp"
android:background="@color/dividing_line_color"
- app:layout_constraintTop_toBottomOf="@id/tv_time"
- android:layout_marginStart="34dp"/>
+ app:layout_constraintTop_toBottomOf="@id/tv_time" />
+
<ImageView
+ android:id="@+id/iv_start"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/icon_expedited"
- android:id="@+id/iv_start"
- app:layout_constraintTop_toTopOf="@id/tv_tips"
app:layout_constraintBottom_toBottomOf="@id/tv_tips"
- app:layout_constraintStart_toStartOf="@id/tv_time"/>
+ app:layout_constraintStart_toStartOf="@id/tv_time"
+ app:layout_constraintTop_toTopOf="@id/tv_tips" />
+
<CheckBox
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- app:layout_constraintBaseline_toBaselineOf="@id/tv_tips"
- app:layout_constraintStart_toEndOf="@id/iv_start"
- android:layout_marginStart="5dp"
- android:text="加急"
android:id="@+id/cb_fast"
style="@style/style_common_text"
- android:textStyle="bold"
- android:paddingStart="9dp"
- android:button="@drawable/selector_radio"/>
- <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:id="@+id/tv_price"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toBottomOf="@id/tv_tips"
- android:textSize="18sp"
- android:visibility="gone"
+ android:layout_marginStart="5dp"
+ android:button="@drawable/selector_radio"
+ android:paddingStart="9dp"
+ android:text="加急"
android:textStyle="bold"
+ app:layout_constraintBaseline_toBaselineOf="@id/tv_tips"
+ app:layout_constraintStart_toEndOf="@id/iv_start" />
+
+ <TextView
+ android:id="@+id/tv_price"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:layout_marginTop="16dp"
- android:textColor="@color/colorPrimary"/>
+ android:textColor="@color/colorPrimary"
+ android:textSize="18sp"
+ android:textStyle="bold"
+ android:visibility="gone"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/tv_tips" />
+
<View
android:id="@+id/line_fast"
android:layout_width="match_parent"
android:layout_height="1px"
+ android:layout_marginStart="34dp"
android:background="@color/dividing_line_color"
- app:layout_constraintTop_toBottomOf="@id/tv_tips"
- android:layout_marginStart="34dp"/>
+ app:layout_constraintTop_toBottomOf="@id/tv_tips" />
+
<TextView
+ android:id="@+id/tv_remark"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toBottomOf="@id/tv_price"
- android:textSize="11sp"
- android:textColor="@color/textColor66"
android:layout_marginTop="1dp"
- android:id="@+id/tv_remark"
+ android:text="禁止托运违禁、危险物品！"
+ android:textColor="@color/textColor66"
+ android:textSize="11sp"
android:visibility="gone"
- android:text="禁止托运违禁、危险物品！"/>
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/tv_price" />
<androidx.constraintlayout.widget.Group
+ android:id="@+id/group_fast"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:id="@+id/group_fast"
android:visibility="gone"
- app:constraint_referenced_ids="iv_start,cb_fast,tv_tips,line_fast"/>
+ app:constraint_referenced_ids="iv_start,cb_fast,tv_tips,line_fast" />
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1px"
+ android:layout_marginStart="34dp"
+ android:background="@color/dividing_line_color"
+ app:layout_constraintTop_toBottomOf="@id/tv_remark" />
+
+ <LinearLayout
+ android:id="@+id/ll_estimate_price"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:orientation="vertical"
+ android:paddingVertical="8dp"
+ android:visibility="gone"
+ app:layout_constraintTop_toBottomOf="@id/tv_remark"
+ tools:visibility="visible">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="预估金额"
+ android:textColor="@color/black"
+ android:textSize="12sp" />
+
+ <TextView
+ android:id="@+id/tv_estimate_price"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="3dp"
+ android:textColor="@color/color_ea8a58"
+ android:textSize="14sp"
+ android:textStyle="bold"
+ tools:text="FCFA 52.85" />
+ </LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
+
<ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
android:id="@+id/iv_location"
- android:src="@mipmap/icon_reset"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintBottom_toTopOf="@id/tv_action"
- android:layout_marginEnd="10dp"
- android:layout_marginBottom="12dp"/>
- <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginEnd="10dp"
+ android:layout_marginBottom="60dp"
+ android:src="@mipmap/icon_reset"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent" />
+
+ <TextView
android:id="@+id/tv_center"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintBottom_toTopOf="@id/iv_center_logistics"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:background="@drawable/bg_white_14dp"
android:elevation="2dp"
+ android:paddingStart="10dp"
+ android:paddingTop="5dp"
+ android:paddingEnd="10dp"
+ android:paddingBottom="5dp"
+ android:text="@string/在这里领取"
android:textColor="@color/textColor"
android:textStyle="bold"
- android:paddingTop="5dp"
- android:paddingBottom="5dp"
- android:paddingStart="10dp"
- android:paddingEnd="10dp"
- android:text="@string/在这里领取"/>
+ app:layout_constraintBottom_toTopOf="@id/iv_center_logistics"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/cl_types"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:id="@+id/cl_types"
+ android:background="@color/white"
android:visibility="gone"
- app:layout_constraintTop_toBottomOf="@id/cl_bottom_logistics"
- android:background="@color/white">
+ app:layout_constraintTop_toBottomOf="@id/cl_bottom_logistics">
+
<HorizontalScrollView
- app:layout_constraintTop_toTopOf="parent"
- android:layout_width="match_parent"
- android:scrollbars="none"
android:id="@+id/sc_type"
- android:layout_height="wrap_content">
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:scrollbars="none"
+ app:layout_constraintTop_toTopOf="parent">
+
<LinearLayout
+ android:id="@+id/ll_type"
android:layout_width="wrap_content"
android:layout_height="131dp"
- android:orientation="horizontal"
- android:id="@+id/ll_type"/>
+ android:orientation="horizontal" />
</HorizontalScrollView>
<TextView
+ android:id="@+id/tv_empty"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintBottom_toBottomOf="@id/sc_type"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
android:text="@string/暂无可选类型"
android:visibility="gone"
- android:id="@+id/tv_empty"/>
+ app:layout_constraintBottom_toBottomOf="@id/sc_type"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
<TextView
+ android:id="@+id/tv_error"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="16dp"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
android:text="@string/获取车辆类型失败"
android:visibility="gone"
- android:id="@+id/tv_error"/>
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
<TextView
+ android:id="@+id/tv_retry"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:id="@+id/tv_retry"
- android:text="@string/重新获取"
- android:background="@drawable/bg_white_4dp_line"
- app:layout_constraintTop_toBottomOf="@id/tv_error"
android:layout_marginTop="8dp"
+ android:background="@drawable/bg_white_4dp_line"
+ android:padding="8dp"
+ android:text="@string/重新获取"
android:textSize="12sp"
android:visibility="gone"
- app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- android:padding="8dp"/>
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/tv_error" />
</androidx.constraintlayout.widget.ConstraintLayout>
-
<TextView
+ android:id="@+id/tv_action"
+ style="@style/style_tv_action"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="@style/style_tv_action"
- app:layout_constraintBottom_toBottomOf="parent"
- android:layout_marginBottom="14dp"
+ android:layout_marginVertical="10dp"
android:text="@string/立即下单"
android:visibility="gone"
- android:id="@+id/tv_action"/>
+ app:layout_constraintTop_toBottomOf="@id/cl_bottom_logistics" />
<ImageView
android:id="@+id/iv_center_logistics"
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index cd0cc5f..8294d23 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -1211,7 +1211,7 @@
<string name="银行卡支付">Bank Card</string>
- <string name="现金支付">Cash</string>
+ <string name="现金支付">OfflinePayment</string>
<string name="等待费">Waiting Time Fee(%1$d Minutes)</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 1151803..e9eabad 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1180,7 +1180,7 @@
<string name="银行卡支付">Carte bancaire</string>
- <string name="现金支付">Paiement en espèces</string>
+ <string name="现金支付">Paiement hors ligne</string>
<string name="等待费">Frais d’attente (%1$d minutes)</string>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 7308fdd..91343d7 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -21,4 +21,5 @@
<color name="color_5DB03D">#5DB03D</color>
<color name="quantum_yellow900">#f57f17</color>
<color name="quantum_googgreen500">#0f9d58</color>
+ <color name="color_ea8a58">#EA8A58</color>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 02bbb44..ae9592d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -630,7 +630,7 @@
<string name="可用优惠券数量">%1$d张可用</string>
<string name="手机支付">手机支付</string>
<string name="银行卡支付">银行卡支付</string>
- <string name="现金支付">现金支付</string>
+ <string name="现金支付">线下支付</string>
<string-array name="week_string_array">
--
Gitblit v1.7.1