支付宝UI修改

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
index 7508123..17499f0 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
@@ -199,6 +199,8 @@ namespace OHOS
     static constexpr const char *PNG_ALIPAY_LIST_HELP = APP_RES_PATH "/alipay/ALIPAY_LIST_HELP.bin";
     static constexpr const char *PNG_ALIPAY_PAY_ICON_WHITE = APP_RES_PATH "/alipay/ALIPAY_PAY_ICON_WHITE.bin";
     static constexpr const char *PNG_ALIPAY_PAY_ICON_GREY = APP_RES_PATH "/alipay/ALIPAY_PAY_ICON_GREY.bin";
+    static constexpr const char *PNG_ALIPAY_YSE_ICON = APP_RES_PATH "/alipay/yes.bin";
+    static constexpr const char *PNG_ALIPAY_NO_ICON = APP_RES_PATH "/alipay/no.bin";
     /* ----------------------------------- 录音 ----------------------------------- */
     static constexpr const char *PNG_ANIMATOR1_IMAGE = APP_RES_PATH "/record/animator1.bin";
     static constexpr const char *PNG_ANIMATOR2_IMAGE = APP_RES_PATH "/record/animator2.bin";
@@ -251,6 +253,7 @@ namespace OHOS
     static constexpr const char *PNG_A019_095_IMAGE_PATH = APP_RES_PATH "/BLUETOOTH_IMAGE_16.bin";
     static constexpr const char *PNG_BLUETOOTHEAR = APP_RES_PATH "/BLUETOOTHEAR.bin";
     /* --------------------------------- AppList -------------------------------- */
+
     static constexpr const char *PNG_APPLIST_THEME_IMAGE = APP_LIST_PATH "/theme.bin";              // 显示方式
     static constexpr const char *PNG_APPLIST_CARDSET_IMAGE = APP_LIST_PATH "/cardsetting.bin";      // 卡片管理
     static constexpr const char *PNG_APPLIST_CHANGEDIAL_IMAGE = APP_LIST_PATH "/changedial.bin";    // 切换表盘

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayBindAni.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayBindAni.h
index d2f4f45..8e31812 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayBindAni.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayBindAni.h
@@ -31,6 +31,7 @@ private:
     UILabel *alipayLabel { nullptr };\r
     UIImageAnimatorView *alipayImageAni { nullptr };\r
     ImageAnimatorInfo searchImageInfo[ALIPAY_BIND_SEARCH_IMAGE_NUM];\r
+    UIImageView *alipaylogImage { nullptr };\r
 };\r
 }\r
 #endif
\ No newline at end of file

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayExitBind.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayExitBind.h
index 08a8627..0446d66 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayExitBind.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayExitBind.h
@@ -28,6 +28,7 @@ private:
     AlipayPresenter *presenter_;\r
     UILabel *alipayLabel[ALIPAY_SET_TWO] { nullptr };\r
     UILabelButton *alipayButton[ALIPAY_SET_TWO] { nullptr };\r
+    UIImageView *AttentionImage { nullptr };\r
 };\r
 }\r
 #endif
\ No newline at end of file

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayUnbind.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayUnbind.h
index 8c15146..7bfefc8 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayUnbind.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayUnbind.h
@@ -28,6 +28,7 @@ private:
     AlipayPresenter *presenter_;\r
     UILabel *alipayLabel[ALIPAY_SET_TWO] { nullptr };\r
     UILabelButton *alipayButton[ALIPAY_SET_TWO] { nullptr };\r
+    UIImageView *AttentionImage { nullptr };\r
 };\r
 }\r
 #endif
