yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.7.0]

Browse Source 
[fea]
[接驳添加站点mark]
This commit is contained in:
yangyakun
2024-10-11 11:10:32 +08:00
parent 5d10b1c008
commit 4e3aff73c5
5 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/utils/MapMakerManager.kt → OCH/common/common/src/main/java/com/mogo/och/common/module/map/MapMakerManager.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.och.unmanned.taxi.utils
package com.mogo.och.common.module.map
import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger

2
OCH/common/data/src/main/java/com/mogo/och/data/bean/BusStationBean.java
View File

@@ -17,7 +17,7 @@ public class BusStationBean {
private double lon; //高精坐标
private double lat; //高精坐标
private int drivingStatus;//行驶信息，0初始值；1已经过；2当前站；3未到站
private boolean leaving;
private boolean leaving;// 为出发false 出发true
private String introduction;// 站点简介
private boolean isPlayTts;
private int pointType; // 1:途径点 2:禁行点 3:站点

17
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt
View File

@@ -22,12 +22,14 @@ import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager
import com.mogo.och.common.module.manager.socket.lan.LedScreenManager
import com.mogo.och.common.module.manager.transform.OchTransform
import com.mogo.och.common.module.manager.transform.OchTransformDispatch
import com.mogo.och.common.module.map.MapMakerManager
import com.mogo.och.common.module.utils.DateTimeUtil
import com.mogo.och.common.module.utils.NumberFormatUtil
import com.mogo.och.common.module.utils.OCHThreadPoolManager
import com.mogo.och.common.module.utils.ResourcesUtils
import com.mogo.och.common.module.utils.RxUtils
import com.mogo.och.shuttle.weaknet.R
import com.mogo.och.weaknet.constant.BusConst
import com.mogo.och.weaknet.repository.db.bean.TaskSiteDataBean
import com.mogo.och.weaknet.repository.RepositoryManager
import com.mogo.och.weaknet.repository.exception.DataException
@@ -267,6 +269,19 @@ object OrderModel {
* 车机端展示 三站： 中间为即将到到达或者刚到达的站
*/
private fun updateBusStatus() {
val (startStation, endStation) = LineManager.getStations()
if(startStation!=null&&endStation!=null){
MapMakerManager.removeAllMapMarkerByOwner(TAG)
if(startStation.isLeaving){// 出发需要移除
MapMakerManager.removeMapMaker(BusConst.BUS_START_MAP_MAKER,startStation.lat,startStation.lon)
}else{// 为出发展示
MapMakerManager.addMapMaker(TAG, BusConst.BUS_START_MAP_MAKER,startStation.lat,startStation.lon,R.raw.star_marker)
}
MapMakerManager.addMapMaker(TAG, BusConst.BUS_END_MAP_MAKER,startStation.lat,startStation.lon,R.raw.end_marker)
}else{
MapMakerManager.removeAllMapMarkerByOwner(TAG)
}
LineModel.stationList?.let {
if (LineModel.startTaskMessage()) { //默认是第一站到站查询
LineManager.lineInfos?.lineName?.let { lineName->
@@ -437,6 +452,8 @@ object OrderModel {
ToastUtils.showShort(ResourcesUtils.getString(R.string.shuttle_logout_error))
return@execute
}
MapMakerManager.removeAllMapMarkerByOwner(TAG)
BusTrajectoryManager.getInstance().stopTrajReqLoop();
LoginStatusManager.loginOut()
}
}

3
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningView.kt
View File

@@ -25,7 +25,7 @@ import com.mogo.och.unmanned.taxi.ui.routing.errorpoint.ReportErrorPointDialog
import com.mogo.och.unmanned.taxi.ui.routing.RoutingSwitchModel
import com.mogo.och.unmanned.taxi.ui.routing.TaxiRoutingFeedbackDialog
import com.mogo.och.unmanned.taxi.ui.routing.TaxiRoutingModel
import com.mogo.och.unmanned.taxi.utils.MapMakerManager
import com.mogo.och.common.module.map.MapMakerManager
import com.mogo.och.unmanned.taxi.utils.TaskUtils
import kotlinx.android.synthetic.main.unmanned_routing_running.view.actv_current_itinerary_end_name
import kotlinx.android.synthetic.main.unmanned_routing_running.view.actv_current_itinerary_start_name
@@ -37,7 +37,6 @@ import kotlinx.android.synthetic.main.unmanned_routing_running.view.actv_time_en
import kotlinx.android.synthetic.main.unmanned_routing_running.view.goutp_show_routing_info
import kotlinx.android.synthetic.main.unmanned_routing_running.view.include_empty
import kotlinx.android.synthetic.main.unmanned_routing_running.view.naviToStart
import kotlinx.coroutines.flow.map
class RoutingRunningView: ConstraintLayout, RoutingRunningModel.RoutingRuningCallback,
ICommonNaviChangedCallback {

2
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiCurrentTaskFragment.kt
View File

@@ -41,7 +41,7 @@ import com.mogo.och.unmanned.taxi.constant.TaxiDriverEventConst
import com.mogo.och.unmanned.taxi.constant.TaxiUnmannedConst.Companion.TAXI_END_MAP_MAKER
import com.mogo.och.unmanned.taxi.constant.TaxiUnmannedConst.Companion.TAXI_START_MAP_MAKER
import com.mogo.och.unmanned.taxi.constant.TaxiUnmannedConst.Companion.TYPE_MARKER_TAXI_ORDER
import com.mogo.och.unmanned.taxi.utils.MapMakerManager
import com.mogo.och.common.module.map.MapMakerManager
import com.mogo.och.unmanned.taxi.utils.TaskUtils
import kotlinx.android.synthetic.main.unmanned_task_fragment_current.cancelOrder
import kotlinx.android.synthetic.main.unmanned_task_fragment_current.endPoint