优化省电模式中充电退出逻辑

diff --git a/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveEleModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveEleModel.cpp
index 1f22e38..990c500 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveEleModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveEleModel.cpp
@@ -1,15 +1,4 @@
-/*** 
- * @Date: 2024-04-15 10:55:58
- * @LastEditors: Caisking 3449750381@qq.com
- * @LastEditTime: 2024-08-19 17:07:54
- * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveEleModel.cpp
- */
-/*** 
- * @Date: 2024-04-15 10:55:58
- * @LastEditors: Caisking 3449750381@qq.com
- * @LastEditTime: 2024-08-17 16:15:17
- * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveEleModel.cpp
- */
+
 #include "saveele/include/SaveEleModel.h"
 
 namespace OHOS
@@ -20,11 +9,11 @@ namespace OHOS
         static SaveEleModel instance;
         return &instance;
     }
-    int SaveEleModel::GetChargeStatus()
+    bool SaveEleModel::GetChargeStatus()
     {
         return chargeStatus_;
     }
-    void SaveEleModel::SetChargeStatus(int chargeStatus)
+    void SaveEleModel::SetChargeStatus(bool chargeStatus)
     {
         chargeStatus_ = chargeStatus;
     }

diff --git a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
index 9a4c9aa..7d9ae45 100644 (file)
--- a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
+++ b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
@@ -364,7 +364,7 @@ void MsgCenterNotifyChargePlugProc(const Topic topic, Request* req)
 #if DIALDATASET
     DialModelCharge::GetInstance()->UpdatechargeStatus(1);
 #endif
-
+    SaveEleModel::GetInstance()->SetChargeStatus(true);
 /* ---------------------------------- 充电弹窗 ---------------------------------- */
     testCHANINGView *t=testCHANINGView::GetInstance();
     if(t!=NULL)
@@ -388,7 +388,7 @@ void MsgCenterNotifyChargeUnPlugProc(const Topic topic, Request* req)
 #if DIALDATASET
     DialModelCharge::GetInstance()->UpdatechargeStatus(0);
 #endif
-
+    SaveEleModel::GetInstance()->SetChargeStatus(false);
 /* ---------------------------------- 充电弹窗 ---------------------------------- */
     testCHANINGView *t=testCHANINGView::GetInstance();
     if(t!=NULL)