From: Caisking <3449750381@qq.com> Date: Tue, 9 Jul 2024 12:07:13 +0000 (+0800) Subject: 修改表盘ID删除方式 X-Git-Tag: release_V1.2.70_20241020_135402~833^2~3^2~2 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=7ff7493104adb642d3ed14ad3825101b84cc8ccc;p=mirrors%2FFD230.git 修改表盘ID删除方式 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageModel.cpp index 0dfc1a595..6a70c5d68 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageModel.cpp @@ -290,7 +290,7 @@ namespace OHOS std::vector messageVector = LoadMessageData(); numberOfItems = messageVector.size(); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "the numberOfItems is %d", numberOfItems); - if (numberOfItems >= 0) + if (numberOfItems > 0) { return &messageVector[numberOfItems - 1]; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialModel.cpp index cad572d1f..9e3957089 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialModel.cpp @@ -33,9 +33,11 @@ namespace OHOS { // 定义特殊Id - constexpr uint16_t MAX_DEFAULT_DIAL_ID = 103; constexpr uint16_t DEFAULT_DIAL_ID_1 = 1028; constexpr uint16_t DEFAULT_DIAL_ID_2 = 1052; + constexpr uint16_t DEFAULT_DIAL_ID_3 = 101; + constexpr uint16_t DEFAULT_DIAL_ID_4 = 102; + constexpr uint16_t MAX_DEFAULT_DIAL_ID = 103; #define DIAL_ID_LENGTH 2 #define DIAL_NAME_LENGTH 50 @@ -44,10 +46,10 @@ namespace OHOS // 表盘map[Id--dialname] 前5个ID固定 std::unordered_map registeredDials{ {DEFAULT_DIAL_ID_1, "KUMI"}, - {DEFAULT_DIAL_ID_2, "classic"}, // 经典表盘 - {101, "sportdial"}, // 运动表盘 - {102, "kaleidoscope"}, // 万花筒表盘102 - {MAX_DEFAULT_DIAL_ID, "jellyfish"}, // 水母表盘 + {DEFAULT_DIAL_ID_2, "classic"}, // 经典表盘 + {DEFAULT_DIAL_ID_3, "sportdial"}, // 运动表盘 + {DEFAULT_DIAL_ID_4, "kaleidoscope"}, // 万花筒表盘 + {MAX_DEFAULT_DIAL_ID, "jellyfish"}, // 水母表盘 }; // 表盘市场UID 对应表盘name bool SetDialModel::saveDialfile() @@ -216,14 +218,21 @@ namespace OHOS { if (registeredDials.find(ID) != registeredDials.end()) { - // 默认表盘不删除 - if (ID <= MAX_DEFAULT_DIAL_ID || ID == DEFAULT_DIAL_ID_1 || ID == DEFAULT_DIAL_ID_2) + // 默认表盘不删除[日志提醒] + switch (ID) { + case MAX_DEFAULT_DIAL_ID: + case DEFAULT_DIAL_ID_1: + case DEFAULT_DIAL_ID_2: + case DEFAULT_DIAL_ID_3: + case DEFAULT_DIAL_ID_4: WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "UninstallDial default dial %d fail", ID); return false; + default: + break; } - /*删除文件操作 只删除下载表盘*/ + /*删除文件操作 目前只删除下载表盘*/ std::string dialFullName = APP_DOWNLOAD_DIAL_PATH; dialFullName += "/"; dialFullName += registeredDials[ID];