diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrderQueryRespBean.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrderQueryRespBean.java index 27fef64839..1d38df720d 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrderQueryRespBean.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrderQueryRespBean.java @@ -63,19 +63,6 @@ public class TaxiPassengerOrderQueryRespBean extends BaseData { public String txtFileMd5DPQP = ""; //轨迹文件md5，默认“” public long contrailSaveTimeDPQP; //上传轨迹完成时间戳ms：用于MEC本地手动导入轨迹验证时不会被云端轨迹覆盖 - // !!!接口中暂无此字段，仅用于本地实现逻辑使用：起始站目的站距离km - public double travelDistance; - - /** - * @param distance - */ - public void decreaseTravelDistance( double distance ) { - travelDistance = ( ( float ) distance / 1000f ); - if ( travelDistance < 0 ) { - travelDistance = 0; - } - } - @Override public int compareTo(Result o) { boolean isEqual = this.orderNo.equals(o.orderNo); @@ -97,7 +84,7 @@ public class TaxiPassengerOrderQueryRespBean extends BaseData { public int hashCode() { return Objects.hash(orderNo, orderType, orderStatus, businessType, startSiteId, startSiteAddr, startSitePoint, startSiteGcjPoint, endSiteId, endSiteAddr, - endSitePoint, endSiteGcjPoint, carNumber, createTime, startTime, travelDistance); + endSitePoint, endSiteGcjPoint, carNumber, createTime, startTime); } } } diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt index b707158df8..acdfd49851 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt @@ -106,7 +106,6 @@ object TaxiPassengerModel : IOCHTaxiPassengerNaviChangedCallback { private var mAutopilotPlanningCallback: IOCHTaxiPassengerAutopilotPlanningCallback? = null//Model->Presenter：自动驾驶线路规划 private val mOrderStatusCallbackMap: MutableMap = ConcurrentHashMap() private var subscribe: Disposable? = null - private val mLocationsModels: MutableList = ArrayList() fun setMoGoAutopilotPlanningListener(moGoAutopilotPlanningCallback: IOCHTaxiPassengerAutopilotPlanningCallback?) { mAutopilotPlanningCallback = moGoAutopilotPlanningCallback @@ -187,8 +186,6 @@ object TaxiPassengerModel : IOCHTaxiPassengerNaviChangedCallback { // 2021.11.1重构自动驾驶 实现接口 IMoGoAutopilotStatusListener 注册监听 替换IMogoAdasOCHCallback接口 CallerAutoPilotStatusListenerManager.addListener(TAG, mGoAutopilotStatusListener) IntentManager.getInstance().registerIntentListener(ConnectivityManager.CONNECTIVITY_ACTION, mNetWorkIntentListener) - // 定位监听 - CallerChassisLocationGCJ02ListenerManager.addListener(TAG, 10, mMapLocationListener) //2021.11.1 自动驾驶路线规划接口 CallerPlanningRottingListenerManager.addListener(TAG, moGoAutopilotPlanningListener) @@ -203,8 +200,6 @@ object TaxiPassengerModel : IOCHTaxiPassengerNaviChangedCallback { } private fun releaseListeners() { - // 注销定位监听 - CallerChassisLocationGCJ02ListenerManager.removeListener(TAG) MogoAiCloudSocketManager.getInstance(mContext) .unregisterLifecycleListener(10010) CallerAutoPilotStatusListenerManager.removeListener(mGoAutopilotStatusListener) @@ -308,7 +303,7 @@ object TaxiPassengerModel : IOCHTaxiPassengerNaviChangedCallback { clearCurrentOCHOrder() } else { updateNativeCurrentOrder(data.data) - if (mOrderStatusCallbackMap.size > 0) { + if (mOrderStatusCallbackMap.isNotEmpty()) { for (callback in mOrderStatusCallbackMap.values) { callback.onCurrentOrderStatusChanged(currentOCHOrder) } @@ -354,18 +349,6 @@ object TaxiPassengerModel : IOCHTaxiPassengerNaviChangedCallback { return currentOCHOrder != null && currentOCHOrder!!.startSiteGcjPoint != null && currentOCHOrder!!.endSiteGcjPoint != null } - // TODO: 2021/9/12 - fun calculateTravelDistance(carLocation: MogoLocation) { - if (checkCurrentOCHOrder() && currentOCHOrder!!.endSiteGcjPoint.size > 0) { - val endLon = currentOCHOrder!!.endSiteGcjPoint[0] - val endLat = currentOCHOrder!!.endSiteGcjPoint[1] - val distance = CoordinateUtils.calculateLineDistance( - endLon, endLat, - carLocation.longitude, carLocation.latitude - ).toDouble() - currentOCHOrder!!.decreaseTravelDistance(distance) - } - } //监听网络变化，避免启动机器时无网导致无法更新订单信息 private val distanceListener: IDistanceListener = object : IDistanceListener { @@ -408,24 +391,10 @@ object TaxiPassengerModel : IOCHTaxiPassengerNaviChangedCallback { } } - // 自车定位 - private val mMapLocationListener: IMoGoChassisLocationGCJ02Listener = - object : IMoGoChassisLocationGCJ02Listener { - override fun onChassisLocationGCJ02(mogoLocation: MogoLocation?) { - //位置变化时，通过围栏判断是否到达x点 - if (null == mogoLocation) return - if (checkCurrentOCHOrder()) { - if (curOrderStatus === TaxiPassengerOrderStatusEnum.OnTheWayToEnd) { - calculateTravelDistance(mogoLocation) - } - } - } - } private val mGoAutopilotStatusListener: IMoGoAutopilotStatusListener = object : IMoGoAutopilotStatusListener { private var arriveAtEnd = false //乘客app专用字段 override fun onAutopilotStatusResponse(state: Int) { -// CallerLogger.INSTANCE.d( M_TAXI_P + TAG, "state = %s", state ); if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) { if (mADASStatusCallback != null) mADASStatusCallback!!.onAutopilotRunning() if (currentOCHOrder != null @@ -467,7 +436,6 @@ object TaxiPassengerModel : IOCHTaxiPassengerNaviChangedCallback { } } - override fun onAutopilotSNRequest() {} override fun onAutopilotArriveAtStation(arrivalNotification: ArrivalNotification?) { if (FunctionBuildConfig.isDemoMode && isPassenger(FunctionBuildConfig.appIdentityMode) @@ -478,20 +446,15 @@ object TaxiPassengerModel : IOCHTaxiPassengerNaviChangedCallback { return } } - - override fun onAutopilotStatusRespByQuery(status: SystemStatusInfo.StatusInfo) {} } private val moGoAutopilotPlanningListener: IMoGoPlanningRottingListener = object : IMoGoPlanningRottingListener { override fun onAutopilotRotting(globalPathResp: GlobalPathResp?) { if (null != globalPathResp && globalPathResp.wayPointsList.size > 0) { calculateRouteLineSum( - coordinateConverterWgsToGcjListCommon( - mContext, - globalPathResp.wayPointsList - ) + coordinateConverterWgsToGcjListCommon(mContext, globalPathResp.wayPointsList) ) - startToRouteAndWipe(globalPathResp.wayPointsList) + startToRouteAndWipe() } } } @@ -514,10 +477,7 @@ object TaxiPassengerModel : IOCHTaxiPassengerNaviChangedCallback { } } - fun startToRouteAndWipe(models: List) { - val locationsModels: List = coordinateConverterWgsToGcjLocations(mContext, models) - mLocationsModels.clear() - mLocationsModels.addAll(locationsModels) + fun startToRouteAndWipe() { showRottingMapView() } @@ -630,9 +590,6 @@ object TaxiPassengerModel : IOCHTaxiPassengerNaviChangedCallback { if (data.data != null && data.data != null && data.data.size > 0) { if (mAutopilotPlanningCallback != null) { calculateRouteLineSum(data.data) - mLocationsModels.clear() - val locationsModels = coordinateConverterLatlngToLocation(data.data) - mLocationsModels.addAll(locationsModels) } } else { RxUtils.disposeSubscribe(subscribe) diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TPRouteDataTestUtils.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TPRouteDataTestUtils.java index ac5ebd9dc7..a7d355ff95 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TPRouteDataTestUtils.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TPRouteDataTestUtils.java @@ -37,7 +37,7 @@ public class TPRouteDataTestUtils { builder.setLongitude(s.getDouble("lon")); list.add(builder.build()); } - TaxiPassengerModel.INSTANCE.startToRouteAndWipe(list); + TaxiPassengerModel.INSTANCE.startToRouteAndWipe(); } catch (JSONException e) { e.printStackTrace(); }