\ No newline at end of file

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayBindAni.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayBindAni.cpp
index 4574cb9..117abd3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayBindAni.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayBindAni.cpp
@@ -14,35 +14,46 @@
 #include "graphic_service.h"\r
 \r
 namespace OHOS {\r
-static const int16 ANILABEL_X_FIRST = 151;\r
-static const int16 ANILABEL_Y_FIRST = 257;\r
-static const int16 ANILABEL_WIDTH_FIRST = 151;\r
-static const int16 ANILABEL_HEIGHT_FIRST = 48;\r
+static const int16 ANILABEL_X_FIRST = 133;\r
+static const int16 ANILABEL_Y_FIRST = 328;\r
+static const int16 ANILABEL_WIDTH_FIRST = 200;\r
+static const int16 ANILABEL_HEIGHT_FIRST = 60;\r
 static const char *ANILABEL_TEXT_FIRST = (char *)"正在绑定";\r
-static const int16 ANILABEL_FONT_FIRST = 38;\r
+static const int16 ANILABEL_FONT_FIRST = 30;\r
+\r
+static constexpr const char *PNG_1_PATH = "user/res/alipay/1.bin";\r
+static constexpr const char *PNG_2_PATH = "user/res/alipay/2.bin";\r
+static constexpr const char *PNG_3_PATH = "user/res/alipay/3.bin";\r
+static constexpr const char *PNG_4_PATH = "user/res/alipay/4.bin";\r
+static constexpr const char *PNG_5_PATH = "user/res/alipay/5.bin";\r
+static constexpr const char *PNG_6_PATH = "user/res/alipay/6.bin";\r
+static constexpr const char *PNG_7_PATH = "user/res/alipay/7.bin";\r
+static constexpr const char *PNG_8_PATH = "user/res/alipay/8.bin";\r
+\r
+static constexpr const char *PNG_LOG_PATH = "user/res/alipay/alipaylog.bin";\r
 \r
 const char *searchImagePath[ALIPAY_BIND_SEARCH_IMAGE_NUM] = {\r
-    PNG_A019_080_IMAGE_PATH,\r
-    PNG_A019_081_IMAGE_PATH,\r
-    PNG_A019_082_IMAGE_PATH,\r
-    PNG_A019_083_IMAGE_PATH,\r
-    PNG_A019_084_IMAGE_PATH,\r
-    PNG_A019_085_IMAGE_PATH,\r
-    PNG_A019_086_IMAGE_PATH,\r
-    PNG_A019_087_IMAGE_PATH,\r
+    PNG_1_PATH,\r
+    PNG_2_PATH,\r
+    PNG_3_PATH,\r
+    PNG_4_PATH,\r
+    PNG_5_PATH,\r
+    PNG_6_PATH,\r
+    PNG_7_PATH,\r
+    PNG_8_PATH,\r
 };\r
 \r
-static const int16 ALIPAY_BIND_IMAGE_X = 162;\r
-static const int16 ALIPAY_BIND_IMAGE_Y = 112;\r
-static const int16 ALIPAY_BIND_IMAGE_WIDTH = 128;\r
-static const int16 ALIPAY_BIND_IMAGE_HEIGHT = 128;\r
+static const int16 ALIPAY_BIND_IMAGE_X = 149;\r
+static const int16 ALIPAY_BIND_IMAGE_Y = 358;\r
+static const int16 ALIPAY_BIND_IMAGE_WIDTH = 168;\r
+static const int16 ALIPAY_BIND_IMAGE_HEIGHT = 40;\r
 \r
-static const int16 ALIPAY_BIND_IMAGE_DELAY = 200;\r
+static const int16 ALIPAY_BIND_IMAGE_DELAY = 100;\r
 \r
-static const int16 RES_IMAGE_X = 162;\r
-static const int16 RES_IMAGE_Y = 112;\r
-static const int16 RES_IMAGE_WIDTH = 128;\r
-static const int16 RES_IMAGE_HEIGHT = 128;\r
+static const int16 RES_IMAGE_X = 149;\r
+static const int16 RES_IMAGE_Y = 358;\r
+static const int16 RES_IMAGE_WIDTH = 168;\r
+static const int16 RES_IMAGE_HEIGHT = 40;\r
 \r
 AlipayBindAni::AlipayBindAni(AlipayPresenter *presenter)\r
 {\r
@@ -63,6 +74,12 @@ AlipayBindAni::~AlipayBindAni()
         delete alipayImageAni;\r
         alipayImageAni = nullptr;\r
     }\r
+    if (alipaylogImage != nullptr) {\r
+        delete alipaylogImage;\r
+        alipaylogImage = nullptr;\r
+    }\r
+\r
+    \r
 }\r
 \r
 bool AlipayBindAni::AlipayInitLabel(void)\r
@@ -77,7 +94,7 @@ bool AlipayBindAni::AlipayInitLabel(void)
     alipayLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, ANILABEL_FONT_FIRST);\r
     alipayLabel->SetStyle(STYLE_TEXT_FONT, ANILABEL_FONT_FIRST);\r
     alipayLabel->SetAlign(TEXT_ALIGNMENT_CENTER);\r
-    alipayLabel->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);\r
+    alipayLabel->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);\r
     Add(alipayLabel);\r
     return true;\r
 }\r
@@ -98,14 +115,23 @@ bool AlipayBindAni::AlipayInitImageAni(void)
         searchImageInfo[i].height = ALIPAY_BIND_IMAGE_HEIGHT;\r
     }\r
 \r
-    alipayImageAni->SetPosition(RES_IMAGE_X, RES_IMAGE_Y, RES_IMAGE_WIDTH, RES_IMAGE_HEIGHT);\r
+    alipayImageAni->SetPosition(ALIPAY_BIND_IMAGE_X, ALIPAY_BIND_IMAGE_Y, ALIPAY_BIND_IMAGE_WIDTH, ALIPAY_BIND_IMAGE_HEIGHT);\r
     alipayImageAni->SetImageAnimatorSrc(searchImageInfo, ALIPAY_BIND_SEARCH_IMAGE_NUM, ALIPAY_BIND_IMAGE_DELAY);\r
     alipayImageAni->SetRepeat(true);\r
     alipayImageAni->SetAutoEnable(false);\r
