From 52bf7d947388236ffbffe8159fbfbb316d422ac0 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 11 Mar 2024 10:20:01 +0800 Subject: [PATCH] =?UTF-8?q?[6.3.0]=20[=E4=B9=98=E5=AE=A2=E5=B1=8F=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/bus/passenger/ui/BusPStatusBarView.kt | 9 ++-- .../passenger/passenger/ui/PM2BaseFragment.kt | 4 +- .../jinlv/layout/p_bus_view_status_bar.xml | 51 +++++++++++-------- .../main/res/m2/layout/bus_p_m2_fragment.xml | 11 ++++ .../src/main/res/m2/values/colors.xml | 26 ---------- .../main/res/{jinlv => }/values/colors.xml | 24 +++++++++ .../shuttle/passenger/ui/BusPStatusBarView.kt | 4 ++ .../shuttle/passenger/ui/PM2BaseFragment.kt | 4 +- .../layout/shuttle_p_jl_view_status_bar.xml | 11 ++++ .../res/m2/layout/shuttle_p_m2_fragment.xml | 12 +++++ .../src/main/res/m2/values/colors.xml | 1 + 11 files changed, 103 insertions(+), 54 deletions(-) delete mode 100644 OCH/bus/passenger/src/main/res/m2/values/colors.xml rename OCH/bus/passenger/src/main/res/{jinlv => }/values/colors.xml (63%) diff --git a/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPStatusBarView.kt b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPStatusBarView.kt index 4bb0bd9403..0d99ce62ff 100644 --- a/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPStatusBarView.kt +++ b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPStatusBarView.kt @@ -2,22 +2,19 @@ package com.mogo.och.bus.passenger.ui import android.annotation.* import android.content.Context -import android.graphics.Color import android.util.AttributeSet import android.view.LayoutInflater import android.view.ViewGroup import androidx.constraintlayout.widget.ConstraintLayout -import chassis.ChassisStatesOuterClass -import com.mogo.eagle.core.function.api.autopilot.IMoGoBatteryManagementSystemListener import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener import com.mogo.eagle.core.function.api.setting.IMoGoSkinModeChangeListener -import com.mogo.eagle.core.function.call.autopilot.CallerBatteryManagementSystemListenerManager import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager import com.mogo.eagle.core.utilcode.kotlin.* -import com.mogo.eagle.core.utilcode.util.ClickUtils +import com.mogo.eagle.core.utilcode.util.AppUtils import com.mogo.och.bus.passenger.R +import kotlinx.android.synthetic.main.p_bus_view_status_bar.view.tv_bus_b1_p_version import kotlinx.coroutines.* import me.jessyan.autosize.utils.AutoSizeUtils @@ -38,6 +35,8 @@ class BusPStatusBarView @JvmOverloads constructor( setBackgroundResource(R.drawable.bg_status_bar) isClickable = true isFocusable = true + + tv_bus_b1_p_version.text = "版本：${AppUtils.getAppVersionName()}" } diff --git a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/PM2BaseFragment.kt b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/PM2BaseFragment.kt index 8a0a0d62c9..fc4107035f 100644 --- a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/PM2BaseFragment.kt +++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/PM2BaseFragment.kt @@ -1,9 +1,11 @@ package com.mogo.och.bus.passenger.passenger.ui import com.mogo.commons.mvp.MvpFragment +import com.mogo.eagle.core.utilcode.util.AppUtils import com.mogo.och.bus.passenger.R import com.mogo.och.bus.passenger.passenger.presenter.PM2Presenter import com.mogo.och.common.module.wigets.media.MediaPlayerFragment +import kotlinx.android.synthetic.main.bus_p_m2_fragment.tv_bug_b2_p_version /** * @author: wangmingjun @@ -27,7 +29,7 @@ class PM2BaseFragment : override fun initViews() { //横竖屏 // setScreenDirection() - + tv_bug_b2_p_version.text = "版本：${AppUtils.getAppVersionName()}" //隐藏小地图 initFragment() } diff --git a/OCH/bus/passenger/src/main/res/jinlv/layout/p_bus_view_status_bar.xml b/OCH/bus/passenger/src/main/res/jinlv/layout/p_bus_view_status_bar.xml index fef63bbd25..88c228c4f3 100644 --- a/OCH/bus/passenger/src/main/res/jinlv/layout/p_bus_view_status_bar.xml +++ b/OCH/bus/passenger/src/main/res/jinlv/layout/p_bus_view_status_bar.xml @@ -1,48 +1,57 @@ + tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"> + + + app:layout_constraintTop_toTopOf="parent" /> + android:layout_marginStart="@dimen/dp_40" + android:src="@drawable/bus_p_blue_tooth_open" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@+id/wifiStateView" + app:layout_constraintTop_toTopOf="parent" /> - - - + app:layout_constraintStart_toEndOf="@+id/blueToothView" + android:layout_marginStart="@dimen/dp_37" + android:textSize="@dimen/dp_18" + android:textColor="@color/bus_p_m2_color_17417B" + android:layout_width="wrap_content" + android:layout_height="wrap_content"/> \ No newline at end of file diff --git a/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_fragment.xml b/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_fragment.xml index df3f1b67b0..eec79bba1e 100644 --- a/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_fragment.xml +++ b/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_fragment.xml @@ -146,6 +146,17 @@ app:layout_constraintBottom_toTopOf="@+id/video_fragment" app:layout_constraintEnd_toEndOf="parent" /> + + \ No newline at end of file diff --git a/OCH/bus/passenger/src/main/res/m2/values/colors.xml b/OCH/bus/passenger/src/main/res/m2/values/colors.xml deleted file mode 100644 index 3c583e6cd4..0000000000 --- a/OCH/bus/passenger/src/main/res/m2/values/colors.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - #FFFFFF - #0B1E38 - #BBDAFB - #0B1E38 - #5D7199 - #A5D8FF - #1B2546 - #23355D - #8895B7 - - - #C8EFFF - #203555 - #17417B - #2D3E5F - #34A61F - #AEEDB8 - #43CEFE - #1466FB - #7094AD - - #99AFC9E7 - #6617417B - \ No newline at end of file diff --git a/OCH/bus/passenger/src/main/res/jinlv/values/colors.xml b/OCH/bus/passenger/src/main/res/values/colors.xml similarity index 63% rename from OCH/bus/passenger/src/main/res/jinlv/values/colors.xml rename to OCH/bus/passenger/src/main/res/values/colors.xml index 4bcd3db004..9011d8750f 100644 --- a/OCH/bus/passenger/src/main/res/jinlv/values/colors.xml +++ b/OCH/bus/passenger/src/main/res/values/colors.xml @@ -1,5 +1,29 @@ + #FFFFFF + #0B1E38 + #BBDAFB + #0B1E38 + #5D7199 + #A5D8FF + #1B2546 + #23355D + #8895B7 + + + #C8EFFF + #203555 + #17417B + #2D3E5F + #34A61F + #AEEDB8 + #43CEFE + #1466FB + #7094AD + + #99AFC9E7 + #6617417B + #80FFFFFF #5D7199 #CCE9EFFC #C7D2E1 diff --git a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPStatusBarView.kt b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPStatusBarView.kt index 1dd9581d1b..cd2c21f70a 100644 --- a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPStatusBarView.kt +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPStatusBarView.kt @@ -12,7 +12,9 @@ import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager import com.mogo.eagle.core.utilcode.kotlin.* +import com.mogo.eagle.core.utilcode.util.AppUtils import com.mogo.och.shuttle.passenger.R +import kotlinx.android.synthetic.main.shuttle_p_jl_view_status_bar.view.tv_shuttle_b1_p_version import kotlinx.coroutines.* import me.jessyan.autosize.utils.AutoSizeUtils @@ -33,6 +35,8 @@ class BusPStatusBarView @JvmOverloads constructor( setBackgroundResource(R.drawable.shuttle_p_jl_bg_status_bar) isClickable = true isFocusable = true + + tv_shuttle_b1_p_version.text = "版本：${AppUtils.getAppVersionName()}" } diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2BaseFragment.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2BaseFragment.kt index c5c7b83350..38717d851a 100644 --- a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2BaseFragment.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2BaseFragment.kt @@ -1,9 +1,11 @@ package com.mogo.och.shuttle.passenger.ui import com.mogo.commons.mvp.MvpFragment +import com.mogo.eagle.core.utilcode.util.AppUtils import com.mogo.och.shuttle.passenger.R import com.mogo.och.shuttle.passenger.presenter.PM2Presenter import com.mogo.och.common.module.wigets.media.MediaPlayerFragment +import kotlinx.android.synthetic.main.shuttle_p_m2_fragment.tv_shuttle_b2_p_version /** @@ -28,7 +30,7 @@ class PM2BaseFragment : override fun initViews() { //横竖屏 // setScreenDirection() - + tv_shuttle_b2_p_version.text = "版本：${AppUtils.getAppVersionName()}" //隐藏小地图 initFragment() } diff --git a/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_view_status_bar.xml b/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_view_status_bar.xml index 0551cdb433..1756b368a8 100644 --- a/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_view_status_bar.xml +++ b/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_view_status_bar.xml @@ -53,4 +53,15 @@ android:layout_gravity="center" android:layout_marginStart="@dimen/dp_40"/> + + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_fragment.xml b/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_fragment.xml index a4f407f00f..75eed6264a 100644 --- a/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_fragment.xml +++ b/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_fragment.xml @@ -146,6 +146,18 @@ app:layout_constraintBottom_toTopOf="@+id/video_fragment" app:layout_constraintEnd_toEndOf="parent" /> + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/res/m2/values/colors.xml b/OCH/shuttle/passenger/src/main/res/m2/values/colors.xml index 71557ca79b..b0196c0ce9 100644 --- a/OCH/shuttle/passenger/src/main/res/m2/values/colors.xml +++ b/OCH/shuttle/passenger/src/main/res/m2/values/colors.xml @@ -20,6 +20,7 @@ #43CEFE #1466FB #7094AD + #80FFFFFF #99AFC9E7 #6617417B