diff --git a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt index 39498449c5..40c9647688 100644 --- a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt +++ b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt @@ -26,13 +26,15 @@ object CharterTrajectoryManager { private const val TAG = "CharterTrajectoryManager" private var mAutoPilotLine: AutoPilotLine? = null private var mLineId = 0 + private var mLineName = "" private var mSendReqDisposable: Disposable? = null /** * 同步Bus路线信息 */ - fun syncTrajectoryInfo(lineId: Int) { + fun syncTrajectoryInfo(lineId: Int, lineName: String) { mLineId = lineId + mLineName = lineName val routesResult = get().getBusRoutesResult() if (LoginStatusManager.isLogin() && routesResult != null) { d(SceneConstant.M_CHARTER_D + TAG, "syncTrajectoryInfo() start.") @@ -81,7 +83,8 @@ object CharterTrajectoryManager { } else if ("ISSM_FUNC_AUTO_PILOT_READY" == guardianInfo.getCode()) { // 收到ssm的自动驾驶变为ready，再次下发轨迹下载.解决：域控重启，或者102域控启动太早，107节点初始化未完成导致的轨迹未进行下载。 d(SceneConstant.M_CHARTER_D + TAG, "onAutopilotGuardian() ssm ready，再次发起下载") - syncTrajectoryInfo(get().getBusOrderResult()?.lineId!!) + syncTrajectoryInfo(get().getBusOrderResult()?.lineId!!, + get().getBusOrderResult()?.lineName!!) } } @@ -96,7 +99,7 @@ object CharterTrajectoryManager { } else { if (mAutoPilotLine == null) { mAutoPilotLine = AutoPilotLine( - mLineId.toLong(), + mLineId.toLong(), mLineName, routesResult.csvFileUrl, routesResult.csvFileMd5, routesResult.txtFileUrl, routesResult.txtFileMd5, routesResult.contrailSaveTime, routesResult.carModel, @@ -106,6 +109,7 @@ object CharterTrajectoryManager { ) } else { mAutoPilotLine!!.lineId = mLineId.toLong() + mAutoPilotLine!!.lineName = mLineName mAutoPilotLine!!.trajUrl = routesResult.csvFileUrl mAutoPilotLine!!.trajMd5 = routesResult.csvFileMd5 mAutoPilotLine!!.stopUrl = routesResult.txtFileUrl @@ -124,6 +128,7 @@ object CharterTrajectoryManager { private fun clearAutoPilotLine() { if (mAutoPilotLine == null) return mAutoPilotLine!!.lineId = -1 + mAutoPilotLine!!.lineName = "" mAutoPilotLine!!.trajUrl = "" mAutoPilotLine!!.trajMd5 = "" mAutoPilotLine!!.stopUrl = "" @@ -206,7 +211,7 @@ object CharterTrajectoryManager { init { mAutoPilotLine = AutoPilotLine( - -1, + -1, "", "", "", "", "", 0, "", "", "", "", "", 0 ) diff --git a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt index d03324e646..ab9161791e 100644 --- a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt +++ b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt @@ -607,7 +607,7 @@ class DriverM1Model { parameters.vehicleType = VEHICLE_TYPE if (parameters.autoPilotLine == null) { parameters.autoPilotLine = AutopilotControlParameters.AutoPilotLine( - mCurrentOrder!!.lineId.toLong(), + mCurrentOrder!!.lineId.toLong(), mCurrentOrder!!.lineName, mCurrentRoute!!.csvFileUrl, mCurrentRoute!!.csvFileMd5, mCurrentRoute!!.txtFileUrl, mCurrentRoute!!.txtFileMd5, mCurrentRoute!!.contrailSaveTime, mCurrentRoute!!.carModel, @@ -841,7 +841,8 @@ class DriverM1Model { d(SceneConstant.M_CHARTER_D + TAG, "checkoutContrail-==" + GsonUtils.toJson(data.data)) mCurrentRoute = data.data - CharterTrajectoryManager.syncTrajectoryInfo(mCurrentOrder?.lineId!!) + CharterTrajectoryManager.syncTrajectoryInfo(mCurrentOrder?.lineId!!, + mCurrentOrder?.lineName!!) } override fun onFail(code: Int, msg: String?) { diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt index de418e60b7..a76bf127a3 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt @@ -1132,9 +1132,8 @@ object CharterPassengerModel { locusInfo?.let { locus -> if (parameters.autoPilotLine == null) { parameters.autoPilotLine = AutoPilotLine( - orderInfo.lineId!!, - locus.csvFileUrl!!, - locus.csvFileMd5!!, + orderInfo.lineId!!, orderInfo.lineName!!, + locus.csvFileUrl!!, locus.csvFileMd5!!, locus.txtFileUrl!!, locus.txtFileMd5!!, locus.contrailSaveTime!!, locus.carModel!!, locus.csvFileUrlDPQP!!, locus.csvFileMd5DPQP!!, diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt index f90176c027..f8138e6112 100644 --- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt @@ -295,7 +295,7 @@ object BusPassengerModel{ parameters.vehicleType = 10 if (parameters.autoPilotLine == null) { parameters.autoPilotLine = AutoPilotLine( - busRoutesResult.lineId.toLong(), + busRoutesResult.lineId.toLong(), busRoutesResult.name, busRoutesResult.csvFileUrl, busRoutesResult.csvFileMd5, busRoutesResult.txtFileUrl, busRoutesResult.txtFileMd5, busRoutesResult.contrailSaveTime, busRoutesResult.carModel, diff --git a/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java b/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java index ad92e2fc57..58391d279f 100644 --- a/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java +++ b/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java @@ -1272,7 +1272,7 @@ public class OrderModel { parameters.vehicleType = VEHICLE_TYPE; if (parameters.autoPilotLine == null) { parameters.autoPilotLine = new AutopilotControlParameters.AutoPilotLine( - busRoutesResult.getLineId(), + busRoutesResult.getLineId(), busRoutesResult.getName(), busRoutesResult.csvFileUrl, busRoutesResult.csvFileMd5, busRoutesResult.txtFileUrl, busRoutesResult.txtFileMd5, busRoutesResult.contrailSaveTime, busRoutesResult.carModel, diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java index 930045f7bd..51814cbd37 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java @@ -41,7 +41,7 @@ public class BusTrajectoryManager { private Disposable mSendReqDisposable = null; public BusTrajectoryManager() { - mAutoPilotLine = new AutopilotControlParameters.AutoPilotLine(-1, + mAutoPilotLine = new AutopilotControlParameters.AutoPilotLine(-1, "", "", "", "", "", 0, "", "", "", "", "", 0); } @@ -108,7 +108,8 @@ public class BusTrajectoryManager { return; } else { if (mAutoPilotLine == null) { - mAutoPilotLine = new AutopilotControlParameters.AutoPilotLine(routesResult.getLineId(), + mAutoPilotLine = new AutopilotControlParameters.AutoPilotLine( + routesResult.getLineId(), routesResult.getName(), routesResult.csvFileUrl, routesResult.csvFileMd5, routesResult.txtFileUrl, routesResult.txtFileMd5, routesResult.contrailSaveTime, routesResult.carModel, @@ -117,6 +118,7 @@ public class BusTrajectoryManager { routesResult.contrailSaveTimeDPQP); } else { mAutoPilotLine.setLineId(routesResult.getLineId()); + mAutoPilotLine.setLineName(routesResult.getName()); mAutoPilotLine.setTrajUrl(routesResult.csvFileUrl); mAutoPilotLine.setTrajMd5(routesResult.csvFileMd5); mAutoPilotLine.setStopUrl(routesResult.txtFileUrl); @@ -135,6 +137,7 @@ public class BusTrajectoryManager { private void clearAutoPilotLine() { if (mAutoPilotLine == null) return; mAutoPilotLine.setLineId(-1); + mAutoPilotLine.setLineName(""); mAutoPilotLine.setTrajUrl(""); mAutoPilotLine.setTrajMd5(""); mAutoPilotLine.setStopUrl(""); @@ -184,25 +187,6 @@ public class BusTrajectoryManager { return; } - // TODO: 2022/6/24 - // test1 -// mAutoPilotLine.setLineId(148); -// mAutoPilotLine.setTrajUrl("http://file-qa.zhidaozhixing.com/fileServer/upload/downloadFileStream?key=fileServer/online_car_hailing/e27c20c2da32481021d934c3ef084536/traj_148.csv"); -// mAutoPilotLine.setTrajMd5("e27c20c2da32481021d934c3ef084536"); -// mAutoPilotLine.setStopUrl("http://file-qa.zhidaozhixing.com/fileServer/upload/downloadFileStream?key=fileServer/online_car_hailing/6224c9dd2c0e2bd990c6482c0464de45/stop_148.txt"); -// mAutoPilotLine.setStopMd5("6224c9dd2c0e2bd990c6482c0464de45"); -// mAutoPilotLine.setTimestamp(1654596000000L); //20220607 18:00 -// mAutoPilotLine.setVehicleModel("红旗H9"); - - // test2 -// mAutoPilotLine.setLineId(148); -// mAutoPilotLine.setTrajUrl("http://file-qa.zhidaozhixing.com/fileServer/upload/downloadFileStream?key=fileServer/online_car_hailing/8654497cf918be461a59c7ad8e22920d/traj_148.csv"); -// mAutoPilotLine.setTrajMd5("8654497cf918be461a59c7ad8e22920d"); -// mAutoPilotLine.setStopUrl("http://file-qa.zhidaozhixing.com/fileServer/upload/downloadFileStream?key=fileServer/online_car_hailing/1bb098b244922649bf3e7bada0d3950f/stop_148.txt"); -// mAutoPilotLine.setStopMd5("1bb098b244922649bf3e7bada0d3950f"); -// mAutoPilotLine.setTimestamp(1654761600000L); //20220609 16:00 -// mAutoPilotLine.setVehicleModel("红旗H9"); - CallerAutoPilotControlManager.INSTANCE.sendTrajectoryDownloadReq(mAutoPilotLine); CallerLogger.INSTANCE.d(M_BUS + TAG, "sendTrajectoryReq(): " + GsonUtils.toJson(mAutoPilotLine)); diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java b/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java index 787429540c..50ab8f5bb7 100644 --- a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java +++ b/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java @@ -1342,7 +1342,7 @@ public class OrderModel { parameters.vehicleType = VEHICLE_TYPE; if (parameters.autoPilotLine == null) { parameters.autoPilotLine = new AutopilotControlParameters.AutoPilotLine( - busRoutesResult.getLineId(), + busRoutesResult.getLineId(), busRoutesResult.getName(), busRoutesResult.csvFileUrl, busRoutesResult.csvFileMd5, busRoutesResult.txtFileUrl, busRoutesResult.txtFileMd5, busRoutesResult.contrailSaveTime, busRoutesResult.carModel, diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java b/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java index fed001d399..8e009220fb 100644 --- a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java +++ b/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java @@ -40,7 +40,7 @@ public class BusTrajectoryManager { private Disposable mSendReqDisposable = null; public BusTrajectoryManager() { - mAutoPilotLine = new AutopilotControlParameters.AutoPilotLine(-1, + mAutoPilotLine = new AutopilotControlParameters.AutoPilotLine(-1, "", "", "", "", "", 0, "", "", "", "", "", 0); } @@ -107,7 +107,8 @@ public class BusTrajectoryManager { return; } else { if (mAutoPilotLine == null) { - mAutoPilotLine = new AutopilotControlParameters.AutoPilotLine(routesResult.getLineId(), + mAutoPilotLine = new AutopilotControlParameters.AutoPilotLine( + routesResult.getLineId(), routesResult.getName(), routesResult.csvFileUrl, routesResult.csvFileMd5, routesResult.txtFileUrl, routesResult.txtFileMd5, routesResult.contrailSaveTime, routesResult.carModel, @@ -116,6 +117,7 @@ public class BusTrajectoryManager { routesResult.contrailSaveTimeDPQP); } else { mAutoPilotLine.setLineId(routesResult.getLineId()); + mAutoPilotLine.setLineName(routesResult.getName()); mAutoPilotLine.setTrajUrl(routesResult.csvFileUrl); mAutoPilotLine.setTrajMd5(routesResult.csvFileMd5); mAutoPilotLine.setStopUrl(routesResult.txtFileUrl); @@ -134,6 +136,7 @@ public class BusTrajectoryManager { private void clearAutoPilotLine() { if (mAutoPilotLine == null) return; mAutoPilotLine.setLineId(-1); + mAutoPilotLine.setLineName(""); mAutoPilotLine.setTrajUrl(""); mAutoPilotLine.setTrajMd5(""); mAutoPilotLine.setStopUrl(""); @@ -183,25 +186,6 @@ public class BusTrajectoryManager { return; } - // TODO: 2022/6/24 - // test1 -// mAutoPilotLine.setLineId(148); -// mAutoPilotLine.setTrajUrl("http://file-qa.zhidaozhixing.com/fileServer/upload/downloadFileStream?key=fileServer/online_car_hailing/e27c20c2da32481021d934c3ef084536/traj_148.csv"); -// mAutoPilotLine.setTrajMd5("e27c20c2da32481021d934c3ef084536"); -// mAutoPilotLine.setStopUrl("http://file-qa.zhidaozhixing.com/fileServer/upload/downloadFileStream?key=fileServer/online_car_hailing/6224c9dd2c0e2bd990c6482c0464de45/stop_148.txt"); -// mAutoPilotLine.setStopMd5("6224c9dd2c0e2bd990c6482c0464de45"); -// mAutoPilotLine.setTimestamp(1654596000000L); //20220607 18:00 -// mAutoPilotLine.setVehicleModel("红旗H9"); - - // test2 -// mAutoPilotLine.setLineId(148); -// mAutoPilotLine.setTrajUrl("http://file-qa.zhidaozhixing.com/fileServer/upload/downloadFileStream?key=fileServer/online_car_hailing/8654497cf918be461a59c7ad8e22920d/traj_148.csv"); -// mAutoPilotLine.setTrajMd5("8654497cf918be461a59c7ad8e22920d"); -// mAutoPilotLine.setStopUrl("http://file-qa.zhidaozhixing.com/fileServer/upload/downloadFileStream?key=fileServer/online_car_hailing/1bb098b244922649bf3e7bada0d3950f/stop_148.txt"); -// mAutoPilotLine.setStopMd5("1bb098b244922649bf3e7bada0d3950f"); -// mAutoPilotLine.setTimestamp(1654761600000L); //20220609 16:00 -// mAutoPilotLine.setVehicleModel("红旗H9"); - CallerAutoPilotControlManager.INSTANCE.sendTrajectoryDownloadReq(mAutoPilotLine); CallerLogger.INSTANCE.d(M_BUS + TAG, "sendTrajectoryReq(): " + GsonUtils.toJson(mAutoPilotLine)); diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/BaseSweeperTabFragment.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/BaseSweeperTabFragment.java index e3842fcf82..8a455a177d 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/BaseSweeperTabFragment.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/BaseSweeperTabFragment.java @@ -170,7 +170,7 @@ public abstract class BaseSweeperTabFragment