Merge #959 into sdk602patch0626 from refs/changes/959/head

Code review from 胡传军

* refs/changes/959/head: (3 commits squashed)

  - 计步有遮挡 #685

  - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

  - 修复通话号码过长显示问题 二级拨号盘点击特效问题 #508 #676 #488

Signed-off-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/959

diff --git a/code/sdk/application/wearable/fd230app/nativeui/goal/src/goalview.cpp b/code/sdk/application/wearable/fd230app/nativeui/goal/src/goalview.cpp
index adb2d79..6ec2dcb 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/goal/src/goalview.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/goal/src/goalview.cpp
@@ -16,7 +16,7 @@ namespace OHOS
    
 
     static constexpr int16_t PULLUP_ANIMATOR_VIEW_X = 213;
-    static constexpr int16_t PULLUP_ANIMATOR_VIEW_Y = 364;
+    static constexpr int16_t PULLUP_ANIMATOR_VIEW_Y = 380;
     static constexpr int16_t PULLUP_ANIMATOR_VIEW_W = 40;
     static constexpr int16_t PULLUP_ANIMATOR_VIEW_H = 40;
     static constexpr int16_t PULLUP_ANIMATOR_VIEW_NUM_FRAMES = 70;
@@ -209,7 +209,7 @@ namespace OHOS
         if (circleProgressimage == nullptr) {
             circleProgressimage = new UIImageView();
         }
-        circleProgressimage->SetPosition(28, 80);         // widget's left position and top position
+        circleProgressimage->SetPosition(28, 80-5);         // widget's left position and top position
         circleProgressimage->Resize(100, 100);          // widget's width and height
         circleProgressimage->SetViewId("image5");// Set style
 
@@ -230,7 +230,7 @@ namespace OHOS
         if (circleProgress1_ == nullptr) {
             circleProgress1_ = new UICircleProgress();
         }
-        circleProgress1_->SetPosition(-1, 0);         // widget's left position and top position
+        circleProgress1_->SetPosition(0, -5);         // widget's left position and top position
         circleProgress1_->Resize(466, 466);          // widget's width and height
         circleProgress1_->SetViewId("circleProgress1");// Set style
         circleProgress1_->SetStyle(STYLE_BACKGROUND_OPA, 0x00);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/makephone/src/CallingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/makephone/src/CallingView.cpp
index be32c2f..321c245 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/makephone/src/CallingView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/makephone/src/CallingView.cpp
@@ -262,7 +262,7 @@ bool CallingView::InitUILabelDisplay()
     callerDisplay->SetAlign(TEXT_ALIGNMENT_CENTER);
     callerDisplay->SetFont(DEFAULT_VECTOR_FONT_FILENAME, LABEL_DISPLAY_FONE_SIZE);
     callerDisplay->SetTextColor(Color::White());
-    callerDisplay->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);
+    callerDisplay->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE);
     group->Add(callerDisplay);
 
     // callDuration = new UILabel();
@@ -372,7 +372,7 @@ bool CallingView::Initshowdial()
 
             labelButton[showdial_i]->SetText(dial_id_str[showdial_i]);
             labelButton[showdial_i]->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 40);
-            labelButton[showdial_i]->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED);
+            labelButton[showdial_i]->SetStyleForState(STYLE_BORDER_COLOR, 0xff191919, UIButton::PRESSED);
 
             dial_group->Add(labelButton[showdial_i]);
             labelButton[showdial_i]->SetVisible(true);