-    alipayImageAni->SetResizeMode(UIImageView::FILL);\r
+    //alipayImageAni->SetResizeMode(UIImageView::FILL);\r
     Add(alipayImageAni);\r
-\r
     alipayImageAni->Start();\r
+\r
+    alipaylogImage = new UIImageView();\r
+    if (alipaylogImage == nullptr) {\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayBindRes::AlipayInitImage new alipayImage fail");\r
+        return false;\r
+    }\r
+    alipaylogImage->SetPosition(143, 130, 180, 180);\r
+    alipaylogImage->SetSrc(PNG_LOG_PATH);\r
+    Add(alipaylogImage);\r
+\r
     return true;\r
 }\r
 \r
@@ -115,7 +141,7 @@ bool AlipayBindAni::InitView()
     SetDraggable(true);\r
     SetTouchable(true);\r
     SetOnDragListener(presenter_);\r
-    SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);\r
+    SetPosition(0, 0, 466, 466);\r
     if (!AlipayInitLabel()) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayBindAni::InitView AlipayInitLabel() false");\r
         return false;\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayBindRes.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayBindRes.cpp
index 0a33198..e9c7c64 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayBindRes.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayBindRes.cpp
@@ -14,19 +14,20 @@
 #include "AlipayModel.h"\r
 \r
 namespace OHOS {\r
-static const int16 EXIT_LABEL_X_FIRST = 151;\r
-static const int16 EXIT_LABEL_Y_FIRST = 257;\r
-static const int16 EXIT_LABEL_WIDTH_FIRST = 151;\r
-static const int16 EXIT_LABEL_HEIGHT_FIRST = 48;\r
+static const int16 EXIT_LABEL_X_FIRST = 83;\r
+static const int16 EXIT_LABEL_Y_FIRST = 350;\r
+\r
+static const int16 EXIT_LABEL_WIDTH_FIRST = 300;\r
+static const int16 EXIT_LABEL_HEIGHT_FIRST = 50;\r
 static const char *EXIT_LABEL_TEXT_FIRST = (char *)"绑定失败";\r
-static const int16 EXIT_LABEL_FONT_FIRST = 38;\r
+static const int16 EXIT_LABEL_FONT_FIRST = 35;\r
 \r
 static const char *EXIT_LABEL_TEXT_SEC = (char *)"绑定成功";\r
 \r
-static const int16 RES_IMAGE_X = 161;\r
-static const int16 RES_IMAGE_Y = 110;\r
-static const int16 RES_IMAGE_WIDTH = 135;\r
-static const int16 RES_IMAGE_HEIGHT = 135;\r
+static const int16 RES_IMAGE_X = 153;\r
+static const int16 RES_IMAGE_Y = 140;\r
+static const int16 RES_IMAGE_WIDTH = 160;\r
+static const int16 RES_IMAGE_HEIGHT = 160;\r
 \r
 AlipayBindRes::AlipayBindRes(AlipayPresenter *presenter)\r
 {\r
@@ -61,10 +62,10 @@ void AlipayBindRes::AlipayRefreshBindRes(void)
     // alipayLabel->Set\r
     if (presenter_->AlipayGetBindFlag()) {\r
         alipayLabel->SetText(EXIT_LABEL_TEXT_SEC);\r
-        alipayImage->SetSrc(PNG_ALIPAY_BIND_SUCCESS);\r
+        alipayImage->SetSrc(PNG_ALIPAY_YSE_ICON);\r
     } else {\r
         alipayLabel->SetText(EXIT_LABEL_TEXT_FIRST);\r
-        alipayImage->SetSrc(PNG_ALIPAY_BIND_FAILURE);\r
+        alipayImage->SetSrc(PNG_ALIPAY_NO_ICON);\r
     }\r
     alipayLabel->Invalidate();\r
     alipayImage->Invalidate();\r
@@ -82,9 +83,9 @@ bool AlipayBindRes::AlipayInitLabel(const char *resStr)
     alipayLabel->SetPosition(EXIT_LABEL_X_FIRST, EXIT_LABEL_Y_FIRST, EXIT_LABEL_WIDTH_FIRST, EXIT_LABEL_HEIGHT_FIRST);\r
     alipayLabel->SetText(resStr);\r
     alipayLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, EXIT_LABEL_FONT_FIRST);\r
-    alipayLabel->SetStyle(STYLE_TEXT_FONT, EXIT_LABEL_FONT_FIRST);\r
-    alipayLabel->SetAlign(TEXT_ALIGNMENT_CENTER);\r
-    alipayLabel->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);\r
+    //alipayLabel->SetStyle(STYLE_TEXT_FONT, EXIT_LABEL_FONT_FIRST);\r
+    alipayLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
+    alipayLabel->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);\r
 \r
     Add(alipayLabel);\r
 \r
@@ -103,7 +104,7 @@ bool AlipayBindRes::AlipayInitImage(const char *imageSrc)
 \r
     // Set additional property\r
     alipayImage->SetAutoEnable(false);\r
