From 3e2866f508b768aefd94e31fab3cf69cc91a5b82 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Wed, 15 Feb 2023 15:13:58 +0800
Subject: [PATCH] [M2] M2 UI

---
 .../bus/passenger/model/PM2DrivingModel.kt    |  12 ++++
 .../bus/passenger/model/PM2ServiceManager.kt  |   3 +-
 .../passenger/ui/PM2DrivingInfoFragment.kt    |   2 +-
 .../passenger/ui/widget/M2StatusBarView.kt    |   2 +-
 .../passenger/ui/widget/M2TurnLightView.kt    |   5 +-
 .../res/drawable-nodpi/m2_youzhuan_open.png   | Bin 0 -> 2730 bytes
 .../drawable-nodpi/m2_youzhuan_un_open.png    | Bin 0 -> 590 bytes
 .../res/drawable-nodpi/m2_zuozhuan_open.png   | Bin 0 -> 1857 bytes
 .../drawable-nodpi/m2_zuozhuan_un_open.png    | Bin 0 -> 612 bytes
 .../brakelight_background_daytime.xml         |   5 ++
 .../res/layout/p_m2_driving_info_fragment.xml |   7 ++-
 .../src/m2/res/layout/p_m2_hpmap_fragment.xml |   4 +-
 .../layout/view_turn_light_status_daytime.xml |  55 ++++++++++++++++++
 .../src/m2/res/values/strings.xml             |   4 +-
 .../och/common/module/utils/DateTimeUtil.java |   3 +-
 15 files changed, 89 insertions(+), 13 deletions(-)
 create mode 100644 OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_youzhuan_open.png
 create mode 100644 OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_youzhuan_un_open.png
 create mode 100644 OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_zuozhuan_open.png
 create mode 100644 OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_zuozhuan_un_open.png
 create mode 100644 OCH/mogo-och-bus-passenger/src/m2/res/drawable/brakelight_background_daytime.xml
 create mode 100644 OCH/mogo-och-bus-passenger/src/m2/res/layout/view_turn_light_status_daytime.xml

diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt
index 7f354e74be..0eb4aa53e9 100644
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt
@@ -79,6 +79,9 @@ class PM2DrivingModel private constructor() {
     fun init(context : Context){
         mContext = context
         initListener()
+        // TODO: 2022/3/31
+        queryDriverOperationStatus()
+        startOrStopOrderLoop(true)
     }
 
     private fun initListener() {
@@ -417,4 +420,13 @@ class PM2DrivingModel private constructor() {
             PM2ModelLoopManager.stopOrStopRouteAndWipe()
         }
     }
+
+    private fun startOrStopOrderLoop(start: Boolean) {
+        d(SceneConstant.M_BUS_P + TAG, "startOrStopOrderLoop() $start")
+        if (start) {
+            PM2ModelLoopManager.startQueryDriverLineLoop()
+        } else {
+            PM2ModelLoopManager.stopQueryDriverLineLoop()
+        }
+    }
 }
