From: Caisking <3449750381@qq.com> Date: Fri, 25 Oct 2024 13:43:56 +0000 (+0800) Subject: 表盘:增加日期星期组合字符串 X-Git-Tag: fd230_release_V1.3.102~177^2~20 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=23a6885e794743077baa46af6bf2fb9785b07054;p=mirrors%2FFD230.git 表盘:增加日期星期组合字符串 --- diff --git a/code/sdk/application/wearable/fd230app/CMakeLists.txt b/code/sdk/application/wearable/fd230app/CMakeLists.txt index 85bddc1cd..fc4907196 100644 --- a/code/sdk/application/wearable/fd230app/CMakeLists.txt +++ b/code/sdk/application/wearable/fd230app/CMakeLists.txt @@ -178,6 +178,8 @@ set(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/main/src/dial/DialModelHourMin.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/main/src/dial/DialModelTimeStr.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/main/src/dial/DialModelWeekNum.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/main/src/dial/DialModelDateWeekStr.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/main/src/dial/DialModelStepgoal.cpp #exception handling ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heart_blood/CheckAbnormalView.cpp diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelDateWeekStr.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelDateWeekStr.h new file mode 100644 index 000000000..6ec963ede --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelDateWeekStr.h @@ -0,0 +1,28 @@ + + +#ifndef DIAL_MODEL_DateWeekStr_H +#define DIAL_MODEL_DateWeekStr_H + +#include "DialBaseModel.h" +#include +#include +#include + +namespace OHOS { +class DialModelDateWeekStr : public DialBaseModel { +public: + DialModelDateWeekStr() {} + virtual ~DialModelDateWeekStr() {} + static DialModelDateWeekStr *GetInstance() { + static DialModelDateWeekStr instance; + return &instance; + } + bool GetDialTextData(DialDataType &type, std::string *&out, + int16_t &strNum) override; + void UpdateDateWeekStr(const std::string *&dialDateWeekStr); + +private: + std::string dateweekstr; +}; +} // namespace OHOS +#endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelWeekStr.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelWeekStr.cpp index 6be3e64ab..6f14eebd6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelWeekStr.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelWeekStr.cpp @@ -5,6 +5,7 @@ #include #include "sys/time.h" #include "wearable_log.h" +#include REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_WEEK_STR, OHOS::DialModelWeekStr::GetInstance()); namespace OHOS