From 8a7bc289544ad834a1d871d8510d1056bfff1d77 Mon Sep 17 00:00:00 2001
From: tongchenfei <tonghenfei@zhidaoauto.com>
Date: Tue, 2 Feb 2021 15:57:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B0=8F=E5=B7=B4ui=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/bus/fragment/OchBusFragment.java | 90 +++++++++++++++++--
 .../src/main/res/layout/fragment_och_bus.xml  |  3 +-
 .../src/main/res/values/dimens.xml            |  9 +-
 3 files changed, 90 insertions(+), 12 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 11c5d86aa6..2fe9555b15 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
@@ -19,6 +19,8 @@ import com.mogo.och.view.SlidePanelView;
 import com.mogo.service.adas.IMogoAdasOCHCallback;
 import com.mogo.utils.logger.Logger;
 
+import java.lang.reflect.Array;
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -51,16 +53,87 @@ public class OchBusFragment extends BaseOchFragment<OchBusFragment, OchBusPresen
 
         tvStationNotice.setOnClickListener(view->{
             // todo debug code
+            List<OchBusStation> stationList = new ArrayList<>();
+            OchBusStation station;
             switch (stationSizeLevel) {
                 case 2:
-
+                    stationSizeLevel++;
+                    station = new OchBusStation();
+                    station.setSiteName("第一站");
+                    station.setIsCurrentSite(OchBusConst.STATION_STATUS_STOPED);
+                    stationList.add(station);
+                    station = new OchBusStation();
+                    station.setSiteName("第二站");
+                    station.setIsCurrentSite(OchBusConst.STATION_STATUS_IDLE);
+                    stationList.add(station);
                     break;
                 case 3:
+                    stationSizeLevel++;
+                    station = new OchBusStation();
+                    station.setSiteName("第一站");
+                    station.setIsCurrentSite(OchBusConst.STATION_STATUS_STOPED);
+                    stationList.add(station);
+                    station = new OchBusStation();
+                    station.setSiteName("第二站");
+                    station.setIsCurrentSite(OchBusConst.STATION_STATUS_IDLE);
+                    stationList.add(station);
+                    station = new OchBusStation();
+                    station.setSiteName("第三站");
+                    station.setIsCurrentSite(OchBusConst.STATION_STATUS_IDLE);
+                    stationList.add(station);
+                    break;
+                case 4:
+                    stationSizeLevel++;
+                    station = new OchBusStation();
+                    station.setSiteName("第一站");
+                    station.setIsCurrentSite(OchBusConst.STATION_STATUS_STOPED);
+                    stationList.add(station);
+                    station = new OchBusStation();
+                    station.setSiteName("第二站");
+                    station.setIsCurrentSite(OchBusConst.STATION_STATUS_IDLE);
+                    stationList.add(station);
+                    station = new OchBusStation();
+                    station.setSiteName("第三站");
+                    station.setIsCurrentSite(OchBusConst.STATION_STATUS_IDLE);
+                    stationList.add(station);
+                    station = new OchBusStation();
+                    station.setSiteName("第四站");
+                    station.setIsCurrentSite(OchBusConst.STATION_STATUS_IDLE);
+                    stationList.add(station);
                     break;
                 default:
+                    stationSizeLevel = 2;
+                    station = new OchBusStation();
+                    station.setSiteName("第一站");
+                    station.setIsCurrentSite(OchBusConst.STATION_STATUS_STOPED);
+                    stationList.add(station);
+                    station = new OchBusStation();
+                    station.setSiteName("第二站");
+                    station.setIsCurrentSite(OchBusConst.STATION_STATUS_IDLE);
+                    stationList.add(station);
+                    station = new OchBusStation();
+                    station.setSiteName("第三站");
+                    station.setIsCurrentSite(OchBusConst.STATION_STATUS_IDLE);
+                    stationList.add(station);
+                    station = new OchBusStation();
+                    station.setSiteName("第四站");
+                    station.setIsCurrentSite(OchBusConst.STATION_STATUS_IDLE);
+                    stationList.add(station);
+                    station = new OchBusStation();
+                    station.setSiteName("第五站");
+                    station.setIsCurrentSite(OchBusConst.STATION_STATUS_IDLE);
+                    stationList.add(station);
+                    station = new OchBusStation();
+                    station.setSiteName("第五站");
+                    station.setIsCurrentSite(OchBusConst.STATION_STATUS_IDLE);
+                    stationList.add(station);
+                    station = new OchBusStation();
+                    station.setSiteName("第五站");
+                    station.setIsCurrentSite(OchBusConst.STATION_STATUS_IDLE);
+                    stationList.add(station);
                     break;
             }
-
+            refreshBusStations(stationList);
         });
 
         Logger.d(TAG, "initView: " + MogoApisHandler.getInstance().getApis().getAdasControllerApi().getAutopilotStatus());
