From 0c0da9c7be544c4baa99bff8689473eb26459ef8 Mon Sep 17 00:00:00 2001 From: renwj Date: Thu, 25 May 2023 20:08:15 +0800 Subject: [PATCH 1/6] =?UTF-8?q?[3.2.0][=E5=BA=94=E7=94=A8=E5=8D=87?= =?UTF-8?q?=E7=BA=A7]=20=E9=9D=99=E9=BB=98=E5=8D=87=E7=BA=A7=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E5=8E=BB=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../upgrade/UpgradeAppNetWorkManager.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeAppNetWorkManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeAppNetWorkManager.kt index 78fd9e3522..109c854f62 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeAppNetWorkManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeAppNetWorkManager.kt @@ -19,7 +19,6 @@ import com.mogo.eagle.core.network.* import com.mogo.eagle.core.network.utils.* import com.mogo.eagle.core.utilcode.download.Config import com.mogo.eagle.core.utilcode.kotlin.* -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.* import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr import com.mogo.eagle.core.utilcode.util.* @@ -45,6 +44,10 @@ class UpgradeAppNetWorkManager private constructor() { @Volatile private var upgradeJob: Job? = null + // 标识静默升级是否已触发下载，如果为true, 直接返回，防止重复下载 + @Volatile + private var mDownloadRequested = false + /** * 获取app升级信息 */ @@ -136,6 +139,10 @@ class UpgradeAppNetWorkManager private constructor() { provider?.recordUpgradeRecord(info.result.versionName, null, 0) } if (ApkInstaller.isInstallAppStore(Utils.getApp())) { + if (mDownloadRequested) { + return + } + mDownloadRequested = true try { withContext(Dispatchers.Main) { Toast.makeText(Utils.getApp(), "检测到新版本[${info.result.versionName}]并且当前设备支持静默升级，开始下载新版本...", Toast.LENGTH_SHORT).show() From 9f8b48aed6be7d962823cdae0821d19765a84f62 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 25 May 2023 20:39:47 +0800 Subject: [PATCH 2/6] =?UTF-8?q?[charter]=20[3.2.0]=20[=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E8=BD=A8=E8=BF=B9=E6=B8=85=E7=90=86=E8=BD=A8=E8=BF=B9=E4=BF=A1?= =?UTF-8?q?=E6=81=AF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/response/OrderInfoResponse.kt | 6 ++-- .../passenger/model/CharterPassengerModel.kt | 29 ++++++++++++------- .../BusPassengerFunctionOrderPresenter.kt | 2 +- 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/OrderInfoResponse.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/OrderInfoResponse.kt index c510232abf..7f8e7555fd 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/OrderInfoResponse.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/OrderInfoResponse.kt @@ -15,11 +15,11 @@ data class OrderInfoResponse(val data: OrderInfo?) : BaseData() { var startSiteId: Int?, var startSiteName: String?, var startSiteNameKr: String?, - val siteId: Long?,//站点id + var siteId: Long?,//站点id val siteName: String?,//站点名称 val siteNameKr: String?,//站点名称 - val wgs84Lat: Double?, - val wgs84Lon: Double?, + var wgs84Lat: Double?, + var wgs84Lon: Double?, var gcj02Lat: Double?, var gcj02Lon: Double?, val startTime: Long?,//开始时间 diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt index b0f3eb7dcb..8fef408d1f 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt @@ -121,9 +121,6 @@ object CharterPassengerModel { private var subscribeCountDown: Disposable?=null var switchLine5minWait: Disposable?=null - @Volatile - private var newCheckSite:SiteInfoResponse.SiteInfo? = null - fun init() { initListeners() queryLoginStatus() @@ -236,6 +233,7 @@ object CharterPassengerModel { when (state) { IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> { CallerAutoPilotControlManager.getGlobalPath() + cleanRoutePoints() } IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE -> {} IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE -> {} @@ -275,6 +273,9 @@ object CharterPassengerModel { .coordinateConverterWgsToGcjLocations(mContext, routePoints) mRoutePoints.addAll(latLngModels) } + fun cleanRoutePoints(){ + mRoutePoints.clear() + } fun setStatusChangeListener(tag:String,orderStatusChangeListener: IOrderStatusChangeListener?) { if (tag.isBlank()) return @@ -457,7 +458,7 @@ object CharterPassengerModel { fun hasSetLineAndSite(): Pair? { orderInfo?.let { - if (it.lineId != null && it.lineId > 0 && it.siteId != null && it.siteId > 0) { + if (it.lineId != null && it.lineId > 0 && it.siteId != null && it.siteId!! > 0) { if(it.arriveStatus==OrderInfoResponse.ARRIVED){ return null } @@ -667,10 +668,11 @@ object CharterPassengerModel { //mLocation gcj坐标 mLocationGCJ02?.let { orderInfo?.let { order -> - newCheckSite?.let { - if(it.siteId!=order.siteId){ - return - } + if(order.siteId==null||order.siteId==0L|| + order.wgs84Lat==null||order.wgs84Lat==0.0|| + order.wgs84Lon==null||order.wgs84Lon==0.0 + ){ + return } // 启动轨迹计算 var lastSumLength = 0f @@ -699,6 +701,9 @@ object CharterPassengerModel { if(lastSumLength>100) { if (mRoutePoints.size == 0){ ToastCharterUtils.showLong("缺少轨迹数据") + CallerLogger.d(M_BUS_P + "calculateDistance两点距离", + "缺少轨迹数据" + ) return } // 计算距离 @@ -989,12 +994,16 @@ object CharterPassengerModel { private fun isSuccess(requestSuccessSign: String) = broadcastList[requestSuccessSign] == null || broadcastList[requestSuccessSign] == false - fun cleanbroadcastListInfo(checkSite: SiteInfoResponse.SiteInfo?) { + fun cleanbroadcastListInfo() { switchLine5minWait = RxUtils.createSubscribe(5 * 60 * 1000) { CallerLogger.d(M_BUS_P + BaseDPMsg.TAG, "5分钟倒计时可以选择线路了") } broadcastList.clear() - newCheckSite = checkSite + orderInfo?.let { + it.siteId = 0 + it.wgs84Lon = 0.0 + it.wgs84Lat = 0.0 + } // 到站结束自驾 CallerAutoPilotControlManager.cancelAutoPilot() // 停止路距计算 diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt index a2fdfe904c..67326784a8 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt @@ -222,7 +222,7 @@ class BusPassengerFunctionOrderPresenter(view: M1OrderLineFragment?) : } mView?.hideDataDriverAgree() CharterPassengerModel.queryOrder() - CharterPassengerModel.cleanbroadcastListInfo(checkSite) + CharterPassengerModel.cleanbroadcastListInfo() } else { ToastCharterUtils.showShort("司机端拒绝请重新选择") mView?.hideDataDriverRefuse() From a33aced6b853b8e378f4866efcb891f5dfe1cd40 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Thu, 25 May 2023 21:03:19 +0800 Subject: [PATCH 3/6] =?UTF-8?q?[dev=5Fminibus-d=5F230425=5F3.2.0]=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E6=B5=81=E7=9A=84=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt index b98c2b9c2f..578f041eac 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt @@ -466,8 +466,8 @@ enum class EventTypeEnumNew( 44.toString(), "注意合流", poiTypeSrcVr = R.drawable.icon_warning_v2x_attention_confluence, - content = "前方%s米注意合流", - tts = "蘑菇路侧提醒您，前方%s米注意合流" + content = "前方%s米注意车流汇入", + tts = "蘑菇路侧提醒您，前方%s米注意车流汇入" ), TYPE_PEDESTRIAN_CROSSING( 114.toString(), From b4c1751f30b31d1ff96e7c9c97a751932df9b650 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 26 May 2023 12:18:46 +0800 Subject: [PATCH 4/6] =?UTF-8?q?[charter]=20[3.2.0]=20[=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passenger/presenter/BusPassengerFunctionOrderPresenter.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt index 67326784a8..ec94b52de6 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt @@ -221,8 +221,8 @@ class BusPassengerFunctionOrderPresenter(view: M1OrderLineFragment?) : mView?.lineAdapterSubmit(it) } mView?.hideDataDriverAgree() - CharterPassengerModel.queryOrder() CharterPassengerModel.cleanbroadcastListInfo() + CharterPassengerModel.queryOrder() } else { ToastCharterUtils.showShort("司机端拒绝请重新选择") mView?.hideDataDriverRefuse() From f3c25809492ef75272b3b7166910f73f380f8731 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 26 May 2023 15:41:40 +0800 Subject: [PATCH 5/6] =?UTF-8?q?[charter]=20[3.2.0]=20[=E6=8F=90=E5=89=8Dcl?= =?UTF-8?q?ear=EF=BC=8C=E8=B7=9D=E7=A6=BB=E6=B7=BB=E5=8A=A0=E5=8F=8C?= =?UTF-8?q?=E9=87=8D=E6=A0=A1=E9=AA=8C]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/bus/passenger/model/CharterPassengerModel.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt index 8fef408d1f..40f7fe761f 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt @@ -707,12 +707,15 @@ object CharterPassengerModel { return } // 计算距离 - lastSumLength = + var templastSumLength = CoordinateCalculateRouteUtil.calculateRouteSumLength( mRoutePoints, it, mogoLocation ) + if(templastSumLength>100){ + lastSumLength = templastSumLength + } } val lastTime: Double = lastSumLength / CharterPassengerConst.Charter_AVERAGE_SPEED * 3.6 //秒 @@ -998,6 +1001,7 @@ object CharterPassengerModel { switchLine5minWait = RxUtils.createSubscribe(5 * 60 * 1000) { CallerLogger.d(M_BUS_P + BaseDPMsg.TAG, "5分钟倒计时可以选择线路了") } + cleanRoutePoints() broadcastList.clear() orderInfo?.let { it.siteId = 0 From 4c5f0c1090eb53c3e6b252ce0a41915c5a889554 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 26 May 2023 15:47:09 +0800 Subject: [PATCH 6/6] =?UTF-8?q?[charter]=20[3.2.0]=20[=E5=88=B0=E7=AB=99?= =?UTF-8?q?=E5=92=8C=E5=88=87=E6=8D=A2=E7=AB=99=E7=82=B9=E9=83=BD=E6=B8=85?= =?UTF-8?q?=E7=90=86=E4=B8=8B=E8=BD=A8=E8=BF=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/bus/passenger/model/CharterPassengerModel.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt index 40f7fe761f..c03106901f 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt @@ -958,7 +958,8 @@ object CharterPassengerModel { } RxUtils.disposeSubscribe(switchLine5minWait) - + // 清理轨迹 + cleanRoutePoints() // 到站结束自驾 CallerAutoPilotControlManager.cancelAutoPilot() // 结束路距计算