diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2StatusBarView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2StatusBarView.kt
index f46d22882d..f723e2b065 100644
--- a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2StatusBarView.kt
+++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2StatusBarView.kt
@@ -2,15 +2,12 @@ package com.mogo.och.shuttle.weaknet.passenger.ui.widget
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.IMoGoChassisStatesListener
-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.CallerChassisStatesListenerManager
import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager
@@ -20,10 +17,9 @@ import com.mogo.eagle.core.utilcode.util.ClickUtils
import com.mogo.eagle.core.utilcode.util.ThreadUtils
import com.mogo.och.common.module.manager.bluetooth.BleManager
import com.mogo.och.common.module.manager.loop.BizLoopManager
+import com.mogo.och.common.module.utils.ResourcesUtils
import com.mogo.och.shuttle.weaknet.passenger.R
-import kotlinx.android.synthetic.main.shuttle_p_m2_view_status_bar.view.aciv_wait_ele
import kotlinx.android.synthetic.main.shuttle_p_m2_view_status_bar.view.iv_logon
-import kotlinx.android.synthetic.main.shuttle_p_m2_view_status_bar.view.progress
import kotlinx.android.synthetic.main.shuttle_p_m2_view_status_bar.view.tv_power_cos
import kotlinx.coroutines.*
import me.jessyan.autosize.utils.AutoSizeUtils
@@ -34,7 +30,7 @@ import me.jessyan.autosize.utils.AutoSizeUtils
*/
class M2StatusBarView @JvmOverloads constructor(
context: Context, attrs: AttributeSet? = null
-) : ConstraintLayout(context, attrs), IViewControlListener, IMoGoSkinModeChangeListener,
+) : ConstraintLayout(context, attrs),
IMoGoChassisStatesListener {
companion object {
@@ -46,7 +42,7 @@ class M2StatusBarView @JvmOverloads constructor(
init {
LayoutInflater.from(context).inflate(R.layout.shuttle_p_m2_view_status_bar, this, true)
- setBackgroundColor(Color.parseColor("#80FFFFFF"))
+ setBackgroundColor(ResourcesUtils.getColor(R.color.white))
isClickable = true
isFocusable = true
}
@@ -55,24 +51,18 @@ class M2StatusBarView @JvmOverloads constructor(
@SuppressLint("ClickableViewAccessibility")
override fun onAttachedToWindow() {
super.onAttachedToWindow()
+
post {
val params: ViewGroup.LayoutParams = getLayoutParams()
- params.height = AutoSizeUtils.dp2px(context,60f)
+ params.height = AutoSizeUtils.dp2px(context,100f)
layoutParams = params
}
- //添加view控制
- CallerHmiViewControlListenerManager.addListener(TAG,this)
- // 添加换肤监听
- CallerSkinModeListenerManager.addListener(TAG, this)
+
//电量
CallerChassisStatesListenerManager.addListener(TAG,this)
- progress?.also {
- it.progress = 0
- aciv_wait_ele.visibility = VISIBLE
- }
tv_power_cos?.also {
- it.text = "检测中"
+ it.text = "?"
}
iv_logon.onClick {
BizLoopManager.runInMainThread{
@@ -86,13 +76,6 @@ class M2StatusBarView @JvmOverloads constructor(
}
}
- override fun onSkinModeChange(skinMode: Int) {
- when (skinMode) {
- 0 -> setStatusBarDarkOrLight(false)
- 1 -> setStatusBarDarkOrLight(true)
- }
- }
-
override fun onDetachedFromWindow() {
super.onDetachedFromWindow()
CallerHmiViewControlListenerManager.removeListener(TAG)
@@ -112,14 +95,11 @@ class M2StatusBarView @JvmOverloads constructor(
if (oldBmsSoc != bmsSoc ) {
scope.launch {
if(bmsSoc >1){
- progress?.also { it.progress = bmsSoc.toInt() }
tv_power_cos?.also { it.text = "${bmsSoc.toInt()}%" }
}else{
val power = (bmsSoc * 100).toInt()
- progress?.also { it.progress = power }
tv_power_cos?.also {it.text = "$power%" }
}
- aciv_wait_ele.visibility = GONE
}
}
} finally {
diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_p_battery.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_p_battery.png
new file mode 100644
index 0000000000..023d42d647
Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_p_battery.png differ
diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_status_bar_logo.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_status_bar_logo.png
index 71d8a4bdaa..f9606416ca 100644
Binary files a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_status_bar_logo.png and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_status_bar_logo.png differ
diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_view_status_bar.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_view_status_bar.xml
index d6e8823a45..8822503d3e 100644
--- a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_view_status_bar.xml
+++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_view_status_bar.xml
@@ -3,92 +3,105 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_60"
+ android:layout_height="@dimen/dp_100"
tools:ignore="MissingDefaultResource"
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+ android:id="@+id/aciv_battery_bg"
+ app:layout_constraintTop_toTopOf="@+id/iv_logon"
+ app:layout_constraintBottom_toBottomOf="@+id/iv_logon"
+ app:layout_constraintEnd_toEndOf="parent"
+ android:src="@drawable/m2_p_battery"
+ android:layout_marginEnd="@dimen/dp_22"
+ android:layout_width="@dimen/dp_50"
+ android:layout_height="@dimen/dp_29"/>
-
-
+ android:layout_width="@dimen/dp_50"
+ android:layout_height="@dimen/dp_29"
+ android:textColor="@color/common_203555"
+ android:textSize="@dimen/dp_20"
+ android:paddingStart="@dimen/dp_5"
+ android:textStyle="bold"
+ android:paddingEnd="@dimen/dp_9"
+ app:layout_constraintTop_toTopOf="@+id/aciv_battery_bg"
+ app:layout_constraintBottom_toBottomOf="@+id/aciv_battery_bg"
+ app:layout_constraintStart_toStartOf="@+id/aciv_battery_bg"
+ app:layout_constraintEnd_toEndOf="@+id/aciv_battery_bg"
+ tools:text="20"/>
diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/values/strings.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/values/strings.xml
index d2faf78c18..61b950582c 100644
--- a/OCH/shuttle/passenger_weaknet/src/main/res/b2/values/strings.xml
+++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/values/strings.xml
@@ -11,4 +11,6 @@
—分钟
请按秩序下车
暂无路线
+
+ MOGO BUS
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/WifiStateView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/WifiStateView.kt
index 8ab18f4cf6..05d61db1b0 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/WifiStateView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/WifiStateView.kt
@@ -75,6 +75,7 @@ class WifiStateView @JvmOverloads constructor(
}
private val txtSize: Float
+ private val txtShow: Boolean
init {
LayoutInflater.from(context).inflate(R.layout.view_wifi_state, this, true)
@@ -83,6 +84,7 @@ class WifiStateView @JvmOverloads constructor(
R.styleable.WifiStateView_wifi_size,
resources.getDimension(R.dimen.dp_30)
)
+ txtShow = a.getBoolean(R.styleable.WifiStateView_wifi_show_title,true)
a.recycle()
viewStatusBarTag.setTextSize(TypedValue.COMPLEX_UNIT_PX,AutoSizeUtils.dp2px(context,txtSize).toFloat())
wifiManager =
@@ -91,6 +93,11 @@ class WifiStateView @JvmOverloads constructor(
val wifiInfo = wifiManager!!.connectionInfo
Log.d(TAG, "wifi-info : $wifiInfo, ssid->: ${wifiInfo.ssid}")
wifiName = wifiInfo.ssid.replace("\"","")
+ if(txtShow){
+ viewStatusBarTag.visibility = VISIBLE
+ }else{
+ viewStatusBarTag.visibility = GONE
+ }
}
private val wifiStateReceiver: BroadcastReceiver = object : BroadcastReceiver() {
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml
index b27ed87536..a80b58aaa8 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml
@@ -91,6 +91,7 @@
+