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

Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.2_local' into dev_robobus-d_241028_6.7.3

Browse Source
This commit is contained in:
yangyakun
2024-11-05 18:49:48 +08:00
parent 096daaf57c 71ee720005
commit 57f67afc4b
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/autopilot/AutopilotStateModel.kt
View File

@@ -111,10 +111,10 @@ class AutopilotStateModel : ViewModel(), IOchAutopilotStatusListener, ILineCall
this.viewCallback?.autopilotDisable()
}
IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE-> {
if (!CallerAutoPilotControlManager.isCanStartAutopilot(false) && !OchAutoPilotStatusListenerManager.canStartAutopilotFromFSM) {// 不可用
this.viewCallback?.autopilotDisable()
} else {// 部分可用
if (CallerAutoPilotControlManager.isCanStartAutopilot(false) || OchAutoPilotStatusListenerManager.canStartAutopilotFromFSM) {// 不可用
this.viewCallback?.canStartAutopilot()
} else {// 部分可用
this.viewCallback?.autopilotDisable()
}
}
IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING-> {// 自驾中

5
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentView.kt
View File

@@ -33,6 +33,7 @@ import com.mogo.och.common.module.utils.ResourcesUtils
import com.mogo.och.common.module.voice.VoiceNotice
import com.mogo.och.common.module.wigets.CommonSlideView
import com.mogo.och.common.module.wigets.OCHCommitDialog
import com.mogo.och.common.module.wigets.dialog.CommonDialogStatus
import com.mogo.och.unmanned.taxi.R
import com.mogo.och.unmanned.taxi.TaxiUnmannedDriverProvider
import com.mogo.och.unmanned.taxi.bean.OrderDetail
@@ -361,14 +362,14 @@ class ItineraryCurrentView: ConstraintLayout, ItineraryCurrentModel.SwtichLineVi
}
private fun closeOrderDialog() {
val builder = OCHCommitDialog.Builder()
val builder = CommonDialogStatus.Builder()
val closeOrderDialog = builder
.title(ResourcesUtils.getString(R.string.dialog_order_close_title))
.tips(ResourcesUtils.getString(R.string.dialog_order_close_content))
.confirmStr(ResourcesUtils.getString(R.string.dialog_order_close_confirm))
.cancelStr(ResourcesUtils.getString(R.string.dialog_order_close_cancel))
.build(context)
closeOrderDialog!!.setClickListener(object : OCHCommitDialog.ClickListener {
closeOrderDialog.setClickListener(object : CommonDialogStatus.ClickListener {
override fun confirm() {
viewModel?.sendUiIntent(TaskUiIntent.CloseOrderByDriver)
}

15
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
View File

@@ -2519,11 +2519,16 @@ internal class DebugSettingView @JvmOverloads constructor(
private fun killApp() {
Intent(Intent.ACTION_MAIN).apply {
addCategory(Intent.CATEGORY_HOME)
flags = Intent.FLAG_ACTIVITY_NEW_TASK
ActivityUtils.startActivity(this)
Process.killProcess(Process.myPid())
exitProcess(0)
try {
addCategory(Intent.CATEGORY_HOME)
flags = Intent.FLAG_ACTIVITY_NEW_TASK
ActivityUtils.startActivity(this)
Process.killProcess(Process.myPid())
exitProcess(0)
}catch (e:Exception){
e.printStackTrace()
CallerLogger.d(TAG,"killApp :${e.message}")
}
}
}