From: Caisking <3449750381@qq.com> Date: Thu, 28 Dec 2023 09:10:02 +0000 (+0800) Subject: 调整动态表盘效果,进一步优化 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=036408ddecb32f55adbe57f0529503b6848cc230;p=mirrors%2FFD230.git 调整动态表盘效果,进一步优化 --- diff --git a/code/sdk/middleware/services/gui/uikit/sample/uitest/components/ui_test_video_play/ui_test_video_play.cpp b/code/sdk/middleware/services/gui/uikit/sample/uitest/components/ui_test_video_play/ui_test_video_play.cpp index 6cc5a5dd2..829b012fc 100755 --- a/code/sdk/middleware/services/gui/uikit/sample/uitest/components/ui_test_video_play/ui_test_video_play.cpp +++ b/code/sdk/middleware/services/gui/uikit/sample/uitest/components/ui_test_video_play/ui_test_video_play.cpp @@ -42,6 +42,7 @@ namespace OHOS SEC_TO_MILLI + uSecond / USEC_TO_MILLI); sweepClock->SetSweepTime12Hour(realHour, realMinute, realMilliSecond, 1); + RootView::GetInstance()->Invalidate(); } private: @@ -179,6 +180,23 @@ namespace OHOS } } + // 播放视频 + videoPlay_->StartVideoPlay(); + + // Add ImageView to App + if (image1_ == nullptr) + { + image1_ = new UIImageView(); + } + image1_->SetPosition(0, 0); // widget's left position and top position + image1_->Resize(466, 466); // widget's width and height + image1_->SetViewId("image1"); // Set style + image1_->SetStyle(STYLE_BORDER_OPA, 0xb2); + image1_->SetStyle(STYLE_BORDER_COLOR, 0xff0b1928); + // Add to rootView + container_->Add(image1_); + image1_->SetVisible(true); + // Add SweepClock to App if (sweepClock1_ == nullptr) { @@ -189,17 +207,26 @@ namespace OHOS sweepClock1_->SetViewId("sweepClock1"); // Set style sweepClock1_->SetStyle(STYLE_BACKGROUND_COLOR, 0xff000000); sweepClock1_->SetStyle(STYLE_BACKGROUND_OPA, 0x00); + sweepClock1_->SetStyle(STYLE_BORDER_OPA, 0xb2); + sweepClock1_->SetStyle(STYLE_BORDER_COLOR, 0xff0b1928); // Set additional property sweepClock1_->SetWorkMode(UISweepClock::WorkMode::NORMAL); - sweepClock1_->SetHandLine(UISweepClock::HandType::HOUR_HAND, {233, 101}, {0, 132}, Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0xff), 5, 132, 255); - sweepClock1_->SetHandLine(UISweepClock::HandType::MINUTE_HAND, {233, 56}, {0, 177}, Color::GetColorFromRGBA(0x00, 0xff, 0x00, 0xff), 3, 177, 255); - sweepClock1_->SetHandLine(UISweepClock::HandType::SECOND_HAND, {233, 10}, {0, 223}, Color::GetColorFromRGBA(0xff, 0x00, 0x00, 0xff), 1, 223, 255); + Image *sweepClock1HourImage = new Image(); + sweepClock1HourImage->SetSrc("/user/res/Dial/hour.bin"); + sweepClock1_->SetHandImage(UISweepClock::HandType::HOUR_HAND, *sweepClock1HourImage, {221, 87}, {12, 146}); + Image *sweepClock1MinuteImage = new Image(); + + sweepClock1MinuteImage->SetSrc("/user/res/Dial/minute.bin"); + sweepClock1_->SetHandImage(UISweepClock::HandType::MINUTE_HAND, *sweepClock1MinuteImage, {221, 33}, {12, 200}); + Image *sweepClock1SecondImage = new Image(); + sweepClock1SecondImage->SetSrc("/user/res/Dial/second.bin"); + sweepClock1_->SetHandImage(UISweepClock::HandType::SECOND_HAND, *sweepClock1SecondImage, {221, 28}, {12, 205}); uint16_t sweepClock1realMilliSecond = 40 * 1000; sweepClock1_->SetSweepTime12Hour(10, 20, sweepClock1realMilliSecond, true); sweepClock1callback_ = new SweepClockCallback(sweepClock1_); - sweepClock1animator_ = new Animator(sweepClock1callback_, sweepClock1_, 0, true); + sweepClock1animator_ = new Animator(sweepClock1callback_, sweepClock1_, 1000, true); sweepClock1animator_->Start(); // Add to rootView @@ -209,18 +236,18 @@ namespace OHOS void UITestVideoPlay::TearDown() { - if (animator_ != nullptr) - { - animator_->Stop(); - delete animator_; - animator_ = nullptr; - } + // if (animator_ != nullptr) + // { + // animator_->Stop(); + // delete animator_; + // animator_ = nullptr; + // } - if (callBack_ != nullptr) - { - delete callBack_; - callBack_ = nullptr; - } + // if (callBack_ != nullptr) + // { + // delete callBack_; + // callBack_ = nullptr; + // } if (sweepClock1callback_ != nullptr) { delete sweepClock1callback_; diff --git a/code/sdk/middleware/services/gui/uikit/sample/uitest/components/ui_test_video_play/ui_test_video_play.h b/code/sdk/middleware/services/gui/uikit/sample/uitest/components/ui_test_video_play/ui_test_video_play.h index 889d37d43..5090a8ced 100755 --- a/code/sdk/middleware/services/gui/uikit/sample/uitest/components/ui_test_video_play/ui_test_video_play.h +++ b/code/sdk/middleware/services/gui/uikit/sample/uitest/components/ui_test_video_play/ui_test_video_play.h @@ -25,7 +25,8 @@ #include "components/ui_lite_surface_view.h" #include "animator/animator.h" #include "media_video_play.h" - +#include "components/ui_sweep_clock.h" +#include "components/ui_image_view.h" namespace OHOS { class VideoAnimatorCallback : public AnimatorCallback @@ -63,6 +64,7 @@ namespace OHOS UISweepClock *sweepClock1_ = nullptr; AnimatorCallback *sweepClock1callback_ = nullptr; Animator *sweepClock1animator_ = nullptr; + UIImageView* image1_ = nullptr; }; } #endif // UI_TEST_VIDEO_PLAY_H