app/build.gradle
@@ -29,8 +29,8 @@ applicationId "com.driver.goposttrip" minSdkVersion 23 targetSdkVersion 35 versionCode 52 versionName "1.7.3" versionCode 53 versionName "1.7.4" multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -186,7 +186,7 @@ private String remark; private String peopleNumber = "-1"; private String seatNumber; public Double payMoney; public String payMoney; private String cargoType; //1:普通 2：贵重 @SerializedName("priceDifference") private String differenceMoney; @@ -648,8 +648,9 @@ * 获取快件总支付金额 */ public double getExpressPayAllMoney() { double value = payMoney == null ? 0 : payMoney; double value = 0; try { value += Double.parseDouble(payMoney); return value + Double.parseDouble(differenceMoney); } catch (Exception e) { e.printStackTrace(); app/src/main/java/com/driver/igotrip/netUtls/HttpManager.java
@@ -26,15 +26,11 @@ import io.reactivex.Observer; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; import okhttp3.Interceptor; import okhttp3.MediaType; import okhttp3.MultipartBody; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.RequestBody; import okhttp3.Response; import okhttp3.ResponseBody; import okhttp3.logging.HttpLoggingInterceptor; import okio.Buffer; import retrofit2.Retrofit; import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory; @@ -119,18 +115,6 @@ // return chain.proceed(request); // } // }); builder.addInterceptor(new Interceptor() { @Override public Response intercept(Chain chain) throws IOException { Request request = chain.request(); Response proceed = chain.proceed(request); return proceed; } }); HttpLoggingInterceptor httpLoggingInterceptor = new HttpLoggingInterceptor(); httpLoggingInterceptor.level(HttpLoggingInterceptor.Level.BODY); builder.addInterceptor(httpLoggingInterceptor); if (BuildConfig.DEBUG) { builder.addInterceptor(new LoggingInterceptor()); app/src/main/java/com/driver/igotrip/netUtls/MyNoMsgObserver.java
@@ -76,7 +76,6 @@ dismissDialog(); try { String responseString = responseBody.string(); LogUtils.e("responseString", "**" + responseString); if (StringUtils.isEmpty(responseString)) { //判空 int code = -1; String msg = getShowErrorMsg(Error.PARSER_ERROR); @@ -112,8 +111,6 @@ if (xldUtils.DEBUG) { e.printStackTrace(); } Utils.systemErr(e); Log.e("responseString", "responseString get " + e.toString()); int code = -1; String msg = getShowErrorMsg(Error.REQUEST_ERROR); if (e instanceof JsonSyntaxException || app/src/main/java/com/driver/igotrip/netUtls/MyObserver.java
@@ -77,7 +77,6 @@ dismissDialog(); try { String responseString = responseBody.string(); LogUtils.e("responseString", "**" + responseString); if (StringUtils.isEmpty(responseString)) { //判空 int code = -1; String msg = getShowErrorMsg(Error.PARSER_ERROR); @@ -113,8 +112,6 @@ if (xldUtils.DEBUG) { e.printStackTrace(); } Utils.systemErr(e); Log.e("responseString", "responseString get " + e.toString()); int code = -1; String msg = getShowErrorMsg(Error.REQUEST_ERROR); if (e instanceof JsonSyntaxException || app/src/main/java/com/driver/igotrip/ui/main/OrderOverActivity.kt
@@ -63,6 +63,8 @@ private val remark by lazy { find<TextView>(R.id.remark) } private val ll_order_money by lazy { find<LinearLayout>(R.id.ll_order_money) } private val tv_order_money by lazy { find<TextView>(R.id.tv_order_money) } private val ll_income_price by lazy { find<LinearLayout>(R.id.ll_income_price) } private val tv_income_price by lazy { find<TextView>(R.id.tv_income_price) } private val ll_service_money by lazy { find<LinearLayout>(R.id.ll_service_money) } private val tv_service_money by lazy { find<TextView>(R.id.tv_service_money) } private val ll_real_income by lazy { find<LinearLayout>(R.id.ll_real_income) } @@ -114,30 +116,26 @@ tv_time.text = it.travelTime_ tv_start_address.text = it.startAddress tv_end_address.text = it.endAddress tv_red_money.text = getString(R.string.元红包, it.tipMoney.toString().extClearInvalidZero()) tv_red_money.text = getString(R.string.元红包, it.tipMoney.toString().extClearInvalidZero()) remark.text = it.remark remark.gone() if (orderType == "1") { tv_red_money.gone() } tv_order_money.text = getString(R.string.money) + " " + it.orderMoney.toString().extClearInvalidZero() tv_service_money.text = getString(R.string.money) + " " + it.platformServerMoney.extClearInvalidZero() tv_coupon_price.text = "-" + getString(R.string.money) + " " + it.couponMoney.extClearInvalidZero() tv_order_money.text = getString(R.string.money) + " " + it.orderMoney.toString().extClearInvalidZero() tv_income_price.text = getString(R.string.money) + " " + it.payMoney.extClearInvalidZero() tv_service_money.text = getString(R.string.money) + " " + it.platformServerMoney.extClearInvalidZero() tv_coupon_price.text = "-" + getString(R.string.money) + " " + it.couponMoney.extClearInvalidZero() ll_coupon_price.isVisible = (it.couponMoney?.toDoubleOrNull() ?: 0.0) > 0 tv_real_income.text = getString(R.string.money) + " " + it.driverServerMoney.extClearInvalidZero() ll_income_price.isVisible = (it.payMoney?.toDoubleOrNull() ?: 0.0) > 0 tv_real_income.text = getString(R.string.money) + " " + it.driverServerMoney.extClearInvalidZero() when (orderBean.orderState) { 10, 12 -> { ll_order_cancel.visible() setTitleText(getString(if (orderBean.orderState == 10) R.string.已取消 else R.string.取消待支付)) iv_phone.gone() tv_cancel_to.text = it.cancelUser tv_cancel_money.text = (getString(R.string.money) + " " + doubleOne(it.cancelPayMoney)).extClearInvalidZero() tv_cancel_money.text = (getString(R.string.money) + " " + doubleOne(it.cancelPayMoney)).extClearInvalidZero() tv_cancel_result.text = it.cancelReason tv_cancel_s.text = it.cancelRemark if (it.cancelRemark.isNullOrEmpty()) { @@ -189,15 +187,13 @@ } }) dialog.show(supportFragmentManager, "card") } else payOrder(paytype) } else payOrder(paytype) } } if (it.isFrozen == 2) { tv_frozen.visible() tv_frozen.setCompoundDrawablesRelativeWithIntrinsicBounds( 0, UiUtil.getFrozenBitmap(), 0, 0 0, UiUtil.getFrozenBitmap(), 0, 0 ) } } @@ -211,8 +207,7 @@ map["orderId"] = orderId map["orderType"] = orderType map["payType"] = paytype if (paytype == 2 && bank != null) map["bankCardId"] = bank if (paytype == 2 && bank != null) map["bankCardId"] = bank callNet(Api.payOrder, map) { when (paytype) { 3 -> { //现金支付成功 @@ -267,10 +262,7 @@ * 提示乘客现金支付 */ override fun showDriverPayDialog( audioUrl: String, orderId: String, orderType: String, money: Double audioUrl: String, orderId: String, orderType: String, money: Double ) { getTTsManager().setVideoText(audioUrl) if (orderId == this.orderId && orderType == this.orderType) { @@ -285,8 +277,7 @@ dialog.setCancelable(false) val view = DialogUtil.getView(dialog) view.find<TextView>(R.id.tv_price).text = getString(R.string.确认现金金额).format(if (money == 0.0) orderBean.orderMoney else money) .replace(",", ".").extClearInvalidZero() getString(R.string.确认现金金额).format(if (money == 0.0) orderBean.orderMoney else money).replace(",", ".").extClearInvalidZero() view.find<TextView>(R.id.tv_close_base).setOnClickListener { dialog.dismiss() } view.find<TextView>(R.id.tv_sure_base).setOnClickListener { dialog.dismiss() } } @@ -315,11 +306,9 @@ map["orderId"] = orderId map["orderType"] = orderType callNet(false, Api.orderStateSocket, map) { val orderSimpleData = Gson().fromJson( it, OrderSimpleData::class.java ) val orderSimpleData = Gson().fromJson( it, OrderSimpleData::class.java ) orderSimpleData?.let { if (orderSimpleData.status == 8) { orderBean.orderState = 8 @@ -346,12 +335,10 @@ setTitleText(if (orderBean.orderState == 8) R.string.待评价 else R.string.已完成) } tv_pay_result_money.text = getString(R.string.money) + " " + (if (it.payMoney == 0.0) it.orderMoney.toString() else it.payMoney.toString()).extClearInvalidZero() getString(R.string.money) + " " + (if (it.payMoney.isNullOrEmpty()) it.orderMoney.toString() else it.payMoney.toString()).extClearInvalidZero() when (orderType) { "2" -> { tv_pay_result_small_money.text = getString(R.string.其中含红包费用) + " " + it.tipMoney.toString() .extClearInvalidZero() tv_pay_result_small_money.text = getString(R.string.其中含红包费用) + " " + it.tipMoney.toString().extClearInvalidZero() } "1" -> { @@ -359,8 +346,7 @@ view_line_money_detail.visible() tv_pay_result_small_money.clickDelay { startActivity<MajorMoneyDetailActivity>( "orderId" to orderId, "orderType" to orderType "orderId" to orderId, "orderType" to orderType ) } } app/src/main/java/com/driver/igotrip/ui/main/major/MajorMoneyDetailActivity.kt
@@ -30,6 +30,7 @@ private val tv_mileage_money by lazy { find<TextView>(R.id.tv_mileage_money) } private val tv_time_name by lazy { find<TextView>(R.id.tv_time_name) } private val tv_time_money by lazy { find<TextView>(R.id.tv_time_money) } private val tv_difference_price by lazy { find<TextView>(R.id.tv_difference_price) } private val tv_coupon_price by lazy { find<TextView>(R.id.tv_coupon_price) } private val tv_long_distance_name by lazy { find<TextView>(R.id.tv_long_distance_name) } private val tv_long_distance_money by lazy { find<TextView>(R.id.tv_long_distance_money) } @@ -40,6 +41,7 @@ private val rl_wait_name by lazy { find<View>(R.id.rl_wait_name) } private val rl_mileage_money by lazy { find<View>(R.id.rl_mileage_money) } private val rl_time_money by lazy { find<View>(R.id.rl_time_money) } private val rl_difference_price by lazy { find<View>(R.id.rl_difference_price) } private val rl_coupon_price by lazy { find<View>(R.id.rl_coupon_price) } private val rl_long_distance_money by lazy { find<View>(R.id.rl_long_distance_money) } private val rl_long_go_money by lazy { find<View>(R.id.rl_long_go_money) } @@ -79,16 +81,18 @@ tv_mileage_money.text = "FCFA"+" "+it.data.mileageMoney.toString().extClearInvalidZero() tv_time_name.text = getString(R.string.time_money, doubleTwo(it.data.duration)) tv_time_money.text = "FCFA"+" "+it.data.durationMoney.toString().extClearInvalidZero() tv_difference_price.text = "FCFA"+" "+it.data.priceDifference.toString().extClearInvalidZero() tv_coupon_price.text = "-FCFA"+" "+it.data.couponMoney.toString().extClearInvalidZero() tv_long_distance_name.text = getString(R.string.远途费公里, doubleTwo(it.data.longDistance)) tv_long_distance_money.text = "FCFA"+" "+it.data.longDistanceMoney.toString().extClearInvalidZero() tv_long_go_money.text = "FCFA"+" "+it.data.roadTollMoney.toString().extClearInvalidZero() et_stop_car_money.text = "FCFA"+" "+it.data.parkMoney.toString().extClearInvalidZero() tv_all_money.text = "FCFA"+" "+it.data.orderMoney.toString().extClearInvalidZero() tv_all_money.text = "FCFA"+" "+it.data.payMoney.toString().extClearInvalidZero() rl_start_num.visibility = if (it.data.startMoney == 0.0) View.GONE else View.VISIBLE rl_wait_name.visibility = if (it.data.wait == 0.0) View.GONE else View.VISIBLE rl_mileage_money.visibility = if (it.data.mileageMoney == 0.0) View.GONE else View.VISIBLE rl_time_money.visibility = if (it.data.durationMoney == 0.0) View.GONE else View.VISIBLE rl_difference_price.visibility = if (it.data.priceDifference == 0.0) View.GONE else View.VISIBLE rl_coupon_price.visibility = if (it.data.couponMoney == 0.0) View.GONE else View.VISIBLE rl_long_distance_money.visibility = if (it.data.longDistanceMoney == 0.0) View.GONE else View.VISIBLE // rl_long_go_money.visibility = if (it.data.roadTollMoney == 0.0) View.GONE else View.VISIBLE app/src/main/java/com/driver/igotrip/ui/main/small_cargo/SmallCargoActivity.kt
@@ -443,7 +443,7 @@ if (it.data.driverPay == "1") { tv_money.visible() tv_money.text = getString(R.string.确认现金金额).format(if (orderType == "4") it.data.expressPayAllMoney else if (it.data.payMoney == 0.0) it.data.orderMoney else it.data.payMoney) getString(R.string.确认现金金额).format(if (orderType == "4") it.data.expressPayAllMoney else if (it.data.payMoney.isNullOrEmpty()) it.data.orderMoney else it.data.payMoney) .replace(",", ".").extClearInvalidZero() } tv_sure_car_num.setOnClickListener { app/src/main/java/com/driver/igotrip/ui/main/small_cargo/SmallOverActivity.kt
@@ -5,11 +5,14 @@ import android.widget.LinearLayout import android.widget.TextView import androidx.core.view.isVisible import cn.sinata.xldutils.utils.* import cn.sinata.xldutils.utils.clickDelay import cn.sinata.xldutils.utils.doubleOne import cn.sinata.xldutils.utils.doubleTwo import cn.sinata.xldutils.utils.gone import cn.sinata.xldutils.utils.visible import com.driver.igotrip.R import com.driver.igotrip.base.BaseEvent import com.driver.igotrip.base.MyApplication import com.driver.igotrip.base.MyApplication.Companion.appContext import com.driver.igotrip.base.MyBaseActivity import com.driver.igotrip.bean.OrderBean import com.driver.igotrip.bean.OrderSimpleData @@ -20,7 +23,6 @@ import com.driver.igotrip.ui.UiUtil import com.driver.igotrip.ui.main.major.MajorMoneyDetailActivity import com.driver.igotrip.utils.MyUtils import com.driver.igotrip.utils.view.SlidingButton import com.google.gson.Gson import org.greenrobot.eventbus.EventBus import org.jetbrains.anko.find @@ -47,9 +49,13 @@ private val tv_remark by lazy { find<TextView>(R.id.tv_remark) } private val ll_order_money by lazy { find<LinearLayout>(R.id.ll_order_money) } private val tv_order_money by lazy { find<TextView>(R.id.tv_order_money) } private val ll_service_money by lazy { find<LinearLayout>(R.id.ll_service_money) } private val tv_coupon_price by lazy { find<TextView>(R.id.tv_coupon_price) } private val ll_coupon_price by lazy { find<LinearLayout>(R.id.ll_coupon_price) } private val tv_coupon_price by lazy { find<TextView>(R.id.tv_coupon_price) } private val ll_difference_price by lazy { find<LinearLayout>(R.id.ll_difference_price) } private val tv_difference_price by lazy { find<TextView>(R.id.tv_difference_price) } private val ll_income_price by lazy { find<LinearLayout>(R.id.ll_income_price) } private val tv_income_price by lazy { find<TextView>(R.id.tv_income_price) } private val ll_service_money by lazy { find<LinearLayout>(R.id.ll_service_money) } private val tv_service_money by lazy { find<TextView>(R.id.tv_service_money) } private val ll_real_income by lazy { find<LinearLayout>(R.id.ll_real_income) } private val tv_real_income by lazy { find<TextView>(R.id.tv_real_income) } @@ -105,16 +111,20 @@ tv_tv_num_cargo.text = cargoStrType + it.peopleNumber tv_people_cargo.text = it.nickName + "-" + it.phone tv_pay_result_money.text = "FCFA" +" "+ (if (it.payMoney == 0.0) it.orderMoney.toString() else it.payMoney.toString()).extClearInvalidZero() "FCFA" + " " + (if (it.payMoney.isNullOrEmpty()) it.orderMoney.toString() else it.payMoney.toString()).extClearInvalidZero() tv_pay_result_small_money.text = getString(R.string.其中含加急费用) +" "+ it.tipMoney.toString().extClearInvalidZero() getString(R.string.其中含加急费用) + " " + it.tipMoney.toString().extClearInvalidZero() setTitleText(getSmallStatue(it.orderState)) tv_pay_result_title.text = getString(R.string.订单) + getSmallStatue(it.orderState) tv_order_money.text = getString(R.string.money) +" "+ it.orderMoney.toString().extClearInvalidZero() tv_service_money.text = getString(R.string.money) +" "+ it.platformServerMoney.extClearInvalidZero() tv_coupon_price.text = "-" + getString(R.string.money) +" "+ it.couponMoney.extClearInvalidZero() tv_order_money.text = getString(R.string.money) + " " + it.orderMoney.toString().extClearInvalidZero() tv_service_money.text = getString(R.string.money) + " " + it.platformServerMoney.extClearInvalidZero() tv_coupon_price.text = "-" + getString(R.string.money) + " " + it.couponMoney.extClearInvalidZero() tv_difference_price.text = getString(R.string.money) + " " + it.differenceMoney.extClearInvalidZero() tv_income_price.text = getString(R.string.money) + " " + it.payMoney.extClearInvalidZero() ll_coupon_price.isVisible = (it.couponMoney?.toDoubleOrNull() ?: 0.0) > 0 tv_real_income.text = getString(R.string.money) +" "+ it.driverServerMoney.extClearInvalidZero() ll_difference_price.isVisible = (it.differenceMoney?.toDoubleOrNull() ?: 0.0) > 0 ll_income_price.isVisible = (it.payMoney?.toDoubleOrNull() ?: 0.0) > 0 tv_real_income.text = getString(R.string.money) + " " + it.driverServerMoney.extClearInvalidZero() ll_pay_result.visible() if (it.orderState in 6..7) { tv_pay_result_title.text = getString(R.string.待乘客支付) app/src/main/java/com/driver/igotrip/ui/mine/money_bag/MinePurseActivity.kt
@@ -33,7 +33,7 @@ override fun onResume() { super.onResume() tv_money.text = getString(R.string.money) + " " + getFormatTwo(CacheKey.getUserInfo().balance + CacheKey.getUserInfo().laveBusinessMoney) getString(R.string.money) + " " + getFormatTwo(CacheKey.getUserInfo().balance) awardAmount.text = getString(R.string.money) + " " + getFormatTwo(CacheKey.getUserInfo().balance) incomeAmount.text = app/src/main/res/layout/activity_major_money_detail.xml
@@ -1,40 +1,38 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" xmlns:tools="http://schemas.android.com/tools" android:orientation="vertical" android:layout_height="match_parent"> android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingBottom="20dp" android:background="@drawable/bg_white_10" android:layout_margin="10dp" android:orientation="vertical"> android:background="@drawable/bg_white_10" android:orientation="vertical" android:paddingBottom="20dp"> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:text="@string/订单金额" android:textColor="#ff333333" android:textStyle="bold" android:layout_marginTop="16dp" android:text="@string/订单收款金额" android:textColor="#ff333333" android:textSize="16sp" /> android:textStyle="bold" /> <TextView android:id="@+id/tv_all_money" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="13dp" tools:text="FCFA55.78" android:textStyle="bold" android:layout_gravity="center_horizontal" android:layout_marginTop="13dp" android:textColor="#fff07207" android:textSize="36sp" /> android:textStyle="bold" tools:text="FCFA55.78" /> <LinearLayout android:layout_width="match_parent" @@ -71,11 +69,11 @@ <RelativeLayout android:id="@+id/rl_start_num" android:layout_marginTop="20dp" android:layout_marginStart="12dp" android:layout_marginEnd="12dp" android:layout_width="match_parent" android:layout_height="wrap_content"> android:layout_height="wrap_content" android:layout_marginStart="12dp" android:layout_marginTop="20dp" android:layout_marginEnd="12dp"> <TextView android:id="@+id/tv_start_name" @@ -84,156 +82,146 @@ android:layout_centerVertical="true" android:text="@string/starting_fare" android:textColor="#ff000000" android:textSize="12sp" /> android:textSize="12sp" /> <TextView android:id="@+id/tv_start_money" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_alignParentEnd="true" tools:text="0.00元" android:layout_centerVertical="true" android:textColor="#ff333333" android:textSize="12sp" /> tools:text="0.00元" /> </RelativeLayout> <RelativeLayout android:id="@+id/rl_wait_name" android:layout_marginTop="15dp" android:layout_marginStart="12dp" android:layout_marginEnd="12dp" android:layout_width="match_parent" android:layout_height="wrap_content"> android:layout_height="wrap_content" android:layout_marginStart="12dp" android:layout_marginTop="15dp" android:layout_marginEnd="12dp"> <TextView android:id="@+id/tv_wait_name" android:layout_width="200dp" android:layout_height="wrap_content" android:layout_centerVertical="true" tools:text="@string/Waiting_minutes" android:textColor="#ff000000" android:textSize="12sp" /> tools:text="@string/Waiting_minutes" /> <TextView android:id="@+id/tv_wait_money" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_alignParentEnd="true" tools:text="0.00元" android:layout_centerVertical="true" android:textColor="#ff333333" android:textSize="12sp" /> tools:text="0.00元" /> </RelativeLayout> <RelativeLayout android:id="@+id/rl_mileage_money" android:layout_marginTop="15dp" android:layout_marginStart="12dp" android:layout_marginEnd="12dp" android:layout_width="match_parent" android:layout_height="wrap_content"> android:layout_height="wrap_content" android:layout_marginStart="12dp" android:layout_marginTop="15dp" android:layout_marginEnd="12dp"> <TextView android:id="@+id/tv_mileage_name" android:layout_width="200dp" android:layout_height="wrap_content" android:layout_centerVertical="true" tools:text="里程费（8.0）公里" android:textColor="#ff000000" android:textSize="12sp" /> tools:text="里程费（8.0）公里" /> <TextView android:id="@+id/tv_mileage_money" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_alignParentEnd="true" tools:text="0.00元" android:layout_centerVertical="true" android:textColor="#ff333333" android:textSize="12sp" /> tools:text="0.00元" /> </RelativeLayout> <RelativeLayout android:id="@+id/rl_time_money" android:layout_marginTop="15dp" android:layout_marginStart="12dp" android:layout_marginEnd="12dp" android:layout_width="match_parent" android:layout_height="wrap_content"> android:layout_height="wrap_content" android:layout_marginStart="12dp" android:layout_marginTop="15dp" android:layout_marginEnd="12dp"> <TextView android:id="@+id/tv_time_name" android:layout_width="200dp" android:layout_height="wrap_content" android:layout_centerVertical="true" tools:text="时长费（30）分钟" android:textColor="#ff000000" android:textSize="12sp" /> tools:text="时长费（30）分钟" /> <TextView android:id="@+id/tv_time_money" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_alignParentEnd="true" tools:text="0.00元" android:layout_centerVertical="true" android:textColor="#ff333333" android:textSize="12sp" /> tools:text="0.00元" /> </RelativeLayout> <RelativeLayout android:id="@+id/rl_long_distance_money" android:layout_marginTop="15dp" android:layout_marginStart="12dp" android:visibility="gone" android:layout_marginEnd="12dp" android:layout_width="match_parent" android:layout_height="wrap_content"> android:layout_height="wrap_content" android:layout_marginStart="12dp" android:layout_marginTop="15dp" android:layout_marginEnd="12dp" android:visibility="gone"> <TextView android:id="@+id/tv_long_distance_name" android:layout_width="200dp" android:layout_height="wrap_content" android:layout_centerVertical="true" tools:text="远途费（6.50）公里" android:textColor="#ff000000" android:textSize="12sp" /> tools:text="远途费（6.50）公里" /> <TextView android:id="@+id/tv_long_distance_money" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_alignParentEnd="true" tools:text="0.00元" android:layout_centerVertical="true" android:textColor="#ff333333" android:textSize="12sp" /> tools:text="0.00元" /> </RelativeLayout> <RelativeLayout android:id="@+id/rl_long_go_money" android:layout_marginTop="15dp" android:layout_marginStart="12dp" android:visibility="gone" android:layout_marginEnd="12dp" android:layout_width="match_parent" android:layout_height="wrap_content"> android:layout_height="wrap_content" android:layout_marginStart="12dp" android:layout_marginTop="15dp" android:layout_marginEnd="12dp" android:visibility="gone"> <TextView android:id="@+id/tv_long_go_name" @@ -242,31 +230,29 @@ android:layout_centerVertical="true" android:text="@string/过路费" android:textColor="#ff000000" android:textSize="12sp" /> android:textSize="12sp" /> <TextView android:id="@+id/tv_long_go_money" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="end|center_vertical" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:background="@null" android:layout_alignParentEnd="true" android:gravity="end|center_vertical" android:textColor="#ff333333" android:textSize="12sp" /> android:textSize="12sp" /> </RelativeLayout> <RelativeLayout android:id="@+id/rl_stop_car_money" android:layout_marginTop="15dp" android:layout_marginStart="12dp" android:layout_marginEnd="12dp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content"> android:layout_height="wrap_content" android:layout_marginStart="12dp" android:layout_marginTop="15dp" android:layout_marginEnd="12dp" android:visibility="gone"> <TextView android:id="@+id/tv_stop_car_name" @@ -275,8 +261,7 @@ android:layout_centerVertical="true" android:text="@string/停车费" android:textColor="#ff000000" android:textSize="12sp" /> android:textSize="12sp" /> <TextView android:id="@+id/et_stop_car_money" @@ -293,13 +278,42 @@ </RelativeLayout> <RelativeLayout android:id="@+id/rl_coupon_price" android:layout_marginTop="15dp" android:layout_marginStart="12dp" android:visibility="visible" android:layout_marginEnd="12dp" android:id="@+id/rl_difference_price" android:layout_width="match_parent" android:layout_height="wrap_content"> android:layout_height="wrap_content" android:layout_marginStart="12dp" android:layout_marginTop="15dp" android:layout_marginEnd="12dp" android:visibility="visible"> <TextView android:layout_width="200dp" android:layout_height="wrap_content" android:layout_centerVertical="true" android:text="@string/差价" android:textColor="#ff000000" android:textSize="12sp" /> <TextView android:id="@+id/tv_difference_price" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:textColor="#ff333333" android:textSize="12sp" tools:text="0.00元" /> </RelativeLayout> <RelativeLayout android:id="@+id/rl_coupon_price" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="12dp" android:layout_marginTop="15dp" android:layout_marginEnd="12dp" android:visibility="visible"> <TextView android:layout_width="200dp" @@ -313,25 +327,24 @@ android:id="@+id/tv_coupon_price" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_alignParentEnd="true" tools:text="0.00元" android:layout_centerVertical="true" android:textColor="#ff333333" android:textSize="12sp" /> tools:text="0.00元" /> </RelativeLayout> <TextView android:id="@+id/tv_price_by_platform" android:layout_width="match_parent" android:layout_height="wrap_content" android:id="@+id/tv_price_by_platform" android:textSize="12sp" android:textColor="@color/end_red" android:layout_marginHorizontal="12dp" android:layout_marginTop="15dp" android:visibility="gone" android:text="@string/争议订单协商价格"/> android:text="@string/争议订单协商价格" android:textColor="@color/end_red" android:textSize="12sp" android:visibility="gone" /> </LinearLayout> </LinearLayout> app/src/main/res/layout/activity_order_over.xml
@@ -54,43 +54,6 @@ </LinearLayout> <LinearLayout android:id="@+id/ll_service_money" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_vertical" android:orientation="horizontal"> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginVertical="11dp" android:text="@string/平台服务费" android:textColor="#ff27282d" android:textSize="14sp" android:textStyle="bold" /> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="6dp" android:layout_marginVertical="11dp" android:text=":" android:textColor="#ff27282d" android:textSize="14sp" android:textStyle="bold" /> <TextView android:id="@+id/tv_service_money" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="0" android:textColor="@color/color_e72c1c" android:textSize="16sp" android:textStyle="bold" /> </LinearLayout> <LinearLayout android:id="@+id/ll_coupon_price" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -130,6 +93,80 @@ </LinearLayout> <LinearLayout android:id="@+id/ll_income_price" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_vertical" android:orientation="horizontal"> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginVertical="11dp" android:text="@string/收款金额" android:textColor="#ff27282d" android:textSize="14sp" android:textStyle="bold" /> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="6dp" android:layout_marginVertical="11dp" android:text=":" android:textColor="#ff27282d" android:textSize="14sp" android:textStyle="bold" /> <TextView android:id="@+id/tv_income_price" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="0" android:textColor="@color/color_e72c1c" android:textSize="16sp" android:textStyle="bold" /> </LinearLayout> <LinearLayout android:id="@+id/ll_service_money" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_vertical" android:orientation="horizontal"> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginVertical="11dp" android:text="@string/平台服务费" android:textColor="#ff27282d" android:textSize="14sp" android:textStyle="bold" /> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="6dp" android:layout_marginVertical="11dp" android:text=":" android:textColor="#ff27282d" android:textSize="14sp" android:textStyle="bold" /> <TextView android:id="@+id/tv_service_money" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="0" android:textColor="@color/color_e72c1c" android:textSize="16sp" android:textStyle="bold" /> </LinearLayout> <LinearLayout android:id="@+id/ll_real_income" android:layout_width="match_parent" android:layout_height="wrap_content" app/src/main/res/layout/activity_order_over_small.xml
@@ -1,8 +1,8 @@ <?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" xmlns:tools="http://schemas.android.com/tools" android:orientation="vertical"> <include layout="@layout/include_order_top_cargo" /> @@ -54,6 +54,121 @@ </LinearLayout> <LinearLayout android:id="@+id/ll_coupon_price" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_vertical" android:orientation="horizontal" android:visibility="gone" tools:visibility="visible"> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginVertical="11dp" android:text="@string/优惠券" android:textColor="#ff27282d" android:textSize="14sp" android:textStyle="bold" /> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="6dp" android:layout_marginVertical="11dp" android:text=":" android:textColor="#ff27282d" android:textSize="14sp" android:textStyle="bold" /> <TextView android:id="@+id/tv_coupon_price" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="0" android:textColor="@color/color_e72c1c" android:textSize="16sp" android:textStyle="bold" /> </LinearLayout> <LinearLayout android:id="@+id/ll_difference_price" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_vertical" android:orientation="horizontal" android:visibility="gone" tools:visibility="visible"> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginVertical="11dp" android:text="@string/差价" android:textColor="#ff27282d" android:textSize="14sp" android:textStyle="bold" /> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="6dp" android:layout_marginVertical="11dp" android:text=":" android:textColor="#ff27282d" android:textSize="14sp" android:textStyle="bold" /> <TextView android:id="@+id/tv_difference_price" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="0" android:textColor="@color/color_e72c1c" android:textSize="16sp" android:textStyle="bold" /> </LinearLayout> <LinearLayout android:id="@+id/ll_income_price" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_vertical" android:orientation="horizontal"> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginVertical="11dp" android:text="@string/收款金额" android:textColor="#ff27282d" android:textSize="14sp" android:textStyle="bold" /> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="6dp" android:layout_marginVertical="11dp" android:text=":" android:textColor="#ff27282d" android:textSize="14sp" android:textStyle="bold" /> <TextView android:id="@+id/tv_income_price" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="0" android:textColor="@color/color_e72c1c" android:textSize="16sp" android:textStyle="bold" /> </LinearLayout> <LinearLayout android:id="@+id/ll_service_money" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -81,45 +196,6 @@ <TextView android:id="@+id/tv_service_money" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="0" android:textColor="@color/color_e72c1c" android:textSize="16sp" android:textStyle="bold" /> </LinearLayout> <LinearLayout android:id="@+id/ll_coupon_price" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_vertical" android:visibility="gone" tools:visibility="visible" android:orientation="horizontal"> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginVertical="11dp" android:text="@string/优惠券" android:textColor="#ff27282d" android:textSize="14sp" android:textStyle="bold" /> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="6dp" android:layout_marginVertical="11dp" android:text=":" android:textColor="#ff27282d" android:textSize="14sp" android:textStyle="bold" /> <TextView android:id="@+id/tv_coupon_price" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="0" app/src/main/res/values-en/strings.xml
@@ -828,4 +828,6 @@ <string name="请在应用权限页面开启相机权限">Please enable camera permissions on the app permissions page</string> <string name="实际收入">Real income</string> <string name="优惠券">Coupon</string> <string name="收款金额">Payment Amount</string> <string name="订单收款金额">Order payment amount</string> </resources> app/src/main/res/values-fr/strings.xml
@@ -832,4 +832,6 @@ <string name="请在应用权限页面开启相机权限">Veuillez activer les autorisations de la caméra sur la page autorisations de l\'application</string> <string name="实际收入">Revenus réels</string> <string name="优惠券">Coupon</string> <string name="收款金额">Montant de recette</string> <string name="订单收款金额">Montant perçu de la commande</string> </resources> app/src/main/res/values/strings.xml
@@ -820,4 +820,6 @@ <string name="请在应用权限页面开启相机权限">请在应用权限页面开启相机权限</string> <string name="实际收入">实际收入</string> <string name="优惠券">优惠券</string> <string name="收款金额">收款金额</string> <string name="订单收款金额">订单收款金额</string> </resources>
