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

Merge branch 'dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.2_local

Browse Source
This commit is contained in:
EmArrow
2024-10-25 11:20:09 +08:00
parent efb423e746 816d340dae
commit 41a7514db0
9 changed files with 54 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/BoneTabLayout.kt
View File

@@ -15,6 +15,7 @@ import com.mogo.eagle.core.function.hmi.bone.tab.WorkOrderView
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI
import com.mogo.eagle.core.utilcode.util.UiThreadHandler
import kotlinx.android.synthetic.main.view_bone_tab.view.boneBgView
import kotlinx.android.synthetic.main.view_bone_tab.view.carInfoTabView
import kotlinx.android.synthetic.main.view_bone_tab.view.faultReasonView
import kotlinx.android.synthetic.main.view_bone_tab.view.msgBoxTabView
@@ -93,9 +94,11 @@ class BoneTabLayout @JvmOverloads constructor(
reportTypeView.setClickListener(object: ReportTypeView.ClickListener{
override fun openFaultReasonView() {
faultReasonView.visibility = VISIBLE
boneBgView.visibility = VISIBLE
}
override fun openWorkOrderView() {
workOrderView.visibility = VISIBLE
boneBgView.visibility = VISIBLE
}
override fun closeReportView() {
@@ -141,6 +144,7 @@ class BoneTabLayout @JvmOverloads constructor(
when (tabType) {
TabType.CAR_INFO -> {
tabSwitchCarInfo.switchTab(check)
boneBgView.visibility = if (check) VISIBLE else GONE
carInfoTabView.visibility = if (check) VISIBLE else GONE
}
@@ -149,8 +153,10 @@ class BoneTabLayout @JvmOverloads constructor(
if (check) {
tabSwitchMsgBox.updateNotice(false)
msgBoxTabView.visibility = VISIBLE
boneBgView.visibility = VISIBLE
} else {
msgBoxTabView.visibility = GONE
boneBgView.visibility = GONE
}
}
@@ -163,6 +169,7 @@ class BoneTabLayout @JvmOverloads constructor(
reportTypeView.visibility = GONE
faultReasonView.visibility = GONE
workOrderView.visibility = GONE
boneBgView.visibility = GONE
reportTypeView.hideTypeSelectView()
}
}
@@ -170,6 +177,7 @@ class BoneTabLayout @JvmOverloads constructor(
TabType.MORE_INFO -> {
tabSwitchMore.switchTab(check)
toolKitTabView.visibility = if (check) VISIBLE else GONE
boneBgView.visibility = if (check) VISIBLE else GONE
}
else -> {}

1
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/TabSwitchView.kt
View File

@@ -55,7 +55,6 @@ class TabSwitchView @JvmOverloads constructor(
ivTabClick.visibility = View.GONE
ivTabClickBg.visibility = View.GONE
ivTabDefault.visibility = View.VISIBLE
}
}

4
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt
View File

@@ -174,7 +174,9 @@ class CarInfoTabView @JvmOverloads constructor(
override fun invokeCarRes(res: Int) {
super.invokeCarRes(res)
UiThreadHandler.post {
ivCarType.setImageResource(res)
if(res != 0){
ivCarType.setImageResource(res)
}
}
}

49
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_tab.xml
View File

@@ -4,12 +4,25 @@
android:layout_width="@dimen/dp_960"
android:layout_height="match_parent">
<ImageView
android:id="@+id/boneBgView"
android:layout_width="@dimen/dp_960"
android:layout_height="0dp"
android:layout_marginStart="@dimen/dp_40"
android:scaleType="fitXY"
android:src="@drawable/bg_tab_item"
android:visibility="gone"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.mogo.eagle.core.function.hmi.bone.tab.CarInfoTabView
android:id="@+id/carInfoTabView"
android:layout_width="@dimen/dp_960"
android:layout_height="@dimen/dp_1214"
android:layout_height="0dp"
android:layout_marginStart="@dimen/dp_40"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/tabSwitchCarInfo"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -17,42 +30,42 @@
<com.mogo.eagle.core.function.hmi.bone.tab.MsgBoxTabView
android:id="@+id/msgBoxTabView"
android:layout_width="@dimen/dp_960"
android:layout_height="@dimen/dp_1214"
android:layout_height="0dp"
android:layout_marginStart="@dimen/dp_40"
android:visibility="gone"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
/>
app:layout_constraintTop_toTopOf="parent" />
<com.mogo.eagle.core.function.hmi.bone.tab.FaultReasonView
android:id="@+id/faultReasonView"
android:layout_width="@dimen/dp_960"
android:layout_height="@dimen/dp_1214"
android:layout_height="0dp"
android:layout_marginStart="@dimen/dp_40"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/tabSwitchCarInfo"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
/>
app:layout_constraintTop_toTopOf="parent" />
<com.mogo.eagle.core.function.hmi.bone.tab.WorkOrderView
android:id="@+id/workOrderView"
android:layout_width="@dimen/dp_960"
android:layout_height="@dimen/dp_1214"
android:layout_height="0dp"
android:layout_marginStart="@dimen/dp_40"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/tabSwitchCarInfo"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
/>
app:layout_constraintTop_toTopOf="parent" />
<com.mogo.eagle.core.function.hmi.bone.tab.ToolKitTabView
android:id="@+id/toolKitTabView"
android:layout_width="@dimen/dp_960"
android:layout_height="@dimen/dp_1214"
android:layout_height="0dp"
android:layout_marginStart="@dimen/dp_40"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/tabSwitchCarInfo"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -61,24 +74,22 @@
android:id="@+id/reportTypeView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginStart="@dimen/dp_270"
android:layout_marginBottom="@dimen/dp_102"
android:elevation="@dimen/dp_1000"
/>
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" />
<View
android:id="@+id/viewBottomContainer"
android:layout_width="@dimen/dp_960"
android:layout_height="@dimen/dp_216"
android:layout_marginStart="@dimen/dp_20"
android:background="@drawable/bg_tab_switch"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginStart="@dimen/dp_20"
app:layout_constraintLeft_toLeftOf="parent"
/>
app:layout_constraintLeft_toLeftOf="parent" />
<com.mogo.eagle.core.function.hmi.bone.TabSwitchView
android:id="@+id/tabSwitchCarInfo"

13
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_car_info_tab.xml
View File

@@ -3,8 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/bg_tab_item">
android:layout_height="match_parent">
<View
android:id="@+id/topViewPos"
@@ -29,7 +28,8 @@
<ScrollView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_900"
android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@+id/viewBottomPos"
app:layout_constraintTop_toBottomOf="@+id/topViewPos">
<androidx.constraintlayout.widget.ConstraintLayout
@@ -252,4 +252,11 @@
app:layout_constraintTop_toTopOf="@+id/tvSnPos" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
<View
android:id="@+id/viewBottomPos"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"/>
</androidx.constraintlayout.widget.ConstraintLayout>

3
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_fault_reason.xml
View File

@@ -2,8 +2,7 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@drawable/bg_tab_item">
xmlns:app="http://schemas.android.com/apk/res-auto">
<View
android:id="@+id/viewTitleBg"

1
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_msg_box_tab.xml
View File

@@ -3,7 +3,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@drawable/bg_tab_item"
>
<View

4
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_tool_kit_tab.xml
View File

@@ -2,8 +2,7 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/bg_tab_item">
android:layout_height="match_parent">
<View
android:id="@+id/topViewPos"
@@ -32,7 +31,6 @@
android:layout_height="0dp"
android:layout_marginLeft="@dimen/dp_56"
android:layout_marginRight="@dimen/dp_56"
android:layout_marginBottom="@dimen/dp_190"
android:clipToPadding="false"
android:paddingTop="@dimen/dp_62"
app:layout_constraintBottom_toBottomOf="parent"

3
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_work_order.xml
View File

@@ -3,8 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/bg_tab_item">
android:layout_height="match_parent">
<View
android:id="@+id/view_title_bg"