优化久坐提醒逻辑

diff --git a/code/sdk/application/wearable/fd230app/nativeui/sedentary_setting/src/SedentarySettingModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/sedentary_setting/src/SedentarySettingModel.cpp
index cb120e0..d1800d4 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/sedentary_setting/src/SedentarySettingModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/sedentary_setting/src/SedentarySettingModel.cpp
@@ -1,19 +1,27 @@
 #include "sedentary_setting/include/SedentarySettingModel.h"
+#include "ConfigModelC.h"
+#include "ConfigModel.h"
 
 #include "custom_runtime.h"
 
-namespace OHOS {
-
-void SedentarySettingModel::SetSwitch(bool enable)
+namespace OHOS
 {
-    uapi_dev_runtime_set_sedentary_status(enable ? 1 : 0);
-}
 
-bool SedentarySettingModel::GetSwitch()
-{
-    return uapi_dev_runtime_get_sedentary_status() ? true : false;
-}
-
-} // namespace OHOS
+    void SedentarySettingModel::SetSwitch(bool enable)
+    {
+        if (enable == true)
+        {
+            ConfigModel::GetInstance()->SetSedentarySwitch(true);
+            ConfigModel::GetInstance()->SetSedentaryInterval(1);
+        }
+        else
+            ConfigModel::GetInstance()->SetSedentarySwitch(false);
+    }
 
+    bool SedentarySettingModel::GetSwitch()
+    {
+        
+        return (ConfigModel::GetInstance()->GetSedentarySwitch() == 1) ? true:false;
+    }
 
+} // namespace OHOS

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp
index c89b58d..079f000 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp
@@ -172,7 +172,7 @@ namespace OHOS
         LabelSetup labelSetups[] = {\r
             {153, STR_ABOUT_WATCH},\r
             // {273, STR_SYSTEM_UPDATE},\r
-            {273, STR_TIME_FORMAT_SET},\r
+            {273, STR_SEDENTARY_REMINDER},\r
             {393, STR_TIME_FORMAT_SET},\r
             {513, STR_WATCH_QR_CODE},\r
             {633, STR_SYSTEM_LANGUAGE},\r