优化目标达成弹窗ui

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 9e1a233..7934bb5 100644 (file)
--- 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
 \r
     bool DisplayBrightnessPresenter::OnDrag(UIView &view, const DragEvent &event)\r
     {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessPresenter::OnDrag");\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessPresenter::OnDrag");\r
         UNUSED(view);\r
         if ((event.GetDeltaX() > X_DRAG_OFFSET) && (event.GetDeltaX() > (DOUBLES * MATH_ABS(event.GetDeltaY())))) // 拖动过程中判断是否是水平滑动\r
         {\r
@@ -190,7 +190,7 @@ namespace OHOS
 \r
     bool DisplayBrightnessPresenter::OnDragEnd(UIView &view, const DragEvent &event)\r
     {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessPresenter::OnDragEnd");\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessPresenter::OnDragEnd");\r
         DisplayBrightnessView *p_DisplayBrightnessView = DisplayBrightnessView::GetInstance();\r
         if (p_DisplayBrightnessView == nullptr)\r
         {\r

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 3f171d9..2b71f0d 100644 (file)
--- 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);