1.删除n9项目无用slice:温度 2.Resume函数添加按键监听防止按键监听失效问题 3249/1 3249/head 3265/target/1 3266/target/1
authorluozheng <1732036298@qq.com>
Fri, 6 Mar 2026 06:19:49 +0000 (14:19 +0800)
committerluozheng <1732036298@qq.com>
Fri, 6 Mar 2026 06:19:49 +0000 (14:19 +0800)
68 files changed:
code/sdk/application/wearable/n9/nativeapp/nativeui/callerlog/include/CallerLogPresenter.h
code/sdk/application/wearable/n9/nativeapp/nativeui/callerlog/src/CallerLogPresenter.cpp
code/sdk/application/wearable/n9/nativeapp/nativeui/codedlock/include/CodedLockPresenter.h
code/sdk/application/wearable/n9/nativeapp/nativeui/codedlock/src/CodedLockPresenter.cpp
code/sdk/application/wearable/n9/nativeapp/nativeui/displaybrightness/include/DisplayBrightnessPresenter.h
code/sdk/application/wearable/n9/nativeapp/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp
code/sdk/application/wearable/n9/nativeapp/nativeui/phone/include/PhoneCallPresenter.h
code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/PhoneCallPresenter.cpp
code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/PhoneCallView.cpp
code/sdk/application/wearable/n9/nativeapp/nativeui/sleep/include/SleepControlPresenter.h
code/sdk/application/wearable/n9/nativeapp/nativeui/sleep/src/SleepControlPresenter.cpp
code/sdk/application/wearable/n9/nativeapp/nativeui/systemupdate/src/SystemUpdatePresenter.cpp
code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempClickMea.h [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempContinueWarn.h [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempExitInter.h [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempExitPrompt.h [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempInitInter.h [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempJoinStudy.h [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempLittleTip.h [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempMainView.h [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempMeaProcess.h [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempMeasure.h [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempModel.h [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempPresenter.h [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempPromptWear.h [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempRemindWear.h [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempReport.h [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempStudyAbout.h [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempWarn.h [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempClickMea.cpp [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempContinueWarn.cpp [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempExitInter.cpp [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempExitPrompt.cpp [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempInitInter.cpp [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempJoinStudy.cpp [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempLittleTip.cpp [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempMainView.cpp [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempMeaProcess.cpp [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempMeasure.cpp [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempModel.cpp [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempPresenter.cpp [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempPromptWear.cpp [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempRemindWear.cpp [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempReport.cpp [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempStudyAbout.cpp [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempWarn.cpp [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/traing/include/TraingEnddataPresenter.h
code/sdk/application/wearable/n9/nativeapp/nativeui/traing/include/TraingNomalPresenter.h
code/sdk/application/wearable/n9/nativeapp/nativeui/traing/include/TraingPresenter.h
code/sdk/application/wearable/n9/nativeapp/nativeui/traing/src/TraingEnddataPresenter.cpp
code/sdk/application/wearable/n9/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp
code/sdk/application/wearable/n9/nativeapp/nativeui/traing/src/TraingPresenter.cpp
code/sdk/application/wearable/n9/nativeapp/nativeui/traing/src/TraingSetPresenter.cpp
code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_GPS/include/TraingGPSPresenter.h
code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_GPS/include/TraingGPSbackPresenter.h
code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_GPS/include/TraingGPSlackPresenter.h
code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_GPS/include/TraingGPSnotePresenter.h
code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_GPS/include/TraingGPSsetPresenter.h
code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_GPS/src/TraingGPSPresenter.cpp
code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_GPS/src/TraingGPSbackPresenter.cpp
code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_GPS/src/TraingGPSlackPresenter.cpp
code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_GPS/src/TraingGPSlostPresenter.cpp
code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_GPS/src/TraingGPSnotePresenter.cpp
code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_GPS/src/TraingGPSsetPresenter.cpp
code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_card/include/TraingCardPresenter.h
code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_card/src/TraingCardPresenter.cpp
code/sdk/build/config/target_config/brandy/config.py
code/sdk/middleware/services/gui/uikit/ui/frameworks/dock/pointer_input_device.cpp

index fc62368..460fa63 100644 (file)
@@ -23,7 +23,6 @@ public:
     ~CallerLogPresenter() override;\r
 \r
     void OnStart() override;\r
-    void OnPause() override;\r
     void OnResume() override;\r
     void OnStop() override;\r
 \r
index 1d29b3e..beb0c5c 100644 (file)
@@ -36,18 +36,13 @@ CallerLogPresenter *CallerLogPresenter::GetInstance(void)
 \r
 void CallerLogPresenter::OnStart()\r
 {\r
-    Presenter<CallerLogView>::OnStart();\r
 }\r
 \r
 void CallerLogPresenter::OnResume(void)\r
 {\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ApplistPresenter::OnResume()");\r
-\r
     return;\r
 }\r
 \r
-void CallerLogPresenter::OnPause(void) {}\r
-\r
 void CallerLogPresenter::OnStop(void)\r
 {\r
     if (hintsCounting != nullptr) {\r
index f3d9bb7..208bb17 100644 (file)
@@ -43,9 +43,7 @@ namespace OHOS
         virtual ~CodedLockPresenter();
 
         void OnStart() override;
-        void OnPause() override;
         void OnResume() override;
-        void OnStop() override;
 
         static CodedLockPresenter *GetInstance();
         void JudgeMatch();
index ce75982..8419065 100644 (file)
@@ -53,22 +53,10 @@ namespace OHOS
         /*重置密码状态*/
         CodedLockModel::GetInstance()->ClearPassword();
         CodedLockModel::GetInstance()->ResetLockState();
-        Presenter<CodedLockView>::OnStart();
     }
-
-    void CodedLockPresenter::OnPause(void)
-    {
-        Presenter<CodedLockView>::OnPause();
-    }
-
+    
     void CodedLockPresenter::OnResume(void)
     {
-        Presenter<CodedLockView>::OnResume();
-    }
-
-    void CodedLockPresenter::OnStop(void)
-    {
-        Presenter<CodedLockView>::OnStop();
     }
 
     void CodedLockPresenter::JudgeMatch()  
index c454b00..cf86ff1 100644 (file)
@@ -87,9 +87,7 @@ namespace OHOS
         virtual ~DisplayBrightnessPresenter();\r
 \r
         void OnStart() override;\r
-        void OnPause() override;\r
         void OnResume() override;\r
-        void OnStop() override;\r
 \r
         static DisplayBrightnessPresenter *GetInstance();\r
         void SetRaiseToBrightnessState(bool value);\r
index 5adfefe..9e1a233 100644 (file)
@@ -145,25 +145,12 @@ namespace OHOS
     void DisplayBrightnessPresenter::OnStart()\r
     {\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessPresenter::OnStart");\r
-        Presenter<DisplayBrightnessView>::OnStart();\r
-    }\r
-\r
-    void DisplayBrightnessPresenter::OnPause(void)\r
-    {\r
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessPresenter::OnPause");\r
-        Presenter<DisplayBrightnessView>::OnPause();\r
     }\r
 \r
     void DisplayBrightnessPresenter::OnResume(void)\r
     {\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessPresenter::OnResume");\r
-        Presenter<DisplayBrightnessView>::OnResume();\r
-    }\r
-\r
-    void DisplayBrightnessPresenter::OnStop(void)\r
-    {\r
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessPresenter::OnStop");\r
-        Presenter<DisplayBrightnessView>::OnStop();\r
+        RootView::GetInstance()->SetOnKeyActListener(this);\r
     }\r
 \r
     bool DisplayBrightnessPresenter::OnClick(UIView &view, const ClickEvent &event)\r
index 66fc974..4dd464f 100644 (file)
@@ -22,9 +22,7 @@ namespace OHOS
         virtual ~PhoneCallPresenter();\r
 \r
         void OnStart() override;\r
-        void OnPause() override;\r
         void OnResume() override;\r
-        void OnStop() override;\r
         void Invalidate();\r
         void UpdatePhoneNumberView(const std::string &number);\r
         static PhoneCallPresenter *GetInstance();\r
index 7426a10..8a2b71f 100644 (file)
@@ -43,26 +43,11 @@ namespace OHOS
 \r
     void PhoneCallPresenter::OnStart()\r
     {\r
-\r
-        Presenter<PhoneCallView>::OnStart();\r
-    }\r
-\r
-    void PhoneCallPresenter::OnPause(void)\r
-    {\r
-\r
-        Presenter<PhoneCallView>::OnPause();\r
     }\r
 \r
     void PhoneCallPresenter::OnResume(void)\r
     {\r
-\r
-        Presenter<PhoneCallView>::OnResume();\r
-    }\r
-\r
-    void PhoneCallPresenter::OnStop(void)\r
-    {\r
-\r
-        Presenter<PhoneCallView>::OnStop();\r
+        RootView::GetInstance()->SetOnKeyActListener(this);\r
     }\r
 \r
     bool PhoneCallPresenter::OnDrag(UIView &view, const DragEvent &event)\r
index e16416e..0c78914 100644 (file)
@@ -262,7 +262,7 @@ namespace OHOS
         Init();\r
         // 增加按键监听\r
         RootView::OnKeyActListener *keyactListener = (RootView::OnKeyActListener *)OHOS::PhoneCallPresenter::GetInstance();\r
-       RootView::GetInstance()->SetOnKeyActListener(keyactListener);\r
+        RootView::GetInstance()->SetOnKeyActListener(keyactListener);\r
     }\r
 \r
    \r
index 998b974..4d4cad2 100644 (file)
@@ -36,9 +36,7 @@ namespace OHOS
         virtual ~SleepControlPresenter();
 
         void OnStart() override;
-        void OnPause() override;
         void OnResume() override;
-        void OnStop() override;
 
         static SleepControlPresenter *GetInstance();
 
index 724a4a2..6caceff 100644 (file)
@@ -53,19 +53,9 @@ namespace OHOS
         Presenter<SleepControlView>::OnStart();
     }
 
-    void SleepControlPresenter::OnPause(void)
-    {
-        Presenter<SleepControlView>::OnPause();
-    }
-
     void SleepControlPresenter::OnResume(void)
     {
-        Presenter<SleepControlView>::OnResume();
-    }
-
-    void SleepControlPresenter::OnStop(void)
-    {
-        Presenter<SleepControlView>::OnStop();
+        RootView::GetInstance()->SetOnKeyActListener(this);
     }
 
     bool SleepControlPresenter::OnDrag(UIView &view, const DragEvent &event)
index 149f918..df1eac3 100644 (file)
@@ -51,7 +51,7 @@ namespace OHOS
 
     void SystemUpdatePresenter::OnResume(void)
     {
-        Presenter<SystemUpdateView>::OnResume();
+        RootView::GetInstance()->SetOnKeyActListener(this);
     }
 
     void SystemUpdatePresenter::OnStop(void)
diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempClickMea.h b/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempClickMea.h
deleted file mode 100644 (file)
index 9197eb9..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-/*\r
- * Copyright (c) CompanyNameMagicTag 2022-2022. All rights reserved.\r
- * Description: temperature\r
- * Author:\r
- * Create: 2022-02-15\r
- */\r
-\r
-#ifndef TEMP_CLICK_MEA_H\r
-#define TEMP_CLICK_MEA_H\r
-\r
-#include "components/ui_label.h"\r
-#include "components/ui_label_button.h"\r
-#include "components/ui_scroll_view.h"\r
-#include "temperature/include/TempPresenter.h"\r
-\r
-namespace OHOS {\r
-class TempClickMea : public UIScrollView {\r
-public:\r
-    TempClickMea();\r
-    ~TempClickMea() override;\r
-    bool InitClickMea();\r
-    static TempClickMea *GetInstance();\r
-    void RefreshClickMea(void);\r
-private:\r
-    bool TempInitButton(void);\r
-    bool TempInitLabel(void);\r
-    UILabel *tempLabel{nullptr};\r
-    UILabelButton *tempButton[SET_TWO]{nullptr};\r
-};\r
-}\r
-#endif
\ No newline at end of file
diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempContinueWarn.h b/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempContinueWarn.h
deleted file mode 100644 (file)
index 841c3f7..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-/*\r
- * Copyright (c) CompanyNameMagicTag 2022-2022. All rights reserved.\r
- * Description: temperature\r
- * Author:\r
- * Create: 2022-02-15\r
- */\r
-\r
-#ifndef TEMP_CONTINUE_WARN_H\r
-#define TEMP_CONTINUE_WARN_H\r
-\r
-#include "components/ui_image_view.h"\r
-#include "components/ui_label.h"\r
-#include "components/ui_view_group.h"\r
-#include "temperature/include/TempPresenter.h"\r
-\r
-namespace OHOS {\r
-class TempContinueWarn : public UIViewGroup {\r
-public:\r
-    TempContinueWarn();\r
-    ~TempContinueWarn() override;\r
-    bool InitTempContinue();\r
-    static TempContinueWarn *GetInstance();\r
-    void RefreshTempContinue(void);\r
-private:\r
-    bool TempInitLabel(void);\r
-    bool TempInitImage(void);\r
-    UIImageView *tempImage{nullptr};\r
-    UILabel *tempLabel[SET_THREE]{nullptr};\r
-};\r
-}\r
-#endif
\ No newline at end of file
diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempExitInter.h b/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempExitInter.h
deleted file mode 100644 (file)
index c709523..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-/*\r
- * Copyright (c) CompanyNameMagicTag 2022-2022. All rights reserved.\r
- * Description: temperature\r
- * Author:\r
- * Create: 2022-02-15\r
- */\r
-\r
-#ifndef TEMP_EXIT_INTER_H\r
-#define TEMP_EXIT_INTER_H\r
-\r
-#include "components/ui_image_view.h"\r
-#include "components/ui_label.h"\r
-#include "AppGroupView.h"\r
-#include "temperature/include/TempPresenter.h"\r
-\r
-namespace OHOS {\r
-class TempExitInter : public AppGroupView {\r
-public:\r
-    TempExitInter();\r
-    ~TempExitInter() override;\r
-    static TempExitInter *GetInstance();\r
-    bool InitView(void *caller) override;\r
-private:\r
-    bool TempInitLabel(void);\r
-    bool TempInitImage(void);\r
-    bool InitSimilarImage(int16 num, int16 tempX, int16 tempY, const char* imageSrc);\r
-    UILabel *tempLabel[SET_TWO]{nullptr};\r
-    UIImageView *tempImage[SET_FOUR]{nullptr};\r
-};\r
-}\r
-#endif
\ No newline at end of file
diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempExitPrompt.h b/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempExitPrompt.h
deleted file mode 100644 (file)
index a0ec725..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/*\r
- * Copyright (c) CompanyNameMagicTag 2022-2022. All rights reserved.\r
- * Description: temperature\r
- * Author:\r
- * Create: 2022-02-15\r
- */\r
-\r
-#ifndef TEMP_EXIT_PROMPT\r
-#define TEMP_EXIT_PROMPT\r
-\r
-#include "components/ui_image_view.h"\r
-#include "components/ui_label.h"\r
-#include "components/ui_scroll_view.h"\r
-#include "temperature/include/TempPresenter.h"\r
-\r
-namespace OHOS {\r
-class TempExitPrompt : public UIScrollView {\r
-public:\r
-    TempExitPrompt();\r
-    ~TempExitPrompt() override;\r
-    bool InitExitPrompt();\r
-    static TempExitPrompt *GetInstance();\r
-private:\r
-    bool TempInitImage(void);\r
-    bool TempInitLabel(void);\r
-    UIImageView *tempImage[SET_TWO]{nullptr};\r
-    UILabel *tempLabel{nullptr};\r
-};\r
-}\r
-#endif
\ No newline at end of file
diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempInitInter.h b/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempInitInter.h
deleted file mode 100644 (file)
index 30781c5..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*\r
- * Copyright (c) CompanyNameMagicTag 2022-2022. All rights reserved.\r
- * Description: temperature\r
- * Author:\r
- * Create: 2022-02-15\r
- */\r
-\r
-#ifndef TEMP_INIT_INTER_H\r
-#define TEMP_INIT_INTER_H\r
-\r
-#include "components/ui_image_view.h"\r
-#include "components/ui_label.h"\r
-#include "components/ui_label_button.h"\r
-#include "AppGroupView.h"\r
-#include "temperature/include/TempPresenter.h"\r
-\r
-namespace OHOS {\r
-class TempInitInter : public AppGroupView {\r
-public:\r
-    TempInitInter();\r
-    ~TempInitInter() override;\r
-    static TempInitInter *GetInstance();\r
-    bool InitView(void *caller) override;\r
-private:\r
-    bool TempInitImage(void);\r
-    bool TempInitButton(void);\r
-    bool SetBasicLabel(void);\r
-    bool SetAppendLabel(void);\r
-    UIImageView *tempImage[SET_THREE]{nullptr};\r
-    UILabel *tempLabel[TEMP_SET_SIX]{nullptr};\r
-    UILabelButton *buttonTemp{nullptr};\r
-};\r
-}\r
-#endif
\ No newline at end of file
diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempJoinStudy.h b/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempJoinStudy.h
deleted file mode 100644 (file)
index 71bbec5..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-/*\r
- * Copyright (c) CompanyNameMagicTag 2022-2022. All rights reserved.\r
- * Description: temperature\r
- * Author:\r
- * Create: 2022-02-15\r
- */\r
-\r
-#ifndef TEMP_JOIN_STUDY_H\r
-#define TEMP_JOIN_STUDY_H\r
-\r
-#include "components/ui_label.h"\r
-#include "components/ui_label_button.h"\r
-#include "components/ui_scroll_view.h"\r
-#include "temperature/include/TempPresenter.h"\r
-\r
-namespace OHOS {\r
-class TempJoinStudy : public UIScrollView {\r
-public:\r
-    TempJoinStudy();\r
-    ~TempJoinStudy() override;\r
-    bool InitJoinStudy();\r
-    static TempJoinStudy *GetInstance();\r
-private:\r
-    bool TempInitLabel(void);\r
-    bool TempInitButton(void);\r
-    bool InitSimilarLabel(int16 num, int16 labelY, const char *labelText);\r
-    UILabel *tempTitle{nullptr};\r
-    UILabel *tempLabel[SET_THREE]{nullptr};\r
-    UILabelButton *tempButton[SET_TWO]{nullptr};\r
-};\r
-}\r
-#endif
\ No newline at end of file
diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempLittleTip.h b/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempLittleTip.h
deleted file mode 100644 (file)
index 7f34df3..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-/*\r
- * Copyright (c) CompanyNameMagicTag 2022-2022. All rights reserved.\r
- * Description: temperature\r
- * Author:\r
- * Create: 2022-02-15\r
- */\r
-\r
-#ifndef TEMP_LITTLE_TIP\r
-#define TEMP_LITTLE_TIP\r
-\r
-#include "components/ui_label.h"\r
-#include "components/ui_scroll_view.h"\r
-#include "temperature/include/TempPresenter.h"\r
-\r
-namespace OHOS {\r
-class TempLittleTip : public UIScrollView {\r
-public:\r
-    TempLittleTip();\r
-    ~TempLittleTip() override;\r
-    bool InitLittleTip();\r
-    static TempLittleTip *GetInstance();\r
-    void RefreshTip(void);\r
-private:\r
-    bool SetBasicLabel(void);\r
-    bool SetAppendLabel(void);\r
-    UILabel *tempLabel[SET_NINE]{nullptr};\r
-};\r
-}\r
-#endif
\ No newline at end of file
diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempMainView.h b/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempMainView.h
deleted file mode 100644 (file)
index b6fa445..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-/*\r
- * Copyright (c) CompanyNameMagicTag 2022-2022. All rights reserved.\r
- * Description: temperature\r
- * Author:\r
- * Create: 2022-02-15\r
- */\r
-\r
-#ifndef TEMP_MAIN_VIEW_H\r
-#define TEMP_MAIN_VIEW_H\r
-\r
-#include <string>\r
-#include "View.h"\r
-#include "components/ui_view_group.h"\r
-#include "ChangeSliceListener.h"\r
-#include "components/ui_swipe_view.h"\r
-#include "temperature/include/TempPresenter.h"\r
-#include "temperature/include/TempJoinStudy.h"\r
-#include "temperature/include/TempMeasure.h"\r
-#include "temperature/include/TempExitInter.h"\r
-#include "temperature/include/TempPromptWear.h"\r
-#include "temperature/include/TempClickMea.h"\r
-#include "temperature/include/TempRemindWear.h"\r
-#include "temperature/include/TempMeaProcess.h"\r
-#include "temperature/include/TempInitInter.h"\r
-#include "temperature/include/TempWarn.h"\r
-#include "temperature/include/TempLittleTip.h"\r
-#include "temperature/include/TempModel.h"\r
-#include "temperature/include/TempStudyAbout.h"\r
-#include "temperature/include/TempExitPrompt.h"\r
-#include "temperature/include/TempContinueWarn.h"\r
-#include "temperature/include/TempReport.h"\r
-\r
-namespace OHOS {\r
-class TempMainView;\r
-class TempMainView : public View<TempPresenter> {\r
-public:\r
-    TempMainView();\r
-    ~TempMainView() override;\r
-    static TempMainView *GetInstance(void);\r
-    void OnStart() override;\r
-    void ChangeView(int16 hideView, int16 showView);\r
-    void DropView(UIView& view);\r
-    int16 GetListenInter(void);\r
-    int16 GetWhichInter(void);\r
-    bool ChangeMeasure(int16 thisView);\r
-    bool ChangePrompt(int16 thisView);\r
-    bool ChangeClickMea(int16 thisView);\r
-    bool ChangeRemindWear(int16 thisView);\r
-    bool ChangeMeaProcess(int16 thisView);\r
-    bool ChangeTempInit(int16 thisView);\r
-    bool ChangeTempWarn(int16 thisView);\r
-    bool ChangeContinue(int16 thisView);\r
-    bool ChangeTempTip(int16 thisView);\r
-    bool ChangeStudyAbout(int16 thisView);\r
-    bool ChangeExitPrompt(int16 thisView);\r
-    bool ClickFunc(int16 interf);\r
-private:\r
-    bool SetSwipeInter(int16 num);\r
-    void DeleteViceInter(void);\r
-    UIViewGroup *group{nullptr};\r
-    UIViewGroup *container[11]{nullptr}; // 一共有11个界面\r
-    UISwipeView *tempSwipeList[2]{nullptr}; // 下拉拖动的界面一共有2个\r
-    TempJoinStudy *tempJoinStudy{nullptr};\r
-    TempMeasure *tempMeasure{nullptr};\r
-    TempExitInter *tempExitInter{nullptr};\r
-    TempPromptWear *tempPromptWear{nullptr};\r
-    TempClickMea *tempClickMea{nullptr};\r
-    TempRemindWear *tempRemindWear{nullptr};\r
-    TempMeaProcess *tempMeaProcess{nullptr};\r
-    TempInitInter *tempInitInter{nullptr};\r
-    TempWarn *tempWarn{nullptr};\r
-    TempLittleTip *tempLittleTip{nullptr};\r
-    TempContinueWarn *tempContinue{nullptr};\r
-    TempExitPrompt *tempExitPrompt{nullptr};\r
-    TempStudyAbout *tempStudyAbout{nullptr};\r
-    TempReport *tempReport{nullptr};\r
-    int16 interListen{-1}; // 监测上一个界面,-1用于还没获得监测界面时的初始化\r
-    int16 tempWhichInter{0}; // 监测当前是哪一个温度界面\r
-    int16 tempWhichMea{-1}; // 监测当前处于哪一个监测界面\r
-};\r
-} // namespace OHOS\r
-#endif // MAIN_ALARM_VIEW_Ha
\ No newline at end of file
diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempMeaProcess.h b/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempMeaProcess.h
deleted file mode 100644 (file)
index 2f13f85..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-/*\r
- * Copyright (c) CompanyNameMagicTag 2022-2022. All rights reserved.\r
- * Description: temperature\r
- * Author:\r
- * Create: 2022-02-15\r
- */\r
-\r
-#ifndef TEMP_MEA_PROCESS_H\r
-#define TEMP_MEA_PROCESS_H\r
-\r
-#include "components/ui_image_view.h"\r
-#include "components/ui_label.h"\r
-#include "components/ui_scroll_view.h"\r
-#include "components/ui_circle_progress.h"\r
-#include "temperature/include/TempPresenter.h"\r
-\r
-namespace OHOS {\r
-class TempMeaProcess : public UIScrollView {\r
-public:\r
-    TempMeaProcess();\r
-    ~TempMeaProcess() override;\r
-    static TempMeaProcess *GetInstance();\r
-    bool InitMeaProcess(void);\r
-    void TempMeaDelayExit(void);\r
-    UICircleProgress *GetCircleProgress(void);\r
-    bool GetCircleStatus(void);\r
-    void SetCircleStatus(bool status);\r
-private:\r
-    bool TempInitImage(void);\r
-    bool TempInitLabel(void);\r
-    bool TempCirCleProcess(void);\r
-    UICircleProgress *tempCircle{nullptr};\r
-    UIImageView *imageMeasure{nullptr};\r
-    UILabel *tempLabel{nullptr};\r
-    bool circleStatus{false};\r
-};\r
-}\r
-#endif
\ No newline at end of file
diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempMeasure.h b/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempMeasure.h
deleted file mode 100644 (file)
index 3919314..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*\r
- * Copyright (c) CompanyNameMagicTag 2022-2022. All rights reserved.\r
- * Description: temperature\r
- * Author:\r
- * Create: 2022-02-15\r
- */\r
-\r
-#ifndef TEMP_MEASURE_H\r
-#define TEMP_MEASURE_H\r
-\r
-#include "components/ui_image_view.h"\r
-#include "components/ui_label.h"\r
-#include "components/ui_label_button.h"\r
-#include "AppGroupView.h"\r
-#include "temperature/include/TempPresenter.h"\r
-\r
-namespace OHOS {\r
-class TempMeasure : public AppGroupView {\r
-public:\r
-    TempMeasure();\r
-    ~TempMeasure() override;\r
-    static TempMeasure *GetInstance();\r
-    bool InitView(void *caller) override;\r
-private:\r
-    bool TempInitImage(void);\r
-    bool TempInitLabel(void);\r
-    bool TempInitButton(void);\r
-    UILabel *labelMeasure{nullptr};\r
-    UIImageView *imageMeasure[SET_THREE]{nullptr};\r
-    UILabelButton *buttonMeasure{nullptr};\r
-    UILabelButton *backgroudButton{nullptr};\r
-};\r
-}\r
-#endif
\ No newline at end of file
diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempModel.h b/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempModel.h
deleted file mode 100644 (file)
index 0c55881..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/*\r
- * Copyright (c) CompanyNameMagicTag 2022-2022. All rights reserved.\r
- * Description: temperature\r
- * Author:\r
- * Create: 2022-02-15\r
- */\r
-\r
-#ifndef TEMP_MODEL_H\r
-#define TEMP_MODEL_H\r
-\r
-#include "ohos_types.h"\r
-#include "list.h"\r
-#include "source.h"\r
-#include "ChangeSliceListener.h"\r
-\r
-namespace OHOS {\r
-class TempModel {\r
-public:\r
-    TempModel();\r
-    virtual ~TempModel();\r
-    static TempModel *GetInstance(void);\r
-    void SetTempInterLis(int16 interListen);\r
-    int16 GetTempInterLis(void);\r
-private:\r
-    int16 tempInterLis{0}; // 监测是否为首次进入体温应用\r
-};\r
-}\r
-#endif
\ No newline at end of file
diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempPresenter.h b/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempPresenter.h
deleted file mode 100644 (file)
index dbfb392..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-/*\r
- * Copyright (c) CompanyNameMagicTag 2022-2022. All rights reserved.\r
- * Description: temperature\r
- * Author:\r
- * Create: 2022-02-15\r
- */\r
-\r
-#ifndef TEMP_PRESENTER_H\r
-#define TEMP_PRESENTER_H\r
-\r
-#include "key/include/KeyInputListener.h"\r
-#include "Presenter.h"\r
-#include "UiConfig.h"\r
-#include "components/ui_image_view.h"\r
-#include "components/ui_swipe_view.h"\r
-#include "wearable_log.h"\r
-#include "color.h"\r
-#include "ModelListenerSample.h"\r
-\r
-namespace OHOS {\r
-constexpr char* TEMP_JOIN_STUDY = (char*)"tempjoinstudy";\r
-constexpr char* TEMP_INTER_JOIN = (char*)"tempjoin";\r
-constexpr char* TEMP_INTER_EXIT = (char*)"tempexit";\r
-constexpr char* TEMP_MEASURE_BUTTON = (char*)"measurebutton";\r
-constexpr char* TEMP_MEASURE_IMAGE = (char*)"measureimage";\r
-constexpr char* TEMP_MEASURE_PROCESS = (char*)"measureprocess";\r
-constexpr char* TEMP_PROMPT_NEXT = (char*)"temppromptnext";\r
-constexpr char* TEMP_MEA_EXIT = (char*)"tempmeaexit";\r
-constexpr char* TEMP_MEA_IN = (char*)"tempmeain";\r
-constexpr char* TEMP_MEA_AGAIN = (char*)"tempmeaagain";\r
-constexpr char* TEMP_WARN_BUTTON = (char*)"tempwarn";\r
-constexpr char* TEMP_IMAGE_LIT_TIP = (char*)"tempimagelietip";\r
-constexpr char* TEMP_EXIT_THIS = (char*)"tempexitstudy";\r
-constexpr char* TEMP_STUDY_THIS = (char*)"tempaboutstudy";\r
-constexpr char* TEMP_WARN_ID = (char*)"tempwarnid";\r
-constexpr char* TEMP_EXIT_DELETE = (char*)"tempexitdelete";\r
-constexpr char* TEMP_EXIT_TRUE = (char*)"tempexittrue";\r
-constexpr char* TEMP_SWIPE_EXIT = (char*)"tempswipeexit";\r
-constexpr int16 BACKGROUND_IMAGE_WIDTH = 190;\r
-constexpr int16 SET_ZERO = 0;\r
-constexpr int16 SET_ONE = 1;\r
-constexpr int16 SET_TWO = 2;\r
-constexpr int16 SET_THREE = 3;\r
-constexpr int16 SET_FOUR = 4;\r
-constexpr int16 SET_FIVE = 5;\r
-constexpr int16 TEMP_SET_SIX = 6;\r
-constexpr int16 SET_SEVEN = 7;\r
-constexpr int16 SET_EIGHT = 8;\r
-constexpr int16 SET_NINE = 9;\r
-constexpr int16 SET_HUNDRED = 100;\r
-\r
-typedef enum {\r
-    JOIN_STUDY_INTER = 0,\r
-    MEASURE_INTER,\r
-    PROMPT_WEAR,\r
-    CLICK_MEA,\r
-    REMIND_WEAR,\r
-    MEASURE_ING,\r
-    MEASURE_INIT,\r
-    TEMP_WARN_INTER,\r
-    TEMP_TIP,\r
-    TEMP_EXIT_STUDY,\r
-    TEMP_STUDY\r
-} tempInterfacesId;\r
-\r
-class TempMainView;\r
-class TempPresenter : public Presenter<TempMainView>, public UIView::OnClickListener, public UIView::OnDragListener,\r
- public ModelListenerSample, public UISwipeView::OnSwipeListener {\r
-public:\r
-    TempPresenter();\r
-    ~TempPresenter() override;\r
-    void OnResume() override;\r
-    void OnStop() override;\r
-    void ClickTempJoin();\r
-    void ClickPromptWear();\r
-    void ClickPromptNext();\r
-    void ClickExitMea();\r
-    void ClickIfWear();\r
-    void ClickMeaAgain(void);\r
-    void ClickMeasure();\r
-    void ClickTempTip(void);\r
-    void ClickTempExit(void);\r
-    void ClickStudyTip(void);\r
-    void ClickWarnBack(void);\r
-    void ClickExitDelete(void);\r
-    void ClickExit(void);\r
-    void ClickExitTemp(void);\r
-    int8 GetTempListen(void);\r
-    ColorType CyanColor(void);\r
-    static TempPresenter *GetInstance();\r
-    bool OnClick(UIView &view, const ClickEvent &event) override;\r
-    bool OnDrag(UIView& view, const DragEvent& event) override;\r
-    bool ClickFuncId(const char *buttonName);\r
-    void OnSwipe(UISwipeView &view) override;\r
-    void ProgressNotify(void);\r
-    void SetTempCountMax(void);\r
-    void UpdateTempCount(void);\r
-    void Notify() override;\r
-private:\r
-    uint8 wearListen{0};\r
-    int8 tempListen{-1}; // 监测隐藏界面\r
-    int16 countTemp{100}; // 体温进度条默认值为100\r
-};\r
-}\r
-#endif
\ No newline at end of file
diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempPromptWear.h b/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempPromptWear.h
deleted file mode 100644 (file)
index 69ac5d2..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/*\r
- * Copyright (c) CompanyNameMagicTag 2022-2022. All rights reserved.\r
- * Description: temperature\r
- * Author:\r
- * Create: 2022-02-15\r
- */\r
-\r
-#ifndef TEMP_PROMPT_WEAR_H\r
-#define TEMP_PROMPT_WEAR_H\r
-\r
-#include "components/ui_image_view.h"\r
-#include "components/ui_label.h"\r
-#include "components/ui_label_button.h"\r
-#include "components/ui_scroll_view.h"\r
-#include "temperature/include/TempPresenter.h"\r
-\r
-namespace OHOS {\r
-class TempPromptWear : public UIScrollView {\r
-public:\r
-    TempPromptWear();\r
-    ~TempPromptWear() override;\r
-    bool InitPromptWear();\r
-    static TempPromptWear *GetInstance();\r
-private:\r
-    bool TempInitLabel(void);\r
-    bool TempInitButton(void);\r
-    bool TempInitImage(void);\r
-    UILabel *tempLabel{nullptr};\r
-    UILabelButton *tempButton{nullptr};\r
-    UIImageView *tempImage{nullptr};\r
-};\r
-}\r
-#endif
\ No newline at end of file
diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempRemindWear.h b/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempRemindWear.h
deleted file mode 100644 (file)
index 48b5b64..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/*\r
- * Copyright (c) CompanyNameMagicTag 2022-2022. All rights reserved.\r
- * Description: temperature\r
- * Author:\r
- * Create: 2022-02-15\r
- */\r
-\r
-#ifndef TEMP_REMIND_WAER_H\r
-#define TEMP_REMIND_WAER_H\r
-\r
-#include "components/ui_image_view.h"\r
-#include "components/ui_label.h"\r
-#include "components/ui_scroll_view.h"\r
-#include "temperature/include/TempPresenter.h"\r
-\r
-namespace OHOS {\r
-class TempRemindWear : public UIScrollView {\r
-public:\r
-    TempRemindWear();\r
-    ~TempRemindWear() override;\r
-    bool InitRemindWear();\r
-    static TempRemindWear *GetInstance();\r
-private:\r
-    bool TempInitImage(void);\r
-    bool TempInitLabel(void);\r
-    UIImageView *tempImage[SET_TWO]{nullptr};\r
-    UILabel *tempLabel{nullptr};\r
-};\r
-}\r
-#endif
\ No newline at end of file
diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempReport.h b/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempReport.h
deleted file mode 100644 (file)
index 41ff679..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-/*\r
- * Copyright (c) CompanyNameMagicTag 2022-2022. All rights reserved.\r
- * Description: temperature\r
- * Author:\r
- * Create: 2022-02-15\r
- */\r
-\r
-#ifndef TEMP_REPORT_H\r
-#define TEMP_REPORT_H\r
-\r
-#include "components/ui_image_view.h"\r
-#include "components/ui_label.h"\r
-#include "AppGroupView.h"\r
-#include "temperature/include/TempPresenter.h"\r
-\r
-namespace OHOS {\r
-class TempReport : public AppGroupView {\r
-public:\r
-    TempReport();\r
-    ~TempReport() override;\r
-    static TempReport *GetInstance();\r
-    bool InitView(void *caller) override;\r
-private:\r
-    bool SetBasicLabel(void);\r
-    bool SetAppendLabel(void);\r
-    bool InitSimilarImage(int16 num, int16 tempX, int16 tempY, const char* imageSrc);\r
-    bool TempInitImage(void);\r
-    UILabel *tempLabel[TEMP_SET_SIX]{nullptr};\r
-    UIImageView *tempImage[SET_FIVE]{nullptr};\r
-};\r
-}\r
-#endif
\ No newline at end of file
diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempStudyAbout.h b/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempStudyAbout.h
deleted file mode 100644 (file)
index c26d51a..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-/*\r
- * Copyright (c) CompanyNameMagicTag 2022-2022. All rights reserved.\r
- * Description: temperature\r
- * Author:\r
- * Create: 2022-02-15\r
- */\r
-\r
-#ifndef TEMP_STUDY_ABOUT\r
-#define TEMP_STUDY_ABOUT\r
-\r
-#include "components/ui_label.h"\r
-#include "components/ui_scroll_view.h"\r
-#include "temperature/include/TempPresenter.h"\r
-\r
-namespace OHOS {\r
-class TempStudyAbout : public UIScrollView {\r
-public:\r
-    TempStudyAbout();\r
-    ~TempStudyAbout() override;\r
-    bool InitStudyAbout();\r
-    static TempStudyAbout *GetInstance();\r
-    void RefreshStudy(void);\r
-private:\r
-    bool SetBasicLabel(void);\r
-    bool SetAppendLabel(void);\r
-    UILabel *tempLabel[SET_FIVE]{nullptr};\r
-};\r
-}\r
-#endif
\ No newline at end of file
diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempWarn.h b/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/include/TempWarn.h
deleted file mode 100644 (file)
index 5d185b5..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*\r
- * Copyright (c) CompanyNameMagicTag 2022-2022. All rights reserved.\r
- * Description: temperature\r
- * Author:\r
- * Create: 2022-02-15\r
- */\r
-\r
-#ifndef TEMP_WARN_H\r
-#define TEMP_WARN_H\r
-\r
-#include "components/ui_image_view.h"\r
-#include "components/ui_label.h"\r
-#include "components/ui_label_button.h"\r
-#include "components/ui_scroll_view.h"\r
-#include "temperature/include/TempPresenter.h"\r
-\r
-namespace OHOS {\r
-class TempWarn : public UIScrollView {\r
-public:\r
-    TempWarn();\r
-    ~TempWarn() override;\r
-    bool InitTempWarn();\r
-    static TempWarn *GetInstance();\r
-    void RefreshTempWarn(void);\r
-private:\r
-    bool TempInitImage(void);\r
-    bool TempInitButton(void);\r
-    bool TempInitLabel(void);\r
-    UIImageView *tempImage{nullptr};\r
-    UILabelButton *tempButton{nullptr};\r
-    UILabel *tempLabel{nullptr};\r
-};\r
-}\r
-#endif
\ No newline at end of file
diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempClickMea.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempClickMea.cpp
deleted file mode 100644 (file)
index c0c1c86..0000000
+++ /dev/null
@@ -1,143 +0,0 @@
-/*\r
- * Copyright (c) CompanyNameMagicTag 2022-2022. All rights reserved.\r
- * Description: temperature\r
- * Author:\r
- * Create: 2022-02-15\r
- */\r
-\r
-#include "UiConfig.h"\r
-#include <string>\r
-#include "font/ui_font.h"\r
-#include "temperature/include/TempClickMea.h"\r
-\r
-namespace OHOS {\r
-static TempClickMea *g_tempClickMea = nullptr;\r
-\r
-static const int16 TEMP_LABEL_FIRST_X = 40;\r
-static const int16 TEMP_LABEL_FIRST_Y = 100;\r
-static const int16 TEMP_LABEL_FIRST_WIDTH = 350;\r
-static const int16 TEMP_LABEL_FIRST_HEIGHT = 180;\r
-static const int16 TEMP_BUTTON_X = 120;\r
-static const int16 TEMP_BUTTON_FIRST_Y = 290;\r
-static const int16 TEMP_BUTTON_SECOND_Y = 390;\r
-static const int16 TEMP_BUTTON_WIDTH = 220;\r
-static const int16 TEMP_BUTTON_HEIGHT = 80;\r
-static const int16 TEMP_LABEL_FONT = 36;\r
-static const char *TEMP_CLICK_MEA_LABEL = (char*)"为减少环境影响,建议在室内、无风、无冷/热源干扰条件下进行测量。";\r
-static const char *TEMP_BUTTON_INTER_LABEL = (char*)"立即测量";\r
-static const char *TEMP_BUTTON_CLOSE_LABEL = (char*)"稍后测量";\r
-\r
-TempClickMea::TempClickMea()\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempClickMea::TempClickMea");\r
-    g_tempClickMea = this;\r
-}\r
-\r
-TempClickMea::~TempClickMea()\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempClickMea::~TempClickMea");\r
-    RemoveAll();\r
-    int num;\r
-    if (tempLabel != nullptr) {\r
-        delete tempLabel;\r
-        tempLabel = nullptr;\r
-    }\r
-    for (num = SET_ZERO; num < SET_TWO; num++) {\r
-        if (tempButton[num] != nullptr) {\r
-            delete tempButton[num];\r
-            tempButton[num] = nullptr;\r
-        }\r
-    }\r
-    g_tempClickMea = nullptr;\r
-}\r
-\r
-TempClickMea *TempClickMea::GetInstance(void)\r
-{\r
-    return g_tempClickMea;\r
-}\r
-\r
-bool TempClickMea::TempInitButton(void)\r
-{\r
-    UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::TempPresenter::GetInstance();\r
-    tempButton[SET_ZERO] = new UILabelButton();\r
-    if (tempButton[SET_ZERO] == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempClickMea::TempInitButton new tempButton[SET_ZERO] error");\r
-        return false;\r
-    }\r
-    tempButton[SET_ZERO]->SetPosition(TEMP_BUTTON_X, TEMP_BUTTON_FIRST_Y, TEMP_BUTTON_WIDTH, TEMP_BUTTON_HEIGHT);\r
-    tempButton[SET_ZERO]->SetFont(DEFAULT_VECTOR_FONT_FILENAME, TEMP_LABEL_FONT);\r
-    tempButton[SET_ZERO]->SetText(TEMP_BUTTON_INTER_LABEL);\r
-    tempButton[SET_ZERO]->SetViewId(TEMP_MEA_IN);\r
-    tempButton[SET_ZERO]->SetOnClickListener(clickListener);\r
-    tempButton[SET_ZERO]->SetStyleForState(STYLE_BACKGROUND_COLOR,\r
-        TempPresenter::GetInstance()->CyanColor().full, UIButton::RELEASED);\r
-    tempButton[SET_ZERO]->SetStyleForState(STYLE_BACKGROUND_COLOR,\r
-        TempPresenter::GetInstance()->CyanColor().full, UIButton::PRESSED);\r
-    tempButton[SET_ZERO]->SetStyleForState(STYLE_BACKGROUND_COLOR,\r
-        TempPresenter::GetInstance()->CyanColor().full, UIButton::INACTIVE);\r
-    Add(tempButton[SET_ZERO]);\r
-\r
-    tempButton[SET_ONE] = new UILabelButton();\r
-    if (tempButton[SET_ONE] == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempJoinStudy::TempInitButton new tempButton[SET_ONE] error");\r
-        return false;\r
-    }\r
-    tempButton[SET_ONE]->SetPosition(TEMP_BUTTON_X, TEMP_BUTTON_SECOND_Y,  TEMP_BUTTON_WIDTH, TEMP_BUTTON_HEIGHT);\r
-    tempButton[SET_ONE]->SetFont(DEFAULT_VECTOR_FONT_FILENAME, TEMP_LABEL_FONT);\r
-    tempButton[SET_ONE]->SetText(TEMP_BUTTON_CLOSE_LABEL);\r
-    tempButton[SET_ONE]->SetViewId(TEMP_MEA_EXIT);\r
-    tempButton[SET_ONE]->SetOnClickListener(clickListener);\r
-    tempButton[SET_ONE]->SetTextColor(OHOS::TempPresenter::GetInstance()->CyanColor());\r
-    tempButton[SET_ONE]->SetStyleForState(STYLE_BACKGROUND_COLOR, Color::Gray().full, UIButton::RELEASED);\r
-    tempButton[SET_ONE]->SetStyleForState(STYLE_BACKGROUND_COLOR, Color::Gray().full, UIButton::PRESSED);\r
-    tempButton[SET_ONE]->SetStyleForState(STYLE_BACKGROUND_COLOR, Color::Gray().full, UIButton::INACTIVE);\r
-    Add(tempButton[SET_ONE]);\r
-\r
-    return true;\r
-}\r
-\r
-bool TempClickMea::TempInitLabel(void)\r
-{\r
-    tempLabel = new UILabel();\r
-    if (tempLabel == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempClickMea::TempInitLabel new label fail");\r
-        return false;\r
-    }\r
-    tempLabel->SetText(TEMP_CLICK_MEA_LABEL);\r
-    tempLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, TEMP_LABEL_FONT);\r
-    tempLabel->SetPosition(TEMP_LABEL_FIRST_X, TEMP_LABEL_FIRST_Y, TEMP_LABEL_FIRST_WIDTH, TEMP_LABEL_FIRST_HEIGHT);\r
-    Add(tempLabel);\r
-    return true;\r
-}\r
-\r
-bool TempClickMea::InitClickMea(void)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempClickMea::InitClickMea");\r
-    SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);\r
-    if (TempPresenter::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempClickMea::InitClickMea TempPresenter::GetInstance() nullptr");\r
-        return false;\r
-    }\r
-    UIView::OnDragListener *listener = static_cast<UIView::OnDragListener*>(TempPresenter::GetInstance());\r
-    SetScrollBlankSize(50); // 50:font size\r
-    SetOnDragListener(listener);\r
-    SetDraggable(true);\r
-    SetTouchable(true);\r
-\r
-    if (!TempInitLabel()) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempClickMea::InitClickMea TempInitLabel() false");\r
-        return false;\r
-    }\r
-    if (!TempInitButton()) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempClickMea::InitClickMea TempInitButton() false");\r
-        return false;\r
-    }\r
-    return true;\r
-}\r
-\r
-void TempClickMea::RefreshClickMea(void)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempClickMea::RefreshClickMea");\r
-    ScrollBy(0, TEMP_LABEL_FIRST_Y - tempLabel->GetY());\r
-}\r
-}
\ No newline at end of file
diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempContinueWarn.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempContinueWarn.cpp
deleted file mode 100644 (file)
index 8d11e3a..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-/*\r
- * Copyright (c) CompanyNameMagicTag 2022-2022. All rights reserved.\r
- * Description: temperature\r
- * Author:\r
- * Create: 2022-02-15\r
- */\r
-\r
-#include "UiConfig.h"\r
-#include <string>\r
-#include "temperature/include/TempContinueWarn.h"\r
-\r
-namespace OHOS {\r
-static TempContinueWarn *g_tempContinueWarn = nullptr;\r
-\r
-static const int16 TEMP_IMAGE_X = 182;\r
-static const int16 TEMP_IMAGE_Y = 30;\r
-static const int16 TEMP_LABEL_ONE_X = 190;\r
-static const int16 TEMP_LABEL_ONE_Y = 130;\r
-static const int16 TEMP_LABEL_ONE_WIDTH = 100;\r
-static const int16 TEMP_LABEL_ONE_HEIGHT = 35;\r
-static const int16 TEMP_LABEL_ONE_FONT = 35;\r
-static const int16 TEMP_LABEL_TWO_X = 155;\r
-static const int16 TEMP_LABEL_TWO_Y = 200;\r
-static const int16 TEMP_LABEL_TWO_WIDTH = 200;\r
-static const int16 TEMP_LABEL_TWO_HEIGHT = 45;\r
-static const int16 TEMP_LABEL_TWO_FONT = 40;\r
-static const int16 TEMP_LABEL_THREE_X = 70;\r
-static const int16 TEMP_LABEL_THREE_Y = 265;\r
-static const int16 TEMP_LABEL_THREE_WIDTH = 290;\r
-static const int16 TEMP_LABEL_THREE_HEIGHT = 60;\r
-static const char *TEMP_LABEL_ONE_TEXT = (char*)"体温";\r
-static const char *TEMP_HOT_WARN = (char*)"体温过高";\r
-static const char *TEMP_COLD_WARN = (char*)"体温过低";\r
-static const char *TEMP_HOT_WARN_LABEL = (char*)"最近10分钟体温高于37.2";\r
-static const char *TEMP_COLD_WARN_LABEL = (char*)"最近10分钟体温低于35.5";\r
-\r
-TempContinueWarn::TempContinueWarn()\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempContinueWarn::TempContinueWarn");\r
-    g_tempContinueWarn = this;\r
-}\r
-\r
-TempContinueWarn::~TempContinueWarn()\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempContinueWarn::~TempContinueWarn");\r
-    RemoveAll();\r
-    int16 num;\r
-    if (tempImage != nullptr) {\r
-        delete tempImage;\r
-        tempImage = nullptr;\r
-    }\r
-    for (num = SET_ZERO; num < SET_THREE; num++) {\r
-        if (tempLabel[num] != nullptr) {\r
-            delete tempLabel[num];\r
-            tempLabel[num] = nullptr;\r
-        }\r
-    }\r
-    g_tempContinueWarn = nullptr;\r
-}\r
-\r
-TempContinueWarn *TempContinueWarn::GetInstance(void)\r
-{\r
-    return g_tempContinueWarn;\r
-}\r
-\r
-bool TempContinueWarn::TempInitLabel(void)\r
-{\r
-    tempLabel[SET_ZERO] = new UILabel();\r
-    if (tempLabel[SET_ZERO] == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempContinueWarn::TempInitLabel new tempLabel[SET_ZERO] fail");\r
-        return false;\r
-    }\r
-    tempLabel[SET_ZERO]->SetPosition(TEMP_LABEL_ONE_X, TEMP_LABEL_ONE_Y, TEMP_LABEL_ONE_WIDTH, TEMP_LABEL_ONE_HEIGHT);\r
-    tempLabel[SET_ZERO]->SetFont(DEFAULT_VECTOR_FONT_FILENAME, TEMP_LABEL_ONE_FONT);\r
-    tempLabel[SET_ZERO]->SetText(TEMP_LABEL_ONE_TEXT);\r
-    tempLabel[SET_ZERO]->SetTextColor(Color::Gray());\r
-    tempLabel[SET_ZERO]->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);\r
-    Add(tempLabel[SET_ZERO]);\r
-    \r
-    tempLabel[SET_ONE] = new UILabel();\r
-    if (tempLabel[SET_ONE] == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempContinueWarn::TempInitLabel new tempLabel[SET_ONE] fail");\r
-        return false;\r
-    }\r
-    tempLabel[SET_ONE]->SetPosition(TEMP_LABEL_TWO_X, TEMP_LABEL_TWO_Y, TEMP_LABEL_TWO_WIDTH, TEMP_LABEL_TWO_HEIGHT);\r
-    tempLabel[SET_ONE]->SetFont(DEFAULT_VECTOR_FONT_FILENAME, TEMP_LABEL_TWO_FONT);\r
-    Add(tempLabel[SET_ONE]);\r
-\r
-    tempLabel[SET_TWO] = new UILabel();\r
-    if (tempLabel[SET_TWO] == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempContinueWarn::TempInitLabel new tempLabel[2] fail");\r
-        return false;\r
-    }\r
-    tempLabel[SET_TWO]->SetPosition(TEMP_LABEL_THREE_X, TEMP_LABEL_THREE_Y, TEMP_LABEL_THREE_WIDTH,\r
-        TEMP_LABEL_THREE_HEIGHT);\r
-    tempLabel[SET_TWO]->SetFont(DEFAULT_VECTOR_FONT_FILENAME, TEMP_LABEL_ONE_FONT);\r
-    tempLabel[SET_TWO]->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER,\r
-        UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER);\r
-    tempLabel[SET_TWO]->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);\r
-    Add(tempLabel[SET_TWO]);\r
-\r
-    return true;\r
-}\r
-\r
-bool TempContinueWarn::TempInitImage(void)\r
-{\r
-    tempImage = new UIImageView();\r
-    if (tempImage == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempContinueWarn::TempInitImage new tempImage fail");\r
-        return false;\r
-    }\r
-    tempImage->SetPosition(TEMP_IMAGE_X, TEMP_IMAGE_Y);\r
-    tempImage->SetSrc(TEMP_LITTLE_MEASURE);\r
-    Add(tempImage);\r
-\r
-    return true;\r
-}\r
-\r
-bool TempContinueWarn::InitTempContinue(void)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempContinueWarn::InitTempContinue");\r
-    SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);\r
-    if (TempPresenter::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempContinueWarn::InitTempContinue TempPresenter::GetInstance() nullptr");\r
-        return false;\r
-    }\r
-    UIView::OnDragListener *listener = static_cast<UIView::OnDragListener*>(TempPresenter::GetInstance());\r
-    SetOnDragListener(listener);\r
-    SetDraggable(true);\r
-    SetTouchable(true);\r
-\r
-    if (!TempInitImage()) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempContinueWarn::InitTempContinue TempInitImage() error");\r
-        return false;\r
-    }\r
-    if (!TempInitLabel()) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempContinueWarn::InitTempContinue TempInitLabel() error");\r
-        return false;\r
-    }\r
-    return true;\r
-}\r
-\r
-void TempContinueWarn::RefreshTempContinue(void)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempContinueWarn::RefreshTempContinue");\r
-    int8 tempListener = TempPresenter::GetInstance()->GetTempListen();\r
-    if (tempListener == 0) {\r
-        tempLabel[SET_ONE]->SetText(TEMP_COLD_WARN);\r
-        tempLabel[SET_ONE]->SetTextColor(Color::Blue());\r
-        tempLabel[SET_TWO]->SetText(TEMP_HOT_WARN_LABEL);\r
-    } else if (tempListener == 1) {\r
-        tempLabel[SET_ONE]->SetText(TEMP_HOT_WARN);\r
-        tempLabel[SET_ONE]->SetTextColor(Color::Orange());\r
-        tempLabel[SET_TWO]->SetText(TEMP_COLD_WARN_LABEL);\r
-    }\r
-    return;\r
-}\r
-}
\ No newline at end of file
diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempExitInter.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempExitInter.cpp
deleted file mode 100644 (file)
index 8ea18ec..0000000
+++ /dev/null
@@ -1,164 +0,0 @@
-/*\r
- * Copyright (c) CompanyNameMagicTag 2022-2022. All rights reserved.\r
- * Description: temperature\r
- * Author:\r
- * Create: 2022-02-15\r
- */\r
-\r
-#include "UiConfig.h"\r
-#include "layout/grid_layout.h"\r
-#include "font/ui_font.h"\r
-#include <string>\r
-#include "temperature/include/TempExitInter.h"\r
-\r
-namespace OHOS {\r
-static TempExitInter *g_tempExitInter = nullptr;\r
-\r
-static const int16 EXIT_LABEL_X = 40;\r
-static const int16 EXIT_LABEL_Y_FIRST = 140;\r
-static const int16 EXIT_THIS_Y_FIRST = 155;\r
-static const int16 EXIT_LABEL_Y_SECOND = 265;\r
-static const int16 EXIT_THIS_Y_SECOND = 275;\r
-static const int16 EXIT_IMAGE_X = 65;\r
-static const int16 EXIT_IMAGE_THIS_X = 325;\r
-static const int16 EXIT_IMAGE_EXIT_Y = 145;\r
-static const int16 EXIT_IMAGE_STUDY_Y = 270;\r
-static const int16 EXIT_LABEL_WIDTH = 400;\r
-static const int16 EXIT_LABEL_HEIGHT = 80;\r
-static const int16 EXIT_LABEL_GROUP_WIDTH = 390;\r
-static const int16 EXIT_LABEL_GROUP_HEIGHT = 110;\r
-static const int16 EXIT_GROUP_ONE_X = 40;\r
-static const int16 EXIT_GROUP_ONE_Y = 140;\r
-static const int16 EXIT_GROUP_TWO_Y = 265;\r
-static const int16 EXIT_LABEL_FONT = 35;\r
-static const char *EXIT_LABEL_TEXT_FIRST = (char*)"退出研究";\r
-static const char *EXIT_LABEL_TEXT_SECOND = (char*)"关于研究";\r
-\r
-TempExitInter::TempExitInter()\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempExitInter::TempExitInter");\r
-    g_tempExitInter = this;\r
-}\r
-\r
-TempExitInter::~TempExitInter()\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempExitInter::~TempExitInter");\r
-    RemoveAll();\r
-    for (int32_t labelNum = SET_ZERO; labelNum < SET_TWO; labelNum++) {\r
-        if (tempLabel[labelNum] != nullptr) {\r
-            delete tempLabel[labelNum];\r
-            tempLabel[labelNum] = nullptr;\r
-        }\r
-    }\r
-    for (int32_t ImageNum = SET_ZERO; ImageNum < SET_FOUR; ImageNum++) {\r
-        if (tempImage[ImageNum] != nullptr) {\r
-            delete tempImage[ImageNum];\r
-            tempImage[ImageNum] = nullptr;\r
-        }\r
-    }\r
-    g_tempExitInter = nullptr;\r
-}\r
-\r
-TempExitInter *TempExitInter::GetInstance(void)\r
-{\r
-    return g_tempExitInter;\r
-}\r
-\r
-bool TempExitInter::TempInitLabel(void)\r
-{\r
-    UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::TempPresenter::GetInstance();\r
-    tempLabel[SET_ZERO] = new UILabel();\r
-    if (tempLabel[SET_ZERO] == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempExitInter::InitExit new tempLabel[SET_ZERO] fail");\r
-        return false;\r
-    }\r
-    tempLabel[SET_ZERO]->SetPosition(EXIT_LABEL_X, EXIT_LABEL_Y_FIRST, EXIT_LABEL_WIDTH, EXIT_LABEL_HEIGHT);\r
-    tempLabel[SET_ZERO]->SetText(EXIT_LABEL_TEXT_FIRST);\r
-    tempLabel[SET_ZERO]->SetViewId(TEMP_EXIT_THIS);\r
-    tempLabel[SET_ZERO]->SetTouchable(true);\r
-    tempLabel[SET_ZERO]->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER,\r
-        UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER);\r
-    tempLabel[SET_ZERO]->SetOnClickListener(clickListener);\r
-    tempLabel[SET_ZERO]->SetFont(DEFAULT_VECTOR_FONT_FILENAME, EXIT_LABEL_FONT);\r
-    Add(tempLabel[SET_ZERO]);\r
-\r
-    tempLabel[SET_ONE] = new UILabel();\r
-    if (tempLabel[SET_ONE] == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempExitInter::InitExit new tempLabel[SET_ONE] fail");\r
-        return false;\r
-    }\r
-    tempLabel[SET_ONE]->SetPosition(EXIT_LABEL_X, EXIT_LABEL_Y_SECOND, EXIT_LABEL_WIDTH, EXIT_LABEL_HEIGHT);\r
-    tempLabel[SET_ONE]->SetText(EXIT_LABEL_TEXT_SECOND);\r
-    tempLabel[SET_ONE]->SetViewId(TEMP_STUDY_THIS);\r
-    tempLabel[SET_ONE]->SetTouchable(true);\r
-    tempLabel[SET_ONE]->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER,\r
-        UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER);\r
-    tempLabel[SET_ONE]->SetOnClickListener(clickListener);\r
-    tempLabel[SET_ONE]->SetFont(DEFAULT_VECTOR_FONT_FILENAME, EXIT_LABEL_FONT);\r
-    Add(tempLabel[SET_ONE]);\r
-\r
-    return true;\r
-}\r
-\r
-bool TempExitInter::InitSimilarImage(int16 num, int16 tempX, int16 tempY, const char* imageSrc)\r
-{\r
-    tempImage[num] = new UIImageView();\r
-    if (tempImage[num] == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempExitInter::InitSimilarImage new tempImage[%d] fail", num);\r
-        return false;\r
-    }\r
-    tempImage[num]->SetPosition(tempX, tempY);\r
-    tempImage[num]->SetSrc(imageSrc);\r
-    Add(tempImage[num]);\r
-\r
-    return true;\r
-}\r
-\r
-bool TempExitInter::TempInitImage(void)\r
-{\r
-    if (!InitSimilarImage(SET_ZERO, EXIT_IMAGE_X, EXIT_IMAGE_EXIT_Y, TEMP_EXIT)) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempExitInter::TempInitImage new tempImage[SET_ZERO] fail");\r
-        return false;\r
-    }\r
-    if (!InitSimilarImage(SET_ONE, EXIT_IMAGE_X, EXIT_IMAGE_STUDY_Y, TEMP_ABOUT_STUDY)) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempExitInter::TempInitImage new tempImage[SET_ONE] fail");\r
-        return false;\r
-    }\r
-    if (!InitSimilarImage(SET_TWO, EXIT_IMAGE_THIS_X, EXIT_THIS_Y_FIRST, PNG_SETTTING_BUTTON_IMAGE)) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempExitInter::TempInitImage new tempImage[SET_TWO] fail");\r
-        return false;\r
-    }\r
-    if (!InitSimilarImage(SET_THREE, EXIT_IMAGE_THIS_X, EXIT_THIS_Y_SECOND, PNG_SETTTING_BUTTON_IMAGE)) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempExitInter::TempInitImage new tempImage[SET_THREE] fail");\r
-        return false;\r
-    }\r
-\r
-    return true;\r
-}\r
-\r
-bool TempExitInter::InitView(void *caller)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempExitInter::InitExit");\r
-    if (TempPresenter::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempExitInter::InitView TempPresenter::GetInstance() nullptr");\r
-        return false;\r
-    }\r
-    UNUSED(caller);\r
-    UIView::OnDragListener *listener = static_cast<UIView::OnDragListener*>(TempPresenter::GetInstance());\r
-\r
-    SetOnDragListener(listener);\r
-    SetViewId(TEMP_SWIPE_EXIT);\r
-    SetDraggable(true);\r
-    SetTouchable(true);\r
-\r
-    if (!TempInitLabel()) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempExitInter::InitView TempInitLabel() false");\r
-        return false;\r
-    }\r
-    if (!TempInitImage()) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempExitInter::InitView TempInitImage() false");\r
-        return false;\r
-    }\r
-    return true;\r
-}\r
-}
\ No newline at end of file
diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempExitPrompt.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempExitPrompt.cpp
deleted file mode 100644 (file)
index 600b97f..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-/*\r
- * Copyright (c) CompanyNameMagicTag 2022-2022. All rights reserved.\r
- * Description: temperature\r
- * Author:\r
- * Create: 2022-02-15\r
- */\r
-\r
-#include "UiConfig.h"\r
-#include "layout/grid_layout.h"\r
-#include <string>\r
-#include "temperature/include/TempExitPrompt.h"\r
-\r
-namespace OHOS {\r
-static TempExitPrompt *g_tempExitPrompt = nullptr;\r
-\r
-static const int16 EXIT_PROMPT_LABEL_X = 40;\r
-static const int16 EXIT_PROMPT_LABEL_Y = 90;\r
-static const int16 EXIT_PROMPT_LABEL_WEIGHT = 380;\r
-static const int16 EXIT_PROMPT_LABEL_HEIGHT = 320;\r
-static const int16 EXIT_PROMPT_DELETE_X = 80;\r
-static const int16 EXIT_PROMPT_TRUE_X = 290;\r
-static const int16 EXIT_PROMPT_IMAGE_Y = 325;\r
-static const int16 EXIT_PROMPT_LABEL_FONT = 35;\r
-static const char *EXIT_PROMPT_LABEL = (char*)"退出研究后,您的历史相关数据将被清除,且无法继续使用该应用。若需体验,需重新加入体温研究。是否退出?";\r
-\r
-TempExitPrompt::TempExitPrompt()\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempExitPrompt::TempExitPrompt");\r
-    g_tempExitPrompt = this;\r
-}\r
-\r
-TempExitPrompt::~TempExitPrompt()\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempExitPrompt::~TempExitPrompt");\r
-    RemoveAll();\r
-    int num;\r
-    if (tempLabel != nullptr) {\r
-        delete tempLabel;\r
-        tempLabel = nullptr;\r
-    }\r
-    for (num = SET_ZERO; num < SET_TWO; num++) {\r
-        if (tempImage[num] != nullptr) {\r
-            delete tempImage[num];\r
-            tempImage[num] = nullptr;\r
-        }\r
-    }\r
-    g_tempExitPrompt = nullptr;\r
-}\r
-\r
-TempExitPrompt *TempExitPrompt::GetInstance(void)\r
-{\r
-    return g_tempExitPrompt;\r
-}\r
-\r
-bool TempExitPrompt::TempInitImage(void)\r
-{\r
-    UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::TempPresenter::GetInstance();\r
-    tempImage[SET_ZERO] = new UIImageView();\r
-    if (tempImage[SET_ZERO] == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempInitInter::TempInitImage new tempImage[SET_ZERO] fail");\r
-        return false;\r
-    }\r
-    tempImage[SET_ZERO]->SetPosition(EXIT_PROMPT_DELETE_X, EXIT_PROMPT_IMAGE_Y);\r
-    tempImage[SET_ZERO]->SetSrc(TEMP_DELETE);\r
-    tempImage[SET_ZERO]->SetOnClickListener(clickListener);\r
-    tempImage[SET_ZERO]->SetViewId(TEMP_EXIT_DELETE);\r
-    tempImage[SET_ZERO]->SetTouchable(true);\r
-    Add(tempImage[SET_ZERO]);\r
-\r
-    tempImage[SET_ONE] = new UIImageView();\r
-    if (tempImage[SET_ONE] == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempInitInter::TempInitImage new tempImage[SET_ONE] fail");\r
-        return false;\r
-    }\r
-    tempImage[SET_ONE]->SetPosition(EXIT_PROMPT_TRUE_X, EXIT_PROMPT_IMAGE_Y);\r
-    tempImage[SET_ONE]->SetSrc(TEMP_TRUE);\r
-    tempImage[SET_ONE]->SetOnClickListener(clickListener);\r
-    tempImage[SET_ONE]->SetViewId(TEMP_EXIT_TRUE);\r
-    tempImage[SET_ONE]->SetTouchable(true);\r
-    Add(tempImage[SET_ONE]);\r
-\r
-    return true;\r
-}\r
-\r
-bool TempExitPrompt::TempInitLabel(void)\r
-{\r
-    tempLabel = new UILabel();\r
-    if (tempLabel == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempExitPrompt::TempInitLabel new tempLabel fail");\r
-        return false;\r
-    }\r
-    tempLabel->SetPosition(EXIT_PROMPT_LABEL_X, EXIT_PROMPT_LABEL_Y,\r
-        EXIT_PROMPT_LABEL_WEIGHT, EXIT_PROMPT_LABEL_HEIGHT);\r
-    tempLabel->SetText(EXIT_PROMPT_LABEL);\r
-    tempLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, EXIT_PROMPT_LABEL_FONT);\r
-    tempLabel->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);\r
-    Add(tempLabel);\r
-\r
-    return true;\r
-}\r
-\r
-bool TempExitPrompt::InitExitPrompt(void)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempExitPrompt::InitExitPrompt");\r
-    SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);\r
-    SetThrowDrag(true);\r
-    if (TempPresenter::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempExitPrompt::InitExitPrompt TempPresenter::GetInstance() nullptr");\r
-        return false;\r
-    }\r
-    UIView::OnDragListener *listener = static_cast<UIView::OnDragListener*>(TempPresenter::GetInstance());\r
-    SetOnDragListener(listener);\r
-    SetDraggable(true);\r
-    SetTouchable(true);\r
-\r
-    if (!TempInitLabel()) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempExitPrompt::InitExitPrompt TempInitLabel() false");\r
-        return false;\r
-    }\r
-    if (!TempInitImage()) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempExitPrompt::InitExitPrompt TempInitImage() false");\r
-        return false;\r
-    }\r
-\r
-    return true;\r
-}\r
-}
\ No newline at end of file
diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempInitInter.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempInitInter.cpp
deleted file mode 100644 (file)
index 19a076c..0000000
+++ /dev/null
@@ -1,235 +0,0 @@
-/*\r
- * Copyright (c) CompanyNameMagicTag 2022-2022. All rights reserved.\r
- * Description: temperature\r
- * Author:\r
- * Create: 2022-02-15\r
- */\r
-\r
-#include "UiConfig.h"\r
-#include <string>\r
-#include "temperature/include/TempInitInter.h"\r
-\r
-namespace OHOS {\r
-static TempInitInter *g_tempInitInter = nullptr;\r
-\r
-static const int16 TEMP_INIT_DROP_X = 200;\r
-static const int16 TEMP_INIT_DROP_Y = 405;\r
-static const int16 TEMP_INIT_DROP_WIDTH = 45;\r
-static const int16 TEMP_INIT_BUTTON_X = 110;\r
-static const int16 TEMP_INIT_BUTTON_Y = 330;\r
-static const int16 TEMP_INIT_BUTTON_WIDTH = 220;\r
-static const int16 TEMP_INIT_BUTTON_HEIGHT = 80;\r
-static const int16 TEMP_INIT_BUTTON_FONT = 35;\r
-static const int16 LABEL_ONE_X = 90;\r
-static const int16 LABEL_TWO_X = 265;\r
-static const int16 TEMP_INIT_LABEL_THREE_X = 105;\r
-static const int16 TEMP_INIT_LABEL_THREE_Y = 80;\r
-static const int16 TEMP_INIT_IMAGE_TIP_X = 255;\r
-static const int16 TEMP_INIT_IMAGE_TIP_Y = 85;\r
-static const int16 TEMP_INIT_IMAGE_TIP_WIDTH = 35;\r
-static const int16 TEMP_INIT_IMAGE_TIP_HEIGHT = 35;\r
-static const int16 LABEL_THREE_WIDTH = 300;\r
-static const int16 TEMP_INIT_LABEL_FOUR_X = 180;\r
-static const int16 TEMP_INIT_LABEL_FOUR_Y = 120;\r
-static const int16 TEMP_INIT_LABEL_TIME_X = 200;\r
-static const int16 TEMP_INIT_LABEL_TIME_Y = 120;\r
-static const int16 LABEL_FIVE_X = 80;\r
-static const int16 TEMP_INIT_LABEL_FIVE_Y = 275;\r
-static const int16 LABEL_FIVE_WIDTH = 320;\r
-static const int16 LABEL_FIVE_HEIGHT = 50;\r
-static const int16 TEMP_INIT_LABEL_TEMP_Y = 160;\r
-static const int16 TITLE_WIDTH = 90;\r
-static const int16 TITLE_HEIGHT = 50;\r
-static const int16 TEMP_INIT_LABEL_WIDTH = 120;\r
-static const int16 TEMP_INIT_LABEL_HEIGHT = 60;\r
-static const int16 TEMP_INIT_LABEL_SKIN_Y = 220;\r
-static const int16 TEMP_INIT_LABEL_SKIN_HEIGHT = 25;\r
-static const int16 TEMP_INIT_TEMP_FONT = 55;\r
-static const int16 TEMP_INIT_TEMP_SKIN_FONT = 20;\r
-static const int16 TEMP_INIT_TEMP_TITLE_FONT = 35;\r
-static const int16 TEMP_LABEL_MAX = 6;\r
-static const char *TEMP_INIT_BUTTON = (char *)"再次测量";\r
-static const char *TEMP_INIT_TEMP_LABEL = (char *)"36.5";\r
-static const char *TEMP_INIT_SKIN_TEMP_LABEL = (char *)"34.5";\r
-static const char *TEMP_INIT_SKIN_SMALL_LABEL = (char *)"体温(℃)                 皮肤温度(℃)";\r
-static const char *TEMP_INIT_TITLE = (char *)"体温";\r
-static const char *TEMP_INIT_TITLE_TIME = (char *)"刚刚";\r
-static const char *TEMP_INIT_LABEL_TIP = (char *)"佩戴不足10分钟,可能影响到温度精确性,数据仅供参考";\r
-\r
-TempInitInter::TempInitInter()\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempInitInter::TempInitInter");\r
-    g_tempInitInter = this;\r
-}\r
-\r
-TempInitInter::~TempInitInter()\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempInitInter::~TempInitInter");\r
-    RemoveAll();\r
-    for (int8_t stNum = SET_ZERO; stNum < SET_THREE; stNum++) {\r
-        if (tempImage[stNum] != nullptr) {\r
-            delete tempImage[stNum];\r
-            tempImage[stNum] = nullptr;\r
-        }\r
-    }\r
-    for (int8_t ndNum = SET_ZERO; ndNum < TEMP_LABEL_MAX; ndNum++) {\r
-        if (tempLabel[ndNum] != nullptr) {\r
-            delete tempLabel[ndNum];\r
-            tempLabel[ndNum] = nullptr;\r
-        }\r
-    }\r
-    if (buttonTemp != nullptr) {\r
-        delete buttonTemp;\r
-        buttonTemp = nullptr;\r
-    }\r
-    g_tempInitInter = nullptr;\r
-}\r
-\r
-TempInitInter *TempInitInter::GetInstance(void)\r
-{\r
-    return g_tempInitInter;\r
-}\r
-\r
-bool TempInitInter::TempInitImage(void)\r
-{\r
-    UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::TempPresenter::GetInstance();\r
-    tempImage[SET_ZERO] = new UIImageView();\r
-    if (tempImage[SET_ZERO] == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempInitInter::TempInitImage new tempImage[SET_ZERO] fail");\r
-        return false;\r
-    }\r
-    tempImage[SET_ZERO]->SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);\r
-    tempImage[SET_ZERO]->SetSrc(TEMP_BACKGROUND);\r
-    Add(tempImage[SET_ZERO]);\r
-\r
-    tempImage[SET_ONE] = new UIImageView();\r
-    if (tempImage[SET_ONE] == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMeasure::InitMeasure new image[SET_ONE] fail");\r
-        return false;\r
-    }\r
-    tempImage[SET_ONE]->SetPosition(TEMP_INIT_DROP_X, TEMP_INIT_DROP_Y, TEMP_INIT_DROP_WIDTH, TEMP_INIT_DROP_WIDTH);\r
-    tempImage[SET_ONE]->SetSrc(TEMP_UP_DROP);\r
-    Add(tempImage[SET_ONE]);\r
-\r
-    tempImage[SET_TWO] = new UIImageView();\r
-    if (tempImage[SET_TWO] == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMeasure::InitMeasure new image[SET_TWO] fail");\r
-        return false;\r
-    }\r
-    tempImage[SET_TWO]->SetPosition(TEMP_INIT_IMAGE_TIP_X,\r
-        TEMP_INIT_IMAGE_TIP_Y, TEMP_INIT_IMAGE_TIP_WIDTH, TEMP_INIT_IMAGE_TIP_HEIGHT);\r
-    tempImage[SET_TWO]->SetTouchable(true);\r
-    tempImage[SET_TWO]->SetViewId(TEMP_IMAGE_LIT_TIP);\r
-    tempImage[SET_TWO]->SetSrc(TEMP_LIT_TIP);\r
-    tempImage[SET_TWO]->SetOnClickListener(clickListener);\r
-    tempImage[SET_TWO]->SetTouchable(true);\r
-    Add(tempImage[SET_TWO]);\r
-\r
-    return true;\r
-}\r
-\r
-typedef struct {\r
-    int16 labelNum;\r
-    int16 x;\r
-    int16 y;\r
-    int16 width;\r
-    int16 height;\r
-    char* name;\r
-    int16 font;\r
-    const char* text;\r
-} TempInitItem;\r
-\r
-static const TempInitItem tempInitItem[] = {\r
-    { SET_ZERO, LABEL_ONE_X, TEMP_INIT_LABEL_TEMP_Y, TEMP_INIT_LABEL_WIDTH, TEMP_INIT_LABEL_HEIGHT,\r
-      (char *)DEFAULT_VECTOR_FONT_FILENAME, TEMP_INIT_TEMP_FONT, TEMP_INIT_TEMP_LABEL },\r
-    { SET_ONE, LABEL_TWO_X, TEMP_INIT_LABEL_TEMP_Y, TEMP_INIT_LABEL_WIDTH, TEMP_INIT_LABEL_WIDTH,\r
-      (char *)DEFAULT_VECTOR_FONT_FILENAME, TEMP_INIT_TEMP_FONT, TEMP_INIT_SKIN_TEMP_LABEL },\r
-    { SET_TWO, TEMP_INIT_LABEL_THREE_X, TEMP_INIT_LABEL_SKIN_Y, LABEL_THREE_WIDTH, TITLE_HEIGHT,\r
-      (char *)DEFAULT_VECTOR_FONT_FILENAME, TEMP_INIT_TEMP_SKIN_FONT, TEMP_INIT_SKIN_SMALL_LABEL },\r
-    { SET_THREE, TEMP_INIT_LABEL_FOUR_X, TEMP_INIT_LABEL_THREE_Y, TITLE_WIDTH, TITLE_WIDTH,\r
-      (char *)DEFAULT_VECTOR_FONT_FILENAME, TEMP_INIT_TEMP_TITLE_FONT, TEMP_INIT_TITLE },\r
-    { SET_FOUR, TEMP_INIT_LABEL_TIME_X, TEMP_INIT_LABEL_TIME_Y, TITLE_WIDTH, TITLE_HEIGHT,\r
-      (char *)DEFAULT_VECTOR_FONT_FILENAME, TEMP_INIT_TEMP_SKIN_FONT, TEMP_INIT_TITLE_TIME },\r
-    { SET_FIVE, LABEL_FIVE_X, TEMP_INIT_LABEL_FIVE_Y, LABEL_FIVE_WIDTH, LABEL_FIVE_HEIGHT,\r
-      (char *)DEFAULT_VECTOR_FONT_FILENAME, TEMP_INIT_TEMP_SKIN_FONT, TEMP_INIT_LABEL_TIP },\r
-};\r
-\r
-bool TempInitInter::SetBasicLabel(void)\r
-{\r
-    for (int num = 0; num <= SET_FIVE; num++) {\r
-        tempLabel[tempInitItem[num].labelNum] = new UILabel();\r
-        if (tempLabel[tempInitItem[num].labelNum] == nullptr) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempInitInter::SetBasicLabel new tempLabel[%d] fail",\r
-                tempInitItem[num].labelNum);\r
-            return false;\r
-        }\r
-        tempLabel[tempInitItem[num].labelNum]->SetPosition(tempInitItem[num].x, tempInitItem[num].y,\r
-            tempInitItem[num].width, tempInitItem[num].height);\r
-        tempLabel[tempInitItem[num].labelNum]->SetFont(tempInitItem[num].name, tempInitItem[num].font);\r
-        tempLabel[tempInitItem[num].labelNum]->SetText(tempInitItem[num].text);\r
-        Add(tempLabel[tempInitItem[num].labelNum]);\r
-    }\r
-    return true;\r
-}\r
-\r
-bool TempInitInter::SetAppendLabel(void)\r
-{\r
-    tempLabel[SET_ZERO]->SetTextColor(TempPresenter::GetInstance()->CyanColor());\r
-    tempLabel[SET_TWO]->SetTextColor(Color::Gray());\r
-    tempLabel[SET_FOUR]->SetTextColor(Color::Gray());\r
-    tempLabel[SET_FIVE]->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);\r
-    tempLabel[SET_FIVE]->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER,\r
-        UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER);\r
-\r
-    return true;\r
-}\r
-\r
-bool TempInitInter::TempInitButton(void)\r
-{\r
-    UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::TempPresenter::GetInstance();\r
-    buttonTemp = new UILabelButton();\r
-    if (buttonTemp == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempInitInter::TempInitButton new label fail");\r
-        return false;\r
-    }\r
-    buttonTemp->SetPosition(TEMP_INIT_BUTTON_X, TEMP_INIT_BUTTON_Y, TEMP_INIT_BUTTON_WIDTH, TEMP_INIT_BUTTON_HEIGHT);\r
-    buttonTemp->SetText(TEMP_INIT_BUTTON);\r
-    buttonTemp->SetViewId(TEMP_MEA_AGAIN);\r
-    buttonTemp->SetFont(DEFAULT_VECTOR_FONT_FILENAME, TEMP_INIT_BUTTON_FONT);\r
-    buttonTemp->SetTextColor(OHOS::TempPresenter::GetInstance()->CyanColor());\r
-    buttonTemp->SetStyleForState(STYLE_BACKGROUND_COLOR, Color::Gray().full, UIButton::RELEASED);\r
-    buttonTemp->SetStyleForState(STYLE_BACKGROUND_COLOR, Color::Gray().full, UIButton::PRESSED);\r
-    buttonTemp->SetStyleForState(STYLE_BACKGROUND_COLOR, Color::Gray().full, UIButton::INACTIVE);\r
-    buttonTemp->SetOnClickListener(clickListener);\r
-    Add(buttonTemp);\r
-    return true;\r
-}\r
-\r
-bool TempInitInter::InitView(void *caller)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempInitInter::InitView");\r
-    UNUSED(caller);\r
-    if (TempPresenter::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempInitInter::InitView TempPresenter::GetInstance() nullptr");\r
-        return false;\r
-    }\r
-\r
-    if (!TempInitImage()) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempInitInter::InitView TempInitImage() false");\r
-        return false;\r
-    }\r
-    if (!SetBasicLabel()) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempInitInter::InitView TempInitLabel() false");\r
-        return false;\r
-    }\r
-    if (!SetAppendLabel()) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempInitInter::InitView TempLowLabel() false");\r
-        return false;\r
-    }\r
-    if (!TempInitButton()) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempInitInter::InitView TempInitButton() false");\r
-        return false;\r
-    }\r
-    return true;\r
-}\r
-}
\ No newline at end of file
diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempJoinStudy.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempJoinStudy.cpp
deleted file mode 100644 (file)
index 9dce745..0000000
+++ /dev/null
@@ -1,186 +0,0 @@
-/*\r
- * Copyright (c) CompanyNameMagicTag 2022-2022. All rights reserved.\r
- * Description: temperature\r
- * Author:\r
- * Create: 2022-02-15\r
- */\r
-\r
-#include "UiConfig.h"\r
-#include "layout/grid_layout.h"\r
-#include <string>\r
-#include "temperature/include/TempJoinStudy.h"\r
-\r
-namespace OHOS {\r
-static TempJoinStudy *g_tempJoinStudy = nullptr;\r
-static const int16 TEMP_TITLE_X = 150;\r
-static const int16 TEMP_TITLE_Y = 50;\r
-static const int16 TEMP_TITLE_WIDTH = 150;\r
-static const int16 TEMP_TITLE_HEIGHT = 45;\r
-static const int16 TEMP_TITLE_FONT = 36;\r
-static const int16 TEMP_FIRST_LABEL_FONT = 35;\r
-static const int16 TEMP_LABEL_FIRST_X = 45;\r
-static const int16 TEMP_LABEL_FIRST_Y = 120;\r
-static const int16 TEMP_LABEL_SECOND_Y = 350;\r
-static const int16 TEMP_LABEL_THIRD_Y = 650;\r
-static const int16 TEMP_LABEL_FIRST_WIDTH = 350;\r
-static const int16 TEMP_LABEL_FIRST_HEIGHT = 400;\r
-static const int16 TEMP_BUTTON_X = 120;\r
-static const int16 TEMP_BUTTON_FIRST_Y = 940;\r
-static const int16 TEMP_BUTTON_SECOND_Y = 1040;\r
-static const int16 TEMP_BUTTON_WEDITH = 220;\r
-static const int16 TEMP_BUTTON_HEIGHT = 80;\r
-static const int16 TEMP_LABEL_MAX = 3;\r
-static const int16 TEMP_BUTTON_MAX = 2;\r
-static const char *TEMP_TITLE_TEXT = (char*)"体温研究";\r
-static const char *TEMP_LABEL_ONE = (char*)"本功能通过内置温度传感器测量腕部皮肤温度,主要研究腕部皮肤温度和体温的关系。";\r
-static const char *TEMP_LABEL_TWO = (char*)"本功能用于18岁以上健康人群测量运动过程,及之后腕部皮肤温度和体温的变化,请加入研究,以便及时观察运动前后身体的变化。";\r
-static const char *TEMP_LABEL_THREE = (char*)"测量需佩戴10分钟以上,且容易受到环境因素影响。目前达不到水银体温计的精度,测量结果仅供参考,不作为医疗诊断依据。";\r
-static const char *TEMP_BUTTON_ONE = (char*)"加入研究";\r
-static const char *TEMP_BUTTON_TWO = (char*)"退出";\r
-\r
-TempJoinStudy::TempJoinStudy()\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempJoinStudy::TempJoinStudy");\r
-    g_tempJoinStudy = this;\r
-}\r
-\r
-TempJoinStudy::~TempJoinStudy()\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempJoinStudy::~TempJoinStudy");\r
-    RemoveAll();\r
-    if (tempTitle != nullptr) {\r
-        delete tempTitle;\r
-        tempTitle = nullptr;\r
-    }\r
-    for (int32_t numLabel = SET_ZERO; numLabel < TEMP_LABEL_MAX; numLabel++) {\r
-        if (tempLabel[numLabel] != nullptr) {\r
-            delete tempLabel[numLabel];\r
-            tempLabel[numLabel] = nullptr;\r
-        }\r
-    }\r
-    for (int32_t numButton = SET_ZERO; numButton < TEMP_BUTTON_MAX; numButton++) {\r
-        if (tempButton[numButton] != nullptr) {\r
-            delete tempButton[numButton];\r
-            tempButton[numButton] = nullptr;\r
-        }\r
-    }\r
-    g_tempJoinStudy = nullptr;\r
-}\r
-\r
-TempJoinStudy *TempJoinStudy::GetInstance(void)\r
-{\r
-    return g_tempJoinStudy;\r
-}\r
-\r
-bool TempJoinStudy::InitSimilarLabel(int16 num, int16 labelY, const char *labelText)\r
-{\r
-    tempLabel[num] = new UILabel();\r
-    if (tempLabel[num] == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempJoinStudy::TempInitLabel new tempLabel[%d] error", num);\r
-        return false;\r
-    }\r
-    tempLabel[num]->SetPosition(TEMP_LABEL_FIRST_X, labelY, TEMP_LABEL_FIRST_WIDTH, TEMP_LABEL_FIRST_HEIGHT);\r
-    tempLabel[num]->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);\r
-    tempLabel[num]->SetText(labelText);\r
-    tempLabel[num]->SetFont(DEFAULT_VECTOR_FONT_FILENAME, TEMP_FIRST_LABEL_FONT);\r
-    Add(tempLabel[num]);\r
-\r
-    return true;\r
-}\r
-\r
-bool TempJoinStudy::TempInitLabel(void)\r
-{\r
-    tempTitle = new UILabel();\r
-    if (tempTitle == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempJoinStudy::TempInitLabel new tempTitle error");\r
-        return false;\r
-    }\r
-    tempTitle->SetPosition(TEMP_TITLE_X, TEMP_TITLE_Y, TEMP_TITLE_WIDTH, TEMP_TITLE_HEIGHT);\r
-    tempTitle->SetFont(DEFAULT_VECTOR_FONT_FILENAME, TEMP_TITLE_FONT);\r
-    tempTitle->SetText(TEMP_TITLE_TEXT);\r
-    Add(tempTitle);\r
-\r
-    if (!InitSimilarLabel(SET_ZERO, TEMP_LABEL_FIRST_Y, TEMP_LABEL_ONE)) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempJoinStudy::TempInitLabel new tempLabel[SET_ZERO] error");\r
-        return false;\r
-    }\r
-    if (!InitSimilarLabel(SET_ONE, TEMP_LABEL_SECOND_Y, TEMP_LABEL_TWO)) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempJoinStudy::TempInitLabel new tempLabel[SET_ONE] error");\r
-        return false;\r
-    }\r
-    if (!InitSimilarLabel(SET_TWO, TEMP_LABEL_THIRD_Y, TEMP_LABEL_THREE)) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempJoinStudy::TempInitLabel new tempLabel[SET_ONE] error");\r
-        return false;\r
-    }\r
-\r
-    return true;\r
-}\r
-\r
-bool TempJoinStudy::TempInitButton(void)\r
-{\r
-    UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::TempPresenter::GetInstance();\r
-    tempButton[SET_ZERO] = new UILabelButton();\r
-    if (tempButton[SET_ZERO] == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempJoinStudy::TempInitButton new tempButton[SET_ZERO] error");\r
-        return false;\r
-    }\r
-    tempButton[SET_ZERO]->SetPosition(TEMP_BUTTON_X, TEMP_BUTTON_FIRST_Y, TEMP_BUTTON_WEDITH, TEMP_BUTTON_HEIGHT);\r
-    tempButton[SET_ZERO]->SetFont(DEFAULT_VECTOR_FONT_FILENAME, TEMP_TITLE_FONT);\r
-    tempButton[SET_ZERO]->SetText(TEMP_BUTTON_ONE);\r
-    tempButton[SET_ZERO]->SetViewId(TEMP_INTER_JOIN);\r
-    tempButton[SET_ZERO]->SetOnClickListener(clickListener);\r
-    tempButton[SET_ZERO]->SetStyleForState(STYLE_BACKGROUND_COLOR,\r
-        OHOS::TempPresenter::GetInstance()->CyanColor().full, UIButton::RELEASED);\r
-    tempButton[SET_ZERO]->SetStyleForState(STYLE_BACKGROUND_COLOR,\r
-        OHOS::TempPresenter::GetInstance()->CyanColor().full, UIButton::PRESSED);\r
-    tempButton[SET_ZERO]->SetStyleForState(STYLE_BACKGROUND_COLOR,\r
-        OHOS::TempPresenter::GetInstance()->CyanColor().full, UIButton::INACTIVE);\r
-    Add(tempButton[SET_ZERO]);\r
-\r
-    tempButton[SET_ONE] = new UILabelButton();\r
-    if (tempButton[SET_ONE] == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempJoinStudy::TempInitButton new tempButton[SET_ONE] error");\r
-        return false;\r
-    }\r
-    tempButton[SET_ONE]->SetPosition(TEMP_BUTTON_X, TEMP_BUTTON_SECOND_Y,  TEMP_BUTTON_WEDITH, TEMP_BUTTON_HEIGHT);\r
-    tempButton[SET_ONE]->SetFont(DEFAULT_VECTOR_FONT_FILENAME, TEMP_TITLE_FONT);\r
-    tempButton[SET_ONE]->SetText(TEMP_BUTTON_TWO);\r
-    tempButton[SET_ONE]->SetViewId(TEMP_INTER_EXIT);\r
-    tempButton[SET_ONE]->SetOnClickListener(clickListener);\r
-    tempButton[SET_ONE]->SetTextColor(OHOS::TempPresenter::GetInstance()->CyanColor());\r
-    tempButton[SET_ONE]->SetStyleForState(STYLE_BACKGROUND_COLOR, Color::Gray().full, UIButton::RELEASED);\r
-    tempButton[SET_ONE]->SetStyleForState(STYLE_BACKGROUND_COLOR, Color::Gray().full, UIButton::PRESSED);\r
-    tempButton[SET_ONE]->SetStyleForState(STYLE_BACKGROUND_COLOR, Color::Gray().full, UIButton::INACTIVE);\r
-    Add(tempButton[SET_ONE]);\r
-\r
-    return true;\r
-}\r
-\r
-bool TempJoinStudy::InitJoinStudy(void)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempJoinStudy::InitJoinStudy");\r
-    SetViewId(TEMP_JOIN_STUDY);\r
-    SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);\r
-    SetThrowDrag(true);\r
-    SetScrollBlankSize(50); // 50:font size\r
-    if (TempPresenter::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempJoinStudy::InitJoinStudy TempPresenter::GetInstance() nullptr");\r
-        return false;\r
-    }\r
-    UIView::OnDragListener *listener = static_cast<UIView::OnDragListener*>(TempPresenter::GetInstance());\r
-    SetOnDragListener(listener);\r
-    SetDraggable(true);\r
-    SetTouchable(true);\r
-\r
-    if (!TempInitLabel()) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempJoinStudy::InitJoinStudy TempInitLabel() false");\r
-        return false;\r
-    }\r
-    if (!TempInitButton()) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempJoinStudy::InitJoinStudy TempInitButton() false");\r
-        return false;\r
-    }\r
-\r
-    return true;\r
-}\r
-}
\ No newline at end of file
diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempLittleTip.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempLittleTip.cpp
deleted file mode 100644 (file)
index b4e7378..0000000
+++ /dev/null
@@ -1,173 +0,0 @@
-/*\r
- * Copyright (c) CompanyNameMagicTag 2022-2022. All rights reserved.\r
- * Description: temperature\r
- * Author:\r
- * Create: 2022-02-15\r
- */\r
-\r
-#include "UiConfig.h"\r
-#include <string>\r
-#include "temperature/include/TempLittleTip.h"\r
-\r
-namespace OHOS {\r
-static TempLittleTip *g_tempJoinStudy = nullptr;\r
-\r
-static const int16 TEMP_TIP_LABEL_ONE_X = 180;\r
-static const int16 TEMP_TIP_LABEL_ONE_Y = 45;\r
-static const int16 TEMP_TIP_LABEL_TITLE_WIDTH = 230;\r
-static const int16 TEMP_TIP_LABEL_TITLE_HEIGHT = 70;\r
-static const int16 TEMP_TIP_LABEL_X = 45;\r
-static const int16 TEMP_TIP_LABEL_TWO_Y = 130;\r
-static const int16 TEMP_TIP_LABEL_THREE_Y = 610;\r
-static const int16 TEMP_TIP_LABEL_FOUR_Y = 670;\r
-static const int16 TEMP_TIP_LABEL_FIVE_Y = 1070;\r
-static const int16 TEMP_TIP_LABEL_SIX_Y = 1120;\r
-static const int16 TEMP_TIP_LABEL_SIX_HEIGHT = 300;\r
-static const int16 TEMP_TIP_LABEL_SEVEN_Y = 1340;\r
-static const int16 TEMP_TIP_LABEL_SEVEN_HEIGHT = 480;\r
-static const int16 TEMP_TIP_LABEL_EIGHT_Y = 2030;\r
-static const int16 TEMP_TIP_LABEL_NIGHT_Y = 2330;\r
-static const int16 TEMP_TIP_LABEL_TITLE_X = 160;\r
-static const int16 TEMP_LABEL_WIDTH = 350;\r
-static const int16 TEMP_LABEL_HEIGHT = 420;\r
-static const int16 TEMP_TIP_TITLE_FONT = 38;\r
-static const int16 TEMP_TIP_TEXT_FONT = 34;\r
-static const int16 TEMP_LABEL_MAX = 9;\r
-static const int16 SET_SIX = 6;\r
-static const char *TEMP_TIP_LABEL_ONE = (char *)"体温";\r
-static const char *TEMP_TIP_LABEL_TWO = (char *)"人体内部的温度称体温。保持恒定的体温,是保持新陈代谢和生命活动的正常进行的必要条件。正常的体温不是一个温度点,\\r
-而是一个体温的范围,大概在36℃-37℃之间(腋窝)通常人体低于35℃为低体温,高于37.2℃为发热。";\r
-static const char *TEMP_TIP_LABEL_THREE = (char *)"皮肤温度";\r
-static const char *TEMP_TIP_LABEL_FOUR = (char *)"皮肤温度是指皮肤表面的温度。人体各部位的皮肤温度不同,且受环境、生理因素等影响显著。室内环境下,\\r
-人体腕部皮肤温度大概在32-34℃,维持舒适的皮肤温度是保证人体热舒适的重要条件";\r
-static const char *TEMP_TIP_LABEL_FIVE = (char *)"测量须知";\r
-static const char *TEMP_TIP_LABEL_SIX = (char *)"● 本设备支持的测量范围为:体温:34-42℃皮肤温度:20-42℃";\r
-static const char *TEMP_TIP_LABEL_SEVEN = (char *)"● 受周围环境影响,测量精度可能会下降。注意以下事项,有助于减少误差:·确保偏紧佩戴10分钟以上,\\r
-在室温(25℃左右)安静状态下测量;·确保手腕处没有水、酒精等液体;·运动、洗澡、室内室外环境切换时,请等待30分钟后在测量;·请避免在阳光直射,有风,又冷/热源的环境下进行测量。";\r
-static const char *TEMP_TIP_LABEL_EIGHT = (char *)"● 穿戴设备在未佩戴、环境温度过低(< 35℃)、过高(> 37.2℃)等条件下会进行出值限制。";\r
-static const char *TEMP_TIP_LABEL_NINE = (char *)"● 测量结果仅供参考,不作为医疗诊断依据";\r
-\r
-TempLittleTip::TempLittleTip()\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempLittleTip::TempLittleTip");\r
-    g_tempJoinStudy = this;\r
-}\r
-\r
-TempLittleTip::~TempLittleTip()\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempLittleTip::~TempLittleTip");\r
-    RemoveAll();\r
-    int8 num;\r
-    for (num = 0; num < TEMP_LABEL_MAX; num++) {\r
-        if (tempLabel[num] != nullptr) {\r
-            delete tempLabel[num];\r
-            tempLabel[num] = nullptr;\r
-        }\r
-    }\r
-    g_tempJoinStudy = nullptr;\r
-}\r
-\r
-TempLittleTip *TempLittleTip::GetInstance(void)\r
-{\r
-    return g_tempJoinStudy;\r
-}\r
-\r
-typedef struct {\r
-    int16 labelNum;\r
-    int16 x;\r
-    int16 y;\r
-    int16 width;\r
-    int16 height;\r
-    char* name;\r
-    int16 font;\r
-    const char* text;\r
-} TempTipItem;\r
-\r
-static const TempTipItem tempTipItem[] = {\r
-    { SET_ZERO, TEMP_TIP_LABEL_ONE_X, TEMP_TIP_LABEL_ONE_Y, TEMP_TIP_LABEL_TITLE_WIDTH, TEMP_TIP_LABEL_TITLE_HEIGHT,\r
-      (char *)DEFAULT_VECTOR_FONT_FILENAME, TEMP_TIP_TITLE_FONT, TEMP_TIP_LABEL_ONE },\r
-    { SET_ONE, TEMP_TIP_LABEL_X, TEMP_TIP_LABEL_TWO_Y, TEMP_LABEL_WIDTH, TEMP_LABEL_HEIGHT,\r
-      (char *)DEFAULT_VECTOR_FONT_FILENAME, TEMP_TIP_TEXT_FONT, TEMP_TIP_LABEL_TWO },\r
-    { SET_TWO, TEMP_TIP_LABEL_TITLE_X, TEMP_TIP_LABEL_THREE_Y, TEMP_TIP_LABEL_TITLE_WIDTH,\r
-      TEMP_TIP_LABEL_TITLE_HEIGHT,  (char *)DEFAULT_VECTOR_FONT_FILENAME, TEMP_TIP_TITLE_FONT, TEMP_TIP_LABEL_THREE },\r
-    { SET_THREE, TEMP_TIP_LABEL_X, TEMP_TIP_LABEL_FOUR_Y, TEMP_LABEL_WIDTH, TEMP_LABEL_HEIGHT,\r
-      (char *)DEFAULT_VECTOR_FONT_FILENAME, TEMP_TIP_TEXT_FONT, TEMP_TIP_LABEL_FOUR },\r
-    { SET_FOUR, TEMP_TIP_LABEL_TITLE_X, TEMP_TIP_LABEL_FIVE_Y, TEMP_TIP_LABEL_TITLE_WIDTH,\r
-      TEMP_TIP_LABEL_TITLE_HEIGHT,  (char *)DEFAULT_VECTOR_FONT_FILENAME, TEMP_TIP_TITLE_FONT, TEMP_TIP_LABEL_FIVE },\r
-    { SET_FIVE, TEMP_TIP_LABEL_X, TEMP_TIP_LABEL_SIX_Y, TEMP_LABEL_WIDTH, TEMP_TIP_LABEL_SIX_HEIGHT,\r
-      (char *)DEFAULT_VECTOR_FONT_FILENAME, TEMP_TIP_TEXT_FONT, TEMP_TIP_LABEL_SIX },\r
-    { SET_SIX, TEMP_TIP_LABEL_X, TEMP_TIP_LABEL_SEVEN_Y, TEMP_LABEL_WIDTH, TEMP_TIP_LABEL_SEVEN_HEIGHT,\r
-      (char *)DEFAULT_VECTOR_FONT_FILENAME, TEMP_TIP_TEXT_FONT, TEMP_TIP_LABEL_SEVEN },\r
-    { SET_SEVEN, TEMP_TIP_LABEL_X, TEMP_TIP_LABEL_EIGHT_Y, TEMP_LABEL_WIDTH, TEMP_TIP_LABEL_SIX_HEIGHT,\r
-      (char *)DEFAULT_VECTOR_FONT_FILENAME, TEMP_TIP_TEXT_FONT, TEMP_TIP_LABEL_EIGHT },\r
-    { SET_EIGHT, TEMP_TIP_LABEL_X, TEMP_TIP_LABEL_NIGHT_Y, TEMP_LABEL_WIDTH, TEMP_TIP_LABEL_SIX_HEIGHT,\r
-      (char *)DEFAULT_VECTOR_FONT_FILENAME, TEMP_TIP_TEXT_FONT, TEMP_TIP_LABEL_NINE },\r
-};\r
-\r
-bool TempLittleTip::SetBasicLabel(void)\r
-{\r
-    for (int num = 0; num <= SET_EIGHT; num++) {\r
-        tempLabel[tempTipItem[num].labelNum] = new UILabel();\r
-        if (tempLabel[tempTipItem[num].labelNum] == nullptr) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempLittleTip::SetBasicLabel new tempLabel[%d] fail",\r
-                tempTipItem[num].labelNum);\r
-            return false;\r
-        }\r
-        tempLabel[tempTipItem[num].labelNum]->SetPosition(tempTipItem[num].x, tempTipItem[num].y,\r
-            tempTipItem[num].width, tempTipItem[num].height);\r
-        tempLabel[tempTipItem[num].labelNum]->SetFont(tempTipItem[num].name, tempTipItem[num].font);\r
-        tempLabel[tempTipItem[num].labelNum]->SetText(tempTipItem[num].text);\r
-        Add(tempLabel[tempTipItem[num].labelNum]);\r
-    }\r
-    return true;\r
-}\r
-\r
-bool TempLittleTip::SetAppendLabel(void)\r
-{\r
-    for (int num = 0; num <= SET_EIGHT; num++) {\r
-        if (tempLabel[tempTipItem[num].labelNum] == nullptr) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempLittleTip::SetAppendLabel tempTipItem[%d] nullptr",\r
-                tempTipItem[num].labelNum);\r
-            return false;\r
-        }\r
-        if (num == SET_ZERO || num == SET_TWO || num == SET_FOUR) {\r
-            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempLittleTip::SetAppendLabel continue");\r
-            continue;\r
-        }\r
-        tempLabel[tempTipItem[num].labelNum]->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);\r
-    }\r
-    return true;\r
-}\r
-\r
-bool TempLittleTip::InitLittleTip(void)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempLittleTip::InitLittleTip");\r
-    SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);\r
-    SetThrowDrag(true);\r
-    SetScrollBlankSize(50); // 50:font size\r
-    if (TempPresenter::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempLittleTip::InitLittleTip TempPresenter::GetInstance() nullptr");\r
-        return false;\r
-    }\r
-    UIView::OnDragListener *listener = static_cast<UIView::OnDragListener*>(TempPresenter::GetInstance());\r
-    SetOnDragListener(listener);\r
-    SetDraggable(true);\r
-    SetTouchable(true);\r
-\r
-    if (!SetBasicLabel()) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempLittleTip::InitLittleTip SetLabel() false");\r
-        return false;\r
-    }\r
-    if (!SetAppendLabel()) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempLittleTip::InitLittleTip SetAppendLabel() false");\r
-        return false;\r
-    }\r
-    return true;\r
-}\r
-\r
-void TempLittleTip::RefreshTip(void)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempLittleTip::RefreshTip");\r
-    ScrollBy(0, TEMP_TIP_LABEL_ONE_Y - tempLabel[0]->GetY());\r
-}\r
-}
\ No newline at end of file
diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempMainView.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempMainView.cpp
deleted file mode 100644 (file)
index 61cd2b6..0000000
+++ /dev/null
@@ -1,591 +0,0 @@
-/*\r
- * Copyright (c) CompanyNameMagicTag 2022-2022. All rights reserved.\r
- * Description: temperature\r
- * Author:\r
- * Create: 2022-02-15\r
- */\r
-\r
-#include "temperature/include/TempMainView.h"\r
-#include "UiConfig.h"\r
-#include "temperature/include/TempMeaProcess.h"\r
-#include "temperature/include/TempWarn.h"\r
-#include "temperature/include/TempExitPrompt.h"\r
-\r
-\r
-namespace OHOS {\r
-static TempMainView *g_tempMainView = nullptr;\r
-\r
-static const int16 FIRST_TIME_JOIN = 0;\r
-static const int16 SECOND_TIME_JOIN = 1;\r
-static const int16 LABEL_FIRST_X = 200;\r
-static const int16 LABEL_FIRST_Y = 60;\r
-static const int16 LABEL_FIRST_WIDTH = 150;\r
-static const int16 LABEL_FIRST_HEIGHT = 45;\r
-static const int16 LABEL_FIRST_FONT = 35;\r
-static const int16 INTERFACES_MAX = 10;\r
-\r
-TempMainView::TempMainView()\r
-{\r
-    g_tempMainView = this;\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempMainView::TempMainView");\r
-}\r
-\r
-TempMainView::~TempMainView()\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempMainView::~TempMainView");\r
-    for (int16_t numGroup = SET_ZERO; numGroup <= INTERFACES_MAX; numGroup++) {\r
-        if (container[numGroup] != nullptr) {\r
-            container[numGroup] = nullptr;\r
-        }\r
-    }\r
-    for (int16_t numSwipe = SET_ZERO; numSwipe < SET_TWO; numSwipe++) {\r
-        if (tempSwipeList[numSwipe] != nullptr) {\r
-            tempSwipeList[numSwipe]->RemoveAll();\r
-            delete tempSwipeList[numSwipe];\r
-            tempSwipeList[numSwipe] = nullptr;\r
-        }\r
-    }\r
-    DeleteViceInter();\r
-    group = nullptr;\r
-    g_tempMainView = nullptr;\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempMainView::~TempMainView");\r
-}\r
-\r
-TempMainView *TempMainView::GetInstance(void)\r
-{\r
-    return g_tempMainView;\r
-}\r
-\r
-void TempMainView::OnStart()\r
-{\r
-\r
-    int16 tempInterListen = TempModel::GetInstance()->GetTempInterLis();\r
-    if (tempInterListen == FIRST_TIME_JOIN) {\r
-        tempJoinStudy = new TempJoinStudy();\r
-        if (tempJoinStudy == nullptr) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMainView:: OnStart tempJoinStudy null error!");\r
-            return;\r
-        }\r
-        container[0] = tempJoinStudy;\r
-        tempJoinStudy->InitJoinStudy();\r
-        tempWhichInter = JOIN_STUDY_INTER;\r
-        group = container[0];\r
-    } else if (tempInterListen == SECOND_TIME_JOIN) {\r
-        AppGroupView *view[SET_TWO] = {nullptr};\r
-        if (!SetSwipeInter(0)) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMainView::OnStart SetSwipeInter[0] null error!");\r
-            return;\r
-        }\r
-        tempMeasure = new TempMeasure();\r
-        if (tempMeasure == nullptr) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMainView:: OnStart tempMeasure null error!");\r
-            return;\r
-        }\r
-        view[0] = tempMeasure;\r
-        view[0]->InitView(this);\r
-\r
-        tempExitInter = new TempExitInter();\r
-        if (tempExitInter == nullptr) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMainView:: OnStart tempExitInter null error!");\r
-            return;\r
-        }\r
-        view[1] = tempExitInter;\r
-        view[1]->InitView(this);\r
-        tempSwipeList[0]->Add(view[0]);\r
-        tempSwipeList[0]->Add(view[1]);\r
-        container[MEASURE_INTER] = tempSwipeList[0];\r
-        group = container[MEASURE_INTER];\r
-        tempWhichInter = MEASURE_INTER;\r
-    }\r
-    AddViewToRootContainer(group);\r
-    return;\r
-}\r
-\r
-void TempMainView::DeleteViceInter(void)\r
-{\r
-    if (tempJoinStudy != nullptr) {\r
-        delete tempJoinStudy;\r
-        tempJoinStudy = nullptr;\r
-    }\r
-    if (tempMeasure != nullptr) {\r
-        delete tempMeasure;\r
-        tempMeasure = nullptr;\r
-    }\r
-    if (tempExitInter != nullptr) {\r
-        delete tempExitInter;\r
-        tempExitInter = nullptr;\r
-    }\r
-    if (tempPromptWear != nullptr) {\r
-        delete tempPromptWear;\r
-        tempPromptWear = nullptr;\r
-    }\r
-    if (tempClickMea != nullptr) {\r
-        delete tempClickMea;\r
-        tempClickMea = nullptr;\r
-    }\r
-    if (tempRemindWear != nullptr) {\r
-        delete tempRemindWear;\r
-        tempRemindWear = nullptr;\r
-    }\r
-    if (tempMeaProcess != nullptr) {\r
-        delete tempMeaProcess;\r
-        tempMeaProcess = nullptr;\r
-    }\r
-    if (tempInitInter != nullptr) {\r
-        delete tempInitInter;\r
-        tempInitInter = nullptr;\r
-    }\r
-    if (tempWarn != nullptr) {\r
-        delete tempWarn;\r
-        tempWarn = nullptr;\r
-    }\r
-    if (tempLittleTip != nullptr) {\r
-        delete tempLittleTip;\r
-        tempLittleTip = nullptr;\r
-    }\r
-    if (tempExitPrompt != nullptr) {\r
-        delete tempExitPrompt;\r
-        tempExitPrompt = nullptr;\r
-    }\r
-    if (tempStudyAbout != nullptr) {\r
-        delete tempStudyAbout;\r
-        tempStudyAbout = nullptr;\r
-    }\r
-}\r
-\r
-int16 TempMainView::GetWhichInter(void)\r
-{\r
-    return tempWhichInter;\r
-}\r
-\r
-bool TempMainView::SetSwipeInter(int16 num)\r
-{\r
-    if (TempPresenter::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMainView:: SetSwipeInter TempPresenter null!");\r
-        return false;\r
-    }\r
-    UIView::OnDragListener *listener = static_cast<UIView::OnDragListener*>(TempPresenter::GetInstance());\r
-    UISwipeView::OnSwipeListener* onSwipeListener =\r
-        static_cast<UISwipeView::OnSwipeListener*>(OHOS::TempPresenter::GetInstance());\r
-    tempSwipeList[num] = new UISwipeView(UISwipeView::VERTICAL);\r
-    if (tempSwipeList[num] == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "tempSwipeList[num] new fail");\r
-        return false;\r
-    }\r
-    tempSwipeList[num]->SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full);\r
-    tempSwipeList[num]->SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);\r
-    tempSwipeList[num]->SetOnDragListener(listener);\r
-    tempSwipeList[num]->SetOnSwipeListener(onSwipeListener);\r
-    tempSwipeList[num]->SetDraggable(true);\r
-    tempSwipeList[num]->SetTouchable(true);\r
-    tempSwipeList[num]->SetAnimatorTime(50); // 50 animator drag time(ms)\r
-\r
-    return true;\r
-}\r
-\r
-int16 TempMainView::GetListenInter(void)\r
-{\r
-    return interListen;\r
-}\r
-\r
-void TempMainView::DropView(UIView& view)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempMainView::DropView");\r
-    if (&view == container[PROMPT_WEAR]) {\r
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempMainView::DropView::container[PROMPT_WEAR]");\r
-        ChangeView(PROMPT_WEAR, MEASURE_INTER);\r
-    } else if (&view == container[CLICK_MEA]) {\r
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempMainView::DropView::container[CLICK_MEA]");\r
-        ChangeView(CLICK_MEA, PROMPT_WEAR);\r
-    } else if (&view == container[REMIND_WEAR]) {\r
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempMainView::DropView::container[REMIND_WEAR]");\r
-        ChangeView(REMIND_WEAR, CLICK_MEA);\r
-    } else if (&view == container[TEMP_EXIT_STUDY]) {\r
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempMainView::DropView::container[TEMP_EXIT_STUDY]");\r
-        ChangeView(TEMP_EXIT_STUDY, tempWhichMea);\r
-    } else if (&view == container[TEMP_WARN_INTER]) {\r
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempMainView::DropView::container[TEMP_WARN_INTER]");\r
-        ChangeView(TEMP_WARN_INTER, MEASURE_INTER);\r
-    } else if (&view == container[TEMP_STUDY]) {\r
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempMainView::DropView::container[TEMP_STUDY] tempWhichMea = %d", tempWhichMea);\r
-        ChangeView(TEMP_STUDY, tempWhichMea);\r
-    } else if (&view == container[TEMP_TIP]) {\r
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempMainView::DropView::container[TEMP_TIP]");\r
-        ChangeView(TEMP_TIP, MEASURE_INIT);\r
-    } else if (&view == container[MEASURE_ING]) {\r
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempMainView::DropView::container[MEASURE_ING]");\r
-        if (interListen == CLICK_MEA) {\r
-            ChangeView(MEASURE_ING, CLICK_MEA);\r
-        } else if (interListen == MEASURE_INIT) {\r
-            ChangeView(MEASURE_ING, MEASURE_INIT);\r
-        }\r
-        if (TempMeaProcess::GetInstance() == nullptr) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMeaProcess::GetInstance() null error!");\r
-            return;\r
-        }\r
-        if (TempPresenter::GetInstance() == nullptr) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempPresenter::GetInstance() null error!");\r
-            return;\r
-        }\r
-        TempMeaProcess::GetInstance()->SetCircleStatus(false);\r
-        TempPresenter::GetInstance()->SetTempCountMax();\r
-    } else {\r
-        NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST);\r
-    }\r
-    return;\r
-}\r
-\r
-bool TempMainView::ChangePrompt(int16 thisView)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempMainView::ChangePrompt");\r
-    if (container[thisView] == nullptr) {\r
-        tempPromptWear = new TempPromptWear();\r
-        if (tempPromptWear == nullptr) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMainView:: OnStart tempPromptWear null error!");\r
-            return false;\r
-        }\r
-        container[thisView] = tempPromptWear;\r
-        tempPromptWear->InitPromptWear();\r
-        AddViewToRootContainer(container[thisView]);\r
-    }\r
-    tempWhichInter = thisView;\r
-    return true;\r
-}\r
-\r
-bool TempMainView::ChangeMeasure(int16 thisView)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempMainView::ChangeMeasure");\r
-    if (container[thisView] == nullptr) {\r
-        AppGroupView *view[SET_THREE] = {nullptr};\r
-        if (!SetSwipeInter(SET_ZERO)) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMainView::ChangeMeasure SetSwipeInter[0] null error!");\r
-            return false;\r
-        }\r
-        tempMeasure = new TempMeasure();\r
-        if (tempMeasure == nullptr) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMainView::ChangeMeasure tempMeasure null error!");\r
-            return false;\r
-        }\r
-        view[SET_ZERO] = tempMeasure;\r
-        if (!view[SET_ZERO]->InitView(this)) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMainView::ChangeMeasure view [0] InitView null error!");\r
-            return false;\r
-        }\r
-\r
-        tempExitInter = new TempExitInter();\r
-        if (tempExitInter == nullptr) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMainView::ChangeMeasure tempExitInter null error!");\r
-            return false;\r
-        }\r
-        view[SET_ONE] = tempExitInter;\r
-        if (!view[SET_ONE]->InitView(this)) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMainView::ChangeMeasure view [1] InitView null error!");\r
-            return false;\r
-        }\r
-        tempSwipeList[SET_ZERO]->Add(view[SET_ZERO]);\r
-        tempSwipeList[SET_ZERO]->Add(view[SET_ONE]);\r
-        container[thisView] = tempSwipeList[SET_ZERO];\r
-\r
-        AddViewToRootContainer(container[thisView]);\r
-        TempModel::GetInstance()->SetTempInterLis(SECOND_TIME_JOIN);\r
-    }\r
-    tempWhichInter = thisView;\r
-    tempWhichMea = thisView;\r
-    return true;\r
-}\r
-\r
-bool TempMainView::ChangeClickMea(int16 thisView)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempMainView::ChangeClickMea");\r
-    if (container[thisView] == nullptr) {\r
-        tempClickMea = new TempClickMea();\r
-        if (tempClickMea == nullptr) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMainView::ChangeClickMea tempClickMea null error!");\r
-            return false;\r
-        }\r
-        container[thisView] = tempClickMea;\r
-        if (!tempClickMea->InitClickMea()) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMainView::ChangeClickMea InitClickMea error!");\r
-            return false;\r
-        }\r
-        AddViewToRootContainer(container[thisView]);\r
-    }\r
-    if (TempClickMea::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempClickMea:: GetInstance error!");\r
-        return false;\r
-    }\r
-    TempClickMea::GetInstance()->RefreshClickMea();\r
-    tempWhichInter = thisView;\r
-    return true;\r
-}\r
-\r
-bool TempMainView::ChangeRemindWear(int16 thisView)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempMainView::ChangeRemindWear");\r
-    if (container[thisView] == nullptr) {\r
-        tempRemindWear = new TempRemindWear();\r
-        if (tempRemindWear == nullptr) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMainView:: OnStart tempRemindWear null error!");\r
-            return false;\r
-        }\r
-        container[thisView] = tempRemindWear;\r
-        if (!tempRemindWear->InitRemindWear()) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMainView::ChangeRemindWear InitRemindWear error!");\r
-            return false;\r
-        }\r
-        AddViewToRootContainer(container[thisView]);\r
-    }\r
-    tempWhichInter = thisView;\r
-    return true;\r
-}\r
-\r
-bool TempMainView::ChangeMeaProcess(int16 thisView)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempMainView::ChangeMeaProcess");\r
-    if (container[thisView] == nullptr) {\r
-        tempMeaProcess = new TempMeaProcess();\r
-        if (tempMeaProcess == nullptr) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMainView:: OnStart tempMeaProcess null error!");\r
-            return false;\r
-        }\r
-        container[thisView] = tempMeaProcess;\r
-        if (!tempMeaProcess->InitMeaProcess()) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMainView::ChangeMeaProcess InitMeaProcess error!");\r
-            return false;\r
-        }\r
-        AddViewToRootContainer(container[thisView]);\r
-    }\r
-    if (TempMeaProcess::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMeaProcess:: GetInstance error!");\r
-        return false;\r
-    }\r
-    TempMeaProcess::GetInstance()->SetCircleStatus(true);\r
-    tempWhichInter = thisView;\r
-    return true;\r
-}\r
-\r
-bool TempMainView::ChangeTempInit(int16 thisView)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempMainView::ChangeTempInit");\r
-    if (container[thisView] == nullptr) {\r
-        AppGroupView *view[SET_THREE] = {nullptr};\r
-        if (!SetSwipeInter(SET_ONE)) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMainView::ChangeMeasure SetSwipeInter[1] null error!");\r
-            return false;\r
-        }\r
-        tempInitInter = new TempInitInter();\r
-        if (tempInitInter == nullptr) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMainView:: OnStart tempInitInter null error!");\r
-            return false;\r
-        }\r
-        view[SET_ZERO] = tempInitInter;\r
-        if (!view[SET_ZERO]->InitView(this)) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMainView::ChangeTempInit view [0] InitView null error!");\r
-            return false;\r
-        }\r
-\r
-        tempExitInter = new TempExitInter();\r
-        if (tempExitInter == nullptr) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMainView:: OnStart tempExitInter null error!");\r
-            return false;\r
-        }\r
-        view[SET_ONE] = tempExitInter;\r
-        if (!view[SET_ONE]->InitView(this)) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMainView::ChangeTempInit view [1] InitView null error!");\r
-            return false;\r
-        }\r
-\r
-        tempReport = new TempReport();\r
-        if (tempReport == nullptr) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMainView::ChangeMeasure tempReport null error!");\r
-            return false;\r
-        }\r
-        view[SET_TWO] = tempReport;\r
-        if (!view[SET_TWO]->InitView(this)) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMainView::ChangeMeasure view [2] InitView null error!");\r
-            return false;\r
-        }\r
-        tempSwipeList[SET_ONE]->Add(view[SET_ZERO]);\r
-        tempSwipeList[SET_ONE]->Add(view[SET_ONE]);\r
-        tempSwipeList[SET_ONE]->Add(view[SET_TWO]);\r
-        container[thisView] = tempSwipeList[SET_ONE];\r
-\r
-        AddViewToRootContainer(container[thisView]);\r
-    }\r
-    tempWhichInter = thisView;\r
-    tempWhichMea = thisView;\r
-    return true;\r
-}\r
-\r
-bool TempMainView::ChangeTempWarn(int16 thisView)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempMainView::ChangeTempWarn");\r
-    if (container[thisView] == nullptr) {\r
-        tempWarn = new TempWarn();\r
-        if (tempWarn == nullptr) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMainView::ChangeTempWarn tempWarn null error!");\r
-            return false;\r
-        }\r
-        container[thisView] = tempWarn;\r
-        if (!tempWarn->InitTempWarn()) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMainView::InitTempWarn tempWarn null error!");\r
-            return false;\r
-        }\r
-        AddViewToRootContainer(container[thisView]);\r
-    }\r
-    if (TempWarn::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempWarn::GetInstance null error!");\r
-        return false;\r
-    }\r
-    TempWarn::GetInstance()->RefreshTempWarn();\r
-    tempWhichInter = thisView;\r
-    return true;\r
-}\r
-\r
-bool TempMainView::ChangeContinue(int16 thisView)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempMainView::ChangeContinue");\r
-    if (container[thisView] == nullptr) {\r
-        tempContinue = new TempContinueWarn();\r
-        if (tempContinue == nullptr) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMainView::ChangeTempWarn tempContinue null error!");\r
-            return false;\r
-        }\r
-        container[thisView] = tempContinue;\r
-        if (!tempContinue->InitTempContinue()) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMainView::InitTempWarn tempContinue null error!");\r
-            return false;\r
-        }\r
-        AddViewToRootContainer(container[thisView]);\r
-    }\r
-    if (TempContinueWarn::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempContinueWarn::GetInstance null error!");\r
-        return false;\r
-    }\r
-    tempWhichInter = thisView;\r
-    return true;\r
-}\r
-\r
-bool TempMainView::ChangeTempTip(int16 thisView)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempMainView::ChangeTempTip");\r
-    if (container[thisView] == nullptr) {\r
-        tempLittleTip = new TempLittleTip();\r
-        if (tempLittleTip == nullptr) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMainView:: ChangeTempTip tempLittleTip null error!");\r
-            return false;\r
-        }\r
-        container[thisView] = tempLittleTip;\r
-        if (!tempLittleTip->InitLittleTip()) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMainView:: ChangeTempTip InitLittleTip null error!");\r
-            return false;\r
-        }\r
-        AddViewToRootContainer(container[thisView]);\r
-    }\r
-    if (TempLittleTip::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempLittleTip:: GetInstance error!");\r
-        return false;\r
-    }\r
-    TempLittleTip::GetInstance()->RefreshTip();\r
-    tempWhichInter = thisView;\r
-    return true;\r
-}\r
-\r
-bool TempMainView::ChangeExitPrompt(int16 thisView)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempMainView::ChangeExitPrompt");\r
-    if (container[thisView] == nullptr) {\r
-        tempExitPrompt = new TempExitPrompt();\r
-        if (tempExitPrompt == nullptr) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMainView:: ChangeExitPrompt tempExitPrompt null error!");\r
-            return false;\r
-        }\r
-        container[thisView] = tempExitPrompt;\r
-        if (!tempExitPrompt->InitExitPrompt()) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMainView:: ChangeExitPrompt InitExitPrompt null error!");\r
-            return false;\r
-        }\r
-        AddViewToRootContainer(container[thisView]);\r
-    }\r
-    tempWhichInter = thisView;\r
-    return true;\r
-}\r
-\r
-bool TempMainView::ChangeStudyAbout(int16 thisView)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempMainView::ChangeStudyAbout");\r
-    if (container[thisView] == nullptr) {\r
-        tempStudyAbout = new TempStudyAbout();\r
-        if (tempStudyAbout == nullptr) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMainView:: ChangeStudyAbout tempStudyAbout null error!");\r
-            return false;\r
-        }\r
-        container[thisView] = tempStudyAbout;\r
-        if (!tempStudyAbout->InitStudyAbout()) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMainView:: ChangeStudyAbout InitStudyAbout null error!");\r
-            return false;\r
-        }\r
-        AddViewToRootContainer(container[thisView]);\r
-    }\r
-    if (TempStudyAbout::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempStudyAbout:: GetInstance error!");\r
-        return false;\r
-    }\r
-    TempStudyAbout::GetInstance()->RefreshStudy();\r
-    tempWhichInter = thisView;\r
-    return true;\r
-}\r
-\r
-struct TempViewMapper {\r
-    const int16 viewId;\r
-    bool (TempMainView::*func)(int16 thisView);\r
-};\r
-\r
-static const TempViewMapper ViewMapper[] = {\r
-    {MEASURE_INTER, &TempMainView::ChangeMeasure},\r
-    {PROMPT_WEAR, &TempMainView::ChangePrompt},\r
-    {CLICK_MEA, &TempMainView::ChangeClickMea},\r
-    {REMIND_WEAR, &TempMainView::ChangeRemindWear},\r
-    {MEASURE_ING, &TempMainView::ChangeMeaProcess},\r
-    {MEASURE_INIT, &TempMainView::ChangeTempInit},\r
-    {TEMP_WARN_INTER, &TempMainView::ChangeTempWarn},\r
-    {TEMP_TIP, &TempMainView::ChangeTempTip},\r
-    {TEMP_EXIT_STUDY, &TempMainView::ChangeExitPrompt},\r
-    {TEMP_STUDY, &TempMainView::ChangeStudyAbout},\r
-};\r
-\r
-bool TempMainView::ClickFunc(int16 interf)\r
-{\r
-    int funcSize = sizeof(ViewMapper) / sizeof(ViewMapper[0]);\r
-    for (int i = 0; i < funcSize; i++) {\r
-        if (interf == ViewMapper[i].viewId) {\r
-            bool jug = (this->*(ViewMapper[i].func))(interf);\r
-            if (!jug) {\r
-                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainAlarmView:: ChangeInterFace[%d] false", interf);\r
-                return false;\r
-            }\r
-            return true;\r
-        }\r
-    }\r
-    return false;\r
-}\r
-\r
-void TempMainView::ChangeView(int16 hideView, int16 showView)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempMainView::ChangeView hideView = %d, showView = %d", hideView, showView);\r
-    if (hideView > INTERFACES_MAX) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMainView::ChangeView Overstep ones bounds");\r
-        return;\r
-    }\r
-    interListen = hideView;\r
-    if (!ClickFunc(showView)) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMainView::ChangeView ClickFunc error");\r
-        return;\r
-    }\r
-    container[hideView]->SetVisible(false);\r
-    container[showView]->SetVisible(true);\r
-    \r
-    Draw();\r
-    return;\r
-}\r
-}
\ No newline at end of file
diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempMeaProcess.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempMeaProcess.cpp
deleted file mode 100644 (file)
index 7bb6460..0000000
+++ /dev/null
@@ -1,177 +0,0 @@
-/*\r
- * Copyright (c) CompanyNameMagicTag 2022-2022. All rights reserved.\r
- * Description: temperature\r
- * Author:\r
- * Create: 2022-02-15\r
- */\r
-\r
-#include "UiConfig.h"\r
-#include <string>\r
-#include "temperature/include/TempMeaProcess.h"\r
-#include "temperature/include/TempMainView.h"\r
-\r
-namespace OHOS {\r
-static TempMeaProcess *g_tempMeaProcess = nullptr;\r
-\r
-static const int16 MEASURE_PROCESS_IMAGE_X = 130;\r
-static const int16 MEASURE_PROCESS_IMAGE_Y = 128;\r
-static const int16 MEASURE_PROCESS_BUTTON_X = 120;\r
-static const int16 MEASURE_PROCESS_BUTTON_Y = 135;\r
-static const int16 MEASURE_PROCESS_WIDTH = 80;\r
-static const int16 MEASURE_PROCESS_CIRCLE_WIDTH = 300;\r
-static const int16 CIRCLE_PROGRESS_CENTER_X = 161;\r
-static const int16 CIRCLE_PROGRESS_CENTER_Y = 161;\r
-static const int16 MEA_CIRCLE_RADIUS = 115;\r
-static const int16 MEA_CIRCLE_VALUE = 100;\r
-static const int16 MEA_CIRCLE_PROGRESS_WIDTH = 20;\r
-static const int16 MEA_CIRCLE_PROGRESS_LEFT = 10;\r
-static const int16 MEA_CIRCLE_PROGRESS_TOP = 5;\r
-static const int16 MEA_CIRCLE_PROGRESS_STARTANGLE = 360;\r
-static const int16 MEA_CIRCLE_PROGRESS_ENDANGLE = 0;\r
-static const int16 MEA_PROCESS_LABEL_FONT = 34;\r
-static const int16 MEA_PROCESS_LABEL_X = 155;\r
-static const int16 MEA_PROCESS_LABEL_Y = 370;\r
-static const int16 MEA_PROCESS_LABEL_WIDTH = 150;\r
-static const int16 MEA_PROCESS_LABEL_HEIGHT = 80;\r
-static const int16 MEASURE_IMAGE_WAITING_X = 114;\r
-static const int16 MEASURE_IMAGE_WAITING_Y = 112;\r
-static const int16 CIRCLE_PROGRESS_POSITION_X = 50;\r
-static const int16 CIRCLE_PROGRESS_POSITION_Y = 52;\r
-static const int16 CIRCLE_PROGRESS_POSITION_WIDTH = 300;\r
-constexpr char *MEA_PROCESS_LABEL_TEXT = (char*)"正在测试";\r
-\r
-TempMeaProcess::TempMeaProcess()\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempMeaProcess::TempMeaProcess");\r
-    g_tempMeaProcess = this;\r
-}\r
-\r
-TempMeaProcess::~TempMeaProcess()\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempMeaProcess::~TempMeaProcess");\r
-    RemoveAll();\r
-    if (tempCircle != nullptr) {\r
-        delete tempCircle;\r
-        tempCircle = nullptr;\r
-    }\r
-    if (imageMeasure != nullptr) {\r
-        delete imageMeasure;\r
-        imageMeasure = nullptr;\r
-    }\r
-    if (tempLabel != nullptr) {\r
-        delete tempLabel;\r
-        tempLabel = nullptr;\r
-    }\r
-    g_tempMeaProcess = nullptr;\r
-}\r
-\r
-TempMeaProcess *TempMeaProcess::GetInstance(void)\r
-{\r
-    return g_tempMeaProcess;\r
-}\r
-\r
-bool TempMeaProcess::TempCirCleProcess()\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempMeaProcess::TempCirCleProcess");\r
-    tempCircle = new UICircleProgress();\r
-    if (tempCircle == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMeaProcess::TempCirCleProcess new tempCircle fail");\r
-        return false;\r
-    }\r
-    tempCircle->SetPosition(CIRCLE_PROGRESS_POSITION_X, CIRCLE_PROGRESS_POSITION_Y,\r
-        CIRCLE_PROGRESS_POSITION_WIDTH, CIRCLE_PROGRESS_POSITION_WIDTH);\r
-    tempCircle->SetCenterPosition(CIRCLE_PROGRESS_CENTER_X, CIRCLE_PROGRESS_CENTER_Y);\r
-    tempCircle->SetRadius(MEA_CIRCLE_RADIUS);\r
-    tempCircle->SetValue(MEA_CIRCLE_VALUE);\r
-    tempCircle->SetBackgroundStyle(STYLE_LINE_WIDTH,\r
-        tempCircle->GetBackgroundStyle(STYLE_LINE_WIDTH) + MEA_CIRCLE_PROGRESS_WIDTH);\r
-    tempCircle->SetForegroundStyle(STYLE_LINE_WIDTH,\r
-        tempCircle->GetForegroundStyle(STYLE_LINE_WIDTH) + MEA_CIRCLE_PROGRESS_WIDTH);\r
-    tempCircle->SetStyle(STYLE_PADDING_LEFT, MEA_CIRCLE_PROGRESS_LEFT);\r
-    tempCircle->SetStyle(STYLE_PADDING_TOP, MEA_CIRCLE_PROGRESS_TOP);\r
-    tempCircle->SetStartAngle(MEA_CIRCLE_PROGRESS_STARTANGLE);\r
-    tempCircle->SetEndAngle(MEA_CIRCLE_PROGRESS_ENDANGLE);\r
-    tempCircle->SetLineColor(Color::Gray());\r
-    Add(tempCircle);\r
-    return true;\r
-}\r
-\r
-bool TempMeaProcess::TempInitImage(void)\r
-{\r
-    UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::TempPresenter::GetInstance();\r
-\r
-    imageMeasure = new UIImageView();\r
-    if (imageMeasure == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMeaProcess::InitMeasure new image fail");\r
-        return false;\r
-    }\r
-    imageMeasure->SetPosition(MEASURE_PROCESS_IMAGE_X, MEASURE_PROCESS_IMAGE_Y,\r
-        MEASURE_PROCESS_WIDTH, MEASURE_PROCESS_WIDTH);\r
-    imageMeasure->SetSrc(TEMP_MEASURE);\r
-    imageMeasure->SetViewId(TEMP_MEASURE_IMAGE);\r
-    imageMeasure->SetOnClickListener(clickListener);\r
-    Add(imageMeasure);\r
-\r
-    return true;\r
-}\r
-\r
-bool TempMeaProcess::TempInitLabel(void)\r
-{\r
-    tempLabel = new UILabel();\r
-    if (tempLabel == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMeaProcess::InitMeasure new label fail");\r
-        return false;\r
-    }\r
-    tempLabel->SetText(MEA_PROCESS_LABEL_TEXT);\r
-    tempLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, MEA_PROCESS_LABEL_FONT);\r
-    tempLabel->SetPosition(MEA_PROCESS_LABEL_X, MEA_PROCESS_LABEL_Y, MEA_PROCESS_LABEL_WIDTH,\r
-        MEA_PROCESS_LABEL_HEIGHT);\r
-    Add(tempLabel);\r
-    return true;\r
-}\r
-\r
-UICircleProgress *TempMeaProcess::GetCircleProgress()\r
-{\r
-    return tempCircle;\r
-}\r
-\r
-bool TempMeaProcess::GetCircleStatus(void)\r
-{\r
-    return circleStatus;\r
-}\r
-\r
-void TempMeaProcess::SetCircleStatus(bool status)\r
-{\r
-    circleStatus = status;\r
-}\r
-\r
-bool TempMeaProcess::InitMeaProcess(void)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempMeaProcess::InitMeaProcess");\r
-    SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);\r
-    if (TempPresenter::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMeaProcess::InitMeaProcess TempPresenter::GetInstance() nullptr");\r
-        return false;\r
-    }\r
-    UIView::OnDragListener *listener = static_cast<UIView::OnDragListener*>(TempPresenter::GetInstance());\r
-    SetOnDragListener(listener);\r
-    SetViewId(TEMP_MEASURE_PROCESS);\r
-    SetDraggable(true);\r
-    SetTouchable(true);\r
-\r
-    if (!TempInitImage()) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMeaProcess::InitMeaProcess TempInitImage() false");\r
-        return false;\r
-    }\r
-    if (!TempInitLabel()) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMeaProcess::InitMeaProcess TempInitLabel() false");\r
-        return false;\r
-    }\r
-    if (!TempCirCleProcess()) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMeaProcess::InitMeaProcess TempCirCleProcess() false");\r
-        return false;\r
-    }\r
-\r
-    return true;\r
-}\r
-}
\ No newline at end of file
diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempMeasure.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempMeasure.cpp
deleted file mode 100644 (file)
index d69ac21..0000000
+++ /dev/null
@@ -1,182 +0,0 @@
-/*\r
- * Copyright (c) CompanyNameMagicTag 2022-2022. All rights reserved.\r
- * Description: temperature\r
- * Author:\r
- * Create: 2022-02-15\r
- */\r
-\r
-#include "UiConfig.h"\r
-#include <string>\r
-#include "temperature/include/TempMeasure.h"\r
-\r
-namespace OHOS {\r
-static TempMeasure *g_tempMeasure = nullptr;\r
-\r
-static const char *MEASURE_TITLE = (char*)"体温";\r
-static const char *MEASURE_BUTTON = (char*)"测量";\r
-static const int16 MEASURE_TITLE_FONT = 40;\r
-static const int16 MEASURE_BUTTON_FONT = 35;\r
-static const int16 MEASURE_TITLE_X = 185;\r
-static const int16 MEASURE_TITLE_Y = 30;\r
-static const int16 MEASURE_TITLE_WIDTH = 155;\r
-static const int16 MEASURE_TITLE_HEIGHT = 155;\r
-static const int16 MEASURE_IMAGE_X = 130;\r
-static const int16 MEASURE_IMAGE_Y = 126;\r
-static const int16 MEASURE_IMAGE_WAITING_X = 114;\r
-static const int16 MEASURE_IMAGE_WAITING_Y = 111;\r
-static const int16 BACKGROUND_IMAGE_X = 135;\r
-static const int16 BACKGROUND_IMAGE_Y = 125;\r
-static const int16 MEASURE_WIDTH = 80;\r
-static const int16 MEASURE_DROP_WIDTH = 45;\r
-static const int16 MEASURE_DROP_X = 200;\r
-static const int16 MEASURE_DROP_Y = 415;\r
-static const int16 MEASURE_BUTTON_X = 110;\r
-static const int16 MEASURE_BUTTON_Y = 340;\r
-static const int16 MEASURE_BUTTON_WIDTH = 220;\r
-static const int16 MEASURE_BUTTON_HEIGHT = 80;\r
-static const int16 TEMP_IMAGE_MAX = 2;\r
-static const int16 TEMP_IMAGE_Y = 35;\r
-static const int16 TEMP_COLD_IMAGE_X = 120;\r
-static const int16 TEMP_HOT_IMAGE_X = 275;\r
-static const int16 TEMP_IMAGE_WIDTH = 60;\r
-static const int16 TEMP_IMAGE_HEIGHT = 58;\r
-\r
-TempMeasure::TempMeasure()\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempMeasure::TempMeasure");\r
-    g_tempMeasure = this;\r
-}\r
-\r
-TempMeasure::~TempMeasure()\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempMeasure::~TempMeasure");\r
-    RemoveAll();\r
-    int numMeasure;\r
-    if (labelMeasure != nullptr) {\r
-        delete labelMeasure;\r
-        labelMeasure = nullptr;\r
-    }\r
-    if (buttonMeasure != nullptr) {\r
-        delete buttonMeasure;\r
-        buttonMeasure = nullptr;\r
-    }\r
-    if (backgroudButton != nullptr) {\r
-        delete backgroudButton;\r
-        backgroudButton = nullptr;\r
-    }\r
-    for (numMeasure = SET_ZERO; numMeasure < SET_THREE; numMeasure++) {\r
-        if (imageMeasure[numMeasure] != nullptr) {\r
-            delete imageMeasure[numMeasure];\r
-            imageMeasure[numMeasure] = nullptr;\r
-        }\r
-    }\r
-    g_tempMeasure = nullptr;\r
-}\r
-\r
-TempMeasure *TempMeasure::GetInstance(void)\r
-{\r
-    return g_tempMeasure;\r
-}\r
-\r
-bool TempMeasure::TempInitImage(void)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempMeasure::TempInitImage");\r
-    UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::TempPresenter::GetInstance();\r
-    imageMeasure[SET_ZERO] = new UIImageView();\r
-    if (imageMeasure[SET_ZERO] == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMeasure::InitMeasure new image fail");\r
-        return false;\r
-    }\r
-    imageMeasure[SET_ZERO]->SetPosition(MEASURE_IMAGE_X, MEASURE_IMAGE_Y, MEASURE_WIDTH, MEASURE_WIDTH);\r
-    imageMeasure[SET_ZERO]->SetSrc(TEMP_MEASURE);\r
-    imageMeasure[SET_ZERO]->SetViewId(TEMP_MEASURE_IMAGE);\r
-    imageMeasure[SET_ZERO]->SetTouchable(true);\r
-    imageMeasure[SET_ZERO]->SetOnClickListener(clickListener);\r
-    Add(imageMeasure[SET_ZERO]);\r
-\r
-    imageMeasure[SET_ONE] = new UIImageView();\r
-    if (imageMeasure[SET_ONE] == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMeasure::InitMeasure new image fail");\r
-        return false;\r
-    }\r
-    imageMeasure[SET_ONE]->SetPosition(MEASURE_DROP_X, MEASURE_DROP_Y, MEASURE_DROP_WIDTH, MEASURE_DROP_WIDTH);\r
-    imageMeasure[SET_ONE]->SetSrc(TEMP_UP_DROP);\r
-    Add(imageMeasure[SET_ONE]);\r
-    \r
-    imageMeasure[SET_TWO] = new UIImageView();\r
-    if (imageMeasure[SET_TWO] == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMeasure::InitMeasure new image fail");\r
-        return false;\r
-    }\r
-    imageMeasure[SET_TWO]->SetPosition(MEASURE_IMAGE_WAITING_X, MEASURE_IMAGE_WAITING_Y);\r
-    imageMeasure[SET_TWO]->SetSrc(TEMP_WAITING);\r
-    Add(imageMeasure[SET_TWO]);\r
-\r
-    return true;\r
-}\r
-\r
-bool TempMeasure::TempInitLabel(void)\r
-{\r
-    labelMeasure = new UILabel();\r
-    if (labelMeasure == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMeasure::InitMeasure new label fail");\r
-        return false;\r
-    }\r
-    labelMeasure->SetText(MEASURE_TITLE);\r
-    labelMeasure->SetFont(DEFAULT_VECTOR_FONT_FILENAME, MEASURE_TITLE_FONT);\r
-    labelMeasure->SetPosition(MEASURE_TITLE_X, MEASURE_TITLE_Y, MEASURE_TITLE_WIDTH, MEASURE_TITLE_HEIGHT);\r
-    Add(labelMeasure);\r
-\r
-    return true;\r
-}\r
-\r
-bool TempMeasure::TempInitButton(void)\r
-{\r
-    UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::TempPresenter::GetInstance();\r
-    buttonMeasure = new UILabelButton();\r
-    if (buttonMeasure == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMeasure::InitMeasure new label fail");\r
-        return false;\r
-    }\r
-    buttonMeasure->SetPosition(MEASURE_BUTTON_X, MEASURE_BUTTON_Y, MEASURE_BUTTON_WIDTH, MEASURE_BUTTON_HEIGHT);\r
-    buttonMeasure->SetText(MEASURE_BUTTON);\r
-    buttonMeasure->SetFont(DEFAULT_VECTOR_FONT_FILENAME, MEASURE_BUTTON_FONT);\r
-    buttonMeasure->SetViewId(TEMP_MEASURE_BUTTON);\r
-    buttonMeasure->SetTextColor(OHOS::TempPresenter::GetInstance()->CyanColor());\r
-    buttonMeasure->SetStyleForState(STYLE_BACKGROUND_COLOR, Color::Gray().full, UIButton::RELEASED);\r
-    buttonMeasure->SetStyleForState(STYLE_BACKGROUND_COLOR, Color::Gray().full, UIButton::PRESSED);\r
-    buttonMeasure->SetStyleForState(STYLE_BACKGROUND_COLOR, Color::Gray().full, UIButton::INACTIVE);\r
-    buttonMeasure->SetOnClickListener(clickListener);\r
-    Add(buttonMeasure);\r
-\r
-    return true;\r
-}\r
-\r
-bool TempMeasure::InitView(void *caller)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempMeasure::InitView");\r
-    UNUSED(caller);\r
-    if (TempPresenter::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMeasure::InitView TempPresenter::GetInstance() nullptr");\r
-        return false;\r
-    }\r
-    UIView::OnDragListener *listener = static_cast<UIView::OnDragListener*>(TempPresenter::GetInstance());\r
-    SetDraggable(true);\r
-    SetTouchable(true);\r
-    SetOnDragListener(listener);\r
-    \r
-    if (!TempInitLabel()) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMeasure::InitView TempInitLabel() false");\r
-        return false;\r
-    }\r
-    if (!TempInitButton()) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMeasure::InitView TempInitButton() false");\r
-        return false;\r
-    }\r
-    if (!TempInitImage()) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempMeasure::InitView TempInitImage() false");\r
-        return false;\r
-    }\r
-    return true;\r
-}\r
-}
\ No newline at end of file
diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempModel.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempModel.cpp
deleted file mode 100644 (file)
index af1f613..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-/*\r
- * Copyright (c) CompanyNameMagicTag 2022-2022. All rights reserved.\r
- * Description: temperature\r
- * Author:\r
- * Create: 2022-02-15\r
- */\r
-\r
-#include "temperature/include/TempModel.h"\r
-#include "UiConfig.h"\r
-#include "temperature/include/TempModel.h"\r
-\r
-namespace OHOS {\r
-TempModel::TempModel()\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempModel::TempModel");\r
-}\r
-\r
-TempModel::~TempModel()\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempModel::~TempModel");\r
-}\r
-\r
-TempModel *TempModel::GetInstance(void)\r
-{\r
-    static TempModel tempModel;\r
-    return &tempModel;\r
-}\r
-\r
-void TempModel::SetTempInterLis(int16 interListen)\r
-{\r
-    tempInterLis = interListen;\r
-}\r
-\r
-int16 TempModel::GetTempInterLis(void)\r
-{\r
-    return tempInterLis;\r
-}\r
-}
\ No newline at end of file
diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempPresenter.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempPresenter.cpp
deleted file mode 100644 (file)
index 5f49e41..0000000
+++ /dev/null
@@ -1,330 +0,0 @@
-/*\r
- * Copyright (c) CompanyNameMagicTag 2022-2022. All rights reserved.\r
- * Description: temperature\r
- * Author:\r
- * Create: 2022-02-15\r
- */\r
-\r
-#include "temperature/include/TempPresenter.h"\r
-#include "temperature/include/TempMainView.h"\r
-#include "ChangeSliceListener.h"\r
-#include "graphic_service.h"\r
-#include "uiservice/include/ui_service.h"\r
-#include "string"\r
-#include "iostream"\r
-#include "sstream"\r
-#include "NativeRegisterManager.h"\r
-\r
-namespace OHOS {\r
-\r
-// REGIST_MENU(VIEW_MAIN_TEMP, TempMainView, TempPresenter, PNG_APPLIST_TEMP_IMAGE, PNG_APPLIST_DEFAULT_IMG, "体温");\r
-\r
-static TempPresenter *g_tempPresenter = nullptr;\r
-\r
-ColorType TempPresenter::CyanColor()\r
-{\r
-    return Color::GetColorFromRGB(0x1C, 0xF4, 0xED);\r
-}\r
-\r
-TempPresenter::TempPresenter()\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempPresenter new");\r
-    g_tempPresenter = this;\r
-}\r
-\r
-TempPresenter::~TempPresenter()\r
-{\r
-    g_tempPresenter = nullptr;\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempPresenter::~TempPresenter");\r
-}\r
-\r
-TempPresenter *TempPresenter::GetInstance()\r
-{\r
-    return g_tempPresenter;\r
-}\r
-\r
-void TempPresenter::OnResume(void) \r
-{\r
-    Presenter<TempMainView>::OnResume();\r
-    SendMsgToUIService(UI_ADD_SLEEP_VETO, 0, nullptr, 0);\r
-}\r
-\r
-void TempPresenter::OnStop(void)\r
-{\r
-    SendMsgToUIService(UI_RM_SLEEP_VETO, 0, nullptr, 0);\r
-}\r
-\r
-bool TempPresenter::OnDrag(UIView& view, const DragEvent& event)\r
-{\r
-    if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) {\r
-        if (TempMainView::GetInstance() == nullptr) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempPresenter::OnDrag TempMainView::GetInstance() nullptr");\r
-            return false;\r
-        }\r
-        TempMainView::GetInstance()->DropView(view);\r
-    }\r
-    return true;\r
-}\r
-\r
-void TempPresenter::ProgressNotify(void)\r
-{\r
-    if (TempMeaProcess::GetInstance() == nullptr) {\r
-        return;\r
-    }\r
-    if (TempMeaProcess::GetInstance()->GetCircleStatus() &&\r
-        TempMeaProcess::GetInstance()->GetCircleProgress() != nullptr) {\r
-        if (countTemp > 0) {\r
-            GraphicService::GetInstance()->PostGraphicEvent(std::bind(&TempPresenter::UpdateTempCount, this));\r
-        } else {\r
-            TempMeaProcess::GetInstance()->SetCircleStatus(false);\r
-            if (TempMainView::GetInstance() != nullptr) {\r
-                TempMainView::GetInstance()->ChangeView(MEASURE_ING, MEASURE_INIT);\r
-            }\r
-            SetTempCountMax();\r
-        }\r
-    }\r
-    return;\r
-}\r
-\r
-void TempPresenter::SetTempCountMax(void)\r
-{\r
-    countTemp = SET_HUNDRED;\r
-}\r
-\r
-void TempPresenter::UpdateTempCount(void)\r
-{\r
-    if (TempMeaProcess::GetInstance() != nullptr) {\r
-        TempMeaProcess::GetInstance()->GetCircleProgress()->SetValue(countTemp);\r
-    }\r
-    countTemp--;\r
-}\r
-\r
-void TempPresenter::ClickTempJoin(void)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempPresenter::ClickTempJoin start");\r
-    if (TempMainView::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempPresenter::ClickTempJoin TempMainView::GetInstance() nullptr");\r
-        return;\r
-    }\r
-    TempMainView::GetInstance()->ChangeView(JOIN_STUDY_INTER, MEASURE_INTER);\r
-    return;\r
-}\r
-\r
-void TempPresenter::ClickPromptWear(void)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempPresenter::ClickPromptWear start");\r
-    if (TempMainView::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempPresenter::ClickPromptWear TempMainView::GetInstance() nullptr");\r
-        return;\r
-    }\r
-    TempMainView::GetInstance()->ChangeView(MEASURE_INTER, PROMPT_WEAR);\r
-    return;\r
-}\r
-\r
-void TempPresenter::ClickPromptNext(void)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempPresenter::ClickPromptWear start");\r
-    if (TempMainView::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempPresenter::ClickPromptNext TempMainView::GetInstance() nullptr");\r
-        return;\r
-    }\r
-    TempMainView::GetInstance()->ChangeView(PROMPT_WEAR, CLICK_MEA);\r
-    return;\r
-}\r
-\r
-void TempPresenter::ClickExitMea(void)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempPresenter::ClickExitMea start");\r
-    if (TempMainView::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempPresenter::ClickExitMea TempMainView::GetInstance() nullptr");\r
-        return;\r
-    }\r
-    TempMainView::GetInstance()->ChangeView(CLICK_MEA, MEASURE_INTER);\r
-    return;\r
-}\r
-\r
-void TempPresenter::ClickIfWear(void)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempPresenter::ClickIfWear start");\r
-    if (TempMainView::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempPresenter::ClickIfWear TempMainView::GetInstance() nullptr");\r
-        return;\r
-    }\r
-    if (wearListen == 0) {\r
-        TempMainView::GetInstance()->ChangeView(CLICK_MEA, MEASURE_ING);\r
-    } else {\r
-        TempMainView::GetInstance()->ChangeView(CLICK_MEA, REMIND_WEAR);\r
-    }\r
-    return;\r
-}\r
-\r
-void TempPresenter::ClickMeaAgain(void)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempPresenter::ClickMeaAgain start");\r
-    if (TempMainView::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempPresenter::ClickMeaAgain TempMainView::GetInstance() nullptr");\r
-        return;\r
-    }\r
-    TempMainView::GetInstance()->ChangeView(MEASURE_INIT, MEASURE_ING);\r
-    return;\r
-}\r
-\r
-void TempPresenter::ClickMeasure(void)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempPresenter::ClickMeasure start");\r
-    if (TempMainView::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempPresenter::ClickMeasure TempMainView::GetInstance() nullptr");\r
-        return;\r
-    }\r
-    TempMainView::GetInstance()->ChangeView(CLICK_MEA, MEASURE_ING);\r
-    return;\r
-}\r
-\r
-void TempPresenter::ClickTempTip(void)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempPresenter::ClickTempTip start");\r
-    if (TempMainView::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempPresenter::ClickTempTip TempMainView::GetInstance() nullptr");\r
-        return;\r
-    }\r
-    TempMainView::GetInstance()->ChangeView(MEASURE_INTER, TEMP_TIP);\r
-    return;\r
-}\r
-\r
-void TempPresenter::ClickTempExit(void)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempPresenter::ClickTempExit start");\r
-    if (TempMainView::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempPresenter::ClickTempExit TempMainView::GetInstance() nullptr");\r
-        return;\r
-    }\r
-    int theView = TempMainView::GetInstance()->GetWhichInter();\r
-    if (theView != MEASURE_INTER && theView != MEASURE_INIT) {\r
-        theView = MEASURE_INIT;\r
-    }\r
-    TempMainView::GetInstance()->ChangeView(theView, TEMP_EXIT_STUDY);\r
-    return;\r
-}\r
-\r
-void TempPresenter::ClickStudyTip(void)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempPresenter::ClickStudyTip start");\r
-    if (TempMainView::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempPresenter::ClickStudyTip TempMainView::GetInstance() nullptr");\r
-        return;\r
-    }\r
-    int theView = TempMainView::GetInstance()->GetWhichInter();\r
-    if (theView != MEASURE_INTER && theView != MEASURE_INIT) {\r
-        theView = MEASURE_INIT;\r
-    }\r
-    TempMainView::GetInstance()->ChangeView(theView, TEMP_STUDY);\r
-    return;\r
-}\r
-\r
-void TempPresenter::ClickWarnBack(void)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempPresenter::ClickWarnBack start");\r
-    if (TempMainView::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempPresenter::ClickStudyTip TempMainView::GetInstance() nullptr");\r
-        return;\r
-    }\r
-    TempMainView::GetInstance()->ChangeView(TEMP_WARN_INTER, MEASURE_INTER);\r
-    return;\r
-}\r
-\r
-void TempPresenter::ClickExitDelete(void)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempPresenter::ClickExitDelete start");\r
-    if (TempMainView::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempPresenter::ClickExitDelete TempMainView::GetInstance() nullptr");\r
-        return;\r
-    }\r
-    TempMainView::GetInstance()->ChangeView(TEMP_EXIT_STUDY, TempMainView::GetInstance()->GetListenInter());\r
-    return;\r
-}\r
-\r
-void TempPresenter::ClickExit(void)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempPresenter::ClickExit start");\r
-    uint16 preSlice = NativeAbility::GetInstance().GetPreSliceId();\r
-    NativeAbility::GetInstance().ChangeSlice(preSlice);\r
-    if (TempModel::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempModel::GetInstance null error!");\r
-        return;\r
-    }\r
-    TempModel::GetInstance()->SetTempInterLis(0);\r
-    return;\r
-}\r
-\r
-void TempPresenter::ClickExitTemp(void)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempPresenter::ClickExitTemp start");\r
-    uint16 preSlice = NativeAbility::GetInstance().GetPreSliceId();\r
-    NativeAbility::GetInstance().ChangeSlice(preSlice);\r
-    return;\r
-}\r
-\r
-int8 TempPresenter::GetTempListen(void)\r
-{\r
-    return tempListen;\r
-}\r
-\r
-struct TempPresentMapper1 {\r
-    const char *viewId;\r
-    void (TempPresenter::*func)(void);\r
-};\r
-\r
-static const TempPresentMapper1 PresentMapper[] = {\r
-    {TEMP_INTER_EXIT, &TempPresenter::ClickExitTemp},\r
-    {TEMP_INTER_JOIN, &TempPresenter::ClickTempJoin},\r
-    {TEMP_MEASURE_IMAGE, &TempPresenter::ClickPromptWear},\r
-    {TEMP_MEASURE_BUTTON, &TempPresenter::ClickPromptWear},\r
-    {TEMP_PROMPT_NEXT, &TempPresenter::ClickPromptNext},\r
-    {TEMP_MEA_EXIT, &TempPresenter::ClickExitMea},\r
-    {TEMP_MEA_IN, &TempPresenter::ClickIfWear},\r
-    {TEMP_MEA_AGAIN, &TempPresenter::ClickMeaAgain},\r
-    {TEMP_IMAGE_LIT_TIP, &TempPresenter::ClickTempTip},\r
-    {TEMP_EXIT_THIS, &TempPresenter::ClickTempExit},\r
-    {TEMP_STUDY_THIS, &TempPresenter::ClickStudyTip},\r
-    {TEMP_WARN_ID, &TempPresenter::ClickWarnBack},\r
-    {TEMP_EXIT_DELETE, &TempPresenter::ClickExitDelete},\r
-    {TEMP_EXIT_TRUE, &TempPresenter::ClickExit},\r
-};\r
-\r
-bool TempPresenter::ClickFuncId(const char *buttonName)\r
-{\r
-    if (buttonName == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempPresenter::ClickFuncId buttonName nullptr error!");\r
-        return false;\r
-    }\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempPresenter::ClickFuncId buttonName = %s", buttonName);\r
-    for (uint16 i = 0; i < sizeof(PresentMapper) / sizeof(PresentMapper[0]); i++) {\r
-        if (strcmp(buttonName, PresentMapper[i].viewId) == 0) {\r
-            (this->*(PresentMapper[i].func))();\r
-            return true;\r
-        }\r
-    }\r
-    return false;\r
-}\r
-\r
-bool TempPresenter::OnClick(UIView &view, const ClickEvent &event)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempPresenter::OnClick ");\r
-    UNUSED(event);\r
-    ClickFuncId(view.GetViewId());\r
-    return true;\r
-}\r
-\r
-void TempPresenter::OnSwipe(UISwipeView &view)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempPresenter::OnSwipe ");\r
-    UNUSED(view);\r
-    return;\r
-}\r
-\r
-void TempPresenter::Notify(void)\r
-{\r
-    ProgressNotify();\r
-    return;\r
-}\r
-}
\ No newline at end of file
diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempPromptWear.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempPromptWear.cpp
deleted file mode 100644 (file)
index 2cbdb64..0000000
+++ /dev/null
@@ -1,135 +0,0 @@
-/*\r
- * Copyright (c) CompanyNameMagicTag 2022-2022. All rights reserved.\r
- * Description: temperature\r
- * Author:\r
- * Create: 2022-02-15\r
- */\r
-\r
-#include "UiConfig.h"\r
-#include <string>\r
-#include "temperature/include/TempPromptWear.h"\r
-\r
-namespace OHOS {\r
-static TempPromptWear *g_tempPromptWear = nullptr;\r
-\r
-static const int16 PROMPT_LABEL_X = 45;\r
-static const int16 PROMPT_LABEL_Y = 180;\r
-static const int16 PROMPT_LABEL_WIDTH = 350;\r
-static const int16 PROMPT_LABEL_HEIGHT = 200;\r
-static const int16 PROMPT_LABEL_BUTTON_X = 63;\r
-static const int16 PROMPT_LABEL_BUTTON_Y = 366;\r
-static const int16 PROMPT_IMAGE_X = 120;\r
-static const int16 PROMPT_IMAGE_Y = 70;\r
-static const int16 PROMPT_BUTTON_WIDHT = 320;\r
-static const int16 PROMPT_BUTTON_HEIGHT = 101;\r
-static const int16 PROMPT_LABEL_FONT = 35;\r
-static const char *PROMPT_WEAR_LABEL = (char*)"为确保测量准确,建议偏紧佩戴,并保持佩戴10分钟以上再测量";\r
-static const char *PROMPT_BUTTON_LABEL = (char*)"下一步";\r
-\r
-TempPromptWear::TempPromptWear()\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempPromptWear::TempPromptWear");\r
-    g_tempPromptWear = this;\r
-}\r
-\r
-TempPromptWear::~TempPromptWear()\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempPromptWear::~TempPromptWear");\r
-    RemoveAll();\r
-    if (tempLabel != nullptr) {\r
-        delete tempLabel;\r
-        tempLabel = nullptr;\r
-    }\r
-    if (tempButton != nullptr) {\r
-        delete tempButton;\r
-        tempButton = nullptr;\r
-    }\r
-    if (tempImage != nullptr) {\r
-        delete tempImage;\r
-        tempImage = nullptr;\r
-    }\r
-    g_tempPromptWear = nullptr;\r
-}\r
-\r
-TempPromptWear *TempPromptWear::GetInstance(void)\r
-{\r
-    return g_tempPromptWear;\r
-}\r
-\r
-bool TempPromptWear::TempInitLabel(void)\r
-{\r
-    tempLabel = new UILabel();\r
-    if (tempLabel == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempPromptWear::TempInitLabel new tempLabel fail");\r
-        return false;\r
-    }\r
-    tempLabel->SetPosition(PROMPT_LABEL_X, PROMPT_LABEL_Y, PROMPT_LABEL_WIDTH, PROMPT_LABEL_HEIGHT);\r
-    tempLabel->SetText(PROMPT_WEAR_LABEL);\r
-    tempLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, PROMPT_LABEL_FONT);\r
-    Add(tempLabel);\r
-\r
-    return true;\r
-}\r
-\r
-bool TempPromptWear::TempInitButton(void)\r
-{\r
-    tempButton = new UILabelButton();\r
-    if (tempButton == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempPromptWear::InitMeasure new tempButton fail");\r
-        return false;\r
-    }\r
-    tempButton->SetPosition(PROMPT_LABEL_BUTTON_X, PROMPT_LABEL_BUTTON_Y, PROMPT_BUTTON_WIDHT, PROMPT_BUTTON_HEIGHT);\r
-    tempButton->SetText(PROMPT_BUTTON_LABEL);\r
-    tempButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME, PROMPT_LABEL_FONT);\r
-    tempButton->SetViewId(TEMP_PROMPT_NEXT);\r
-    UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::TempPresenter::GetInstance();\r
-    tempButton->SetOnClickListener(clickListener);\r
-    tempButton->SetTextColor(OHOS::TempPresenter::GetInstance()->CyanColor());\r
-    tempButton->SetImageSrc(PNG_NEW_DEVICE, PNG_NEW_DEVICE);\r
-    Add(tempButton);\r
-\r
-    return true;\r
-}\r
-\r
-bool TempPromptWear::TempInitImage(void)\r
-{\r
-    tempImage = new UIImageView();\r
-    if (tempImage == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempPromptWear::InitMeasure new UIImageView fail");\r
-        return false;\r
-    }\r
-    tempImage->SetPosition(PROMPT_IMAGE_X, PROMPT_IMAGE_Y); // 30 : offset\r
-    tempImage->SetSrc(TEMP_ICON_ENTER);\r
-    Add(tempImage);\r
-\r
-    return true;\r
-}\r
-\r
-bool TempPromptWear::InitPromptWear(void)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempPromptWear::InitPromptWear");\r
-    SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);\\r
-    if (TempPresenter::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempPromptWear::InitPromptWear TempPresenter::GetInstance() nullptr");\r
-        return false;\r
-    }\r
-    UIView::OnDragListener *listener = static_cast<UIView::OnDragListener*>(TempPresenter::GetInstance());\r
-    SetOnDragListener(listener);\r
-    SetDraggable(true);\r
-    SetTouchable(true);\r
-\r
-    if (!TempInitLabel()) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempPromptWear::InitPromptWear TempInitLabel() fail");\r
-        return false;\r
-    }\r
-    if (!TempInitButton()) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempPromptWear::InitPromptWear TempInitButton() fail");\r
-        return false;\r
-    }\r
-    if (!TempInitImage()) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempPromptWear::InitPromptWear TempInitImage() fail");\r
-        return false;\r
-    }\r
-    return true;\r
-}\r
-}
\ No newline at end of file
diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempRemindWear.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempRemindWear.cpp
deleted file mode 100644 (file)
index 12a401b..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-/*\r
- * Copyright (c) CompanyNameMagicTag 2022-2022. All rights reserved.\r
- * Description: temperature\r
- * Author:\r
- * Create: 2022-02-15\r
- */\r
-\r
-#include "UiConfig.h"\r
-#include <string>\r
-#include "temperature/include/TempRemindWear.h"\r
-\r
-namespace OHOS {\r
-static TempRemindWear *g_tempRemindWear = nullptr;\r
-\r
-static const int16 REMIND_BACKGROUND_X = 180;\r
-static const int16 REMIND_BACKGROUND_Y = 350;\r
-static const int16 REMIND_WEAR_IMAGE_X = 120;\r
-static const int16 REMIND_WEAR_IMAGE_WIDTH = 100;\r
-static const int16 REMIND_ROTATE_X = 180;\r
-static const int16 REMIND_ROTATE_Y = 345;\r
-static const int16 REMIND_WEAR_IMAGE_Y = 70;\r
-static const int16 REMIND_LABEL_X = 105;\r
-static const int16 REMIND_LABEL_Y = 200;\r
-static const int16 REMIND_LABEL_WIDTH = 350;\r
-static const int16 REMIND_LABEL_HEIGHT = 200;\r
-static const int16 REMIND_LABEL_FONT = 35;\r
-static const char *REMIND_WEAR_LABEL = (char*)"请佩戴手表测量";\r
-\r
-TempRemindWear::TempRemindWear()\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempRemindWear::TempRemindWear");\r
-    g_tempRemindWear = this;\r
-}\r
-\r
-TempRemindWear::~TempRemindWear()\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempRemindWear::~TempRemindWear");\r
-    RemoveAll();\r
-    int num;\r
-    if (tempLabel != nullptr) {\r
-        delete tempLabel;\r
-        tempLabel = nullptr;\r
-    }\r
-    for (num = 0; num < SET_TWO; num++) {\r
-        if (tempImage[num] != nullptr) {\r
-            delete tempImage[num];\r
-            tempImage[num] = nullptr;\r
-        }\r
-    }\r
-    g_tempRemindWear = nullptr;\r
-}\r
-\r
-TempRemindWear *TempRemindWear::GetInstance(void)\r
-{\r
-    return g_tempRemindWear;\r
-}\r
-\r
-bool TempRemindWear::TempInitImage(void)\r
-{\r
-    tempImage[0] = new UIImageView();\r
-    if (tempImage[0] == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempRemindWear::InitRemindWear new tempImage[0] fail");\r
-        return false;\r
-    }\r
-    tempImage[0]->SetPosition(REMIND_WEAR_IMAGE_X, REMIND_WEAR_IMAGE_Y);\r
-    tempImage[0]->SetSrc(TEMP_ICON_ENTER);\r
-    Add(tempImage[0]);\r
-\r
-    tempImage[1] = new UIImageView();\r
-    if (tempImage[1] == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempRemindWear::InitRemindWear new tempImage[1] fail");\r
-        return false;\r
-    }\r
-    tempImage[1]->SetPosition(REMIND_ROTATE_X, REMIND_ROTATE_Y);\r
-    tempImage[1]->SetSrc(TEMP_ROTATE);\r
-    Add(tempImage[1]);\r
-    \r
-    return true;\r
-}\r
-\r
-bool TempRemindWear::TempInitLabel(void)\r
-{\r
-    tempLabel = new UILabel();\r
-    if (tempLabel == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempRemindWear::InitPromptWear new tempLabel fail");\r
-        return false;\r
-    }\r
-    tempLabel->SetPosition(REMIND_LABEL_X, REMIND_LABEL_Y, REMIND_LABEL_WIDTH, REMIND_LABEL_HEIGHT);\r
-    tempLabel->SetText(REMIND_WEAR_LABEL);\r
-    tempLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, REMIND_LABEL_FONT);\r
-    Add(tempLabel);\r
-\r
-    return true;\r
-}\r
-\r
-bool TempRemindWear::InitRemindWear(void)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempRemindWear::InitRemindWear");\r
-    SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);\r
-    SetThrowDrag(true);\r
-    if (TempPresenter::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempRemindWear::InitRemindWear TempPresenter::GetInstance() nullptr");\r
-        return false;\r
-    }\r
-    UIView::OnDragListener *listener = static_cast<UIView::OnDragListener*>(TempPresenter::GetInstance());\r
-    SetOnDragListener(listener);\r
-    SetDraggable(true);\r
-    SetTouchable(true);\r
-\r
-    if (!TempInitImage()) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempRemindWear::InitRemindWear TempInitImage() false");\r
-        return false;\r
-    }\r
-    if (!TempInitLabel()) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempRemindWear::InitRemindWear TempInitLabel() false");\r
-        return false;\r
-    }\r
-\r
-    return true;\r
-}\r
-}
\ No newline at end of file
diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempReport.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempReport.cpp
deleted file mode 100644 (file)
index 43eeb7b..0000000
+++ /dev/null
@@ -1,212 +0,0 @@
-/*\r
- * Copyright (c) CompanyNameMagicTag 2022-2022. All rights reserved.\r
- * Description: temperature\r
- * Author:\r
- * Create: 2022-02-15\r
- */\r
-\r
-#include "UiConfig.h"\r
-#include "layout/grid_layout.h"\r
-#include "font/ui_font.h"\r
-#include <string>\r
-#include "temperature/include/TempReport.h"\r
-\r
-namespace OHOS {\r
-static TempReport *g_tempReport = nullptr;\r
-\r
-static const int16 TEMP_LABEL_ONE_X = 170;\r
-static const int16 TEMP_LABEL_ONE_Y = 30;\r
-static const int16 TEMP_LABEL_ONE_WIDTH = 100;\r
-static const int16 TEMP_LABEL_ONE_HEIGHT = 55;\r
-static const int16 TEMP_LABEL_TWO_X = 180;\r
-static const int16 TEMP_LABEL_TWO_Y = 90;\r
-static const int16 TEMP_LABEL_TWO_WIDTH = 130;\r
-static const int16 TEMP_LABEL_TWO_HEIGHT = 35;\r
-static const int16 TEMP_LABEL_THREE_X = 150;\r
-static const int16 TEMP_LABEL_THREE_Y = 270;\r
-static const int16 TEMP_LABEL_THREE_WIDTH = 90;\r
-static const int16 TEMP_LABEL_THREE_HEIGHT = 40;\r
-static const int16 TEMP_LABEL_FOUR_X = 260;\r
-static const int16 TEMP_LABEL_FIVE_X = 60;\r
-static const int16 TEMP_LABEL_FIVE_Y = 320;\r
-static const int16 TEMP_LABEL_FIVE_WIDTH = 300;\r
-static const int16 TEMP_LABEL_FIVE_HEIGHT = 60;\r
-static const int16 TEMP_LABEL_SIX_X = 190;\r
-static const int16 TEMP_LABEL_SIX_Y = 385;\r
-static const int16 TEMP_LABEL_SIX_WIDTH = 80;\r
-static const int16 TEMP_LABEL_SIX_HEIGHT = 40;\r
-static const int16 TEMP_IMAGE_ONE_X = 70;\r
-static const int16 TEMP_IMAGE_ONE_Y = 30;\r
-static const int16 TEMP_IMAGE_TWO_X = 275;\r
-static const int16 TEMP_IMAGE_TWO_Y = 50;\r
-static const int16 TEMP_IMAGE_THREE_X = 117;\r
-static const int16 TEMP_IMAGE_THREE_Y = 273;\r
-static const int16 TEMP_IMAGE_FOUR_X = 230;\r
-static const int16 TEMP_FOUR_X = 40;\r
-static const int16 TEMP_IMAGE_FOUR_Y = 120;\r
-static const int16 TEMP_TITLE_FONT = 50;\r
-static const int16 TEMP_LABEL_FONT = 35;\r
-static const int16 TEMP_TIP_FONT = 30;\r
-static const int16 TEMP_LITTLE_TIP_FONT = 25;\r
-static const char *TEMP_LABEL_FIVE_TEXT = (char *)"可能受佩带松紧、环境冷热等影响,测量结果仅供参考";\r
-static const char *TEMP_LABEL_SIX_TEXT = (char *)"测量";\r
-static const char *TEMP_NUMBERS = (char *)"36.5";\r
-static const char *TEMP_TIME_TIP = (char *)"1分钟前";\r
-\r
-TempReport::TempReport()\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempReport::TempReport");\r
-    g_tempReport = this;\r
-}\r
-\r
-TempReport::~TempReport()\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempReport::~TempReport");\r
-    RemoveAll();\r
-    for (int16_t labelNum = 0; labelNum < TEMP_SET_SIX; labelNum++) {\r
-        if (tempLabel[labelNum] != nullptr) {\r
-            delete tempLabel[labelNum];\r
-            tempLabel[labelNum] = nullptr;\r
-        }\r
-    }\r
-    for (int16_t imageNum = 0; imageNum < SET_FIVE; imageNum++) {\r
-        if (tempImage[imageNum] != nullptr) {\r
-            delete tempImage[imageNum];\r
-            tempImage[imageNum] = nullptr;\r
-        }\r
-    }\r
-    g_tempReport = nullptr;\r
-}\r
-\r
-TempReport *TempReport::GetInstance(void)\r
-{\r
-    return g_tempReport;\r
-}\r
-\r
-typedef struct {\r
-    int16 labelNum;\r
-    int16 x;\r
-    int16 y;\r
-    int16 width;\r
-    int16 height;\r
-    char* name;\r
-    int16 font;\r
-    const char* text;\r
-} TempReportItem;\r
-\r
-static const TempReportItem tempReportItem[] = {\r
-    {SET_ZERO, TEMP_LABEL_ONE_X, TEMP_LABEL_ONE_Y, TEMP_LABEL_ONE_WIDTH, TEMP_LABEL_ONE_HEIGHT,\r
-        (char *)DEFAULT_VECTOR_FONT_FILENAME, TEMP_TITLE_FONT, TEMP_NUMBERS},\r
-    {SET_ONE, TEMP_LABEL_TWO_X, TEMP_LABEL_TWO_Y, TEMP_LABEL_TWO_WIDTH, TEMP_LABEL_TWO_HEIGHT,\r
-        (char *)DEFAULT_VECTOR_FONT_FILENAME, TEMP_TIP_FONT, TEMP_TIME_TIP},\r
-    {SET_TWO, TEMP_LABEL_THREE_X, TEMP_LABEL_THREE_Y, TEMP_LABEL_THREE_WIDTH, TEMP_LABEL_THREE_HEIGHT,\r
-        (char *)DEFAULT_VECTOR_FONT_FILENAME, TEMP_LABEL_FONT, TEMP_NUMBERS},\r
-    {SET_THREE, TEMP_LABEL_FOUR_X, TEMP_LABEL_THREE_Y, TEMP_LABEL_THREE_WIDTH, TEMP_LABEL_THREE_HEIGHT,\r
-        (char *)DEFAULT_VECTOR_FONT_FILENAME, TEMP_LABEL_FONT, TEMP_NUMBERS},\r
-    {SET_FOUR, TEMP_LABEL_FIVE_X, TEMP_LABEL_FIVE_Y, TEMP_LABEL_FIVE_WIDTH, TEMP_LABEL_FIVE_HEIGHT,\r
-        (char *)DEFAULT_VECTOR_FONT_FILENAME, TEMP_LITTLE_TIP_FONT, TEMP_LABEL_FIVE_TEXT},\r
-    {SET_FIVE, TEMP_LABEL_SIX_X, TEMP_LABEL_SIX_Y, TEMP_LABEL_SIX_WIDTH, TEMP_LABEL_SIX_HEIGHT,\r
-        (char *)DEFAULT_VECTOR_FONT_FILENAME, TEMP_LABEL_FONT, TEMP_LABEL_SIX_TEXT},\r
-};\r
-\r
-bool TempReport::SetBasicLabel(void)\r
-{\r
-    for (int num = 0; num <= SET_FIVE; num++) {\r
-        tempLabel[tempReportItem[num].labelNum] = new UILabel();\r
-        if (tempLabel[tempReportItem[num].labelNum] == nullptr) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempReport::InitLittleTip new tempLabel[%d] fail",\r
-                tempReportItem[num].labelNum);\r
-            return false;\r
-        }\r
-        tempLabel[tempReportItem[num].labelNum]->SetPosition(tempReportItem[num].x, tempReportItem[num].y,\r
-            tempReportItem[num].width, tempReportItem[num].height);\r
-        tempLabel[tempReportItem[num].labelNum]->SetFont(tempReportItem[num].name, tempReportItem[num].font);\r
-        tempLabel[tempReportItem[num].labelNum]->SetText(tempReportItem[num].text);\r
-        Add(tempLabel[tempReportItem[num].labelNum]);\r
-    }\r
-    return true;\r
-}\r
-\r
-bool TempReport::SetAppendLabel(void)\r
-{\r
-    if (tempLabel[SET_FOUR] == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempReport::SetAppendLabel new tempLabel[SET_FOUR] fail");\r
-        return false;\r
-    }\r
-    tempLabel[SET_FOUR]->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER,\r
-        UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER);\r
-    tempLabel[SET_FOUR]->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);\r
-    tempLabel[SET_FIVE]->SetTextColor(TempPresenter::GetInstance()->CyanColor());\r
-\r
-    return true;\r
-}\r
-\r
-bool TempReport::InitSimilarImage(int16 num, int16 tempX, int16 tempY, const char* imageSrc)\r
-{\r
-    tempImage[num] = new UIImageView();\r
-    if (tempImage[num] == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempReport::InitSimilarImage new tempImage[%d] fail", num);\r
-        return false;\r
-    }\r
-    tempImage[num]->SetPosition(tempX, tempY);\r
-    tempImage[num]->SetSrc(imageSrc);\r
-    Add(tempImage[num]);\r
-\r
-    return true;\r
-}\r
-\r
-bool TempReport::TempInitImage(void)\r
-{\r
-    if (!InitSimilarImage(SET_ZERO, TEMP_IMAGE_ONE_X, TEMP_IMAGE_ONE_Y, TEMP_LITTLE_MEASURE)) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempReport::TempReport InitSimilarImage false");\r
-        return false;\r
-    }\r
-    if (!InitSimilarImage(SET_ONE, TEMP_IMAGE_TWO_X, TEMP_IMAGE_TWO_Y, TEMP_LIT_TIP)) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempReport::TempReport InitSimilarImage false");\r
-        return false;\r
-    }\r
-    if (!InitSimilarImage(SET_TWO, TEMP_IMAGE_THREE_X, TEMP_IMAGE_THREE_Y, TEMP_POINT)) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempReport::TempReport InitSimilarImage false");\r
-        return false;\r
-    }\r
-    if (!InitSimilarImage(SET_THREE, TEMP_IMAGE_FOUR_X, TEMP_IMAGE_THREE_Y, TEMP_REV_POINTER)) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempReport::TempReport InitSimilarImage false");\r
-        return false;\r
-    }\r
-    if (!InitSimilarImage(SET_FOUR, TEMP_FOUR_X, TEMP_IMAGE_FOUR_Y, TEMP_REPORT)) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempReport::TempReport InitSimilarImage false");\r
-        return false;\r
-    }\r
-\r
-    return true;\r
-}\r
-\r
-bool TempReport::InitView(void *caller)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempReport::InitView");\r
-    if (TempPresenter::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempReport::InitView TempPresenter::GetInstance() nullptr");\r
-        return false;\r
-    }\r
-    UNUSED(caller);\r
-    UIView::OnDragListener *listener = static_cast<UIView::OnDragListener*>(TempPresenter::GetInstance());\r
-\r
-    SetOnDragListener(listener);\r
-    SetDraggable(true);\r
-    SetTouchable(true);\r
-\r
-    if (!TempInitImage()) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempReport::InitView TempInitImage false");\r
-        return false;\r
-    }\r
-    if (!SetBasicLabel()) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempReport::InitView SetBasicLabel false");\r
-        return false;\r
-    }\r
-    if (!SetAppendLabel()) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempReport::InitView SetAppendLabel false");\r
-        return false;\r
-    }\r
-    return true;\r
-}\r
-}
\ No newline at end of file
diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempStudyAbout.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempStudyAbout.cpp
deleted file mode 100644 (file)
index 4c1a8ed..0000000
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (c) CompanyNameMagicTag 2022-2022. All rights reserved.
- * Description: temperature
- * Author:
- * Create: 2022-02-15
- */
-
-#include "UiConfig.h"
-#include <string>
-#include "temperature/include/TempStudyAbout.h"
-
-namespace OHOS {
-static TempStudyAbout *g_tempStudyAbout = nullptr;
-
-static const int16 TEMP_LABEL_ONE_X = 150;
-static const int16 TEMP_LABEL_ONE_Y = 50;
-static const int16 TEMP_LABEL_ONE_WIDTH = 150;
-static const int16 TEMP_LABEL_ONE_HEIGHT = 45;
-static const int16 TEMP_LABEL_TWO_X = 45;
-static const int16 TEMP_LABEL_TWO_Y = 110;
-static const int16 TEMP_LABEL_TWO_WIDTH = 390;
-static const int16 TEMP_LABEL_TWO_HEIGHT = 200;
-static const int16 TEMP_LABEL_THREE_Y = 310;
-static const int16 TEMP_LABEL_FOUR_Y = 520;
-static const int16 LABEL_FOUR_HEIGHT = 310;
-static const int16 TEMP_LABEL_FIVE_Y = 843;
-static const int16 TEMP_LABEL_FONT = 35;
-static const int16 TEMP_LABEL_TIP_FONT = 28;
-static const char *TEMP_STUDY_LABEL_ONE = (char *)"关于研究";
-static const char *TEMP_STUDY_LABEL_TWO = (char *)"本功能通过内置温度传感器测量腕部皮肤温度,主要研究腕部皮肤温度和体温的关系";
-static const char *TEMP_STUDY_LABEL_THREE = (char *)"本功能用于18岁以上健康人群测量运动过程,及之后腕部皮肤温度和体温的变化。";
-static const char *TEMP_STUDY_LABEL_FOUR = (char *)"测量需佩戴10分钟以上,且容易受到环境因素影响。目前达不到水银体温计精度,测量结果仅供参考,不作为医疗诊断依据。";
-static const char *TEMP_STUDY_LABEL_FIVE = (char *)"加入研究时间2022/3/84:16:35OPM";
-
-TempStudyAbout::TempStudyAbout()
-{
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempStudyAbout::TempStudyAbout");
-    g_tempStudyAbout = this;
-}
-
-TempStudyAbout::~TempStudyAbout()
-{
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempStudyAbout::~TempStudyAbout");
-    RemoveAll();
-    int8 num;
-    for (num = SET_ZERO; num < SET_FIVE; num++) {
-        if (tempLabel[num] != nullptr) {
-            delete tempLabel[num];
-            tempLabel[num] = nullptr;
-        }
-    }
-    g_tempStudyAbout = nullptr;
-}
-
-TempStudyAbout *TempStudyAbout::GetInstance(void)
-{
-    return g_tempStudyAbout;
-}
-
-typedef struct {
-    int16 labelNum;
-    int16 x;
-    int16 y;
-    int16 width;
-    int16 height;
-    char* name;
-    int16 font;
-    const char* text;
-} TempStudyItem;
-
-static const TempStudyItem tempStudyItem[] = {
-    { SET_ZERO, TEMP_LABEL_ONE_X, TEMP_LABEL_ONE_Y, TEMP_LABEL_ONE_WIDTH, TEMP_LABEL_ONE_HEIGHT,
-      (char *)DEFAULT_VECTOR_FONT_FILENAME, TEMP_LABEL_FONT, TEMP_STUDY_LABEL_ONE },
-    { SET_ONE, TEMP_LABEL_TWO_X, TEMP_LABEL_TWO_Y, TEMP_LABEL_TWO_WIDTH, TEMP_LABEL_TWO_HEIGHT,
-      (char *)DEFAULT_VECTOR_FONT_FILENAME, TEMP_LABEL_FONT, TEMP_STUDY_LABEL_TWO },
-    { SET_TWO, TEMP_LABEL_TWO_X, TEMP_LABEL_THREE_Y, TEMP_LABEL_TWO_WIDTH, TEMP_LABEL_TWO_HEIGHT,
-      (char *)DEFAULT_VECTOR_FONT_FILENAME, TEMP_LABEL_FONT, TEMP_STUDY_LABEL_THREE },
-    { SET_THREE, TEMP_LABEL_TWO_X, TEMP_LABEL_FOUR_Y, TEMP_LABEL_TWO_WIDTH, LABEL_FOUR_HEIGHT,
-      (char *)DEFAULT_VECTOR_FONT_FILENAME, TEMP_LABEL_FONT, TEMP_STUDY_LABEL_FOUR },
-    { SET_FOUR, TEMP_LABEL_TWO_X, TEMP_LABEL_FIVE_Y, TEMP_LABEL_TWO_WIDTH, TEMP_LABEL_TWO_HEIGHT,
-      (char *)DEFAULT_VECTOR_FONT_FILENAME, TEMP_LABEL_TIP_FONT, TEMP_STUDY_LABEL_FIVE },
-};
-
-bool TempStudyAbout::SetBasicLabel(void)
-{
-    for (int num = 0; num <= SET_FOUR; num++) {
-        tempLabel[tempStudyItem[num].labelNum] = new UILabel();
-        if (tempLabel[tempStudyItem[num].labelNum] == nullptr) {
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempStudyAbout::InitLittleTip new tempLabel[%d] fail",
-                tempStudyItem[num].labelNum);
-            return false;
-        }
-        tempLabel[tempStudyItem[num].labelNum]->SetPosition(tempStudyItem[num].x, tempStudyItem[num].y,
-            tempStudyItem[num].width, tempStudyItem[num].height);
-        tempLabel[tempStudyItem[num].labelNum]->SetFont(tempStudyItem[num].name, tempStudyItem[num].font);
-        tempLabel[tempStudyItem[num].labelNum]->SetText(tempStudyItem[num].text);
-        Add(tempLabel[tempStudyItem[num].labelNum]);
-    }
-    return true;
-}
-
-bool TempStudyAbout::SetAppendLabel(void)
-{
-    if (tempLabel[SET_FOUR] == nullptr) {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempStudyAbout::SetAppendLabel new tempLabel[SET_FOUR] fail");
-        return false;
-    }
-    tempLabel[SET_FOUR]->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER,
-        UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER);
-    tempLabel[SET_FOUR]->SetTextColor(Color::Gray());
-
-    return true;
-}
-
-bool TempStudyAbout::InitStudyAbout(void)
-{
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempStudyAbout::InitStudyAbout");
-    SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);
-    SetThrowDrag(true);
-    if (TempPresenter::GetInstance() == nullptr) {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempStudyAbout::InitStudyAbout TempPresenter::GetInstance() nullptr");
-        return false;
-    }
-    UIView::OnDragListener *listener = static_cast<UIView::OnDragListener*>(TempPresenter::GetInstance());
-    SetOnDragListener(listener);
-    SetHorizontalScrollState(false);
-    SetScrollBlankSize(50); // 50:font size
-    SetDraggable(true);
-    SetTouchable(true);
-
-    if (!SetBasicLabel()) {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempStudyAbout::InitStudyAbout SetBasicLabel() false");
-        return false;
-    }
-    if (!SetAppendLabel()) {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempStudyAbout::InitStudyAbout SetAppendLabel() false");
-        return false;
-    }
-    return true;
-}
-
-void TempStudyAbout::RefreshStudy(void)
-{
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempStudyAbout::RefreshStudy");
-    ScrollBy(0, TEMP_LABEL_ONE_Y - tempLabel[0]->GetY());
-}
-}
diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempWarn.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/temperature/src/TempWarn.cpp
deleted file mode 100644 (file)
index 985b0fe..0000000
+++ /dev/null
@@ -1,161 +0,0 @@
-/*\r
- * Copyright (c) CompanyNameMagicTag 2022-2022. All rights reserved.\r
- * Description: temperature\r
- * Author:\r
- * Create: 2022-02-15\r
- */\r
-\r
-#include "UiConfig.h"\r
-#include <string>\r
-#include "temperature/include/TempWarn.h"\r
-\r
-namespace OHOS {\r
-static TempWarn *g_tempWarn = nullptr;\r
-\r
-static const int16 TEMP_WARN_IMAGE_X = 182;\r
-static const int16 TEMP_WARN_IMAGE_Y = 57;\r
-static const int16 TEMP_WARN_BUTTON_X = 63;\r
-static const int16 TEMP_WARN_BUTTON_Y = 366;\r
-static const int16 TEMP_WARN_BUTTON_WIDHT = 320;\r
-static const int16 TEMP_WARN_BUTTON_HEIGHT = 101;\r
-static const int16 TEMP_WARN_LABEL_FONT = 35;\r
-static const int16 TEMP_WARN_LABEL_X = 60;\r
-static const int16 TEMP_WARN_LABEL_Y = 160;\r
-static const int16 TEMP_WARN_LABEL_WIDTH = 350;\r
-static const int16 TEMP_WARN_LABEL_HEIGHT = 200;\r
-static const char *TEMP_WARN_BUTTON_TEXT = (char*)"知道了";\r
-static const char *TEMP_WARN_COLD_LABEL = (char*)"当前体温温度过低(低于35℃),请检测佩戴状态并做好重复测量";\r
-static const char *TEMP_WARN_HOT_LABEL = (char*)"当前体温温度过高(高于37.2℃),请检测佩戴状态并做好重复测量";\r
-static const char *TEMP_WARN_ENVIR = (char*)"检测到手表周围温度波动。可能是受环境变化、高功耗应用、佩戴郭松、手表沾水等影响,请进行相应调整并等待10分钟在进行测量";\r
-\r
-TempWarn::TempWarn()\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempWarn::TempWarn");\r
-    g_tempWarn = this;\r
-}\r
-\r
-TempWarn::~TempWarn()\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempWarn::~TempWarn");\r
-    RemoveAll();\r
-    if (tempImage != nullptr) {\r
-        delete tempImage;\r
-        tempImage = nullptr;\r
-    }\r
-    if (tempButton != nullptr) {\r
-        delete tempButton;\r
-        tempButton = nullptr;\r
-    }\r
-    if (tempLabel != nullptr) {\r
-        delete tempLabel;\r
-        tempLabel = nullptr;\r
-    }\r
-    g_tempWarn = nullptr;\r
-}\r
-\r
-TempWarn *TempWarn::GetInstance(void)\r
-{\r
-    return g_tempWarn;\r
-}\r
-\r
-bool TempWarn::TempInitImage(void)\r
-{\r
-    tempImage = new UIImageView();\r
-    if (tempImage == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempWarn::InitRemindWear new tempImage fail");\r
-        return false;\r
-    }\r
-    tempImage->SetPosition(TEMP_WARN_IMAGE_X, TEMP_WARN_IMAGE_Y);\r
-    tempImage->SetSrc(TEMP_WARN);\r
-    Add(tempImage);\r
-\r
-    return true;\r
-}\r
-\r
-bool TempWarn::TempInitButton(void)\r
-{\r
-    tempButton = new UILabelButton();\r
-    if (tempButton == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempWarn::InitMeasure new tempButton fail");\r
-        return false;\r
-    }\r
-    tempButton->SetPosition(TEMP_WARN_BUTTON_X, TEMP_WARN_BUTTON_Y, TEMP_WARN_BUTTON_WIDHT, TEMP_WARN_BUTTON_HEIGHT);\r
-    tempButton->SetText(TEMP_WARN_BUTTON_TEXT);\r
-    tempButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME, TEMP_WARN_LABEL_FONT);\r
-    tempButton->SetViewId(TEMP_WARN_ID);\r
-    UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::TempPresenter::GetInstance();\r
-    tempButton->SetOnClickListener(clickListener);\r
-    tempButton->SetTextColor(OHOS::TempPresenter::GetInstance()->CyanColor());\r
-    tempButton->SetImageSrc(PNG_NEW_DEVICE, PNG_NEW_DEVICE);\r
-    Add(tempButton);\r
-\r
-    return true;\r
-}\r
-\r
-bool TempWarn::TempInitLabel(void)\r
-{\r
-    tempLabel = new UILabel();\r
-    if (tempLabel == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempWarn::TempInitLabel new tempLabel fail");\r
-        return false;\r
-    }\r
-    tempLabel->SetPosition(TEMP_WARN_LABEL_X, TEMP_WARN_LABEL_Y, TEMP_WARN_LABEL_WIDTH, TEMP_WARN_LABEL_HEIGHT);\r
-    tempLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, TEMP_WARN_LABEL_FONT);\r
-    tempLabel->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);\r
-    Add(tempLabel);\r
-\r
-    return true;\r
-}\r
-\r
-bool TempWarn::InitTempWarn(void)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempWarn::InitTempWarn");\r
-    SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);\r
-    SetThrowDrag(true);\r
-    if (TempPresenter::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempWarn::InitTempWarn TempPresenter::GetInstance() nullptr");\r
-        return false;\r
-    }\r
-    UIView::OnDragListener *listener = static_cast<UIView::OnDragListener*>(TempPresenter::GetInstance());\r
-    SetOnDragListener(listener);\r
-    SetDraggable(true);\r
-    SetTouchable(true);\r
-\r
-    if (!TempInitImage()) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempWarn::InitTempWarn TempInitImage() false");\r
-        return false;\r
-    }\r
-    if (!TempInitButton()) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempWarn::InitTempWarn TempInitButton() false");\r
-        return false;\r
-    }\r
-    if (!TempInitLabel()) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempWarn::InitTempWarn TempInitLabel() false");\r
-        return false;\r
-    }\r
-\r
-    return true;\r
-}\r
-\r
-void TempWarn::RefreshTempWarn(void)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempWarn::RefreshTempWarn");\r
-    if (TempPresenter::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempWarn::RefreshTempWarn GetInstance nullptr");\r
-        return;\r
-    }\r
-    if (tempLabel == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TempWarn::RefreshTempWarn tempLabel nullptr");\r
-        return;\r
-    }\r
-    int8 tempListener = TempPresenter::GetInstance()->GetTempListen();\r
-    if (tempListener == 0) {\r
-        tempLabel->SetText(TEMP_WARN_COLD_LABEL);\r
-    } else if (tempListener == 1) {\r
-        tempLabel->SetText(TEMP_WARN_HOT_LABEL);\r
-    } else {\r
-        tempLabel->SetText(TEMP_WARN_ENVIR);\r
-    }\r
-    return;\r
-}\r
-}
\ No newline at end of file
index 6dfd2fd..3d3e727 100644 (file)
@@ -32,9 +32,7 @@ namespace OHOS
         virtual ~TraingEnddataPresenter();
 
         void OnStart() override;