-    alipayImage->SetResizeMode(UIImageView::FILL);\r
+    //alipayImage->SetResizeMode(UIImageView::FILL);\r
 \r
     Add(alipayImage);\r
     return true;\r
@@ -115,14 +116,14 @@ bool AlipayBindRes::InitView()
     SetDraggable(true);\r
     SetTouchable(true);\r
     SetOnDragListener(presenter_);\r
-    SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);\r
+    SetPosition(0, 0, 466, 466);\r
 \r
     const char *resStr = EXIT_LABEL_TEXT_SEC;\r
     if (!AlipayInitLabel(resStr)) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayBindRes::InitView AlipayInitLabel() false");\r
         return false;\r
     }\r
-    if (!AlipayInitImage(PNG_ALIPAY_BIND_SUCCESS)) {\r
+    if (!AlipayInitImage(PNG_ALIPAY_YSE_ICON)) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayBindRes::InitView AlipayInitImage() false");\r
         return false;\r
     }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayExitBind.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayExitBind.cpp
index edf88e3..2f9bf47 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayExitBind.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayExitBind.cpp
@@ -12,33 +12,37 @@
 #include "AlipayExitBind.h"\r
 \r
 namespace OHOS {\r
-static const int16 EXIT_LABEL_X_FIRST = 132;\r
-static const int16 EXIT_LABEL_X_SEC = 0;\r
-static const int16 EXIT_LABEL_WIDTH_FIRST = 189;\r
-static const int16 EXIT_LABEL_HEIGHT_FIRST = 48;\r
-\r
-static const int16 EXIT_LABEL_Y_FIRST = 57;\r
-static const int16 EXIT_LABEL_Y_SECOND = 154;\r
-static const int16 EXIT_LABEL_WIDTH_SEC = 454;\r
-static const int16 EXIT_LABEL_HEIGHT_SEC = 83;\r
-static const int16 EXIT_LABEL_FONT_FIRST = 38;\r
+\r
+static const int16 EXIT_LABEL_X_FIRST = 83;\r
+static const int16 EXIT_LABEL_X_SEC = 53;\r
+\r
+static const int16 EXIT_LABEL_WIDTH_FIRST = 300;\r
+static const int16 EXIT_LABEL_HEIGHT_FIRST = 35;\r
+\r
+static const int16 EXIT_LABEL_Y_FIRST = 50;\r
+static const int16 EXIT_LABEL_Y_SECOND = 222;\r
+\r
+static const int16 EXIT_LABEL_WIDTH_SEC = 360;\r
+static const int16 EXIT_LABEL_HEIGHT_SEC = 70;\r
+\r
+static const int16 EXIT_LABEL_FONT_FIRST = 30;\r
 static const int16 EXIT_LABEL_FONT_SEC = 30;\r
 \r
 static const char *EXIT_LABEL_TEXT_FIRST = (char *)"未完成绑定";\r
-static const char *EXIT_LABEL_TEXT_SECOND = (char *)"当前未完成绑定，退出在进来\n需要重新扫码绑定";\r
+static const char *EXIT_LABEL_TEXT_SECOND = (char *)"当前未完成绑定，退出在进来需要重新扫码绑定";\r
 \r
-static const int16 EXIT_BUTTON_EXIT_X = 50;\r
-static const int16 EXIT_BUTTON_EXIT_Y = 312;\r
+static const int16 EXIT_BUTTON_EXIT_X = 58;\r
+static const int16 EXIT_BUTTON_EXIT_Y = 320;\r
 \r
-static const int16 EXIT_BUTTON_BIND_X = 233;\r
-static const int16 EXIT_BUTTON_BIND_Y = 312;\r
+static const int16 EXIT_BUTTON_BIND_X = 238;\r
+static const int16 EXIT_BUTTON_BIND_Y = 320;\r
 \r
 static const char *EXIT_BUTTON_TEXT_FIRST = (char *)"退出";\r
 static const char *EXIT_BUTTON_TEXT_SECOND = (char *)"去绑定";\r
 \r
-static const int16 EXIT_BUTTON_WIDTH = 169;\r
-static const int16 EXIT_BUTTON_HEIGHT = 73;\r
-static const int16 EXIT_BUTTON_FONT = 38;\r
+static const int16 EXIT_BUTTON_WIDTH = 170;\r
+static const int16 EXIT_BUTTON_HEIGHT = 90;\r
+static const int16 EXIT_BUTTON_FONT = 26;\r
 \r
 AlipayExitBind::AlipayExitBind(AlipayPresenter *presenter)\r
 {\r
@@ -62,6 +66,11 @@ AlipayExitBind::~AlipayExitBind()
             alipayButton[buttonNum] = nullptr;\r
         }\r
     }\r
+    if(AttentionImage)\r
+    {\r
+        delete AttentionImage;\r
+        AttentionImage =nullptr;\r
+    }\r
 }\r
 \r
 bool AlipayExitBind::AlipayInitLabel()\r
