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

[6.7.0][状态栏改版] 改变状态栏高度72dp->67dp

Browse Source
This commit is contained in:
renwj
2024-09-26 18:41:20 +08:00
parent 596ead1d98
commit 52909df70b
20 changed files with 43 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_72">
android:layout_marginTop="@dimen/dp_status_bar_height">
<!--高精地图-->
<com.mogo.eagle.core.function.view.MapBizView
android:id="@+id/mapBizView"

2
OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt
View File

@@ -231,7 +231,7 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
removeStatusBar()
} else {
onBusinessChange(businessEnum)
LoginStatusManager.setLoginStatus(LoginStatusEnum.Login)
// LoginStatusManager.setLoginStatus(LoginStatusEnum.Login)
val supportFragmentManager: FragmentManager? = activity?.supportFragmentManager
val fragment = getFragment()
d(TAG, "切换 fragment:${fragment}_activity:$activity _ ${containerId}_$this")

2
OCH/offline/driver/src/main/res/layout/offline_base_fragment.xml
View File

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_72">
android:layout_marginTop="@dimen/dp_status_bar_height">
<com.mogo.och.offline.view.BizMapView
android:id="@+id/mapBizView"

2
OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_wadk_task_running.xml
View File

@@ -4,7 +4,7 @@
android:layout_width="960dp"
android:layout_height="match_parent"
android:background="#F0151D41"
android:layout_marginTop="@dimen/dp_72"
android:layout_marginTop="@dimen/dp_status_bar_height"
android:id="@+id/clLayout"
>

2
OCH/sweeper/driver/src/main/res/layout/sweeper_base_fragment.xml
View File

@@ -5,7 +5,7 @@
android:id="@+id/sweeper_root_View"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_72"
android:layout_marginTop="@dimen/dp_status_bar_height"
android:clickable="true">
<com.mogo.eagle.core.function.view.MapBizView

2
OCH/sweeper/driver/src/main/res/layout/sweeper_cloud_base_fragment.xml
View File

@@ -5,7 +5,7 @@
android:id="@+id/sweeper_root_View"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_72"
android:layout_marginTop="@dimen/dp_status_bar_height"
android:clickable="true">
<com.mogo.eagle.core.function.view.MapBizView

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

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_72">
android:layout_marginTop="@dimen/dp_status_bar_height">
<com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugViewTrigger
android:layout_width="@dimen/dp_400"

2
OCH/taxi/driver/src/main/res/layout/taxi_operation_tab_item_custom.xml
View File

@@ -18,7 +18,7 @@
<ImageView
android:id="@+id/operation_tab_line_iv"
android:layout_width="@dimen/dp_72"
android:layout_width="@dimen/dp_status_bar_height"
android:layout_height="@dimen/dp_24"
app:layout_constraintTop_toBottomOf="@+id/operation_tab_title"
app:layout_constraintLeft_toLeftOf="parent"

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

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_72">
android:layout_marginTop="@dimen/dp_status_bar_height">
<com.mogo.eagle.core.function.view.MapBizView
android:id="@+id/mapBizView"
app:isWeatherEnable="false"

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

@@ -178,7 +178,6 @@ object ToolKitDataManager : IToolKitItemClickListener, IOrderListener {
ToolTypeEnum.OPERATION_PANEL.name -> {
ctx?.also {
// SopView.sopView.toggle(it)
CallerHmiManager.toggleOperatePanel(true)
}
}

23
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt
View File

@@ -68,6 +68,7 @@ import com.zhjt.service_biz.BizConfig
import kotlinx.coroutines.Job
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import java.lang.ref.WeakReference
import java.util.concurrent.atomic.AtomicBoolean
import java.util.concurrent.atomic.AtomicReference
@@ -95,6 +96,8 @@ class MoGoHmiProvider : IMoGoHmiProvider {
private val xiaozhi by lazy { XiaoZhiStateManager() }
private val operatePanel by lazy { AtomicReference<WeakReference<View>>() }
override fun init(context: Context?) {
this.context = context
}
@@ -448,22 +451,26 @@ class MoGoHmiProvider : IMoGoHmiProvider {
Log.d(TAG, "toggleOperatePanel --- activity is null, show: $show")
return
}
var target = operatePanel.get()?.get()
if (show) {
var target = activity.findViewById<View>(R.id.id_operate_panel)
if (target == null) {
val vs = activity.findViewById<ViewStub>(R.id.vs_operate_panel) ?: throw AssertionError()
target = vs.inflate()
target = activity.findViewById(R.id.id_operate_panel)
if (target == null) {
val vs = activity.findViewById<ViewStub>(R.id.vs_operate_panel) ?: throw AssertionError()
target = vs.inflate()
}
}
if (target != null) {
operatePanel.set(WeakReference(target))
}
if (target != null && target.visibility != View.VISIBLE) {
TransitionManager.beginDelayedTransition(target.parent as ViewGroup, Slide(Gravity.START).also { it.duration = 150; it.addTarget(target) })
target.visibility = View.VISIBLE
target.post { target.bringToFront() }
}
} else {
val operatePanelView = activity.findViewById<View>(R.id.id_operate_panel)
if (operatePanelView != null && operatePanelView.visibility == View.VISIBLE) {
TransitionManager.beginDelayedTransition(operatePanelView.parent as ViewGroup, Slide(Gravity.START).also { it.duration = 150; it.addTarget(operatePanelView) })
operatePanelView.visibility = View.GONE
if (target != null && target.visibility == View.VISIBLE) {
TransitionManager.beginDelayedTransition(target.parent as ViewGroup, Slide(Gravity.START).also { it.duration = 150; it.addTarget(target) })
target.visibility = View.GONE
}
}
}

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

@@ -48,7 +48,7 @@
android:id="@+id/steering_tv_left"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_72"
android:layout_marginTop="@dimen/dp_status_bar_height"
android:layout_marginRight="-16dp"
android:gravity="right"
android:text="0°"
@@ -63,7 +63,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="-16dp"
android:layout_marginTop="@dimen/dp_72"
android:layout_marginTop="@dimen/dp_status_bar_height"
android:gravity="left"
android:text="0°"
android:textColor="#415479"

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

@@ -21,8 +21,8 @@
<ImageView
android:id="@+id/ivPassengerV2XImage"
android:layout_width="@dimen/dp_72"
android:layout_height="@dimen/dp_72"
android:layout_width="@dimen/dp_status_bar_height"
android:layout_height="@dimen/dp_status_bar_height"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"

2
core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml
View File

@@ -47,7 +47,7 @@
android:id="@id/vs_operate_panel"
android:layout_width="@dimen/dp_1046"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_72"
android:layout_marginTop="@dimen/dp_status_bar_height"
android:inflatedId="@id/id_operate_panel"
android:layout_gravity="start|top"
android:layout="@layout/layout_operate_panel_holder" />

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

@@ -101,7 +101,7 @@
<TextView
android:id="@+id/tvCarNo"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_72"
android:layout_height="@dimen/dp_status_bar_height"
android:layout_marginStart="@dimen/dp_16"
android:background="@drawable/bg_tab_car_no"
android:gravity="center"

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

@@ -156,7 +156,7 @@
<View
android:id="@+id/viewTimeBg"
android:layout_width="@dimen/dp_295"
android:layout_height="@dimen/dp_72"
android:layout_height="@dimen/dp_status_bar_height"
app:layout_constraintLeft_toLeftOf="@id/viewFaultTimeLabel"
app:layout_constraintTop_toBottomOf="@id/tvFaultTimeTitle"
android:layout_marginTop="@dimen/dp_15"
@@ -165,8 +165,8 @@
<ImageView
android:id="@+id/ivTimeReduce"
android:layout_width="@dimen/dp_72"
android:layout_height="@dimen/dp_72"
android:layout_width="@dimen/dp_status_bar_height"
android:layout_height="@dimen/dp_status_bar_height"
android:src="@drawable/icon_fault_time_reduce"
app:layout_constraintTop_toTopOf="@id/viewTimeBg"
app:layout_constraintBottom_toBottomOf="@id/viewTimeBg"
@@ -176,8 +176,8 @@
<ImageView
android:id="@+id/ivTimeAdd"
android:layout_width="@dimen/dp_72"
android:layout_height="@dimen/dp_72"
android:layout_width="@dimen/dp_status_bar_height"
android:layout_height="@dimen/dp_status_bar_height"
android:src="@drawable/icon_fault_time_add"
app:layout_constraintTop_toTopOf="@id/viewTimeBg"
app:layout_constraintBottom_toBottomOf="@id/viewTimeBg"

2
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_bar.xml
View File

@@ -2,7 +2,7 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_72"
android:layout_height="@dimen/dp_status_bar_height"
tools:background="#A6000000"
tools:parentTag="android.widget.FrameLayout">

2
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_wifi_state.xml
View File

@@ -5,7 +5,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:background="#A6000000"
tools:layout_height="@dimen/dp_72">
tools:layout_height="@dimen/dp_status_bar_height">
<ImageView
android:id="@+id/viewWifiStateBg"

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

@@ -164,7 +164,7 @@
<View
android:id="@+id/view_time_bg"
android:layout_width="@dimen/dp_295"
android:layout_height="@dimen/dp_72"
android:layout_height="@dimen/dp_status_bar_height"
app:layout_constraintLeft_toLeftOf="@id/view_time_label"
app:layout_constraintTop_toBottomOf="@id/tv_time_title"
android:layout_marginTop="@dimen/dp_15"
@@ -173,8 +173,8 @@
<ImageView
android:id="@+id/iv_time_reduce"
android:layout_width="@dimen/dp_72"
android:layout_height="@dimen/dp_72"
android:layout_width="@dimen/dp_status_bar_height"
android:layout_height="@dimen/dp_status_bar_height"
android:src="@drawable/icon_fault_time_reduce"
app:layout_constraintTop_toTopOf="@id/view_time_bg"
app:layout_constraintBottom_toBottomOf="@id/view_time_bg"
@@ -184,8 +184,8 @@
<ImageView
android:id="@+id/iv_time_add"
android:layout_width="@dimen/dp_72"
android:layout_height="@dimen/dp_72"
android:layout_width="@dimen/dp_status_bar_height"
android:layout_height="@dimen/dp_status_bar_height"
android:src="@drawable/icon_fault_time_add"
app:layout_constraintTop_toTopOf="@id/view_time_bg"
app:layout_constraintBottom_toBottomOf="@id/view_time_bg"

1
core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml
View File

@@ -44,6 +44,7 @@
<dimen name="dp_588">588dp</dimen>
<dimen name="dp_1066">1066dp</dimen>
<dimen name="dp_status_bar_height">67dp</dimen>
<dimen name="turnlight_bg_corner">60dp</dimen>
<dimen name="turnlight_width">275dp</dimen>
<dimen name="turnlight_height">120dp</dimen>