diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml
index 598f77c55f..ab0232e3f3 100644
--- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml
+++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml
@@ -144,7 +144,7 @@
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="@dimen/dp_20"
- app:layout_constraintRight_toLeftOf="@+id/ivCameraIcon"
+ app:layout_constraintRight_toLeftOf="@+id/viewTrafficLightVr"
app:layout_goneMarginRight="@dimen/dp_160"/>
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
index f76b845ab1..339afef14f 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
@@ -238,6 +238,7 @@ import kotlinx.android.synthetic.main.view_debug_setting.view.tbObuLog
import kotlinx.android.synthetic.main.view_debug_setting.view.tbObuWarningFusionUnion
import kotlinx.android.synthetic.main.view_debug_setting.view.tbOpenAcceleration
import kotlinx.android.synthetic.main.view_debug_setting.view.tbOpenSnBinding
+import kotlinx.android.synthetic.main.view_debug_setting.view.tbParrallelDriveViewShowControl
import kotlinx.android.synthetic.main.view_debug_setting.view.tbReportMore
import kotlinx.android.synthetic.main.view_debug_setting.view.tbReportWarning
import kotlinx.android.synthetic.main.view_debug_setting.view.tbRouteDynamicEffect
@@ -1628,6 +1629,20 @@ internal class DebugSettingView @JvmOverloads constructor(
HmiBuildConfig.isShowBusStationStrategyBorderPoint = isChecked
}
+ /**
+ * 远程代码按钮 展示控制
+ */
+ tbParrallelDriveViewShowControl.isChecked = HmiBuildConfig.isShowParallelDriveBtnView
+ tbParrallelDriveViewShowControl.setOnCheckedChangeListener { _, isChecked ->
+ HmiBuildConfig.isShowParallelDriveBtnView = isChecked
+ CallerHmiViewControlListenerManager.invokeUpdateParallelDriveViewShow(isChecked)
+ }
+ tbParrallelDriveViewShowControl.visibility =
+ if (AppIdentityModeUtils.isTaxiDriver(FunctionBuildConfig.appIdentityMode))
+ View.VISIBLE
+ else
+ View.GONE
+
btnThresholdDefine.setOnClickListener {
try {
accelerationThresholdNum = etThreshold.text.toString().toDouble()
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ParallelDriveView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ParallelDriveView.kt
index b6fd4aa4a3..539991d891 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ParallelDriveView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ParallelDriveView.kt
@@ -7,22 +7,27 @@ import android.content.Context
import android.graphics.Color
import android.util.AttributeSet
import android.view.LayoutInflater
+import android.view.View
import android.view.animation.LinearInterpolator
import android.widget.ImageView
import android.widget.TextView
import androidx.constraintlayout.widget.ConstraintLayout
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.commons.voice.AIAssist
+import com.mogo.eagle.core.data.config.HmiBuildConfig
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
import com.mogo.eagle.core.function.api.autopilot.IMoGoParallelDrivingActionsListener
import com.mogo.eagle.core.function.api.autopilot.IMoGoParallelDrivingStatusListener
+import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
import com.mogo.eagle.core.function.call.autopilot.CallerParallelDrivingActionsListenerManager
import com.mogo.eagle.core.function.call.autopilot.CallerParallelDrivingListenerManager
+import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager
import com.mogo.eagle.core.function.hmi.R
import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI
import com.mogo.eagle.core.utilcode.util.ThreadUtils
import com.mogo.eagle.core.utilcode.util.ToastUtils
@@ -37,7 +42,7 @@ class ParallelDriveView @JvmOverloads constructor(
attrs: AttributeSet? = null,
defStyleAttr: Int = 0
) : ConstraintLayout(context, attrs, defStyleAttr), IMoGoAutopilotStatusListener,
- IMoGoParallelDrivingActionsListener, IMoGoParallelDrivingStatusListener {
+ IMoGoParallelDrivingActionsListener, IMoGoParallelDrivingStatusListener, IViewControlListener {
companion object {
private const val TAG = "ParallelDriveView"
private const val APP_REQUESTING = 1
@@ -78,6 +83,15 @@ class ParallelDriveView @JvmOverloads constructor(
CallerAutoPilotStatusListenerManager.addListener("$M_HMI$TAG", this)
CallerParallelDrivingListenerManager.addListener("$M_HMI$TAG", this)
CallerParallelDrivingActionsListenerManager.addListener("$M_HMI$TAG", this)
+ CallerHmiViewControlListenerManager.addListener("$M_HMI$TAG", this)
+
+ //V6.7.0 平行驾驶目前暂时没启用,默认先不展示 远程代驾 按钮,同时通过 调试面板中开关控制 显示/隐藏
+ visibility = if (HmiBuildConfig.isShowParallelDriveBtnView) View.VISIBLE else View.GONE
+ }
+
+ override fun updateParallelDriveViewShow(isShow: Boolean) {
+ Logger.d(TAG, "isShow -> $isShow")
+ visibility = if (isShow) View.VISIBLE else View.GONE
}
private fun initView() {
@@ -453,6 +467,7 @@ class ParallelDriveView @JvmOverloads constructor(
CallerAutoPilotStatusListenerManager.removeListener("$M_HMI$TAG")
CallerParallelDrivingListenerManager.removeListener("$M_HMI$TAG")
CallerParallelDrivingActionsListenerManager.removeListener("$M_HMI$TAG")
+ CallerHmiViewControlListenerManager.removeListener("$M_HMI$TAG")
}
interface ClickEventListener {
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
index 15e7ec53fe..cfad45423c 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
@@ -1486,6 +1486,18 @@
android:textOn="关闭「通过公交站计算范围边界点」"
android:textSize="@dimen/dp_24" />
+
+
()
}
}
+ fun invokeUpdateParallelDriveViewShow(isShow: Boolean) {
+ M_LISTENERS.forEach {
+ val listener = it.value
+ listener.updateParallelDriveViewShow(isShow)
+ }
+ }
}
\ No newline at end of file