@@ -78,7 +87,7 @@ bool AlipayExitBind::AlipayInitLabel()
     alipayLabel[ALIPAY_SET_ZERO]->SetFont(DEFAULT_VECTOR_FONT_FILENAME, EXIT_LABEL_FONT_FIRST);\r
     alipayLabel[ALIPAY_SET_ZERO]->SetStyle(STYLE_TEXT_FONT, EXIT_LABEL_FONT_FIRST);\r
     alipayLabel[ALIPAY_SET_ZERO]->SetAlign(TEXT_ALIGNMENT_CENTER);\r
-    alipayLabel[ALIPAY_SET_ZERO]->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);\r
+    alipayLabel[ALIPAY_SET_ZERO]->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);\r
 \r
     Add(alipayLabel[ALIPAY_SET_ZERO]);\r
 \r
@@ -91,12 +100,23 @@ bool AlipayExitBind::AlipayInitLabel()
         EXIT_LABEL_HEIGHT_SEC);\r
     alipayLabel[ALIPAY_SET_ONE]->SetText(EXIT_LABEL_TEXT_SECOND);\r
     alipayLabel[ALIPAY_SET_ONE]->SetFont(DEFAULT_VECTOR_FONT_FILENAME, EXIT_LABEL_FONT_SEC);\r
-    alipayLabel[ALIPAY_SET_ONE]->SetStyle(STYLE_LINE_SPACE, 6);\r
-    alipayLabel[ALIPAY_SET_ONE]->SetStyle(STYLE_TEXT_FONT, EXIT_LABEL_FONT_SEC);\r
+    //alipayLabel[ALIPAY_SET_ONE]->SetStyle(STYLE_LINE_SPACE, 12);\r
+    //alipayLabel[ALIPAY_SET_ONE]->SetStyle(STYLE_TEXT_FONT, EXIT_LABEL_FONT_SEC);\r
+    alipayLabel[ALIPAY_SET_ONE]->SetTextColor(Color::GetColorFromRGBA(0xAA, 0xAA, 0xAA, 0xFF));\r
     alipayLabel[ALIPAY_SET_ONE]->SetAlign(TEXT_ALIGNMENT_CENTER);\r
-    alipayLabel[ALIPAY_SET_ONE]->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS);\r
+    alipayLabel[ALIPAY_SET_ONE]->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);\r
     Add(alipayLabel[ALIPAY_SET_ONE]);\r
 \r
+    AttentionImage=new UIImageView();\r
+    if (AttentionImage == nullptr)\r
+    {\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemFactoryResetView::new FactoryResetImage fail!");\r
+        return false;\r
+    }\r
+    AttentionImage->SetPosition(193, 110);\r
+    AttentionImage->SetSrc(PNG_ATTENTION_IMAGE);\r
+    Add(AttentionImage);\r
+\r
     return true;\r
 }\r
 \r
@@ -111,11 +131,12 @@ bool AlipayExitBind::InitSimilarButton(int16 num, int16 alipayX, int16 alipayY,
     int64_t backColor = 0;\r
 \r
     if (num == 0) {\r
-        backColor = 0xff4a83bf;\r
-        alipayButton[num]->SetTextColor(Color::GetColorFromRGBA(0x00, 0x00, 0x00, 0xff));\r
-        alipayButton[num]->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff);\r
+        backColor = 0xff191919;\r
+        //alipayButton[num]->SetTextColor(Color::GetColorFromRGBA(0x19, 0x19, 0x19, 0x19));\r
+        alipayButton[num]->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919);\r
     } else if (num == 1) {\r
-        backColor = 0xff0b1928;\r
+        backColor = 0xff0176ff;\r
+        alipayButton[num]->SetStyle(STYLE_BACKGROUND_COLOR, 0xff0176ff);\r
     }\r
     alipayButton[num]->SetPosition(alipayX, alipayY, EXIT_BUTTON_WIDTH, EXIT_BUTTON_HEIGHT);\r
     alipayButton[num]->SetText(buttonStr);\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayPayCode.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayPayCode.cpp
index 79e738f..80f52fa 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayPayCode.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayPayCode.cpp
@@ -204,7 +204,7 @@ bool AlipayPayCode::InitView()
     SetOnDragListener(presenter_);\r
     SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);\r
     SetStyle(STYLE_BACKGROUND_COLOR, 0xff1677ff);\r
-    SetStyle(STYLE_BACKGROUND_OPA, 0xff);\r
+    //SetStyle(STYLE_BACKGROUND_OPA, 0xff);\r
 \r
     if (!AlipayInitLabel()) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayPayCode::InitView AlipayInitLabel() false");\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayUnbind.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayUnbind.cpp
