activity文件夹更新

diff --git a/code/sdk/application/wearable/fd230app/nativeui/activity/include/ActivityModel.h b/code/sdk/application/wearable/fd230app/nativeui/activity/include/ActivityModel.h
index 7bf138e..7c694f9 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/activity/include/ActivityModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/activity/include/ActivityModel.h
@@ -10,8 +10,8 @@
 \r
 #define NUM_7 7\r
 \r
-#include <time.h>\r
-#include "stdio.h"\r
+#include <ctime>\r
+#include <cstdio>\r
 #include "ohos_types.h"\r
 #include "RtcService.h"\r
 #include "samgr_lite.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/activity/include/ActivityPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/activity/include/ActivityPresenter.h
index a65060d..1842d3b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/activity/include/ActivityPresenter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/activity/include/ActivityPresenter.h
@@ -9,7 +9,7 @@
 #define ACTIVITY_PRESENTER_H\r
 \r
 #include <sys/timerfd.h>\r
-#include <time.h>\r
+#include <ctime>\r
 #include "BaseView.h"\r
 #include "Presenter.h"\r
 #include "MainActivityView.h"\r
@@ -27,7 +27,7 @@ public:
     void OnResume() override;\r
     void OnStop() override;\r
     static ActivityPresenter *GetInstance();\r
-    virtual bool OnDrag(UIView& view, const DragEvent& event) override;\r
+    bool OnDrag(UIView& view, const DragEvent& event) override;\r
 };\r
 }\r
 #endif
\ No newline at end of file