\ No newline at end of file
diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2ServiceManager.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2ServiceManager.kt
index 4cabbcd805..41cbdfd51f 100644
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2ServiceManager.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2ServiceManager.kt
@@ -26,7 +26,8 @@ object PM2ServiceManager {
      * @return
      */
     private val driverAppSn: String
-        get() = getServerToken()
+//        get() = getServerToken()
+        get() = "X2020220425Q466X1F"
 
     /**
      * 查询绑定行驶的小巴车路线
diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt
index afe9ab272b..3e127dd7c7 100644
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt
@@ -74,7 +74,7 @@ class PM2DrivingInfoFragment :
             DateTimeUtils.getCurrentDateTime(),HH_mm)
 
         val date = formatCalendarToString(
-            DateTimeUtils.getCurrentDateTime(), yyyy_MM_dd)
+            DateTimeUtils.getCurrentDateTime(), yy_MM_dd)
         val weekDay = DateTimeUtils.getWeekDayFromCalendar1(DateTimeUtils.getCurrentDateTime())
         current_weekday_tv.text = "$date  $weekDay"
 
diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt
index d1a8e6a1ff..186d6bd6a6 100644
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt
@@ -35,7 +35,7 @@ class M2StatusBarView @JvmOverloads constructor(
 
     init {
         LayoutInflater.from(context).inflate(R.layout.p_m2_view_status_bar, this, true)
-        setBackgroundColor(Color.TRANSPARENT)
+        setBackgroundColor(Color.parseColor("#80FFFFFF"))
     }
 
     override fun onAttachedToWindow() {
diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2TurnLightView.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2TurnLightView.kt
index ffaa7b1d14..17d5780835 100644
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2TurnLightView.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2TurnLightView.kt
@@ -2,7 +2,6 @@ package com.mogo.och.bus.passenger.ui.widget
 
 import android.content.Context
 import android.util.AttributeSet
-import android.view.LayoutInflater
 import com.mogo.eagle.core.function.hmi.ui.vehicle.TurnLightViewStatus
 
 /**
@@ -11,5 +10,7 @@ import com.mogo.eagle.core.function.hmi.ui.vehicle.TurnLightViewStatus
  */
 class M2TurnLightView @JvmOverloads constructor(
     context: Context, attrs: AttributeSet? = null
-) {
+) : TurnLightViewStatus(context, attrs) {
+
+
 }
\ No newline at end of file
diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_youzhuan_open.png b/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_youzhuan_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..bbd2c12d90939529ba285fd95957f5134d73fa34
GIT binary patch
literal 2730
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

literal 0
HcmV?d00001

diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_youzhuan_un_open.png b/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_youzhuan_un_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c0dcaabe1a576c014071eca670390ab9af15afb
GIT binary patch
literal 590
zcmeAS@N?(olHy`uVBq!ia0vp^iXhCv1|-9u9Lfh$jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(<ExPTeK1}PMCXaFhO;pyTS62bX4
z?4aKv2Z7w(7Y-df!t9~s`dE}h#^$GFM%JPA9LG!_zR929aN)@R4+;mR)(5dnX{j(c
zI_>Q(+X*6@?uy+yaPZruyXK$M;_h#oTohB{%ICs&LH5DR4fY{{Q4g*LadXVRpSAqs
zxz9G=j>nu6nzsG*TN6Lw=Nv~jsxJ8?{#Ci>qZ_}dM@z7gV9=gDXDto)zrNryq3wjr
z%S)D1{+h)<Y1L{HG1Zx(sonc#QR95;&pg~*BHzDHniRco<~nbCE30KkH?p?n_kU;>
zi#~coN$YxQ%g!5GC*R8*Irv~HuY26jGmklx8cep`pO~|;YAUD7q3$>8cGnwYRvlmt
z)4R+mRycP?W8k|jT)}yB)^;eIt>=AL@LWk{V)5UgZI4<`H2(`0_A7hlqBHZtF8&Xf
zeHjkU^kbMed-I7nLnHO7v$t+&_gi)dWk$~RZC@vRSx@iQ<_9g;T6}!$o4X2T3QrEZ
z(>YhO{Nzf@v(|>2raij!VrQ)Unn!un&kA=;jM$;k@X?CNV{L%zjrRw_zsqImOxzNY
zp;X~G>r0e*ZIrOS&IFE`lY1o?)bt~Sw+7$-A%EFBMWkQm$9}#)jKS*FKjNBh3WDO&
M)78&qol`;+0Ho9J>Hq)$

literal 0
HcmV?d00001

diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_zuozhuan_open.png b/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_zuozhuan_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..9bbda22cb7bc5b39f7d996df563b8338120a021c
GIT binary patch
literal 1857
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

literal 0
HcmV?d00001

diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_zuozhuan_un_open.png b/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_zuozhuan_un_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c33fddbd9cab89ed62bc1be5fa495995592132f
GIT binary patch
literal 612
zcmeAS@N?(olHy`uVBq!ia0vp^iXhCv1|-9u9Lfh$jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(<ExPTeK1}PMCXaFfY=jq}Y62bX4
z%-8>rfkd9US%i&*(3JHH-IaxGf7tt6aX57U!wQvaNB%oK68bAS&&J`v>cBR^rwNNv
zZZ0@;&0~}2_R^=jVz1fN&VOF}t*knnVUqSrhako>Rt4#2&au~9uU@`3jc4lD*p;`;
zd)S^O|5~i_e@gu}g9qo9-r-3;%ChX#`ETxAvsaj|)4I|S@0X*NlJuYDWkr|yks!Uz
zNwY0h#801Vc~0NEQ+Z?DnYqd#O+tE`F0IY{RP1&+=bF?}yZt)5^A*~+&P!_4$ywjW
zmBKxPE#uFTL$`%r&vyNLG=(EA<w7EBL9YAS%6aN+r*s(Ocy=p%XjJxnBft3UOx4$W
zPP#mD@|7_QJXcug>SDpCex>DYLy(N&#Tx;_nWB5TxQ;(;omG*scq7+SM;XV7K+%v5
z)$R9!qmGFPK7Z;mYk||=Z$~}Co+z%@(0;exf5Wt<{dfOgTylHw#6C^dQlF$xodq*w
zCuXH?I(i^aYISa~;ji}_mX|g5?F|n*X?IULeVX`V+2Y*x@HNR>+E%Ib@42z+@eQ?%
zL+^BrJb&7U`R;qbJ#)d6duN|Ac)k4SlrgpXfxoJkh?9q3#XD}xWTvWPR~qGh1i59Z
hzV>9D#KjW&fPMDkQlqVIClf(2?CI*~vd$@?2>|W(_;UaN

literal 0
HcmV?d00001

diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/drawable/brakelight_background_daytime.xml b/OCH/mogo-och-bus-passenger/src/m2/res/drawable/brakelight_background_daytime.xml
new file mode 100644
index 0000000000..280fcfc941
--- /dev/null
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/drawable/brakelight_background_daytime.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#b2afc9e7" />
+    <corners android:radius="@dimen/dp_18" />
+</shape>
\ No newline at end of file
diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml b/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml
index 36c702c121..a7c537ab67 100644
--- a/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml
@@ -34,7 +34,6 @@
             android:textStyle="bold"
             app:layout_constraintLeft_toLeftOf="@+id/img_drive_bg"
             android:layout_marginLeft="@dimen/dp_24"
-            android:layout_marginTop="@dimen/dp_8"
             app:layout_constraintTop_toTopOf="@+id/img_drive_bg"
             tools:ignore="SpUsage" />
 
@@ -62,13 +61,15 @@
             app:layout_constraintTop_toBottomOf="@+id/speed_tv" />
 
         <!-- 转向灯  IMoGoChassisLamplightListener-->
-        <com.mogo.eagle.core.function.hmi.ui.vehicle.TurnLightViewStatus
+        <com.mogo.och.bus.passenger.ui.widget.M2TurnLightView
             android:id="@+id/turn_light_view"
             android:layout_width="@dimen/dp_68"
             android:layout_height="@dimen/dp_38"
             android:layout_marginLeft="@dimen/dp_12"
             app:layout_constraintLeft_toRightOf="@+id/auto_tv"
-            app:layout_constraintTop_toTopOf="@+id/auto_tv" />
+            app:layout_constraintTop_toTopOf="@+id/auto_tv"
+            app:visible="true"
+            app:day_light_mode="true"/>
 
         <!-- 红绿灯-->
         <com.mogo.och.bus.passenger.ui.widget.M2PTrafficLightView            android:id="@+id/traffic_light_view"
diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_hpmap_fragment.xml b/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_hpmap_fragment.xml
index 96a4bb5148..7639206abb 100644
--- a/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_hpmap_fragment.xml
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_hpmap_fragment.xml
@@ -13,11 +13,11 @@
 
     <!--    消息盒子气泡-->
 
-    <com.mogo.eagle.core.function.hmi.ui.msgbox.PassengerMsgBoxBubbleView
+    <com.mogo.eagle.core.function.hmi.ui.msgbox.MBoxBubbleView
         android:id="@+id/box_bubble_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintLeft_toLeftOf="parent" />
 
     <!--pnc行为决策-->
diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/layout/view_turn_light_status_daytime.xml b/OCH/mogo-och-bus-passenger/src/m2/res/layout/view_turn_light_status_daytime.xml
new file mode 100644
index 0000000000..6717350f74
--- /dev/null
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/layout/view_turn_light_status_daytime.xml
@@ -0,0 +1,55 @@
+<?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/dp_66"
+    android:layout_height="@dimen/dp_38"
+    android:visibility="visible">
+
+    <FrameLayout
+        android:id="@+id/turn_light_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone"
+        android:background="@drawable/brakelight_background_daytime"
+        android:layout_gravity="top|center_horizontal"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <ImageView
+            android:id="@+id/left_nor_image"
+            android:layout_width="@dimen/dp_19"
+            android:layout_height="@dimen/dp_21"
+            android:layout_gravity="left|center_vertical"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:src="@drawable/m2_zuozhuan_un_open" />
+
+        <ImageView
+            android:id="@+id/right_nor_image"
+            android:layout_width="@dimen/dp_19"
+            android:layout_height="@dimen/dp_21"
+            android:layout_gravity="right|center_vertical"
+            android:layout_marginRight="@dimen/dp_10"
+            android:src="@drawable/m2_youzhuan_un_open" />
+
+        <ImageView
+            android:id="@+id/left_select_image"
+            android:layout_width="@dimen/dp_20"
+            android:layout_height="@dimen/dp_22"
+            android:layout_gravity="left|center_vertical"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:layout_marginTop="2dp"
+            android:src="@drawable/m2_zuozhuan_open"
+            android:visibility="gone" />
+
+        <ImageView
+            android:id="@+id/right_select_image"
+            android:layout_width="@dimen/dp_20"
+            android:layout_height="@dimen/dp_22"
+            android:layout_gravity="right|center_vertical"
+            android:layout_marginTop="2dp"
+            android:layout_marginRight="10dp"
+            android:src="@drawable/m2_youzhuan_open"
+            android:visibility="gone" />
+    </FrameLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/values/strings.xml b/OCH/mogo-och-bus-passenger/src/m2/res/values/strings.xml
index 47672a2416..a90bd2ee4e 100644
--- a/OCH/mogo-och-bus-passenger/src/m2/res/values/strings.xml
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/values/strings.xml
@@ -11,8 +11,8 @@
     <string name="bus_p_cur_station_arrived_tip">请携带好随身物品下车。</string>
     <string name="bus_p_cur_station_arrived_tip_init">欢迎乘坐蘑菇车联自动驾驶车。</string>
 
-    <string name="m2_over_map_style_path">src/m2/assets/m2_map_style.data</string>
-    <string name="m2_over_map_style_extra_path">src/m2/assets/m2_map_style_extra.data</string>
+    <string name="m2_over_map_style_path">m2_map_style.data</string>
+    <string name="m2_over_map_style_extra_path">m2_map_style_extra.data</string>
     <string name="m2_p_auto_tv">Auto</string>
 
 </resources>
\ No newline at end of file
diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/DateTimeUtil.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/DateTimeUtil.java
index d1a2639515..e3bb4c8da1 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/DateTimeUtil.java
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/DateTimeUtil.java
@@ -15,7 +15,8 @@ public class DateTimeUtil {
     public static final String MM_dd = "MM-dd";
     public static final String MM_dd_HH_mm = "MM-dd HH:mm";
     public static final String yyyy_MM_dd = "yyyy-MM-dd";
-    public static final String yy_MM_dd = "yy-MM-dd";
+    public static final String yyyyMMdd = "yyyy-MM-dd";
+    public static final String yy_MM_dd = "yy.MM.dd";
     public static final String yyyy_MM_dd_HH_mm = "yyyy-MM-dd HH:mm";
 
     public static String formatCalendarToString(Calendar calendar, String format){