From: Caisking Date: Tue, 21 Oct 2025 03:59:21 +0000 (+0800) Subject: 修改FOOINGLOGO的名称 X-Git-Tag: V1.0.9_20251128_194606_LN~180^2~12^2~6 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=941e6339c63fd840f3ea166a96016d23a080e2ca;p=mirrors%2FFD230.git 修改FOOINGLOGO的名称 --- diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativelauncher/include/ui_resource_string.h b/code/sdk/application/wearable/fd272/nativeapp/nativelauncher/include/ui_resource_string.h index 51aba65f9..7ff7ffc23 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativelauncher/include/ui_resource_string.h +++ b/code/sdk/application/wearable/fd272/nativeapp/nativelauncher/include/ui_resource_string.h @@ -433,7 +433,7 @@ enum UIResourceTextId : uint16_t { STR_DIAL_MODE = 420, STR_DIAL_VIA_WATCH_SIM = 421, STR_DIAL_VIA_PHONE = 422, - STR_KUMI_TECHNOLOGY = 423, + STR_FOOING_TECHNOLOGY = 423, STR_CALLING = 424, STR_NOT_PAIRED = 425, STR_PAIRED = 426, diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/systemupdate/include/SystemUpdateView.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/systemupdate/include/SystemUpdateView.h index 07b678708..73d828296 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/systemupdate/include/SystemUpdateView.h +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/systemupdate/include/SystemUpdateView.h @@ -81,7 +81,7 @@ namespace OHOS UIScrollView *SystemUpdateScrollView{nullptr}; UILabelExt *Title{nullptr}; // 标题 - UIImageView *KUMILOGOImage{nullptr}; // KUMILogo图片 + UIImageView *FOOINGLOGOImage{nullptr}; // FOOINGLogo图片 /* -------------------------------------------------------------------------- */ UIScrollView *NoNeedUpdateScrollView{nullptr}; diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/systemupdate/src/SystemUpdateView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/systemupdate/src/SystemUpdateView.cpp index e52614459..a4777910c 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/systemupdate/src/SystemUpdateView.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/systemupdate/src/SystemUpdateView.cpp @@ -321,8 +321,8 @@ namespace OHOS delete Title; Title = nullptr; - delete KUMILOGOImage; - KUMILOGOImage = nullptr; + delete FOOINGLOGOImage; + FOOINGLOGOImage = nullptr; delete LatestVersionLabel; LatestVersionLabel = nullptr; @@ -596,21 +596,21 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::Title new fail!"); return; } - /* ------------------------------ KUMILOGOImage ----------------------------- */ - KUMILOGOImage = new UIImageView(); - if (KUMILOGOImage == nullptr) + /* ------------------------------ FOOINGLOGOImage ----------------------------- */ + FOOINGLOGOImage = new UIImageView(); + if (FOOINGLOGOImage == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!"); return; } - KUMILOGOImage->SetPosition(117, 87, 230, 160); + FOOINGLOGOImage->SetPosition(117, 87, 230, 160); #ifdef CUSTOM_Z1 - // const char *imagesPath = "/user/res/system/KUMILOGO.bin"; - // KUMILOGOImage->SetSrc(imagesPath); + // const char *imagesPath = "/user/res/system/FOOINGLOGO.bin"; + // FOOINGLOGOImage->SetSrc(imagesPath); #else - const char *imagesPath = "/user/res/system/KUMILOGO.bin"; - KUMILOGOImage->SetSrc(imagesPath); + const char *imagesPath = "/user/res/system/FOOINGLOGO.bin"; + FOOINGLOGOImage->SetSrc(imagesPath); #endif /* --------------------------- LatestVersionLabel --------------------------- */ Config = { @@ -826,7 +826,7 @@ namespace OHOS /* ----------------------------------- Add ---------------------------------- */ SystemUpdateScrollView->Add(Title); - SystemUpdateScrollView->Add(KUMILOGOImage); + SystemUpdateScrollView->Add(FOOINGLOGOImage); SystemUpdateScrollView->Add(LatestVersionLabel); SystemUpdateScrollView->Add(VersionIdLabel); SystemUpdateScrollView->Add(UpdateNowButtton); diff --git a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/transmitting.cpp b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/transmitting.cpp index d731d8a36..7d3856480 100644 --- a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/transmitting.cpp +++ b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/transmitting.cpp @@ -55,7 +55,7 @@ namespace OHOS #define TRANSMITTING_SUCC_PATH PNG_SUCC_IMAGE; #define TRANSMITTING_FAIL_PATH PNG_ATTENTION_IMAGE; - #define TRANSMITTING_OTA_DOWN "/user/res/system/KUMILOGO.bin" + #define TRANSMITTING_OTA_DOWN "/user/res/system/FOOINGLOGO.bin" @@ -275,7 +275,7 @@ namespace OHOS if (transmitting_img == nullptr) { transmitting_img = new UIImageView(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!"); } transmitting_img->SetPosition(117, 87, 230, 160); @@ -382,7 +382,7 @@ namespace OHOS if (transmitting_img == nullptr) { transmitting_img = new UIImageView(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!"); } transmitting_img->SetPosition(193, 150,80, 80); const char *imagesPath = TRANSMITTING_FAIL_PATH; @@ -434,7 +434,7 @@ namespace OHOS if (transmitting_img == nullptr) { transmitting_img = new UIImageView(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!"); } transmitting_img->SetPosition(193, 150,80, 80); const char *imagesPath = TRANSMITTING_FAIL_PATH; @@ -492,7 +492,7 @@ namespace OHOS if (transmitting_img == nullptr) { transmitting_img = new UIImageView(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!"); } transmitting_img->SetPosition(117, 87, 230, 160); const char *imagesPath = TRANSMITTING_OTA_DOWN; @@ -548,7 +548,7 @@ namespace OHOS if (transmitting_img == nullptr) { transmitting_img = new UIImageView(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!"); } transmitting_img->SetPosition(117, 87, 230, 160); @@ -759,7 +759,7 @@ namespace OHOS if (transmitting_img == nullptr) { transmitting_img = new UIImageView(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!"); } transmitting_img->SetPosition(193, 150,80, 80); const char *imagesPath = TRANSMITTING_SUCC_PATH; @@ -835,7 +835,7 @@ namespace OHOS if (transmitting_img == nullptr) { transmitting_img = new UIImageView(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!"); } transmitting_img->SetPosition(193, 150,80, 80); const char *imagesPath = TRANSMITTING_SUCC_PATH; @@ -912,7 +912,7 @@ namespace OHOS if (transmitting_img == nullptr) { transmitting_img = new UIImageView(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!"); } transmitting_img->SetPosition(193, 150,80, 80); const char *imagesPath = TRANSMITTING_SUCC_PATH; @@ -989,7 +989,7 @@ namespace OHOS if (transmitting_img == nullptr) { transmitting_img = new UIImageView(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!"); } transmitting_img->SetPosition(193, 150,80, 80); const char *imagesPath = TRANSMITTING_FAIL_PATH; @@ -1061,7 +1061,7 @@ namespace OHOS if (transmitting_img == nullptr) { transmitting_img = new UIImageView(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!"); } transmitting_img->SetPosition(193, 150,80, 80); const char *imagesPath = TRANSMITTING_FAIL_PATH; @@ -1124,7 +1124,7 @@ namespace OHOS if (transmitting_img == nullptr) { transmitting_img = new UIImageView(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!"); } transmitting_img->SetPosition(193, 150,80, 80); const char *imagesPath = TRANSMITTING_FAIL_PATH; @@ -1184,7 +1184,7 @@ namespace OHOS if (transmitting_img == nullptr) { transmitting_img = new UIImageView(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!"); } transmitting_img->SetPosition(193, 150,80, 80); const char *imagesPath = TRANSMITTING_FAIL_PATH; @@ -1244,7 +1244,7 @@ namespace OHOS if (transmitting_img == nullptr) { transmitting_img = new UIImageView(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!"); } transmitting_img->SetPosition(193, 150,80, 80); const char *imagesPath = TRANSMITTING_FAIL_PATH;