From: Caisking <3449750381@qq.com> Date: Mon, 28 Oct 2024 12:10:14 +0000 (+0800) Subject: #1123系统:内存管理设计(表盘管理) X-Git-Tag: fd230_release_V1.3.102~171^2~2 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=aa5af16354a381f6c38c9af9d423f6df9708d4ec;p=mirrors%2FFD230.git #1123系统:内存管理设计(表盘管理) --- 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 beb91656a..4165e75c7 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 @@ -37,10 +37,10 @@ namespace OHOS #define DIAL_NAME_LENGTH 50 #define DIAL_ID_PATH "user/userdata/dial_id.bin" - #define DIAL_MAX_NUM 21 + #define DIAL_MAX_NUM 10 #define DIAL_CUSTOM_MAX_NUM 1 - #define DIAL_OFFLINE_DIAL_MAX_NUM 14 - #define DIAL_RES_DIAL_MAX_NUM 6 + #define DIAL_OFFLINE_DIAL_MAX_NUM 3 + #define DIAL_RES_DIAL_MAX_NUM 5 class SetDialModel 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 7412fbe26..99e5702c8 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 @@ -57,6 +57,7 @@ bool SetDialModel::saveDialfile() { int size = fwrite(buf, 1, DIAL_ID_LENGTH + DIAL_NAME_LENGTH, fp); if (DIAL_ID_LENGTH + DIAL_NAME_LENGTH != size) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, " fwrite is fail! %d", size); + fclose(fp); return false; } else { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, " fwrite is succ %d !", @@ -152,7 +153,10 @@ void SetDialModel::RegisterDial(uint16_t ID, const char *dialname, dialname); LoadAllDial(); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, " RegisterDial ble is ok!"); + saveDialfile(); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, " RegisterDial ble save is ok!"); } /* 打印map */ @@ -902,6 +906,8 @@ void SetDialModel::CheckDialSpace() { uint8_t offlinedial_num = DIAL_OFFLINE_DIAL_MAX_NUM - (GetDialCount() - DIAL_CUSTOM_MAX_NUM - DIAL_RES_DIAL_MAX_NUM); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, + "CheckDialSpace: Offline dial count %d", offlinedial_num); if (offlinedial_num <= 0) { //离线表盘个数已到上限 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemLogModel.h b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemLogModel.h index 8da4aeea3..48ddb04ad 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemLogModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemLogModel.h @@ -16,10 +16,10 @@ #define TOTAL_RING_SPACE (2 * 1024 * 1024) // 2M #define TOTAL_RING_SPACE_PATH "/user/music/ring" -#define TOTAL_DIAL_SPACE (24 * 1024 * 1024) // 24M +#define TOTAL_DIAL_SPACE (5 * 1024 * 1024) // 5M #define TOTAL_DIAL_SPACE_PATH "/user/dial/offline_dial" -#define TOTAL_RES_DIAL_SPACE (7 * 1024 * 1024) // 7M +#define TOTAL_RES_DIAL_SPACE (5 * 1024 * 1024) // 5M #define TOTAL_RES_DIAL_SPACE_PATH "/user/dial/res_dial" #define TOTAL_CUSTOM_DAIL_SPACE (1 * 1024 * 1024) // 1M 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 ecfe67cc7..03cec802a 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 (20) //表盘最大数量 +#define MAX_BLE_EVENT_DIAL_NUM (9) //表盘最大数量 uint32_t packdataLen = 0; uint32_t totalDataLen = 0; @@ -7326,41 +7326,42 @@ errcode_t decode_single_dial_info(ble_read_data *buffer_handle) filename[dialinfo.file_name_len] ='\0'; //在runtime中备份一个安装文件名。 uapi_dev_runtime_set_dialname(filename); - //存表盘id - ble_dial_uid = dialinfo.dial_uid; - // if(ble_dial_uid<=4) - // ble_dial_uid++; - if (check_dial_freespace(ble_dial_uid, file_size) == false) + if (check_dial_freespace(dialinfo.dial_uid, file_size) == false) { TRANSMIT_DATA=TRANS_DIAL_FAIL; CustomEventPublish(TOPIC_EVENT_BLE_TRANSMIT,&TRANSMIT_DATA,1); return ERRCODE_FAIL; } - else - { - buffer_handle->file_recv_stat.file_name = filename; - buffer_handle->file_recv_stat.file_size = file_size; - buffer_handle->file_recv_stat.file_type = 3;//表盘 - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP," filetype = %d, file_name=%s, file_size=%d , dial_uid %04X ,dial_count %d, dial_filetype %d\n", - buffer_handle->file_recv_stat.file_type, - buffer_handle->file_recv_stat.file_name, - buffer_handle->file_recv_stat.file_size, - dialinfo.dial_uid, - dialinfo.dial_count, - dialinfo.file_type - ); - buffer_handle->file_recv_stat.received_size = 0; - buffer_handle->file_recv_stat.lrcvalue = 0; - buffer_handle->receive_file_flag = 1; - uapi_ble_connect_param_update(BLE_CONNECT_INTERVAL_HIGH); + //存表盘id + ble_dial_uid = dialinfo.dial_uid; + // if(ble_dial_uid<=4) + // ble_dial_uid++; - TRANSMIT_DATA=TRANS_DIAL_TRANSMITTING; - CustomEventPublish(TOPIC_EVENT_BLE_TRANSMIT,&TRANSMIT_DATA,1); - return ERRCODE_SUCC; - } + + buffer_handle->file_recv_stat.file_name = filename; + buffer_handle->file_recv_stat.file_size = file_size; + buffer_handle->file_recv_stat.file_type = 3;//表盘 + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP," filetype = %d, file_name=%s, file_size=%d , dial_uid %04X ,dial_count %d, dial_filetype %d\n", + buffer_handle->file_recv_stat.file_type, + buffer_handle->file_recv_stat.file_name, + buffer_handle->file_recv_stat.file_size, + dialinfo.dial_uid, + dialinfo.dial_count, + dialinfo.file_type + + ); + buffer_handle->file_recv_stat.received_size = 0; + buffer_handle->file_recv_stat.lrcvalue = 0; + buffer_handle->receive_file_flag = 1; + uapi_ble_connect_param_update(BLE_CONNECT_INTERVAL_HIGH); + + TRANSMIT_DATA=TRANS_DIAL_TRANSMITTING; + CustomEventPublish(TOPIC_EVENT_BLE_TRANSMIT,&TRANSMIT_DATA,1); + return ERRCODE_SUCC; +