-        void OnPause() override;
         void OnResume() override;
-        void OnStop() override;
         void NavigateBack(); // 返回函数
         static TraingEnddataPresenter *GetInstance();
 
index d8191b4..93d9b8f 100644 (file)
@@ -21,9 +21,7 @@ namespace OHOS
         virtual ~TraingNomalPresenter();
 
         void OnStart() override;
-        void OnPause() override;
         void OnResume() override;
-        void OnStop() override;
         void NavigateBack();
         void OnTickEvent() override;
         void Notify() override {}
index 87fcd14..1328565 100644 (file)
@@ -32,9 +32,7 @@ namespace OHOS
         virtual ~TraingPresenter();
 
         void OnStart() override;
-        void OnPause() override;
         void OnResume() override;
-        void OnStop() override;
         void NavigateBack();
 
         static TraingPresenter *GetInstance();
index e238d92..4505ead 100644 (file)
@@ -40,22 +40,11 @@ namespace OHOS
 
     void TraingEnddataPresenter::OnStart()
     {
-        Presenter<TraingEnddataView>::OnStart();
-    }
-
-    void TraingEnddataPresenter::OnPause()
-    {
-        Presenter<TraingEnddataView>::OnPause();
     }
 
     void TraingEnddataPresenter::OnResume()
     {
-        Presenter<TraingEnddataView>::OnResume();
-    }
-
-    void TraingEnddataPresenter::OnStop()
-    {
-        Presenter<TraingEnddataView>::OnStop();
+        RootView::GetInstance()->SetOnKeyActListener(this);
     }
 
     void TraingEnddataPresenter::NavigateBack()
