From b382c976d7b059f5a4113afdfaa354e0646e40c6 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Fri, 10 Nov 2023 10:56:27 +0800
Subject: [PATCH] =?UTF-8?q?[6.2.0]=20[m1]=20[=E9=A1=B5=E9=9D=A2=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84=E8=B0=83=E6=95=B4]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/charter/passenger/ui/MainFragment.kt  | 34 +++++------
 .../res/layout/charter_p_main_fragment.xml    | 56 ++++++-------------
 2 files changed, 35 insertions(+), 55 deletions(-)

diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/MainFragment.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/MainFragment.kt
index 6209889156..7e6fae56b7 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/MainFragment.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/MainFragment.kt
@@ -42,9 +42,9 @@ import kotlinx.android.synthetic.main.charter_p_main_fragment.biz_softcontrol
 import kotlinx.android.synthetic.main.charter_p_main_fragment.biz_video
 import kotlinx.android.synthetic.main.charter_p_main_fragment.mapBizView
 import kotlinx.android.synthetic.main.charter_p_main_fragment.omvOverMap
-import kotlinx.android.synthetic.main.charter_p_main_fragment.viewBusPM1MsgBoxBubble
-import kotlinx.android.synthetic.main.charter_p_main_fragment.viewBusPM1MsgBoxButton
-import kotlinx.android.synthetic.main.charter_p_main_fragment.viewBusPM1MsgBoxList
+//import kotlinx.android.synthetic.main.charter_p_main_fragment.viewBusPM1MsgBoxBubble
+//import kotlinx.android.synthetic.main.charter_p_main_fragment.viewBusPM1MsgBoxButton
+//import kotlinx.android.synthetic.main.charter_p_main_fragment.viewBusPM1MsgBoxList
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
@@ -104,20 +104,20 @@ class MainFragment : MvpFragment<MainFragment?, BusPassengerPresenter?>(), IMogo
 
     override fun initViews() {
         omvOverMap.hideResetView()
-        viewBusPM1MsgBoxButton.setClickListener(object : MMsgBoxButtonView.ClickListener {
-            override fun showMsgBoxList(show: Boolean) {
-                if (show) {
-                    viewBusPM1MsgBoxList.visibility = View.VISIBLE
-                    viewBusPM1MsgBoxBubble.visibility = View.GONE
-                    viewBusPM1MsgBoxBubble.isShowData(false)
-                } else {
-                    viewBusPM1MsgBoxList.visibility = View.GONE
-                    viewBusPM1MsgBoxBubble.visibility = View.VISIBLE
-                    viewBusPM1MsgBoxBubble.isShowData(true)
-                }
-            }
-
-        })
+//        viewBusPM1MsgBoxButton.setClickListener(object : MMsgBoxButtonView.ClickListener {
+//            override fun showMsgBoxList(show: Boolean) {
+//                if (show) {
+//                    viewBusPM1MsgBoxList.visibility = View.VISIBLE
+//                    viewBusPM1MsgBoxBubble.visibility = View.GONE
+//                    viewBusPM1MsgBoxBubble.isShowData(false)
+//                } else {
+//                    viewBusPM1MsgBoxList.visibility = View.GONE
+//                    viewBusPM1MsgBoxBubble.visibility = View.VISIBLE
+//                    viewBusPM1MsgBoxBubble.isShowData(true)
+//                }
+//            }
+//
+//        })
 
         bb_boorombar.setCheckChangeListener(object : BottomBar.ApplyClickLintener {
             override fun onApplyClick(selectItem: BottomBar.SelectView): Boolean {
diff --git a/OCH/charter/passenger/src/main/res/layout/charter_p_main_fragment.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_main_fragment.xml
index 96a4bc6821..f73e120c8f 100644
--- a/OCH/charter/passenger/src/main/res/layout/charter_p_main_fragment.xml
+++ b/OCH/charter/passenger/src/main/res/layout/charter_p_main_fragment.xml
@@ -7,7 +7,7 @@
     <com.mogo.eagle.core.function.view.MapBizView
         android:id="@+id/mapBizView"
         android:layout_width="0dp"
-        app:layout_constraintWidth_percent="0.662"
+        app:layout_constraintWidth_percent="0.6045"
         app:styleMode="MAP_STYLE_DAY_VR"
         app:isWeatherEnable="false"
         app:locationIcon3DRes="@raw/m1"
@@ -32,15 +32,25 @@
         app:resetDrawableMarginBottom="54dp"
         app:resetDrawableMarginRight="34dp"
         app:startPointDrawable="@null"
+        app:rightPadding="140"
         app:topPadding="100" />
 
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/aciv_enter_video"
+        android:layout_width="@dimen/dp_147"
+        android:layout_height="@dimen/dp_149"
+        android:layout_marginTop="@dimen/dp_44"
+        android:src="@drawable/charter_p_video"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/aciv_map_2_default"
         android:layout_width="@dimen/dp_148"
         android:layout_height="@dimen/dp_150"
-        android:layout_marginBottom="-15dp"
+        android:layout_marginTop="@dimen/dp_m_27"
         android:src="@drawable/charter_p_overmap_reset"
-        app:layout_constraintBottom_toTopOf="@+id/bb_boorombar"
+        app:layout_constraintTop_toBottomOf="@+id/aciv_enter_video"
         app:layout_constraintEnd_toEndOf="parent" />
 
     <!--pnc行为决策-->
@@ -52,35 +62,6 @@
         app:layout_constraintEnd_toEndOf="@+id/mapBizView"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <!--消息盒子选择入口-->
-    <com.mogo.eagle.core.function.hmi.ui.msgbox.MMsgBoxButtonView
-        android:id="@+id/viewBusPM1MsgBoxButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_50"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/aciv_enter_video"
-        android:layout_width="@dimen/dp_147"
-        android:layout_height="@dimen/dp_149"
-        android:layout_marginTop="-20dp"
-        android:src="@drawable/charter_p_video"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/viewBusPM1MsgBoxButton" />
-
-    <!--消息盒子打开视图-->
-    <com.mogo.eagle.core.function.hmi.ui.msgbox.MMsgBoxListView
-        android:id="@+id/viewBusPM1MsgBoxList"
-        android:layout_width="450dp"
-        android:layout_height="520dp"
-        android:layout_marginTop="-30dp"
-        android:layout_marginEnd="@dimen/dp_34"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="@+id/viewBusPM1MsgBoxButton"
-        app:layout_constraintTop_toBottomOf="@+id/viewBusPM1MsgBoxButton" />
-
     <!--消息盒子气泡视图-->
     <com.mogo.eagle.core.function.hmi.ui.msgbox.MMsgBoxBubbleView
         android:id="@+id/viewBusPM1MsgBoxBubble"
@@ -89,8 +70,8 @@
         android:layout_marginTop="-30dp"
         android:layout_marginEnd="@dimen/dp_34"
         android:visibility="visible"
-        app:layout_constraintEnd_toEndOf="@+id/viewBusPM1MsgBoxButton"
-        app:layout_constraintTop_toBottomOf="@+id/viewBusPM1MsgBoxButton" />
+        app:layout_constraintEnd_toEndOf="@+id/aciv_enter_video"
+        app:layout_constraintTop_toBottomOf="@+id/aciv_enter_video" />
 
     <!--速度、剩余时间、剩余距离和到达时间-->
     <com.mogo.och.charter.passenger.ui.itinerary.ItineraryView
@@ -169,9 +150,8 @@
     <com.mogo.och.charter.passenger.ui.lockview.LockAndUnlockView
         android:layout_width="@dimen/dp_138"
         android:layout_height="@dimen/dp_138"
-        app:layout_constraintBottom_toTopOf="@+id/aciv_map_2_default"
-        android:layout_marginBottom="-30dp"
-        app:layout_constraintEnd_toEndOf="parent" />
-
+        app:layout_constraintBottom_toTopOf="@+id/bb_boorombar"
+        android:layout_marginBottom="@dimen/dp_m_2"
+        app:layout_constraintStart_toStartOf="parent" />
 
 </com.mogo.och.charter.passenger.ui.lockview.LockViewConstrainLayout>
\ No newline at end of file