From f2e563dc06025141945fc10ac4ea338b472aeeba Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Wed, 7 Apr 2021 10:06:27 +0800
Subject: [PATCH] opt

---
 .idea/gradle.xml                              |  1 -
 .idea/misc.xml                                |  2 +-
 .../och/bus/presenter/OchBusOrderModel.java   |  1 +
 .../och/bus/presenter/OchBusPresenter.java    | 20 +++++++++++++++----
 .../common/drawer/V2XWarnDataDrawer.java      |  2 --
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 4ff10f68a5..83405b8de1 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -91,7 +91,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 733acb1920..97b9126cee 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,7 +8,7 @@
     <asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
     <groovy codeStyle="LEGACY" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>
\ No newline at end of file
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java
index b5826b2631..80d9a4d381 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java
@@ -75,6 +75,7 @@ class OchBusOrderModel {
 
     /**
      * 站点信息变更推送
+     * 新订单、取消订单、到达站点等都会导致停靠站点变更，故都会收到此推送
      */
     private IMogoOnMessageListener< OchBusStationsChangedMsg > mOnBusStationsChangedMsg = new IMogoOnMessageListener< OchBusStationsChangedMsg >() {
         @Override
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java
index 191bd9c882..1d97dd3a93 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java
@@ -71,7 +71,7 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog
     private IOchBusApiService mService;
 
     /**
-     * 运营状态
+     * 运营状态、后端更具运营状态来判断车辆是否派单
      */
     private boolean mIsWorking = false;
 
@@ -216,10 +216,16 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog
         return nextStationIndex;
     }
 
+    /**
+     * 延时查询站点信心
+     */
     private void queryBusStationDelay() {
         handler.sendEmptyMessageDelayed( MSG_QUERY_BUS_STATION, QUERY_BUS_STATION_DELAY );
     }
 
+    /**
+     * 在踩刹车、控制方向盘等操作后，会停止自动加水，重启自动驾驶的话相当于重新设置自动驾驶目的地
+     */
     public void restartAutopilot() {
         Logger.d( TAG, "重启自动驾驶===" + isGoingToNextStation );
         if ( isGoingToNextStation ) {
@@ -228,7 +234,7 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog
     }
 
     /**
-     * 测试
+     * 测试、重置站点状态
      */
     public void debugResetStationStatus() {
         OchBusResetRequest request = new OchBusResetRequest( Utils.getSn(), 1 );
@@ -403,14 +409,20 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog
                 } );
     }
 
+    /**
+     * 播报下车乘客信息
+     *
+     * @param o
+     */
     private void playLeavePassengersMsg( QueryLeaveAwayPassengersResponse o ) {
         if ( currentStationIndex > stationList.size() - 1 ) {
             return;
         }
         String station = stationList.get( currentStationIndex ).getSiteName();
         StringBuilder builder = new StringBuilder( "已到达" );
-        if ( station.endsWith( "站" ) ) {
-            builder.append( station );
+        builder.append( station );
+        if ( !station.endsWith( "站" ) ) {
+            builder.append( "站" );
         }
         if ( o == null || o.result == null || o.result.info == null || o.result.info.isEmpty() ) {
             //
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java
index b9f839be11..43edc1fd20 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java
@@ -59,8 +59,6 @@ public class V2XWarnDataDrawer extends BaseDrawer implements IMogoStatusChangedL
     public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
         Logger.d(TAG, "%s - %s", descriptor, isTrue);
         mChangeCarModeStatus = true;
-
-        AdasRecognizedResultDrawer.getInstance().notifyVrModeChanged();
     }
 
     public boolean isVrMode() {