From: Caisking Date: Mon, 26 May 2025 08:01:34 +0000 (+0800) Subject: patch_gui_0423_0515 合并 X-Git-Tag: leiniao_debug_1.0.0_20250922_020716~269^2~6 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F1790%2Fhead;p=mirrors%2FFD230.git patch_gui_0423_0515 合并 --- diff --git a/code/sdk/application/wearable/fd230/nativeapp/brandy-auto-ota-cli/libuikit_fwk.a b/code/sdk/application/wearable/fd230/nativeapp/brandy-auto-ota-cli/libuikit_fwk.a index c530718d4..f8834ae85 100644 Binary files a/code/sdk/application/wearable/fd230/nativeapp/brandy-auto-ota-cli/libuikit_fwk.a and b/code/sdk/application/wearable/fd230/nativeapp/brandy-auto-ota-cli/libuikit_fwk.a differ diff --git a/code/sdk/application/wearable/fd230/nativeapp/brandy-auto-ota-ser/libuikit_fwk.a b/code/sdk/application/wearable/fd230/nativeapp/brandy-auto-ota-ser/libuikit_fwk.a index 410571e58..9c513d8e2 100644 Binary files a/code/sdk/application/wearable/fd230/nativeapp/brandy-auto-ota-ser/libuikit_fwk.a and b/code/sdk/application/wearable/fd230/nativeapp/brandy-auto-ota-ser/libuikit_fwk.a differ diff --git a/code/sdk/application/wearable/fd230/nativeapp/brandy-native-js-fd230/libuikit_fwk.a b/code/sdk/application/wearable/fd230/nativeapp/brandy-native-js-fd230/libuikit_fwk.a index 55d73657a..b1ab9d2d0 100644 Binary files a/code/sdk/application/wearable/fd230/nativeapp/brandy-native-js-fd230/libuikit_fwk.a and b/code/sdk/application/wearable/fd230/nativeapp/brandy-native-js-fd230/libuikit_fwk.a differ diff --git a/code/sdk/application/wearable/fd230/nativeapp/brandy-native-js-xts/libuikit_fwk.a b/code/sdk/application/wearable/fd230/nativeapp/brandy-native-js-xts/libuikit_fwk.a index 55d73657a..b1ab9d2d0 100644 Binary files a/code/sdk/application/wearable/fd230/nativeapp/brandy-native-js-xts/libuikit_fwk.a and b/code/sdk/application/wearable/fd230/nativeapp/brandy-native-js-xts/libuikit_fwk.a differ diff --git a/code/sdk/application/wearable/fd230/nativeapp/brandy-native-js/libuikit_fwk.a b/code/sdk/application/wearable/fd230/nativeapp/brandy-native-js/libuikit_fwk.a index 55d73657a..b1ab9d2d0 100644 Binary files a/code/sdk/application/wearable/fd230/nativeapp/brandy-native-js/libuikit_fwk.a and b/code/sdk/application/wearable/fd230/nativeapp/brandy-native-js/libuikit_fwk.a differ diff --git a/code/sdk/application/wearable/fd230/nativeapp/brandy-xts/libuikit_fwk.a b/code/sdk/application/wearable/fd230/nativeapp/brandy-xts/libuikit_fwk.a index 2c30eba89..7864f090a 100644 Binary files a/code/sdk/application/wearable/fd230/nativeapp/brandy-xts/libuikit_fwk.a and b/code/sdk/application/wearable/fd230/nativeapp/brandy-xts/libuikit_fwk.a differ diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/DialBinParserV3.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/DialBinParserV3.h index 1d5e2ca9d..99d530e89 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/DialBinParserV3.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/DialBinParserV3.h @@ -8,10 +8,10 @@ #ifndef GRAPHIC_LITE_DIAL_BIN_PARSER_V3_H #define GRAPHIC_LITE_DIAL_BIN_PARSER_V3_H #include "DialBinParserManager.h" -#include "DialTimePublisher.h" +#include "DialModelTime.h" #include "components/ui_abstract_progress.h" #include "DialViewContainer.h" -#include "DialOHDataType.h" +#include "DialDataType.h" #include "DialOHSliceId.h" namespace OHOS { @@ -47,21 +47,21 @@ private: bool (DialBinParserV3::*funcArray_[DIAL_BIN_PARSER_FUNC_NUM])(ContainerInterface&); void AddToParentWithView(ContainerInterface &parent, uint8_t displayMode, UIView *view); void AddToParentWithDialView(ContainerInterface &parent, uint8_t displayMode, - DialView *view, DialOHDataType bindData, bool isPeriodic); + DialView *view, DialDataType bindData, bool isPeriodic); struct { uint8_t *viewType; uint8_t dialViewCount; FILE *file; uint8_t curIndex; } curViewType_; - bool ParseTimeIntervals(FILE* fp, uint8_t cnt, DialTimePublisher::TimeChangeListener *listener); + bool ParseTimeIntervals(FILE* fp, uint8_t cnt, TimeChangeListener *listener); bool ParseViewType(uint8_t *viewType, uint8_t dialViewCount, FILE *file); bool ParseContainerSubviews(DialViewContainer *container, uint8_t num); bool ParseOptionsSubviews(ContainerInterface &parent); DialViewGroup* dialGroup_ = nullptr; std::string file_; - uint32_t dirId_ = 0xfef << 20; // 20: offset + const uint32_t dirId_ = 0xfef << 20; // 20: offset uint32_t imageOffset_ = 0; DisplayState state_ = DisplayState::NORMAL; }; // class DialBinParserV3 diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialDataBase.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialDataBase.h index 4b0d0d400..3a5718a70 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialDataBase.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialDataBase.h @@ -1,13 +1,14 @@ #ifndef DIAL_DATA_BASE_H #define DIAL_DATA_BASE_H +#include "DialDataType.h" -enum class DialDataType { +enum class DialOldDataType { DATA_TYPE_FLOAT_BASE = 0, DATA_TYPE_STEPS, // 运动步数 DATA_TYPE_HEART_RATE, // 心率 DATA_TYPE_CALORIE, // 运动卡路里 DATA_TYPE_TEMPERATURE, // 温度 - DATA_TYPE_PM25, // PM2.5 + DATA_TYPE_PM25, // PM2.5 (目前没有映射 需要增加) DATA_TYPE_PRESSURE, // 压力 DATA_TYPE_AILTITUDE, // 海拔 DATA_TYPE_POWER, // 电量 @@ -25,7 +26,7 @@ enum class DialDataType { /* ------------------------------- 在下面增加新数据类型 ------------------------------- */ DATA_TYPE_CHARGE, // 充电状态 - DATA_TYPE_DIALPATH, // 表盘路径 + DATA_TYPE_DIALPATH, // 表盘路径 (目前没有映射 需要增加,但是该项 没有使用?) DATA_TYPE_SPO2, // 血氧 DATA_TYPE_DISTANCE, // 运动距离 DATA_TYPE_WEATHER, // 天气 @@ -42,15 +43,9 @@ enum class DialDataType { DATA_TYPE_STEPS_GOAL_INT, // 运动步数百分比 DATA_TYPE_CALORIE_GOAL_INT, // 运动卡路里目标百分比 - DATA_TYPE_SWIVEL_GEAR_ONE = 0x2000, //原sdk设置为20 太小了 - DATA_TYPE_SWIVEL_GEAR_TWO, - DATA_TYPE_SWIVEL_GEAR_THREE, - DATA_TYPE_SWIVEL_GEAR_FOUR, - DATA_TYPE_SWIVEL_GEAR_FIVE, - DATA_TYPE_SWIVEL_GEAR_SIX, - + DATA_TYPE_MULTI_FLOAT_BASE = 0x2fff, // 多个浮点数据类型基值 - DATA_TYPE_HOUR_MIN, // 时分 + DATA_TYPE_TEXT_BASE = 0x4fff, // 文本数据类型基值 DATA_TYPE_WEEK_STR, // 星期(string) @@ -69,4 +64,6 @@ enum class DialDataType { DATA_TYPE_MAX = 0x6000, // 数据类型的最大值 }; + +OHOS::DialDataType Convert2DataType(DialOldDataType dialData); #endif diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialDataType.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialDataType.h new file mode 100644 index 000000000..69784392b --- /dev/null +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialDataType.h @@ -0,0 +1,204 @@ +/* + * Copyright (c) CompanyNameMagicTag 2025. All rights reserved. + * Description: DialDataType + * Author: + * Create: 2025-02-15 + */ + +#ifndef DIAL_DATA_TYPE_H +#define DIAL_DATA_TYPE_H + +#include + +namespace OHOS { +enum class DialDataType : int16_t { + // 起始:单个浮点数据,OH标准协议部分,禁止改动,从0开始(包括0,二进制格式为:0000,xxxx,xxxx,xxxx) + DATA_TYPE_FLOAT_BASE = 0, + CLOCK = 1, //时钟 + CLOCK_HIGH = 2, //时钟高位 + CLOCK_LOW = 3, //时钟低位 + CLOCK_RATIO_12H = 4,//12小时制 + CLOCK_RATIO_24H = 5,//24小时制 + MINUTE_TIME = 6,//分钟 + MINUTE_HIGH = 7,//分钟高位 + MINUTE_LOW = 8,//分钟低位 + MINUTE_RATIO = 9,//分钟比例 + SECOND_TIME = 10,//秒 + SECOND_HIGH = 11,//秒高位 + SECOND_LOW = 12,//秒低位 + SECOND_RATIO = 13,//秒比例 + AM_PM = 14,//AM/PM + HOUR_FORMAT = 16,//小时格式 + PREV_HOUR = 17,//上一个小时 + NEXT_HOUR = 18,//下一个小时 + CLOCK_ANGLE = 19,//时钟角度 + MINUTE_ANGLE = 20,//分钟角度 + SECOND_ANGLE = 21,//秒角度 + MILLISECOND_ANGLE = 22,//毫秒角度 + PREV_SECOND = 25,//上一秒 + NEXT_SECOND = 26,//下一秒 + PREV_2_SECONDS = 27,//上2秒 + PREV_MINUTE = 28,//上一分钟 + NEXT_MINUTE = 29,//下一分钟 + DUAL_TIMEZONE_CLOCK = 30,//双时区时钟 + DUAL_TIMEZONE_CLOCK_HIGH = 31,//双时区时钟高位 + DUAL_TIMEZONE_CLOCK_LOW = 32,//双时区时钟低位 + DUAL_TIMEZONE_CLOCK_RATIO_12H = 33,//双时区12小时制 + DUAL_TIMEZONE_CLOCK_RATIO_24H = 34,//双时区24小时制 + DUAL_TIMEZONE_MINUTE = 35,//双时区分钟 + DUAL_TIMEZONE_MINUTE_HIGH = 36,//双时区分钟高位 + DUAL_TIMEZONE_MINUTE_LOW = 37,//双时区分钟低位 + DUAL_TIMEZONE_MINUTE_RATIO = 38,//双时区分钟比例 + DUAL_TIMEZONE_AMPM = 41,//双时区AM/PM + SUNRISE_SUNSET_IMAGE = 50,//日出日落图片 + SUNRISE_SUNSET_CLOCK_HIGH = 51,//日出日落时钟高位 + SUNRISE_SUNSET_CLOCK_LOW = 52,//日出日落时钟低位 + SUNRISE_SUNSET_MINUTE_HIGH = 53,//日出日落分钟高位 + SUNRISE_SUNSET_MINUTE_LOW = 54,//日出日落分钟低位 + DATE = 70,//日期 + DATE_HIGH = 71,//日期高位 + DATE_LOW = 72,//日期低位 + DATE_31_DAY_RATIO = 73,//日期31天比例 + YESTERDAY = 74,//昨天 + YESTERDAY_DATE_HIGH = 75,//昨天日期高位 + YESTERDAY_DATE_LOW = 76,//昨天日期低位 + TOMORROW = 77,//明天 + TOMORROW_DATE_HIGH = 78,//明天日期高位 + TOMORROW_DATE_LOW = 79,//明天日期低位 + MONTH_DATA = 80,//月份数据 + MONTH = 81,//月份 + WEEKDAY_DATA = 83, + WEEKDAY_RATIO = 84, + CHINESE_HOUR = 86, + MOON_PHASE = 87, + PREV_MONTH = 88, + NEXT_MONTH = 89, + SOLAR_YEAR = 240, + YEAR_ONES = 241, + YEAR_TENS = 242, + YEAR_HUNDREDS = 243, + YEAR_THOUSANDS = 244, + LUNAR_MONTH = 90, + LUNAR_DATE_HIGH = 91, + LUNAR_DATE_LOW = 92, + BATTERY = 100, + BATTERY_ENUM = 102, + BATTERY_STATUS_ENUM = 103, + BATTERY_LEVEL = 104, + CHARGING_STATUS = 105, + STEP_COUNT = 110, + STEP_ONES = 111, + STEP_TENS = 112, + STEP_HUNDREDS = 113, + STEP_THOUSANDS = 114, + STEP_TENS_OF_THOUSANDS = 115, + STEP_GOAL_PROGRESS = 116, + STEP_GOAL_PROGRESS_ENUM = 117, + CALORIE = 120, + CALORIE_RATIO = 121, + CALORIE_GOAL_PROGRESS_ENUM = 122, + HEART_RATE = 130, + MAX_HEART_RATE = 131, + MIN_HEART_RATE = 132, + HEART_RATE_ZONE = 133, + HEART_RATE_RATIO = 134, + STRESS_LEVEL = 140, + STRESS_RATIO = 141, + STRESS_LEVEL_TYPE = 142, + MODERATE_HIGH_INTENSITY_TIME = 150, + MODERATE_HIGH_INTENSITY_TIME_RATIO = 151, + STAND_COUNT = 152, + STAND_COUNT_RATIO = 153, + MAX_VO2 = 160, + MAX_VO2_RATIO = 161, + SLEEP_RATIO = 166, + SLEEP_GOAL_PROGRESS_ENUM = 167, + TEMPERATURE = 170, + MAX_TEMPERATURE = 171, + MIN_TEMPERATURE = 172, + CURRENT_TEMPERATURE_MINUS_1 = 173, + CURRENT_TEMPERATURE_PLUS_1 = 174, + TEMPERATURE_TYPE = 175, + WEATHER_TYPE = 176, + TEMPERATURE_RATIO = 177, + PRESSURE = 180, + PRESSURE_RATIO = 181, + AQI = 182, + AQI_LEVEL = 183, + AQI_RATIO = 184, + ALTITUDE_DATA = 191, + ALTITUDE_UNIT = 192, + ALTITUDE_RATIO = 193, + DISTANCE_DATA = 195, + DISTANCE_UNIT = 196, + DISTANCE_GOAL_PROGRESS = 197, + BLE_CONNECTION_STATUS = 210, + BT_CONNECTION_STATUS = 211, + BLOOD_OXYGEN = 220, + SYSTOLIC_BLOOD_PRESSURE = 221, + DIASTOLIC_BLOOD_PRESSURE = 222, + DUAL_LANGUAGE_SYSTEM = 230, + UNREAD_SMS_MSG = 250, + UNREAD_WECHAT_MSG = 251, + // 结束:单个浮点数据,OH标准协议部分,禁止改动,到4095结束(包括4095) + + + // 起始:单个浮点数据,私有可定制部分,从4096开始(包括4096,二进制格式为:0001,xxxx,xxxx,xxxx) + DATA_TYPE_FLOAT_CUSTOM_BASE = 4096, + PM25 = 4097, // PM2.5 + POWER_STANDBY, // 备用电量 + WEEK_NUM, // 星期(数字) + STEPS_GOAL_BOXPROGRESS,//步数目标进度条映射? + CALORIE_GOAL_BOXPROGRESS,//卡路里目标进度条映射? + + SWIVEL_GEAR_POSITIVE = 8190, // private data, clockwise + SWIVEL_GEAR_NEGATIVE = 8191, // counterclockwise + // 结束:单个浮点数据,私有可定制部分,到8191结束(包括8191) + + // 起始:文本数据,OH标准协议部分,禁止改动,从8192开始(包括8192,二进制格式为:0010,xxxx,xxxx,xxxx) + DATA_TYPE_TEXT_BASE = 8192, + AM_PM_TEXT = 8193, + SUNRISE_TEXT = 8210, + SUNSET_TEXT = 8211, + MOONRISE_TEXT = 8221, + MOONSET_TEXT = 8222, + DUAL_TIMEZONE_ABBR_TEXT = 8200, + DUAL_TIMEZONE_TIME_TEXT = 8201, + DUAL_TIMEZONE_AM_PM_TEXT = 8202, + MONTH_TEXT = 8230, + DATE_TEXT = 8231, + WEEKDAY_TEXT = 8232, + LUNAR_YEAR = 8240, + SLEEP_TEXT = 8250, + DISTANCE_TEXT = 8260, + TIDE_RISE_TIME_TEXT = 8270, + TIDE_FALL_TIME_TEXT = 8271, + // 结束:文本数据,OH标准协议部分,禁止改动,到12287结束(包括12287) + + // 文本数据,私有可定制部分,从12288开始(包括12288,二进制格式为:0011,xxxx,xxxx,xxxx) + DATA_TYPE_TEXT_CUSTOM_BASE = 12288, + WEEK_STR = 12289, // 星期(string) + DATE_STR = 12290, // 日期(string) + WEATHER_STR = 12291, // 天气(string) + TIMESTR_STR = 12292, // 时间(string) + DATE_WEEK_STR = 12293, // 日期(年月日)星期(string) + POWER_STR = 12294, // 电量(string) + DATE_WEEK_MD_STR = 12295, // 星期(月日)和日期(string) + DATE_EN_STR = 12296, // 月份+日期 (英文) + WEEK_EN_STR = 12297, // 星期(英文) + STEPS_GOAL_STR = 12298, // 运动步数目标(string) + CALORIE_GOAL_STR = 12299, // 卡路里目标(string) + // 文本数据,私有可定制部分,到16383结束(包括16383) + + // 起始:多个浮点数据,OH标准协议部分,禁止改动,从16384开始(包括16384,二进制格式为:0100,xxxx,xxxx,xxxx) + DATA_TYPE_MULTI_FLOAT_BASE = 16384, + // 结束:多个浮点数据,OH标准协议部分,禁止改动,到20479结束(包括20479) + + // 起始:多个浮点数据,私有可定制部分,从20480开始(包括20480,二进制格式为:0101,xxxx,xxxx,xxxx) + // 结束:多个浮点数据,私有可定制部分,到24575结束(包括24575) + + DATA_TYPE_MAX = 0x6000, +}; // enum class DialDataType +} // namespace OHOS + +#endif // DIAL_DATA_TYPE_H diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialDigitalImgView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialDigitalImgView.h index 5b3249662..540c491b5 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialDigitalImgView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialDigitalImgView.h @@ -7,7 +7,7 @@ #include #include "DialView.h" -#include "DialTimePublisher.h" +#include "DialModelTime.h" #include "components/ui_image_view.h" #include "gfx_utils/graphic_math.h" #include "components/ui_view_group.h" @@ -20,7 +20,7 @@ enum class ImgAlign { RIGHT, }; -class DialDigitalImgView : public UIImageView, public DialView, public DialTimePublisher::TimeChangeListener { +class DialDigitalImgView : public UIImageView, public DialView, public TimeChangeListener { public: DialDigitalImgView(); ~DialDigitalImgView() override; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialModelHourMin.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialModelHourMin.h deleted file mode 100644 index d28ed1d1c..000000000 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialModelHourMin.h +++ /dev/null @@ -1,29 +0,0 @@ - -#ifndef DIAL_MODEL_HourMin_H -#define DIAL_MODEL_HourMin_H - -#include "DialBaseModel.h" -#include -#include -#include - -namespace OHOS -{ - class DialModelHourMin : public DialBaseModel - { - public: - DialModelHourMin() {} - virtual ~DialModelHourMin() {} - static DialModelHourMin *GetInstance() - { - static DialModelHourMin instance; - return &instance; - } - bool GetDialFloatData(DialDataType &type, float *&out, int16_t len) override; - void UpdateHourMin(const std::string *&dialHourMin); - - private: - float dialhourmin{2}; - }; -} -#endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialModelPath.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialModelPath.h deleted file mode 100644 index 0291902fd..000000000 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialModelPath.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef DIAL_MODEL_PATH_H -#define DIAL_MODEL_PATH_H - -#include "DialBaseModel.h" -#include -#include - -namespace OHOS -{ - class DialModelPath : public DialBaseModel - { - public: - DialModelPath() {} - virtual ~DialModelPath() {} - static DialModelPath *GetInstance() - { - static DialModelPath instance; - return &instance; - } - bool GetDialTextData(DialDataType &type, std::string *&out, int16_t &strNum) override; - void UpdatePath(const std::string *&DialPath); - - private: - std::string DialPath_ = "/user/res/dials/dog.bin"; - }; -} -#endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialModelTime.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialModelTime.h index 43cd8b08d..d71982f5f 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialModelTime.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialModelTime.h @@ -9,31 +9,30 @@ #define DIAL_MODEL_TIME_H #include "DialBaseModel.h" -#include "DialTimePublisher.h" #include "gfx_utils/list.h" namespace OHOS { -class DialModelTime : public DialBaseModel, public DialTimePublisher { +class TimeChangeListener; +class DialModelTime : public DialBaseModel { public: - DialModelTime() - { - DialModelTime::SetPublisher(dynamic_cast(this)); - } ~DialModelTime() override { listeners_.Clear(); } + static DialModelTime* GetInstance() { static DialModelTime instance; return &instance; } + bool GetDialFloatData(DialDataType& type, float& out) override; - void UpdateTime() override; - void Register(TimeChangeListener* listener) override; - void Unregister(TimeChangeListener* listener) override; + void UpdateTime(); + void Register(TimeChangeListener* listener); + void Unregister(TimeChangeListener* listener); private: + DialModelTime() = default; struct tm *tblock_; uint16_t angleH_ = 0; uint16_t angleM_ = 0; @@ -41,5 +40,23 @@ private: float angleMS_ = 0; List listeners_; }; -} + +class TimeChangeListener { +public: + struct TimeInterval { + uint8_t start; + uint8_t end; + }; + virtual void OnTimeUpdate(const struct tm &curTime) = 0; + void SetTimeInervals(TimeInterval *intervals, uint8_t num); + bool IsInTimeInterval(const struct tm &curTime); + TimeChangeListener(const TimeChangeListener&) = delete; + TimeChangeListener& operator=(const TimeChangeListener&) = delete; + TimeChangeListener(); + virtual ~TimeChangeListener(); +private: + TimeInterval *intervals_ = nullptr; + uint8_t num_ = 0; +}; +} // namespace OHOS #endif diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialOHDataType.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialOHDataType.h deleted file mode 100644 index 83f8f0fc8..000000000 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialOHDataType.h +++ /dev/null @@ -1,189 +0,0 @@ -/* - * Copyright (c) CompanyNameMagicTag 2025. All rights reserved. - * Description: DialOHDataType - * Author: - * Create: 2025-02-15 - */ - -#ifndef DIAL_OH_DATATYPE_H -#define DIAL_OH_DATATYPE_H - -#include -#include "DialDataBase.h" - -namespace OHOS { -enum class DialOHDataType : int16_t { - CLOCK = 1, - CLOCK_HIGH_BIT = 2, - CLOCK_LOW_BIT = 3, - CLOCK_RATIO_12 = 4, - CLOCK_RATIO_24 = 5, - MINUTES = 6, - MINUTES_HIGH_BIT = 7, - MINUTES_LOW_BIT = 8, - MINUTES_RATIO = 9, - SECONDS = 10, - SECONDS_HIGH_BIT = 11, - SECONDS_LOW_BIT = 12, - SECONDS_RATIO = 13, - AM_PM = 14, - AMPM_TEXT = 15, - HOUR_MODE = 16, - PREVIOUS_HOUR = 17, - NEXT_HOUR = 18, - CLOCK_ANGLE = 19, - MINUTE_ANGLE = 20, - SECONDS_ANGLE = 21, - MILLISECOND_ANGLE = 22, - PREVIOUS_SECOND = 25, - NEXT_SECOND = 26, - PREVIOUS_SECOND_PREVIOUS_SECOND = 27, - PREVIOUS_MINUTE = 28, - NEXT_MINUTE = 29, - DUAL_TIME_ZONE_CLOCK = 30, - DUAL_TIME_ZONE_CLOCK_HIGH_BIT = 31, - DUAL_TIME_ZONE_CLOCK_LOW_BIT = 32, - DUAL_TIME_ZONE_CLOCK_RATIO_12 = 33, - DUAL_TIME_ZONE_CLOCK_RATIO_24 = 34, - DUAL_TIME_ZONE_MINUTES = 35, - DUAL_TIME_ZONE_MINUTES_HIGH_BIT = 36, - DUAL_TIME_ZONE_MINUTES_LOW_BIT = 37, - DUAL_TIME_ZONE_MINUTES_RATIO = 38, - DUAL_TIME_ZONE_ABBREVIATION_TEXT = 39, - DUAL_TIME_ZONE_TIME_MINUTE_TEXT = 40, - DUAL_TIME_ZONE_AMPM = 41, - DUAL_TIME_ZONE_AM_PM_TEXT = 42, - SUNRISE_SUNSET_PICTURE_SELECTION = 50, - SUNRISE_SUNSET_CLOCK_HIGH_BIT = 51, - SUNRISE_SUNSET_CLOCK_LOW_BIT = 52, - SUNRISE_SUNSET_MINUTES_HIGH_BIT = 53, - SUNRISE_SUNSET_MINUTES_LOW_BIT = 54, - SUNRISE_TEXT = 55, - SUNSET_TEXT = 56, - MOONRISE_TEXT = 60, - MOONSET_TEXT = 61, - DATE = 70, - DATE_HIGH_BIT = 71, - DATE_LOW_BIT = 72, - DATE_OCCUPIES_31_DAYS_RATIO = 73, - YESTERDAY = 74, - YESTERDAY_DATE_HIGH_BIT = 75, - YESTERDAY_DATE_LOW_BIT = 76, - TOMORROW = 77, - TOMORROW_DATE_HIGH_BIT = 78, - TOMORROW_DATE_LOW_BIT = 79, - MONTH_DATA = 80, - MONTH = 81, - MONTH_TEXT = 82, - WEEK_DATA = 83, - WEEK_RATIO = 84, - WEEK_TEXT = 85, - TWELVE_DIVISIONS = 86, - LUNAR_PHASE = 87, - PREVIOUS_MONTH = 88, - NEXT_MONTH = 89, - LUNAR_MONTH = 90, - LUNAR_DATE_HIGH_BIT = 91, - LUNAR_DATE_LOW_BIT = 92, - CHARGE = 100, - CHARGE_ENUMERATION = 102, - CHARGE_STATUS_ENUMERATION = 103, - CHARGE_RATIO = 104, - CHARGING_STATUS = 105, - STEPS = 110, - STEPS_UNIT_DIGIT = 111, - STEPS_TENS_DIGIT = 112, - STEPS_HUNDRED_DIGIT = 113, - STEPS_THOUSAND_DIGIT = 114, - STEPS_TEN_THOUSAND_DIGIT = 115, - STEPS_TARGET_ACHIEVEMENT_RATE = 116, - STEPS_TARGET_PROGRESS_ENUMERATION = 117, - CALORIES = 120, - CALORIES_RATIO = 121, - CALORIES_TARGET_PROGRESS_ENUMERATION = 122, - HEART_RATE = 130, - MAXIMUM_HEART_RATE = 131, - MINIMUM_HEART_RATE = 132, - HEART_RATE_RANGE = 133, - HEART_RATE_RATIO = 134, - STRESS = 140, - STRESS_RATIO = 141, - STRESS_LEVEL_TYPE = 142, - MODERATE_TO_VIGOROUS_INTENSITY_TIME = 150, - MODERATE_TO_VIGOROUS_INTENSITY_TIME_RATIO = 151, - STANDING_TIMES = 152, - STANDING_TIMES_RATIO = 153, - MAXIMUM_OXYGEN_UPTAKE = 160, - MAXIMUM_OXYGEN_UPTAKE_RATIO = 161, - SLEEP_TEXT = 165, - SLEEP_RATIO = 166, - SLEEP_TARGET_ACHIEVEMENT_RATE_ENUMERATION = 167, - TEMPERATURE = 170, - HIGHEST_TEMPERATURE = 171, - LOWEST_TEMPERATURE = 172, - CURRENT_TEMPERATURE_MINUS_ONE = 173, - CURRENT_TEMPERATURE_PLUS_ONE = 174, - TEMPERATURE_TYPE = 175, - WEATHER_TYPE = 176, - TEMPERATURE_RATIO = 177, - ATMOSPHERIC_PRESSURE = 180, - ATMOSPHERIC_PRESSURE_RATIO = 181, - AIR_QUALITY_INDEX = 182, - AIR_QUALITY_INDEX_LEVEL = 183, - AIR_QUALITY_INDEX_RATIO = 184, - ELEVATION = 190, - ELEVATION_HEIGHT_DATA = 191, - ELEVATION_HEIGHT_UNIT = 192, - HEIGHT_RATIO = 193, - DISTANCE_TEXT = 194, - DISTANCE_DATA = 195, - DISTANCE_UNIT = 196, - DISTANCE_TARGET_PROGRESS = 197, - HIGH_TIDE_TIME_TEXT = 200, - LOW_TIDE_TIME_TEXT = 201, - BLE_CONNECTION_STATUS = 210, - BT_CONNECTION_STATUS = 211, - BLOOD_OXYGEN = 220, - SYSTOLIC_BLOOD_PRESSURE = 221, - DIASTOLIC_BLOOD_PRESSURE = 222, - DUAL_LANGUAGE_SYSTEM = 230, - SWIVEL_GEAR_POSITIVE = (1 << 12) + 20, // private data, clockwise - SWIVEL_GEAR_NEGATIVE, // counterclockwise -}; // enum class DialOHDataType - -struct HashOHDataType { - size_t operator()(DialOHDataType data) const - { - return std::hash()(static_cast(data)); - } -}; - -const std::unordered_map g_bindDataConverter = { - {DialOHDataType::CLOCK, DialDataType::DATA_TYPE_TIME_HOUR}, - {DialOHDataType::MINUTES, DialDataType::DATA_TYPE_TIME_MINUTE}, - {DialOHDataType::SECONDS, DialDataType::DATA_TYPE_TIME_SECOND}, - {DialOHDataType::MILLISECOND_ANGLE, DialDataType::DATA_TYPE_CLOCK_ANGLE_MS}, - {DialOHDataType::DATE, DialDataType::DATA_TYPE_TIME_DATE}, - {DialOHDataType::WEEK_DATA, DialDataType::DATA_TYPE_TIME_WEEK}, - {DialOHDataType::CHARGE, DialDataType::DATA_TYPE_POWER}, - {DialOHDataType::STEPS, DialDataType::DATA_TYPE_STEPS}, - {DialOHDataType::CALORIES, DialDataType::DATA_TYPE_CALORIE}, - {DialOHDataType::HEART_RATE, DialDataType::DATA_TYPE_HEART_RATE}, - {DialOHDataType::STRESS, DialDataType::DATA_TYPE_PRESSURE}, - {DialOHDataType::TEMPERATURE, DialDataType::DATA_TYPE_TEMPERATURE}, - {DialOHDataType::ELEVATION, DialDataType::DATA_TYPE_AILTITUDE}, - {DialOHDataType::AIR_QUALITY_INDEX, DialDataType::DATA_TYPE_PM25}, - {DialOHDataType::CLOCK_ANGLE, DialDataType::DATA_TYPE_CLOCK_ANGLE_H}, - {DialOHDataType::MINUTE_ANGLE, DialDataType::DATA_TYPE_CLOCK_ANGLE_M}, - {DialOHDataType::SECONDS_ANGLE, DialDataType::DATA_TYPE_CLOCK_ANGLE_S}, - {DialOHDataType::MONTH, DialDataType::DATA_TYPE_TIME_MONTH}, - {DialOHDataType::SWIVEL_GEAR_POSITIVE, DialDataType::DATA_TYPE_SWIVEL_GEAR_ONE}, - {DialOHDataType::SWIVEL_GEAR_POSITIVE, DialDataType::DATA_TYPE_SWIVEL_GEAR_FOUR}, - {DialOHDataType::SWIVEL_GEAR_POSITIVE, DialDataType::DATA_TYPE_SWIVEL_GEAR_SIX}, - {DialOHDataType::SWIVEL_GEAR_NEGATIVE, DialDataType::DATA_TYPE_SWIVEL_GEAR_TWO}, - {DialOHDataType::SWIVEL_GEAR_NEGATIVE, DialDataType::DATA_TYPE_SWIVEL_GEAR_THREE}, - {DialOHDataType::SWIVEL_GEAR_NEGATIVE, DialDataType::DATA_TYPE_SWIVEL_GEAR_FIVE}, -}; -} // namespace OHOS - -#endif // DIAL_OH_DATATYPE_H diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialOptionImgView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialOptionImgView.h index dd08a9d6b..52e4298c2 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialOptionImgView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialOptionImgView.h @@ -7,7 +7,7 @@ #include #include "DialView.h" -#include "DialTimePublisher.h" +#include "DialModelTime.h" #include "components/ui_image_view.h" #include "font/font_global_manager.h" @@ -16,7 +16,7 @@ namespace OHOS { class DialOptionImgView : public UIImageView, public DialView, public FontGlobalManager::LangChangeListener, - public DialTimePublisher::TimeChangeListener { + public TimeChangeListener { public: DialOptionImgView(); ~DialOptionImgView() override; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialSequenceContainer.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialSequenceContainer.h deleted file mode 100644 index f692d1f3b..000000000 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialSequenceContainer.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) CompanyNameMagicTag 2025. All rights reserved. - * Description: DialSequenceContainer - * Author: - * Create: 2025-03-05 - */ - -#ifndef DIAL_SEQUENCE_CONTAINER_H -#define DIAL_SEQUENCE_CONTAINER_H -#include "components/ui_view_group.h" -#include "components/ui_image_animator.h" - -namespace OHOS { -class DialSequenceContainer : public UIViewGroup, public UIImageAnimatorView::AnimatorStopListener { -public: - DialSequenceContainer(); - ~DialSequenceContainer() override; - DialSequenceContainer(const DialSequenceContainer&) = delete; - DialSequenceContainer& operator=(const DialSequenceContainer&) = delete; - bool AddSequenceRes(uint16_t interval, bool repeat, const ImageAnimatorInfo *imgSrc, uint8_t imgNum); - bool OnClickEvent(const ClickEvent& event) override; - void Start(); - void Stop(); - void Pause(); - void Resume(); - void OnAnimatorStop(UIView& view) override; - -private: - void UpdateCurrentView(); - UIImageAnimatorView *repeatView_ = nullptr; - UIImageAnimatorView *nonCycleView_[3]; // 3: max seqImg num - // if curView_ is not null, curView_ must be added into parent. - UIImageAnimatorView *curView_ = nullptr; - uint8_t nonCycleNum_ = 0; - uint8_t loop_ = 0; - bool isClick_ = false; -}; // class DialSequenceContainer -} // namespace OHOS -#endif // DIAL_SEQUENCE_CONTAINER_H \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialSequenceImgView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialSequenceImgView.h index 4800b71b9..3f5b92fb9 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialSequenceImgView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialSequenceImgView.h @@ -8,17 +8,54 @@ #include "components/ui_image_animator.h" namespace OHOS { +struct SequenceInfo : public HeapBase { + long imgOffset = 0; + long resPos = 0; + uint8_t imgNum = 0; + FILE *fp = nullptr; + std::string fileName; + uint16_t interval = 0; + bool repeat = false; +}; -class DialSequenceImgView : public UIImageAnimatorView { +class DialSequenceImgView : public UIImageAnimatorView, public UIImageAnimatorView::AnimatorStopListener { public: DialSequenceImgView(); ~DialSequenceImgView() override; - bool SetSequenceRes(const ImageAnimatorInfo* imgSrc, uint8_t imgNum); + bool SetSequenceRes(const ImageAnimatorInfo *imgSrc, uint8_t imgNum); + bool SetPreviewImg(); + bool LoadCurSeqImgs(); + bool AddSequenceRes(const SequenceInfo ¶); + bool OnClickEvent(const ClickEvent &event) override; + void OnAnimatorStop(UIView &view) override; private: - ImageAnimatorInfo* imgSrc_ = nullptr; - uint8_t imgNum_ = 0; + ImageAnimatorInfo *LoadImgs(const SequenceInfo ¶, uint8_t num) const; + void UpdateCurrentSeq(); + struct AnimatorInfo : public HeapBase { + SequenceInfo info; + ImageAnimatorInfo *imgs = nullptr; + uint8_t num = 0; + ~AnimatorInfo() + { + if (imgs != nullptr) { + UIFree(imgs); + imgs = nullptr; + num = 0; + } + } + }; + void SetAnimatorInfo(AnimatorInfo *info, uint8_t num); + static constexpr uint8_t SEQ_IMG_NUM = 3; + AnimatorInfo *repeatSeq_ = nullptr; + AnimatorInfo *nonCycleSeq_[SEQ_IMG_NUM]; + AnimatorInfo *curSeq_ = nullptr; + uint8_t nonCycleNum_ = 0; + uint8_t loop_ = 0; + bool isClick_ = false; + uint8_t viewNum_ = 0; + bool isAllImgLoaded_ = false; }; -} +} // namespace OHOS #endif diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialStaticImgView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialStaticImgView.h index 733c5ed7a..df8f2810c 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialStaticImgView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialStaticImgView.h @@ -7,12 +7,12 @@ #include "components/ui_image_view.h" #include "font/font_global_manager.h" -#include "DialTimePublisher.h" +#include "DialModelTime.h" namespace OHOS { class DialStaticImgView : public UIImageView, public FontGlobalManager::LangChangeListener, - public DialTimePublisher::TimeChangeListener { + public TimeChangeListener { public: DialStaticImgView(); ~DialStaticImgView() override; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialTimePublisher.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialTimePublisher.h deleted file mode 100644 index fcdb80cb3..000000000 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialTimePublisher.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) CompanyNameMagicTag 2025. All rights reserved. - * Description: DialTimePublisher - * Author: - * Create: 2025-03-04 - */ - -#ifndef DIAL_TIME_PUBLISHER_H -#define DIAL_TIME_PUBLISHER_H -#include -#include - -namespace OHOS { -class DialTimePublisher { -public: - struct TimeInterval { - uint8_t start; - uint8_t end; - }; - class TimeChangeListener { - public: - virtual void OnTimeUpdate(const struct tm &curTime) = 0; - void SetTimeInervals(TimeInterval *intervals, uint8_t num); - bool IsInTimeInterval(const struct tm &curTime); - TimeChangeListener(const TimeChangeListener&) = delete; - TimeChangeListener& operator=(const TimeChangeListener&) = delete; - TimeChangeListener(); - virtual ~TimeChangeListener(); - private: - TimeInterval *intervals_ = nullptr; - uint8_t num_ = 0; - }; - - virtual void Register(TimeChangeListener *listener) = 0; - virtual void Unregister(TimeChangeListener *listener) = 0; - virtual void UpdateTime() = 0; - static void SetPublisher(DialTimePublisher *publisher); - static DialTimePublisher *GetPublisher(); - virtual ~DialTimePublisher() {} - -private: - static DialTimePublisher *publisher_; -}; // class DialTimePublisher -} // namespace OHOS -#endif // DIAL_TIME_PUBLISHER_H \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialView.h index 300f7a0b4..3155d760a 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialView.h @@ -7,6 +7,7 @@ #include #include +#include "DialDataType.h" namespace OHOS { @@ -18,6 +19,18 @@ public: virtual void HandleFloatData(float data) {} virtual void HandleFloatData(const float* data, uint16_t num) {} virtual void HandleTextData(const std::string* data, uint16_t num) {} + virtual DialDataType GetDataType() + { + return type_; + } + + virtual void SetDataType(DialDataType type) + { + type_ = type; + } + +private: + DialDataType type_ = DialDataType::DATA_TYPE_MAX; }; } #endif diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialViewGroup.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialViewGroup.h index 92b014ec2..3b4aec3c7 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialViewGroup.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialViewGroup.h @@ -6,6 +6,7 @@ #define DIAL_VIEW_GROUP_H #include +#include #include "DialDataBase.h" #include "components/ui_view_group.h" #include "components/ui_image_animator.h" @@ -19,7 +20,6 @@ #include "DialVideoView.h" #include "DialBinTypesV2.h" #include "DialViewContainer.h" -#include "DialSequenceContainer.h" namespace OHOS { class DialViewGroup : public UICardPage, public OnDialDataUpdateListener, public ContainerInterface { @@ -190,7 +190,8 @@ private: void SetImgAnimatorState(uint8_t state); List rollingLabelList_; List imgAnimList_; - List seqList_; + bool isSeqImgLoaded_ = false; + std::shared_ptr isExists_; }; } #endif diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/ModelDialDataFactory.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/ModelDialDataFactory.h index 30c1d1c31..33bedbe49 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/ModelDialDataFactory.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/ModelDialDataFactory.h @@ -11,7 +11,6 @@ #include #include "DialBaseModel.h" #include "DialDataBase.h" -#include "DialOHDataType.h" #include "ModelDialDataFactory.h" namespace OHOS { @@ -31,8 +30,6 @@ public: models_[static_cast(type)] = model; } - bool IsOHBindDataExist(DialOHDataType type) const; - bool IsBindDataExist(DialDataType type) const; bool RegisterDialDataListener(DialDataType type, OnDialDataUpdateListener* listener); bool UnRegisterDialDataListener(DialDataType type); bool GetDialTextData(DialDataType& type, std::string*& out, int16_t& strNum); diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainPresenterSample.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainPresenterSample.cpp index 2fab9cb11..7a36adf41 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainPresenterSample.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainPresenterSample.cpp @@ -11,6 +11,7 @@ #include "PlayersModel.h" #include "PlayersPresenter.h" #include "CompassPresenter.h" +#include "NativeRegisterManager.h" #include "compass/include/CompassModel.h" #include "CompassCalibrationView.h" #include "drag_event.h" @@ -112,6 +113,11 @@ REGIST_SLICE(VIEW_MAIN, MainViewSample, MainPresenterSample); PageTransitionMgr::GetInstance().SaveSlideBackSnapShotIfNecessary(watchFace); watchFace->SetOpaScale(opaScale); + uint8_t curCardId = view_->GetHorCurrentCard(); + UICardPage *card = view_->GetViewById(curCardId); + if (card != nullptr) { + card->OnPause(); + } mainPresenterState_ = MainPresenterState::PAUSE; //进行视频表盘的暂停 @@ -263,46 +269,25 @@ if (ConfigModel::GetInstance()->GetisFirstTimeStart() == true) { void MainPresenterSample::SetTaskPeroid(CardId cardId) { - if (cardId == COMPASS) - { + SetLastRun(0); // refresh entering card in time + if (cardId == COMPASS) { SetPeriod(DEFAULT_TASK_PERIOD); - } - else if (cardId == WATCH_FACE) - { + } else if (cardId == WATCH_FACE) { uint32_t time; DialSetting &setting = GetDialSetting(); - if (setting.dialFlag) - { - time = dynamic_cast(view_->GetViewById(WATCH_FACE))->GetPeriod(); - } - else - { + if (setting.dialFlag) { + time = dynamic_cast(view_->GetViewById(WATCH_FACE))->GetPeriod(); + } else { time = DEFAULT_TASK_PERIOD; } SetPeriod(time); - } - else if (cardId == MUSIC_PLAYER) - { + } else if (cardId == MUSIC_PLAYER) { SetPeriod(PLAYER_PERIOD); - } - else - { + } else { SetPeriod(MAX_PERIOD); } } - void MainPresenterSample::ResetgoalCardView() - { - if(goalControlView::GetInstance()) - { - auto goalSwipView = goalControlView::GetInstance()->GetGoalControlSwipView(); - if (goalSwipView->GetCurrentPage() != 0) - { - goalSwipView->SetCurrentPage(0); - } - } - } - void MainPresenterSample::OnSwipe(UISwipeView &view) { // UNUSED(view); @@ -533,6 +518,18 @@ if (ConfigModel::GetInstance()->GetisFirstTimeStart() == true) { } } } + /*末日目标*/ + void MainPresenterSample::ResetgoalCardView() + { + if(goalControlView::GetInstance()) + { + auto goalSwipView = goalControlView::GetInstance()->GetGoalControlSwipView(); + if (goalSwipView->GetCurrentPage() != 0) + { + goalSwipView->SetCurrentPage(0); + } + } + } /*心率卡片*/ diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialDataBase.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialDataBase.cpp new file mode 100644 index 000000000..e75718ef0 --- /dev/null +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialDataBase.cpp @@ -0,0 +1,77 @@ +/* + * Copyright (c) CompanyNameMagicTag 2025. All rights reserved. + * Description: DialDataBase + * Author: + * Create: 2025-04-08 + */ + +#include +#include "dial/DialDataBase.h" + +namespace { +struct DataTypeHash { + size_t operator()(const DialOldDataType &data) const + { + return std::hash{}(static_cast(data)); + } +}; + +static std::unordered_map g_data2std = { + {DialOldDataType::DATA_TYPE_STEPS, OHOS::DialDataType::STEP_COUNT}, + {DialOldDataType::DATA_TYPE_HEART_RATE, OHOS::DialDataType::HEART_RATE}, + {DialOldDataType::DATA_TYPE_POWER, OHOS::DialDataType::BATTERY}, + {DialOldDataType::DATA_TYPE_CLOCK_ANGLE_H, OHOS::DialDataType::CLOCK_ANGLE}, + {DialOldDataType::DATA_TYPE_CLOCK_ANGLE_M, OHOS::DialDataType::MINUTE_ANGLE}, + {DialOldDataType::DATA_TYPE_CLOCK_ANGLE_S, OHOS::DialDataType::SECOND_ANGLE}, + {DialOldDataType::DATA_TYPE_CLOCK_ANGLE_MS, OHOS::DialDataType::MILLISECOND_ANGLE}, + {DialOldDataType::DATA_TYPE_TIME_SECOND, OHOS::DialDataType::SECOND_TIME}, + {DialOldDataType::DATA_TYPE_TIME_MINUTE, OHOS::DialDataType::MINUTE_TIME}, + {DialOldDataType::DATA_TYPE_TIME_HOUR, OHOS::DialDataType::CLOCK}, + {DialOldDataType::DATA_TYPE_TIME_DATE, OHOS::DialDataType::DATE}, + {DialOldDataType::DATA_TYPE_TIME_WEEK, OHOS::DialDataType::WEEKDAY_DATA}, + {DialOldDataType::DATA_TYPE_TIME_MONTH, OHOS::DialDataType::MONTH}, + {DialOldDataType::DATA_TYPE_TIME_YEAR, OHOS::DialDataType::SOLAR_YEAR}, + /*适配oldtype*/ + {DialOldDataType::DATA_TYPE_CALORIE, OHOS::DialDataType::CALORIE}, + {DialOldDataType::DATA_TYPE_TEMPERATURE, OHOS::DialDataType::TEMPERATURE}, + {DialOldDataType::DATA_TYPE_PM25, OHOS::DialDataType::PM25}, + {DialOldDataType::DATA_TYPE_PRESSURE, OHOS::DialDataType::PRESSURE}, + {DialOldDataType::DATA_TYPE_AILTITUDE, OHOS::DialDataType::ALTITUDE_DATA}, + {DialOldDataType::DATA_TYPE_CHARGE, OHOS::DialDataType::CHARGING_STATUS}, + {DialOldDataType::DATA_TYPE_SPO2, OHOS::DialDataType::BLOOD_OXYGEN}, + {DialOldDataType::DATA_TYPE_DISTANCE, OHOS::DialDataType::DISTANCE_DATA}, + {DialOldDataType::DATA_TYPE_WEATHER, OHOS::DialDataType::WEATHER_TYPE}, + {DialOldDataType::DATA_TYPE_POWER_STANDBY, OHOS::DialDataType::POWER_STANDBY}, + {DialOldDataType::DATA_TYPE_HOUR_TENS, OHOS::DialDataType::CLOCK_HIGH}, + {DialOldDataType::DATA_TYPE_HOUR_UNITS, OHOS::DialDataType::CLOCK_LOW}, + {DialOldDataType::DATA_TYPE_MINUTE_TENS, OHOS::DialDataType::MINUTE_HIGH}, + {DialOldDataType::DATA_TYPE_MINUTE_UNITS, OHOS::DialDataType::MINUTE_LOW}, + {DialOldDataType::DATA_TYPE_WEEK_NUM, OHOS::DialDataType::WEEK_NUM}, + {DialOldDataType::DATA_TYPE_STEPS_GOAL, OHOS::DialDataType::STEPS_GOAL_BOXPROGRESS}, + {DialOldDataType::DATA_TYPE_SECOND_MAPPER, OHOS::DialDataType::SECOND_RATIO}, + {DialOldDataType::DATA_TYPE_POWER_MAPPER, OHOS::DialDataType::BATTERY_LEVEL}, + {DialOldDataType::DATA_TYPE_CALORIE_GOAL, OHOS::DialDataType::CALORIE_GOAL_BOXPROGRESS}, + {DialOldDataType::DATA_TYPE_STEPS_GOAL_INT, OHOS::DialDataType::STEP_GOAL_PROGRESS}, + {DialOldDataType::DATA_TYPE_CALORIE_GOAL_INT, OHOS::DialDataType::CALORIE_RATIO}, + {DialOldDataType::DATA_TYPE_WEEK_STR, OHOS::DialDataType::WEEK_STR}, + {DialOldDataType::DATA_TYPE_DATE_STR, OHOS::DialDataType::DATE_STR}, + {DialOldDataType::DATA_TYPE_WEATHER_STR, OHOS::DialDataType::WEATHER_STR}, + {DialOldDataType::DATA_TYPE_TIMESTR_STR, OHOS::DialDataType::TIMESTR_STR}, + {DialOldDataType::DATA_TYPE_DATE_WEEK_STR, OHOS::DialDataType::DATE_WEEK_STR}, + {DialOldDataType::DATA_TYPE_POWER_STR, OHOS::DialDataType::POWER_STR}, + {DialOldDataType::DATA_TYPE_DATE_WEEK_MD_STR, OHOS::DialDataType::DATE_WEEK_MD_STR}, + {DialOldDataType::DATA_TYPE_DATE_EN_STR, OHOS::DialDataType::DATE_EN_STR}, + {DialOldDataType::DATA_TYPE_WEEK_EN_STR, OHOS::DialDataType::WEEK_EN_STR}, + {DialOldDataType::DATA_TYPE_STEPS_GOAL_STR, OHOS::DialDataType::STEPS_GOAL_STR}, + {DialOldDataType::DATA_TYPE_CALORIE_GOAL_STR, OHOS::DialDataType::CALORIE_GOAL_STR}, + +}; +} + + OHOS::DialDataType Convert2DataType(DialOldDataType dialData) +{ + if (g_data2std.find(dialData) != g_data2std.end()) { + return g_data2std[dialData]; + } + return OHOS::DialDataType::DATA_TYPE_MAX; +} \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelCalorie.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelCalorie.cpp index 787d4b8ce..55f4b1181 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelCalorie.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelCalorie.cpp @@ -1,25 +1,4 @@ -/* - * @Author: penglei 1624952103@qq.com - * @Date: 2025-05-15 11:27:16 - * @LastEditors: penglei 1624952103@qq.com - * @LastEditTime: 2025-05-20 10:33:14 - * @FilePath: /FD230/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelCalorie.cpp - * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE - */ -/*** - * @Date: 2024-07-31 18:33:13 - * @LastEditors: Caisking 3449750381@qq.com - * @LastEditTime: 2024-08-02 18:54:18 - * @FilePath: - * /FD230/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelCalorie.cpp - */ -/*** - * @Date: 2024-04-15 10:55:58 - * @LastEditors: Caisking 3449750381@qq.com - * @LastEditTime: 2024-07-31 18:36:06 - * @FilePath: - * /FD230/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelCalorie.cpp - */ + /* * Copyright (c) CompanyNameMagicTag 2023. All rights reserved. * Description: DialModelCalorie @@ -32,7 +11,7 @@ #include "wearable_log.h" #include "goal/include/goalmodel.h" -REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_CALORIE, +REGIST_DIAL_MODULE(OHOS::DialDataType::CALORIE, OHOS::DialModelCalorie::GetInstance()); // #include "cywee_hal.h" @@ -52,7 +31,7 @@ void DialModelCalorie::UpdateCalorie(int16_t calorie) { // 更新表盘卡路里数据 calorie_ = static_cast(calorie); if (onChangeListener_ != nullptr) { - onChangeListener_->OnDialFloatDataUpdate(DialDataType::DATA_TYPE_CALORIE, + onChangeListener_->OnDialFloatDataUpdate(OHOS::DialDataType::CALORIE, calorie_); } } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelCharge.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelCharge.cpp index a78dd613b..abe39205e 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelCharge.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelCharge.cpp @@ -8,7 +8,7 @@ #include "RegisterDialModel.h" #include "DialModelCharge.h" #include "wearable_log.h" -REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_CHARGE, OHOS::DialModelCharge::GetInstance()); +REGIST_DIAL_MODULE(OHOS::DialDataType::CHARGING_STATUS, OHOS::DialModelCharge::GetInstance()); namespace OHOS { @@ -25,7 +25,7 @@ namespace OHOS chargeStatus_ = static_cast(chargeStatus); if (onChangeListener_ != nullptr) { - onChangeListener_->OnDialFloatDataUpdate(DialDataType::DATA_TYPE_CHARGE, chargeStatus_); + onChangeListener_->OnDialFloatDataUpdate(OHOS::DialDataType::CHARGING_STATUS, chargeStatus_); } } } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelDateEnStr.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelDateEnStr.cpp index 2320e6346..acb782b37 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelDateEnStr.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelDateEnStr.cpp @@ -8,7 +8,7 @@ #include #include -REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_DATE_EN_STR, +REGIST_DIAL_MODULE(OHOS::DialDataType::DATE_EN_STR, OHOS::DialModelDateEnStr::GetInstance()); namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelDateStr.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelDateStr.cpp index 5be656d22..801a44512 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelDateStr.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelDateStr.cpp @@ -7,7 +7,7 @@ #include "wearable_log.h" #include -REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_DATE_STR, OHOS::DialModelDateStr::GetInstance()); +REGIST_DIAL_MODULE(OHOS::DialDataType::DATE_STR, OHOS::DialModelDateStr::GetInstance()); namespace OHOS { // CnDatedays 是一个包含星期字符串的数组 diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelDateWeekMDStr.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelDateWeekMDStr.cpp index e9e42c351..eb185785a 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelDateWeekMDStr.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelDateWeekMDStr.cpp @@ -18,7 +18,7 @@ namespace OHOS { - REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_DATE_WEEK_MD_STR, OHOS::DialModelDateWeekMDStr::GetInstance()); + REGIST_DIAL_MODULE(OHOS::DialDataType::DATE_WEEK_MD_STR, OHOS::DialModelDateWeekMDStr::GetInstance()); // Cnweekdays 是一个包含周字符串的数组 constexpr const char *Cnweekdays[] = {"星期天", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"}; @@ -61,7 +61,7 @@ namespace OHOS dateweekmdstr = *dialDateWeekMDStr; // 更新字符串 if (onChangeListener_ != nullptr) { - onChangeListener_->OnDialTextDataUpdate(DialDataType::DATA_TYPE_DATE_WEEK_MD_STR, &dateweekmdstr, dateweekmdstr.size()); + onChangeListener_->OnDialTextDataUpdate(OHOS::DialDataType::DATE_WEEK_MD_STR, &dateweekmdstr, dateweekmdstr.size()); } } } // namespace OHOS \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelDateWeekStr.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelDateWeekStr.cpp index d111d67d3..872daeecd 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelDateWeekStr.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelDateWeekStr.cpp @@ -9,7 +9,7 @@ #include #include -REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_DATE_WEEK_STR, +REGIST_DIAL_MODULE(OHOS::DialDataType::DATE_WEEK_STR, OHOS::DialModelDateWeekStr::GetInstance()); namespace OHOS { @@ -52,7 +52,7 @@ void DialModelDateWeekStr::UpdateDateWeekStr(const std::string *&dialWeekStr) { dateweekstr = *dialWeekStr; // 更新字符串 if (onChangeListener_ != nullptr) { onChangeListener_->OnDialTextDataUpdate( - DialDataType::DATA_TYPE_DATE_WEEK_STR, &dateweekstr, + OHOS::DialDataType::DATE_WEEK_STR, &dateweekstr, dateweekstr.size()); } } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelDistance.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelDistance.cpp index 95e3cf82e..66350f7bb 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelDistance.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelDistance.cpp @@ -2,7 +2,7 @@ #include "RegisterDialModel.h" #include "DialModelDistance.h" #include "wearable_log.h" -REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_DISTANCE, OHOS::DialModelDistance::GetInstance()); +REGIST_DIAL_MODULE(OHOS::DialDataType::DISTANCE_DATA, OHOS::DialModelDistance::GetInstance()); #include "goal/include/goalmodel.h" // #include "cywee_hal.h" // extern "C" int cywee_get_distance_data(); @@ -24,7 +24,7 @@ namespace OHOS if (onChangeListener_ != nullptr) { // 通知改变监听器更新距离数据 onChangeListener_->OnDialFloatDataUpdate( - DialDataType::DATA_TYPE_DISTANCE, distance_); + OHOS::DialDataType::DISTANCE_DATA, distance_); } } } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelHeartRate.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelHeartRate.cpp index d4c9bc436..9f0e4d332 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelHeartRate.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelHeartRate.cpp @@ -21,7 +21,7 @@ #include "DialModelHeartRate.h" #include "wearable_log.h" -REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_HEART_RATE, OHOS::DialModelHeartRate::GetInstance()); +REGIST_DIAL_MODULE(OHOS::DialDataType::HEART_RATE, OHOS::DialModelHeartRate::GetInstance()); namespace OHOS { @@ -41,7 +41,7 @@ namespace OHOS heartRate_ = static_cast(heartRate); if (onChangeListener_ != nullptr) { - onChangeListener_->OnDialFloatDataUpdate(DialDataType::DATA_TYPE_HEART_RATE, heartRate_); + onChangeListener_->OnDialFloatDataUpdate(OHOS::DialDataType::HEART_RATE, heartRate_); } } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelHourMin.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelHourMin.cpp deleted file mode 100644 index 4a5652569..000000000 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelHourMin.cpp +++ /dev/null @@ -1,49 +0,0 @@ -/*** - * @Date: 2024-08-08 16:15:49 - * @LastEditors: Caisking 3449750381@qq.com - * @LastEditTime: 2024-08-08 16:28:43 - * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelHourMin.cpp - */ -#include "RegisterDialModel.h" -#include "DialModelHourMin.h" -#include -#include -#include -#include "sys/time.h" -#include "wearable_log.h" -#include - -REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_HOUR_MIN, OHOS::DialModelHourMin::GetInstance()); -namespace OHOS -{ - /*继承的虚函数 不能修改*/ - bool DialModelHourMin::GetDialFloatData(DialDataType &type, float *&out, int16_t len) - { - (void)type; - - struct tm local_time = {0}; - time_t seconds = time(nullptr); - - if (localtime_r(&seconds, &local_time) == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "get localtime error!"); - return false; - } - - out[0] = static_cast(local_time.tm_hour); - out[1] = static_cast(local_time.tm_min); - // printf("GetDialFloatData %f %f\r\n", out[0], out[1]); - len = 2; - return true; - } - - void DialModelHourMin::UpdateHourMin(const std::string *&dialHourMin) - { - // dialdateStr_.clear(); - // dialdateStr_ = *dialHourMin; // 更新字符串 - // if (onChangeListener_ != nullptr) - // { - // onChangeListener_->OnDialTextDataUpdate(DialDataType::DialModelMinUnits, &dialdateStr_, dialdateStr_.size()); - // } - } -} \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelHourTens.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelHourTens.cpp index 0a1a2b623..adb191dbb 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelHourTens.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelHourTens.cpp @@ -11,7 +11,7 @@ #include "custom_runtime.h" // 注册模块 -REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_HOUR_TENS, OHOS::DialModelHourTens::GetInstance()); +REGIST_DIAL_MODULE(OHOS::DialDataType::CLOCK_HIGH, OHOS::DialModelHourTens::GetInstance()); namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelHourUnits.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelHourUnits.cpp index e63d63f54..fd1524b46 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelHourUnits.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelHourUnits.cpp @@ -5,7 +5,7 @@ #include "custom_runtime.h" // 注册模块 -REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_HOUR_UNITS, OHOS::DialModelHourUnits::GetInstance()); +REGIST_DIAL_MODULE(OHOS::DialDataType::CLOCK_LOW, OHOS::DialModelHourUnits::GetInstance()); namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelKcalgoal.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelKcalgoal.cpp index c7f66d0f5..795e3fe61 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelKcalgoal.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelKcalgoal.cpp @@ -10,7 +10,7 @@ #include "RegisterDialModel.h" #include "goal/include/goalmodel.h" -REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_CALORIE_GOAL, +REGIST_DIAL_MODULE(OHOS::DialDataType::CALORIE_GOAL_BOXPROGRESS, OHOS::DialModelKcalgoal::GetInstance()); namespace OHOS { @@ -30,7 +30,7 @@ bool DialModelKcalgoal::GetDialFloatData(DialDataType &type, float &out) { } if (onChangeListener_ != nullptr) { onChangeListener_->OnDialFloatDataUpdate( - DialDataType::DATA_TYPE_CALORIE_GOAL, Kcalgoal_); + OHOS::DialDataType::CALORIE_GOAL_BOXPROGRESS, Kcalgoal_); } out = DialBoxProgressView::GetInstance()->ConvertToRequiredFormat( DialBoxDataType::CALORIE_TARGET, Kcalgoal_); @@ -49,7 +49,7 @@ void DialModelKcalgoal::UpdateKcalgoal(uint32_t Kcals) { } if (onChangeListener_ != nullptr) { onChangeListener_->OnDialFloatDataUpdate( - DialDataType::DATA_TYPE_CALORIE_GOAL, Kcalgoal_); + OHOS::DialDataType::CALORIE_GOAL_BOXPROGRESS, Kcalgoal_); } } } // namespace OHOS diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelKcalgoalStr.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelKcalgoalStr.cpp index a5889b37e..ce4993d66 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelKcalgoalStr.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelKcalgoalStr.cpp @@ -10,7 +10,7 @@ #include "RegisterDialModel.h" #include "goal/include/goalmodel.h" -REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_CALORIE_GOAL_STR, +REGIST_DIAL_MODULE(OHOS::DialDataType::CALORIE_GOAL_STR, OHOS::DialModelKcalgoalStr::GetInstance()); namespace OHOS { @@ -48,7 +48,7 @@ void DialModelKcalgoalStr::UpdateKcalgoalStr(uint32_t Kcals) { if (onChangeListener_ != nullptr) { onChangeListener_->OnDialTextDataUpdate( - DialDataType::DATA_TYPE_CALORIE_GOAL_STR, &KcalgoalStr_, + OHOS::DialDataType::CALORIE_GOAL_STR, &KcalgoalStr_, KcalgoalStr_.size()); } } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelKcalgoalValue.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelKcalgoalValue.cpp index 359d8a266..f73360ebf 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelKcalgoalValue.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelKcalgoalValue.cpp @@ -10,7 +10,7 @@ #include "RegisterDialModel.h" #include "goal/include/goalmodel.h" -REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_CALORIE_GOAL_INT, +REGIST_DIAL_MODULE(OHOS::DialDataType::CALORIE_RATIO, OHOS::DialModelKcalgoalValue::GetInstance()); namespace OHOS { @@ -47,7 +47,7 @@ void DialModelKcalgoalValue::UpdateKcalgoalValue(uint32_t caloriesInput) { if (onChangeListener_) { onChangeListener_->OnDialFloatDataUpdate( - DialDataType::DATA_TYPE_CALORIE_GOAL_INT, KcalgoalValue_); + OHOS::DialDataType::CALORIE_RATIO, KcalgoalValue_); } } } // namespace OHOS diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelMinTens.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelMinTens.cpp index afff9b2f0..ae0e26a8a 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelMinTens.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelMinTens.cpp @@ -17,7 +17,7 @@ #include "custom_runtime.h" // 注册模块 -REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_MINUTE_TENS, OHOS::DialModelMinTens::GetInstance()); +REGIST_DIAL_MODULE(OHOS::DialDataType::MINUTE_HIGH, OHOS::DialModelMinTens::GetInstance()); namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelMinUnits.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelMinUnits.cpp index f5b289f66..69af8f2c0 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelMinUnits.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelMinUnits.cpp @@ -17,7 +17,7 @@ #include "custom_runtime.h" // 注册模块 -REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_MINUTE_UNITS, OHOS::DialModelMinUnits::GetInstance()); +REGIST_DIAL_MODULE(OHOS::DialDataType::MINUTE_LOW, OHOS::DialModelMinUnits::GetInstance()); namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPath.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPath.cpp deleted file mode 100644 index f8d70c030..000000000 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPath.cpp +++ /dev/null @@ -1,24 +0,0 @@ -#include "RegisterDialModel.h" -#include "DialModelPath.h" -#include - -REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_DIALPATH, OHOS::DialModelPath::GetInstance()); - -namespace OHOS -{ - bool DialModelPath::GetDialTextData(DialDataType &type, std::string *&out, int16_t &strNum) - { - (void)type; - out = &DialPath_; - return true; - } - - void DialModelPath::UpdatePath(const std::string *&DialPath) - { - DialPath_ = *DialPath; - if (onChangeListener_ != nullptr) - { - onChangeListener_->OnDialTextDataUpdate(DialDataType::DATA_TYPE_HEART_RATE, &DialPath_, 0); - } - } -} diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPower.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPower.cpp index ae7c2e593..4997b99c0 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPower.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPower.cpp @@ -28,7 +28,7 @@ // #include "battery_hal.h" // extern uint8_t battery_get_voltage(float *voltage); -REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_POWER, OHOS::DialModelPower::GetInstance()); +REGIST_DIAL_MODULE(OHOS::DialDataType::BATTERY, OHOS::DialModelPower::GetInstance()); namespace OHOS { @@ -62,7 +62,7 @@ namespace OHOS } if (onChangeListener_ != nullptr) { - onChangeListener_->OnDialFloatDataUpdate(DialDataType::DATA_TYPE_POWER, power_); + onChangeListener_->OnDialFloatDataUpdate(OHOS::DialDataType::BATTERY, power_); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[UpdatePower!]\r\n"); } } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPowerMapper.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPowerMapper.cpp index d076ba974..7a11c7aa6 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPowerMapper.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPowerMapper.cpp @@ -9,7 +9,7 @@ #include "battery_hal.h" extern uint8_t battery_get_voltage(float *voltage); -REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_POWER_MAPPER, +REGIST_DIAL_MODULE(OHOS::DialDataType::BATTERY_LEVEL, OHOS::DialModelPowerMapper::GetInstance()); namespace OHOS { @@ -41,7 +41,7 @@ void DialModelPowerMapper::NotifyPowerMapperUpdate() { } if (onChangeListener_ != nullptr) { onChangeListener_->OnDialFloatDataUpdate( - DialDataType::DATA_TYPE_POWER_MAPPER, powermapper_); + OHOS::DialDataType::BATTERY_LEVEL, powermapper_); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[UpdatePowerMapper!]\r\n"); } } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPowerStandby.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPowerStandby.cpp index fa72d9757..bc6da4ace 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPowerStandby.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPowerStandby.cpp @@ -10,7 +10,7 @@ #include "battery_hal.h" extern uint8_t battery_get_voltage(float *voltage); -REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_POWER_STANDBY, +REGIST_DIAL_MODULE(OHOS::DialDataType::POWER_STANDBY, OHOS::DialModelPowerStanby::GetInstance()); namespace OHOS { @@ -69,7 +69,7 @@ void DialModelPowerStanby::NotifyPowerStanbyUpdate() { } if (onChangeListener_ != nullptr) { onChangeListener_->OnDialFloatDataUpdate( - DialDataType::DATA_TYPE_POWER_STANDBY, PowerStanby_); + OHOS::DialDataType::POWER_STANDBY, PowerStanby_); WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[UpdatePowerStanby!]\r\n"); } } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPowerStr.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPowerStr.cpp index 82f44ba70..93a336f23 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPowerStr.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPowerStr.cpp @@ -6,7 +6,7 @@ extern uint8_t battery_get_voltage(float *voltage); namespace OHOS { - REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_POWER_STR,OHOS::DialModelPowerStr::GetInstance()); + REGIST_DIAL_MODULE(OHOS::DialDataType::POWER_STR,OHOS::DialModelPowerStr::GetInstance()); bool DialModelPowerStr::GetDialTextData(DialDataType &type, std::string *&out, int16_t &strNum) { @@ -25,7 +25,7 @@ namespace OHOS dialPowerStr_ = dialPowerStr; // 更新字符串 if (onChangeListener_ != nullptr) { - onChangeListener_->OnDialTextDataUpdate(DialDataType::DATA_TYPE_POWER_STR, &dialPowerStr_, 1); + onChangeListener_->OnDialTextDataUpdate(OHOS::DialDataType::POWER_STR, &dialPowerStr_, 1); } } } \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelSPO2.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelSPO2.cpp index fbda6a42c..bb2e07b47 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelSPO2.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelSPO2.cpp @@ -15,7 +15,7 @@ #include "DialModelSPO2.h" #include "wearable_log.h" -REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_SPO2, OHOS::DialModelSPO2::GetInstance()); +REGIST_DIAL_MODULE(OHOS::DialDataType::BLOOD_OXYGEN, OHOS::DialModelSPO2::GetInstance()); namespace OHOS { @@ -33,7 +33,7 @@ namespace OHOS SPO2_ = static_cast(SPO2); if (onChangeListener_ != nullptr) { - onChangeListener_->OnDialFloatDataUpdate(DialDataType::DATA_TYPE_SPO2, SPO2_); + onChangeListener_->OnDialFloatDataUpdate(OHOS::DialDataType::BLOOD_OXYGEN, SPO2_); } } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelSecondMapper.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelSecondMapper.cpp index 24ea85304..2f023feb6 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelSecondMapper.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelSecondMapper.cpp @@ -7,7 +7,7 @@ #include // 注册模块 -REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_SECOND_MAPPER, +REGIST_DIAL_MODULE(OHOS::DialDataType::SECOND_RATIO, OHOS::DialModelSecondMapper::GetInstance()); namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelStepgoal.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelStepgoal.cpp index 12e0ed912..ec7434e1a 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelStepgoal.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelStepgoal.cpp @@ -10,7 +10,7 @@ #include "RegisterDialModel.h" #include "goal/include/goalmodel.h" -REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_STEPS_GOAL, +REGIST_DIAL_MODULE(OHOS::DialDataType::STEPS_GOAL_BOXPROGRESS, OHOS::DialModelStepgoal::GetInstance()); namespace OHOS { @@ -44,7 +44,7 @@ void DialModelStepgoal::UpdateStepgoal(uint32_t steps) { DialBoxDataType::STEP_TARGET, stepgoal_); } if (onChangeListener_ != nullptr) { - onChangeListener_->OnDialFloatDataUpdate(DialDataType::DATA_TYPE_STEPS_GOAL, + onChangeListener_->OnDialFloatDataUpdate(OHOS::DialDataType::STEPS_GOAL_BOXPROGRESS, stepgoal_); } } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelStepgoalStr.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelStepgoalStr.cpp index 8425232d9..4229b7096 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelStepgoalStr.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelStepgoalStr.cpp @@ -10,7 +10,7 @@ #include "RegisterDialModel.h" #include "goal/include/goalmodel.h" -REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_STEPS_GOAL_STR, +REGIST_DIAL_MODULE(OHOS::DialDataType::STEPS_GOAL_STR, OHOS::DialModelStepgoalStr::GetInstance()); namespace OHOS { @@ -46,7 +46,7 @@ void DialModelStepgoalStr::UpdateStepgoalStr(uint32_t steps) { if (onChangeListener_ != nullptr) { onChangeListener_->OnDialTextDataUpdate( - DialDataType::DATA_TYPE_STEPS_GOAL_STR, &StepgoalStr_, + OHOS::DialDataType::STEPS_GOAL_STR, &StepgoalStr_, StepgoalStr_.size()); } } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelStepgoalValue.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelStepgoalValue.cpp index 0a3fbe3ed..7de676d74 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelStepgoalValue.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelStepgoalValue.cpp @@ -10,7 +10,7 @@ #include "RegisterDialModel.h" #include "goal/include/goalmodel.h" -REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_STEPS_GOAL_INT, +REGIST_DIAL_MODULE(OHOS::DialDataType::STEP_GOAL_PROGRESS, OHOS::DialModelStepgoalValue::GetInstance()); namespace OHOS { @@ -47,7 +47,7 @@ void DialModelStepgoalValue::UpdateStepgoalValue(uint32_t steps) { if (onChangeListener_ != nullptr) { //更新百分比 实际值 onChangeListener_->OnDialFloatDataUpdate( - DialDataType::DATA_TYPE_STEPS_GOAL_INT, stepgoalValue_); + OHOS::DialDataType::STEP_GOAL_PROGRESS, stepgoalValue_); } } } // namespace OHOS diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelSteps.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelSteps.cpp index c54ebec59..3eeb3ff71 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelSteps.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelSteps.cpp @@ -9,7 +9,7 @@ #include "RegisterDialModel.h" #include "goal/include/goalmodel.h" -REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_STEPS, +REGIST_DIAL_MODULE(OHOS::DialDataType::STEP_COUNT, OHOS::DialModelSteps::GetInstance()); namespace OHOS { @@ -24,7 +24,7 @@ bool DialModelSteps::GetDialFloatData(DialDataType &type, float &out) { void DialModelSteps::UpdateSteps(uint32_t steps) { steps_ = static_cast(steps); if (onChangeListener_ != nullptr) { - onChangeListener_->OnDialFloatDataUpdate(DialDataType::DATA_TYPE_STEPS, + onChangeListener_->OnDialFloatDataUpdate(OHOS::DialDataType::STEP_COUNT, steps_); } } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelTime.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelTime.cpp index 4d1acc532..26a7b6fe6 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelTime.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelTime.cpp @@ -5,6 +5,7 @@ * Create: 2023-12 */ +#include #include "sys/time.h" #include "RegisterDialModel.h" #include "DialModelTime.h" @@ -22,32 +23,23 @@ #define REGIST_DIAL_MODULE_WEEK(type, func) static OHOS::RegisterDialModel(REGIST_WEEK)(type, func) #define REGIST_DIAL_MODULE_MOUNTH(type, func) static OHOS::RegisterDialModel(REGIST_MOUNTH)(type, func) #define REGIST_DIAL_MODULE_YEAR(type, func) static OHOS::RegisterDialModel(REGIST_YEAR)(type, func) -#define REGIST_DIAL_MODULE_GEAR_ONE(type, func) static OHOS::RegisterDialModel(REGIST_GEAR_ONE)(type, func) -#define REGIST_DIAL_MODULE_GEAR_TWO(type, func) static OHOS::RegisterDialModel(REGIST_GEAR_TWO)(type, func) -#define REGIST_DIAL_MODULE_GEAR_THREE(type, func) static OHOS::RegisterDialModel(REGIST_GEAR_THREE)(type, func) -#define REGIST_DIAL_MODULE_GEAR_FOUR(type, func) static OHOS::RegisterDialModel(REGIST_GEAR_FOUR)(type, func) -#define REGIST_DIAL_MODULE_GEAR_FIVE(type, func) static OHOS::RegisterDialModel(REGIST_GEAR_FIVE)(type, func) -#define REGIST_DIAL_MODULE_GEAR_SIX(type, func) static OHOS::RegisterDialModel(REGIST_GEAR_SIX)(type, func) - -REGIST_DIAL_MODULE_ANGLE_H(DialDataType::DATA_TYPE_CLOCK_ANGLE_H, OHOS::DialModelTime::GetInstance()); -REGIST_DIAL_MODULE_ANGLE_M(DialDataType::DATA_TYPE_CLOCK_ANGLE_M, OHOS::DialModelTime::GetInstance()); -REGIST_DIAL_MODULE_ANGLE_S(DialDataType::DATA_TYPE_CLOCK_ANGLE_S, OHOS::DialModelTime::GetInstance()); -REGIST_DIAL_MODULE_ANGLE_MS(DialDataType::DATA_TYPE_CLOCK_ANGLE_MS, OHOS::DialModelTime::GetInstance()); - -REGIST_DIAL_MODULE_SECOND(DialDataType::DATA_TYPE_TIME_SECOND, OHOS::DialModelTime::GetInstance()); -REGIST_DIAL_MODULE_MINUTE(DialDataType::DATA_TYPE_TIME_MINUTE, OHOS::DialModelTime::GetInstance()); -REGIST_DIAL_MODULE_HOUR(DialDataType::DATA_TYPE_TIME_HOUR, OHOS::DialModelTime::GetInstance()); -REGIST_DIAL_MODULE_DATE(DialDataType::DATA_TYPE_TIME_DATE, OHOS::DialModelTime::GetInstance()); -REGIST_DIAL_MODULE_WEEK(DialDataType::DATA_TYPE_TIME_WEEK, OHOS::DialModelTime::GetInstance()); -REGIST_DIAL_MODULE_MOUNTH(DialDataType::DATA_TYPE_TIME_MONTH, OHOS::DialModelTime::GetInstance()); -REGIST_DIAL_MODULE_YEAR(DialDataType::DATA_TYPE_TIME_YEAR, OHOS::DialModelTime::GetInstance()); - -REGIST_DIAL_MODULE_GEAR_ONE(DialDataType::DATA_TYPE_SWIVEL_GEAR_ONE, OHOS::DialModelTime::GetInstance()); -REGIST_DIAL_MODULE_GEAR_TWO(DialDataType::DATA_TYPE_SWIVEL_GEAR_TWO, OHOS::DialModelTime::GetInstance()); -REGIST_DIAL_MODULE_GEAR_THREE(DialDataType::DATA_TYPE_SWIVEL_GEAR_THREE, OHOS::DialModelTime::GetInstance()); -REGIST_DIAL_MODULE_GEAR_FOUR(DialDataType::DATA_TYPE_SWIVEL_GEAR_FOUR, OHOS::DialModelTime::GetInstance()); -REGIST_DIAL_MODULE_GEAR_FIVE(DialDataType::DATA_TYPE_SWIVEL_GEAR_FIVE, OHOS::DialModelTime::GetInstance()); -REGIST_DIAL_MODULE_GEAR_SIX(DialDataType::DATA_TYPE_SWIVEL_GEAR_SIX, OHOS::DialModelTime::GetInstance()); +#define REGIST_DIAL_MODULE_GEAR_POSITIVE(type, func) static OHOS::RegisterDialModel(REGIST_GEAR_POSITIVE)(type, func) +#define REGIST_DIAL_MODULE_GEAR_NEGATIVE(type, func) static OHOS::RegisterDialModel(REGIST_GEAR_NEGATIVE)(type, func) + +REGIST_DIAL_MODULE_ANGLE_H(OHOS::DialDataType::CLOCK_ANGLE, OHOS::DialModelTime::GetInstance()); +REGIST_DIAL_MODULE_ANGLE_M(OHOS::DialDataType::MINUTE_ANGLE, OHOS::DialModelTime::GetInstance()); +REGIST_DIAL_MODULE_ANGLE_S(OHOS::DialDataType::SECOND_ANGLE, OHOS::DialModelTime::GetInstance()); +REGIST_DIAL_MODULE_ANGLE_MS(OHOS::DialDataType::MILLISECOND_ANGLE, OHOS::DialModelTime::GetInstance()); + +REGIST_DIAL_MODULE_SECOND(OHOS::DialDataType::SECOND_TIME, OHOS::DialModelTime::GetInstance()); +REGIST_DIAL_MODULE_MINUTE(OHOS::DialDataType::MINUTE_TIME, OHOS::DialModelTime::GetInstance()); +REGIST_DIAL_MODULE_HOUR(OHOS::DialDataType::CLOCK, OHOS::DialModelTime::GetInstance()); +REGIST_DIAL_MODULE_DATE(OHOS::DialDataType::DATE, OHOS::DialModelTime::GetInstance()); +REGIST_DIAL_MODULE_WEEK(OHOS::DialDataType::WEEKDAY_DATA, OHOS::DialModelTime::GetInstance()); +REGIST_DIAL_MODULE_MOUNTH(OHOS::DialDataType::MONTH, OHOS::DialModelTime::GetInstance()); +REGIST_DIAL_MODULE_YEAR(OHOS::DialDataType::SOLAR_YEAR, OHOS::DialModelTime::GetInstance()); +REGIST_DIAL_MODULE_GEAR_POSITIVE(OHOS::DialDataType::SWIVEL_GEAR_POSITIVE, OHOS::DialModelTime::GetInstance()); +REGIST_DIAL_MODULE_GEAR_NEGATIVE(OHOS::DialDataType::SWIVEL_GEAR_NEGATIVE, OHOS::DialModelTime::GetInstance()); namespace OHOS { static constexpr int16_t S_MS_US_TRANS = 1000; // 1000: seconds, milliseconds, microsecond transform value @@ -57,22 +49,6 @@ static constexpr uint8_t HALF_DAY_IN_HOUR = 12; // 60: 12 hours every half d static uint16_t ConvertHandValueToAngle(int32_t handValue, uint8_t range, int32_t secondHandValue, uint16_t ratio) { - #ifdef fd230_650 - if ((range == 0) || (ratio == 0)) { - return 0; - } - /* - * Example: calculate the angle of hour hand - * Assume that the time is 5: 30, then range is 12, radio is 60 - * angle is [(5 * 60 + 30) / (12 * 60)] * 360 - */ - int32_t degree = (handValue * ratio + secondHandValue); - degree = CIRCLE_IN_DEGREE_UI * degree / (static_cast(range) * ratio); - - return static_cast(degree % CIRCLE_IN_DEGREE_UI); - #endif - - /* -------------------------------- 0423补丁合入 -------------------------------- */ if ((range == 0) || (ratio == 0)) { return 0; } @@ -89,15 +65,6 @@ static uint16_t ConvertHandValueToAngle(int32_t handValue, uint8_t range, int32_ static float ConvertHandSecondValueToAngle(int32_t handValue, uint16_t range) { - #ifdef fd230_650 - /* - * Example: calculate the angle of second hand without millisecond handle - * Assume that the time is 5:30:30, then range is 60 - * angle is (30 / 60) * 360 - */ - return (static_cast(handValue * CIRCLE_IN_DEGREE_UI) / range); - #endif - /* -------------------------------- 0423补丁合入 -------------------------------- */ /* * Example: calculate the angle of second hand without millisecond handle * Assume that the time is 5:30:30, then range is 60 @@ -108,51 +75,25 @@ static float ConvertHandSecondValueToAngle(int32_t handValue, uint16_t range) void DialModelTime::UpdateTime() { -#ifdef fd230_650 -#if 0 - struct timeval tv; - gettimeofday(&tv, NULL); - tblock_ = localtime(&tv.tv_sec); - int realMS = tblock_.tm_sec * S_MS_US_TRANS + tv.tv_usec / S_MS_US_TRANS; -#else - /*优化为更安全的localtime_r()*/ - struct timeval tv; - gettimeofday(&tv, NULL); - struct tm tmp={0}; - localtime_r(&tv.tv_sec, &tmp); - int realMS = tmp.tm_sec * S_MS_US_TRANS + tv.tv_usec / S_MS_US_TRANS; - tblock_.tm_year = tmp.tm_year; - tblock_.tm_mon = tmp.tm_mon; - tblock_.tm_mday = tmp.tm_mday; - tblock_.tm_wday = tmp.tm_wday; - tblock_.tm_hour = tmp.tm_hour; - tblock_.tm_min = tmp.tm_min; - tblock_.tm_sec = tmp.tm_sec; - - if (uapi_dev_runtime_get_time_hour_show_model() == 12) - { - if (tmp.tm_hour > 12) - tblock_.tm_hour = tmp.tm_hour - 12 ; - } -#endif - - angleH_ = ConvertHandValueToAngle(tblock_.tm_hour, HALF_DAY_IN_HOUR, tblock_.tm_min, ONE_HOUR_IN_MINUTE); - angleM_ = ConvertHandValueToAngle(tblock_.tm_min, ONE_HOUR_IN_MINUTE, tblock_.tm_sec, ONE_MINUTE_IN_SECOND); - angleS_ = ConvertHandValueToAngle(tblock_.tm_sec, ONE_MINUTE_IN_SECOND, 0, 1); - angleMS_ = ConvertHandSecondValueToAngle(realMS, S_MS_US_TRANS * ONE_MINUTE_IN_SECOND); - - #endif - - /* --------------------------------- 0423补丁 --------------------------------- */ struct timeval tv; gettimeofday(&tv, nullptr); +#ifdef _WIN32 + time_t time = tv.tv_sec; + if (tblock_ == nullptr) { + tblock_ = new struct tm(); + memset_s(tblock_, sizeof(struct tm), 0, sizeof(struct tm)); + } + localtime_s(tblock_, &time); +#else tblock_ = localtime(&tv.tv_sec); +#endif int realMS = tblock_->tm_sec * S_MS_US_TRANS + tv.tv_usec / S_MS_US_TRANS; angleH_ = ConvertHandValueToAngle(tblock_->tm_hour, HALF_DAY_IN_HOUR, tblock_->tm_min, ONE_HOUR_IN_MINUTE); angleM_ = ConvertHandValueToAngle(tblock_->tm_min, ONE_HOUR_IN_MINUTE, tblock_->tm_sec, ONE_MINUTE_IN_SECOND); angleS_ = ConvertHandValueToAngle(tblock_->tm_sec, ONE_MINUTE_IN_SECOND, 0, 1); angleMS_ = ConvertHandSecondValueToAngle(realMS, S_MS_US_TRANS * ONE_MINUTE_IN_SECOND); + if (tblock_ == nullptr) { return; } @@ -163,7 +104,6 @@ void DialModelTime::UpdateTime() } } RootView::GetInstance()->Invalidate(); - /* -------------------------------------------------------------------------- */ } void DialModelTime::Register(TimeChangeListener* listener) @@ -196,102 +136,54 @@ void DialModelTime::Unregister(TimeChangeListener* listener) bool DialModelTime::GetDialFloatData(DialDataType& type, float& out) { - #ifdef fd230_650 - UpdateTime(); - - switch (type) { - case DialDataType::DATA_TYPE_CLOCK_ANGLE_H: - out = static_cast(angleH_); - break; - case DialDataType::DATA_TYPE_CLOCK_ANGLE_M: - out = static_cast(angleM_); - break; - case DialDataType::DATA_TYPE_CLOCK_ANGLE_S: - out = static_cast(angleS_); - break; - case DialDataType::DATA_TYPE_CLOCK_ANGLE_MS: - out = static_cast(angleMS_); - break; - case DialDataType::DATA_TYPE_TIME_YEAR: - out = static_cast((tblock_.tm_year) + 1900); - break; - case DialDataType::DATA_TYPE_TIME_MONTH: - out = static_cast((tblock_.tm_mon) + 1); - break; - case DialDataType::DATA_TYPE_TIME_WEEK: - out = static_cast(tblock_.tm_wday); - break; - case DialDataType::DATA_TYPE_TIME_DATE: - out = static_cast(tblock_.tm_mday); - break; - case DialDataType::DATA_TYPE_TIME_HOUR: - out = static_cast(tblock_.tm_hour); - break; - case DialDataType::DATA_TYPE_TIME_MINUTE: - out = static_cast(tblock_.tm_min); - break; - case DialDataType::DATA_TYPE_TIME_SECOND: - out = static_cast(tblock_.tm_sec); - break; - default: - return false; - } - return true; - #endif - - /* --------------------------------- 0423补丁 --------------------------------- */ if (tblock_ == nullptr) { UpdateTime(); } switch (type) { - case DialDataType::DATA_TYPE_CLOCK_ANGLE_H: + case OHOS::DialDataType::CLOCK_ANGLE: out = static_cast(angleH_); break; - case DialDataType::DATA_TYPE_CLOCK_ANGLE_M: + case OHOS::DialDataType::MINUTE_ANGLE: out = static_cast(angleM_); break; - case DialDataType::DATA_TYPE_CLOCK_ANGLE_S: + case OHOS::DialDataType::SECOND_ANGLE: out = static_cast(angleS_); break; - case DialDataType::DATA_TYPE_CLOCK_ANGLE_MS: + case OHOS::DialDataType::MILLISECOND_ANGLE: out = static_cast(angleMS_); break; - case DialDataType::DATA_TYPE_TIME_YEAR: + case OHOS::DialDataType::SOLAR_YEAR: out = static_cast(tblock_->tm_year); break; - case DialDataType::DATA_TYPE_TIME_MONTH: + case OHOS::DialDataType::MONTH: out = static_cast(tblock_->tm_mon); break; - case DialDataType::DATA_TYPE_TIME_WEEK: + case OHOS::DialDataType::WEEKDAY_DATA: out = static_cast(tblock_->tm_wday); break; - case DialDataType::DATA_TYPE_TIME_DATE: + case OHOS::DialDataType::DATE: out = static_cast(tblock_->tm_mday); break; - case DialDataType::DATA_TYPE_TIME_HOUR: + case OHOS::DialDataType::CLOCK: out = static_cast(tblock_->tm_hour); break; - case DialDataType::DATA_TYPE_TIME_MINUTE: + case OHOS::DialDataType::MINUTE_TIME: out = static_cast(tblock_->tm_min); break; - case DialDataType::DATA_TYPE_TIME_SECOND: + case OHOS::DialDataType::SECOND_TIME: out = static_cast(tblock_->tm_sec); break; - case DialDataType::DATA_TYPE_SWIVEL_GEAR_TWO: - case DialDataType::DATA_TYPE_SWIVEL_GEAR_THREE: - case DialDataType::DATA_TYPE_SWIVEL_GEAR_FIVE: { + case DialDataType::SWIVEL_GEAR_POSITIVE: { float coeff = 6.0f; // 6.0: coeff float accleratedAngle = angleMS_ * coeff - floor(angleMS_ * coeff / CIRCLE_IN_DEGREE) * CIRCLE_IN_DEGREE; - out = static_cast(accleratedAngle * -1.0 + CIRCLE_IN_DEGREE); + out = static_cast(accleratedAngle); break; } - case DialDataType::DATA_TYPE_SWIVEL_GEAR_ONE: - case DialDataType::DATA_TYPE_SWIVEL_GEAR_FOUR: - case DialDataType::DATA_TYPE_SWIVEL_GEAR_SIX: { + case DialDataType::SWIVEL_GEAR_NEGATIVE: { float coeff = 6.0f; // 6.0: coeff float accleratedAngle = angleMS_ * coeff - floor(angleMS_ * coeff / CIRCLE_IN_DEGREE) * CIRCLE_IN_DEGREE; - out = static_cast(accleratedAngle); + out = static_cast(accleratedAngle * -1.0 + CIRCLE_IN_DEGREE); break; } default: @@ -299,4 +191,52 @@ bool DialModelTime::GetDialFloatData(DialDataType& type, float& out) } return true; } + +void TimeChangeListener::SetTimeInervals(TimeInterval *intervals, uint8_t num) +{ + if (intervals == nullptr || num == 0) { + return; + } + if (intervals_ != nullptr) { + UIFree(intervals_); + intervals_ = nullptr; + } + num_ = 0; + + intervals_ = static_cast(UIMalloc(sizeof(TimeInterval) * num)); + if (intervals_ == nullptr) { + GRAPHIC_LOGE("failed to malloc!"); + return; + } + num_ = num; + memcpy_s(intervals_, sizeof(TimeInterval) * num, intervals, sizeof(TimeInterval) * num); +} + +bool TimeChangeListener::IsInTimeInterval(const struct tm &curTime) +{ + if (num_ == 0) { // 0-24 + return true; + } + for (uint8_t i = 0; i < num_; ++i) { + if (intervals_[i].start <= curTime.tm_hour && intervals_[i].end > curTime.tm_hour) { + return true; + } + } + return false; +} + +TimeChangeListener::TimeChangeListener() +{ + DialModelTime::GetInstance()->Register(this); +} + +TimeChangeListener::~TimeChangeListener() +{ + if (intervals_ != nullptr) { + UIFree(intervals_); + intervals_ = nullptr; + } + num_ = 0; + DialModelTime::GetInstance()->Unregister(this); +} } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelTimeStr.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelTimeStr.cpp index 848f721ee..f68c23fd1 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelTimeStr.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelTimeStr.cpp @@ -10,7 +10,7 @@ #include #include -REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_TIMESTR_STR, +REGIST_DIAL_MODULE(OHOS::DialDataType::TIMESTR_STR, OHOS::DialModelTimeStr::GetInstance()); namespace OHOS { @@ -51,7 +51,7 @@ void DialModelTimeStr::UpdateTimeStr(const std::string dialTimeStr) { dialTimeStr_.clear(); dialTimeStr_ = dialTimeStr; // 更新字符串 if (onChangeListener_ != nullptr) { - onChangeListener_->OnDialTextDataUpdate(DialDataType::DATA_TYPE_TIMESTR_STR, + onChangeListener_->OnDialTextDataUpdate(OHOS::DialDataType::TIMESTR_STR, &dialTimeStr_, 1); } } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeather.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeather.cpp index d549ea367..d360fed1c 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeather.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeather.cpp @@ -14,7 +14,7 @@ #include "RegisterDialModel.h" #include "DialModelWeather.h" #include "wearable_log.h" -REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_WEATHER, OHOS::DialModelWeather::GetInstance()); +REGIST_DIAL_MODULE(OHOS::DialDataType::WEATHER_TYPE, OHOS::DialModelWeather::GetInstance()); namespace OHOS { @@ -31,7 +31,7 @@ namespace OHOS Weather_ = static_cast(Weather - 1); if (onChangeListener_ != nullptr) { - onChangeListener_->OnDialFloatDataUpdate(DialDataType::DATA_TYPE_WEATHER, Weather_); + onChangeListener_->OnDialFloatDataUpdate(OHOS::DialDataType::WEATHER_TYPE, Weather_); } } } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeatherStr.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeatherStr.cpp index d2c82ddab..ec5524190 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeatherStr.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeatherStr.cpp @@ -16,7 +16,7 @@ #include "sys/time.h" #include "wearable_log.h" -REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_WEATHER_STR, OHOS::DialModelWeatherStr::GetInstance()); +REGIST_DIAL_MODULE(OHOS::DialDataType::WEATHER_STR, OHOS::DialModelWeatherStr::GetInstance()); namespace OHOS { @@ -35,7 +35,7 @@ namespace OHOS dialWeatherStr_ = dialWeatherStr; // 更新字符串 if (onChangeListener_ != nullptr) { - onChangeListener_->OnDialTextDataUpdate(DialDataType::DATA_TYPE_WEATHER_STR, &dialWeatherStr_, 1); + onChangeListener_->OnDialTextDataUpdate(OHOS::DialDataType::WEATHER_STR, &dialWeatherStr_, 1); } } } \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeekEnStr.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeekEnStr.cpp index 6f04fb404..72ff069ba 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeekEnStr.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeekEnStr.cpp @@ -7,7 +7,7 @@ #include #include -REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_WEEK_EN_STR, +REGIST_DIAL_MODULE(OHOS::DialDataType::WEEK_EN_STR, OHOS::DialModelWeekEnStr::GetInstance()); namespace OHOS { // CnWeekEndays 是一个包含星期字符串的数组 @@ -41,7 +41,7 @@ void DialModelWeekEnStr::UpdateWeekEnStr(const std::string *&dialWeekEnStr) { dialWeekEnStr_.clear(); dialWeekEnStr_ = *dialWeekEnStr; // 更新字符串 if (onChangeListener_ != nullptr) { - onChangeListener_->OnDialTextDataUpdate(DialDataType::DATA_TYPE_WEEK_EN_STR, + onChangeListener_->OnDialTextDataUpdate(OHOS::DialDataType::WEEK_EN_STR, &dialWeekEnStr_, dialWeekEnStr_.size()); } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeekNum.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeekNum.cpp index e61797e9c..deb1e35e2 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeekNum.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeekNum.cpp @@ -6,7 +6,7 @@ #include #include -REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_WEEK_NUM, +REGIST_DIAL_MODULE(OHOS::DialDataType::WEEK_NUM, OHOS::DialModelWeekNum::GetInstance()); namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeekStr.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeekStr.cpp index 6f14eebd6..f076832e3 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeekStr.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeekStr.cpp @@ -7,7 +7,7 @@ #include "wearable_log.h" #include -REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_WEEK_STR, OHOS::DialModelWeekStr::GetInstance()); +REGIST_DIAL_MODULE(OHOS::DialDataType::WEEK_STR, OHOS::DialModelWeekStr::GetInstance()); namespace OHOS { // Cnweekdays 是一个包含星期字符串的数组 @@ -41,7 +41,7 @@ namespace OHOS dialWeekStr_ = *dialWeekStr; // 更新字符串 if (onChangeListener_ != nullptr) { - onChangeListener_->OnDialTextDataUpdate(DialDataType::DATA_TYPE_WEEK_STR, &dialWeekStr_, dialWeekStr_.size()); + onChangeListener_->OnDialTextDataUpdate(OHOS::DialDataType::WEEK_STR, &dialWeekStr_, dialWeekStr_.size()); } } } \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialSequenceContainer.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialSequenceContainer.cpp deleted file mode 100644 index 4024f4696..000000000 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialSequenceContainer.cpp +++ /dev/null @@ -1,228 +0,0 @@ -/* - * Copyright (c) CompanyNameMagicTag 2025. All rights reserved. - * Description: DialSequenceContainer - * Author: - * Create: 2025-03-05 - */ - -#include "DialSequenceContainer.h" - -namespace OHOS { -DialSequenceContainer::DialSequenceContainer() -{ - SetTouchable(true); - SetStyle(STYLE_BACKGROUND_OPA, OPA_TRANSPARENT); - memset_s(nonCycleView_, sizeof(nonCycleView_), 0, sizeof(nonCycleView_)); -} - -DialSequenceContainer::~DialSequenceContainer() -{ - if (repeatView_ != nullptr) { - delete repeatView_; - repeatView_ = nullptr; - } - - for (uint8_t i = 0; i < nonCycleNum_; ++i) { - delete nonCycleView_[i]; - nonCycleView_[i] = nullptr; - } - nonCycleNum_ = 0; - curView_ = nullptr; -} - -bool DialSequenceContainer::AddSequenceRes(uint16_t interval, bool repeat, - const ImageAnimatorInfo *imgSrc, uint8_t imgNum) -{ - if (imgSrc == nullptr || imgNum == 0) { - return false; - } - - // add animator images to view - if (repeat) { - if (repeatView_ != nullptr) { - GRAPHIC_LOGE("the repeat seq view has existed!"); - return false; - } - repeatView_ = new UIImageAnimatorView; - repeatView_->SetImageAnimatorSrc(imgSrc, imgNum, interval); - repeatView_->SetRepeat(false); - } else { - if (nonCycleNum_ >= sizeof(nonCycleView_) / sizeof(nonCycleView_[0])) { - GRAPHIC_LOGE("non cycle seq views have been exceedeed!"); - return false; - } - nonCycleView_[nonCycleNum_] = new UIImageAnimatorView; - nonCycleView_[nonCycleNum_]->SetImageAnimatorSrc(imgSrc, imgNum, interval); - nonCycleView_[nonCycleNum_]->SetRepeat(false); - ++nonCycleNum_; - } - - // update rect area - Rect rect(GetRelativeRect()); - for (uint8_t i = 0; i < imgNum; ++i) { - rect.JoinRect(rect, - Rect(rect.GetX(), - rect.GetY(), - rect.GetX() + imgSrc[i].width - 1, - rect.GetY() + imgSrc[i].height - 1)); - } - rect.JoinRect(rect, GetRelativeRect()); - SetPosition(rect.GetX(), rect.GetY()); - SetWidth(rect.GetWidth()); - SetHeight(rect.GetHeight()); - Invalidate(); - - return true; -} - -bool DialSequenceContainer::OnClickEvent(const ClickEvent& event) -{ - if (curView_ == nullptr) { - return false; - } - uint8_t curState = curView_->GetState(); - switch (curState) { - case Animator::STOP: { - if (curView_ == repeatView_) { - isClick_ = true; - } else { - UpdateCurrentView(); - Start(); - } - break; - } - case Animator::PAUSE: { - return false; - } - case Animator::RUNNING: - case Animator::START: { - if (curView_ == repeatView_) { - isClick_ = true; - } - break; - } - default: { - GRAPHIC_LOGE("error state"); - } - } - - return UIViewGroup::OnClickEvent(event); -} - -void DialSequenceContainer::Start() -{ - if (curView_ != nullptr) { - curView_->Start(); - return; - } - - UpdateCurrentView(); - if (curView_ == nullptr) { - return; - } - curView_->Start(); -} - -void DialSequenceContainer::Stop() -{ - if (curView_ != nullptr) { - curView_->Stop(); - return; - } - - UpdateCurrentView(); - if (curView_ == nullptr) { - return; - } - curView_->Stop(); -} - -void DialSequenceContainer::Pause() -{ - if (curView_ != nullptr) { - curView_->Pause(); - return; - } - - UpdateCurrentView(); - if (curView_ == nullptr) { - return; - } - curView_->Pause(); -} - -void DialSequenceContainer::Resume() -{ - if (curView_ != nullptr) { - curView_->Resume(); - return; - } - - UpdateCurrentView(); - if (curView_ == nullptr) { - return; - } - curView_->Resume(); -} - -void DialSequenceContainer::OnAnimatorStop(UIView& view) -{ - bool isClick = isClick_; - isClick_ = false; - bool isRepeat = (curView_ == repeatView_); - if (isRepeat && isClick) { - UpdateCurrentView(); - Start(); - } else if (isRepeat && !isClick) { - Start(); - } else { - if (repeatView_ != nullptr) { - UpdateCurrentView(); - Start(); - } - } -} - -void DialSequenceContainer::UpdateCurrentView() -{ - if (curView_ != nullptr) { - if (repeatView_ != nullptr && nonCycleNum_ == 0) { - return; - } else if (repeatView_ == nullptr && nonCycleNum_ != 0) { - Remove(curView_); - curView_ = nonCycleView_[loop_]; - loop_ = (loop_ + 1) % nonCycleNum_; - curView_->SetAnimatorStopListener(this); - Add(curView_); - Invalidate(); - return; - } - - // both repeat and noncycle exist - Remove(curView_); - if (curView_ == repeatView_) { - curView_ = nonCycleView_[loop_]; - loop_ = (loop_ + 1) % nonCycleNum_; - } else { - curView_ = repeatView_; - } - curView_->SetAnimatorStopListener(this); - Add(curView_); - Invalidate(); - return; - } - - if (repeatView_ != nullptr) { - curView_ = repeatView_; - } else if (nonCycleNum_ != 0) { - curView_ = nonCycleView_[loop_]; - loop_ = (loop_ + 1) % nonCycleNum_; - } else { - GRAPHIC_LOGE("sequence img has not been added!"); - return; - } - curView_->SetAnimatorStopListener(this); - Add(curView_); - Invalidate(); -} -} // namespace OHOS diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialSequenceImgView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialSequenceImgView.cpp index 5c9c31ec3..c7d1c24e7 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialSequenceImgView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialSequenceImgView.cpp @@ -4,39 +4,274 @@ #include "DialSequenceImgView.h" #include "securec.h" +#include "common/graphic_utils.h" +#include "common/image_cache_manager.h" namespace OHOS { +namespace { +const uint32_t DIRID = 0xfef << 20; // 20: offset +} + DialSequenceImgView::DialSequenceImgView(void) { + SetStyle(STYLE_BACKGROUND_OPA, OPA_TRANSPARENT); + memset_s(nonCycleSeq_, sizeof(nonCycleSeq_), 0, sizeof(nonCycleSeq_)); } DialSequenceImgView::~DialSequenceImgView(void) { - if (imgSrc_ != nullptr) { - UIFree(imgSrc_); + if (repeatSeq_ != nullptr) { + delete repeatSeq_; + repeatSeq_ = nullptr; + } + + for (uint8_t i = 0; i < nonCycleNum_; ++i) { + delete nonCycleSeq_[i]; + nonCycleSeq_[i] = nullptr; } + nonCycleNum_ = 0; + loop_ = 0; + isClick_ = false; + viewNum_ = 0; + isAllImgLoaded_ = false; + curSeq_ = nullptr; } -bool DialSequenceImgView::SetSequenceRes(const ImageAnimatorInfo* imgSrc, uint8_t imgNum) +bool DialSequenceImgView::SetSequenceRes(const ImageAnimatorInfo *imgSrc, uint8_t imgNum) { if (imgSrc == nullptr || imgNum == 0) { return false; } - if (imgSrc_ != nullptr) { - UIFree(imgSrc_); - imgNum_ = 0; + + SetImageAnimatorSrc(imgSrc, imgNum); + return true; +} + +bool DialSequenceImgView::SetPreviewImg() +{ + if (curSeq_ == nullptr) { + UpdateCurrentSeq(); } - uint32_t size = sizeof(ImageAnimatorInfo) * imgNum; - imgSrc_ = static_cast(UIMalloc(size)); - if (imgSrc_ == nullptr) { + if (curSeq_ == nullptr) { return false; } - if (memcpy_s(imgSrc_, size, imgSrc, size) != EOK) { - UIFree(imgSrc_); + SetAnimatorInfo(curSeq_, 1); + isAllImgLoaded_ = false; + SetSrc(curSeq_->imgs[0].imageInfo); + SetPosition(curSeq_->imgs[0].pos.x, curSeq_->imgs[0].pos.y); + SetWidth(curSeq_->imgs[0].width); + SetHeight(curSeq_->imgs[0].height); + Invalidate(); + return true; +} + +bool DialSequenceImgView::LoadCurSeqImgs() +{ + if (curSeq_ == nullptr) { + UpdateCurrentSeq(); + } + if (curSeq_ == nullptr) { return false; } - imgNum_ = imgNum; - SetImageAnimatorSrc(imgSrc_, imgNum_); + isAllImgLoaded_ = true; + SetAnimatorInfo(curSeq_, curSeq_->info.imgNum); return true; } -} \ No newline at end of file + +bool DialSequenceImgView::AddSequenceRes(const SequenceInfo ¶) +{ + if (viewNum_ >= SEQ_IMG_NUM) { + GRAPHIC_LOGE("seq num has exceeded!"); + return false; + } + + if (para.repeat) { + if (repeatSeq_ != nullptr) { + GRAPHIC_LOGE("the repeat seq has existed!"); + return false; + } + repeatSeq_ = new AnimatorInfo; + repeatSeq_->info = para; + } else { + if (nonCycleNum_ >= SEQ_IMG_NUM) { + GRAPHIC_LOGE("non cycle seq have been exceedeed!"); + return false; + } + nonCycleSeq_[nonCycleNum_] = new AnimatorInfo; + nonCycleSeq_[nonCycleNum_]->info = para; + ++nonCycleNum_; + } + + SetTouchable(true); + SetAnimatorStopListener(this); + SetRepeat(false); + ++viewNum_; + return true; +} + +bool DialSequenceImgView::OnClickEvent(const ClickEvent &event) +{ + if (!isAllImgLoaded_) { + return false; + } + if (curSeq_ == nullptr) { + return false; + } + uint8_t curState = GetState(); + switch (curState) { + case Animator::STOP: { + if (curSeq_ == repeatSeq_) { + isClick_ = true; + } else { + UpdateCurrentSeq(); + SetAnimatorInfo(curSeq_, curSeq_->info.imgNum); + Start(); + } + break; + } + case Animator::PAUSE: { + return false; + } + case Animator::RUNNING: + case Animator::START: { + if (curSeq_ == repeatSeq_) { + isClick_ = true; + } + break; + } + default: { + GRAPHIC_LOGE("error state"); + } + } + + return UIImageAnimatorView::OnClickEvent(event); +} + +void DialSequenceImgView::OnAnimatorStop(UIView &view) +{ + if (!isAllImgLoaded_) { + return; + } + bool isClick = isClick_; + isClick_ = false; + bool isRepeat = (curSeq_ == repeatSeq_); + if (isRepeat && isClick) { + UpdateCurrentSeq(); + SetAnimatorInfo(curSeq_, curSeq_->info.imgNum); + Start(); + } else if (isRepeat && !isClick) { + Start(); + } else { + if (repeatSeq_ != nullptr) { + UpdateCurrentSeq(); + SetAnimatorInfo(curSeq_, curSeq_->info.imgNum); + Start(); + } + } +} + +ImageAnimatorInfo *DialSequenceImgView::LoadImgs(const SequenceInfo ¶, uint8_t num) const +{ + if (para.fp == nullptr || num > para.imgNum) { + return nullptr; + } + + long curPt = ftell(para.fp); + fseek(para.fp, para.resPos, SEEK_SET); + uint16_t *imgIdArray = static_cast(UIMalloc(sizeof(uint16_t) * num)); + defer + { + if (imgIdArray != nullptr) { + UIFree(imgIdArray); + } + fseek(para.fp, curPt, SEEK_SET); + }; + if (imgIdArray == nullptr) { + return nullptr; + } + ImageAnimatorInfo *imgInfoArray = static_cast(UIMalloc(num * sizeof(ImageAnimatorInfo))); + if (imgInfoArray == nullptr) { + return nullptr; + } + + if (fread(imgIdArray, 1, sizeof(uint16_t) * num, para.fp) != sizeof(uint16_t) * num) { + GRAPHIC_LOGE("failed to read resId"); + UIFree(imgInfoArray); + return nullptr; + } + for (uint8_t i = 0; i < num; ++i) { + uint32_t resId = imgIdArray[i] | DIRID; + ImageInfo *info = + ImageCacheManager::GetInstance().LoadOneInMultiRes(resId, para.fileName, para.fp, false, para.imgOffset); + if (info == nullptr) { + GRAPHIC_LOGE("load img fail! file:%s resId:%x", para.fileName.c_str(), resId); + UIFree(imgInfoArray); + return nullptr; + } + imgInfoArray[i].imageInfo = info; + imgInfoArray[i].pos = {GetRelativeRect().GetX(), GetRelativeRect().GetY()}; + imgInfoArray[i].width = info->header.width; + imgInfoArray[i].height = info->header.height; + imgInfoArray[i].imageType = IMG_SRC_IMAGE_INFO; + } + return imgInfoArray; +} + +void DialSequenceImgView::UpdateCurrentSeq() +{ + if (curSeq_ != nullptr) { + if (repeatSeq_ != nullptr && nonCycleNum_ == 0) { + return; + } else if (repeatSeq_ == nullptr && nonCycleNum_ != 0) { + curSeq_ = nonCycleSeq_[loop_]; + loop_ = (loop_ + 1) % nonCycleNum_; + return; + } + + // both repeat and noncycle exist + if (curSeq_ == repeatSeq_) { + curSeq_ = nonCycleSeq_[loop_]; + loop_ = (loop_ + 1) % nonCycleNum_; + } else { + curSeq_ = repeatSeq_; + } + return; + } + + if (repeatSeq_ != nullptr) { + curSeq_ = repeatSeq_; + } else if (nonCycleNum_ != 0) { + curSeq_ = nonCycleSeq_[loop_]; + loop_ = (loop_ + 1) % nonCycleNum_; + } else { + GRAPHIC_LOGE("sequence img has not been added!"); + return; + } +} + +void DialSequenceImgView::SetAnimatorInfo(AnimatorInfo *info, uint8_t num) +{ + if (info == nullptr || num == 0) { + GRAPHIC_LOGE("para error"); + return; + } + if (num > info->info.imgNum) { + GRAPHIC_LOGE("The number of images exceeds the limit."); + return; + } + + if (num == info->num && info->imgs != nullptr) { + SetImageAnimatorSrc(info->imgs, info->num, info->info.interval); + } else { + if (info->imgs != nullptr) { + UIFree(info->imgs); + } + info->num = num; + info->imgs = LoadImgs(info->info, info->num); + if (info->imgs == nullptr) { + return; + } + SetImageAnimatorSrc(info->imgs, info->num, info->info.interval); + } +} +} // namespace OHOS \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialTimePublisher.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialTimePublisher.cpp deleted file mode 100644 index cb4539b16..000000000 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialTimePublisher.cpp +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (c) CompanyNameMagicTag 2025. All rights reserved. - * Description: DialTimePublisher - * Author: - * Create: 2025-03-04 - */ - -#include "DialTimePublisher.h" -#include "securec.h" -#include "gfx_utils/mem_api.h" -#include "gfx_utils/graphic_log.h" - -namespace OHOS { -DialTimePublisher *DialTimePublisher::publisher_ = nullptr; - -void DialTimePublisher::TimeChangeListener::SetTimeInervals(TimeInterval *intervals, uint8_t num) -{ - if (intervals == nullptr || num == 0) { - return; - } - if (intervals_ != nullptr) { - UIFree(intervals_); - intervals_ = nullptr; - } - num_ = 0; - - intervals_ = static_cast(UIMalloc(sizeof(TimeInterval) * num)); - if (intervals_ == nullptr) { - GRAPHIC_LOGE("failed to malloc!"); - return; - } - num_ = num; - memcpy_s(intervals_, sizeof(TimeInterval) * num, intervals, sizeof(TimeInterval) * num); -} - -bool DialTimePublisher::TimeChangeListener::IsInTimeInterval(const struct tm &curTime) -{ - if (num_ == 0) { // 0-24 - return true; - } - for (uint8_t i = 0; i < num_; ++i) { - if (intervals_[i].start <= curTime.tm_hour && intervals_[i].end > curTime.tm_hour) { - return true; - } - } - return false; -} - -DialTimePublisher::TimeChangeListener::TimeChangeListener() -{ - if (DialTimePublisher::GetPublisher() != nullptr) { - DialTimePublisher::GetPublisher()->Register(this); - } -} - -DialTimePublisher::TimeChangeListener::~TimeChangeListener() -{ - if (intervals_ != nullptr) { - UIFree(intervals_); - intervals_ = nullptr; - } - num_ = 0; - if (DialTimePublisher::GetPublisher() != nullptr) { - DialTimePublisher::GetPublisher()->Unregister(this); - } -} - -void DialTimePublisher::SetPublisher(DialTimePublisher *publisher) -{ - publisher_ = publisher; -} - -DialTimePublisher *DialTimePublisher::GetPublisher() -{ - return publisher_; -} -} // namespace OHOS \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialViewContainer.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialViewContainer.cpp index 6db086094..8ed4cf710 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialViewContainer.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialViewContainer.cpp @@ -7,6 +7,7 @@ #include "DialViewContainer.h" #include "DialDigitalImgView.h" +#include "ModelDialDataFactory.h" namespace OHOS { DialViewContainer::~DialViewContainer() @@ -57,7 +58,7 @@ void DialViewContainer::AddView(DialDataType type, DialView* view, bool isPeriod .type = type, .isPeriodic = isPeriodic }; - if (type == DialDataType::DATA_TYPE_MAX) { + if (ModelDialDataFactory::GetInstance().GetModuleByType(type) == nullptr) { hasInvalidBindData_ = true; } dialViews_.PushBack(info); @@ -91,7 +92,8 @@ bool DialViewContainer::IsInvalidateBindData(uint8_t index) for (uint8_t i = 0; i < index; ++i) { it = it->next_; } - if (it->data_.dialView != nullptr && it->data_.type == DialDataType::DATA_TYPE_MAX) { + if (it->data_.dialView != nullptr && + ModelDialDataFactory::GetInstance().GetModuleByType(it->data_.type) == nullptr) { return true; } DialViewContainer *container = dynamic_cast(it->data_.view); diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialViewGroup.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialViewGroup.cpp index 19ba8d408..9225077ca 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialViewGroup.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialViewGroup.cpp @@ -19,6 +19,9 @@ #include "ui_screennotify.h" #endif #include "DialDigitalImgView.h" +#include "common/input_device_manager.h" +#include "DialSequenceImgView.h" +#include "engines/gfx/lite_m_gfx_engine.h" namespace OHOS { static DialVideoView *g_video = nullptr; @@ -28,53 +31,17 @@ namespace OHOS static constexpr const char *SLEEPICON = "user/res/dial_state/sleep.bin"; static constexpr const char *LOCKICON = "user/res/dial_state/lock.bin"; -#ifdef SUPPORT_OHOSFWK - static void ScreenStatusNotify(ScreenStatus status) - { - if (g_video == nullptr) - { - return; - } - // printf("uapi_dev_runtime_get_transmitting_status() %d\n",uapi_dev_runtime_get_transmitting_status()); - // printf("ScreenStatusNotify status %d\n", status); - // printf("ScreenStatusNotify g_video->IsPlayed() %d\n", g_video->IsPlayed()); - if (status == SCREEN_STATUS_OFF) - { - g_video->PausePlay(); - // printf("暂停视频\n"); - } - else if (status == SCREEN_STATUS_ON) - { - if (g_video->IsPaused()) - { - g_video->ResumePlay(); - // printf("恢复视频\n"); - } - else if (!g_video->IsPlayed()) - { - g_video->StartPlay(); - // printf("开始播放\n"); - } - } - } -#endif DialViewGroup::DialViewGroup(void) { SetTouchable(true); SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); SetCoverable(true); + isExists_ = std::make_shared(true); } DialViewGroup::~DialViewGroup(void) { - if (video_ != nullptr) - { -#ifdef SUPPORT_OHOSFWK - deregisterNotifyScreenStatus(ScreenStatusNotify); -#endif - g_video = nullptr; - } if (kaleidoscope_ != nullptr) { kaleidoscope_->ClearFocus(); @@ -109,7 +76,7 @@ namespace OHOS periodicUpdateTypes_.Clear(); - dataTypeMap_.clear(); + ClearViews(); ListNode *viewNode = dialViews_.Head(); while (viewNode != dialViews_.End()) @@ -120,7 +87,10 @@ namespace OHOS } dialViews_.Clear(); - period_ = DEFAULT_TASK_PERIOD; + rollingLabelList_.Clear(); + imgAnimList_.Clear(); + + period_ = DEFAULT_TASK_PERIOD; video_ = nullptr; @@ -143,13 +113,15 @@ namespace OHOS } } - void DialViewGroup::SetDial(std::string filePath, DisplayState state) - { +void DialViewGroup::SetDial(std::string filePath, DisplayState state) +{ + if (resPreloaded_) { ClearDial(); resPreloaded_ = false; - filePath_ = filePath; - state_ = state; } + filePath_ = filePath; + state_ = state; +} void DialViewGroup::UpdateStateShow() { @@ -216,212 +188,174 @@ namespace OHOS WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DialViewGroup::GetElapseTime %d", elapseTime); } - void DialViewGroup::ProcessData(DialDataType type, DialView *view) - { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DialViewGroup::ProcessData type %d\r\n", type); - int16_t value = static_cast(type) >> 14; // 14: bit shift - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DialViewGroup::ProcessData value %d\r\n", value); - 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; - bool ret = ModelDialDataFactory::GetInstance().GetDialTextData(type, textData, num); - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ModelDialDataFactory type %d num %d ret %d textData %s\r\n", type, num, ret,textData->c_str()); - 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::DoStop(void) - { - SetLableAnimatorState(Animator::PAUSE); - SetImgAnimatorState(Animator::PAUSE); - if (video_ != nullptr && !video_->IsStopped()) - { - video_->StopPlay(); +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; + if (!ModelDialDataFactory::GetInstance().GetDialTextData(type, textData, num)) { + std::string tmp = ""; + view->HandleTextData(&tmp, 1); + return; } - if (kaleidoscope_ != nullptr) - { - kaleidoscope_->StopRotateAnimator(); - kaleidoscope_->ClearFocus(); + view->HandleTextData(textData, num); + } else if (value == 2) { // 2: multifloat + float* floatsData = nullptr; + int16_t num = 0; + if (!ModelDialDataFactory::GetInstance().GetDialFloatData(type, floatsData, num)) { + float tmp = 0.0; + view->HandleFloatData(&tmp, 1); + return; } + view->HandleFloatData(floatsData, num); + } else { + GRAPHIC_LOGW("invalid datatype %d", static_cast(type)); } +} +void DialViewGroup::DoStop(void) +{ + SetLableAnimatorState(Animator::PAUSE); + SetImgAnimatorState(Animator::PAUSE); + if (video_ != nullptr && !video_->IsStopped()) { + video_->StopPlay(); + } + if (kaleidoscope_ != nullptr) { + kaleidoscope_->StopRotateAnimator(); + kaleidoscope_->ClearFocus(); + } +} - void DialViewGroup::DoStart(void) - { - SetLableAnimatorState(Animator::START); +void DialViewGroup::DoStart(void) +{ + SetLableAnimatorState(Animator::START); + if (isSeqImgLoaded_) { SetImgAnimatorState(Animator::START); - if (video_ != nullptr) - { - if (video_->IsPaused()) - { - video_->ResumePlay(); - } - else if (!video_->IsPlayed()) - { - video_->StartPlay(); - } - } - if (kaleidoscope_ != nullptr) - { - kaleidoscope_->RequestFocus(); - kaleidoscope_->StartRotateAnimator(); + } + if (video_ != nullptr) { + if (video_->IsPaused()) { + video_->ResumePlay(); + } else if (!video_->IsPlayed()) { + video_->StartPlay(); } } + if (kaleidoscope_ != nullptr) { + kaleidoscope_->RequestFocus(); + kaleidoscope_->StartRotateAnimator(); + } +} - void DialViewGroup::DoPause(void) - { - SetLableAnimatorState(Animator::PAUSE); - SetImgAnimatorState(Animator::PAUSE); - if (kaleidoscope_ != nullptr) - { - kaleidoscope_->StopRotateAnimator(); - kaleidoscope_->ClearFocus(); - } - if (video_ != nullptr) - { - video_->PausePlay(); - } +void DialViewGroup::DoPause(void) +{ + SetLableAnimatorState(Animator::PAUSE); + SetImgAnimatorState(Animator::PAUSE); + if (kaleidoscope_ != nullptr) { + kaleidoscope_->StopRotateAnimator(); + kaleidoscope_->ClearFocus(); + } + if (video_ != nullptr) { + video_->PausePlay(); } +} - void DialViewGroup::RecordSpecial(UIView *view) - { - if (dynamic_cast(view) != nullptr) - { - UILabel *label = dynamic_cast(view); - uint8_t mode = label->GetLineBreakMode(); - if (mode == UILabel::LINE_BREAK_MARQUEE || mode == UILabel::LINE_BREAK_OSCILLATION) - { - rollingLabelList_.PushBack(label); - } - } - else if (dynamic_cast(view) != nullptr) - { - UIImageAnimatorView *imgAnim = dynamic_cast(view); - imgAnimList_.PushBack(imgAnim); - } - else if (dynamic_cast(view) != nullptr) - { - kaleidoscope_ = dynamic_cast(view); - } - else if (dynamic_cast(view) != nullptr) - { - if (video_ != nullptr) - { - GRAPHIC_LOGE("Already added a video view.\n"); - return; - } - video_ = reinterpret_cast(view); - } - else if (dynamic_cast(view) != nullptr) - { - DialSequenceContainer *seq = dynamic_cast(view); - seqList_.PushBack(seq); +void DialViewGroup::RecordSpecial(UIView *view) +{ + if (dynamic_cast(view) != nullptr) { + UILabel* label = dynamic_cast(view); + uint8_t mode = label->GetLineBreakMode(); + if (mode == UILabel::LINE_BREAK_MARQUEE || mode == UILabel::LINE_BREAK_OSCILLATION) { + rollingLabelList_.PushBack(label); + } + } else if (dynamic_cast(view) != nullptr) { + UIImageAnimatorView* imgAnim = dynamic_cast(view); + imgAnimList_.PushBack(imgAnim); + } else if (dynamic_cast(view) != nullptr) { + kaleidoscope_ = dynamic_cast(view); + } else if (dynamic_cast(view) != nullptr) { + if (video_ != nullptr) { + GRAPHIC_LOGE("Already added a video view.\n"); + return; } + video_ = reinterpret_cast(view); } +} - void DialViewGroup::RecordBindData(DialDataType type, DialView *view, bool isPeriodic) - { - if (dynamic_cast(view) != nullptr) - { - UILabel *label = dynamic_cast(view); - uint8_t mode = label->GetLineBreakMode(); - if (mode == UILabel::LINE_BREAK_MARQUEE || mode == UILabel::LINE_BREAK_OSCILLATION) - { - rollingLabelList_.PushBack(label); - } +void DialViewGroup::RecordBindData(DialDataType type, DialView* view, bool isPeriodic) +{ + if (dynamic_cast(view) != nullptr) { + UILabel* label = dynamic_cast(view); + uint8_t mode = label->GetLineBreakMode(); + if (mode == UILabel::LINE_BREAK_MARQUEE || mode == UILabel::LINE_BREAK_OSCILLATION) { + rollingLabelList_.PushBack(label); } + } - auto it = dataTypeMap_.find(static_cast(type)); - if (it != dataTypeMap_.end()) - { - it->second->PushBack(view); - } - else - { - Views *container = new Views; - if (container == nullptr) - { - GRAPHIC_LOGE("failed to alloc binddata container"); - return; - } - container->PushBack(view); - dataTypeMap_.insert(std::make_pair(static_cast(type), container)); - viewsMemPool_.PushBack(container); - } - if (isPeriodic) - { - periodicUpdateTypes_.PushBack(type); - } - else - { - ModelDialDataFactory::GetInstance().RegisterDialDataListener(type, this); - passiveUpdateTypes_.PushBack(type); + auto it = dataTypeMap_.find(static_cast(type)); + if (it != dataTypeMap_.end()) { + it->second->PushBack(view); + } else { + Views *container = new Views; + if (container == nullptr) { + GRAPHIC_LOGE("failed to alloc binddata container"); + return; } + container->PushBack(view); + dataTypeMap_.insert(std::make_pair(static_cast(type), container)); + viewsMemPool_.PushBack(container); } + view->SetDataType(type); + if (isPeriodic) { + periodicUpdateTypes_.PushBack(type); + } else { + ModelDialDataFactory::GetInstance().RegisterDialDataListener(type, this); + passiveUpdateTypes_.PushBack(type); + } +} - void DialViewGroup::ClearViews() - { - dataTypeMap_.clear(); - for (uint16_t i = 0; i < viewsMemPool_.Size(); ++i) - { - delete viewsMemPool_[i]; - } - viewsMemPool_.Clear(); +void DialViewGroup::ClearViews() +{ + dataTypeMap_.clear(); + for (uint16_t i = 0; i < viewsMemPool_.Size(); ++i) { + delete viewsMemPool_[i]; } + viewsMemPool_.Clear(); +} - void DialViewGroup::AddView(UIView *view) - { - if (view == nullptr) - { - GRAPHIC_LOGE("Parameter is nullptr.\n"); - return; - } - dialViews_.PushBack(view); - Add(view); - DialViewContainer *container = dynamic_cast(view); - if (container != nullptr) - { - ListNode *head = container->Begin(); - for (; head != container->End(); head = head->next_) - { - DialViewContainer::SubView &subView = head->data_; - if (subView.dialView != nullptr) - { - RecordBindData(subView.type, subView.dialView, subView.isPeriodic); - ProcessData(subView.type, subView.dialView); - } - else if (subView.view != nullptr) - { - RecordSpecial(subView.view); - } +void DialViewGroup::AddView(UIView* view) +{ + if (view == nullptr) { + GRAPHIC_LOGE("Parameter is nullptr.\n"); + return; + } + dialViews_.PushBack(view); + Add(view); + DialViewContainer *container = dynamic_cast(view); + if (container != nullptr) { + ListNode *head = container->Begin(); + for (;head != container->End(); head = head->next_) { + DialViewContainer::SubView &subView = head->data_; + if (subView.dialView != nullptr) { + RecordBindData(subView.type, subView.dialView, subView.isPeriodic); + ProcessData(subView.type, subView.dialView); + } else if (subView.view != nullptr) { + RecordSpecial(subView.view); } } - else - { - RecordSpecial(view); - } + } else { + RecordSpecial(view); } +} - void DialViewGroup::AddView(DialDataType type, DialView *view, bool isPeriodic) - { - if (view == nullptr) - { - GRAPHIC_LOGE("Parameter is nullptr.\n"); - return; - } +void DialViewGroup::AddView(DialDataType type, DialView* view, bool isPeriodic) +{ + if (view == nullptr) { + GRAPHIC_LOGE("Parameter is nullptr.\n"); + return; + } DialDigitalImgView *digital = dynamic_cast(view); if (digital != nullptr) @@ -450,6 +384,36 @@ namespace OHOS { return period_; } + // 更新数据 + 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()) { + Views *container = iter->second; + for (uint16_t i = 0; i < container->Size(); ++i) { + ProcessData(type, (*container)[i]); + } + } + node = node->next_; + } + if (LowPowerManager::GetInstance()->IsLiteSurfaceInRootView()) { + Invalidate(); + } + // ota进行视频暂停 + if (uapi_dev_runtime_get_transmitting_status() == 1 || uapi_dev_runtime_get_restore_factory_status() == 1) + { + // 暂停视频 + DoPause(); + } + else + { + // 获取视频 + DoStart(); + } + } void DialViewGroup::OnDialFloatDataUpdate(DialDataType type, float data) { @@ -560,222 +524,158 @@ namespace OHOS return false; } - void DialViewGroup::ScrollBegin(bool isActive) - { - if (isActive) - { - DoPause(); - } +void DialViewGroup::ScrollBegin(bool isActive) +{ + if (isActive) { + DoPause(); } +} - void DialViewGroup::ScrollEnd(bool isActive) - { - MainPresenterSample *mainPresenter = MainPresenterSample::GetInstance(); - if ((mainPresenter == nullptr) || (mainPresenter->GetMainPresenterState() != MainPresenterState::RESUME)) - { - return; - } +void DialViewGroup::ScrollEnd(bool isActive) +{ + MainPresenterSample* mainPresenter = MainPresenterSample::GetInstance(); + if ((mainPresenter == nullptr) || (mainPresenter->GetMainPresenterState() != MainPresenterState::RESUME)) { + return; + } - if (isActive) - { - DoStart(); + if (isActive) { + DoStart(); + } else { + if (video_ != nullptr && !video_->IsStopped()) { + video_->StopPlay(); } - else - { - if (video_ != nullptr && !video_->IsStopped()) - { - video_->StopPlay(); - } - if (video_ != nullptr) - { - ClearCache(); - } + if (video_ != nullptr) { + ClearCache(); } } +} - void DialViewGroup::CoverBegin(bool isCovered) - { - if (!isCovered) - { - DoPause(); - } +void DialViewGroup::CoverBegin(bool isCovered) +{ + if (!isCovered) { + DoPause(); } +} - void DialViewGroup::CoverEnd(bool isCovered) - { - MainPresenterSample *mainPresenter = MainPresenterSample::GetInstance(); - if ((mainPresenter == nullptr) || (mainPresenter->GetMainPresenterState() != MainPresenterState::RESUME)) - { - return; - } - - if (!isCovered) - { - DoStart(); - } +void DialViewGroup::CoverEnd(bool isCovered) +{ + MainPresenterSample* mainPresenter = MainPresenterSample::GetInstance(); + if ((mainPresenter == nullptr) || (mainPresenter->GetMainPresenterState() != MainPresenterState::RESUME)) { + return; } - void DialViewGroup::OnActive(void) - { - MainPresenterSample *mainPresenter = MainPresenterSample::GetInstance(); - if ((mainPresenter == nullptr) || (mainPresenter->GetMainPresenterState() != MainPresenterState::RESUME)) - { - return; - } - + if (!isCovered) { DoStart(); } +} - void DialViewGroup::OnInactive(void) - { - DoStop(); +void DialViewGroup::OnActive(void) +{ + MainPresenterSample* mainPresenter = MainPresenterSample::GetInstance(); + if ((mainPresenter == nullptr) || (mainPresenter->GetMainPresenterState() != MainPresenterState::RESUME)) { + return; + } + if (!isSeqImgLoaded_) { + std::weak_ptr wk = isExists_; + GraphicService::GetInstance()->ForceRefreshImmediately(); + GraphicService::GetInstance()->PostGraphicEvent([this, wk]() { + if (wk.expired()) { + return; + } + + InputDeviceManager::GetInstance()->ClearInputDeviceState(); + ListNode *node = imgAnimList_.Begin(); + while (node != imgAnimList_.End()) { + if (node->data_ != nullptr) { + DialSequenceImgView *imgAnim = dynamic_cast(node->data_); + if (imgAnim != nullptr) { + imgAnim->LoadCurSeqImgs(); + imgAnim->Start(); + } + } + node = node->next_; + } + isSeqImgLoaded_ = true; + }); } - void DialViewGroup::OnCovered(void) - { - MainPresenterSample *mainPresenter = MainPresenterSample::GetInstance(); - if ((mainPresenter == nullptr) || (mainPresenter->GetMainPresenterState() != MainPresenterState::RESUME)) - { - return; - } + DoStart(); +} - DoPause(); +void DialViewGroup::OnInactive(void) +{ + DoStop(); +} + +void DialViewGroup::OnCovered(void) +{ + MainPresenterSample* mainPresenter = MainPresenterSample::GetInstance(); + if ((mainPresenter == nullptr) || (mainPresenter->GetMainPresenterState() != MainPresenterState::RESUME)) { + return; } - void DialViewGroup::OnUncovered(void) - { - MainPresenterSample *mainPresenter = MainPresenterSample::GetInstance(); - if ((mainPresenter == nullptr) || (mainPresenter->GetMainPresenterState() != MainPresenterState::RESUME)) - { - return; - } + DoPause(); +} - DoStart(); +void DialViewGroup::OnUncovered(void) +{ + MainPresenterSample* mainPresenter = MainPresenterSample::GetInstance(); + if ((mainPresenter == nullptr) || (mainPresenter->GetMainPresenterState() != MainPresenterState::RESUME)) { + return; } - void DialViewGroup::OnPause() - { - DoPause(); + DoStart(); +} + +void DialViewGroup::OnPause() +{ + DoPause(); +} + +MediaVideoPlay* DialViewGroup::GetVideoPlay() +{ + if (video_ != nullptr) { + return video_->GetVideoPlay(); } + return nullptr; +} - void DialViewGroup::SetLableAnimatorState(uint8_t state) - { - if (rollingLabelList_.IsEmpty()) - { - return; - } +void DialViewGroup::SetLableAnimatorState(uint8_t state) +{ + if (rollingLabelList_.IsEmpty()) { + return; + } - ListNode *node = rollingLabelList_.Begin(); - while (node != rollingLabelList_.End()) - { - if (node->data_ != nullptr) - { - UILabel *label = node->data_; - label->SetAnimState(state); - } - node = node->next_; + ListNode* node = rollingLabelList_.Begin(); + while (node != rollingLabelList_.End()) { + if (node->data_ != nullptr) { + UILabel* label = node->data_; + label->SetAnimState(state); } + node = node->next_; } +} - void DialViewGroup::SetImgAnimatorState(uint8_t state) - { - if (imgAnimList_.IsEmpty() && seqList_.IsEmpty()) - { - return; - } +void DialViewGroup::SetImgAnimatorState(uint8_t state) +{ + if (imgAnimList_.IsEmpty()) { + return; + } - ListNode *node = imgAnimList_.Begin(); - while (node != imgAnimList_.End()) - { - if (node->data_ != nullptr) - { - UIImageAnimatorView *imgAnim = node->data_; - switch (state) - { + ListNode* node = imgAnimList_.Begin(); + while (node != imgAnimList_.End()) { + if (node->data_ != nullptr) { + UIImageAnimatorView* imgAnim = node->data_; + switch (state) { case Animator::PAUSE: imgAnim->Pause(); break; case Animator::START: imgAnim->Resume(); break; - } - } - node = node->next_; - } - - ListNode *it = seqList_.Begin(); - while (it != seqList_.End()) - { - if (it->data_ != nullptr) - { - switch (state) - { - case Animator::PAUSE: - it->data_->Pause(); - break; - case Animator::START: - it->data_->Resume(); - break; - } - } - it = it->next_; - } - } - - MediaVideoPlay *DialViewGroup::GetVideoPlay() - { - if (video_ != nullptr) - { - return video_->GetVideoPlay(); - } - return nullptr; - } - - void DialViewGroup::StopDial() - { - DoStop(); - } - void DialViewGroup::StartDial() - { - MainPresenterSample *mainPresenter = MainPresenterSample::GetInstance(); - if ((mainPresenter == nullptr) || (mainPresenter->GetMainPresenterState() != MainPresenterState::RESUME)) - { - 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()) - { - Views *container = iter->second; - for (uint16_t i = 0; i < container->Size(); ++i) - { - ProcessData(type, (*container)[i]); - } } - node = node->next_; - } - if (LowPowerManager::GetInstance()->IsLiteSurfaceInRootView()) - { - Invalidate(); - } - // ota进行视频暂停 - if (uapi_dev_runtime_get_transmitting_status() == 1 || uapi_dev_runtime_get_restore_factory_status() == 1) - { - // 暂停视频 - StopDial(); - } - else - { - // 获取视频 - StartDial(); } + node = node->next_; } -} \ No newline at end of file +} +} // namespace OHOS diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/ModelDialDataFactory.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/ModelDialDataFactory.cpp index 81c7106fd..d17de5b31 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/ModelDialDataFactory.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/ModelDialDataFactory.cpp @@ -43,24 +43,6 @@ DialBaseModel* ModelDialDataFactory::GetModuleByType(DialDataType& type) return iter->second; } -bool ModelDialDataFactory::IsOHBindDataExist(DialOHDataType type) const -{ - auto it = g_bindDataConverter.find(type); - if (it == g_bindDataConverter.end()) { - return false; - } - return IsBindDataExist(it->second); -} - -bool ModelDialDataFactory::IsBindDataExist(DialDataType type) const -{ - auto it = models_.find(static_cast(type)); - if (it != models_.end() && it->second != nullptr) { - return true; - } - return false; -} - bool ModelDialDataFactory::RegisterDialDataListener(DialDataType type, OnDialDataUpdateListener* listener) { DialBaseModel* model = GetModuleByType(type); diff --git a/code/sdk/application/wearable/nativeapp/brandy-auto-ota-cli/libuikit_fwk.a b/code/sdk/application/wearable/nativeapp/brandy-auto-ota-cli/libuikit_fwk.a index c530718d4..f8834ae85 100644 Binary files a/code/sdk/application/wearable/nativeapp/brandy-auto-ota-cli/libuikit_fwk.a and b/code/sdk/application/wearable/nativeapp/brandy-auto-ota-cli/libuikit_fwk.a differ diff --git a/code/sdk/application/wearable/nativeapp/brandy-auto-ota-ser/libuikit_fwk.a b/code/sdk/application/wearable/nativeapp/brandy-auto-ota-ser/libuikit_fwk.a index 410571e58..9c513d8e2 100644 Binary files a/code/sdk/application/wearable/nativeapp/brandy-auto-ota-ser/libuikit_fwk.a and b/code/sdk/application/wearable/nativeapp/brandy-auto-ota-ser/libuikit_fwk.a differ diff --git a/code/sdk/application/wearable/nativeapp/brandy-native-js-fd230/libuikit_fwk.a b/code/sdk/application/wearable/nativeapp/brandy-native-js-fd230/libuikit_fwk.a index 55d73657a..b1ab9d2d0 100644 Binary files a/code/sdk/application/wearable/nativeapp/brandy-native-js-fd230/libuikit_fwk.a and b/code/sdk/application/wearable/nativeapp/brandy-native-js-fd230/libuikit_fwk.a differ diff --git a/code/sdk/application/wearable/nativeapp/brandy-native-js/libuikit_fwk.a b/code/sdk/application/wearable/nativeapp/brandy-native-js/libuikit_fwk.a index 55d73657a..b1ab9d2d0 100644 Binary files a/code/sdk/application/wearable/nativeapp/brandy-native-js/libuikit_fwk.a and b/code/sdk/application/wearable/nativeapp/brandy-native-js/libuikit_fwk.a differ diff --git a/code/sdk/application/wearable/nativeapp/brandy-xts/libuikit_fwk.a b/code/sdk/application/wearable/nativeapp/brandy-xts/libuikit_fwk.a index 2c30eba89..7864f090a 100644 Binary files a/code/sdk/application/wearable/nativeapp/brandy-xts/libuikit_fwk.a and b/code/sdk/application/wearable/nativeapp/brandy-xts/libuikit_fwk.a differ diff --git a/code/sdk/application/wearable/nativeapp/nativeui/main/include/DialBinParserV3.h b/code/sdk/application/wearable/nativeapp/nativeui/main/include/DialBinParserV3.h index 1d5e2ca9d..99d530e89 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/main/include/DialBinParserV3.h +++ b/code/sdk/application/wearable/nativeapp/nativeui/main/include/DialBinParserV3.h @@ -8,10 +8,10 @@ #ifndef GRAPHIC_LITE_DIAL_BIN_PARSER_V3_H #define GRAPHIC_LITE_DIAL_BIN_PARSER_V3_H #include "DialBinParserManager.h" -#include "DialTimePublisher.h" +#include "DialModelTime.h" #include "components/ui_abstract_progress.h" #include "DialViewContainer.h" -#include "DialOHDataType.h" +#include "DialDataType.h" #include "DialOHSliceId.h" namespace OHOS { @@ -47,21 +47,21 @@ private: bool (DialBinParserV3::*funcArray_[DIAL_BIN_PARSER_FUNC_NUM])(ContainerInterface&); void AddToParentWithView(ContainerInterface &parent, uint8_t displayMode, UIView *view); void AddToParentWithDialView(ContainerInterface &parent, uint8_t displayMode, - DialView *view, DialOHDataType bindData, bool isPeriodic); + DialView *view, DialDataType bindData, bool isPeriodic); struct { uint8_t *viewType; uint8_t dialViewCount; FILE *file; uint8_t curIndex; } curViewType_; - bool ParseTimeIntervals(FILE* fp, uint8_t cnt, DialTimePublisher::TimeChangeListener *listener); + bool ParseTimeIntervals(FILE* fp, uint8_t cnt, TimeChangeListener *listener); bool ParseViewType(uint8_t *viewType, uint8_t dialViewCount, FILE *file); bool ParseContainerSubviews(DialViewContainer *container, uint8_t num); bool ParseOptionsSubviews(ContainerInterface &parent); DialViewGroup* dialGroup_ = nullptr; std::string file_; - uint32_t dirId_ = 0xfef << 20; // 20: offset + const uint32_t dirId_ = 0xfef << 20; // 20: offset uint32_t imageOffset_ = 0; DisplayState state_ = DisplayState::NORMAL; }; // class DialBinParserV3 diff --git a/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialDataBase.h b/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialDataBase.h index d9bc68b3c..e6d52b7ec 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialDataBase.h +++ b/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialDataBase.h @@ -7,8 +7,9 @@ #ifndef DIAL_DATA_BASE_H #define DIAL_DATA_BASE_H +#include "DialDataType.h" -enum class DialDataType { +enum class DialOldDataType { DATA_TYPE_FLOAT_BASE = 0, DATA_TYPE_STEPS, DATA_TYPE_HEART_RATE, @@ -30,17 +31,12 @@ enum class DialDataType { DATA_TYPE_TIME_MONTH, DATA_TYPE_TIME_YEAR, - DATA_TYPE_SWIVEL_GEAR_ONE = 20, - DATA_TYPE_SWIVEL_GEAR_TWO, - DATA_TYPE_SWIVEL_GEAR_THREE, - DATA_TYPE_SWIVEL_GEAR_FOUR, - DATA_TYPE_SWIVEL_GEAR_FIVE, - DATA_TYPE_SWIVEL_GEAR_SIX, - DATA_TYPE_TEXT_BASE = 0x2000, DATA_TYPE_MULTI_FLOAT_BASE = 0x4000, DATA_TYPE_MAX = 0x6000 }; + +OHOS::DialDataType Convert2DataType(DialOldDataType dialData); #endif diff --git a/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialDataType.h b/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialDataType.h new file mode 100644 index 000000000..8f1632072 --- /dev/null +++ b/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialDataType.h @@ -0,0 +1,184 @@ +/* + * Copyright (c) CompanyNameMagicTag 2025. All rights reserved. + * Description: DialDataType + * Author: + * Create: 2025-02-15 + */ + +#ifndef DIAL_DATA_TYPE_H +#define DIAL_DATA_TYPE_H + +#include + +namespace OHOS { +enum class DialDataType : int16_t { + // 起始:单个浮点数据,OH标准协议部分,禁止改动,从0开始(包括0,二进制格式为:0000,xxxx,xxxx,xxxx) + DATA_TYPE_FLOAT_BASE = 0, + CLOCK = 1, + CLOCK_HIGH = 2, + CLOCK_LOW = 3, + CLOCK_RATIO_12H = 4, + CLOCK_RATIO_24H = 5, + MINUTE_TIME = 6, + MINUTE_HIGH = 7, + MINUTE_LOW = 8, + MINUTE_RATIO = 9, + SECOND_TIME = 10, + SECOND_HIGH = 11, + SECOND_LOW = 12, + SECOND_RATIO = 13, + AM_PM = 14, + HOUR_FORMAT = 16, + PREV_HOUR = 17, + NEXT_HOUR = 18, + CLOCK_ANGLE = 19, + MINUTE_ANGLE = 20, + SECOND_ANGLE = 21, + MILLISECOND_ANGLE = 22, + PREV_SECOND = 25, + NEXT_SECOND = 26, + PREV_2_SECONDS = 27, + PREV_MINUTE = 28, + NEXT_MINUTE = 29, + DUAL_TIMEZONE_CLOCK = 30, + DUAL_TIMEZONE_CLOCK_HIGH = 31, + DUAL_TIMEZONE_CLOCK_LOW = 32, + DUAL_TIMEZONE_CLOCK_RATIO_12H = 33, + DUAL_TIMEZONE_CLOCK_RATIO_24H = 34, + DUAL_TIMEZONE_MINUTE = 35, + DUAL_TIMEZONE_MINUTE_HIGH = 36, + DUAL_TIMEZONE_MINUTE_LOW = 37, + DUAL_TIMEZONE_MINUTE_RATIO = 38, + DUAL_TIMEZONE_AMPM = 41, + SUNRISE_SUNSET_IMAGE = 50, + SUNRISE_SUNSET_CLOCK_HIGH = 51, + SUNRISE_SUNSET_CLOCK_LOW = 52, + SUNRISE_SUNSET_MINUTE_HIGH = 53, + SUNRISE_SUNSET_MINUTE_LOW = 54, + DATE = 70, + DATE_HIGH = 71, + DATE_LOW = 72, + DATE_31_DAY_RATIO = 73, + YESTERDAY = 74, + YESTERDAY_DATE_HIGH = 75, + YESTERDAY_DATE_LOW = 76, + TOMORROW = 77, + TOMORROW_DATE_HIGH = 78, + TOMORROW_DATE_LOW = 79, + MONTH_DATA = 80, + MONTH = 81, + WEEKDAY_DATA = 83, + WEEKDAY_RATIO = 84, + CHINESE_HOUR = 86, + MOON_PHASE = 87, + PREV_MONTH = 88, + NEXT_MONTH = 89, + SOLAR_YEAR = 240, + YEAR_ONES = 241, + YEAR_TENS = 242, + YEAR_HUNDREDS = 243, + YEAR_THOUSANDS = 244, + LUNAR_MONTH = 90, + LUNAR_DATE_HIGH = 91, + LUNAR_DATE_LOW = 92, + BATTERY = 100, + BATTERY_ENUM = 102, + BATTERY_STATUS_ENUM = 103, + BATTERY_LEVEL = 104, + CHARGING_STATUS = 105, + STEP_COUNT = 110, + STEP_ONES = 111, + STEP_TENS = 112, + STEP_HUNDREDS = 113, + STEP_THOUSANDS = 114, + STEP_TENS_OF_THOUSANDS = 115, + STEP_GOAL_PROGRESS = 116, + STEP_GOAL_PROGRESS_ENUM = 117, + CALORIE = 120, + CALORIE_RATIO = 121, + CALORIE_GOAL_PROGRESS_ENUM = 122, + HEART_RATE = 130, + MAX_HEART_RATE = 131, + MIN_HEART_RATE = 132, + HEART_RATE_ZONE = 133, + HEART_RATE_RATIO = 134, + STRESS_LEVEL = 140, + STRESS_RATIO = 141, + STRESS_LEVEL_TYPE = 142, + MODERATE_HIGH_INTENSITY_TIME = 150, + MODERATE_HIGH_INTENSITY_TIME_RATIO = 151, + STAND_COUNT = 152, + STAND_COUNT_RATIO = 153, + MAX_VO2 = 160, + MAX_VO2_RATIO = 161, + SLEEP_RATIO = 166, + SLEEP_GOAL_PROGRESS_ENUM = 167, + TEMPERATURE = 170, + MAX_TEMPERATURE = 171, + MIN_TEMPERATURE = 172, + CURRENT_TEMPERATURE_MINUS_1 = 173, + CURRENT_TEMPERATURE_PLUS_1 = 174, + TEMPERATURE_TYPE = 175, + WEATHER_TYPE = 176, + TEMPERATURE_RATIO = 177, + PRESSURE = 180, + PRESSURE_RATIO = 181, + AQI = 182, + AQI_LEVEL = 183, + AQI_RATIO = 184, + ALTITUDE_DATA = 191, + ALTITUDE_UNIT = 192, + ALTITUDE_RATIO = 193, + DISTANCE_DATA = 195, + DISTANCE_UNIT = 196, + DISTANCE_GOAL_PROGRESS = 197, + BLE_CONNECTION_STATUS = 210, + BT_CONNECTION_STATUS = 211, + BLOOD_OXYGEN = 220, + SYSTOLIC_BLOOD_PRESSURE = 221, + DIASTOLIC_BLOOD_PRESSURE = 222, + DUAL_LANGUAGE_SYSTEM = 230, + UNREAD_SMS_MSG = 250, + UNREAD_WECHAT_MSG = 251, + // 结束:单个浮点数据,OH标准协议部分,禁止改动,到4095结束(包括4095) + + // 起始:单个浮点数据,私有可定制部分,从4096开始(包括4096,二进制格式为:0001,xxxx,xxxx,xxxx) + SWIVEL_GEAR_POSITIVE = 8190, // private data, clockwise + SWIVEL_GEAR_NEGATIVE = 8191, // counterclockwise + // 结束:单个浮点数据,私有可定制部分,到8191结束(包括8191) + + // 起始:文本数据,OH标准协议部分,禁止改动,从8192开始(包括8192,二进制格式为:0010,xxxx,xxxx,xxxx) + DATA_TYPE_TEXT_BASE = 8192, + AM_PM_TEXT = 8193, + SUNRISE_TEXT = 8210, + SUNSET_TEXT = 8211, + MOONRISE_TEXT = 8221, + MOONSET_TEXT = 8222, + DUAL_TIMEZONE_ABBR_TEXT = 8200, + DUAL_TIMEZONE_TIME_TEXT = 8201, + DUAL_TIMEZONE_AM_PM_TEXT = 8202, + MONTH_TEXT = 8230, + DATE_TEXT = 8231, + WEEKDAY_TEXT = 8232, + LUNAR_YEAR = 8240, + SLEEP_TEXT = 8250, + DISTANCE_TEXT = 8260, + TIDE_RISE_TIME_TEXT = 8270, + TIDE_FALL_TIME_TEXT = 8271, + // 结束:文本数据,OH标准协议部分,禁止改动,到12287结束(包括12287) + + // 文本数据,私有可定制部分,从12288开始(包括12288,二进制格式为:0011,xxxx,xxxx,xxxx) + // 文本数据,私有可定制部分,到16383结束(包括16383) + + // 起始:多个浮点数据,OH标准协议部分,禁止改动,从16384开始(包括16384,二进制格式为:0100,xxxx,xxxx,xxxx) + DATA_TYPE_MULTI_FLOAT_BASE = 16384, + // 结束:多个浮点数据,OH标准协议部分,禁止改动,到20479结束(包括20479) + + // 起始:多个浮点数据,私有可定制部分,从20480开始(包括20480,二进制格式为:0101,xxxx,xxxx,xxxx) + // 结束:多个浮点数据,私有可定制部分,到24575结束(包括24575) + + DATA_TYPE_MAX = 0x6000, +}; // enum class DialDataType +} // namespace OHOS + +#endif // DIAL_DATA_TYPE_H diff --git a/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialDigitalImgView.h b/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialDigitalImgView.h index 5b3249662..540c491b5 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialDigitalImgView.h +++ b/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialDigitalImgView.h @@ -7,7 +7,7 @@ #include #include "DialView.h" -#include "DialTimePublisher.h" +#include "DialModelTime.h" #include "components/ui_image_view.h" #include "gfx_utils/graphic_math.h" #include "components/ui_view_group.h" @@ -20,7 +20,7 @@ enum class ImgAlign { RIGHT, }; -class DialDigitalImgView : public UIImageView, public DialView, public DialTimePublisher::TimeChangeListener { +class DialDigitalImgView : public UIImageView, public DialView, public TimeChangeListener { public: DialDigitalImgView(); ~DialDigitalImgView() override; diff --git a/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialModelTime.h b/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialModelTime.h index 43cd8b08d..d71982f5f 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialModelTime.h +++ b/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialModelTime.h @@ -9,31 +9,30 @@ #define DIAL_MODEL_TIME_H #include "DialBaseModel.h" -#include "DialTimePublisher.h" #include "gfx_utils/list.h" namespace OHOS { -class DialModelTime : public DialBaseModel, public DialTimePublisher { +class TimeChangeListener; +class DialModelTime : public DialBaseModel { public: - DialModelTime() - { - DialModelTime::SetPublisher(dynamic_cast(this)); - } ~DialModelTime() override { listeners_.Clear(); } + static DialModelTime* GetInstance() { static DialModelTime instance; return &instance; } + bool GetDialFloatData(DialDataType& type, float& out) override; - void UpdateTime() override; - void Register(TimeChangeListener* listener) override; - void Unregister(TimeChangeListener* listener) override; + void UpdateTime(); + void Register(TimeChangeListener* listener); + void Unregister(TimeChangeListener* listener); private: + DialModelTime() = default; struct tm *tblock_; uint16_t angleH_ = 0; uint16_t angleM_ = 0; @@ -41,5 +40,23 @@ private: float angleMS_ = 0; List listeners_; }; -} + +class TimeChangeListener { +public: + struct TimeInterval { + uint8_t start; + uint8_t end; + }; + virtual void OnTimeUpdate(const struct tm &curTime) = 0; + void SetTimeInervals(TimeInterval *intervals, uint8_t num); + bool IsInTimeInterval(const struct tm &curTime); + TimeChangeListener(const TimeChangeListener&) = delete; + TimeChangeListener& operator=(const TimeChangeListener&) = delete; + TimeChangeListener(); + virtual ~TimeChangeListener(); +private: + TimeInterval *intervals_ = nullptr; + uint8_t num_ = 0; +}; +} // namespace OHOS #endif diff --git a/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialOHDataType.h b/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialOHDataType.h deleted file mode 100644 index 83f8f0fc8..000000000 --- a/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialOHDataType.h +++ /dev/null @@ -1,189 +0,0 @@ -/* - * Copyright (c) CompanyNameMagicTag 2025. All rights reserved. - * Description: DialOHDataType - * Author: - * Create: 2025-02-15 - */ - -#ifndef DIAL_OH_DATATYPE_H -#define DIAL_OH_DATATYPE_H - -#include -#include "DialDataBase.h" - -namespace OHOS { -enum class DialOHDataType : int16_t { - CLOCK = 1, - CLOCK_HIGH_BIT = 2, - CLOCK_LOW_BIT = 3, - CLOCK_RATIO_12 = 4, - CLOCK_RATIO_24 = 5, - MINUTES = 6, - MINUTES_HIGH_BIT = 7, - MINUTES_LOW_BIT = 8, - MINUTES_RATIO = 9, - SECONDS = 10, - SECONDS_HIGH_BIT = 11, - SECONDS_LOW_BIT = 12, - SECONDS_RATIO = 13, - AM_PM = 14, - AMPM_TEXT = 15, - HOUR_MODE = 16, - PREVIOUS_HOUR = 17, - NEXT_HOUR = 18, - CLOCK_ANGLE = 19, - MINUTE_ANGLE = 20, - SECONDS_ANGLE = 21, - MILLISECOND_ANGLE = 22, - PREVIOUS_SECOND = 25, - NEXT_SECOND = 26, - PREVIOUS_SECOND_PREVIOUS_SECOND = 27, - PREVIOUS_MINUTE = 28, - NEXT_MINUTE = 29, - DUAL_TIME_ZONE_CLOCK = 30, - DUAL_TIME_ZONE_CLOCK_HIGH_BIT = 31, - DUAL_TIME_ZONE_CLOCK_LOW_BIT = 32, - DUAL_TIME_ZONE_CLOCK_RATIO_12 = 33, - DUAL_TIME_ZONE_CLOCK_RATIO_24 = 34, - DUAL_TIME_ZONE_MINUTES = 35, - DUAL_TIME_ZONE_MINUTES_HIGH_BIT = 36, - DUAL_TIME_ZONE_MINUTES_LOW_BIT = 37, - DUAL_TIME_ZONE_MINUTES_RATIO = 38, - DUAL_TIME_ZONE_ABBREVIATION_TEXT = 39, - DUAL_TIME_ZONE_TIME_MINUTE_TEXT = 40, - DUAL_TIME_ZONE_AMPM = 41, - DUAL_TIME_ZONE_AM_PM_TEXT = 42, - SUNRISE_SUNSET_PICTURE_SELECTION = 50, - SUNRISE_SUNSET_CLOCK_HIGH_BIT = 51, - SUNRISE_SUNSET_CLOCK_LOW_BIT = 52, - SUNRISE_SUNSET_MINUTES_HIGH_BIT = 53, - SUNRISE_SUNSET_MINUTES_LOW_BIT = 54, - SUNRISE_TEXT = 55, - SUNSET_TEXT = 56, - MOONRISE_TEXT = 60, - MOONSET_TEXT = 61, - DATE = 70, - DATE_HIGH_BIT = 71, - DATE_LOW_BIT = 72, - DATE_OCCUPIES_31_DAYS_RATIO = 73, - YESTERDAY = 74, - YESTERDAY_DATE_HIGH_BIT = 75, - YESTERDAY_DATE_LOW_BIT = 76, - TOMORROW = 77, - TOMORROW_DATE_HIGH_BIT = 78, - TOMORROW_DATE_LOW_BIT = 79, - MONTH_DATA = 80, - MONTH = 81, - MONTH_TEXT = 82, - WEEK_DATA = 83, - WEEK_RATIO = 84, - WEEK_TEXT = 85, - TWELVE_DIVISIONS = 86, - LUNAR_PHASE = 87, - PREVIOUS_MONTH = 88, - NEXT_MONTH = 89, - LUNAR_MONTH = 90, - LUNAR_DATE_HIGH_BIT = 91, - LUNAR_DATE_LOW_BIT = 92, - CHARGE = 100, - CHARGE_ENUMERATION = 102, - CHARGE_STATUS_ENUMERATION = 103, - CHARGE_RATIO = 104, - CHARGING_STATUS = 105, - STEPS = 110, - STEPS_UNIT_DIGIT = 111, - STEPS_TENS_DIGIT = 112, - STEPS_HUNDRED_DIGIT = 113, - STEPS_THOUSAND_DIGIT = 114, - STEPS_TEN_THOUSAND_DIGIT = 115, - STEPS_TARGET_ACHIEVEMENT_RATE = 116, - STEPS_TARGET_PROGRESS_ENUMERATION = 117, - CALORIES = 120, - CALORIES_RATIO = 121, - CALORIES_TARGET_PROGRESS_ENUMERATION = 122, - HEART_RATE = 130, - MAXIMUM_HEART_RATE = 131, - MINIMUM_HEART_RATE = 132, - HEART_RATE_RANGE = 133, - HEART_RATE_RATIO = 134, - STRESS = 140, - STRESS_RATIO = 141, - STRESS_LEVEL_TYPE = 142, - MODERATE_TO_VIGOROUS_INTENSITY_TIME = 150, - MODERATE_TO_VIGOROUS_INTENSITY_TIME_RATIO = 151, - STANDING_TIMES = 152, - STANDING_TIMES_RATIO = 153, - MAXIMUM_OXYGEN_UPTAKE = 160, - MAXIMUM_OXYGEN_UPTAKE_RATIO = 161, - SLEEP_TEXT = 165, - SLEEP_RATIO = 166, - SLEEP_TARGET_ACHIEVEMENT_RATE_ENUMERATION = 167, - TEMPERATURE = 170, - HIGHEST_TEMPERATURE = 171, - LOWEST_TEMPERATURE = 172, - CURRENT_TEMPERATURE_MINUS_ONE = 173, - CURRENT_TEMPERATURE_PLUS_ONE = 174, - TEMPERATURE_TYPE = 175, - WEATHER_TYPE = 176, - TEMPERATURE_RATIO = 177, - ATMOSPHERIC_PRESSURE = 180, - ATMOSPHERIC_PRESSURE_RATIO = 181, - AIR_QUALITY_INDEX = 182, - AIR_QUALITY_INDEX_LEVEL = 183, - AIR_QUALITY_INDEX_RATIO = 184, - ELEVATION = 190, - ELEVATION_HEIGHT_DATA = 191, - ELEVATION_HEIGHT_UNIT = 192, - HEIGHT_RATIO = 193, - DISTANCE_TEXT = 194, - DISTANCE_DATA = 195, - DISTANCE_UNIT = 196, - DISTANCE_TARGET_PROGRESS = 197, - HIGH_TIDE_TIME_TEXT = 200, - LOW_TIDE_TIME_TEXT = 201, - BLE_CONNECTION_STATUS = 210, - BT_CONNECTION_STATUS = 211, - BLOOD_OXYGEN = 220, - SYSTOLIC_BLOOD_PRESSURE = 221, - DIASTOLIC_BLOOD_PRESSURE = 222, - DUAL_LANGUAGE_SYSTEM = 230, - SWIVEL_GEAR_POSITIVE = (1 << 12) + 20, // private data, clockwise - SWIVEL_GEAR_NEGATIVE, // counterclockwise -}; // enum class DialOHDataType - -struct HashOHDataType { - size_t operator()(DialOHDataType data) const - { - return std::hash()(static_cast(data)); - } -}; - -const std::unordered_map g_bindDataConverter = { - {DialOHDataType::CLOCK, DialDataType::DATA_TYPE_TIME_HOUR}, - {DialOHDataType::MINUTES, DialDataType::DATA_TYPE_TIME_MINUTE}, - {DialOHDataType::SECONDS, DialDataType::DATA_TYPE_TIME_SECOND}, - {DialOHDataType::MILLISECOND_ANGLE, DialDataType::DATA_TYPE_CLOCK_ANGLE_MS}, - {DialOHDataType::DATE, DialDataType::DATA_TYPE_TIME_DATE}, - {DialOHDataType::WEEK_DATA, DialDataType::DATA_TYPE_TIME_WEEK}, - {DialOHDataType::CHARGE, DialDataType::DATA_TYPE_POWER}, - {DialOHDataType::STEPS, DialDataType::DATA_TYPE_STEPS}, - {DialOHDataType::CALORIES, DialDataType::DATA_TYPE_CALORIE}, - {DialOHDataType::HEART_RATE, DialDataType::DATA_TYPE_HEART_RATE}, - {DialOHDataType::STRESS, DialDataType::DATA_TYPE_PRESSURE}, - {DialOHDataType::TEMPERATURE, DialDataType::DATA_TYPE_TEMPERATURE}, - {DialOHDataType::ELEVATION, DialDataType::DATA_TYPE_AILTITUDE}, - {DialOHDataType::AIR_QUALITY_INDEX, DialDataType::DATA_TYPE_PM25}, - {DialOHDataType::CLOCK_ANGLE, DialDataType::DATA_TYPE_CLOCK_ANGLE_H}, - {DialOHDataType::MINUTE_ANGLE, DialDataType::DATA_TYPE_CLOCK_ANGLE_M}, - {DialOHDataType::SECONDS_ANGLE, DialDataType::DATA_TYPE_CLOCK_ANGLE_S}, - {DialOHDataType::MONTH, DialDataType::DATA_TYPE_TIME_MONTH}, - {DialOHDataType::SWIVEL_GEAR_POSITIVE, DialDataType::DATA_TYPE_SWIVEL_GEAR_ONE}, - {DialOHDataType::SWIVEL_GEAR_POSITIVE, DialDataType::DATA_TYPE_SWIVEL_GEAR_FOUR}, - {DialOHDataType::SWIVEL_GEAR_POSITIVE, DialDataType::DATA_TYPE_SWIVEL_GEAR_SIX}, - {DialOHDataType::SWIVEL_GEAR_NEGATIVE, DialDataType::DATA_TYPE_SWIVEL_GEAR_TWO}, - {DialOHDataType::SWIVEL_GEAR_NEGATIVE, DialDataType::DATA_TYPE_SWIVEL_GEAR_THREE}, - {DialOHDataType::SWIVEL_GEAR_NEGATIVE, DialDataType::DATA_TYPE_SWIVEL_GEAR_FIVE}, -}; -} // namespace OHOS - -#endif // DIAL_OH_DATATYPE_H diff --git a/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialOptionImgView.h b/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialOptionImgView.h index dd08a9d6b..52e4298c2 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialOptionImgView.h +++ b/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialOptionImgView.h @@ -7,7 +7,7 @@ #include #include "DialView.h" -#include "DialTimePublisher.h" +#include "DialModelTime.h" #include "components/ui_image_view.h" #include "font/font_global_manager.h" @@ -16,7 +16,7 @@ namespace OHOS { class DialOptionImgView : public UIImageView, public DialView, public FontGlobalManager::LangChangeListener, - public DialTimePublisher::TimeChangeListener { + public TimeChangeListener { public: DialOptionImgView(); ~DialOptionImgView() override; diff --git a/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialSequenceContainer.h b/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialSequenceContainer.h deleted file mode 100644 index f692d1f3b..000000000 --- a/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialSequenceContainer.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) CompanyNameMagicTag 2025. All rights reserved. - * Description: DialSequenceContainer - * Author: - * Create: 2025-03-05 - */ - -#ifndef DIAL_SEQUENCE_CONTAINER_H -#define DIAL_SEQUENCE_CONTAINER_H -#include "components/ui_view_group.h" -#include "components/ui_image_animator.h" - -namespace OHOS { -class DialSequenceContainer : public UIViewGroup, public UIImageAnimatorView::AnimatorStopListener { -public: - DialSequenceContainer(); - ~DialSequenceContainer() override; - DialSequenceContainer(const DialSequenceContainer&) = delete; - DialSequenceContainer& operator=(const DialSequenceContainer&) = delete; - bool AddSequenceRes(uint16_t interval, bool repeat, const ImageAnimatorInfo *imgSrc, uint8_t imgNum); - bool OnClickEvent(const ClickEvent& event) override; - void Start(); - void Stop(); - void Pause(); - void Resume(); - void OnAnimatorStop(UIView& view) override; - -private: - void UpdateCurrentView(); - UIImageAnimatorView *repeatView_ = nullptr; - UIImageAnimatorView *nonCycleView_[3]; // 3: max seqImg num - // if curView_ is not null, curView_ must be added into parent. - UIImageAnimatorView *curView_ = nullptr; - uint8_t nonCycleNum_ = 0; - uint8_t loop_ = 0; - bool isClick_ = false; -}; // class DialSequenceContainer -} // namespace OHOS -#endif // DIAL_SEQUENCE_CONTAINER_H \ No newline at end of file diff --git a/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialSequenceImgView.h b/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialSequenceImgView.h index 4800b71b9..3f5b92fb9 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialSequenceImgView.h +++ b/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialSequenceImgView.h @@ -8,17 +8,54 @@ #include "components/ui_image_animator.h" namespace OHOS { +struct SequenceInfo : public HeapBase { + long imgOffset = 0; + long resPos = 0; + uint8_t imgNum = 0; + FILE *fp = nullptr; + std::string fileName; + uint16_t interval = 0; + bool repeat = false; +}; -class DialSequenceImgView : public UIImageAnimatorView { +class DialSequenceImgView : public UIImageAnimatorView, public UIImageAnimatorView::AnimatorStopListener { public: DialSequenceImgView(); ~DialSequenceImgView() override; - bool SetSequenceRes(const ImageAnimatorInfo* imgSrc, uint8_t imgNum); + bool SetSequenceRes(const ImageAnimatorInfo *imgSrc, uint8_t imgNum); + bool SetPreviewImg(); + bool LoadCurSeqImgs(); + bool AddSequenceRes(const SequenceInfo ¶); + bool OnClickEvent(const ClickEvent &event) override; + void OnAnimatorStop(UIView &view) override; private: - ImageAnimatorInfo* imgSrc_ = nullptr; - uint8_t imgNum_ = 0; + ImageAnimatorInfo *LoadImgs(const SequenceInfo ¶, uint8_t num) const; + void UpdateCurrentSeq(); + struct AnimatorInfo : public HeapBase { + SequenceInfo info; + ImageAnimatorInfo *imgs = nullptr; + uint8_t num = 0; + ~AnimatorInfo() + { + if (imgs != nullptr) { + UIFree(imgs); + imgs = nullptr; + num = 0; + } + } + }; + void SetAnimatorInfo(AnimatorInfo *info, uint8_t num); + static constexpr uint8_t SEQ_IMG_NUM = 3; + AnimatorInfo *repeatSeq_ = nullptr; + AnimatorInfo *nonCycleSeq_[SEQ_IMG_NUM]; + AnimatorInfo *curSeq_ = nullptr; + uint8_t nonCycleNum_ = 0; + uint8_t loop_ = 0; + bool isClick_ = false; + uint8_t viewNum_ = 0; + bool isAllImgLoaded_ = false; }; -} +} // namespace OHOS #endif diff --git a/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialStaticImgView.h b/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialStaticImgView.h index 733c5ed7a..df8f2810c 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialStaticImgView.h +++ b/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialStaticImgView.h @@ -7,12 +7,12 @@ #include "components/ui_image_view.h" #include "font/font_global_manager.h" -#include "DialTimePublisher.h" +#include "DialModelTime.h" namespace OHOS { class DialStaticImgView : public UIImageView, public FontGlobalManager::LangChangeListener, - public DialTimePublisher::TimeChangeListener { + public TimeChangeListener { public: DialStaticImgView(); ~DialStaticImgView() override; diff --git a/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialTimePublisher.h b/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialTimePublisher.h deleted file mode 100644 index fcdb80cb3..000000000 --- a/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialTimePublisher.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) CompanyNameMagicTag 2025. All rights reserved. - * Description: DialTimePublisher - * Author: - * Create: 2025-03-04 - */ - -#ifndef DIAL_TIME_PUBLISHER_H -#define DIAL_TIME_PUBLISHER_H -#include -#include - -namespace OHOS { -class DialTimePublisher { -public: - struct TimeInterval { - uint8_t start; - uint8_t end; - }; - class TimeChangeListener { - public: - virtual void OnTimeUpdate(const struct tm &curTime) = 0; - void SetTimeInervals(TimeInterval *intervals, uint8_t num); - bool IsInTimeInterval(const struct tm &curTime); - TimeChangeListener(const TimeChangeListener&) = delete; - TimeChangeListener& operator=(const TimeChangeListener&) = delete; - TimeChangeListener(); - virtual ~TimeChangeListener(); - private: - TimeInterval *intervals_ = nullptr; - uint8_t num_ = 0; - }; - - virtual void Register(TimeChangeListener *listener) = 0; - virtual void Unregister(TimeChangeListener *listener) = 0; - virtual void UpdateTime() = 0; - static void SetPublisher(DialTimePublisher *publisher); - static DialTimePublisher *GetPublisher(); - virtual ~DialTimePublisher() {} - -private: - static DialTimePublisher *publisher_; -}; // class DialTimePublisher -} // namespace OHOS -#endif // DIAL_TIME_PUBLISHER_H \ No newline at end of file diff --git a/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialView.h b/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialView.h index 300f7a0b4..3155d760a 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialView.h +++ b/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialView.h @@ -7,6 +7,7 @@ #include #include +#include "DialDataType.h" namespace OHOS { @@ -18,6 +19,18 @@ public: virtual void HandleFloatData(float data) {} virtual void HandleFloatData(const float* data, uint16_t num) {} virtual void HandleTextData(const std::string* data, uint16_t num) {} + virtual DialDataType GetDataType() + { + return type_; + } + + virtual void SetDataType(DialDataType type) + { + type_ = type; + } + +private: + DialDataType type_ = DialDataType::DATA_TYPE_MAX; }; } #endif diff --git a/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialViewGroup.h b/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialViewGroup.h index 8c1ed7400..a3072703f 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialViewGroup.h +++ b/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/DialViewGroup.h @@ -6,6 +6,7 @@ #define DIAL_VIEW_GROUP_H #include +#include #include "DialDataBase.h" #include "components/ui_view_group.h" #include "components/ui_image_animator.h" @@ -19,7 +20,6 @@ #include "DialVideoView.h" #include "DialBinTypesV2.h" #include "DialViewContainer.h" -#include "DialSequenceContainer.h" namespace OHOS { class DialViewGroup : public UICardPage, public OnDialDataUpdateListener, public ContainerInterface { @@ -174,7 +174,8 @@ private: void SetImgAnimatorState(uint8_t state); List rollingLabelList_; List imgAnimList_; - List seqList_; + bool isSeqImgLoaded_ = false; + std::shared_ptr isExists_; }; } #endif diff --git a/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/ModelDialDataFactory.h b/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/ModelDialDataFactory.h index 30c1d1c31..33bedbe49 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/ModelDialDataFactory.h +++ b/code/sdk/application/wearable/nativeapp/nativeui/main/include/dial/ModelDialDataFactory.h @@ -11,7 +11,6 @@ #include #include "DialBaseModel.h" #include "DialDataBase.h" -#include "DialOHDataType.h" #include "ModelDialDataFactory.h" namespace OHOS { @@ -31,8 +30,6 @@ public: models_[static_cast(type)] = model; } - bool IsOHBindDataExist(DialOHDataType type) const; - bool IsBindDataExist(DialDataType type) const; bool RegisterDialDataListener(DialDataType type, OnDialDataUpdateListener* listener); bool UnRegisterDialDataListener(DialDataType type); bool GetDialTextData(DialDataType& type, std::string*& out, int16_t& strNum); diff --git a/code/sdk/application/wearable/nativeapp/nativeui/main/src/MainPresenterSample.cpp b/code/sdk/application/wearable/nativeapp/nativeui/main/src/MainPresenterSample.cpp index 5a0f085c7..ca40fa472 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/main/src/MainPresenterSample.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/main/src/MainPresenterSample.cpp @@ -178,7 +178,7 @@ void MainPresenterSample::SetPage(int8_t id, bool loadAdjacent) void MainPresenterSample::SetTaskPeroid(CardId cardId) { - SetLastRun(0); + SetLastRun(0); // refresh entering card in time if (cardId == COMPASS) { SetPeriod(DEFAULT_TASK_PERIOD); } else if (cardId == WATCH_FACE) { diff --git a/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/DialDataBase.cpp b/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/DialDataBase.cpp new file mode 100644 index 000000000..bda2cf912 --- /dev/null +++ b/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/DialDataBase.cpp @@ -0,0 +1,43 @@ +/* + * Copyright (c) CompanyNameMagicTag 2025. All rights reserved. + * Description: DialDataBase + * Author: + * Create: 2025-04-08 + */ + +#include +#include "dial/DialDataBase.h" + +namespace { +struct DataTypeHash { + size_t operator()(const DialOldDataType &data) const + { + return std::hash{}(static_cast(data)); + } +}; + +static std::unordered_map g_data2std = { + {DialOldDataType::DATA_TYPE_STEPS, OHOS::DialDataType::STEP_COUNT}, + {DialOldDataType::DATA_TYPE_HEART_RATE, OHOS::DialDataType::HEART_RATE}, + {DialOldDataType::DATA_TYPE_POWER, OHOS::DialDataType::BATTERY}, + {DialOldDataType::DATA_TYPE_CLOCK_ANGLE_H, OHOS::DialDataType::CLOCK_ANGLE}, + {DialOldDataType::DATA_TYPE_CLOCK_ANGLE_M, OHOS::DialDataType::MINUTE_ANGLE}, + {DialOldDataType::DATA_TYPE_CLOCK_ANGLE_S, OHOS::DialDataType::SECOND_ANGLE}, + {DialOldDataType::DATA_TYPE_CLOCK_ANGLE_MS, OHOS::DialDataType::MILLISECOND_ANGLE}, + {DialOldDataType::DATA_TYPE_TIME_SECOND, OHOS::DialDataType::SECOND_TIME}, + {DialOldDataType::DATA_TYPE_TIME_MINUTE, OHOS::DialDataType::MINUTE_TIME}, + {DialOldDataType::DATA_TYPE_TIME_HOUR, OHOS::DialDataType::CLOCK}, + {DialOldDataType::DATA_TYPE_TIME_DATE, OHOS::DialDataType::DATE}, + {DialOldDataType::DATA_TYPE_TIME_WEEK, OHOS::DialDataType::WEEKDAY_DATA}, + {DialOldDataType::DATA_TYPE_TIME_MONTH, OHOS::DialDataType::MONTH}, + {DialOldDataType::DATA_TYPE_TIME_YEAR, OHOS::DialDataType::SOLAR_YEAR}, +}; +} + + OHOS::DialDataType Convert2DataType(DialOldDataType dialData) +{ + if (g_data2std.find(dialData) != g_data2std.end()) { + return g_data2std[dialData]; + } + return OHOS::DialDataType::DATA_TYPE_MAX; +} \ No newline at end of file diff --git a/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/DialModelHeartRate.cpp b/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/DialModelHeartRate.cpp index f4a337eca..ff827325e 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/DialModelHeartRate.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/DialModelHeartRate.cpp @@ -8,7 +8,7 @@ #include "RegisterDialModel.h" #include "DialModelHeartRate.h" -REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_HEART_RATE, OHOS::DialModelHeartRate::GetInstance()); +REGIST_DIAL_MODULE(OHOS::DialDataType::HEART_RATE, OHOS::DialModelHeartRate::GetInstance()); namespace OHOS { bool DialModelHeartRate::GetDialFloatData(DialDataType& type, float& out) @@ -22,7 +22,7 @@ void DialModelHeartRate::UpdateHeartRate(int16_t heartRate) { heartRate_ = static_cast(heartRate); if (onChangeListener_ != nullptr) { - onChangeListener_->OnDialFloatDataUpdate(DialDataType::DATA_TYPE_HEART_RATE, heartRate_); + onChangeListener_->OnDialFloatDataUpdate(DialDataType::HEART_RATE, heartRate_); } } } diff --git a/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/DialModelPower.cpp b/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/DialModelPower.cpp index e0e1877d8..b6a2c5a86 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/DialModelPower.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/DialModelPower.cpp @@ -8,7 +8,7 @@ #include "RegisterDialModel.h" #include "DialModelPower.h" -REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_POWER, OHOS::DialModelPower::GetInstance()); +REGIST_DIAL_MODULE(OHOS::DialDataType::BATTERY, OHOS::DialModelPower::GetInstance()); namespace OHOS { bool DialModelPower::GetDialFloatData(DialDataType& type, float& out) diff --git a/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/DialModelSteps.cpp b/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/DialModelSteps.cpp index 0a9e7ff29..a1ad2edf9 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/DialModelSteps.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/DialModelSteps.cpp @@ -8,7 +8,7 @@ #include "RegisterDialModel.h" #include "DialModelSteps.h" -REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_STEPS, OHOS::DialModelSteps::GetInstance()); +REGIST_DIAL_MODULE(OHOS::DialDataType::STEP_COUNT, OHOS::DialModelSteps::GetInstance()); namespace OHOS { bool DialModelSteps::GetDialFloatData(DialDataType& type, float& out) @@ -22,7 +22,7 @@ void DialModelSteps::UpdateSteps(int16_t steps) { steps_ = static_cast(steps); if (onChangeListener_ != nullptr) { - onChangeListener_->OnDialFloatDataUpdate(DialDataType::DATA_TYPE_STEPS, steps_); + onChangeListener_->OnDialFloatDataUpdate(DialDataType::STEP_COUNT, steps_); } } } diff --git a/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/DialModelTime.cpp b/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/DialModelTime.cpp index aa17d850c..b626e0233 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/DialModelTime.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/DialModelTime.cpp @@ -5,6 +5,7 @@ * Create: 2023-12 */ +#include #include "sys/time.h" #include "RegisterDialModel.h" #include "DialModelTime.h" @@ -22,32 +23,23 @@ #define REGIST_DIAL_MODULE_WEEK(type, func) static OHOS::RegisterDialModel(REGIST_WEEK)(type, func) #define REGIST_DIAL_MODULE_MOUNTH(type, func) static OHOS::RegisterDialModel(REGIST_MOUNTH)(type, func) #define REGIST_DIAL_MODULE_YEAR(type, func) static OHOS::RegisterDialModel(REGIST_YEAR)(type, func) -#define REGIST_DIAL_MODULE_GEAR_ONE(type, func) static OHOS::RegisterDialModel(REGIST_GEAR_ONE)(type, func) -#define REGIST_DIAL_MODULE_GEAR_TWO(type, func) static OHOS::RegisterDialModel(REGIST_GEAR_TWO)(type, func) -#define REGIST_DIAL_MODULE_GEAR_THREE(type, func) static OHOS::RegisterDialModel(REGIST_GEAR_THREE)(type, func) -#define REGIST_DIAL_MODULE_GEAR_FOUR(type, func) static OHOS::RegisterDialModel(REGIST_GEAR_FOUR)(type, func) -#define REGIST_DIAL_MODULE_GEAR_FIVE(type, func) static OHOS::RegisterDialModel(REGIST_GEAR_FIVE)(type, func) -#define REGIST_DIAL_MODULE_GEAR_SIX(type, func) static OHOS::RegisterDialModel(REGIST_GEAR_SIX)(type, func) - -REGIST_DIAL_MODULE_ANGLE_H(DialDataType::DATA_TYPE_CLOCK_ANGLE_H, OHOS::DialModelTime::GetInstance()); -REGIST_DIAL_MODULE_ANGLE_M(DialDataType::DATA_TYPE_CLOCK_ANGLE_M, OHOS::DialModelTime::GetInstance()); -REGIST_DIAL_MODULE_ANGLE_S(DialDataType::DATA_TYPE_CLOCK_ANGLE_S, OHOS::DialModelTime::GetInstance()); -REGIST_DIAL_MODULE_ANGLE_MS(DialDataType::DATA_TYPE_CLOCK_ANGLE_MS, OHOS::DialModelTime::GetInstance()); - -REGIST_DIAL_MODULE_SECOND(DialDataType::DATA_TYPE_TIME_SECOND, OHOS::DialModelTime::GetInstance()); -REGIST_DIAL_MODULE_MINUTE(DialDataType::DATA_TYPE_TIME_MINUTE, OHOS::DialModelTime::GetInstance()); -REGIST_DIAL_MODULE_HOUR(DialDataType::DATA_TYPE_TIME_HOUR, OHOS::DialModelTime::GetInstance()); -REGIST_DIAL_MODULE_DATE(DialDataType::DATA_TYPE_TIME_DATE, OHOS::DialModelTime::GetInstance()); -REGIST_DIAL_MODULE_WEEK(DialDataType::DATA_TYPE_TIME_WEEK, OHOS::DialModelTime::GetInstance()); -REGIST_DIAL_MODULE_MOUNTH(DialDataType::DATA_TYPE_TIME_MONTH, OHOS::DialModelTime::GetInstance()); -REGIST_DIAL_MODULE_YEAR(DialDataType::DATA_TYPE_TIME_YEAR, OHOS::DialModelTime::GetInstance()); - -REGIST_DIAL_MODULE_GEAR_ONE(DialDataType::DATA_TYPE_SWIVEL_GEAR_ONE, OHOS::DialModelTime::GetInstance()); -REGIST_DIAL_MODULE_GEAR_TWO(DialDataType::DATA_TYPE_SWIVEL_GEAR_TWO, OHOS::DialModelTime::GetInstance()); -REGIST_DIAL_MODULE_GEAR_THREE(DialDataType::DATA_TYPE_SWIVEL_GEAR_THREE, OHOS::DialModelTime::GetInstance()); -REGIST_DIAL_MODULE_GEAR_FOUR(DialDataType::DATA_TYPE_SWIVEL_GEAR_FOUR, OHOS::DialModelTime::GetInstance()); -REGIST_DIAL_MODULE_GEAR_FIVE(DialDataType::DATA_TYPE_SWIVEL_GEAR_FIVE, OHOS::DialModelTime::GetInstance()); -REGIST_DIAL_MODULE_GEAR_SIX(DialDataType::DATA_TYPE_SWIVEL_GEAR_SIX, OHOS::DialModelTime::GetInstance()); +#define REGIST_DIAL_MODULE_GEAR_POSITIVE(type, func) static OHOS::RegisterDialModel(REGIST_GEAR_POSITIVE)(type, func) +#define REGIST_DIAL_MODULE_GEAR_NEGATIVE(type, func) static OHOS::RegisterDialModel(REGIST_GEAR_NEGATIVE)(type, func) + +REGIST_DIAL_MODULE_ANGLE_H(OHOS::DialDataType::CLOCK_ANGLE, OHOS::DialModelTime::GetInstance()); +REGIST_DIAL_MODULE_ANGLE_M(OHOS::DialDataType::MINUTE_ANGLE, OHOS::DialModelTime::GetInstance()); +REGIST_DIAL_MODULE_ANGLE_S(OHOS::DialDataType::SECOND_ANGLE, OHOS::DialModelTime::GetInstance()); +REGIST_DIAL_MODULE_ANGLE_MS(OHOS::DialDataType::MILLISECOND_ANGLE, OHOS::DialModelTime::GetInstance()); + +REGIST_DIAL_MODULE_SECOND(OHOS::DialDataType::SECOND_TIME, OHOS::DialModelTime::GetInstance()); +REGIST_DIAL_MODULE_MINUTE(OHOS::DialDataType::MINUTE_TIME, OHOS::DialModelTime::GetInstance()); +REGIST_DIAL_MODULE_HOUR(OHOS::DialDataType::CLOCK, OHOS::DialModelTime::GetInstance()); +REGIST_DIAL_MODULE_DATE(OHOS::DialDataType::DATE, OHOS::DialModelTime::GetInstance()); +REGIST_DIAL_MODULE_WEEK(OHOS::DialDataType::WEEKDAY_DATA, OHOS::DialModelTime::GetInstance()); +REGIST_DIAL_MODULE_MOUNTH(OHOS::DialDataType::MONTH, OHOS::DialModelTime::GetInstance()); +REGIST_DIAL_MODULE_YEAR(OHOS::DialDataType::SOLAR_YEAR, OHOS::DialModelTime::GetInstance()); +REGIST_DIAL_MODULE_GEAR_POSITIVE(OHOS::DialDataType::SWIVEL_GEAR_POSITIVE, OHOS::DialModelTime::GetInstance()); +REGIST_DIAL_MODULE_GEAR_NEGATIVE(OHOS::DialDataType::SWIVEL_GEAR_NEGATIVE, OHOS::DialModelTime::GetInstance()); namespace OHOS { static constexpr int16_t S_MS_US_TRANS = 1000; // 1000: seconds, milliseconds, microsecond transform value @@ -85,14 +77,23 @@ void DialModelTime::UpdateTime() { struct timeval tv; gettimeofday(&tv, nullptr); +#ifdef _WIN32 + time_t time = tv.tv_sec; + if (tblock_ == nullptr) { + tblock_ = new struct tm(); + memset_s(tblock_, sizeof(struct tm), 0, sizeof(struct tm)); + } + localtime_s(tblock_, &time); +#else tblock_ = localtime(&tv.tv_sec); +#endif int realMS = tblock_->tm_sec * S_MS_US_TRANS + tv.tv_usec / S_MS_US_TRANS; angleH_ = ConvertHandValueToAngle(tblock_->tm_hour, HALF_DAY_IN_HOUR, tblock_->tm_min, ONE_HOUR_IN_MINUTE); angleM_ = ConvertHandValueToAngle(tblock_->tm_min, ONE_HOUR_IN_MINUTE, tblock_->tm_sec, ONE_MINUTE_IN_SECOND); angleS_ = ConvertHandValueToAngle(tblock_->tm_sec, ONE_MINUTE_IN_SECOND, 0, 1); angleMS_ = ConvertHandSecondValueToAngle(realMS, S_MS_US_TRANS * ONE_MINUTE_IN_SECOND); - + if (tblock_ == nullptr) { return; } @@ -140,53 +141,49 @@ bool DialModelTime::GetDialFloatData(DialDataType& type, float& out) } switch (type) { - case DialDataType::DATA_TYPE_CLOCK_ANGLE_H: + case DialDataType::CLOCK_ANGLE: out = static_cast(angleH_); break; - case DialDataType::DATA_TYPE_CLOCK_ANGLE_M: + case DialDataType::MINUTE_ANGLE: out = static_cast(angleM_); break; - case DialDataType::DATA_TYPE_CLOCK_ANGLE_S: + case DialDataType::SECOND_ANGLE: out = static_cast(angleS_); break; - case DialDataType::DATA_TYPE_CLOCK_ANGLE_MS: + case DialDataType::MILLISECOND_ANGLE: out = static_cast(angleMS_); break; - case DialDataType::DATA_TYPE_TIME_YEAR: - out = static_cast(tblock_->tm_year); + case DialDataType::SOLAR_YEAR: + out = static_cast(tblock_->tm_year + 1900); // 1900: since 1900 break; - case DialDataType::DATA_TYPE_TIME_MONTH: + case DialDataType::MONTH: out = static_cast(tblock_->tm_mon); break; - case DialDataType::DATA_TYPE_TIME_WEEK: + case DialDataType::WEEKDAY_DATA: out = static_cast(tblock_->tm_wday); break; - case DialDataType::DATA_TYPE_TIME_DATE: + case DialDataType::DATE: out = static_cast(tblock_->tm_mday); break; - case DialDataType::DATA_TYPE_TIME_HOUR: + case DialDataType::CLOCK: out = static_cast(tblock_->tm_hour); break; - case DialDataType::DATA_TYPE_TIME_MINUTE: + case DialDataType::MINUTE_TIME: out = static_cast(tblock_->tm_min); break; - case DialDataType::DATA_TYPE_TIME_SECOND: + case DialDataType::SECOND_TIME: out = static_cast(tblock_->tm_sec); break; - case DialDataType::DATA_TYPE_SWIVEL_GEAR_TWO: - case DialDataType::DATA_TYPE_SWIVEL_GEAR_THREE: - case DialDataType::DATA_TYPE_SWIVEL_GEAR_FIVE: { + case DialDataType::SWIVEL_GEAR_POSITIVE: { float coeff = 6.0f; // 6.0: coeff float accleratedAngle = angleMS_ * coeff - floor(angleMS_ * coeff / CIRCLE_IN_DEGREE) * CIRCLE_IN_DEGREE; - out = static_cast(accleratedAngle * -1.0 + CIRCLE_IN_DEGREE); + out = static_cast(accleratedAngle); break; } - case DialDataType::DATA_TYPE_SWIVEL_GEAR_ONE: - case DialDataType::DATA_TYPE_SWIVEL_GEAR_FOUR: - case DialDataType::DATA_TYPE_SWIVEL_GEAR_SIX: { + case DialDataType::SWIVEL_GEAR_NEGATIVE: { float coeff = 6.0f; // 6.0: coeff float accleratedAngle = angleMS_ * coeff - floor(angleMS_ * coeff / CIRCLE_IN_DEGREE) * CIRCLE_IN_DEGREE; - out = static_cast(accleratedAngle); + out = static_cast(accleratedAngle * -1.0 + CIRCLE_IN_DEGREE); break; } default: @@ -194,4 +191,52 @@ bool DialModelTime::GetDialFloatData(DialDataType& type, float& out) } return true; } + +void TimeChangeListener::SetTimeInervals(TimeInterval *intervals, uint8_t num) +{ + if (intervals == nullptr || num == 0) { + return; + } + if (intervals_ != nullptr) { + UIFree(intervals_); + intervals_ = nullptr; + } + num_ = 0; + + intervals_ = static_cast(UIMalloc(sizeof(TimeInterval) * num)); + if (intervals_ == nullptr) { + GRAPHIC_LOGE("failed to malloc!"); + return; + } + num_ = num; + memcpy_s(intervals_, sizeof(TimeInterval) * num, intervals, sizeof(TimeInterval) * num); +} + +bool TimeChangeListener::IsInTimeInterval(const struct tm &curTime) +{ + if (num_ == 0) { // 0-24 + return true; + } + for (uint8_t i = 0; i < num_; ++i) { + if (intervals_[i].start <= curTime.tm_hour && intervals_[i].end > curTime.tm_hour) { + return true; + } + } + return false; +} + +TimeChangeListener::TimeChangeListener() +{ + DialModelTime::GetInstance()->Register(this); +} + +TimeChangeListener::~TimeChangeListener() +{ + if (intervals_ != nullptr) { + UIFree(intervals_); + intervals_ = nullptr; + } + num_ = 0; + DialModelTime::GetInstance()->Unregister(this); +} } diff --git a/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/DialSequenceContainer.cpp b/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/DialSequenceContainer.cpp deleted file mode 100644 index 4024f4696..000000000 --- a/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/DialSequenceContainer.cpp +++ /dev/null @@ -1,228 +0,0 @@ -/* - * Copyright (c) CompanyNameMagicTag 2025. All rights reserved. - * Description: DialSequenceContainer - * Author: - * Create: 2025-03-05 - */ - -#include "DialSequenceContainer.h" - -namespace OHOS { -DialSequenceContainer::DialSequenceContainer() -{ - SetTouchable(true); - SetStyle(STYLE_BACKGROUND_OPA, OPA_TRANSPARENT); - memset_s(nonCycleView_, sizeof(nonCycleView_), 0, sizeof(nonCycleView_)); -} - -DialSequenceContainer::~DialSequenceContainer() -{ - if (repeatView_ != nullptr) { - delete repeatView_; - repeatView_ = nullptr; - } - - for (uint8_t i = 0; i < nonCycleNum_; ++i) { - delete nonCycleView_[i]; - nonCycleView_[i] = nullptr; - } - nonCycleNum_ = 0; - curView_ = nullptr; -} - -bool DialSequenceContainer::AddSequenceRes(uint16_t interval, bool repeat, - const ImageAnimatorInfo *imgSrc, uint8_t imgNum) -{ - if (imgSrc == nullptr || imgNum == 0) { - return false; - } - - // add animator images to view - if (repeat) { - if (repeatView_ != nullptr) { - GRAPHIC_LOGE("the repeat seq view has existed!"); - return false; - } - repeatView_ = new UIImageAnimatorView; - repeatView_->SetImageAnimatorSrc(imgSrc, imgNum, interval); - repeatView_->SetRepeat(false); - } else { - if (nonCycleNum_ >= sizeof(nonCycleView_) / sizeof(nonCycleView_[0])) { - GRAPHIC_LOGE("non cycle seq views have been exceedeed!"); - return false; - } - nonCycleView_[nonCycleNum_] = new UIImageAnimatorView; - nonCycleView_[nonCycleNum_]->SetImageAnimatorSrc(imgSrc, imgNum, interval); - nonCycleView_[nonCycleNum_]->SetRepeat(false); - ++nonCycleNum_; - } - - // update rect area - Rect rect(GetRelativeRect()); - for (uint8_t i = 0; i < imgNum; ++i) { - rect.JoinRect(rect, - Rect(rect.GetX(), - rect.GetY(), - rect.GetX() + imgSrc[i].width - 1, - rect.GetY() + imgSrc[i].height - 1)); - } - rect.JoinRect(rect, GetRelativeRect()); - SetPosition(rect.GetX(), rect.GetY()); - SetWidth(rect.GetWidth()); - SetHeight(rect.GetHeight()); - Invalidate(); - - return true; -} - -bool DialSequenceContainer::OnClickEvent(const ClickEvent& event) -{ - if (curView_ == nullptr) { - return false; - } - uint8_t curState = curView_->GetState(); - switch (curState) { - case Animator::STOP: { - if (curView_ == repeatView_) { - isClick_ = true; - } else { - UpdateCurrentView(); - Start(); - } - break; - } - case Animator::PAUSE: { - return false; - } - case Animator::RUNNING: - case Animator::START: { - if (curView_ == repeatView_) { - isClick_ = true; - } - break; - } - default: { - GRAPHIC_LOGE("error state"); - } - } - - return UIViewGroup::OnClickEvent(event); -} - -void DialSequenceContainer::Start() -{ - if (curView_ != nullptr) { - curView_->Start(); - return; - } - - UpdateCurrentView(); - if (curView_ == nullptr) { - return; - } - curView_->Start(); -} - -void DialSequenceContainer::Stop() -{ - if (curView_ != nullptr) { - curView_->Stop(); - return; - } - - UpdateCurrentView(); - if (curView_ == nullptr) { - return; - } - curView_->Stop(); -} - -void DialSequenceContainer::Pause() -{ - if (curView_ != nullptr) { - curView_->Pause(); - return; - } - - UpdateCurrentView(); - if (curView_ == nullptr) { - return; - } - curView_->Pause(); -} - -void DialSequenceContainer::Resume() -{ - if (curView_ != nullptr) { - curView_->Resume(); - return; - } - - UpdateCurrentView(); - if (curView_ == nullptr) { - return; - } - curView_->Resume(); -} - -void DialSequenceContainer::OnAnimatorStop(UIView& view) -{ - bool isClick = isClick_; - isClick_ = false; - bool isRepeat = (curView_ == repeatView_); - if (isRepeat && isClick) { - UpdateCurrentView(); - Start(); - } else if (isRepeat && !isClick) { - Start(); - } else { - if (repeatView_ != nullptr) { - UpdateCurrentView(); - Start(); - } - } -} - -void DialSequenceContainer::UpdateCurrentView() -{ - if (curView_ != nullptr) { - if (repeatView_ != nullptr && nonCycleNum_ == 0) { - return; - } else if (repeatView_ == nullptr && nonCycleNum_ != 0) { - Remove(curView_); - curView_ = nonCycleView_[loop_]; - loop_ = (loop_ + 1) % nonCycleNum_; - curView_->SetAnimatorStopListener(this); - Add(curView_); - Invalidate(); - return; - } - - // both repeat and noncycle exist - Remove(curView_); - if (curView_ == repeatView_) { - curView_ = nonCycleView_[loop_]; - loop_ = (loop_ + 1) % nonCycleNum_; - } else { - curView_ = repeatView_; - } - curView_->SetAnimatorStopListener(this); - Add(curView_); - Invalidate(); - return; - } - - if (repeatView_ != nullptr) { - curView_ = repeatView_; - } else if (nonCycleNum_ != 0) { - curView_ = nonCycleView_[loop_]; - loop_ = (loop_ + 1) % nonCycleNum_; - } else { - GRAPHIC_LOGE("sequence img has not been added!"); - return; - } - curView_->SetAnimatorStopListener(this); - Add(curView_); - Invalidate(); -} -} // namespace OHOS diff --git a/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/DialSequenceImgView.cpp b/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/DialSequenceImgView.cpp index 5c9c31ec3..c7d1c24e7 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/DialSequenceImgView.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/DialSequenceImgView.cpp @@ -4,39 +4,274 @@ #include "DialSequenceImgView.h" #include "securec.h" +#include "common/graphic_utils.h" +#include "common/image_cache_manager.h" namespace OHOS { +namespace { +const uint32_t DIRID = 0xfef << 20; // 20: offset +} + DialSequenceImgView::DialSequenceImgView(void) { + SetStyle(STYLE_BACKGROUND_OPA, OPA_TRANSPARENT); + memset_s(nonCycleSeq_, sizeof(nonCycleSeq_), 0, sizeof(nonCycleSeq_)); } DialSequenceImgView::~DialSequenceImgView(void) { - if (imgSrc_ != nullptr) { - UIFree(imgSrc_); + if (repeatSeq_ != nullptr) { + delete repeatSeq_; + repeatSeq_ = nullptr; + } + + for (uint8_t i = 0; i < nonCycleNum_; ++i) { + delete nonCycleSeq_[i]; + nonCycleSeq_[i] = nullptr; } + nonCycleNum_ = 0; + loop_ = 0; + isClick_ = false; + viewNum_ = 0; + isAllImgLoaded_ = false; + curSeq_ = nullptr; } -bool DialSequenceImgView::SetSequenceRes(const ImageAnimatorInfo* imgSrc, uint8_t imgNum) +bool DialSequenceImgView::SetSequenceRes(const ImageAnimatorInfo *imgSrc, uint8_t imgNum) { if (imgSrc == nullptr || imgNum == 0) { return false; } - if (imgSrc_ != nullptr) { - UIFree(imgSrc_); - imgNum_ = 0; + + SetImageAnimatorSrc(imgSrc, imgNum); + return true; +} + +bool DialSequenceImgView::SetPreviewImg() +{ + if (curSeq_ == nullptr) { + UpdateCurrentSeq(); } - uint32_t size = sizeof(ImageAnimatorInfo) * imgNum; - imgSrc_ = static_cast(UIMalloc(size)); - if (imgSrc_ == nullptr) { + if (curSeq_ == nullptr) { return false; } - if (memcpy_s(imgSrc_, size, imgSrc, size) != EOK) { - UIFree(imgSrc_); + SetAnimatorInfo(curSeq_, 1); + isAllImgLoaded_ = false; + SetSrc(curSeq_->imgs[0].imageInfo); + SetPosition(curSeq_->imgs[0].pos.x, curSeq_->imgs[0].pos.y); + SetWidth(curSeq_->imgs[0].width); + SetHeight(curSeq_->imgs[0].height); + Invalidate(); + return true; +} + +bool DialSequenceImgView::LoadCurSeqImgs() +{ + if (curSeq_ == nullptr) { + UpdateCurrentSeq(); + } + if (curSeq_ == nullptr) { return false; } - imgNum_ = imgNum; - SetImageAnimatorSrc(imgSrc_, imgNum_); + isAllImgLoaded_ = true; + SetAnimatorInfo(curSeq_, curSeq_->info.imgNum); return true; } -} \ No newline at end of file + +bool DialSequenceImgView::AddSequenceRes(const SequenceInfo ¶) +{ + if (viewNum_ >= SEQ_IMG_NUM) { + GRAPHIC_LOGE("seq num has exceeded!"); + return false; + } + + if (para.repeat) { + if (repeatSeq_ != nullptr) { + GRAPHIC_LOGE("the repeat seq has existed!"); + return false; + } + repeatSeq_ = new AnimatorInfo; + repeatSeq_->info = para; + } else { + if (nonCycleNum_ >= SEQ_IMG_NUM) { + GRAPHIC_LOGE("non cycle seq have been exceedeed!"); + return false; + } + nonCycleSeq_[nonCycleNum_] = new AnimatorInfo; + nonCycleSeq_[nonCycleNum_]->info = para; + ++nonCycleNum_; + } + + SetTouchable(true); + SetAnimatorStopListener(this); + SetRepeat(false); + ++viewNum_; + return true; +} + +bool DialSequenceImgView::OnClickEvent(const ClickEvent &event) +{ + if (!isAllImgLoaded_) { + return false; + } + if (curSeq_ == nullptr) { + return false; + } + uint8_t curState = GetState(); + switch (curState) { + case Animator::STOP: { + if (curSeq_ == repeatSeq_) { + isClick_ = true; + } else { + UpdateCurrentSeq(); + SetAnimatorInfo(curSeq_, curSeq_->info.imgNum); + Start(); + } + break; + } + case Animator::PAUSE: { + return false; + } + case Animator::RUNNING: + case Animator::START: { + if (curSeq_ == repeatSeq_) { + isClick_ = true; + } + break; + } + default: { + GRAPHIC_LOGE("error state"); + } + } + + return UIImageAnimatorView::OnClickEvent(event); +} + +void DialSequenceImgView::OnAnimatorStop(UIView &view) +{ + if (!isAllImgLoaded_) { + return; + } + bool isClick = isClick_; + isClick_ = false; + bool isRepeat = (curSeq_ == repeatSeq_); + if (isRepeat && isClick) { + UpdateCurrentSeq(); + SetAnimatorInfo(curSeq_, curSeq_->info.imgNum); + Start(); + } else if (isRepeat && !isClick) { + Start(); + } else { + if (repeatSeq_ != nullptr) { + UpdateCurrentSeq(); + SetAnimatorInfo(curSeq_, curSeq_->info.imgNum); + Start(); + } + } +} + +ImageAnimatorInfo *DialSequenceImgView::LoadImgs(const SequenceInfo ¶, uint8_t num) const +{ + if (para.fp == nullptr || num > para.imgNum) { + return nullptr; + } + + long curPt = ftell(para.fp); + fseek(para.fp, para.resPos, SEEK_SET); + uint16_t *imgIdArray = static_cast(UIMalloc(sizeof(uint16_t) * num)); + defer + { + if (imgIdArray != nullptr) { + UIFree(imgIdArray); + } + fseek(para.fp, curPt, SEEK_SET); + }; + if (imgIdArray == nullptr) { + return nullptr; + } + ImageAnimatorInfo *imgInfoArray = static_cast(UIMalloc(num * sizeof(ImageAnimatorInfo))); + if (imgInfoArray == nullptr) { + return nullptr; + } + + if (fread(imgIdArray, 1, sizeof(uint16_t) * num, para.fp) != sizeof(uint16_t) * num) { + GRAPHIC_LOGE("failed to read resId"); + UIFree(imgInfoArray); + return nullptr; + } + for (uint8_t i = 0; i < num; ++i) { + uint32_t resId = imgIdArray[i] | DIRID; + ImageInfo *info = + ImageCacheManager::GetInstance().LoadOneInMultiRes(resId, para.fileName, para.fp, false, para.imgOffset); + if (info == nullptr) { + GRAPHIC_LOGE("load img fail! file:%s resId:%x", para.fileName.c_str(), resId); + UIFree(imgInfoArray); + return nullptr; + } + imgInfoArray[i].imageInfo = info; + imgInfoArray[i].pos = {GetRelativeRect().GetX(), GetRelativeRect().GetY()}; + imgInfoArray[i].width = info->header.width; + imgInfoArray[i].height = info->header.height; + imgInfoArray[i].imageType = IMG_SRC_IMAGE_INFO; + } + return imgInfoArray; +} + +void DialSequenceImgView::UpdateCurrentSeq() +{ + if (curSeq_ != nullptr) { + if (repeatSeq_ != nullptr && nonCycleNum_ == 0) { + return; + } else if (repeatSeq_ == nullptr && nonCycleNum_ != 0) { + curSeq_ = nonCycleSeq_[loop_]; + loop_ = (loop_ + 1) % nonCycleNum_; + return; + } + + // both repeat and noncycle exist + if (curSeq_ == repeatSeq_) { + curSeq_ = nonCycleSeq_[loop_]; + loop_ = (loop_ + 1) % nonCycleNum_; + } else { + curSeq_ = repeatSeq_; + } + return; + } + + if (repeatSeq_ != nullptr) { + curSeq_ = repeatSeq_; + } else if (nonCycleNum_ != 0) { + curSeq_ = nonCycleSeq_[loop_]; + loop_ = (loop_ + 1) % nonCycleNum_; + } else { + GRAPHIC_LOGE("sequence img has not been added!"); + return; + } +} + +void DialSequenceImgView::SetAnimatorInfo(AnimatorInfo *info, uint8_t num) +{ + if (info == nullptr || num == 0) { + GRAPHIC_LOGE("para error"); + return; + } + if (num > info->info.imgNum) { + GRAPHIC_LOGE("The number of images exceeds the limit."); + return; + } + + if (num == info->num && info->imgs != nullptr) { + SetImageAnimatorSrc(info->imgs, info->num, info->info.interval); + } else { + if (info->imgs != nullptr) { + UIFree(info->imgs); + } + info->num = num; + info->imgs = LoadImgs(info->info, info->num); + if (info->imgs == nullptr) { + return; + } + SetImageAnimatorSrc(info->imgs, info->num, info->info.interval); + } +} +} // namespace OHOS \ No newline at end of file diff --git a/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/DialTimePublisher.cpp b/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/DialTimePublisher.cpp deleted file mode 100644 index cb4539b16..000000000 --- a/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/DialTimePublisher.cpp +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (c) CompanyNameMagicTag 2025. All rights reserved. - * Description: DialTimePublisher - * Author: - * Create: 2025-03-04 - */ - -#include "DialTimePublisher.h" -#include "securec.h" -#include "gfx_utils/mem_api.h" -#include "gfx_utils/graphic_log.h" - -namespace OHOS { -DialTimePublisher *DialTimePublisher::publisher_ = nullptr; - -void DialTimePublisher::TimeChangeListener::SetTimeInervals(TimeInterval *intervals, uint8_t num) -{ - if (intervals == nullptr || num == 0) { - return; - } - if (intervals_ != nullptr) { - UIFree(intervals_); - intervals_ = nullptr; - } - num_ = 0; - - intervals_ = static_cast(UIMalloc(sizeof(TimeInterval) * num)); - if (intervals_ == nullptr) { - GRAPHIC_LOGE("failed to malloc!"); - return; - } - num_ = num; - memcpy_s(intervals_, sizeof(TimeInterval) * num, intervals, sizeof(TimeInterval) * num); -} - -bool DialTimePublisher::TimeChangeListener::IsInTimeInterval(const struct tm &curTime) -{ - if (num_ == 0) { // 0-24 - return true; - } - for (uint8_t i = 0; i < num_; ++i) { - if (intervals_[i].start <= curTime.tm_hour && intervals_[i].end > curTime.tm_hour) { - return true; - } - } - return false; -} - -DialTimePublisher::TimeChangeListener::TimeChangeListener() -{ - if (DialTimePublisher::GetPublisher() != nullptr) { - DialTimePublisher::GetPublisher()->Register(this); - } -} - -DialTimePublisher::TimeChangeListener::~TimeChangeListener() -{ - if (intervals_ != nullptr) { - UIFree(intervals_); - intervals_ = nullptr; - } - num_ = 0; - if (DialTimePublisher::GetPublisher() != nullptr) { - DialTimePublisher::GetPublisher()->Unregister(this); - } -} - -void DialTimePublisher::SetPublisher(DialTimePublisher *publisher) -{ - publisher_ = publisher; -} - -DialTimePublisher *DialTimePublisher::GetPublisher() -{ - return publisher_; -} -} // namespace OHOS \ No newline at end of file diff --git a/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/DialViewContainer.cpp b/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/DialViewContainer.cpp index 6db086094..8ed4cf710 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/DialViewContainer.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/DialViewContainer.cpp @@ -7,6 +7,7 @@ #include "DialViewContainer.h" #include "DialDigitalImgView.h" +#include "ModelDialDataFactory.h" namespace OHOS { DialViewContainer::~DialViewContainer() @@ -57,7 +58,7 @@ void DialViewContainer::AddView(DialDataType type, DialView* view, bool isPeriod .type = type, .isPeriodic = isPeriodic }; - if (type == DialDataType::DATA_TYPE_MAX) { + if (ModelDialDataFactory::GetInstance().GetModuleByType(type) == nullptr) { hasInvalidBindData_ = true; } dialViews_.PushBack(info); @@ -91,7 +92,8 @@ bool DialViewContainer::IsInvalidateBindData(uint8_t index) for (uint8_t i = 0; i < index; ++i) { it = it->next_; } - if (it->data_.dialView != nullptr && it->data_.type == DialDataType::DATA_TYPE_MAX) { + if (it->data_.dialView != nullptr && + ModelDialDataFactory::GetInstance().GetModuleByType(it->data_.type) == nullptr) { return true; } DialViewContainer *container = dynamic_cast(it->data_.view); diff --git a/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/DialViewGroup.cpp b/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/DialViewGroup.cpp index 8d705373a..54d197579 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/DialViewGroup.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/DialViewGroup.cpp @@ -13,6 +13,9 @@ #endif #include "MainPresenterSample.h" #include "DialDigitalImgView.h" +#include "common/input_device_manager.h" +#include "DialSequenceImgView.h" +#include "engines/gfx/lite_m_gfx_engine.h" namespace OHOS { DialViewGroup::DialViewGroup(void) @@ -20,6 +23,7 @@ DialViewGroup::DialViewGroup(void) SetTouchable(true); SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); SetCoverable(true); + isExists_ = std::make_shared(true); } DialViewGroup::~DialViewGroup(void) @@ -66,7 +70,6 @@ void DialViewGroup::ClearDial() rollingLabelList_.Clear(); imgAnimList_.Clear(); - seqList_.Clear(); period_ = DEFAULT_TASK_PERIOD; @@ -80,8 +83,10 @@ void DialViewGroup::ClearDial() void DialViewGroup::SetDial(std::string filePath, DisplayState state) { - ClearDial(); - resPreloaded_ = false; + if (resPreloaded_) { + ClearDial(); + resPreloaded_ = false; + } filePath_ = filePath; state_ = state; } @@ -109,13 +114,23 @@ void DialViewGroup::ProcessData(DialDataType type, DialView* view) } else if (value == 1) { // 1: text std::string* textData = nullptr; int16_t num = 0; - ModelDialDataFactory::GetInstance().GetDialTextData(type, textData, num); + if (!ModelDialDataFactory::GetInstance().GetDialTextData(type, textData, num)) { + std::string tmp = ""; + view->HandleTextData(&tmp, 1); + return; + } view->HandleTextData(textData, num); } else if (value == 2) { // 2: multifloat float* floatsData = nullptr; int16_t num = 0; - ModelDialDataFactory::GetInstance().GetDialFloatData(type, floatsData, num); + if (!ModelDialDataFactory::GetInstance().GetDialFloatData(type, floatsData, num)) { + float tmp = 0.0; + view->HandleFloatData(&tmp, 1); + return; + } view->HandleFloatData(floatsData, num); + } else { + GRAPHIC_LOGW("invalid datatype %d", static_cast(type)); } } void DialViewGroup::DoStop(void) @@ -134,7 +149,9 @@ void DialViewGroup::DoStop(void) void DialViewGroup::DoStart(void) { SetLableAnimatorState(Animator::START); - SetImgAnimatorState(Animator::START); + if (isSeqImgLoaded_) { + SetImgAnimatorState(Animator::START); + } if (video_ != nullptr) { if (video_->IsPaused()) { video_->ResumePlay(); @@ -180,9 +197,6 @@ void DialViewGroup::RecordSpecial(UIView *view) return; } video_ = reinterpret_cast(view); - } else if (dynamic_cast(view) != nullptr) { - DialSequenceContainer *seq = dynamic_cast(view); - seqList_.PushBack(seq); } } @@ -209,6 +223,7 @@ void DialViewGroup::RecordBindData(DialDataType type, DialView* view, bool isPer dataTypeMap_.insert(std::make_pair(static_cast(type), container)); viewsMemPool_.PushBack(container); } + view->SetDataType(type); if (isPeriodic) { periodicUpdateTypes_.PushBack(type); } else { @@ -439,6 +454,29 @@ void DialViewGroup::OnActive(void) if ((mainPresenter == nullptr) || (mainPresenter->GetMainPresenterState() != MainPresenterState::RESUME)) { return; } + if (!isSeqImgLoaded_) { + std::weak_ptr wk = isExists_; + GraphicService::GetInstance()->ForceRefreshImmediately(); + GraphicService::GetInstance()->PostGraphicEvent([this, wk]() { + if (wk.expired()) { + return; + } + + InputDeviceManager::GetInstance()->ClearInputDeviceState(); + ListNode *node = imgAnimList_.Begin(); + while (node != imgAnimList_.End()) { + if (node->data_ != nullptr) { + DialSequenceImgView *imgAnim = dynamic_cast(node->data_); + if (imgAnim != nullptr) { + imgAnim->LoadCurSeqImgs(); + imgAnim->Start(); + } + } + node = node->next_; + } + isSeqImgLoaded_ = true; + }); + } DoStart(); } @@ -499,7 +537,7 @@ void DialViewGroup::SetLableAnimatorState(uint8_t state) void DialViewGroup::SetImgAnimatorState(uint8_t state) { - if (imgAnimList_.IsEmpty() && seqList_.IsEmpty()) { + if (imgAnimList_.IsEmpty()) { return; } @@ -518,20 +556,5 @@ void DialViewGroup::SetImgAnimatorState(uint8_t state) } node = node->next_; } - - ListNode* it = seqList_.Begin(); - while (it != seqList_.End()) { - if (it->data_ != nullptr) { - switch (state) { - case Animator::PAUSE: - it->data_->Pause(); - break; - case Animator::START: - it->data_->Resume(); - break; - } - } - it = it->next_; - } } } // namespace OHOS diff --git a/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/ModelDialDataFactory.cpp b/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/ModelDialDataFactory.cpp index 81c7106fd..d17de5b31 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/ModelDialDataFactory.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/main/src/dial/ModelDialDataFactory.cpp @@ -43,24 +43,6 @@ DialBaseModel* ModelDialDataFactory::GetModuleByType(DialDataType& type) return iter->second; } -bool ModelDialDataFactory::IsOHBindDataExist(DialOHDataType type) const -{ - auto it = g_bindDataConverter.find(type); - if (it == g_bindDataConverter.end()) { - return false; - } - return IsBindDataExist(it->second); -} - -bool ModelDialDataFactory::IsBindDataExist(DialDataType type) const -{ - auto it = models_.find(static_cast(type)); - if (it != models_.end() && it->second != nullptr) { - return true; - } - return false; -} - bool ModelDialDataFactory::RegisterDialDataListener(DialDataType type, OnDialDataUpdateListener* listener) { DialBaseModel* model = GetModuleByType(type); diff --git a/code/sdk/application/wearable/service/msg_center/brandy-auto-ota-cli/libmsg_center.a b/code/sdk/application/wearable/service/msg_center/brandy-auto-ota-cli/libmsg_center.a index f6ea17c48..6a29e7c98 100644 Binary files a/code/sdk/application/wearable/service/msg_center/brandy-auto-ota-cli/libmsg_center.a and b/code/sdk/application/wearable/service/msg_center/brandy-auto-ota-cli/libmsg_center.a differ diff --git a/code/sdk/application/wearable/service/msg_center/brandy-auto-ota-ser/libmsg_center.a b/code/sdk/application/wearable/service/msg_center/brandy-auto-ota-ser/libmsg_center.a index c7c253e08..1a1666e42 100644 Binary files a/code/sdk/application/wearable/service/msg_center/brandy-auto-ota-ser/libmsg_center.a and b/code/sdk/application/wearable/service/msg_center/brandy-auto-ota-ser/libmsg_center.a differ diff --git a/code/sdk/application/wearable/service/msg_center/brandy-native-js-fd230/libmsg_center.a b/code/sdk/application/wearable/service/msg_center/brandy-native-js-fd230/libmsg_center.a deleted file mode 100644 index 0e24be78a..000000000 Binary files a/code/sdk/application/wearable/service/msg_center/brandy-native-js-fd230/libmsg_center.a and /dev/null differ diff --git a/code/sdk/application/wearable/service/msg_center/brandy-native-js-fd230/libuikit_fwk.a b/code/sdk/application/wearable/service/msg_center/brandy-native-js-fd230/libuikit_fwk.a new file mode 100644 index 000000000..b1ab9d2d0 Binary files /dev/null and b/code/sdk/application/wearable/service/msg_center/brandy-native-js-fd230/libuikit_fwk.a differ diff --git a/code/sdk/application/wearable/service/msg_center/brandy-native-js/libmsg_center.a b/code/sdk/application/wearable/service/msg_center/brandy-native-js/libmsg_center.a index 0e24be78a..c3aaaca96 100644 Binary files a/code/sdk/application/wearable/service/msg_center/brandy-native-js/libmsg_center.a and b/code/sdk/application/wearable/service/msg_center/brandy-native-js/libmsg_center.a differ diff --git a/code/sdk/application/wearable/service/msg_center/brandy-xts/libmsg_center.a b/code/sdk/application/wearable/service/msg_center/brandy-xts/libmsg_center.a index c686df549..426bb7c43 100644 Binary files a/code/sdk/application/wearable/service/msg_center/brandy-xts/libmsg_center.a and b/code/sdk/application/wearable/service/msg_center/brandy-xts/libmsg_center.a differ diff --git a/code/sdk/interim_binary/brandy/acore/build_hso_cfg/hso_database/xml/base/closed_comp/DialBinParser.cpp.xml b/code/sdk/interim_binary/brandy/acore/build_hso_cfg/hso_database/xml/base/closed_comp/DialBinParser.cpp.xml index 5d00528fc..42040f7f9 100644 --- a/code/sdk/interim_binary/brandy/acore/build_hso_cfg/hso_database/xml/base/closed_comp/DialBinParser.cpp.xml +++ b/code/sdk/interim_binary/brandy/acore/build_hso_cfg/hso_database/xml/base/closed_comp/DialBinParser.cpp.xml @@ -1,55 +1,55 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/code/sdk/interim_binary/brandy/acore/build_hso_cfg/hso_database/xml/base/closed_comp/display_vau.c.xml b/code/sdk/interim_binary/brandy/acore/build_hso_cfg/hso_database/xml/base/closed_comp/display_vau.c.xml index eb9dbcfde..dd31827a2 100644 --- a/code/sdk/interim_binary/brandy/acore/build_hso_cfg/hso_database/xml/base/closed_comp/display_vau.c.xml +++ b/code/sdk/interim_binary/brandy/acore/build_hso_cfg/hso_database/xml/base/closed_comp/display_vau.c.xml @@ -12,40 +12,40 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/code/sdk/interim_binary/brandy/acore/build_hso_cfg/hso_database/xml/base/closed_comp/image_cache_manager.cpp.xml b/code/sdk/interim_binary/brandy/acore/build_hso_cfg/hso_database/xml/base/closed_comp/image_cache_manager.cpp.xml index fe7277920..7614ddff1 100644 --- a/code/sdk/interim_binary/brandy/acore/build_hso_cfg/hso_database/xml/base/closed_comp/image_cache_manager.cpp.xml +++ b/code/sdk/interim_binary/brandy/acore/build_hso_cfg/hso_database/xml/base/closed_comp/image_cache_manager.cpp.xml @@ -35,6 +35,6 @@ - - + + \ No newline at end of file diff --git a/code/sdk/interim_binary/brandy/acore/build_hso_cfg/hso_database/xml/base/closed_comp/kaleidoscope_utils.cpp.xml b/code/sdk/interim_binary/brandy/acore/build_hso_cfg/hso_database/xml/base/closed_comp/kaleidoscope_utils.cpp.xml index f6f2241a0..f22769f80 100644 --- a/code/sdk/interim_binary/brandy/acore/build_hso_cfg/hso_database/xml/base/closed_comp/kaleidoscope_utils.cpp.xml +++ b/code/sdk/interim_binary/brandy/acore/build_hso_cfg/hso_database/xml/base/closed_comp/kaleidoscope_utils.cpp.xml @@ -17,10 +17,10 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/code/sdk/interim_binary/brandy/acore/build_hso_cfg/hso_database/xml/base/closed_comp/ui_cross_view.cpp.xml b/code/sdk/interim_binary/brandy/acore/build_hso_cfg/hso_database/xml/base/closed_comp/ui_cross_view.cpp.xml index 2cf8d0c76..ce2a29db0 100644 --- a/code/sdk/interim_binary/brandy/acore/build_hso_cfg/hso_database/xml/base/closed_comp/ui_cross_view.cpp.xml +++ b/code/sdk/interim_binary/brandy/acore/build_hso_cfg/hso_database/xml/base/closed_comp/ui_cross_view.cpp.xml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/freertos/ble/libbt_host_brandy_service.a b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/freertos/ble/libbt_host_brandy_service.a index 807cef0bb..9d8104949 100644 Binary files a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/freertos/ble/libbt_host_brandy_service.a and b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/freertos/ble/libbt_host_brandy_service.a differ diff --git a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/freertos/ble/libbt_host_sdk.a b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/freertos/ble/libbt_host_sdk.a index 02ddfb287..76cbbc5db 100644 Binary files a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/freertos/ble/libbt_host_sdk.a and b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/freertos/ble/libbt_host_sdk.a differ diff --git a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/freertos/br/libbt_host_brandy_service.a b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/freertos/br/libbt_host_brandy_service.a index 91cdef901..4e896a81d 100644 Binary files a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/freertos/br/libbt_host_brandy_service.a and b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/freertos/br/libbt_host_brandy_service.a differ diff --git a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/freertos/br/libbt_host_sdk.a b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/freertos/br/libbt_host_sdk.a index bacaa3ce0..f288166ce 100644 Binary files a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/freertos/br/libbt_host_sdk.a and b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/freertos/br/libbt_host_sdk.a differ diff --git a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/ble/libbt_host_brandy_service.a b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/ble/libbt_host_brandy_service.a index 7cc5f9f80..63f02708d 100644 Binary files a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/ble/libbt_host_brandy_service.a and b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/ble/libbt_host_brandy_service.a differ diff --git a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/ble/libbt_host_sdk.a b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/ble/libbt_host_sdk.a index 3df28f9a5..5ddd4073d 100644 Binary files a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/ble/libbt_host_sdk.a and b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/ble/libbt_host_sdk.a differ diff --git a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_audio_manager_wrapper.a b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_audio_manager_wrapper.a index 5a3492545..f86fdc31b 100644 Binary files a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_audio_manager_wrapper.a and b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_audio_manager_wrapper.a differ diff --git a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_brandy_service.a b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_brandy_service.a index 79cb1c332..485d5a80b 100644 Binary files a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_brandy_service.a and b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_brandy_service.a differ diff --git a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_sdk.a b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_sdk.a index 58a913fa6..7d93f9c56 100644 Binary files a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_sdk.a and b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_sdk.a differ diff --git a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/mini/ble/libbt_host_brandy_service.a b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/mini/ble/libbt_host_brandy_service.a index 1abdef2fb..3af19559e 100644 Binary files a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/mini/ble/libbt_host_brandy_service.a and b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/mini/ble/libbt_host_brandy_service.a differ diff --git a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/mini/ble/libbt_host_sdk.a b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/mini/ble/libbt_host_sdk.a index 6ba40df7d..7e6b8ba9b 100644 Binary files a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/mini/ble/libbt_host_sdk.a and b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/mini/ble/libbt_host_sdk.a differ diff --git a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/mini/br/libbt_host_brandy_service.a b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/mini/br/libbt_host_brandy_service.a index 2a62b43f1..5546b2be9 100644 Binary files a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/mini/br/libbt_host_brandy_service.a and b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/mini/br/libbt_host_brandy_service.a differ diff --git a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/mini/br/libbt_host_sdk.a b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/mini/br/libbt_host_sdk.a index 1dd7bc776..8a9516efd 100644 Binary files a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/mini/br/libbt_host_sdk.a and b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/mini/br/libbt_host_sdk.a differ diff --git a/code/sdk/middleware/chips/brandy/dfx/include/log_def_gui.h b/code/sdk/middleware/chips/brandy/dfx/include/log_def_gui.h index 4a2f4b5ed..7c59246ac 100644 --- a/code/sdk/middleware/chips/brandy/dfx/include/log_def_gui.h +++ b/code/sdk/middleware/chips/brandy/dfx/include/log_def_gui.h @@ -459,8 +459,8 @@ typedef enum { VIDEOCARD_CPP, DIALBINPARSERV3_CPP, DIALTIMEPUBLISHER_CPP, - DIALSEQUENCECONTAINER_CPP, WATCHINTERFACE_CPP, + DIALMODELTIME_CPP, FILE_ID_MAX = 1024, } log_file_list_enum_gui_t; #endif diff --git a/code/sdk/middleware/services/gpu/api/rm/brandy-auto-ota-cli/libgfx_rm.a b/code/sdk/middleware/services/gpu/api/rm/brandy-auto-ota-cli/libgfx_rm.a index c6dbfdd1b..8ba42a584 100644 Binary files a/code/sdk/middleware/services/gpu/api/rm/brandy-auto-ota-cli/libgfx_rm.a and b/code/sdk/middleware/services/gpu/api/rm/brandy-auto-ota-cli/libgfx_rm.a differ diff --git a/code/sdk/middleware/services/gpu/api/rm/brandy-auto-ota-ser/libgfx_rm.a b/code/sdk/middleware/services/gpu/api/rm/brandy-auto-ota-ser/libgfx_rm.a index 86859b75b..bfc3f2c91 100644 Binary files a/code/sdk/middleware/services/gpu/api/rm/brandy-auto-ota-ser/libgfx_rm.a and b/code/sdk/middleware/services/gpu/api/rm/brandy-auto-ota-ser/libgfx_rm.a differ diff --git a/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-fd230-r/libgfx_rm.a b/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-fd230-r/libgfx_rm.a index 4adaa7e6f..441cef80f 100644 Binary files a/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-fd230-r/libgfx_rm.a and b/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-fd230-r/libgfx_rm.a differ diff --git a/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-fd230/libgfx_rm.a b/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-fd230/libgfx_rm.a index deccbf1bd..441cef80f 100644 Binary files a/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-fd230/libgfx_rm.a and b/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-fd230/libgfx_rm.a differ diff --git a/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-r/libgfx_rm.a b/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-r/libgfx_rm.a index 4adaa7e6f..fbc80060f 100644 Binary files a/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-r/libgfx_rm.a and b/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-r/libgfx_rm.a differ diff --git a/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-xts-r/libgfx_rm.a b/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-xts-r/libgfx_rm.a index 4adaa7e6f..73a22fc3e 100644 Binary files a/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-xts-r/libgfx_rm.a and b/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-xts-r/libgfx_rm.a differ diff --git a/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-xts/libgfx_rm.a b/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-xts/libgfx_rm.a index deccbf1bd..73a22fc3e 100644 Binary files a/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-xts/libgfx_rm.a and b/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-xts/libgfx_rm.a differ diff --git a/code/sdk/middleware/services/gpu/api/rm/brandy-native-js/libgfx_rm.a b/code/sdk/middleware/services/gpu/api/rm/brandy-native-js/libgfx_rm.a index deccbf1bd..441cef80f 100644 Binary files a/code/sdk/middleware/services/gpu/api/rm/brandy-native-js/libgfx_rm.a and b/code/sdk/middleware/services/gpu/api/rm/brandy-native-js/libgfx_rm.a differ diff --git a/code/sdk/middleware/services/gpu/api/rm/brandy-target1-r/libgfx_rm.a b/code/sdk/middleware/services/gpu/api/rm/brandy-target1-r/libgfx_rm.a index e29c3e3aa..c98fc14c4 100644 Binary files a/code/sdk/middleware/services/gpu/api/rm/brandy-target1-r/libgfx_rm.a and b/code/sdk/middleware/services/gpu/api/rm/brandy-target1-r/libgfx_rm.a differ diff --git a/code/sdk/middleware/services/gpu/api/rm/brandy-target1/libgfx_rm.a b/code/sdk/middleware/services/gpu/api/rm/brandy-target1/libgfx_rm.a index 350f9fbda..3e905a253 100644 Binary files a/code/sdk/middleware/services/gpu/api/rm/brandy-target1/libgfx_rm.a and b/code/sdk/middleware/services/gpu/api/rm/brandy-target1/libgfx_rm.a differ diff --git a/code/sdk/middleware/services/gpu/api/rm/brandy-target3-r/libgfx_rm.a b/code/sdk/middleware/services/gpu/api/rm/brandy-target3-r/libgfx_rm.a index 084c2e902..941acdb57 100644 Binary files a/code/sdk/middleware/services/gpu/api/rm/brandy-target3-r/libgfx_rm.a and b/code/sdk/middleware/services/gpu/api/rm/brandy-target3-r/libgfx_rm.a differ diff --git a/code/sdk/middleware/services/gpu/api/rm/brandy-target3/libgfx_rm.a b/code/sdk/middleware/services/gpu/api/rm/brandy-target3/libgfx_rm.a index 0c0b185a6..c0b0c1ae2 100644 Binary files a/code/sdk/middleware/services/gpu/api/rm/brandy-target3/libgfx_rm.a and b/code/sdk/middleware/services/gpu/api/rm/brandy-target3/libgfx_rm.a differ diff --git a/code/sdk/middleware/services/gpu/api/rm/brandy-target4-r/libgfx_rm.a b/code/sdk/middleware/services/gpu/api/rm/brandy-target4-r/libgfx_rm.a index 3d9e75be5..788bded6e 100644 Binary files a/code/sdk/middleware/services/gpu/api/rm/brandy-target4-r/libgfx_rm.a and b/code/sdk/middleware/services/gpu/api/rm/brandy-target4-r/libgfx_rm.a differ diff --git a/code/sdk/middleware/services/gpu/api/rm/brandy-target4/libgfx_rm.a b/code/sdk/middleware/services/gpu/api/rm/brandy-target4/libgfx_rm.a index 0c52ab9ed..e2b31fdf0 100644 Binary files a/code/sdk/middleware/services/gpu/api/rm/brandy-target4/libgfx_rm.a and b/code/sdk/middleware/services/gpu/api/rm/brandy-target4/libgfx_rm.a differ diff --git a/code/sdk/middleware/services/gpu/api/rm/brandy-target5-r/libgfx_rm.a b/code/sdk/middleware/services/gpu/api/rm/brandy-target5-r/libgfx_rm.a index 232248462..082b3dac8 100644 Binary files a/code/sdk/middleware/services/gpu/api/rm/brandy-target5-r/libgfx_rm.a and b/code/sdk/middleware/services/gpu/api/rm/brandy-target5-r/libgfx_rm.a differ diff --git a/code/sdk/middleware/services/gpu/api/rm/brandy-target5/libgfx_rm.a b/code/sdk/middleware/services/gpu/api/rm/brandy-target5/libgfx_rm.a index 90be983ef..aef687eb4 100644 Binary files a/code/sdk/middleware/services/gpu/api/rm/brandy-target5/libgfx_rm.a and b/code/sdk/middleware/services/gpu/api/rm/brandy-target5/libgfx_rm.a differ diff --git a/code/sdk/middleware/services/gpu/api/rm/brandy-xts/libgfx_rm.a b/code/sdk/middleware/services/gpu/api/rm/brandy-xts/libgfx_rm.a index 742841344..73a22fc3e 100644 Binary files a/code/sdk/middleware/services/gpu/api/rm/brandy-xts/libgfx_rm.a and b/code/sdk/middleware/services/gpu/api/rm/brandy-xts/libgfx_rm.a differ diff --git a/code/sdk/middleware/services/gpu/api/rm/testsuite-brandy-sdk/libgfx_rm.a b/code/sdk/middleware/services/gpu/api/rm/testsuite-brandy-sdk/libgfx_rm.a index 5943d14d0..9e1b02296 100644 Binary files a/code/sdk/middleware/services/gpu/api/rm/testsuite-brandy-sdk/libgfx_rm.a and b/code/sdk/middleware/services/gpu/api/rm/testsuite-brandy-sdk/libgfx_rm.a differ diff --git a/code/sdk/middleware/services/gui/hal/display/brandy-auto-ota-cli/libdisplay_gfx.a b/code/sdk/middleware/services/gui/hal/display/brandy-auto-ota-cli/libdisplay_gfx.a index 97b71926a..1c555aba8 100644 Binary files a/code/sdk/middleware/services/gui/hal/display/brandy-auto-ota-cli/libdisplay_gfx.a and b/code/sdk/middleware/services/gui/hal/display/brandy-auto-ota-cli/libdisplay_gfx.a differ diff --git a/code/sdk/middleware/services/gui/hal/display/brandy-auto-ota-ser/libdisplay_gfx.a b/code/sdk/middleware/services/gui/hal/display/brandy-auto-ota-ser/libdisplay_gfx.a index f3d611c92..55d15300a 100644 Binary files a/code/sdk/middleware/services/gui/hal/display/brandy-auto-ota-ser/libdisplay_gfx.a and b/code/sdk/middleware/services/gui/hal/display/brandy-auto-ota-ser/libdisplay_gfx.a differ diff --git a/code/sdk/middleware/services/gui/hal/display/brandy-native-js-fd230/libdisplay_gfx.a b/code/sdk/middleware/services/gui/hal/display/brandy-native-js-fd230/libdisplay_gfx.a index f1571801f..5b7a5036a 100644 Binary files a/code/sdk/middleware/services/gui/hal/display/brandy-native-js-fd230/libdisplay_gfx.a and b/code/sdk/middleware/services/gui/hal/display/brandy-native-js-fd230/libdisplay_gfx.a differ diff --git a/code/sdk/middleware/services/gui/hal/display/brandy-native-js-xts/libdisplay_gfx.a b/code/sdk/middleware/services/gui/hal/display/brandy-native-js-xts/libdisplay_gfx.a index f1571801f..5b7a5036a 100644 Binary files a/code/sdk/middleware/services/gui/hal/display/brandy-native-js-xts/libdisplay_gfx.a and b/code/sdk/middleware/services/gui/hal/display/brandy-native-js-xts/libdisplay_gfx.a differ diff --git a/code/sdk/middleware/services/gui/hal/display/brandy-native-js/libdisplay_gfx.a b/code/sdk/middleware/services/gui/hal/display/brandy-native-js/libdisplay_gfx.a index f1571801f..5b7a5036a 100644 Binary files a/code/sdk/middleware/services/gui/hal/display/brandy-native-js/libdisplay_gfx.a and b/code/sdk/middleware/services/gui/hal/display/brandy-native-js/libdisplay_gfx.a differ diff --git a/code/sdk/middleware/services/gui/hal/display/brandy-target1/libdisplay_gfx.a b/code/sdk/middleware/services/gui/hal/display/brandy-target1/libdisplay_gfx.a index 9a5cb4e15..3325fc9ed 100644 Binary files a/code/sdk/middleware/services/gui/hal/display/brandy-target1/libdisplay_gfx.a and b/code/sdk/middleware/services/gui/hal/display/brandy-target1/libdisplay_gfx.a differ diff --git a/code/sdk/middleware/services/gui/hal/display/brandy-target3/libdisplay_gfx.a b/code/sdk/middleware/services/gui/hal/display/brandy-target3/libdisplay_gfx.a index fdd8ba175..2df6c10d3 100644 Binary files a/code/sdk/middleware/services/gui/hal/display/brandy-target3/libdisplay_gfx.a and b/code/sdk/middleware/services/gui/hal/display/brandy-target3/libdisplay_gfx.a differ diff --git a/code/sdk/middleware/services/gui/hal/display/brandy-target5/libdisplay_gfx.a b/code/sdk/middleware/services/gui/hal/display/brandy-target5/libdisplay_gfx.a index a9ffd5f1b..9e3a976f4 100644 Binary files a/code/sdk/middleware/services/gui/hal/display/brandy-target5/libdisplay_gfx.a and b/code/sdk/middleware/services/gui/hal/display/brandy-target5/libdisplay_gfx.a differ diff --git a/code/sdk/middleware/services/gui/hal/display/brandy-xts/libdisplay_gfx.a b/code/sdk/middleware/services/gui/hal/display/brandy-xts/libdisplay_gfx.a index dfaf9472e..93d2d8d65 100644 Binary files a/code/sdk/middleware/services/gui/hal/display/brandy-xts/libdisplay_gfx.a and b/code/sdk/middleware/services/gui/hal/display/brandy-xts/libdisplay_gfx.a differ diff --git a/code/sdk/middleware/services/gui/lvgl/brandy-target1/liblvgl_proprietary_mini.a b/code/sdk/middleware/services/gui/lvgl/brandy-target1/liblvgl_proprietary_mini.a index 289f8855e..c065a9fe6 100644 Binary files a/code/sdk/middleware/services/gui/lvgl/brandy-target1/liblvgl_proprietary_mini.a and b/code/sdk/middleware/services/gui/lvgl/brandy-target1/liblvgl_proprietary_mini.a differ diff --git a/code/sdk/middleware/services/gui/lvgl/brandy-target5/liblvgl_proprietary.a b/code/sdk/middleware/services/gui/lvgl/brandy-target5/liblvgl_proprietary.a index 3abe5ed13..597c388ab 100644 Binary files a/code/sdk/middleware/services/gui/lvgl/brandy-target5/liblvgl_proprietary.a and b/code/sdk/middleware/services/gui/lvgl/brandy-target5/liblvgl_proprietary.a differ diff --git a/code/sdk/middleware/services/gui/uikit/brandy-auto-ota-cli/libuikit_ext.a b/code/sdk/middleware/services/gui/uikit/brandy-auto-ota-cli/libuikit_ext.a index b06968c15..093848246 100644 Binary files a/code/sdk/middleware/services/gui/uikit/brandy-auto-ota-cli/libuikit_ext.a and b/code/sdk/middleware/services/gui/uikit/brandy-auto-ota-cli/libuikit_ext.a differ diff --git a/code/sdk/middleware/services/gui/uikit/brandy-auto-ota-ser/libuikit_ext.a b/code/sdk/middleware/services/gui/uikit/brandy-auto-ota-ser/libuikit_ext.a index ecbaad890..2856f3df5 100644 Binary files a/code/sdk/middleware/services/gui/uikit/brandy-auto-ota-ser/libuikit_ext.a and b/code/sdk/middleware/services/gui/uikit/brandy-auto-ota-ser/libuikit_ext.a differ diff --git a/code/sdk/middleware/services/gui/uikit/brandy-native-js-fd230/libuikit_ext.a b/code/sdk/middleware/services/gui/uikit/brandy-native-js-fd230/libuikit_ext.a index 81ecca508..aa77c6800 100644 Binary files a/code/sdk/middleware/services/gui/uikit/brandy-native-js-fd230/libuikit_ext.a and b/code/sdk/middleware/services/gui/uikit/brandy-native-js-fd230/libuikit_ext.a differ diff --git a/code/sdk/middleware/services/gui/uikit/brandy-native-js-xts/libuikit_ext.a b/code/sdk/middleware/services/gui/uikit/brandy-native-js-xts/libuikit_ext.a index 81ecca508..aa77c6800 100644 Binary files a/code/sdk/middleware/services/gui/uikit/brandy-native-js-xts/libuikit_ext.a and b/code/sdk/middleware/services/gui/uikit/brandy-native-js-xts/libuikit_ext.a differ diff --git a/code/sdk/middleware/services/gui/uikit/brandy-native-js/libuikit_ext.a b/code/sdk/middleware/services/gui/uikit/brandy-native-js/libuikit_ext.a index 81ecca508..aa77c6800 100644 Binary files a/code/sdk/middleware/services/gui/uikit/brandy-native-js/libuikit_ext.a and b/code/sdk/middleware/services/gui/uikit/brandy-native-js/libuikit_ext.a differ diff --git a/code/sdk/middleware/services/gui/uikit/brandy-target3/libuikit_ext.a b/code/sdk/middleware/services/gui/uikit/brandy-target3/libuikit_ext.a index cad2383a7..fbaddb64a 100644 Binary files a/code/sdk/middleware/services/gui/uikit/brandy-target3/libuikit_ext.a and b/code/sdk/middleware/services/gui/uikit/brandy-target3/libuikit_ext.a differ diff --git a/code/sdk/middleware/services/gui/uikit/brandy-xts/libuikit_ext.a b/code/sdk/middleware/services/gui/uikit/brandy-xts/libuikit_ext.a index 55fc828a4..13ebf2c9b 100644 Binary files a/code/sdk/middleware/services/gui/uikit/brandy-xts/libuikit_ext.a and b/code/sdk/middleware/services/gui/uikit/brandy-xts/libuikit_ext.a differ diff --git a/code/sdk/middleware/services/gui/uikit/proprietary/include/components/ui_sphere_view.h b/code/sdk/middleware/services/gui/uikit/proprietary/include/components/ui_sphere_view.h index cb057fc9e..6cd8cffc5 100644 --- a/code/sdk/middleware/services/gui/uikit/proprietary/include/components/ui_sphere_view.h +++ b/code/sdk/middleware/services/gui/uikit/proprietary/include/components/ui_sphere_view.h @@ -29,42 +29,137 @@ public: return UI_SPHERE_VIEW; } - void Add(UIView* child) override; - void Remove(UIView* child) override; + /** + * @brief Adds a child view. + * + * @param view Indicates the pointer to the child view to add. + * @since 1.0 + * @version 1.0 + */ + void Add(UIView* view) override; + + /** + * @brief Inserts a new child view behind the current one. + * + * @param prevView Indicates the pointer to the current child view, previous to the new child view to insert. + * @param insertView Indicates the pointer to the new child view to insert. + * @since 1.0 + * @version 1.0 + */ void Insert(UIView* prevView, UIView* insertView) override; + + /** + * @brief Removes a child view. + * + * @param view Indicates the pointer to the child view to remove. + * @since 1.0 + * @version 1.0 + */ + void Remove(UIView* view) override; + + /** + * @brief Sets the number of rows to be displayed. + * + * @param numberOfRow Number of rows. + * @since 1.0 + * @version 1.0 + */ void SetNumberOfRow(uint8_t numberOfRow); - void SetSphereCameraPosition(const Vector2& position); - void SetSphereCameraDistance(int16_t distance); + + /** + * @brief Get the number of rows to be displayed. + * + * @return Number of rows. + * @since 1.0 + * @version 1.0 + */ uint8_t GetNumberOfRow() { return numberOfRow_; } + class ChildStateListener : public HeapBase { + public: + /** + * @brief Callback function when the status of a child control changes. + * + * @param view Object of the child control whose state changes. + * @param rowAngle Rotation angle of the child control in the current row direction. + * @param colAngle Rotation angle of the child control in the current column direction. + * @since 1.0 + * @version 1.0 + */ + virtual bool StateChange(UIView& view, float rowAngle, float colAngle) + { + return false; + } + + virtual ~ChildStateListener() {} + }; + + /** + * @brief Listens for the change of the angle status of the child control. + * + * @param Object of class ChildStateListener. + * @since 1.0 + * @version 1.0 + */ + void SetChildStateListener(ChildStateListener* listener) + { + listener_ = listener; + } + + /** + * @brief Updates the angle of the current spherical rotation. + * @param angle Indicates The angle of movement. + * @since 1.0 + * @version 1.0 + */ + void UpdateItemAngle(float angle); + + /** + * @brief Sets the height for the view. + * @param height Indicates the height to set. + * @since 1.0 + * @version 1.0 + */ + void SetHeight(int16_t height) override; + + /** + * @brief Sets the width for the view. + * @param width Indicates the width to set. + * @since 1.0 + * @version 1.0 + */ + void SetWidth(int16_t width) override; + + /** + * @brief Set sensitivity factor. + * Drag distance will be converted to angle, and will multiply by this factor. + */ void SetSensitivityFactor(float sensitivity) { sensitivityFactor_ = sensitivity; } + /** + * @brief Get sensitivity factor. Default value is 1.0. + */ float GetSensitivityFactor() { return sensitivityFactor_; } + void SetSphereCameraPosition(const Vector2& position); + void SetSphereCameraDistance(int16_t distance); #if ENABLE_ROTATE_INPUT bool OnRotateStartEvent(const RotateEvent& event) override; - bool OnRotateEvent(const RotateEvent& event) override; - bool OnRotateEndEvent(const RotateEvent& event) override; #endif - - void UpdateItemAngle(float angle); bool OnDragStartEvent(const DragEvent& event) override; bool OnDragEvent(const DragEvent& event) override; bool OnDragEndEvent(const DragEvent& event) override; - void SetHeight(int16_t height) override; - void SetWidth(int16_t width) override; - protected: bool DragXInner(int16_t distance) override; bool DragYInner(int16_t distance) override @@ -119,6 +214,7 @@ private: void TransformItemGroup(); Animator dragAnim_; + ChildStateListener* listener_ = nullptr; DragAnimatorCallback dragCallback_; uint8_t numberOfRow_ = 1; bool needRefreshSphere_ = false; diff --git a/code/sdk/middleware/services/gui/uikit/proprietary/include/service/graphic_service.h b/code/sdk/middleware/services/gui/uikit/proprietary/include/service/graphic_service.h index d1ff6f6ad..a1103eff7 100644 --- a/code/sdk/middleware/services/gui/uikit/proprietary/include/service/graphic_service.h +++ b/code/sdk/middleware/services/gui/uikit/proprietary/include/service/graphic_service.h @@ -131,6 +131,8 @@ public: */ void GpuResetEnd(void); + void ForceRefreshImmediately(); + static void NativeMainThread(void* args); static void RtcEventThread(void* args); diff --git a/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service.cpp b/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service.cpp index 43eae321a..2d79d5467 100644 --- a/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service.cpp +++ b/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service.cpp @@ -169,6 +169,29 @@ void GraphicService::GpuResetEnd(void) isGpuReseting = false; } +void GraphicService::ForceRefreshImmediately() +{ + using namespace OHOS; + if (GraphicService::GetInstance()->GetGraphicTaskTriggeredCount() <= 0) { + osal_atomic_inc(&graphicTaskTriggeredCount_); + GraphicEventHandler::GetInstance()->PostGraphicEvent([] { + if (GraphicService::GetInstance()->IsScreenOn() && isJsTaskFinished_) { + TaskManager::GetInstance()->TaskHandler(); + LiteMGfxEngine::GetInstance()->SyncHwDraw(); + } else { + GRAPHIC_LOGW("ignore redundant task when screen is off or js task is not finished"); + } + GraphicService::GetInstance()->DecreaseTriggerCount(); + }); + return; + } + GraphicEventHandler::GetInstance()->PostGraphicEvent([]() { + if (GraphicService::GetInstance()->IsScreenOn() && isJsTaskFinished_) { + LiteMGfxEngine::GetInstance()->SyncHwDraw(); + } + }); +} + void GraphicService::EnableAsyncMode(bool enable) { OHOS::LiteMGfxEngine::GetInstance()->EnableAsyncMode(enable); diff --git a/code/sdk/middleware/services/gui/uikit/sample/uitest/components/ui_test_sphere_view/ui_test_sphere_view.cpp b/code/sdk/middleware/services/gui/uikit/sample/uitest/components/ui_test_sphere_view/ui_test_sphere_view.cpp index 7e9b3baa8..710978ea2 100644 --- a/code/sdk/middleware/services/gui/uikit/sample/uitest/components/ui_test_sphere_view/ui_test_sphere_view.cpp +++ b/code/sdk/middleware/services/gui/uikit/sample/uitest/components/ui_test_sphere_view/ui_test_sphere_view.cpp @@ -21,11 +21,15 @@ namespace OHOS { static constexpr uint8_t STEP_SIZE = 10; - UITestSphereView::UITestSphereView() { } +const UIView* UITestSphereView::GetTestView() +{ + return container_; +} + void UITestSphereView::SetUp() { container_ = new UIViewGroup(); @@ -36,6 +40,10 @@ void UITestSphereView::SetUp() sphereView_ = new UISphereView(8); // 8: Setting the Number of Displayed Lines. sphereView_->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); sphereView_->SetThrowDrag(true); + if (listener_ == nullptr) { + listener_ = new UITestSphereView::StateListener(); + sphereView_->SetChildStateListener(listener_); + } sphereView_->RequestFocus(); container_->Add(sphereView_); for (uint8_t i = 0; i < 24; i++) { // 24: item number. @@ -69,6 +77,10 @@ void UITestSphereView::TearDown() addItemBt_ = nullptr; updateCameraDistance = nullptr; removeItemBt_ = nullptr; + if (listener_ != nullptr) { + delete listener_; + listener_ = nullptr; + } } void UITestSphereView::SetUpLabelButton() @@ -116,11 +128,6 @@ void UITestSphereView::SetUpLabelButton() controlGroup_->Add(updateCameraDistance); } -const UIView* UITestSphereView::GetTestView() -{ - return container_; -} - bool UITestSphereView::OnClick(UIView& view, const ClickEvent& event) { int16_t x = sphereView_->GetX(); diff --git a/code/sdk/middleware/services/gui/uikit/sample/uitest/components/ui_test_sphere_view/ui_test_sphere_view.h b/code/sdk/middleware/services/gui/uikit/sample/uitest/components/ui_test_sphere_view/ui_test_sphere_view.h index f13f95629..a051d3774 100644 --- a/code/sdk/middleware/services/gui/uikit/sample/uitest/components/ui_test_sphere_view/ui_test_sphere_view.h +++ b/code/sdk/middleware/services/gui/uikit/sample/uitest/components/ui_test_sphere_view/ui_test_sphere_view.h @@ -29,6 +29,19 @@ public: const UIView* GetTestView() override; bool OnClick(UIView& view, const ClickEvent& event) override; private: + class StateListener : public UISphereView::ChildStateListener { + public: + bool StateChange(UIView& view, float rowAngle, float colAngle) override + { + if (FloatMore(rowAngle, 90.0f) && FloatLess(rowAngle, 270.0f)) { // 90 270: angle range + view.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE >> 1); + } else { + view.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE); + } + return true; + } + }; + void SetUpLabelButton(); UIViewGroup* container_ = nullptr; UISphereView* sphereView_ = nullptr; @@ -40,6 +53,7 @@ private: UILabelButton* addItemBt_ = nullptr; UILabelButton* removeItemBt_ = nullptr; UILabelButton* updateCameraDistance = nullptr; + StateListener* listener_ = nullptr; }; } #endif \ No newline at end of file diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-auto-ota-cli/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-auto-ota-cli/libx_vfs_private.a index 4f71ebc7b..33a2d799b 100644 Binary files a/code/sdk/middleware/utils/fs/vfs/brandy-auto-ota-cli/libx_vfs_private.a and b/code/sdk/middleware/utils/fs/vfs/brandy-auto-ota-cli/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-auto-ota-ser/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-auto-ota-ser/libx_vfs_private.a index dbeea41a3..8f40ca66b 100644 Binary files a/code/sdk/middleware/utils/fs/vfs/brandy-auto-ota-ser/libx_vfs_private.a and b/code/sdk/middleware/utils/fs/vfs/brandy-auto-ota-ser/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-native-js-fd230-r/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-native-js-fd230-r/libx_vfs_private.a index d4d36d3e7..319a37815 100644 Binary files a/code/sdk/middleware/utils/fs/vfs/brandy-native-js-fd230-r/libx_vfs_private.a and b/code/sdk/middleware/utils/fs/vfs/brandy-native-js-fd230-r/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-native-js-fd230/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-native-js-fd230/libx_vfs_private.a index 5f8467405..319a37815 100644 Binary files a/code/sdk/middleware/utils/fs/vfs/brandy-native-js-fd230/libx_vfs_private.a and b/code/sdk/middleware/utils/fs/vfs/brandy-native-js-fd230/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-native-js-r/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-native-js-r/libx_vfs_private.a index d4d36d3e7..23120b6c6 100644 Binary files a/code/sdk/middleware/utils/fs/vfs/brandy-native-js-r/libx_vfs_private.a and b/code/sdk/middleware/utils/fs/vfs/brandy-native-js-r/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-native-js-xts-r/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-native-js-xts-r/libx_vfs_private.a index d4d36d3e7..319a37815 100644 Binary files a/code/sdk/middleware/utils/fs/vfs/brandy-native-js-xts-r/libx_vfs_private.a and b/code/sdk/middleware/utils/fs/vfs/brandy-native-js-xts-r/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-native-js-xts/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-native-js-xts/libx_vfs_private.a index 5f8467405..319a37815 100644 Binary files a/code/sdk/middleware/utils/fs/vfs/brandy-native-js-xts/libx_vfs_private.a and b/code/sdk/middleware/utils/fs/vfs/brandy-native-js-xts/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-native-js/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-native-js/libx_vfs_private.a index 5f8467405..319a37815 100644 Binary files a/code/sdk/middleware/utils/fs/vfs/brandy-native-js/libx_vfs_private.a and b/code/sdk/middleware/utils/fs/vfs/brandy-native-js/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-target1-r/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-target1-r/libx_vfs_private.a index 53ac7549c..bb57d22ae 100644 Binary files a/code/sdk/middleware/utils/fs/vfs/brandy-target1-r/libx_vfs_private.a and b/code/sdk/middleware/utils/fs/vfs/brandy-target1-r/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-target1/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-target1/libx_vfs_private.a index 0e2d1efab..e52a1e68b 100644 Binary files a/code/sdk/middleware/utils/fs/vfs/brandy-target1/libx_vfs_private.a and b/code/sdk/middleware/utils/fs/vfs/brandy-target1/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-target3-r/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-target3-r/libx_vfs_private.a index 6951132c1..24b0b2f8e 100644 Binary files a/code/sdk/middleware/utils/fs/vfs/brandy-target3-r/libx_vfs_private.a and b/code/sdk/middleware/utils/fs/vfs/brandy-target3-r/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-target3/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-target3/libx_vfs_private.a index ade8e668c..0e5855e02 100644 Binary files a/code/sdk/middleware/utils/fs/vfs/brandy-target3/libx_vfs_private.a and b/code/sdk/middleware/utils/fs/vfs/brandy-target3/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-target4-r/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-target4-r/libx_vfs_private.a index 2c25d4a38..97f4e64f5 100644 Binary files a/code/sdk/middleware/utils/fs/vfs/brandy-target4-r/libx_vfs_private.a and b/code/sdk/middleware/utils/fs/vfs/brandy-target4-r/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-target4/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-target4/libx_vfs_private.a index a8eda5169..09bfd6041 100644 Binary files a/code/sdk/middleware/utils/fs/vfs/brandy-target4/libx_vfs_private.a and b/code/sdk/middleware/utils/fs/vfs/brandy-target4/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-target5-r/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-target5-r/libx_vfs_private.a index 1e71bec3a..c2ee0d61f 100644 Binary files a/code/sdk/middleware/utils/fs/vfs/brandy-target5-r/libx_vfs_private.a and b/code/sdk/middleware/utils/fs/vfs/brandy-target5-r/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-target5/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-target5/libx_vfs_private.a index 59e8e59e9..48096293a 100644 Binary files a/code/sdk/middleware/utils/fs/vfs/brandy-target5/libx_vfs_private.a and b/code/sdk/middleware/utils/fs/vfs/brandy-target5/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-xts-r/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-xts-r/libx_vfs_private.a index 9aee13f0d..b466e66f4 100644 Binary files a/code/sdk/middleware/utils/fs/vfs/brandy-xts-r/libx_vfs_private.a and b/code/sdk/middleware/utils/fs/vfs/brandy-xts-r/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-xts/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-xts/libx_vfs_private.a index 2469af96b..e80292fca 100644 Binary files a/code/sdk/middleware/utils/fs/vfs/brandy-xts/libx_vfs_private.a and b/code/sdk/middleware/utils/fs/vfs/brandy-xts/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/vfs/testsuite-brandy-sdk/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/testsuite-brandy-sdk/libx_vfs_private.a index 23a8abb3e..a276ed70e 100644 Binary files a/code/sdk/middleware/utils/fs/vfs/testsuite-brandy-sdk/libx_vfs_private.a and b/code/sdk/middleware/utils/fs/vfs/testsuite-brandy-sdk/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-auto-ota-cli/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-auto-ota-cli/libfs_yaffs2.a index 07d8ad087..46d1ef55b 100644 Binary files a/code/sdk/middleware/utils/fs/yaffs2/brandy-auto-ota-cli/libfs_yaffs2.a and b/code/sdk/middleware/utils/fs/yaffs2/brandy-auto-ota-cli/libfs_yaffs2.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-auto-ota-ser/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-auto-ota-ser/libfs_yaffs2.a index dfbf36969..3e07c7c96 100644 Binary files a/code/sdk/middleware/utils/fs/yaffs2/brandy-auto-ota-ser/libfs_yaffs2.a and b/code/sdk/middleware/utils/fs/yaffs2/brandy-auto-ota-ser/libfs_yaffs2.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-fd230-r/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-fd230-r/libfs_yaffs2.a index 7a5f00f84..b9ee51284 100644 Binary files a/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-fd230-r/libfs_yaffs2.a and b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-fd230-r/libfs_yaffs2.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-fd230/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-fd230/libfs_yaffs2.a index d5edc8c90..b9ee51284 100644 Binary files a/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-fd230/libfs_yaffs2.a and b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-fd230/libfs_yaffs2.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-r/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-r/libfs_yaffs2.a index 7a5f00f84..3a01352d5 100644 Binary files a/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-r/libfs_yaffs2.a and b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-r/libfs_yaffs2.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-xts-r/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-xts-r/libfs_yaffs2.a index 7a5f00f84..b9ee51284 100644 Binary files a/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-xts-r/libfs_yaffs2.a and b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-xts-r/libfs_yaffs2.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-xts/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-xts/libfs_yaffs2.a index d5edc8c90..b9ee51284 100644 Binary files a/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-xts/libfs_yaffs2.a and b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-xts/libfs_yaffs2.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js/libfs_yaffs2.a index d5edc8c90..b9ee51284 100644 Binary files a/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js/libfs_yaffs2.a and b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js/libfs_yaffs2.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-target1-r/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-target1-r/libfs_yaffs2.a index c4d553a54..7a071efa8 100644 Binary files a/code/sdk/middleware/utils/fs/yaffs2/brandy-target1-r/libfs_yaffs2.a and b/code/sdk/middleware/utils/fs/yaffs2/brandy-target1-r/libfs_yaffs2.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-target1/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-target1/libfs_yaffs2.a index c2b76c448..e554b69b7 100644 Binary files a/code/sdk/middleware/utils/fs/yaffs2/brandy-target1/libfs_yaffs2.a and b/code/sdk/middleware/utils/fs/yaffs2/brandy-target1/libfs_yaffs2.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-target3-r/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-target3-r/libfs_yaffs2.a index 005f8eadc..46e3f75e5 100644 Binary files a/code/sdk/middleware/utils/fs/yaffs2/brandy-target3-r/libfs_yaffs2.a and b/code/sdk/middleware/utils/fs/yaffs2/brandy-target3-r/libfs_yaffs2.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-target3/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-target3/libfs_yaffs2.a index ad0320927..82c739041 100644 Binary files a/code/sdk/middleware/utils/fs/yaffs2/brandy-target3/libfs_yaffs2.a and b/code/sdk/middleware/utils/fs/yaffs2/brandy-target3/libfs_yaffs2.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-target4-r/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-target4-r/libfs_yaffs2.a index db1bc6962..9c9873469 100644 Binary files a/code/sdk/middleware/utils/fs/yaffs2/brandy-target4-r/libfs_yaffs2.a and b/code/sdk/middleware/utils/fs/yaffs2/brandy-target4-r/libfs_yaffs2.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-target4/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-target4/libfs_yaffs2.a index f9c30b3e4..1c923b402 100644 Binary files a/code/sdk/middleware/utils/fs/yaffs2/brandy-target4/libfs_yaffs2.a and b/code/sdk/middleware/utils/fs/yaffs2/brandy-target4/libfs_yaffs2.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-target5-r/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-target5-r/libfs_yaffs2.a index f29370908..64071738b 100644 Binary files a/code/sdk/middleware/utils/fs/yaffs2/brandy-target5-r/libfs_yaffs2.a and b/code/sdk/middleware/utils/fs/yaffs2/brandy-target5-r/libfs_yaffs2.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-target5/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-target5/libfs_yaffs2.a index 918e2f7aa..16ee62462 100644 Binary files a/code/sdk/middleware/utils/fs/yaffs2/brandy-target5/libfs_yaffs2.a and b/code/sdk/middleware/utils/fs/yaffs2/brandy-target5/libfs_yaffs2.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-xts-r/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-xts-r/libfs_yaffs2.a index f7a618b65..3813b9e20 100644 Binary files a/code/sdk/middleware/utils/fs/yaffs2/brandy-xts-r/libfs_yaffs2.a and b/code/sdk/middleware/utils/fs/yaffs2/brandy-xts-r/libfs_yaffs2.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-xts/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-xts/libfs_yaffs2.a index 027f4e2e1..a6315c34f 100644 Binary files a/code/sdk/middleware/utils/fs/yaffs2/brandy-xts/libfs_yaffs2.a and b/code/sdk/middleware/utils/fs/yaffs2/brandy-xts/libfs_yaffs2.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/testsuite-brandy-sdk/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/testsuite-brandy-sdk/libfs_yaffs2.a index e8670d92f..81b00d7d8 100644 Binary files a/code/sdk/middleware/utils/fs/yaffs2/testsuite-brandy-sdk/libfs_yaffs2.a and b/code/sdk/middleware/utils/fs/yaffs2/testsuite-brandy-sdk/libfs_yaffs2.a differ diff --git a/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-auto-ota-cli/libams.a b/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-auto-ota-cli/libams.a index 9b9821112..ed105e4ed 100644 Binary files a/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-auto-ota-cli/libams.a and b/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-auto-ota-cli/libams.a differ diff --git a/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-auto-ota-ser/libams.a b/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-auto-ota-ser/libams.a index c61d30cb4..bce4d9af1 100644 Binary files a/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-auto-ota-ser/libams.a and b/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-auto-ota-ser/libams.a differ diff --git a/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-native-js-fd230/libams.a b/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-native-js-fd230/libams.a index ce7a53da8..8279bdf6c 100644 Binary files a/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-native-js-fd230/libams.a and b/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-native-js-fd230/libams.a differ diff --git a/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-native-js-xts/libams.a b/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-native-js-xts/libams.a index ce7a53da8..8279bdf6c 100644 Binary files a/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-native-js-xts/libams.a and b/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-native-js-xts/libams.a differ diff --git a/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-native-js/libams.a b/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-native-js/libams.a index ce7a53da8..8279bdf6c 100644 Binary files a/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-native-js/libams.a and b/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-native-js/libams.a differ diff --git a/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-xts/libams.a b/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-xts/libams.a index cc6ff5d17..38fd93400 100644 Binary files a/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-xts/libams.a and b/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-xts/libams.a differ diff --git a/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-auto-ota-cli/libace.a b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-auto-ota-cli/libace.a index b9e83392d..6f1bca9d4 100644 Binary files a/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-auto-ota-cli/libace.a and b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-auto-ota-cli/libace.a differ diff --git a/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-auto-ota-ser/libace.a b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-auto-ota-ser/libace.a index 7f42d3148..bd6f95e4d 100644 Binary files a/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-auto-ota-ser/libace.a and b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-auto-ota-ser/libace.a differ diff --git a/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-fd230/libace.a b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-fd230/libace.a index 634ec02d2..f829a5801 100644 Binary files a/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-fd230/libace.a and b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-fd230/libace.a differ diff --git a/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-xts/libace.a b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-xts/libace.a index 634ec02d2..f829a5801 100644 Binary files a/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-xts/libace.a and b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-xts/libace.a differ diff --git a/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js/libace.a b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js/libace.a index 634ec02d2..f829a5801 100644 Binary files a/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js/libace.a and b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js/libace.a differ diff --git a/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-xts/libace.a b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-xts/libace.a index 4c139f258..89566229a 100644 Binary files a/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-xts/libace.a and b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-xts/libace.a differ diff --git a/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-auto-ota-cli/libbms.a b/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-auto-ota-cli/libbms.a index 9826884cd..72e2b6a18 100644 Binary files a/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-auto-ota-cli/libbms.a and b/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-auto-ota-cli/libbms.a differ diff --git a/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-auto-ota-ser/libbms.a b/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-auto-ota-ser/libbms.a index 33284f522..bdaa35601 100644 Binary files a/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-auto-ota-ser/libbms.a and b/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-auto-ota-ser/libbms.a differ diff --git a/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-native-js-fd230/libbms.a b/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-native-js-fd230/libbms.a index 3faa0d3fd..ac4194c38 100644 Binary files a/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-native-js-fd230/libbms.a and b/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-native-js-fd230/libbms.a differ diff --git a/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-native-js-xts/libbms.a b/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-native-js-xts/libbms.a index 3faa0d3fd..ac4194c38 100644 Binary files a/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-native-js-xts/libbms.a and b/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-native-js-xts/libbms.a differ diff --git a/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-native-js/libbms.a b/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-native-js/libbms.a index 3faa0d3fd..ac4194c38 100644 Binary files a/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-native-js/libbms.a and b/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-native-js/libbms.a differ diff --git a/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-xts/libbms.a b/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-xts/libbms.a index 8d7c947fb..0c761ced1 100644 Binary files a/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-xts/libbms.a and b/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-xts/libbms.a differ diff --git a/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-auto-ota-cli/libjerryscript.a b/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-auto-ota-cli/libjerryscript.a index fba453f3b..a74badd84 100644 Binary files a/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-auto-ota-cli/libjerryscript.a and b/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-auto-ota-cli/libjerryscript.a differ diff --git a/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-auto-ota-ser/libjerryscript.a b/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-auto-ota-ser/libjerryscript.a index f3d1edece..79e6edeab 100644 Binary files a/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-auto-ota-ser/libjerryscript.a and b/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-auto-ota-ser/libjerryscript.a differ diff --git a/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-native-js-fd230/libjerryscript.a b/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-native-js-fd230/libjerryscript.a index 934e94816..00de31cdc 100644 Binary files a/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-native-js-fd230/libjerryscript.a and b/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-native-js-fd230/libjerryscript.a differ diff --git a/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-native-js-xts/libjerryscript.a b/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-native-js-xts/libjerryscript.a index 934e94816..00de31cdc 100644 Binary files a/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-native-js-xts/libjerryscript.a and b/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-native-js-xts/libjerryscript.a differ diff --git a/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-native-js/libjerryscript.a b/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-native-js/libjerryscript.a index 934e94816..00de31cdc 100644 Binary files a/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-native-js/libjerryscript.a and b/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-native-js/libjerryscript.a differ diff --git a/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-xts/libjerryscript.a b/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-xts/libjerryscript.a index 5548a92d9..845c578e8 100644 Binary files a/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-xts/libjerryscript.a and b/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-xts/libjerryscript.a differ