diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/BoneTabLayout.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/BoneTabLayout.kt index 3cf42d5370..334ded9ea7 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/BoneTabLayout.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/BoneTabLayout.kt @@ -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 -> {} diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/TabSwitchView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/TabSwitchView.kt index 4732ee6a9b..441616651d 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/TabSwitchView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/TabSwitchView.kt @@ -55,7 +55,6 @@ class TabSwitchView @JvmOverloads constructor( ivTabClick.visibility = View.GONE ivTabClickBg.visibility = View.GONE ivTabDefault.visibility = View.VISIBLE - } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt index 702a467728..48e85e6b67 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt @@ -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) + } } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_tab.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_tab.xml index 478f5ca7a5..1039d942c8 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_tab.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_tab.xml @@ -4,12 +4,25 @@ android:layout_width="@dimen/dp_960" android:layout_height="match_parent"> + + @@ -17,42 +30,42 @@ + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="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" /> + app:layout_constraintLeft_toLeftOf="parent" /> + android:layout_height="match_parent"> + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_fault_reason.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_fault_reason.xml index 8a70f38525..94f4514d34 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_fault_reason.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_fault_reason.xml @@ -2,8 +2,7 @@ + xmlns:app="http://schemas.android.com/apk/res-auto"> + android:layout_height="match_parent"> + android:layout_height="match_parent">