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..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 @@ -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,15 +701,21 @@ object CharterPassengerModel { if(lastSumLength>100) { if (mRoutePoints.size == 0){ ToastCharterUtils.showLong("缺少轨迹数据") + CallerLogger.d(M_BUS_P + "calculateDistance两点距离", + "缺少轨迹数据" + ) return } // 计算距离 - lastSumLength = + var templastSumLength = CoordinateCalculateRouteUtil.calculateRouteSumLength( mRoutePoints, it, mogoLocation ) + if(templastSumLength>100){ + lastSumLength = templastSumLength + } } val lastTime: Double = lastSumLength / CharterPassengerConst.Charter_AVERAGE_SPEED * 3.6 //秒 @@ -950,7 +958,8 @@ object CharterPassengerModel { } RxUtils.disposeSubscribe(switchLine5minWait) - + // 清理轨迹 + cleanRoutePoints() // 到站结束自驾 CallerAutoPilotControlManager.cancelAutoPilot() // 结束路距计算 @@ -989,12 +998,17 @@ 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分钟倒计时可以选择线路了") } + cleanRoutePoints() 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..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.cleanbroadcastListInfo() CharterPassengerModel.queryOrder() - CharterPassengerModel.cleanbroadcastListInfo(checkSite) } else { ToastCharterUtils.showShort("司机端拒绝请重新选择") mView?.hideDataDriverRefuse() 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() 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(),