From 1a9a9b2e873f5514eebea1bfd49f579ced838c48 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 16 Mar 2023 14:11:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[m1]=20[=E8=AF=B7=E6=B1=82=E5=8F=B8?= =?UTF-8?q?=E6=9C=BA=E8=B6=85=E6=97=B62=E5=88=86=E9=92=9F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/bus/passenger/ui/view/LineSiteView.kt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) 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 dbc648cb24..75f2366d28 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 @@ -29,12 +29,14 @@ import com.mogo.och.bus.passenger.presenter.BusPassengerFunctionDevicePresenter import com.mogo.och.bus.passenger.ui.M1ContainFragment import com.mogo.och.bus.passenger.ui.adapter.OrderLineItemAdapter import com.mogo.och.bus.passenger.ui.adapter.OrderSiteItemAdapter +import com.mogo.och.bus.passenger.utils.RxUtils import com.mogo.och.bus.passenger.view.BottomDecoration import com.mogo.och.common.module.bean.dpmsg.ChangeDestMsg import com.mogo.och.common.module.bean.dpmsg.DPMsgType import com.mogo.och.common.module.biz.constant.OchCommonConst import com.mogo.och.common.module.biz.network.OchCommonServiceCallback import com.mogo.och.common.module.manager.OCHPlanningStopSideStatusManager +import io.reactivex.disposables.Disposable import kotlinx.android.synthetic.m1.m1_order_lineside.view.* import me.jessyan.autosize.utils.AutoSizeUtils @@ -84,6 +86,8 @@ class LineSiteView @JvmOverloads constructor( duration = 1000 } private var changeCheck: M1ContainFragment.ChangeCheck?=null + private var subscribeSelectLine: Disposable? = null + private var subscribeSelectSite: Disposable? = null init { LayoutInflater.from(context).inflate(R.layout.m1_order_lineside, this, true) @@ -284,6 +288,11 @@ class LineSiteView @JvmOverloads constructor( TAGLINELOOP, LoopInfo(3, ::checkServerStatus) ) + RxUtils.disposeSubscribe(subscribeSelectLine) + subscribeSelectLine= RxUtils.createSubscribe(120_1000){ + ToastUtils.showShort("请联系安全员确认") + endAni() + } } } tv_site_only_submit.onClick { @@ -313,6 +322,11 @@ class LineSiteView @JvmOverloads constructor( TAGLINELOOP, LoopInfo(3, ::checkServerStatus) ) + RxUtils.disposeSubscribe(subscribeSelectSite) + subscribeSelectSite = RxUtils.createSubscribe(120_1000){ + ToastUtils.showShort("请联系安全员确认") + endAni() + } } tv_loading_wait_driver_title.onClick { endAni() @@ -408,6 +422,7 @@ class LineSiteView @JvmOverloads constructor( tempCheckLineIsSubmit = false ToastUtils.showShort("司机端拒绝请重新选择") } + RxUtils.disposeSubscribe(subscribeSelectLine) } else { if (msg.isConfirmed) { ToastUtils.showShort("站点确定") @@ -430,6 +445,7 @@ class LineSiteView @JvmOverloads constructor( tempCheckLineIsSubmit = true ToastUtils.showShort("司机端拒绝请重新选择") } + RxUtils.disposeSubscribe(subscribeSelectSite) } BusPassengerModelLoopManager.removeLoopFunction(TAGLINELOOP) endAni() @@ -465,6 +481,8 @@ class LineSiteView @JvmOverloads constructor( override fun onDetachedFromWindow() { super.onDetachedFromWindow() loadingAni.cancel() + RxUtils.disposeSubscribe(subscribeSelectLine) + RxUtils.disposeSubscribe(subscribeSelectSite) CallerTelematicListenerManager.removeListener(TAG) BusPassengerModelLoopManager.removeLoopFunction(TAGLINELOOP) CharterPassengerModel.setControllerStatusCallback(TAG, null) From cce2256c68a6da5d328368a61c30402d62c734e9 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Thu, 16 Mar 2023 15:17:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[m2][fix]=E8=A7=A3=E5=86=B3=E5=81=B6?= =?UTF-8?q?=E7=8E=B0=E7=9A=84=E4=B9=98=E5=AE=A2=E5=B1=8F=E5=8D=A1=E9=A1=BF?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gradle.properties b/gradle.properties index b417f92818..6be651f447 100644 --- a/gradle.properties +++ b/gradle.properties @@ -66,23 +66,23 @@ SERVICE_BIZ_VERSION=1.2.4 LOGLIB_VERSION=1.5.11 ######## MogoAiCloudSDK Version ######## # 网络请求LOGLIB_VERSION -MOGO_NETWORK_VERSION=1.4.5.10 +MOGO_NETWORK_VERSION=1.4.5.12 # 鉴权 -MOGO_PASSPORT_VERSION=1.4.5.10 +MOGO_PASSPORT_VERSION=1.4.5.12 # 常链接 -MOGO_SOCKET_VERSION=1.4.5.10 +MOGO_SOCKET_VERSION=1.4.5.12 # 数据采集 -MOGO_REALTIME_VERSION=1.4.5.10 +MOGO_REALTIME_VERSION=1.4.5.12 # 探路，道路事件发布，获取 -MOGO_TANLU_VERSION=1.4.5.10 +MOGO_TANLU_VERSION=1.4.5.12 # 直播推流 -MOGO_LIVE_VERSION=1.4.5.10 +MOGO_LIVE_VERSION=1.4.5.12 # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.4.5.10 +MOGO_TRAFFICLIVE_VERSION=1.4.5.12 # 定位服务 -MOGO_LOCATION_VERSION=1.4.5.10 +MOGO_LOCATION_VERSION=1.4.5.12 # 远程通讯模块 -MOGO_TELEMATIC_VERSION=1.4.5.10 +MOGO_TELEMATIC_VERSION=1.4.5.12 ######## MogoAiCloudSDK Version ######## # 自研地图 MAP_SDK_VERSION=2.10.0.9 From 8f310a2d58549270bffe2fb375f716cded50f8a2 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Thu, 16 Mar 2023 15:24:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[m2][opt]=E5=85=A8=E8=A7=88=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E9=99=8D=E4=BD=8E=E5=AE=9A=E4=BD=8D=E6=8E=A5=E6=94=B6?= =?UTF-8?q?=E7=9A=84=E9=A2=91=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/eagle/core/function/view/OverMapView.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt index e3fb3283e0..3cef39a6a1 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt @@ -261,7 +261,7 @@ class OverMapView @JvmOverloads constructor( CallerPlanningRottingListenerManager.addListener(TAG, this) initAMapView(context) // 注册定位监听 - CallerChassisLocationGCJ02ListenerManager.addListener(TAG, 20, this) + CallerChassisLocationGCJ02ListenerManager.addListener(TAG, this) //设置全览模式 overLayerView?.setOnClickListener { displayCustomOverView() } overLayerView?.let {