From 2ea96f15a2e6740dfab4b4903f07110401ccb1f4 Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Tue, 7 Feb 2023 22:40:14 +0800
Subject: [PATCH] [2.13.0-arch-opt] fix bug of day light mode in map and
 battery charge

---
 .../hmi/ui/widget/BatteryGroupView.kt         |  4 +--
 .../eagle/core/function/map/MapFragment.kt    |  0
 .../java/com/mogo/map/AMapViewWrapper.java    | 30 +++++++++----------
 3 files changed, 17 insertions(+), 17 deletions(-)
 delete mode 100644 core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.kt

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 4bb2a24d01..894d3306fd 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
@@ -76,8 +76,8 @@ class BatteryGroupView : LinearLayout, IMoGoSkinModeChangeListener {
                         if (isCharging) {
                             it.ivBatteryCharge.visibility = View.VISIBLE
                             when(it.mSkinMode){
-                                0 -> it.ivBatteryCharge.setImageResource(R.drawable.battery_charge_light)
-                                1 -> it.ivBatteryCharge.setImageResource(R.drawable.battery_charge_dark)
+                                0 -> it.ivBatteryCharge.setImageResource(R.drawable.battery_charge_dark)
+                                1 -> it.ivBatteryCharge.setImageResource(R.drawable.battery_charge_light)
                             }
                         } else {
                             it.ivBatteryCharge.visibility = View.GONE
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.kt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java
index 77df0450d2..80aa628eb3 100644
--- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java
@@ -854,21 +854,21 @@ public class AMapViewWrapper implements IMogoMapView,
 
     @Override
     public void stepInVrMode(boolean isDayMode) {
-//        try {
-//            int mapStyle;
-//            if (isDayMode) {
-//                mCurrentUI = EnumMapUI.MAP_STYLE_DAY_VR;
-//                mapStyle = MapAutoApi.MAP_STYLE_DAY_VR;
-//            } else {
-//                mCurrentUI = EnumMapUI.MAP_STYLE_NIGHT_VR;
-//                mapStyle = MapAutoApi.MAP_STYLE_NIGHT_VR;
-//            }
-//            if (mMapView != null && mMapView.getMapAutoViewHelper() != null) {
-//                mMapView.getMapAutoViewHelper().setMapStyle(mapStyle);
-//            }
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
+        try {
+            int mapStyle;
+            if (isDayMode) {
+                mCurrentUI = EnumMapUI.MAP_STYLE_DAY_VR;
+                mapStyle = MapAutoApi.MAP_STYLE_DAY_VR;
+            } else {
+                mCurrentUI = EnumMapUI.MAP_STYLE_NIGHT_VR;
+                mapStyle = MapAutoApi.MAP_STYLE_NIGHT_VR;
+            }
+            if (mMapView != null && mMapView.getMapAutoViewHelper() != null) {
+                mMapView.getMapAutoViewHelper().setMapStyle(mapStyle);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     @Override