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

[6.5.0]

Browse Source 
[fea]
[司机屏视角切换]
This commit is contained in:
yangyakun
2024-07-03 19:32:42 +08:00
parent 2a7bc40667
commit fd087758c9
27 changed files with 243 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml
View File

@@ -221,6 +221,15 @@
android:layout_marginTop="-24dp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@id/module_mogo_och_autopilot_status" />
<com.mogo.och.common.module.wigets.map.switchvisual.VisualViewDirver
app:layout_constraintStart_toEndOf="@+id/module_mogo_och_station_panel_container"
app:layout_constraintBottom_toBottomOf="@+id/module_mogo_och_station_panel_container"
android:layout_marginBottom="@dimen/dp_28"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<!--订单调试页面-->
<include
android:id="@+id/module_mogo_och_bus_test_bar"
@@ -256,16 +265,6 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/module_mogo_och_arrived_tv" />
<!--切换地图远近事件 @dimen/module_switch_map -->
<com.mogo.och.common.module.wigets.map.switchvisual.VisualView
android:id="@+id/switch_visual_view"
android:layout_width="@dimen/dp_142"
android:layout_height="@dimen/dp_142"
android:layout_marginStart="-10dp"
android:layout_marginBottom="@dimen/dp_17"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/toolsView" />
<com.mogo.och.common.module.wigets.map.reportworkorder.ReportWorkOrderView
android:id="@+id/reportworkorderview"
@@ -274,7 +273,7 @@
android:layout_marginStart="-10dp"
android:layout_marginBottom="@dimen/dp_17"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/switch_visual_view" />
app:layout_constraintLeft_toRightOf="@id/toolsView" />
<com.mogo.eagle.core.function.hmi.ui.widget.RomaTaxiView
android:layout_width="@dimen/dp_142"

19
OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml
View File

@@ -187,6 +187,13 @@
app:layout_constraintTop_toBottomOf="@id/autopilot_status"
app:layout_goneMarginTop="@dimen/dp_530" />
<com.mogo.och.common.module.wigets.map.switchvisual.VisualViewDirver
app:layout_constraintStart_toEndOf="@+id/module_mogo_och_station_panel_container"
app:layout_constraintBottom_toBottomOf="@+id/module_mogo_och_station_panel_container"
android:layout_marginBottom="@dimen/dp_46"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<!--订单信息-->
<include
android:id="@+id/module_mogo_och_bus_test_bar"
@@ -223,23 +230,13 @@
android:layout_width="@dimen/dp_142"
android:layout_height="@dimen/dp_142"/>
<!--切换地图远近事件 @dimen/module_switch_map -->
<com.mogo.och.common.module.wigets.map.switchvisual.VisualView
android:id="@+id/switch_visual_view"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/toolsView"
android:layout_marginStart="-10dp"
android:layout_marginBottom="@dimen/dp_17"
android:layout_width="@dimen/dp_142"
android:layout_height="@dimen/dp_142"/>
<com.mogo.och.common.module.wigets.map.reportworkorder.ReportWorkOrderView
android:id="@+id/reportworkorderview"
android:layout_marginStart="-10dp"
android:layout_marginBottom="@dimen/dp_17"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/switch_visual_view"
app:layout_constraintLeft_toRightOf="@id/toolsView"
android:layout_width="@dimen/dp_142"
android:layout_height="@dimen/dp_142"/>

22
OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt
View File

