From: Caisking <3449750381@qq.com>
Date: Sat, 17 Aug 2024 09:31:57 +0000 (+0800)
Subject: 修改错误的充电状态拼写
X-Git-Tag: release_V1.2.70_20241020_135402~643
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=b47e59e8681830f3e7641af70d7082623c2df246;p=mirrors%2FFD230.git

修改错误的充电状态拼写
---

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
index 82b09f2db..aa8f7dca5 100644
--- a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
@@ -490,7 +490,7 @@ namespace OHOS
         if (get_charge_stat())
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Power is Charging!");
-            DialModelCharge::GetInstance()->UpdateChargeStuaut(1);
+            DialModelCharge::GetInstance()->UpdatechargeStatus(1);
         }
     }
 
diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelCharge.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelCharge.h
index 0588a5d38..373ed7ed2 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelCharge.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelCharge.h
@@ -23,10 +23,10 @@ namespace OHOS
             return &instance;
         }
         bool GetDialFloatData(DialDataType &type, float &out) override;
-        void UpdateChargeStuaut(int16_t ChargeStuaut);
+        void UpdatechargeStatus(int16_t chargeStatus);
 
     private:
-        int16_t ChargeStuaut_ = 0; // 默认没有充电 测试为充电
+        int16_t chargeStatus_ = 0; // 默认没有充电 测试为充电
     };
 }
 #endif
\ No newline at end of file
diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelCharge.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelCharge.cpp
index e4c08c545..a78dd613b 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelCharge.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelCharge.cpp
@@ -15,17 +15,17 @@ namespace OHOS
     bool DialModelCharge::GetDialFloatData(DialDataType &type, float &out)
     {
         (void)type;
-        out = ChargeStuaut_;
-        //WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DialModelCharge %d", ChargeStuaut_);
+        out = chargeStatus_;
+        //WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DialModelCharge %d", chargeStatus_);
         return true;
     }
 
-    void DialModelCharge::UpdateChargeStuaut(int16_t ChargeStuaut)
+    void DialModelCharge::UpdatechargeStatus(int16_t chargeStatus)
     {
-        ChargeStuaut_ = static_cast<float>(ChargeStuaut);
+        chargeStatus_ = static_cast<float>(chargeStatus);
         if (onChangeListener_ != nullptr)
         {
-            onChangeListener_->OnDialFloatDataUpdate(DialDataType::DATA_TYPE_CHARGE, ChargeStuaut_);
+            onChangeListener_->OnDialFloatDataUpdate(DialDataType::DATA_TYPE_CHARGE, 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 b3865869d..b690175ee 100644
--- 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
@@ -356,9 +356,9 @@ void MsgCenterNotifyChargePlugProc(const Topic topic, Request* req)
         display_api->turn_on_screen();
     }
 #if DIALDATASET
-    DialModelCharge::GetInstance()->UpdateChargeStuaut(1);
+    DialModelCharge::GetInstance()->UpdatechargeStatus(1);
 #endif
-    SaveEleModel::GetInstance()->SetChargeStuaut(1);
+    SaveEleModel::GetInstance()->SetChargeStatus(1);
 
    
 
@@ -382,9 +382,9 @@ void MsgCenterNotifyChargeUnPlugProc(const Topic topic, Request* req)
     unused(topic);
     WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "MsgCenterNotifyProc:: CHarger UnPlug !");
 #if DIALDATASET
-    DialModelCharge::GetInstance()->UpdateChargeStuaut(0);
+    DialModelCharge::GetInstance()->UpdatechargeStatus(0);
 #endif
-    SaveEleModel::GetInstance()->SetChargeStuaut(0);
+    SaveEleModel::GetInstance()->SetChargeStatus(0);
 
    
 
@@ -454,8 +454,8 @@ void MsgCenterNotifyLowPowerAlarmProc(const Topic topic, Request* req)
    
     
     //TODO: 亮屏弹窗倒计时5秒关机(不需要取消,强制关机)
-    // DialModelCharge::GetInstance()->UpdateChargeStuaut(0);
-    // SaveEleModel::GetInstance()->SetChargeStuaut(0);
+    // DialModelCharge::GetInstance()->UpdatechargeStatus(0);
+    // SaveEleModel::GetInstance()->SetChargeStatus(0);
     
     // testCHANINGView *t=testCHANINGView::GetInstance();
     // if(t!=NULL)