diff --git a/code/sdk/application/wearable/fd230app/nativeui/activity/include/ActivityWeekView.h b/code/sdk/application/wearable/fd230app/nativeui/activity/include/ActivityWeekView.h
index 214f4f5..93da20d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/activity/include/ActivityWeekView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/activity/include/ActivityWeekView.h
@@ -27,7 +27,7 @@ namespace OHOS {
 class ActivityWeekView : public UICardPage {\r
 public:\r
     ActivityWeekView();\r
-    virtual ~ActivityWeekView();\r
+    ~ActivityWeekView() override;\r
     static ActivityWeekView *GetInstance(void);\r
     int GetDigits(int stepValue);\r
     void InitSteps();\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityModel.cpp
index fe8dcad..a073d84 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityModel.cpp
@@ -32,22 +32,22 @@ using namespace OHOS;
 static void Notify(void *args, const Topic topic, Request* request);
 
 Subscriber subscirber = {
-    .identity = NULL,
-    .args = NULL,
+    .identity = nullptr,
+    .args = nullptr,
     .Notify = Notify,
 };
 
 void StepSubscribeTopic(Topic topic)
 {
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "StepSubscribeTopic, topic=%u", topic);
-    BroadcastApi *broadcastApi = NULL;
+    BroadcastApi *broadcastApi = nullptr;
     IUnknown *api = SAMGR_GetInstance()->GetFeatureApi(BROADCAST_SERVICE_NAME, BROADCAST_FEATURE_NAME);
-    if (api == NULL) {
+    if (api == nullptr) {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "StepSubscribeTopic, GetFeatureApi failed");
         return;
     }
     int result = api->QueryInterface(api, DEFAULT_VERSION, (void **)&broadcastApi);
-    if (result != 0 || broadcastApi == NULL) {
+    if (result != 0 || broadcastApi == nullptr) {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "StepSubscribeTopic, QueryInterface failed");
         return;
     }
@@ -58,14 +58,14 @@ void StepSubscribeTopic(Topic topic)
 void StepUnsubscribeTopic(Topic topic)
 {
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "StepUnsubscribeTopic, topic=%u", topic);
-    BroadcastApi *broadcastApi = NULL;
+    BroadcastApi *broadcastApi = nullptr;
     IUnknown *api = SAMGR_GetInstance()->GetFeatureApi(BROADCAST_SERVICE_NAME, BROADCAST_FEATURE_NAME);
-    if (api == NULL) {
+    if (api == nullptr) {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "StepUnsubscribeTopic, GetFeatureApi failed");
         return;
     }
     int result = api->QueryInterface(api, DEFAULT_VERSION, (void **)&broadcastApi);
-    if (result != 0 || broadcastApi == NULL) {
+    if (result != 0 || broadcastApi == nullptr) {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "StepUnsubscribeTopic, QueryInterface failed");
         return;
     }
@@ -77,30 +77,32 @@ static void RefreshStepControls(const uint32_t &value, const uint16 &msgId)
 {
     MainClockView *mainClockView = OHOS::MainClockView::GetInstance();
     if (mainClockView != nullptr) {
-        GraphicService::GetInstance()->PostGraphicEvent(std::bind(&MainClockView::RefreshStep, mainClockView, value));
+        GraphicService::GetInstance()->PostGraphicEvent(
+            std::bind(&MainClockView::RefreshStep, mainClockView, value));
     }
+
     IndoorWalkPresenter *indoorWalkPresenter = OHOS::IndoorWalkPresenter::GetInstance();
     if (indoorWalkPresenter != nullptr) {
-        GraphicService::GetInstance()->PostGraphicEvent(std::bind(&IndoorWalkPresenter::ModifiesSteps,
-                                                              indoorWalkPresenter, value));
+        GraphicService::GetInstance()->PostGraphicEvent(
+            std::bind(&IndoorWalkPresenter::ModifiesSteps, indoorWalkPresenter, value));
     }
 
     ActivityWeekView *activityWeekView = OHOS::ActivityWeekView::GetInstance();
     if (activityWeekView == nullptr) {
         return;
     }
-    GraphicService::GetInstance()->PostGraphicEvent(std::bind(&ActivityWeekView::RefreshSteps,
-                                                                    activityWeekView, value));
+    GraphicService::GetInstance()->PostGraphicEvent(
+        std::bind(&ActivityWeekView::RefreshSteps, activityWeekView, value));
 
     if (msgId == TOPIC_EVENT_STEPDATA_UPDATE) {
-        GraphicService::GetInstance()->PostGraphicEvent(std::bind(&ActivityWeekView::RefreshTodayView,
-                                                                        activityWeekView, value));
+        GraphicService::GetInstance()->PostGraphicEvent(
+            std::bind(&ActivityWeekView::RefreshTodayView, activityWeekView, value));
     } else if (msgId == TOPIC_EVENT_NEXTDAY_UPDATE) {
-        GraphicService::GetInstance()->PostGraphicEvent(std::bind(&ActivityWeekView::InitAvgStep,
-                                                                        activityWeekView));
+        GraphicService::GetInstance()->PostGraphicEvent(
+            std::bind(&ActivityWeekView::InitAvgStep, activityWeekView));
         if (OHOS::ActivityModel::GetInstance()->GetWeekToday() == MONDAY_STEP_COUNTER) {
-            GraphicService::GetInstance()->PostGraphicEvent(std::bind(&ActivityWeekView::InitWeekView,
-                                                                            activityWeekView));
+            GraphicService::GetInstance()->PostGraphicEvent(
+                std::bind(&ActivityWeekView::InitWeekView, activityWeekView));
         }
     }
 }
@@ -109,12 +111,12 @@ static void Notify(void *args, const Topic topic, Request* request)
 {
     UNUSED(args);
     UNUSED(topic);
-    if (request == NULL) {
+    if (request == nullptr) {
         return;
     }
 
     if (request->msgId == TOPIC_EVENT_STEPDATA_UPDATE) {
-        if (request->data == NULL) {
+        if (request->data == nullptr) {
             return;
         }
         // 计步数据累加
@@ -122,10 +124,9 @@ static void Notify(void *args, const Topic topic, Request* request)
         // counter += *(uint32_t *)request->data;
         uint32 counter = *(uint32_t *)request->data;
         OHOS::ActivityModel::GetInstance()->ReviseStepCounter(counter);
-        OHOS::DialModelSteps::GetInstance()->UpdateSteps(counter);//更新表盘步数
-        GraphicService::GetInstance()->PostGraphicEvent(std::bind(&ActivityModel::SetStepData,
-                                                                        ActivityModel::GetInstance(), counter));
 
+        GraphicService::GetInstance()->PostGraphicEvent(
+            std::bind(&ActivityModel::SetStepData, ActivityModel::GetInstance(), counter));
         RefreshStepControls(counter, TOPIC_EVENT_STEPDATA_UPDATE);
     }
 
@@ -141,13 +142,13 @@ static void Notify(void *args, const Topic topic, Request* request)
 #endif
 
 namespace OHOS {
-StepAllData g_stepData1 = {0, 0, 0, 0, 0, 0, 0};
+StepAllData g_stepData1 = {10050, 13421, 12312, 4252, 8993, 12314, 3423};
 
 static constexpr const char *STEP_DATA_PATH = "/user/userdata/step_";
 static constexpr uint32_t SECONDS_ONEDAY = 86400;
 static constexpr uint16_t ONT_MIN_STEP_CONTER = 120;
 
-osTimerId_t g_saveEveryMinHandle = NULL;
+osTimerId_t g_saveEveryMinHandle = nullptr;
 void SaveEveryMinCallback(int data);
 
 ActivityModel::ActivityModel()
@@ -160,13 +161,13 @@ ActivityModel::~ActivityModel()
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ActivityModel::~ActivityModel");
     StepUnsubscribeTopic(TOPIC_EVENT_STEPDATA_UPDATE);
     StepUnsubscribeTopic(TOPIC_EVENT_NEXTDAY_UPDATE);
-    if (g_saveEveryMinHandle != NULL) {
+    if (g_saveEveryMinHandle != nullptr) {
         osStatus_t ret = osTimerDelete(g_saveEveryMinHandle);
         if (ret != osOK) {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "~ActivityModel osTimerDelete failed, ret = %lx!!", ret);
             return;
         }
-        g_saveEveryMinHandle = NULL;
+        g_saveEveryMinHandle = nullptr;
     }
 }
 
@@ -210,8 +211,7 @@ static void SaveEveryMinCallbackProc(int data)
     uint32 savedValue = ActivityModel::GetInstance()->GetLastSavedValue();
     if (savedValue != g_stepData1.weekSteps[today]) {
         struct tm curTime;
-        time_t second;
-        second = time(NULL);
+        time_t second = time(nullptr);
         (void)gmtime_r((const time_t *)&second, &curTime);
         ActivityModel::GetInstance()->SaveStepToFile(&curTime);
     }
@@ -226,11 +226,11 @@ void ActivityModel::SetStepData(uint32_t &value)
 {
     g_stepData1.weekSteps[weekToday] = value;
     // 第一次上报数据后打开定时器
-    if (g_saveEveryMinHandle != NULL) {
+    if (g_saveEveryMinHandle != nullptr) {
         return;
     }
-    g_saveEveryMinHandle = osTimerNew((osTimerFunc_t)SaveEveryMinCallback, osTimerPeriodic, NULL, NULL);
-    if (g_saveEveryMinHandle == NULL) {
+    g_saveEveryMinHandle = osTimerNew((osTimerFunc_t)SaveEveryMinCallback, osTimerPeriodic, nullptr, nullptr);
+    if (g_saveEveryMinHandle == nullptr) {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ActivityModel::SetStepData osTimerNew failed!!");
         return;
     }
@@ -238,13 +238,13 @@ void ActivityModel::SetStepData(uint32_t &value)
     osStatus_t retTimer = osTimerStart(g_saveEveryMinHandle, tick);
     if (retTimer != osOK) {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ActivityModel::SetStepData osTimerStart failed, ret = %lx!!", retTimer);
-        if (g_saveEveryMinHandle != NULL) {
+        if (g_saveEveryMinHandle != nullptr) {
             retTimer = osTimerDelete(g_saveEveryMinHandle);
             if (retTimer != osOK) {
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ActivityModel::SetStepData osTimerDelete  ret = %lx!!", retTimer);
                 return;
             }
-            g_saveEveryMinHandle = NULL;
+            g_saveEveryMinHandle = nullptr;
         }
         return;
     }
@@ -273,8 +273,7 @@ uint32_t ActivityModel::ZeroHourStepHandle(void)
 {
     g_stepData1.weekSteps[weekToday] = stepCounter;
     struct tm historyTime;
-    time_t second;
-    second = time(NULL) - SECONDS_ONEDAY;
+    time_t second = time(nullptr) - SECONDS_ONEDAY;
     (void)gmtime_r((const time_t *)&second, &historyTime);
     SaveStepToFile(&historyTime);
     stepCounter = 0;

diff --git a/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityWeekView.cpp b/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityWeekView.cpp
index 3eb986e..54a62e3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityWeekView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityWeekView.cpp
@@ -110,27 +110,27 @@ ActivityWeekView *ActivityWeekView::GetInstance(void)
 \r
 UIView *ActivityWeekView::CreateUIView(int16_t x, int16_t y)\r
 {\r
-    UIView *view = new UIView();\r
-    if (view == nullptr) {\r
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ActivityWeekView::InitView view is nullptr");\r
+    UIView *uiView = new UIView();\r
+    if (uiView == nullptr) {\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ActivityWeekView::InitView uiView is nullptr");\r
         return nullptr;\r
     }\r
-    view->SetStyle(STYLE_BACKGROUND_COLOR, Color::GetColorFromRGB(0x00, 165, 230).full);\r
-    view->SetStyle(STYLE_BACKGROUND_OPA, 127); // 127 : background opacity\r
-    view->SetStyle(STYLE_BORDER_COLOR, Color::Gray().full);\r
-    view->SetStyle(STYLE_BORDER_OPA, 127); // 127 : border opacity\r
-    view->SetStyle(STYLE_BORDER_WIDTH, 0); // 0 : border width\r
-    view->SetStyle(STYLE_PADDING_LEFT, 0);\r
-    view->SetStyle(STYLE_PADDING_RIGHT, 0);\r
-    view->SetStyle(STYLE_PADDING_TOP, 0);\r
-    view->SetStyle(STYLE_PADDING_BOTTOM, 0);\r
-    view->SetStyle(STYLE_MARGIN_LEFT, 0);\r
-    view->SetStyle(STYLE_MARGIN_RIGHT, 0);\r
-    view->SetStyle(STYLE_MARGIN_TOP, 0);\r
-    view->SetStyle(STYLE_MARGIN_BOTTOM, 0);\r
-    view->SetPosition(x, y);\r
-    view->SetStyle(STYLE_BORDER_RADIUS, UIVIEW_WIDTH / 2 + 10); // 2 : half width 10 : offset\r
-    return view;\r
+    uiView->SetStyle(STYLE_BACKGROUND_COLOR, Color::GetColorFromRGB(0x00, 165, 230).full);\r
+    uiView->SetStyle(STYLE_BACKGROUND_OPA, 127); // 127 : background opacity\r
+    uiView->SetStyle(STYLE_BORDER_COLOR, Color::Gray().full);\r
+    uiView->SetStyle(STYLE_BORDER_OPA, 127); // 127 : border opacity\r
+    uiView->SetStyle(STYLE_BORDER_WIDTH, 0); // 0 : border width\r
+    uiView->SetStyle(STYLE_PADDING_LEFT, 0);\r
+    uiView->SetStyle(STYLE_PADDING_RIGHT, 0);\r
+    uiView->SetStyle(STYLE_PADDING_TOP, 0);\r
+    uiView->SetStyle(STYLE_PADDING_BOTTOM, 0);\r
+    uiView->SetStyle(STYLE_MARGIN_LEFT, 0);\r
+    uiView->SetStyle(STYLE_MARGIN_RIGHT, 0);\r
+    uiView->SetStyle(STYLE_MARGIN_TOP, 0);\r
+    uiView->SetStyle(STYLE_MARGIN_BOTTOM, 0);\r
+    uiView->SetPosition(x, y);\r
+    uiView->SetStyle(STYLE_BORDER_RADIUS, UIVIEW_WIDTH / 2 + 10); // 2 : half width 10 : offset\r
+    return uiView;\r
 }\r
 \r
 void ActivityWeekView::InitSteps()\r