From 6a99016b90451f373b898649fc775480a2688656 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Thu, 9 Mar 2023 10:01:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[m1]=20[1.1.2]=20[=E5=80=92=E8=AE=A1?=
 =?UTF-8?q?=E6=97=B6=E5=92=8C=E5=8F=B8=E6=9C=BA=E7=AB=AF=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=20=E6=B7=BB=E5=8A=A060s]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/och/bus/passenger/model/CharterPassengerModel.kt   | 2 +-
 .../mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
index ac6c34ee37..f6352445b9 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
@@ -535,7 +535,7 @@ object CharterPassengerModel {
                                         }
                                     }
                                 }
-                                iDistanceTimeCallback?.setOrderTimeCallBack(millisUntilFinished)
+                                iDistanceTimeCallback?.setOrderTimeCallBack(millisUntilFinished+60)
                                 CallerLogger.d(
                                     M_BUS_P + TAG,
                                     "倒计时${millisUntilFinished}"
diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
index e4262c5863..fc273721a1 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
@@ -154,7 +154,7 @@ class BusPassengerPresenter(view: MainFragment?) :
     }
 
     override fun setOrderTimeCallBack(timeInSecond: Long) {
-        val surplusTime = Math.ceil(timeInSecond.toDouble() / 60f).toInt()
+        val surplusTime = (timeInSecond / 60).toInt()
 
         val beforeTime = Calendar.getInstance()
         beforeTime.add(Calendar.MINUTE, surplusTime)

From 0988df2ef62b3761935642b96ddf8ff9e818e799 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Thu, 9 Mar 2023 12:11:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[m1]=20[1.1.2]=20[ui=E8=B0=83=E6=95=B4]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/bus/passenger/ui/MainFragment.kt |  4 ----
 .../src/m1/res/layout/m1_main_fragment.xml    | 21 ++++++++++++++-----
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainFragment.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainFragment.kt
index e7e7f9ebed..3bc696dec9 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainFragment.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainFragment.kt
@@ -85,10 +85,6 @@ class MainFragment :
             }
         }
 
-        v_debug.setOnLongClickListener {
-            ToggleDebugView.toggleDebugView.toggle(requireContext())
-            true
-        }
         viewBusPM1MsgBoxButton.setClickListener(object : MMsgBoxButtonView.ClickListener {
             override fun showMsgBoxList(show: Boolean) {
                 if (show) {
diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_main_fragment.xml b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_main_fragment.xml
index 5a3dd1e87c..4bc6e8fc23 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_main_fragment.xml
+++ b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_main_fragment.xml
@@ -29,13 +29,23 @@
         android:layout_width="0dp"
         android:layout_height="match_parent"/>
 
-    <View
-        android:id="@+id/v_debug"
+    <com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugViewTrigger
+        android:layout_height="@dimen/dp_400"
+        android:layout_width="@dimen/dp_100"
+        android:longClickable="true"
         app:layout_constraintStart_toStartOf="@+id/mapBizView"
         app:layout_constraintTop_toTopOf="@+id/mapBizView"
-        app:layout_constraintBottom_toBottomOf="@+id/mapBizView"
-        android:layout_width="@dimen/dp_40"
-        android:layout_height="@dimen/dp_100"/>
+        app:layout_constraintBottom_toBottomOf="@+id/mapBizView" />
+
+    <!--pnc行为决策-->
+    <com.mogo.eagle.core.function.hmi.ui.vehicle.PncActionsView
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/dp_100"
+        android:layout_marginBottom="@dimen/dp_180"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="@+id/mapBizView"
+        app:layout_constraintStart_toStartOf="parent" />
+
 
     <LinearLayout
         android:id="@+id/ll_car_speed"
@@ -213,6 +223,7 @@
         android:src="@drawable/m1_order_end"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
+        android:layout_marginStart="-14dp"
         android:layout_width="@dimen/dp_181"
         android:layout_height="@dimen/dp_179"/>