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

[6.5.0]

Browse Source 
[fix]
[bag 和订单进行绑定]
This commit is contained in:
yangyakun
2024-07-18 10:58:48 +08:00
parent 75f29ce62e
commit bb0d566089
12 changed files with 92 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java
View File

@@ -312,6 +312,7 @@ public class TaxiPresenter extends Presenter<TaxiFragment> implements ITaxiADASS
if(mView!=null) {
mView.updateCtvAutopilotStatusTag(true);
CallerOrderListenerManager.INSTANCE.invokeOrderStatus(true);
mView.setGuidHide();
}
}
}, UiThreadHandler.MODE.QUEUE);

3
OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
View File

@@ -567,4 +567,7 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
public void setGuidShow() {
acivShowGuid.setVisibility(View.VISIBLE);
}
public void setGuidHide(){
acivShowGuid.setVisibility(View.GONE);
}
}

1
OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
View File

@@ -416,6 +416,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"/>

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

@@ -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, "隐藏到达目的地")

8
OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/bottom/BottomBar.kt
View File

@@ -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)
}
}
}

2
OCH/taxi/pcommon/src/main/res/layout/taxt_p_bottom_bar.xml
View File

@@ -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"

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

@@ -537,4 +537,8 @@ abstract class BaseTaxiTabFragment<V : IView, P : Presenter<V>> : MvpFragment<V,
fun setGuidShow() {
aciv_show_guid.visibility = View.VISIBLE
}
fun setGuidHide() {
aciv_show_guid.visibility = View.GONE
}
}

11
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/TaxiPresenter.java
View File

@@ -337,7 +337,7 @@ public class TaxiPresenter extends Presenter<TaxiFragment> 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<TaxiFragment> 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);
}
}
}

1
OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml
View File

@@ -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"/>

28
OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerGetTrajectoryByLineIdRespBean.java
View File

@@ -7,6 +7,15 @@ import java.util.List;
public class TaxiPassengerGetTrajectoryByLineIdRespBean extends BaseData {
public List<TrajectoryInfo> 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) {

35
OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/bean/TaxiPassengerOrdersInServiceQueryRespBean.java
View File

@@ -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;

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

@@ -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)