From d84bede5e927a2aef20d2c166269f3b1d2a5ce49 Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Mon, 2 Feb 2026 16:16:35 +0800 Subject: [PATCH] =?utf8?q?=E4=BC=98=E5=8C=96=E7=9B=AE=E6=A0=87=E8=BE=BE?= =?utf8?q?=E6=88=90=E5=BC=B9=E7=AA=97ui?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../src/DisplayBrightnessPresent.cpp | 4 +-- .../src/notify/goal_notification.cpp | 32 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp index 9e1a233d9..7934bb5bf 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp @@ -179,7 +179,7 @@ namespace OHOS bool DisplayBrightnessPresenter::OnDrag(UIView &view, const DragEvent &event) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessPresenter::OnDrag"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessPresenter::OnDrag"); UNUSED(view); if ((event.GetDeltaX() > X_DRAG_OFFSET) && (event.GetDeltaX() > (DOUBLES * MATH_ABS(event.GetDeltaY())))) // 拖动过程中判断是否是水平滑动 { @@ -190,7 +190,7 @@ namespace OHOS bool DisplayBrightnessPresenter::OnDragEnd(UIView &view, const DragEvent &event) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessPresenter::OnDragEnd"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessPresenter::OnDragEnd"); DisplayBrightnessView *p_DisplayBrightnessView = DisplayBrightnessView::GetInstance(); if (p_DisplayBrightnessView == nullptr) { diff --git a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/goal_notification.cpp b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/goal_notification.cpp index 3f171d95d..2b71f0d79 100644 --- a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/goal_notification.cpp +++ b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/goal_notification.cpp @@ -272,7 +272,7 @@ namespace OHOS WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"tag[%d]-tagType[%d]-tagString[%s]\r\n", tag, tagType,tagString.c_str()); InitLabel(labeltag, 70, 215, 326, 97, "label2", tagString.c_str(),DEFAULT_VECTOR_FONT_FILENAME, 80); labeltag->SetTextColor(Color::GetColorFromRGBA(0x4f, 0xc3, 0x4c, 0xff)); - labeltag->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); + labeltag->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); // 初始化图片数组以及动画 winimageInfos = CreateImageInfoArray(winbasePath.c_str(), 94); winimageAnimatorInfo = new ImageAnimatorInfo[94]; @@ -296,21 +296,8 @@ namespace OHOS } if (GoalviewShowCallBack_FALG == 0) { - - NotificationManager::GetInstance()->StopNotify(); - - // if(GoalviewShow_timer) - // { - // osTimerStop(GoalviewShow_timer); - // osStatus_t ret = osTimerDelete(GoalviewShow_timer); - // if (ret != osOK) { - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Disatransmitting_timer failed ret = %lx!", ret); - // return; - // } - // GoalviewShow_timer = nullptr; - // } + // NotificationManager::GetInstance()->StopNotify(); } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "hintdialtimerCallBack ??????!"); } UIViewGroup *GoalviewShow() @@ -353,12 +340,25 @@ namespace OHOS getView->SetDirection(1); /* -------------------------------------------------------------------------- */ - InitLabelExt(labeltitle, 58, 53, 350, 35, "label3",STR_GOAL_DOWN, DEFAULT_VECTOR_FONT_FILENAME_EN, 35); + InitLabelExt(labeltitle, 58, 55, 350, 35, "label3",STR_GOAL_DOWN, DEFAULT_VECTOR_FONT_FILENAME_EN, 30); labeltitle->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); + labeltitle->SetStyle(STYLE_LINE_HEIGHT, 40); labeltitle->SetRollSpeed(23); /* -------------------------------------------------------------------------- */ InitRollLabel(labelgettag, 103, 307, 200, 35, "label3", STR_ACCOMPLISH_GOAL,DEFAULT_VECTOR_FONT_FILENAME, 30); InitLabel(labelpre, 233, 307, 160, 35, "label3", "100%",DEFAULT_VECTOR_FONT_FILENAME, 30); + if (ConfigModel::GetInstance()->GetLanguage() == 0) + { + labelgettag->SetWidth(200); + labelpre->SetX(233); + } + else + { + labelgettag->SetWidth(280); + labelgettag->SetX(90); + int x = labelgettag->GetWidth() + labelgettag->GetX() - 43; + labelpre->SetX(x); + } // 初始化按键 InitButtonExt(buttonok_, 0, 366, 466, 100, BUTTONWINOK, STR_OK, 30); buttonok_->SetImageSrc(BUTTONOK_IMAGE, BUTTONOK_IMAGE); -- 2.17.1