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

Merge branch 'dev_robotaxi-d_230809_6.0.0' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robotaxi-d_230809_6.0.0

Browse Source
This commit is contained in:
aibingbing
2023-09-06 20:37:29 +08:00
parent 9eadadef99 dbb9ac3986
commit 25d93067e2
18 changed files with 81 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt
View File

@@ -92,7 +92,7 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{
d(M_OCHCOMMON + TAG, "onAutopilotRotting: 收到轨迹")
globalPathResp?.wayPointsList?.let {
if (it.size > 0) {
d(M_OCHCOMMON + TAG, "收到轨迹:${it.size}第一个点${it[0]}最后一个点:${it.last()}")
d(M_OCHCOMMON + TAG, "收到轨迹:轨迹个数${it.size}第一个点${it[0]}最后一个点:${it.last()} 轨迹id:${globalPathResp.lineId}")
if(globalPathResp.lineId!=null) {// 适配低版本不传递lineId
if (globalPathResp.lineId == lineId && !mRoutePoints.isNullOrEmpty()) {
d(M_OCHCOMMON + TAG, "重复轨迹")

5
OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/CommonAmapNaviVIew.kt
View File

@@ -134,7 +134,6 @@ class CommonAmapNaviVIew @JvmOverloads constructor(
}
override fun onNaviCancel() {
TODO("Not yet implemented")
}
override fun onNaviBackClick(): Boolean {
@@ -170,11 +169,11 @@ class CommonAmapNaviVIew @JvmOverloads constructor(
}
override fun onMapTypeChanged(p0: Int) {
TODO("Not yet implemented")
}
override fun onNaviViewShowMode(p0: Int) {
TODO("Not yet implemented")
}
fun onCreate(savedInstanceState : Bundle?){

4
OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
View File

@@ -96,8 +96,10 @@ class TaxiPassengerBaseFragment() :
ck_setting.visibility = View.VISIBLE
if (DeviceUtils.isLenovoModel() || DeviceUtils.isEB5Model()) {
romaPView.visibility = View.VISIBLE
romaDistanceView.visibility = View.VISIBLE
} else {
romaPView.visibility = View.GONE
romaDistanceView.visibility = View.GONE
}
rv_location_center.visibility = View.VISIBLE
pcnActionView.visibility = View.VISIBLE
@@ -111,6 +113,7 @@ class TaxiPassengerBaseFragment() :
presenter?.setItineraryVisibility()
ck_setting.visibility = View.VISIBLE
romaPView.visibility = View.GONE
romaDistanceView.visibility = View.GONE
rv_location_center.visibility = View.VISIBLE
pcnActionView.visibility = View.VISIBLE
CallerHmiManager.showTrafficLightView()
@@ -124,6 +127,7 @@ class TaxiPassengerBaseFragment() :
ck_setting.visibility = View.GONE
ck_setting.isChecked = false
romaPView.visibility = View.GONE
romaDistanceView.visibility = View.GONE
rv_location_center.visibility = View.GONE
pcnActionView.visibility = View.GONE
CallerHmiManager.hideTrafficLightView()

1
OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml
View File

@@ -82,6 +82,7 @@
app:roma_open="@drawable/taxi_p_roma_checked" />
<com.mogo.eagle.core.function.hmi.ui.widget.RomaDistanceView
android:id="@+id/romaDistanceView"
android:layout_width="@dimen/dp_334"
android:layout_height="@dimen/dp_120"
android:layout_marginStart="@dimen/dp_50"

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

@@ -592,6 +592,7 @@ abstract class BaseTaxiTabFragment<V : IView, P : Presenter<V>> : MvpFragment<V,
fun showRoutingToStationFragment(isShow: Boolean) {
val transaction: FragmentTransaction = childFragmentManager.beginTransaction()
closeRoutingViewIfHadAdd()
if (isShow) {
closeAmapViewIFHadeAdd()
taxiRoutingNaviFragment = TaxiRoutingNaviFragment.newInstance()
@@ -605,7 +606,6 @@ abstract class BaseTaxiTabFragment<V : IView, P : Presenter<V>> : MvpFragment<V,
module_mogo_och_navi_panel_container.visibility = View.VISIBLE
smallMapView.visibility = View.GONE
} else {
closeRoutingViewIfHadAdd()
taxi_close_navi_icon.visibility = View.GONE
module_mogo_och_navi_panel_container.visibility = View.INVISIBLE //2023.9.4高德导航由gone设置成INVISIBLE,保留导航实例,避免导航被挂起
smallMapView.visibility = View.VISIBLE

4
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/navi/auto/TaxiMapDirectionView.kt
View File

@@ -74,6 +74,7 @@ class TaxiMapDirectionView @JvmOverloads constructor(
override fun onDetachedFromWindow() {
super.onDetachedFromWindow()
// 注册定位监听
clearPolyline()
CallerChassisLocationGCJ02ListenerManager.removeListener(TAG)
}
@@ -215,6 +216,7 @@ class TaxiMapDirectionView @JvmOverloads constructor(
texIndexList.add(1)
}
if (mPolyline != null) {
d(SceneConstant.M_TAXI + TAG, "mPolyline != null")
mPolyline!!.points = allPoints
mPolyline!!.options.customTextureIndex = texIndexList
return
@@ -234,10 +236,12 @@ class TaxiMapDirectionView @JvmOverloads constructor(
}
// 绘制线
d(SceneConstant.M_TAXI + TAG, "绘制线mPolyline = mAMap.addPolyline(polylineOptions)")
mPolyline = mAMap.addPolyline(polylineOptions)
}
override fun clearPolyline() {
d(SceneConstant.M_TAXI + TAG, "clearPolyline")
if (mPolyline != null) {
mPolyline!!.remove()
mPolyline = null

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

@@ -267,7 +267,7 @@ class TaxiCurrentTaskViewModel : BaseViewModel<UnmannedState, TaskUiIntent>(),
driveToNearestStationTask: StartServiceRespBean.Result?,
currentTaskWithOrder: QueryCurrentTaskRespBean.Result?
) {
if (currentTaskWithOrder?.endSite != null && currentTaskWithOrder.startSite != null
if (currentTaskWithOrder?.endSite != null
&& (currentTaskWithOrder.currentStatus < TaskStatusEnum.CompleteTask.code
||currentTaskWithOrder.order != null)
) {

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

@@ -706,7 +706,8 @@ object TaxiTaskModel {
if (result.order != null && result.currentStatus == TaskStatusEnum.CompleteTask.code
&& result.servingStatus == 1){
if (result.order!!.orderStatus <= TaxiOrderStatusEnum.ArriveAtStart.code) {
if (result.taskType <= TaskTypeEnum.VirtualTask.code
&& result.order!!.orderStatus < TaxiOrderStatusEnum.ArriveAtStart.code) {
VoiceNotice.showNotice("已为您接到订单")
}
if (result.taskType == TaskTypeEnum.ToOrderStartTask.code

2
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java
View File

@@ -287,7 +287,7 @@ public class TaxiTrajectoryManager {
}
if (mPreAutoPilotLine != null){
DebugView.Companion.printInfoMsg("[下发轨迹] sendTrajectoryDownloadReq, lindId=" + mPreAutoPilotLine.getLineId() + ", lineName=" + mPreAutoPilotLine.getLineName());
DebugView.Companion.printInfoMsg("[下发预加载轨迹] sendTrajectoryDownloadReq, lindId=" + mPreAutoPilotLine.getLineId() + ", lineName=" + mPreAutoPilotLine.getLineName());
CallerAutoPilotControlManager.INSTANCE.sendTrajectoryDownloadReq(mPreAutoPilotLine, PRE_LOADING);
}else {
CallerLogger.e(M_TAXI + TAG, "sendTrajectoryReq(): mPreAutoPilotLine is null!!!");

4
OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
View File

@@ -95,8 +95,10 @@ class TaxiPassengerBaseFragment() :
ck_setting.visibility = View.VISIBLE
if (DeviceUtils.isLenovoModel() || DeviceUtils.isEB5Model()) {
romaPView.visibility = View.VISIBLE
romaDistanceView.visibility = View.VISIBLE
} else {
romaPView.visibility = View.GONE
romaDistanceView.visibility = View.GONE
}
rv_location_center.visibility = View.VISIBLE
pcnActionView.visibility = View.VISIBLE
@@ -110,6 +112,7 @@ class TaxiPassengerBaseFragment() :
presenter?.setItineraryVisibility()
ck_setting.visibility = View.VISIBLE
romaPView.visibility = View.GONE
romaDistanceView.visibility = View.GONE
rv_location_center.visibility = View.VISIBLE
pcnActionView.visibility = View.VISIBLE
CallerHmiManager.showTrafficLightView()
@@ -123,6 +126,7 @@ class TaxiPassengerBaseFragment() :
ck_setting.visibility = View.GONE
ck_setting.isChecked = false
romaPView.visibility = View.GONE
romaDistanceView.visibility = View.GONE
rv_location_center.visibility = View.GONE
pcnActionView.visibility = View.GONE
CallerHmiManager.hideTrafficLightView()

1
OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_base_fragment.xml
View File

@@ -80,6 +80,7 @@
app:roma_open="@drawable/taxi_p_roma_checked" />
<com.mogo.eagle.core.function.hmi.ui.widget.RomaDistanceView
android:id="@+id/romaDistanceView"
android:layout_width="@dimen/dp_334"
android:layout_height="@dimen/dp_120"
android:layout_marginStart="@dimen/dp_50"