add the fit views of fentiji

2021-08-08 12:09:02 +08:00
parent 2545d1c868
commit 8c808edc75
38 changed files with 620 additions and 151518 deletions
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -15,6 +15,11 @@
        <entry key="modules/mogo-module-service/src/main/res/drawable/bg_adas_dispatch.xml" value="0.184" />
        <entry key="modules/mogo-module-service/src/main/res/drawable/bg_adas_dispatch_affirm.xml" value="0.19166666666666668" />
        <entry key="modules/mogo-module-service/src/main/res/drawable/bg_map_marker_blue_info.xml" value="0.184" />
+        <entry key="modules/mogo-module-service/src/main/res/drawable/module_service_dispatch_cars_affirm_bg.xml" value="0.218" />
+        <entry key="modules/mogo-module-service/src/main/res/drawable/module_service_dispatch_cars_bg.xml" value="0.218" />
+        <entry key="modules/mogo-module-service/src/main/res/drawable/module_service_dispatch_cars_cancel_bg.xml" value="0.218" />
+        <entry key="modules/mogo-module-service/src/main/res/drawable/module_service_dispatch_timer_bg.xml" value="0.218" />
+        <entry key="modules/mogo-module-service/src/main/res/layout/module_dialog_adas_dispatch_cars.xml" value="0.5546876453218006" />
        <entry key="modules/mogo-module-service/src/main/res/layout/module_dialog_adas_dispatch_remind.xml" value="0.35734252929687504" />
      </map>
    </option>
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/SubscribeImpl.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/SubscribeImpl.java
@@ -43,7 +43,7 @@ public abstract class SubscribeImpl< T extends BaseData > implements Observer< T
    @Override
    public void onNext( T o ) {
        if ( o != null ) {
-            if ( o.code != 0 ) {
+            if ( o.code != 0 && o.code!= 200 ) {
                onError( o.msg, o.code );
            } else {
                onSuccess( o );
--- a/gradle.properties
+++ b/gradle.properties
@@ -178,7 +178,7 @@ MOGO_AICLOUD_SERVICES_APK_VERSION=1.0.0-SNAPSHOT
 MOGO_AICLOUD_SERVICES_SDK_VERSION=1.0.0-SNAPSHOT

 # 自研地图
-MAP_SDK_VERSION=1.0.0-vr-8.5.79-1
+MAP_SDK_VERSION=1.0.1-ezhou-1.0.1

 ## 产品库必备配置，产品库自动对versionCode和versionName版本进行升级
 applicationId=com.mogo.launcer
--- a/modules/mogo-module-service/src/main/assets/adas0.txt
+++ b/modules/mogo-module-service/src/main/assets/adas0.txt
--- a/modules/mogo-module-service/src/main/assets/adas1.txt
+++ b/modules/mogo-module-service/src/main/assets/adas1.txt
--- a/modules/mogo-module-service/src/main/assets/adas2.txt
+++ b/modules/mogo-module-service/src/main/assets/adas2.txt
--- a/modules/mogo-module-service/src/main/assets/adas3.txt
+++ b/modules/mogo-module-service/src/main/assets/adas3.txt
--- a/modules/mogo-module-service/src/main/assets/adas4.txt
+++ b/modules/mogo-module-service/src/main/assets/adas4.txt
--- a/modules/mogo-module-service/src/main/assets/adas5.txt
+++ b/modules/mogo-module-service/src/main/assets/adas5.txt
--- a/modules/mogo-module-service/src/main/assets/adas6.txt
+++ b/modules/mogo-module-service/src/main/assets/adas6.txt
--- a/modules/mogo-module-service/src/main/assets/adas7.txt
+++ b/modules/mogo-module-service/src/main/assets/adas7.txt
--- a/modules/mogo-module-service/src/main/assets/adas8.txt
+++ b/modules/mogo-module-service/src/main/assets/adas8.txt
--- a/modules/mogo-module-service/src/main/assets/adas9.txt
+++ b/modules/mogo-module-service/src/main/assets/adas9.txt
--- a/modules/mogo-module-service/src/main/assets/adascar0.txt
+++ b/modules/mogo-module-service/src/main/assets/adascar0.txt
--- a/modules/mogo-module-service/src/main/assets/adascar1.txt
+++ b/modules/mogo-module-service/src/main/assets/adascar1.txt
--- a/modules/mogo-module-service/src/main/assets/adascar2.txt
+++ b/modules/mogo-module-service/src/main/assets/adascar2.txt
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAirportDialog.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAirportDialog.java
@@ -7,15 +7,14 @@ import android.widget.TextView;

 import androidx.annotation.NonNull;

-import com.mogo.module.common.dialog.BaseFloatDialog;
 import com.mogo.module.service.R;
 import com.mogo.module.service.dispatch.bean.DispatchAdasAutoPilotLocReceiverBean;
 import com.mogo.utils.logger.Logger;


-public class DispatchRemindDialog extends BaseFloatDialog {
+public class DispatchAirportDialog extends DispatchBaseDialog {

-    private static final String TAG = "DispatchRemindDialog";
+    private static final String TAG = "DispatchAirportDialog";
    private IDispatchRemindClickListener mListener;

    private final TextView tvStartLoc;
@@ -24,9 +23,9 @@ public class DispatchRemindDialog extends BaseFloatDialog {
    private final TextView tvFlightInfo;
    private final TextView tvTaskContent;

-    public DispatchRemindDialog(@NonNull Context context) {
+    public DispatchAirportDialog(@NonNull Context context) {
        super(context);
-        setContentView(R.layout.module_dialog_adas_dispatch_remind);
+        setContentView(R.layout.module_dialog_adas_dispatch_airport);
        setCanceledOnTouchOutside(false);
        tvStartLoc = findViewById(R.id.module_services_dispatch_dialog_start_content);
        tvEndLoc = findViewById(R.id.module_services_dispatch_dialog_end_content);
@@ -43,21 +42,22 @@ public class DispatchRemindDialog extends BaseFloatDialog {

    }

+    @Override
    public void showDialog(DispatchAdasAutoPilotLocReceiverBean dispatchContent) {
        show();
-        if(!TextUtils.isEmpty(dispatchContent.getStartLocAddress())){
+        if (!TextUtils.isEmpty(dispatchContent.getStartLocAddress())) {
            tvStartLoc.setText(dispatchContent.getStartLocAddress());
        }
-        if(!TextUtils.isEmpty(dispatchContent.getEndLocAddress())){
+        if (!TextUtils.isEmpty(dispatchContent.getEndLocAddress())) {
            tvEndLoc.setText(dispatchContent.getEndLocAddress());
        }
-        if(!TextUtils.isEmpty(dispatchContent.getTaskTime())){
+        if (!TextUtils.isEmpty(dispatchContent.getTaskTime())) {
            tvTaskTime.setText(dispatchContent.getTaskTime());
        }
-        if(!TextUtils.isEmpty(dispatchContent.getFlightInfo())){
+        if (!TextUtils.isEmpty(dispatchContent.getFlightInfo())) {
            tvFlightInfo.setText(dispatchContent.getFlightInfo());
        }
-        if(!TextUtils.isEmpty(dispatchContent.getTaskInfo())){
+        if (!TextUtils.isEmpty(dispatchContent.getTaskInfo())) {
            tvTaskContent.setText(dispatchContent.getTaskInfo());
        }
    }
@@ -66,6 +66,7 @@ public class DispatchRemindDialog extends BaseFloatDialog {
        dismiss();
    }

+    @Override
    public void addIDispatchRemindListener(IDispatchRemindClickListener listener) {
        if (listener == null) {
            Logger.d(TAG, "addIDispatchRemindListener listener is null");
@@ -74,8 +75,4 @@ public class DispatchRemindDialog extends BaseFloatDialog {
        this.mListener = listener;
    }

-    public interface IDispatchRemindClickListener {
-
-        void affirm();
-    }
 }
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java
@@ -1,6 +1,8 @@
 package com.mogo.module.service.dispatch;

 import static com.mogo.module.service.dispatch.model.DispatchServiceModel.DISPATCH_RESULT_AFFIRM;
+import static com.mogo.module.service.dispatch.model.DispatchServiceModel.DISPATCH_RESULT_MANUAL_CANCEL;
+import static com.mogo.module.service.dispatch.model.DispatchServiceModel.DISPATCH_RESULT_TIMER_CANCEL;

 import android.content.Context;
 import android.location.Location;
@@ -23,7 +25,7 @@ import com.mogo.utils.logger.Logger;

 //负责监听自动驾驶状态并进行状态上报，自动驾驶路线上报，接收调度指令展示指令弹窗
 public class DispatchAutoPilotManager implements IMogoOnMessageListener<DispatchAdasAutoPilotLocReceiverBean>
-        , DispatchRemindDialog.IDispatchRemindClickListener
+        , IDispatchRemindClickListener
        , IMogoCarLocationChangedListener2, IMogoAdasOCHCallback {

    private static final String TAG = "DispatchAutoPilotManager";
@@ -33,7 +35,7 @@ public class DispatchAutoPilotManager implements IMogoOnMessageListener<Dispatch
    private static final int MSG_SOCKET_TYPE = 501000;
    private static final int MSG_TYPE_SHOW_DIALOG = 0;

-    private DispatchRemindDialog dispatchRemindDialog;
+    private DispatchDialogManager dispatchDialogManager;
    private MogoLocation mogoLocation;
    private DispatchAdasAutoPilotLocReceiverBean receiverBean;

@@ -57,12 +59,12 @@ public class DispatchAutoPilotManager implements IMogoOnMessageListener<Dispatch
        public void handleMessage(Message msg) {
            super.handleMessage(msg);
            if (msg.what == MSG_TYPE_SHOW_DIALOG) {
-                if (dispatchRemindDialog.isShowing()) {
+                if (dispatchDialogManager.isShowing()) {
                    Logger.d(TAG, "此时已经有调度，又收到调度信息");
                    return;
                }
                DispatchAdasAutoPilotLocReceiverBean msgData = (DispatchAdasAutoPilotLocReceiverBean) msg.obj;
-                dispatchRemindDialog.showDialog(msgData);
+                dispatchDialogManager.showDialog(msgData);
            }
        }
    };
@@ -75,8 +77,8 @@ public class DispatchAutoPilotManager implements IMogoOnMessageListener<Dispatch
                .registerCarLocationChangedListener(TAG, this);
        MogoApisHandler.getInstance().getApis().getAdasControllerApi()
                .addAdasOCHCallback(this);
-        dispatchRemindDialog = new DispatchRemindDialog(context);
-        dispatchRemindDialog.addIDispatchRemindListener(this);
+        dispatchDialogManager = DispatchDialogManager.getInstance(context);
+        dispatchDialogManager.addIDispatchRemindListener(this);
    }

    @Override
@@ -99,6 +101,7 @@ public class DispatchAutoPilotManager implements IMogoOnMessageListener<Dispatch

    @Override
    public void affirm() {
+        dispatchDialogManager.releaseDialog();
        DispatchServiceModel.getInstance().dispatchResultUpload(DISPATCH_RESULT_AFFIRM, new IDispatch() {
            @Override
            public void onSuccess() {
@@ -118,6 +121,23 @@ public class DispatchAutoPilotManager implements IMogoOnMessageListener<Dispatch
        });
    }

+    @Override
+    public void cancel(boolean manualTrigger) {
+        dispatchDialogManager.releaseDialog();
+        DispatchServiceModel.getInstance().dispatchResultUpload(manualTrigger ? DISPATCH_RESULT_MANUAL_CANCEL
+                : DISPATCH_RESULT_TIMER_CANCEL, new IDispatch() {
+            @Override
+            public void onSuccess() {
+
+            }
+
+            @Override
+            public void onError(String msg) {
+
+            }
+        });
+    }
+
    @Override
    public void onCarLocationChanged2(Location location) {
        //坐标转换
@@ -138,14 +158,37 @@ public class DispatchAutoPilotManager implements IMogoOnMessageListener<Dispatch

    }

-    public void test() {
-        Logger.d(TAG, "test to trigger mock autopilot");
+    public void testEZhouStart() {
+        Logger.d(TAG, "test to trigger mock testEZhouStart");
        DispatchAdasAutoPilotLocReceiverBean adasAutoPilotLocReceiverBean = new DispatchAdasAutoPilotLocReceiverBean(
-                "1", 26.825571122, 112.5762410415, "起点---5号跑道",
+                DispatchAdasAutoPilotLocReceiverBean.DISPATCH_SOURCE_EZHOU, DispatchAdasAutoPilotLocReceiverBean.DISPATCH_TYPE_START, "1",
+                26.825571122, 112.5762410415, "起点---5号跑道",
                26.825571122, 112.5762410415, "终点---鄂州机场",
-                "" + System.currentTimeMillis(), "AR453航班", "实现调度", System.currentTimeMillis());
+                "5分钟", "AR453航班", "实现调度", System.currentTimeMillis());
        this.receiverBean = adasAutoPilotLocReceiverBean;
-        dispatchRemindDialog.showDialog(adasAutoPilotLocReceiverBean);
+        DispatchDialogManager.getInstance(mContext).showDialog(adasAutoPilotLocReceiverBean);
+    }
+
+    public void testEZhouStop() {
+        Logger.d(TAG, "test to trigger mock testEZhouStop");
+        DispatchAdasAutoPilotLocReceiverBean adasAutoPilotLocReceiverBean = new DispatchAdasAutoPilotLocReceiverBean(
+                DispatchAdasAutoPilotLocReceiverBean.DISPATCH_SOURCE_EZHOU, DispatchAdasAutoPilotLocReceiverBean.DISPATCH_TYPE_STOP, "1",
+                0.0, 0.0, "",
+                0.0, 0.0, "",
+                "", "", "", System.currentTimeMillis());
+        this.receiverBean = adasAutoPilotLocReceiverBean;
+        DispatchDialogManager.getInstance(mContext).showDialog(adasAutoPilotLocReceiverBean);
+    }
+
+    public void testHengYangStart() {
+        Logger.d(TAG, "test to trigger mock testHengYangStart");
+        DispatchAdasAutoPilotLocReceiverBean adasAutoPilotLocReceiverBean = new DispatchAdasAutoPilotLocReceiverBean(
+                DispatchAdasAutoPilotLocReceiverBean.DISPATCH_SOURCE_HENGYANG, DispatchAdasAutoPilotLocReceiverBean.DISPATCH_TYPE_START, "2",
+                26.825571122, 112.5762410415, "衡阳科学城",
+                26.825571122, 112.5762410415, "衡阳首钢集团",
+                "", "", "", System.currentTimeMillis());
+        this.receiverBean = adasAutoPilotLocReceiverBean;
+        DispatchDialogManager.getInstance(mContext).showDialog(adasAutoPilotLocReceiverBean);
    }

    public void testDispatchResultUpload() {
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchBaseDialog.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchBaseDialog.java
@@ -0,0 +1,20 @@
+package com.mogo.module.service.dispatch;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.mogo.module.common.dialog.BaseFloatDialog;
+import com.mogo.module.service.dispatch.bean.DispatchAdasAutoPilotLocReceiverBean;
+
+public abstract class DispatchBaseDialog extends BaseFloatDialog {
+
+    public DispatchBaseDialog(@NonNull Context context) {
+        super(context);
+    }
+
+    public abstract void addIDispatchRemindListener(IDispatchRemindClickListener listener);
+
+    public abstract void showDialog(DispatchAdasAutoPilotLocReceiverBean dispatchContent);
+
+}
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchCarsDialog.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchCarsDialog.java
@@ -0,0 +1,97 @@
+package com.mogo.module.service.dispatch;
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.Message;
+import android.text.TextUtils;
+import android.widget.Button;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+
+import com.mogo.module.service.R;
+import com.mogo.module.service.dispatch.bean.DispatchAdasAutoPilotLocReceiverBean;
+import com.mogo.utils.logger.Logger;
+
+public class DispatchCarsDialog extends DispatchBaseDialog{
+
+    private static final String TAG = "DispatchCarsDialog";
+    private static final int MSG_TYPE_TIMER = 0;
+    private static int TIMER = 10;
+    private IDispatchRemindClickListener mListener;
+
+    private final TextView tvTimer;
+    private final TextView tvLoc;
+
+    private final Handler handler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+            if (msg.what == MSG_TYPE_TIMER) {
+                if (TIMER > 0) {
+                    TIMER--;
+                    Logger.d(TAG,"timer : " + TIMER);
+                    tvTimer.setText(String.valueOf(TIMER));
+                    handler.sendEmptyMessageDelayed(MSG_TYPE_TIMER,1000L);
+                } else {
+                    hideDialog();
+                }
+            }
+        }
+    };
+
+    public DispatchCarsDialog(@NonNull Context context) {
+        super(context);
+        setContentView(R.layout.module_dialog_adas_dispatch_cars);
+        setCanceledOnTouchOutside(false);
+        tvTimer = findViewById(R.id.module_adas_dispatch_remind_timer);
+        tvLoc = findViewById(R.id.module_adas_dispatch_remind_loc);
+        Button btnAffirm = (Button) findViewById(R.id.module_adas_dispatch_remind_affirm);
+        Button btnCancel = (Button) findViewById(R.id.module_adas_dispatch_remind_cancel);
+        tvTimer.setText(String.valueOf(TIMER));
+        btnAffirm.setOnClickListener(v -> {
+            if (mListener != null) {
+                mListener.affirm();
+                dismissDialog();
+            }
+        });
+        btnCancel.setOnClickListener(v -> {
+            if (mListener != null) {
+                mListener.cancel(true);
+                dismissDialog();
+            }
+        });
+    }
+
+    private void hideDialog() {
+        if (mListener != null) {
+            mListener.cancel(false);
+        }
+        dismissDialog();
+    }
+
+    private void dismissDialog(){
+        handler.removeMessages(MSG_TYPE_TIMER);
+        TIMER = 10;
+        dismiss();
+    }
+
+    @Override
+    public void addIDispatchRemindListener(IDispatchRemindClickListener listener) {
+        if (listener == null) {
+            Logger.d(TAG, "addIDispatchRemindListener listener is null");
+            return;
+        }
+        this.mListener = listener;
+    }
+
+    @Override
+    public void showDialog(DispatchAdasAutoPilotLocReceiverBean dispatchContent) {
+        if(TextUtils.isEmpty(dispatchContent.getEndLocAddress())){
+            return;
+        }
+        show();
+        handler.sendEmptyMessage(MSG_TYPE_TIMER);
+        tvLoc.setText(dispatchContent.getEndLocAddress());
+    }
+}
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchDialogManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchDialogManager.java
@@ -0,0 +1,108 @@
+package com.mogo.module.service.dispatch;
+
+import static com.mogo.module.service.dispatch.bean.DispatchAdasAutoPilotLocReceiverBean.DISPATCH_SOURCE_EZHOU;
+import static com.mogo.module.service.dispatch.bean.DispatchAdasAutoPilotLocReceiverBean.DISPATCH_SOURCE_HENGYANG;
+import static com.mogo.module.service.dispatch.bean.DispatchAdasAutoPilotLocReceiverBean.DISPATCH_TYPE_START;
+import static com.mogo.module.service.dispatch.bean.DispatchAdasAutoPilotLocReceiverBean.DISPATCH_TYPE_STOP;
+
+import android.content.Context;
+
+import com.mogo.commons.voice.AIAssist;
+import com.mogo.module.service.dispatch.bean.DispatchAdasAutoPilotLocReceiverBean;
+import com.mogo.utils.logger.Logger;
+
+public class DispatchDialogManager {
+
+    private static final String TAG = "DispatchDialogManager";
+    private static volatile DispatchDialogManager manager;
+    private static final byte[] obj = new byte[0];
+    private Context mContext;
+    private IDispatchRemindClickListener mListener;
+    private DispatchBaseDialog dialog;
+
+    private DispatchDialogManager(Context context) {
+        mContext = context;
+    }
+
+    public static DispatchDialogManager getInstance(Context context) {
+        if (manager == null) {
+            synchronized (obj) {
+                if (manager == null) {
+                    manager = new DispatchDialogManager(context);
+                }
+            }
+        }
+        return manager;
+    }
+
+    public void addIDispatchRemindListener(IDispatchRemindClickListener listener) {
+        if (listener == null) {
+            Logger.d(TAG, "addIDispatchRemindListener listener is null");
+            return;
+        }
+        this.mListener = listener;
+    }
+
+    public boolean isShowing() {
+        return dialog != null && dialog.isShowing();
+    }
+
+    public void showDialog(DispatchAdasAutoPilotLocReceiverBean msgData) {
+        if (msgData == null) {
+            return;
+        }
+        switch (msgData.getSource()) {
+            case DISPATCH_SOURCE_HENGYANG:
+                dispatchHengYang(msgData);
+                break;
+            case DISPATCH_SOURCE_EZHOU:
+                dispatchEZhou(msgData);
+                break;
+        }
+
+    }
+
+    private void dispatchHengYang(DispatchAdasAutoPilotLocReceiverBean msgData) {
+        if (msgData.getType() == DISPATCH_TYPE_START) {  //衡阳只有开始调度
+            if (dialog != null && dialog.isShowing()) {  //避免下发两次
+                return;
+            }
+            if (dialog == null) {
+                dialog = new DispatchCarsDialog(mContext);
+            }
+            dialog.addIDispatchRemindListener(mListener);
+            dialog.showDialog(msgData);
+        }
+    }
+
+    private void dispatchEZhou(DispatchAdasAutoPilotLocReceiverBean msgData) {
+        switch (msgData.getType()) {
+            case DISPATCH_TYPE_START:
+                if (dialog != null && dialog.isShowing()) {  //避免下发两次
+                    return;
+                }
+                if (dialog == null) {
+                    dialog = new DispatchAirportDialog(mContext);
+                }
+                dialog.addIDispatchRemindListener(mListener);
+                dialog.showDialog(msgData);
+            case DISPATCH_TYPE_STOP:
+                //语音播报
+                voice();
+                break;
+        }
+    }
+
+    private void voice() {
+        AIAssist.getInstance(mContext).speakTTSVoice("请立即停车!请立即停车!");
+    }
+
+    public void releaseDialog() {
+        if (dialog != null) {
+            if (dialog.isShowing()) {
+                dialog.dismiss();
+            }
+            dialog = null;
+        }
+    }
+}
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchTestPanelBroadCastReceiver.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchTestPanelBroadCastReceiver.java
@@ -15,12 +15,9 @@ public class DispatchTestPanelBroadCastReceiver extends BroadcastReceiver {
     */
    public static final String BROADCAST_TEST_PANEL_CONTROL_TYPE_EXTRA_KEY = "sceneType";

-    private Context mContext;
-
    @Override
    public void onReceive(Context context, Intent intent) {
        try {
-            this.mContext = context;
            int sceneType = intent.getIntExtra(BROADCAST_TEST_PANEL_CONTROL_TYPE_EXTRA_KEY, 0);
            Logger.d(TAG, "textPanelOpenType:" + sceneType);
            // 分发场景
@@ -37,9 +34,13 @@ public class DispatchTestPanelBroadCastReceiver extends BroadcastReceiver {
     */
    private void dispatchSceneTest(int sceneType) {
        Logger.d(TAG, "sceneType=" + sceneType);
-        if (sceneType == 0) {//打开调度弹窗
-            DispatchAutoPilotManager.getInstance().test();
-        }else if(sceneType == 1){ //验证自动驾驶调度上报接口
+        if (sceneType == 0) {
+            DispatchAutoPilotManager.getInstance().testEZhouStart();
+        } else if (sceneType == 1) {
+            DispatchAutoPilotManager.getInstance().testEZhouStop();
+        } else if (sceneType == 2) {
+            DispatchAutoPilotManager.getInstance().testHengYangStart();
+        } else if (sceneType == 3) { //验证自动驾驶调度上报接口
            DispatchAutoPilotManager.getInstance().testDispatchResultUpload();
        }
    }
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/IDispatchRemindClickListener.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/IDispatchRemindClickListener.java
@@ -0,0 +1,8 @@
+package com.mogo.module.service.dispatch;
+
+public interface IDispatchRemindClickListener {
+
+    void affirm();
+
+    void cancel(boolean manualTrigger);
+}
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/bean/DispatchAdasAutoPilotLocReceiverBean.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/bean/DispatchAdasAutoPilotLocReceiverBean.java
@@ -2,6 +2,13 @@ package com.mogo.module.service.dispatch.bean;

 public class DispatchAdasAutoPilotLocReceiverBean {

+    public static final int DISPATCH_SOURCE_HENGYANG = 1;
+    public static final int DISPATCH_SOURCE_EZHOU = 2;
+    public static final int DISPATCH_TYPE_START = 1;
+    public static final int DISPATCH_TYPE_STOP = 2;
+
+    private int source; // 1：衡阳   2：鄂州
+    private int type;   // 1：启动   2：停止
    private String poiId;

    private double startLat;
@@ -17,7 +24,9 @@ public class DispatchAdasAutoPilotLocReceiverBean {
    private String taskInfo;
    private long systemTime;

-    public DispatchAdasAutoPilotLocReceiverBean(String poiId, double startLat, double startLon, String startLocAddress, double endLat, double endLon, String endLocAddress, String taskTime, String flightInfo, String taskInfo, long systemTime) {
+    public DispatchAdasAutoPilotLocReceiverBean(int source, int type, String poiId, double startLat, double startLon, String startLocAddress, double endLat, double endLon, String endLocAddress, String taskTime, String flightInfo, String taskInfo, long systemTime) {
+        this.source = source;
+        this.type = type;
        this.poiId = poiId;
        this.startLat = startLat;
        this.startLon = startLon;
@@ -31,6 +40,22 @@ public class DispatchAdasAutoPilotLocReceiverBean {
        this.systemTime = systemTime;
    }

+    public int getSource() {
+        return source;
+    }
+
+    public void setSource(int source) {
+        this.source = source;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
    public String getPoiId() {
        return poiId;
    }
@@ -122,7 +147,9 @@ public class DispatchAdasAutoPilotLocReceiverBean {
    @Override
    public String toString() {
        return "DispatchAdasAutoPilotLocReceiverBean{" +
-                "poiId='" + poiId + '\'' +
+                "source=" + source +
+                ", type=" + type +
+                ", poiId='" + poiId + '\'' +
                ", startLat=" + startLat +
                ", startLon=" + startLon +
                ", startLocAddress='" + startLocAddress + '\'' +
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/model/DispatchServiceModel.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/model/DispatchServiceModel.java
@@ -24,7 +24,7 @@ import io.reactivex.schedulers.Schedulers;

 public class DispatchServiceModel {

-    private static final String TAG = "AdasServiceModel";
+    private static final String TAG = "DispatchServiceModel";
    private static volatile DispatchServiceModel instance;
    private static final byte[] obj = new byte[0];

--- a/modules/mogo-module-service/src/main/res/drawable/bg_adas_dispatch.xml
+++ b/modules/mogo-module-service/src/main/res/drawable/bg_adas_dispatch.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
    <solid android:color="@color/module_services_dispatch_bg" />
-    <corners android:radius="@dimen/module_services_dispatch_dialog_corner" />
+    <corners android:radius="@dimen/module_services_dispatch_airport_dialog_corner" />

 </shape>
--- a/modules/mogo-module-service/src/main/res/drawable/bg_adas_dispatch_affirm.xml
+++ b/modules/mogo-module-service/src/main/res/drawable/bg_adas_dispatch_affirm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
    <solid android:color="@color/module_services_dispatch_affirm_bg" />
-    <corners android:radius="@dimen/module_services_dispatch_dialog_affirm_corner" />
+    <corners android:radius="@dimen/module_services_dispatch_airport_dialog_affirm_corner" />

 </shape>
--- a/modules/mogo-module-service/src/main/res/drawable/module_service_dispatch_cars_affirm_bg.xml
+++ b/modules/mogo-module-service/src/main/res/drawable/module_service_dispatch_cars_affirm_bg.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <corners android:bottomLeftRadius="@dimen/module_services_dispatch_cars_dialog_corner"/>
+    <solid android:color="@color/module_services_dispatch_cars_background"/>
+</shape>
--- a/modules/mogo-module-service/src/main/res/drawable/module_service_dispatch_cars_bg.xml
+++ b/modules/mogo-module-service/src/main/res/drawable/module_service_dispatch_cars_bg.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="@dimen/module_services_dispatch_cars_dialog_corner"/>
+    <solid android:color="@color/module_services_dispatch_cars_background"/>
+</shape>
--- a/modules/mogo-module-service/src/main/res/drawable/module_service_dispatch_cars_cancel_bg.xml
+++ b/modules/mogo-module-service/src/main/res/drawable/module_service_dispatch_cars_cancel_bg.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <corners android:bottomRightRadius="@dimen/module_services_dispatch_cars_dialog_corner"/>
+    <solid android:color="@color/module_services_dispatch_cars_background"/>
+</shape>
--- a/modules/mogo-module-service/src/main/res/drawable/module_service_dispatch_timer_bg.xml
+++ b/modules/mogo-module-service/src/main/res/drawable/module_service_dispatch_timer_bg.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+    <solid android:color="@color/module_services_dispatch_cars_count_down_bg"/>
+</shape>
--- a/modules/mogo-module-service/src/main/res/layout/module_dialog_adas_dispatch_airport.xml
+++ b/modules/mogo-module-service/src/main/res/layout/module_dialog_adas_dispatch_airport.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="@dimen/module_services_dispatch_dialog_width"
-    android:layout_height="@dimen/module_services_dispatch_dialog_height"
+    android:layout_width="@dimen/module_services_dispatch_airport_dialog_width"
+    android:layout_height="wrap_content"
    android:background="@drawable/bg_adas_dispatch">

    <TextView
@@ -9,112 +9,113 @@
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_centerHorizontal="true"
-        android:layout_marginTop="@dimen/module_services_dispatch_dialog_title_margin_top"
+        android:layout_marginTop="@dimen/module_services_dispatch_airport_dialog_title_margin_top"
        android:text="@string/module_services_dispatch_dialog_title"
        android:textColor="@android:color/white"
-        android:textSize="@dimen/module_services_dispatch_dialog_title_size"
+        android:textSize="@dimen/module_services_dispatch_airport_dialog_title_size"
        android:textStyle="bold" />

    <TextView
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/module_services_dispatch_dialog_first_column_margin_left"
-        android:layout_marginTop="@dimen/module_services_dispatch_dialog_startloc_margin_top"
+        android:layout_marginStart="@dimen/module_services_dispatch_airport_dialog_first_column_margin_left"
+        android:layout_marginTop="@dimen/module_services_dispatch_airport_dialog_startloc_margin_top"
        android:text="@string/module_services_dispatch_dialog_start_loc"
-        android:textSize="@dimen/module_services_dispatch_dialog_next_level_title_size" />
+        android:textSize="@dimen/module_services_dispatch_airport_dialog_next_level_title_size" />

    <TextView
        android:id="@+id/module_services_dispatch_dialog_start_content"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/module_services_dispatch_dialog_first_column_margin_left"
-        android:layout_marginTop="@dimen/module_services_dispatch_dialog_startloc_content_margin_top"
+        android:layout_marginStart="@dimen/module_services_dispatch_airport_dialog_first_column_margin_left"
+        android:layout_marginTop="@dimen/module_services_dispatch_airport_dialog_startloc_content_margin_top"
        android:textColor="@android:color/white"
-        android:textSize="@dimen/module_services_dispatch_dialog_title_size"
+        android:textSize="@dimen/module_services_dispatch_airport_dialog_title_size"
        android:textStyle="bold" />

    <TextView
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/module_services_dispatch_dialog_first_column_margin_left"
-        android:layout_marginTop="@dimen/module_services_dispatch_dialog_endloc_margin_top"
+        android:layout_marginStart="@dimen/module_services_dispatch_airport_dialog_first_column_margin_left"
+        android:layout_marginTop="@dimen/module_services_dispatch_airport_dialog_endloc_margin_top"
        android:text="@string/module_services_dispatch_dialog_end_loc"
-        android:textSize="@dimen/module_services_dispatch_dialog_next_level_title_size" />
+        android:textSize="@dimen/module_services_dispatch_airport_dialog_next_level_title_size" />

    <TextView
        android:id="@+id/module_services_dispatch_dialog_end_content"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/module_services_dispatch_dialog_first_column_margin_left"
-        android:layout_marginTop="@dimen/module_services_dispatch_dialog_endloc_content_margin_top"
+        android:layout_marginStart="@dimen/module_services_dispatch_airport_dialog_first_column_margin_left"
+        android:layout_marginTop="@dimen/module_services_dispatch_airport_dialog_endloc_content_margin_top"
        android:textColor="@android:color/white"
-        android:textSize="@dimen/module_services_dispatch_dialog_title_size"
+        android:textSize="@dimen/module_services_dispatch_airport_dialog_title_size"
        android:textStyle="bold" />

    <TextView
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/module_services_dispatch_dialog_first_column_margin_left"
-        android:layout_marginTop="@dimen/module_services_dispatch_dialog_task_margin_top"
+        android:layout_marginStart="@dimen/module_services_dispatch_airport_dialog_first_column_margin_left"
+        android:layout_marginTop="@dimen/module_services_dispatch_airport_dialog_task_margin_top"
        android:text="@string/module_services_dispatch_dialog_task_info"
-        android:textSize="@dimen/module_services_dispatch_dialog_next_level_title_size" />
+        android:textSize="@dimen/module_services_dispatch_airport_dialog_next_level_title_size" />

    <TextView
        android:id="@+id/module_services_dispatch_dialog_task_content"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/module_services_dispatch_dialog_first_column_margin_left"
-        android:layout_marginTop="@dimen/module_services_dispatch_dialog_task_content_margin_top"
+        android:layout_marginStart="@dimen/module_services_dispatch_airport_dialog_first_column_margin_left"
+        android:layout_marginTop="@dimen/module_services_dispatch_airport_dialog_task_content_margin_top"
        android:textColor="@android:color/white"
-        android:textSize="@dimen/module_services_dispatch_dialog_task_content_size" />
+        android:textSize="@dimen/module_services_dispatch_airport_dialog_task_content_size" />

    <TextView
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/module_services_dispatch_dialog_last_column_margin_left"
-        android:layout_marginTop="@dimen/module_services_dispatch_dialog_startloc_margin_top"
+        android:layout_marginStart="@dimen/module_services_dispatch_airport_dialog_last_column_margin_left"
+        android:layout_marginTop="@dimen/module_services_dispatch_airport_dialog_startloc_margin_top"
        android:text="@string/module_services_dispatch_dialog_task_time"
-        android:textSize="@dimen/module_services_dispatch_dialog_next_level_title_size" />
+        android:textSize="@dimen/module_services_dispatch_airport_dialog_next_level_title_size" />

    <TextView
        android:id="@+id/module_services_dispatch_dialog_task_time"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/module_services_dispatch_dialog_last_column_margin_left"
-        android:layout_marginTop="@dimen/module_services_dispatch_dialog_startloc_content_margin_top"
+        android:layout_marginStart="@dimen/module_services_dispatch_airport_dialog_last_column_margin_left"
+        android:layout_marginTop="@dimen/module_services_dispatch_airport_dialog_startloc_content_margin_top"
        android:textColor="@android:color/white"
-        android:textSize="@dimen/module_services_dispatch_dialog_title_size"
+        android:textSize="@dimen/module_services_dispatch_airport_dialog_title_size"
        android:textStyle="bold" />

    <TextView
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/module_services_dispatch_dialog_last_column_margin_left"
-        android:layout_marginTop="@dimen/module_services_dispatch_dialog_endloc_margin_top"
+        android:layout_marginStart="@dimen/module_services_dispatch_airport_dialog_last_column_margin_left"
+        android:layout_marginTop="@dimen/module_services_dispatch_airport_dialog_endloc_margin_top"
        android:text="@string/module_services_dispatch_dialog_flight_info"
-        android:textSize="@dimen/module_services_dispatch_dialog_next_level_title_size" />
+        android:textSize="@dimen/module_services_dispatch_airport_dialog_next_level_title_size" />

    <TextView
        android:id="@+id/module_services_dispatch_dialog_flight_time"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/module_services_dispatch_dialog_last_column_margin_left"
-        android:layout_marginTop="@dimen/module_services_dispatch_dialog_endloc_content_margin_top"
+        android:layout_marginStart="@dimen/module_services_dispatch_airport_dialog_last_column_margin_left"
+        android:layout_marginTop="@dimen/module_services_dispatch_airport_dialog_endloc_content_margin_top"
        android:textColor="@android:color/white"
-        android:textSize="@dimen/module_services_dispatch_dialog_title_size"
+        android:textSize="@dimen/module_services_dispatch_airport_dialog_title_size"
        android:textStyle="bold" />

    <Button
        android:id="@+id/module_services_dispatch_dialog_confirm"
-        android:layout_width="@dimen/module_services_dispatch_dialog_affirm_width"
-        android:layout_height="@dimen/module_services_dispatch_dialog_affirm_height"
-        android:layout_alignParentBottom="true"
+        android:layout_width="@dimen/module_services_dispatch_airport_dialog_affirm_width"
+        android:layout_height="@dimen/module_services_dispatch_airport_dialog_affirm_height"
        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="@dimen/module_services_dispatch_dialog_margin_bottom"
+        android:layout_alignTop="@+id/module_services_dispatch_dialog_task_content"
+        android:layout_marginTop="@dimen/module_services_dispatch_airport_dialog_margin_top"
+        android:layout_marginBottom="@dimen/module_services_dispatch_airport_dialog_margin_bottom"
        android:background="@drawable/bg_adas_dispatch_affirm"
        android:gravity="center"
        android:text="@string/module_services_dispatch_dialog_affirm"
        android:textColor="@android:color/white"
-        android:textSize="@dimen/module_services_dispatch_dialog_title_size"
+        android:textSize="@dimen/module_services_dispatch_airport_dialog_title_size"
        android:textStyle="bold" />
 </RelativeLayout>
--- a/modules/mogo-module-service/src/main/res/layout/module_dialog_adas_dispatch_cars.xml
+++ b/modules/mogo-module-service/src/main/res/layout/module_dialog_adas_dispatch_cars.xml
@@ -0,0 +1,95 @@
+<?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/module_services_dispatch_cars_dialog_width"
+    android:layout_height="@dimen/module_services_dispatch_cars_dialog_height"
+    android:background="@drawable/module_service_dispatch_cars_bg">
+
+    <TextView
+        android:id="@+id/module_adas_dispatch_remind_timer"
+        android:layout_width="@dimen/module_services_dispatch_cars_dialog_timer_size"
+        android:layout_height="@dimen/module_services_dispatch_cars_dialog_timer_size"
+        android:layout_margin="@dimen/module_services_dispatch_cars_dialog_timer_margin"
+        android:background="@drawable/module_service_dispatch_timer_bg"
+        android:gravity="center"
+        android:text="10"
+        android:textColor="@color/module_services_dispatch_cars_count_down_txt"
+        android:textSize="@dimen/module_services_dispatch_cars_dialog_timer_txt_size"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/module_services_dispatch_cars_dialog_title_margin_top"
+        android:text="@string/module_services_dispatch_cars_remind_title"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/module_services_dispatch_cars_dialog_title_size"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/module_services_dispatch_cars_dialog_content_margin_top"
+        android:text="@string/module_services_dispatch_cars_remind_content"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/module_services_dispatch_cars_dialog_content_size"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/module_adas_dispatch_remind_loc"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/module_services_dispatch_cars_dialog_loc_margin_top"
+        android:maxLines="1"
+        android:textColor="@color/module_services_dispatch_cars_text_loc"
+        android:textSize="@dimen/module_services_dispatch_cars_dialog_loc_size"
+        android:textStyle="bold"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:layout_marginBottom="@dimen/module_services_dispatch_cars_dialog_line_margin_bottom"
+        android:background="@color/module_services_dispatch_cars_background"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent" />
+
+    <Button
+        android:id="@+id/module_adas_dispatch_remind_affirm"
+        android:layout_width="@dimen/module_services_dispatch_cars_dialog_btn_width"
+        android:layout_height="@dimen/module_services_dispatch_cars_dialog_line_margin_bottom"
+        android:background="@drawable/module_service_dispatch_cars_affirm_bg"
+        android:gravity="center"
+        android:text="@string/module_services_dispatch_cars_affirm"
+        android:textColor="@color/module_services_dispatch_cars_text_loc"
+        android:textSize="@dimen/module_services_dispatch_cars_dialog_title_size"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent" />
+
+    <View
+        android:layout_width="1px"
+        android:layout_height="@dimen/module_services_dispatch_cars_dialog_line_margin_bottom"
+        android:layout_marginStart="@dimen/module_services_dispatch_cars_dialog_btn_width"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent" />
+
+    <Button
+        android:id="@+id/module_adas_dispatch_remind_cancel"
+        android:layout_width="@dimen/module_services_dispatch_cars_dialog_btn_width"
+        android:layout_height="@dimen/module_services_dispatch_cars_dialog_line_margin_bottom"
+        android:background="@drawable/module_service_dispatch_cars_cancel_bg"
+        android:gravity="center"
+        android:text="@string/module_services_dispatch_cars_cancel"
+        android:textColor="@color/module_services_dispatch_cars_cancel"
+        android:textSize="@dimen/module_services_dispatch_cars_dialog_title_size"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintRight_toRightOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/modules/mogo-module-service/src/main/res/values-xhdpi-2560x1600/dimens.xml
+++ b/modules/mogo-module-service/src/main/res/values-xhdpi-2560x1600/dimens.xml
@@ -1,22 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="module_services_dispatch_dialog_width">1263px</dimen>
-    <dimen name="module_services_dispatch_dialog_height">1173px</dimen>
-    <dimen name="module_services_dispatch_dialog_corner">32px</dimen>
-    <dimen name="module_services_dispatch_dialog_next_level_title_size">38px</dimen>
-    <dimen name="module_services_dispatch_dialog_title_size">48px</dimen>
-    <dimen name="module_services_dispatch_dialog_task_content_size">42px</dimen>
-    <dimen name="module_services_dispatch_dialog_title_margin_top">55px</dimen>
-    <dimen name="module_services_dispatch_dialog_startloc_margin_top">219px</dimen>
-    <dimen name="module_services_dispatch_dialog_startloc_content_margin_top">288px</dimen>
-    <dimen name="module_services_dispatch_dialog_endloc_margin_top">415px</dimen>
-    <dimen name="module_services_dispatch_dialog_endloc_content_margin_top">484px</dimen>
-    <dimen name="module_services_dispatch_dialog_task_margin_top">621px</dimen>
-    <dimen name="module_services_dispatch_dialog_task_content_margin_top">690px</dimen>
-    <dimen name="module_services_dispatch_dialog_first_column_margin_left">100px</dimen>
-    <dimen name="module_services_dispatch_dialog_last_column_margin_left">852px</dimen>
-    <dimen name="module_services_dispatch_dialog_margin_bottom">80px</dimen>
-    <dimen name="module_services_dispatch_dialog_affirm_width">700px</dimen>
-    <dimen name="module_services_dispatch_dialog_affirm_height">140px</dimen>
-    <dimen name="module_services_dispatch_dialog_affirm_corner">70px</dimen>
+    <!--鄂州机场调度Dialog-->
+    <dimen name="module_services_dispatch_airport_dialog_width">1263px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_height">1173px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_corner">32px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_next_level_title_size">38px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_title_size">48px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_task_content_size">42px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_title_margin_top">55px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_startloc_margin_top">219px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_startloc_content_margin_top">288px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_endloc_margin_top">415px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_endloc_content_margin_top">484px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_task_margin_top">621px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_task_content_margin_top">690px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_first_column_margin_left">100px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_last_column_margin_left">852px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_margin_top">86px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_margin_bottom">80px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_affirm_width">700px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_affirm_height">140px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_affirm_corner">70px</dimen>
+
+    <!--衡阳小巴调度Dialog-->
+    <dimen name="module_services_dispatch_cars_dialog_width">950px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_height">540px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_corner">32px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_title_size">48px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_title_margin_top">55px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_content_size">38px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_content_margin_top">179px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_loc_size">56px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_loc_margin_top">251px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_line_margin_bottom">152px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_btn_width">474.5px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_timer_margin">20px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_timer_size">46px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_timer_txt_size">24px</dimen>
 </resources>
--- a/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml
@@ -58,4 +58,42 @@
    <dimen name="module_services_panel_item_nickname_marginTop">6px</dimen>
    <dimen name="module_services_panel_item_distance_tag_marginBottom">6px</dimen>
    <dimen name="module_services_panel_item_start">40px</dimen>
+
+    <!--鄂州机场调度Dialog-->
+    <dimen name="module_services_dispatch_airport_dialog_width">947px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_height">880px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_corner">24px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_next_level_title_size">28px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_title_size">36px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_task_content_size">30px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_title_margin_top">41px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_startloc_margin_top">164px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_startloc_content_margin_top">216px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_endloc_margin_top">311px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_endloc_content_margin_top">363px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_task_margin_top">466px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_task_content_margin_top">519px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_first_column_margin_left">75px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_last_column_margin_left">639px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_margin_top">70px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_margin_bottom">60px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_affirm_width">525px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_affirm_height">105px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_affirm_corner">52px</dimen>
+
+    <!--衡阳小巴调度Dialog-->
+    <dimen name="module_services_dispatch_cars_dialog_width">712px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_height">405px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_corner">24px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_title_size">36px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_title_margin_top">41px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_content_size">28px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_content_margin_top">134px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_loc_size">42px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_loc_margin_top">188px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_line_margin_bottom">114px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_btn_width">355px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_timer_margin">15px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_timer_size">35px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_timer_txt_size">18px</dimen>
 </resources>
--- a/modules/mogo-module-service/src/main/res/values/colors.xml
+++ b/modules/mogo-module-service/src/main/res/values/colors.xml
@@ -11,4 +11,11 @@
    <color name="module_services_error_textColor">#FFFFFF</color>
    <color name="module_services_dispatch_bg">#E63B4577</color>
    <color name="module_services_dispatch_affirm_bg">#3E7BFE</color>
+
+    <color name="module_services_dispatch_cars_text_loc">#1F9BFE</color>
+    <color name="module_services_dispatch_cars_background">#E63B4577</color>
+    <color name="module_services_dispatch_cars_count_down_txt">#8E9DD4</color>
+    <color name="module_services_dispatch_cars_count_down_bg">#4D000000</color>
+    <color name="module_services_dispatch_cars_line">#66B8BFE8</color>
+    <color name="module_services_dispatch_cars_cancel">#AFB3C7</color>
 </resources>
--- a/modules/mogo-module-service/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-service/src/main/res/values/dimens.xml
@@ -60,23 +60,39 @@
    <dimen name="module_services_panel_item_distance_tag_marginBottom">3px</dimen>
    <dimen name="module_services_panel_item_start">24px</dimen>

-    <dimen name="module_services_dispatch_dialog_width">1263px</dimen>
-    <dimen name="module_services_dispatch_dialog_height">1173px</dimen>
-    <dimen name="module_services_dispatch_dialog_corner">32px</dimen>
-    <dimen name="module_services_dispatch_dialog_next_level_title_size">38px</dimen>
-    <dimen name="module_services_dispatch_dialog_title_size">48px</dimen>
-    <dimen name="module_services_dispatch_dialog_task_content_size">42px</dimen>
-    <dimen name="module_services_dispatch_dialog_title_margin_top">55px</dimen>
-    <dimen name="module_services_dispatch_dialog_startloc_margin_top">219px</dimen>
-    <dimen name="module_services_dispatch_dialog_startloc_content_margin_top">288px</dimen>
-    <dimen name="module_services_dispatch_dialog_endloc_margin_top">415px</dimen>
-    <dimen name="module_services_dispatch_dialog_endloc_content_margin_top">484px</dimen>
-    <dimen name="module_services_dispatch_dialog_task_margin_top">621px</dimen>
-    <dimen name="module_services_dispatch_dialog_task_content_margin_top">690px</dimen>
-    <dimen name="module_services_dispatch_dialog_first_column_margin_left">100px</dimen>
-    <dimen name="module_services_dispatch_dialog_last_column_margin_left">852px</dimen>
-    <dimen name="module_services_dispatch_dialog_margin_bottom">80px</dimen>
-    <dimen name="module_services_dispatch_dialog_affirm_width">700px</dimen>
-    <dimen name="module_services_dispatch_dialog_affirm_height">140px</dimen>
-    <dimen name="module_services_dispatch_dialog_affirm_corner">70px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_width">1263px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_height">1173px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_corner">32px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_next_level_title_size">38px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_title_size">48px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_task_content_size">42px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_title_margin_top">55px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_startloc_margin_top">219px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_startloc_content_margin_top">288px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_endloc_margin_top">415px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_endloc_content_margin_top">484px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_task_margin_top">621px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_task_content_margin_top">690px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_first_column_margin_left">100px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_last_column_margin_left">852px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_margin_top">86px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_margin_bottom">80px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_affirm_width">700px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_affirm_height">140px</dimen>
+    <dimen name="module_services_dispatch_airport_dialog_affirm_corner">70px</dimen>
+
+    <dimen name="module_services_dispatch_cars_dialog_width">950px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_height">540px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_corner">32px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_title_size">48px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_title_margin_top">55px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_content_size">38px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_content_margin_top">179px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_loc_size">56px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_loc_margin_top">251px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_line_margin_bottom">152px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_btn_width">474.5px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_timer_margin">20px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_timer_size">46px</dimen>
+    <dimen name="module_services_dispatch_cars_dialog_timer_txt_size">24px</dimen>
 </resources>
--- a/modules/mogo-module-service/src/main/res/values/strings.xml
+++ b/modules/mogo-module-service/src/main/res/values/strings.xml
@@ -19,4 +19,9 @@
    <string name="module_services_dispatch_dialog_task_info">任务内容:</string>
    <string name="module_services_dispatch_dialog_flight_info">航班信息:</string>
    <string name="module_services_dispatch_dialog_affirm">接受任务</string>
+
+    <string name="module_services_dispatch_cars_remind_title">调度确认</string>
+    <string name="module_services_dispatch_cars_remind_content">车辆将开启自动驾驶，并行驶至：</string>
+    <string name="module_services_dispatch_cars_affirm">确认</string>
+    <string name="module_services_dispatch_cars_cancel">取消</string>
 </resources>