index 2c081ca..eb68174 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayUnbind.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayUnbind.cpp
@@ -13,34 +13,35 @@
 #include "AlipayUnbind.h"\r
 \r
 namespace OHOS {\r
-static const int16 EXIT_LABEL_X_FIRST = 132;\r
-static const int16 EXIT_LABEL_Y_FIRST = 57;\r
-static const int16 EXIT_LABEL_WIDTH_FIRST = 189;\r
-static const int16 EXIT_LABEL_HEIGHT_FIRST = 48;\r
+static const int16 EXIT_LABEL_X_FIRST = 83;\r
+static const int16 EXIT_LABEL_Y_FIRST = 50;\r
+static const int16 EXIT_LABEL_WIDTH_FIRST = 300;\r
+static const int16 EXIT_LABEL_HEIGHT_FIRST = 35;\r
 \r
-static const int16 EXIT_LABEL_X_SEC = 44;\r
-static const int16 EXIT_LABEL_Y_SECOND = 126;\r
-static const int16 EXIT_LABEL_WIDTH_SEC = 365;\r
-static const int16 EXIT_LABEL_HEIGHT_SEC = 128;\r
+static const int16 EXIT_LABEL_X_SEC = 53;\r
+static const int16 EXIT_LABEL_Y_SECOND = 222;\r
 \r
-static const int16 EXIT_LABEL_FONT_FIRST = 38;\r
+static const int16 EXIT_LABEL_WIDTH_SEC = 360;\r
+static const int16 EXIT_LABEL_HEIGHT_SEC = 70;\r
+\r
+static const int16 EXIT_LABEL_FONT_FIRST = 30;\r
 static const int16 EXIT_LABEL_FONT_SEC = 30;\r
 \r
 static const char *UNBIND_LABEL_TEXT_FIRST = (char *)"解除绑定";\r
 static const char *UNBIND_LABEL_TEXT_SECOND = (char *)"解绑后将无法使用支付宝各项解锁功能，确认解绑？";\r
 \r
-static const int16 EXIT_BUTTON_EXIT_X = 50;\r
-static const int16 EXIT_BUTTON_EXIT_Y = 312;\r
+static const int16 EXIT_BUTTON_EXIT_X = 58;\r
+static const int16 EXIT_BUTTON_EXIT_Y = 320;\r
 \r
-static const int16 EXIT_BUTTON_BIND_X = 233;\r
-static const int16 EXIT_BUTTON_BIND_Y = 312;\r
+static const int16 EXIT_BUTTON_BIND_X = 238;\r
+static const int16 EXIT_BUTTON_BIND_Y = 320;\r
 \r
 static const char *UNBIND_BUTTON_TEXT_FIRST = (char *)"确认";\r
 static const char *UNBIND_BUTTON_TEXT_SECOND = (char *)"取消";\r
 \r
-static const int16 EXIT_BUTTON_WIDTH = 169;\r
-static const int16 EXIT_BUTTON_HEIGHT = 73;\r
-static const int16 EXIT_BUTTON_FONT = 38;\r
+static const int16 EXIT_BUTTON_WIDTH = 170;\r
+static const int16 EXIT_BUTTON_HEIGHT = 90;\r
+static const int16 EXIT_BUTTON_FONT = 26;\r
 \r
 AlipayUnbind::AlipayUnbind(AlipayPresenter *presenter)\r
 {\r
@@ -64,6 +65,11 @@ AlipayUnbind::~AlipayUnbind()
             alipayButton[buttonNum] = nullptr;\r
         }\r
     }\r
+    if(AttentionImage)\r
+    {\r
+        delete AttentionImage;\r
+        AttentionImage =nullptr;\r
+    }\r
 }\r
 \r
 bool AlipayUnbind::AlipayInitLabel()\r
@@ -80,7 +86,7 @@ bool AlipayUnbind::AlipayInitLabel()
     alipayLabel[ALIPAY_SET_ZERO]->SetFont(DEFAULT_VECTOR_FONT_FILENAME, EXIT_LABEL_FONT_FIRST);\r
     alipayLabel[ALIPAY_SET_ZERO]->SetStyle(STYLE_TEXT_FONT, EXIT_LABEL_FONT_FIRST);\r
     alipayLabel[ALIPAY_SET_ZERO]->SetAlign(TEXT_ALIGNMENT_CENTER);\r
-    alipayLabel[ALIPAY_SET_ZERO]->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);\r
+    alipayLabel[ALIPAY_SET_ZERO]->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);\r
 \r
     Add(alipayLabel[ALIPAY_SET_ZERO]);\r
 \r
@@ -93,11 +99,25 @@ bool AlipayUnbind::AlipayInitLabel()
         EXIT_LABEL_HEIGHT_SEC);\r
     alipayLabel[ALIPAY_SET_ONE]->SetText(UNBIND_LABEL_TEXT_SECOND);\r
     alipayLabel[ALIPAY_SET_ONE]->SetFont(DEFAULT_VECTOR_FONT_FILENAME, EXIT_LABEL_FONT_SEC);\r
