From: Caisking <3449750381@qq.com> Date: Mon, 21 Oct 2024 10:47:36 +0000 (+0800) Subject: 表盘:优化ble安装表盘的错误弹窗显示 X-Git-Tag: fd230_release_V1.3.102~211 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F1233%2Fhead;p=mirrors%2FFD230.git 表盘:优化ble安装表盘的错误弹窗显示 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp index ae2677280..863c5f0be 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp @@ -62,7 +62,7 @@ namespace OHOS {DIAL_CLOCK_5, "Custom_5", CUSTOM_CLOCK5_DIALPER_PATH, DEFAULT_TASK_PERIOD}, // 表盘 Id 4 }; //默认表盘 - static const char* DEFAULT_CUSTOM_DIAL_PATH = "/user/dial/obsidianrhythm.bin"; + static const char* DEFAULT_CUSTOM_DIAL_PATH = "/user/dial/res_dial/obsidianrhythm.bin"; //卡片map const CardInfo printfMap[] = { {HEART_RATE, "心率卡片"}, 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 3366fdebd..850dfffab 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 @@ -24,9 +24,7 @@ #include extern "C" { -void check_dial_space() { - OHOS::SetDialModel::GetInstance().CheckDialSpace(); -} +void check_dial_space() { OHOS::SetDialModel::GetInstance().CheckDialSpace(); } } namespace OHOS { @@ -109,7 +107,7 @@ bool SetDialModel::readDialfile() { } SetDialModel::SetDialModel() { - LoadAllDial(); // 更新表盘个数 当前表盘 + LoadAllDial(); // 更新表盘个数 当前表盘 readDialfile(); // 读取表盘map配置文件 char idBuffer[10]; // 读取表盘Id配置文件 int len = UtilsGetValue("dial_id", idBuffer, sizeof(idBuffer)); @@ -887,6 +885,9 @@ void SetDialModel::CheckDialSpace() { //判断offlinedial文件夹内存是否可以继续存储 downloadstate = SystemLogModel::GetInstance()->canSyncFile( TOTAL_DIAL_SPACE_PATH, TOTAL_DIAL_SPACE, download_dialSize); + //离线表盘 + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CheckDialSpace: Offline dial %d", + downloadstate); return; } } else { @@ -894,15 +895,22 @@ void SetDialModel::CheckDialSpace() { downloadstate = SystemLogModel::GetInstance()->canSyncFile( TOTAL_CUSTOM_DAIL_SPACE_PATH, TOTAL_CUSTOM_DAIL_SPACE, download_dialSize); + //自定义表盘 + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CheckDialSpace: Custom dial %d", + downloadstate); } } bool SetDialModel::CheckDialDownload(uint16_t ID, uint32_t dial_size) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CheckDialDownload: %d %d", ID, + dial_size); + download_DialID = ID; download_dialSize = dial_size; - do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_CHECK_DIAL_SPACE, nullptr, 0); + // do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_CHECK_DIAL_SPACE, nullptr,0); + CheckDialSpace(); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CheckDialDownload: %d", downloadstate);