index f02755c..aa5f540 100644 (file)
@@ -57,20 +57,9 @@ namespace OHOS
         }\r
         Presenter<TraingNomalView>::OnStart();\r
     }\r
-\r
-    void TraingNomalPresenter::OnPause(void){\r
-        Presenter<TraingNomalView>::OnPause();\r
-    }\r
-\r
     void TraingNomalPresenter::OnResume(void)\r
     {\r
-        Presenter<TraingNomalView>::OnResume();\r
-    }\r
-\r
-    void TraingNomalPresenter::OnStop(void)\r
-    {\r
-\r
-        Presenter<TraingNomalView>::OnStop();\r
+        RootView::GetInstance()->SetOnKeyActListener(this);\r
     }\r
     // 回退逻辑\r
     void TraingNomalPresenter::NavigateBack()\r
index 7887a3d..e38c91b 100644 (file)
@@ -49,11 +49,11 @@ TraingPresenter *TraingPresenter::GetInstance() { return g_pTraingPresenter; }
 
 void TraingPresenter::OnStart() { Presenter<TraingView>::OnStart(); }
 
-void TraingPresenter::OnPause(void) { Presenter<TraingView>::OnPause(); }
 
-void TraingPresenter::OnResume(void) { Presenter<TraingView>::OnResume(); }
+void TraingPresenter::OnResume(void) { 
+    RootView::GetInstance()->SetOnKeyActListener(this);
+ }
 
