From: Caisking <3449750381@qq.com> Date: Fri, 10 May 2024 02:44:34 +0000 (+0800) Subject: 建立统一的UI组件工具；【uicomponents/Uicomponents.h】 X-Git-Tag: release_V1.2.70_20241020_135402~1025^2~8^2^2~3 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=474764a3d3f61cdfc1ee8649ff6ed229bfe0663a;p=mirrors%2FFD230.git 建立统一的UI组件工具；【uicomponents/Uicomponents.h】 --- diff --git a/code/sdk/application/wearable/CMakeLists.txt b/code/sdk/application/wearable/CMakeLists.txt index dbe9f4715..955d2b24c 100755 --- a/code/sdk/application/wearable/CMakeLists.txt +++ b/code/sdk/application/wearable/CMakeLists.txt @@ -5,6 +5,7 @@ add_subdirectory_if_exist(nativeabilityfwk) add_subdirectory_if_exist(nativeapp) +add_subdirectory_if_exist(CustomUIComponentTool) add_subdirectory_if_exist(fd230app) add_subdirectory_if_exist(ohos_deps) add_subdirectory_if_exist(service) diff --git a/code/sdk/application/wearable/CustomUIComponentTool/CMakeLists.txt b/code/sdk/application/wearable/CustomUIComponentTool/CMakeLists.txt new file mode 100644 index 000000000..5867d248b --- /dev/null +++ b/code/sdk/application/wearable/CustomUIComponentTool/CMakeLists.txt @@ -0,0 +1,112 @@ +set(COMPONENT_NAME "CustomUIcomponentTool") +set(UI_SAMPLE_ROOT ${ROOT_DIR}/middleware/services/gui/uikit/sample/uitest) + +set(PUBLIC_HEADER + ${CMAKE_CURRENT_SOURCE_DIR} +) + +set(PRIVATE_HEADER + ${ROOT_DIR}/open_source/openharmony/foundation/ace/ace_engine_lite/interfaces/base + ${ROOT_DIR}/open_source/openharmony/third_party/cJSON + ${UI_SAMPLE_ROOT}/components + ${ROOT_DIR}/middleware/services/gui/uikit/proprietary/src/utils/innerkits + ${ROOT_DIR}/middleware/services/gui/uikit/proprietary/include + ${ROOT_DIR}/middleware/services/gui/uikit/proprietary/src/ui/frameworks + ${ROOT_DIR}/middleware/services/gui/uikit/proprietary/src/ui/innerkits + ${ROOT_DIR}/middleware/services/gui/uikit/proprietary/include/components + + ${ROOT_DIR}/middleware/services/gui/uikit/ui/interfaces/innerkits + ${ROOT_DIR}/middleware/services/gui/lvgl/src/hal + ${ROOT_DIR}/middleware/services/gui/uikit/ui/interfaces/kits/events + ${ROOT_DIR}/middleware/services/gui/uikit/ui/interfaces/kits + + ${ROOT_DIR}/middleware/services/gui/uikit/utils/interfaces/kits + ${ROOT_DIR}/middleware/services/gui/uikit/utils/interfaces/kits/gfx_utils + ${ROOT_DIR}/middleware/services/gui/uikit/utils/interfaces/innerkits + ${ROOT_DIR}/middleware/services/gui/uikit/surface/interfaces/kits + ${ROOT_DIR}/middleware/services/gui/uikit/ui/interfaces/kits + ${ROOT_DIR}/middleware/services/gui/uikit/ui/interfaces/kits/components + ${ROOT_DIR}/middleware/services/gui/uikit/ui/interfaces/kits/events + ${ROOT_DIR}/middleware/services/gui/uikit/ui/frameworks/ + + + ${ROOT_DIR}/open_source/openharmony/foundation/graphic/ui/interfaces/kits/events + ${ROOT_DIR}/open_source/openharmony/foundation/graphic/ui/interfaces/kits + ${ROOT_DIR}/open_source/openharmony/foundation/graphic/utils/interfaces/kits + ${ROOT_DIR}/open_source/openharmony/foundation/graphic/utils/interfaces/kits/gfx_utils + ${ROOT_DIR}/open_source/openharmony/foundation/graphic/utils/interfaces/innerkits + ${ROOT_DIR}/open_source/openharmony/foundation/graphic/ui/interfaces/innerkits + ${ROOT_DIR}/open_source/openharmony/foundation/graphic/ui/frameworks + ${ROOT_DIR}/open_source/openharmony/foundation/graphic/surface/interfaces/kits + ${ROOT_DIR}/open_source/openharmony/foundation/graphic/ui/interfaces/kits/components + ${ROOT_DIR}/open_source/openharmony/foundation/multimedia/player/interfaces/kits/ + ${ROOT_DIR}/open_source/openharmony/third_party/qrcodegen/cpp + ${ROOT_DIR}/include/middleware/services/bts/common + ${ROOT_DIR}/include/middleware/services/bts/ble + ${ROOT_DIR}/include/middleware/services/bts/br + + + ${ROOT_DIR}/include/middleware/services/bts/common + ${ROOT_DIR}/include/middleware/services/bts/ble + ${ROOT_DIR}/include/middleware/services/bts/br + + ${ROOT_DIR}/open_source/openharmony/drivers/peripheral/display/interfaces/include + ${ROOT_DIR}/open_source/openharmony/drivers/peripheral/cywee/ + ${ROOT_DIR}/open_source/openharmony/foundation/distributedschedule/samgr_lite/interfaces/kits/samgr + + + ${ROOT_DIR}/middleware/services/media/foundation/sample/wrapper + ${ROOT_DIR}/application/wearable/service/msg_center/include + ${ROOT_DIR}/application/wearable/service/ble_service/bleservice + ${ROOT_DIR}/application/wearable/service/ble_service/blemoder + ${ROOT_DIR}/application/wearable/nativeabilityfwk/include + ${ROOT_DIR}/open_source/openharmony/foundation/multimedia/audio_player/interfaces/kits + ${ROOT_DIR}/open_source/openharmony/foundation/multimedia/audiomanager/interfaces/kits/audiomanager + ${ROOT_DIR}/open_source/openharmony/foundation/multimedia/audiomanager/interfaces/kits/audiocommon + ${ROOT_DIR}/open_source/openharmony/foundation/multimedia/player/interfaces/kits/ + ${ROOT_DIR}/open_source/openharmony/foundation/multimedia/utils/include + ${ROOT_DIR}/open_source/openharmony/utils/native/lite/include + ${ROOT_DIR}/open_source/openharmony/utils/native/lite/kv_store/innerkits +) + +set(SOURCES + #UI组件初始化 + ${CMAKE_CURRENT_SOURCE_DIR}/uicomponents/UIComponents.cpp + +) + +set(COMPONENT_PUBLIC_CCFLAGS +) + +set(COMPONENT_CCFLAGS + -std=c++11 + -Wno-error + -Wno-unused-parameter + -fno-exceptions + -fno-unwind-tables + -fno-asynchronous-unwind-tables + -Wno-undef + -Wno-bitwise-op-parentheses + -Wno-shift-op-parentheses + -nostdlibinc + -nostdinc + -nostdlib + -Wno-c++11-narrowing + -Wno-error=unused-function +) + +set(WHOLE_LINK + true +) + +set(MAIN_COMPONENT + false +) + +set(PUBLIC_DEFINES +) + +set(PRIVATE_DEFINES +) + +build_component() diff --git a/code/sdk/application/wearable/fd230app/nativeui/uicomponents/UIComponents.cpp b/code/sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.cpp similarity index 95% rename from code/sdk/application/wearable/fd230app/nativeui/uicomponents/UIComponents.cpp rename to code/sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.cpp index 453879a0e..8dbaa3a11 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/uicomponents/UIComponents.cpp +++ b/code/sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.cpp @@ -345,6 +345,20 @@ namespace OHOS delete labelext; } - + /*解析动画资源数组 imageche*/ + void AnalysisArray(const char *fliename) + { +#if 0 + for (uint32_t i = startId; i <= lastId; i++) + { + ImageInfo *image = ImageCacheManager::GetInstance().LoadOneInMultiRes(i, file); + if (image == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "LoadAppMultiImages %x fail", i); + return; + } + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "LoadAppMultiImages %x", i); + } +#endif + } } - diff --git a/code/sdk/application/wearable/fd230app/nativeui/uicomponents/UIComponents.h b/code/sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.h similarity index 96% rename from code/sdk/application/wearable/fd230app/nativeui/uicomponents/UIComponents.h rename to code/sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.h index ba19be1e7..806252a36 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/uicomponents/UIComponents.h +++ b/code/sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.h @@ -60,5 +60,7 @@ namespace OHOS std::string UpdateLabel(UILabelExt *&label, const std::string &updatestr, UIResourceTextId id); /*通过labelext获取Id设置label*/ void SetLabelId(UILabel *&label, UIResourceTextId id); + /*解析动画资源数组 imageche*/ + void AnalysisArray(const char *fliename); } #endif // UICOMPONENTS_H \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/CMakeLists.txt b/code/sdk/application/wearable/fd230app/CMakeLists.txt index 5e176c6f8..4af701a30 100644 --- a/code/sdk/application/wearable/fd230app/CMakeLists.txt +++ b/code/sdk/application/wearable/fd230app/CMakeLists.txt @@ -288,8 +288,6 @@ set(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heart_blood/src/HeartCardView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heart_blood/health_service/health_service.cpp - #UI组件初始化 - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/uicomponents/UIComponents.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/countdown/src/MainCountDownPresenter.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/countdown/src/CountDownModel.cpp diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py index 63ecd8443..3ba4980e1 100755 --- a/code/sdk/build/config/target_config/brandy/config.py +++ b/code/sdk/build/config/target_config/brandy/config.py @@ -164,6 +164,7 @@ target = { "slip", "cat1_service", "audio_manager", + "CustomUIcomponentTool", "custom_utils", "rotary_encoder", #"nativelauncher",