Merge remote-tracking branch 'origin/dev_robotaxi-d-app-module_265_220329_2.6.5' into dev_robotaxi-d-app-module_265_220329_2.6.5

OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java

@@ -11,6 +11,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.map.MogoMapUIController;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.och.bus.passenger.constant.BusPassengerConst;
+import com.mogo.och.bus.passenger.ui.BusPassengerBaseFragment;
 import com.mogo.service.statusmanager.IMogoStatusChangedListener;
 import com.mogo.service.statusmanager.StatusDescriptor;
 
@@ -30,6 +31,7 @@ public class MogoOCHBusPassenger implements IMogoOCH, IMogoStatusChangedListener
 
     private FragmentActivity mActivity;
     private int mContainerId;
+    private BusPassengerBaseFragment mBusPassengerFragment;
 
     @Override
     public void createCoverage(FragmentActivity activity, int containerId) {
@@ -63,17 +65,15 @@ public class MogoOCHBusPassenger implements IMogoOCH, IMogoStatusChangedListener
     public void init(Context context) {
         MogoApisHandler.getInstance().getApis().getStatusManagerApi().registerStatusChangedListener("OchBus"
                 , StatusDescriptor.VR_MODE, this);
-        MogoApisHandler.getInstance().getApis().getStatusManagerApi().registerStatusChangedListener("OchBus"
-                , StatusDescriptor.TOP_VIEW, this);
     }
 
     @Override
     public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
-        if (descriptor == StatusDescriptor.VR_MODE){
+        if (descriptor == StatusDescriptor.VR_MODE) {
             if (isTrue){
-
+                showFragment();
             }else {
-
+                hideFragment();
             }
         }
     }
@@ -86,4 +86,21 @@ public class MogoOCHBusPassenger implements IMogoOCH, IMogoStatusChangedListener
         MogoMapUIController.getInstance()
                 .openVrMode( false );
     }
+
+    private void showFragment() {
+        if (mBusPassengerFragment == null) {
+            CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "准备add fragment======");
+            mBusPassengerFragment = new BusPassengerBaseFragment();
+            mActivity.getSupportFragmentManager().beginTransaction().add(mContainerId, mBusPassengerFragment).commitAllowingStateLoss();
+            return;
+        }
+        CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "准备show fragment");
+        mActivity.getSupportFragmentManager().beginTransaction().show(mBusPassengerFragment).commitAllowingStateLoss();
+    }
+
+    private void hideFragment(){
+        if (mBusPassengerFragment != null){
+            mActivity.getSupportFragmentManager().beginTransaction().hide(mBusPassengerFragment).commitAllowingStateLoss();
+        }
+    }
 }

OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java

@@ -0,0 +1,20 @@
+package com.mogo.och.bus.passenger.callback;
+
+/**
+ * Created on 2022/3/31
+ *
+ * Model->Presenter回调：ADAS相关（自动驾驶状态回调，到达终点等等）
+ */
+public interface IBusPassengerADASStatusCallback {
+    // 自动驾驶触发的已到达目的地：暂未用到
+    void onAutopilotArriveEnd();
+
+    // 自动驾驶可用状态
+    void onAutopilotEnable();
+
+    // 自动驾驶不可用状态
+    void onAutopilotDisable();
+
+    // 自动驾驶运行中
+    void onAutopilotRunning();
+}

OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java

@@ -0,0 +1,15 @@
+package com.mogo.och.bus.passenger.callback;
+
+import com.amap.api.maps.model.LatLng;
+
+import java.util.List;
+
+import mogo.telematics.pad.MessagePad;
+
+/**
+ * Created on 2022/3/31
+ */
+public interface IBusPassengerAutopilotPlanningCallback {
+    void routeResult(List<MessagePad.Location> models);
+    void routeResultByServer(List<LatLng> models);
+}

OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java

@@ -0,0 +1,15 @@
+package com.mogo.och.bus.passenger.callback;
+
+import android.location.Location;
+
+/**
+ * Created on 2022/3/31
+ *
+ * Model->Presenter回调：状态控制器监听（accOn、adas ui show、voice ui show、push ui show、v2x ui show等等）
+ */
+public interface IBusPassengerControllerStatusCallback {
+    // 是否vr map模式
+    void onVRModeChanged(boolean isVRMode);
+    // 自车定位
+    void onCarLocationChanged(Location location);
+}

OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java

@@ -0,0 +1,260 @@
+package com.mogo.och.bus.passenger.model;
+
+import android.content.Context;
+import android.content.Intent;
+import android.location.Location;
+import android.net.ConnectivityManager;
+
+import androidx.annotation.Nullable;
+
+import com.mogo.aicloud.services.socket.IMogoLifecycleListener;
+import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager;
+import com.mogo.commons.debug.DebugConfig;
+import com.mogo.eagle.core.data.autopilot.ADASTrajectoryInfo;
+import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo;
+import com.mogo.eagle.core.data.config.FunctionBuildConfig;
+import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotPlanningListener;
+import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
+import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotPlanningListenerManager;
+import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
+import com.mogo.eagle.core.utilcode.util.NetworkUtils;
+import com.mogo.map.navi.IMogoCarLocationChangedListener2;
+import com.mogo.module.common.MogoApisHandler;
+import com.mogo.och.bus.passenger.callback.IBusPassengerADASStatusCallback;
+import com.mogo.och.bus.passenger.callback.IBusPassengerAutopilotPlanningCallback;
+import com.mogo.och.bus.passenger.callback.IBusPassengerControllerStatusCallback;
+import com.mogo.service.intent.IMogoIntentListener;
+import com.mogo.service.statusmanager.IMogoStatusChangedListener;
+import com.mogo.service.statusmanager.StatusDescriptor;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import mogo.telematics.pad.MessagePad;
+import mogo_msg.MogoReportMsg;
+
+import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS_P;
+
+/**
+ * Created on 2022/3/31
+ */
+public class BusPassengerModel {
+    private static final String TAG = BusPassengerModel.class.getSimpleName();
+
+    private static final class SingletonHolder {
+        private static final BusPassengerModel INSTANCE = new BusPassengerModel();
+    }
+
+    public static BusPassengerModel getInstance() {
+        return SingletonHolder.INSTANCE;
+    }
+
+    private Context mContext;
+    private IBusPassengerADASStatusCallback mADASStatusCallback; //Model->Presenter：自动驾驶状态相关
+    private IBusPassengerAutopilotPlanningCallback mAutopilotPlanningCallback; //Model->Presenter：自动驾驶线路规划
+    private Map<String, IBusPassengerControllerStatusCallback> mControllerStatusCallbackMap = new ConcurrentHashMap<>();
+
+    private double mLongitude, mLatitude;
+
+    private BusPassengerModel() {
+    }
+
+    public void init( Context context ) {
+        mContext = context.getApplicationContext();
+        initListeners();
+        // TODO: 2022/3/31
+    }
+
+    public void release() {
+        releaseListeners();
+    }
+
+    public void setMoGoAutopilotPlanningListener(IBusPassengerAutopilotPlanningCallback
+                                                         moGoAutopilotPlanningCallback) {
+        this.mAutopilotPlanningCallback = moGoAutopilotPlanningCallback;
+    }
+
+    public void setADASStatusCallback(IBusPassengerADASStatusCallback callback) {
+        this.mADASStatusCallback = callback;
+    }
+
+    public void setControllerStatusCallback(String tag, IBusPassengerControllerStatusCallback callback) {
+        if (tag == null || "".equals(tag)) return;
+
+        if (callback == null) {
+            mControllerStatusCallbackMap.remove(tag);
+            return;
+        }
+
+        mControllerStatusCallbackMap.put(tag,callback);
+
+    }
+
+    private void initListeners() {
+        MogoAiCloudSocketManager.getInstance(mContext)
+                .registerLifecycleListener(10010, mSocketLifeCycleLisnter);
+
+        // 2021.11.1重构自动驾驶 实现接口 IMoGoAutopilotStatusListener 注册监听 替换IMogoAdasOCHCallback接口
+        CallerAutoPilotStatusListenerManager.INSTANCE.addListener(TAG, mGoAutopilotStatusListener);
+        MogoApisHandler.getInstance()
+                .getApis()
+                .getIntentManagerApi()
+                .registerIntentListener( ConnectivityManager.CONNECTIVITY_ACTION, mNetWorkIntentListener );
+        MogoApisHandler.getInstance()
+                .getApis()
+                .getStatusManagerApi()
+                .registerStatusChangedListener( TAG, StatusDescriptor.VR_MODE, mMogoStatusChangedListener );
+        // 达到起始站围栏监听
+        MogoApisHandler.getInstance()
+                .getApis()
+                .getRegisterCenterApi()
+                .registerCarLocationChangedListener( TAG, mCarLocationChangedListener2);
+
+        //2021.11.1 自动驾驶路线规划接口
+        CallerAutopilotPlanningListenerManager.INSTANCE.addListener(TAG,moGoAutopilotPlanningListener);
+    }
+
+    private void releaseListeners() {
+        MogoApisHandler.getInstance()
+                .getApis()
+                .getStatusManagerApi()
+                .unregisterStatusChangedListener(TAG, StatusDescriptor.VR_MODE, mMogoStatusChangedListener);
+
+        // 注销到达起始站围栏监听
+        MogoApisHandler.getInstance()
+                .getApis()
+                .getRegisterCenterApi()
+                .unregisterCarLocationChangedListener(TAG, mCarLocationChangedListener2);
+
+        MogoAiCloudSocketManager.getInstance(mContext)
+                .unregisterLifecycleListener(10010);
+
+        CallerAutoPilotStatusListenerManager.INSTANCE.removeListener(mGoAutopilotStatusListener);
+        CallerAutopilotPlanningListenerManager.INSTANCE.removeListener(moGoAutopilotPlanningListener);
+    }
+
+    //监听网络变化，避免启动机器时无网导致无法更新订单信息
+    private final IMogoIntentListener mNetWorkIntentListener = new IMogoIntentListener() {
+        @Override
+        public void onIntentReceived( String intentStr, Intent intent ) {
+            CallerLogger.INSTANCE.d( M_BUS_P + TAG, "onIntentReceived = %s", intentStr );
+            if ( ConnectivityManager.CONNECTIVITY_ACTION.equals( intentStr ) ) {
+                if ( NetworkUtils.isConnected( mContext ) ) {
+                    if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
+                        // TODO: 2022/3/31  
+                    }
+                }
+            }
+        }
+    };
+
+    private final IMogoStatusChangedListener mMogoStatusChangedListener = new IMogoStatusChangedListener() {
+        // VR mode变更回调
+        @Override
+        public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
+            if (StatusDescriptor.VR_MODE == descriptor) {
+                if (mControllerStatusCallbackMap.size() > 0) {
+                    for (IBusPassengerControllerStatusCallback callback :mControllerStatusCallbackMap.values()){
+                        callback.onVRModeChanged(isTrue);
+                    }
+                }
+            }
+        }
+    };
+
+    private final IMogoLifecycleListener mSocketLifeCycleLisnter = new IMogoLifecycleListener() {
+        @Override
+        public void onConnectFailure() { CallerLogger.INSTANCE.e(M_BUS_P + TAG,"socket onConnectFailure"); }
+
+        @Override
+        public void onConnectSuccess() { CallerLogger.INSTANCE.e(M_BUS_P + TAG,"socket onConnectSuccess"); }
+
+        @Override
+        public void onConnectLost() { CallerLogger.INSTANCE.e(M_BUS_P + TAG,"socket onConnectLost"); }
+    };
+
+    // 自车定位
+    private final IMogoCarLocationChangedListener2 mCarLocationChangedListener2 = new IMogoCarLocationChangedListener2() {
+
+        @Override
+        public void onCarLocationChanged2( Location location ) {
+            //位置变化时，通过围栏判断是否到达x点
+            // TODO: 2022/3/31
+            mLongitude = location.getLongitude();
+            mLatitude = location.getLatitude();
+            for (IBusPassengerControllerStatusCallback callback :mControllerStatusCallbackMap.values()){
+                callback.onCarLocationChanged(location);
+            }
+        }
+    };
+
+    private final IMoGoAutopilotStatusListener mGoAutopilotStatusListener = new IMoGoAutopilotStatusListener(){
+
+        @Override
+        public void onAutopilotGuardian(@Nullable MogoReportMsg.MogoReportMessage guardianInfo) {
+
+        }
+
+        private boolean arriveAtEnd = false; //乘客app专用字段
+
+        @Override
+        public void onAutopilotStatusResponse(@NotNull AutopilotStatusInfo autopilotStatusInfo) {
+            if (autopilotStatusInfo == null) return;
+            int state = autopilotStatusInfo.getState();
+            CallerLogger.INSTANCE.d( M_BUS_P + TAG, "state = %s", state );
+            if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) {
+                if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotRunning();
+                // TODO: 2022/3/31  
+            } else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) {
+                // TODO: 2022/3/31  
+
+                if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotEnable();
+            } else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE) {
+                // TODO: 2022/3/31  
+
+                if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotDisable();
+            }
+        }
+
+        @Override
+        public void onAutopilotSNRequest() {
+
+        }
+
+        @Override
+        public void onAutopilotArriveAtStation(@Nullable MessagePad.ArrivalNotification arrivalNotification) {
+            if (FunctionBuildConfig.isDemoMode
+                    && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
+                arriveAtEnd = true;
+            }
+
+            // TODO: 2022/3/31  
+            if (DebugConfig.isDebug()) {
+                // TipToast.shortTip("到达目的地");
+            }
+        }
+
+    };
+
+    private final IMoGoAutopilotPlanningListener moGoAutopilotPlanningListener = new IMoGoAutopilotPlanningListener(){
+
+        @Override
+        public void onAutopilotRotting(@Nullable MessagePad.GlobalPathResp routeList) {
+            if (null != routeList && routeList.getWayPointsList().size() > 0){
+                // TODO: 2022/3/31
+                mAutopilotPlanningCallback.routeResult(routeList.getWayPointsList());
+            }
+        }
+
+        @Override
+        public void onAutopilotTrajectory(ArrayList<ADASTrajectoryInfo> trajectoryInfos) {
+
+        }
+    };
+
+}

OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/network/BusPassengerServiceApi.java

@@ -0,0 +1,9 @@
+package com.mogo.och.bus.passenger.network;
+
+/**
+ * Created on 2022/3/31
+ *
+ * Bus乘客端接口定义
+ */
+interface BusPassengerServiceApi {
+}

OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/network/BusPassengerServiceCallback.java

@@ -0,0 +1,15 @@
+package com.mogo.och.bus.passenger.network;
+
+/**
+ * Created on 2022/3/31
+ */
+public interface BusPassengerServiceCallback<T> {
+
+    void onSuccess(T data);
+
+    void onFail(int code, String msg);
+
+    default void onError() {
+
+    }
+}

OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.java

@@ -0,0 +1,81 @@
+package com.mogo.och.bus.passenger.network;
+
+import android.content.Context;
+
+import com.mogo.eagle.core.data.BaseData;
+import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager;
+import com.mogo.eagle.core.network.MoGoRetrofitFactory;
+import com.mogo.eagle.core.network.RequestOptions;
+import com.mogo.eagle.core.network.SubscribeImpl;
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
+import com.mogo.och.bus.passenger.constant.BusPassengerConst;
+
+import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS_P;
+
+/**
+ * Created on 2022/3/31
+ */
+public class BusPassengerServiceManager {
+    private static final String TAG = BusPassengerServiceManager.class.getSimpleName();
+
+    private static final class SingletonHolder {
+        private static final BusPassengerServiceManager INSTANCE = new BusPassengerServiceManager();
+    }
+
+    public static BusPassengerServiceManager getInstance() {
+        return SingletonHolder.INSTANCE;
+    }
+
+    private BusPassengerServiceApi mBusPassengerServiceApi;
+
+    private BusPassengerServiceManager() {
+        if (mBusPassengerServiceApi == null){
+            mBusPassengerServiceApi = MoGoRetrofitFactory.getInstance(
+                    BusPassengerConst.getBaseUrl()).create(BusPassengerServiceApi.class);
+        }
+    }
+
+    /**
+     * 获取Bus司机端的sn
+     * @return
+     */
+    private String getDriverAppSn(){
+        return CallerTelematicManager.INSTANCE.getServerToken();
+//        return "X2020210525EFA93B5946FA38D4";
+    }
+
+    private <T extends BaseData> SubscribeImpl getSubscribeImpl(
+            Context context, BusPassengerServiceCallback<T> callback, String apiName) {
+        return new SubscribeImpl<T>(RequestOptions.create(context)) {
+            @Override
+            public void onSuccess(T o) {
+                super.onSuccess(o);
+                CallerLogger.INSTANCE.e(M_BUS_P + TAG,apiName +
+                        ": onSuccess() " + o.msg);
+                if (callback != null) {
+                    callback.onSuccess(o);
+                }
+            }
+
+            @Override
+            public void onError(Throwable e) {
+                super.onError(e);
+                CallerLogger.INSTANCE.e(M_BUS_P + TAG,apiName +
+                        ": onError() " + e.getMessage());
+                if (callback != null) {
+                    callback.onError();
+                }
+            }
+
+            @Override
+            public void onError(String message, int code) {
+                super.onError(message, code);
+                CallerLogger.INSTANCE.e(M_BUS_P + TAG,String.format(apiName +
+                        ": onError() code = %d; message = %s;", code, message));
+                if (callback != null) {
+                    callback.onFail(code, message);
+                }
+            }
+        };
+    }
+}

OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java

@@ -0,0 +1,98 @@
+package com.mogo.och.bus.passenger.presenter;
+
+import android.location.Location;
+import android.os.Looper;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.LifecycleOwner;
+
+import com.mogo.commons.AbsMogoApplication;
+import com.mogo.commons.mvp.Presenter;
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
+import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
+import com.mogo.och.bus.passenger.callback.IBusPassengerADASStatusCallback;
+import com.mogo.och.bus.passenger.callback.IBusPassengerControllerStatusCallback;
+import com.mogo.och.bus.passenger.model.BusPassengerModel;
+import com.mogo.och.bus.passenger.ui.BusPassengerBaseFragment;
+
+import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS_P;
+
+/**
+ * Created on 2022/3/31
+ */
+public class BaseBusPassengerPresenter extends Presenter<BusPassengerBaseFragment> implements
+        IBusPassengerADASStatusCallback, IBusPassengerControllerStatusCallback {
+    private static final String TAG = BaseBusPassengerPresenter.class.getSimpleName();
+
+    public BaseBusPassengerPresenter(BusPassengerBaseFragment view) {
+        super(view);
+        BusPassengerModel.getInstance().init(AbsMogoApplication.getApp());
+        initListeners();
+    }
+
+    @Override
+    public void onCreate( @NonNull LifecycleOwner owner ) {
+        super.onCreate( owner );
+        CallerLogger.INSTANCE.d( M_BUS_P + TAG, "Bus乘客端Presenter onCreate()" );
+    }
+
+    @Override
+    public void onDestroy( @NonNull LifecycleOwner owner ) {
+        super.onDestroy( owner );
+
+        releaseListeners();
+        BusPassengerModel.getInstance().release();
+    }
+
+    private void initListeners() {
+        BusPassengerModel.getInstance().setADASStatusCallback(this);
+        BusPassengerModel.getInstance().setControllerStatusCallback(TAG, this);
+    }
+
+    private void releaseListeners() {
+        BusPassengerModel.getInstance().setADASStatusCallback(null);
+        BusPassengerModel.getInstance().setControllerStatusCallback(TAG, null);
+    }
+
+    private void runOnUIThread( Runnable executor ) {
+        if ( executor == null ) {
+            return;
+        }
+        if ( Looper.myLooper() != Looper.getMainLooper() ) {
+            UiThreadHandler.post( executor );
+        } else {
+            executor.run();
+        }
+    }
+
+
+    @Override
+    public void onAutopilotArriveEnd() {
+
+    }
+
+    @Override
+    public void onAutopilotEnable() {
+
+    }
+
+    @Override
+    public void onAutopilotDisable() {
+
+    }
+
+    @Override
+    public void onAutopilotRunning() {
+
+    }
+
+    @Override
+    public void onVRModeChanged(boolean isVRMode) {
+
+    }
+
+    @Override
+    public void onCarLocationChanged(Location location) {
+
+    }
+}

OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java

@@ -0,0 +1,46 @@
+package com.mogo.och.bus.passenger.ui;
+
+import android.os.Handler;
+import android.os.Looper;
+
+import androidx.annotation.NonNull;
+
+import com.mogo.commons.mvp.MvpFragment;
+import com.mogo.och.bus.passenger.R;
+import com.mogo.och.bus.passenger.presenter.BaseBusPassengerPresenter;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Created on 2022/3/31
+ *
+ * Bus乘客端基础Fragment
+ */
+public class BusPassengerBaseFragment extends MvpFragment<BusPassengerBaseFragment, BaseBusPassengerPresenter> {
+    private static final String TAG = BusPassengerBaseFragment.class.getSimpleName();
+
+    private Handler mHandler = new Handler(Looper.getMainLooper());
+
+    @NonNull
+    @NotNull
+    @Override
+    protected BaseBusPassengerPresenter createPresenter() {
+        return new BaseBusPassengerPresenter(this);
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.bus_p_base_fragment;
+    }
+
+    @Override
+    public String getTagName() {
+        return TAG;
+    }
+
+    @Override
+    protected void initViews() {
+
+    }
+
+}

OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>

OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/OchBusProvider.java

@@ -47,8 +47,6 @@ public class OchBusProvider implements IMogoOCH {
     public void init(Context context) {
         MogoApisHandler.getInstance().getApis().getStatusManagerApi().registerStatusChangedListener("OchBus"
                 , StatusDescriptor.VR_MODE, statusChangedListener);
-        MogoApisHandler.getInstance().getApis().getStatusManagerApi().registerStatusChangedListener("OchBus"
-                , StatusDescriptor.TOP_VIEW, statusChangedListener);
     }
 
     private void showFragment() {
@@ -78,8 +76,7 @@ public class OchBusProvider implements IMogoOCH {
             } else {
                 hideFragment();
             }
-        } else if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()
-                && descriptor == StatusDescriptor.TOP_VIEW) {
+        } else if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
             // topView进行展示时推出网约车界面，但是不隐藏整个fragment
             if (busFragment != null && isTrue) {
                 busFragment.hideOchBus();

OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseOchBusTabFragment.java

@@ -150,16 +150,12 @@ public abstract class BaseOchBusTabFragment<V extends IView, P extends Presenter
             });
         }
         initListener();
