From: Caisking <3449750381@qq.com> Date: Sat, 6 Jul 2024 07:39:02 +0000 (+0800) Subject: 修复表盘Id初始化不正确 X-Git-Tag: release_V1.2.70_20241020_135402~838^2~5 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=28086d9f8f332153fdcd9c412c2124975b3705f8;p=mirrors%2FFD230.git 修复表盘Id初始化不正确 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/MainModel.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/MainModel.h index 24b351070..65f44fae1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/MainModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/MainModel.h @@ -1,3 +1,9 @@ +/*** + * @Date: 2024-06-21 09:56:18 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-07-06 15:15:38 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/include/MainModel.h + */ /*** * @Date: 2024-06-21 09:56:18 * @LastEditors: Caisking 3449750381@qq.com @@ -62,7 +68,7 @@ namespace OHOS void AddCardSetting(uint8_t index); const CardInfo *GetCardInfo(CardId card) const; const DialInfo *GetDialInfo(DialId dial) const; - void AddDialSetting(const DialSetting &setting); + void AddDialSetting(const DialSetting &setting, const int id); void InitDialSettings(void); DialSetting &GetDialSetting(); bool IsFromSetCardView(void) const; 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 57fc16d92..dd5a768a1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp @@ -344,6 +344,7 @@ namespace OHOS } return nullptr; } + void MainModel::InitDialSettingDefault(void) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "InitDialSettingDefault"); @@ -351,17 +352,17 @@ namespace OHOS dialSetting.dialId = DIAL_CLOCK; dialSetting.dialFullName = ""; } + /*更新表盘设置*/ - void MainModel::AddDialSetting(const DialSetting &setting) + void MainModel::AddDialSetting(const DialSetting &setting, const int id) { std::string tmp; - tmp += std::to_string(setting.dialFlag); - tmp += ","; - tmp += std::to_string(setting.dialId); - tmp += ","; - tmp += setting.dialFullName; - tmp += ","; + tmp += std::to_string(setting.dialFlag) + ","; + tmp += std::to_string(setting.dialId) + ","; + tmp += setting.dialFullName + ","; + (void)UtilsSetValue("dial_setting", tmp.c_str()); + (void)UtilsSetValue("dial_id", std::to_string(id).c_str()); } /*加载kvstore里面的dial*/ void MainModel::InitDialSettings(void) 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 f2e4e1af0..cad572d1f 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 @@ -123,6 +123,12 @@ namespace OHOS { readDialfile(); LoadAllDial(); + char idBuffer[10]; + int len = UtilsGetValue("dial_id", idBuffer, sizeof(idBuffer)); + if (len >= 0) + { + currentDialID = std::stoi(idBuffer); // 将字符串转换为整数 + } } SetDialModel::~SetDialModel() {} @@ -136,17 +142,16 @@ namespace OHOS /* 注册表盘map */ void SetDialModel::RegisterDial(uint16_t ID, const char *dialname) { - if(ID==0 || strlen(dialname)==0) - return; + if (ID == 0 || strlen(dialname) == 0) + return; registeredDials[ID] = std::string(dialname); // 唯一性 - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RegisterDial %d %s is ok!",ID, dialname); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RegisterDial %d %s is ok!", ID, dialname); LoadAllDial(); saveDialfile(); - } /* 打印map */ void SetDialModel::PrintRegisteredDials(const std::unordered_map &dials) @@ -172,7 +177,7 @@ namespace OHOS /* 获取当前表盘Id */ uint16_t SetDialModel::GetCurrentDialID() { - if (registeredDials.find(currentDialID) != registeredDials.end()) + if (registeredDials.find(currentDialID) != registeredDials.end()) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "currentDialID is %d,name is %s", currentDialID, registeredDials[currentDialID].c_str()); } @@ -230,8 +235,6 @@ namespace OHOS registeredDials.erase(ID); LoadAllDial(); - - return true; } WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "uapi_delete_files the dial %d is false", ID); @@ -256,8 +259,8 @@ namespace OHOS diagSetting.dialFlag = info.dialFlag; diagSetting.dialId = info.id; diagSetting.dialFullName = info.dialFullName; - MainModel::GetInstance().AddDialSetting(diagSetting); // 更新表盘设置 - currentDialID = ID; // 更新当前表盘Id + currentDialID = ID; // 更新当前表盘Id + MainModel::GetInstance().AddDialSetting(diagSetting, currentDialID); // 更新表盘设置 NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN); return; // 更新成功后直接返回 } @@ -449,8 +452,8 @@ namespace OHOS diagSetting.dialFlag = info.dialFlag; diagSetting.dialId = info.id; diagSetting.dialFullName = info.dialFullName; - MainModel::GetInstance().AddDialSetting(diagSetting); currentDialID = GetDialIdFromName(info.dialName); // 更新表盘Id + MainModel::GetInstance().AddDialSetting(diagSetting, currentDialID); } /*获取表盘的总数*/