Merge pull request #9 from Forairaaaaa/fix-app-pm-bg-transitoin

fix history page reload bg color transition
m5stack · Jun 20, 2024 · 6a3f835 · 6a3f835
2 parents b174943 + 72d1971
commit 6a3f835
Show file tree

Hide file tree

Showing 5 changed files with 192 additions and 171 deletions.
diff --git a/app/apps/app_power_monitor/app_power_monitor.cpp b/app/apps/app_power_monitor/app_power_monitor.cpp
@@ -27,7 +27,7 @@ void* AppPower_monitor_Packer::getCustomData()
     switch (app_history)
     {
     case 0:
-        return (void*)(&AssetPool::GetStaticAsset()->Color.AppPowerMonitor.primary);
+        return (void*)(&AssetPool::GetStaticAsset()->Color.AppPowerMonitor.pageSimpleDetailBackground);
     case 1:
         return (void*)(&AssetPool::GetStaticAsset()->Color.AppPowerMonitor.pageBusVoltage);
     case 2:
@@ -39,8 +39,8 @@ void* AppPower_monitor_Packer::getCustomData()
     default:
         break;
     }
-    spdlog::warn("no theme color on history {}", app_history);
-    return (void*)(&AssetPool::GetStaticAsset()->Color.AppPowerMonitor.primary);
+    // spdlog::warn("no theme color on history {}", app_history);
+    return (void*)(&AssetPool::GetStaticAsset()->Color.AppPowerMonitor.pageSimpleDetailBackground);
 }
 
 // Icon
@@ -240,7 +240,7 @@ void AppPower_monitor::_setup_page_shunt_volt()
 void AppPower_monitor::_setup_page_simple_detail()
 {
     spdlog::info("page simple detail");
-    _data.view->setConfig().themeColor = AssetPool::GetStaticAsset()->Color.AppPowerMonitor.primary;
+    _data.view->setConfig().themeColor = AssetPool::GetStaticAsset()->Color.AppPowerMonitor.pageSimpleDetailBackground;
     _data.view->reset();
     _data.view->goSimpleDetailPage();
 }

diff --git a/app/apps/app_power_monitor/view/view_single_data.cpp b/app/apps/app_power_monitor/view/view_single_data.cpp
@@ -1,8 +1,8 @@
 /*
-* SPDX-FileCopyrightText: 2024 M5Stack Technology CO LTD
-*
-* SPDX-License-Identifier: MIT
-*/
+ * SPDX-FileCopyrightText: 2024 M5Stack Technology CO LTD
+ *
+ * SPDX-License-Identifier: MIT
+ */
 #include "view.h"
 #include "../../../hal/hal.h"
 #include "../../../assets/assets.h"

diff --git a/app/apps/app_startup_anim/app_startup_anim.cpp b/app/apps/app_startup_anim/app_startup_anim.cpp
@@ -69,10 +69,31 @@ static void _pop_up_launcher_background_mask()
 
     // Get mask color
     uint32_t mask_color = 0;
-    if (HAL::NvsGet(NVS_KEY_APP_HISTORY) == 5)
+    auto app_history_page = HAL::NvsGet(NVS_KEY_APP_HISTORY);
+    switch (app_history_page)
+    {
+    case 0:
+        mask_color = AssetPool::GetColor().AppPowerMonitor.pageSimpleDetailBackground;
+        break;
+    case 1:
+        mask_color = AssetPool::GetColor().AppPowerMonitor.pageBusVoltage;
+        break;
+    case 2:
+        mask_color = AssetPool::GetColor().AppPowerMonitor.pageShuntCurrent;
+        break;
+    case 3:
+        mask_color = AssetPool::GetColor().AppPowerMonitor.pageBusPower;
+        break;
+    case 4:
+        mask_color = AssetPool::GetColor().AppPowerMonitor.pageMoreDetailBackground;
+        break;
+    case 5:
         mask_color = AssetPool::GetColor().AppWaveform.primary;
-    else
-        mask_color = AssetPool::GetColor().AppPowerMonitor.primary;
+        break;
+    default:
+        mask_color = AssetPool::GetColor().AppLauncher.background;
+        break;
+    }
 
     while (!transition.isFinish())
     {

diff --git a/app/hal/types.h b/app/hal/types.h
@@ -211,7 +211,7 @@ namespace OTA_UPGRADE
 /* -------------------------------------------------------------------------- */
 typedef std::function<void(const std::string& log, bool pushScreen, bool clear)> OnLogPageRenderCallback_t;
 
-#define APP_VERSION "V1.1.0"
+#define APP_VERSION "V1.1.2"
 
 /* -------------------------------------------------------------------------- */
 /*                                  NVS keys                                  */