yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.2.0]

Browse Source 
[m1]
[页面结构调整]
This commit is contained in:
yangyakun
2023-11-10 10:56:27 +08:00
parent 51e80f17cd
commit b382c976d7
2 changed files with 35 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/MainFragment.kt
View File

@@ -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 {

56
OCH/charter/passenger/src/main/res/layout/charter_p_main_fragment.xml
View File

@@ -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>