-        ctvAutopilotStatus.setOnClickListener(v -> {
-            // 如果能自动驾驶，就自动驾驶，不能就提示
-//            if (CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState() == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE){
-//                    return;
-//            }
-//            if (autopilotLoadingAnimator != null){
-//                TipToast.shortTip("正在开启自动驾驶。。。");
-//                return;
-//            }
-            restartAutopilot();
+        ctvAutopilotStatus.setOnClickListener(new OnPreventFastClickListener(){
+
+            @Override
+            public void onClickImpl(View v) {
+                restartAutopilot();
+            }
         });
 
         // debug下调用测试面板 2022.2.25修改到 长按当前站点名字

OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java

@@ -38,7 +38,6 @@ class MogoOCHTaxiPassenger implements IMogoOCH, IMogoStatusChangedListener {
     public void init( Context context ) {
         CallerLogger.INSTANCE.d( M_TAXI_P + TAG, "init" );
         MogoApisHandler.getInstance().getApis().getStatusManagerApi().registerStatusChangedListener("ochTaxi", StatusDescriptor.VR_MODE,this);
-        MogoApisHandler.getInstance().getApis().getStatusManagerApi().registerStatusChangedListener("ochTaxi", StatusDescriptor.TOP_VIEW,this);
     }
 
     /**

OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrderQueryRemainingResp.java

@@ -0,0 +1,20 @@
+package com.mogo.och.taxi.passenger.bean;
+
+import com.mogo.eagle.core.data.BaseData;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Created by pangfan on 2021/8/19
+ *
+ * 查询订单返回数据结构
+ */
+public class TaxiPassengerOrderQueryRemainingResp extends BaseData {
+    public Result data;
+
+    public static class Result {
+        public long distance;
+        public long duration;
+    }
+}

OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerQueryOrderRouteResp.java

@@ -0,0 +1,13 @@
+package com.mogo.och.taxi.passenger.bean;
+
+import com.amap.api.maps.model.LatLng;
+import com.mogo.eagle.core.data.BaseData;
+
+import java.util.List;
+
+/**
+ * Created by pangfan on 2021/8/19
+ */
+public class TaxiPassengerQueryOrderRouteResp extends BaseData {
+    public List<LatLng> data;
+}

OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/IOCHTaxiPassengerAutopilotPlanningCallback.java

@@ -1,6 +1,8 @@
 package com.mogo.och.taxi.passenger.callback;
 
 
+import com.amap.api.maps.model.LatLng;
+
 import java.util.List;
 
 import mogo.telematics.pad.MessagePad;
@@ -10,4 +12,5 @@ import mogo.telematics.pad.MessagePad;
  */
 public interface IOCHTaxiPassengerAutopilotPlanningCallback {
     void routeResult(List<MessagePad.Location> models);
+    void routeResultByServer(List<LatLng> models);
 }

OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/IOCHTaxiPassengerNaviChangedCallback.java

@@ -6,6 +6,6 @@ package com.mogo.och.taxi.passenger.callback;
  */
 public interface IOCHTaxiPassengerNaviChangedCallback {
     // 当前位置距离上车点的距离（米）、预估时间（秒） 、当前路的名称
-    void onCurrentNaviDistAndTimeChanged(int meters, int timeInSecond, String currentRoadName);
+    void onCurrentRoadName(String currentRoadName);
     void reInitNaviAmap(boolean isPlay,boolean isRestart);
 }

OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/IOCHTaxiPassengerOrderStatusCallback.java

@@ -17,6 +17,9 @@ public interface IOCHTaxiPassengerOrderStatusCallback {
     void onCurrentOrderStatusChanged(TaxiPassengerOrderQueryRespBean.Result order);
 
     // 当前位置距离上车点的距离（米）、预估时间（秒）
-    void onCurrentOrderDistToEndChanged(int meters, int timeInSecond, String currentRoadName);
+    void onCurrentOrderDistToEndChanged(long meters, long timeInSecond);
+
+    //当前路名字
+    void onCurrentRoadName(String currentRoadName);
 
 }

OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt

@@ -39,5 +39,8 @@ class TaxiPassengerConst {
 
         // 订单总里程
         const val SP_KEY_ORDER_SUM_DIS = "SP_KEY_ORDER_SUM_DIS"
+
+        //实时查询订单剩余时间 和 剩余里程 轮询间隔2s
+        const val LOOP_CALCULATEROUTE_2S = 2 * 1000L
     }
 }

OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java

@@ -8,11 +8,12 @@ import android.os.Looper;
 
 import androidx.annotation.Nullable;
 
+import com.amap.api.maps.model.LatLng;
 import com.amap.api.navi.model.NaviLatLng;
 import com.elegant.network.utils.GsonUtil;
+import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager;
 import com.mogo.cloud.commons.utils.CoordinateUtils;
 import com.mogo.commons.debug.DebugConfig;
-import com.mogo.commons.voice.AIAssist;
 import com.mogo.eagle.core.data.autopilot.ADASTrajectoryInfo;
 import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo;
 import com.mogo.eagle.core.data.config.FunctionBuildConfig;
@@ -29,9 +30,10 @@ import com.mogo.eagle.core.utilcode.util.NetworkUtils;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.map.navi.IMogoCarLocationChangedListener2;
 import com.mogo.module.common.MogoApisHandler;
-import com.mogo.och.taxi.passenger.R;
+import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryRemainingResp;
 import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryRespBean;
 import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrdersInServiceQueryRespBean;
+import com.mogo.och.taxi.passenger.bean.TaxiPassengerQueryOrderRouteResp;
 import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerADASStatusCallback;
 import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerAutopilotPlanningCallback;
 import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerControllerStatusCallback;
@@ -42,22 +44,29 @@ import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst;
 import com.mogo.och.taxi.passenger.constant.TaxiPassengerOrderStatusEnum;
 import com.mogo.och.taxi.passenger.network.TaxiPassengerServiceCallback;
 import com.mogo.och.taxi.passenger.network.TaxiPassengerServiceManager;
-import com.mogo.service.cloud.socket.IMogoLifecycleListener;
+import com.mogo.aicloud.services.socket.IMogoLifecycleListener;
+import com.mogo.och.taxi.passenger.utils.TPCoordinateCalculateRouteUtil;
+import com.mogo.service.IMogoServiceApis;
 import com.mogo.service.intent.IMogoIntentListener;
 import com.mogo.service.statusmanager.IMogoStatusChangedListener;
 import com.mogo.service.statusmanager.StatusDescriptor;
 
 import org.jetbrains.annotations.NotNull;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import io.reactivex.exceptions.UndeliverableException;
+import io.reactivex.functions.Consumer;
+import io.reactivex.plugins.RxJavaPlugins;
 import mogo.telematics.pad.MessagePad;
 import mogo_msg.MogoReportMsg;
 
+import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI;
 import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI_P;
 
 /**
@@ -83,12 +92,6 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback
     private volatile List<TaxiPassengerOrderQueryRespBean.Result> mInServiceList = Collections.emptyList(); //进行中订单
     private volatile List<TaxiPassengerOrderQueryRespBean.Result> mWaitServiceList = Collections.emptyList(); //待服务订单
 
-    public void setmTtsLessThan200Tip(int ttsLessThan200Tip) {
-        this.mTtsLessThan200Tip = ttsLessThan200Tip;
-    }
-
-    private volatile  int mTtsLessThan200Tip = 0;//离终点200米提示播报
-
     private IOCHTaxiPassengerADASStatusCallback mADASStatusCallback; //Model->Presenter：自动驾驶状态相关
     private IOCHTaxiPassengerAutopilotPlanningCallback mAutopilotPlanningCallback; //Model->Presenter：自动驾驶线路规划
 
@@ -142,13 +145,41 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback
         mContext = context.getApplicationContext();
         initListeners();
 
-//        IMogoServiceApis apis = MogoApisHandler.getInstance().getApis();
-//        apis.getSocketManagerApi(mContext).init(mContext, DebugConfig.getSocketAppId());
-        // TODO: 2021/8/27 因需要通过此回调的location进行坐标上传，暂改为全程监听，退出后再反注册，
-        //  待后续整体调整location获取来源
-//        if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE) {
-//            apis.getLocationInfoApi().start();
-//        }
+        // 调用Disposable.dispose() 时候会出现InterruptedException 导致出现崩溃
+        // The exception could not be delivered to the consumer because it has already canceled/disposed the flow or the excTeption has nowhere to go to begin with
+        RxJavaPlugins.setErrorHandler(new Consumer<Throwable>() {
+            @Override
+            public void accept(Throwable e) {
+                if (e instanceof UndeliverableException) {
+                    e = e.getCause();
+                    CallerLogger.INSTANCE.d(M_TAXI + TAG, "UndeliverableException");
+                }
+                if ((e instanceof IOException)) {//
+                    // fine, irrelevant network problem or API that throws on cancellation
+                    CallerLogger.INSTANCE.d(M_TAXI + TAG, "IOException");
+                    return;
+                }
+                if (e instanceof InterruptedException) {
+                    // fine, some blocking code was interrupted by a dispose call
+                    CallerLogger.INSTANCE.d(M_TAXI + TAG, "InterruptedException");
+                    return;
+                }
+                if ((e instanceof NullPointerException) || (e instanceof IllegalArgumentException)) {
+                    // that's likely a bug in the application
+                    CallerLogger.INSTANCE.d(M_TAXI + TAG, "NullPointerException or IllegalArgumentException");
+                    Thread.currentThread().getUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e);
+                    return;
+                }
+                if (e instanceof IllegalStateException) {
+                    // that's a bug in RxJava or in a custom operator
+                    CallerLogger.INSTANCE.d(M_TAXI + TAG, "IllegalStateException");
+                    Thread.currentThread().getUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e);
+                    return;
+                }
+                CallerLogger.INSTANCE.d(M_TAXI + TAG,"Undeliverable exception");
+            }
+        });
+
         startOrStopOrderLoop();
     }
 
@@ -163,13 +194,12 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback
 
     public void release() {
         startOrStopOrderLoop(false);
+        startOrStopQueryOrderRemaining(false);
         releaseListeners();
     }
 
     private void initListeners() {
-        MogoApisHandler.getInstance()
-                .getApis()
-                .getSocketManagerApi(mContext)
+        MogoAiCloudSocketManager.getInstance(mContext)
                 .registerLifecycleListener(10010,mSocketLifeCycleLisnter);
 
         // 2021.11.1重构自动驾驶 实现接口 IMoGoAutopilotStatusListener 注册监听 替换IMogoAdasOCHCallback接口
@@ -207,9 +237,7 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback
                 .getRegisterCenterApi()
                 .unregisterCarLocationChangedListener(TAG, mCarLocationChangedListener2);
 
-        MogoApisHandler.getInstance()
-                .getApis()
-                .getSocketManagerApi(mContext)
+        MogoAiCloudSocketManager.getInstance(mContext)
                 .unregisterLifecycleListener(10010);
 
         CallerAutoPilotStatusListenerManager.INSTANCE.removeListener(mGoAutopilotStatusListener);
@@ -531,6 +559,7 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback
         @Override
         public void onAutopilotRotting(@Nullable MessagePad.GlobalPathResp routeList) {
             if (null != routeList && routeList.getWayPointsList().size() > 0){
+                calculateRouteLineSum(TPCoordinateCalculateRouteUtil.coordinateConverterWgsToGcjListCommon(mContext,routeList.getWayPointsList()));
                 mAutopilotPlanningCallback.routeResult(routeList.getWayPointsList());
             }
         }
@@ -568,16 +597,62 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback
         }
     }
 
-    @Override
-    public void onCurrentNaviDistAndTimeChanged(int meters, int timeInSecond, String currentRoadName) {
-        if (mTtsLessThan200Tip == 0 && meters <= 200){
-            mTtsLessThan200Tip = 1;
-            runOnUIThread(() -> {
-                AIAssist.getInstance(mContext).speakTTSVoice(mContext.getString(R.string.taxi_p_arrive_end_tts_200));
-            });
+    public void startOrStopQueryOrderRemaining(boolean isStart){
+        if (isStart){
+            TaxiPassengerModelLoopManager.getInstance().startQueryOrderRemainingtLoop();
+        }else {
+            TaxiPassengerModelLoopManager.getInstance().stopQueryOrderRemainingLoop();
         }
+    }
+
+    public void queryOrderRemaining(){
+        if (mCurrentOCHOrder == null) return;
+        TaxiPassengerServiceManager.getInstance().queryOrderRemaining(mContext, mCurrentOCHOrder.orderNo, new TaxiPassengerServiceCallback<TaxiPassengerOrderQueryRemainingResp>() {
+            @Override
+            public void onSuccess(TaxiPassengerOrderQueryRemainingResp data) {
+                if (data != null && data.data!=null){
+                    CallerLogger.INSTANCE.e(M_TAXI_P + TAG,"distance = "+data.data.distance+" ,duration = "+data.data.duration);
+                    for (IOCHTaxiPassengerOrderStatusCallback callback :mOrderStatusCallbackMap.values()){
+                        callback.onCurrentOrderDistToEndChanged(data.data.distance,data.data.duration);
+                    }
+                }
+            }
+
+            @Override
+            public void onFail(int code, String msg) {
+
+            }
+        });
+    }
+
+    public void queryOrderRouteList() {
+         if (mCurrentOCHOrder == null) return;
+        CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "--route--- queryOrderRouteList");
+         TaxiPassengerServiceManager.getInstance().queryOrderRouteList(mContext, mCurrentOCHOrder.orderNo, new TaxiPassengerServiceCallback<TaxiPassengerQueryOrderRouteResp>() {
+             @Override
+             public void onSuccess(TaxiPassengerQueryOrderRouteResp data) {
+                 CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "--route---"+GsonUtil.jsonFromObject(data));
+                 if (data != null && data.data != null && data.data != null && data.data.size() > 0){
+                     if (mAutopilotPlanningCallback != null){
+                         calculateRouteLineSum(data.data);
+                         mAutopilotPlanningCallback.routeResultByServer(data.data);
+                     }
+                 }else {
+                     queryOrderRouteList();
+                 }
+             }
+
+             @Override
+             public void onFail(int code, String msg) {
+
+             }
+         });
+    }
+
+    @Override
+    public void onCurrentRoadName(String currentRoadName) {
         for (IOCHTaxiPassengerOrderStatusCallback callback :mOrderStatusCallbackMap.values()){
-            callback.onCurrentOrderDistToEndChanged(meters,timeInSecond,currentRoadName);
+            callback.onCurrentRoadName(currentRoadName);
         }
     }
 
@@ -594,6 +669,11 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback
         TaxiPassengerNaviToDestinationModel.getInstance(mContext).setFirstcalculateDriveRoute(0);
     }
 
+    public void calculateRouteLineSum(List<LatLng> points){
+        float sumLength = TPCoordinateCalculateRouteUtil.calculateRouteSumLength(points);
+        SharedPrefsMgr.getInstance(mContext).putInt(TaxiPassengerConst.SP_KEY_ORDER_SUM_DIS,(int) sumLength);
+    }
+
     private void runOnUIThread(Runnable executor) {
         if (executor == null) {
             return;

OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModelLoopManager.java

@@ -30,7 +30,7 @@ public class TaxiPassengerModelLoopManager {
     }
 
     private Disposable mInAndWaitServiceDisposable; //进行中、待服务订单列表轮询
-    private Disposable mHeartbeatDisposable; //心跳轮询
+    private Disposable mQueryOrderRemainingDisposable; //心跳轮询
 
     public void startInAndWaitOrdersLoop() {
         if (mInAndWaitServiceDisposable != null && !mInAndWaitServiceDisposable.isDisposed()) {
@@ -54,24 +54,24 @@ public class TaxiPassengerModelLoopManager {
     }
 
 
-//    public void startHeartbeatLoop() {
-//        if (mHeartbeatDisposable != null && !mHeartbeatDisposable.isDisposed()) {
-//            return;
-//        }
-//        CallerLogger.INSTANCE.i(M_TAXI_P + TAG, "startHeartbeatLoop()");
-//        mHeartbeatDisposable = Observable.interval(TaxiPassengerConst.LOOP_DELAY,
-//                TaxiPassengerConst.LOOP_PERIOD_60S, TimeUnit.MILLISECONDS)
-//                .map((aLong -> aLong + 1))
-//                .subscribeOn(Schedulers.io())
-//                .observeOn(AndroidSchedulers.mainThread())
-//                .subscribe(aLong -> TaxiPassengerModel.getInstance().runCarHeartbeat());
-//    }
+    public void startQueryOrderRemainingtLoop() {
+        if (mQueryOrderRemainingDisposable != null && !mQueryOrderRemainingDisposable.isDisposed()) {
+            return;
+        }
+        CallerLogger.INSTANCE.i(M_TAXI_P + TAG, "startQueryOrderRemainingtLoop()");
+        mQueryOrderRemainingDisposable = Observable.interval(TaxiPassengerConst.LOOP_DELAY,
+                TaxiPassengerConst.LOOP_CALCULATEROUTE_2S, TimeUnit.MILLISECONDS)
+                .map((aLong -> aLong + 1))
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(aLong -> TaxiPassengerModel.getInstance().queryOrderRemaining());
+    }
 
-//    public void stopHeartbeatLoop() {
-//        if (mHeartbeatDisposable != null) {
-//            CallerLogger.INSTANCE.i(M_TAXI_P + TAG, "stopHeartbeatLoop()");
-//            mHeartbeatDisposable.dispose();
-//            mHeartbeatDisposable = null;
-//        }
-//    }
+    public void stopQueryOrderRemainingLoop() {
+        if (mQueryOrderRemainingDisposable != null) {
+            CallerLogger.INSTANCE.i(M_TAXI_P + TAG, "stopQueryOrderRemainingLoop()");
+            mQueryOrderRemainingDisposable.dispose();
+            mQueryOrderRemainingDisposable = null;
+        }
+    }
 }

OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerNaviToDestinationModel.java

@@ -140,8 +140,7 @@ public class TaxiPassengerNaviToDestinationModel implements AMapNaviListener {
             SharedPrefsMgr.getInstance(mContext).putInt(TaxiPassengerConst.SP_KEY_ORDER_SUM_DIS,naviinfo.getPathRetainDistance());
         }
         if (null != mNaviChangedCallback){
-            mNaviChangedCallback.onCurrentNaviDistAndTimeChanged(naviinfo.getPathRetainDistance()
-                    ,naviinfo.getPathRetainTime(),naviinfo.getCurrentRoadName());// 米、秒
+            mNaviChangedCallback.onCurrentRoadName(naviinfo.getCurrentRoadName());//当前路的名字
         }
     }
 

OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.java

@@ -1,9 +1,9 @@
 package com.mogo.och.taxi.passenger.network;
-import com.mogo.eagle.core.data.BaseData;
-import com.mogo.och.taxi.passenger.bean.TaxiPassengerCarHeartbeatReqBean;
+import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryRemainingResp;
 import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryReqBean;
 import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryRespBean;
 import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrdersInServiceQueryRespBean;
+import com.mogo.och.taxi.passenger.bean.TaxiPassengerQueryOrderRouteResp;
 
 import io.reactivex.Observable;
 import retrofit2.http.Body;
@@ -42,11 +42,25 @@ interface TaxiPassengerServiceApi {
     Observable<TaxiPassengerOrderQueryRespBean> queryOrderById(@Header ("appId") String appId,@Header("ticket") String ticket,@Body TaxiPassengerOrderQueryReqBean data);
 
     /**
-     * 车机端上传心跳数据（只在出车状态时上传）：包含高德坐标系经纬度
-     * @param data
+     * 查询订单剩余里程和时间
+     * @param appId
+     * @param ticket
+     * @param orderNo
      * @return
      */
-//    @Headers( {"Content-type:application/json;charset=UTF-8"} )
-//    @POST( "/autopilot-car-hailing/api/v1/driver/heartbeat" )
-//    Observable<BaseData> runCarHeartbeat(@Body TaxiPassengerCarHeartbeatReqBean data);
+    @Headers( {"Content-type:application/json;charset=UTF-8"} )
+    @GET("/autopilot-car-hailing/order/v2/driver/taxi/queryOrderRemaining")
+    Observable<TaxiPassengerOrderQueryRemainingResp> queryOrderRemaining(@Header("appId") String appId, @Header("ticket") String ticket, @Query("orderNo") String orderNo);
+
+    /**
+     * 查询订单全路径
+     * @param appId
+     * @param ticket
+     * @param orderNo
+     * @return
+     */
+    @Headers( {"Content-type:application/json;charset=UTF-8"} )
+//    @GET( "/autopilot-car-hailing/api/v1/driver/serviceStatus/query" )
+    @GET( "/autopilot-car-hailing/order/v2/driver/taxi/passenger/orderRoute" )
+    Observable<TaxiPassengerQueryOrderRouteResp> queryOrderRoute(@Header ("appId") String appId, @Header("ticket") String ticket, @Query("orderNo") String orderNo);
 }

OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.java

@@ -11,9 +11,12 @@ import com.mogo.eagle.core.network.MoGoRetrofitFactory;
 import com.mogo.eagle.core.network.RequestOptions;
 import com.mogo.eagle.core.network.SubscribeImpl;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
+import com.mogo.module.common.MogoApisHandler;
+import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryRemainingResp;
 import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryReqBean;
 import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryRespBean;
 import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrdersInServiceQueryRespBean;
+import com.mogo.och.taxi.passenger.bean.TaxiPassengerQueryOrderRouteResp;
 import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst;
 
 import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -47,7 +50,7 @@ public class TaxiPassengerServiceManager {
      */
     private String getDriverAppSn(){
         return CallerTelematicManager.INSTANCE.getServerToken();
-//        return "X2020211111NG0XNFK";
+//        return "X2020210525EFA93B5946FA38D4";
     }
 
     /**
@@ -65,6 +68,31 @@ public class TaxiPassengerServiceManager {
                 .subscribe(getSubscribeImpl(context, callback, "queryOrdersInAndWaitService"));
     }
 
+    /**
+     * 查询订单剩余里程和时间
+     * @param context
+     * @param orderNo
+     * @param callback
+     */
+    public void queryOrderRemaining(Context context, String orderNo, TaxiPassengerServiceCallback<TaxiPassengerOrderQueryRemainingResp> callback){
+        mOCHTaxiServiceApi.queryOrderRemaining(MoGoAiCloudClientConfig.getInstance().getServiceAppId()
+                ,MoGoAiCloudClientConfig.getInstance().getToken()
+                ,orderNo)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(getSubscribeImpl(context, callback, "queryOrderRemaining"));
+    }
+
+    public void queryOrderRouteList(Context context, String orderNo, TaxiPassengerServiceCallback<TaxiPassengerQueryOrderRouteResp> callback){
+
+        mOCHTaxiServiceApi.queryOrderRoute(MoGoAiCloudClientConfig.getInstance().getServiceAppId()
+                ,MoGoAiCloudClientConfig.getInstance().getToken()
+                ,orderNo)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(getSubscribeImpl(context, callback, "queryOrderRouteList"));
+    }
+
     /**
      * 通过orderId查询订单信息（用于本地已经有orderId时）
      * @param context

OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java

@@ -12,6 +12,7 @@ import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.mvp.Presenter;
 import com.mogo.commons.voice.AIAssist;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
+import com.mogo.eagle.core.network.utils.GsonUtil;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
@@ -121,7 +122,7 @@ public class BaseTaxiPassengerPresenter extends Presenter<TaxiPassengerBaseFragm
 
     @Override
     public void onCurrentOrderStatusChanged(TaxiPassengerOrderQueryRespBean.Result order) {
-        CallerLogger.INSTANCE.d(M_TAXI_P + TAG,"order = "+order.toString());
+        CallerLogger.INSTANCE.d(M_TAXI_P + TAG, GsonUtil.jsonFromObject(order));
         if (mCurrentPassengerOrder == null){
             mCurrentPassengerOrder = order; //当前无订单
             updateOrderView(order);
@@ -132,7 +133,12 @@ public class BaseTaxiPassengerPresenter extends Presenter<TaxiPassengerBaseFragm
     }
 
     @Override
-    public void onCurrentOrderDistToEndChanged(int meters, int timeInSecond, String currentRoadName) {
+    public void onCurrentOrderDistToEndChanged(long meters, long timeInSecond) {
+
+    }
+
+    @Override
+    public void onCurrentRoadName(String currentRoadName) {
 
     }
 
@@ -150,15 +156,13 @@ public class BaseTaxiPassengerPresenter extends Presenter<TaxiPassengerBaseFragm
         }
         if (TaxiPassengerOrderStatusEnum.ArriveAtEndStation.getCode() == order.orderStatus){
             TaxiPassengerModel.getInstance().recoverNaviInfo();
-            runOnUIThread(() ->{
-                AIAssist.getInstance(getContext()).speakTTSVoice(getContext().getString(R.string.taxi_p_arrive_end_tts));
-            });
             TaxiPassengerNaviToDestinationModel.getInstance(getContext()).destroyAmaNavi();
             mView.showOrHideServingOrderFragment(false);
             mView.showOrHideArrivedEndLayout(true,order.endSiteAddr);
             return;
         }
         if (TaxiPassengerOrderStatusEnum.JourneyCompleted.getCode() == order.orderStatus){
+            mView.showOrHideServingOrderFragment(false);
             mView.showOrHideArrivedEndLayout(false,"");
             mCurrentPassengerOrder = null;
             return;

OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/TaxiPassengerServingOrderPresenter.java

@@ -7,9 +7,12 @@ import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 import androidx.lifecycle.LifecycleOwner;
 
+import com.amap.api.maps.model.LatLng;
 import com.mogo.commons.mvp.Presenter;
 import com.mogo.commons.voice.AIAssist;
 import com.mogo.eagle.core.data.map.MogoLatLng;
+import com.mogo.eagle.core.network.utils.GsonUtil;
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.och.taxi.passenger.R;
 import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryRespBean;
 import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerAutopilotPlanningCallback;
@@ -27,6 +30,8 @@ import java.util.List;
 
 import mogo.telematics.pad.MessagePad;
 
+import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI_P;
+
 /**
  * @author: wangmingjun
  * @date: 2022/3/14
@@ -74,16 +79,35 @@ public class TaxiPassengerServingOrderPresenter extends Presenter<TaxiPassengerS
         mView.routeResult(latLngList);
     }
 
+    @Override
+    public void routeResultByServer(List<LatLng> models) {
+        if (models == null) return;
+        mView.routeResultByServer(models);
+    }
+
     @Override
     public void onCurrentOrderStatusChanged(TaxiPassengerOrderQueryRespBean.Result order) {
+        CallerLogger.INSTANCE.d(M_TAXI_P + TAG, GsonUtil.jsonFromObject(order));
+
         if (mCurrentPassengerOrder == null){
             mCurrentPassengerOrder = order; //当前无订单
+            if (TaxiPassengerOrderStatusEnum.OnTheWayToEndStation.getCode() == order.orderStatus){
+                TaxiPassengerModel.getInstance().startOrStopQueryOrderRemaining(true);
+                TaxiPassengerModel.getInstance().queryOrderRouteList();
+            }
+
             mView.updateOrderStatusView(order);
         }else if (mCurrentPassengerOrder.orderStatus != order.orderStatus) {
             mView.updateOrderStatusView(order);
+
+            if (TaxiPassengerOrderStatusEnum.OnTheWayToEndStation.getCode() == order.orderStatus){
+                CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "-----OnTheWayToEndStation----");
+                TaxiPassengerModel.getInstance().startOrStopQueryOrderRemaining(true);
+            }
+
             if (TaxiPassengerOrderStatusEnum.Cancel.getCode() == mCurrentPassengerOrder.orderStatus
-                || TaxiPassengerOrderStatusEnum.ArriveAtStartStation.getCode() == mCurrentPassengerOrder.orderStatus){
-                TaxiPassengerModel.getInstance().setmTtsLessThan200Tip(0);
+                || TaxiPassengerOrderStatusEnum.ArriveAtEndStation.getCode() == mCurrentPassengerOrder.orderStatus){
+                TaxiPassengerModel.getInstance().startOrStopQueryOrderRemaining(false);
             }
             mCurrentPassengerOrder = order;
         }
@@ -91,8 +115,13 @@ public class TaxiPassengerServingOrderPresenter extends Presenter<TaxiPassengerS
 
     @RequiresApi(api = Build.VERSION_CODES.N)
     @Override
-    public void onCurrentOrderDistToEndChanged(int meters, int timeInSecond, String currentRoadName) {
-        mView.onCurrentOrderDistToEndChanged(meters, timeInSecond, currentRoadName);
+    public void onCurrentOrderDistToEndChanged(long meters, long timeInSecond) {
+        mView.onCurrentOrderDistToEndChanged(meters, timeInSecond);
+    }
+
+    @Override
+    public void onCurrentRoadName(String currentRoadName) {
+        mView.onCurrentRoadName(currentRoadName);
     }
 
     @Override

OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerMapDirectionView.java

@@ -325,6 +325,11 @@ public class TaxiPassengerMapDirectionView
         mCoordinatesLatLng.addAll(latLngs);
     }
 
+    public void setCoordinatesLatLng(List<LatLng> latLngs){
+        mCoordinatesLatLng.clear();
+        mCoordinatesLatLng.addAll(latLngs);
+    }
+
     @Override
     public void onCameraChange(CameraPosition cameraPosition) {
         mITaxiPassengerMapViewCallback.onCameraChange(cameraPosition.bearing);

OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerServingOrderFragment.java

@@ -12,12 +12,14 @@ import android.view.View;
 import android.view.animation.Animation;
 import android.view.animation.RotateAnimation;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 import androidx.appcompat.widget.AppCompatSeekBar;
 
+import com.amap.api.maps.model.LatLng;
 import com.mogo.commons.mvp.MvpFragment;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
@@ -61,6 +63,7 @@ public class TaxiPassengerServingOrderFragment extends
     private TextView mTPOrderStartStation;
     private TextView mTPOrderEndStation;
     private TextView mTPOrderRemainDis;
+    private TextView mTPOrderRemainDisUnit;
     private TextView mTPOrderRemainTime;
     private TextView mTPOrderRemainArriveTime;
     private ImageView mMapArrowIcon;
@@ -109,6 +112,7 @@ public class TaxiPassengerServingOrderFragment extends
         mTPOrderStartStation = findViewById(R.id.taxi_p_order_status_start_station_tv);
         mTPOrderEndStation = findViewById(R.id.taxi_p_order_status_end_station_tv);
         mTPOrderRemainDis = findViewById(R.id.taxi_p_order_remain_distance);
+        mTPOrderRemainDisUnit = findViewById(R.id.taxi_p_order_remain_distance_unit);
         mTPOrderRemainTime = findViewById(R.id.taxi_p_order_remain_time);
         mTPOrderRemainArriveTime = findViewById(R.id.taxi_p_order_remain_arrive_time);
 
@@ -346,9 +350,9 @@ public class TaxiPassengerServingOrderFragment extends
      * 行驶进度值更新
      */
     @RequiresApi(api = Build.VERSION_CODES.N)
-    private void updateDriveProcessLoading(int progressLoading,String currentRoadName) {
-        mProgessDes.setText(currentRoadName);
-        int progressInt = SharedPrefsMgr.getInstance(getContext()).getInt(TaxiPassengerConst.SP_KEY_ORDER_SUM_DIS,0) - progressLoading;
+    private void updateDriveProcessLoading(int progressLoading) {
+        int progressInt = SharedPrefsMgr.getInstance(getContext())
+                .getInt(TaxiPassengerConst.SP_KEY_ORDER_SUM_DIS,0) - progressLoading;
         CallerLogger.INSTANCE.d(M_TAXI_P + TAG,"progressInt = "+progressInt);
         mProgressSeekBar.setProgress(
                 progressInt
@@ -356,6 +360,9 @@ public class TaxiPassengerServingOrderFragment extends
         mProgressSeekBar.jumpDrawablesToCurrentState();
     }
 
+    private void updateDriveRoadName(String currentRoadName){
+        mProgessDes.setText(currentRoadName);
+    }
 
     @Override
     public void onResume() {
@@ -405,6 +412,15 @@ public class TaxiPassengerServingOrderFragment extends
         }
     }
 
+    public void routeResultByServer(List<LatLng> latLngList) {
+        CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "routeResultByServer:" + latLngList.size());
+        if (latLngList.size() > 0) {
+            drawablePolylineByServerRoute(latLngList);
+        } else {
+            clearPolyline();
+        }
+    }
+
     /**
      * 绘制
      *
@@ -422,6 +438,17 @@ public class TaxiPassengerServingOrderFragment extends
         }
     }
 
+    public void drawablePolylineByServerRoute(List<LatLng> mCoordinatesLatLng){
+        if (mMapDirectionView != null){
+            mMapDirectionView.setCoordinatesLatLng(mCoordinatesLatLng);
+            UiThreadHandler.post(new Runnable() {
+                @Override
+                public void run() {
+                    mMapDirectionView.drawablePolyline();
+                }
+            });
+        }
+    }
     private void clearPolyline() {
         if (mMapDirectionView != null) {
             UiThreadHandler.post(new Runnable() {
@@ -439,6 +466,9 @@ public class TaxiPassengerServingOrderFragment extends
 
         if (TaxiPassengerOrderStatusEnum.ArriveAtStartStation.getCode() == order.orderStatus) {
             mTPOrderStatus.setText(getString(R.string.taxi_p_arrive_to_start));
+            mTPOrderRemainDis.setText("--");
+            mTPOrderRemainTime.setText("--");
+            mTPOrderRemainArriveTime.setText("--");
             setSeekBarMax();
             return;
         }
@@ -452,26 +482,43 @@ public class TaxiPassengerServingOrderFragment extends
 
     /**
      * 剩余里程，剩余时间，当前定位点所在道路
-     * @param meters
-     * @param timeInSecond
-     * @param currentRoadName
+     * @param meters 单位 米
+     * @param remainTime 单位 秒
      */
     @RequiresApi(api = Build.VERSION_CODES.N)
-    public void onCurrentOrderDistToEndChanged(int meters, int timeInSecond, String currentRoadName) {
-        DecimalFormat fnum = new DecimalFormat("##0.00");
-        String remainDis = fnum.format((float) meters / 1000);
-        int remainTime = (int) timeInSecond / 60;
+    public void onCurrentOrderDistToEndChanged(long meters, long remainTime) {
+        String disUnit = "公里";
+        String remainDis = "0";
+
+        if (meters > 0){
+            if (meters / 1000 < 1){
+                disUnit = "米";
+                remainDis = String.valueOf(Math.round(meters));
+            }else {
+                disUnit = "公里";
+                remainDis = TaxiPassengerUtils.formatLong((double) meters / 1000);
+            }
+        }
+
+        int time = (int)Math.ceil((double)remainTime/ 60f);
+
         Calendar beforeTime = Calendar.getInstance();
-        beforeTime.add(Calendar.MINUTE,remainTime);
+        beforeTime.add(Calendar.MINUTE,time);
         String arriveTime = TaxiPassengerUtils.formatCalendarToString(beforeTime,TaxiPassengerUtils.TAXI_HH_mm);
-        updateOrderDisAndTimeView(remainDis, remainTime, arriveTime);
-        updateDriveProcessLoading(meters,currentRoadName);
+        updateOrderDisAndTimeView(remainDis, disUnit,time, arriveTime);
+        updateDriveProcessLoading(new Long(meters).intValue());
     }
 
-    private void updateOrderDisAndTimeView(String remainDis, int remainTime, String arriveTime) {
+    public void onCurrentRoadName(String roadName){
+        updateDriveRoadName(roadName);
+    }
+
+    private void updateOrderDisAndTimeView(String remainDis, String remainDisUnit, int remainTime, String arriveTime) {
         mTPOrderRemainDis.setText(remainDis);
+        mTPOrderRemainDisUnit.setText(remainDisUnit);
         mTPOrderRemainTime.setText(String.valueOf(remainTime));
         mTPOrderRemainArriveTime.setText(arriveTime);
+
     }
 
     public void onCarLocationChanged(Location location) {
@@ -537,12 +584,4 @@ public class TaxiPassengerServingOrderFragment extends
         lastBearing = bearing;
     }
 
-    public void setGradientText(int startColor, int endColor){
-        Shader shader = new LinearGradient(
-                0, 0, 0, mTPSpeedTv.getLineHeight(),
-                getResources().getColor(startColor),
-                getResources().getColor(endColor),
-                Shader.TileMode.REPEAT);
-        mTPSpeedTv.getPaint().setShader(shader);
-    }
 }

OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TPCoordinateCalculateRouteUtil.java

@@ -0,0 +1,55 @@
+package com.mogo.och.taxi.passenger.utils;
+
+import android.content.Context;
+
+import com.amap.api.maps.CoordinateConverter;
+import com.amap.api.maps.model.LatLng;
+import com.mogo.cloud.commons.utils.CoordinateUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import mogo.telematics.pad.MessagePad;
+
+/**
+ * @author: wangmingjun
+ * @date: 2022/3/28
+ */
+public class TPCoordinateCalculateRouteUtil {
+
+    public static float calculateRouteSumLength(List<LatLng> points){
+        if (null == points || points.size() == 0) return 0;
+
+        float sumLength = 0;
+
+        //计算全路径总距离
+        for (int i = 0;i + 1< points.size();i++){
+            double preLat = points.get(i).latitude;
+            double preLon = points.get(i).longitude;
+            double laLat  = points.get(i+1).latitude;
+            double laLon = points.get(i+1).longitude;
+
+            float length = CoordinateUtils.calculateLineDistance(laLon,laLat,preLon,preLat);
+            sumLength += length;
+        }
+        return sumLength;
+    }
+
+    public static List<LatLng> coordinateConverterWgsToGcjListCommon(Context mContext, List<MessagePad.Location> models) {
+        //转成MogoLatLng集合
+        List<LatLng> list = new ArrayList<>();
+        for (MessagePad.Location m : models) {
+            LatLng mogoLatLng = coordinateConverterWgsToGcj(mContext, m);
+            list.add(mogoLatLng);
+        }
+        return list;
+    }
+
+    public static LatLng coordinateConverterWgsToGcj(Context mContext, MessagePad.Location mogoLatLng) {
+        CoordinateConverter mCoordinateConverter = new CoordinateConverter(mContext);
+        mCoordinateConverter.from(CoordinateConverter.CoordType.GPS);
+        mCoordinateConverter.coord(new LatLng(mogoLatLng.getLatitude(), mogoLatLng.getLongitude()));
+        LatLng latLng = mCoordinateConverter.convert();
+        return latLng;
+    }
+}

OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerUtils.java

@@ -1,6 +1,9 @@
 package com.mogo.och.taxi.passenger.utils;
 
 import com.mogo.eagle.core.utilcode.util.DateTimeUtils;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 
@@ -89,4 +92,18 @@ public class TaxiPassengerUtils {
         int minute = (int)(seconds % 3600)/60;
         return String.valueOf(minute);
     }
+
+    /**
+     * 有小数两位， 没有小数保留整数
+     * @param d
+     * @return
+     */
+    public static String formatLong(double d) {
+        BigDecimal bg = new BigDecimal(d).setScale(2, RoundingMode.UP);
+        double num = bg.doubleValue();
+        if (Math.round(num) - num == 0) {
+            return String.valueOf((long) num);
+        }
+        return String.valueOf(num);
+    }
 }

OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_activity_serving_order_view.xml

@@ -119,6 +119,7 @@
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
+                    android:gravity="center_vertical"
                     app:layout_constraintRight_toLeftOf="@+id/taxi_p_order_rl2"
                     app:layout_constraintTop_toTopOf="parent">
 
@@ -134,7 +135,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:includeFontPadding="false"
-                            android:text="0"
+                            android:text="--"
                             android:textColor="#84D4FF"
                             android:textSize="42px"
                             android:textStyle="bold" />
@@ -147,7 +148,7 @@
                             android:layout_marginLeft="@dimen/dp_6"
                             android:layout_toRightOf="@+id/taxi_p_order_remain_distance"
                             android:includeFontPadding="false"
-                            android:text="KM"
+                            android:text="公里"
                             android:textColor="#FFFFFF"
                             android:textSize="20px" />
                     </LinearLayout>
@@ -171,6 +172,7 @@
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
+                    android:gravity="center_vertical"
                     app:layout_constraintRight_toLeftOf="@+id/taxi_p_order_rl3"
                     app:layout_constraintTop_toTopOf="parent">
 
@@ -186,7 +188,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:includeFontPadding="false"
-                            android:text="0"
+                            android:text="--"
                             android:textColor="#84D4FF"
                             android:textSize="42px"
                             android:textStyle="bold" />
@@ -223,6 +225,7 @@
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
+                    android:gravity="center_vertical"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent">
 
@@ -232,7 +235,7 @@
                         android:layout_height="wrap_content"
                         android:layout_centerHorizontal="true"
                         android:includeFontPadding="false"
-                        android:text="0"
+                        android:text="--"
                         android:textColor="#84D4FF"
                         android:textSize="42px"
                         android:textStyle="bold" />
@@ -259,6 +262,7 @@
                 android:layout_height="@dimen/taxi_p_order_map_height"
                 android:background="@color/taxi_p_map_bg"
                 app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/taxi_p_order_remain"
                 app:layout_constraintLeft_toLeftOf="parent" />
 
             <View

OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxi.java

@@ -38,7 +38,6 @@ class MogoOCHTaxi implements IMogoOCH , IMogoStatusChangedListener {
     public void init( Context context ) {
         CallerLogger.INSTANCE.d( M_TAXI + TAG, "init" );
         MogoApisHandler.getInstance().getApis().getStatusManagerApi().registerStatusChangedListener("ochTaxi", StatusDescriptor.VR_MODE,this);
-        MogoApisHandler.getInstance().getApis().getStatusManagerApi().registerStatusChangedListener("ochTaxi", StatusDescriptor.TOP_VIEW,this);
     }
 
     /**

OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/QueryOrderRouteResp.java

@@ -0,0 +1,13 @@
+package com.mogo.och.taxi.bean;
+
+import com.amap.api.maps.model.LatLng;
+import com.mogo.eagle.core.data.BaseData;
+
+import java.util.List;
+
+/**
+ * Created by pangfan on 2021/8/19
+ */
+public class QueryOrderRouteResp extends BaseData {
+    public List<LatLng> data;
+}

OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/UpdateOrderDisAndTimeReqBean.java

@@ -0,0 +1,14 @@
+package com.mogo.och.taxi.bean;
+
+
+public class UpdateOrderDisAndTimeReqBean {
+    public String orderNo; //订单号（必须）
+    public long distance; //剩余里程 单位米（必须）
+    public long duration; //剩余时间 单位秒（必须）
+
+    public UpdateOrderDisAndTimeReqBean(String orderNo, long distance, long duration) {
+        this.orderNo = orderNo;
+        this.distance = distance;
+        this.duration = duration;
+    }
+}

OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/IOCHTaxiNaviChangedCallback.java

@@ -6,6 +6,6 @@ package com.mogo.och.taxi.callback;
  */
 public interface IOCHTaxiNaviChangedCallback {
     // 当前位置距离上车点的距离（米）、预估时间（秒）
-    void onCurrentNaviDistAndTimeChanged(int meters, int timeInSecond);
+    void onCurrentNaviDistAndTimeChanged(int meters, long timeInSecond);
     void reInitNaviAmap(boolean isPlay,boolean isRestart);
 }

OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/OCHTaxiConst.kt

@@ -59,5 +59,10 @@ class OCHTaxiConst {
         const val EVENT_PARAM_ORDER_NUMBER = "order_num"
         const val EVENT_PARAM_START_RESULT = "start_autopilot" // true/false
 
+        // 实时计算当前剩余里程和时间 间隔 2秒
+        const val LOOP_CALCULATEROUTE_2S = 2 * 1000L
+
+        //总里程/平均车速。（bus的平均里程：25km/h，taxi的平均里程：38km/h），单位为：分钟，不足1分钟时，显示1分钟。
+        const val TAXI_AVERAGE_SPEED = 38
     }
 }

OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/MogoOCHTaxiModelNew.java

@@ -9,9 +9,9 @@ import android.net.ConnectivityManager;
 
 import androidx.annotation.Nullable;
 
-import com.amap.api.maps.CoordinateConverter;
 import com.amap.api.maps.model.LatLng;
 import com.elegant.network.utils.GsonUtil;
+import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager;
 import com.mogo.cloud.commons.utils.CoordinateUtils;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.eagle.core.data.BaseData;
@@ -25,9 +25,11 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotPlanningListenerManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
 import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
 import com.mogo.eagle.core.utilcode.util.NetworkUtils;
+import com.mogo.eagle.core.utilcode.util.SharedPrefs;
 import com.mogo.map.navi.IMogoCarLocationChangedListener2;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.och.taxi.bean.DriverServiceDataRespBean;
@@ -40,6 +42,7 @@ import com.mogo.och.taxi.bean.OrderRouteUpdateReqBean;
 import com.mogo.och.taxi.bean.OrdersInServiceQueryRespBean;
 import com.mogo.och.taxi.bean.OrdersListQueryRespBean;
 import com.mogo.och.taxi.bean.OrdersNewBookingQueryRespBean;
+import com.mogo.och.taxi.bean.QueryOrderRouteResp;
 import com.mogo.och.taxi.callback.IOCHTaxiADASStatusCallback;
 import com.mogo.och.taxi.callback.IOCHTaxiCarStatusCallback;
 import com.mogo.och.taxi.callback.IOCHTaxiControllerStatusCallback;
@@ -50,10 +53,11 @@ import com.mogo.och.taxi.constant.OrderStatusEnum;
 import com.mogo.och.taxi.constant.OrderTypeEnum;
 import com.mogo.och.taxi.network.OCHTaxiServiceCallback;
 import com.mogo.och.taxi.network.OCHTaxiServiceManagerNew;
+import com.mogo.och.taxi.utils.CoordinateCalculateRouteUtil;
 import com.mogo.och.taxi.utils.OchTaxiAnalyticsUtil;
 import com.mogo.och.taxi.utils.OrderUtil;
 import com.mogo.och.taxi.utils.PinYinUtil;
-import com.mogo.service.cloud.socket.IMogoLifecycleListener;
+import com.mogo.aicloud.services.socket.IMogoLifecycleListener;
 import com.mogo.service.intent.IMogoIntentListener;
 import com.mogo.service.statusmanager.IMogoStatusChangedListener;
 import com.mogo.service.statusmanager.StatusDescriptor;
@@ -102,16 +106,13 @@ public class MogoOCHTaxiModelNew {
     private IOCHTaxiControllerStatusCallback mControllerStatusCallback; //Model->Presenter：VR mode等
     private IOCHTaxiOrderStatusCallback mOrderStatusCallback; //Model->Presenter：订单变更
 
-//    private IOCHTaxiAutopilotPlanningCallback mAutopilotPlanningCallback; //Model->Presenter：自动驾驶线路规划
+    private List<LatLng> mRoutePoints = new ArrayList<>();
 
     private double mLongitude, mLatitude;
 
     private MogoOCHTaxiModelNew() {
     }
-//    public void setMoGoAutopilotPlanningListener(IOCHTaxiAutopilotPlanningCallback
-//                                                         moGoAutopilotPlanningCallback) {
-//        this.mAutopilotPlanningCallback = moGoAutopilotPlanningCallback;
-//    }
+
     public void setADASStatusCallback(IOCHTaxiADASStatusCallback callback) {
         this.mADASStatusCallback = callback;
     }
@@ -190,13 +191,12 @@ public class MogoOCHTaxiModelNew {
 
     public void release() {
         startOrStopOrderLoop(false);
+        startOrStopCalculateRouteInfo(false);
         releaseListeners();
     }
 
     private void initListeners() {
-        MogoApisHandler.getInstance()
-                .getApis()
-                .getSocketManagerApi(mContext)
+        MogoAiCloudSocketManager.getInstance(mContext)
                 .registerLifecycleListener(10010, mSocketLifeCycleLisnter);
 
         // 2021.11.1重构自动驾驶 实现接口 IMoGoAutopilotStatusListener 注册监听 替换IMogoAdasOCHCallback接口
@@ -231,9 +231,7 @@ public class MogoOCHTaxiModelNew {
                 .getRegisterCenterApi()
                 .unregisterCarLocationChangedListener(TAG, mCarLocationChangedListener2);
 
-        MogoApisHandler.getInstance()
-                .getApis()
-                .getSocketManagerApi(mContext)
+        MogoAiCloudSocketManager.getInstance(mContext)
                 .unregisterLifecycleListener(10010);
 
         CallerAutoPilotStatusListenerManager.INSTANCE.removeListener(mGoAutopilotStatusListener);
@@ -263,7 +261,7 @@ public class MogoOCHTaxiModelNew {
                             mOCHCarStatus = data.data.serviceStatus == 1 ? 1 : 0;
                             //更新view
                             CallerLogger.INSTANCE.d(M_TAXI + TAG, "changeCarStatus:" + mOCHCarStatus);
-                            startOrStopOrderLoop(mOCHCarStatus == 1);
+//                            startOrStopOrderLoop(mOCHCarStatus == 1); todo 只从一个入口开始订单轮询
                             String role = "";
                             if (DriverRoleEnum.DEMO.getCode() == data.data.purpose){
                                 role = OCHTaxiConst.DEMO_USER;
@@ -931,9 +929,10 @@ public class MogoOCHTaxiModelNew {
             if (location != null && checkCurrentOCHOrder()) {
                 if (getCurOrderStatus() == OrderStatusEnum.OnTheWayToStartStation) {
                     judgeStartStation(location);
-                } else if (getCurOrderStatus() == OrderStatusEnum.OnTheWayToEndStation) {
-                    calculateTravelDistance(location);
                 }
+//                else if (getCurOrderStatus() == OrderStatusEnum.OnTheWayToEndStation) {
+//                    calculateTravelDistance(location);
+//                }
             }
             mLongitude = location.getLongitude();
             mLatitude = location.getLatitude();
@@ -1052,6 +1051,7 @@ public class MogoOCHTaxiModelNew {
         public void onAutopilotRotting(MessagePad.GlobalPathResp routeList) {
             if (null != routeList && routeList.getWayPointsList().size() > 0){
                 updateOrderRoute(routeList.getWayPointsList());
+                updateOrderRouteInfo(routeList.getWayPointsList());
             }
         }
 
@@ -1068,8 +1068,8 @@ public class MogoOCHTaxiModelNew {
      */
     public void updateOrderRoute(List<MessagePad.Location> models) {
         if (null == mCurrentOCHOrder) return;
-        List<OrderRouteUpdateReqBean.Result> points =  CoordinateConverterFrom84ForList(mContext,models);
-
+        List<OrderRouteUpdateReqBean.Result> points =
+                CoordinateCalculateRouteUtil.coordinateConverterWgsToGcjList(mContext,models);
         OCHTaxiServiceManagerNew.getInstance().updateOrderRoute(mContext, mCurrentOCHOrder.orderNo
                 , points, new OCHTaxiServiceCallback<BaseData>() {
                     @Override
@@ -1084,24 +1084,116 @@ public class MogoOCHTaxiModelNew {
                 });
     }
 
-    private List<OrderRouteUpdateReqBean.Result> CoordinateConverterFrom84ForList(Context mContext, List<MessagePad.Location> mogoLatLngList) {
-        List<OrderRouteUpdateReqBean.Result> points = new ArrayList<>();
-        for (MessagePad.Location m : mogoLatLngList) {
-            LatLng mogoLatLng = CoordinateConverterFrom84(mContext, m);
-            OrderRouteUpdateReqBean.Result result = new OrderRouteUpdateReqBean.Result();
-            result.latitude = mogoLatLng.latitude;
-            result.longitude = mogoLatLng.longitude;
-            points.add(result);
-        }
-        return points;
+    /**
+     * 计算全路径长度，以及实时更新剩余距离，剩余时间，预计时间
+     * @param models
+     */
+    public void updateOrderRouteInfo(List<MessagePad.Location> models) {
+        if (null == models || models.size() == 0) return;
+        if (mCurrentOCHOrder == null) return;
+        Logger.d(M_TAXI + TAG, "--------计算出sumLength开始---------- ");
+
+        //转换成高德坐标系
+        mRoutePoints = CoordinateCalculateRouteUtil.coordinateConverterWgsToGcjListCommon(mContext,models);
+        startDynamicCalculateRouteInfo();
     }
 
-    private LatLng CoordinateConverterFrom84(Context mContext, MessagePad.Location mogoLatLng) {
-        CoordinateConverter mCoordinateConverter = new CoordinateConverter(mContext);
-        mCoordinateConverter.from(CoordinateConverter.CoordType.GPS);
-        mCoordinateConverter.coord(new LatLng(mogoLatLng.getLatitude(), mogoLatLng.getLongitude()));
-        LatLng latLng = mCoordinateConverter.convert();
-        return latLng;
+    public void startDynamicCalculateRouteInfo(){
+        Logger.d(M_TAXI + TAG, "--------mCurrentOCHOrder---------- "+mCurrentOCHOrder);
+
+        if (mCurrentOCHOrder != null && mRoutePoints.size() == 0){//根据orderNo去查询
+            queryOrderRouteList(mCurrentOCHOrder.orderNo);
+        }
+
+        //开启实时计算剩余距离，剩余时间，预计时间
+        startOrStopCalculateRouteInfo(true);
+    }
+
+    /**
+     * 实时计算当前剩余里程和时间
+     */
+    public void dynamicCalculateRouteInfo(){
+        List<LatLng> lastPoints = CoordinateCalculateRouteUtil
+                .getRemainPointListByCompare(mRoutePoints,mLongitude,mLatitude);
+
+        float lastSumLength = 0;
+
+        if (lastPoints.size() == 1){ //只是最后一个点，计算当前位置和最后一个点的距离
+            lastSumLength = CoordinateUtils.calculateLineDistance(
+                    lastPoints.get(0).longitude, lastPoints.get(0).latitude,
+                    mLongitude, mLatitude);
+        }else {
+            lastSumLength = CoordinateCalculateRouteUtil.calculateRouteSumLength(lastPoints);
+        }
+
+        double lastTime = lastSumLength / OCHTaxiConst.TAXI_AVERAGE_SPEED * 3.6 ; //秒
+        Logger.d(M_TAXI + "dynamicCalculateRouteInfo"
+                , "---lastSumLength: "+lastSumLength+"----lastTime : "+lastTime);
+
+        mCurrentOCHOrder.decreaseTravelDistance(lastSumLength);
+        if (mOrderStatusCallback != null) {
+            mOrderStatusCallback.onCurrentOrderDistToEndChanged((long) lastSumLength, (long) lastTime);
+        }
+
+        reportOrderRemain((long)lastSumLength,(long)lastTime);
+    }
+
+    /**
+     * 查询当前订单的全局路径 （当自动驾驶开启后，订单前往乘客上车点，杀掉应用再次进来时候）
+     */
+    private void queryOrderRouteList(String orderNo) {
+        if (mCurrentOCHOrder != null){
+           OCHTaxiServiceManagerNew.getInstance().queryOrderRoute(mContext, orderNo,
+                   new OCHTaxiServiceCallback<QueryOrderRouteResp>() {
+               @Override
+               public void onSuccess(QueryOrderRouteResp data) {
+                   if (data != null && data.data != null){
+                       mRoutePoints.clear();
+                       mRoutePoints.addAll(data.data);
+                   }
+               }
+
+               @Override
+               public void onFail(int code, String msg) {
+
+               }
+           });
+        }
+    }
+
+    /**
+     * 开始轮询计算剩余里程和时间
+     * @param isStart
+     */
+    public void startOrStopCalculateRouteInfo(boolean isStart) {
+        CallerLogger.INSTANCE.d(M_TAXI + TAG, "startOrStopOrderLoop() " + isStart);
+        if (isStart) {
+            OCHTaxiModelLoopManager.getInstance().startCalculateRouteInfoLoop();
+        } else {
+            mRoutePoints.clear();
+            OCHTaxiModelLoopManager.getInstance().stopCalculateRouteInfLoop();
+        }
+    }
+
+    /**
+     * 上报订单剩余里程和时间 单位：KM, M， 单位：分钟
+     * @param lastSumLength
+     * @param duration
+     */
+    private void reportOrderRemain(long lastSumLength, long duration) {// 米/分钟
+        if (mCurrentOCHOrder == null) return;
+        OCHTaxiServiceManagerNew.getInstance().reportOrderRemain(mContext, mCurrentOCHOrder.orderNo
+                , lastSumLength, duration, new OCHTaxiServiceCallback<BaseData>() {
+            @Override
+            public void onSuccess(BaseData data) {
+
+            }
+
+            @Override
+            public void onFail(int code, String msg) {
+
+            }
+        });
     }
 
 

OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/OCHTaxiModelLoopManager.java

@@ -1,6 +1,7 @@
 package com.mogo.och.taxi.model;
 
 import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI;
+import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI_P;
 
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.och.taxi.constant.OCHTaxiConst;
@@ -33,6 +34,7 @@ public class OCHTaxiModelLoopManager {
     private Disposable mNewBookingOrderDisposable; //新到待抢预约单轮询
     private Disposable mGrabResultDisposable; //抢单结果轮询
     private Disposable mHeartbeatDisposable; //心跳轮询
+    private Disposable mCalculateRouteDisposable; //每隔2s计算一次剩余里程和时间
 
     public void startInAndWaitOrdersLoop() {
         if (mInAndWaitServiceDisposable != null && !mInAndWaitServiceDisposable.isDisposed()) {
@@ -117,4 +119,25 @@ public class OCHTaxiModelLoopManager {
             mHeartbeatDisposable = null;
         }
     }
+
+    public void startCalculateRouteInfoLoop() {
+        if (mCalculateRouteDisposable != null && !mCalculateRouteDisposable.isDisposed()) {
+            return;
+        }
+        CallerLogger.INSTANCE.i(M_TAXI_P + TAG, "startCalculateRouteInfoLoop()");
+        mCalculateRouteDisposable = Observable.interval(OCHTaxiConst.LOOP_DELAY,
+                OCHTaxiConst.LOOP_CALCULATEROUTE_2S, TimeUnit.MILLISECONDS)
+                .map((aLong -> aLong + 1))
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(aLong -> MogoOCHTaxiModelNew.getInstance().dynamicCalculateRouteInfo());
+    }
+
+    public void stopCalculateRouteInfLoop() {
+        if (mCalculateRouteDisposable != null) {
+            CallerLogger.INSTANCE.i(M_TAXI_P + TAG, "stopCalculateRouteInfLoop()");
+            mCalculateRouteDisposable.dispose();
+            mCalculateRouteDisposable = null;
+        }
+    }
 }

OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/OCHTaxiServiceApiNew.java

@@ -18,6 +18,8 @@ import com.mogo.och.taxi.bean.OrdersInServiceQueryRespBean;
 import com.mogo.och.taxi.bean.OrdersListQueryReqBean;
 import com.mogo.och.taxi.bean.OrdersListQueryRespBean;
 import com.mogo.och.taxi.bean.OrdersNewBookingQueryRespBean;
+import com.mogo.och.taxi.bean.QueryOrderRouteResp;
+import com.mogo.och.taxi.bean.UpdateOrderDisAndTimeReqBean;
 
 import io.reactivex.Observable;
 import retrofit2.http.Body;
@@ -186,4 +188,21 @@ interface OCHTaxiServiceApiNew {
     @POST("/autopilot-car-hailing/order/v2/driver/taxi/orderRoute")
 //    @POST("/mock/268/autopilot-car-hailing/order/v2/driver/taxi/orderRoute")
     Observable<BaseData> updateOrderRoute(@Header ("appId") String appId, @Header("ticket") String ticket, @Body OrderRouteUpdateReqBean data);
+
+    /**
+     * 上报订单剩余里程和剩余时间
+     * @param appId
+     * @param ticket
+     * @param data
+     * @return
+     */
+    @Headers( {"Content-type:application/json;charset=UTF-8"} )
+    @POST("/autopilot-car-hailing/order/v2/driver/taxi/reportOrderRemain")
+    Observable<BaseData> reportOrderRemain(@Header ("appId") String appId, @Header("ticket") String ticket, @Body UpdateOrderDisAndTimeReqBean data);
+
+
+    @Headers( {"Content-type:application/json;charset=UTF-8"} )
+//    @GET( "/autopilot-car-hailing/api/v1/driver/serviceStatus/query" )
+    @GET( "/autopilot-car-hailing/order/v2/driver/taxi/orderRoute" )
+    Observable<QueryOrderRouteResp> queryOrderRoute(@Header ("appId") String appId, @Header("ticket") String ticket, @Query("orderNo") String orderNo);
 }

OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/OCHTaxiServiceManagerNew.java

@@ -28,6 +28,8 @@ import com.mogo.och.taxi.bean.OrdersInServiceQueryRespBean;
 import com.mogo.och.taxi.bean.OrdersListQueryReqBean;
 import com.mogo.och.taxi.bean.OrdersListQueryRespBean;
 import com.mogo.och.taxi.bean.OrdersNewBookingQueryRespBean;
+import com.mogo.och.taxi.bean.QueryOrderRouteResp;
+import com.mogo.och.taxi.bean.UpdateOrderDisAndTimeReqBean;
 import com.mogo.och.taxi.constant.OCHTaxiConst;
 
 import java.util.List;
@@ -309,6 +311,40 @@ public class OCHTaxiServiceManagerNew {
                 .subscribe(getSubscribeImpl(context,callback,"updateOrderRoute"));
     }
 
+    /**
+     * 上报剩余里程，时间
+     * @param context
+     * @param orderNo
+     * @param distance
+     * @param duration
+     * @param callback
+     */
+    public void reportOrderRemain(Context context, String orderNo,long distance, long duration
+            ,OCHTaxiServiceCallback<BaseData> callback){
+
+        mOCHTaxiServiceApi.reportOrderRemain(MoGoAiCloudClientConfig.getInstance().getServiceAppId()
+                ,MoGoAiCloudClientConfig.getInstance().getToken()
+                ,new UpdateOrderDisAndTimeReqBean(orderNo,distance,duration))
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(getSubscribeImpl(context,callback,"reportOrderRemain"));
+    }
+
+    /**
+     * 查询订单全路径
+     * @param context
+     * @param orderNo
+     * @param callback
+     */
+    public void queryOrderRoute(Context context, String orderNo,OCHTaxiServiceCallback<QueryOrderRouteResp> callback) {
+        mOCHTaxiServiceApi.queryOrderRoute(MoGoAiCloudClientConfig.getInstance().getServiceAppId()
+                ,MoGoAiCloudClientConfig.getInstance().getToken()
+                ,orderNo)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(getSubscribeImpl(context,callback,"queryOrderRoute"));
+    }
+
     private <T extends BaseData> SubscribeImpl getSubscribeImpl(
             Context context, OCHTaxiServiceCallback<T> callback, String apiName) {
         return new SubscribeImpl<T>(RequestOptions.create(context)) {

OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/OCHTaxiPresenter.java

@@ -186,6 +186,14 @@ public class OCHTaxiPresenter extends Presenter<OCHTaxiFragment> implements IOCH
     @Override
     public void onCurrentOrderStatusChanged(OrderQueryRespBean.Result order) {
         CallerLogger.INSTANCE.d(M_TAXI + TAG,"order = "+order.toString());
+        if (OrderStatusEnum.OnTheWayToEndStation.getCode() == order.orderStatus){
+            MogoOCHTaxiModelNew.getInstance().startDynamicCalculateRouteInfo();
+        }
+        if (OrderStatusEnum.ArriveAtEndStation.getCode() == order.orderStatus ||
+            OrderStatusEnum.Cancel.getCode() == order.orderStatus ||
+            OrderStatusEnum.JourneyCompleted.getCode() == order.orderStatus){
+            MogoOCHTaxiModelNew.getInstance().startOrStopCalculateRouteInfo(false);
+        }
         mView.updateCurrentOrderStatusChanged(order);
     }
 

OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiBeingServerdOrdersFragment.java

@@ -3,8 +3,6 @@ package com.mogo.och.taxi.ui;
 import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI;
 
 import android.app.Activity;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Build;
@@ -41,7 +39,6 @@ import com.mogo.och.taxi.model.MogoOCHTaxiModelNew;
 import com.mogo.och.taxi.model.NaviToDestinationModel;
 import com.mogo.och.taxi.utils.OchTaxiUtils;
 
-import java.text.DecimalFormat;
 import java.util.Calendar;
 import java.util.List;
 
@@ -58,6 +55,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem
     private String mOrderNo;
     private double mOrderStartStationLat = 0;
     private double mOrderStartStationLng = 0;
+    private volatile  int mTtsLessThan200Tip = 0;//离终点200米提示播报
 
     public static OCHTaxiBeingServerdOrdersFragment newInstance(Activity activity, OCHTaxiFragment taxiFragment) {
         mActivity = activity;
@@ -148,8 +146,6 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem
         mNaviIcon.setOnClickListener(this);
     }
 
-    private boolean isSpeakedEndingNotice = false;
-
     /**
      * 初始化订单信息
      */
@@ -297,30 +293,59 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem
         }
     }
 
+    /**
+     * 剩余里程和剩余时间
+     * @param meters m
+     * @param timeInSecond 秒
+     */
     public void updateDistanceAndTime(long meters, long timeInSecond) {
-//        CallerLogger.INSTANCE.d(M_TAXI + TAG,"meters = "+meters);
-        if (mContentModule3 != null && mContentModule3.getVisibility() == View.VISIBLE) {
-            DecimalFormat fnum = new DecimalFormat("##0.0");
-            String dis = fnum.format((float) meters / 1000);
-            String strHtml2 = "<font color=\"#CAD6FF\">里程 </font>" + "<b><font color=\"#FFFFFF\">" + dis + "</font></b>" + "<font color=\"#CAD6FF\"> 公里</font>"
-                    + "<font color=\"#CAD6FF\">，剩余 </font>" + "<b><font color=\"#FFFFFF\">" + (int) timeInSecond / 60 + "</font></b>" + "<font color=\"#CAD6FF\"> 分钟</font>";
+//        CallerLogger.INSTANCE.d(M_TAXI + TAG,"meters = "+meters+"timeInSecond ="+timeInSecond);
+        String dis = "0";
+        String disUnit = "公里";
+        if (meters > 0){
+            if (meters / 1000 < 1){
+                disUnit = "米";
+                dis = String.valueOf(Math.round(meters));
+            }else {
+                disUnit = "公里";
+                dis = OchTaxiUtils.formatLong((double)meters / 1000);
+            }
+        }
+        String strHtml2 = "<font color=\"#CAD6FF\">里程 </font>" + "<b><font color=\"#FFFFFF\">" + dis + "</font></b>" + "<font color=\"#CAD6FF\"> "+disUnit+"</font>"
+                + "<font color=\"#CAD6FF\">，剩余 </font>" + "<b><font color=\"#FFFFFF\">" + (int)Math.ceil((double)timeInSecond/ 60f) + "</font></b>" + "<font color=\"#CAD6FF\"> 分钟</font>";
+
+        if (mContentModule3 != null && mContentModule3.getVisibility() == View.VISIBLE) { //前往上车点
+
             mDistanceAndTime3.setText(Html.fromHtml(strHtml2));
             mNaviIcon.setVisibility(View.VISIBLE);
-        } else if (mContentModule2 != null && mContentModule2.getVisibility() == View.VISIBLE) {
-            DecimalFormat fnum = new DecimalFormat("##0.0");
-            String dis = fnum.format((float) meters / 1000);
-            String strHtml2 = "<font color=\"#CAD6FF\">距离 </font>" + "<b><font color=\"#FFFFFF\">" + dis + "</font></b>" + "<font color=\"#CAD6FF\"> 公里</font>";
-//                    + "<font color=\"#CAD6FF\">，用时 </font>" + "<b><font color=\"#FFFFFF\">"+(int)timeInSecond/60+"</font></b>" + "<font color=\"#CAD6FF\"> 分钟</font>";
+        } else if (mContentModule2 != null && mContentModule2.getVisibility() == View.VISIBLE) { //前往终点 时间单位是分钟
+            if (mTtsLessThan200Tip < 1 && meters <= 250 && meters > 150){
+                speekVoice200mTipsOnce();
+            }
             mDistanceAndTime2.setText(Html.fromHtml(strHtml2));
         }
+
     }
 
-    public void onCurrentOrderRouteInfoGot(OrderQueryRouteInfoRespBean.Result routeInfo) {
-        CallerLogger.INSTANCE.d(M_TAXI + TAG, "meters = " + routeInfo.durationToEnd);
-        DecimalFormat fnum = new DecimalFormat("##0.0");
-        String dis = fnum.format((float) routeInfo.distanceToEnd / 1000);
+    private void speekVoice200mTipsOnce() {
+        mTtsLessThan200Tip = 1;
+        showNotice(getResources().getString(R.string.module_och_taxi_order_arrive_end_200m_tip));
+    }
+
+    public void onCurrentOrderRouteInfoGot(OrderQueryRouteInfoRespBean.Result routeInfo) {// 单位 米， 秒
+        CallerLogger.INSTANCE.d(M_TAXI + TAG, "durationToEnd = " + routeInfo.durationToEnd);
+
+        String dis = "0";
+        long distance = routeInfo.distanceToEnd;
+        long duration = routeInfo.durationToEnd;
+
+        if (routeInfo.distanceToEnd > 0){
+
+            dis = OchTaxiUtils.formatLong( (double) distance/ 1000);
+        }
+
         String strHtml2 = "<font color=\"#CAD6FF\">距离 </font>" + "<b><font color=\"#FFFFFF\">" + dis + "</font></b>" + "<font color=\"#CAD6FF\"> 公里</font>"
-                + "<font color=\"#CAD6FF\">，用时 </font>" + "<b><font color=\"#FFFFFF\">" + (int) routeInfo.durationToEnd / 60 + "</font></b>" + "<font color=\"#CAD6FF\"> 分钟</font>";
+                + "<font color=\"#CAD6FF\">，用时 </font>" + "<b><font color=\"#FFFFFF\">" + (int)Math.ceil( (double) duration/ 60)  + "</font></b>" + "<font color=\"#CAD6FF\"> 分钟</font>";
         if (mContentModule2 != null && mContentModule2.getVisibility() == View.VISIBLE) {
             mDistanceAndTime2.setText(Html.fromHtml(strHtml2));
         } else if (mContentModule3 != null && mContentModule3.getVisibility() == View.VISIBLE) {
@@ -328,13 +353,6 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem
         }
     }
 
-    public synchronized void SpeakNoticeOnce() {
-        if (!isSpeakedEndingNotice) {
-            isSpeakedEndingNotice = true;
-            showNotice(mActivity.getString(R.string.module_och_taxi_order_complete_1));
-        }
-    }
-
     @Override
     public void onDestroyView() {
         super.onDestroyView();
@@ -342,14 +360,14 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem
     }
 
     private void startOrEndService(String step) {
-        if (step.equals("服务完成")) {//点击了完成服务，结束订单并更新订单信息
+        if (step.equals(getResources().getString(R.string.module_och_taxi_order_server_end))) {//点击了完成服务，结束订单并更新订单信息
 //            isHaveBeingOrder(false);
             mTaxiFragment.completeOrderService(OrderStatusEnum.JourneyCompleted);
-            showNotice("车辆已停稳，请携带好随身物品，下车请注意安全");
+            showNotice(getResources().getString(R.string.module_och_taxi_order_server_completed_tip));
             return;
-        } else if (step.equals("开始服务")) {//点击服务，开启自动驾驶
+        } else if (step.equals(getResources().getString(R.string.module_och_taxi_order_server_start))) {//点击服务，开启自动驾驶
             mTaxiFragment.startAutoPilot();
-            showNotice("自动驾驶已启动，请系好安全带");
+            showNotice(getResources().getString(R.string.module_och_taxi_order_server_start_auto_tip));
         }
     }
 
@@ -358,7 +376,6 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem
         CallerLogger.INSTANCE.d(M_TAXI + TAG, "status==" + status);
         mActivity.runOnUiThread(() -> {
             if (status == OrderStatusEnum.None.getCode() || status == OrderStatusEnum.Cancel.getCode() || status == OrderStatusEnum.JourneyCompleted.getCode()) {
-                isSpeakedEndingNotice = false;
                 isHaveBeingOrder(false);
             } else {
                 isHaveBeingOrder(true);
@@ -369,12 +386,14 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem
                     case OnTheWayToStartStation:
                         mOrderCancel.setVisibility(View.VISIBLE);
                         showNotice(mActivity.getString(R.string.module_och_taxi_new_order));
+                        mTtsLessThan200Tip = 0;
                         startNaviToStartStation(false, mOrderStartStationLat, mOrderStartStationLng);
                         showOrHideNavi(true);
                         setOrRemoveMapMaker(true, OCHTaxiConst.TAXI_START_MAP_MAKER,order.startSitePoint);
                         setOrRemoveMapMaker(true,OCHTaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint);
                         break;
                     case Cancel:
+                        mTtsLessThan200Tip = 0;
                         mOrderCancel.setVisibility(View.VISIBLE);
                         showNotice(mActivity.getString(R.string.module_och_taxi_order_cancel));
                         showOrHideNavi(false);
@@ -382,6 +401,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem
                         setOrRemoveMapMaker(false,OCHTaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint);
                         break;
                     case ArriveAtStartStation:
+                        mTtsLessThan200Tip = 0;
                         mOrderCancel.setVisibility(View.VISIBLE);
                         showNotice(mActivity.getString(R.string.module_och_taxi_order_status_ph_text));
                         showOrHideNavi(false);
@@ -396,13 +416,15 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem
                         setOrRemoveMapMaker(true,OCHTaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint);
                         break;
                     case ArriveAtEndStation:
+                        mTtsLessThan200Tip = 0;
                         mOrderCancel.setVisibility(View.GONE);
-                        showNotice(mActivity.getString(R.string.module_och_taxi_order_complete_1));
+                        showNotice(mActivity.getString(R.string.module_och_taxi_order_auto_arrive_end_tip));
                         showOrHideNavi(false);
                         setOrRemoveMapMaker(false, OCHTaxiConst.TAXI_START_MAP_MAKER,order.startSitePoint);
                         setOrRemoveMapMaker(false,OCHTaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint);
                         break;
                     case JourneyCompleted:
+                        mTtsLessThan200Tip = 0;
                         mOrderCancel.setVisibility(View.GONE);
                         showNotice("感谢您使用蘑菇智行,再见~");
                         showOrHideNavi(false);
@@ -488,7 +510,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem
     }
 
     @Override
-    public void onCurrentNaviDistAndTimeChanged(int meters, int timeInSecond) {
+    public void onCurrentNaviDistAndTimeChanged(int meters, long timeInSecond) {
         updateDistanceAndTime(meters, timeInSecond);
     }
 

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

@@ -357,203 +357,205 @@ public class OCHTaxiFragment extends BaseOchTaxiTabFragment<OCHTaxiFragment, OCH
         findViewById(R.id.test_bar_on_the_way_to_end).setOnClickListener(v -> {
             showNotice("自动驾驶已启动，请系好安全带");
             MogoOCHTaxiModelNew.getInstance().setOnTheWayToEndStation();
+            testRouteInfoUpload();
         });
-        findViewById(R.id.test_bar_send_route).setOnClickListener(v -> {
+    }
 
-            String listStr = "{\"models\":[{\n" +
-                    "\t\t\"lat\": 40.19927810144466,\n" +
-                    "\t\t\"lon\": 116.73527259387767\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.19927836356079,\n" +
-                    "\t\t\"lon\": 116.73513114732762\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.19927759500293,\n" +
-                    "\t\t\"lon\": 116.73497660879111\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.199264819842284,\n" +
-                    "\t\t\"lon\": 116.73480063747202\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.1992510141554,\n" +
-                    "\t\t\"lon\": 116.73463922037767\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.199245872804,\n" +
-                    "\t\t\"lon\": 116.73445960685193\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.19924673374912,\n" +
-                    "\t\t\"lon\": 116.73427704009703\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.19924747108264,\n" +
-                    "\t\t\"lon\": 116.7340707102972\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.19924828745573,\n" +
-                    "\t\t\"lon\": 116.73385916927226\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.19924941093133,\n" +
-                    "\t\t\"lon\": 116.73364048294795\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.19924939253381,\n" +
-                    "\t\t\"lon\": 116.73340837408566\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.19924949105934,\n" +
-                    "\t\t\"lon\": 116.73317368725336\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.19925040039033,\n" +
-                    "\t\t\"lon\": 116.73296532811216\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.1992515355653,\n" +
-                    "\t\t\"lon\": 116.73277787366743\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.1992512720328,\n" +
-                    "\t\t\"lon\": 116.73263377253741\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.199205174954606,\n" +
-                    "\t\t\"lon\": 116.73249773114644\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.1991015743076,\n" +
-                    "\t\t\"lon\": 116.7324219601283\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.198971862686285,\n" +
-                    "\t\t\"lon\": 116.73239393296355\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.19883883071582,\n" +
-                    "\t\t\"lon\": 116.73237676435652\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.19870171355796,\n" +
-                    "\t\t\"lon\": 116.73236052150362\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.1985491853193,\n" +
-                    "\t\t\"lon\": 116.73234157857011\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.1983890047355,\n" +
-                    "\t\t\"lon\": 116.73232167996464\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.1982209877466,\n" +
-                    "\t\t\"lon\": 116.73230101645792\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.198037574138326,\n" +
-                    "\t\t\"lon\": 116.73227735486083\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.19787327856243,\n" +
-                    "\t\t\"lon\": 116.73225676816314\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.19771917207499,\n" +
-                    "\t\t\"lon\": 116.73223814728027\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.197548305175935,\n" +
-                    "\t\t\"lon\": 116.73221624705808\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.19739568979691,\n" +
-                    "\t\t\"lon\": 116.73219618210774\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.19724703821575,\n" +
-                    "\t\t\"lon\": 116.73217598293311\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.1970956560885,\n" +
-                    "\t\t\"lon\": 116.73215773721505\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.19697703483188,\n" +
-                    "\t\t\"lon\": 116.73214337172284\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.19687000725696,\n" +
-                    "\t\t\"lon\": 116.73210037067965\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.196833449601726,\n" +
-                    "\t\t\"lon\": 116.73196646708011\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.19685833847804,\n" +
-                    "\t\t\"lon\": 116.73181315361103\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.196889170203264,\n" +
-                    "\t\t\"lon\": 116.73164355747393\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.19692242860347,\n" +
-                    "\t\t\"lon\": 116.7314555399657\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.19696431701069,\n" +
-                    "\t\t\"lon\": 116.7312261834129\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.19700025925464,\n" +
-                    "\t\t\"lon\": 116.73102774016093\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.19703414798773,\n" +
-                    "\t\t\"lon\": 116.73084270562073\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.19707287604138,\n" +
-                    "\t\t\"lon\": 116.73062835248406\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.19710951629977,\n" +
-                    "\t\t\"lon\": 116.73041744082339\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.19714593807105,\n" +
-                    "\t\t\"lon\": 116.73021414314803\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.197183297026285,\n" +
-                    "\t\t\"lon\": 116.7300057066447\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.1972247359487,\n" +
-                    "\t\t\"lon\": 116.7297751515664\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.19726518822745,\n" +
-                    "\t\t\"lon\": 116.72954958923812\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.19730538240706,\n" +
-                    "\t\t\"lon\": 116.72932440756041\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.19734272112662,\n" +
-                    "\t\t\"lon\": 116.72911631453036\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.197379191549075,\n" +
-                    "\t\t\"lon\": 116.72890982812105\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.197417565369314,\n" +
-                    "\t\t\"lon\": 116.72869447869044\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.19746052080799,\n" +
-                    "\t\t\"lon\": 116.72845641541247\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.19750040582118,\n" +
-                    "\t\t\"lon\": 116.72823569991117\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.19753999704064,\n" +
-                    "\t\t\"lon\": 116.72801998373052\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.19757796882569,\n" +
-                    "\t\t\"lon\": 116.72781280504363\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.197617062364586,\n" +
-                    "\t\t\"lon\": 116.72759949431683\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.19765391602761,\n" +
-                    "\t\t\"lon\": 116.72739776789756\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.19768973009218,\n" +
-                    "\t\t\"lon\": 116.72719980764646\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.197726191028785,\n" +
-                    "\t\t\"lon\": 116.72699719861669\n" +
-                    "\t}, {\n" +
-                    "\t\t\"lat\": 40.19776233489642,\n" +
-                    "\t\t\"lon\": 116.72679516155276\n" +
-                    "\t}]}\n";
+    private void testRouteInfoUpload() {
+        String listStr = "{\"models\":[{\n" +
+                "\t\t\"lat\": 40.19927810144466,\n" +
+                "\t\t\"lon\": 116.73527259387767\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.19927836356079,\n" +
+                "\t\t\"lon\": 116.73513114732762\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.19927759500293,\n" +
+                "\t\t\"lon\": 116.73497660879111\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.199264819842284,\n" +
+                "\t\t\"lon\": 116.73480063747202\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.1992510141554,\n" +
+                "\t\t\"lon\": 116.73463922037767\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.199245872804,\n" +
+                "\t\t\"lon\": 116.73445960685193\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.19924673374912,\n" +
+                "\t\t\"lon\": 116.73427704009703\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.19924747108264,\n" +
+                "\t\t\"lon\": 116.7340707102972\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.19924828745573,\n" +
+                "\t\t\"lon\": 116.73385916927226\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.19924941093133,\n" +
+                "\t\t\"lon\": 116.73364048294795\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.19924939253381,\n" +
+                "\t\t\"lon\": 116.73340837408566\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.19924949105934,\n" +
+                "\t\t\"lon\": 116.73317368725336\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.19925040039033,\n" +
+                "\t\t\"lon\": 116.73296532811216\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.1992515355653,\n" +
+                "\t\t\"lon\": 116.73277787366743\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.1992512720328,\n" +
+                "\t\t\"lon\": 116.73263377253741\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.199205174954606,\n" +
+                "\t\t\"lon\": 116.73249773114644\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.1991015743076,\n" +
+                "\t\t\"lon\": 116.7324219601283\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.198971862686285,\n" +
+                "\t\t\"lon\": 116.73239393296355\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.19883883071582,\n" +
+                "\t\t\"lon\": 116.73237676435652\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.19870171355796,\n" +
+                "\t\t\"lon\": 116.73236052150362\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.1985491853193,\n" +
+                "\t\t\"lon\": 116.73234157857011\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.1983890047355,\n" +
+                "\t\t\"lon\": 116.73232167996464\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.1982209877466,\n" +
+                "\t\t\"lon\": 116.73230101645792\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.198037574138326,\n" +
+                "\t\t\"lon\": 116.73227735486083\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.19787327856243,\n" +
+                "\t\t\"lon\": 116.73225676816314\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.19771917207499,\n" +
+                "\t\t\"lon\": 116.73223814728027\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.197548305175935,\n" +
+                "\t\t\"lon\": 116.73221624705808\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.19739568979691,\n" +
+                "\t\t\"lon\": 116.73219618210774\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.19724703821575,\n" +
+                "\t\t\"lon\": 116.73217598293311\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.1970956560885,\n" +
+                "\t\t\"lon\": 116.73215773721505\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.19697703483188,\n" +
+                "\t\t\"lon\": 116.73214337172284\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.19687000725696,\n" +
+                "\t\t\"lon\": 116.73210037067965\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.196833449601726,\n" +
+                "\t\t\"lon\": 116.73196646708011\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.19685833847804,\n" +
+                "\t\t\"lon\": 116.73181315361103\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.196889170203264,\n" +
+                "\t\t\"lon\": 116.73164355747393\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.19692242860347,\n" +
+                "\t\t\"lon\": 116.7314555399657\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.19696431701069,\n" +
+                "\t\t\"lon\": 116.7312261834129\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.19700025925464,\n" +
+                "\t\t\"lon\": 116.73102774016093\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.19703414798773,\n" +
+                "\t\t\"lon\": 116.73084270562073\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.19707287604138,\n" +
+                "\t\t\"lon\": 116.73062835248406\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.19710951629977,\n" +
+                "\t\t\"lon\": 116.73041744082339\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.19714593807105,\n" +
+                "\t\t\"lon\": 116.73021414314803\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.197183297026285,\n" +
+                "\t\t\"lon\": 116.7300057066447\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.1972247359487,\n" +
+                "\t\t\"lon\": 116.7297751515664\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.19726518822745,\n" +
+                "\t\t\"lon\": 116.72954958923812\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.19730538240706,\n" +
+                "\t\t\"lon\": 116.72932440756041\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.19734272112662,\n" +
+                "\t\t\"lon\": 116.72911631453036\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.197379191549075,\n" +
+                "\t\t\"lon\": 116.72890982812105\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.197417565369314,\n" +
+                "\t\t\"lon\": 116.72869447869044\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.19746052080799,\n" +
+                "\t\t\"lon\": 116.72845641541247\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.19750040582118,\n" +
+                "\t\t\"lon\": 116.72823569991117\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.19753999704064,\n" +
+                "\t\t\"lon\": 116.72801998373052\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.19757796882569,\n" +
+                "\t\t\"lon\": 116.72781280504363\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.197617062364586,\n" +
+                "\t\t\"lon\": 116.72759949431683\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.19765391602761,\n" +
+                "\t\t\"lon\": 116.72739776789756\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.19768973009218,\n" +
+                "\t\t\"lon\": 116.72719980764646\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.197726191028785,\n" +
+                "\t\t\"lon\": 116.72699719861669\n" +
+                "\t}, {\n" +
+                "\t\t\"lat\": 40.19776233489642,\n" +
+                "\t\t\"lon\": 116.72679516155276\n" +
+                "\t}]}\n";
 
 
-            List<MessagePad.Location> list = new ArrayList<>();
+        List<MessagePad.Location> list = new ArrayList<>();
 
-            try {
-                JSONObject jsonObject = new JSONObject(listStr);
-                JSONArray jsonElements = jsonObject.getJSONArray("models");
-                for (int i = 0; i < jsonElements.length(); i++) {
-                    JSONObject s = jsonElements.getJSONObject(i);
-                    MessagePad.Location.Builder builder = MessagePad.Location.newBuilder();
-                    builder.setLatitude(s.getDouble("lat"));
-                    builder.setLongitude(s.getDouble("lon"));
-                    list.add(builder.build());
-                }
-                MogoOCHTaxiModelNew.getInstance().updateOrderRoute(list);
-            } catch (JSONException e) {
-                e.printStackTrace();
+        try {
+            JSONObject jsonObject = new JSONObject(listStr);
+            JSONArray jsonElements = jsonObject.getJSONArray("models");
+            for (int i = 0; i < jsonElements.length(); i++) {
+                JSONObject s = jsonElements.getJSONObject(i);
+                MessagePad.Location.Builder builder = MessagePad.Location.newBuilder();
+                builder.setLatitude(s.getDouble("lat"));
+                builder.setLongitude(s.getDouble("lon"));
+                list.add(builder.build());
             }
-        });
+            MogoOCHTaxiModelNew.getInstance().updateOrderRoute(list);
+            MogoOCHTaxiModelNew.getInstance().updateOrderRouteInfo(list);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
     }
 
     public void clickTestBar() {

OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/CoordinateCalculateRouteUtil.java

@@ -0,0 +1,177 @@
+package com.mogo.och.taxi.utils;
+
+import android.content.Context;
+
+import com.amap.api.maps.CoordinateConverter;
+import com.amap.api.maps.model.LatLng;
+import com.mogo.cloud.commons.utils.CoordinateUtils;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
+import com.mogo.och.taxi.bean.OrderRouteUpdateReqBean;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import mogo.telematics.pad.MessagePad;
+
+import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI;
+
+/**
+ * @author: wangmingjun
+ * @date: 2022/3/28
+ */
+public class CoordinateCalculateRouteUtil {
+
+    public static float calculateRouteSumLength(List<LatLng> points){
+        if (null == points || points.size() == 0) return 0;
+
+        float sumLength = 0;
+
+        //计算全路径总距离
+        for (int i = 0;i + 1< points.size();i++){
+            double preLat = points.get(i).latitude;
+            double preLon = points.get(i).longitude;
+            double laLat  = points.get(i+1).latitude;
+            double laLon = points.get(i+1).longitude;
+
+            float length = CoordinateUtils.calculateLineDistance(laLon,laLat,preLon,preLat);
+            sumLength += length;
+        }
+        return sumLength;
+    }
+
+    public static List<LatLng> coordinateConverterWgsToGcjListCommon(Context mContext, List<MessagePad.Location> models) {
+        //转成MogoLatLng集合
+        List<LatLng> list = new ArrayList<>();
+        for (MessagePad.Location m : models) {
+            LatLng mogoLatLng = coordinateConverterWgsToGcj(mContext, m);
+            list.add(mogoLatLng);
+        }
+        return list;
+    }
+
+    public static LatLng coordinateConverterWgsToGcj(Context mContext, MessagePad.Location mogoLatLng) {
+        CoordinateConverter mCoordinateConverter = new CoordinateConverter(mContext);
+        mCoordinateConverter.from(CoordinateConverter.CoordType.GPS);
+        mCoordinateConverter.coord(new LatLng(mogoLatLng.getLatitude(), mogoLatLng.getLongitude()));
+        LatLng latLng = mCoordinateConverter.convert();
+        return latLng;
+    }
+
+
+    public static List<OrderRouteUpdateReqBean.Result> coordinateConverterWgsToGcjList(Context mContext, List<MessagePad.Location> mogoLatLngList) {
+        List<OrderRouteUpdateReqBean.Result> points = new ArrayList<>();
+        for (MessagePad.Location m : mogoLatLngList) {
+            LatLng mogoLatLng = CoordinateCalculateRouteUtil.coordinateConverterWgsToGcj(mContext, m);
+            OrderRouteUpdateReqBean.Result result = new OrderRouteUpdateReqBean.Result();
+            result.latitude = mogoLatLng.latitude;
+            result.longitude = mogoLatLng.longitude;
+            points.add(result);
+        }
+        return points;
+    }
+
+    /**
+     * 根据实时定位的坐标确定出已行驶到那个坐标点 todo 有问题 暂不使用
+     * @param mRoutePoints
+     * @param realLon
+     * @param realLat
+     * @return 返回剩余路径集合
+     */
+    @Deprecated
+    public static List<LatLng> getCurrentPoinByCompare(List<LatLng> mRoutePoints,double realLon,double realLat) {
+        // 疑似坐标 先以坐标中间1/2为第一个比对点
+        int currentIndex  = Math.round(mRoutePoints.size()/2);
+        LatLng currentLatLng = mRoutePoints.get(currentIndex);
+
+        //差值初始化
+        float baseDiffDis = CoordinateUtils.calculateLineDistance(realLon,realLat
+                ,currentLatLng.longitude,currentLatLng.latitude);// lon,lat, prelon, prelat
+
+        List<LatLng> latePoints = new ArrayList<>();
+        //与选中点左右比较
+        if (currentIndex -1 >= 0 && currentIndex+1<= mRoutePoints.size()-1){
+            LatLng leftCurrentLatLng = mRoutePoints.get(currentIndex -1);
+            LatLng rightCurentLatLng = mRoutePoints.get(currentIndex + 1);
+            float leftDiffDis = CoordinateUtils.calculateLineDistance(realLon,realLat
+                    ,leftCurrentLatLng.longitude,leftCurrentLatLng.latitude);
+            float rightDiffDis = CoordinateUtils.calculateLineDistance(realLon,realLat,rightCurentLatLng.longitude,rightCurentLatLng.latitude);
+
+            if (rightDiffDis < leftDiffDis){ //靠近了右半边
+                baseDiffDis = rightDiffDis;
+                for (int i = currentIndex +1; i+1 <mRoutePoints.size() ;i++){
+                    float diff = CoordinateUtils.calculateLineDistance(realLon,realLat
+                            ,mRoutePoints.get(i).longitude,mRoutePoints.get(i).latitude);
+                    Logger.d(M_TAXI + "Compare右半边集合", "点："+i+"------------baseDiffDis = "+baseDiffDis+"---diff="+diff);
+                    if (baseDiffDis >= diff){
+                        baseDiffDis = diff;
+                        currentIndex = i;
+                        if (i == mRoutePoints.size()-1){
+                            latePoints.addAll(mRoutePoints);
+                        }
+                    }else {
+                        latePoints.addAll(mRoutePoints.subList(currentIndex,mRoutePoints.size()-1));
+                        return latePoints;
+                    }
+                }
+            }else if (rightDiffDis > leftDiffDis){ //靠近左半边
+                baseDiffDis = leftDiffDis;
+                for (int j = currentIndex-1; j -1 >=0 ;j++){
+                    float diff = CoordinateUtils.calculateLineDistance(realLon,realLat,mRoutePoints.get(j).longitude,mRoutePoints.get(j).latitude);
+                    Logger.d(M_TAXI + "Compare左半边集合", "点："+j+"------------baseDiffDis = "+baseDiffDis+"---diff="+diff);
+                    if (baseDiffDis >= diff){
+                        baseDiffDis = diff;
+                        currentIndex = j;
+                        if (j == 0){
+                            latePoints.addAll(mRoutePoints);
+                        }
+                    }else {
+                        latePoints.addAll(mRoutePoints.subList(currentIndex,mRoutePoints.size()-1));
+                        return latePoints;
+                    }
+                }
+            }else {
+                Logger.d(M_TAXI + "正好相等", "点："+currentIndex+"------------baseDiffDis = "+baseDiffDis+"---diff="+leftDiffDis);
+                latePoints.addAll(mRoutePoints.subList(currentIndex,currentIndex));
+                return latePoints;
+            }
+        }
+            return latePoints;
+    }
+
+    /**
+     * 简单粗暴 直接比较 todo 需要优化
+     * @param mRoutePoints
+     * @param realLon
+     * @param realLat
+     * @return
+     */
+    public static List<LatLng> getRemainPointListByCompare(List<LatLng> mRoutePoints,double realLon,double realLat) {
+        List<LatLng> latePoints = new ArrayList<>();
+        int currentIndex = 0; //记录疑似点
+        if (mRoutePoints.size() > 0){
+            //基础点
+            LatLng baseLatLng = mRoutePoints.get(0);
+            float baseDiffDis = CoordinateUtils.calculateLineDistance(realLon,realLat
+                    ,baseLatLng.longitude,baseLatLng.latitude);// lon,lat, prelon, prelat
+
+            for (int i= 1; i < mRoutePoints.size(); i++){
+                LatLng latLng = mRoutePoints.get(i);
+                float diff = CoordinateUtils.calculateLineDistance(realLon,realLat
+                        ,latLng.longitude,latLng.latitude);
+                if (baseDiffDis > diff){
+//                    Logger.d(M_TAXI + "calculateRouteSumLength", "点："+i+"-------先记录点----- ");
+                    baseDiffDis = diff;
+                    currentIndex = i;
+                }
+            }
+            Logger.d(M_TAXI + "calculateRouteSumLength", "点："+currentIndex+"-------是最近的点------ ");
+            if (currentIndex == mRoutePoints.size()-1){
+                latePoints.add(mRoutePoints.get(currentIndex));
+            }else {
+                latePoints.addAll(mRoutePoints.subList(currentIndex,mRoutePoints.size()-1));
+            }
+            return latePoints;
+        }
+        return latePoints;
+    }
+}

OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/OchTaxiUtils.java

@@ -2,6 +2,8 @@ package com.mogo.och.taxi.utils;
 
 import com.mogo.eagle.core.utilcode.util.DateTimeUtils;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 
@@ -90,4 +92,18 @@ public class OchTaxiUtils {
         int minute = (int)(seconds % 3600)/60;
         return String.valueOf(minute);
     }
+
+    /**
+     * 有小数两位， 没有小数保留整数
+     * @param d
+     * @return
+     */
+    public static String formatLong(double d) {
+        BigDecimal bg = new BigDecimal(d).setScale(2, RoundingMode.UP);
+        double num = bg.doubleValue();
+        if (Math.ceil(num) - num == 0) {
+            return String.valueOf((long) num);
+        }
+        return String.valueOf(num);
+    }
 }

OCH/mogo-och-taxi/src/main/res/layout/taxi_panel.xml

@@ -63,11 +63,5 @@
             android:text="到达目的地"
             android:textSize="12sp" />
 
-        <Button
-            android:id="@+id/test_bar_send_route"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="发送全路径"
-            android:textSize="12sp" />
     </LinearLayout>
 </com.mogo.och.taxi.ui.BorderShadowLayout>

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

@@ -18,4 +18,8 @@
     <string name="module_och_taxi_order_cancel_commit">确认</string>
     <string name="module_och_taxi_order_server_start">开始服务</string>
     <string name="module_och_taxi_order_server_end">服务完成</string>
+    <string name="module_och_taxi_order_server_completed_tip">车辆已停稳，请携带好随身物品，下车请注意安全</string>
+    <string name="module_och_taxi_order_server_start_auto_tip">无人驾驶已启动，请您系好安全带</string>
+    <string name="module_och_taxi_order_arrive_end_200m_tip">即将到达目的地，请拿好随身物品，准备下车</string>
+    <string name="module_och_taxi_order_auto_arrive_end_tip">已达到目的地，感谢乘坐\'蘑菇车联\'无人驾驶车，期待下次相遇</string>
 </resources>

app/src/main/AndroidManifest.xml

@@ -13,6 +13,7 @@
         android:label="@string/app_shell_name"
         android:largeHeap="true"
         android:resizeableActivity="false"
+        android:requestLegacyExternalStorage="true"
         android:supportsRtl="true"
         android:theme="@style/AppTheme.App"
         android:usesCleartextTraffic="true"

app/src/main/java/com/mogo/launcher/MogoApplication.java

@@ -107,22 +107,23 @@ public class MogoApplication extends MainMoGoApplication {
         if (DebugConfig.getProductFlavor().equals("fPadLenovoOchTaxi")
                 || DebugConfig.getProductFlavor().equals("fPadLenovoOchTaxiPassenger")) {
             HdMapBuildConfig.currentCarVrIconRes = R.raw.chuzuche;
-            //是否显示 红绿等
-            HmiBuildConfig.isShowTrafficLightView = false;
         } else if (DebugConfig.getProductFlavor().equals("fPadLenovoOchBus")
                 || DebugConfig.getProductFlavor().equals("fPadLenovoOchBusPassenger")) {
             HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache;
-            //是否显示 红绿等
-            HmiBuildConfig.isShowTrafficLightView = false;
             HmiBuildConfig.isShowBrakeLightView = false;
             HmiBuildConfig.isShowTurnLightView = false;
         }
 
         if (DebugConfig.getProductFlavor().equals("fPadLenovoOchTaxiPassenger")) {
+            //是否显示 红绿等
+            HmiBuildConfig.isShowTrafficLightView = false;
             //是否显示 限速UI
             HmiBuildConfig.isShowLimitingVelocityView = false;
             //是否显示 路侧监控
             HmiBuildConfig.isShowCameraView = false;
+        } else if (DebugConfig.getProductFlavor().equals("fPadLenovoOchBusPassenger")) {
+            //是否显示 红绿等
+            HmiBuildConfig.isShowTrafficLightView = false;
         }
         //och模块
         MogoModulePaths.addModuleFunction(new MogoModule("/och/api", "IMoGoFunctionProvider"));

config.gradle

@@ -112,8 +112,8 @@ ext {
 
             // obu sdk
             obusdk                       : "com.zhidao.enterprise.smartv2x:smartv2x:1.0.0.3",
-            mogoobu                      : 'com.zhidao.support.obu:mogoobu:1.0.0.19',
-            mogoami                      : 'com.zhidao.support.obu.ami:mogoami:1.0.0.10',
+            mogoobu                      : 'com.zhidao.support.obu:mogoobu:1.0.0.21',
+            mogoami                      : 'com.zhidao.support.obu.ami:mogoami:1.0.0.12',
             adasHigh                     : 'com.zhidao.support.adas:high:1.2.1.2_bate25',
 
             // google

core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt

@@ -284,7 +284,7 @@ class MoGoAutopilotProvider :
     }
 
     override fun setAutoPilotSpeed(speed: Int): Boolean {
-        return AdasManager.getInstance().sendAutopilotSpeedReq(speed.toDouble())
+        return AdasManager.getInstance().sendAutopilotSpeedReq(speed/3.6)
     }
 
     override fun setIPCShutDown() {

core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt

@@ -1,5 +1,6 @@
 package com.mogo.eagle.core.function.autopilot.adapter
 
+import android.annotation.SuppressLint
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.commons.debug.DebugConfig
 import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo
@@ -8,6 +9,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.autopilot.network.AdasServiceModel
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
+import com.mogo.eagle.core.utilcode.mogo.toast.TipToast
 import com.zhidao.support.adas.high.AdasManager
 import com.zhidao.support.adas.high.OnAdasConnectStatusListener
 import com.zhidao.support.adas.high.common.Constants
@@ -42,14 +44,22 @@ class MoGoAdasMsgConnectStatusListenerImpl : OnAdasConnectStatusListener,
 
             // 同步SN给工控机
             syncBasicInfoToAutopilot()
-
-            // 开启轮训上传自动驾驶状态
+            // 开启轮询上传自动驾驶状态
             updateDriveStatusTask()
+
         } else if (ipcConnectionStatus == Constants.IPC_CONNECTION_STATUS.DISCONNECTED) {
             CallerLogger.d("$M_ADAS_IMPL$TAG", "webSocket 连接失败 reason:$reason")
+            reason?.let {
+                TipToast.shortTip("工控机连接断开，原因:$it , 等待重连")
+            }
             CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectIP =
                 AdasManager.getInstance().ipcConnectedIp
             CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectStatus = false
+            //与工控机断开连接，需要重置自动驾驶状态(包括上传至云平台缓存信息)，等待连接成功后同步状态信息
+            mCurrentAutopilotStatus = 0
+            mCurrentAutopilotSpeed = 0.0f
+            CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().state = 0
+            CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().pilotmode = 0
             CallerAutoPilotStatusListenerManager.invokeAutoPilotStatus()
         } else if (ipcConnectionStatus == Constants.IPC_CONNECTION_STATUS.CONNECTING) {
             CallerLogger.d("$M_ADAS_IMPL$TAG", "webSocket 正在连接")
@@ -60,7 +70,6 @@ class MoGoAdasMsgConnectStatusListenerImpl : OnAdasConnectStatusListener,
         }
     }
 
-
     /**
      * 工控机获取SN
      */
@@ -96,13 +105,14 @@ class MoGoAdasMsgConnectStatusListenerImpl : OnAdasConnectStatusListener,
     /**
      * 上传自动驾驶状态任务
      */
+    @SuppressLint("CheckResult")
     private fun updateDriveStatusTask() {
         CallerLogger.d("$M_ADAS_IMPL$TAG", "updateDriveStatusTask")
         Flowable.interval(0, 5, TimeUnit.SECONDS)
             .subscribeOn(Schedulers.io())
             .unsubscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())
-            .subscribe { aLong: Long? ->
+            .subscribe {
                 AdasServiceModel.getInstance()
                     .updateDriveStatus(mCurrentAutopilotStatus, mCurrentAutopilotSpeed)
             }

core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java

@@ -138,7 +138,7 @@ public class MoGoHandAdasMsgManager implements
     @Override
     public void onAutopilotCarConfig(@NotNull MessagePad.CarConfigResp carConfigResp) {
         if (carConfigResp != null && !TextUtils.isEmpty(carConfigResp.getMacAddress())) {
-            CallerLogger.INSTANCE.d(M_DEVA + TAG, " carConfigResp.getMacAddress() = " + carConfigResp.getMacAddress() + "--mac = " + carConfigResp.getMacAddress().replaceAll(".{2}(?=.)", "$0:"));
+            Log.d("liyz", "onAutopilotCarConfig ---------------------" + carConfigResp.getMacAddress() + "--lateNumber() = " + carConfigResp.getPlateNumber());
             CallerBindingcarManager.getBindingcarProvider().getBindingcarInfo(carConfigResp.getMacAddress());
         }
     }

core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java

@@ -1,16 +1,15 @@
 package com.mogo.eagle.core.function.bindingcar;
 
 import android.content.Context;
-import android.text.TextUtils;
 import android.util.Log;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.mogo.commons.constants.SharedPrefsConstants;
+import com.mogo.eagle.core.data.config.FunctionBuildConfig;
+import com.mogo.eagle.core.data.config.HmiBuildConfig;
 import com.mogo.eagle.core.data.constants.MogoServicePaths;
 import com.mogo.eagle.core.function.api.bindingcar.BindingcarCallBack;
 import com.mogo.eagle.core.function.api.bindingcar.IMoGoBindingcarProvider;
 import com.mogo.eagle.core.function.bindingcar.network.BindingcarNetWorkManager;
-import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -50,12 +49,29 @@ public class BindingcarProvider implements IMoGoBindingcarProvider {
     @Override
     public void getBindingcarInfo(String macAddress) {
         mAddress = macAddress;
-        BindingcarNetWorkManager.getInstance().getBindingcarInfo(mContext, macAddress);
+        if (HmiBuildConfig.isShowSnBindingView) {
+            if (getScreenType() == 1) {
+                BindingcarNetWorkManager.getInstance().getBindingcarInfo(mContext, macAddress, getScreenType());
+            }
+        }
     }
 
     @Override
     public void modifyCarInfo(BindingcarCallBack callBack) {
-        BindingcarNetWorkManager.getInstance().modifyBindingcar(mAddress, callBack);
+        if (getScreenType() == 1) {
+            BindingcarNetWorkManager.getInstance().modifyBindingcar(mAddress, callBack, getScreenType());
+        }
+    }
+
+
+    private int getScreenType() {
+        int screenType = -1;
+        if (FunctionBuildConfig.appIdentityMode == 0 || FunctionBuildConfig.appIdentityMode == 0xA0) {
+            screenType = 1; //司机屏
+        } else if (FunctionBuildConfig.appIdentityMode == 1 || FunctionBuildConfig.appIdentityMode == 0xA1) {
+            screenType = 2; //乘客屏
+        }
+        return screenType;
     }
 
 

core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java

@@ -1,6 +1,7 @@
 package com.mogo.eagle.core.function.bindingcar.network;
 
 import android.content.Context;
+import android.util.Log;
 
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 import com.mogo.commons.constants.SharedPrefsConstants;
@@ -55,9 +56,9 @@ public class BindingcarNetWorkManager {
      *
      * @param macAddress mac地址
      */
-    public void getBindingcarInfo(Context context, String macAddress) {
+    public void getBindingcarInfo(Context context, String macAddress, int screenType) {
         String sn = MoGoAiCloudClientConfig.getInstance().getSn();
-        BindingcarRequest request = new BindingcarRequest(macAddress, sn);
+        BindingcarRequest request = new BindingcarRequest(macAddress, sn, screenType);
         RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request));
         mBindingcarApiService.getBindingcarInfo(token, requestBody)
                 .subscribeOn(Schedulers.io())
@@ -71,6 +72,7 @@ public class BindingcarNetWorkManager {
                     public void onNext(@NonNull BindingcarInfo info) {
                         if (info != null && info.getData() != null) {
                             CallerLogger.INSTANCE.d(TAG, "getBindingcarInfo onNext info.getData() =" + info.getData().toString());
+                            Log.d("liyz", "getBindingcarInfo onNext info.getData() =" + info.getData().toString() + "--compare = " + info.getData().getCompare());
                             if (info.getData().getCompare() == 0) {
                                 CallerHmiManager.INSTANCE.showBindingcarDialog();
                             } else if (info.getData().getCompare() == 3) {
@@ -84,6 +86,7 @@ public class BindingcarNetWorkManager {
                     @Override
                     public void onError(@NonNull Throwable e) {
                         CallerLogger.INSTANCE.e(TAG, "getBindingcarInfo onError e = " + e.toString() + "---e.getMessage = " + e.getMessage());
+                        Log.e("liyz", "getBindingcarInfo onError e = " + e.toString() + "---e.getMessage = " + e.getMessage());
                     }
 
                     @Override
@@ -97,9 +100,9 @@ public class BindingcarNetWorkManager {
      * 绑定和修改绑定车辆
      * mac: 48:b0:2d:3a:9c:19
      */
-    public void modifyBindingcar(String macAddress, BindingcarCallBack callBack) {
+    public void modifyBindingcar(String macAddress, BindingcarCallBack callBack, int screenType) {
         String sn = MoGoAiCloudClientConfig.getInstance().getSn();
-        BindingcarRequest request = new BindingcarRequest(macAddress, sn);
+        BindingcarRequest request = new BindingcarRequest(macAddress, sn, screenType);
         RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request));
         mBindingcarApiService.modifyBindingcarInfo(token, requestBody)
                 .subscribeOn(Schedulers.io())
@@ -114,11 +117,13 @@ public class BindingcarNetWorkManager {
                         if (info != null) {
                             callBack.callBackResult(info);
                             CallerLogger.INSTANCE.d(TAG, "modifyBindingcar onNext code = " + info.code + "---msg = " + info.msg + "--info.toString() = " + info.toString());
+                            Log.d("liyz", "modifyBindingcar onNext code = " + info.code + "---msg = " + info.msg + "--info.toString() = " + info.toString());
                         }
                     }
 
                     @Override
                     public void onError(@NonNull Throwable e) {
+                        Log.e("liyz", "modifyBindingcar onError e = " + e.toString() + "---e.getMessage = " + e.getMessage());
                         CallerLogger.INSTANCE.e(TAG, "modifyBindingcar onError e = " + e.toString() + "---e.getMessage = " + e.getMessage());
                     }
 

core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarRequest.java

@@ -8,10 +8,12 @@ package com.mogo.eagle.core.function.bindingcar.network;
 public class BindingcarRequest {
     private String mac;
     private String sn;
+    private int type;
 
-    public BindingcarRequest(String mac, String sn) {
+    public BindingcarRequest(String mac, String sn, int type) {
         this.mac = mac;
         this.sn = sn;
+        this.type = type;
     }
 
     public String getMac() {
@@ -30,11 +32,20 @@ public class BindingcarRequest {
         this.sn = sn;
     }
 
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
     @Override
     public String toString() {
         return "BindingcarRequest{" +
                 "mac='" + mac + '\'' +
                 ", sn='" + sn + '\'' +
+                ", type=" + type +
                 '}';
     }
 }

core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/VehicleMonitoringManager.kt

@@ -13,7 +13,6 @@ import com.mogo.eagle.core.function.check.view.CheckActivity
 import com.mogo.eagle.core.function.check.view.CheckDialog
 import com.mogo.eagle.core.utilcode.util.*
 import com.mogo.module.common.MogoApisHandler
-import com.mogo.module.service.receiver.MogoReceiver
 import com.mogo.service.statusmanager.IMogoStatusChangedListener
 import com.mogo.service.statusmanager.StatusDescriptor
 import java.util.concurrent.ConcurrentHashMap
@@ -62,7 +61,7 @@ class VehicleMonitoringManager : ICheckProvider, IMogoStatusChangedListener {
     override fun checkMonitor(context: Context) {
         checkNetWork( context, object : ICheckResultCallBack {
             override fun callBackWithCheckData(data: CheckResultData) {
-                updateMonitoringStatus(MogoReceiver.ACTION_CHECK_VEHICLE_MONITORING, data.data.vehicle.state)
+                updateMonitoringStatus(TAG, data.data.vehicle.state)
                 if (data.data.vehicle.state == 1) {
                     hasTipShow = false
                 } else {

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt

@@ -85,8 +85,8 @@ class DevaToolsProvider : IDevaToolsProvider {
         upgradeManager.getPackageUrls(versionName)
     }
 
-    override fun downLoadPackage(downLoadKey: String) {
-//        upgradeManager.downLoadPackage(mContext!!, downLoadKey)
+    override fun downLoadPackage(downloadKey: String,downloadUrl: String) {
+        upgradeManager.downLoadPackage(mContext!!, downloadKey,downloadUrl)
     }
 
 }

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/consts/BadCaseHost.kt

@@ -4,5 +4,5 @@ import com.mogo.commons.debug.DebugConfig
 
 internal object BadCaseHost {
 
-    fun getHost(): String = if (DebugConfig.getNetMode() == DebugConfig.NET_MODE_RELEASE) "http://dzt.zhidaozhixing.com"  else "http://front.zdjs-private-test.myghost.zhidaoauto.com"
+    fun getHost(): String = "http://dzt.zhidaozhixing.com"/*if (DebugConfig.getNetMode() == DebugConfig.NET_MODE_RELEASE) "http://dzt.zhidaozhixing.com"  else "http://front.zdjs-private-test.myghost.zhidaoauto.com"*/
 }

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/feedback/FeedbackManager.kt

@@ -1,5 +1,6 @@
 package com.zhjt.mogo_core_function_devatools.feedback
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.text.TextUtils
 import android.view.View
@@ -61,7 +62,7 @@ internal object FeedbackManager {
                     }
                     itx.adapter.notifyItemChanged(0)
                 }
-                override fun onStartBadCaseRecord(record: TextView) {
+                @SuppressLint("SetTextI18n") override fun onStartBadCaseRecord(record: TextView) {
                     if (!CallerAutoPilotManager.isConnected()) {
                         TipToast.shortTip("请检查车机与域控制器连接是否正常")
                         return
@@ -119,9 +120,20 @@ internal object FeedbackManager {
                         recordBag(1, taskId)
                         launch {
                             CallerLogger.d("${M_DEVA}${TAG}", "延时20秒开始....")
+                            launch {
+                                var left = 20
+                                while (left >= 0) {
+                                    record.text = "结束录制(${left}s)"
+                                    delay(1000)
+                                    left--
+                                }
+                            }.also {
+                                record.setTag(R.id.feed_back_badcase_count_down_job, it)
+                            }
                             delay(20000) //延时20秒
                             CallerLogger.d("${M_DEVA}${TAG}", "延时20秒结束....")
                             record.text = "正在结束录制"
+                            (record.getTag(R.id.feed_back_badcase_count_down_job) as? Job)?.safeCancel()
                             record.setTag(R.id.feed_back_badcase_tag, 2)
                             stopRecordBag(1, taskId)
                         }.also { itx ->
@@ -142,10 +154,10 @@ internal object FeedbackManager {
                         return
                     }
                     val taskId = (record.getTag(R.id.feed_back_badcase_taskid_tag) as? Int) ?: throw IllegalStateException("TaskId 不存在")
-                    val oldJob = record.getTag(R.id.feed_back_badcase_job) as? Job
+                    (record.getTag(R.id.feed_back_badcase_job) as? Job)?.safeCancel()
+                    (record.getTag(R.id.feed_back_badcase_count_down_job) as? Job)?.safeCancel()
                     record.text = "正在结束录制"
                     record.setTag(R.id.feed_back_badcase_tag, 2)
-                    oldJob?.safeCancel()
                     record.scope.launch {
                         stopRecordBag(1, taskId)
                     }

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Handler
 import android.os.Message
+import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager
 import com.mogo.cloud.passport.MoGoAiCloudClient
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.commons.AbsMogoApplication
@@ -19,8 +20,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
 import com.mogo.eagle.core.utilcode.mogo.toast.TipToast
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
-import com.mogo.module.common.MogoApisHandler
-import com.mogo.service.cloud.socket.IMogoOnMessageListener
+import com.mogo.aicloud.services.socket.IMogoOnMessageListener
 import com.zhidao.loglib.bean.RemoteLogPushContent
 import com.zhidao.loglib.call.LogInfoManagerFactory
 import com.zhidao.loglib.core.ILogListener
@@ -48,8 +48,7 @@ object MogoLogCatchManager : IMogoOnMessageListener<RemoteLogPushContent>, Handl
 
     fun init(context: Context) {
         mContext = context
-        MogoApisHandler.getInstance().apis
-            .getSocketManagerApi(AbsMogoApplication.getApp().applicationContext)
+        MogoAiCloudSocketManager.getInstance(AbsMogoApplication.getApp().applicationContext)
             .registerOnMessageListener(LOG_PUSH_TYPE, this)
         manualContent.pkgName = context.packageName
         logCheck(context)
@@ -220,13 +219,11 @@ object MogoLogCatchManager : IMogoOnMessageListener<RemoteLogPushContent>, Handl
             SharedPrefsMgr.getInstance(mContext!!).putLong(MoGoConfig.CATCH_LOG_TIME, 0)
 
             CallerDevaToolsListenerManager.invokeDevaToolsLogCatchClose()
-            TipToast.shortTip("日志抓取默认计时结束")
         }
     }
 
     fun onDestroy() {
-        MogoApisHandler.getInstance().apis
-            .getSocketManagerApi(AbsMogoApplication.getApp().applicationContext)
+        MogoAiCloudSocketManager.getInstance(AbsMogoApplication.getApp().applicationContext)
             .unregisterLifecycleListener(LOG_PUSH_TYPE)
 
         if (handler.hasMessages(MSG_TRY_CLOSE_LOG)) {

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/scene/SceneManager.kt

@@ -35,7 +35,7 @@ class SceneManager {
         private const val NET = "NET"
         private const val BUS = "BUS"
         private const val TAXI = "TAXI"
-        private const val TAXI_P = "TAXI-P"
+        private const val TAXI_P = "TAXI_P"
         private const val OTHER = "OTHER"
 
         val sceneManager: SceneManager by lazy(LazyThreadSafetyMode.SYNCHRONIZED) {
@@ -43,7 +43,6 @@ class SceneManager {
         }
     }
 
-    private var sceneCache: MutableMap<String, SceneLogCache> = scene.getSceneCache()
     private var sceneModuleTAG: SceneModuleTAG = SceneModuleTAG(mutableMapOf())
     private var sceneLogTAG: SceneLogTAG = SceneLogTAG(mutableMapOf())
 
@@ -56,9 +55,9 @@ class SceneManager {
         sceneModuleTAG.map[V2X] = SceneModule(true, M_V2X)
         sceneModuleTAG.map[ROUTE] = SceneModule(true, M_OLD_ROUTE)
         sceneModuleTAG.map[NET] = SceneModule(true, M_NETWORK)
-        sceneModuleTAG.map[BUS] = SceneModule(false, M_BUS)
-        sceneModuleTAG.map[TAXI] = SceneModule(false, M_TAXI)
-        sceneModuleTAG.map[TAXI_P] = SceneModule(false, M_TAXI_P)
+        sceneModuleTAG.map[BUS] = SceneModule(true, M_BUS)
+        sceneModuleTAG.map[TAXI] = SceneModule(true, M_TAXI)
+        sceneModuleTAG.map[TAXI_P] = SceneModule(true, M_TAXI_P)
         sceneModuleTAG.map[OTHER] = SceneModule(false, M_OTHER)
 
         sceneLogTAG.map[TAXI] = SceneTAG(false)
@@ -74,6 +73,7 @@ class SceneManager {
     }
 
     fun updateModuleTAG(moduleTag: MutableMap<String, SceneModule>) {
+        val sceneCache = scene.getSceneCache()
         moduleTag.iterator().forEach { map ->
             val name = map.value.name
             val logger = map.value.log
@@ -96,6 +96,7 @@ class SceneManager {
     }
 
     private fun updateSceneModuleTAG() {
+        val sceneCache = scene.getSceneCache()
         sceneModuleTAG.map.iterator().forEach { map ->
             val sceneModule = map.value
             val sceneLogCache = sceneCache[sceneModule.name]
@@ -109,6 +110,7 @@ class SceneManager {
     }
 
     private fun realUpdateSceneTAG(name: String, logger: Boolean) {
+        val sceneCache = scene.getSceneCache()
         when (name) {
             TAXI -> {
                 sceneCache[M_TAXI]?.logger = logger

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt

@@ -36,14 +36,14 @@ class UpgradeManager : IDownload {
         })
     }
 
-    fun downLoadPackage(context: Context, downLoadKey: String) {
+    fun downLoadPackage(context: Context, downloadKey: String,downloadUrl: String) {
 //        val downLoadUrl = map?.get(downLoadKey)
 //        downLoadUrl?.let {
         DownloadUtils.downLoad(
             context,
-            "https://scm-1255510688.cos.ap-beijing.myqcloud.com/test/com.mogo.launcher.f/2.5.1.1009/IntelligentPilot_v2.5.1.1009_20220216_[fPadLenovoOchTaxi-launcher-online]_debug.apk",
+            downloadUrl,
             Config.downLoadPath,
-            downLoadKey,
+            downloadKey,
             5,
             this
         )

core/function-impl/mogo-core-function-devatools/src/main/res/values/ids.xml

@@ -3,4 +3,5 @@
     <item name="feed_back_badcase_tag" type="id" />
     <item name="feed_back_badcase_taskid_tag" type="id" />
     <item name="feed_back_badcase_job" type="id" />
+    <item name="feed_back_badcase_count_down_job" type="id" />
 </resources>

core/function-impl/mogo-core-function-dispatch/src/main/java/com/zhjt/dispatch/DispatchAutoPilotManager.java

@@ -5,6 +5,7 @@ import android.location.Location;
 import android.os.Handler;
 import android.os.Message;
 
+import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager;
 import com.mogo.cloud.commons.utils.CoordinateUtils;
 import com.mogo.eagle.core.data.autopilot.ADASTrajectoryInfo;
 import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters;
@@ -25,7 +26,7 @@ import com.mogo.map.navi.IMogoCarLocationChangedListener2;
 import com.mogo.module.common.MogoApisHandler;
 import com.zhjt.dispatch.model.DispatchServiceModel;
 import com.mogo.service.IMogoServiceApis;
-import com.mogo.service.cloud.socket.IMogoOnMessageListener;
+import com.mogo.aicloud.services.socket.IMogoOnMessageListener;
 import com.zhjt.dispatch.model.IDispatch;
 
 import org.jetbrains.annotations.NotNull;
@@ -102,7 +103,7 @@ public class DispatchAutoPilotManager implements IMogoOnMessageListener<Dispatch
         mContext = context;
         mApis = MogoApisHandler.getInstance().getApis();
 
-        mApis.getSocketManagerApi(context).registerOnMessageListener(MSG_SOCKET_TYPE, this);
+        MogoAiCloudSocketManager.getInstance(context).registerOnMessageListener(MSG_SOCKET_TYPE, this);
         mApis.getRegisterCenterApi()
                 .registerCarLocationChangedListener(TAG, this);
         // 添加自动驾驶按钮选中监听

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/WaringConst.java

@@ -23,6 +23,8 @@ public class WaringConst {
     public static String BROADCAST_V2X_TRAFFIC_LIGHT_IS_SHOW__EXTRA_KEY = "trafficLightIsShow";
     // 选中的交通等类型，red、yellow、green
     public static String BROADCAST_V2X_TRAFFIC_LIGHT_CHECK_TYPE_EXTRA_KEY = "trafficLightCheckType";
+    // 倒计时
+    public static String BROADCAST_V2X_TRAFFIC_LIGHT_COUNT_DOWN_TYPE_EXTRA_KEY = "trafficLightCountDown";
 
     // 限速标志
     // 是否展示：true-展示，false-关闭

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XTrafficLightBroadcastReceiver.kt

@@ -32,10 +32,15 @@ class V2XTrafficLightBroadcastReceiver : BroadcastReceiver() {
                     WaringConst.BROADCAST_V2X_TRAFFIC_LIGHT_CHECK_TYPE_EXTRA_KEY,
                     0
                 )
+            val trafficLightCountDown =
+                intent.getIntExtra(
+                    WaringConst.BROADCAST_V2X_TRAFFIC_LIGHT_COUNT_DOWN_TYPE_EXTRA_KEY,
+                    0
+                )
 
             if (trafficLightIsShow) {
                 // 分发场景
-                dispatchShowWaring(trafficLightCheckType)
+                dispatchShowWaring(trafficLightCheckType, trafficLightCountDown)
             } else {
                 dispatchCloseWaring()
             }
@@ -44,14 +49,22 @@ class V2XTrafficLightBroadcastReceiver : BroadcastReceiver() {
         }
     }
 
-
     /**
      * 展示交通灯
      *
      * @param trafficLightCheckType    选中的交通的灯 0-都是默认，1-红，2-黄，3-绿
+     * @param trafficLightCountDown    对应交通灯倒计时，如果倒计时为0，则disable
      */
-    private fun dispatchShowWaring(trafficLightCheckType: Int) {
+    private fun dispatchShowWaring(trafficLightCheckType: Int, trafficLightCountDown: Int) {
         CallerHmiManager.showWarningTrafficLight(trafficLightCheckType)
+        if(trafficLightCountDown == 0 ){
+            CallerHmiManager.disableWarningTrafficLightCountDown()
+        }
+        when(trafficLightCheckType){
+            1 -> CallerHmiManager.changeCountdownRed(trafficLightCountDown)
+            2 -> CallerHmiManager.changeCountdownYellow(trafficLightCountDown)
+            3 -> CallerHmiManager.changeCountdownGreen(trafficLightCountDown)
+        }
     }
 
     /**

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt

@@ -3,6 +3,7 @@ package com.mogo.eagle.core.function.hmi.ui
 import android.animation.Animator
 import android.os.Bundle
 import android.text.TextUtils
+import android.util.Log
 import android.view.Gravity
 import android.view.View
 import android.view.WindowManager
@@ -541,6 +542,13 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
         mViewTrafficLight?.disableWarningTrafficLight()
     }
 
+    /**
+     * 关闭红绿灯倒计时
+     */
+    override fun disableWarningTrafficLightCountDown() {
+        mViewTrafficLight?.disableCountdown()
+    }
+
     override fun changeCountdownRed(redNum: Int) {
         mViewTrafficLight?.changeCountdownRed(redNum)
     }
@@ -862,6 +870,10 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
         HmiBuildConfig.isShowBrakeLightView = isOpen
     }
 
+    override fun setSnBinding(isOpen: Boolean) {
+        HmiBuildConfig.isShowSnBindingView = isOpen
+    }
+
     /**
      * 展示工控机下载、升级状态信息
      * @param upgradeMode 升级模式（提示升级、静默升级）

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt

@@ -11,9 +11,11 @@ import android.view.View
 import androidx.annotation.RequiresApi
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.LinearLayoutManager
 import com.mogo.cloud.passport.MoGoAiCloudClient
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.debug.DebugConfig
+import com.mogo.commons.voice.AIAssist
 import com.mogo.eagle.core.data.app.AppConfigInfo
 import com.mogo.eagle.core.data.autopilot.*
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
@@ -23,6 +25,7 @@ import com.mogo.eagle.core.data.deva.scene.SceneModule
 import com.mogo.eagle.core.data.enums.TrafficTypeEnum
 import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.data.obu.ObuStatusInfo
+import com.mogo.eagle.core.data.upgrade.UpgradeVersionEntity
 import com.mogo.eagle.core.function.api.autopilot.*
 import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener
 import com.mogo.eagle.core.function.api.map.listener.IMoGoMapLocationListener
@@ -43,6 +46,7 @@ import com.mogo.eagle.core.function.hmi.ui.logcatch.ILogViewListener
 import com.mogo.eagle.core.function.hmi.ui.logcatch.LogInfoView
 import com.mogo.eagle.core.function.hmi.ui.tools.AdUpgradeDialog
 import com.mogo.eagle.core.function.hmi.ui.tools.DockerRebootDialog
+import com.mogo.eagle.core.function.hmi.ui.upgrade.UpgradeListAdapter
 import com.mogo.eagle.core.utilcode.kotlin.onClick
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.mogo.logger.LogLevel
@@ -58,6 +62,7 @@ import kotlinx.android.synthetic.main.view_debug_setting.view.*
 import mogo.telematics.pad.MessagePad
 import mogo_msg.MogoReportMsg
 import java.util.*
+import kotlin.collections.ArrayList
 
 /**
  * @author xiaoyuzhou
@@ -116,6 +121,16 @@ class DebugSettingView @JvmOverloads constructor(
     //OBU连接状态
     private var obuConnectStatus: Boolean = false
 
+    //渠道包标签
+    private var onlineSelected: Boolean = true
+    private var qaSelected: Boolean = true
+
+    private var upgradeListAdapter: UpgradeListAdapter?=null
+
+    private val upgradeVersionList by lazy{
+        ArrayList<UpgradeVersionEntity>()
+    }
+
     private val mapUiController by lazy {
         CallerMapUIServiceManager.getMapUIController()
     }
@@ -257,6 +272,9 @@ class DebugSettingView @JvmOverloads constructor(
             }
         }
 
+        /**
+         * 鹰眼参数配置
+         */
         tbEagleEyeController.setOnCheckedChangeListener { buttonView, isChecked ->
             if(isChecked){
                 buttonView.setCompoundDrawables(null, null, iconDown, null)
@@ -345,7 +363,20 @@ class DebugSettingView @JvmOverloads constructor(
             }
         }
 
-
+        /**
+         * 应用包管理中心
+         */
+        btnApkCenter.setOnCheckedChangeListener { buttonView, isChecked ->
+            if(isChecked){
+                buttonView.setCompoundDrawables(null, null, iconDown, null)
+                //展示应用包管理中心
+                apkCenterLayout.visibility = View.VISIBLE
+            } else {
+                buttonView.setCompoundDrawables(null, null, iconRight, null)
+                //隐藏应用包管理中心
+                apkCenterLayout.visibility = View.GONE
+            }
+        }
 
         lastVisualAngleMode = mapUiController?.currentMapVisualAngle
 
@@ -408,6 +439,8 @@ class DebugSettingView @JvmOverloads constructor(
         setHmiCheckedChangeListener()
         //日志中心事件点击监听
         setLogCheckedChangeListener()
+        //APK包管理中心配置
+        setApkCenterListener()
 
         //OBU配置信息
         tvObuInfo.text = CallerObuListenerManager.getObuStatusInfoJsonString()
@@ -857,6 +890,18 @@ class DebugSettingView @JvmOverloads constructor(
                 CallerHmiManager.setBrakeLightFunction(false)
             }
         }
+
+        /**
+         * sn绑定控制
+         */
+        tbOpenSnBinding.setOnCheckedChangeListener { buttonView, isChecked ->
+            if (!isChecked) {
+                CallerHmiManager.setSnBinding(true)
+            } else {
+                CallerHmiManager.setSnBinding(false)
+            }
+        }
+
     }
 
     /**
@@ -1043,7 +1088,17 @@ class DebugSettingView @JvmOverloads constructor(
                 }
 
                 override fun upgradeVersionUrls(urls: Map<String, String>?) {
-
+                    //版本信息更新
+                    urls?.let {
+                        upgradeVersionList.clear()
+                        it.iterator().forEach {map ->
+                            val name = if(map.key.contains("{")) map.key.replace("{","") else map.key
+                            val url = if(map.value.contains("}")) map.value.replace("}","") else map.value
+                            upgradeVersionList.add(UpgradeVersionEntity(name,url))
+                        }
+                        upgradeListAdapter?.setDada(dataFilter(upgradeVersionList))
+                        upgradeListAdapter?.notifyDataSetChanged()
+                    }
                 }
             })
 
@@ -1141,6 +1196,75 @@ class DebugSettingView @JvmOverloads constructor(
         }
     }
 
+    /**
+     * APK包管理
+     */
+    private fun setApkCenterListener(){
+        val layoutManager: LinearLayoutManager = object : LinearLayoutManager(context,
+            VERTICAL, false) {
+            override fun canScrollVertically(): Boolean {
+                // 直接禁止垂直滑动
+                return false
+            }
+        }
+        rvUpgradeVersionList.layoutManager =layoutManager
+
+        upgradeListAdapter = UpgradeListAdapter(context,upgradeVersionList,
+            object:UpgradeListAdapter.ClickListener{
+                override fun downloadApk(name: String,url: String) {
+                    //下载包
+                    CallerDevaToolsManager.downLoadPackage(name,url)
+                    ToastUtils.showLong("开始下载APK,稍后可前往downloads文件夹查看")
+                }
+
+            })
+
+        rvUpgradeVersionList.adapter = upgradeListAdapter
+
+        ivApkSearch.setOnClickListener {
+            val searchStr = etApkSearch.text.toString()
+            if(searchStr.isEmpty()){
+                ToastUtils.showShort("请输入正确的搜索关键字")
+            }else{
+                CallerDevaToolsManager.getUpgradeVersionUrls(searchStr)
+            }
+
+        }
+
+        //Online
+        cbApkOnline.setOnCheckedChangeListener { _, isChecked ->
+            onlineSelected = isChecked
+            upgradeListAdapter?.setDada(dataFilter(upgradeVersionList))
+            upgradeListAdapter?.notifyDataSetChanged()
+        }
+        //QA
+        cbApkQa.setOnCheckedChangeListener { _, isChecked ->
+            qaSelected = isChecked
+            upgradeListAdapter?.setDada(dataFilter(upgradeVersionList))
+            upgradeListAdapter?.notifyDataSetChanged()
+        }
+
+
+    }
+
+    /**
+     * 数据包数据过滤器
+     */
+    private fun dataFilter(list: ArrayList<UpgradeVersionEntity>): ArrayList<UpgradeVersionEntity> {
+        val tempList = ArrayList<UpgradeVersionEntity>()
+        list?.let {
+            it.iterator().forEach { entity->
+                if(onlineSelected && entity.name.contains("online")){
+                    tempList.add(entity)
+                }
+                if(qaSelected && entity.name.contains("qa")){
+                    tempList.add(entity)
+                }
+            }
+        }
+        return tempList
+    }
+
     private fun logViewDestroy() {
         logInfoView?.let {
             it.dismiss()
@@ -1205,8 +1329,6 @@ class DebugSettingView @JvmOverloads constructor(
          */
         tvAppVersionName.text = "鹰眼版本名：${AppUtils.getAppVersionName()}"
         tvAppVersionCode.text = "鹰眼版本号：${AppUtils.getAppVersionCode()}"
-        tvObuAppInfo.text = "OBU程序版本：${CallerObuListenerManager.getObuStatusInfo().appInfo}"
-        tvObuHliInfo.text = "OBU协议版本：${CallerObuListenerManager.getObuStatusInfo().hliInfo}"
         tvObuSdkVersion.text = "OBU-SDK版本：${AppConfigInfo.obuSdkVersion}"
         tvAutopilotProtocolVersionInfo.text =
             "Autopilot协议版本：${CallerAutoPilotManager.getProtocolVersion()}"
@@ -1365,13 +1487,21 @@ class DebugSettingView @JvmOverloads constructor(
      * 自动驾驶状态回调
      */
     override fun onAutopilotStatusResponse(autoPilotStatusInfo: AutopilotStatusInfo) {
+        mAutoPilotStatusInfo?.let {
+            if(it.pilotmode != autoPilotStatusInfo.pilotmode){
+                when(autoPilotStatusInfo.pilotmode){
+                    0 -> AIAssist.getInstance(context).speakTTSVoice("退出自动驾驶")
+                    1 -> AIAssist.getInstance(context).speakTTSVoice("开始自动驾驶")
+                }
+            }
+        }
         mAutoPilotStatusInfo = autoPilotStatusInfo
         AppConfigInfo.isConnectAutopilot = autoPilotStatusInfo.connectStatus
 
-        if (AppConfigInfo.isConnectAutopilot && (AppConfigInfo.plateNumber.isNullOrEmpty() || AppConfigInfo.iPCMacAddress.isNullOrEmpty())) {
-            //查询工控机基础配置信息
-            CallerAutoPilotManager.getCarConfig()
-        }
+//        if (AppConfigInfo.isConnectAutopilot && (AppConfigInfo.plateNumber.isNullOrEmpty() || AppConfigInfo.iPCMacAddress.isNullOrEmpty())) {
+//            //查询工控机基础配置信息
+//            CallerAutoPilotManager.getCarConfig()
+//        }
 
         if (autoPilotStatusInfo.connectStatus) {
             adasConnectStatus = true

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt

@@ -8,6 +8,7 @@ import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.FrameLayout
+import com.mogo.eagle.core.data.app.AppConfigInfo
 import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListener
@@ -120,7 +121,9 @@ class AutoPilotAndCheckView @JvmOverloads constructor(
             }
         }
         updateSpeedSettingViews()
-        CallerAutoPilotManager.getCarConfig()
+        if (AppConfigInfo.isConnectAutopilot) {
+            CallerAutoPilotManager.getCarConfig()
+        }
 //        // 比如需要设置默认速度
 //        val speed = "30"
 //        etInputSpeed.setText(speed)

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/upgrade/UpgradeListAdapter.kt

@@ -0,0 +1,66 @@
+package com.mogo.eagle.core.function.hmi.ui.upgrade
+
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView.Adapter
+import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import com.mogo.eagle.core.data.upgrade.UpgradeVersionEntity
+import com.mogo.eagle.core.function.hmi.R
+import com.mogo.eagle.core.function.hmi.ui.upgrade.UpgradeListAdapter.UpgradeListHolder
+
+/**
+ * @author XuXinChao
+ * @description APK升级包列表适配器
+ * @since: 2022/3/25
+ */
+class UpgradeListAdapter: Adapter<UpgradeListHolder> {
+
+    private var context: Context? = null
+    private var data:List<UpgradeVersionEntity>? = null
+    private var clickListener: ClickListener? = null
+
+    constructor(
+        context: Context,
+        data: List<UpgradeVersionEntity>?,
+        clickListener: ClickListener? = null
+    ) {
+        this.context = context
+        this.data = data
+        this.clickListener = clickListener
+    }
+
+    public fun setDada( data: List<UpgradeVersionEntity>?){
+        this.data = data
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): UpgradeListHolder {
+        val view = LayoutInflater.from(parent.context)
+            .inflate(R.layout.item_upgrade_version, parent, false)
+        return UpgradeListHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: UpgradeListHolder, position: Int) {
+        data?.let {
+            val upgradeVersionEntity = it[position]
+            holder.tvUpgradeApkName.text=upgradeVersionEntity.name
+            holder.tvUpgradeApkName.setOnClickListener {
+                clickListener?.downloadApk(upgradeVersionEntity.name,upgradeVersionEntity.url)
+            }
+        }
+    }
+
+    override fun getItemCount() = data?.size ?: 0
+
+    class UpgradeListHolder(itemView: View) : ViewHolder(itemView) {
+        var tvUpgradeApkName: TextView = itemView.findViewById(R.id.tvUpgradeApkName)
+    }
+
+    interface ClickListener{
+        fun downloadApk(name:String,url:String)
+    }
+
+}

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/GradientTextView.kt

@@ -0,0 +1,100 @@
+package com.mogo.eagle.core.function.hmi.ui.widget
+
+import android.content.Context
+import android.graphics.*
+import android.util.AttributeSet
+import androidx.appcompat.widget.AppCompatTextView
+import java.lang.RuntimeException
+
+class GradientTextView @JvmOverloads constructor(
+    context: Context?,
+    attrs: AttributeSet? = null
+) : AppCompatTextView(context!!, attrs) {
+    private var mLinearGradient: LinearGradient? = null
+    private var mPaint: Paint? = null
+    private var mViewWidth = 0 //文字的宽度
+    private var mViewHeight = 0 //文字的高度
+    private val mTextBound = Rect()
+    private var mColorList : IntArray?//存放颜色的数组
+    private var isVertical = false//默认是横向
+
+    private var mRadius = 0f
+    private var mdx = 0f
+    private var mdy = 0f
+    private var mColor = 0
+
+    init {
+        //设置默认的颜色
+        mColorList = intArrayOf(-0x1, 0xFFFFFFF)
+    }
+
+    override fun onDraw(canvas: Canvas) {
+        if (isVertical) {
+            mViewHeight = measuredHeight
+        } else {
+            mViewWidth = measuredWidth
+        }
+        mPaint = paint
+        val mTipText = text.toString()
+        setStyle()
+        mPaint!!.getTextBounds(mTipText, 0, mTipText.length, mTextBound)
+        mPaint!!.setShadowLayer(mRadius, mdx, mdy, mColor)
+
+        //画出文字
+        canvas.drawText(
+            mTipText,
+            (measuredWidth / 2 - mTextBound.width() / 2).toFloat(),
+            (measuredHeight / 2 + mTextBound.height() / 2).toFloat(),
+            mPaint!!
+        )
+    }
+
+    /**
+     * true表示纵向渐变,false变身横向渐变
+     *
+     * @param vertical 纵向
+     */
+    fun setVertical(vertical: Boolean) {
+        isVertical = vertical
+    }
+
+    /**
+     * 设置渐变的颜色
+     *
+     * @param mColorList
+     */
+    fun setColorList(mColorList: IntArray?) {
+        if (mColorList != null && mColorList.size < 2) {
+            throw RuntimeException("ColorList's length must be > 2")
+        } else {
+            this.mColorList = mColorList
+        }
+    }
+
+    private fun setStyle() {
+        mPaint!!.isAntiAlias = true
+        mPaint!!.isDither = true
+        mPaint!!.isFilterBitmap = true
+        //前面4个参数分别表示渐变的开始x轴,开始y轴,结束的x轴,结束的y轴,mColorList表示渐变的颜色数组
+        mLinearGradient = LinearGradient(0f,0f,mViewWidth.toFloat(),mViewHeight.toFloat(),mColorList!!,null,Shader.TileMode.CLAMP)
+        mPaint!!.shader = mLinearGradient
+        mPaint!!.strokeJoin = Paint.Join.ROUND
+        mPaint!!.strokeCap = Paint.Cap.ROUND
+        mPaint!!.style = Paint.Style.FILL_AND_STROKE
+    }
+
+    /**
+     * 设置投影层
+     * @param radius
+     * @param dx
+     * @param dy
+     * @param color
+     */
+    fun setShadowLayerCustom(radius: Float, dx: Float, dy: Float, color: Int) {
+        mRadius = radius
+        mdx = dx
+        mdy = dy
+        mColor = color
+    }
+
+}

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SingleTrafficLightView.kt

@@ -0,0 +1,178 @@
+package com.mogo.eagle.core.function.hmi.ui.widget
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.ImageView
+import androidx.core.view.marginLeft
+import com.mogo.eagle.core.function.api.hmi.view.IViewTrafficLight
+import com.mogo.eagle.core.function.hmi.R
+import com.mogo.eagle.core.utilcode.util.UiThreadHandler
+
+/**
+ * 新版红绿灯view
+ */
+class SingleTrafficLightView @JvmOverloads constructor(
+    context: Context?,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : IViewTrafficLight(context, attrs, defStyleAttr) {
+    private var mLightIconIV: ImageView? = null
+    private var mLightIconBG: ImageView? = null
+    private var mLightTimeTV: GradientTextView? = null
+    private var mCurrentLightId = 0
+
+    init {
+        init(context)
+    }
+
+    private fun init(context: Context?) {
+        LayoutInflater.from(context).inflate(R.layout.hmi_view_traffic_light, this, true)
+        mLightIconIV = findViewById(R.id.hmi_traffic_light_iv)
+        mLightIconBG = findViewById(R.id.hmi_traffic_light_bg)
+        mLightTimeTV = findViewById(R.id.hmi_traffic_light_time_tv)
+    }
+
+    /**
+     * 展示红绿灯预警
+     *
+     * @param checkLightId 0-都是默认，1-红，2-黄，3-绿
+     */
+    override fun showWarningTrafficLight(checkLightId: Int) {
+        super.showWarningTrafficLight(checkLightId)
+        mCurrentLightId = checkLightId
+        updateTrafficLightIcon(checkLightId)
+    }
+
+    /**
+     * 关闭红绿灯预警展示，并重制灯态
+     */
+    override fun disableWarningTrafficLight() {
+        super.disableWarningTrafficLight()
+        UiThreadHandler.post {
+            mCurrentLightId = 0
+            this@SingleTrafficLightView.visibility = GONE
+        }
+    }
+
+    override fun disableCountdown() {
+        super.disableCountdown()
+        UiThreadHandler.post {
+            val lp = this.layoutParams as MarginLayoutParams
+            lp.width = context.resources.getDimension(R.dimen.hmi_traffic_light_icon_size).toInt()
+            this.layoutParams = lp
+            mLightTimeTV!!.visibility = GONE
+            mLightIconBG!!.layoutParams.width = context.resources.getDimension(R.dimen.dp_124).toInt()
+        }
+    }
+
+    /**
+     * @param redNum 红灯倒计时
+     * @param yellowNum 黄灯倒计时
+     * @param greenNum 绿灯倒计时
+     */
+    override fun changeCountdownTrafficLightNum(redNum: Int, yellowNum: Int, greenNum: Int) {
+        super.changeCountdownTrafficLightNum(redNum, yellowNum, greenNum)
+        UiThreadHandler.post {
+            resetView()
+            when (mCurrentLightId) {
+                1 -> changeCountdownRed(redNum)
+                2 -> changeCountdownYellow(yellowNum)
+                3 -> changeCountdownGreen(greenNum)
+                else -> UiThreadHandler.post { mLightTimeTV!!.text = "" }
+            }
+        }
+    }
+
+    override fun changeCountdownRed(redNum: Int) {
+        super.changeCountdownRed(redNum)
+        UiThreadHandler.post {
+            if (redNum > 0) {
+                resetView()
+                mLightTimeTV!!.setVertical(true)
+                mLightTimeTV!!.setColorList(
+                    intArrayOf(
+                        resources.getColor(R.color.hmi_traffic_light_red_color_up),
+                        resources.getColor(R.color.hmi_traffic_light_red_color_down)
+                    )
+                )
+                mLightTimeTV!!.text = redNum.toString()
+            } else {
+                mLightTimeTV!!.text = ""
+            }
+        }
+    }
+
+    override fun changeCountdownGreen(greenNum: Int) {
+        super.changeCountdownGreen(greenNum)
+        UiThreadHandler.post {
+            if (greenNum > 0) {
+                resetView()
+                mLightTimeTV!!.setVertical(true)
+                mLightTimeTV!!.setColorList(
+                    intArrayOf(
+                        resources.getColor(R.color.hmi_traffic_light_green_color_up),
+                        resources.getColor(R.color.hmi_traffic_light_green_color_down)
+                    )
+                )
+                mLightTimeTV!!.text = greenNum.toString()
+            } else {
+                mLightTimeTV!!.text = ""
+            }
+        }
+    }
+
+    override fun changeCountdownYellow(yellowNum: Int) {
+        super.changeCountdownYellow(yellowNum)
+        UiThreadHandler.post {
+            if (yellowNum > 0) {
+                resetView()
+                mLightTimeTV!!.setVertical(true)
+                mLightTimeTV!!.setColorList(
+                    intArrayOf(
+                        resources.getColor(R.color.hmi_traffic_light_yellow_color_up),
+                        resources.getColor(R.color.hmi_traffic_light_yellow_color_down)
+                    )
+                )
+                mLightTimeTV!!.text = yellowNum.toString()
+            } else {
+                mLightTimeTV!!.text = ""
+            }
+        }
+    }
+
+    /**
+     * 更新红绿灯icon
+     *
+     * @param lightId 0-都是默认，1-红，2-黄，3-绿
+     */
+    private fun updateTrafficLightIcon(lightId: Int) {
+        UiThreadHandler.post {
+            when (lightId) {
+                1 -> {
+                    mLightIconIV!!.setBackgroundResource(R.drawable.hmi_light_red_nor)
+                    this@SingleTrafficLightView.visibility = VISIBLE
+                }
+                2 -> {
+                    mLightIconIV!!.setBackgroundResource(R.drawable.hmi_lightyellow_nor)
+                    this@SingleTrafficLightView.visibility = VISIBLE
+                }
+                3 -> {
+                    mLightIconIV!!.setBackgroundResource(R.drawable.hmi_light_green_nor)
+                    this@SingleTrafficLightView.visibility = VISIBLE
+                }
+                else -> this@SingleTrafficLightView.visibility = GONE
+            }
+        }
+    }
+
+    private fun resetView(){
+        val lp = this.layoutParams as MarginLayoutParams
+        lp.width = context.resources.getDimension(R.dimen.hmi_traffic_light_layout_width).toInt()
+        this.layoutParams = lp
+        mLightTimeTV!!.visibility = View.VISIBLE
+        mLightIconBG!!.layoutParams.width = context.resources.getDimension(R.dimen.hmi_traffic_light_bg_width).toInt()
+    }
+
+}

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/EventDispatchCenter.java

@@ -16,8 +16,6 @@ import com.mogo.map.marker.IMogoMarkerClickListener;
 import com.mogo.map.model.MogoPoi;
 import com.mogo.map.navi.IMogoCarLocationChangedListener;
 import com.mogo.map.navi.IMogoCarLocationChangedListener2;
-import com.mogo.map.navi.IMogoNaviListener;
-import com.mogo.map.navi.MogoNaviInfo;
 import com.mogo.map.uicontroller.EnumMapUI;
 import com.mogo.map.uicontroller.VisualAngleMode;
 
@@ -31,7 +29,6 @@ import java.util.Iterator;
  * 事件回调分发中心
  */
 public class EventDispatchCenter implements
-        IMogoNaviListener,
         IMogoMarkerClickListener,
         IMogoCarLocationChangedListener2,
         IMogoMapListener,
@@ -248,8 +245,6 @@ public class EventDispatchCenter implements
 
     @Override
     public void onMapChanged(MogoLatLng location, float zoom, float tilt, float bearing) {
-
-        final long start = System.currentTimeMillis();
         Iterator<IMogoMapListener> iterator = MogoRegisterCenterHandler.getInstance().getMapListeners();
         if (iterator == null) {
             return;
@@ -266,135 +261,6 @@ public class EventDispatchCenter implements
         }
     }
 
-    @Override
-    public void onInitNaviFailure() {
-        Iterator<IMogoNaviListener> iterator = MogoRegisterCenterHandler.getInstance().getNaviListeners();
-        if (iterator == null) {
-            return;
-        }
-        while (iterator.hasNext()) {
-            IMogoNaviListener listener = iterator.next();
-            if (listener != null) {
-                try {
-                    listener.onInitNaviFailure();
-                } catch (Exception e) {
-                    CallerLogger.INSTANCE.e(M_MAIN + TAG, "onInitNaviFailure error : " + e);
-                }
-            }
-        }
-    }
-
-    @Override
-    public void onInitNaviSuccess() {
-        Iterator<IMogoNaviListener> iterator = MogoRegisterCenterHandler.getInstance().getNaviListeners();
-        if (iterator == null) {
-            return;
-        }
-        while (iterator.hasNext()) {
-            IMogoNaviListener listener = iterator.next();
-            if (listener != null) {
-                try {
-                    listener.onInitNaviSuccess();
-                } catch (Exception e) {
-                    CallerLogger.INSTANCE.e(M_MAIN + TAG, "onInitNaviSuccess error : " + e);
-                }
-            }
-        }
-    }
-
-    @Override
-    public void onNaviInfoUpdate(MogoNaviInfo naviinfo) {
-        Iterator<IMogoNaviListener> iterator = MogoRegisterCenterHandler.getInstance().getNaviListeners();
-
-        if (iterator == null) {
-            return;
-        }
-        while (iterator.hasNext()) {
-            IMogoNaviListener listener = iterator.next();
-            if (listener != null) {
-                try {
-                    listener.onNaviInfoUpdate(naviinfo);
-                } catch (Exception e) {
-                    CallerLogger.INSTANCE.e(M_MAIN + TAG, "onNaviInfoUpdate error : " + e);
-                }
-            }
-        }
-    }
-
-    @Override
-    public void onStartNavi() {
-        Iterator<IMogoNaviListener> iterator = MogoRegisterCenterHandler.getInstance().getNaviListeners();
-
-        if (iterator == null) {
-            return;
-        }
-        while (iterator.hasNext()) {
-            IMogoNaviListener listener = iterator.next();
-            if (listener != null) {
-                try {
-                    listener.onStartNavi();
-                } catch (Exception e) {
-                    CallerLogger.INSTANCE.e(M_MAIN + TAG, "onStartNavi error : " + e);
-                }
-            }
-        }
-    }
-
-    @Override
-    public void onStopNavi() {
-        Iterator<IMogoNaviListener> iterator = MogoRegisterCenterHandler.getInstance().getNaviListeners();
-        if (iterator == null) {
-            return;
-        }
-        while (iterator.hasNext()) {
-            IMogoNaviListener listener = iterator.next();
-            if (listener != null) {
-                try {
-                    listener.onStopNavi();
-                } catch (Exception e) {
-                    CallerLogger.INSTANCE.e(M_MAIN + TAG, "onStopNavi error : " + e);
-                }
-            }
-        }
-    }
-
-    @Override
-    public void onCalculateSuccess() {
-        Iterator<IMogoNaviListener> iterator = MogoRegisterCenterHandler.getInstance().getNaviListeners();
-        if (iterator == null) {
-            return;
-        }
-        while (iterator.hasNext()) {
-            IMogoNaviListener listener = iterator.next();
-            if (listener != null) {
-                try {
-                    listener.onCalculateSuccess();
-                } catch (Exception e) {
-                    CallerLogger.INSTANCE.e(M_MAIN + TAG, "onCalculateSuccess error : " + e);
-                }
-            }
-        }
-    }
-
-    @Override
-    public void onoCalculateFailed() {
-        Iterator<IMogoNaviListener> iterator = MogoRegisterCenterHandler.getInstance().getNaviListeners();
-        if (iterator == null) {
-            return;
-        }
-        while (iterator.hasNext()) {
-            IMogoNaviListener listener = iterator.next();
-            if (listener != null) {
-                try {
-                    listener.onoCalculateFailed();
-                } catch (Exception e) {
-                    CallerLogger.INSTANCE.e(M_MAIN + TAG, "onoCalculateFailed error : " + e);
-                }
-            }
-        }
-    }
-
-
     @Override
     public void onLocationChanged(MogoLocation location) {
 

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java

@@ -43,7 +43,6 @@ import com.mogo.map.uicontroller.EnumMapUI;
 import com.mogo.map.uicontroller.IMogoMapUIController;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.service.IMogoServiceApis;
-import com.mogo.service.adas.IMogoADASControlStatusChangedListener;
 import com.mogo.service.fragmentmanager.FragmentStackTransactionListener;
 import com.mogo.service.fragmentmanager.IMogoFragmentManager;
 import com.mogo.service.statusmanager.IMogoStatusChangedListener;
@@ -62,7 +61,6 @@ import java.util.Map;
 public class MainActivity extends MvpActivity<MainView, MainPresenter> implements MainView,
         IMogoLocationListener,
         IMogoStatusChangedListener,
-        IMogoADASControlStatusChangedListener,
         FragmentStackTransactionListener {
 
     protected static final String TAG = "MainActivity";
@@ -195,8 +193,6 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
             listenerRegister.registerMarkerClickListener(EventDispatchCenter.getInstance());
         }
 
-        initAdasControlStatusListener();
-
         if (DebugConfig.isMapBased()) {
             EventDispatchCenter.getInstance().setMapLoadedCallback(() -> {
                 CallerLogger.INSTANCE.d(M_MAIN + TAG, "map loaded." + Thread.currentThread().getName());
@@ -208,7 +204,7 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
                     // TODO 这里临时兼容进入VR模式
                     MogoApisHandler.getInstance().getApis().getStatusManagerApi().setVrMode(TAG, true);
                     MogoMapListenerHandler.getInstance().onMapModeChanged(EnumMapUI.Type_VR);
-                }, 3000);
+                }, 1000);
                 CallerLogger.INSTANCE.i(M_MAIN + TAG, "App launch timer cost " + (System.currentTimeMillis() - start) + "ms");
             });
             loadFunctionMapView();
@@ -238,20 +234,18 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
      */
     protected void loadOthersModules() {
         // 加载地图，触发地图加载完毕回调，在初始化其他卡片模块，保证卡片模块可以正确获取地图相关服务。
-        loadContainerModules();
         MogoModulesManager.getInstance().loadModules();
         MogoModulesManager.getInstance().loadFunctionModules();
-        MogoModulesManager.getInstance().loadFunctionModulesServer();
         mPresenter.delayOperations();
+        MogoModulesManager.getInstance().loadFunctionModulesServer();
 
         // 启动一些基本的服务：定位等
         startBaseService();
     }
 
-    private void initAdasControlStatusListener() {
-        mServiceApis.getRegisterCenterApi().registerADASControlStatusChangedListener(TAG, this);
-    }
-
+    /**
+     * 启动后台服务
+     */
     private void startBaseService() {
         Intent intentMainServicee = new Intent(this, MogoMainService.class);
         startService(intentMainServicee);
@@ -261,10 +255,6 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
 //        startService(intentCarcorderService);
     }
 
-    protected void loadContainerModules() {
-        //MogoModulesManager.getInstance().loadEventPanelModule(R.id.module_main_id_event_panel_fragment_container);
-    }
-
     @Override
     public void hideCoverUpLayout() {
         getWindow().setBackgroundDrawable(null);
@@ -302,16 +292,6 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
         EventDispatchCenter.getInstance().onLocationChanged(location);
     }
 
-    @Override
-    public void onMapUiModeChanged(EnumMapUI mapUI) {
-        switch (mapUI) {
-            case Type_Night:
-                break;
-            case Type_Light:
-                break;
-        }
-    }
-
     @Override
     protected void onResume() {
         super.onResume();
@@ -378,7 +358,6 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
             listenerRegister.unregisterMarkerClickListener();
             listenerRegister.unregisterHostMapListener();
         }
-        mServiceApis.getRegisterCenterApi().unregisterADASControlStatusChangedListener(TAG);
         mMogoStatusManager.setMainPageLaunchedStatus(TAG, false);
         mMogoStatusManager.setMainPageIsBackgroundStatus(TAG, false);
         if (mMogoFragmentManager != null) {
@@ -442,16 +421,6 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
         }
     }
 
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        CallerLogger.INSTANCE.d(M_MAIN + TAG, "requestCode: " + requestCode + " resultCode: " + resultCode);
-        if (requestCode == REQUEST_CODE_DIALOG) {
-            //申请悬浮窗权限
-
-        }
-    }
-
     /**
      * 由于应用是单页面的，所以采用Fragment将各模块的UI进行分割解耦合
      *

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java

@@ -15,9 +15,7 @@ import com.mogo.commons.debug.DebugConfig;
 import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider;
 import com.mogo.eagle.core.function.hmi.R;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
-import com.mogo.map.uicontroller.EnumMapUI;
 import com.mogo.service.intent.IMogoIntentListener;
-import com.mogo.service.statusmanager.StatusDescriptor;
 
 /**
  * 针对作为Launcher的情况，做个性化操作
@@ -34,7 +32,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         DebugConfig.setNeedRequestUserInfo(true);
-        CallerLogger.INSTANCE.i(M_MAIN +TAG, "onCreate");
+        CallerLogger.INSTANCE.i(M_MAIN + TAG, "onCreate");
     }
 
     @Override
@@ -88,12 +86,9 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
         }
     }
 
-
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        mServiceApis.getStatusManagerApi().unregisterStatusChangedListener(TAG,
-                StatusDescriptor.VR_MODE, this);
         stopCountDown();
         try {
             // acc off 之后会出现进程还在，但是页面被杀的情况，这个直接杀掉进程，然后让整个进程重启
@@ -103,21 +98,6 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
         }
     }
 
-    @Override
-    public void onMapUiModeChanged(EnumMapUI mapUI) {
-        super.onMapUiModeChanged(mapUI);
-        Intent intent = new Intent("com.mogo.style.SKIN_CHANGED");
-        intent.putExtra("type", -1);
-        if (mapUI == EnumMapUI.Type_Light) {
-            intent.putExtra("type", 1);
-        } else if (mapUI == EnumMapUI.Type_Night) {
-            intent.putExtra("type", 0);
-        }
-        sendBroadcast(intent);
-        CallerLogger.INSTANCE.d(M_MAIN + TAG, "send msg to AI Voice");
-    }
-
-
     private void stopCountDown() {
         if (runnableV2XEvent != null) {
             handlerV2XEvent.removeCallbacks(runnableV2XEvent);

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java

@@ -6,6 +6,8 @@ import android.content.Context;
 import android.os.Process;
 
 import com.bytedance.boost_multidex.BoostMultiDex;
+import com.mogo.aicloud.services.locationinfo.MogoLocationInfoServices;
+import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager;
 import com.mogo.cloud.httpdns.MogoHttpDnsConfig;
 import com.mogo.cloud.httpdns.bean.HttpDnsSimpleLocation;
 import com.mogo.cloud.passport.IMoGoTokenCallback;
@@ -21,6 +23,7 @@ import com.mogo.eagle.core.data.constants.MoGoConfig;
 import com.mogo.eagle.core.data.constants.MogoServicePaths;
 import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.eagle.core.function.api.chat.biz.ChatConsts;
+import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager;
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
 import com.mogo.eagle.core.function.notice.PushUIConstants;
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
@@ -30,16 +33,15 @@ import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
 import com.mogo.eagle.core.utilcode.util.ProcessUtils;
 import com.mogo.map.MapApiPath;
 import com.mogo.map.location.IMogoLocationClient;
-import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.MogoModule;
 import com.mogo.module.common.MogoModulePaths;
 import com.mogo.module.common.constants.HostConst;
 import com.mogo.module.service.ServiceConst;
-import com.mogo.service.IMogoServiceApis;
-import com.mogo.service.cloud.socket.IMogoLifecycleListener;
+import com.mogo.aicloud.services.socket.IMogoLifecycleListener;
 import com.mogo.test.crashreport.CrashReportConstants;
 import com.mogo.test.crashreport.upgrade.UpgradeReportConstants;
 import com.zhidao.support.obu.ami.AmiClientManager;
+import com.zhjt.mogo_core_function_devatools.DevaToolsProvider;
 
 import java.lang.reflect.Field;
 
@@ -109,6 +111,8 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
             e.printStackTrace();
         }
         SocketBuildConfig.isPrintLog = false;
+        // 初始化DevaTools,开始链路记录
+        CallerDevaToolsManager.INSTANCE.init(this);
     }
 
 
@@ -265,24 +269,21 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
      */
     private void uploadLocPerFiveSecond() {
         if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE) {
-            IMogoServiceApis apis = MogoApisHandler.getInstance().getApis();
-            apis.getLocationInfoApi().start();
+            MogoLocationInfoServices.getInstance().init(getApplicationContext());
+            MogoLocationInfoServices.getInstance().start();
             IMogoLocationClient locationClient = CallerMapUIServiceManager.INSTANCE.getSingletonLocationClient(getApplicationContext());
             if (locationClient != null) {
-                locationClient.addLocationListener(location -> {
-                    apis.getLocationInfoApi().provideLocation(location);
-                });
+                locationClient.addLocationListener(location -> MogoLocationInfoServices.getInstance().provideLocation(location));
             }
         }
     }
 
     private void startSocketService() {
         CallerLogger.INSTANCE.d(M_MAIN + TAG, "startSocketService");
-        IMogoServiceApis apis = MogoApisHandler.getInstance().getApis();
         MogoLocation location = CallerMapUIServiceManager.INSTANCE.getSingletonLocationClient(getApp()).getLastKnowLocation();
         // 关闭长链服务
-        apis.getSocketManagerApi(getApplicationContext()).destroy();
-        apis.getSocketManagerApi(this).registerLifecycleListener(10020, new IMogoLifecycleListener() {
+        MogoAiCloudSocketManager.getInstance(getApplicationContext()).destroy();
+        MogoAiCloudSocketManager.getInstance(getApplicationContext()).registerLifecycleListener(10020, new IMogoLifecycleListener() {
             @Override
             public void onConnectFailure() {
                 CallerLogger.INSTANCE.d(M_MAIN + TAG, "socket-onConnectFailure");
@@ -304,7 +305,7 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
         // 开启Socket长链服务
         double lat = location.getLatitude();
         double lon = location.getLongitude();
-        apis.getSocketManagerApi(getApplicationContext()).init(getApplicationContext(), DebugConfig.getSocketAppId(),lat,lon);
+        MogoAiCloudSocketManager.getInstance(getApplicationContext()).init(getApplicationContext(), DebugConfig.getSocketAppId(),lat,lon);
     }
 
     @Override
@@ -315,8 +316,6 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
 
     private void initModules() {
         CallerLogger.INSTANCE.d(M_MAIN + TAG, "initModules");
-        //mogo deva tools
-        MogoModulePaths.addModule(new MogoModule(MogoServicePaths.PATH_DEVA_TOOLS, "IMoGoDevaToolsProvider"));
         // 初始化 bugly 升级
         MogoModulePaths.addBaseModule(new MogoModule(UpgradeReportConstants.PATH, UpgradeReportConstants.NAME));
         // 初始化 apm 日志采集

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/delaycheck/DelayCheckApiServices.java

@@ -1,35 +0,0 @@
-package com.mogo.eagle.core.function.main.delaycheck;
-
-import com.mogo.eagle.core.data.BaseData;
-
-import io.reactivex.Observable;
-import okhttp3.RequestBody;
-import retrofit2.http.Body;
-import retrofit2.http.GET;
-import retrofit2.http.Headers;
-import retrofit2.http.POST;
-
-/**
- * 时延验证相关接口
- *
- * @author tongchenfei
- */
-public interface DelayCheckApiServices {
-
-    /**
-     * 空接口
-     * @return 什么都不返回
-     */
-    @GET("/yycp-test-service/net/delay/heartbeat")
-    Observable<BaseData> emptyInterface();
-
-    /**
-     * 时延上报接口 接口文档如下
-     * http://wiki.zhidaohulian.com/pages/viewpage.action?pageId=48967034
-     * @param params 相关参数，详见文档
-     * @return 相关返回值，详见文档
-     */
-    @POST("/yycp-test-service/net/delay/log")
-    @Headers({"Content-type:application/json;charset=UTF-8"})
-    Observable<DelayCheckResponse> uploadDelayCheckData(@Body RequestBody params);
-}

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/delaycheck/DelayCheckHttpConstant.java

@@ -1,28 +0,0 @@
-package com.mogo.eagle.core.function.main.delaycheck;
-
-import com.mogo.commons.debug.DebugConfig;
-
-/**
- * dzt base url
- *
- * @author tongchenfei
- */
-public class DelayCheckHttpConstant {
-    public static final String HOST_DEV = "http://dzt-test.zhidaozhixing.com";
-    public static final String HOST_TEST = "http://dzt-test.zhidaozhixing.com";
-    public static final String HOST_DEMO = "http://dzt-show.zhidaozhixing.com";
-    public static final String HOST_PRODUCT = "http://dzt.zhidaozhixing.com";
-
-    public static String getBaseUrl(){
-        switch ( DebugConfig.getNetMode() ) {
-            case DebugConfig.NET_MODE_DEV:
-                return HOST_DEV;
-            case DebugConfig.NET_MODE_QA:
-                return HOST_TEST;
-            case DebugConfig.NET_MODE_DEMO:
-                return HOST_DEMO;
-            default:
-                return HOST_PRODUCT;
-        }
-    }
-}

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/delaycheck/DelayCheckResponse.java

@@ -1,29 +0,0 @@
-package com.mogo.eagle.core.function.main.delaycheck;
-
-import com.mogo.eagle.core.data.BaseData;
-
-/**
- * 延迟检测response
- *
- * @author tongchenfei
- */
-public class DelayCheckResponse extends BaseData {
-    private DelayCheckResult result;
-
-    public DelayCheckResult getResult() {
-        return result;
-    }
-
-    public void setResult(DelayCheckResult result) {
-        this.result = result;
-    }
-
-    @Override
-    public String toString() {
-        return "DelayCheckResponse{" +
-                "result=" + result +
-                ", code=" + code +
-                ", msg='" + msg + '\'' +
-                '}';
-    }
-}

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/delaycheck/DelayCheckResult.java

@@ -1,41 +0,0 @@
-package com.mogo.eagle.core.function.main.delaycheck;
-
-/**
- * 延迟检查返回结果
- *
- * @author tongchenfei
- */
-public class DelayCheckResult {
-    /**
-     * 是否保持心跳
-     */
-    private boolean necessary;
-    /**
-     * 心跳间隔，单位 s
-     */
-    private int beatSeconds;
-
-    public boolean isNecessary() {
-        return necessary;
-    }
-
-    public void setNecessary(boolean necessary) {
-        this.necessary = necessary;
-    }
-
-    public int getBeatSeconds() {
-        return beatSeconds;
-    }
-
-    public void setBeatSeconds(int beatSeconds) {
-        this.beatSeconds = beatSeconds;
-    }
-
-    @Override
-    public String toString() {
-        return "DelayCheckResult{" +
-                "necessary=" + necessary +
-                ", beatSeconds=" + beatSeconds +
-                '}';
-    }
-}

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/delaycheck/DelayCheckUploadRequest.java

@@ -1,111 +0,0 @@
-package com.mogo.eagle.core.function.main.delaycheck;
-
-/**
- * 时延检测上报请求参数
- *
- * @author tongchenfei
- */
-public class DelayCheckUploadRequest {
-    private String sn;
-    private long startTime;
-    private long endTime;
-    /**
-     * 请求时长
-     */
-    private long burning;
-    /**
-     * 信号强度
-     */
-    private int netState;
-    private String place;
-    private String cityCode;
-    private double lat;
-    private double lon;
-
-    public String getSn() {
-        return sn;
-    }
-
-    public void setSn(String sn) {
-        this.sn = sn;
-    }
-
-    public long getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(long startTime) {
-        this.startTime = startTime;
-    }
-
-    public long getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(long endTime) {
-        this.endTime = endTime;
-    }
-
-    public long getBurning() {
-        return burning;
-    }
-
-    public void setBurning(long burning) {
-        this.burning = burning;
-    }
-
-    public int getNetState() {
-        return netState;
-    }
-
-    public void setNetState(int netState) {
-        this.netState = netState;
-    }
-
-    public String getPlace() {
-        return place;
-    }
-
-    public void setPlace(String place) {
-        this.place = place;
-    }
-
-    public String getCityCode() {
-        return cityCode;
-    }
-
-    public void setCityCode(String cityCode) {
-        this.cityCode = cityCode;
-    }
-
-    public double getLat() {
-        return lat;
-    }
-
-    public void setLat(double lat) {
-        this.lat = lat;
-    }
-
-    public double getLon() {
-        return lon;
-    }
-
-    public void setLon(double lon) {
-        this.lon = lon;
-    }
-
-    @Override
-    public String toString() {
-        return "DelayCheckUploadRequest{" +
-                "sn='" + sn + '\'' +
-                ", startTime=" + startTime +
-                ", endTime=" + endTime +
-                ", burning=" + burning +
-                ", netState=" + netState +
-                ", place='" + place + '\'' +
-                ", cityCode='" + cityCode + '\'' +
-                ", lat=" + lat +
-                ", lon=" + lon +
-                '}';
-    }
-}

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/delaycheck/DelayCheckUtil.java

@@ -1,155 +0,0 @@
-package com.mogo.eagle.core.function.main.delaycheck;
-
-import android.content.Context;
-import android.os.Handler;
-import android.os.Message;
-import android.os.SystemClock;
-
-import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
-import com.mogo.commons.AbsMogoApplication;
-import com.mogo.eagle.core.data.BaseData;
-import com.mogo.eagle.core.data.map.MogoLocation;
-import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
-import com.mogo.eagle.core.network.MoGoRetrofitFactory;
-import com.mogo.eagle.core.network.RequestOptions;
-import com.mogo.eagle.core.network.SubscribeImpl;
-import com.mogo.eagle.core.network.utils.GsonUtil;
-import com.mogo.eagle.core.utilcode.util.NetworkUtils;
-import com.mogo.map.location.IMogoLocationClient;
-
-import io.reactivex.schedulers.Schedulers;
-import okhttp3.MediaType;
-import okhttp3.RequestBody;
-
-/**
- * 延时验证工具类
- *
- * @author tongchenfei
- */
-public class DelayCheckUtil implements Handler.Callback {
-    private final Handler handler = new Handler(this);
-
-    private static final int MSG_CHECK_NET_CONNECT_STATUS = 1001;
-    /**
-     * 首次延时检测时间间隔，暂定10分钟，等待机器稳定后再做打算
-     */
-    private static final long FIRST_CHECK_NET_CONNECT_STATUS_DELAY = 10 * 60 * 1000;
-    private static final long CHECK_NET_CONNECT_STATUS_DELAY = 5000L;
-
-    private static final int MSG_START_DELAY_CHECK = 1002;
-    /**
-     * 默认检测时间间隔，若服务端正确返回，以服务端返回为主
-     */
-    private static final long DELAY_CHECK_DELAY = 10 * 60 * 1000;
-
-    private final Context context;
-
-    public DelayCheckUtil(Context context) {
-        this.context = context;
-    }
-
-    /**
-     * 每5s检查一下网络状态，网络状态为连接状态时，开始空接口请求以及后续的参数上报
-     */
-    public void waitingForCheck() {
-        handler.sendEmptyMessageDelayed(MSG_CHECK_NET_CONNECT_STATUS, FIRST_CHECK_NET_CONNECT_STATUS_DELAY);
-    }
-
-    private long requestTime, netDelay, requestStartSystemTime, requestEndSystem;
-
-    @Override
-    public boolean handleMessage(Message msg) {
-        switch (msg.what) {
-            case MSG_CHECK_NET_CONNECT_STATUS:
-                if (NetworkUtils.isConnected(context)) {
-                    handler.sendEmptyMessage(MSG_START_DELAY_CHECK);
-                } else {
-                    handler.sendEmptyMessageDelayed(MSG_CHECK_NET_CONNECT_STATUS, CHECK_NET_CONNECT_STATUS_DELAY);
-                }
-                return true;
-            case MSG_START_DELAY_CHECK:
-                // 请求空接口
-                startEmptyRequest();
-                return true;
-            default:
-                return false;
-        }
-    }
-
-    private void startEmptyRequest() {
-        requestTime = SystemClock.elapsedRealtime();
-        requestStartSystemTime = System.currentTimeMillis();
-        MoGoRetrofitFactory.getInstance(DelayCheckHttpConstant.getBaseUrl()).create(DelayCheckApiServices.class)
-                .emptyInterface().subscribeOn(Schedulers.io()).observeOn(Schedulers.io())
-                .subscribe(new SubscribeImpl<BaseData>(RequestOptions.create(context)) {
-                    @Override
-                    public void onSuccess(BaseData o) {
-                        super.onSuccess(o);
-                        requestEndSystem = System.currentTimeMillis();
-                        netDelay = SystemClock.elapsedRealtime() - requestTime;
-                        startUpload();
-                    }
-
-                    @Override
-                    public void onError(Throwable e) {
-                        super.onError(e);
-                        handler.sendEmptyMessageDelayed(MSG_CHECK_NET_CONNECT_STATUS, CHECK_NET_CONNECT_STATUS_DELAY);
-                    }
-
-                    @Override
-                    public void onError(String message, int code) {
-                        super.onError(message, code);
-                        handler.sendEmptyMessageDelayed(MSG_CHECK_NET_CONNECT_STATUS, CHECK_NET_CONNECT_STATUS_DELAY);
-                    }
-                });
-    }
-
-    private void startUpload() {
-        IMogoLocationClient locationClient = CallerMapUIServiceManager.INSTANCE.getSingletonLocationClient(AbsMogoApplication.getApp());
-        MogoLocation lastLocation = null;
-        if (locationClient != null) {
-            lastLocation = locationClient.getLastKnowLocation();
-        }
-        if (lastLocation == null) {
-            handler.sendEmptyMessageDelayed(MSG_START_DELAY_CHECK, DELAY_CHECK_DELAY);
-            return;
-        }
-        DelayCheckUploadRequest request = new DelayCheckUploadRequest();
-        request.setSn(MoGoAiCloudClientConfig.getInstance().getSn());
-        request.setStartTime(requestStartSystemTime);
-        request.setEndTime(requestEndSystem);
-        request.setNetState(NetworkUtils.netStrengthLevel);
-        request.setPlace(lastLocation.getAddress());
-        request.setCityCode(lastLocation.getCityCode());
-        request.setLat(lastLocation.getLatitude());
-        request.setLon(lastLocation.getLongitude());
-        request.setBurning(netDelay);
-
-        RequestBody params = RequestBody.create(MediaType.get("application/json"), GsonUtil.jsonFromObject(request));
-
-        MoGoRetrofitFactory.getInstance(DelayCheckHttpConstant.getBaseUrl()).create(DelayCheckApiServices.class)
-                .uploadDelayCheckData(params).observeOn(Schedulers.io()).subscribeOn(Schedulers.io())
-                .subscribe(new SubscribeImpl<DelayCheckResponse>(RequestOptions.create(context)) {
-                    @Override
-                    public void onSuccess(DelayCheckResponse o) {
-                        super.onSuccess(o);
-                        DelayCheckResult result = o.getResult();
-                        if (result.isNecessary()) {
-                            handler.sendEmptyMessageDelayed(MSG_START_DELAY_CHECK, result.getBeatSeconds() * 1000L);
-                        }
-                    }
-
-                    @Override
-                    public void onError(String message, int code) {
-                        super.onError(message, code);
-                        handler.sendEmptyMessageDelayed(MSG_CHECK_NET_CONNECT_STATUS, CHECK_NET_CONNECT_STATUS_DELAY);
-                    }
-
-                    @Override
-                    public void onError(Throwable e) {
-                        super.onError(e);
-                        handler.sendEmptyMessageDelayed(MSG_CHECK_NET_CONNECT_STATUS, CHECK_NET_CONNECT_STATUS_DELAY);
-                    }
-                });
-    }
-}

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/registercenter/MogoRegisterCenter.java

@@ -8,9 +8,6 @@ import com.mogo.map.listener.IMogoMapListener;
 import com.mogo.map.location.IMogoLocationListener;
 import com.mogo.map.marker.IMogoMarkerClickListener;
 import com.mogo.map.navi.IMogoCarLocationChangedListener;
-import com.mogo.map.navi.IMogoNaviListener;
-import com.mogo.service.adas.IMogoADASControlStatusChangedListener;
-import com.mogo.service.module.IMogoModuleLifecycle;
 import com.mogo.service.module.IMogoRegisterCenter;
 
 import java.util.Iterator;
@@ -24,16 +21,6 @@ import java.util.Iterator;
 @Route(path = MogoServicePaths.PATH_REGISTER_CENTER)
 public class MogoRegisterCenter implements IMogoRegisterCenter {
 
-    @Override
-    public void registerMogoModuleLifecycle(String moduleName, IMogoModuleLifecycle lifecycle) {
-        MogoRegisterCenterHandler.getInstance().registerMogoModuleLifecycle(moduleName, lifecycle);
-    }
-
-    @Override
-    public void unregisterMogoModuleLifecycle(String moduleName) {
-        MogoRegisterCenterHandler.getInstance().unregisterMogoModuleLifecycle(moduleName);
-    }
-
     @Override
     public void registerMogoMapListener(String moduleName, IMogoMapListener listener) {
         MogoRegisterCenterHandler.getInstance().registerMogoMapListener(moduleName, listener);
@@ -44,16 +31,6 @@ public class MogoRegisterCenter implements IMogoRegisterCenter {
         MogoRegisterCenterHandler.getInstance().unregisterMogoMapListener(moduleName);
     }
 
-    @Override
-    public void registerMogoNaviListener(String moduleName, IMogoNaviListener listener) {
-        MogoRegisterCenterHandler.getInstance().registerMogoNaviListener(moduleName, listener);
-    }
-
-    @Override
-    public void unregisterMogoNaviListener(String moduleName) {
-        MogoRegisterCenterHandler.getInstance().unregisterMogoNaviListener(moduleName);
-    }
-
     @Override
     public void registerMogoLocationListener(String moduleName, IMogoLocationListener listener) {
         MogoRegisterCenterHandler.getInstance().registerMogoLocationListener(moduleName, listener);
@@ -99,21 +76,6 @@ public class MogoRegisterCenter implements IMogoRegisterCenter {
         MogoRegisterCenterHandler.getInstance().unregisterCarLocationChangedListener(tag, listener);
     }
 
-    @Override
-    public void registerADASControlStatusChangedListener(String tag, IMogoADASControlStatusChangedListener listener) {
-        MogoRegisterCenterHandler.getInstance().registerADASControlStatusChangedListener(tag, listener);
-    }
-
-    @Override
-    public void unregisterADASControlStatusChangedListener(String tag) {
-        MogoRegisterCenterHandler.getInstance().unregisterADASControlStatusChangedListener(tag);
-    }
-
-    @Override
-    public Iterator<IMogoADASControlStatusChangedListener> getAdasControlStatusChangedListeners() {
-        return MogoRegisterCenterHandler.getInstance().getAdasControlStatusChangedListeners();
-    }
-
     @Override
     public void init(Context context) {
     }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/registercenter/MogoRegisterCenterHandler.java

@@ -6,9 +6,6 @@ import com.mogo.map.listener.IMogoMapListener;
 import com.mogo.map.location.IMogoLocationListener;
 import com.mogo.map.marker.IMogoMarkerClickListener;
 import com.mogo.map.navi.IMogoCarLocationChangedListener;
-import com.mogo.map.navi.IMogoNaviListener;
-import com.mogo.service.adas.IMogoADASControlStatusChangedListener;
-import com.mogo.service.module.IMogoModuleLifecycle;
 import com.mogo.service.module.IMogoRegisterCenter;
 
 import java.util.ArrayList;
@@ -27,14 +24,11 @@ public class MogoRegisterCenterHandler implements IMogoRegisterCenter {
 
     private static volatile MogoRegisterCenterHandler sInstance;
 
-    private final Map<String, IMogoModuleLifecycle> mLifecycle = new HashMap<>();
     private final Map<String, IMogoMapListener> mMap = new HashMap<>();
-    private final Map<String, IMogoNaviListener> mNavi = new ConcurrentHashMap<>();
     private final Map<String, IMogoLocationListener> mLocation = new HashMap<>();
     private final Map<String, IMogoMarkerClickListener> mMarker = new HashMap<>();
     private final Map<String, ArrayList<IMogoMarkerClickListener>> mStaticMarker = new HashMap<>();
     private final Map<String, IMogoCarLocationChangedListener> mCarLocations = new ConcurrentHashMap<>();
-    private final Map<String, IMogoADASControlStatusChangedListener> mADAS = new HashMap<>();
 
     private MogoRegisterCenterHandler() {
     }
@@ -54,17 +48,6 @@ public class MogoRegisterCenterHandler implements IMogoRegisterCenter {
         sInstance = null;
     }
 
-
-    @Override
-    public void registerMogoModuleLifecycle(String tag, IMogoModuleLifecycle lifecycle) {
-        mLifecycle.put(tag, lifecycle);
-    }
-
-    @Override
-    public void unregisterMogoModuleLifecycle(String tag) {
-        mLifecycle.remove(tag);
-    }
-
     @Override
     public void registerMogoMapListener(String tag, IMogoMapListener listener) {
         mMap.put(tag, listener);
@@ -75,16 +58,6 @@ public class MogoRegisterCenterHandler implements IMogoRegisterCenter {
         mMap.remove(tag);
     }
 
-    @Override
-    public void registerMogoNaviListener(String tag, IMogoNaviListener listener) {
-        mNavi.put(tag, listener);
-    }
-
-    @Override
-    public void unregisterMogoNaviListener(String tag) {
-        mNavi.remove(tag);
-    }
-
     @Override
     public void registerMogoLocationListener(String tag, IMogoLocationListener listener) {
         mLocation.put(tag, listener);
@@ -136,16 +109,6 @@ public class MogoRegisterCenterHandler implements IMogoRegisterCenter {
         mCarLocations.remove(tag);
     }
 
-    @Override
-    public void registerADASControlStatusChangedListener(String tag, IMogoADASControlStatusChangedListener listener) {
-        mADAS.put(tag, listener);
-    }
-
-    @Override
-    public void unregisterADASControlStatusChangedListener(String tag) {
-        mADAS.remove(tag);
-    }
-
     @Override
     public void init(Context context) {
     }
@@ -162,10 +125,6 @@ public class MogoRegisterCenterHandler implements IMogoRegisterCenter {
         return mMap.values().iterator();
     }
 
-    public Iterator<IMogoNaviListener> getNaviListeners() {
-        return mNavi.values().iterator();
-    }
-
     @Override
     public Iterator<IMogoLocationListener> getLocationListeners() {
         return mLocation.values().iterator();
@@ -175,8 +134,4 @@ public class MogoRegisterCenterHandler implements IMogoRegisterCenter {
         return mCarLocations.values().iterator();
     }
 
-    @Override
-    public Iterator<IMogoADASControlStatusChangedListener> getAdasControlStatusChangedListeners() {
-        return mADAS.values().iterator();
-    }
 }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/service/MogoMainService.java

@@ -15,7 +15,6 @@ import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.function.main.EventDispatchCenter;
 import com.mogo.eagle.core.function.main.cards.MogoModulesManager;
-import com.mogo.eagle.core.function.main.delaycheck.DelayCheckUtil;
 import com.mogo.eagle.core.function.main.monitoring.VehicleMonitoring;
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
@@ -55,9 +54,6 @@ class MogoMainService extends Service implements IMogoLocationListener {
                     HdMapBuildConfig.isMapLoaded = true;
                 }, 5_000L
         );
-        // 开启延时检测
-        DelayCheckUtil delayCheckUtil = new DelayCheckUtil(this);
-        delayCheckUtil.waitingForCheck();
         // 车辆检测
         VehicleMonitoring monitoring = new VehicleMonitoring(this);
         monitoring.vehicleCheck();

core/function-impl/mogo-core-function-hmi/src/main/res/drawable/traffic_light_bg.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="#ff000000"/>
+    <corners android:radius="@dimen/hmi_traffic_light_layout_corner"/>
+</shape>

core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml

@@ -60,27 +60,24 @@
     <!--超视距-->
     <ImageView
         android:id="@+id/ivCameraIcon"
-        android:layout_width="130px"
-        android:layout_height="130px"
-        android:layout_marginTop="38px"
+        android:layout_width="120px"
+        android:layout_height="120px"
+        android:layout_marginTop="45px"
         android:layout_marginEnd="40px"
         android:background="@drawable/icon_camera_nor"
-        app:layout_constraintEnd_toStartOf="@id/viewTrafficLightVr"
+        app:layout_constraintRight_toLeftOf="@id/viewTrafficLightVr"
         app:layout_constraintTop_toTopOf="parent"
         tools:visibility="visible" />
 
     <!--红绿灯-->
-    <com.mogo.eagle.core.function.hmi.ui.widget.TrafficLightView
+    <com.mogo.eagle.core.function.hmi.ui.widget.SingleTrafficLightView
         android:id="@+id/viewTrafficLightVr"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="40px"
-        android:layout_marginEnd="40px"
-        android:elevation="@dimen/dp_10"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible" />
+        android:layout_marginTop="@dimen/hmi_traffic_light_layout_margin_top"
+        android:layout_marginRight="@dimen/hmi_traffic_light_layout_margin_right"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <!--地图视角切换-->
     <com.mogo.eagle.core.function.hmi.ui.widget.PerspectiveSwitchView

core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_traffic_light.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="@dimen/hmi_traffic_light_layout_width"
+    android:layout_height="@dimen/hmi_traffic_light_layout_height"
+    android:visibility="visible">
+
+    <ImageView
+        android:id="@+id/hmi_traffic_light_bg"
+        android:layout_width="@dimen/hmi_traffic_light_bg_width"
+        android:layout_height="@dimen/hmi_traffic_light_bg_height"
+        android:layout_marginStart="@dimen/hmi_traffic_light_bg_margin_left"
+        android:layout_marginTop="@dimen/hmi_traffic_light_bg_margin_top"
+        android:background="@drawable/traffic_light_bg"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/hmi_traffic_light_iv"
+        android:layout_width="@dimen/hmi_traffic_light_icon_size"
+        android:layout_height="@dimen/hmi_traffic_light_icon_size"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.mogo.eagle.core.function.hmi.ui.widget.GradientTextView
+        android:id="@+id/hmi_traffic_light_time_tv"
+        android:layout_width="@dimen/hmi_traffic_light_time_view_width"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:textSize="@dimen/hmi_traffic_light_time_size"
+        android:textStyle="bold"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_upgrade_version.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:layout_marginStart="10dp"
+    android:layout_marginEnd="10dp">
+
+    <TextView
+        android:id="@+id/tvUpgradeApkName"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="16sp"
+        android:textColor="@color/color_FF2966EC"
+        android:padding="10dp"
+        />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="#F0F0F0"
+        android:layout_marginTop="3dp"
+        android:layout_marginBottom="3dp"/>
+
+
+</LinearLayout>

core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml

@@ -16,8 +16,7 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:fitsSystemWindows="true"
-        android:paddingTop="25dp">
+        android:fitsSystemWindows="true">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/cl_special_effect"
@@ -92,25 +91,26 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
-        <!--冷启动过渡Logo-->
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/module_main_id_cover_up"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@drawable/main_splash_bg">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="@drawable/main_bitmap_splash_icon"
-                android:scaleType="centerCrop"
-                android:visibility="visible"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintVertical_bias="0.47" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
     </FrameLayout>
 
+    <!--冷启动过渡Logo-->
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/module_main_id_cover_up"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/main_splash_bg">
+
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/main_bitmap_splash_icon"
+            android:scaleType="centerCrop"
+            android:visibility="visible"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
 </FrameLayout>

core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml

@@ -118,7 +118,7 @@
 
     </ScrollView>
 
-    <ScrollView
+    <androidx.core.widget.NestedScrollView
         android:id="@+id/svLayout"
         android:layout_width="match_parent"
         android:layout_height="0dp"
@@ -245,28 +245,6 @@
                     android:layout_height="1dp"
                     android:background="#F0F0F0" />
 
-                <TextView
-                    android:id="@+id/tvObuAppInfo"
-                    style="@style/DebugSettingText"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="#F0F0F0" />
-
-                <TextView
-                    android:id="@+id/tvObuHliInfo"
-                    style="@style/DebugSettingText"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="#F0F0F0" />
-
                 <TextView
                     android:id="@+id/tvObuSdkVersion"
                     style="@style/DebugSettingText"
@@ -960,6 +938,16 @@
                         android:textOn="打开「刹车控制」"
                         android:textSize="@dimen/dp_24" />
 
+                    <ToggleButton
+                        android:id="@+id/tbOpenSnBinding"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_columnWeight="1"
+                        android:layout_margin="2dp"
+                        android:gravity="center"
+                        android:textOff="关闭「SN绑定控制」"
+                        android:textOn="打开「SN绑定控制」"
+                        android:textSize="@dimen/dp_24" />
                 </GridLayout>
 
                 <ToggleButton
@@ -1538,9 +1526,105 @@
                 </LinearLayout>
             </LinearLayout>
 
+            <ToggleButton
+                android:id="@+id/btnApkCenter"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_10"
+                android:background="@drawable/radio_button_normal_background_right"
+                android:drawableEnd="@drawable/icon_right"
+                android:padding="@dimen/dp_20"
+                android:textOff="应用包管理中心"
+                android:textOn="应用包管理中心"
+                />
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/apkCenterLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
+                >
+
+                <ImageView
+                    android:id="@+id/ivApkSearch"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    android:src="@drawable/icon_search"
+                    android:padding="10dp"
+                    android:layout_marginEnd="10dp"
+                    />
+
+                <androidx.appcompat.widget.AppCompatEditText
+                    android:id="@+id/etApkSearch"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toLeftOf="@id/ivApkSearch"
+                    app:layout_constraintTop_toTopOf="@id/ivApkSearch"
+                    app:layout_constraintBottom_toBottomOf="@id/ivApkSearch"
+                    android:layout_marginStart="@dimen/dp_30"
+                    android:layout_marginTop="@dimen/dp_10"
+                    android:layout_marginEnd="@dimen/dp_20"
+                    android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/debug_setting_edit_bg"
+                    android:gravity="center"
+                    android:textColor="#1A1A1A"
+                    android:textSize="14sp"
+                    android:hint="请输入搜索关键字如版本号等"
+                    />
+
+                <CheckBox
+                    android:id="@+id/cbApkOnline"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="@dimen/dp_10"
+                    android:text="Online"
+                    android:textColor="#000"
+                    android:textSize="@dimen/dp_24"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toLeftOf="@id/cbApkQa"
+                    app:layout_constraintTop_toBottomOf="@id/ivApkSearch"
+                    android:checked="true"
+                    />
+
+                <CheckBox
+                    android:id="@+id/cbApkQa"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="@dimen/dp_10"
+                    android:text="QA"
+                    android:textColor="#000"
+                    android:textSize="@dimen/dp_24"
+                    app:layout_constraintLeft_toRightOf="@id/cbApkOnline"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/ivApkSearch"
+                    android:checked="true"
+                    />
+
+                <View
+                    android:id="@+id/apkSearchDivider"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="#F0F0F0"
+                    app:layout_constraintTop_toBottomOf="@id/cbApkQa"
+                    android:layout_marginTop="@dimen/dp_10"
+                    />
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/rvUpgradeVersionList"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintTop_toBottomOf="@id/apkSearchDivider"
+                    android:nestedScrollingEnabled="false"
+                    />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
         </LinearLayout>
 
-    </ScrollView>
+    </androidx.core.widget.NestedScrollView>
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>

core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/dimens.xml

@@ -37,4 +37,17 @@
     <dimen name="dp_580">580px</dimen>
     <dimen name="dp_588">588px</dimen>
     <dimen name="dp_1066">1066px</dimen>
+
+    <dimen name="hmi_traffic_light_layout_width">225px</dimen>
+    <dimen name="hmi_traffic_light_layout_height">154px</dimen>
+    <dimen name="hmi_traffic_light_layout_corner">60px</dimen>
+    <dimen name="hmi_traffic_light_layout_margin_right">40px</dimen>
+    <dimen name="hmi_traffic_light_layout_margin_top">23px</dimen>
+    <dimen name="hmi_traffic_light_bg_width">210px</dimen>
+    <dimen name="hmi_traffic_light_bg_height">120px</dimen>
+    <dimen name="hmi_traffic_light_bg_margin_left">15px</dimen>
+    <dimen name="hmi_traffic_light_bg_margin_top">17px</dimen>
+    <dimen name="hmi_traffic_light_icon_size">154px</dimen>
+    <dimen name="hmi_traffic_light_time_view_width">130px</dimen>
+    <dimen name="hmi_traffic_light_time_size">60px</dimen>
 </resources>

core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml

@@ -46,4 +46,11 @@
     <color name="dialog_bg_color">#3B4577</color>
 
     <color name="turnlight_bg_color">#000000</color>
+
+    <color name="hmi_traffic_light_red_color_up">#FFFFA28B</color>
+    <color name="hmi_traffic_light_red_color_down">#FFDA1100</color>
+    <color name="hmi_traffic_light_green_color_up">#FF60FFD3</color>
+    <color name="hmi_traffic_light_green_color_down">#FF006D43</color>
+    <color name="hmi_traffic_light_yellow_color_up">#FFFFE198</color>
+    <color name="hmi_traffic_light_yellow_color_down">#FFFF9B00</color>
 </resources>

core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml

@@ -42,4 +42,16 @@
     <dimen name="brakelight_width">460px</dimen>
     <dimen name="brakelight_height">120px</dimen>
 
+    <dimen name="hmi_traffic_light_layout_width">225px</dimen>
+    <dimen name="hmi_traffic_light_layout_height">154px</dimen>
+    <dimen name="hmi_traffic_light_layout_corner">60px</dimen>
+    <dimen name="hmi_traffic_light_layout_margin_right">40px</dimen>
+    <dimen name="hmi_traffic_light_layout_margin_top">23px</dimen>
+    <dimen name="hmi_traffic_light_bg_width">210px</dimen>
+    <dimen name="hmi_traffic_light_bg_height">120px</dimen>
+    <dimen name="hmi_traffic_light_bg_margin_left">15px</dimen>
+    <dimen name="hmi_traffic_light_bg_margin_top">17px</dimen>
+    <dimen name="hmi_traffic_light_icon_size">154px</dimen>
+    <dimen name="hmi_traffic_light_time_view_width">130px</dimen>
+    <dimen name="hmi_traffic_light_time_size">60px</dimen>
 </resources>