diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java
index 707eb8d3ed..32a64b55cf 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java
@@ -180,7 +180,7 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i
slidePanelView.setVisibility( View.VISIBLE );
slidePanelView.setText( getString( R.string.module_och_taxi_arrive_at_end_station ) );
mOrderStatus.setText( R.string.module_och_taxi_arrive_at_end_station2 );
- showNotice( getString( R.string.module_och_taxi_order_complete) );
+ showNotice( getString( R.string.module_och_taxi_order_complete_1) );
} else if ( MogoOCHTaxiModel.getInstance().isOnTheWay2EndStation() ) {
Logger.d( TAG, "已经去往终点" );
slidePanelView.setVisibility( View.GONE );
@@ -429,7 +429,7 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i
// showSlidePanle("滑动出发");
// showPanel();
} else {
- AIAssist.getInstance(getContext()).speakTTSVoice("已收车");
+// AIAssist.getInstance(getContext()).speakTTSVoice("已收车");
tvOperationStatus.setText("出车");
hideSlidePanel();
// hidPanel();
@@ -447,8 +447,10 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i
if (status == OCHOrderStatus.None.getCode() || status == OCHOrderStatus.Cancel.getCode() || status == OCHOrderStatus.Completed.getCode() ){
getPanelView().setVisibility(View.INVISIBLE);
hideSlidePanel();
+ changeOperationViewVisible(View.VISIBLE);
}else {
getPanelView().setVisibility(View.VISIBLE);
+ changeOperationViewVisible(View.INVISIBLE);
}
updateOrderStatus();
});
@@ -504,7 +506,7 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i
public void onArriveAt(AdasOCHData data) {
Logger.d( TAG, "行程结束");
MogoApisHandler.getInstance().getApis().getAdasControllerApi().cancelAutopilot();
- AIAssist.getInstance( getContext() ).speakTTSVoice( "即将到达目的地，请您携带好随身物品，安全下车。" );
+// AIAssist.getInstance( getContext() ).speakTTSVoice( "即将到达目的地，请您携带好随身物品，安全下车。" );
}
@Override
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml b/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml
index a9ccf96c3e..d7b4c3f7d9 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml
@@ -4,7 +4,8 @@
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/module_och_taxi_layoutview"
android:layout_width="@dimen/module_mogo_och_autopilot_order_bg_width"
- android:layout_height="@dimen/module_mogo_och_autopilot_order_bg_height"
+ android:layout_height="wrap_content"
+ android:minHeight="@dimen/module_mogo_och_autopilot_order_bg_height"
android:orientation="vertical">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+ android:orientation="horizontal">
+
-
+
-
+
+
-
+ android:orientation="horizontal">
+
-
+
-
-
-
+
+
+
预计里程
3.2 km
请携带好随身物品，注意侧后\n方来车，感谢体验蘑菇智行自\n动驾驶车！
+ 即将到达目的地，请您携带好随身物品，安全下车。
去往下车地点
已到达，等待乘客上车
收到新订单，前往上车地点
diff --git a/OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java b/OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java
index 9e07b68e89..d8ee04f180 100644
--- a/OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java
+++ b/OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java
@@ -256,4 +256,9 @@ public abstract class BaseOchFragment> e
public abstract void restartAutopilot();
+ public void changeOperationViewVisible(int visible){
+ getActivity().runOnUiThread(() -> {
+ tvOperationStatus.setVisibility(visible);
+ });
+ }
}
diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapApiBuilder.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapApiBuilder.java
index 81c8f74f37..24e88eb8f6 100644
--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapApiBuilder.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapApiBuilder.java
@@ -95,6 +95,7 @@ class AMapApiBuilder implements IMogoMapApiBuilder {
@Override
public IMogoMapView getMapView( Context context ) {
+ Logger.e("lianglihui","AMapApiBuilder getMapView");
IMogoMapView mapView = AMapViewHandler.getMapView();
if ( mapView != null
&& mapView.getMapView() != null
diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
index ace1c26a15..cb8a418b86 100644
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
@@ -114,6 +114,7 @@ public class AMapViewWrapper implements IMogoMapView,
public AMapViewWrapper(MapAutoView mMapView) {
startTime = System.currentTimeMillis();
Logger.i(TAG, "autoop--AMapViewWrapper: init");
+ Logger.i("lianglihui", "autoop--AMapViewWrapper: init");
this.mMapView = mMapView;
if (DebugConfig.isDebug()) {
GpsTester.getInstance().init(mMapView);
diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java
index 6b3816382f..db813b21b0 100644
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java
@@ -94,6 +94,7 @@ class CustomMapApiBuilder implements IMogoMapApiBuilder {
@Override
public IMogoMapView getMapView( Context context ) {
Log.d(TAG,"setDebugMode==true");
+ Log.d("lianglihui","setDebugMode==true");
NavAutoApi.INSTANCE.init( context, MapParams.Companion.init()
.setDebugMode( true )
.setDataFileSource(1) //todo 使用本地地图数据
diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java
index 654f33047b..a837407a25 100644
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java
@@ -96,6 +96,7 @@ public class AMapUIController implements IMogoMapUIController {
@Override
public VisualAngleMode getCurrentMapVisualAngle() {
+ Logger.e("lianglihui","amapUIcontroller ");
if (mClient != null) {
return mClient.getCurrentMapVisualAngle();
}
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/MogoBaseMapView.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/MogoBaseMapView.java
index 915baab015..ef60ef4d6b 100644
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/MogoBaseMapView.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/MogoBaseMapView.java
@@ -7,6 +7,8 @@ import android.widget.FrameLayout;
import androidx.annotation.Nullable;
+import com.mogo.utils.logger.Logger;
+
/**
* @author congtaowang
@@ -34,6 +36,7 @@ public abstract class MogoBaseMapView extends FrameLayout implements ILifeCycle
}
private void init( Context context ) {
+ Logger.e("lianglihui","MogoBaseMapView");
addMapView( context );
if (mMapView != null){
MogoMap.getInstance().init( getContext(), mMapView.getMap() );
diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
index e9e15649bb..5176da18fa 100644
--- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
+++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
@@ -353,8 +353,6 @@ public class MogoADASController implements IMogoADASController {
//测试网约车
//testOCH();
- // TODO: 2021/6/30 临时解决方案
- timeLoop();
}
@Override
@@ -758,7 +756,7 @@ public class MogoADASController implements IMogoADASController {
adasProvider.removeAdasStatusListener();
//AutopilotServiceManage.getInstance().release();
//关闭定时任务
- if (mDisposable != null) mDisposable.dispose();
+// if (mDisposable != null) mDisposable.dispose();
}
@Override
@@ -946,22 +944,22 @@ public class MogoADASController implements IMogoADASController {
mAdasDataListener.cameraEyeDetectResult(json);
}
-
- private static final int PERIOD = 5 * 1000;
- private static final int DELAY = 10000;
- private Disposable mDisposable;
-
- /**
- * 定时循环任务
- */
- private void timeLoop() {
- mDisposable = Observable.interval(DELAY, PERIOD, TimeUnit.MILLISECONDS)
- .map((aLong -> aLong + 1))
- .subscribeOn(Schedulers.io())
- .subscribe(aLong ->
- adasProvider.setBasicInfo()
- );//getUnreadCount()执行的任务
- }
+//
+// private static final int PERIOD = 5 * 1000;
+// private static final int DELAY = 10000;
+// private Disposable mDisposable;
+//
+// /**
+// * 定时循环任务
+// */
+// private void timeLoop() {
+// mDisposable = Observable.interval(DELAY, PERIOD, TimeUnit.MILLISECONDS)
+// .map((aLong -> aLong + 1))
+// .subscribeOn(Schedulers.io())
+// .subscribe(aLong ->
+// adasProvider.setBasicInfo()
+// );//getUnreadCount()执行的任务
+// }
}