From: luozheng <1732036298@qq.com> Date: Tue, 28 May 2024 13:52:03 +0000 (+0800) Subject: main 文件夹更新 X-Git-Tag: release_V1.2.70_20241020_135402~1083 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=379231fe3f116206eb7dee5ad1912de0cdb9a763;p=mirrors%2FFD230.git main 文件夹更新 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/AppGroupView.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/AppGroupView.h index 88e838133..08529bdb5 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/AppGroupView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/AppGroupView.h @@ -20,7 +20,7 @@ public: { SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); } - virtual ~AppGroupView() {} + ~AppGroupView() override {} virtual bool InitView(void *caller)=0; bool initViewStatus{false}; }; diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/DialBinParser.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/DialBinParser.h deleted file mode 100644 index dc737236f..000000000 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/DialBinParser.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (c) 2023 CompanyNameMagicTag. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#ifndef GRAPHIC_LITE_DIAL_BIN_PARSER_H -#define GRAPHIC_LITE_DIAL_BIN_PARSER_H -#include -#include -#include "graphic_types.h" -#include "DialViewGroup.h" -#include "DialBinTypes.h" -#include "components/ui_abstract_progress.h" - -namespace OHOS { -class DialBinParser { -public: - static DialBinParser* GetInstance(void); - bool UpdateDial(const std::string& file, FILE* fp, DialViewGroup* group); - bool GetDialPreviewInfo(FILE* fp, DialPreviewInfo* info); - -protected: - int32_t ParseDialHeader(FILE* file); - int32_t ParserDialStaticImg(FILE* fp); - int32_t ParserDialSequenceImg(FILE* fp); - int32_t ParserDialRotateImg(FILE* fp); - int32_t ParserDialOptionImg(FILE* fp); - int32_t ParserDialDigitalImg(FILE* fp); - int32_t ParserDialLabel(FILE* fp); - int32_t ParserDialArcLabel(FILE* fp); - int32_t ParserDialBoxProgress(FILE* fp); - int32_t ParserDialArcProgress(FILE* fp); - int32_t ParserDialVideo(FILE* fp); - int32_t ParserDialClick(FILE* fp); - int32_t ParserDialKaleidoscope(FILE* fp); - -private: - DialBinParser(); - virtual ~DialBinParser(); - void* MallocAndReadBuf(FILE* file, uint32_t readSize); - bool SetProgressType(FILE* fp, UIAbstractProgress* view, DialProgressType data); - - static constexpr uint8_t DIAL_BIN_PARSER_FUNC_NUM = 12; // 12: func max value - int32_t (DialBinParser::*funcArray_[DIAL_BIN_PARSER_FUNC_NUM])(FILE*); - - DialViewGroup* dialGroup_ = nullptr; - std::string file_; - uint32_t dirId_ = 0xfef << 20; // 20: offset - uint32_t imageOffset_ = 0; -}; -} -#endif diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/HealthModel.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/HealthModel.h index f459ae358..fd9bca8ed 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/HealthModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/HealthModel.h @@ -16,7 +16,7 @@ #ifndef HEALTH_MODEL_H #define HEALTH_MODEL_H -#include "stdio.h" +#include #include "gfx_utils/list.h" #include "los_mux.h" #include "UiServersMsg.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/MainModel.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/MainModel.h index 6bc09a099..1d82fac85 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/MainModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/MainModel.h @@ -25,9 +25,9 @@ namespace OHOS { } DialInfo; typedef struct { - uint8_t dialFlag; - uint8_t dialId; - std::string dialFullName; + uint8_t dialFlag; + uint8_t dialId; + std::string dialFullName; } DialSetting; class MainModel { @@ -43,6 +43,10 @@ namespace OHOS { void AddDialSetting(const DialSetting &setting); void InitDialSettings(void); DialSetting &GetDialSetting(); + bool IsFromSetCardView(void) const; + void SetFromSetCardView(bool isFrom); + void SetFromCardId(uint8_t cardId); + uint8_t GetFromCardId(void); private: void InitDialSettingDefault(void); MainModel(); @@ -53,6 +57,8 @@ namespace OHOS { CardId cardSettings[CARD_SETTING_COUNT_MAX] = { MAX_CARD }; uint8_t cardSettingCount{0}; DialSetting dialSetting; + bool isFromSetCardView{false}; + uint8_t fromCardId{MAX_CARD}; }; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/MainPresenterSample.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/MainPresenterSample.h index 2192994df..2f931890b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/MainPresenterSample.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/MainPresenterSample.h @@ -18,13 +18,12 @@ #include "MainModel.h" #include "components/ui_swipe_view.h" #include "components/ui_view.h" -#include "CompassView.h" -#include "CompassPresenter.h" +#include "MainCompassView.h" +#include "MainCompassPresenter.h" #include "PlayersView.h" #include "HeartRateView.h" #include "swipe_effect/zoom_effect.h" -using namespace std; namespace OHOS { @@ -53,18 +52,18 @@ namespace OHOS { public: MainPresenterSample(); - virtual ~MainPresenterSample(); + ~MainPresenterSample() override; static MainPresenterSample *GetInstance(void); void OnStart() override; void OnPause() override; void OnResume() override; void OnStop() override; - virtual void Notify() override; + void Notify() override; bool OnClick(UIView &view, const ClickEvent &event) override; bool OnDrag(UIView &view, const DragEvent &event) override; bool OnLongPress(UIView &view, const LongPressEvent &event) override; - virtual void OnSwipe(UISwipeView &view) override; + void OnSwipe(UISwipeView& view) override; void SetPage(int8_t id); void SetTaskPeroid(CardId cardId); void setCallback(ZoomEffect *callback) @@ -85,6 +84,10 @@ namespace OHOS void get_memcheck(); + bool IsFromSetCardView(void) const; + void SetFromSetCardView(bool isFrom); + uint8_t GetFromCardId(void); + private: void ProcessDataNotify(void); void SetCircleProgress(void); diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/MainViewSample.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/MainViewSample.h index fb86752e3..daa3e73d4 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/MainViewSample.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/MainViewSample.h @@ -44,7 +44,7 @@ namespace OHOS { public: MainViewSample(); - virtual ~MainViewSample(); + ~MainViewSample() override; static MainViewSample *GetInstance(void); void OnStart() override; void OnSetUpView() override; @@ -85,7 +85,7 @@ namespace OHOS SetPage(mainClockView->GetViewIndex()); } } - + void SwitchToCard(uint8_t cardId); bool IsMainClockPage(void); bool IsPullUpViewPage(void); void SetDragFg(bool continFg); @@ -118,8 +118,8 @@ namespace OHOS void VertViewLoad(void); void HorViewLoad(void); - UICardPage *InitWathOffDial(DialSetting &setting); - UICardPage *InitWathDial(DialSetting &setting); + UICardPage *InitWatchOffDial(DialSetting &setting); + UICardPage *InitWatchDial(DialSetting &setting); }; } // namespace OHOS #endif // MAIN_VIEW_SAMPLE_H diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/ModelListenerSample.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/ModelListenerSample.h index 7c2bd82a3..b6d37a37d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/ModelListenerSample.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/ModelListenerSample.h @@ -24,6 +24,7 @@ public: ModelListenerSample(); virtual ~ModelListenerSample(); virtual void Notify(void) = 0; + virtual void OnTickEvent(void) {}; void Callback(); }; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/PullUpDownView.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/PullUpDownView.h index caadd670b..660b26136 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/PullUpDownView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/PullUpDownView.h @@ -50,7 +50,7 @@ namespace OHOS { public: PullUpDownView(); - virtual ~PullUpDownView(); + ~PullUpDownView() override; static PullUpDownView *GetInstance(void); bool InitView(); void PreLoad(void) override; diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/UiServersMsg.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/UiServersMsg.h index 822004909..a7e2693c7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/UiServersMsg.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/UiServersMsg.h @@ -8,7 +8,7 @@ #ifndef UI_SERVERS_MSG_H #define UI_SERVERS_MSG_H -#include +#include #include "ohos_types.h" #include "message.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialArcLabelView.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialArcLabelView.h index ded3418c1..d3ad91ee2 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialArcLabelView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialArcLabelView.h @@ -5,7 +5,7 @@ #ifndef DIAL_ARC_LABEL_VIEW_H #define DIAL_ARC_LABEL_VIEW_H -#include "stdint.h" +#include #include "DialView.h" #include "components/ui_arc_label.h" @@ -13,7 +13,7 @@ namespace OHOS { class DialArcLabelView : public UIArcLabel, public DialView { public: DialArcLabelView(); - virtual ~DialArcLabelView(); + ~DialArcLabelView() override; bool SetText(const char* text); bool SetTextWithWildcard(const char* text); diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialArcProgressView.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialArcProgressView.h index eab02980a..29675223f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialArcProgressView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialArcProgressView.h @@ -12,7 +12,7 @@ namespace OHOS { class DialArcProgressView : public UICircleProgress, public DialView { public: DialArcProgressView(); - virtual ~DialArcProgressView(); + ~DialArcProgressView() override; void HandleFloatData(float data) override; private: int32_t value_ = -1; diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialBaseModel.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialBaseModel.h index 115495579..ef71b9bb1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialBaseModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialBaseModel.h @@ -12,7 +12,6 @@ #include "heap_base.h" #include "OnDialDataUpdateListener.h" -using namespace std; namespace OHOS { class DialBaseModel : public HeapBase { public: @@ -38,7 +37,7 @@ public: /* * * @brief Get dial data of text type */ - virtual bool GetDialTextData(DialDataType& type, string*& out, int16_t& strNum) + virtual bool GetDialTextData(DialDataType& type, std::string*& out, int16_t& strNum) { return false; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialBoxProgressView.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialBoxProgressView.h index e4aca93ac..b77772284 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialBoxProgressView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialBoxProgressView.h @@ -12,7 +12,7 @@ namespace OHOS { class DialBoxProgressView : public UIBoxProgress, public DialView { public: DialBoxProgressView(); - virtual ~DialBoxProgressView(); + ~DialBoxProgressView() override; static DialBoxProgressView* GetInstance() { static DialBoxProgressView instance; diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialDigitalImgView.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialDigitalImgView.h index 7a67038f7..443c325ee 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialDigitalImgView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialDigitalImgView.h @@ -5,7 +5,7 @@ #ifndef DIAL_DIGITAL_IMG_VIEW_H #define DIAL_DIGITAL_IMG_VIEW_H -#include "stdint.h" +#include #include "DialView.h" #include "components/ui_image_view.h" #include "gfx_utils/graphic_math.h" @@ -22,7 +22,7 @@ enum class ImgAlign { class DialDigitalImgView : public UIImageView, public DialView { public: DialDigitalImgView(); - virtual ~DialDigitalImgView(); + ~DialDigitalImgView() override; void HandleFloatData(float data) override; diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialKaleidoscopeView.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialKaleidoscopeView.h index f73c2b817..3125ab001 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialKaleidoscopeView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialKaleidoscopeView.h @@ -5,7 +5,7 @@ #ifndef DIAL_KALEIDOSCOPE_VIEW_H #define DIAL_KALEIDOSCOPE_VIEW_H #include "components/ui_kaleidoscope_view.h" -namespace OHOS{ +namespace OHOS { using DialKaleidoscopeView = UIKaleidoscopeView; } #endif diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialLabelView.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialLabelView.h index f53fbd488..355656e7d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialLabelView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialLabelView.h @@ -5,7 +5,7 @@ #ifndef DIAL_LABEL_VIEW_H #define DIAL_LABEL_VIEW_H -#include "stdint.h" +#include #include "DialView.h" #include "components/ui_label.h" #include "components/ui_label_ext.h" @@ -14,7 +14,7 @@ namespace OHOS { class DialLabelView : public UILabel, public DialView { public: DialLabelView(); - virtual ~DialLabelView(); + ~DialLabelView() override; bool SetText(const char* text); bool SetTextWithWildcard(const char* text); diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelHeartRate.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelHeartRate.h index a7ebae573..3c3f8b9c0 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelHeartRate.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelHeartRate.h @@ -10,21 +10,18 @@ #include "DialBaseModel.h" -namespace OHOS -{ - class DialModelHeartRate : public DialBaseModel +namespace OHOS { +class DialModelHeartRate : public DialBaseModel { +public: + DialModelHeartRate() {} + ~DialModelHeartRate() override {} + static DialModelHeartRate* GetInstance() { - public: - DialModelHeartRate() {} - virtual ~DialModelHeartRate() {} - static DialModelHeartRate *GetInstance() - { - static DialModelHeartRate instance; - return &instance; - } - bool GetDialFloatData(DialDataType &type, float &out) override; - void UpdateHeartRate(int16_t heartRate); - int GetHeartData(void); + static DialModelHeartRate instance; + return &instance; + } + bool GetDialFloatData(DialDataType& type, float& out) override; + void UpdateHeartRate(int16_t heartRate); private: float heartRate_ = 0; // 67.0: default heart value as reference diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelPower.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelPower.h index 537b00948..ed9f7f0ff 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelPower.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelPower.h @@ -16,13 +16,13 @@ #include "DialBaseModel.h" -namespace OHOS +namespace OHOS { { class DialModelPower : public DialBaseModel { public: DialModelPower() {} - virtual ~DialModelPower() {} + ~DialModelPower() override {} static DialModelPower *GetInstance() { static DialModelPower instance; diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelSteps.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelSteps.h index 4992777ff..e721c60d8 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelSteps.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelSteps.h @@ -14,7 +14,7 @@ namespace OHOS { class DialModelSteps : public DialBaseModel { public: DialModelSteps() {} - virtual ~DialModelSteps() {} + ~DialModelSteps() override {} static DialModelSteps* GetInstance() { static DialModelSteps instance; diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelTime.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelTime.h index 6f4fb7607..7da252b40 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelTime.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelTime.h @@ -14,7 +14,7 @@ namespace OHOS { class DialModelTime : public DialBaseModel { public: DialModelTime() {} - virtual ~DialModelTime() {} + ~DialModelTime() override {} static DialModelTime* GetInstance() { static DialModelTime instance; @@ -24,7 +24,7 @@ public: void UpdateTime(); private: - struct tm tblock_; + struct tm *tblock_; uint16_t angleH_ = 0; uint16_t angleM_ = 0; uint16_t angleS_ = 0; diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialOptionImgView.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialOptionImgView.h index 837b24410..4fa2fbd65 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialOptionImgView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialOptionImgView.h @@ -5,7 +5,7 @@ #ifndef DIAL_OPTION_IMG_VIEW_H #define DIAL_OPTION_IMG_VIEW_H -#include "stdint.h" +#include #include "DialView.h" #include "components/ui_image_view.h" @@ -14,7 +14,7 @@ namespace OHOS { class DialOptionImgView : public UIImageView, public DialView { public: DialOptionImgView(); - virtual ~DialOptionImgView(); + ~DialOptionImgView() override; void HandleFloatData(float data) override; diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialRotateImgView.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialRotateImgView.h index 23d49eb68..e1fff0ed8 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialRotateImgView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialRotateImgView.h @@ -5,7 +5,7 @@ #ifndef DIAL_ROTATE_IMG_VIEW_H #define DIAL_ROTATE_IMG_VIEW_H -#include "stdint.h" +#include #include "DialView.h" #include "components/ui_image_view.h" #include "gfx_utils/graphic_math.h" @@ -15,7 +15,7 @@ namespace OHOS { class DialRotateImgView : public UIImageView, public DialView { public: DialRotateImgView(); - virtual ~DialRotateImgView(); + ~DialRotateImgView() override; void HandleFloatData(float data) override; diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialSequenceImgView.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialSequenceImgView.h index ef885b6e0..4800b71b9 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialSequenceImgView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialSequenceImgView.h @@ -12,7 +12,7 @@ namespace OHOS { class DialSequenceImgView : public UIImageAnimatorView { public: DialSequenceImgView(); - virtual ~DialSequenceImgView(); + ~DialSequenceImgView() override; bool SetSequenceRes(const ImageAnimatorInfo* imgSrc, uint8_t imgNum); diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialStaticImgView.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialStaticImgView.h index a405bd868..e1b48a0a6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialStaticImgView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialStaticImgView.h @@ -11,7 +11,7 @@ namespace OHOS { class DialStaticImgView : public UIImageView { public: DialStaticImgView(); - virtual ~DialStaticImgView(); + ~DialStaticImgView() override; }; } #endif diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialVideoView.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialVideoView.h index eca3227cc..7d4c1408b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialVideoView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialVideoView.h @@ -5,7 +5,7 @@ #ifndef DIAL_VIDEO_VIEW #define DIAL_VIDEO_VIEW -#include "stdint.h" +#include #include "components/ui_lite_surface_view.h" #include "video_play_wrapper.h" @@ -13,7 +13,7 @@ namespace OHOS { class DialVideoView : public UILiteSurfaceView { public: DialVideoView(); - virtual ~DialVideoView(); + ~DialVideoView() override; bool SetVideoRes(FILE* fp, uint32_t offset); bool StartPlay(); bool ResumePlay(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialView.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialView.h index 4f933a000..300f7a0b4 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialView.h @@ -5,7 +5,7 @@ #ifndef DIAL_VIEW_H #define DIAL_VIEW_H -#include "stdint.h" +#include #include namespace OHOS { diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialViewGroup.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialViewGroup.h index 5d3e76b3d..2a28997b6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialViewGroup.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialViewGroup.h @@ -5,11 +5,12 @@ #ifndef DIAL_VIEW_GROUP_H #define DIAL_VIEW_GROUP_H -#include "DialDataBase.h" #include +#include "DialDataBase.h" #include "components/ui_view_group.h" #include "OnDialDataUpdateListener.h" #include "components/ui_card_page.h" +#include "components/ui_kaleidoscope_view.h" #include "gfx_utils/list.h" #include "DialView.h" #include "DialVideoView.h" @@ -19,7 +20,7 @@ namespace OHOS { class DialViewGroup : public UICardPage, public OnDialDataUpdateListener { public: DialViewGroup(); - virtual ~DialViewGroup(); + ~DialViewGroup() override; /** * @brief Set dial resource path. @@ -106,7 +107,10 @@ public: */ void CoverEnd(bool isCovered) override; - void ComeBack(); + /** + * @brief This function is invoked when the function SetHorCurrentPage() is called. + */ + void OnActive(void) override; private: void ProcessData(DialDataType type, DialView* view); @@ -119,7 +123,7 @@ private: std::string filePath_; FILE* fp_ = nullptr; DialVideoView* video_ = nullptr; - DialSequenceImgView* sequence_ = nullptr; + UIKaleidoscopeView* kaleidoscope_ = nullptr; typedef struct { Rect area; diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/ModelDialDataFactory.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/ModelDialDataFactory.h index 602586aa4..33bedbe49 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/ModelDialDataFactory.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/ModelDialDataFactory.h @@ -32,7 +32,7 @@ public: bool RegisterDialDataListener(DialDataType type, OnDialDataUpdateListener* listener); bool UnRegisterDialDataListener(DialDataType type); - bool GetDialTextData(DialDataType& type, string*& out, int16_t& strNum); + bool GetDialTextData(DialDataType& type, std::string*& out, int16_t& strNum); bool GetDialFloatData(DialDataType& type, float& out); bool GetDialFloatData(DialDataType& type, float*& out, int16_t& len); DialBaseModel* GetModuleByType(DialDataType& type); diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/HealthModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/HealthModel.cpp index 50bbd9cdf..ad7fb0624 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/HealthModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/HealthModel.cpp @@ -24,8 +24,6 @@ #include #include "thread_adapter.h" -using namespace std; - namespace OHOS { HealthAllData g_healthData; @@ -52,8 +50,8 @@ HealthModel *HealthModel::GetInstance(void) int HealthModel::SaveGlobalHealthToFile(void) { - ofstream outHealthFile; - outHealthFile.open(HEALTH_DATA_PATH, ios::out); + std::ofstream outHealthFile; + outHealthFile.open(HEALTH_DATA_PATH, std::ios::out); if (outHealthFile.is_open() == 0) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "open HEALTH_DATA_PATH failure!"); outHealthFile.close(); @@ -107,7 +105,7 @@ void HealthModel::PushHealthData(HealthMsg healthMsg) bool HealthModel::FetchedHealthData(HealthMsg *healthMsg) { - if (listHealth.IsEmpty() == true) { + if (listHealth.IsEmpty()) { return false; } else { MUTEX_Lock(g_healthDataMutex); @@ -123,8 +121,8 @@ bool HealthModel::InitHealthData(void) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HealthModel::InitHealthData start"); (void)memset_s(&g_healthData, sizeof(HealthAllData), 0, sizeof(HealthAllData)); - ifstream inHealthFile; - inHealthFile.open(HEALTH_DATA_PATH, ios::in); + std::ifstream inHealthFile; + inHealthFile.open(HEALTH_DATA_PATH, std::ios::in); if (!inHealthFile.is_open()) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "open HEALTH_DATA_PATH failure!"); inHealthFile.close(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp index fec1e6462..0b2beb745 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp @@ -235,4 +235,24 @@ namespace OHOS { return dialSetting; } + + bool MainModel::IsFromSetCardView(void) const + { + return isFromSetCardView; + } + + void MainModel::SetFromSetCardView(bool isFrom) + { + isFromSetCardView = isFrom; + } + + void MainModel::SetFromCardId(uint8_t cardId) + { + fromCardId = cardId; + } + + uint8_t MainModel::GetFromCardId(void) + { + return fromCardId; + } } \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp index 881aba230..38b74f7fc 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp @@ -570,4 +570,19 @@ namespace OHOS } } + bool MainPresenterSample::IsFromSetCardView(void) const + { + return MainModel::GetInstance().IsFromSetCardView(); + } + + void MainPresenterSample::SetFromSetCardView(bool isFrom) + { + MainModel::GetInstance().SetFromSetCardView(isFrom); + } + + uint8_t MainPresenterSample::GetFromCardId(void) + { + return MainModel::GetInstance().GetFromCardId(); + } + } \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp index 499a77801..298289eb3 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp @@ -195,7 +195,15 @@ namespace OHOS mainSwipeGroup->SetLoopState(true); mainSwipeGroup->EnableScreenCap(true); mainSwipeGroup->RegisterSwipeCallback(callback); - SwitchToClockPage(); + if (presenter_->IsFromSetCardView()) + { + presenter_->SetFromSetCardView(false); + SwitchToCard(presenter_->GetFromCardId()); + } + else + { + SwitchToClockPage(); + } SetContainerView(mainSwipeGroup); } @@ -504,5 +512,17 @@ namespace OHOS /* pageId 与CardId 没有对应关系,需要一次转换 */ return cardSettings[pageId]; } + + void MainViewSample::SwitchToCard(uint8_t cardId) + { + if ((cardId < MAX_CARD) && (recordCard[cardId] != nullptr)) + { + SetPage(recordCard[cardId]->GetViewIndex()); + } + else + { + SwitchToClockPage(); + } + } } diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialVideoView.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialVideoView.cpp index 7770f1618..c3cbafba4 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialVideoView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialVideoView.cpp @@ -12,7 +12,7 @@ static constexpr int16_t JPEG_HEIGHT_DIVISOR = 2; static constexpr int16_t JPEG_WIDTH_BYTE_ALIGNMENT = 128; static constexpr int16_t JPEG_HEIGHT_BYTE_ALIGNMENT = 16; static constexpr int16_t BUFFER_QUEUE_SIZE = 2; -static constexpr int16_t STRIDE_ALIGNMENT_VALUE = 64; +static constexpr int16_t STRIDE_ALIGNMENT_VALUE = 128; #ifdef SUPPORT_AT_OHOSFWK static MediaVideoPlay *g_videoPlay = nullptr; @@ -50,7 +50,6 @@ DialVideoView::~DialVideoView() deregisterNotifyScreenStatus(ScreenStatusNotify); #endif if (videoPlayer_ != nullptr) { - videoPlayer_->StopVideoPlay(); delete videoPlayer_; } } @@ -87,6 +86,7 @@ bool DialVideoView::SetVideoRes(FILE* fp, uint32_t offset) } videoPlayer_ = new MediaVideoPlay(surface, fd, offset_, true); + videoPlayer_->SetSyncExitMode(true); #ifdef SUPPORT_AT_OHOSFWK g_videoPlay = videoPlayer_; registerNotifyScreenStatus(ScreenStatusNotify); diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialViewGroup.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialViewGroup.cpp index 6400c9777..2eea946de 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialViewGroup.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialViewGroup.cpp @@ -7,371 +7,360 @@ #include "DialBinParser.h" #include "ModelDialDataFactory.h" #include "common/low_power_manager.h" -#include "wearable_log.h" -namespace OHOS +namespace OHOS { +DialViewGroup::DialViewGroup(void) { - DialViewGroup::DialViewGroup(void) - { - SetTouchable(true); - SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); - SetCoverable(true); - } - - DialViewGroup::~DialViewGroup(void) - { - ClearDial(); - } - - void DialViewGroup::ClearDial() - { - ListNode *passiveNode = passiveUpdateTypes_.Head(); - while (passiveNode != passiveUpdateTypes_.End()) - { - DialDataType type = passiveNode->data_; - ModelDialDataFactory::GetInstance().UnRegisterDialDataListener(type); - passiveNode = passiveNode->next_; - } - passiveUpdateTypes_.Clear(); - - ListNode *clickNode = dialClicks_.Head(); - while (clickNode != dialClicks_.End()) - { - DialClick click = clickNode->data_; - if (!click.isSliceType) - { - UIFree(click.bundleName); - } - clickNode = clickNode->next_; - } - dialClicks_.Clear(); + SetTouchable(true); + SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); + SetCoverable(true); +} - periodicUpdateTypes_.Clear(); +DialViewGroup::~DialViewGroup(void) +{ + if (kaleidoscope_ != nullptr) { + kaleidoscope_->ClearFocus(); + kaleidoscope_ = nullptr; + } + ClearDial(); +} - dataTypeMap_.clear(); +void DialViewGroup::ClearDial() +{ + ListNode* passiveNode = passiveUpdateTypes_.Head(); + while (passiveNode != passiveUpdateTypes_.End()) { + DialDataType type = passiveNode->data_; + ModelDialDataFactory::GetInstance().UnRegisterDialDataListener(type); + passiveNode = passiveNode->next_; + } + passiveUpdateTypes_.Clear(); - ListNode *viewNode = dialViews_.Head(); - while (viewNode != dialViews_.End()) - { - UIViewGroup::Remove(viewNode->data_); - delete (viewNode->data_); - viewNode = viewNode->next_; + ListNode* clickNode = dialClicks_.Head(); + while (clickNode != dialClicks_.End()) { + DialClick click = clickNode->data_; + if (!click.isSliceType) { + UIFree(click.bundleName); } - dialViews_.Clear(); - - period_ = DEFAULT_TASK_PERIOD; + clickNode = clickNode->next_; + } + dialClicks_.Clear(); - video_ = nullptr; + periodicUpdateTypes_.Clear(); - sequence_ = nullptr; + dataTypeMap_.clear(); - if (fp_ != nullptr) - { - fclose(fp_); - fp_ = nullptr; - } + ListNode* viewNode = dialViews_.Head(); + while (viewNode != dialViews_.End()) { + UIViewGroup::Remove(viewNode->data_); + delete(viewNode->data_); + viewNode = viewNode->next_; } + dialViews_.Clear(); - void DialViewGroup::SetDial(std::string filePath) - { - ClearDial(); - resPreloaded_ = false; - filePath_ = filePath; - } + period_ = DEFAULT_TASK_PERIOD; - void DialViewGroup::PreLoad(void) - { - if (!resPreloaded_) - { - fp_ = fopen(filePath_.c_str(), "rb"); - if (fp_ == nullptr) - { - GRAPHIC_LOGE("cannot open file: %s\n", filePath_.c_str()); - return; - } - DialBinParser::GetInstance()->UpdateDial(filePath_, fp_, this); - if (video_ != nullptr) - { - video_->StartPlay(); - } - resPreloaded_ = true; - } + video_ = nullptr; + + if (fp_ != nullptr) { + fclose(fp_); + fp_ = nullptr; } +} + +void DialViewGroup::SetDial(std::string filePath) +{ + ClearDial(); + resPreloaded_ = false; + filePath_ = filePath; +} - void DialViewGroup::ProcessData(DialDataType type, DialView *view) - { - int16_t value = static_cast(type) >> 13; // 13: bit shift - if (value == 0) - { // 0: float - float floatData = 0; - ModelDialDataFactory::GetInstance().GetDialFloatData(type, floatData); - view->HandleFloatData(floatData); +void DialViewGroup::PreLoad(void) +{ + if (!resPreloaded_) { + fp_ = fopen(filePath_.c_str(), "rb"); + if (fp_ == nullptr) { + GRAPHIC_LOGE("cannot open file: %s\n", filePath_.c_str()); + return; } - else if (value == 1) - { // 1: text - std::string *textData = nullptr; - int16_t num = 0; - ModelDialDataFactory::GetInstance().GetDialTextData(type, textData, num); - view->HandleTextData(textData, num); + DialBinParser::GetInstance()->UpdateDial(filePath_, fp_, this); + if (video_ != nullptr) { + video_->StartPlay(); } - else if (value == 2) - { // 2: multifloat - float *floatsData = nullptr; - int16_t num = 0; - ModelDialDataFactory::GetInstance().GetDialFloatData(type, floatsData, num); - view->HandleFloatData(floatsData, num); + + if (kaleidoscope_ != nullptr) { + kaleidoscope_->RequestFocus(); + kaleidoscope_->StartRotateAnimator(); } + resPreloaded_ = true; } +} - void DialViewGroup::AddView(UIView *view, bool isDialVideoView) - { - if (view == nullptr) - { - GRAPHIC_LOGE("Parameter is nullptr.\n"); - return; - } - dialViews_.PushBack(view); - Add(view); - - if (isDialVideoView) - { - if (video_ != nullptr) - { - GRAPHIC_LOGE("Already added a video view.\n"); - return; - } - video_ = reinterpret_cast(view); - } +void DialViewGroup::ProcessData(DialDataType type, DialView* view) +{ + int16_t value = static_cast(type) >> 13; // 13: bit shift + if (value == 0) { // 0: float + float floatData = 0; + ModelDialDataFactory::GetInstance().GetDialFloatData(type, floatData); + view->HandleFloatData(floatData); + } else if (value == 1) { // 1: text + std::string* textData = nullptr; + int16_t num = 0; + ModelDialDataFactory::GetInstance().GetDialTextData(type, textData, num); + view->HandleTextData(textData, num); + } else if (value == 2) { // 2: multifloat + float* floatsData = nullptr; + int16_t num = 0; + ModelDialDataFactory::GetInstance().GetDialFloatData(type, floatsData, num); + view->HandleFloatData(floatsData, num); } +} - void DialViewGroup::AddView(DialDataType type, DialView *view, bool isPeriodic) - { - if (view == nullptr) - { - GRAPHIC_LOGE("Parameter is nullptr.\n"); - return; - } +void DialViewGroup::AddView(UIView* view, bool isDialVideoView) +{ + if (view == nullptr) { + GRAPHIC_LOGE("Parameter is nullptr.\n"); + return; + } + dialViews_.PushBack(view); + Add(view); - dataTypeMap_.insert(std::make_pair(static_cast(type), view)); - if (isPeriodic) - { - periodicUpdateTypes_.PushBack(type); - } - else - { - ModelDialDataFactory::GetInstance().RegisterDialDataListener(type, this); - passiveUpdateTypes_.PushBack(type); - } - dialViews_.PushBack(dynamic_cast(view)); - ProcessData(type, view); - Add(dynamic_cast(view)); + if (view->GetViewType() == UI_KALEIDOSCOPE_VIEW) { + kaleidoscope_ = dynamic_cast(view); } - void DialViewGroup::SetPeriod(uint32_t period) - { - if (period_ < DEFAULT_TASK_PERIOD) - { - period_ = DEFAULT_TASK_PERIOD; - } - else - { - period_ = period; + if (isDialVideoView) { + if (video_ != nullptr) { + GRAPHIC_LOGE("Already added a video view.\n"); + return; } + video_ = reinterpret_cast(view); } +} - uint32_t DialViewGroup::GetPeriod() - { - return period_; +void DialViewGroup::AddView(DialDataType type, DialView* view, bool isPeriodic) +{ + if (view == nullptr) { + GRAPHIC_LOGE("Parameter is nullptr.\n"); + return; } - void DialViewGroup::UpdateViewsByPeriodicUpdateData() - { - ListNode *node = periodicUpdateTypes_.Head(); - while (node != periodicUpdateTypes_.End()) - { - DialDataType type = node->data_; - auto iter = dataTypeMap_.find(static_cast(type)); - if (iter != dataTypeMap_.end()) - { - ProcessData(type, iter->second); - } - node = node->next_; - } - if (LowPowerManager::GetInstance()->IsLiteSurfaceInRootView()) - { - Invalidate(); - } + dataTypeMap_.insert(std::make_pair(static_cast(type), view)); + if (isPeriodic) { + periodicUpdateTypes_.PushBack(type); + } else { + ModelDialDataFactory::GetInstance().RegisterDialDataListener(type, this); + passiveUpdateTypes_.PushBack(type); } + dialViews_.PushBack(dynamic_cast(view)); + ProcessData(type, view); + Add(dynamic_cast(view)); +} - void DialViewGroup::OnDialFloatDataUpdate(DialDataType type, float data) - { - auto iter = dataTypeMap_.find(static_cast(type)); - if (iter != dataTypeMap_.end()) - { - DialView *view = iter->second; - view->HandleFloatData(data); - } +void DialViewGroup::SetPeriod(uint32_t period) +{ + if (period_ < DEFAULT_TASK_PERIOD) { + period_ = DEFAULT_TASK_PERIOD; + } else { + period_ = period; } +} + +uint32_t DialViewGroup::GetPeriod() +{ + return period_; +} - void DialViewGroup::OnDialFloatDataUpdate(DialDataType type, const float *data, uint16_t num) - { +void DialViewGroup::UpdateViewsByPeriodicUpdateData() +{ + ListNode* node = periodicUpdateTypes_.Head(); + while (node != periodicUpdateTypes_.End()) { + DialDataType type = node->data_; auto iter = dataTypeMap_.find(static_cast(type)); - if (iter != dataTypeMap_.end()) - { - DialView *view = iter->second; - view->HandleFloatData(data, num); + if (iter != dataTypeMap_.end()) { + ProcessData(type, iter->second); } + node = node->next_; + } + if (LowPowerManager::GetInstance()->IsLiteSurfaceInRootView()) { + Invalidate(); } +} - void DialViewGroup::OnDialTextDataUpdate(DialDataType type, const std::string *data, uint16_t num) - { - auto iter = dataTypeMap_.find(static_cast(type)); - if (iter != dataTypeMap_.end()) - { - DialView *view = iter->second; - view->HandleTextData(data, num); - } +void DialViewGroup::OnDialFloatDataUpdate(DialDataType type, float data) +{ + auto iter = dataTypeMap_.find(static_cast(type)); + if (iter != dataTypeMap_.end()) { + DialView* view = iter->second; + view->HandleFloatData(data); + } +} + +void DialViewGroup::OnDialFloatDataUpdate(DialDataType type, const float* data, uint16_t num) +{ + auto iter = dataTypeMap_.find(static_cast(type)); + if (iter != dataTypeMap_.end()) { + DialView* view = iter->second; + view->HandleFloatData(data, num); } +} - void DialViewGroup::AddDialClick(Rect &rect, const char *bundleName) - { - if (bundleName == nullptr) - { - return; - } - uint32_t len = static_cast(strlen(bundleName)); - char *name = static_cast(UIMalloc(++len)); - if (name == nullptr) - { - return; - } - if (memcpy_s(name, len, bundleName, len) != EOK) - { - UIFree(name); - name = nullptr; - return; - } - name[len] = '\0'; - DialClick click = {rect, false, {.bundleName = name}}; - dialClicks_.PushBack(click); +void DialViewGroup::OnDialTextDataUpdate(DialDataType type, const std::string* data, uint16_t num) +{ + auto iter = dataTypeMap_.find(static_cast(type)); + if (iter != dataTypeMap_.end()) { + DialView* view = iter->second; + view->HandleTextData(data, num); } +} - void DialViewGroup::AddDialClick(Rect &rect, uint32_t sliceId) - { - if (sliceId == 0) - { - return; - } +void DialViewGroup::AddDialClick(Rect& rect, const char* bundleName) +{ + if (bundleName == nullptr) { + return; + } + uint32_t len = static_cast(strlen(bundleName)); + char* name = static_cast(UIMalloc(++len)); + if (name == nullptr) { + return; + } + if (memcpy_s(name, len, bundleName, len) != EOK) { + UIFree(name); + name = nullptr; + return; + } + name[len] = '\0'; + DialClick click = {rect, false, {.bundleName = name}}; + dialClicks_.PushBack(click); +} + +void DialViewGroup::AddDialClick(Rect& rect, uint32_t sliceId) +{ + if (sliceId == 0) { + return; + } + + DialClick click = {rect, true, {.sliceId = sliceId}}; + dialClicks_.PushBack(click); +} - DialClick click = {rect, true, {.sliceId = sliceId}}; - dialClicks_.PushBack(click); - } - - bool DialViewGroup::OnClickEvent(const ClickEvent &event) - { - Point point = event.GetCurrentPos(); - ListNode *node = dialClicks_.Head(); - while (node != dialClicks_.End()) - { - DialClick dialClick = node->data_; - if (dialClick.area.IsContains(point)) - { - if (dialClick.isSliceType) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OnClickEvent %d", dialClick.sliceId); - NativeAbility::GetInstance().ChangeSlice(dialClick.sliceId); - } - else - { +bool DialViewGroup::OnClickEvent(const ClickEvent& event) +{ + Point point = event.GetCurrentPos(); + ListNode* node = dialClicks_.Head(); + while (node != dialClicks_.End()) { + DialClick dialClick = node->data_; + if (dialClick.area.IsContains(point)) { + if (dialClick.isSliceType) { + NativeAbility::GetInstance().ChangeSlice(dialClick.sliceId); + } else { #ifdef JS_ENABLE - StartJsApp(dialClick.bundleName); + StartJsApp(dialClick.bundleName); #endif - } - return true; } - node = node->next_; + return true; } - return false; + node = node->next_; } + return false; +} - void DialViewGroup::ScrollBegin(bool isActive) - { - if (video_ == nullptr) - { - return; - } - if (video_->IsPlayed()) - { - video_->PausePlay(); +void DialViewGroup::ScrollBegin(bool isActive) +{ + if (kaleidoscope_ != nullptr) { + if (isActive) { + kaleidoscope_->ClearFocus(); + kaleidoscope_->StopRotateAnimator(); } + return; } - void DialViewGroup::ScrollEnd(bool isActive) - { - if (video_ == nullptr) - { - return; - } + if (video_ == nullptr) { + return; + } + if (video_->IsPlayed()) { + video_->PausePlay(); + } +} - if (isActive) - { - if (video_->IsPaused()) - { - video_->ResumePlay(); - } - else if (video_->IsStopped()) - { - video_->StartPlay(); - } +void DialViewGroup::ScrollEnd(bool isActive) +{ + if (kaleidoscope_ != nullptr) { + if (isActive) { + kaleidoscope_->StartRotateAnimator(); + kaleidoscope_->RequestFocus(); } + return; } - void DialViewGroup::CoverBegin(bool isCovered) - { - if (video_ == nullptr) - { - return; - } + if (video_ == nullptr) { + return; + } - if (video_->IsPlayed()) - { - video_->PausePlay(); + if (isActive) { + if (video_->IsPaused()) { + video_->ResumePlay(); + } else if (video_->IsStopped()) { + video_->StartPlay(); + } + } else { + if (video_->IsPaused() || video_->IsPlayed()) { + video_->StopPlay(); } + ClearCache(); } +} - void DialViewGroup::CoverEnd(bool isCovered) - { - if (video_ == nullptr) - { - return; +void DialViewGroup::CoverBegin(bool isCovered) +{ + if (kaleidoscope_ != nullptr) { + if (!isCovered) { + kaleidoscope_->StopRotateAnimator(); + kaleidoscope_->ClearFocus(); } - if (!isCovered) - { - if (video_->IsPaused()) - { - video_->ResumePlay(); - } - else if (video_->IsStopped()) - { + return; + } - video_->StartPlay(); - } + if (video_ == nullptr) { + return; + } + + if (video_->IsPlayed()) { + video_->PausePlay(); + } +} + +void DialViewGroup::CoverEnd(bool isCovered) +{ + if (kaleidoscope_ != nullptr) { + if (!isCovered) { + kaleidoscope_->RequestFocus(); + kaleidoscope_->StartRotateAnimator(); } + return; } - void DialViewGroup::ComeBack() - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ComeBack"); - if (video_ != nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "video_"); - if (video_->IsPaused()) - { - video_->ResumePlay(); - } - else if (video_->IsStopped()) - { - video_->StartPlay(); - } + if (video_ == nullptr) { + return; + } + if (!isCovered) { + if (video_->IsPaused()) { + video_->ResumePlay(); + } else if (video_->IsStopped()) { + video_->StartPlay(); } } } + +void DialViewGroup::OnActive(void) +{ + if (video_ != nullptr) { + if (video_->IsPaused()) { + video_->ResumePlay(); + } else if (video_->IsStopped()) { + video_->StartPlay(); + } + } else if (kaleidoscope_ != nullptr) { + kaleidoscope_->RequestFocus(); + kaleidoscope_->StartRotateAnimator(); + } +} +} diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/ModelDialDataFactory.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/ModelDialDataFactory.cpp index 9d02e691d..d17de5b31 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/ModelDialDataFactory.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/ModelDialDataFactory.cpp @@ -7,7 +7,7 @@ #include "ModelDialDataFactory.h" namespace OHOS { -bool ModelDialDataFactory::GetDialTextData(DialDataType& type, string*& out, int16_t& strNum) +bool ModelDialDataFactory::GetDialTextData(DialDataType& type, std::string*& out, int16_t& strNum) { DialBaseModel* model = GetModuleByType(type); if (model == nullptr) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/parser/DialBinParser.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/parser/DialBinParser.cpp index 6e54b0a92..b2978d168 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/parser/DialBinParser.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/parser/DialBinParser.cpp @@ -578,6 +578,17 @@ int32_t DialBinParser::ParserDialVideo(FILE* fp) view->SetPosition(data->rect.x, data->rect.y, data->rect.w, data->rect.h); view->SetSurfaceColorkey(data->colorKey); view->SetVideoRes(fp, data->offset); + uint32_t resId = data->imgId | dirId_; + uint32_t curReadPt = ftell(fp); + ImageInfo* imgInfo = ImageCacheManager::GetInstance().LoadOneInMultiRes(resId, + file_, fp, false, imageOffset_); + if (imgInfo == nullptr) { + GRAPHIC_LOGE("[%s: %d]load img fail! file: %s resId: %x\n", + __FUNCTION__, __LINE__, file_.c_str(), resId); + return false; + } + fseek(fp, curReadPt, SEEK_SET); + view->SetPreview(imgInfo); dialGroup_->AddView(view, true); UIFree(data); return 0; @@ -633,10 +644,8 @@ int32_t DialBinParser::ParserDialKaleidoscope(FILE* fp) fseek(fp, curReadPt, SEEK_SET); view->SetSrc(imgInfo); - view->RequestFocus(); view->SetRotateEventFactor(data->crownRotateStep); // 0.2: rotate event factor view->SetRotateAnimatorValue(data->animatorRotateStep); // 0.1: rotate animator value - view->StartRotateAnimator(); dialGroup_->AddView(view); UIFree(data);