app/build.gradle
@@ -32,7 +32,7 @@ ndk { // 设置支持的SO库架构，第三方给的so库哪几种架构，就配置这几种架构 // abiFilters 'armeabi','x86' abiFilters 'armeabi' abiFilters 'armeabi',"x86" } } @@ -102,4 +102,5 @@ implementation files('libs/Msc.jar') implementation 'me.jessyan:autosize:1.1.2' implementation files('libs/AMap3DMap_7.5.0_AMapNavi_7.5.0_AMapSearch_7.3.0_AMapTrack_1.3.0_AMapLocation_5.0.0_20200610.jar') implementation 'com.wang.avi:library:2.1.3' } app/src/main/AndroidManifest.xml
@@ -78,21 +78,30 @@ <action android:name="wisdom.intent.action.driverInfo" /> <!-- //顶灯--> <action android:name="wisdom.intent.action.topLight" /> </intent-filter> </receiver> <receiver android:name=".base.MoneyBroadCastReceiver" android:enabled="true" android:exported="true" > <intent-filter android:priority="1000"> <action android:name="Action" /> <!-- //空重车状态--> <action android:name="wisdom.intent.action.ledLight" /> <!-- //计价器 司机登退签状态改变时--> <!-- //计价器--> <action android:name="wisdom.intent.action.priceDevice" /> </intent-filter> </receiver> <meta-data android:name="design_width_in_dp" android:value="1280" /> android:value="1024" /> <meta-data android:name="design_height_in_dp" android:value="768" /> android:value="600" /> <!-- //原本是768 现在 X1.3--> <meta-data @@ -127,6 +136,8 @@ <activity android:name=".slab.SlabLoginActivity" android:configChanges="orientation|screenSize|keyboardHidden" /> <activity android:name=".slab.SlabOrderListActivity" android:configChanges="orientation|screenSize|keyboardHidden" /> <activity android:name=".slab.SlabMainActivity" android:configChanges="orientation|screenSize|keyboardHidden" /> app/src/main/java/com/okgoincar/base/BaseEvent.java
@@ -32,6 +32,9 @@ public static final int REQUEST_CAR_INFO = 11024; //收到显示屏信息 public static final int UP_TRIP = 11025; //收到重车指令 刷新出行页面 public static final int SURE_MONEY= 11026; //收到价格 结束行程 private String msg; private int code; private int type; app/src/main/java/com/okgoincar/base/BaseRecyclerFragment.kt
@@ -4,15 +4,17 @@ import android.view.LayoutInflater import android.view.View import android.widget.FrameLayout import androidx.core.content.ContextCompat import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import cn.sinata.xldutils.activitys.BaseActivity import com.okgoincar.netUtls.callNet import cn.sinata.xldutils.utils.getNowTimeBlack import com.google.gson.Gson import com.okgoincar.R import com.okgoincar.base.BaseRvAdapter import com.okgoincar.base.BaseViewHolder import com.okgoincar.base.MyBaseFragment import com.okgoincar.netUtls.callNet import com.okgoincar.utils.StatesBarUtil import com.scwang.smartrefresh.layout.api.RefreshLayout import kotlinx.android.synthetic.main.fragment_base_recycler.* @@ -78,6 +80,13 @@ smart_refresh_layout!!.setOnLoadMoreListener { refreshLayout: RefreshLayout? -> loadMore() } super.onActivityCreated(savedInstanceState) init() if (getNowTimeBlack()){ ch_class_head.setAccentColor(ContextCompat.getColor(context,R.color.write)) ch_class_footer.setAccentColor(ContextCompat.getColor(context,R.color.write)) }else{ ch_class_head.setAccentColor(ContextCompat.getColor(context,R.color.black)) ch_class_footer.setAccentColor(ContextCompat.getColor(context,R.color.black)) } } open fun setPageSize(i: Int): Int { app/src/main/java/com/okgoincar/base/Const.java
@@ -64,6 +64,7 @@ public final static String OK = "OK"; public final static String ORDER_STATUS = "ORDER_STATUS"; public final static String REASSIGN = "REASSIGN"; public final static String OFFLINE = "OFFLINE"; }
New file @@ -0,0 +1,89 @@ package com.okgoincar.base import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.os.Handler import android.os.Looper import cn.sinata.rxnetty.netStatus.NetUtils import cn.sinata.xldutils.utils.toast import com.google.gson.Gson import com.okgoincar.bean.LoginBean import com.okgoincar.netUtls.Api import com.okgoincar.netUtls.callNet import com.okgoincar.netUtls.getMapByAny import com.okgoincar.netUtls.getToken import com.okgoincar.slab.SlabLoginActivity import com.okgoincar.slab.SlabMainActivity import com.okgoincar.utils.Cache.CacheKey import com.okgoincar.utils.Cache.CacheUtil import org.greenrobot.eventbus.EventBus import org.jetbrains.anko.startActivity import java.lang.Exception class MoneyBroadCastReceiver : BroadcastReceiver() { override fun onReceive(contexts: Context?, intent: Intent?) { if (intent == null && contexts == null){ toast("内容获取为空，广播接收消息错误") return } try { Handler(Looper.getMainLooper()).post { when(intent!!.action){ "wisdom.intent.action.ledLight" ->{ val isHeavy = intent!!.getBooleanExtra("isHeavy",true) if (isHeavy){ callStatue(contexts!!,5) //代表让订单到进行中 } } "wisdom.intent.action.priceDevice" -> { var price = intent.getDoubleExtra("price",0.0) //计价器价格，单位为元 var mileage = intent.getDoubleExtra("mileage",0.0) //里程，单位为km } } } }catch (e:Exception){ } } private fun callStatue(contexts: Context,i: Int) { if (MyApplication.currentOrderId.isEmpty()){ toast("没有进行中的订单，无法开始") return } var map = getMapByAny() map["orderId"] = MyApplication.currentOrderId map["orderType"] = MyApplication.currentOrderType map["state"] = i map["lat"] = MyApplication.getLocation().latitude map["lon"] = MyApplication.getLocation().longitude callNet(contexts, Api.process, map) { EventBus.getDefault().post(BaseEvent(BaseEvent.UP_TRIP)) } } private fun callOver(contexts: Context,travelFee:Double){ if (MyApplication.currentOrderId.isEmpty()){ toast("没有进行中的订单，无法结束") return } var map = getMapByAny() map["orderId"] = MyApplication.currentOrderId map["orderType"] = MyApplication.currentOrderType map["travelFee"] = travelFee map["lat"] = MyApplication.getLocation().latitude map["lon"] = MyApplication.getLocation().longitude map["type"] = 1 callNet(contexts,Api.confirmFees_,map){ EventBus.getDefault().post(BaseEvent(BaseEvent.SURE_MONEY)) } } } app/src/main/java/com/okgoincar/base/MyApplication.kt
@@ -30,6 +30,10 @@ import com.okgoincar.bean.websocket.HeartBean import com.okgoincar.netUtls.Api import com.okgoincar.slab.MySlabBaseActivity import com.okgoincar.slab.SlabLoginActivity import com.okgoincar.utils.Cache.CacheUtil import org.greenrobot.eventbus.EventBus import org.jetbrains.anko.startActivity import org.jetbrains.anko.toast import org.json.JSONObject import java.security.SecureRandom @@ -95,6 +99,12 @@ Const.SOCKET_METHOD.OK -> { testReceiveNum++ } Const.SOCKET_METHOD.OFFLINE -> { CacheUtil.get().clear() NettyClient.getInstance().stopService() EventBus.getDefault().post(BaseEvent(BaseEvent.OUT_APP)) toast("您的账号已在其他平台登录") } Const.SOCKET_METHOD.ORDER_STATUS -> { val orderSimpleData = Gson().fromJson( app/src/main/java/com/okgoincar/netUtls/Api.java
@@ -44,6 +44,7 @@ public static String queryMyAllOrder = "api/order/queryMyAllOrder"; ///api/order/queryMyAllOrder 获取我的订单列表 public static String queryOrderList = "api/order/queryOrderList"; ////api/order/queryOrderList 获取首页订单列表 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 获取抢单界面的订单详情 public static String queryMyActivity = "api/driver/queryMyActivity"; //api/driver/queryMyActivity 获取当前有效的活动列表 public static String queryHistoryActivity = "api/driver/queryHistoryActivity"; //api/driver/queryHistoryActivity 获取历史活动列表 @@ -60,6 +61,7 @@ public static String queryToBePaidPage = "api/order/queryToBePaidPage"; //api/order/queryToBePaidPage 获取待支付页详情 public static String confirmFees = "api/order/confirmFees"; //api/order/confirmFees 司机确认费用 public static String orderStateSocket = "api/netty/orderStateSocket"; ///api/netty/orderStateSocket 主动调用获取订单状态 public static String confirmFees_ = "api/order/confirmFees_"; ///api/order/confirmFees_ 司机确认费用（车载端） /*** * 消息 app/src/main/java/com/okgoincar/slab/MySlabBaseActivity.java
@@ -140,14 +140,6 @@ } public void showOrder(String orderId, String orderType) { // Bundle bundle = creatBundleString("orderId", orderId); // bundle.putString("orderType", orderType); Intent intent = new Intent(this, SlabGetOrderFragment.class); intent.putExtra("orderId",orderId); intent.putExtra("orderType",orderType); startActivity(intent); } public void toDorderAct(String orderId, String orderType){ Intent intent = new Intent(this, SlabTripActivity.class); @@ -164,8 +156,6 @@ * @param type */ public void showOrder(String orderId, String orderType,int time,int type) { // Bundle bundle = creatBundleString("orderId", orderId); // bundle.putString("orderType", orderType); Intent intent = new Intent(this,SlabGetOrderFragment.class); intent.putExtra("orderId",orderId); intent.putExtra("orderType",orderType); app/src/main/java/com/okgoincar/slab/SlabGetOrderFragment.kt
@@ -130,6 +130,7 @@ tv_start.textColor(this,R.color.white) tv_end.textColor(this,R.color.white) 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) @@ -137,7 +138,7 @@ tv_start.textColor(this,R.color.black) tv_end.textColor(this,R.color.black) tv_money.textColor(this,R.color.black) tv_title.textColor(this,R.color.yellow_ffa72d) } } @@ -147,7 +148,7 @@ map["orderId"] = orderId map["orderType"] = orderType showDialog() callNet(this, Api.grabOrder, map, { callNet(this, Api.grabOrder_, map, { dismissDialog() Toast.create(this).show("抢单成功") onBackPressed() app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt
@@ -29,24 +29,24 @@ override fun setOnclick() { tv_login.clickDelay { // if (et_number.getContent().isNullOrEmpty()) { // toast("请输入工号") // return@clickDelay // } // var map = getMapByAny() // map["jobNum"] = et_number.getContent().trim() // callNet(true, Api.loginByJobNumber, map) { // toast("登录成功") // var bean = gson.fromJson<LoginBean>(it, LoginBean::class.java) // CacheKey.putKeyStr("appid", bean.data.appid) // CacheKey.putKeyStr("token", bean.data.token) // CacheKey.putKeyStr("userId", bean.data.id.toString()) // CacheKey.putKeyStr("serverId", bean.data.serverId.toString()) // CacheKey.putKeyStr("terminalName", bean.data.terminalId.toString()) // finish() // startActivity<SlabMainActivity>() // } toLoginActivity(this,"452229198204010012") if (et_number.getContent().isNullOrEmpty()) { toast("请输入工号") return@clickDelay } var map = getMapByAny() map["jobNum"] = et_number.getContent().trim() callNet(true, Api.loginByJobNumber, map) { toast("登录成功") var bean = gson.fromJson<LoginBean>(it, LoginBean::class.java) CacheKey.putKeyStr("appid", bean.data.appid) CacheKey.putKeyStr("token", bean.data.token) CacheKey.putKeyStr("userId", bean.data.id.toString()) CacheKey.putKeyStr("serverId", bean.data.serverId.toString()) CacheKey.putKeyStr("terminalName", bean.data.terminalId.toString()) finish() startActivity<SlabMainActivity>() } // toLoginActivity(this,"452229198204010012") } } app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt
@@ -50,9 +50,9 @@ override fun setBlackMode(b: Boolean?) { super.setBlackMode(b) if (b!!) { if (b!!) { //晚上 ct_bg.setBackgroundResource(R.color.black_191919) ll_top.setBackgroundResource(R.drawable.bg_green_top_black) ll_top.setBackgroundResource(R.drawable.bg_gray_top) tv_server_ing.textColor(this,R.color.write) iv_small.textColor(this,R.color.write) tv_wait_server.textColor(this,R.color.write) @@ -63,8 +63,10 @@ tv_current_time.textColor(this,R.color.write) tv_company.textColor(this,R.color.write) tv_time.textColor(this,R.color.write) tv_car_statue.textColor(this,R.color.write) tv_title.textColor(this,R.color.slab_yellow_zhong) } else { ll_top.setBackgroundResource(R.drawable.bg_white_round5) ll_top.setBackgroundResource(R.drawable.bg_green_top) ct_bg.setBackgroundResource(R.drawable.write) tv_server_ing.textColor(this,R.color.black) iv_small.textColor(this,R.color.black) @@ -76,6 +78,8 @@ tv_current_time.textColor(this,R.color.black) tv_company.textColor(this,R.color.black) tv_time.textColor(this,R.color.black) tv_car_statue.textColor(this,R.color.black) tv_title.textColor(this,R.color.yellow_ffa72d) } } @@ -89,6 +93,7 @@ initCall() NettyClient.getInstance().startService() callPersion() showOrder("2221","2",100,2) } private fun callPersion() { @@ -106,7 +111,7 @@ private fun showUI(data: UserInfoBean?) { data?.let { tv_code_num.text = "证号：" + data.taxiAptitudeCard tv_code_num.text = "资格证号：" + data.taxiAptitudeCard tv_name.text = "姓名：" + it.name tv_car_num.text = "车牌：" + it.licensePlate recycler_view_start.layoutManager = @@ -118,7 +123,7 @@ recycler_view_start.adapter = SlabStartAdapter(it.score.toDouble()) tv_company.text = "公司：" + it.company tv_time.text = "发证日期：" + it.networkCarlssueDate GlideUtil.load(this, it.avatar, iv_head, 1) GlideUtil.load(this, it.avatar, iv_head, 8) tv_current_time.text = DateUtil.getTime( DateUtil.TYPE7, System.currentTimeMillis() @@ -135,7 +140,14 @@ if (data.data.work == 1){ MyApplication.getTTsManager().setVideoText("您正在上班中") }else{ MyApplication.getTTsManager().setVideoText("您已下班") // MyApplication.getTTsManager().setVideoText("您已下班") var mapC = getMapByAny() mapC["type"] = "2" callNet(true, Api.work2, mapC) { homeDataBean?.data?.work = 1 tv_car.text = "收车" MyApplication.getTTsManager().setVideoText("您正在上班中") } } } @@ -189,27 +201,32 @@ } tv_more.clickDelay { startActivity<SlabOrderListActivity>() } ll_task.clickDelay { startActivity<SlabMineEventActivity>() } tv_car.clickDelay { if (homeDataBean?.data?.work == 1) { callNet(true, Api.work2, getMapByAny()) { homeDataBean?.data?.work = 2 tv_car.text = "出车" MyApplication.getTTsManager().setVideoText("您已下班") } } else { var map = getMapByAny() map["type"] = "2" callNet(true, Api.work2, map) { homeDataBean?.data?.work = 1 tv_car.text = "收车" MyApplication.getTTsManager().setVideoText("您正在上班中") } } // if (homeDataBean?.data?.work == 1) { // callNet(true, Api.work2, getMapByAny()) { // homeDataBean?.data?.work = 2 // tv_car.text = "出车" // MyApplication.getTTsManager().setVideoText("您已下班") // } // } else { // var map = getMapByAny() // map["type"] = "2" // callNet(true, Api.work2, map) { // homeDataBean?.data?.work = 1 // tv_car.text = "收车" // MyApplication.getTTsManager().setVideoText("您正在上班中") // } // } } } app/src/main/java/com/okgoincar/slab/SlabMainFragment.kt
@@ -2,6 +2,7 @@ import android.view.View 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.bean.OrderListBean @@ -28,6 +29,10 @@ override fun getDatas(t: String?): List<OrderListBean.DataBean> { var data = gson.fromJson<OrderListBean>(t,OrderListBean::class.java) if (state == 1 && data.data.size >= 1){ MyApplication.currentOrderId = data.data[0].id.toString() MyApplication.currentOrderId = data.data[0].type.toString() } return data.data }
New file @@ -0,0 +1,40 @@ package com.okgoincar.slab import cn.sinata.xldutils.utils.clickDelay import cn.sinata.xldutils.utils.textColor import com.okgoincar.R import kotlinx.android.synthetic.main.activity_history_slab.* class SlabOrderListActivity :MySlabBaseActivity(){ override fun setContentView() { setContentView(R.layout.activity_history_slab) } override fun initView() { showHeader(false) showTitle(false) tv_title_slab.text = "历史订单" addFragment(SlabOrderListFragment(),R.id.rl_container) } override fun setOnclick() { iv_back_slab.clickDelay { onBackPressed() } } override fun setBlackMode(b: Boolean?) { super.setBlackMode(b) if (b!!){ tv_title_slab.textColor(this,R.color.write) ll_back.setBackgroundResource(R.color.slab_black) iv_back_slab.setImageResource(R.mipmap.icon_back_slab) }else{ tv_title_slab.textColor(this,R.color.black) ll_back.setBackgroundResource(R.color.write) iv_back_slab.setImageResource(R.mipmap.icon_back_black) } } } app/src/main/java/com/okgoincar/slab/SlabOrderListAdapter.kt
New file @@ -0,0 +1,39 @@ package com.okgoincar.slab import android.view.View import cn.sinata.xldutils.utils.getNowTimeBlack import cn.sinata.xldutils.utils.textColor import com.okgoincar.R import com.okgoincar.base.BaseRvAdapter import com.okgoincar.base.BaseViewHolder import com.okgoincar.bean.EventBean import com.okgoincar.bean.OrderListBean import kotlinx.android.synthetic.main.item_order_list_slab.view.* class SlabOrderListAdapter: BaseRvAdapter<OrderListBean.DataBean>() { override fun getLayoutResId(viewType: Int): Int { return R.layout.item_order_list_slab } override fun onBindItem(holder: BaseViewHolder?, view: View?, item: OrderListBean.DataBean?) { holder?.let { setblack(getNowTimeBlack(),it.itemView) it.itemView.tv_time.text = item!!.time it.itemView.tv_money.text = "订单金额：¥"+item!!.redMoney } } private fun setblack(nowTimeBlack: Boolean, itemView: View) { if (nowTimeBlack){ itemView.ll_main.setBackgroundResource(R.color.slab_gray) itemView.tv_time.textColor(context,R.color.write) itemView.tv_money.textColor(context,R.color.write) }else{ itemView.ll_main.setBackgroundResource(R.color.write) itemView.tv_time.textColor(context,R.color.black) itemView.tv_money.textColor(context,R.color.black) } } } app/src/main/java/com/okgoincar/slab/SlabOrderListFragment.kt
New file @@ -0,0 +1,89 @@ package com.okgoincar.slab import android.view.View import cn.sinata.xldutils.utils.clickDelay import cn.sinata.xldutils.utils.getNowTimeBlack import cn.sinata.xldutils.utils.textColor import com.example.emanagercar.ui.base.BaseRecyclerFragment import com.okgoincar.R import com.okgoincar.netUtls.getMapByAny import com.okgoincar.bean.EventHistoryBean import com.okgoincar.bean.OrderBean import com.okgoincar.bean.OrderListBean import com.okgoincar.netUtls.Api import com.okgoincar.netUtls.callNet import com.okgoincar.slab.event.SlabEventDetailActivity import com.okgoincar.slab.util.DialogUtil import kotlinx.android.synthetic.main.order_detail.view.* import org.jetbrains.anko.startActivity import java.util.HashMap class SlabOrderListFragment : BaseRecyclerFragment<OrderListBean.DataBean>(SlabOrderListAdapter()) { override fun pathUrl(): String? { return Api.queryMyAllOrder } override fun mapObject(): HashMap<String?, Any?>? { var map = getMapByAny() map["state"] = 1 return map } override fun mapString(): HashMap<String?, String?>? { return null } override fun getDatas(t: String?): List<OrderListBean.DataBean> { return gson.fromJson<OrderListBean>(t, OrderListBean::class.java).data } override fun onItemClick(view: View?, position: Int) { var bean = (adapter as SlabOrderListAdapter).data[position] bean?.let { var pop = DialogUtil.getPopupwindow(context, R.layout.order_detail) var view = pop.contentView view.iv_close.clickDelay { pop.dismiss() } view.tv_time.text = it.time view.tv_start.text = it.startAddress view.tv_end.text = it.endAddress view.tv_money.text = it.redMoney.toString() + "元红包" view. tv_money_num.text = it.redMoney.toString()+"元" setBlack(getNowTimeBlack(),view) pop.showCenter(dictorView) } } private fun setBlack(nowTimeBlack: Boolean, view: View?) { view?.let { if (nowTimeBlack){ //黑 view.rl_back.setBackgroundResource(R.drawable.bg_slab_gray_4_gray) view.tv_title.textColor(context,R.color.slab_yellow_zhong) view.tv_money_num.textColor(context,R.color.slab_yellow_zhong) view.iv_close.setImageResource(R.mipmap.close_write_c) view.tv_time.textColor(context,R.color.write) view.tv_start.textColor(context,R.color.write) view.tv_end.textColor(context,R.color.write) view.tv_money.textColor(context,R.color.write) view.tv_money_order.textColor(context,R.color.write) }else{ view.rl_back.setBackgroundResource(R.drawable.bg_white_6) view.tv_title.textColor(context,R.color.sdsdf) view.tv_money_num.textColor(context,R.color.sdsdf) view.iv_close.setImageResource(R.mipmap.close_big) view.tv_time.textColor(context,R.color.black) view.tv_start.textColor(context,R.color.black) view.tv_end.textColor(context,R.color.black) view.tv_money.textColor(context,R.color.black) view.tv_money_order.textColor(context,R.color.black) } } } override fun initView() { } } app/src/main/java/com/okgoincar/slab/SlabOrderOverActivity.kt
@@ -1,10 +1,8 @@ package com.okgoincar.slab import android.os.CountDownTimer import android.os.Looper import cn.sinata.xldutils.utils.clickDelay import cn.sinata.xldutils.utils.gone import cn.sinata.xldutils.utils.textColor import cn.sinata.xldutils.utils.visible import cn.sinata.xldutils.utils.* import com.okgoincar.netUtls.callNet import com.okgoincar.netUtls.getMapByAny import com.google.gson.Gson @@ -13,6 +11,7 @@ import com.okgoincar.bean.OrderBean import com.okgoincar.bean.OrderSimpleData import com.okgoincar.netUtls.Api import com.okgoincar.netUtls.timeOver import com.okgoincar.utils.MyUtils import kotlinx.android.synthetic.main.activity_order_over.* @@ -26,51 +25,71 @@ intent.getStringExtra("orderId") } var time:CountDownTimer? = null lateinit var orderBean: OrderBean override fun setContentView() { setContentView(R.layout.activity_order_over) MyApplication.currentOrderType = "" MyApplication.currentOrderId = "" ll_pay_result.gone() showHeader(false) showTitle(false) time = timeOver (5000){ tv_title_slab.text = "已完成($it)" if (it == 0){ onBackPressed() } } } override fun onPause() { super.onPause() if (time != null){ time!!.onFinish() } } override fun setBlackMode(b: Boolean?) { super.setBlackMode(b) if(b!!){ rl_main_bg.setBackgroundResource(R.color.black_191919) 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.color.black_191919) ll_pay_result.setBackgroundResource(R.drawable.bg_slab_main_8_shen_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_pay_result_small_money.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) }else{ rl_main_bg.setBackgroundResource(R.drawable.write) ll_content_web.setBackgroundResource(R.drawable.bg_white_round5) ll_order_top.setBackgroundResource(R.drawable.bg_white_round5) ll_pay_result.setBackgroundResource(R.drawable.bg_white_round5) 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_pay_result_small_money.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) } } @@ -92,33 +111,34 @@ tv_phone.clickDelay { MyUtils.getInstans().CallPhone(this, it.data.phone.toString()) } tv_pay_result_money.text = "￥" + it.data.orderMoney.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() + "元小费" when (orderBean.data.orderState) { 10, 11 -> { ll_pay_result.gone() setTitleText("已取消") } 6, 7 -> { if (it.data.payManner == 2) { ll_pay_result.gone() setTitleText("已完成") } else { addSocketLisener() showPayResultText(it, it.data.orderState) } } 8, 9 -> { if (it.data.payManner == 2) { ll_pay_result.gone() setTitleText("已完成") } else { showPayResultText(it, it.data.orderState) } } } // when (orderBean.data.orderState) { // 10, 11 -> { // ll_pay_result.gone() // setTitleText("已取消") // } // 6, 7 -> { // if (it.data.payManner == 2) { // ll_pay_result.gone() // setTitleText("已完成") // } else { // addSocketLisener() // showPayResultText(it, it.data.orderState) // } // } // 8, 9 -> { // if (it.data.payManner == 2) { // ll_pay_result.gone() // setTitleText("已完成") // } else { // showPayResultText(it, it.data.orderState) // } // } // } } } @@ -194,5 +214,9 @@ iv_back_slab.clickDelay { onBackPressed() } tv_to_main.clickDelay { onBackPressed() } } } app/src/main/java/com/okgoincar/slab/SlabTripActivity.kt
@@ -103,8 +103,8 @@ tv_time_send_prove.textColor(this,R.color.write) tv_current_time.textColor(this,R.color.write) } else { ll_order_top.setBackgroundResource(R.drawable.write) ll_info_top.setBackgroundResource(R.drawable.write) ll_order_top.setBackgroundResource(R.drawable.write_bottom_10) ll_info_top.setBackgroundResource(R.drawable.write_top_10) rl_back.setBackgroundResource(R.drawable.write) iv_back_slab.setImageResource(R.mipmap.icon_back_black) tv_title_slab.textColor(this,R.color.black) @@ -408,6 +408,9 @@ callNet(this, Api.queryOrderInfo, map) { orderBean = gson.fromJson(it, OrderBean::class.java) showUi(orderBean) Handler(Looper.getMainLooper()).postDelayed({ startActivity<SlabOrderOverActivity>("orderId" to orderBean.data.orderId.toString() , "orderType" to orderBean.data.type.toString()) },1000) } callPersion() } @@ -434,7 +437,7 @@ recycler_view_start.adapter = SlabStartAdapter(it.score.toDouble()) tv_company.text = "公司：" + it.company tv_time_send_prove.text = "发证日期：" + it.networkCarlssueDate GlideUtil.load(this, it.avatar, iv_head, 1) GlideUtil.load(this, it.avatar, iv_head, 8) tv_current_time.text = DateUtil.getTime( DateUtil.TYPE7, System.currentTimeMillis() @@ -642,6 +645,14 @@ MyApplication.currentOrderType = "" finish() } BaseEvent.UP_TRIP ->{ callOrder() } BaseEvent.SURE_MONEY -> { startActivity<SlabOrderOverActivity>("orderId" to orderBean.data.orderId.toString() , "orderType" to orderBean.data.type.toString()) finish() } } } } app/src/main/java/com/okgoincar/slab/adapter/SlabMainAdapter.kt
@@ -26,6 +26,7 @@ it.itemView.tv_time.text = item!!.time it.itemView.tv_start.text = item.startAddress it.itemView.tv_end.text = item.endAddress it.itemView.tv_qian.text = item.redMoney.toString()+"元小费" it.itemView.clickDelay { when(item.state){ 2,3,4,5 -> { @@ -47,15 +48,17 @@ private fun setBlackMode(nowTimeBlack: Boolean,view:View) { if (nowTimeBlack){ view.ll_bg.setBackgroundResource(R.color.black_191919) view.ll_bg.setBackgroundResource(R.color.slab_gray) view.tv_time.textColor(context,R.color.write) view.tv_start.textColor(context,R.color.write) view.tv_end.textColor(context,R.color.write) view.tv_qian.textColor(context,R.color.write) }else{ view.ll_bg.setBackgroundResource(R.color.white) view.tv_time.textColor(context,R.color.black) view.tv_start.textColor(context,R.color.black) view.tv_end.textColor(context,R.color.black) view.tv_qian.textColor(context,R.color.black) } }
@@ -31,8 +31,10 @@ private fun setblack(itemView: View, nowTimeBlack: Boolean) { if (nowTimeBlack){ itemView.tv_time.textColor(context,R.color.write) itemView.rl_main.setBackgroundResource(R.color.slab_gray) }else{ itemView.tv_time.textColor(context,R.color.black) itemView.rl_main.setBackgroundResource(R.color.B8B8) } }
@@ -26,10 +26,10 @@ private fun setblack(nowTimeBlack: Boolean, itemView: View) { if (nowTimeBlack){ itemView.rl_back.setBackgroundResource(R.color.black_191919) itemView.rl_back.setBackgroundResource(R.color.slab_gray) itemView.tv_start.textColor(context,R.color.write) }else{ itemView.rl_back.setBackgroundResource(R.drawable.write) itemView.rl_back.setBackgroundResource(R.color.write) itemView.tv_start.textColor(context,R.color.black) } } app/src/main/java/com/okgoincar/utils/UtilKt.kt
@@ -307,13 +307,14 @@ // } //}) fun getNowTimeBlack():Boolean{ var hour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY) if (hour < 7 || hour >= 18){ // if (hour < 7 || hour >= 12){ // if (hour < 7 || hour >= 18){ // return true // } return true } return false } fun toast(s:String){ app/src/main/res/drawable/bg_gray_top.xml
New file @@ -0,0 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <shape xmlns:android="http://schemas.android.com/apk/res/android"> <corners android:topLeftRadius="8dp" android:topRightRadius="8dp"/> <solid android:color="@color/slab_gray"/> </shape> app/src/main/res/drawable/bg_green_top.xml
@@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <shape xmlns:android="http://schemas.android.com/apk/res/android"> <corners android:topLeftRadius="8dp" android:topRightRadius="8dp"/> <solid android:color="#1F5E57"/> <solid android:color="@color/white"/> </shape> app/src/main/res/drawable/bg_slab_gray_4_gray.xml
New file @@ -0,0 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <shape xmlns:android="http://schemas.android.com/apk/res/android"> <solid android:color="#ff383838" /> <corners android:radius="4dp" /> </shape> app/src/main/res/drawable/bg_slab_main.xml
@@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <shape xmlns:android="http://schemas.android.com/apk/res/android"> <gradient android:type="linear" android:useLevel="true" android:startColor="#ff44a08d" android:endColor="#ff093637" android:angle="90" /> android:startColor="@color/white" android:endColor="@color/white" android:angle="90" /> </shape> app/src/main/res/drawable/bg_slab_main_8_black_bottom.xml
New file @@ -0,0 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <shape xmlns:android="http://schemas.android.com/apk/res/android"> <corners android:bottomRightRadius="8dp" android:bottomLeftRadius="8dp"/> <solid android:color="#383838" /> </shape> app/src/main/res/drawable/write_bottom_10.xml
New file @@ -0,0 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <shape xmlns:android="http://schemas.android.com/apk/res/android"> <solid android:color="@color/white"/> <corners android:bottomLeftRadius="@dimen/dp_10" android:bottomRightRadius="@dimen/dp_10"/> </shape> app/src/main/res/drawable/write_top_10.xml
New file @@ -0,0 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <shape xmlns:android="http://schemas.android.com/apk/res/android"> <solid android:color="@color/white"/> <corners android:topRightRadius="@dimen/dp_10" android:topLeftRadius="@dimen/dp_10"/> </shape> app/src/main/res/layout-v21/include_line_48.xml
New file @@ -0,0 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <View xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="1px" android:background="#979797" android:id="@+id/view_line_14" android:alpha="0.3" android:layout_marginLeft="48dp" android:layout_marginRight="48dp" /> app/src/main/res/layout/activity_order_over.xml
@@ -27,6 +27,7 @@ android:id="@+id/tv_title_slab" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textStyle="bold" android:layout_centerInParent="true" android:text="准备出发" android:textColor="#ffffffff" @@ -38,9 +39,9 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@+id/rl_top" android:layout_marginStart="26dp" android:layout_marginTop="23dp" android:layout_marginEnd="20dp" android:layout_marginStart="16dp" android:layout_marginTop="13dp" android:layout_marginEnd="10dp" android:layout_toStartOf="@+id/ll_pay_result" android:orientation="vertical"> @@ -48,6 +49,10 @@ android:id="@+id/ll_content_web" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_10" android:layout_marginEnd="10dp" android:elevation="5dp" android:layout_marginTop="10dp" android:background="@drawable/bg_slab_main_8" android:orientation="vertical" android:paddingStart="10dp"> @@ -69,6 +74,7 @@ android:layout_marginTop="23dp" android:layout_marginBottom="9dp" android:text="123次乘车" android:visibility="gone" android:textColor="#ffffffff" android:textSize="30sp" android:textStyle="bold" /> @@ -77,7 +83,7 @@ android:id="@+id/tv_phone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="23dp" android:layout_marginTop="13dp" android:layout_marginBottom="22dp" android:drawableStart="@mipmap/icon_dial_slab" android:drawablePadding="10dp" @@ -91,9 +97,12 @@ <LinearLayout android:id="@+id/ll_order_top" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@+id/ll_content_web" android:layout_marginStart="10dp" android:layout_marginEnd="10dp" android:layout_marginTop="10dp" android:layout_marginBottom="20dp" android:layout_height="match_parent" android:layout_below="@+id/ll_content_web" android:background="@drawable/bg_slab_main_8_bottom" android:elevation="3dp" android:orientation="vertical" @@ -107,29 +116,27 @@ </RelativeLayout> <include layout="@layout/include_line" /> <TextView android:id="@+id/tv_time" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="11dp" android:layout_marginTop="21dp" android:layout_marginBottom="11dp" android:drawableStart="@drawable/bg_point_main_color_write" android:drawablePadding="5dp" android:drawableStart="@mipmap/icon_time_xiao" android:drawablePadding="7dp" android:text="4月3日 14:00" android:textColor="#ffffffff" android:textSize="26sp" android:textStyle="bold" /> <include layout="@layout/include_line" /> <TextView android:id="@+id/tv_start_address" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="11dp" android:layout_marginTop="28dp" android:layout_marginBottom="11dp" android:drawableStart="@drawable/bg_point_main_color_slab" android:drawablePadding="5dp" @@ -138,13 +145,12 @@ android:textSize="26sp" android:textStyle="bold" /> <include layout="@layout/include_line" /> <TextView android:id="@+id/tv_end_address" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="11dp" android:layout_marginTop="28dp" android:layout_marginBottom="11dp" android:drawableStart="@drawable/bg_point_main_color_black_slab" android:drawablePadding="5dp" @@ -153,22 +159,20 @@ android:textSize="26sp" android:textStyle="bold" /> <include layout="@layout/include_line" /> <TextView android:id="@+id/tv_red_money" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="11dp" android:layout_marginTop="28dp" android:layout_marginBottom="11dp" android:drawableStart="@mipmap/hongbao" android:drawablePadding="5dp" android:drawableStart="@mipmap/hongbao_xiao" android:drawablePadding="10dp" android:text="8元小费" android:textColor="#ffffffff" android:textSize="26sp" android:textStyle="bold" /> <include layout="@layout/include_line" /> </LinearLayout> @@ -189,13 +193,24 @@ android:layout_marginTop="20dp" android:layout_marginEnd="20dp" android:layout_marginBottom="18dp" android:background="@drawable/bg_slab_main_8_shen" android:gravity="center_horizontal" android:orientation="vertical"> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="26dp" android:id="@+id/tv_order_type" android:text="订单金额" android:textStyle="bold" android:textColor="#ffffffff" android:textSize="50sp" /> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:visibility="gone" android:layout_marginTop="30dp" android:orientation="horizontal"> @@ -236,7 +251,7 @@ android:text="¥51.5" android:textColor="#fffea62d" android:textStyle="bold" android:textSize="70sp"/> android:textSize="100sp"/> <LinearLayout android:layout_width="match_parent" @@ -245,6 +260,7 @@ android:orientation="horizontal"> <TextView android:id="@+id/tv_hive_small_money" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="其中含小费：" @@ -263,6 +279,21 @@ </LinearLayout> <include layout="@layout/include_weight_height"/> <TextView android:id="@+id/tv_to_main" android:layout_width="match_parent" android:layout_height="100dp" android:background="@drawable/bg_event_btn_one" android:gravity="center" android:text="返回首页" android:layout_marginEnd="50dp" android:layout_marginStart="50dp" android:textColor="#ffffffff" android:textSize="40sp" /> </LinearLayout> app/src/main/res/layout/activity_trip_slab.xml
@@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:id="@+id/rl_back" android:layout_width="match_parent" android:layout_height="match_parent" android:background="@drawable/bg_slab_main"> @@ -25,6 +25,7 @@ android:id="@+id/tv_title_slab" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textStyle="bold" android:layout_centerInParent="true" android:text="准备出发" android:textColor="#ffffffff" @@ -33,18 +34,21 @@ </RelativeLayout> <LinearLayout android:layout_width="384dp" android:layout_height="wrap_content" android:layout_width="404dp" android:layout_height="match_parent" android:layout_below="@+id/rl_top" android:layout_marginStart="26dp" android:layout_marginTop="23dp" android:layout_marginStart="16dp" android:layout_marginTop="13dp" android:layout_marginBottom="10dp" android:orientation="vertical"> <LinearLayout android:id="@+id/ll_info_top" android:layout_width="384dp" android:layout_height="wrap_content" android:id="@+id/ll_info_top" android:layout_margin="10dp" android:background="@drawable/bg_slab_main_8" android:elevation="5dp" android:orientation="vertical" android:paddingStart="10dp"> @@ -67,7 +71,8 @@ android:text="123次乘车" android:textColor="#ffffffff" android:textSize="30sp" android:textStyle="bold" /> android:textStyle="bold" android:visibility="gone" /> <TextView android:id="@+id/tv_phone" @@ -87,46 +92,39 @@ <LinearLayout android:id="@+id/ll_order_top" android:layout_width="384dp" android:layout_height="wrap_content" android:layout_marginTop="10dp" android:layout_height="match_parent" android:layout_marginStart="10dp" android:layout_marginEnd="10dp" android:layout_marginBottom="10dp" android:background="@drawable/bg_slab_main_8_bottom" android:elevation="3dp" android:elevation="5dp" android:orientation="vertical" android:paddingStart="14dp"> <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content"> android:paddingStart="16dp"> </RelativeLayout> <include layout="@layout/include_line" /> <TextView android:id="@+id/tv_time" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="11dp" android:layout_marginTop="21dp" android:layout_marginBottom="11dp" android:drawableStart="@drawable/bg_point_main_color_write" android:drawablePadding="5dp" android:drawableStart="@mipmap/icon_time_xiao" android:drawablePadding="13dp" 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_marginTop="28dp" android:layout_marginBottom="11dp" android:drawableStart="@drawable/bg_point_main_color_slab" android:drawablePadding="5dp" android:drawablePadding="13dp" android:text="柳州市政府旁红旗连锁超市" android:textColor="#ffffffff" android:textSize="26sp" @@ -137,10 +135,10 @@ android:id="@+id/tv_end_address" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="11dp" android:layout_marginTop="28dp" android:layout_marginBottom="11dp" android:drawableStart="@drawable/bg_point_main_color_black_slab" android:drawablePadding="5dp" android:drawablePadding="13dp" android:text="柳州客运中心" android:textColor="#ffffffff" android:textSize="26sp" @@ -151,21 +149,19 @@ android:id="@+id/tv_red_money" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="11dp" android:layout_marginTop="28dp" android:layout_marginBottom="11dp" android:drawableStart="@mipmap/hongbao" android:drawablePadding="10dp" android:drawableStart="@mipmap/hongbao_xiao" android:drawablePadding="18dp" android:text="8元小费" android:textColor="#ffffffff" android:textSize="26sp" android:textStyle="bold" /> </LinearLayout> </LinearLayout> <RelativeLayout @@ -181,7 +177,7 @@ android:layout_height="match_parent" android:layout_marginStart="23dp" android:layout_marginEnd="26dp" android:layout_marginBottom="120dp"> android:layout_marginBottom="20dp"> <androidx.cardview.widget.CardView android:layout_width="match_parent" @@ -205,7 +201,7 @@ android:layout_height="40dp" android:layout_alignParentBottom="true" android:layout_marginStart="33dp" android:layout_marginBottom="140dp" android:layout_marginBottom="40dp" android:src="@mipmap/pos" /> <ImageView @@ -215,7 +211,7 @@ android:layout_alignParentEnd="true" android:layout_alignParentBottom="true" android:layout_marginEnd="40dp" android:layout_marginBottom="140dp" android:layout_marginBottom="40dp" android:src="@mipmap/daohang" /> </RelativeLayout> @@ -234,38 +230,51 @@ android:layout_height="match_parent" android:orientation="vertical"> <TextView android:id="@+id/tv_title_top" android:layout_width="wrap_content" android:layout_height="91dp" android:gravity="center" android:text="服 务 监 督 卡" android:textColor="#ED5F08" android:textSize="66sp" android:textStyle="bold" /> <TextView android:id="@+id/tv_code_num" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="24dp" android:textStyle="bold" android:layout_marginTop="16dp" android:text="证号：123441415242345678" android:textColor="#ffffffff" android:textSize="34sp" /> android:textSize="30sp" /> <TextView android:id="@+id/tv_name_car_man" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="31dp" android:layout_marginTop="11dp" android:textStyle="bold" android:text="姓名：张师傅" android:textColor="#ffffffff" android:textSize="34sp" /> android:textSize="30sp" /> <TextView android:id="@+id/tv_car_num_var" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="31dp" android:layout_marginTop="11dp" android:text="车牌：桂B12345" android:textStyle="bold" android:textColor="#ffffffff" android:textSize="34sp" /> android:textSize="30sp" /> <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="31dp" android:layout_marginTop="11dp" android:gravity="center_vertical" android:orientation="horizontal"> @@ -274,8 +283,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="星级：" android:textStyle="bold" android:textColor="#ffffffff" android:textSize="34sp" /> android:textSize="30sp" /> <androidx.recyclerview.widget.RecyclerView android:id="@+id/recycler_view_start" @@ -288,29 +298,30 @@ android:id="@+id/tv_company" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="31dp" android:layout_marginTop="11dp" android:text="公司：云森科技公司" android:textStyle="bold" android:textColor="#ffffffff" android:textSize="34sp" /> android:textSize="30sp" /> <TextView android:id="@+id/tv_time_send_prove" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="31dp" android:layout_marginTop="11dp" android:text="发证日期：2018.12.1" android:textStyle="bold" android:textColor="#ffffffff" android:textSize="34sp" /> android:textSize="30sp" /> </LinearLayout> <ImageView android:id="@+id/iv_head" android:layout_width="200dp" android:layout_height="300dp" android:layout_height="200dp" android:layout_alignParentEnd="true" android:layout_marginTop="103dp" android:layout_marginTop="173dp" android:layout_marginEnd="26dp" /> <TextView @@ -319,11 +330,12 @@ android:layout_height="wrap_content" android:layout_below="@+id/iv_head" android:layout_alignParentEnd="true" android:layout_marginTop="20dp" android:layout_marginTop="14dp" android:textStyle="bold" android:layout_marginEnd="35dp" android:text="8月32日星期三" android:textColor="#ffffffff" android:textSize="34sp" /> android:textSize="26sp" /> </RelativeLayout> @@ -342,7 +354,7 @@ android:paddingBottom="13dp" android:text="收起" android:textColor="#ffffffff" android:textSize="30sp" /> android:textSize="40sp" /> <com.okgoincar.utils.view.SlidingButton @@ -352,6 +364,7 @@ android:layout_alignParentBottom="true" android:layout_marginStart="26dp" android:layout_marginEnd="26dp" android:layout_marginBottom="14dp" /> android:layout_marginBottom="14dp" android:visibility="gone" /> </RelativeLayout> app/src/main/res/layout/fragment_base_recycler.xml
@@ -28,11 +28,12 @@ app:srlEnableAutoLoadMore="false"> <com.scwang.smartrefresh.layout.header.ClassicsHeader android:id="@+id/ch_class_head" android:layout_width="match_parent" android:layout_height="wrap_content" app:srlTextSizeTitle="20dp" app:srlTextSizeTime="20dp" app:srlAccentColor="@color/white" app:srlAccentColor="@color/black" android:gravity="center" /> <FrameLayout @@ -89,11 +90,12 @@ </FrameLayout> <com.scwang.smartrefresh.layout.footer.ClassicsFooter android:id="@+id/ch_class_footer" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" app:srlTextNothing="没有更多了" app:srlAccentColor="@color/white" app:srlAccentColor="@color/black" app:srlTextSizeTitle="20sp" /> </com.scwang.smartrefresh.layout.SmartRefreshLayout> app/src/main/res/layout/item_get_order.xml
@@ -11,9 +11,9 @@ android:orientation="vertical"> <RelativeLayout android:id="@+id/rl_top_back" android:layout_width="match_parent" android:layout_height="140dp" android:id="@+id/rl_top_back" android:background="@color/green_154c49"> <TextView @@ -60,21 +60,19 @@ <RelativeLayout android:layout_width="match_parent" android:background="#154C49" android:layout_height="wrap_content"> android:layout_height="wrap_content" android:background="#154C49"> <View android:id="@+id/view_line_14" android:layout_width="match_parent" android:layout_height="1dp" android:background="#979797" android:id="@+id/view_line_14" android:alpha="0.7" android:layout_marginLeft="48dp" android:layout_marginRight="48dp" /> android:alpha="0.7" android:background="#979797" /> </RelativeLayout> <LinearLayout @@ -91,9 +89,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="6dp" android:layout_marginBottom="6dp" android:drawableStart="@drawable/bg_point_main_color_write" android:drawablePadding="5dp" android:layout_marginBottom="6dp" android:drawableStart="@mipmap/icon_time_xiao" android:text="4月3日 14:00" android:textColor="@color/write" android:textSize="32sp" @@ -130,8 +128,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="3dp" android:layout_marginStart="2dp" android:layout_marginBottom="17dp" android:drawableStart="@mipmap/hongbao" android:drawableStart="@mipmap/hongbao_xiao" android:drawablePadding="10dp" android:text="8元小费" android:textColor="@color/write" app/src/main/res/layout/item_history_event_slab.xml
@@ -4,6 +4,9 @@ android:layout_height="80dp" android:layout_marginStart="26dp" android:layout_marginEnd="26dp" android:id="@+id/rl_main" android:background="@color/B8B8" android:elevation="6dp" android:layout_marginTop="24dp" >
@@ -2,8 +2,10 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="6dp" android:layout_marginTop="6dp" android:id="@+id/ll_bg" android:layout_margin="@dimen/dp_10" android:elevation="6dp" android:background="@color/_green1f5e57" android:orientation="vertical"> @@ -19,12 +21,14 @@ android:layout_width="16dp" android:layout_height="16dp" android:layout_gravity="bottom" android:layout_marginBottom="@dimen/dp_10" android:layout_marginEnd="6dp" android:src="@mipmap/icon_time_gray" /> <TextView android:id="@+id/tv_time" android:layout_width="wrap_content" android:textStyle="bold" android:layout_height="wrap_content" android:layout_marginTop="10dp" android:text="4月3日 14:00" @@ -53,7 +57,6 @@ android:layout_height="wrap_content" android:layout_marginStart="13dp" android:layout_marginTop="12dp" android:layout_marginBottom="10dp" android:drawableStart="@drawable/bg_point_main_color_s" android:drawablePadding="6dp" android:text="柳州客运中心" @@ -61,5 +64,31 @@ android:textSize="26sp" android:textStyle="bold" /> <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="6dp" android:orientation="horizontal"> <ImageView android:layout_width="32dp" android:layout_height="32dp" android:layout_gravity="bottom" android:layout_marginTop="13dp" android:layout_marginBottom="@dimen/dp_10" android:src="@mipmap/hongbao" /> <TextView android:id="@+id/tv_qian" android:textStyle="bold" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="10dp" android:text="柳州客运中心" android:textColor="@color/write" android:textSize="26sp" /> </LinearLayout> </LinearLayout> app/src/main/res/layout/item_mine_event_slab.xml
@@ -2,8 +2,8 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="14dp" android:layout_marginEnd="14dp" android:layout_marginStart="4dp" android:layout_marginEnd="4dp" android:layout_marginBottom="10dp" android:paddingTop="9dp"> @@ -12,8 +12,12 @@ android:id="@+id/rl_back" android:layout_width="match_parent" android:layout_height="161dp" android:elevation="5dp" android:layout_marginStart="10dp" android:layout_marginEnd="10dp" android:layout_marginBottom="10dp" android:background="@color/main_green" android:layout_marginTop="30dp"> android:layout_marginTop="20dp"> <TextView android:id="@+id/tv_start" @@ -41,6 +45,7 @@ <TextView android:id="@+id/tv_content" android:layout_width="194dp" android:elevation="5dp" android:layout_height="60dp" android:layout_centerHorizontal="true" android:background="@drawable/bg_event_btn_one" app/src/main/res/layout/item_order_list_slab.xml
New file @@ -0,0 +1,37 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_margin="12dp" android:orientation="horizontal" android:padding="24dp" android:id="@+id/ll_main" android:elevation="6dp" android:background="@color/white" android:layout_height="wrap_content"> <TextView android:id="@+id/tv_time" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="4月3日 14:00" android:textStyle="bold" android:drawablePadding="15dp" android:drawableStart="@mipmap/time_black" android:textColor="#ff383838" android:textSize="40sp" /> <include layout="@layout/include_weight_width"/> <TextView android:id="@+id/tv_money" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="订单金额：¥20.00" android:drawableStart="@mipmap/hongbao" android:drawablePadding="15dp" android:textStyle="bold" android:textColor="#ff383838" android:textSize="40sp" /> </LinearLayout> app/src/main/res/layout/order_detail.xml
New file @@ -0,0 +1,145 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent"> <RelativeLayout android:layout_width="715dp" android:layout_height="wrap_content" android:id="@+id/rl_back" android:background="@drawable/bg_white_6" android:layout_centerInParent="true" android:layout_marginTop="50dp" android:layout_marginBottom="50dp"> <TextView android:id="@+id/tv_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerHorizontal="true" android:layout_margin="13dp" android:text="订单详情" android:textColor="@color/sdsdf" android:textSize="60sp" /> <ImageView android:id="@+id/iv_close" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:padding="32dp" android:src="@mipmap/close_big" /> <View android:id="@+id/view_line_14" android:layout_width="match_parent" android:layout_height="1dp" android:layout_below="@+id/iv_close" android:layout_marginLeft="48dp" android:layout_marginRight="48dp" android:alpha="0.3" android:background="#979797" /> <LinearLayout android:id="@+id/ll_order_top" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@+id/iv_close" android:orientation="vertical" android:paddingStart="33dp" android:paddingTop="15dp"> <TextView android:id="@+id/tv_time" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="6dp" android:layout_marginBottom="6dp" android:drawableStart="@mipmap/icon_time_xiao" android:drawablePadding="5dp" android:text="4月3日 14:00" android:textColor="@color/black" android:textSize="32sp" android:textStyle="bold" /> <TextView android:id="@+id/tv_start" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="6dp" android:layout_marginBottom="6dp" android:drawableStart="@drawable/bg_point_main_color_slab" android:drawablePadding="5dp" android:text="柳州市政府" android:textColor="@color/black" android:textSize="32sp" android:textStyle="bold" /> <TextView android:id="@+id/tv_end" android:layout_width="wrap_content" 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:text="柳州客运中心" android:textColor="@color/black" android:textSize="32sp" android:textStyle="bold" /> <TextView android:id="@+id/tv_money" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="2dp" android:layout_marginTop="3dp" android:drawableStart="@mipmap/hongbao_xiao" android:drawablePadding="10dp" android:text="8元小费" android:textColor="@color/black" android:textSize="32sp" android:textStyle="bold" /> <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="6dp" android:layout_marginBottom="17dp" android:gravity="center_vertical" android:orientation="horizontal"> <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@mipmap/pay_order_detail" /> <TextView android:id="@+id/tv_money_order" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_5" android:text="订单金额：" android:textColor="@color/black" android:textSize="32sp" android:textStyle="bold" /> <TextView android:id="@+id/tv_money_num" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="18.00元" android:textColor="#ED5F08" android:textSize="32sp" android:textStyle="bold" /> </LinearLayout> </LinearLayout> </RelativeLayout> </RelativeLayout> app/src/main/res/layout/slab_activity_main.xml
@@ -1,19 +1,19 @@ <?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/ct_bg" android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/ct_bg" android:background="@drawable/bg_slab_main"> android:background="@color/white"> <LinearLayout android:id="@+id/ll_top" android:layout_width="384dp" android:layout_width="415dp" android:layout_height="68dp" android:layout_marginStart="26dp" android:layout_marginTop="50dp" android:background="@drawable/bg_green_top" android:elevation="4dp" android:gravity="center_vertical" android:orientation="horizontal" app:layout_constraintStart_toStartOf="parent" @@ -22,73 +22,80 @@ <TextView android:id="@+id/tv_server_ing" android:layout_width="0dp" android:gravity="center" android:layout_weight="1" android:layout_height="wrap_content" android:layout_marginStart="15dp" android:layout_marginEnd="15dp" android:text="出租" android:layout_weight="1" android:gravity="center" android:text="出租(1)" android:textColor="@color/main_yellow" android:textSize="28sp" /> android:textSize="31sp" android:textStyle="bold" /> <View android:layout_width="0.5dp" android:layout_height="match_parent" android:layout_marginTop="20dp" android:layout_marginBottom="20dp" android:background="@color/write" /> android:background="#D1D1D1" /> <TextView android:id="@+id/iv_small" android:layout_width="0dp" android:layout_weight="1" android:gravity="center" android:layout_height="wrap_content" android:layout_marginStart="15dp" android:layout_marginEnd="15dp" android:layout_weight="1" android:gravity="center" android:text="小件" android:textColor="@color/write" android:textSize="28sp" /> android:textColor="@color/black" android:textSize="31sp" android:textStyle="bold" /> <View android:layout_width="0.5dp" android:layout_height="match_parent" android:layout_marginTop="20dp" android:layout_marginBottom="20dp" android:background="@color/write" /> android:background="#D1D1D1" /> <TextView android:id="@+id/tv_wait_server" android:layout_width="0dp" android:gravity="center" android:layout_weight="1" android:layout_height="wrap_content" android:layout_marginStart="15dp" android:layout_marginEnd="15dp" android:layout_weight="1" android:gravity="center" android:text="预约" android:textColor="@color/write" android:textSize="28sp" /> android:textColor="@color/black" android:textSize="31sp" android:textStyle="bold" /> </LinearLayout> <RelativeLayout android:id="@+id/rl_container" android:layout_width="384dp" android:layout_height="wrap_content" android:layout_marginStart="26dp" android:layout_width="435dp" android:layout_height="0dp" android:layout_marginStart="16dp" android:layout_marginBottom="10dp" android:elevation="6dp" app:layout_constraintBottom_toTopOf="@+id/tv_more" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/ll_top" /> <TextView android:id="@+id/tv_title" android:id="@+id/tv_title_top" android:layout_width="wrap_content" android:layout_height="91dp" android:layout_marginTop="30dp" android:gravity="center" android:text="服务监督卡" android:textColor="#ffffa72d" android:textColor="#ED5F08" android:textSize="66sp" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/ll_top" app:layout_constraintTop_toTopOf="parent" /> @@ -103,7 +110,7 @@ android:background="#979797" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/ll_top" app:layout_constraintTop_toBottomOf="@+id/tv_title" /> app:layout_constraintTop_toBottomOf="@+id/tv_title_top" /> <LinearLayout android:layout_width="0dp" @@ -113,7 +120,7 @@ android:paddingStart="40dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/ll_top" app:layout_constraintTop_toBottomOf="@+id/tv_title"> app:layout_constraintTop_toBottomOf="@+id/tv_title_top"> <TextView android:id="@+id/tv_code_num" @@ -121,32 +128,35 @@ android:layout_height="wrap_content" android:layout_marginTop="24dp" android:text="证号：123441415242345678" android:textColor="#ffffffff" android:textSize="34sp" /> android:textColor="@color/black" android:textSize="30sp" android:textStyle="bold" /> <TextView android:id="@+id/tv_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="31dp" android:layout_marginTop="11dp" android:text="姓名：张师傅" android:textColor="#ffffffff" android:textSize="34sp" /> android:textColor="@color/black" android:textSize="30sp" android:textStyle="bold" /> <TextView android:id="@+id/tv_car_num" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="31dp" android:layout_marginTop="11dp" android:text="车牌：桂B12345" android:textColor="#ffffffff" android:textSize="34sp" /> android:textColor="@color/black" android:textSize="30sp" android:textStyle="bold" /> <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="11dp" android:gravity="center_vertical" android:layout_marginTop="31dp" android:orientation="horizontal"> <TextView @@ -154,8 +164,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="星级：" android:textColor="#ffffffff" android:textSize="34sp" /> android:textColor="@color/black" android:textSize="30sp" android:textStyle="bold" /> <androidx.recyclerview.widget.RecyclerView android:id="@+id/recycler_view_start" @@ -168,19 +179,21 @@ android:id="@+id/tv_company" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="31dp" android:layout_marginTop="11dp" android:text="公司：云森科技公司" android:textColor="#ffffffff" android:textSize="34sp" /> android:textColor="@color/black" android:textSize="30sp" android:textStyle="bold" /> <TextView android:id="@+id/tv_time" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="31dp" android:layout_marginTop="11dp" android:text="发证日期：2018.12.1" android:textColor="#ffffffff" android:textSize="34sp" /> android:textColor="@color/black" android:textSize="30sp" android:textStyle="bold" /> </LinearLayout> @@ -188,51 +201,102 @@ <ImageView android:id="@+id/iv_head" android:layout_width="200dp" android:layout_height="300dp" android:layout_height="200dp" android:layout_marginTop="103dp" android:layout_marginEnd="26dp" android:elevation="5dp" android:scaleType="centerCrop" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/tv_title" /> app:layout_constraintTop_toBottomOf="@+id/tv_title_top" /> <TextView android:id="@+id/tv_current_time" android:layout_width="wrap_content" android:layout_marginEnd="35dp" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="20dp" android:layout_marginEnd="35dp" android:elevation="5dp" android:text="8月32日星期三" android:textColor="#ffffffff" android:textSize="34sp" android:textColor="@color/black" android:textSize="26sp" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@+id/iv_head" app:layout_constraintTop_toBottomOf="@+id/iv_head" /> <com.wang.avi.AVLoadingIndicatorView style="@style/AVLoadingIndicatorView.Small" android:layout_width="150dp" android:layout_height="150dp" android:layout_marginEnd="52dp" android:layout_marginBottom="5dp" app:indicatorColor="#E8340C" app:indicatorName="BallScaleMultipleIndicator" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/tv_car" /> <TextView android:id="@+id/tv_car_statue" android:layout_width="150dp" android:layout_height="150dp" android:layout_marginEnd="52dp" android:layout_marginBottom="5dp" android:gravity="center" android:text="听单中" android:textColor="@color/black" android:textSize="40sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/tv_car" /> <TextView android:id="@+id/tv_car" android:layout_width="260dp" android:layout_height="68dp" android:layout_height="90dp" android:visibility="invisible" android:layout_marginEnd="27dp" android:enabled="false" android:layout_marginBottom="35dp" android:background="@drawable/bg_login" android:elevation="5dp" android:gravity="center" android:text="收车" android:textColor="#ffffffff" android:textSize="40sp" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" /> <TextView android:id="@+id/tv_more" android:layout_width="260dp" android:layout_height="90dp" android:text="历史订单" android:background="@drawable/bg_task" android:gravity="center" android:textSize="40sp" android:textColor="#F28105" android:textStyle="bold" android:layout_marginBottom="17dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@+id/rl_container" /> <TextView android:id="@+id/ll_task" android:layout_width="260dp" android:layout_height="68dp" android:layout_height="90dp" android:layout_marginEnd="27dp" android:layout_marginBottom="35dp" android:layout_marginBottom="17dp" android:background="@drawable/bg_task" android:elevation="5dp" android:gravity="center" android:text="奖励活动" android:textColor="#F28105" android:textSize="40sp" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/tv_car" /> app:layout_constraintEnd_toEndOf="parent" /> </androidx.constraintlayout.widget.ConstraintLayout> app/src/main/res/mipmap-xxhdpi/close_big.png
@@ -87,10 +87,16 @@ <color name="yellow_ffa72d">#FFA72D</color> <color name="yellow_FF7656">#FF7656</color> <color name="yellow_FFA72D">#FFA72D</color> <color name="slab_yellow_zhong">#ED5F08</color> <color name="black_mode_383838">#383838</color> <color name="black_191919">#191919</color> <color name="_green1f5e57">#1F5E57</color> <color name="green_154c49">#154C49</color> <color name="slab_gray">#39373a</color> <color name="slab_black">#191919</color> <color name="B8B8">#33B8B8B8</color> <color name="sdsdf">#ffed5f08</color><!--黑色 --> </resources> xldUtils/src/main/res/values/colors.xml
@@ -18,4 +18,5 @@ <color name="bg_line">#DEDEDE</color> <color name="white">@android:color/white</color> <color name="qing">#00C47A</color> <color name="gray_slab">#9A9696</color> </resources>
