更正历史问题：1.除了表盘界面，其他界面不出现上下拉界面；2.取消截图展示，使用实时绘制

diff --git a/code/sdk/application/wearable/fd230app/nativeui/blood/src/BloodCardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/blood/src/BloodCardView.cpp
index 4b79f79..9b49a7b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/blood/src/BloodCardView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/blood/src/BloodCardView.cpp
@@ -190,7 +190,7 @@ namespace OHOS
         {\r
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AddButton error!\n");\r
         };\r
-        SetCoverable(true);\r
+        // SetCoverable(true);\r
         return true;\r
     }\r
     /***\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassControlView.cpp b/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassControlView.cpp
index 2651ea9..bd87bff 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassControlView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassControlView.cpp
@@ -64,7 +64,7 @@ bool CompassControlView::InitView(void)
         compassView->SetVisible(true);
         compassCalibrationView->SetVisible(false);
     }
-    SetCoverable(true);
+    // SetCoverable(true);
     return true;
 }
 

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
new file mode 100644 (file)
index 0000000..f35bf63
--- /dev/null
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelCharge.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) CompanyNameMagicTag 2023. All rights reserved.
+ * Description: DialModelCharge
+ * Author:
+ * Create: 2023-12
+ */
+
+#ifndef DIAL_MODEL_Charge_H
+#define DIAL_MODEL_Charge_H
+
+#include "DialBaseModel.h"
+
+namespace OHOS
+{
+    class DialModelCharge : public DialBaseModel
+    {
+    public:
+        DialModelCharge() {}
+        virtual ~DialModelCharge() {}
+        static DialModelCharge *GetInstance()
+        {
+            static DialModelCharge instance;
+            return &instance;
+        }
+        bool GetDialFloatData(DialDataType &type, float &out) override;
+        void UpdateChargeStuaut(int16_t ChargeStuaut);
+
+    private:
+        int16_t ChargeStuaut = 0; // 默认没有充电
+    };
+}
+#endif
\ No newline at end of file

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
index 779cdaf..1d0a7be 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
@@ -178,7 +178,7 @@ namespace OHOS
         mainSwipeGroup->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight());
         mainSwipeGroup->SetAnimatorTime(50); // 50: animator drag time(ms);
         mainSwipeGroup->SetLoopState(true);
-        mainSwipeGroup->EnableScreenCap(true);
+        mainSwipeGroup->EnableScreenCap(false);//取消屏幕截图展示，使用实时绘制
         mainSwipeGroup->RegisterSwipeCallback(callback);
         SwitchToClockPage();
         SetContainerView(mainSwipeGroup);

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
new file mode 100644 (file)
index 0000000..d0a4da9
--- /dev/null
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelCharge.cpp
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) CompanyNameMagicTag 2023. All rights reserved.
+ * Description: DialModelCharge
+ * Author:
+ * Create: 2023-12
+ */
+
+#include "RegisterDialModel.h"
+#include "DialModelCharge.h"
+
+REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_HEART_RATE, OHOS::DialModelCharge::GetInstance());
+
+namespace OHOS
+{
+    bool DialModelCharge::GetDialFloatData(DialDataType &type, float &out)
+    {
+        (void)type;
+        out = ChargeStuaut;
+        return true;
+    }
+
+    void DialModelCharge::UpdateChargeStuaut(int16_t Charge)
+    {
+        ChargeStuaut = static_cast<float>(Charge);
+        if (onChangeListener_ != nullptr)
+        {
+            onChangeListener_->OnDialFloatDataUpdate(DialDataType::DATA_TYPE_CHARGE, ChargeStuaut);
+        }
+    }
+}

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp
index 7a8bce2..992a6ef 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp
@@ -224,7 +224,7 @@ namespace OHOS
         {\r
             printf("InitImage error!\n");\r
         };\r
-        SetCoverable(true);\r
+        // SetCoverable(true);\r
         return true;\r
     }\r
 \r

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 3958be9..540cd1a 100755 (executable)
--- 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
@@ -115,7 +115,7 @@ void MsgCenterNotifyChargePlugProc(const Topic topic, Request* req)
 {
     unused(req);
     unused(topic);
-     WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "MsgCenterNotifyProc:: CHarger Plug !");
+    WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "MsgCenterNotifyProc:: CHarger Plug !");
 }
 
 void MsgCenterNotifyChargeUnPlugProc(const Topic topic, Request* req)