-    alipayLabel[ALIPAY_SET_ONE]->SetStyle(STYLE_LINE_SPACE, 12);\r
-    alipayLabel[ALIPAY_SET_ONE]->SetStyle(STYLE_TEXT_FONT, EXIT_LABEL_FONT_SEC);\r
+    //alipayLabel[ALIPAY_SET_ONE]->SetStyle(STYLE_LINE_SPACE, 12);\r
+    //alipayLabel[ALIPAY_SET_ONE]->SetStyle(STYLE_TEXT_FONT, EXIT_LABEL_FONT_SEC);\r
+    alipayLabel[ALIPAY_SET_ONE]->SetTextColor(Color::GetColorFromRGBA(0xAA, 0xAA, 0xAA, 0xFF));\r
+    alipayLabel[ALIPAY_SET_ONE]->SetAlign(TEXT_ALIGNMENT_CENTER);\r
     alipayLabel[ALIPAY_SET_ONE]->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);\r
     Add(alipayLabel[ALIPAY_SET_ONE]);\r
 \r
+    AttentionImage=new UIImageView();\r
+    if (AttentionImage == nullptr)\r
+    {\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemFactoryResetView::new FactoryResetImage fail!");\r
+        return false;\r
+    }\r
+    AttentionImage->SetPosition(193, 110);\r
+    AttentionImage->SetSrc(PNG_ATTENTION_IMAGE);\r
+    Add(AttentionImage);\r
+\r
+\r
+\r
     return true;\r
 }\r
 \r
@@ -110,11 +130,12 @@ bool AlipayUnbind::InitSimilarButton(int16 num, int16 alipayX, int16 alipayY, co
     }\r
     int64_t backColor = 0;\r
     if (num == 0) {\r
-        backColor = 0xff4a83bf;\r
-        alipayButton[num]->SetTextColor(Color::GetColorFromRGBA(0x00, 0x00, 0x00, 0xff));\r
-        alipayButton[num]->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff);\r
+        backColor = 0xff191919;\r
+        //alipayButton[num]->SetTextColor(Color::GetColorFromRGBA(0x19, 0x19, 0x19, 0x19));\r
+        alipayButton[num]->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919);\r
     } else if (num == 1) {\r
-        backColor = 0xff0b1928;\r
+        backColor = 0xff0176ff;\r
+        alipayButton[num]->SetStyle(STYLE_BACKGROUND_COLOR, 0xff0176ff);\r
     }\r
     alipayButton[num]->SetPosition(alipayX, alipayY, EXIT_BUTTON_WIDTH, EXIT_BUTTON_HEIGHT);\r
     alipayButton[num]->SetText(buttonStr);\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayUnbindFinish.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayUnbindFinish.cpp
index 817d90b..2bbfe63 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayUnbindFinish.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayUnbindFinish.cpp
@@ -79,20 +79,21 @@ bool AlipayUnbindFinish::AlipayInitLabel(void)
 \r
     Add(titleUnbind);\r
 \r
-    titleUnbind = new UILabel();\r
-    if (titleUnbind == nullptr) {\r
+    textUnbind = new UILabel();\r
+    if (textUnbind == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayUnbindFinish::AlipayInitLabel new label fail");\r
         return false;\r
     }\r
-    titleUnbind->SetText(UNBIND_FINISH_TEXT);\r
-    titleUnbind->SetFont(DEFAULT_VECTOR_FONT_FILENAME, UNBIND_FINISH_TEXT_FONT);\r
-    titleUnbind->SetPosition(UNBIND_FINISH_TEXT_X, UNBIND_FINISH_TEXT_Y, UNBIND_FINISH_TEXT_WIDTH,\r
+    textUnbind->SetText(UNBIND_FINISH_TEXT);\r
+    textUnbind->SetFont(DEFAULT_VECTOR_FONT_FILENAME, UNBIND_FINISH_TEXT_FONT);\r
+    textUnbind->SetPosition(UNBIND_FINISH_TEXT_X, UNBIND_FINISH_TEXT_Y, UNBIND_FINISH_TEXT_WIDTH,\r
         UNBIND_FINISH_TEXT_HEIGHT);\r
-    titleUnbind->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);\r
-    titleUnbind->SetStyle(STYLE_TEXT_FONT, UNBIND_FINISH_TEXT_FONT);\r
-    titleUnbind->SetStyle(STYLE_LINE_SPACE, 6);\r
-\r
-    Add(titleUnbind);\r
+    textUnbind->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);\r
+    textUnbind->SetStyle(STYLE_TEXT_FONT, UNBIND_FINISH_TEXT_FONT);\r
+    textUnbind->SetStyle(STYLE_LINE_SPACE, 6);\r
+    textUnbind->SetTextColor(Color::GetColorFromRGBA(0xAA, 0xAA, 0xAA, 0xFF));\r
+    textUnbind->SetAlign(TEXT_ALIGNMENT_CENTER);\r
+    Add(textUnbind);\r
 \r
     return true;\r
 }\r

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 0fe261e..e6d64cb 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/goal/src/goalview.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/goal/src/goalview.cpp
@@ -265,7 +265,7 @@ namespace OHOS
             stepAnimatorView->SetPosition(183, 90, 100, 100);
             stepAnimatorView->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff);
             stepAnimatorView->SetStyle(STYLE_BACKGROUND_OPA, 0xff);
