diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java index 48ecbb6c73..bf5dfe18db 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java @@ -312,6 +312,7 @@ public class TaxiPresenter extends Presenter implements ITaxiADASS if(mView!=null) { mView.updateCtvAutopilotStatusTag(true); CallerOrderListenerManager.INSTANCE.invokeOrderStatus(true); + mView.setGuidHide(); } } }, UiThreadHandler.MODE.QUEUE); diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java index c8d4e060cd..f370397d2b 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java @@ -567,4 +567,7 @@ public abstract class BaseTaxiTabFragment diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt index efc7bff68a..4bf9a3cf43 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt @@ -267,7 +267,7 @@ class TaxiPassengerBaseFragment() : override fun showOrHideCheckAndStartAutopilotView(status:Int){ UiThreadHandler.post { arrivedView.visibility = View.GONE - bottom.setBagVisable(BottomBar.SelectView.OVERMAPVIEW) + bottom.setBagVisable(BottomBar.SelectView.OVERMAPVIEW,View.VISIBLE) when (status) { 0 -> { if(chekAndStartAutopilotView.visibility == View.GONE){ @@ -334,6 +334,7 @@ class TaxiPassengerBaseFragment() : arrivedView.setDataAndStartAnimation() VoiceNotice.showNotice("已到达目的地，带好随身物品，右侧下车更安全！期待下次再见", AIAssist.LEVEL2) } + bottom.setBagVisable(BottomBar.SelectView.OVERMAPVIEW,View.GONE) } else { if(arrivedView.visibility!=View.GONE) { showOrHide(true, "隐藏到达目的地") diff --git a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/bottom/BottomBar.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/bottom/BottomBar.kt index 3cf1cb2d53..9c0f7c5bbf 100644 --- a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/bottom/BottomBar.kt +++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/bottom/BottomBar.kt @@ -46,16 +46,16 @@ class BottomBar @JvmOverloads constructor( this.overMapViewApply = overMapViewApply } - fun setBagVisable(selectItem:SelectView){ + fun setBagVisable(selectItem:SelectView,visibility:Int){ when (selectItem) { SelectView.PRECISIONMAP -> { - actv_precisionmap.setBagVisable(VISIBLE) + actv_precisionmap.setBagVisable(visibility) } SelectView.OVERMAPVIEW -> { - actv_overmap.setBagVisable(VISIBLE) + actv_overmap.setBagVisable(visibility) } SelectView.VIDEO -> { - actv_video.setBagVisable(VISIBLE) + actv_video.setBagVisable(visibility) } } } diff --git a/OCH/taxi/pcommon/src/main/res/layout/taxt_p_bottom_bar.xml b/OCH/taxi/pcommon/src/main/res/layout/taxt_p_bottom_bar.xml index 352502a511..f9238f26a6 100644 --- a/OCH/taxi/pcommon/src/main/res/layout/taxt_p_bottom_bar.xml +++ b/OCH/taxi/pcommon/src/main/res/layout/taxt_p_bottom_bar.xml @@ -86,7 +86,7 @@ app:normalDrawable="@drawable/taxt_p_bottom_overmap_normal" app:bottomTitle="全局概览" app:bottomTitleCheckedColor="@color/white" - app:bottomShowIcon = "true" + app:bottomShowIcon = "false" android:layout_marginEnd="@dimen/dp_107" android:layout_marginStart="@dimen/dp_107" app:bottomTitleNormalColor="@color/taxi_cp_41444D" diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/BaseTaxiTabFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/BaseTaxiTabFragment.kt index e442b06aec..6a84d3dbeb 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/BaseTaxiTabFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/BaseTaxiTabFragment.kt @@ -537,4 +537,8 @@ abstract class BaseTaxiTabFragment> : MvpFragment implements ITaxiADASS @Override public void onCurrentOrderStatusChanged(@Nullable BaseOrderBean order) { if(order!=null){ - if (order.orderStatus== TaxiOrderStatusEnum.ArriveAtStart.getCode()) { + if (order.orderStatus == TaxiOrderStatusEnum.ArriveAtStart.getCode()) { UiThreadHandler.post(new Runnable() { @Override public void run() { @@ -346,6 +346,15 @@ public class TaxiPresenter extends Presenter implements ITaxiADASS } } }, UiThreadHandler.MODE.QUEUE); + }else if(order.orderStatus == TaxiOrderStatusEnum.ArriveAtEnd.getCode()){ + UiThreadHandler.post(new Runnable() { + @Override + public void run() { + if(mView!=null) { + mView.setGuidHide(); + } + } + }, UiThreadHandler.MODE.QUEUE); } } } diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml index 24034443aa..7b989e1200 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml @@ -419,6 +419,7 @@ app:layout_constraintEnd_toEndOf="@+id/smallMapView" app:layout_constraintBottom_toTopOf="@+id/smallMapView" android:src="@drawable/taxi_overmap_tag" + android:visibility="gone" android:layout_marginBottom="-32dp" android:layout_width="@dimen/dp_209" android:layout_height="@dimen/dp_91"/> diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerGetTrajectoryByLineIdRespBean.java b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerGetTrajectoryByLineIdRespBean.java index ae97586c91..7b10ffcd9c 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerGetTrajectoryByLineIdRespBean.java +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerGetTrajectoryByLineIdRespBean.java @@ -7,6 +7,15 @@ import java.util.List; public class TaxiPassengerGetTrajectoryByLineIdRespBean extends BaseData { public List data; + @Override + public String toString() { + return "TaxiPassengerGetTrajectoryByLineIdRespBean{" + + "data=" + data + + ", code=" + code + + ", msg='" + msg + '\'' + + '}'; + } + public static class TrajectoryInfo { public long lineId; // line id public String lineName; // line name @@ -21,6 +30,25 @@ public class TaxiPassengerGetTrajectoryByLineIdRespBean extends BaseData { public String txtFileUrlDPQP = ""; //打点文件下载的cos url，默认“” public String txtFileMd5DPQP = ""; //轨迹文件md5，默认“” public long contrailSaveTimeDPQP; //上传轨迹完成时间戳ms：用于MEC本地手动导入轨迹验证时不会被云端轨迹覆盖 + + @Override + public String toString() { + return "TrajectoryInfo{" + + "lineId=" + lineId + + ", lineName='" + lineName + '\'' + + ", csvFileUrl='" + csvFileUrl + '\'' + + ", csvFileMd5='" + csvFileMd5 + '\'' + + ", txtFileUrl='" + txtFileUrl + '\'' + + ", txtFileMd5='" + txtFileMd5 + '\'' + + ", contrailSaveTime=" + contrailSaveTime + + ", carModel='" + carModel + '\'' + + ", csvFileUrlDPQP='" + csvFileUrlDPQP + '\'' + + ", csvFileMd5DPQP='" + csvFileMd5DPQP + '\'' + + ", txtFileUrlDPQP='" + txtFileUrlDPQP + '\'' + + ", txtFileMd5DPQP='" + txtFileMd5DPQP + '\'' + + ", contrailSaveTimeDPQP=" + contrailSaveTimeDPQP + + '}'; + } } public TrajectoryInfo getTrajectoryInfoByLineId(long lineId) { diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerOrdersInServiceQueryRespBean.java b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerOrdersInServiceQueryRespBean.java index d81fca4e8c..7a4918cf1b 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerOrdersInServiceQueryRespBean.java +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerOrdersInServiceQueryRespBean.java @@ -13,6 +13,15 @@ import java.util.Objects; public class TaxiPassengerOrdersInServiceQueryRespBean extends BaseData { public Result data; + @Override + public String toString() { + return "TaxiPassengerOrdersInServiceQueryRespBean{" + + "data=" + data + + ", code=" + code + + ", msg='" + msg + '\'' + + '}'; + } + public static class Result { public String sn; // sn public long lineId = -1; //路线id，默认-1 @@ -23,6 +32,20 @@ public class TaxiPassengerOrdersInServiceQueryRespBean extends BaseData { public OrderBean order; public TaxiPassengerGetTrajectoryByLineIdRespBean.TrajectoryInfo trajectoryInfoByQuery;//通过line id查询的详细信息 + + @Override + public String toString() { + return "Result{" + + "sn='" + sn + '\'' + + ", lineId=" + lineId + + ", servingStatus=" + servingStatus + + ", currentStatus=" + currentStatus + + ", taskType=" + taskType + + ", endSite=" + endSite + + ", order=" + order + + ", trajectoryInfoByQuery=" + trajectoryInfoByQuery + + '}'; + } } public static class SiteBean { @@ -33,6 +56,18 @@ public class TaxiPassengerOrdersInServiceQueryRespBean extends BaseData { public Double wgs84Lon;// wgs84 经度 public Double wgs84Lat;// wgs84 纬度 + @Override + public String toString() { + return "SiteBean{" + + "siteId=" + siteId + + ", siteName='" + siteName + '\'' + + ", gcjLon=" + gcjLon + + ", gcjLat=" + gcjLat + + ", wgs84Lon=" + wgs84Lon + + ", wgs84Lat=" + wgs84Lat + + '}'; + } + @Override public boolean equals(Object o) { if (this == o) return true; diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt index 63fe6f13ff..561a44e057 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt @@ -283,7 +283,7 @@ class TaxiPassengerBaseFragment() : override fun showOrHideCheckAndStartAutopilotView(status:Int){ UiThreadHandler.post { arrivedView.visibility = View.GONE - bottom.setBagVisable(BottomBar.SelectView.OVERMAPVIEW) + bottom.setBagVisable(BottomBar.SelectView.OVERMAPVIEW,View.VISIBLE) when (status) { 0 -> { if (chekAndStartAutopilotView.visibility == View.GONE) { @@ -343,6 +343,7 @@ class TaxiPassengerBaseFragment() : exitFullVideoScreen(true) arrivedView.aniArrived(true) showOrHide(false,"显示到达目的地") + bottom.setBagVisable(BottomBar.SelectView.OVERMAPVIEW,View.GONE) RxUtils.createSubscribe(500) { arrivedView.setDataAndStartAnimation() VoiceNotice.showNotice("已到达目的地，带好随身物品，右侧下车更安全！期待下次再见", AIAssist.LEVEL2)