修复主界面首次刷新notify

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
index 077ad21..f8f18f9 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
@@ -268,9 +268,9 @@ namespace OHOS
         {VIEW_CONNECT_PHONE, &NativeLauncher::InitConnectPhoneSlice},
         {VIEW_INDOORWALK, &NativeLauncher::InitIndoorWalkSlice},
         {VIEW_SHUTDOWN_OR_REBOOT, &NativeLauncher::InitRebootSlice},
-        {VIEW_WEATHER, &NativeLauncher::InitWeatherSlice},                                   // 天气
-        {VIEW_GOAL, &NativeLauncher::InitGoalSlice},                                   // 每日目标
-        
+        {VIEW_WEATHER, &NativeLauncher::InitWeatherSlice}, // 天气
+        {VIEW_GOAL, &NativeLauncher::InitGoalSlice},       // 每日目标
+
         {VIEW_SYSTEM, &NativeLauncher::InitSystemSlice},                                     // 系统实例化地址
         {VIEW_SOUND_VIBRATION, &NativeLauncher::InitSoundAndVibrationSlice},                 // 声音与震动实例化地址
         {VIEW_SYSTEM_VOLUME, &NativeLauncher::InitSystemVolumeSlice},                        // 系统音量
@@ -685,8 +685,6 @@ namespace OHOS
         NativeAbility::GetInstance().AddSliceProxy(VIEW_GOAL, maingoal);
     }
 
-
-
     void NativeLauncher::InitSystemSlice(void) // 系统
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "NativeLauncher::InitSystemSlice");

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/MainPresenterSample.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/MainPresenterSample.h
index 2f93189..e71f143 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/include/MainPresenterSample.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/MainPresenterSample.h
@@ -24,7 +24,6 @@
 #include "HeartRateView.h"
 #include "swipe_effect/zoom_effect.h"
 
-
 namespace OHOS
 {
     static constexpr const char *MAIN_CLICK_WEATHER = "mainclickweather";
@@ -52,18 +51,18 @@ namespace OHOS
     {
     public:
         MainPresenterSample();
-    ~MainPresenterSample() override;
+        ~MainPresenterSample() override;
         static MainPresenterSample *GetInstance(void);
 
         void OnStart() override;
         void OnPause() override;
         void OnResume() override;
         void OnStop() override;
-    void Notify() override;
+        void Notify() override;
         bool OnClick(UIView &view, const ClickEvent &event) override;
         bool OnDrag(UIView &view, const DragEvent &event) override;
         bool OnLongPress(UIView &view, const LongPressEvent &event) override;
-    void OnSwipe(UISwipeView& view) override;
+        void OnSwipe(UISwipeView &view) override;
         void SetPage(int8_t id);
         void SetTaskPeroid(CardId cardId);
         void setCallback(ZoomEffect *callback)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/ModelListenerSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/ModelListenerSample.cpp
index c5e76b7..060ada9 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/ModelListenerSample.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/ModelListenerSample.cpp
@@ -18,20 +18,22 @@
 #include "PresenterTask.h"
 
 #include "wearable_log.h"
-namespace OHOS {
-ModelListenerSample::ModelListenerSample()
+namespace OHOS
 {
-    PresenterTask::GetInstance()->SetModelListener(this);
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ModelListenerSample::ModelListenerSample");
-}
-ModelListenerSample::~ModelListenerSample()
-{
-    PresenterTask::GetInstance()->SetModelListener(nullptr);
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ModelListenerSample::~ModelListenerSample");
-}
+    ModelListenerSample::ModelListenerSample()
+    {
+        PresenterTask::GetInstance()->SetModelListener(this);
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ModelListenerSample::ModelListenerSample");
+    }
+    ModelListenerSample::~ModelListenerSample()
+    {
+        PresenterTask::GetInstance()->SetModelListener(nullptr);
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ModelListenerSample::~ModelListenerSample");
+    }
 
-void ModelListenerSample::Callback()
-{
-    Notify();
-}
+    void ModelListenerSample::Callback()
+    {
+        Notify();
+        OnTickEvent(); // 加载表盘、卡片配置
+    }
 }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/rtcservice/include/rtc_at_cmd.h b/code/sdk/application/wearable/fd230app/nativeui/rtcservice/include/rtc_at_cmd.h
index fee6408..9d9202a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/rtcservice/include/rtc_at_cmd.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/rtcservice/include/rtc_at_cmd.h
@@ -22,6 +22,7 @@ extern "C"
 #endif /* __cplusplus */
 
     at_cmd_table_t *get_rtc_cmd_table(uint32_t *cmd_count);
+    bool get_printf();
 
 #ifdef __cplusplus
 #if __cplusplus

diff --git a/code/sdk/application/wearable/fd230app/nativeui/rtcservice/src/rtc_at_cmd.cpp b/code/sdk/application/wearable/fd230app/nativeui/rtcservice/src/rtc_at_cmd.cpp
index ccd97e3..6f0b4b0 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/rtcservice/src/rtc_at_cmd.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/rtcservice/src/rtc_at_cmd.cpp
@@ -19,10 +19,10 @@ extern "C"
 
 #define RTCTEST_SUCCESS 0
 #define RTCTEST_FAILED (-1)
-
+    static bool printf_set = false;
     // bool is_rtc_print_enabled = true;
     static int ConvertCmdToParam(uint8_t *para, uint32_t paraLen,
-                                 uint8_t argv[RTCTEST_MAX_ARGC][RTCTEST_MAX_ARGV_LEN], uint32_t *argc)
+                      uint8_t argv[RTCTEST_MAX_ARGC][RTCTEST_MAX_ARGV_LEN], uint32_t *argc)
     {
         uint32_t pos = 0;
         *argc = 0;
@@ -56,6 +56,11 @@ extern "C"
 
         return RTCTEST_SUCCESS;
     }
+    static void set_printf(bool set)
+    {
+        printf("set_printf %d\r\n", set);
+        printf_set = set;
+    }
 
     static uint32_t rtc_do_test(uint8_t *para, uint32_t paraLen, char *strCommonCmd)
     {
@@ -103,6 +108,11 @@ extern "C"
         return (at_cmd_table_t *)g_rtc_cmd;
     }
 
+    bool get_printf()
+    {
+        return printf_set;
+    }
+
 #ifdef __cplusplus
 #if __cplusplus
 }