@@ -11,6 +11,9 @@ import com.google.gson.reflect.TypeToken
import com.mogo.eagle.core.data.enums.DataSourceType
import com.mogo.eagle.core.data.enums.EventTypeEnumNew
import com.mogo.eagle.core.data.map.MogoLocation
import com.mogo.eagle.core.function.angle.scenes.CrossRoad
import com.mogo.eagle.core.function.angle.scenes.Default
import com.mogo.eagle.core.function.angle.scenes.LongSight
import com.mogo.eagle.core.function.api.hmi.xiaozhi.event.V2N
import com.mogo.eagle.core.function.api.hmi.xiaozhi.state.State
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
@@ -23,6 +26,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerPlanningActionsListener
import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager
import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
import com.mogo.eagle.core.function.call.map.CallerMapRomaListener
import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
import com.mogo.eagle.core.utilcode.util.ActivityUtils
@@ -57,6 +61,7 @@ object DebugDataDispatch {
const val stopSite = "stopSite"
const val v2N = "xiaozhiV2N"
const val romal = "romal"
const val visualView = "visual"
// adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "location" --es path "1111/11111"
// adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "globalPath" --es path "sy73.json"
@@ -69,6 +74,7 @@ object DebugDataDispatch {
// adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "stopSite" --ei state 6 --ei action 1
// adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "xiaozhiV2N" --es poiType "10002" --ei state 0
// adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "romal" --ei show 0
// adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "visual" --ei show 0
val ROOT_PATH =
@@ -170,6 +176,22 @@ object DebugDataDispatch {
pncAction.parkScenarioAction = planningaction.build()
CallerPlanningActionsListenerManager.invokePNCActions(pncAction.build())
}
visualView ->{
val state = intent.getIntExtra("show", 0)
when (state) {
0 -> {
CallerVisualAngleManager.changeScene(LongSight(0))
}
1 -> {
CallerVisualAngleManager.changeScene(Default(0))
}
2 -> {
CallerVisualAngleManager.changeScene(CrossRoad(0))
}
else -> {}
}
}
romal ->{
val state = intent.getIntExtra("show", 0)
CallerMapRomaListener.invokeMapRomaRange(state==0)

45
OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/SeekBarView.kt
View File

@@ -11,12 +11,19 @@ import android.util.AttributeSet
import android.view.LayoutInflater
import android.view.MotionEvent
import android.widget.ImageView
import androidx.annotation.DrawableRes
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.constraintlayout.widget.ConstraintSet
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.findViewTreeViewModelStoreOwner
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.eagle.core.utilcode.util.UiThreadHandler
import com.mogo.och.common.module.R
import kotlinx.android.synthetic.main.taxi_p_seekbar_visualangle.view.iv_visualangle_bg
import kotlinx.android.synthetic.main.taxi_p_seekbar_visualangle.view.iv_visualangle_value
import kotlinx.android.synthetic.main.taxi_seekbar_visualangle.view.iv_visualangle_bg_dark
import kotlinx.android.synthetic.main.taxi_seekbar_visualangle.view.iv_visualangle_value_dark
import kotlin.properties.Delegates
@@ -53,13 +60,6 @@ class SeekBarView : ConstraintLayout, VisualViewModel.IVisualCallback {
override fun onDraw(canvas: Canvas) {
super.onDraw(canvas)
val split = (height - draggableButton.height) / 3f
canvas.drawLine(0f,split,width.toFloat(),split,p)
canvas.drawLine(0f,split*2,width.toFloat(),split*2,p)
canvas.drawLine(0f,(height - draggableButton.height).toFloat(),width.toFloat(),split*3,p)
val translationY = draggableButton.translationY
canvas.drawLine(0f,translationY,width.toFloat(),translationY,p)
}
private var initialX = 0f
@@ -82,12 +82,12 @@ class SeekBarView : ConstraintLayout, VisualViewModel.IVisualCallback {
if(draggableButton.translationY<-draggableButton.height){
tempSet.clone(this)
tempSet.setTranslationY(R.id.iv_setting_only_value,-draggableButton.height.toFloat())
tempSet.setTranslationY(draggableButton.id,-draggableButton.height.toFloat())
tempSet.applyTo(this)
return true
}else if (draggableButton.translationY>(height)){
tempSet.clone(this)
tempSet.setTranslationY(R.id.iv_setting_only_value,(height).toFloat())
tempSet.setTranslationY(draggableButton.id,(height).toFloat())
tempSet.applyTo(this)
return true
}
@@ -98,7 +98,7 @@ class SeekBarView : ConstraintLayout, VisualViewModel.IVisualCallback {
initialY = event.rawY;
tempSet.clone(this)
tempSet.setTranslationY(R.id.iv_setting_only_value,draggableButton.translationY+dy)
tempSet.setTranslationY(draggableButton.id,draggableButton.translationY+dy)
tempSet.applyTo(this)
}
MotionEvent.ACTION_UP -> {
@@ -178,10 +178,31 @@ class SeekBarView : ConstraintLayout, VisualViewModel.IVisualCallback {
private lateinit var draggableButton:ImageView
private fun initView() {
LayoutInflater.from(context).inflate(R.layout.taxi_p_seekbar_visualangle, this, true)
draggableButton = findViewById(R.id.iv_setting_only_value)
if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
LayoutInflater.from(context).inflate(R.layout.taxi_seekbar_visualangle, this, true)
draggableButton = findViewById(R.id.iv_visualangle_value_dark)
}else{
LayoutInflater.from(context).inflate(R.layout.taxi_p_seekbar_visualangle, this, true)
draggableButton = findViewById(R.id.iv_visualangle_value)
}
}
fun setBgResource(@DrawableRes resource:Int){
if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
iv_visualangle_bg_dark.setImageResource(resource)
}else{
iv_visualangle_bg.setImageResource(resource)
}
}
fun setHumbResource(@DrawableRes resource:Int){
if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
iv_visualangle_value_dark.setImageResource(resource)
}else{
iv_visualangle_value.setImageResource(resource)
}
}
override fun onAttachedToWindow() {
super.onAttachedToWindow()
viewModel = findViewTreeViewModelStoreOwner()?.let {

67
OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/VisualViewDirver.kt Normal file
View File

@@ -0,0 +1,67 @@
package com.mogo.och.common.module.wigets.map.switchvisual
import android.content.Context
import android.util.AttributeSet
import android.view.LayoutInflater
import androidx.constraintlayout.widget.ConstraintLayout
import com.mogo.och.common.module.R
import kotlinx.android.synthetic.main.common_visualangle_black.view.iv_center_location_bg
import kotlinx.android.synthetic.main.common_visualangle_black.view.iv_visual_angle_title_bottom
import kotlinx.android.synthetic.main.common_visualangle_black.view.iv_visual_angle_title_head
import kotlinx.android.synthetic.main.common_visualangle_black.view.iv_visual_angle_title_value_bg
class VisualViewDirver : ConstraintLayout {
private val TAG = "LeftBarView"
constructor(context: Context) : super(context)
constructor(context: Context, attributeSet: AttributeSet) : super(context, attributeSet)
constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int) : super(context, attributeSet, defStyleAttr)
constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attributeSet, defStyleAttr, defStyleRes)
init {
}
private fun initView() {
LayoutInflater.from(context).inflate(R.layout.common_visualangle_black, this, true)
iv_visual_angle_title_value_bg.enableCallback = object :SeekBarView.EnableCallback{
override fun enableChangeListener(enable: Boolean) {
if(enable){
iv_visual_angle_title_head.setImageResource(R.drawable.commont_visual_head)
iv_visual_angle_title_bottom.setImageResource(R.drawable.common_visual_bottom)
iv_visual_angle_title_value_bg.setBgResource(R.drawable.common_visual_angle_bg)
iv_visual_angle_title_value_bg.setHumbResource(R.drawable.common_visual_angle)
iv_center_location_bg.setImageResource(R.drawable.common_visualangle_bg)
}else{
iv_visual_angle_title_head.setImageResource(R.drawable.commont_visual_head_unable)
iv_visual_angle_title_bottom.setImageResource(R.drawable.common_visual_bottom_unenable)
iv_visual_angle_title_value_bg.setBgResource(R.drawable.common_visual_angle_bg_unenable)
iv_visual_angle_title_value_bg.setHumbResource(R.drawable.common_visual_angle_unenable)
iv_center_location_bg.setImageResource(R.drawable.common_visualangle_bg_unenable)
}
}
}
}
override fun onVisibilityAggregated(isVisible: Boolean) {
super.onVisibilityAggregated(isVisible)
}
override fun onAttachedToWindow() {
super.onAttachedToWindow()
}
init {
try {
initView()
} catch (e: Exception) {
e.printStackTrace()
}
}
}

BIN
OCH/common/common/src/main/res/drawable-nodpi/common_visual_angle.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
OCH/common/common/src/main/res/drawable-nodpi/common_visual_angle_bg.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
OCH/common/common/src/main/res/drawable-nodpi/common_visual_angle_bg_unenable.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
OCH/common/common/src/main/res/drawable-nodpi/common_visual_angle_unenable.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
OCH/common/common/src/main/res/drawable-nodpi/common_visual_bottom.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
OCH/common/common/src/main/res/drawable-nodpi/common_visual_bottom_unenable.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 800 B

BIN
OCH/common/common/src/main/res/drawable-nodpi/common_visualangle_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.1 KiB

BIN
OCH/common/common/src/main/res/drawable-nodpi/common_visualangle_bg_unenable.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
OCH/common/common/src/main/res/drawable-nodpi/commont_visual_head.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
OCH/common/common/src/main/res/drawable-nodpi/commont_visual_head_unable.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

47
OCH/common/common/src/main/res/layout/common_visualangle_black.xml Normal file
View File

@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="@dimen/dp_64"
android:layout_height="@dimen/dp_308"
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
<ImageView
android:id="@+id/iv_center_location_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@drawable/common_visualangle_bg"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.mogo.och.common.module.wigets.map.switchvisual.SeekBarView
android:id="@+id/iv_visual_angle_title_value_bg"
android:layout_width="@dimen/dp_64"
android:layout_height="@dimen/dp_169"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_visual_angle_title_head"
android:layout_width="@dimen/dp_30"
android:layout_height="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_22"
android:src="@drawable/commont_visual_head"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_visual_angle_title_bottom"
android:layout_width="@dimen/dp_31"
android:layout_height="@dimen/dp_25"
android:layout_marginBottom="@dimen/dp_22"
android:src="@drawable/common_visual_bottom"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</merge>

4
OCH/common/common/src/main/res/layout/taxi_p_seekbar_visualangle.xml
View File

@@ -7,7 +7,7 @@
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
<ImageView
android:id="@+id/iv_setting_only_bg"
android:id="@+id/iv_visualangle_bg"
android:layout_width="39dp"
android:layout_height="141dp"
android:src="@drawable/taxi_p_visual_angle_bg"
@@ -17,7 +17,7 @@
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_setting_only_value"
android:id="@+id/iv_visualangle_value"
android:layout_width="100dp"
android:layout_height="100dp"
android:src="@drawable/taxi_p_visual_angle"

20
OCH/taxi/pcommon/src/main/res/layout/taxi_p_seekbar_visualangle.xml → OCH/common/common/src/main/res/layout/taxi_seekbar_visualangle.xml
View File

@@ -2,25 +2,25 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="100dp"
android:layout_height="208dp"
android:layout_width="@dimen/dp_64"
android:layout_height="@dimen/dp_169"
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
<ImageView
android:id="@+id/iv_setting_only_bg"
android:layout_width="39dp"
android:layout_height="141dp"
android:src="@drawable/taxi_p_visual_angle_bg"
android:id="@+id/iv_visualangle_bg_dark"
android:layout_width="@dimen/dp_40"
android:layout_height="@dimen/dp_169"
android:src="@drawable/common_visual_angle_bg"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_setting_only_value"
android:layout_width="100dp"
android:layout_height="100dp"
android:src="@drawable/taxi_p_visual_angle"
android:id="@+id/iv_visualangle_value_dark"
android:layout_width="@dimen/dp_64"
android:layout_height="@dimen/dp_33"
android:src="@drawable/common_visual_angle"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

21
OCH/shuttle/driver/src/main/res/layout/shuttle_base_fragment.xml
View File

@@ -198,6 +198,14 @@
app:layout_constraintTop_toBottomOf="@id/module_mogo_och_autopilot_status"
app:layout_goneMarginTop="@dimen/module_mogo_och_station_panel_container_margin_top_no_call" />
<com.mogo.och.common.module.wigets.map.switchvisual.VisualViewDirver
app:layout_constraintStart_toEndOf="@+id/module_mogo_och_station_panel_container"
app:layout_constraintBottom_toBottomOf="@+id/module_mogo_och_station_panel_container"
android:layout_marginBottom="@dimen/dp_28"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<include
android:id="@+id/module_mogo_och_bus_test_bar"
layout="@layout/shuttle_test_bar_view"
@@ -241,23 +249,12 @@
android:layout_width="@dimen/dp_142"
android:layout_height="@dimen/dp_142"/>
<!--切换地图远近事件 @dimen/module_switch_map -->
<com.mogo.och.common.module.wigets.map.switchvisual.VisualView
android:id="@+id/switch_visual_view"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/toolsView"
android:layout_marginStart="-10dp"
android:layout_marginBottom="@dimen/dp_17"
android:layout_width="@dimen/dp_142"
android:layout_height="@dimen/dp_142"/>
<com.mogo.och.common.module.wigets.map.reportworkorder.ReportWorkOrderView
android:id="@+id/reportworkorderview"
android:layout_marginStart="-10dp"
android:layout_marginBottom="@dimen/dp_17"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/switch_visual_view"
app:layout_constraintLeft_toRightOf="@id/toolsView"
android:layout_width="@dimen/dp_142"
android:layout_height="@dimen/dp_142"/>

5
OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperCloudTaskModel.java
View File

@@ -792,4 +792,9 @@ public class SweeperCloudTaskModel implements IMoGoSweeperFutianCloudTaskListene
public void onAutopilotTrajectoryDownloadReq(@NonNull AutopilotControlParameters.AutoPilotLine autoPilotLine, int downloadType) {
}
@Override
public void onFsmReceiveTimeout(boolean isTimeout) {
}
}

5
OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/presenter/SweeperOperatePresenter.java
View File

@@ -469,4 +469,9 @@ public class SweeperOperatePresenter extends Presenter<SweeperOperateFragment>
@Override
public void onAutopilotTrajectoryDownloadReq(@NonNull AutopilotControlParameters.AutoPilotLine autoPilotLine, int downloadType) {
}
@Override
public void onFsmReceiveTimeout(boolean isTimeout) {
}
}

20
OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
View File

@@ -220,6 +220,14 @@
app:layout_constraintTop_toBottomOf="@+id/module_mogo_och_autopilot_status"
tools:visibility="visible" />
<com.mogo.och.common.module.wigets.map.switchvisual.VisualViewDirver
app:layout_constraintStart_toEndOf="@+id/module_mogo_och_station_panel_container"
app:layout_constraintBottom_toBottomOf="@+id/module_mogo_och_station_panel_container"
android:layout_marginBottom="@dimen/dp_32"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<com.mogo.och.common.module.wigets.map.orderstatus.OrderStatusView
android:id="@+id/module_mogo_och_operation_status"
android:layout_width="@dimen/dp_316"
@@ -250,16 +258,6 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/module_mogo_och_operation_status" />
<com.mogo.och.common.module.wigets.map.switchvisual.VisualView
android:id="@+id/switch_visual_view"
android:layout_width="@dimen/dp_142"
android:layout_height="@dimen/dp_142"
android:layout_marginStart="-10dp"
android:layout_marginBottom="@dimen/dp_17"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/toolsView" />
<com.mogo.och.common.module.wigets.map.reportworkorder.ReportWorkOrderView
android:id="@+id/reportworkorderview"
android:layout_width="@dimen/dp_142"
@@ -267,7 +265,7 @@
android:layout_marginStart="-10dp"
android:layout_marginBottom="@dimen/dp_17"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/switch_visual_view" />
app:layout_constraintLeft_toRightOf="@id/toolsView" />
<com.mogo.eagle.core.function.hmi.ui.widget.RomaTaxiView
android:layout_width="@dimen/dp_142"

2
OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
View File

@@ -86,7 +86,7 @@ class TaxiPassengerBaseFragment() :
}
})
lbv_go2_center.setOrderIdCallback(object :LeftBarView.LeftBarCallback{
lbv_go2_center.setOrderIdCallback(object : LeftBarView.LeftBarCallback{
override fun setGo2CenterClick() {
when (bottom.getCurrentPage()) {
BottomBar.SelectView.PRECISIONMAP -> {

1
OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/bar/LeftBarView.kt
View File

@@ -8,7 +8,6 @@ import androidx.constraintlayout.widget.ConstraintLayout
import com.mogo.eagle.core.utilcode.kotlin.onClick
import com.mogo.och.common.module.wigets.map.switchvisual.SeekBarView
import com.mogo.och.taxi.passenger.common.R
import kotlinx.android.synthetic.main.taxi_p_leftbar.view.iv_center_location
import kotlinx.android.synthetic.main.taxi_p_leftbar.view.iv_center_location_bg
import kotlinx.android.synthetic.main.taxi_p_leftbar.view.iv_visual_angle_title_bottom
import kotlinx.android.synthetic.main.taxi_p_leftbar.view.iv_visual_angle_title_head

12
OCH/taxi/pcommon/src/main/res/layout/taxi_p_rightbar.xml
View File

@@ -58,13 +58,13 @@
<androidx.constraintlayout.widget.Group
android:id="@+id/con_only_one_group"
android:visibility="gone"
app:constraint_referenced_ids="iv_setting_only_bg,ck_setting_only"
app:constraint_referenced_ids="iv_visualangle_bg,ck_setting_only"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<ImageView
android:id="@+id/iv_setting_only_bg"
android:id="@+id/iv_visualangle_bg"
android:layout_width="@dimen/dp_120"
android:layout_height="@dimen/dp_120"
android:src="@drawable/taxi_p_reset_location_bg"
@@ -78,9 +78,9 @@
android:layout_height="@dimen/dp_76"
android:background="@drawable/taxi_p_setting_selector"
android:button="@null"
app:layout_constraintBottom_toBottomOf="@+id/iv_setting_only_bg"
app:layout_constraintStart_toStartOf="@+id/iv_setting_only_bg"
app:layout_constraintEnd_toEndOf="@+id/iv_setting_only_bg"
app:layout_constraintTop_toTopOf="@+id/iv_setting_only_bg" />
app:layout_constraintBottom_toBottomOf="@+id/iv_visualangle_bg"
app:layout_constraintStart_toStartOf="@+id/iv_visualangle_bg"
app:layout_constraintEnd_toEndOf="@+id/iv_visualangle_bg"
app:layout_constraintTop_toTopOf="@+id/iv_visualangle_bg" />
</merge>

2
OCH/taxi/pcommon/src/main/res/layout/taxi_p_seekbar_.xml
View File

@@ -7,7 +7,7 @@
tools:parentTag="androidx.constraintlayout.motion.widget.MotionLayout">
<ImageView
android:id="@+id/iv_setting_only_bg"
android:id="@+id/iv_visualangle_bg"
android:layout_width="39px"
android:layout_height="141px"
android:src="@drawable/taxi_p_visual_angle_bg"

18
OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml
View File

@@ -208,6 +208,13 @@
app:layout_constraintTop_toBottomOf="@+id/module_mogo_och_autopilot_status"
tools:visibility="visible" />
<com.mogo.och.common.module.wigets.map.switchvisual.VisualViewDirver
app:layout_constraintStart_toEndOf="@+id/module_mogo_och_station_panel_container"
app:layout_constraintBottom_toBottomOf="@+id/module_mogo_och_station_panel_container"
android:layout_marginBottom="@dimen/dp_32"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<com.mogo.och.common.module.wigets.map.orderstatus.OrderStatusView
android:id="@+id/module_mogo_och_operation_status"
app:layout_constraintBottom_toBottomOf="parent"
@@ -237,21 +244,12 @@
android:layout_width="@dimen/dp_142"
android:layout_height="@dimen/dp_142"/>
<com.mogo.och.common.module.wigets.map.switchvisual.VisualView
android:id="@+id/switch_visual_view"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/toolsView"
android:layout_marginStart="-11dp"
android:layout_marginBottom="@dimen/dp_17"
android:layout_width="@dimen/dp_142"
android:layout_height="@dimen/dp_142"/>
<com.mogo.och.common.module.wigets.map.reportworkorder.ReportWorkOrderView
android:id="@+id/reportworkorderview"
android:layout_marginStart="-11dp"
android:layout_marginBottom="@dimen/dp_17"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/switch_visual_view"
app:layout_constraintLeft_toRightOf="@id/toolsView"
android:layout_width="@dimen/dp_142"
android:layout_height="@dimen/dp_142"/>