From 1f6d78860024f66e6ebc25552f4bb4a81569eed7 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Wed, 17 Apr 2024 16:34:50 +0800
Subject: [PATCH] =?UTF-8?q?[6.4.0]=20[statusbar=20=E7=94=B5=E6=B1=A0?=
 =?UTF-8?q?=E5=A4=84=E7=90=86]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../function/hmi/ui/widget/BatteryGroupView.kt     | 14 ++++++++------
 .../core/function/hmi/ui/widget/StatusBarView.kt   |  1 -
 .../src/main/res/layout/view_status_bar.xml        |  3 +++
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/BatteryGroupView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/BatteryGroupView.kt
index 894d3306fd..77f8c65a59 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/BatteryGroupView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/BatteryGroupView.kt
@@ -19,12 +19,14 @@ import java.lang.ref.WeakReference
 
 class BatteryGroupView : LinearLayout, IMoGoSkinModeChangeListener {
 
-    constructor(
-        context: Context,
-        attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0
-    ) : super(context, attrs, defStyleAttr) {
-    }
+    constructor(context: Context?) : super(context)
+
+    constructor(context: Context?, attributeSet: AttributeSet) : super(context, attributeSet)
+
+    constructor(context: Context?, attributeSet: AttributeSet, defStyleAttr: Int) : super(context, attributeSet, defStyleAttr)
+
+    constructor(context: Context?, attributeSet: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attributeSet, defStyleAttr, defStyleRes)
+
 
     private var batteryHandler: BatteryHandler = BatteryHandler(this)
     private var view: View =
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/StatusBarView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/StatusBarView.kt
index 74c84568f3..e5f162cf05 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/StatusBarView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/StatusBarView.kt
@@ -46,7 +46,6 @@ class StatusBarView @JvmOverloads constructor(
             params.height = BarUtils.getStatusBarHeight()
             layoutParams = params
         }
-        viewStatusBarRight.addView(BatteryGroupView(this.context))
 
         //添加view控制
         CallerHmiViewControlListenerManager.addListener(TAG,this)
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_bar.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_bar.xml
index 897357307c..0ce2d1ad90 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_bar.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_bar.xml
@@ -77,5 +77,8 @@
         android:layout_marginEnd="@dimen/dp_44"
         android:gravity="end|center"
         android:orientation="horizontal">
+        <com.mogo.eagle.core.function.hmi.ui.widget.BatteryGroupView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
     </LinearLayout>
 </merge>
\ No newline at end of file