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

Revert "taxi 3秒轮询方案 缓解长连接异常 调整订单状态切换逻辑,完全从服务端获取"

Browse Source 
This reverts commit eee19baf
This commit is contained in:
lianglihui
2021-07-18 15:30:03 +08:00
parent eee19baf2d
commit 604dd938c1
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java
View File

@@ -489,8 +489,8 @@ class MogoOCHTaxiModel {
updateOCHOrderStatus( OCHOrderStatus.ArriveAtStartStation, new OCHOrderStatusCallback() {
@Override
public void onSuccess( Object data ) {
// OCHTaxiUiController.getInstance().onOrderStatusChanged(OCHOrderStatus.ArriveAtStartStation.getCode());
// Logger.d( TAG, "更新状态成功" );
OCHTaxiUiController.getInstance().onOrderStatusChanged(OCHOrderStatus.ArriveAtStartStation.getCode());
Logger.d( TAG, "更新状态成功" );
}
@Override
@@ -853,7 +853,7 @@ class MogoOCHTaxiModel {
}
}
private static final int PERIOD = 3000;
private static final int PERIOD = 3 * 1000;
private static final int DELAY = 100;
private Disposable mDisposable;
/**

6
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java
View File

@@ -232,7 +232,7 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i
@Override
public void onSuccess( Object data ) {
Logger.d( TAG, "更新状态成功" );
// onOrderStatusChanged(OCHOrderStatus.ArriveAtEndStation.getCode());
onOrderStatusChanged(OCHOrderStatus.ArriveAtEndStation.getCode());
}
@Override
@@ -296,7 +296,7 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i
Logger.d( TAG, "更新状态成功" );
MogoOCHTaxiModel.getInstance().clearCurrentOCHOrder();
MogoOCHTaxiModel.getInstance().cancelAutopilot();
// OCHTaxiUiController.getInstance().onOrderStatusChanged(0);
OCHTaxiUiController.getInstance().onOrderStatusChanged(0);
}
@Override
@@ -336,7 +336,7 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i
@Override
public void onSuccess( Object data ) {
Logger.d( TAG, "更新状态成功" );
// onOrderStatusChanged(OCHOrderStatus.OnTheWayToEndStation.getCode());
onOrderStatusChanged(OCHOrderStatus.OnTheWayToEndStation.getCode());
}
@Override

2
OCH/mogo-och-taxi/src/main/res/values/strings.xml
View File

@@ -2,7 +2,7 @@
<resources>
<string name="module_och_taxi_arrive_at_start_station">确认上车，行程开始</string>
<string name="module_och_taxi_arrive_at_end_station">到达站点，乘客已下车</string>
<string name="module_och_taxi_order_status_ph_text">已到达上车地点，等待乘客上车</string>
<string name="module_och_taxi_order_status_ph_text">已到达上车站点，等待乘客上车</string>
<string name="module_och_taxi_order_distance_anchor_text">预计里程</string>
<string name="module_och_taxi_order_distance_text_ph">3.2 km</string>
<string name="module_och_taxi_order_complete">请携带好随身物品，注意侧后\n方来车，感谢体验蘑菇智行自\n动驾驶车！</string>