From 6ee3031394cc599f51ef66bb0ee307802f68df86 Mon Sep 17 00:00:00 2001
From: wujifei <wujifei@zhidaoauto.com>
Date: Tue, 22 Jun 2021 15:58:52 +0800
Subject: [PATCH 1/8] =?UTF-8?q?fix#=E9=81=93=E8=B7=AF=E9=A2=84=E8=AD=A6?=
 =?UTF-8?q?=E7=BC=BA=E5=A4=B1=E7=BA=A2=E8=89=B2=E6=B8=90=E5=8F=98=E8=92=99?=
 =?UTF-8?q?=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java
index fe7e4d093f..50c0aa7ef7 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java
@@ -285,7 +285,7 @@ public class V2XRoadEventVH extends V2XBaseViewHolder<V2XEventShowEntity> {
                 tvEvent.setText(EventTypeUtils.getPoiTypeStrVr(mNoveltyInfo.getPoiType()));
                 if (V2XPoiTypeEnum.FOURS_FOG.equals(mNoveltyInfo.getPoiType())) {
                     V2XServiceManager.getDisplayEffectsManager().displayEffects(V2XPoiTypeEnum.FOURS_FOG);
-                    // MarkerServiceHandler.getApis().getV2XListenerManager().warningChangedForListenerWithDirection(ALERT_THE_FRONT_CRASH_WARNING_TOP, MogoReceiver.ACTION_V2X_FRONT_WARNING);
+                    MarkerServiceHandler.getApis().getV2XListenerManager().warningChangedForListenerWithDirection(ALERT_THE_FRONT_CRASH_WARNING_TOP, MogoReceiver.ACTION_V2X_FRONT_WARNING);
                 }
                 tvEventAddress.setText(mNoveltyInfo.getAddr());
                 tvEventDistance.setText("距离 " + (int) mNoveltyInfo.getDistance() + "米");

From c3b37f6536bba52da18f4b541ce2b9a72a941747 Mon Sep 17 00:00:00 2001
From: wujifei <wujifei@zhidaoauto.com>
Date: Tue, 22 Jun 2021 16:33:22 +0800
Subject: [PATCH 2/8] =?UTF-8?q?fix#=E4=BF=AE=E5=A4=8D=E6=B1=82=E5=8A=A9?=
 =?UTF-8?q?=E5=9C=BA=E6=99=AF=E5=8D=A1=E7=89=87=E6=98=BE=E7=A4=BA=E4=B8=8D?=
 =?UTF-8?q?=E6=B8=85=E6=99=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo-module-v2x/src/main/res/drawable/bg_v2x_event_bg.xml   | 2 +-
 .../src/main/res/layout/window_carforhelp_detail.xml            | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_bg.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_bg.xml
index 707a1b5291..b28203b717 100644
--- a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_bg.xml
+++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_bg.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="#000000" />
+    <solid android:color="#88000000" />
     <corners android:radius="@dimen/module_v2x_road_event_bg_radius" />
 </shape>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_carforhelp_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/window_carforhelp_detail.xml
index dc05c04fc2..00031a8426 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/window_carforhelp_detail.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_carforhelp_detail.xml
@@ -8,7 +8,6 @@
         android:layout_width="@dimen/module_v2x_car_for_help_width"
         android:layout_height="@dimen/module_v2x_car_for_help_height"
         android:layout_marginTop="@dimen/dp_8"
-        android:alpha="0.7"
         android:background="@drawable/bg_v2x_event_bg"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

From 97175fa46cc3854b19df7b838b7bf5fa51998ba3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Tue, 22 Jun 2021 17:24:27 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=8D=95?=
 =?UTF-8?q?=E7=8B=AC=E4=B8=8E=E5=B7=A5=E6=8E=A7=E6=9C=BA=E4=B8=8B=E5=8F=91?=
 =?UTF-8?q?=E7=AB=99=E7=82=B9=E7=9A=84=E5=8A=9F=E8=83=BD=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E4=BA=86ADAS=E7=8A=B6=E6=80=81=E5=9B=9E=E8=B0=83?=
 =?UTF-8?q?=E6=9C=AA=E8=A2=AB=E6=B3=A8=E5=86=8C=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/bus/fragment/OchBusFragment.java |  1 +
 .../java/com/mogo/och/BaseOchFragment.java    | 30 ++++++++++++++----
 .../layout/module_mogo_och_base_fragment.xml  | 31 +++++++++++--------
 .../mogo/module/adas/AdasEventManager.java    |  2 +-
 .../service/impl/adas/MogoADASController.java |  7 +++--
 5 files changed, 48 insertions(+), 23 deletions(-)

diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java
index 023888b7d8..5bc22f3044 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java
@@ -200,6 +200,7 @@ public class OchBusFragment extends BaseOchFragment< OchBusFragment, OchBusPrese
      * 设置自动驾驶可用状态
      */
     public void onAutopilotEnableChange( boolean isEnable ) {
+        onAutopilotStatusChanged(isEnable);
         if ( isEnable ) {
             showAutopilotBiz();
         } else {
diff --git a/OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java b/OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java
index eacee5b82f..8c1fab5ea4 100644
--- a/OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java
+++ b/OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java
@@ -17,6 +17,8 @@ import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.view.OnPreventFastClickListener;
 import com.mogo.och.view.SlidePanelView;
 import com.mogo.service.adas.IMogoAdasOCHCallback;
+import com.mogo.service.adas.RemoteControlAutoPilotParameters;
+import com.mogo.utils.logger.Logger;
 
 /**
  * 网约车基础Fragment，主要负责布局通用界面，处理站点面板和通话面板互斥情况
@@ -32,7 +34,7 @@ public abstract class BaseOchFragment<V extends IView, P extends Presenter<V>> e
     protected SlidePanelView slidePanelView;
     private CheckedTextView ctvAutopilotStatus;
     protected TextView tvOperationStatus;
-    public  boolean isOperationStatus;//false-收车，true-出车
+    public boolean isOperationStatus;//false-收车，true-出车
     private FrameLayout flStationPanelContainer;
     private Group groupTestPanel;
 
@@ -109,12 +111,28 @@ public abstract class BaseOchFragment<V extends IView, P extends Presenter<V>> e
                         .mockOchStatus(IMogoAdasOCHCallback.STATUS_AUTOPILOT_RUNNING, "Running")
         );
 
-        // 模拟 自动驾驶网约车回调数据
+        // 模拟 自动驾驶站
         findViewById(R.id.btnAutopilotArrive).setOnClickListener(view ->
                 MogoApisHandler.getInstance().getApis()
                         .getAdasControllerApi().mockOchStatus(-1, "Arrived")
         );
 
+        // 模拟 站点下发工控
+        findViewById(R.id.btnAutopilotControl).setOnClickListener(view ->
+                {
+                    RemoteControlAutoPilotParameters currentAutopilot = new RemoteControlAutoPilotParameters();
+                    currentAutopilot.isSpeakVoice = true;
+                    // 万集东门站
+                    currentAutopilot.startLatLon = new RemoteControlAutoPilotParameters.AutoPilotLonLat(116.74157277,40.19885549);
+                    // 市政府前街18号
+                    currentAutopilot.endLatLon = new RemoteControlAutoPilotParameters.AutoPilotLonLat(116.729134342,40.1953113732);
+                    // 订单运营类型 （9出租车，10小巴）
+                    currentAutopilot.vehicleType = 10;
+                    Logger.d(TAG, "模拟 订单站点下发：" + currentAutopilot);
+                    MogoApisHandler.getInstance().getApis().getAdasControllerApi().aiCloudToAdasData(currentAutopilot);
+                }
+        );
+
         tvOperationStatus.setOnClickListener(view -> {
             onChangeOperationStatus();
         });
@@ -185,14 +203,14 @@ public abstract class BaseOchFragment<V extends IView, P extends Presenter<V>> e
         });
     }
 
-    public void hidPanel(){
-        getActivity().runOnUiThread(()->{
+    public void hidPanel() {
+        getActivity().runOnUiThread(() -> {
             flStationPanelContainer.setVisibility(View.GONE);
         });
     }
 
-    public void showPanel(){
-        getActivity().runOnUiThread(()->{
+    public void showPanel() {
+        getActivity().runOnUiThread(() -> {
             flStationPanelContainer.setVisibility(View.VISIBLE);
         });
     }
diff --git a/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml b/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml
index c369dc9da8..3cc3070de3 100644
--- a/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml
+++ b/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml
@@ -76,9 +76,8 @@
         android:id="@+id/btnAutopilotDisable"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="#f00"
-        android:text="Disable"
-        android:textSize="30sp"
+        android:text="模拟 不可自动驾驶"
+        android:textSize="20sp"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -86,9 +85,8 @@
         android:id="@+id/btnAutopilotEnable"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="#0f0"
-        android:text="Enable"
-        android:textSize="30sp"
+        android:text="模拟 中途人工干预"
+        android:textSize="20sp"
         app:layout_constraintRight_toRightOf="@id/btnAutopilotDisable"
         app:layout_constraintTop_toBottomOf="@id/btnAutopilotDisable" />
 
@@ -96,9 +94,8 @@
         android:id="@+id/btnAutopilotRunning"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="#00f"
-        android:text="Running"
-        android:textSize="30sp"
+        android:text="模拟 自动驾驶途中"
+        android:textSize="20sp"
         app:layout_constraintRight_toRightOf="@id/btnAutopilotDisable"
         app:layout_constraintTop_toBottomOf="@id/btnAutopilotEnable" />
 
@@ -106,18 +103,26 @@
         android:id="@+id/btnAutopilotArrive"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="#f00"
-        android:text="Arrived"
-        android:textSize="30sp"
+        android:text="模拟 自动驾驶到站"
+        android:textSize="20sp"
         app:layout_constraintRight_toRightOf="@id/btnAutopilotDisable"
         app:layout_constraintTop_toBottomOf="@id/btnAutopilotRunning" />
 
+    <Button
+        android:id="@+id/btnAutopilotControl"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="模拟 站点下发工控"
+        android:textSize="20sp"
+        app:layout_constraintRight_toRightOf="@id/btnAutopilotDisable"
+        app:layout_constraintTop_toBottomOf="@id/btnAutopilotArrive" />
+
     <androidx.constraintlayout.widget.Group
         android:id="@+id/groupTestPanel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:visibility="gone"
-        app:constraint_referenced_ids="btnAutopilotArrive,btnAutopilotDisable,btnAutopilotEnable,btnAutopilotRunning"
+        app:constraint_referenced_ids="btnAutopilotArrive,btnAutopilotDisable,btnAutopilotEnable,btnAutopilotRunning,btnAutopilotControl"
         tools:visibility="visible" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java
index d4b8b69e37..9c99db2ba5 100644
--- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java
+++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java
@@ -173,7 +173,7 @@ public class AdasEventManager implements OnAdasListener, OnAdasMsgConnectStatusL
 
     @Override
     public void autopilotStatus(AutopilotStatus autopilotStatus) {
-        Logger.d(TAG,"autopilotStatus " + autopilotStatus);
+        Logger.d(TAG,"autopilotStatus " + GsonUtil.jsonFromObject(autopilotStatus));
         AutopilotStatus.ValuesBean autopilotStatusValues = autopilotStatus.getValues();
         AutopilotStatus.ValuesBean mAutopilotStatus;
 
diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
index 6c1bcce43e..b4ae41db7c 100644
--- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
+++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
@@ -326,9 +326,10 @@ public class MogoADASController implements IMogoADASController {
                 return;
             }
         }
-        if (SingletonsHolder.get(IMogoStatusManager.class).isVrMode()) {
-            return;
-        }
+        // TODO 以前这里是考虑ADAS独立应用，现在集成ADAS-SDK到程序内了，这个判断不需要了
+//        if (SingletonsHolder.get(IMogoStatusManager.class).isVrMode()) {
+//            return;
+//        }
         Logger.d(TAG, Log.getStackTraceString(new Throwable()));
         init(AbsMogoApplication.getApp());
         adasProvider.addAdasStatusListener(new AdasStatusListener() {

From 23f5587a52b02eb6b848ce0cd584b6be26ef41a9 Mon Sep 17 00:00:00 2001
From: wujifei <wujifei@zhidaoauto.com>
Date: Tue, 22 Jun 2021 17:36:40 +0800
Subject: [PATCH 4/8] =?UTF-8?q?fix#=E5=8D=87=E7=BA=A7IM=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 397e869bd5..00b1222c01 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -148,7 +148,7 @@ MOGO_OCH_TAXI_VERSION=1.0.0
 
 ######## 外部依赖引用
 # 车聊聊
-CARCHATTING_VERSION=2.2.327
+CARCHATTING_VERSION=2.2.330
 # 车聊聊接口
 CARCHATTINGPROVIDER_VERSION=1.1.11
 # websocket

From b2f69fbb1fc22f10c6d4f053bc81ece24425f5d1 Mon Sep 17 00:00:00 2001
From: wujifei <wujifei@zhidaoauto.com>
Date: Tue, 22 Jun 2021 17:52:30 +0800
Subject: [PATCH 5/8] =?UTF-8?q?fix#=E4=BB=96=E8=BD=A6=E6=B1=82=E5=8A=A9UI?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/layout/item_v2x_fault_help_vr.xml               | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help_vr.xml
index 1e4c57715d..06c4b23743 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help_vr.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help_vr.xml
@@ -5,7 +5,6 @@
     android:layout_width="@dimen/module_v2x_fault_help_width"
     android:layout_height="@dimen/module_v2x_fault_help_height"
     android:layout_marginTop="@dimen/dp_8"
-    android:alpha="0.7"
     android:background="@drawable/bg_v2x_event_bg"
     tools:layout_height="wrap_content">
 

From b704df61097e3f4e3381c0af548421bcd661ce93 Mon Sep 17 00:00:00 2001
From: lianglihui <lianglihui@zhidaoauto.com>
Date: Tue, 22 Jun 2021 18:45:29 +0800
Subject: [PATCH 6/8] =?UTF-8?q?UI=E8=B5=B0=E6=9F=A5=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=20=E6=BB=91=E5=8A=A8=E6=9D=A1=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/mogo/och/view/SlidePanelView.java    | 7 +++++--
 OCH/mogo-och/src/main/res/values/attrs.xml                 | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/OCH/mogo-och/src/main/java/com/mogo/och/view/SlidePanelView.java b/OCH/mogo-och/src/main/java/com/mogo/och/view/SlidePanelView.java
index fd2c4ddd65..8f2e12b9a6 100644
--- a/OCH/mogo-och/src/main/java/com/mogo/och/view/SlidePanelView.java
+++ b/OCH/mogo-och/src/main/java/com/mogo/och/view/SlidePanelView.java
@@ -50,6 +50,7 @@ public class SlidePanelView extends View {
         NORMAL_TEXT_MARGIN_RIGHT = (int) mTypedArray.getDimension(R.styleable.SlidePanelView_NORMAL_TEXT_MARGIN_RIGHT, NORMAL_TEXT_MARGIN_RIGHT);
         SHORT_TEXT_MARGIN_LEFT = (int) mTypedArray.getDimension(R.styleable.SlidePanelView_SHORT_TEXT_MARGIN_LEFT, SHORT_TEXT_MARGIN_LEFT);
         SHORT_TEXT_MARGIN_RIGHT = (int) mTypedArray.getDimension(R.styleable.SlidePanelView_SHORT_TEXT_MARGIN_RIGHT, SHORT_TEXT_MARGIN_RIGHT);
+        SLIDEPANELVIEW_VIEW_HIGH = (int) mTypedArray.getDimension(R.styleable.SlidePanelView_SLIDEPANELVIEW_VIEW_HIGH, SLIDEPANELVIEW_VIEW_HIGH);
         init();
     }
 
@@ -64,6 +65,7 @@ public class SlidePanelView extends View {
     private static int NORMAL_TEXT_MARGIN_RIGHT = 60;
     private static int SHORT_TEXT_MARGIN_LEFT = 60;
     private static int SHORT_TEXT_MARGIN_RIGHT = 70;
+    private static int SLIDEPANELVIEW_VIEW_HIGH = 160;
 
     private int textMarginLeft = NORMAL_TEXT_MARGIN_LEFT;
     private int textMarginRight = NORMAL_TEXT_MARGIN_RIGHT;
@@ -148,7 +150,8 @@ public class SlidePanelView extends View {
             // 高度根据图片大小和上下间隔确定
             textPaint.getTextBounds(blockText, 0, blockText.length(), textRect);
             widthSize = BLOCK_START_X * 2 + bmBlock.getWidth() + textMarginLeft + textMarginRight + textRect.width();
-            heightSize = BLOCK_START_Y * 2 + bmBlock.getHeight();
+//            heightSize = BLOCK_START_Y * 2 + bmBlock.getHeight();
+            heightSize = SLIDEPANELVIEW_VIEW_HIGH;
             widthMeasureSpec = MeasureSpec.makeMeasureSpec(widthSize, widthMode);
             heightMeasureSpec = MeasureSpec.makeMeasureSpec(heightSize, heightMode);
         }
@@ -245,7 +248,7 @@ public class SlidePanelView extends View {
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
         // 画背景
-        canvas.drawRoundRect(bgRectF, (float) getHeight() / 2, (float) getHeight() / 2, bgPaint);
+        canvas.drawRoundRect(bgRectF, (float) getHeight() / 2, SLIDEPANELVIEW_VIEW_HIGH / 2, bgPaint);
         // 画文字
         gradientMatrix.setTranslate(matrixTranslate, 0);
         textGradient.setLocalMatrix(gradientMatrix);
diff --git a/OCH/mogo-och/src/main/res/values/attrs.xml b/OCH/mogo-och/src/main/res/values/attrs.xml
index 33fc037d9c..24c52520f0 100644
--- a/OCH/mogo-och/src/main/res/values/attrs.xml
+++ b/OCH/mogo-och/src/main/res/values/attrs.xml
@@ -6,6 +6,7 @@
         <attr name="NORMAL_TEXT_MARGIN_RIGHT" format="dimension" />
         <attr name="SHORT_TEXT_MARGIN_LEFT" format="dimension" />
         <attr name="SHORT_TEXT_MARGIN_RIGHT" format="dimension" />
+        <attr name="SLIDEPANELVIEW_VIEW_HIGH" format="dimension" />
         <attr name="BLOCK_START_X" format="dimension" />
         <attr name="BLOCK_START_Y" format="dimension" />
     </declare-styleable>

From ccb152cea8d36342a17e5f383c9e15cc28b84d34 Mon Sep 17 00:00:00 2001
From: lianglihui <lianglihui@zhidaoauto.com>
Date: Wed, 23 Jun 2021 10:26:38 +0800
Subject: [PATCH 7/8] fix npe

---
 .../com/mogo/och/taxi/MogoOCHTaxiModel.java   | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java
index c044046c82..8c0d302ec0 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java
@@ -29,6 +29,7 @@ import com.mogo.utils.network.utils.GsonUtil;
 import com.mogo.utils.storage.SharedPrefsMgr;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
@@ -314,6 +315,9 @@ class MogoOCHTaxiModel {
      * @param data
      */
     private void convertCurrentOrder( OCHTaxiOrderResponse2 data ) {
+        if (data.data == null){
+            return;
+        }
         if ( mCurrentOCHOrder == null ) {
             mCurrentOCHOrder = new OCHTaxiOrderResponse();
         }
@@ -325,18 +329,23 @@ class MogoOCHTaxiModel {
         mCurrentOCHOrder.orderType = data.data.orderType;
         mCurrentOCHOrder.drivingRoutes = new ArrayList<>();
         OCHTaxiOrderResponse.OCHTaxiStation startStation = new OCHTaxiOrderResponse.OCHTaxiStation();
-        startStation.lon = data.data.startStationCoordinate.get( 0 );
-        startStation.lat = data.data.startStationCoordinate.get( 1 );
-        startStation.siteId = data.data.startStationId;
-        startStation.siteName = data.data.startStation;
-        mCurrentOCHOrder.drivingRoutes.add( startStation );
+        List< Double > startStationCoordinate = data.data.startStationCoordinate;
+        if (startStationCoordinate != null && startStationCoordinate.size()>1){
+            startStation.lon = startStationCoordinate.get( 0 );
+            startStation.lat = startStationCoordinate.get( 1 );
+            startStation.siteId = data.data.startStationId;
+            startStation.siteName = data.data.startStation;
+            mCurrentOCHOrder.drivingRoutes.add( startStation );
+        }
         OCHTaxiOrderResponse.OCHTaxiStation endStation = new OCHTaxiOrderResponse.OCHTaxiStation();
-        endStation.lon = data.data.endStationCoordinate.get( 0 );
-        endStation.lat = data.data.endStationCoordinate.get( 1 );
-        endStation.siteId = data.data.endStationId;
-        endStation.siteName = data.data.endStation;
-        mCurrentOCHOrder.drivingRoutes.add( endStation );
-
+        List< Double > endStationCoordinate = data.data.endStationCoordinate;
+        if (endStationCoordinate != null && endStationCoordinate.size()>1){
+            endStation.lon = endStationCoordinate.get( 0 );
+            endStation.lat = endStationCoordinate.get( 1 );
+            endStation.siteId = data.data.endStationId;
+            endStation.siteName = data.data.endStation;
+            mCurrentOCHOrder.drivingRoutes.add( endStation );
+        }
         cacheOrderInfo2Native( mCurrentOCHOrder );
     }
 

From 9c04a6ebc823ca109865c06168b4345d49307adb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Wed, 23 Jun 2021 14:52:25 +0800
Subject: [PATCH 8/8] =?UTF-8?q?1.0.0-vr-8.5.52=20=E4=BF=AE=E5=A5=BD?=
 =?UTF-8?q?=E6=91=84=E5=83=8F=E5=A4=B4=E6=A8=A1=E5=9E=8B=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E8=87=AA=E8=BD=A6=E5=81=B6=E5=B0=94=E6=B6=88=E5=A4=B1?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 00b1222c01..626d6cf917 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -187,4 +187,4 @@ applicationId=com.mogo.launcer
 applicationName=IntelligentPilot
 versionCode=80007
 versionName=8.0.7
-MAP_SDK_VERSION=1.0.0-vr-8.5.51
\ No newline at end of file
+MAP_SDK_VERSION=1.0.0-vr-8.5.52
\ No newline at end of file