优惠券优化

18034727885

2026-07-17 ebff085ad82a37ce4d3fdf61e67bf47b30285443

优惠券优化

 app/src/main/java/com/igo/user/network/HttpManager.kt

@@ -259,7 +259,9 @@
    fun addTaxiOrder(endAddress: String,endLat: Double,endLon:Double, orderSource:Int,orderType :Int,placementLat :Double,
                     placementLon:Double,startAddress :String,startLat:Double, startLon :Double,substitute :Int,tipMoney:Int,
                     travelTime:String,driverId:Int?, passengers:String?,passengersPhone:String?,serverCarModelId: Int? = 0,type: Int = 1,
                     businessType: Int = Const.OrderType.TYPE_TAXI): Flowable<ResultData<JsonObject>> {
                     businessType: Int = Const.OrderType.TYPE_TAXI,
                     useCoupon: Boolean = false
    ): Flowable<ResultData<JsonObject>> {
        val map = HashMap<String, Any>()
        map["endAddress"] = endAddress
        map["endLat"] = endLat
@@ -275,6 +277,7 @@
        map["tipMoney"] = tipMoney
        map["type"] = type
        map["travelTime"] = travelTime
        map["isUseCoupon"] = useCoupon
        if (businessType == Const.OrderType.TYPE_SPECIAL&&serverCarModelId!=null) //专车要选车型
            map["serverCarModelId"] = serverCarModelId
        if (driverId!=null)

 app/src/main/java/com/igo/user/ui/trip/MapTripFragment.kt

@@ -12,6 +12,7 @@
import android.net.Uri
import android.util.Log
import android.view.View
import android.widget.CheckBox
import android.widget.CheckedTextView
import android.widget.ImageView
import android.widget.LinearLayout
@@ -152,7 +153,9 @@
    private val tv_retry by lazy { find<TextView>(R.id.tv_retry) }
    private val tv_tips by lazy { find<TextView>(R.id.tv_tips) }
    private val tv_action_special by lazy { find<TextView>(R.id.tv_action_special) }
    private val cb_use_coupon_special by lazy { find<CheckBox>(R.id.cb_use_coupon_special) }
    private val tv_action_taxi by lazy { find<TextView>(R.id.tv_action_taxi) }
    private val cb_use_coupon_taxi by lazy { find<CheckBox>(R.id.cb_use_coupon_taxi) }
    private val tv_set_emergency by lazy { find<TextView>(R.id.tv_set_emergency) }
    private val tab_confirm by lazy { find<CommonTabLayout>(R.id.tab_confirm) }
    private val tv_msg by lazy { find<TextView>(R.id.tv_msg) }
@@ -403,7 +406,8 @@
                null,
                if (substitute == 0) null else name,
                if (substitute == 0) null else phone,
                carTypeId, 1, type
                carTypeId, 1, type,
                (if (type == Const.OrderType.TYPE_TAXI) cb_use_coupon_taxi else cb_use_coupon_special).isChecked
            ).requestByF(this, success = { _, data ->
                data?.run {
                    tv_action_taxi.isClickable = true
@@ -994,7 +998,7 @@
                    if (chooseindex == 2) {
                        tv_passenger_special.visible()
                    } else {
                        tv_passenger_special.invisible()
                        tv_passenger_special.gone()
                    }
                    callback?.invoke(false)
                    getCarType()

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

@@ -1,70 +1,72 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:id="@+id/cl_special"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:background="@drawable/bg_fd_6dp"
    tools:visibility="visible"
    android:visibility="gone">
    android:visibility="gone"
    tools:visibility="visible">

    <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" />

    <View
        android:layout_width="match_parent"
        android:layout_height="1px"
        android:layout_marginStart="14dp"
        android:layout_marginEnd="14dp"
        android:layout_marginBottom="2dp"
        android:background="@color/dividing_line_color"
        app:layout_constraintBottom_toBottomOf="@id/sc_type"
        android:layout_marginBottom="2dp"/>
        app:layout_constraintBottom_toBottomOf="@id/sc_type" />


    <TextView
@@ -82,46 +84,62 @@
        app:layout_constraintBaseline_toBaselineOf="@id/tv_passenger_special"
        app:layout_constraintEnd_toStartOf="@id/vertical_1_special"
        app:layout_constraintStart_toStartOf="parent" />

    <View
        android:id="@+id/vertical_1_special"
        android:layout_width="1dp"
        android:layout_height="20dp"
        android:visibility="gone"
        app:layout_constraintTop_toTopOf="@id/tv_passenger_special"
        app:layout_constraintBottom_toBottomOf="@id/tv_passenger_special"
        android:background="@color/dividing_line_color"
        android:visibility="gone"
        app:layout_constraintBottom_toBottomOf="@id/tv_passenger_special"
        app:layout_constraintEnd_toStartOf="@id/tv_passenger_special"
        app:layout_constraintStart_toEndOf="@id/tv_time_special"/>
        app:layout_constraintStart_toEndOf="@id/tv_time_special"
        app:layout_constraintTop_toTopOf="@id/tv_passenger_special" />

    <TextView
        android:id="@+id/tv_passenger_special"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginTop="10dp"
        android:visibility="invisible"
        android:drawableEnd="@mipmap/icon_more_black"
        android:drawablePadding="3dp"
        android:paddingTop="14dp"
        app:layout_constraintTop_toBottomOf="@id/sc_type"
        android:paddingBottom="14dp"
        android:text="@string/选乘车人"
        android:textColor="@color/textColor"
        android:textSize="12sp"
        android:visibility="invisible"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toEndOf="@id/vertical_1_special" />
        app:layout_constraintStart_toEndOf="@id/vertical_1_special"
        app:layout_constraintTop_toBottomOf="@id/sc_type"
        tools:visibility="gone" />

    <CheckBox
        android:id="@+id/cb_use_coupon_special"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:button="@drawable/selector_radio"
        android:checked="true"
        app:layout_goneMarginTop="12dp"
        android:gravity="center_vertical"
        android:text="@string/使用优惠券抵扣"
        android:textColor="@color/textColor"
        android:textSize="12sp"
        app:layout_constraintStart_toStartOf="@id/tv_action_special"
        app:layout_constraintTop_toBottomOf="@id/tv_passenger_special" />

    <TextView
        android:id="@+id/tv_action_special"
        style="@style/style_tv_action"
        android:layout_width="match_parent"
        android:layout_marginTop="12dp"
        android:layout_height="wrap_content"
        android:layout_marginStart="40dp"
        android:layout_marginTop="12dp"
        android:layout_marginEnd="40dp"
        android:layout_marginBottom="14dp"
        android:text="@string/呼叫司机"
        android:layout_marginStart="40dp"
        android:layout_marginEnd="40dp"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintTop_toBottomOf="@id/tv_time_special"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"/>
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@id/cb_use_coupon_special" />
</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,10 +1,13 @@
<?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:id="@+id/cl_taxi"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:id="@+id/cl_taxi"
    android:visibility="gone"
    xmlns:app="http://schemas.android.com/apk/res-auto">
    tools:visibility="visible">

    <com.igo.user.views.CommonTabLayout
        android:id="@+id/tab_confirm"
        android:layout_width="match_parent"
@@ -17,11 +20,13 @@
        app:tl_textBold="SELECT"
        app:tl_textSelectColor="@color/black"
        app:tl_textUnselectColor="@color/textColor99" />

    <View
        android:layout_width="match_parent"
        android:layout_height="1px"
        android:background="@color/dividing_line_color"
        app:layout_constraintTop_toBottomOf="@id/tab_confirm" />

    <TextView
        android:id="@+id/tv_title"
        android:layout_width="wrap_content"
@@ -49,22 +54,24 @@
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@id/tv_title" />

    <TextView
        android:id="@+id/tv_set_emergency"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:id="@+id/tv_set_emergency"
        android:visibility="gone"
        android:text="紧急联系人"
        app:layout_constraintEnd_toEndOf="parent"
        android:layout_marginEnd="10dp"
        app:layout_constraintTop_toTopOf="@id/tv_title"
        app:layout_constraintBottom_toBottomOf="@id/tv_way"
        android:drawableEnd="@mipmap/icon_more_grey"
        android:drawablePadding="5dp"
        android:textSize="12sp"
        android:textColor="@color/textColor"
        android:paddingTop="5dp"
        android:paddingBottom="5dp"/>
        android:paddingBottom="5dp"
        android:text="紧急联系人"
        android:textColor="@color/textColor"
        android:textSize="12sp"
        android:visibility="gone"
        app:layout_constraintBottom_toBottomOf="@id/tv_way"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintTop_toTopOf="@id/tv_title" />

    <View
        android:id="@+id/line1"
        android:layout_width="match_parent"
@@ -80,8 +87,8 @@
        android:layout_width="1dp"
        android:layout_height="20dp"
        android:layout_marginTop="12dp"
        android:visibility="gone"
        android:background="@color/dividing_line_color"
        android:visibility="gone"
        app:layout_constraintEnd_toStartOf="@id/vertical_2"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@id/line1" />
@@ -104,10 +111,10 @@
        android:drawablePadding="3dp"
        android:paddingTop="14dp"
        android:paddingBottom="14dp"
        android:visibility="gone"
        android:text="预约时间"
        android:textColor="@color/textColor"
        android:textSize="12sp"
        android:visibility="gone"
        app:layout_constraintBaseline_toBaselineOf="@id/tv_passenger"
        app:layout_constraintEnd_toStartOf="@id/vertical_1"
        app:layout_constraintStart_toStartOf="parent" />
@@ -139,83 +146,96 @@
        android:text="小费"
        android:textColor="@color/textColor"
        android:textSize="12sp"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintBaseline_toBaselineOf="@id/tv_passenger"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toEndOf="@id/vertical_2" />

    <View
        android:id="@+id/line"
        android:layout_width="match_parent"
        android:layout_height="1px"
        android:layout_marginStart="14dp"
        android:layout_marginEnd="14dp"
        android:background="@color/dividing_line_color"
        android:id="@+id/line"
        app:layout_constraintTop_toBottomOf="@id/tv_passenger" />

    <TextView
        android:id="@+id/tv_money"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:id="@+id/tv_money"
        app:layout_constraintTop_toBottomOf="@id/tv_passenger"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        android:layout_marginTop="12dp"
        android:text="预估费用：¥0.00元"
        android:textColor="@color/textColor"
        android:textSize="12sp"
        android:visibility="gone"
        android:textColor="@color/textColor"
        android:text="预估费用：¥0.00元"/>
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@id/tv_passenger"
        tools:visibility="visible" />

    <LinearLayout
        android:id="@+id/ll_money"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:id="@+id/ll_money"
        android:layout_marginStart="14dp"
        android:layout_marginTop="12dp"
        android:layout_marginEnd="14dp"
        android:visibility="gone"
        app:layout_constraintTop_toBottomOf="@id/tv_passenger"
        android:layout_marginTop="12dp"
        android:layout_marginStart="14dp"
        android:layout_marginEnd="14dp">
        tools:visibility="visible">

        <TextView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:textSize="12sp"
            android:text="预估费用"
            android:textColor="@color/textColor"
            android:text="预估费用" />
            android:textSize="12sp" />

        <TextView
            android:id="@+id/tv_money_now"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:id="@+id/tv_money_now"
            android:gravity="end"
            android:text="￥0.0元"
            android:textSize="12sp"
            android:textStyle="bold"
            android:text="￥0.0元"/>
            android:textStyle="bold" />
    </LinearLayout>

    <androidx.constraintlayout.widget.Barrier
        android:id="@+id/barrier"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:id="@+id/barrier"
        android:visibility="gone"
        app:barrierDirection="bottom"
        app:constraint_referenced_ids="ll_money,tv_money"
        app:barrierDirection="bottom"/>
    <View
        android:layout_width="match_parent"
        android:layout_height="1px"
        android:layout_marginStart="14dp"
        tools:visibility="visible" />

    <CheckBox
        android:id="@+id/cb_use_coupon_taxi"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginTop="12dp"
        android:visibility="gone"
        android:layout_marginEnd="14dp"
        android:background="@color/dividing_line_color"
        android:button="@drawable/selector_radio"
        android:checked="true"
        android:gravity="center_vertical"
        android:text="@string/使用优惠券抵扣"
        android:textColor="@color/textColor"
        android:textSize="12sp"
        app:layout_constraintStart_toStartOf="@id/tv_action_taxi"
        app:layout_constraintTop_toBottomOf="@id/barrier" />

    <TextView
        android:id="@+id/tv_action_taxi"
        style="@style/style_tv_action"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginTop="28dp"
        android:layout_marginStart="40dp"
        android:layout_marginTop="12dp"
        android:layout_marginEnd="40dp"
        android:layout_marginBottom="14dp"
        android:text="呼叫出租车"
        android:layout_marginStart="40dp"
        android:layout_marginEnd="40dp"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@id/barrier" />
        app:layout_constraintTop_toBottomOf="@id/cb_use_coupon_taxi" />
</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -2042,5 +2042,6 @@
    <string name="取件码">Pickup Code: </string>
    <string name="取货图片">Pickup Photos</string>
    <string name="送达图片">Delivery Images</string>
    <string name="使用优惠券抵扣">use coupons for deduction</string>

</resources>

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

@@ -2014,5 +2014,6 @@
    <string name="取件码">Prendre le Code pièce: </string>
    <string name="取货图片">Images de ramassage</string>
    <string name="送达图片">Livraison d\'images</string>
    <string name="使用优惠券抵扣">Utiliser un bon de réduction pour déduire</string>

</resources>

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

@@ -1069,5 +1069,6 @@
    <string name="取件码">取件码：</string>
    <string name="取货图片">取货图片</string>
    <string name="送达图片">送达图片</string>
    <string name="使用优惠券抵扣">使用优惠券抵扣</string>

</resources>