From 84cb01a95716cc424e1f97f7f502c46a110e61a8 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 7 Mar 2023 23:11:33 +0800 Subject: [PATCH] =?UTF-8?q?[m1]=20[1.1.2]=20[=E4=B9=98=E5=AE=A2=E5=B1=8F?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E5=8D=95=E7=8B=AC=E4=BF=AE=E6=94=B9=E7=AB=99?= =?UTF-8?q?=E7=82=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/adapter/OrderSiteItemAdapter.kt | 12 +-- .../och/bus/passenger/ui/view/LineSiteView.kt | 86 ++++++++++++++++-- .../drawable-nodpi/m1_order_site_check.png | Bin 1758 -> 1779 bytes .../m1_order_site_check_enable.png | Bin 0 -> 1478 bytes .../src/m1/res/values/color.xml | 2 + 5 files changed, 88 insertions(+), 12 deletions(-) create mode 100644 OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_site_check_enable.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/OrderSiteItemAdapter.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/OrderSiteItemAdapter.kt index 3f013fb0be..b74994b122 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/OrderSiteItemAdapter.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/OrderSiteItemAdapter.kt @@ -36,9 +36,9 @@ class OrderSiteItemAdapter(private val context: Context, private val dataList: M } fun setEnable(enable:Boolean){ this.enable = enable - dataList.forEachIndexed { _, lineInfo -> - lineInfo.isCheck = false - } +// dataList.forEachIndexed { _, lineInfo -> +// lineInfo.isCheck = false +// } notifyDataSetChanged() } @@ -57,10 +57,10 @@ class OrderSiteItemAdapter(private val context: Context, private val dataList: M }else{ holder.iv_site_checked.setImageResource(R.drawable.m1_order_site_check) } - holder.tv_site_site_name.setTextColor(ContextCompat.getColor(context,R.color.bus_p_m1_2C2D31)) + holder.tv_site_site_name.setTextColor(ContextCompat.getColor(context,R.color.bus_p_m1_222222)) }else { - holder.iv_site_checked.setImageResource(R.drawable.m1_order_site_check) - holder.tv_site_site_name.setTextColor(ContextCompat.getColor(context,R.color.bus_p_m1_662C2D31)) + holder.iv_site_checked.setImageResource(R.drawable.m1_order_site_check_enable) + holder.tv_site_site_name.setTextColor(ContextCompat.getColor(context,R.color.bus_p_m1_332C2D31)) } holder.tv_site_site_name.text = siteInfo.siteName holder.itemView.setOnClickListener { diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt index 720290509d..ee41893145 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt @@ -61,6 +61,9 @@ class LineSiteView @JvmOverloads constructor( // 向司机端临时提交的终点站点 private var tempCheckSite: SiteInfoResponse.SiteInfo? = null + private var tempCheckLineIsSubmit = false + private var isChangeIngLineAndSite = false + private val lineList = mutableListOf() private val siteList = mutableListOf() @@ -104,10 +107,14 @@ class LineSiteView @JvmOverloads constructor( checkSite = hasSetLineAndSite.second lineList.clear() resetData() + isChangeIngLineAndSite = true } else { queryLineList() setEnableLineStatus(true) setEnableSiteStatus(false) + onlyChangeSite(false) + setSiteAdapterEnable(false) + isChangeIngLineAndSite = false } initListener() @@ -122,10 +129,14 @@ class LineSiteView @JvmOverloads constructor( queryLineList() setEnableLineStatus(true) setEnableSiteStatus(false) + onlyChangeSite(false) + setSiteAdapterEnable(false) }else{ checkLine?.let { setEnableLineStatus(false) setEnableSiteStatus(false) + onlyChangeSite(false) + setSiteAdapterEnable(true) lineAdapter.submitLine(it) checkLine?.let { querySitesByLineId(it.lineId.toString(),false) @@ -150,12 +161,26 @@ class LineSiteView @JvmOverloads constructor( /** * 设置是否可用选择站点 */ - private fun setEnableSiteStatus(enable: Boolean) { - if (enable) { + private fun setEnableSiteStatus(cancleAndSubmit: Boolean) { + if (cancleAndSubmit) { g_side_cancle_submit_group.visibility = View.VISIBLE - siteAdapter.setEnable(true) } else { g_side_cancle_submit_group.visibility = View.GONE + } + } + + fun onlyChangeSite(submit:Boolean){ + if (submit) { + g_side_submit_group.visibility = View.VISIBLE + } else { + g_side_submit_group.visibility = View.GONE + } + } + + fun setSiteAdapterEnable(enable: Boolean){ + if(enable){ + siteAdapter.setEnable(true) + }else{ siteAdapter.setEnable(false) } } @@ -172,13 +197,24 @@ class LineSiteView @JvmOverloads constructor( override fun onCheckListener(siteInfo: SiteInfoResponse.SiteInfo) { // 设置临时选中的 tempCheckSite = siteInfo + if(isChangeIngLineAndSite) { + checkSite?.let { + if (it.siteId == siteInfo.siteId) { + onlyChangeSite(false) + } else { + onlyChangeSite(true) + } + } + } } } tv_line_cancle.onClick { + isChangeIngLineAndSite = false resetData() } tv_site_cancle.onClick { + isChangeIngLineAndSite = false resetData() } tv_line_submit.onClick { @@ -213,7 +249,7 @@ class LineSiteView @JvmOverloads constructor( } } tv_site_submit.onClick { - if (tempCheckSite == null) { + if (!tempCheckLineIsSubmit) { ToastUtils.showLong("请选择站点") return@onClick } @@ -245,6 +281,34 @@ class LineSiteView @JvmOverloads constructor( ) } } + tv_site_only_submit.onClick { + // 线路不换只换站点 + if (!CallerTelematicManager.getClientConnStatus()) { + ToastUtils.showLong("乘客屏无法连接司机屏请联系安全员") + return@onClick + } + tempCheckSite?.let { siteInfo -> + val msg = ChangeDestMsg( + siteInfo.lineId!!.toInt(), + siteInfo.lineName!!, + currentSite!!.siteId!!.toInt(), + currentSite!!.siteName!!, + siteInfo.siteId!!.toInt(), + siteInfo.siteName!!, + false + ) + CallerTelematicManager.sendMsgToServer( + OchCommonConst.BUSINESS_STRING, + GsonUtils.toJson(msg).toByteArray() + ) + } + startAni() + // 启动查看和司机端链接 + BusPassengerModelLoopManager.setLoopFunction( + TAGLINELOOP, + LoopInfo(3, ::checkServerStatus) + ) + } tv_loading_wait_driver_title.onClick { endAni() } @@ -259,7 +323,8 @@ class LineSiteView @JvmOverloads constructor( if (gnssSpeed < 0.5) { // TODO: 自驾中 需要 靠边停车中、到站 // TODO: 没有自驾中 需要 靠边停车中、到站 - + isChangeIngLineAndSite = false + onlyChangeSite(false) // 可以切换路径 setEnableLineStatus(true) queryLineList() @@ -286,26 +351,34 @@ class LineSiteView @JvmOverloads constructor( ToastUtils.showShort("线路确定") setEnableLineStatus(false) setEnableSiteStatus(true) + onlyChangeSite(false) + setSiteAdapterEnable(true) + tempCheckLineIsSubmit = true tempCheckLine?.let { lineAdapter.submitLine(it) } } else { + tempCheckLineIsSubmit = false ToastUtils.showShort("司机端拒绝请重新选择") } } else { if (msg.isConfirmed) { ToastUtils.showShort("站点确定") setEnableLineStatus(false) - setEnableSiteStatus(false) + setEnableSiteStatus(true) + onlyChangeSite(false) + setSiteAdapterEnable(true) checkLine = tempCheckLine checkSite = tempCheckSite tempCheckLine = null tempCheckSite = null + tempCheckLineIsSubmit = false checkLine?.let { lineAdapter.submitLine(it) } go2StartCar() } else { + tempCheckLineIsSubmit = false ToastUtils.showShort("司机端拒绝请重新选择") } } @@ -404,6 +477,7 @@ class LineSiteView @JvmOverloads constructor( } if(isSelect){ data.data.last().isCheck = true + tempCheckSite = data.data.last() }else{ data.data.forEach { if (it.siteId == checkSite?.siteId) { diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_site_check.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_site_check.png index 94446335e8054a6284aedb28658086f5094f52ca..320ac5abd8e5f889760213df969446211098ba07 100644 GIT binary patch delta 1669 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 literal 0 HcmV?d00001 diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/values/color.xml b/OCH/mogo-och-charter-passenger/src/m1/res/values/color.xml index 685b7a7cfe..26fd58da09 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/res/values/color.xml +++ b/OCH/mogo-och-charter-passenger/src/m1/res/values/color.xml @@ -23,7 +23,9 @@ #485173 #292C39 #2C2D31 + #222222 #662C2D31 + #332C2D31 #80288DFC #3060ABFE