From f03c2ba5e202214b52292d35cc3c8132467e22bc Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E8=A2=81=E6=B8=85=E6=A2=A6?= <3449750381@qq.com> Date: Tue, 10 Dec 2024 13:06:42 +0000 Subject: [PATCH] Merge #1506 into sdk602patch0911 from refs/changes/1506/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit - 消息：优化信息的处理逻辑 - 系统：优化解析脚本 - #1233 手表，室外跑步，APP运动数据中目标显示0公里，手表设置的是1公里目标提醒 - 运动：修改距离单位的输出 - 修改ANCS;增加过滤；关闭多余打印 - 训练：优化暂停之后的显示 - ble传输：增加运动状态下不进行传输 - 表盘：增加运动状态下不进行界面切换 - ANCS：优化消息弹窗 - dump文件解析脚本优化 - 系统：修改label的滚动速度为23 --- .../uicomponents/UIComponents.cpp | 2 +- .../nativeui/aimodels/src/AiModelsView.cpp | 2 +- .../src/AiVoiceBluetoothFailedStartView.cpp | 2 +- .../aivoice/src/AiVoiceConnectingView.cpp | 2 +- .../nativeui/aivoice/src/AiVoiceView.cpp | 2 +- .../aivoice/src/AivoiceConnectTimeoutView.cpp | 2 +- .../aivoice/src/AivoiceListeningView.cpp | 2 +- .../src/AivoiceMobileDataFailedStartView.cpp | 2 +- .../aivoice/src/AivoiceThinkingView.cpp | 2 +- .../aivoice/src/apikeys/ApiKeysDeleteView.cpp | 2 +- .../aivoice/src/apikeys/NotSetApiKeysView.cpp | 2 +- .../aivoice/src/apikeys/SetApiKeysView.cpp | 2 +- .../nativeui/alarm/src/AlarmConfigView.cpp | 10 +-- .../nativeui/alarm/src/AlarmJudgeView.cpp | 4 +- .../nativeui/alarm/src/AlarmNewTimeView.cpp | 2 +- .../nativeui/alarm/src/AlarmSetTimeView.cpp | 2 +- .../nativeui/alarm/src/MainAlarmView.cpp | 6 +- .../nativeui/alipay/src/AlipaySetting.cpp | 4 +- .../src/AlipayTrans/AlipayTransCode.cpp | 2 +- .../assistant/src/AssistantAnswerView.cpp | 2 +- .../assistant/src/AssistantHfpView.cpp | 4 +- .../bloodoxygen/src/BloodResultView.cpp | 2 +- .../bluetooth/src/BluetoothDeviceListView.cpp | 2 +- .../bluetooth/src/BluetoothEarListView.cpp | 2 +- .../bluetooth/src/BluetoothOptionsView.cpp | 4 +- .../bluetooth/src/TipsConnFailMessageView.cpp | 8 +- .../bluetooth/src/TipsSuccMessageView.cpp | 6 +- .../src/BluetoothServiceOptionsView.cpp | 2 +- .../countdown/src/CountDownTimeConfigView.cpp | 2 +- .../src/CountDownTimeNotNullView.cpp | 4 +- .../countdown/src/MainCountDownView.cpp | 4 +- .../countdown/src/StartCountDownView.cpp | 4 +- .../src/DisplayBrightnessView.cpp | 4 +- .../src/ScreenDurationView.cpp | 2 +- .../flashlight/src/FlashlightView.cpp | 2 +- .../nativeui/heart_blood/BloodCardView.cpp | 2 +- .../heart_blood/CheckAbnormalView.cpp | 2 +- .../nativeui/heart_blood/CheckInvalidView.cpp | 2 +- .../nativeui/heartrate/src/HeartChartView.cpp | 2 +- .../nativeui/heartrate/src/HeartNoteView.cpp | 2 +- .../heartrate/src/HeartResultView.cpp | 2 +- .../nativeui/message/src/MessageItemView.cpp | 2 +- .../nativeui/message/src/MessageShowView.cpp | 2 +- .../src/MotionRecognitionView.cpp | 4 +- .../networkandcall/src/NetworkAndCallView.cpp | 4 +- .../nativeui/phone/src/PhoneDirView.cpp | 4 +- .../src/MusicPlayerBluetoothDisConView.cpp | 2 +- .../player/src/MusicPlayerSourceView.cpp | 2 +- .../player/src/PlayerListitemView.cpp | 2 +- .../nativeui/player/src/PlayersView.cpp | 2 +- .../src/FactoryResetView.cpp | 4 +- .../src/RebootAndShutdownView.cpp | 8 +- .../nativeui/record/src/RecordDeleteView.cpp | 2 +- ...spiratoryTrainingDurationSelectionView.cpp | 2 +- .../safemodemanager/src/RepairView.cpp | 2 +- .../src/SafeModeManagerView.cpp | 2 +- .../schedule/src/ScheduleListItem.cpp | 6 +- .../nativeui/schedule/src/ScheduleView.cpp | 20 ++--- .../nativeui/set_dial/src/SetDialModel.cpp | 9 ++- .../set_dial_style/src/SetDialStyleView.cpp | 4 +- .../set_time_format/src/SetTimeFormatView.cpp | 2 + .../nativeui/sleepmode/src/SleepModeView.cpp | 4 +- .../src/SoundAndVibrationView.cpp | 4 +- .../src/VibrationModeView.cpp | 2 +- .../stopwatch/src/MainStopWatchView.cpp | 2 +- .../src/StopWatchRecordCycleToLimitView.cpp | 4 +- .../src/StopWatchRecordTimeToLimitView.cpp | 6 +- .../system/src/SystemFactoryResetView.cpp | 2 +- .../nativeui/system/src/SystemRestart.cpp | 4 +- .../nativeui/system/src/SystemShutdown.cpp | 4 +- .../nativeui/system/src/SystemView.cpp | 2 +- .../takephotos/src/TakephotosView.cpp | 2 +- .../themestyle/src/ThemeStyleView.cpp | 2 +- .../nativeui/traing/src/TraingEnddataView.cpp | 2 +- .../nativeui/traing/src/TraingModel.cpp | 59 +++++++------- .../training_card/src/TraingCardView.cpp | 6 +- .../training_card/src/TrainingControlView.cpp | 6 ++ .../src/TraingAquaticItemView.cpp | 2 +- .../src/TraingBallItemView.cpp | 2 +- .../src/TraingDanceItemView.cpp | 2 +- .../src/TraingFitnessItemView.cpp | 2 +- .../src/TraingIceItemView.cpp | 2 +- .../src/TraingLimitItemView.cpp | 2 +- .../src/TraingMoreItemView.cpp | 2 +- .../src/TraingOtherItemView.cpp | 2 +- .../src/TraingRestItemView.cpp | 2 +- .../watchQRcode/src/WatchQRCodeView.cpp | 4 +- .../service/ble_service/bleservice/bleANCS.c | 43 ++++++----- .../service/ble_service/bleservice/bleEvent.c | 77 +++++++++++++------ .../src/notify/alarm_notification.cpp | 2 +- .../src/notify/goal_notification.cpp | 2 +- .../src/notify/message_notification.cpp | 4 +- .../src/notify/pairing_notification.cpp | 4 +- .../notify/sedentaryReminder_notification.cpp | 2 +- tools/log_parser/excdump.sh | 3 +- 95 files changed, 262 insertions(+), 213 deletions(-) diff --git a/code/sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.cpp b/code/sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.cpp index 4e8174b78..b2313a51b 100644 --- a/code/sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.cpp +++ b/code/sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.cpp @@ -100,7 +100,7 @@ bool InitRollLabel(UILabelExt *&label, int left, int top, int width, int height, // 设置标签的文本和其他属性 label->SetTextId(id); label->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - label->SetRollSpeed(70); + label->SetRollSpeed(23); label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); return true; diff --git a/code/sdk/application/wearable/fd230app/nativeui/aimodels/src/AiModelsView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aimodels/src/AiModelsView.cpp index 8f2e71a99..e831b35cf 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aimodels/src/AiModelsView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aimodels/src/AiModelsView.cpp @@ -125,7 +125,7 @@ namespace OHOS label->SetTextId(labelconfig.textId); label->SetLineBreakMode(labelconfig.lineBreakMode); label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label->SetRollSpeed(70); + label->SetRollSpeed(23); label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize); return label; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceBluetoothFailedStartView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceBluetoothFailedStartView.cpp index 0d11484d2..8bd7be13c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceBluetoothFailedStartView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceBluetoothFailedStartView.cpp @@ -91,7 +91,7 @@ namespace OHOS label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh); label->SetTextId(labelconfig.textId); label->SetLineBreakMode(labelconfig.lineBreakMode); - label->SetRollSpeed(70); + label->SetRollSpeed(23); label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize); return label; diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceConnectingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceConnectingView.cpp index b04ee9513..98b314e63 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceConnectingView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceConnectingView.cpp @@ -87,7 +87,7 @@ namespace OHOS label->SetTextId(labelconfig.textId); label->SetLineBreakMode(labelconfig.lineBreakMode); label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label->SetRollSpeed(70); + label->SetRollSpeed(23); label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize); return label; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceView.cpp index 8a589eac3..6f857067a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceView.cpp @@ -161,7 +161,7 @@ namespace OHOS label->SetTextId(labelconfig.textId); label->SetLineBreakMode(labelconfig.lineBreakMode); label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label->SetRollSpeed(70); + label->SetRollSpeed(23); label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize); return label; } 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 fd6e3936e..50fec0c0d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceConnectTimeoutView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceConnectTimeoutView.cpp @@ -169,7 +169,7 @@ namespace OHOS NoteLabel->SetStyle(STYLE_TEXT_FONT, 30); NoteLabel->SetStyle(STYLE_LINE_HEIGHT, 35); NoteLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - NoteLabel->SetRollSpeed(70); + NoteLabel->SetRollSpeed(23); NoteLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); NoteLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30); /* -------------------------------------------------------------------------- */ 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 d571e6499..050d4522d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceListeningView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceListeningView.cpp @@ -92,7 +92,7 @@ namespace OHOS label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh); label->SetTextId(labelconfig.textId); label->SetLineBreakMode(labelconfig.lineBreakMode); - label->SetRollSpeed(70); + label->SetRollSpeed(23); label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize); return label; diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceMobileDataFailedStartView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceMobileDataFailedStartView.cpp index 7e2b0ad04..c3750fc7c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceMobileDataFailedStartView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceMobileDataFailedStartView.cpp @@ -91,7 +91,7 @@ namespace OHOS label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh); label->SetTextId(labelconfig.textId); label->SetLineBreakMode(labelconfig.lineBreakMode); - label->SetRollSpeed(70); + label->SetRollSpeed(23); label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize); return label; diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceThinkingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceThinkingView.cpp index aa68b6542..6e7db531a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceThinkingView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceThinkingView.cpp @@ -87,7 +87,7 @@ namespace OHOS label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh); label->SetTextId(labelconfig.textId); label->SetLineBreakMode(labelconfig.lineBreakMode); - label->SetRollSpeed(70); + label->SetRollSpeed(23); label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize); return label; diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/ApiKeysDeleteView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/ApiKeysDeleteView.cpp index 27ca80763..0d2138a99 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/ApiKeysDeleteView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/ApiKeysDeleteView.cpp @@ -80,7 +80,7 @@ namespace OHOS label->SetTextId(labelconfig.textId); label->SetLineBreakMode(labelconfig.lineBreakMode); label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label->SetRollSpeed(70); + label->SetRollSpeed(23); label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize); return label; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/NotSetApiKeysView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/NotSetApiKeysView.cpp index e9c902d11..6c4c11dce 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/NotSetApiKeysView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/NotSetApiKeysView.cpp @@ -81,7 +81,7 @@ namespace OHOS label->SetTextId(labelconfig.textId); label->SetLineBreakMode(labelconfig.lineBreakMode); label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label->SetRollSpeed(70); + label->SetRollSpeed(23); label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize); return label; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/SetApiKeysView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/SetApiKeysView.cpp index 5b9fcd772..6ba568783 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/SetApiKeysView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/SetApiKeysView.cpp @@ -88,7 +88,7 @@ namespace OHOS label->SetTextId(labelconfig.textId); label->SetLineBreakMode(labelconfig.lineBreakMode); label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label->SetRollSpeed(70); + label->SetRollSpeed(23); label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize); return label; } 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 78927fbfb..33cd189f7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmConfigView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmConfigView.cpp @@ -149,7 +149,7 @@ namespace OHOS editLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); editLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); editLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - editLabel->SetRollSpeed(70); + editLabel->SetRollSpeed(23); /* -------------------------------------------------------------------------- */ // if (labelTime == nullptr) // { @@ -178,7 +178,7 @@ namespace OHOS labelTime->SetStyle(STYLE_LINE_HEIGHT, 45); labelTime->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 40); labelTime->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - labelTime->SetRollSpeed(70); + labelTime->SetRollSpeed(23); /* -------------------------------------------------------------------------- */ if (labelSetTime == nullptr) { @@ -197,7 +197,7 @@ namespace OHOS labelSetTime->SetTextColor(Color::GetColorFromRGBA(0x99, 0x99, 0x99, 0xff)); labelSetTime->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); labelSetTime->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - labelSetTime->SetRollSpeed(70); + labelSetTime->SetRollSpeed(23); /* -------------------------------------------------------------------------- */ if (labelDay == nullptr) { @@ -213,7 +213,7 @@ namespace OHOS labelDay->SetStyle(STYLE_LINE_HEIGHT, 45); labelDay->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 40); labelDay->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - labelDay->SetRollSpeed(70); + labelDay->SetRollSpeed(23); /* -------------------------------------------------------------------------- */ if (labelSetWeek == nullptr) { @@ -232,7 +232,7 @@ namespace OHOS labelSetWeek->SetTextColor(Color::GetColorFromRGBA(0x99, 0x99, 0x99, 0xff)); labelSetWeek->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); labelSetWeek->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - labelSetWeek->SetRollSpeed(70); + labelSetWeek->SetRollSpeed(23); } void AlarmConfigView::InitButton() 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 17a5ad477..b45d22489 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmJudgeView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmJudgeView.cpp @@ -88,7 +88,7 @@ UIScrollView * AlarmJudgeView::InitDeleteScreen() DeleteTitleLabelExt_->SetTextId(STR_DELETE); DeleteTitleLabelExt_->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); DeleteTitleLabelExt_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - DeleteTitleLabelExt_->SetRollSpeed(70); + DeleteTitleLabelExt_->SetRollSpeed(23); DeleteTitleLabelExt_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); DeleteTitleLabelExt_->SetStyle(STYLE_TEXT_COLOR, Color::White().full); } @@ -105,7 +105,7 @@ UIScrollView * AlarmJudgeView::InitDeleteScreen() DeletePromptLabelExt_->SetTextId(STR_ALARM_DELETE_NOTE); DeletePromptLabelExt_->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); DeletePromptLabelExt_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - DeletePromptLabelExt_->SetRollSpeed(70); + DeletePromptLabelExt_->SetRollSpeed(23); DeletePromptLabelExt_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); DeletePromptLabelExt_->SetStyle(STYLE_TEXT_COLOR, 0xff999999); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmNewTimeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmNewTimeView.cpp index e00410e6c..3796e195e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmNewTimeView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmNewTimeView.cpp @@ -101,7 +101,7 @@ namespace OHOS title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - title->SetRollSpeed(70); + title->SetRollSpeed(23); group->Add(title); /* -------------------------------------------------------------------------- */ if (picker == nullptr) diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetTimeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetTimeView.cpp index b1266491b..a0263355a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetTimeView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetTimeView.cpp @@ -175,7 +175,7 @@ UIScrollView *AlarmSetTimeView::InitSetTimeView(void) title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - title->SetRollSpeed(70); + title->SetRollSpeed(23); group->Add(title); /* -------------------------------------------------------------------------- */ if (picker == nullptr) { 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 c53c176ed..32b2dc25a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp @@ -189,7 +189,7 @@ void MainAlarmView::AlarmTitleCreate(void) TitleLabelExt_->SetTextId(STR_ALARM); TitleLabelExt_->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); TitleLabelExt_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - TitleLabelExt_->SetRollSpeed(70); + TitleLabelExt_->SetRollSpeed(23); TitleLabelExt_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); group->Add(TitleLabelExt_); @@ -216,7 +216,7 @@ void MainAlarmView::AlarmAddButtonCreate(void) AddButton_->SetTextId(STR_ADD_A_NEW_ALARM); // AddButton_->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); // AddButton_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - // AddButton_->SetRollSpeed(70); + // AddButton_->SetRollSpeed(23); AddButton_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::AlarmPresenter::GetInstance(); AddButton_->SetOnClickListener(clickListener); @@ -293,7 +293,7 @@ UIViewGroup * MainAlarmView::NewClockCtlExt(int16_t alarmNum, uint8_t index) dLabel[alarmNum]->SetTextColor(Color::GetColorFromRGBA(0x99, 0x99, 0x99, 0xff)); dLabel[alarmNum]->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, D_CLOCK_LABEL_FONT); dLabel[alarmNum]->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - dLabel[alarmNum]->SetRollSpeed(70); + dLabel[alarmNum]->SetRollSpeed(23); /* -------------------------------------------------------------------------- */ statusButton[alarmNum] = new UIToggleButton(); if (statusButton[alarmNum] == nullptr) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipaySetting.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipaySetting.cpp index 09ad20cfd..18ebe11cd 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipaySetting.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipaySetting.cpp @@ -121,7 +121,7 @@ bool AlipaySetting::AlipayInitLabel(void) labelName->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); labelName->SetStyle(STYLE_TEXT_FONT, SETTING_NAME_FONT); labelName->SetAlign(TEXT_ALIGNMENT_CENTER); - labelName->SetRollSpeed(30); + labelName->SetRollSpeed(23); labelName->SetRollStartPos(SETTING_NAME_X); Add(labelName); @@ -140,7 +140,7 @@ bool AlipaySetting::AlipayInitLabel(void) labelId->SetTextColor(Color::GetColorFromRGBA(0x99, 0x99, 0x99, 0xff)); labelId->SetStyle(STYLE_TEXT_FONT, SETTING_ID_FONT); labelId->SetAlign(TEXT_ALIGNMENT_CENTER); - labelId->SetRollSpeed(30); + labelId->SetRollSpeed(23); labelId->SetRollStartPos(SETTING_ID_X); Add(labelId); diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransCode.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransCode.cpp index 2f0459546..b32347cde 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransCode.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransCode.cpp @@ -85,7 +85,7 @@ bool AlipayTransCode::AlipayInitLabel(void) labelPayCode->SetPosition(TRANSCODE_TITLE_X, TRANSCODE_TITLE_Y, TRANSCODE_TITLE_WIDTH, TRANSCODE_TITLE_HEIGHT); labelPayCode->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); labelPayCode->SetAlign(TEXT_ALIGNMENT_CENTER); - labelPayCode->SetRollSpeed(30); + labelPayCode->SetRollSpeed(23); labelPayCode->SetRollStartPos(TRANSCODE_TITLE_X); Add(labelPayCode); diff --git a/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantAnswerView.cpp b/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantAnswerView.cpp index 64844077c..3a7944836 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantAnswerView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantAnswerView.cpp @@ -290,7 +290,7 @@ void AssistantAnswerView::InitNoteLabel() { notelabel->SetTextId(STR_CALLSOMEONE); // notelabel->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS); notelabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - notelabel->SetRollSpeed(70); + notelabel->SetRollSpeed(23); notelabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); notelabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantHfpView.cpp b/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantHfpView.cpp index 3fdd70704..cfc6855b6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantHfpView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantHfpView.cpp @@ -67,7 +67,7 @@ AssistantHfpView::AssistantHfpViewLabelInit(LabelConfig &labelconfig) { label->SetTextId(labelconfig.textId); label->SetLineBreakMode(labelconfig.lineBreakMode); label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label->SetRollSpeed(70); + label->SetRollSpeed(23); label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize); return label; } @@ -114,7 +114,7 @@ bool AssistantHfpView::CreateAssistantHfpViewLabel(void) { InitLabelExt(noteLabel, 53, 230, 360, 105, "label", STR_BLUENOTE, DEFAULT_VECTOR_FONT_FILENAME_EN, 30); noteLabel->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); noteLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - noteLabel->SetRollSpeed(70); + noteLabel->SetRollSpeed(23); /* -------------------------------------------------------------------------- */ int16_t y = noteLabel->GetY() + noteLabel->GetTextHeight() + 30 + 33; diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultView.cpp index 4d9615a81..55afd4acc 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultView.cpp @@ -113,7 +113,7 @@ namespace OHOS InitLabelExt(timeLabel, 53, 270, 360, 35, "time", STR_CHECKNO, DEFAULT_VECTOR_FONT_FILENAME, 30); // 设置来回滚动属性 timeLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - timeLabel->SetRollSpeed(70); + timeLabel->SetRollSpeed(23); UpSPO2Text(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothDeviceListView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothDeviceListView.cpp index 9701f7ca4..2dd40855a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothDeviceListView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothDeviceListView.cpp @@ -216,7 +216,7 @@ namespace OHOS titleLabel->SetStyle(STYLE_TEXT_FONT,30); titleLabel->SetStyle(STYLE_LINE_HEIGHT,35); titleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - titleLabel->SetRollSpeed(70); + titleLabel->SetRollSpeed(23); titleLabel->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER, UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER); InitList(); // 加载bt设备列表 InitNewEquipmentButton(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothEarListView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothEarListView.cpp index c7272b062..2a68bf61a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothEarListView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothEarListView.cpp @@ -244,7 +244,7 @@ namespace OHOS titleLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); titleLabel->SetStyle(STYLE_TEXT_FONT,30); titleLabel->SetStyle(STYLE_LINE_HEIGHT,35); - titleLabel->SetRollSpeed(70); + titleLabel->SetRollSpeed(23); titleLabel->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER, UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER); titleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); group->Add(titleLabel); 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 a33b9fb2e..97f68abf4 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothOptionsView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothOptionsView.cpp @@ -101,7 +101,7 @@ namespace OHOS titleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); titleLabel->SetStyle(STYLE_TEXT_FONT,30); titleLabel->SetStyle(STYLE_LINE_HEIGHT,35); - titleLabel->SetRollSpeed(70); + titleLabel->SetRollSpeed(23); titleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); /* --------------------------- EarPhoneDeviceName --------------------------- */ if (EarPhoneDeviceName == nullptr) @@ -238,7 +238,7 @@ namespace OHOS unpairLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); unpairLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); unpairLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - // unpairLabel->SetRollSpeed(70); + // unpairLabel->SetRollSpeed(23); /* -------------------------------------------------------------------------- */ return true; } 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 d44de8c5d..78a9d0752 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/TipsConnFailMessageView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/TipsConnFailMessageView.cpp @@ -153,7 +153,7 @@ namespace OHOS titleLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); titleLabel->SetStyle(STYLE_TEXT_FONT, 30); titleLabel->SetStyle(STYLE_LINE_HEIGHT, 35); - titleLabel->SetRollSpeed(70); + titleLabel->SetRollSpeed(23); titleLabel->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER, UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER); titleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); } @@ -182,7 +182,7 @@ namespace OHOS bluetoothNameLabel->SetStyle(STYLE_TEXT_FONT, 30); bluetoothNameLabel->SetStyle(STYLE_LINE_HEIGHT, 35); bluetoothNameLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - bluetoothNameLabel->SetRollSpeed(70); + bluetoothNameLabel->SetRollSpeed(23); bluetoothNameLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30); bluetoothNameLabel->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER, UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER); } @@ -200,7 +200,7 @@ namespace OHOS conn_fail_Label->SetStyle(STYLE_TEXT_FONT, 30); conn_fail_Label->SetStyle(STYLE_LINE_HEIGHT, 35); conn_fail_Label->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - conn_fail_Label->SetRollSpeed(70); + conn_fail_Label->SetRollSpeed(23); conn_fail_Label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); conn_fail_Label->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER, UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER); conn_fail_Label->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x7f)); @@ -221,7 +221,7 @@ namespace OHOS // tipLabel->SetText("请确认该设备在通信范围内且处于待配对状态"); tipLabel->SetTextId(STR_BTEARPHONE_CONN_FAIL_TIP); tipLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - // tipLabel->SetRollSpeed(70); + // tipLabel->SetRollSpeed(23); tipLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); tipLabel->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER, UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER); tipLabel->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 3fc03be19..89fb0151a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/TipsSuccMessageView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/TipsSuccMessageView.cpp @@ -108,7 +108,7 @@ namespace OHOS titleLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); titleLabel->SetStyle(STYLE_TEXT_FONT, 30); titleLabel->SetStyle(STYLE_LINE_HEIGHT, 35); - titleLabel->SetRollSpeed(70); + titleLabel->SetRollSpeed(23); titleLabel->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER, UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER); titleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); } @@ -137,7 +137,7 @@ namespace OHOS bluetoothNameLabel->SetStyle(STYLE_TEXT_FONT, 30); bluetoothNameLabel->SetStyle(STYLE_LINE_HEIGHT, 35); bluetoothNameLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - bluetoothNameLabel->SetRollSpeed(70); + bluetoothNameLabel->SetRollSpeed(23); bluetoothNameLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30); bluetoothNameLabel->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER, UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER); } @@ -156,7 +156,7 @@ namespace OHOS conn_succ_Label->SetStyle(STYLE_TEXT_FONT, 30); conn_succ_Label->SetStyle(STYLE_LINE_HEIGHT, 35); conn_succ_Label->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - conn_succ_Label->SetRollSpeed(70); + conn_succ_Label->SetRollSpeed(23); conn_succ_Label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); conn_succ_Label->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER, UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER); conn_succ_Label->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x7f)); diff --git a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/BluetoothServiceOptionsView.cpp b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/BluetoothServiceOptionsView.cpp index a77170817..04faea773 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/BluetoothServiceOptionsView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/BluetoothServiceOptionsView.cpp @@ -254,7 +254,7 @@ namespace OHOS label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh); // 字体行高 label->SetTextId(labelconfig.textId); label->SetLineBreakMode(labelconfig.lineBreakMode); // 断行模式。 - label->SetRollSpeed(70); + label->SetRollSpeed(23); label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize); return label; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownTimeConfigView.cpp b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownTimeConfigView.cpp index 36847949a..3aa166151 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownTimeConfigView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownTimeConfigView.cpp @@ -97,7 +97,7 @@ namespace OHOS Title->SetTextId(STR_COUNT_DOWN); // 倒计时 Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - Title->SetRollSpeed(70); + Title->SetRollSpeed(23); Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); /* -------------------------------------------------------------------------- */ timePicker = new UITimePicker(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownTimeNotNullView.cpp b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownTimeNotNullView.cpp index f2d4dc97a..0f657ae00 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownTimeNotNullView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownTimeNotNullView.cpp @@ -79,7 +79,7 @@ namespace OHOS Title->SetTextId(STR_COUNT_DOWN); // 倒计时 Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - Title->SetRollSpeed(70); + Title->SetRollSpeed(23); Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); /* -------------------------------------------------------------------------- */ Attention = new UIImageView(); @@ -104,7 +104,7 @@ namespace OHOS AttentionLabel->SetTextId(STR_SET_COUNT_DOWN_NOTE); // 请先设置好倒计时间 AttentionLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); AttentionLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - AttentionLabel->SetRollSpeed(70); + AttentionLabel->SetRollSpeed(23); AttentionLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); /* -------------------------------------------------------------------------- */ button = new UILabelButtonExt(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownView.cpp b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownView.cpp index fcfecb757..9a6ab67d1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownView.cpp @@ -131,7 +131,7 @@ namespace OHOS Title->SetTextId(STR_COUNT_DOWN); // 倒计时 Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - Title->SetRollSpeed(70); + Title->SetRollSpeed(23); Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); /* -------------------------- CUSTOM_COUNTDOWN ------------------------- */ CUSTOM_COUNTDOWN = new UILabelButtonExt(); @@ -161,7 +161,7 @@ namespace OHOS QuickStart->SetTextId(STR_QUICK_START); QuickStart->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); QuickStart->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - QuickStart->SetRollSpeed(70); + QuickStart->SetRollSpeed(23); QuickStart->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); /* ----------------------- COUNTDOWN_ONE_MINUTE_BUTTON ---------------------- */ COUNTDOWN_ONE_MINUTE_BUTTON = SetUILabelButton(43, 345, 180, 150, COUNTDOWN_ONE_MINUTE_BUTTON_VIEWID, "1分钟", STR_1_MIN); 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 3eb3f4fda..af12408a2 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/StartCountDownView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/StartCountDownView.cpp @@ -124,7 +124,7 @@ namespace OHOS Title->SetTextId(STR_COUNT_DOWN); // 倒计时 Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - Title->SetRollSpeed(70); + Title->SetRollSpeed(23); Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); /* -------------------------------------------------------------------------- */ showCountDownTimelabel = new UILabelExt(); @@ -143,7 +143,7 @@ namespace OHOS showCountDownTimelabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); showCountDownTimelabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); showCountDownTimelabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 80); - showCountDownTimelabel->SetRollSpeed(70); + showCountDownTimelabel->SetRollSpeed(23); /* -------------------------------------------------------------------------- */ vectorImage = new UIImageView(); if (vectorImage == nullptr) diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessView.cpp b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessView.cpp index 431e6eb00..5efab47c5 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessView.cpp @@ -128,7 +128,7 @@ namespace OHOS DisplayBrightnessTitleLabel->SetStyle(STYLE_LINE_HEIGHT, 35); DisplayBrightnessTitleLabel->SetTextId(STR_SCREEN_AND_BRIGHTNESS); /*屏幕与亮度*/ DisplayBrightnessTitleLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - DisplayBrightnessTitleLabel->SetRollSpeed(70); + DisplayBrightnessTitleLabel->SetRollSpeed(23); DisplayBrightnessTitleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); DisplayBrightnessTitleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); return true; @@ -197,7 +197,7 @@ namespace OHOS label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh); // 字体行高 label->SetTextId(labelconfig.textId); label->SetLineBreakMode(labelconfig.lineBreakMode); // 断行模式。 - label->SetRollSpeed(70); + label->SetRollSpeed(23); label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize); return label; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/ScreenDurationView.cpp b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/ScreenDurationView.cpp index fb72545ea..165721e39 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/ScreenDurationView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/ScreenDurationView.cpp @@ -101,7 +101,7 @@ namespace OHOS label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh); // 字体行高 label->SetTextId(labelconfig.textId); // 内容 label->SetLineBreakMode(labelconfig.lineBreakMode); // 断行模式。 - label->SetRollSpeed(70); + label->SetRollSpeed(23); label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize); return label; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/flashlight/src/FlashlightView.cpp b/code/sdk/application/wearable/fd230app/nativeui/flashlight/src/FlashlightView.cpp index ee0a3d5cc..eafeda080 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/flashlight/src/FlashlightView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/flashlight/src/FlashlightView.cpp @@ -752,7 +752,7 @@ namespace OHOS temp_UILabelExt->SetTextId(text_id); temp_UILabelExt->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); temp_UILabelExt->SetAlign(hor_align, ver_align); - temp_UILabelExt->SetRollSpeed(70); + temp_UILabelExt->SetRollSpeed(23); temp_UILabelExt->SetFont(DEFAULT_VECTOR_FONT_FILENAME, font_size); temp_UILabelExt->SetStyle(STYLE_TEXT_COLOR, color_value); diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/BloodCardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/BloodCardView.cpp index 9b26a2dbb..12aee59c7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/BloodCardView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/BloodCardView.cpp @@ -108,7 +108,7 @@ namespace OHOS InitRollLabel(timeLabel, 53, 260, 360, 35, "time", STR_CHECKNO, DEFAULT_VECTOR_FONT_FILENAME, 30); // 设置来回滚动属性 timeLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - timeLabel->SetRollSpeed(70); + timeLabel->SetRollSpeed(23); UpSPO2Text(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckAbnormalView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckAbnormalView.cpp index 8f4204037..355804b03 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckAbnormalView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckAbnormalView.cpp @@ -79,7 +79,7 @@ namespace OHOS InitLabelExt(noteLabel, 53, 230, 360, 70, "time", STR_PWUWC, DEFAULT_VECTOR_FONT_FILENAME, 30); // 设置来回滚动属性 noteLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - noteLabel->SetRollSpeed(70); + noteLabel->SetRollSpeed(23); container_->Add(titleLabel); container_->Add(noteLabel); diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckInvalidView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckInvalidView.cpp index ff547f832..8058099e1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckInvalidView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckInvalidView.cpp @@ -127,7 +127,7 @@ namespace OHOS // 设置来回滚动属性 InitLabelExt(noteLabel, 53, 230, 360, 70, "time", STR_HEARTNOTE, DEFAULT_VECTOR_FONT_FILENAME, 30); noteLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - noteLabel->SetRollSpeed(70); + noteLabel->SetRollSpeed(23); container_->Add(titleLabel); container_->Add(remindLabel); diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartView.cpp index 0f85e62f3..f7d8f436b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartView.cpp @@ -436,7 +436,7 @@ void HeartChartView::InitChartLabel() { InitLabel(lastheart_, 53, 130, 360, 35, "label", "--", DEFAULT_VECTOR_FONT_FILENAME_EN, 30); lastheart_->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - lastheart_->SetRollSpeed(70); + lastheart_->SetRollSpeed(23); //最小心率 不居中 InitLabelAdapt(minheart_, 293, 380, 200, 35, "label", "--", DEFAULT_VECTOR_FONT_FILENAME_EN, 35); diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartNoteView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartNoteView.cpp index 37ae1a863..4fc7ca970 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartNoteView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartNoteView.cpp @@ -85,7 +85,7 @@ UIScrollView *HeartNoteView::CreateHeartNoteView(void) { DEFAULT_VECTOR_FONT_FILENAME, 30); // 设置来回滚动属性 noteLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - noteLabel->SetRollSpeed(70); + noteLabel->SetRollSpeed(23); /*初始化button*/ InitButtonExt(StButton, 58, 320, 170, 90, CLICK_HEART_STOP, STR_STOP, 30); diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartResultView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartResultView.cpp index 4584b65fd..e49bc79cd 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartResultView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartResultView.cpp @@ -110,7 +110,7 @@ namespace OHOS InitLabelExt(timeLabel, 53, 270, 360, 35, "time", STR_CHECKNO, DEFAULT_VECTOR_FONT_FILENAME, 30); // 设置来回滚动属性 timeLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - timeLabel->SetRollSpeed(70); + timeLabel->SetRollSpeed(23); UpHeartText(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageItemView.cpp index a09ec4474..f4e7c83e6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageItemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageItemView.cpp @@ -108,7 +108,7 @@ namespace OHOS stitle.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); // 来回滚动属性 stitle.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - stitle.SetRollSpeed(70); + stitle.SetRollSpeed(23); smessgae.SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS); smessgae.SetTextColor(Color::Gray()); diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageShowView.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageShowView.cpp index 7971847ac..dd8006fd1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageShowView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageShowView.cpp @@ -175,7 +175,7 @@ namespace OHOS title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); // 来回滚动属性 - title->SetRollSpeed(70); + title->SetRollSpeed(23); title->SetVisible(true); /* -------------------------------------------------------------------------- */ time = new UILabel(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionView.cpp b/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionView.cpp index 417b6ecfc..f6e7953bc 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionView.cpp @@ -101,7 +101,7 @@ namespace OHOS Title->SetTextId(STR_MOTION_RECOGNITION); /*运动识别*/ Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - Title->SetRollSpeed(70); + Title->SetRollSpeed(23); Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); Title->SetVisible(true); /* -------------------------------------------------------------------------- */ @@ -125,7 +125,7 @@ namespace OHOS MotionRecognitionLabel->SetStyle(STYLE_LINE_HEIGHT, 35); MotionRecognitionLabel->SetTextId(STR_AUTO_DETECT); /*自动识别*/ MotionRecognitionLabel->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); - MotionRecognitionLabel->SetRollSpeed(70); + MotionRecognitionLabel->SetRollSpeed(23); MotionRecognitionLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); /* -------------------------------------------------------------------------- */ MotionRecognitionToggleButton = new UIToggleButton(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallView.cpp b/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallView.cpp index 16d213edd..66748f6ad 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallView.cpp @@ -103,7 +103,7 @@ namespace OHOS Title->SetTextId(STR_NETWORKANDCALL); // 网络与通话 Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - Title->SetRollSpeed(70); + Title->SetRollSpeed(23); Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); /* -------------------------------------------------------------------------- */ int positionY_Img = 120; @@ -134,7 +134,7 @@ namespace OHOS NetworkAndCallLabel[i]->SetTextId(textId[i]); NetworkAndCallLabel[i]->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); NetworkAndCallLabel[i]->SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_CENTER); - NetworkAndCallLabel[i]->SetRollSpeed(70); + NetworkAndCallLabel[i]->SetRollSpeed(23); NetworkAndCallLabel[i]->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); } /* -------------------------------------------------------------------------- */ diff --git a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneDirView.cpp b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneDirView.cpp index e858cc960..3a6b06f16 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneDirView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneDirView.cpp @@ -89,7 +89,7 @@ namespace OHOS label[i]->SetText(addressbook_t.Contact_t[i].name); label[i]->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); label[i]->SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_CENTER); - label[i]->SetRollSpeed(70); + label[i]->SetRollSpeed(23); label[i]->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); label[i]->SetVisible(true); @@ -138,7 +138,7 @@ namespace OHOS label1_phone_name->SetText(addressbook_t.Contact_t[0].name); label1_phone_name->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); label1_phone_name->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label1_phone_name->SetRollSpeed(70); + label1_phone_name->SetRollSpeed(23); label1_phone_name->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); // Add to rootView diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerBluetoothDisConView.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerBluetoothDisConView.cpp index e8160521b..705810ba9 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerBluetoothDisConView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerBluetoothDisConView.cpp @@ -118,7 +118,7 @@ namespace OHOS label->SetTextId(labelconfig.textId); label->SetLineBreakMode(labelconfig.lineBreakMode); label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label->SetRollSpeed(70); + label->SetRollSpeed(23); label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize); return label; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerSourceView.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerSourceView.cpp index 031cf8f42..f7f8597d1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerSourceView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerSourceView.cpp @@ -215,7 +215,7 @@ namespace OHOS label->SetTextId(labelconfig.textId); label->SetLineBreakMode(labelconfig.lineBreakMode); // label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label->SetRollSpeed(70); + label->SetRollSpeed(23); label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize); return label; } 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 08f0fb423..531a5e36a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayerListitemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayerListitemView.cpp @@ -49,7 +49,7 @@ namespace OHOS sLabel.SetStyle(STYLE_LINE_HEIGHT, 35); sLabel.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); sLabel.SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0xff)); - sLabel.SetRollSpeed(70); + sLabel.SetRollSpeed(23); 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/player/src/PlayersView.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp index 1c99bb55a..9aba7c9c8 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp @@ -286,7 +286,7 @@ namespace OHOS musicListTitle->SetTextId(STR_MUSIC_LIST); musicListTitle->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); musicListTitle->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - musicListTitle->SetRollSpeed(70); + musicListTitle->SetRollSpeed(23); musicListTitle->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); /* -------------------------- musicListIsEmptyImage ------------------------- */ if (musicListIsEmptyImage == nullptr) diff --git a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/FactoryResetView.cpp b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/FactoryResetView.cpp index f13850f8a..db48569ee 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/FactoryResetView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/FactoryResetView.cpp @@ -127,7 +127,7 @@ namespace OHOS Title->SetStyle(STYLE_LINE_HEIGHT, 35); Title->SetTextId(STR_FACTORY_RESET); /*恢复出厂*/ Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - Title->SetRollSpeed(70); + Title->SetRollSpeed(23); Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); /* ---------------------------- FactoryResetImage --------------------------- */ @@ -276,7 +276,7 @@ namespace OHOS Title->SetStyle(STYLE_LINE_HEIGHT, 35); Title->SetTextId(STR_FACTORY_RESET); /*恢复出厂*/ Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - Title->SetRollSpeed(70); + Title->SetRollSpeed(23); Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); /* ---------------------------- FactoryResetImage --------------------------- */ 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 ce44e901d..e64dcda2a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownView.cpp @@ -112,7 +112,7 @@ namespace OHOS label->SetTextId(labelconfig.textId); label->SetLineBreakMode(labelconfig.lineBreakMode); label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label->SetRollSpeed(70); + label->SetRollSpeed(23); label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize); return label; } @@ -169,7 +169,7 @@ namespace OHOS sosLabel->SetText("SOS"); sosLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); sosLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - sosLabel->SetRollSpeed(70); + sosLabel->SetRollSpeed(23); sosLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30); sosLabel->SetTextColor(Color::GetColorFromRGBA(0x66, 0x66, 0x66, 0xff)); /* -------------------------------------------------------------------------- */ @@ -608,7 +608,7 @@ namespace OHOS shutdowntitle->SetTextId(STR_SHUTDOWN); // 内容 shutdowntitle->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); shutdowntitle->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - shutdowntitle->SetRollSpeed(70); + shutdowntitle->SetRollSpeed(23); shutdowntitle->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); SystemShutdownScrollView->Add(shutdowntitle); } @@ -638,7 +638,7 @@ namespace OHOS note->SetTextId(STR_SHUTDOWN_CONFIRM); note->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); note->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - note->SetRollSpeed(70); + note->SetRollSpeed(23); note->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); SystemShutdownScrollView->Add(note); } 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 49a27d4b6..b72a336d9 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordDeleteView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordDeleteView.cpp @@ -80,7 +80,7 @@ namespace OHOS label->SetLineBreakMode(labelconfig.lineBreakMode); // 断行模式。 label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize); - label->SetRollSpeed(70); + label->SetRollSpeed(23); return label; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingDurationSelectionView.cpp b/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingDurationSelectionView.cpp index 22971d4bf..eea5598b0 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingDurationSelectionView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingDurationSelectionView.cpp @@ -69,7 +69,7 @@ namespace OHOS // label->SetText(labelconfig.text); label->SetLineBreakMode(labelconfig.lineBreakMode); label->SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_CENTER); - label->SetRollSpeed(70); + label->SetRollSpeed(23); label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize); return label; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/safemodemanager/src/RepairView.cpp b/code/sdk/application/wearable/fd230app/nativeui/safemodemanager/src/RepairView.cpp index e13376479..f2c56d1a4 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/safemodemanager/src/RepairView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/safemodemanager/src/RepairView.cpp @@ -138,7 +138,7 @@ void RepairView::InitLabels() { downingLabel_->SetTextColor( Color::GetColorFromRGBA(0xef, 0x0e, 0x0e, 0xff)); downingLabel_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - downingLabel_->SetRollSpeed(70); + downingLabel_->SetRollSpeed(23); downingLabel_->SetFont(GILROY_BOLD_FONT, 26); scrollView_->Add(downingLabel_); downingLabel_->SetVisible(false); diff --git a/code/sdk/application/wearable/fd230app/nativeui/safemodemanager/src/SafeModeManagerView.cpp b/code/sdk/application/wearable/fd230app/nativeui/safemodemanager/src/SafeModeManagerView.cpp index 3cd6842af..518b3f340 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/safemodemanager/src/SafeModeManagerView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/safemodemanager/src/SafeModeManagerView.cpp @@ -138,7 +138,7 @@ void SafeModeManagerView::InitView() { if (item.statusLabel.text == "Resource Check") { item.statusLabel.label->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); item.statusLabel.label->SetAlign(TEXT_ALIGNMENT_CENTER); - item.statusLabel.label->SetRollSpeed(30); + item.statusLabel.label->SetRollSpeed(23); } SafeModeScrollView[VIEW_SAFE_LIST]->Add(item.statusLabel.label); diff --git a/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleListItem.cpp b/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleListItem.cpp index 40fb26d0f..26156b133 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleListItem.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleListItem.cpp @@ -24,7 +24,7 @@ namespace OHOS // LabelExtDate_.SetTextId(text_id); LabelExtDate_.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); LabelExtDate_.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - LabelExtDate_.SetRollSpeed(70); + LabelExtDate_.SetRollSpeed(23); LabelExtDate_.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); LabelExtDate_.SetStyle(STYLE_TEXT_COLOR, 0xffff5a36); @@ -34,7 +34,7 @@ namespace OHOS // LabelExtTopic_.SetTextId(text_id); LabelExtTopic_.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); LabelExtTopic_.SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_TOP); - LabelExtTopic_.SetRollSpeed(70); + LabelExtTopic_.SetRollSpeed(23); LabelExtTopic_.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); // LabelExtTopic_.SetStyle(STYLE_TEXT_COLOR, 0xffff5a36); @@ -44,7 +44,7 @@ namespace OHOS // LabelExtTime_.SetTextId(text_id); LabelExtTime_.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); LabelExtTime_.SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_TOP); - LabelExtTime_.SetRollSpeed(70); + LabelExtTime_.SetRollSpeed(23); LabelExtTime_.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 20); // LabelExtTime_.SetStyle(STYLE_TEXT_COLOR, 0xffff5a36); diff --git a/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleView.cpp b/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleView.cpp index 7cb2cdfc5..1dfb891bb 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleView.cpp @@ -454,7 +454,7 @@ namespace OHOS // ContentDateLabelExt_->SetTextId(text_id); ContentDateLabelExt_->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); ContentDateLabelExt_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - ContentDateLabelExt_->SetRollSpeed(70); + ContentDateLabelExt_->SetRollSpeed(23); ContentDateLabelExt_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); ContentDateLabelExt_->SetStyle(STYLE_TEXT_COLOR, 0xffff5a36); } @@ -471,7 +471,7 @@ namespace OHOS ContentTopicLabelExt_->SetTextId(STR_SCHEDULE_TOPIC); // ContentTopicLabelExt_->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); ContentTopicLabelExt_->SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_TOP); - ContentTopicLabelExt_->SetRollSpeed(70); + ContentTopicLabelExt_->SetRollSpeed(23); ContentTopicLabelExt_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); ContentTopicLabelExt_->SetStyle(STYLE_TEXT_COLOR, 0xff999999); @@ -488,7 +488,7 @@ namespace OHOS ContentTopicLabelExt1_->SetStyle(STYLE_LINE_HEIGHT, 35); ContentTopicLabelExt1_->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); ContentTopicLabelExt1_->SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_TOP); - ContentTopicLabelExt1_->SetRollSpeed(70); + ContentTopicLabelExt1_->SetRollSpeed(23); ContentTopicLabelExt1_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); ContentTopicLabelExt1_->SetStyle(STYLE_TEXT_COLOR, Color::White().full); } @@ -506,7 +506,7 @@ namespace OHOS ContentTimeLabelExt_->SetTextId(STR_SCHEDULE_TIME); // ContentTimeLabelExt_->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); ContentTimeLabelExt_->SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_TOP); - ContentTimeLabelExt_->SetRollSpeed(70); + ContentTimeLabelExt_->SetRollSpeed(23); ContentTimeLabelExt_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); ContentTimeLabelExt_->SetStyle(STYLE_TEXT_COLOR, 0xff999999); @@ -523,7 +523,7 @@ namespace OHOS ContentTimeLabelExt1_->SetStyle(STYLE_LINE_HEIGHT, 35); ContentTimeLabelExt1_->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); ContentTimeLabelExt1_->SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_TOP); - ContentTimeLabelExt1_->SetRollSpeed(70); + ContentTimeLabelExt1_->SetRollSpeed(23); ContentTimeLabelExt1_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); ContentTimeLabelExt1_->SetStyle(STYLE_TEXT_COLOR, Color::White().full); } @@ -541,7 +541,7 @@ namespace OHOS ContentContentLabelExt_->SetTextId(STR_SCHEDULE_NOTES); // ContentContentLabelExt_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); ContentContentLabelExt_->SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_TOP); - ContentContentLabelExt_->SetRollSpeed(70); + ContentContentLabelExt_->SetRollSpeed(23); ContentContentLabelExt_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); ContentContentLabelExt_->SetStyle(STYLE_TEXT_COLOR, 0xff999999); @@ -558,7 +558,7 @@ namespace OHOS ContentContentLabelExt1_->SetStyle(STYLE_LINE_HEIGHT, 35); ContentContentLabelExt1_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); ContentContentLabelExt1_->SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_TOP); - ContentContentLabelExt1_->SetRollSpeed(70); + ContentContentLabelExt1_->SetRollSpeed(23); ContentContentLabelExt1_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); ContentContentLabelExt1_->SetStyle(STYLE_TEXT_COLOR, Color::White().full); } @@ -674,7 +674,7 @@ namespace OHOS DeleteTitleLabelExt_->SetTextId(STR_DELETE); DeleteTitleLabelExt_->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); DeleteTitleLabelExt_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - DeleteTitleLabelExt_->SetRollSpeed(70); + DeleteTitleLabelExt_->SetRollSpeed(23); DeleteTitleLabelExt_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); DeleteTitleLabelExt_->SetStyle(STYLE_TEXT_COLOR, Color::White().full); } @@ -691,7 +691,7 @@ namespace OHOS DeletePromptLabelExt_->SetTextId(STR_SCHEDULE_DELETE_PROMPT); DeletePromptLabelExt_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); DeletePromptLabelExt_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - DeletePromptLabelExt_->SetRollSpeed(70); + DeletePromptLabelExt_->SetRollSpeed(23); DeletePromptLabelExt_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); DeletePromptLabelExt_->SetStyle(STYLE_TEXT_COLOR, 0xff999999); } @@ -756,7 +756,7 @@ namespace OHOS LabelExt->SetTextId(text_id); LabelExt->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); LabelExt->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - LabelExt->SetRollSpeed(70); + LabelExt->SetRollSpeed(23); LabelExt->SetFont(DEFAULT_VECTOR_FONT_FILENAME, font_size); LabelExt->SetStyle(STYLE_TEXT_COLOR, text_color); 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 65e11d06a..9e3435b35 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 @@ -118,7 +118,9 @@ bool SetDialModel::readDialfile() { RegisterDial(uid, name_buf); } } else { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"Invalid uid or empty name. uid: %d, name: %s", uid, name_buf); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, + "Invalid uid or empty name. uid: %d, name: %s", uid, + name_buf); } file_size -= (DIAL_ID_LENGTH + DIAL_NAME_LENGTH); @@ -463,7 +465,10 @@ void SetDialModel::UpdateDialSetting(uint16_t ID) { uapi_set_screen_on_api(); // 更新当前表盘Id MainModel::GetInstance().AddDialSetting(diagSetting, currentDialID); // 更新表盘设置 - NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN); + //运动状态下不进行页面切换 + if (uapi_dev_runtime_get_train_status() != 1) { + NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN); + } svr_ble_read_data_value_updata_noyify(); // app切换表盘增加id更新 reply_app_send_switchDialCmd(true); return; // 更新成功后直接返回 diff --git a/code/sdk/application/wearable/fd230app/nativeui/set_dial_style/src/SetDialStyleView.cpp b/code/sdk/application/wearable/fd230app/nativeui/set_dial_style/src/SetDialStyleView.cpp index 6413ce44b..3565169b6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/set_dial_style/src/SetDialStyleView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/set_dial_style/src/SetDialStyleView.cpp @@ -61,7 +61,9 @@ namespace OHOS labelTitle_.SetPosition(83, 50, 300, 60); labelTitle_.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); labelTitle_.SetTextId(STR_BROWSING_SPECIAL_EFFECTS); - labelTitle_.SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS); // 居中 + // labelTitle_.SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS); // 居中 + labelTitle_.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); + labelTitle_.SetRollSpeed(23); labelTitle_.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); container_->Add(&labelTitle_); diff --git a/code/sdk/application/wearable/fd230app/nativeui/set_time_format/src/SetTimeFormatView.cpp b/code/sdk/application/wearable/fd230app/nativeui/set_time_format/src/SetTimeFormatView.cpp index 941119455..eaf83d6f9 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/set_time_format/src/SetTimeFormatView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/set_time_format/src/SetTimeFormatView.cpp @@ -57,6 +57,8 @@ void SetTimeFormatView::OnSetUpView() { labelFormat24H_.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); // labelFormat24H_.SetTextId(STR_OVERLAY_FLOW); labelFormat24H_.SetTextId(STR_FORMAT); // TODO:多国语言 + labelFormat24H_.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); + labelFormat24H_.SetRollSpeed(23); container_->Add(&labelFormat24H_); btnFormat24H_.SetPosition(298, 145, 100, 50); diff --git a/code/sdk/application/wearable/fd230app/nativeui/sleepmode/src/SleepModeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/sleepmode/src/SleepModeView.cpp index d05e9daa8..2e079c6a6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/sleepmode/src/SleepModeView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/sleepmode/src/SleepModeView.cpp @@ -149,7 +149,7 @@ namespace OHOS TitleLabelExt_->SetTextId(STR_SLEEPMODE); TitleLabelExt_->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); TitleLabelExt_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - TitleLabelExt_->SetRollSpeed(70); + TitleLabelExt_->SetRollSpeed(23); TitleLabelExt_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); // TitleLabelExt_->SetStyle(STYLE_TEXT_COLOR, 0xffff5a36); } @@ -182,7 +182,7 @@ namespace OHOS PromptLabelExt_->SetTextId(STR_SLEEP_MODE_PROMPT_ON); PromptLabelExt_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); PromptLabelExt_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - PromptLabelExt_->SetRollSpeed(70); + PromptLabelExt_->SetRollSpeed(23); PromptLabelExt_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); PromptLabelExt_->SetStyle(STYLE_TEXT_COLOR, 0Xff999999); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationView.cpp b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationView.cpp index 04840cc8c..d006a22c0 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationView.cpp @@ -149,7 +149,7 @@ namespace OHOS label->SetTextId(labelconfig.textId); label->SetLineBreakMode(labelconfig.lineBreakMode); label->SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_CENTER); - label->SetRollSpeed(70); + label->SetRollSpeed(23); label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize); return label; } @@ -173,7 +173,7 @@ namespace OHOS Title->SetStyle(STYLE_LINE_HEIGHT, 35); Title->SetTextId(STR_SOUND_AND_VIBRATION); // 声音与震动 Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - Title->SetRollSpeed(70); + Title->SetRollSpeed(23); Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); SoundAndVibrationScrollView[SOUNDANDVIBRATIONVIEW]->Add(Title); diff --git a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/VibrationModeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/VibrationModeView.cpp index 7d6f746ff..091ee7f48 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/VibrationModeView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/VibrationModeView.cpp @@ -103,7 +103,7 @@ namespace OHOS Title->SetStyle(STYLE_LINE_HEIGHT, 35); Title->SetTextId(STR_VIBRATION_MODE); // 震动模式 Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - Title->SetRollSpeed(70); + Title->SetRollSpeed(23); Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); scrollView->Add(Title); 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 1ddf56cec..d0bd49d8f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/MainStopWatchView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/MainStopWatchView.cpp @@ -266,7 +266,7 @@ namespace OHOS stopWatchlabel->SetTextId(STR_STOPWATCH); // 秒表 stopWatchlabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); stopWatchlabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - stopWatchlabel->SetRollSpeed(70); + stopWatchlabel->SetRollSpeed(23); stopWatchlabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); stopWatchlabel->SetVisible(true); /* ------------------------------ showTimelabel ----------------------------- */ diff --git a/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/StopWatchRecordCycleToLimitView.cpp b/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/StopWatchRecordCycleToLimitView.cpp index 879ddac78..a6bf75f58 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/StopWatchRecordCycleToLimitView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/StopWatchRecordCycleToLimitView.cpp @@ -57,7 +57,7 @@ namespace OHOS Title->SetTextId(STR_STOPWATCH); // 秒表 Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - Title->SetRollSpeed(70); + Title->SetRollSpeed(23); Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); /* -------------------------------------------------------------------------- */ if (AttentionImage == nullptr) @@ -89,7 +89,7 @@ namespace OHOS AttentionLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); AttentionLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); AttentionLabel->SetTextColor(Color::GetColorFromRGBA(0xaa, 0xaa, 0xaa, 0xff)); - AttentionLabel->SetRollSpeed(70); + AttentionLabel->SetRollSpeed(23); AttentionLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); /* -------------------------------------------------------------------------- */ if (button == nullptr) diff --git a/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/StopWatchRecordTimeToLimitView.cpp b/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/StopWatchRecordTimeToLimitView.cpp index 83af2f8c3..403064dfd 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/StopWatchRecordTimeToLimitView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/StopWatchRecordTimeToLimitView.cpp @@ -58,7 +58,7 @@ namespace OHOS Title->SetTextId(STR_STOPWATCH); // 秒表 Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - Title->SetRollSpeed(70); + Title->SetRollSpeed(23); Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); /* -------------------------------------------------------------------------- */ if (AttentionImage == nullptr) @@ -90,7 +90,7 @@ namespace OHOS AttentionLabel_1->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); AttentionLabel_1->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); AttentionLabel_1->SetTextColor(Color::GetColorFromRGBA(0xaa, 0xaa, 0xaa, 0xff)); - AttentionLabel_1->SetRollSpeed(70); + AttentionLabel_1->SetRollSpeed(23); AttentionLabel_1->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); /* ---------------------------- AttentionLabel_2 ---------------------------- */ if (AttentionLabel_2 == nullptr) @@ -109,7 +109,7 @@ namespace OHOS AttentionLabel_2->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); AttentionLabel_2->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); AttentionLabel_2->SetTextColor(Color::GetColorFromRGBA(0xaa, 0xaa, 0xaa, 0xff)); - AttentionLabel_2->SetRollSpeed(70); + AttentionLabel_2->SetRollSpeed(23); AttentionLabel_2->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); /* -------------------------------------------------------------------------- */ if (button == nullptr) diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemFactoryResetView.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemFactoryResetView.cpp index 569f83329..e8553e70a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemFactoryResetView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemFactoryResetView.cpp @@ -92,7 +92,7 @@ namespace OHOS Title->SetStyle(STYLE_LINE_HEIGHT, 35); Title->SetTextId(STR_FACTORY_RESET); /*恢复出厂*/ Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - Title->SetRollSpeed(70); + Title->SetRollSpeed(23); Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); /* ---------------------------- FactoryResetImage --------------------------- */ diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemRestart.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemRestart.cpp index 19b8b120f..646156e6c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemRestart.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemRestart.cpp @@ -88,7 +88,7 @@ namespace OHOS title->SetTextId(STR_RESTART); // 内容 title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - title->SetRollSpeed(70); + title->SetRollSpeed(23); title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); SystemRestartScrollView->Add(title); } @@ -118,7 +118,7 @@ namespace OHOS note->SetTextId(STR_RESET_CONFIRM); note->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); note->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - note->SetRollSpeed(70); + note->SetRollSpeed(23); note->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); SystemRestartScrollView->Add(note); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemShutdown.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemShutdown.cpp index f80031590..482720c75 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemShutdown.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemShutdown.cpp @@ -88,7 +88,7 @@ namespace OHOS title->SetTextId(STR_SHUTDOWN); // 内容 title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - title->SetRollSpeed(70); + title->SetRollSpeed(23); title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); SystemShutdownScrollView->Add(title); } @@ -118,7 +118,7 @@ namespace OHOS note->SetTextId(STR_SHUTDOWN_CONFIRM); note->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); note->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - note->SetRollSpeed(70); + note->SetRollSpeed(23); note->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); SystemShutdownScrollView->Add(note); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp index 0b9c6b5b0..4fd654369 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp @@ -136,7 +136,7 @@ namespace OHOS label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh); label->SetTextId(labelconfig.textId); label->SetLineBreakMode(labelconfig.lineBreakMode); - label->SetRollSpeed(70); + label->SetRollSpeed(23); label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize); return label; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/takephotos/src/TakephotosView.cpp b/code/sdk/application/wearable/fd230app/nativeui/takephotos/src/TakephotosView.cpp index 9ce58cd96..0926b5b15 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/takephotos/src/TakephotosView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/takephotos/src/TakephotosView.cpp @@ -249,7 +249,7 @@ void TakephotosView::ShowTakeView() { /*初始化label*/ InitLabelExt(labeltake_, 83, 50, 300, 35, "labletitle", STR_REMOTE_SHOOTING, DEFAULT_VECTOR_FONT_FILENAME, 30); - InitLabelExt(labelclick_, 53, 278, 360, 70, "labelclick_", STR_TACKNUM, + InitRollLabel(labelclick_, 53, 278, 360, 70, "labelclick_", STR_TACKNUM, DEFAULT_VECTOR_FONT_FILENAME, 30); UpdateLabel(labelclick_, 0, STR_TACKNUM); // 初始化为0 diff --git a/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStyleView.cpp b/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStyleView.cpp index ea79708c6..5da20e551 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStyleView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStyleView.cpp @@ -134,7 +134,7 @@ namespace OHOS label->SetTextId(labelconfig.textId);//TODO::多国语言 label->SetLineBreakMode(labelconfig.lineBreakMode); label->SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_CENTER); - label->SetRollSpeed(70); + label->SetRollSpeed(23); label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize); return label; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp index 9cf253a8a..8f9d23a21 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp @@ -113,7 +113,7 @@ void TraingEnddataView ::InitializeLabels() { /*title and sport*/ InitRollLabel(labeltype, 83, 50, 300, 35, "label1", STR_EXERCISE_LIST, DEFAULT_VECTOR_FONT_FILENAME, 30); - InitLabel(labelsport, 147, 140, 240, 35, "label6", "健走", + InitRollLabel(labelsport, 147, 140, 240, 35, "label6", STR_EXERCISE_OUTDOORRUNNING, DEFAULT_VECTOR_FONT_FILENAME, 30); InitLabel(labelduration, 146, 179, 240, 40, "label7", "13:00:22-15:00:12", DEFAULT_VECTOR_FONT_FILENAME, 28); diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp index 10326b15d..f216defdc 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp @@ -1242,7 +1242,11 @@ bool TraingModel::SaveSportData() { data.st = static_cast(sportdata->starttime); data.sp = static_cast(sportdata->endtime); data.tgt = static_cast(sportdata->sportTagType); - data.tg = static_cast(sportdata->tag); + if (sportdata->sportTagType == ExerciseTag::Distance) { + data.tg = static_cast(sportdata->tag * 1000); + } else { + data.tg = static_cast(sportdata->tag); + } data.pg = static_cast(sportdata->goaldegree); data.du = static_cast(sportdata->duration); data.ca = static_cast(sportdata->calories * 10); @@ -1713,38 +1717,37 @@ void LogError(const char *msg, osStatus_t ret) { void TraingTimerCallback(void) { // 只在活动状态下进行更新 - if (pauseStartTimestamp == 0) { - //开始时将该值设置为运动开始值 - pauseStartTimestamp = sportdata->starttime; - } + if (pauseStartTimestamp == 0) { + //开始时将该值设置为运动开始值 + pauseStartTimestamp = sportdata->starttime; + } - uint32_t currentTimestamp = - OHOS::TraingModel::GetInstance()->get_current_time(); // 获取当前时间戳 - g_motionTimes = (currentTimestamp - pauseStartTimestamp) + - totalPausedDuration; // 更新运动时间 - sportdata->duration = g_motionTimes; // 更新持续时间 + uint32_t currentTimestamp = + OHOS::TraingModel::GetInstance()->get_current_time(); // 获取当前时间戳 + g_motionTimes = (currentTimestamp - pauseStartTimestamp) + + totalPausedDuration; // 更新运动时间 + sportdata->duration = g_motionTimes; // 更新持续时间 - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, - "更新运动时间。当前运动时间: %d %d %d %d", currentTimestamp, - pauseStartTimestamp, totalPausedDuration, g_motionTimes); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, + "更新运动时间。当前运动时间: %d %d %d %d", currentTimestamp, + pauseStartTimestamp, totalPausedDuration, g_motionTimes); - // 检查并发送实时数据 - OHOS::TraingModel::GetInstance()->SendLiveDataIfNecessary(); - OHOS::TraingModel::GetInstance()->CheckTimeTag(); + // 检查并发送实时数据 + OHOS::TraingModel::GetInstance()->SendLiveDataIfNecessary(); + OHOS::TraingModel::GetInstance()->CheckTimeTag(); - // 记录特殊活动的心率/配速数据 - if (OHOS::TraingModel::GetInstance()->GetIsSpecial()) { - OHOS::TraingModel::GetInstance()->StoreDataIfMinutePassed(); - } + // 记录特殊活动的心率/配速数据 + if (OHOS::TraingModel::GetInstance()->GetIsSpecial()) { + OHOS::TraingModel::GetInstance()->StoreDataIfMinutePassed(); + } - // 振动反馈 - if ((sportdata->goaldegree >= 100) && (shock_count < 4)) { - shock_count++; - ui_api_vibrate_once_func(); // 触发振动反馈 - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "触发了振动。振动计数: %d", - shock_count); - } - + // 振动反馈 + if ((sportdata->goaldegree >= 100) && (shock_count < 4)) { + shock_count++; + ui_api_vibrate_once_func(); // 触发振动反馈 + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "触发了振动。振动计数: %d", + shock_count); + } WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TraingTimerCallback 被执行。"); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp index dbec98ea0..d61e7ca84 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp @@ -862,7 +862,7 @@ void TraingCardView::ShowGetTagView() { InitLabelExt(labeltitle, 83, 50, 300, 35, "label3", STR_GOAL_TITLE, DEFAULT_VECTOR_FONT_FILENAME_EN, 35); labeltitle->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - labeltitle->SetRollSpeed(70); + labeltitle->SetRollSpeed(23); getView->Add(labeltitle); InitRollLabel(labelgettag, 103, 307, 200, 35, "label3", STR_ACCOMPLISH_GOAL, @@ -913,7 +913,7 @@ void TraingCardView::ShowHeartView() { DEFAULT_VECTOR_FONT_FILENAME_EN, 30); labelnote->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - labelnote->SetRollSpeed(70); + labelnote->SetRollSpeed(23); heartView->Add(labelnote); @@ -994,7 +994,7 @@ void TraingCardView::InitImageAnimator() { DEFAULT_VECTOR_FONT_FILENAME_EN, 80); labeltag->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - labeltag->SetRollSpeed(70); + labeltag->SetRollSpeed(23); labeltag->SetTextColor(Color::GetColorFromRGBA(0x4f, 0xc3, 0x4c, 0xff)); getView->Add(labeltag); diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingControlView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingControlView.cpp index 9660fb5a0..81351be98 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingControlView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingControlView.cpp @@ -67,6 +67,12 @@ void TrainingControlView::InitView() { InitLabelExt(labelstop, 251, 330, 130, 35, "label4", STR_PAUSE, DEFAULT_VECTOR_FONT_FILENAME, 30); + if (state == ExerciseState::Pause) { + labelstop->SetTextId(STR_RESUME); + } else { + labelstop->SetTextId(STR_PAUSE); + } + // 添加到视图中 Add(labeltitle); Add(labeltimer); diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticItemView.cpp index b02e3cf2e..5b1ae56ca 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticItemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticItemView.cpp @@ -86,7 +86,7 @@ void TraingAquaticItemView::SetUpChild() { sLabel.SetPosition(40, 33, 240, 35); sLabel.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - sLabel.SetRollSpeed(70); + sLabel.SetRollSpeed(23); sLabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallItemView.cpp index e7178afee..dd4062c1b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallItemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallItemView.cpp @@ -86,7 +86,7 @@ void TraingBallItemView::SetUpChild() { sLabel.SetPosition(40, 33, 240, 35); sLabel.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - sLabel.SetRollSpeed(70); + sLabel.SetRollSpeed(23); sLabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceItemView.cpp index 3517cdfc4..6ba343546 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceItemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceItemView.cpp @@ -86,7 +86,7 @@ void TraingDanceItemView::SetUpChild() { sLabel.SetPosition(40, 33, 240, 35); sLabel.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - sLabel.SetRollSpeed(70); + sLabel.SetRollSpeed(23); sLabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessItemView.cpp index 99737ab35..5e8535399 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessItemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessItemView.cpp @@ -86,7 +86,7 @@ void TraingFitnessItemView::SetUpChild() { sLabel.SetPosition(40, 33, 240, 35); sLabel.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - sLabel.SetRollSpeed(70); + sLabel.SetRollSpeed(23); sLabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceItemView.cpp index af8e2181e..da24e2aae 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceItemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceItemView.cpp @@ -86,7 +86,7 @@ void TraingIceItemView::SetUpChild() { sLabel.SetPosition(40, 33, 240, 35); sLabel.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - sLabel.SetRollSpeed(70); + sLabel.SetRollSpeed(23); sLabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitItemView.cpp index 2d349bb74..89b1398d6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitItemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitItemView.cpp @@ -86,7 +86,7 @@ void TraingLimitItemView::SetUpChild() { sLabel.SetPosition(40, 33, 240, 35); sLabel.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - sLabel.SetRollSpeed(70); + sLabel.SetRollSpeed(23); sLabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreItemView.cpp index 6f7698e44..8b217d91d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreItemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreItemView.cpp @@ -105,7 +105,7 @@ void TraingMoreItemView::SetUpChild() { sLabel.SetPosition(105, 33, 200, 35); sLabel.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); // sLabel.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - sLabel.SetRollSpeed(70); + sLabel.SetRollSpeed(23); sLabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingOtherItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingOtherItemView.cpp index 4015ee595..c96ad433f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingOtherItemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingOtherItemView.cpp @@ -86,7 +86,7 @@ void TraingOtherItemView::SetUpChild() { sLabel.SetPosition(40, 33, 240, 35); sLabel.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - sLabel.SetRollSpeed(70); + sLabel.SetRollSpeed(23); sLabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestItemView.cpp index bdec1eb08..1b2e5cce2 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestItemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestItemView.cpp @@ -86,7 +86,7 @@ void TraingRestItemView::SetUpChild() { sLabel.SetPosition(40, 33, 240, 35); sLabel.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - sLabel.SetRollSpeed(70); + sLabel.SetRollSpeed(23); sLabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); } 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 b37e912ab..1d62ee8ec 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/watchQRcode/src/WatchQRCodeView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/watchQRcode/src/WatchQRCodeView.cpp @@ -123,7 +123,7 @@ namespace OHOS WEARABLE_LOGD(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_EN, 30); - TitleLabel->SetRollSpeed(70); + TitleLabel->SetRollSpeed(23); TitleLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); TitleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); WatchQRCodeGroupView->Add(TitleLabel); @@ -139,7 +139,7 @@ namespace OHOS DeviceNameLabel->SetStyle(STYLE_TEXT_FONT, 30); DeviceNameLabel->SetStyle(STYLE_LINE_HEIGHT, 35); DeviceNameLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30); - DeviceNameLabel->SetRollSpeed(70); + DeviceNameLabel->SetRollSpeed(23); DeviceNameLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); DeviceNameLabel->SetTextColor(Color::GetColorFromRGBA(0x99, 0x99, 0x99, 0xff)); DeviceNameLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); diff --git a/code/sdk/application/wearable/service/ble_service/bleservice/bleANCS.c b/code/sdk/application/wearable/service/ble_service/bleservice/bleANCS.c index 279b782b9..6c5646bd6 100644 --- a/code/sdk/application/wearable/service/ble_service/bleservice/bleANCS.c +++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleANCS.c @@ -278,28 +278,29 @@ static void ble_ancs_client_notify_source_cbk(uint8_t client_id, uint16_t conn_i ble_ancs_notification_src_t *notify_src, errcode_t status) { if (status == ERRCODE_BT_SUCCESS) { - printf( - "[ANCSClientNotifySRCCBK]conn_id:%d status:0x%x notify_id:%lu " - "eventId:%d eventFlags:0x%x category_id:%d\r\n", - conn_id, status, - notify_src->notification_uid, - notify_src->event_id, - notify_src->event_flags, - notify_src->category_id); - //ble_ancs_client_at_cmd_perform_action(conn_id,notify_src->notification_uid,ANCS_ACTION_POSITIVE); - - - uint32_t creationTime=0; - int ret = uapi_get_timestampe_ss(&creationTime); - //当前时间戳减去订阅通知时间戳10s以上的通知，才要求数据（过滤ios将所有未查看消息发过来） - // if(creationTime-subscribe_notify_creationTime>10) - // { - ble_ancs_client_at_cmd_get_notify_att(conn_id, notify_src->notification_uid); - // } + // printf( + // "[ANCSClientNotifySRCCBK]conn_id:%d status:0x%x notify_id:%lu " + // "eventId:%d eventFlags:0x%x category_id:%d\r\n", + // conn_id, status, + // notify_src->notification_uid, + // notify_src->event_id, + // notify_src->event_flags, + // notify_src->category_id); + // //ble_ancs_client_at_cmd_perform_action(conn_id,notify_src->notification_uid,ANCS_ACTION_POSITIVE); + + + uint32_t creationTime=0; + int ret = uapi_get_timestampe_ss(&creationTime); + //当前时间戳减去订阅通知时间戳10s以上的通知，才要求数据（过滤ios将所有未查看消息发过来） + if(creationTime-subscribe_notify_creationTime>10) + { + ble_ancs_client_at_cmd_get_notify_att(conn_id, notify_src->notification_uid); + } - } else { - printf("[ANCSClientNotifySRCCBK]conn_id:%d status:0x%x.\r\n", - conn_id, status); + // } else { + // printf("[ANCSClientNotifySRCCBK]conn_id:%d status:0x%x.\r\n", + // conn_id, status); + // } } } //static char old_time_buf[64]={0}; 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 8efdd04f8..ad5ac220b 100644 --- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c +++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c @@ -7049,8 +7049,11 @@ errcode_t decode_ota_data(ble_read_data *buffer_handle,uint8_t *data,uint16_t da -errcode_t decode_ota_json(ble_read_data *buffer_handle) -{ +errcode_t decode_ota_json(ble_read_data *buffer_handle) { + + if (uapi_dev_runtime_get_train_status() == 1) { + return ERRCODE_FAIL; + } uint8_t *data = buffer_handle->data+sizeof(msg_header_t); uint16_t datalen = buffer_handle->totalDataLen; @@ -7058,7 +7061,19 @@ errcode_t decode_ota_json(ble_read_data *buffer_handle) cJSON* root = cJSON_Parse((const char *)data); if(root != NULL) - { + { + cJSON* ota_size_json = cJSON_GetObjectItem(root, "size"); + if(ota_size_json != NULL && cJSON_IsNumber(ota_size_json)) + { + buffer_handle->file_recv_stat.file_size = ota_size_json->valueint; + if(is_free_ota_update(ota_size_json->valueint)==false) + { + TRANSMIT_DATA=TRANS_OTA_FAIL; + CustomEventPublish(TOPIC_EVENT_BLE_TRANSMIT,&TRANSMIT_DATA,1); + return ERRCODE_FAIL; + } + } + cJSON* ota_type_json = cJSON_GetObjectItem(root, "type"); if(ota_type_json != NULL && cJSON_IsNumber(ota_type_json)) { @@ -7080,17 +7095,7 @@ errcode_t decode_ota_json(ble_read_data *buffer_handle) }else{ buffer_handle->file_recv_stat.file_name = NULL; } - cJSON* ota_size_json = cJSON_GetObjectItem(root, "size"); - if(ota_size_json != NULL && cJSON_IsNumber(ota_size_json)) - { - buffer_handle->file_recv_stat.file_size = ota_size_json->valueint; - if(is_free_ota_update(ota_size_json->valueint)==false) - { - TRANSMIT_DATA=TRANS_OTA_FAIL; - CustomEventPublish(TOPIC_EVENT_BLE_TRANSMIT,&TRANSMIT_DATA,1); - return ERRCODE_FAIL; - } - } + cJSON* ota_major_json = cJSON_GetObjectItem(root, "major"); if(ota_major_json != NULL && cJSON_IsNumber(ota_major_json)) { @@ -7140,6 +7145,10 @@ errcode_t decode_ota_json(ble_read_data *buffer_handle) errcode_t decode_mp3_json(ble_read_data *buffer_handle) { + if (uapi_dev_runtime_get_train_status() == 1) { + return ERRCODE_FAIL; + } + uint8_t *data = buffer_handle->data+sizeof(msg_header_t); uint16_t datalen = buffer_handle->totalDataLen; WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"MP3_file_save %s\n",data); @@ -7160,6 +7169,11 @@ errcode_t decode_mp3_json(ble_read_data *buffer_handle) if (filenamelen > 0 && filenamelen < 255) { + if(buffer_handle->file_recv_stat.file_name) + { + free(buffer_handle->file_recv_stat.file_name); + buffer_handle->file_recv_stat.file_name=NULL; + } buffer_handle->file_recv_stat.file_name = malloc(filenamelen); if (buffer_handle->file_recv_stat.file_name!=NULL) { @@ -7178,7 +7192,7 @@ errcode_t decode_mp3_json(ble_read_data *buffer_handle) { buffer_handle->file_recv_stat.file_size = ota_size_json->valueint; } - cJSON_Delete(root); + cJSON_Delete(root); WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP," MP3_type= %d, MP3_name=%s, MP3_size=%d \n", buffer_handle->file_recv_stat.file_type, @@ -7193,6 +7207,7 @@ errcode_t decode_mp3_json(ble_read_data *buffer_handle) // CustomEventPublish(TOPIC_EVENT_BLE_TRANSMIT,&TRANSMIT_DATA,1); if(IS_free_save_Mp3(ota_size_json->valueint)==false) { + free(buffer_handle->file_recv_stat.file_name); TRANSMIT_DATA=TRANS_MP3_MAX_FAIL; CustomEventPublish(TOPIC_EVENT_BLE_TRANSMIT,&TRANSMIT_DATA,1); @@ -7265,7 +7280,9 @@ errcode_t decode_dial_info(ble_read_data *buffer_handle) WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"file name len should in [0,255] \n"); return ERRCODE_FAIL; } + char * filename = malloc(dialinfo.file_name_len); + ble_dial_file_count= data[sizeof(msg_recv_dial_info_t)+dialinfo.file_name_len]; if (filename == NULL) { @@ -7273,16 +7290,17 @@ errcode_t decode_dial_info(ble_read_data *buffer_handle) return ERRCODE_FAIL; } memcpy_s(filename,dialinfo.file_name_len,data+sizeof(msg_recv_dial_info_t),dialinfo.file_name_len); + buffer_handle->file_recv_stat.file_name = filename; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP," dial name = %s, dial file count = %d \n", - filename, - ble_dial_file_count - ); - free(filename); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP," dial name = %s, dial file count = %d \n", + filename,ble_dial_file_count); + free(filename); + buffer_handle->file_recv_stat.file_name=NULL; } - ble_dial_uid = dialinfo.dial_uid; + + ble_dial_uid = dialinfo.dial_uid; buffer_handle->file_recv_stat.received_size = 0; buffer_handle->file_recv_stat.lrcvalue = 0; @@ -7295,7 +7313,7 @@ errcode_t decode_dial_info(ble_read_data *buffer_handle) errcode_t decode_single_dial_info(ble_read_data *buffer_handle) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"decode_single_dial_info \n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"decode_single_dial_info \n"); for(uint8_t i = 0;idata_len;i++) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"%x ",buffer_handle->data[i]); @@ -7303,7 +7321,6 @@ errcode_t decode_single_dial_info(ble_read_data *buffer_handle) WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"\n"); if (buffer_handle->data_len == 6) { - return ERRCODE_SUCC; } uint8_t *data = buffer_handle->data+sizeof(msg_header_t); @@ -7326,6 +7343,9 @@ errcode_t decode_single_dial_info(ble_read_data *buffer_handle) return ERRCODE_FAIL; } + if (uapi_dev_runtime_get_train_status() == 1) { + return ERRCODE_FAIL; + } char * filename = malloc(dialinfo.file_name_len+1); @@ -7342,9 +7362,11 @@ errcode_t decode_single_dial_info(ble_read_data *buffer_handle) filename[dialinfo.file_name_len] ='\0'; //在runtime中备份一个安装文件名。 uapi_dev_runtime_set_dialname(filename); - + if (check_dial_freespace(dialinfo.dial_uid, file_size) == false) { + free(filename); + filename=NULL; TRANSMIT_DATA=TRANS_DIAL_MAX_FAIL; CustomEventPublish(TOPIC_EVENT_BLE_TRANSMIT,&TRANSMIT_DATA,1); @@ -7356,7 +7378,12 @@ errcode_t decode_single_dial_info(ble_read_data *buffer_handle) // if(ble_dial_uid<=4) // ble_dial_uid++; - + if(buffer_handle->file_recv_stat.file_name) + { + free(buffer_handle->file_recv_stat.file_name); + buffer_handle->file_recv_stat.file_name=NULL; + } + 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;//表盘 diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/alarm_notification.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/alarm_notification.cpp index b24132c0f..adc756196 100755 --- a/code/sdk/application/wearable/service/msg_center/src/notify/alarm_notification.cpp +++ b/code/sdk/application/wearable/service/msg_center/src/notify/alarm_notification.cpp @@ -409,7 +409,7 @@ namespace OHOS g_mainLable->SetStyle(STYLE_LINE_HEIGHT, 35); g_mainLable->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); g_mainLable->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - g_mainLable->SetRollSpeed(70); + g_mainLable->SetRollSpeed(23); g_mainLable->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); g_alarmView->Add(g_mainLable); /* -------------------------------------------------------------------------- */ diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/goal_notification.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/goal_notification.cpp index 67274d537..09d0c25df 100644 --- a/code/sdk/application/wearable/service/msg_center/src/notify/goal_notification.cpp +++ b/code/sdk/application/wearable/service/msg_center/src/notify/goal_notification.cpp @@ -365,7 +365,7 @@ namespace OHOS STR_GOAL_DOWN, DEFAULT_VECTOR_FONT_FILENAME_EN, 35); labeltitle->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - labeltitle->SetRollSpeed(70); + labeltitle->SetRollSpeed(23); getView->Add(labeltitle); InitRollLabel(labelgettag, 103, 307, 200, 35, "label3", STR_ACCOMPLISH_GOAL, DEFAULT_VECTOR_FONT_FILENAME, 30); diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/message_notification.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/message_notification.cpp index 499d79ccb..2c48743c8 100644 --- a/code/sdk/application/wearable/service/msg_center/src/notify/message_notification.cpp +++ b/code/sdk/application/wearable/service/msg_center/src/notify/message_notification.cpp @@ -142,7 +142,7 @@ UIViewGroup *CreateMessageView(void) { // titleLabel->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS); titleLabel->SetLineBreakMode( UILabel::LINE_BREAK_OSCILLATION); // 来回滚动属性 - titleLabel->SetRollSpeed(70); + titleLabel->SetRollSpeed(23); titleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); titleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); titleLabel->SetVisible(true); @@ -274,6 +274,8 @@ void FreeMessageView(void) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MessageGroupView %p", MessageGroupView); + RootView::GetInstance()->Remove(MessageGroupView); + delete MessageGroupView; MessageGroupView = nullptr; WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Free MessageView succeed!!"); diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/pairing_notification.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/pairing_notification.cpp index 2911e5d7a..2e088816f 100644 --- a/code/sdk/application/wearable/service/msg_center/src/notify/pairing_notification.cpp +++ b/code/sdk/application/wearable/service/msg_center/src/notify/pairing_notification.cpp @@ -292,7 +292,7 @@ namespace OHOS DeviceBindingViewTitleLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); DeviceBindingViewTitleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); DeviceBindingViewTitleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - DeviceBindingViewTitleLabel->SetRollSpeed(70); + DeviceBindingViewTitleLabel->SetRollSpeed(23); /* ----------------------- DeviceBindingAnimatorView ---------------------- */ BindPathsArray = CreateImageInfoArray(BIND_IMAGE_SRC, BIND_IMAGE_ANIMATOR_VIEW_NUM_FRAMES); if (DeviceBindingAnimatorView == nullptr) @@ -352,7 +352,7 @@ namespace OHOS DeviceBindingName->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); DeviceBindingName->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); DeviceBindingName->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - DeviceBindingName->SetRollSpeed(70); + DeviceBindingName->SetRollSpeed(23); /* ------------------------------ DeviceBindingButtonCancel ------------------------------ */ int y = DeviceBindingName->GetY() + DeviceBindingName->GetTextHeight() + 20; DeviceBindingButtonCancel = CreateButton(111, y, 100, 100, "/user/res/SYSTEM_CheckOff.bin"); diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/sedentaryReminder_notification.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/sedentaryReminder_notification.cpp index 3696552d4..3b9d00a19 100644 --- a/code/sdk/application/wearable/service/msg_center/src/notify/sedentaryReminder_notification.cpp +++ b/code/sdk/application/wearable/service/msg_center/src/notify/sedentaryReminder_notification.cpp @@ -207,7 +207,7 @@ namespace OHOS SedentaryReminderTitleLabel->SetText("久坐提醒"); #endif SedentaryReminderTitleLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); - SedentaryReminderTitleLabel->SetRollSpeed(70); + SedentaryReminderTitleLabel->SetRollSpeed(23); SedentaryReminderTitleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); SedentaryReminderTitleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); /* --------------------------- SedentaryReminderImage --------------------------- */ diff --git a/tools/log_parser/excdump.sh b/tools/log_parser/excdump.sh index 94bb7167e..0d964262a 100755 --- a/tools/log_parser/excdump.sh +++ b/tools/log_parser/excdump.sh @@ -17,7 +17,8 @@ struct="exc_info_save_t" srctarpath=$1 srctar=`basename $srctarpath` srcdir=`dirname $srctarpath` -version=${srctar:4:23} +#需要从输入的参数“文件名”提取出来版本号VXX.XX.XX_YYMMDD_HHMMSS +version=${srctar:4:24} targetdir=$srcdir/bin_$srctar mkdir -p $targetdir tar xf $srctarpath -C $targetdir -- 2.17.1