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

Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0

Browse Source
This commit is contained in:
wangmingjun
2023-03-09 14:06:19 +08:00
parent 641060c649 0988df2ef6
commit bc7720e7f0
4 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
View File

@@ -535,7 +535,7 @@ object CharterPassengerModel {
}
}
}
iDistanceTimeCallback?.setOrderTimeCallBack(millisUntilFinished)
iDistanceTimeCallback?.setOrderTimeCallBack(millisUntilFinished+60)
CallerLogger.d(
M_BUS_P + TAG,
"倒计时${millisUntilFinished}"

2
OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
View File

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

4
OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainFragment.kt
View File

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

21
OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_main_fragment.xml
View File

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