-void TraingPresenter::OnStop(void) { Presenter<TraingView>::OnStop(); }
 // 回退函数 [ Slice 的 traingview {右滑只能回到applist}]
 void TraingPresenter::NavigateBack() {
   NativeAbility::GetInstance().ChangeSlice(
index 80c61ec..a49df84 100644 (file)
@@ -64,14 +64,10 @@ namespace OHOS
 \r
     void TraingSetPresenter::OnResume(void)\r
     {\r
-\r
-        Presenter<TraingSetView>::OnResume();\r
     }\r
 \r
     void TraingSetPresenter::OnStop(void)\r
     {\r
-\r
-        Presenter<TraingSetView>::OnStop();\r
     }\r
     void TraingSetPresenter::NavigateBack()\r
     {\r
index 0cc44ac..df7dfd5 100644 (file)
@@ -19,9 +19,7 @@ namespace OHOS
         virtual ~TraingGPSPresenter();
 
         void OnStart() override;
-        void OnPause() override;
         void OnResume() override;
-        void OnStop() override;
 
         static TraingGPSPresenter *GetInstance();
 
index 6e26026..a5aad8b 100644 (file)
@@ -18,9 +18,7 @@ namespace OHOS
         virtual ~TraingGPSbackPresenter();
 
         void OnStart() override;
-        void OnPause() override;
         void OnResume() override;
-        void OnStop() override;
 
         static TraingGPSbackPresenter *GetInstance();
 
index cf3f878..b88f70c 100644 (file)
@@ -19,9 +19,7 @@ namespace OHOS
         virtual ~TraingGPSlackPresenter();
 
         void OnStart() override;
-        void OnPause() override;
         void OnResume() override;
-        void OnStop() override;
 
         static TraingGPSlackPresenter *GetInstance();
 
index c7a5704..98fd935 100644 (file)
@@ -18,9 +18,7 @@ namespace OHOS
         virtual ~TraingGPSnotePresenter();
 
         void OnStart() override;
-        void OnPause() override;
         void OnResume() override;
-        void OnStop() override;
 
         static TraingGPSnotePresenter *GetInstance();
 
index 0bb93f5..7b51935 100644 (file)
@@ -18,9 +18,7 @@ namespace OHOS
         virtual ~TraingGPSsetPresenter();
 
         void OnStart() override;
-        void OnPause() override;
         void OnResume() override;
-        void OnStop() override;
 
         static TraingGPSsetPresenter *GetInstance();
 
index c5d575d..2a82ae1 100644 (file)
@@ -36,27 +36,15 @@ namespace OHOS
 
     void TraingGPSPresenter::OnStart()
     {
-
-        Presenter<TraingGPSView>::OnStart();
     }
 
-    void TraingGPSPresenter::OnPause(void)
-    {
-
-        Presenter<TraingGPSView>::OnPause();
-    }
+   
 
     void TraingGPSPresenter::OnResume(void)
     {
-
-        Presenter<TraingGPSView>::OnResume();
     }
 
-    void TraingGPSPresenter::OnStop(void)
-    {
-
-        Presenter<TraingGPSView>::OnStop();
-    }
+    
     bool TraingGPSPresenter::OnDrag(UIView &view, const DragEvent &event)
     {
         return true;
index fe970f0..31a0ddc 100644 (file)
@@ -35,26 +35,10 @@ namespace OHOS
 
     void TraingGPSbackPresenter::OnStart()
     {
-
-        Presenter<TraingGPSbackView>::OnStart();
-    }
-
-    void TraingGPSbackPresenter::OnPause(void)
-    {
-
-        Presenter<TraingGPSbackView>::OnPause();
     }
 
     void TraingGPSbackPresenter::OnResume(void)
     {
-
-        Presenter<TraingGPSbackView>::OnResume();
-    }
-
-    void TraingGPSbackPresenter::OnStop(void)
-    {
-
-        Presenter<TraingGPSbackView>::OnStop();
     }
 
     bool TraingGPSbackPresenter::OnDrag(UIView &view, const DragEvent &event)
index 92f54f2..a41a5ed 100644 (file)
@@ -36,26 +36,9 @@ namespace OHOS
 
     void TraingGPSlackPresenter::OnStart()
     {
-
-        Presenter<TraingGPSlackView>::OnStart();
-    }
-
-    void TraingGPSlackPresenter::OnPause(void)
-    {
-
-        Presenter<TraingGPSlackView>::OnPause();
     }
-
     void TraingGPSlackPresenter::OnResume(void)
     {
-
-        Presenter<TraingGPSlackView>::OnResume();
-    }
-
-    void TraingGPSlackPresenter::OnStop(void)
-    {
-
-        Presenter<TraingGPSlackView>::OnStop();
     }
     bool TraingGPSlackPresenter::OnDrag(UIView &view, const DragEvent &event)
     {
index 008085a..e368225 100644 (file)
@@ -38,27 +38,12 @@ namespace OHOS
 
     void TraingGPSnotePresenter::OnStart()
     {
-
-        Presenter<TraingGPSnoteView>::OnStart();
-    }
-
-    void TraingGPSnotePresenter::OnPause(void)
-    {
-
-        Presenter<TraingGPSnoteView>::OnPause();
     }
 
     void TraingGPSnotePresenter::OnResume(void)
     {
-
-        Presenter<TraingGPSnoteView>::OnResume();
-    }
-
-    void TraingGPSnotePresenter::OnStop(void)
-    {
-
-        Presenter<TraingGPSnoteView>::OnStop();
     }
+    
     bool TraingGPSnotePresenter::OnDrag(UIView &view, const DragEvent &event)
     {
         return true;
index 1d7eb30..9dec26a 100644 (file)
@@ -41,27 +41,12 @@ namespace OHOS
 
     void TraingGPSsetPresenter::OnStart()
     {
-
-        Presenter<TraingGPSsetView>::OnStart();
-    }
-
-    void TraingGPSsetPresenter::OnPause(void)
-    {
-
-        Presenter<TraingGPSsetView>::OnPause();
     }
 
     void TraingGPSsetPresenter::OnResume(void)
     {
-
-        Presenter<TraingGPSsetView>::OnResume();
-    }
-
-    void TraingGPSsetPresenter::OnStop(void)
-    {
-
-        Presenter<TraingGPSsetView>::OnStop();
     }
+    
     bool TraingGPSsetPresenter::OnDrag(UIView &view, const DragEvent &event)
     {
         return true;
index 51935d4..e907a86 100644 (file)
@@ -46,9 +46,7 @@ public:
   static TraingCardPresenter *GetInstance(void);\r
 \r
   void OnStart() override;\r
-  void OnPause() override;\r
   void OnResume() override;\r
-  void OnStop() override;\r
   void OnTickEvent() override{};\r
   void Notify() override {}\r
 \r
index 2b155b7..2e97638 100644 (file)
@@ -76,23 +76,11 @@ void TraingCardPresenter::OnStart() {
   // ScreenAlwaysOnCtr(OPEN_SCREEN_ALWAYS_ON); // 长亮屏\r
 }\r
 \r
-void TraingCardPresenter::OnPause(void) {\r
-\r
-  Presenter<TraingCardView>::OnPause();\r
-}\r
-\r
 void TraingCardPresenter::OnResume(void) {\r
 \r
-  Presenter<TraingCardView>::OnResume();\r
   RootView::GetInstance()->SetOnKeyActListener(this);\r
 }\r
 \r
-void TraingCardPresenter::OnStop(void) {\r
-\r
-  Presenter<TraingCardView>::OnStop();\r
-  // ScreenAlwaysOnCtr(CANCEL_SCREEN_ALWAYS_ON); // 长亮屏\r
-}\r
-\r
 bool TraingCardPresenter::OnDrag(UIView &view, const DragEvent &event) {\r
   UNUSED(view);\r
   return true;\r
index d193459..05f288a 100644 (file)
@@ -1013,6 +1013,7 @@ target = {
             'SUPPORT_GYRO_SERVICE',
             'GYRO_SH5001',
             'SUPPORT_AI_SERVICE',
+            'SUPPORT_CHINA_MOBILE_AI_REGULATION',
         ],
         #添加自定义应用
        'ram_component': [
index 4994c4e..c994bcc 100644 (file)
@@ -263,9 +263,9 @@ void PointerInputDevice::DispatchDragStartEvent()
                 DispatchCancelEvent();
             }
             // HISI delete end
-            printf("=====PointerInputDevice::DispatchDragStartEvent absx(%d) limitx(%d) absy(%d) limity(%d) \r\n",
-            MATH_ABS(dragLen_.x),DRAG_LIMIT_X,
-            MATH_ABS(dragLen_.y),DRAG_LIMIT_Y);
+            // printf("=====PointerInputDevice::DispatchDragStartEvent absx(%d) limitx(%d) absy(%d) limity(%d) \r\n",
+            // MATH_ABS(dragLen_.x),DRAG_LIMIT_X,
+            // MATH_ABS(dragLen_.y),DRAG_LIMIT_Y);
 
             // Send Drag Begin Event.
             DragEvent evt(curPos_, lastPos_, dragLen_);