@@ -121,21 +194,20 @@ public class OchBusFragment extends BaseOchFragment<OchBusFragment, OchBusPresen
                 // 获取小巴数据失败
                 return;
             }
-            // todo 根据车站数量，调整面板高度，分为2，3，>3
-            View panelView = getPanelView();
-            ViewGroup.LayoutParams params = panelView.getLayoutParams();
+            // 根据车站数量，调整面板高度，分为2，3，>3
+            ViewGroup.LayoutParams params = rvStationList.getLayoutParams();
             switch (stationList.size()) {
                 case 2:
-                    params.height = getResources().getDimensionPixelSize(R.dimen.module_mogo_och_bus_two_station_panel_height);
+                    params.height = getResources().getDimensionPixelSize(R.dimen.module_mogo_och_bus_two_station_list_height);
                     break;
                 case 3:
-                    params.height = getResources().getDimensionPixelSize(R.dimen.module_mogo_och_bus_three_station_panel_height);
+                    params.height = getResources().getDimensionPixelSize(R.dimen.module_mogo_och_bus_three_station_list_height);
                     break;
                 default:
-                    params.height = getResources().getDimensionPixelSize(R.dimen.module_mogo_och_bus_station_panel_height);
+                    params.height = getResources().getDimensionPixelSize(R.dimen.module_mogo_och_bus_station_list_height);
                     break;
             }
-            panelView.setLayoutParams(params);
+            rvStationList.setLayoutParams(params);
             // 渲染小巴路线数据
             adapter.refreshStationList(stationList);
             int currPos = -1;
diff --git a/OCH/mogo-och-bus/src/main/res/layout/fragment_och_bus.xml b/OCH/mogo-och-bus/src/main/res/layout/fragment_och_bus.xml
index afd0fcdab0..aa0e377783 100644
--- a/OCH/mogo-och-bus/src/main/res/layout/fragment_och_bus.xml
+++ b/OCH/mogo-och-bus/src/main/res/layout/fragment_och_bus.xml
@@ -2,8 +2,9 @@
 <com.mogo.och.bus.view.NoTouchConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="@dimen/module_mogo_och_bus_station_panel_width"
-    android:layout_height="@dimen/module_mogo_och_bus_station_panel_height"
+    android:layout_height="wrap_content"
     android:clickable="true"
+    android:maxHeight="@dimen/module_mogo_och_bus_station_panel_height"
     android:background="@drawable/module_och_bus_panel_bkg">
 
 
diff --git a/OCH/mogo-och-bus/src/main/res/values/dimens.xml b/OCH/mogo-och-bus/src/main/res/values/dimens.xml
index ae91017c6c..2e0c11b709 100644
--- a/OCH/mogo-och-bus/src/main/res/values/dimens.xml
+++ b/OCH/mogo-och-bus/src/main/res/values/dimens.xml
@@ -3,8 +3,13 @@
 <!--  本套资源适配分体机xhdpi  -->
     <dimen name="module_mogo_och_bus_station_panel_width">464px</dimen>
     <dimen name="module_mogo_och_bus_station_panel_height">348px</dimen>
-    <dimen name="module_mogo_och_bus_two_station_panel_height">148px</dimen>
-    <dimen name="module_mogo_och_bus_three_station_panel_height">248px</dimen>
+    <dimen name="module_mogo_och_bus_two_station_panel_height">211px</dimen>
+    <dimen name="module_mogo_och_bus_three_station_panel_height">276px</dimen>
+
+
+    <dimen name="module_mogo_och_bus_station_list_height">220px</dimen>
+    <dimen name="module_mogo_och_bus_two_station_list_height">98px</dimen>
+    <dimen name="module_mogo_och_bus_three_station_list_height">159px</dimen>
 
     <dimen name="module_mogo_och_bus_current_station_name_text_size">32px</dimen>
     <dimen name="module_mogo_och_bus_current_station_notice_text_size">20px</dimen>

