app/src/main/AndroidManifest.xml
@@ -155,6 +155,9 @@ android:configChanges="orientation|screenSize|keyboardHidden" /> <activity android:name=".slab.cargo.CargoActivity" android:configChanges="orientation|screenSize|keyboardHidden" /> <activity android:name=".slab.cargo.SlabCargoOverActivity" android:configChanges="orientation|screenSize|keyboardHidden" /> <activity android:name=".slab.SlabStartActivity" android:configChanges="orientation|screenSize|keyboardHidden" > app/src/main/java/com/okgoincar/bean/OrderBean.java
@@ -72,7 +72,7 @@ private double startDistance; private double startLat; private double startLon; private double tipMoney; private Double tipMoney; private double totalDistance; private String travelTime; private String travelTime_; @@ -275,7 +275,7 @@ return startLon; } public double getTipMoney() { public Double getTipMoney() { return tipMoney; }
@@ -50,6 +50,9 @@ public static String work = "api/driver/work"; ///api/driver/work 司机上下班操作 public static String queryMyAllOrder = "api/order/queryMyAllOrder"; ///api/order/queryMyAllOrder 获取我的订单列表 public static String queryOrderList = "api/order/queryOrderList"; ////api/order/queryOrderList 获取首页订单列表 public static String queryOrderList1 = "api/order/queryOrderList1"; ////api/order/queryOrderList1 获取首页订单列表 public static String grabOrder = "api/order/grabOrder"; /////api/order/grabOrder 司机抢单操作 public static String grabOrder_ = "api/order/grabOrder_"; /////api/order/grabOrder 司机抢单操作(车载) public static String queryPushOrder = "api/order/queryPushOrder"; ////api/order/queryPushOrder 获取抢单界面的订单详情 app/src/main/java/com/okgoincar/slab/SlabGetOrderFragment.kt
@@ -129,6 +129,7 @@ tv_name.visible() tv_cargo_num.visible() tv_money.visible() tv_money.setDrawableLeft(R.mipmap.rocket_cargo) tv_name.text = data.nickName+"-"+data.phone tv_cargo_num.text = "普通小件X"+data.peopleNumber if (data.tipMoney != null && data.tipMoney > 0.0){ @@ -164,8 +165,8 @@ tv_money.textColor(this,R.color.white) tv_title.textColor(this,R.color.slab_yellow_zhong) }else{ rl_top_back.setBackgroundResource(R.color.white) ll_order_top.setBackgroundResource(R.color.white) rl_top_back.setBackgroundResource(R.color.black) ll_order_top.setBackgroundResource(R.color.black) tv_time.textColor(this,R.color.black) tv_start.textColor(this,R.color.black) tv_end.textColor(this,R.color.black) app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt
@@ -105,6 +105,7 @@ } else { showNoneNetDialog() } tv_server_ing.textColor(this, R.color.main_yellow) } @@ -124,6 +125,7 @@ try { mainFragment?.refresh() callPersion() callHomeNUm() } catch (e: Exception) { } @@ -231,8 +233,10 @@ } } } callHomeNUm() } fun callHomeNUm(){ callNet(true, Api.queryHomeNum, getMapByAny()) { var data = gson.fromJson<MainInfoBean>(it, MainInfoBean::class.java) if (!data.data.service.isNullOrEmpty() && data.data.service != "0") @@ -252,10 +256,13 @@ tv_server_ing.textColor(this, R.color.main_yellow) if (getNowTimeBlack()) { tv_wait_server.textColor(this, R.color.white) iv_small.textColor(this, R.color.white) } else { tv_wait_server.textColor(this, R.color.black) iv_small.textColor(this, R.color.black) } mainFragment.state = 1 mainFragment.type = 1 mainFragment.autoRefresh() } @@ -263,15 +270,28 @@ tv_wait_server.textColor(this, R.color.main_yellow) if (getNowTimeBlack()) { tv_server_ing.textColor(this, R.color.white) iv_small.textColor(this, R.color.white) } else { tv_server_ing.textColor(this, R.color.black) iv_small.textColor(this, R.color.black) } mainFragment.state = 2 mainFragment.type = 1 mainFragment.autoRefresh() } iv_small.setOnClickListener { iv_small.textColor(this, R.color.main_yellow) if (getNowTimeBlack()) { tv_server_ing.textColor(this, R.color.white) tv_wait_server.textColor(this, R.color.white) } else { tv_server_ing.textColor(this, R.color.black) tv_wait_server.textColor(this, R.color.black) } mainFragment.state = 1 mainFragment.type = 2 mainFragment.autoRefresh() } tv_name.clickDelay { app/src/main/java/com/okgoincar/slab/SlabMainFragment.kt
@@ -4,7 +4,7 @@ import com.example.emanagercar.ui.base.BaseRecyclerFragment import com.okgoincar.base.MyApplication import com.okgoincar.netUtls.getMapByAny import com.okgoincar.ui.adapter.SlabMainAdapter import com.okgoincar.slab.adapter.SlabMainAdapter import com.okgoincar.bean.OrderListBean import com.okgoincar.netUtls.Api import com.okgoincar.netUtls.callNet @@ -13,16 +13,18 @@ class SlabMainFragment : BaseRecyclerFragment<OrderListBean.DataBean>(SlabMainAdapter()) { var state = 1 var type = 1 var firstCallRecord = false //是否首次在进行中的列表中加入历史记录 （进行中的订单太少客户觉得太空） override fun pathUrl(): String? { return Api.queryOrderList return Api.queryOrderList1 } override fun mapObject(): HashMap<String?, Any?>? { var map = getMapByAny() map["state"] = state map["type"] = type return map } @@ -60,7 +62,7 @@ override fun noShowNothing() { super.noShowNothing() if (!firstCallRecord && state == 1) { if (!firstCallRecord && state == 1 && type == 1) { callRecord() } } app/src/main/java/com/okgoincar/slab/adapter/SlabMainAdapter.kt
@@ -1,4 +1,4 @@ package com.okgoincar.ui.adapter package com.okgoincar.slab.adapter import android.view.View import cn.sinata.xldutils.utils.clickDelay @@ -9,11 +9,11 @@ import com.okgoincar.R import com.okgoincar.base.BaseRvAdapter import com.okgoincar.base.BaseViewHolder import com.okgoincar.base.MyApplication import com.okgoincar.bean.OrderListBean import com.okgoincar.slab.SlabMainActivity import com.okgoincar.slab.SlabTripActivity import com.okgoincar.slab.cargo.CargoActivity import com.okgoincar.slab.cargo.SlabCargoOverActivity import com.okgoincar.slab.util.DialogUtil import kotlinx.android.synthetic.main.item_main_list_slab.view.* import kotlinx.android.synthetic.main.item_main_list_slab.view.tv_end @@ -36,12 +36,27 @@ it.itemView.tv_end.text = item.endAddress it.itemView.tv_qian.text = item.redMoney.toString() + "元小费" it.itemView.clickDelay { if (item.type == 4 || item.type == 5){ context.startActivity<CargoActivity>( "orderId" to item.id.toString(), "orderType" to item.type.toString() ) when(item.state){ 1,2,3,4,5,7,8,9,12 ->{ context.startActivity<CargoActivity>( "orderId" to item.id.toString(), "orderType" to item.type.toString() ) } 6,10->{ context.startActivity<SlabCargoOverActivity>( "orderId" to item.id.toString(), "orderType" to item.type.toString() ) } 11 -> { toast("订单改派中") } } return@clickDelay } when (item.state) { app/src/main/java/com/okgoincar/slab/cargo/CargoActivity.kt
@@ -180,8 +180,6 @@ Handler(Looper.getMainLooper()).post { toast("用户已取消订单") MyApplication.getTTsManager().setVideoText("用户已取消订单") MyApplication.currentOrderType = "" MyApplication.currentOrderId = "" finish() } } @@ -469,8 +467,6 @@ private fun callOrder() { MyApplication.currentOrderId = orderId MyApplication.currentOrderType = orderType var map = getMapByAny() map["orderId"] = orderId map["orderType"] = orderType @@ -524,13 +520,16 @@ private fun showUi(orderBean: OrderBean?) { orderBean?.let { tv_name.text = orderBean.data.nickName tv_car_num.text = it.data.historyNum.toString() + "次乘车" tv_car_num.text = it.data.historyNum.toString() + "次寄物" tv_time.text = it.data.travelTime tv_start_address.text = it.data.startAddress tv_end_address.text = it.data.endAddress tv_name_phone.text = orderBean.data.nickName + "-" + orderBean.data.phone tv_type_cargo.text = "普通小件X" + orderBean.data.peopleNumber tv_red_money.text = doubleTwo(orderBean.data.tipMoney) + "元加急费" if (orderBean.data.tipMoney == null || orderBean.data.tipMoney <= 0.0){ tv_red_money.gone() } tv_phone.text = orderBean.data.phone showStatueMapUI(it) } @@ -586,6 +585,10 @@ // 流程操作状态（3=开始出发预约点，4=到达预约点，5=开始服务，6=服务结束） private fun showStatueMapUI(it: OrderBean) { getAllMark(it) tv_gap_money.gone() if (it.data.orderState == 4 || it.data.orderState == 8 || it.data.orderState == 12){ tv_gap_money.visible() } when (it.data.orderState) { 2, 3 -> { clickBroad() @@ -602,7 +605,7 @@ setTitleText("去取货物") } } 4,8-> { 4,8,12-> { clickBroad() iv_to_gd.gone() closeLine() @@ -731,8 +734,8 @@ fun callStartOrder(contexts: Context, i: Int,func:() -> Unit) { var map = getMapByAny() map["orderId"] = MyApplication.currentOrderId map["orderType"] = MyApplication.currentOrderType map["orderId"] = orderId map["orderType"] = orderType map["state"] = i map["lat"] = MyApplication.getLocation().latitude map["lon"] = MyApplication.getLocation().longitude app/src/main/java/com/okgoincar/slab/cargo/SlabCargoOverActivity.kt
New file @@ -0,0 +1,303 @@ package com.okgoincar.slab.cargo import android.os.CountDownTimer import android.os.Handler import android.os.Looper import cn.sinata.xldutils.utils.* import com.okgoincar.netUtls.callNet import com.okgoincar.netUtls.getMapByAny import com.google.gson.Gson import com.okgoincar.R import com.okgoincar.base.MyApplication import com.okgoincar.bean.OrderBean import com.okgoincar.bean.OrderSimpleData import com.okgoincar.bean.OrderStatueBean import com.okgoincar.netUtls.Api import com.okgoincar.netUtls.timeOver import com.okgoincar.slab.MySlabBaseActivity import com.okgoincar.utils.MyUtils import kotlinx.android.synthetic.main.activity_order_over_cargo.* import java.lang.Exception class SlabCargoOverActivity : MySlabBaseActivity() { val orderType by lazy { intent.getStringExtra("orderType") } val orderId by lazy { intent.getStringExtra("orderId") } var time: CountDownTimer? = null lateinit var orderBean: OrderBean override fun setContentView() { setContentView(R.layout.activity_order_over_cargo) MyApplication.currentOrderType = "" MyApplication.currentOrderId = "" showHeader(false) showTitle(false) } override fun onPause() { super.onPause() if (time != null) { time!!.cancel() } } override fun setBlackMode(b: Boolean?) { super.setBlackMode(b) if (b!!) { //晚上 rl_main_bg.setBackgroundResource(R.color.black) ll_content_web.setBackgroundResource(R.drawable.bg_slab_main_8_black) ll_order_top.setBackgroundResource(R.drawable.bg_slab_main_8_black_bottom) // ll_pay_result.setBackgroundResource(R.drawable.bg_slab_main_8_shen_black) iv_back_slab.setImageResource(R.mipmap.icon_back_slab) tv_title_slab.textColor(this, R.color.write) tv_name.textColor(this, R.color.write) tv_car_num.textColor(this, R.color.write) tv_phone.textColor(this, R.color.write) tv_time.textColor(this, R.color.write) tv_time.setDrawableLeft(R.mipmap.icon_time_gray) tv_start_address.textColor(this, R.color.write) tv_end_address.textColor(this, R.color.write) tv_red_money.textColor(this, R.color.write) tv_pay_result_title.textColor(this, R.color.write) tv_order_type.textColor(this, R.color.write) tv_hive_small_money.textColor(this, R.color.write) tv_phone.setDrawableLeft(R.mipmap.icon_dial_slab) tv_name_phone.textColor(this, R.color.write) tv_type_cargo.textColor(this, R.color.write) } else { rl_main_bg.setBackgroundResource(R.color.write) ll_content_web.setBackgroundResource(R.drawable.write_top_10) ll_order_top.setBackgroundResource(R.drawable.write_bottom_10) // ll_pay_result.setBackgroundResource(R.drawable.bg_white_round5) iv_back_slab.setImageResource(R.mipmap.icon_back_black) tv_title_slab.textColor(this, R.color.black) tv_name.textColor(this, R.color.black) tv_car_num.textColor(this, R.color.black) tv_phone.textColor(this, R.color.black) tv_time.textColor(this, R.color.black) tv_time.setDrawableLeft(R.mipmap.icon_time_xiao) tv_start_address.textColor(this, R.color.black) tv_end_address.textColor(this, R.color.black) tv_red_money.textColor(this, R.color.black) tv_pay_result_title.textColor(this, R.color.black) tv_order_type.textColor(this, R.color.black) tv_hive_small_money.textColor(this, R.color.black) tv_phone.setDrawableLeft(R.mipmap.icon_dial) tv_name_phone.textColor(this, R.color.black) tv_type_cargo.textColor(this, R.color.black) } } override fun initView() { var map = getMapByAny() map["orderId"] = orderId map["orderType"] = orderType callNet(this, Api.queryOrderInfo, map) { orderBean = gson.fromJson(it, OrderBean::class.java) showUi(orderBean) // addSocketLisener(orderBean) // checkOrderStatue() } } private fun showUi(orderBean: OrderBean?) { orderBean?.let { tv_title_slab.text = "待支付" tv_name.text = it.data.nickName tv_car_num.text = it.data.historyNum.toString() + "次寄物" tv_phone.text = it.data.phone tv_phone.clickDelay { MyUtils.getInstans().CallPhone(this, it.data.phone.toString()) } tv_pay_result_money.text = "￥" + it.data.orderMoney.toString() tv_pay_result_small_money.text = "¥" + it.data.tipMoney.toString() tv_time.text = it.data.travelTime tv_start_address.text = it.data.startAddress tv_end_address.text = it.data.endAddress tv_red_money.text = it.data.tipMoney.toString() + "元小费" tv_name_phone.text = it.data.nickName + "-" + it.data.phone tv_type_cargo.text = "普通小件X" + it.data.peopleNumber tv_red_money.text = doubleTwo(it.data.tipMoney) + "元加急费" if (it.data.tipMoney == null || it.data.tipMoney <= 0.0){ tv_red_money.gone() } } } fun overOrder(){ callComplete() { Handler(Looper.getMainLooper()).post { time?.cancel() time?.onFinish() finish() } } } var handler: Handler? = null var isPlay = false fun checkOrderStatue() { var map = getMapByAny() // map["orderId"] = orderId // map["orderType"] = orderType callNet(false, Api.orderStateSocket, map) { val orderSimpleData = Gson().fromJson( it, OrderStatueBean::class.java ) orderSimpleData?.data?.let { var currentBean: OrderStatueBean.DataBean? = null for (item in it) { if (item.orderId == orderBean.data?.orderId) { currentBean = item } } if (it.size == 0 || currentBean == null) { return@callNet } if (currentBean.state == 8) { tv_pay_result_money.textColor( this@SlabCargoOverActivity, R.color.slab_green_over ) Handler(Looper.getMainLooper()).post { if (isPlay) { return@post } isPlay = true tv_complete.gone() tv_to_main.visible() MyApplication.getTTsManager() .setVideoText("乘客已支付" + orderBean.data?.orderMoney.toString() + "元") time?.cancel() time = timeOver(20000) { tv_title_slab.text = "已完成($it)" if (it == 0) { if (time != null) { time!!.cancel() } try { finish() } catch (e: Exception) { } } } } } } } } override fun onDestroy() { super.onDestroy() handler?.removeCallbacksAndMessages(null) } fun showPayResultText(it: OrderBean, statue: Int) { ll_pay_result.visible() if (statue in 6..7) { tv_pay_result_title.text = "待乘客支付" setTitleText("待支付") } else { tv_pay_result_title.text = "乘客已支付" setTitleText("已完成") } tv_pay_result_money.text = "￥" + it.data.orderMoney.toString() tv_pay_result_small_money.text = "¥" + it.data.tipMoney.toString() } override fun setTitleText(title: String?) { tv_title_slab.text = title } override fun setOnclick() { iv_back_slab.clickDelay { onBackPressed() } tv_to_main.clickDelay { onBackPressed() } tv_complete.clickDelay { onBackPressed() } } private fun callComplete(function: () -> Unit) { var map = getMapByAny() map["orderId"] = orderId map["orderType"] = orderType callNet(Api.completeOrder,map,{ function() }){ function() } } private fun addSocketLisener(orderBean: OrderBean?) { MyApplication.addOrderView(object : MyApplication.OrderStatueView { override fun orderInfo(data: OrderSimpleData?) { data?.let { if (it.status == 8 || it.status == 7) { tv_pay_result_money.textColor( this@SlabCargoOverActivity, R.color.slab_green_over ) Handler(Looper.getMainLooper()).post { if (isPlay) { return@post } isPlay = true MyApplication.getTTsManager() .setVideoText("乘客已支付" + orderBean?.data?.orderMoney.toString() + "元") time = timeOver(20000) { tv_title_slab.text = "已完成($it)" if (it == 0) { if (time != null) { time!!.cancel() } try { finish() } catch (e: Exception) { } } } } // android.os.Handler(Looper.getMainLooper()).post { // orderBean.data.orderState = 8 // showUi(orderBean) // } } } } }) // if (handler == null) { // handler = android.os.Handler(mainLooper) // handler!!.postDelayed({ // checkOrderStatue() // }, 3000) // } } } app/src/main/res/layout/activity_order_over_cargo.xml
New file @@ -0,0 +1,343 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/rl_main_bg" android:layout_width="match_parent" android:layout_height="match_parent" android:background="@drawable/bg_slab_main" android:orientation="vertical"> <RelativeLayout android:id="@+id/rl_top" android:layout_width="match_parent" android:layout_height="70dp" android:layout_marginTop="26dp"> <ImageView android:id="@+id/iv_back_slab" android:layout_width="84dp" android:layout_height="54dp" android:layout_centerVertical="true" android:paddingStart="26dp" android:paddingEnd="26dp" android:src="@mipmap/icon_back_slab" /> <TextView android:id="@+id/tv_title_slab" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true" android:text="准备出发" android:textColor="#ffffffff" android:textSize="50sp" android:textStyle="bold" /> </RelativeLayout> <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@+id/rl_top" android:layout_marginStart="16dp" android:layout_marginTop="13dp" android:layout_marginEnd="10dp" android:layout_toStartOf="@+id/ll_pay_result" android:orientation="vertical"> <LinearLayout android:id="@+id/ll_content_web" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_10" android:layout_marginTop="10dp" android:layout_marginEnd="10dp" android:background="@drawable/bg_slab_main_8" android:elevation="5dp" android:orientation="vertical" android:paddingStart="10dp"> <TextView android:id="@+id/tv_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="23dp" android:text="可乐" android:textColor="#ffffffff" android:textSize="34sp" android:textStyle="bold" /> <TextView android:id="@+id/tv_car_num" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="23dp" android:layout_marginBottom="9dp" android:text="123次乘车" android:textColor="#ffffffff" android:textSize="30sp" android:textStyle="bold" android:visibility="gone" /> <TextView android:id="@+id/tv_phone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="13dp" android:layout_marginBottom="22dp" android:drawableStart="@mipmap/icon_dial_slab" android:drawablePadding="10dp" android:text="15367543211" android:textColor="#ffffffff" android:textSize="30sp" android:textStyle="bold" /> </LinearLayout> <LinearLayout android:id="@+id/ll_order_top" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_below="@+id/ll_content_web" android:layout_marginStart="10dp" android:layout_marginTop="10dp" android:layout_marginEnd="10dp" android:layout_marginBottom="20dp" android:background="@drawable/bg_slab_main_8_bottom" android:elevation="3dp" android:orientation="vertical" android:paddingStart="14dp"> <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content"> </RelativeLayout> <TextView android:id="@+id/tv_time" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="21dp" android:layout_marginBottom="11dp" android:drawableStart="@mipmap/icon_time_xiao" android:drawablePadding="7dp" android:text="4月3日 14:00" android:textColor="#ffffffff" android:textSize="26sp" android:textStyle="bold" /> <TextView android:id="@+id/tv_start_address" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="11dp" android:layout_marginBottom="11dp" android:drawableStart="@drawable/bg_point_main_color_slab" android:drawablePadding="5dp" android:text="柳州市政府旁红旗连锁超市" android:textColor="#ffffffff" android:textSize="26sp" android:textStyle="bold" /> <TextView android:id="@+id/tv_end_address" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="11dp" android:layout_marginBottom="11dp" android:drawableStart="@drawable/bg_point_main_color_black_slab" android:drawablePadding="5dp" android:text="柳州客运中心" android:textColor="#ffffffff" android:textSize="26sp" android:textStyle="bold" /> <TextView android:id="@+id/tv_name_phone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="11dp" android:layout_marginBottom="11dp" android:maxLines="1" android:ellipsize="end" android:drawableStart="@mipmap/people_cargo" android:drawablePadding="20dp" android:text="张三-145764578" android:textColor="#ffffffff" android:textSize="26sp" android:textStyle="bold" /> <TextView android:id="@+id/tv_type_cargo" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="11dp" android:layout_marginBottom="11dp" android:maxLines="1" android:ellipsize="end" android:drawableStart="@mipmap/item_cargo" android:drawablePadding="20dp" android:text="普通小件" android:textColor="#ffffffff" android:textSize="26sp" android:textStyle="bold" /> <TextView android:id="@+id/tv_red_money" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="11dp" android:layout_marginBottom="11dp" android:maxLines="1" android:ellipsize="end" android:drawableStart="@mipmap/rocket_cargo" android:drawablePadding="20dp" android:text="8元加急费" android:textColor="#ffffffff" android:textSize="26sp" android:textStyle="bold" /> </LinearLayout> <include layout="@layout/include_weight_height" /> </RelativeLayout> <LinearLayout android:id="@+id/ll_pay_result" android:layout_width="567dp" android:layout_height="567dp" android:layout_below="@+id/rl_top" android:layout_alignParentEnd="true" android:layout_marginTop="20dp" android:layout_marginEnd="20dp" android:layout_marginBottom="18dp" android:gravity="center_horizontal" android:orientation="vertical"> <TextView android:id="@+id/tv_order_type" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="26dp" android:text="乘客已支付" android:textColor="#ffffffff" android:textSize="50sp" android:textStyle="bold" /> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="30dp" android:orientation="horizontal" android:visibility="gone"> <View android:layout_width="0dp" android:layout_height="1dp" android:layout_gravity="center" android:layout_marginStart="21dp" android:layout_marginEnd="29dp" android:layout_weight="1" android:background="@color/write" /> <TextView android:id="@+id/tv_pay_result_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="待乘客支付" android:textColor="#ffffffff" android:textSize="30sp" /> <View android:layout_width="0dp" android:layout_height="1dp" android:layout_gravity="center" android:layout_marginStart="29dp" android:layout_marginEnd="21dp" android:layout_weight="1" android:background="@color/write" /> </LinearLayout> <TextView android:id="@+id/tv_pay_result_money" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="2dp" android:text="¥51.5" android:textColor="#fffea62d" android:textSize="100sp" android:textStyle="bold" /> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" android:visibility="gone" android:orientation="horizontal"> <TextView android:id="@+id/tv_hive_small_money" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="其中含小费：" android:textColor="@color/write" android:textSize="26sp" /> <TextView android:id="@+id/tv_pay_result_small_money" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="" android:textColor="@color/main_yellow_qian_y" android:textSize="26sp" /> </LinearLayout> <include layout="@layout/include_weight_height" /> <TextView android:id="@+id/tv_complete" android:layout_width="match_parent" android:visibility="gone" android:layout_height="100dp" android:layout_gravity="center" android:layout_marginStart="50dp" android:layout_marginEnd="50dp" android:layout_marginBottom="10dp" android:background="@drawable/bg_event_btn_one" android:gravity="center" android:text="返回首页" android:textColor="#ffffffff" android:textSize="30sp" /> <TextView android:id="@+id/tv_to_main" android:layout_width="match_parent" android:layout_height="100dp" android:visibility="gone" android:layout_marginStart="50dp" android:layout_marginEnd="50dp" android:background="@drawable/bg_event_btn_one" android:gravity="center" android:text="返回首页" android:textColor="@color/slab_green_over" android:textSize="40sp" /> </LinearLayout> </RelativeLayout> app/src/main/res/layout/activity_trip_slab_cargo.xml
@@ -93,7 +93,8 @@ <LinearLayout android:id="@+id/ll_order_top" android:layout_width="384dp" android:layout_height="match_parent" android:layout_height="0dp" android:layout_weight="1" android:layout_marginStart="10dp" android:layout_marginEnd="10dp" android:layout_marginBottom="10dp" @@ -109,6 +110,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="21dp" android:maxLines="1" android:ellipsize="end" android:layout_marginBottom="11dp" android:drawableStart="@mipmap/icon_time_xiao" android:drawablePadding="13dp" @@ -122,7 +125,9 @@ android:id="@+id/tv_start_address" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="28dp" android:layout_marginTop="11dp" android:maxLines="1" android:ellipsize="end" android:layout_marginBottom="11dp" android:drawableStart="@drawable/bg_point_main_color_slab" android:drawablePadding="13dp" @@ -136,7 +141,9 @@ android:id="@+id/tv_end_address" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="28dp" android:layout_marginTop="11dp" android:maxLines="1" android:ellipsize="end" android:layout_marginBottom="11dp" android:drawableStart="@drawable/bg_point_main_color_black_slab" android:drawablePadding="13dp" @@ -149,10 +156,12 @@ android:id="@+id/tv_name_phone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="28dp" android:layout_marginTop="11dp" android:layout_marginBottom="11dp" android:drawableStart="@drawable/bg_point_main_color_black_slab" android:drawablePadding="13dp" android:maxLines="1" android:ellipsize="end" android:drawableStart="@mipmap/people_cargo" android:drawablePadding="20dp" android:text="张三-145764578" android:textColor="#ffffffff" android:textSize="26sp" @@ -162,10 +171,12 @@ android:id="@+id/tv_type_cargo" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="28dp" android:layout_marginTop="11dp" android:layout_marginBottom="11dp" android:drawableStart="@drawable/bg_point_main_color_black_slab" android:drawablePadding="13dp" android:maxLines="1" android:ellipsize="end" android:drawableStart="@mipmap/item_cargo" android:drawablePadding="20dp" android:text="普通小件" android:textColor="#ffffffff" android:textSize="26sp" @@ -175,17 +186,27 @@ android:id="@+id/tv_red_money" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="28dp" android:layout_marginTop="11dp" android:layout_marginBottom="11dp" android:drawableStart="@drawable/bg_point_main_color_black_slab" android:drawablePadding="18dp" android:maxLines="1" android:ellipsize="end" android:drawableStart="@mipmap/rocket_cargo" android:drawablePadding="20dp" android:text="8元加急费" android:textColor="#ffffffff" android:textSize="26sp" android:textStyle="bold" /> </LinearLayout> <com.okgoincar.utils.view.SlidingButton android:id="@+id/slide_btn" android:layout_width="384dp" android:layout_height="94dp" android:layout_alignParentBottom="true" android:layout_marginStart="10dp" android:layout_marginEnd="26dp" android:layout_marginBottom="14dp" /> </LinearLayout> @@ -236,13 +257,13 @@ android:layout_width="wrap_content" android:layout_height="40dp" android:text="补差价" android:layout_marginBottom="20dp" android:gravity="center" android:layout_marginEnd="40dp" android:layout_marginBottom="90dp" android:textSize="30dp" android:textColor="@color/main_yellow" android:layout_above="@+id/iv_to_gd" android:layout_alignEnd="@+id/iv_to_gd" android:src="@mipmap/daohang"/> android:layout_alignParentEnd="true" android:layout_alignParentBottom="true" /> <ImageView android:id="@+id/iv_to_gd" @@ -397,21 +418,14 @@ android:textSize="40sp" /> <com.okgoincar.utils.view.SlidingButton android:id="@+id/slide_btn" android:layout_width="384dp" android:layout_height="94dp" android:layout_alignParentBottom="true" android:layout_marginStart="26dp" android:layout_marginEnd="26dp" android:layout_marginBottom="14dp" android:visibility="gone" /> <Button android:id="@+id/btn_start" android:layout_width="wrap_content" android:layout_marginStart="150dp" android:text="开始行程" android:visibility="gone" android:layout_height="match_parent"/> <Button @@ -419,6 +433,7 @@ android:layout_width="wrap_content" android:layout_marginStart="300dp" android:text="结束行程" android:visibility="gone" android:layout_height="match_parent"/>
@@ -129,8 +129,8 @@ android:layout_height="wrap_content" android:layout_marginTop="6dp" android:layout_marginBottom="6dp" android:drawableStart="@drawable/bg_point_main_color_black_slab" android:drawablePadding="5dp" android:drawableStart="@mipmap/people_cargo" android:drawablePadding="10dp" android:text="张三-169345734" android:textColor="@color/write" android:textSize="32sp" @@ -142,8 +142,8 @@ android:layout_height="wrap_content" android:layout_marginTop="6dp" android:layout_marginBottom="6dp" android:drawableStart="@drawable/bg_point_main_color_black_slab" android:drawablePadding="5dp" android:drawableStart="@mipmap/item_cargo" android:drawablePadding="10dp" android:text="普通小件" android:textColor="@color/write" android:textSize="32sp" app/src/main/res/mipmap-xxhdpi/item_cargo.png
