删除多余文件
authorCaisking <3449750381@qq.com>
Tue, 9 Jan 2024 09:52:44 +0000 (17:52 +0800)
committerCaisking <3449750381@qq.com>
Tue, 9 Jan 2024 09:52:44 +0000 (17:52 +0800)
code/sdk/application/wearable/nativeapp/CMakeLists.txt
code/sdk/application/wearable/nativeapp/nativeui/clock/include/DialMalioView.h [deleted file]
code/sdk/application/wearable/nativeapp/nativeui/clock/include/DialUserView.h [deleted file]
code/sdk/application/wearable/nativeapp/nativeui/clock/src/DialMalioView.cpp [deleted file]
code/sdk/application/wearable/nativeapp/nativeui/clock/src/DialUserView.cpp [deleted file]
code/sdk/application/wearable/nativeapp/nativeui/dial/include/Digital_clockView.h
code/sdk/application/wearable/nativeapp/nativeui/main/include/MainViewSample.h
code/sdk/application/wearable/nativeapp/nativeui/main/src/MainViewSample.cpp

index 13cf890..677cb5e 100755 (executable)
@@ -96,8 +96,7 @@ set(SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/applist/src/ApplistPresenter.cpp\r
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/applist/src/ApplistView.cpp\r
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/clock/src/MainClockView.cpp\r
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/clock/src/DialUserView.cpp\r
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/clock/src/DialMalioView.cpp\r
+\r
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodoxygen/src/BloodOxygenView.cpp\r
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodoxygen/src/BloodBandoffView.cpp\r
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodoxygen/src/BloodOxygenPresenter.cpp\r
diff --git a/code/sdk/application/wearable/nativeapp/nativeui/clock/include/DialMalioView.h b/code/sdk/application/wearable/nativeapp/nativeui/clock/include/DialMalioView.h
deleted file mode 100755 (executable)
index 138ec0f..0000000
+++ /dev/null
@@ -1,166 +0,0 @@
-/*\r
- * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved.\r
- * Description: DialMalioView\r
- * Author:\r
- * Create: 2021-10-18\r
- */\r
-#if 0\r
-    #ifndef DialMalio_VIEW_H\r
-    #define DialMalio_VIEW_H\r
-\r
-    #include <string>\r
-    #include <time.h>\r
-    #include "View.h"\r
-    #include "components/ui_label.h"\r
-    #include "components/root_view.h"\r
-    #include "components/ui_view_group.h"\r
-    #include "components/ui_image_view.h"\r
-    #include "components/ui_label_button.h"\r
-    #include "components/ui_sweep_clock.h"\r
-    #include "BaseView.h"\r
-    #include "ChangeSliceListener.h"\r
-    #include "font/ui_font_bitmap.h"\r
-    #include "font/ui_font.h"\r
-    #include "graphic_config.h"\r
-    #include "HealthModel.h"\r
-    #include "ActivityModel.h"\r
-    #include "UiConfig.h"\r
-    #include "components/ui_card_page.h"\r
-    #include "animator/animator_manager.h"\r
-    #include "time.h"\r
-    #include "sys/time.h"\r
-\r
-    namespace OHOS\r
-    {\r
-        class ClockCallback : public AnimatorCallback\r
-        {\r
-        public:\r
-            explicit ClockCallback(UISweepClock *clock) : sweepClock(clock) {}\r
-            ~ClockCallback() {}\r
-            virtual void Callback(UIView *view)\r
-            {\r
-                UNUSED(view);\r
-                struct timeval tv;\r
-                gettimeofday(&tv, NULL);\r
-                uint64_t second = tv.tv_sec;\r
-                uint64_t uSecond = tv.tv_usec;\r
-                uint64_t minute = second / 60;\r
-                uint64_t hour = minute / 60;\r
-                uint8_t realHour = static_cast<uint8_t>(hour % 24);\r
-                uint8_t realMinute = static_cast<uint8_t>(minute % 60);\r
-                uint16_t realMilliSecond = static_cast<uint16_t>((second % 60) *\r
-                                                                    1000 +\r
-                                                                uSecond / 1000);\r
-                sweepClock->SetSweepTime12Hour(realHour, realMinute, realMilliSecond, 1);\r
-            }\r
-\r
-        private:\r
-            UISweepClock *sweepClock{nullptr};\r
-        };\r
-\r
-        class DialMalioView : public UICardPage\r
-        {\r
-        public:\r
-            DialMalioView();\r
-            virtual ~DialMalioView();\r
-            static DialMalioView *GetInstance(void);\r
-            bool InitView(void);\r
-            void PreLoad(void) override;\r
-            void UnLoad(void) override;\r
-            void RefreshStep(int step);\r
-            void RefreshHeartRate(int value);\r
-            void ClockAnimatorStart(void);\r
-            void ClockAnimatorStop(void);\r
-\r
-        private:\r
-            void InitStepValue();\r
-            bool InitLabelView(void);\r
-            bool InitCenterCircleView(void);\r
-            bool InitHandView(void);\r
-            void InitDateTime(void);\r
-            bool InitSweepClock(void);\r
-            bool LoadClockImage(Image *view, uint32_t resId);\r
-            bool LoadClockImage(UIImageView *view, uint32_t resId);\r
-            UIImageView *curFace{nullptr};\r
-            UILabelButton *stepLabel{nullptr};\r
-            UIButton *button1_ = nullptr;\r
-            UILabel *batteryLabel{nullptr};\r
-            UILabel *weekLabel{nullptr};\r
-            UILabel *heartRateLabel{nullptr};\r
-            ClockCallback *callBack{nullptr};\r
-            Animator *clockAnimator{nullptr};\r
-            UISweepClock *mainSweepClock{nullptr};\r
-            Image *secondHand{nullptr};\r
-            Image *minuteHand{nullptr};\r
-            Image *hourHand{nullptr};\r
-            UIImageView *heartRate{nullptr};\r
-            Image *hand24Hour{nullptr};\r
-            UIImageView *weekDay{nullptr};\r
-            UIImageView *progress{nullptr};\r
-            Image *bigCircle{nullptr};\r
-            Image *medCircle{nullptr};\r
-            Image *smallCircle{nullptr};\r
-            bool viewiInitStatus{false};\r
-        };\r
-    } // namespace OHOS\r
-    #endif // DialMalio_VIEW_H\r
-#endif\r
-#ifndef DialMalioVIEW_H\r
-#define DialMalioVIEW_H\r
-\r
-#include <string>\r
-#include <time.h>\r
-#include "View.h"\r
-#include "components/ui_label.h"\r
-#include "components/root_view.h"\r
-#include "components/ui_view_group.h"\r
-#include "components/ui_image_view.h"\r
-#include "components/ui_label_button.h"\r
-#include "components/ui_sweep_clock.h"\r
-#include "BaseView.h"\r
-#include "ChangeSliceListener.h"\r
-#include "font/ui_font_bitmap.h"\r
-#include "font/ui_font.h"\r
-#include "graphic_config.h"\r
-#include "HealthModel.h"\r
-#include "ActivityModel.h"\r
-#include "UiConfig.h"\r
-#include "components/ui_card_page.h"\r
-#include "animator/animator_manager.h"\r
-#include "time.h"\r
-#include "sys/time.h"\r
-#include "graphic_config.h"\r
-#include "components/ui_label_button.h"\r
-\r
-namespace OHOS\r
-{\r
-    class DialMalioView : public UICardPage\r
-    {\r
-    public:\r
-        DialMalioView();\r
-        ~DialMalioView();\r
-        void Init();\r
-        void DeInit();\r
-        UIView *GetView();\r
-        void PreLoad(void) override;\r
-        void ClockAnimatorStart(void);\r
-        void ClockAnimatorStop(void);\r
-\r
-    private:\r
-        DialMalioView(const DialMalioView &) = delete;\r
-        DialMalioView &operator=(const DialMalioView &) = delete;\r
-        DialMalioView(DialMalioView &&) = delete;\r
-        DialMalioView &operator=(DialMalioView &&) = delete;\r
-\r
-        UIViewGroup *container_ = nullptr;\r
-        Animator *clockAnimator{nullptr};\r
-        UIImageView *image1_ = nullptr;\r
-        UISweepClock *sweepClock1_ = nullptr;\r
-        AnimatorCallback *sweepClock1callback_ = nullptr;\r
-        Animator *sweepClock1animator_ = nullptr;\r
-        UILabelButton *labelButton1_ = nullptr;\r
-        UIButton *button1_ = nullptr;\r
-        bool viewiInitStatus{false};\r
-    };\r
-} // namespace OHOS\r
-#endif /* DialMalioVIEW_H */
\ No newline at end of file
diff --git a/code/sdk/application/wearable/nativeapp/nativeui/clock/include/DialUserView.h b/code/sdk/application/wearable/nativeapp/nativeui/clock/include/DialUserView.h
deleted file mode 100755 (executable)
index 967e37a..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-/*\r
- * Copyright (c) 2023 CompanyNameMagicTag.\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-#ifndef DialUserVIEW_H\r
-#define DialUserVIEW_H\r
-\r
-#include <string>\r
-#include <time.h>\r
-#include "View.h"\r
-#include "components/ui_label.h"\r
-#include "components/root_view.h"\r
-#include "components/ui_view_group.h"\r
-#include "components/ui_image_view.h"\r
-#include "components/ui_label_button.h"\r
-#include "components/ui_sweep_clock.h"\r
-#include "BaseView.h"\r
-#include "ChangeSliceListener.h"\r
-#include "font/ui_font_bitmap.h"\r
-#include "font/ui_font.h"\r
-#include "graphic_config.h"\r
-#include "HealthModel.h"\r
-#include "ActivityModel.h"\r
-#include "UiConfig.h"\r
-#include "components/ui_card_page.h"\r
-#include "animator/animator_manager.h"\r
-#include "time.h"\r
-#include "sys/time.h"\r
-\r
-namespace OHOS\r
-{\r
-    class DialUserView : public UICardPage\r
-    {\r
-    public:\r
-        DialUserView();\r
-        ~DialUserView();\r
-        static DialUserView *GetInstance(void);\r
-        void Loadperfile();\r
-        void Initdigit();\r
-        void Initdata();\r
-        void Initweek();\r
-        void Initbattery();\r
-\r
-        void DeInit();\r
-        void OnTimer(void);\r
-        void PreLoad(void) override;\r
-        void ClockAnimatorStart(void);\r
-        void ClockAnimatorStop(void);\r
-        UIView *GetView();\r
-\r
-    private:\r
-        void InitDateTime(void);\r
-        DialUserView(const DialUserView &) = delete;\r
-        DialUserView &operator=(const DialUserView &) = delete;\r
-        DialUserView(DialUserView &&) = delete;\r
-        DialUserView &operator=(DialUserView &&) = delete;\r
-\r
-        UIViewGroup *container_ = nullptr;\r
-        UIImageView *background = nullptr;\r
-        UIImageView *hour1 = nullptr;\r
-        UIImageView *hour2 = nullptr;\r
-        UIImageView *colon = nullptr;\r
-        UIImageView *minute1 = nullptr;\r
-        UIImageView *minute2 = nullptr;\r
-        UILabel *dataLabel = nullptr;\r
-        UILabel *weekLabel = nullptr;\r
-        UILabel *batteryLabel = nullptr;\r
-        Animator *clockAnimator{nullptr};\r
-        bool viewiInitStatus{false};\r
-    };\r
-} // namespace OHOS\r
-#endif /* DialUserVIEW_H */\r
diff --git a/code/sdk/application/wearable/nativeapp/nativeui/clock/src/DialMalioView.cpp b/code/sdk/application/wearable/nativeapp/nativeui/clock/src/DialMalioView.cpp
deleted file mode 100755 (executable)
index 21c8efe..0000000
+++ /dev/null
@@ -1,472 +0,0 @@
-/*\r
- * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved.\r
- * Description: DialMalioView\r
- * Author:\r
- * Create: 2021-08-14\r
- */\r
-\r
-#if 0\r
-#include "DialMalioView.h"\r
-#include "MainPresenterSample.h"\r
-#include "components/ui_label.h"\r
-#include "wearable_log.h"\r
-#include "ui_resource_image.h"\r
-#include "common/image_cache_manager.h"\r
-#include <time.h>\r
-\r
-namespace OHOS\r
-{\r
-    static DialMalioView *g_pDialMalioView = nullptr;\r
-\r
-    DialMalioView::DialMalioView()\r
-    {\r
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DialMalioView::DialMalioView");\r
-        g_pDialMalioView = this;\r
-    }\r
-\r
-    DialMalioView::~DialMalioView()\r
-    {\r
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DialMalioView::~DialMalioView");\r
-        if (clockAnimator != nullptr)\r
-        {\r
-            clockAnimator->Stop();\r
-            delete clockAnimator;\r
-            clockAnimator = nullptr;\r
-        }\r
-        mainSweepClock->RemoveAll();\r
-        g_pDialMalioView = nullptr;\r
-    }\r
-\r
-    DialMalioView *DialMalioView::GetInstance(void)\r
-    {\r
-        return g_pDialMalioView;\r
-    }\r
-\r
-    void DialMalioView::InitStepValue() {}\r
-\r
-    bool DialMalioView::InitLabelView(void) {}\r
-\r
-    bool DialMalioView::InitCenterCircleView(void) {}\r
-\r
-    bool DialMalioView::InitHandView(void)\r
-    {\r
-        secondHand = new Image();\r
-        if (secondHand == nullptr)\r
-        {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "secondHand new fail");\r
-            return false;\r
-        }\r
-        if (LoadClockImage(secondHand, CLOCK_SECONDHAND) == false)\r
-        {\r
-            return false;\r
-        }\r
-\r
-        minuteHand = new Image();\r
-        if (minuteHand == nullptr)\r
-        {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "minuteHand new fail");\r
-            return false;\r
-        }\r
-        if (LoadClockImage(minuteHand, CLOCK_MINUTEHAND) == false)\r
-        {\r
-            return false;\r
-        }\r
-        hourHand = new Image();\r
-        if (hourHand == nullptr)\r
-        {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "hourHand new fail");\r
-            return false;\r
-        }\r
-        if (LoadClockImage(hourHand, CLOCK_HOURHAND) == false)\r
-        {\r
-            return false;\r
-        }\r
-    }\r
-\r
-    bool DialMalioView::LoadClockImage(Image *view, uint32_t resId)\r
-    {\r
-        std::string file = CLOCK_IAMGES;\r
-        ImageInfo *image = ImageCacheManager::GetInstance().LoadOneInMultiRes(resId, file);\r
-        if (image == nullptr)\r
-        {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "LoadClockImage %x fail", resId);\r
-            return false;\r
-        }\r
-        view->SetSrc(image);\r
-        return true;\r
-    }\r
-\r
-    bool DialMalioView::LoadClockImage(UIImageView *view, uint32_t resId)\r
-    {\r
-        std::string file = CLOCK_IAMGES;\r
-        ImageInfo *image = ImageCacheManager::GetInstance().LoadOneInMultiRes(resId, file);\r
-        if (image == nullptr)\r
-        {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "LoadClockImage %x fail", resId);\r
-            return false;\r
-        }\r
-        view->SetSrc(image);\r
-        return true;\r
-    }\r
-\r
-    bool DialMalioView::InitSweepClock(void)\r
-    {\r
-        curFace = new UIImageView();\r
-        if (curFace == nullptr)\r
-        {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "curFace new fail");\r
-            return false;\r
-        }\r
-        curFace->SetPosition(0, 0);\r
-\r
-        if (LoadClockImage(curFace, CLOCK_MAIN_FACE_IMAGE) == false)\r
-        {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "curFace LoadClockImage CLOCK_MAIN_FACE_IMAGE fail");\r
-            return false;\r
-        }\r
-        InitHandView();\r
-        return true;\r
-    }\r
-    void DialMalioView::PreLoad(void)\r
-    {\r
-        if (!viewiInitStatus)\r
-        {\r
-            InitView();\r
-            viewiInitStatus = true;\r
-        }\r
-    }\r
-\r
-    void DialMalioView::UnLoad(void)\r
-    {\r
-        // Main clock view is commonly used page, so we do not release it's resources inner slice.\r
-    }\r
-    bool DialMalioView::InitView(void)\r
-    {\r
-        mainSweepClock = new UISweepClock();\r
-        if (mainSweepClock == nullptr)\r
-        {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "mainSweepClock new fail");\r
-            return false;\r
-        }\r
-        if (InitSweepClock() == false)\r
-        {\r
-            return false;\r
-        }\r
-\r
-        mainSweepClock->Add(curFace);\r
-        Add(mainSweepClock);\r
-\r
-        mainSweepClock->SetDragParentInstead(true);\r
-        mainSweepClock->SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);\r
-\r
-        // {214, 3}: position x, y {14, 223}: center x, y\r
-        mainSweepClock->SetHandImage(UISweepClock::HandType::SECOND_HAND, *secondHand,\r
-                                     {221, 28}, {12, 205});\r
-        mainSweepClock->SetHandImage(UISweepClock::HandType::MINUTE_HAND, *minuteHand,\r
-                                     {221, 33}, {221, 87});\r
-        mainSweepClock->SetHandImage(UISweepClock::HandType::HOUR_HAND, *hourHand,\r
-                                     {221, 87}, {12, 146});\r
-        mainSweepClock->SetInitTime24Hour(0, 0, 0);\r
-        mainSweepClock->SetWorkMode(UISweepClock::WorkMode::NORMAL);\r
-        InitDateTime();\r
-\r
-        callBack = new ClockCallback(mainSweepClock);\r
-        if (callBack == nullptr)\r
-        {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "callBack new fail");\r
-            return false;\r
-        }\r
-        clockAnimator = new Animator(callBack, mainSweepClock, 0, true);\r
-        if (clockAnimator == nullptr)\r
-        {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "clockAnimator new fail");\r
-            return false;\r
-        }\r
-        clockAnimator->Start();\r
-        return true;\r
-    }\r
-\r
-    void DialMalioView::RefreshStep(int step) {}\r
-\r
-    void DialMalioView::RefreshHeartRate(int value) {}\r
-\r
-    void DialMalioView::InitDateTime(void)\r
-    {\r
-        struct tm pTM;\r
-        time_t seconds;\r
-        time(&seconds);\r
-        localtime_r(&seconds, &pTM);\r
-        mainSweepClock->SetTime24Hour(pTM.tm_hour, pTM.tm_min, pTM.tm_sec);\r
-    }\r
-\r
-    void DialMalioView::ClockAnimatorStart(void)\r
-    {\r
-        if (clockAnimator != nullptr)\r
-        {\r
-            clockAnimator->Start();\r
-        }\r
-    }\r
-\r
-    void DialMalioView::ClockAnimatorStop(void)\r
-    {\r
-        if (clockAnimator != nullptr)\r
-        {\r
-            clockAnimator->Stop();\r
-        }\r
-    }\r
-\r
-}\r
-#endif\r
-\r
-#include "DialMalioView.h"\r
-#include "MainClockView.h"\r
-#include "MainPresenterSample.h"\r
-#include "components/ui_label.h"\r
-#include "wearable_log.h"\r
-#include "ui_resource_image.h"\r
-#include "common/image_cache_manager.h"\r
-#include <time.h>\r
-\r
-namespace OHOS\r
-{\r
-    class SweepClockCallback : public AnimatorCallback\r
-    {\r
-    public:\r
-        explicit SweepClockCallback(UISweepClock *clock) : sweepClock(clock) {}\r
-        ~SweepClockCallback() {}\r
-\r
-        virtual void Callback(UIView *view)\r
-        {\r
-            // UNUSED(view);\r
-            struct timeval tv;\r
-            gettimeofday(&tv, NULL);\r
-            uint64_t second = tv.tv_sec;\r
-            uint64_t uSecond = tv.tv_usec;\r
-            uint64_t minute = second / MIN_TO_HOUR;\r
-            uint64_t hour = minute / MIN_TO_HOUR;\r
-            uint8_t realHour = static_cast<uint8_t>(hour % HOURLY_SYSTEM);\r
-            uint8_t realMinute = static_cast<uint8_t>(minute % MIN_TO_HOUR);\r
-            uint16_t realMilliSecond = static_cast<uint16_t>((second % MIN_TO_HOUR) *\r
-                                                                 SEC_TO_MILLI +\r
-                                                             uSecond / USEC_TO_MILLI);\r
-            sweepClock->SetSweepTime12Hour(realHour, realMinute, realMilliSecond, 1);\r
-        }\r
-\r
-    private:\r
-        static constexpr int16_t SEC_TO_MILLI = 1000;\r
-        static constexpr int16_t USEC_TO_MILLI = 1000;\r
-        static constexpr int16_t MIN_TO_HOUR = 60;\r
-        static constexpr int16_t HOURLY_SYSTEM = 24;\r
-        static constexpr int16_t INTERVAL = 30;\r
-        UISweepClock *sweepClock{nullptr};\r
-    };\r
-\r
-    static DialMalioView *g_pDialMalioView = nullptr;\r
-\r
-    DialMalioView::DialMalioView()\r
-    {\r
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DialMalioView::DialMalioView");\r
-        SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);\r
-        g_pDialMalioView = this;\r
-    }\r
-\r
-    DialMalioView::~DialMalioView()\r
-    {\r
-        DeInit();\r
-        delete g_pDialMalioView;\r
-        g_pDialMalioView = nullptr;\r
-    }\r
-\r
-    void DialMalioView::Init()\r
-    {\r
-        // Other initialization code\r
-        UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::MainPresenterSample::GetInstance();\r
-        container_ = new UIViewGroup();\r
-        if (container_ == nullptr)\r
-        {\r
-            return;\r
-        }\r
-        container_->SetPosition(0, 0);\r
-        container_->SetWidth(Screen::GetInstance().GetWidth());\r
-        container_->SetHeight(Screen::GetInstance().GetHeight());\r
-        container_->SetTouchable(true);\r
-        container_->SetDraggable(true);\r
-\r
-        RootView::GetInstance()->Add(container_);\r
-        // Add ImageView to App\r
-        if (image1_ == nullptr)\r
-        {\r
-            image1_ = new UIImageView();\r
-        }\r
-        image1_->SetPosition(0, 0);   // widget's left position and top position\r
-        image1_->Resize(466, 466);    // widget's width and height\r
-        image1_->SetViewId("image1"); // Set style\r
-\r
-        // Set additional property\r
-#ifdef _WIN32\r
-        char *image1imagesPath = "c:/Users/caiking/project/image_converter_tool/dogmalio.bin";\r
-#else\r
-        char *image1imagesPath = "/user/res/Dial/dogmalio.bin";\r
-#endif\r
-        image1_->SetSrc(image1imagesPath);\r
-\r
-        // Add to rootView\r
-        container_->Add(image1_);\r
-        image1_->SetVisible(true);\r
-\r
-        // Add SweepClock to App\r
-        if (sweepClock1_ == nullptr)\r
-        {\r
-            sweepClock1_ = new UISweepClock();\r
-        }\r
-        sweepClock1_->SetPosition(0, 0);        // widget's left position and top position\r
-        sweepClock1_->Resize(466, 466);         // widget's width and height\r
-        sweepClock1_->SetViewId("sweepClock1"); // Set style\r
-        sweepClock1_->SetStyle(STYLE_BACKGROUND_COLOR, 0xff000000);\r
-        sweepClock1_->SetStyle(STYLE_BACKGROUND_OPA, 0x00);\r
-\r
-        // Set additional property\r
-        sweepClock1_->SetWorkMode(UISweepClock::WorkMode::NORMAL);\r
-        Image *sweepClock1HourImage = new Image();\r
-#ifdef _WIN32\r
-        sweepClock1HourImage->SetSrc("c:/Users/caiking/project/image_converter_tool/output/Dial/hour.bin");\r
-#else\r
-        sweepClock1HourImage->SetSrc("/user/res/Dial/hour.bin");\r
-#endif\r
-        sweepClock1_->SetHandImage(UISweepClock::HandType::HOUR_HAND, *sweepClock1HourImage, {221, 87}, {12, 146});\r
-        Image *sweepClock1MinuteImage = new Image();\r
-#ifdef _WIN32\r
-        sweepClock1MinuteImage->SetSrc("c:/Users/caiking/project/image_converter_tool/output/Dial/minute.bin");\r
-#else\r
-        sweepClock1MinuteImage->SetSrc("/user/res/Dial/minute.bin");\r
-#endif\r
-        sweepClock1_->SetHandImage(UISweepClock::HandType::MINUTE_HAND, *sweepClock1MinuteImage, {221, 33}, {12, 200});\r
-        Image *sweepClock1SecondImage = new Image();\r
-#ifdef _WIN32\r
-        sweepClock1SecondImage->SetSrc("c:/Users/caiking/project/image_converter_tool/output/Dial/second.bin");\r
-#else\r
-        sweepClock1SecondImage->SetSrc("/user/res/Dial/second.bin");\r
-#endif\r
-        sweepClock1_->SetHandImage(UISweepClock::HandType::SECOND_HAND, *sweepClock1SecondImage, {221, 28}, {12, 205});\r
-        uint16_t sweepClock1realMilliSecond = 40 * 1000;\r
-        sweepClock1_->SetSweepTime12Hour(10, 20, sweepClock1realMilliSecond, true);\r
-\r
-        sweepClock1callback_ = new SweepClockCallback(sweepClock1_);\r
-        sweepClock1animator_ = new Animator(sweepClock1callback_, sweepClock1_, 0, true);\r
-        sweepClock1animator_->Start();\r
-\r
-        // Add to rootView\r
-        container_->Add(sweepClock1_);\r
-        sweepClock1_->SetVisible(true);\r
-\r
-        // Add LabelButtonExt to App\r
-        if (labelButton1_ == nullptr)\r
-        {\r
-            labelButton1_ = new UILabelButton();\r
-        }\r
-        labelButton1_->SetPosition(133, 266);     // widget's left position and top position\r
-        labelButton1_->Resize(200, 200);          // widget's width and height\r
-        labelButton1_->SetViewId("labelButton1"); // Set style\r
-        labelButton1_->SetStyle(STYLE_BACKGROUND_COLOR, 0xff000000);\r
-        labelButton1_->SetStyle(STYLE_BACKGROUND_OPA, 0x00);\r
-\r
-        // Set additional property\r
-        labelButton1_->SetText("11月27号\n星期一");\r
-        labelButton1_->SetLabelPosition(2, 0);\r
-        labelButton1_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 40);\r
-        labelButton1_->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED);\r
-\r
-        // Add to rootView\r
-        container_->Add(labelButton1_);\r
-        labelButton1_->SetVisible(true);\r
-\r
-        // Add Button to App\r
-        if (button1_ == nullptr)\r
-        {\r
-            button1_ = new UIButton();\r
-        }\r
-        button1_->SetPosition(0, 0);    // widget's left position and top position\r
-        button1_->Resize(466, 466);     // widget's width and height\r
-        button1_->SetViewId("button1"); // Set style\r
-        button1_->SetStyle(STYLE_BACKGROUND_COLOR, 0xff000000);\r
-        button1_->SetStyle(STYLE_BACKGROUND_OPA, 0x00);\r
-\r
-        // Set additional property\r
-        button1_->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff000000, UIButton::PRESSED);\r
-        button1_->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED);\r
-\r
-        // Add the CallBack about events\r
-        UIView::OnLongPressListener *button1LongPress = static_cast<UIView::OnLongPressListener *>(MainPresenterSample::GetInstance());\r
-        button1_->SetOnLongPressListener(button1LongPress);\r
-        // Add to rootView\r
-        container_->Add(button1_);\r
-        button1_->SetVisible(true);\r
-        SetCoverable(true);\r
-    }\r
-\r
-    void DialMalioView::DeInit()\r
-    {\r
-        if (clockAnimator != nullptr)\r
-        {\r
-            clockAnimator->Stop();\r
-            delete clockAnimator;\r
-            clockAnimator = nullptr;\r
-        }\r
-        if (container_ != nullptr)\r
-        {\r
-            container_->RemoveAll();\r
-            delete container_;\r
-            container_ = nullptr;\r
-        }\r
-        if (image1_ != nullptr)\r
-        {\r
-            delete image1_;\r
-            image1_ = nullptr;\r
-        }\r
-        if (sweepClock1callback_ != nullptr)\r
-        {\r
-            delete sweepClock1callback_;\r
-            sweepClock1callback_ = nullptr;\r
-        }\r
-        if (sweepClock1animator_ != nullptr)\r
-        {\r
-            delete sweepClock1animator_;\r
-            sweepClock1animator_ = nullptr;\r
-        }\r
-        if (labelButton1_ != nullptr)\r
-        {\r
-            delete labelButton1_;\r
-            labelButton1_ = nullptr;\r
-        }\r
-    }\r
-\r
-    UIView *DialMalioView::GetView()\r
-    {\r
-        Init();\r
-        return container_;\r
-    }\r
-\r
-    void DialMalioView::PreLoad(void)\r
-    {\r
-        if (!viewiInitStatus)\r
-        {\r
-            GetView();\r
-            viewiInitStatus = true;\r
-        }\r
-    }\r
-    void DialMalioView::ClockAnimatorStart(void)\r
-    {\r
-        if (clockAnimator != nullptr)\r
-        {\r
-            clockAnimator->Start();\r
-        }\r
-    }\r
-\r
-    void DialMalioView::ClockAnimatorStop(void)\r
-    {\r
-        if (clockAnimator != nullptr)\r
-        {\r
-            clockAnimator->Stop();\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/code/sdk/application/wearable/nativeapp/nativeui/clock/src/DialUserView.cpp b/code/sdk/application/wearable/nativeapp/nativeui/clock/src/DialUserView.cpp
deleted file mode 100755 (executable)
index e533c08..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-/*\r
- * Copyright (c) 2023 CompanyNameMagicTag.\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-#include "DialUserView.h"\r
-#include "components/ui_label.h"\r
-#include "wearable_log.h"\r
-#include "ui_resource_image.h"\r
-#include "common/image_cache_manager.h"\r
-#include <time.h>\r
-#include <iostream>\r
-#include <fstream>\r
-namespace OHOS\r
-{\r
-}
\ No newline at end of file
index e2a6ef9..c594dd0 100644 (file)
@@ -166,7 +166,7 @@ namespace OHOS
             // 将小时和分钟转换为字符串,并更新 stringtime
             stringtime = (hour < 10 ? "0" : "") + std::to_string(hour) + ":" + (minute < 10 ? "0" : "") + std::to_string(minute);
             printf("Before updating images\n");
-            printf("--%s:%s--\n", imageFolderPath.c_str(), stringtime.c_str());
+            //printf("--%s:%s--\n", imageFolderPath.c_str(), stringtime.c_str());
             updateImage(hour1, imageFolderPath.c_str(), stringtime.substr(0, 1));
             updateImage(hour2, imageFolderPath.c_str(), stringtime.substr(1, 1));
             updateImage(minute1, imageFolderPath.c_str(), stringtime.substr(3, 1));
index 6d49c1e..cff99d5 100755 (executable)
@@ -22,8 +22,6 @@
 #include "ActivityWeekView.h"\r
 #include "CompassControlView.h"\r
 #include "MainClockView.h"\r
-#include "DialUserView.h"\r
-#include "DialMalioView.h"\r
 #include "PlayersView.h"\r
 #include "MainPresenterSample.h"\r
 #include "HeartRateView.h"\r
@@ -70,8 +68,6 @@ private:
     UICardPage *messageView{nullptr};\r
     UILabel *messageLable{nullptr};\r
     MainClockView *mainClockView{nullptr};\r
-    DialUserView *dialUserView{nullptr};\r
-    DialMalioView *dialmalioview{nullptr};\r
     ActivityWeekView *activityWeekView{nullptr};\r
     PlayersView *playersView{nullptr};\r
     CompassControlView *compassControlView{nullptr};\r
index e7c06b8..8b243a0 100755 (executable)
@@ -52,10 +52,10 @@ MainViewSample::~MainViewSample()
         mainSwipeGroup = nullptr;\r
     }\r
 \r
-    // if (mainClockView != nullptr) {\r
-    //     delete mainClockView;\r
-    //     mainClockView = nullptr;\r
-    // }\r
+    if (mainClockView != nullptr) {\r
+        delete mainClockView;\r
+        mainClockView = nullptr;\r
+    }\r
 \r
     if (activityWeekView != nullptr) {\r
         delete activityWeekView;\r
@@ -132,8 +132,8 @@ void MainViewSample::OnStart()
     mainSwipeGroup->SetLoopState(true);\r
     mainSwipeGroup->EnableScreenCap(true);\r
     mainSwipeGroup->RegisterSwipeCallback(callback);\r
-    //mainSwipeGroup->SetHorCurrentPage(mainClockView->GetViewIndex());\r
-    mainSwipeGroup->SetHorCurrentPage(dialmalioview->GetViewIndex());\r
+    mainSwipeGroup->SetHorCurrentPage(mainClockView->GetViewIndex());\r
+\r
     SetContainerView(mainSwipeGroup);\r
 }\r
 \r
@@ -246,30 +246,13 @@ void MainViewSample::OnStop()
 \r
 UICardPage *MainViewSample::InitWatchFacePage(void)\r
 {\r
-    #if 0\r
-    dialUserView = new DialUserView();\r
-    //dialUserView->PreLoad();\r
-    if ( dialUserView  == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DialUserView new fail");\r
-        return nullptr;\r
-    }\r
-    printf("creat dial succes!!\n");\r
-    return dialUserView;\r
-    #endif\r
 \r
-    #if 1\r
     mainClockView = new MainClockView();\r
     if (mainClockView == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainClockView new fail");\r
         return nullptr;\r
     }\r
     return mainClockView;\r
-    #endif\r
-\r
-    #if 0\r
-    dialmalioview = new DialMalioView();\r
-    return dialmalioview;\r
-    #endif\r
 }\r
 \r
 UICardPage *MainViewSample::InitHeartRatePage(void)\r
@@ -335,14 +318,11 @@ void MainViewSample::AnimatorStart(int pageIndex)
     if (heartRateView != nullptr && pageIndex == ScreenModels::GetInstance()->GetCardPage(HEART_RATE)) {\r
         heartRateView->HeartbeatImageAnimatorStart();\r
     }\r
-    // if ((mainClockView != nullptr && pageIndex == ScreenModels::GetInstance()->GetCardPage(WATCH_FACE)) &&\r
-    //     mainSwipeGroup->GetCurrentPageId(UISwipeView::VERTICAL) == 1) {\r
-    //     mainClockView->ClockAnimatorStart();\r
-    // }\r
-    if ((dialmalioview != nullptr && pageIndex == ScreenModels::GetInstance()->GetCardPage(WATCH_FACE)) &&\r
+    if ((mainClockView != nullptr && pageIndex == ScreenModels::GetInstance()->GetCardPage(WATCH_FACE)) &&\r
         mainSwipeGroup->GetCurrentPageId(UISwipeView::VERTICAL) == 1) {\r
-        dialmalioview->ClockAnimatorStart();\r
+        mainClockView->ClockAnimatorStart();\r
     }\r
+\r
 }\r
 \r
 void MainViewSample::AnimatorStop(void)\r
@@ -353,9 +333,6 @@ void MainViewSample::AnimatorStop(void)
     if (mainClockView != nullptr) {\r
         mainClockView->ClockAnimatorStop();\r
     }\r
-    // if (dialmalioview != nullptr) {\r
-    //     dialmalioview->ClockAnimatorStop();\r
-    // }\r
 }\r
 \r
 bool MainViewSample::IsMainView(void)\r