diff --git a/code/sdk/middleware/services/gui/uikit/proprietary/include/service/graphic_service_wrapper.h b/code/sdk/middleware/services/gui/uikit/proprietary/include/service/graphic_service_wrapper.h
index 89e10f2..6c65e2e 100755 (executable)
--- a/code/sdk/middleware/services/gui/uikit/proprietary/include/service/graphic_service_wrapper.h
+++ b/code/sdk/middleware/services/gui/uikit/proprietary/include/service/graphic_service_wrapper.h
@@ -1,7 +1,7 @@
 /*** 
  * @Date: 2024-05-30 15:59:37
  * @LastEditors: Caisking 3449750381@qq.com
- * @LastEditTime: 2024-06-17 16:06:42
+ * @LastEditTime: 2024-06-17 17:09:31
  * @FilePath: /XTS_FD230/FD230/code/sdk/middleware/services/gui/uikit/proprietary/include/service/graphic_service_wrapper.h
  */
 /*
@@ -81,7 +81,6 @@ void GpuResetStart(void);
  */
 void GpuResetEnd(void);
 
-void set_printf(bool set);
 
 #ifdef __cplusplus
 };

diff --git a/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service_wrapper.cpp b/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service_wrapper.cpp
index 01019f3..ad04606 100755 (executable)
--- a/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service_wrapper.cpp
+++ b/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service_wrapper.cpp
@@ -23,6 +23,7 @@
 #include "common/screen.h"
 #include "components/root_view.h"
 #include "components/ui_image_view.h"
+#include "rtcservice/include/rtc_at_cmd.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -51,15 +52,6 @@ static OHOS::ImageInfo* g_ota_imgInfo = nullptr;
 
 #endif
 
-// 全局变量，用于标记刷新操作是否执行
-bool refresh_executed = false;
-bool printf_set = false;
-
-void set_printf(bool set)
-{
-    printf("set_printf %d\r\n",set);
-    printf_set = set;
-}
 
 static void UikitRTCCallBack(uintptr_t data)
 {
@@ -67,15 +59,12 @@ static void UikitRTCCallBack(uintptr_t data)
     if (!g_initialized || !g_isScreenOn) {
         return;
     }
-    if(printf_set)
+    if(get_printf())
     {
-        printf("[refresh_executed is %d g_rtcHandle is %d g_timeInterval is %d ]\r\n",refresh_executed,g_rtcHandle,g_timeInterval);
+        printf("[g_timeInterval is %d ]\r\n",g_timeInterval);
     }
     uapi_rtc_start(g_rtcHandle, g_timeInterval, UikitRTCCallBack, 0);
     GraphicService::GetInstance()->UpdateGraphicEvent();
-
-    // 标记刷新操作已执行
-    refresh_executed = true;
 }
 
 void SetFrequenceInner(int freq)
@@ -120,6 +109,7 @@ void NotifyScreenOn(void)
         OHOS::LowPowerManager::GetInstance()->ExitLowPower();
         uapi_rtc_start(g_rtcHandle, g_timeInterval, static_cast<rtc_callback_t>(UikitRTCCallBack), 0);
     }
+
     GraphicService::GetInstance()->NotifyScreenOn();
 }