From 76e3047f6d7bcb1070897fe8b873f752ec4354dc Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Sat, 5 Oct 2024 11:01:28 +0800 Subject: [PATCH] =?utf8?q?=E5=B0=86=E4=B8=80=E4=BA=9B=E4=B8=8D=E7=94=A8?= =?utf8?q?=E7=BF=BB=E8=AF=91=E7=9A=84=E7=BB=84=E4=BB=B6=E5=AD=97=E4=BD=93?= =?utf8?q?=E8=AE=BE=E7=BD=AE=E4=B8=BA=E9=BB=98=E8=AE=A4=E5=AD=97=E4=BD=93?= =?utf8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=E5=9C=A8=E5=88=87=E6=8D=A2=E5=85=B6?= =?utf8?q?=E4=BB=96=E5=9B=BD=E8=AF=AD=E8=A8=80=E6=97=B6=E5=80=99=E8=AF=A5?= =?utf8?q?=E5=AD=97=E5=BA=93=E6=B2=A1=E6=9C=89=E6=94=B9=E5=AD=97=E4=BD=93?= =?utf8?q?=E8=80=8C=E6=98=BE=E7=A4=BA=E7=A9=BA=E7=99=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../src/AivoiceChatContentListAdapter.cpp | 4 +-- .../src/AivoiceChatContentListItemView.cpp | 4 +-- .../aivoice/src/AivoiceConnectTimeoutView.cpp | 4 +-- .../aivoice/src/AivoiceListeningView.cpp | 4 +-- .../nativeui/alarm/src/AlarmConfigView.cpp | 4 +-- .../nativeui/alarm/src/AlarmJudgeView.cpp | 6 ++-- .../nativeui/alarm/src/AlarmSetWeekView.cpp | 2 +- .../nativeui/alarm/src/MainAlarmView.cpp | 4 +-- .../bluetooth/src/BluetoothItemView.cpp | 2 +- .../bluetooth/src/BluetoothOptionsView.cpp | 2 +- .../bluetooth/src/TipsConnFailMessageView.cpp | 2 +- .../bluetooth/src/TipsSuccMessageView.cpp | 2 +- .../countdown/src/MainCountDownPresenter.cpp | 2 -- .../countdown/src/StartCountDownView.cpp | 4 +-- .../languagecode/src/LanguageSwitchView.cpp | 2 +- .../nativeui/main/src/MainPresenterSample.cpp | 36 ------------------- .../nativeui/main/src/PullUpDownView.cpp | 6 ++-- .../player/src/PlayerListDelSongView.cpp | 2 +- .../player/src/PlayerListitemView.cpp | 4 +-- .../src/RebootAndShutdownView.cpp | 4 +-- .../nativeui/record/src/RecordDeleteView.cpp | 2 +- .../nativeui/record/src/RecordGoingView.cpp | 2 +- .../record/src/RecordingListitemView.cpp | 4 +-- .../record/src/RecordingPlayerView.cpp | 2 +- .../stopwatch/src/MainStopWatchView.cpp | 2 +- .../system/src/SystemAboutTheWatchView.cpp | 2 +- .../watchQRcode/src/WatchQRCodeView.cpp | 4 +-- .../weather/src/FutureWeatherListitemView.cpp | 6 ++-- .../nativeui/weather/src/WeatherView.cpp | 4 +-- 29 files changed, 45 insertions(+), 83 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceChatContentListAdapter.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceChatContentListAdapter.cpp index 6842ce396..2fd95d144 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceChatContentListAdapter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceChatContentListAdapter.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-28 14:27:05 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-07-15 20:24:59 + * @LastEditTime: 2024-10-05 10:20:15 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/language/src/AivoiceChatContentListAdapter.cpp */ #include "aivoice/include/AivoiceChatContentListAdapter.h" @@ -70,7 +70,7 @@ namespace OHOS label.SetText(Text); label.SetLineBreakMode(UILabel::LINE_BREAK_WRAP); label.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 26); + label.SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 26); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "label.GetHeight = %d,label.GetTextHeight = %d\n", label.GetHeight(), label.GetTextHeight()); itemViewHeight = label.GetTextHeight(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceChatContentListItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceChatContentListItemView.cpp index 5b470045a..0dbe09aa4 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceChatContentListItemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceChatContentListItemView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-06-29 17:27:25 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-09-26 18:16:34 + * @LastEditTime: 2024-10-05 10:20:09 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceChatContentListItemView.cpp */ @@ -109,7 +109,7 @@ namespace OHOS chatContentLabel.SetStyle(STYLE_LINE_HEIGHT, CHATCONTENTLABEL_LINE_HEIGHT); chatContentLabel.SetLineBreakMode(UILabel::LINE_BREAK_WRAP); chatContentLabel.SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_CENTER); - chatContentLabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME, CHATCONTENTLABEL_TEXT_FONT); + chatContentLabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, CHATCONTENTLABEL_TEXT_FONT); } } \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceConnectTimeoutView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceConnectTimeoutView.cpp index 03ff9a1bf..35557fc7a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceConnectTimeoutView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceConnectTimeoutView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-05-07 11:25:58 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-08-31 16:13:53 + * @LastEditTime: 2024-10-05 10:20:37 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/AiVoice/src/AivoiceConnectTimeoutView.cpp */ #include "aivoice/include/AiVoicePresenter.h" @@ -171,7 +171,7 @@ namespace OHOS NoteLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); NoteLabel->SetRollSpeed(70); NoteLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - NoteLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + NoteLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30); /* -------------------------------------------------------------------------- */ labelconfig = { .left = 133, diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceListeningView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceListeningView.cpp index ae2a198ea..e93f99e90 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceListeningView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceListeningView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-05-07 11:25:58 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-09-26 15:39:03 + * @LastEditTime: 2024-10-05 10:21:11 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/AiVoice/src/AivoiceListeningView.cpp */ #include "aivoice/include/AiVoicePresenter.h" @@ -217,7 +217,7 @@ namespace OHOS showtimeout->SetStyle(STYLE_LINE_HEIGHT, 60); showtimeout->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS); showtimeout->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - showtimeout->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 50); + showtimeout->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 50); return true; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmConfigView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmConfigView.cpp index 60b91a35c..4c7f8c224 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmConfigView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmConfigView.cpp @@ -175,7 +175,7 @@ namespace OHOS labelTime->SetPosition(93, 120 + 12, 250, 45); labelTime->SetStyle(STYLE_TEXT_FONT, 40); labelTime->SetStyle(STYLE_LINE_HEIGHT, 45); - labelTime->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 40); + labelTime->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 40); labelTime->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); labelTime->SetRollSpeed(70); /* -------------------------------------------------------------------------- */ @@ -210,7 +210,7 @@ namespace OHOS labelDay->SetPosition(93, 240 + 12, 250, 45); labelDay->SetStyle(STYLE_TEXT_FONT, 40); labelDay->SetStyle(STYLE_LINE_HEIGHT, 45); - labelDay->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 40); + labelDay->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 40); labelDay->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); labelDay->SetRollSpeed(70); /* -------------------------------------------------------------------------- */ diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmJudgeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmJudgeView.cpp index ee1a7d307..c8d5cb4b4 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmJudgeView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmJudgeView.cpp @@ -183,11 +183,11 @@ UIScrollView * AlarmJudgeView::InitDeleteScreen() if(nullptr == DeletePromptLabelExt_) return nullptr; - DeletePromptLabelExt_->SetPosition(98, 187, 270, 35); + DeletePromptLabelExt_->SetPosition(83, 187, 300, 35); DeletePromptLabelExt_->SetStyle(STYLE_TEXT_FONT, 30); DeletePromptLabelExt_->SetStyle(STYLE_LINE_HEIGHT, 35); - DeletePromptLabelExt_->SetText(DELETE_INETERFACES); - DeletePromptLabelExt_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); + DeletePromptLabelExt_->SetTextId(STR_ALARM_DELETE_NOTE); + DeletePromptLabelExt_->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); DeletePromptLabelExt_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); DeletePromptLabelExt_->SetRollSpeed(70); DeletePromptLabelExt_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetWeekView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetWeekView.cpp index 77aed612a..4146746cd 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetWeekView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetWeekView.cpp @@ -146,7 +146,7 @@ UILabelButtonExt *AlarmSetWeekView::CreateUILabelButton(const char *buttonText1, labelButton->SetText(buttonText2); } labelButton->SetPosition(x, y); - labelButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME, FONT_DEFAULT_SIZE); + labelButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, FONT_DEFAULT_SIZE); labelButton->SetStyleForState(STYLE_BORDER_RADIUS, BUTTON_STYLE_BORDER_RADIUS_VALUE, UIButton::PRESSED); labelButton->SetStyleForState(STYLE_BORDER_RADIUS, BUTTON_STYLE_BORDER_RADIUS_VALUE, UIButton::INACTIVE); labelButton->SetStyleForState(STYLE_BORDER_RADIUS, BUTTON_STYLE_BORDER_RADIUS_VALUE, UIButton::RELEASED); diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp index fa10d610c..f602cab92 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp @@ -295,7 +295,7 @@ UIViewGroup * MainAlarmView::NewClockCtlExt(int16_t alarmNum, uint8_t index) UIView::OnClickListener *clockListener = (UIView::OnClickListener *)OHOS::AlarmPresenter::GetInstance(); dClock[alarmNum]->SetOnClickListener(clockListener); dClock[alarmNum]->SetPosition(50, 10, 110, 50); - dClock[alarmNum]->SetFont(DEFAULT_VECTOR_FONT_FILENAME, D_CLOCK_FONT_SIZE); + dClock[alarmNum]->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, D_CLOCK_FONT_SIZE); dClock[alarmNum]->SetDisplayMode(UIDigitalClock::DISPLAY_24_HOUR_NO_SECONDS); /* -------------------------------------------------------------------------- */ dLabel[alarmNum] = new UILabelExt(); @@ -307,7 +307,7 @@ UIViewGroup * MainAlarmView::NewClockCtlExt(int16_t alarmNum, uint8_t index) dLabel[alarmNum]->SetStyle(STYLE_TEXT_FONT, 30); dLabel[alarmNum]->SetStyle(STYLE_LINE_HEIGHT, 35); dLabel[alarmNum]->SetTextColor(Color::GetColorFromRGBA(0x99, 0x99, 0x99, 0xff)); - dLabel[alarmNum]->SetFont(DEFAULT_VECTOR_FONT_FILENAME, D_CLOCK_LABEL_FONT); + dLabel[alarmNum]->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, D_CLOCK_LABEL_FONT); dLabel[alarmNum]->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); dLabel[alarmNum]->SetRollSpeed(70); /* -------------------------------------------------------------------------- */ diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothItemView.cpp index fc5b95f96..d73c4418a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothItemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothItemView.cpp @@ -67,7 +67,7 @@ namespace OHOS namelabel.SetPosition(40, 21, 250, 35); namelabel.SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919); namelabel.SetStyle(STYLE_BACKGROUND_OPA, 0x00); - namelabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + namelabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30); namelabel.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); namelabel.SetRollSpeed(100); namelabel.SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_LEFT, UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER); diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothOptionsView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothOptionsView.cpp index c11059f8f..77ed59658 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothOptionsView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothOptionsView.cpp @@ -115,7 +115,7 @@ namespace OHOS EarPhoneDeviceName->SetText(reinterpret_cast(caseInfo->deviceName)); EarPhoneDeviceName->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); EarPhoneDeviceName->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - EarPhoneDeviceName->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + EarPhoneDeviceName->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30); /* -------------------------------- pairState ------------------------------- */ if (pairState == nullptr) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/TipsConnFailMessageView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/TipsConnFailMessageView.cpp index 340637226..8d125872f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/TipsConnFailMessageView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/TipsConnFailMessageView.cpp @@ -191,7 +191,7 @@ namespace OHOS conn_fail_Label->SetStyle(STYLE_LINE_HEIGHT, 35); conn_fail_Label->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); conn_fail_Label->SetRollSpeed(70); - conn_fail_Label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + conn_fail_Label->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30); conn_fail_Label->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER, UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER); conn_fail_Label->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x7f)); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/TipsSuccMessageView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/TipsSuccMessageView.cpp index c2fda4fcb..3fc03be19 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/TipsSuccMessageView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/TipsSuccMessageView.cpp @@ -138,7 +138,7 @@ namespace OHOS bluetoothNameLabel->SetStyle(STYLE_LINE_HEIGHT, 35); bluetoothNameLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); bluetoothNameLabel->SetRollSpeed(70); - bluetoothNameLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + bluetoothNameLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30); bluetoothNameLabel->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER, UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER); } /* ----------------------------- conn_succ_Label ---------------------------- */ diff --git a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownPresenter.cpp index 319005d54..037a75f45 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownPresenter.cpp @@ -104,8 +104,6 @@ namespace OHOS // Update label texts if necessary if (p_MainCountDownView->GetStartCountDownView() != nullptr) { - // p_MainCountDownView->GetStartCountDownView()->GetShowCountDownTimelabel()->SetText(timeValue.c_str()); - // p_MainCountDownView->GetStartCountDownView()->GetShowTheRingTimelabel()->SetText(timeValue.c_str()); p_MainCountDownView->GetStartCountDownView()->GetShowCountDownTimelabel()->SetText(CountDownModel::GetInstance()->GetCountDownTime().c_str()); p_MainCountDownView->GetStartCountDownView()->GetShowTheRingTimelabel()->SetText(CountDownModel::GetInstance()->GetRingTime().c_str()); p_MainCountDownView->GetStartCountDownView()->GetPlayOrPauseToggleButton()->SetVisible(true); diff --git a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/StartCountDownView.cpp b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/StartCountDownView.cpp index 7d1b8c007..cd34de099 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/StartCountDownView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/StartCountDownView.cpp @@ -139,7 +139,7 @@ namespace OHOS showCountDownTimelabel->SetText(CountDownModel::GetInstance()->GetCountDownTime().c_str()); showCountDownTimelabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); showCountDownTimelabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - showCountDownTimelabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 80); + showCountDownTimelabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 80); showCountDownTimelabel->SetRollSpeed(70); /* -------------------------------------------------------------------------- */ vectorImage = new UIImageView(); @@ -164,7 +164,7 @@ namespace OHOS showTheRingTime->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); showTheRingTime->SetTextColor(Color::GetColorFromRGBA(0x66, 0x66, 0x66, 0xff)); showTheRingTime->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - showTheRingTime->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 35); + showTheRingTime->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 35); /* -------------------------------------------------------------------------- */ play_or_pause_toggleButton = new UIToggleButton(); if (play_or_pause_toggleButton == nullptr) diff --git a/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchView.cpp b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchView.cpp index 722fa1c80..7f47c625a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchView.cpp @@ -253,7 +253,7 @@ namespace OHOS LanguageSwitchViewhintLabel->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); LanguageSwitchViewhintLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); LanguageSwitchViewhintLabel->SetRollSpeed(0); - LanguageSwitchViewhintLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + LanguageSwitchViewhintLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30); group->Add(LanguageSwitchViewhintLabel); LanguageSwitchViewhintLabel->SetVisible(true); diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp index d6dcb5cf5..0c4e72fe7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp @@ -527,22 +527,6 @@ namespace OHOS return MainModel::GetInstance().GetDialSetting(); } - // 更新时间 - void MainPresenterSample::UpdataTime() - { - // // 获取当前时间 - // char *timeStr = (char *)malloc(9); - // if (uapi_get_HHMMSS_Time(timeStr, ':', false) != ERRCODE_SUCC) - // { - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Failed to get start time"); - // free(timeStr); - // return; - // } - // if (PullUpDownView::GetInstance() != nullptr) - // // PullUpDownView::GetInstance()->GetTimeLabel()->SetText(timeStr); - // free(timeStr); - } - static const char *weekDays_ch[] = {"星期天", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"}; static const char *weekDays_other[] = {"Sun", "Mon", "Tue", "Wed", "Thur", "Fri", "Sat"}; uint32_t MainPresenterSample::GetWeekStr(char *p_week) @@ -602,30 +586,10 @@ namespace OHOS uint8_t value = 0; value = battery_get_voltage(&voltage); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "battery_get_voltage = %d", value); - // 更新电池信息 - // const char *progressImages[3] = { - // "/user/res/Battery/Battery_Limit.bin", // 低电量图片路径 - // "/user/res/Battery/Battery_Save.bin", // 中等电量图片路径 - // "/user/res/Battery/Battery_Normal.bin" // 正常电量图片路径 - // }; - // const char *progressImageSrc = nullptr; - // for (int i = 0; i < 3; i++) - // { - // if (value <= (i + 1) * 10) - // { - // progressImageSrc = progressImages[i]; - // // PRINT("Update progressImageSrc!\n"); - // break; - // } - // } std::string dateAndweek = std::string(dateStr) + " " + std::string(weekStr); if (PullUpDownView::GetInstance() != nullptr) { - // PullUpDownView::GetInstance()->GetProgress()->SetImage(progressImageSrc, progressImageSrc); PullUpDownView::GetInstance()->GetProgress()->SetValue(value); - // PullUpDownView::GetInstance()->GetDateLabel()->SetText(dateStr); - // PullUpDownView::GetInstance()->GetTimeLabel()->SetText(timeStr); - // PullUpDownView::GetInstance()->GetWeekLabel()->SetText(weekStr); PullUpDownView::GetInstance()->GetDateAndWeekLabel()->SetText(dateAndweek.c_str()); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp index 791aec4b6..b94743226 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-06-26 18:14:24 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-09-11 16:16:01 + * @LastEditTime: 2024-10-05 10:40:04 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp */ @@ -434,7 +434,7 @@ namespace OHOS Singal_4->SetText("4G"); Singal_4->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); Singal_4->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - Singal_4->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 34); + Singal_4->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 34); Singal_4->SetVisible(false); group1->Add(Singal_4); /* ----------------------------------- HD ----------------------------------- */ @@ -497,7 +497,7 @@ namespace OHOS showDateAndWeekLabel->SetTextColor(Color::GetColorFromRGBA(0xaa, 0xaa, 0xaa, 0xff)); showDateAndWeekLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); showDateAndWeekLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - showDateAndWeekLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + showDateAndWeekLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30); group[DROPDOWNVIEW]->Add(showDateAndWeekLabel); /* -------------------------------------------------------------------------- */ UpdateSignalStrengthStatusAndBatteryPosition(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayerListDelSongView.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayerListDelSongView.cpp index a245181a7..92eed0c0c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayerListDelSongView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayerListDelSongView.cpp @@ -203,7 +203,7 @@ namespace OHOS songNameLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); songNameLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); songNameLabel->SetTextColor(Color::GetColorFromRGBA(0x4f, 0xc3, 0x4c, 0xff)); - songNameLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + songNameLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30); return true; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayerListitemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayerListitemView.cpp index 0ef6f0c41..08f0fb423 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayerListitemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayerListitemView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-06-12 14:15:45 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-08-09 17:34:29 + * @LastEditTime: 2024-10-05 10:43:38 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayerListitemView.cpp */ #include "player/include/PlayerListitemView.h" @@ -50,7 +50,7 @@ namespace OHOS sLabel.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); sLabel.SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0xff)); sLabel.SetRollSpeed(70); - sLabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + sLabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30); sLabel.SetTouchable(true); sLabel.SetAlign(TEXT_ALIGNMENT_LEFT,TEXT_ALIGNMENT_TOP); diff --git a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownView.cpp b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownView.cpp index 07cb13ab2..ce44e901d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-07-18 14:26:08 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-08-29 17:14:57 + * @LastEditTime: 2024-10-05 10:43:59 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownView.cpp */ @@ -170,7 +170,7 @@ namespace OHOS sosLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); sosLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); sosLabel->SetRollSpeed(70); - sosLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + sosLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30); sosLabel->SetTextColor(Color::GetColorFromRGBA(0x66, 0x66, 0x66, 0xff)); /* -------------------------------------------------------------------------- */ labelConfig = { diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordDeleteView.cpp b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordDeleteView.cpp index 7e184ee4e..af5c3e3ad 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordDeleteView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordDeleteView.cpp @@ -164,7 +164,7 @@ namespace OHOS DeleteNameLabel->SetText(""); // 内容 DeleteNameLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); // 断行模式。 DeleteNameLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - DeleteNameLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + DeleteNameLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30); RecordDeleteViewScrollView->Add(DeleteNameLabel); DeleteNameLabel->LayoutCenterOfParent(); // 与父视图中心对齐 diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordGoingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordGoingView.cpp index 0f7ddf896..7a8a9739d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordGoingView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordGoingView.cpp @@ -96,7 +96,7 @@ namespace OHOS label->SetText(labelconfig.text); // 内容 label->SetLineBreakMode(labelconfig.lineBreakMode); // 断行模式。 label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize); + label->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, labelconfig.fontSize); return label; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingListitemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingListitemView.cpp index cc773ded1..1b8b9c776 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingListitemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingListitemView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-02 20:10:18 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-08-31 20:19:43 + * @LastEditTime: 2024-10-05 10:45:23 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingListitemView.cpp */ #include "record/include/RecordingListitemView.h" @@ -65,7 +65,7 @@ namespace OHOS label.SetStyle(STYLE_LINE_HEIGHT, height); label.SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); label.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label.SetFont(DEFAULT_VECTOR_FONT_FILENAME, fontSize); + label.SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, fontSize); } int RecordingListitemView::GetRecordingListIndex() diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPlayerView.cpp b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPlayerView.cpp index 134807072..160da79f9 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPlayerView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPlayerView.cpp @@ -85,7 +85,7 @@ namespace OHOS label->SetText(labelconfig.text); // 内容 label->SetLineBreakMode(labelconfig.lineBreakMode); // 断行模式。 label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize); + label->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, labelconfig.fontSize); return label; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/MainStopWatchView.cpp b/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/MainStopWatchView.cpp index cfac70da8..a833ab630 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/MainStopWatchView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/MainStopWatchView.cpp @@ -278,7 +278,7 @@ namespace OHOS showTimelabel->SetText("00:00.00"); showTimelabel->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); showTimelabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - showTimelabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 84); + showTimelabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 84); /* -------------------------------- LineImage ------------------------------- */ LineImage = new UIImageView(); if (LineImage == nullptr) diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp index 9f8691a0e..f627103cd 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp @@ -164,7 +164,7 @@ namespace OHOS label->SetText(labelConfig.text.c_str()); // 内容 label->SetLineBreakMode(labelConfig.lineBreakMode); // 断行模式。 label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_TOP); - label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelConfig.fontSize); + label->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, labelConfig.fontSize); return label; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/watchQRcode/src/WatchQRCodeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/watchQRcode/src/WatchQRCodeView.cpp index f97b78347..5c1ceb27a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/watchQRcode/src/WatchQRCodeView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/watchQRcode/src/WatchQRCodeView.cpp @@ -122,7 +122,7 @@ namespace OHOS errcode_t ret = uapi_get_nv_btname(ble_name, &ble_name_len); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "get btname %s ,ret 0x%X\n", ble_name, ret); TitleLabel->SetText((char *)ble_name); - TitleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + TitleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30); TitleLabel->SetRollSpeed(70); TitleLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); TitleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); @@ -138,7 +138,7 @@ namespace OHOS DeviceNameLabel->SetPosition(83, 390, 300, 35); DeviceNameLabel->SetStyle(STYLE_TEXT_FONT, 30); DeviceNameLabel->SetStyle(STYLE_LINE_HEIGHT, 35); - DeviceNameLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + DeviceNameLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30); DeviceNameLabel->SetRollSpeed(70); DeviceNameLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); DeviceNameLabel->SetTextColor(Color::GetColorFromRGBA(0x99, 0x99, 0x99, 0xff)); diff --git a/code/sdk/application/wearable/fd230app/nativeui/weather/src/FutureWeatherListitemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/weather/src/FutureWeatherListitemView.cpp index 720cb11e6..48addec65 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/weather/src/FutureWeatherListitemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/weather/src/FutureWeatherListitemView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-04-15 09:25:53 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-06-15 17:49:39 + * @LastEditTime: 2024-10-05 10:53:08 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/weather/src/FutureWeatherListitemView.cpp */ @@ -57,14 +57,14 @@ namespace OHOS dateLabel.SetStyle(STYLE_LINE_HEIGHT, 35); dateLabel.SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); dateLabel.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - dateLabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + dateLabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30); /* -------------------------------------------------------------------------- */ minAndmaxTemperatureLabel.SetPosition(231, 16, 40, 40); minAndmaxTemperatureLabel.SetStyle(STYLE_TEXT_FONT, 30); minAndmaxTemperatureLabel.SetStyle(STYLE_LINE_HEIGHT, 35); minAndmaxTemperatureLabel.SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); minAndmaxTemperatureLabel.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - minAndmaxTemperatureLabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + minAndmaxTemperatureLabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30); // /* -------------------------------------------------------------------------- */ // minTemperatureLabel.SetPosition(231, 16, 40, 40); // minTemperatureLabel.SetStyle(STYLE_TEXT_FONT, 30); diff --git a/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherView.cpp b/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherView.cpp index 49a6c9012..eb5f34b93 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-06-12 11:44:04 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-09-11 19:08:27 + * @LastEditTime: 2024-10-05 10:54:02 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherView.cpp */ #include "weather/include/WeatherView.h" @@ -188,7 +188,7 @@ namespace OHOS label->SetText(text); label->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, textfont); + label->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, textfont); return label; } -- 2.17.1