From: luozheng <1732036298@qq.com> Date: Fri, 9 Aug 2024 11:19:41 +0000 (+0800) Subject: Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... X-Git-Tag: release_V1.2.70_20241020_135402~688 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F668%2F1;p=mirrors%2FFD230.git Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626 --- 1870b7b349dd9567efcbc9704364b8b1c8bc5f1c diff --cc code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp index f729e02a4,cac03770f..f3caa03d7 --- a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp @@@ -85,7 -85,7 +85,8 @@@ namespace OHO {VIEW_SET_DIAL_STYLE, PNG_APPLIST_CHANGEDIAL_IMAGE, PNG_APPLIST_CHANGEDIAL_IMAGE, PNG_APPLIST_DEFAULT_IMG, "更换表盘", STR_WATCH_FACE, nullptr}, {VIEW_SAVEELE, PNG_APPLIST_SAVEELE_IMAGE, PNG_APPLIST_SAVEELE_IMAGE, PNG_APPLIST_DEFAULT_IMG, "省电模式", STR_POWER_SAVE_MODE, nullptr}, {VIEW_SLEEP, PNG_APPLIST_SLEEP_IMAGE, PNG_APPLIST_SLEEP_IMAGE, PNG_APPLIST_DEFAULT_IMG, "睡眠", STR_SLEEP, nullptr}, + // {VIEW_MUSIC_PLAYER, PNG_APPLIST_MUSIC_IMAGE, PNG_APPLIST_MUSIC_IMAGE, PNG_APPLIST_DEFAULT_IMG, "音乐播放器", STR_MUSIC, nullptr}, + {VIEW_OFFLINEVOICE, PNG_APPLIST_VOCASSIST_IMAGE, PNG_APPLIST_VOCASSIST_IMAGE, PNG_APPLIST_DEFAULT_IMG, "语音助手", STR_VOICE_ASSISTANT, nullptr}, {VIEW_SETTING, PNG_APPLIST_SETTING_IMAGE, PNG_APPLIST_SETTING_IMAGE, PNG_APPLIST_DEFAULT_IMG, "设置", STR_SETTINGS, nullptr}, #if 0 /*屏蔽Slice*/ diff --cc code/sdk/application/wearable/fd230app/nativeui/obumessage/include/OBUMessageView.h index f2dd67569,362de1611..256ee38e8 --- a/code/sdk/application/wearable/fd230app/nativeui/obumessage/include/OBUMessageView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/obumessage/include/OBUMessageView.h @@@ -1,9 -1,9 +1,9 @@@ /* * @Author: luozheng 1732036298@qq.com * @Date: 2024-07-27 10:58:43 - * @LastEditors: penglei 1624952103@qq.com - * @LastEditTime: 2024-08-08 19:16:46 + * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-08-07 11:37:56 - * @FilePath: /xts_origin/FD230/code/sdk/application/wearable/fd230app/nativeui/obumessage/include/OBUMessageView..h ++ * @LastEditTime: 2024-08-09 19:11:20 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/obumessage/include/OBUMessageView.h * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@@ -43,12 -41,10 +43,15 @@@ namespace OHO UIViewGroup *group = nullptr; UILabel *title = nullptr; UILabel *displayTimeLabel = nullptr; - UILabel *obuMessageLabel = nullptr; + UILabel *obuMessageLabel1 = nullptr; + UILabel *obuMessageLabel2 = nullptr; + UILabel *MessageNumLabel1 = nullptr; + UILabel *MessageNumLabel2 = nullptr; + + OBUMessageListAdapter *obuAdapter{nullptr}; + UIList *obuList{nullptr}; + + int count{0}; bool viewInitStatus{false}; }; } diff --cc code/sdk/application/wearable/fd230app/nativeui/obumessage/src/OBUMessageView.cpp index 8c2647cfd,c833ad70c..379eadd56 --- a/code/sdk/application/wearable/fd230app/nativeui/obumessage/src/OBUMessageView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/obumessage/src/OBUMessageView.cpp @@@ -1,8 -1,8 +1,8 @@@ /* * @Author: luozheng 1732036298@qq.com * @Date: 2024-05-07 11:25:58 - * @LastEditors: penglei 1624952103@qq.com - * @LastEditTime: 2024-08-09 10:25:01 + * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-08-07 12:11:00 ++ * @LastEditTime: 2024-08-09 19:15:37 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/obumessage/src/OBUMessageView.cpp */ #include "obumessage/include/OBUMessagePresenter.h" @@@ -55,21 -55,26 +55,36 @@@ namespace OHO delete displayTimeLabel; displayTimeLabel = nullptr; } - if (obuMessageLabel != nullptr) + if (obuMessageLabel1 != nullptr) { - delete obuMessageLabel; - obuMessageLabel = nullptr; + delete obuMessageLabel1; + obuMessageLabel1 = nullptr; + } - if (obuMessageLabel2 != nullptr) ++ if (obuMessageLabel2 != nullptr) + { + delete obuMessageLabel2; + obuMessageLabel2 = nullptr; + } - if (MessageNumLabel1 != nullptr) ++ if (MessageNumLabel1 != nullptr) + { + delete MessageNumLabel1; + MessageNumLabel1 = nullptr; + } - if (MessageNumLabel2 != nullptr) ++ if (MessageNumLabel2 != nullptr) + { + delete MessageNumLabel2; + MessageNumLabel2 = nullptr; } + if (obuAdapter != nullptr) + { + delete obuAdapter; + obuAdapter = nullptr; + } + if (obuList != nullptr) + { + delete obuList; + obuList = nullptr; + } delete group; group = nullptr; } @@@ -157,45 -162,77 +172,107 @@@ return; } } - obuMessageLabel->SetPosition(53, 30, 360, 250); - obuMessageLabel->SetStyle(STYLE_BORDER_RADIUS, 33); - obuMessageLabel->SetStyle(STYLE_TEXT_FONT, 40); - obuMessageLabel->SetStyle(STYLE_LINE_HEIGHT, 45); - obuMessageLabel->SetText(""); - obuMessageLabel->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS); - obuMessageLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - obuMessageLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 40); - group->Add(obuMessageLabel); + obuMessageLabel1->SetPosition(68, 10, 360, 250); + obuMessageLabel1->SetStyle(STYLE_BORDER_RADIUS, 33); + obuMessageLabel1->SetStyle(STYLE_TEXT_FONT, 40); + obuMessageLabel1->SetStyle(STYLE_LINE_HEIGHT, 45); + obuMessageLabel1->SetText(""); + obuMessageLabel1->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS); + obuMessageLabel1->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + obuMessageLabel1->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + group->Add(obuMessageLabel1); + + /* ----------------------------- obuMessageLabel2 ---------------------------- */ + if (obuMessageLabel2 == nullptr) + { + obuMessageLabel2 = new UILabel(); + if (obuMessageLabel2 == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "obuMessageLabel2 fail!!"); + return; + } + } + obuMessageLabel2->SetPosition(53, 70, 360, 250); + obuMessageLabel2->SetStyle(STYLE_BORDER_RADIUS, 33); + obuMessageLabel2->SetStyle(STYLE_TEXT_FONT, 40); + obuMessageLabel2->SetStyle(STYLE_LINE_HEIGHT, 45); + obuMessageLabel2->SetText(""); + obuMessageLabel2->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS); + obuMessageLabel2->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + obuMessageLabel2->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + group->Add(obuMessageLabel2); + + /* ----------------------------- MessageNumLabel1 ---------------------------- */ + if (MessageNumLabel1 == nullptr) + { + MessageNumLabel1 = new UILabel(); + if (MessageNumLabel1 == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MessageNumLabel1 fail!!"); + return; + } + } + MessageNumLabel1->SetPosition(28, 10, 360, 250); + MessageNumLabel1->SetStyle(STYLE_BORDER_RADIUS, 33); + MessageNumLabel1->SetStyle(STYLE_TEXT_FONT, 40); + MessageNumLabel1->SetStyle(STYLE_LINE_HEIGHT, 45); + MessageNumLabel1->SetText(""); + MessageNumLabel1->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS); + MessageNumLabel1->SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_CENTER); + MessageNumLabel1->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + group->Add(MessageNumLabel1); + + + /* ----------------------------- MessageNumLabel2 ---------------------------- */ + if (MessageNumLabel2 == nullptr) + { + MessageNumLabel2 = new UILabel(); + if (MessageNumLabel2 == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MessageNumLabel2 fail!!"); + return; + } + } + MessageNumLabel2->SetPosition(28, 70, 360, 250); + MessageNumLabel2->SetStyle(STYLE_BORDER_RADIUS, 33); + MessageNumLabel2->SetStyle(STYLE_TEXT_FONT, 40); + MessageNumLabel2->SetStyle(STYLE_LINE_HEIGHT, 45); + MessageNumLabel2->SetText(""); + MessageNumLabel2->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS); + MessageNumLabel2->SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_CENTER); + MessageNumLabel2->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + group->Add(MessageNumLabel2); + /* + obuAdapter = new OBUMessageListAdapter(); + if (obuAdapter == nullptr) + { + return; + } + obuList = new UIList(UIList::VERTICAL); + if (obuList == nullptr) + { + return; + } + obuList->SetPosition(53, 30, 360, 250); + obuList->SetStyle(STYLE_BACKGROUND_COLOR, 0xff000000); + obuList->EnableAutoAlign(true); + obuList->SetTouchable(true); + obuList->SetDraggable(true); + obuList->SetThrowDrag(true); + obuList->SetReboundSize(35); + obuList->SetMaxScrollDistance(1000); + obuList->SetSwipeACCLevel(800); // 800: compensation distance + obuList->SetDragACCLevel(5); // 5: drag acceleration + obuList->SetRotateFactor(2); + obuList->RequestFocus(); + obuList->SetIntercept(true); + obuList->SetAdapter(obuAdapter); + obuList->RefreshList(); + group->Add(obuList); + */ + ++ viewInitStatus = true; } @@@ -279,20 -317,19 +357,32 @@@ labelTimeStr = std::string(labelTime); } } + if(flag == 1) + { + num1++; + obuMessageLabel1->SetText(rxdataStr.c_str()); /*数据更新*/ + MessageNumLabel1->SetText(std::to_string(num1).c_str()); + } + else if(flag == 2) + { + num2++; + obuMessageLabel2->SetText(rxdataStr.c_str()); + MessageNumLabel2->SetText(std::to_string(num2).c_str()); + } displayTimeLabel->SetText(labelTimeStr.c_str()); /*时间更新：时:分:秒*/ - obuMessageLabel->SetText(rxdataStr.c_str()); /*数据更新*/ + + /* + OBUItem item; + item.index = count++; + item.text = rxdataStr; + if (count >= 50) + { + count = 0; + obuAdapter->ClearData(); + } + obuAdapter->AddListItem(item); + obuList->RefreshList(); + obuList->SetStartIndex(count); + */ } }