From 94a81d3d350d040a2eb1d052d05f20fdf798726e Mon Sep 17 00:00:00 2001
From: tongchenfei <tonghenfei@zhidaoauto.com>
Date: Tue, 2 Feb 2021 20:35:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B0=8F=E5=B7=B4?=
 =?UTF-8?q?=E8=BF=9B=E5=85=A5vr=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml                                  |  1 +
 .../java/com/mogo/och/bus/OchBusProvider.java     | 15 +++++++++++++++
 .../com/mogo/och/bus/fragment/OchBusFragment.java |  4 ++--
 .../res/drawable/module_och_bus_panel_bkg.xml     | 10 +++++++---
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 771c1f74d7..740794bd48 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -89,6 +89,7 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
+        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/OchBusProvider.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/OchBusProvider.java
index fcd71674c3..ff5094b200 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/OchBusProvider.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/OchBusProvider.java
@@ -13,6 +13,7 @@ import com.mogo.och.bus.fragment.OchBusFragment;
 import com.mogo.service.connection.IMogoOnMessageListener;
 import com.mogo.service.statusmanager.IMogoStatusChangedListener;
 import com.mogo.service.statusmanager.StatusDescriptor;
+import com.mogo.utils.UiThreadHandler;
 import com.mogo.utils.logger.Logger;
 
 import java.util.List;
@@ -33,6 +34,20 @@ public class OchBusProvider implements IMogoOCH {
     public void init(FragmentActivity activity, int containerId) {
         this.containerId = containerId;
         this.activity = activity;
+
+        UiThreadHandler.postDelayed(this::stepIntoVrMode, 5_000L );
+    }
+
+    /**
+     * 进入鹰眼模式，设置手势缩放地图失效
+     */
+    private void stepIntoVrMode(){
+        Logger.d( TAG, "进入vr模式" );
+        MogoApisHandler.getInstance()
+                .getApis()
+                .getMapServiceApi()
+                .getMapUIController()
+                .openVrMode(false);
     }
 
     @Override
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 2fe9555b15..ac7069c71f 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
@@ -223,14 +223,14 @@ public class OchBusFragment extends BaseOchFragment<OchBusFragment, OchBusPresen
                     tvStationNotice.setText("当前车站");
                     tvStationName.setText(station.getSiteName());
                     if (i == stationList.size() - 1) {
-                        showNotice("行程结束，请携带好随身物品\n注意侧后方来车\n感谢体验蘑菇智行自动驾驶车！");
+                        showNotice("行程结束，请携带好随身物品，注意侧后方来车，感谢体验蘑菇智行自动驾驶车！");
                         tvStationNotice.setText("终点");
                         showSlidePanle("单程结束");
                     } else if (i == 0) {
                         hideNotice();
                         showSlidePanle("准备出发");
                     } else {
-                        showNotice("行程结束，请携带好随身物品\n注意侧后方来车\n感谢体验蘑菇智行自动驾驶车！");
+                        showNotice("行程结束，请携带好随身物品，注意侧后方来车，感谢体验蘑菇智行自动驾驶车！");
                         showSlidePanle("乘客已上车，准备出发");
                     }
                     break;
diff --git a/OCH/mogo-och-bus/src/main/res/drawable/module_och_bus_panel_bkg.xml b/OCH/mogo-och-bus/src/main/res/drawable/module_och_bus_panel_bkg.xml
index d6aa33cbcd..e189a5b0e2 100644
--- a/OCH/mogo-och-bus/src/main/res/drawable/module_och_bus_panel_bkg.xml
+++ b/OCH/mogo-och-bus/src/main/res/drawable/module_och_bus_panel_bkg.xml
@@ -3,7 +3,10 @@
     <item>
         <shape>
             <corners android:radius="17px" />
-            <solid android:color="#AD3D4E81" />
+            <gradient
+                android:angle="270"
+                android:endColor="#152147"
+                android:startColor="#354E8A" />
         </shape>
     </item>
     <item
@@ -14,8 +17,9 @@
         <shape>
             <corners android:radius="17px" />
             <gradient
-                android:endColor="#202D4E"
-                android:startColor="#2C3862" />
+                android:angle="270"
+                android:endColor="#141C35"
+                android:startColor="#344687" />
         </shape>
     </item>
 </layer-list>
\ No newline at end of file