-            stepAnimatorView->SetImageAnimatorSrc(goalAnimatorInfo, 20, 100);
+            stepAnimatorView->SetImageAnimatorSrc(goalAnimatorInfo, 20, 50);
             stepAnimatorView->SetRepeat(true);
             stepAnimatorView->Start();
         }

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/alipay/include/AlipayBindAni.h b/code/sdk/application/wearable/nativeapp/nativeui/alipay/include/AlipayBindAni.h
index ea2cc58..6f29d87 100644 (file)
--- a/code/sdk/application/wearable/nativeapp/nativeui/alipay/include/AlipayBindAni.h
+++ b/code/sdk/application/wearable/nativeapp/nativeui/alipay/include/AlipayBindAni.h
@@ -30,6 +30,7 @@ private:
     UILabel *alipayLabel { nullptr };\r
     UIImageAnimatorView *alipayImageAni { nullptr };\r
     ImageAnimatorInfo searchImageInfo[ALIPAY_BIND_SEARCH_IMAGE_NUM];\r
+  \r
 };\r
 }\r
 #endif
\ No newline at end of file

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/alipay/include/AlipayUnbind.h b/code/sdk/application/wearable/nativeapp/nativeui/alipay/include/AlipayUnbind.h
index 183b806..c77eaf4 100644 (file)
--- a/code/sdk/application/wearable/nativeapp/nativeui/alipay/include/AlipayUnbind.h
+++ b/code/sdk/application/wearable/nativeapp/nativeui/alipay/include/AlipayUnbind.h
@@ -27,6 +27,7 @@ private:
     AlipayPresenter *presenter_;\r
     UILabel *alipayLabel[ALIPAY_SET_TWO] { nullptr };\r
     UILabelButton *alipayButton[ALIPAY_SET_TWO] { nullptr };\r
+    \r
 };\r
 }\r
 #endif
\ No newline at end of file

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/alipay/1.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/alipay/1.bin
new file mode 100644 (file)
index 0000000..76ebc1d
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/alipay/1.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:78107b4519e57b5b0737d21dd855c8786e77111afd1c5b50e4d2d5b817ac0c1b
+size 4504

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/alipay/2.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/alipay/2.bin
new file mode 100644 (file)
index 0000000..54a0249
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/alipay/2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9125b84c19b07ebca138b1fa49bd049f48ed5f138bfc4e63b61bf15db987ddf3
+size 4504

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/alipay/3.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/alipay/3.bin
new file mode 100644 (file)
index 0000000..a13dd20
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/alipay/3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:96e04fd4696ece9f971938c0272f00257266d8b6899cc9ea3371d548da260693
+size 4504

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/alipay/4.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/alipay/4.bin
new file mode 100644 (file)
index 0000000..5b00452
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/alipay/4.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:966f76cc73a4ec2539ee6c7f7b511727a67f5d95e8e0b86f916179f5a147e9be
+size 4504

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/alipay/5.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/alipay/5.bin
new file mode 100644 (file)
index 0000000..f746a19
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/alipay/5.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d8ec36638755327980836b2301d13d446b14a6fba50a9e7dc7860bb2055b3837
+size 4504

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/alipay/6.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/alipay/6.bin
new file mode 100644 (file)
index 0000000..bb782ee
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/alipay/6.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a12da421c595cbc68b804765d588475a809816eef094527a5b07eea4a285f232
+size 4504

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/alipay/7.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/alipay/7.bin
new file mode 100644 (file)
index 0000000..49b1649
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/alipay/7.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1475fc806f229e115db4a0729f264ddc5471ca719b8ec6f90a467b4d20779dc7
+size 4504

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/alipay/8.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/alipay/8.bin
new file mode 100644 (file)
index 0000000..0a91818
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/alipay/8.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b203f3874ac14c642e06e233852fa40e16da3f8c847bc5adc878ba9402c89192
+size 4504

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/alipay/alipaylog.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/alipay/alipaylog.bin
new file mode 100644 (file)
index 0000000..7801d8e
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/alipay/alipaylog.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:490be57f49cf691f45736cb377ea1e298ada45cb11555c8f3c6d5f06abf186b8
+size 21624

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/alipay/no.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/alipay/no.bin
new file mode 100644 (file)
index 0000000..391096c
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/alipay/no.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7c3b9af150e162e1e19aea6c066844a4c159d8732bea5e85b79c0f3b36fb9085
+size 17304

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/alipay/yes.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/alipay/yes.bin
new file mode 100644 (file)
index 0000000..eee475c
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/alipay/yes.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bbd44def8b0cb27f86809721c75367d505233a50de9930a4a6bfae02c29566ba
+size 17304