Merge branch 'dev_robotaxi-d_240401_6.4.0' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robotaxi-d_240401_6.4.0

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 =

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)

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>