From: Caisking <3449750381@qq.com> Date: Tue, 29 Oct 2024 02:44:56 +0000 (+0800) Subject: 表盘:修复离线表盘个数错误 X-Git-Tag: fd230_release_V1.3.102~165^2~11 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=ed61909733f684f9b95f3d2ba4826d7cdf8ae59f;p=mirrors%2FFD230.git 表盘:修复离线表盘个数错误 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/set_dial/include/SetDialModel.h b/code/sdk/application/wearable/fd230app/nativeui/set_dial/include/SetDialModel.h index 4165e75c7..9b37bc11c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/set_dial/include/SetDialModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/set_dial/include/SetDialModel.h @@ -103,6 +103,7 @@ namespace OHOS uint16_t download_DialID = 1028; uint32_t download_dialSize = 0; bool downloadstate = false; + uint8_t downloadnum = 0; }; } 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 99e5702c8..64fe7541b 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 @@ -37,9 +37,9 @@ std::unordered_map registeredDials{ {DEFAULT_DIAL_ID_0, "KUMI"}, // 为了预防显示 {DEFAULT_DIAL_ID, "obsidianrhythm"}, // 默认表盘修改为 黑耀律动 #endif - {DEFAULT_DIAL_ID_1, "satellite"}, // 卫星表盘 - {DEFAULT_DIAL_ID_2, "birdie"}, // 飞鸟表盘 - {DEFAULT_DIAL_ID_3, "dawninsight"}, // 晨曦智影 + {DEFAULT_DIAL_ID_1, "satellite"}, // 卫星表盘 + {DEFAULT_DIAL_ID_2, "birdie"}, // 飞鸟表盘 + {DEFAULT_DIAL_ID_3, "dawninsight"}, // 晨曦智影 {MAX_DEFAULT_DIAL_ID, "mirrorvoyager"}, // 镜影行者 }; @@ -468,7 +468,7 @@ void SetDialModel::LoadAllDial() { void SetDialModel::LoadAllDialFromFs() { int ret; struct dirent *direntp; - + downloadnum = 0; //记录离线表盘个数 // 打开目录 DIR *dirp = opendir(APP_DOWNLOAD_DIAL_PATH); // 遍历文件 @@ -478,6 +478,7 @@ void SetDialModel::LoadAllDialFromFs() { int ret = ParseDialHeader(DOWNLOADDIAL, direntp->d_name, dialInfo); if (ret == 0) { dialInfoList.push_back(dialInfo); + downloadnum++; } } } @@ -904,10 +905,9 @@ void SetDialModel::CheckDialSpace() { if (download_DialID > 5) { //离线表盘 判断当前离线表盘个数 uint8_t offlinedial_num = - DIAL_OFFLINE_DIAL_MAX_NUM - - (GetDialCount() - DIAL_CUSTOM_MAX_NUM - DIAL_RES_DIAL_MAX_NUM); + DIAL_OFFLINE_DIAL_MAX_NUM - downloadnum; //最多下载3个 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, - "CheckDialSpace: Offline dial count %d", offlinedial_num); + "CheckDialSpace: Offline dial count %d", offlinedial_num); if (offlinedial_num <= 0) { //离线表盘个数已到上限 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, diff --git a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c index 03cec802a..2cad4d4f9 100644 --- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c +++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c @@ -53,7 +53,7 @@ extern "C" { #define AI_TXT_BUF_MAX_LEN 1024*3 //json解析失败 -#define MAX_BLE_EVENT_DIAL_NUM (9) //表盘最大数量 +#define MAX_BLE_EVENT_DIAL_NUM (10) //表盘最大数量 uint32_t packdataLen = 0; uint32_t totalDataLen = 0;