支付宝界面UI优化

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListItem.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListItem.h
index a9d5d3d..4782ae0 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListItem.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListItem.h
@@ -15,7 +15,7 @@ namespace OHOS {
 /*
  * alipayList id.
  */
-#define SUPPORT_ALIPAY_TRANS 0
+#define SUPPORT_ALIPAY_TRANS 1
 typedef enum : uint16_t {
     // alipayList item index
     ALIPAY_LIST_ITEM_PAY,

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListItemView.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListItemView.h
index 02cd06f..4542473 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListItemView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListItemView.h
@@ -29,6 +29,7 @@ private:
     UIImageView sIcon;
     UILabel sLabel;
     UIImageView sNextImage;
+    UIImageView back;
     AlipayListItem sItemInfo;
 };
 }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListView.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListView.h
index 075df43..769ada7 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListView.h
@@ -17,7 +17,8 @@
 #include "components/ui_scroll_view.h"
 #include "components/ui_list.h"
 #include "components/icon_adapter.h"
-#include "AlipayPresenter.h"
+// #include "AlipayPresenter.h"
+#include "alipay/include/AlipayPresenter.h"
 #include "AppViewIDs.h"
 #include"ui_resource_string.h"
 #include "UiConfig.h"
@@ -39,7 +40,7 @@ private:
     AlipayPresenter *presenter_;
     AlipayListAdapter *listAdapter { nullptr };
     UIList *contentList { nullptr };
-    AlipayListItem alipayLists[ALIPAY_LIST_ITEM_MAX];
+    AlipayListItem alipayLists[ALIPAY_LIST_ITEM_MAX + 1] = {ALIPAY_LIST_ITEM_MAX,nullptr,nullptr,nullptr,false}; //加1是为了给标题一个位置（UI优化）
 };
 }
 #endif
\ No newline at end of file

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayPresenter.h
index 9690a02..46b90ba 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayPresenter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayPresenter.h
@@ -84,11 +84,11 @@ typedef enum {
 } alipayInterfacesId;\r
 \r
 typedef enum {\r
-    ALIPAY_TRANS_TIPS_UNKNOW = 0,\r
-    ALIPAY_TRANS_TIPS_TO_MUCH,\r
-    ALIPAY_TRANS_TIPS_SECURE,\r
-    ALIPAY_TRANS_TIPS_LIST_UNKNOW,\r
-    ALIPAY_TRANS_TIPS_NOT_SUPPORT,\r
+    ALIPAY_TRANS_TIPS_UNKNOW = 0,       //未知错误_具体错误码，请联系设备厂商解决\r
+    ALIPAY_TRANS_TIPS_TO_MUCH,          //开通的乘车码数量太多，清在手机支付宝-出行-管理中，管理后再用\r
+    ALIPAY_TRANS_TIPS_SECURE,           //存在安全风险，12小时内不可用，请切换到手机侧使用\r
+    ALIPAY_TRANS_TIPS_LIST_UNKNOW,      //未知错误_具体错误码，请联系设备厂商解决\r
+    ALIPAY_TRANS_TIPS_NOT_SUPPORT,      //暂不支持，请切换到手机侧使用\r
 } alipayTransTipsId;\r
 \r
 typedef enum {\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipaySetting.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipaySetting.h
index a734661..3d2c0bf 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipaySetting.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipaySetting.h
@@ -26,10 +26,10 @@ private:
     bool AlipayInitButton();\r
     bool AlipayInitLabel(void);\r
     AlipayPresenter *presenter_;\r
-    UILabel *labelTitle { nullptr };\r
-    UILabel *labelName { nullptr };\r
-    UILabel *labelId { nullptr };\r
-    UILabelButton *buttonSetting { nullptr };\r
+    UILabel *labelTitle { nullptr };          // 标题：设置\r
+    UILabel *labelName { nullptr };           // 用户名称\r
+    UILabel *labelId { nullptr };             \r
+    UILabelButton *buttonSetting { nullptr }; // 解除绑定按钮\r
 };\r
 }\r
 #endif
\ No newline at end of file

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 2f9bf47..c24d184 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayExitBind.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayExitBind.cpp
@@ -13,18 +13,18 @@
 \r
 namespace OHOS {\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_WIDTH_SEC = 360;\r
+\r
 static const int16 EXIT_LABEL_HEIGHT_FIRST = 35;\r
+static const int16 EXIT_LABEL_HEIGHT_SEC = 70;\r
+\r
+static const int16 EXIT_LABEL_X_FIRST = (HORIZONTAL_RESOLUTION - EXIT_LABEL_WIDTH_FIRST) / 2;\r
+static const int16 EXIT_LABEL_X_SEC = (HORIZONTAL_RESOLUTION - EXIT_LABEL_WIDTH_SEC) / 2;\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

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayList/AlipayListAdapter.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayList/AlipayListAdapter.cpp
index bf6e90b..3cc6fdd 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayList/AlipayListAdapter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayList/AlipayListAdapter.cpp
@@ -6,8 +6,10 @@
  * Create:
  */
 
-#include "AlipayListAdapter.h"
-#include "AlipayListItemView.h"
+// #include "AlipayListAdapter.h"
+// #include "AlipayListItemView.h"
+#include "alipay/include/AlipayList/AlipayListAdapter.h"
+#include "alipay/include/AlipayList/AlipayListItemView.h"
 
 namespace OHOS {
 AlipayListAdapter::AlipayListAdapter()

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayList/AlipayListItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayList/AlipayListItemView.cpp
index 4cd238d..63d7316 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayList/AlipayListItemView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayList/AlipayListItemView.cpp
@@ -6,19 +6,28 @@
  */
 
 #include "wearable_log.h"
-#include "AlipayListItemView.h"
+// #include "AlipayListItemView.h"
+#include "alipay/include/AlipayList/AlipayListItemView.h"
 
 namespace OHOS {
-static constexpr int16 ALIPAY_LIST_ICON_X = 20;
-static constexpr int16 NUM_22 = 22;
-static constexpr int16_t ALIPAY_LIST_ICON_WIDTH = 64;
-static constexpr int16_t ALIPAY_LIST_ICON_HEIGHT = 64;
-static constexpr int16_t ALIPAY_LIST_ITEM_BUTTON_HEIGHT = 100;
-static constexpr int16_t ALIPAY_LIST_ITEM_LABEL_WIDTH = 122;
-static constexpr int16_t ALIPAY_LIST_ITEM_LABEL_HEIGHT = 100;
-static constexpr int16_t ALIPAY_LIST_ITEM_FONT_SIZE = 40;
-static constexpr int16_t ALIPAY_LISTS_RESIZE_SIZE = 100;
-static constexpr int16_t ALIPAY_LIST_SICON_Y = 15;
+static constexpr int16_t ALIPAY_LIST_ITEM_BUTTON_HEIGHT = 120;
+
+static constexpr int16 ALIPAY_LIST_BACK_X = 43;
+static constexpr int16 ALIPAY_LIST_BACK_Y = 0;
+static constexpr int16_t ALIPAY_LIST_BACK_WIDTH = 380;
+static constexpr int16_t ALIPAY_LIST_BACK_HEIGHT = 100;
+
+static constexpr int16 ALIPAY_LIST_ICON_X = 19 + ALIPAY_LIST_BACK_X;
+static constexpr int16 ALIPAY_LIST_ICON_Y = 19;
+static constexpr int16_t ALIPAY_LIST_ICON_WIDTH = 62;
+static constexpr int16_t ALIPAY_LIST_ICON_HEIGHT = 62;
+
+static constexpr int16_t ALIPAY_LIST_ITEM_LABEL_X = 115 + ALIPAY_LIST_BACK_X;
+static constexpr int16_t ALIPAY_LIST_ITEM_LABEL_Y = 33;
+static constexpr int16_t ALIPAY_LIST_ITEM_LABEL_WIDTH = 180;
+static constexpr int16_t ALIPAY_LIST_ITEM_LABEL_HEIGHT = 35;
+static constexpr int16_t ALIPAY_LIST_ITEM_FONT_SIZE = 30;
+
 static constexpr int16 NUMS_2 = 2;
 static constexpr int16 NUMS_50 = 50;
 
@@ -31,6 +40,7 @@ AlipayListItemView::AlipayListItemView()
     SetTouchable(true);
     SetUpChild();
 
+    Add(&back);
     Add(&sIcon);
     Add(&sLabel);
     Add(&sNextImage);
@@ -38,6 +48,7 @@ AlipayListItemView::AlipayListItemView()
 
 AlipayListItemView::~AlipayListItemView()
 {
+    Remove(&back);
     Remove(&sIcon);
     Remove(&sLabel);
     Remove(&sNextImage);
@@ -50,30 +61,60 @@ void AlipayListItemView::SetItemInfo(const AlipayListItem &itemInfo)
     sIcon.SetSrc(itemInfo.icon);
     sLabel.SetText(itemInfo.label);
     sNextImage.SetVisible(itemInfo.hasSecondMenu);
+    if(!sItemInfo.hasSecondMenu)
+    {
+        back.SetVisible(false);
+        sIcon.SetVisible(false);
+        sNextImage.SetVisible(false);
+        sLabel.SetPosition((HORIZONTAL_RESOLUTION - ALIPAY_LIST_ITEM_LABEL_WIDTH) / NUMS_2, ALIPAY_LIST_ITEM_LABEL_Y + 17);
+        sLabel.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
+        SetHeight(120);
+    }
+    else
+    {
+        back.SetVisible(true);
+        sIcon.SetVisible(true);
+        sNextImage.SetVisible(true);
+        sLabel.SetPosition(ALIPAY_LIST_ITEM_LABEL_X, ALIPAY_LIST_ITEM_LABEL_Y);
+        sLabel.SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_CENTER);
+        if(sItemInfo.index == ALIPAY_LIST_ITEM_HELP)
+        {
+            SetHeight(180);
+        }
+        else
+        {
+            SetHeight(120);
+        }
+    }
 }
 
 void AlipayListItemView::SetUpChild()
 {
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayListItemView::SetUpChild()");
-    sIcon.SetPosition(ALIPAY_LIST_ICON_X, ALIPAY_LIST_SICON_Y);
+    sIcon.SetPosition(ALIPAY_LIST_ICON_X, ALIPAY_LIST_ICON_Y);
     sIcon.Resize(ALIPAY_LIST_ICON_WIDTH, ALIPAY_LIST_ICON_HEIGHT);
-
     sIcon.SetAutoEnable(false);
-    sIcon.SetResizeMode(UIImageView::FILL);
+    sIcon.SetResizeMode(UIImageView::CENTER);
     sIcon.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE);
 
-    sLabel.SetPosition(ALIPAY_LIST_ITEM_LABEL_WIDTH, 0);
+    sLabel.SetPosition(ALIPAY_LIST_ITEM_LABEL_X, ALIPAY_LIST_ITEM_LABEL_Y);
     sLabel.Resize(ALIPAY_LIST_ITEM_LABEL_WIDTH, ALIPAY_LIST_ITEM_LABEL_HEIGHT);
     sLabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME, ALIPAY_LIST_ITEM_FONT_SIZE);
-    sLabel.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-    sLabel.SetStyle(STYLE_TEXT_OPA, OPA_OPAQUE);
-    sLabel.SetStyle(STYLE_TEXT_COLOR, Color::White().full);
-    sLabel.SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full);
-    sLabel.SetStyle(STYLE_BACKGROUND_OPA, OPA_OPAQUE);
+    sLabel.SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_CENTER);
+    sLabel.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
+    // sLabel.SetStyle(STYLE_TEXT_OPA, OPA_OPAQUE);
+    // sLabel.SetStyle(STYLE_TEXT_COLOR, Color::White().full);
+    // sLabel.SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full);
+    // sLabel.SetStyle(STYLE_BACKGROUND_OPA, OPA_OPAQUE);
 
     sNextImage.SetSrc(PNG_SETTING_NEXT_IMAGE);
     sNextImage.SetPosition(LA_HORIZONTAL_RESOLUTION - NUMS_50, (SETTING_ITEM_HEIGHT - sNextImage.GetHeight()) / NUMS_2);
     sNextImage.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE);
+
+    back.SetPosition(ALIPAY_LIST_BACK_X, ALIPAY_LIST_BACK_Y, ALIPAY_LIST_BACK_WIDTH, ALIPAY_LIST_BACK_HEIGHT);
+    back.SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919);
+    back.SetStyle(STYLE_BACKGROUND_OPA, 0xff);
+    back.SetStyle(STYLE_BORDER_RADIUS, 100);
 }
 
 }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayList/AlipayListView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayList/AlipayListView.cpp
index 0a2f65f..91be991 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayList/AlipayListView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayList/AlipayListView.cpp
@@ -6,8 +6,10 @@
  */
 
 #include <string>
-#include "AlipayListView.h"
-#include "AlipayListItem.h"
+// #include "AlipayListView.h"
+// #include "AlipayListItem.h"
+#include "alipay/include/AlipayList/AlipayListView.h"
+#include "alipay/include/AlipayList/AlipayListItem.h"
 #include "cmsis_os2.h"
 
 namespace OHOS {
@@ -53,9 +55,11 @@ bool AlipayList::AlipayInitList()
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayList::OnStart::contentList is nullptr");
         return false;
     }
-    contentList->SetPosition(ALIPAY_LIST_POSITION_X, ALIPAY_LIST_POSITION_Y);
-    contentList->Resize(HORIZONTAL_RESOLUTION - ALIPAY_LIST_POSITION_X, VERTICAL_RESOLUTION - ALIPAY_LIST_POSITION_Y);
-    contentList->SetScrollBlankSize(ALIPAY_LIST_SCROLLBLANKSIZE);
+    // contentList->SetPosition(ALIPAY_LIST_POSITION_X, ALIPAY_LIST_POSITION_Y);
+    // contentList->Resize(HORIZONTAL_RESOLUTION - ALIPAY_LIST_POSITION_X, VERTICAL_RESOLUTION - ALIPAY_LIST_POSITION_Y);
+    contentList->SetPosition(0, 0);
+    contentList->Resize(HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);
+    // contentList->SetScrollBlankSize(ALIPAY_LIST_SCROLLBLANKSIZE);
     contentList->SetSelectPosition(ALIPAY_LIST_POSITION_Y);
     contentList->SetDraggable(true);
     contentList->SetThrowDrag(false);
@@ -70,6 +74,7 @@ bool AlipayList::AlipayInitList()
 
 void AlipayList::InitAlipayListItem()
 {
+#if 0
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayListModel::InitAlipayListItem()");
     alipayLists[0] = {ALIPAY_LIST_ITEM_PAY, ALIPAY_LIST_PAY_BUTTON, PNG_ALIPAY_LIST_PAY, "付款码", true};
 #if SUPPORT_ALIPAY_TRANS
@@ -80,6 +85,22 @@ void AlipayList::InitAlipayListItem()
     alipayLists[1] = {ALIPAY_LIST_ITEM_SETTING, ALIPAY_LIST_SETTING_BUTTON, PNG_ALIPAY_LIST_SETTING, "设置", true};
     alipayLists[2] = {ALIPAY_LIST_ITEM_HELP, ALIPAY_LIST_HELP_BUTTON, PNG_ALIPAY_LIST_HELP, "帮助", true};
 #endif
+#else
+    /* -------------------------------------------------------------------------- */
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayListModel::InitAlipayListItem()");
+    alipayLists[0] = {ALIPAY_LIST_ITEM_MAX, nullptr, nullptr, "支付宝", false};
+    alipayLists[1] = {ALIPAY_LIST_ITEM_PAY, ALIPAY_LIST_PAY_BUTTON, PNG_ALIPAY_LIST_PAY, "付款码", true};
+    #if SUPPORT_ALIPAY_TRANS
+    alipayLists[2] = {ALIPAY_LIST_ITEM_TRANS, ALIPAY_LIST_TRANS_BUTTON, PNG_ALIPAY_LIST_TRANS, "乘车码", true};
+    alipayLists[3] = {ALIPAY_LIST_ITEM_SETTING, ALIPAY_LIST_SETTING_BUTTON, PNG_ALIPAY_LIST_SETTING, "设置", true};
+    alipayLists[4] = {ALIPAY_LIST_ITEM_HELP, ALIPAY_LIST_HELP_BUTTON, PNG_ALIPAY_LIST_HELP, "帮助", true};
+    #else
+    alipayLists[2] = {ALIPAY_LIST_ITEM_SETTING, ALIPAY_LIST_SETTING_BUTTON, PNG_ALIPAY_LIST_SETTING, "设置", true};
+    alipayLists[3] = {ALIPAY_LIST_ITEM_HELP, ALIPAY_LIST_HELP_BUTTON, PNG_ALIPAY_LIST_HELP, "帮助", true};
+    #endif
+    /* -------------------------------------------------------------------------- */
+
+#endif
 }
 
 bool AlipayList::InitListView()
@@ -102,7 +123,7 @@ bool AlipayList::InitListView()
 void AlipayList::AddAlipayListItemToList(void)
 {
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayList::AddAlipayListItemToList");
-    for (uint8_t i = 0; i < ALIPAY_LIST_ITEM_MAX; i++) {
+    for (uint8_t i = 0; i < ALIPAY_LIST_ITEM_MAX + 1; i++) {
         listAdapter->AddListItem(alipayLists[i]);
     }
 }

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 18ebe11..1431015 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipaySetting.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipaySetting.cpp
@@ -8,37 +8,39 @@
 #include "UiConfig.h"\r
 #include <string>\r
 #include "cmsis_os.h"\r
-#include "AlipaySetting.h"\r
-#include "AlipayModel.h"\r
+// #include "AlipaySetting.h"\r
+// #include "AlipayModel.h"\r
+#include "alipay/include/AlipaySetting.h"\r
+#include "alipay/include/AlipayModel.h"\r
 #include "uicomponents/UIComponents.h"\r
 \r
 namespace OHOS {\r
-static const char *SETTING_TITLE = (char *)"设置";\r
-static const char *SETTING_BUTTON = (char *)"解除绑定";\r
+static const char *SETTING_TITLE = (char *)"设置";      \r
+static const char *SETTING_BUTTON = (char *)"解除绑定"; \r
 \r
-static const int16 SETTING_TITLE_FONT = 38;\r
-static const int16 SETTING_TITLE_X = 0;\r
-static const int16 SETTING_TITLE_Y = 35;\r
-static const int16 SETTING_TITLE_WIDTH = 454;\r
-static const int16 SETTING_TITLE_HEIGHT = 53;\r
+static const int16 SETTING_TITLE_FONT = 30;\r
+static const int16 SETTING_TITLE_X = (HORIZONTAL_RESOLUTION - 300) / 2;\r
+static const int16 SETTING_TITLE_Y = 50;\r
+static const int16 SETTING_TITLE_WIDTH = 300;\r
+static const int16 SETTING_TITLE_HEIGHT = 35;\r
 \r
-static const int16 SETTING_NAME_FONT = 38;\r
-static const int16 SETTING_NAME_X = 0;\r
-static const int16 SETTING_NAME_Y = 142;\r
-static const int16 SETTING_NAME_WIDTH = 454;\r
-static const int16 SETTING_NAME_HEIGHT = 53;\r
+static const int16 SETTING_NAME_FONT = 30;\r
+static const int16 SETTING_NAME_X = (HORIZONTAL_RESOLUTION - 360) / 2;\r
+static const int16 SETTING_NAME_Y = 155;\r
+static const int16 SETTING_NAME_WIDTH = 360;\r
+static const int16 SETTING_NAME_HEIGHT = 35;\r
 \r
 static const int16 SETTING_ID_FONT = 30;\r
-static const int16 SETTING_ID_X = 0;\r
-static const int16 SETTING_ID_Y = 198;\r
-static const int16 SETTING_ID_WIDTH = 454;\r
-static const int16 SETTING_ID_HEIGHT = 109;\r
+static const int16 SETTING_ID_X = (HORIZONTAL_RESOLUTION - 360) / 2;\r
+static const int16 SETTING_ID_Y = 210;\r
+static const int16 SETTING_ID_WIDTH = 360;\r
+static const int16 SETTING_ID_HEIGHT = 35;\r
 \r
-static const int16 SETTING_BUTTON_X = 121;\r
-static const int16 SETTING_BUTTON_Y = 320;\r
-static const int16 SETTING_BUTTON_WIDTH = 212;\r
-static const int16 SETTING_BUTTON_HEIGHT = 73;\r
-static const int16 SETTING_BUTTON_FONT = 38;\r
+static const int16 SETTING_BUTTON_X = (HORIZONTAL_RESOLUTION - 280) / 2;\r
+static const int16 SETTING_BUTTON_Y = 315;\r
+static const int16 SETTING_BUTTON_WIDTH = 280;\r
+static const int16 SETTING_BUTTON_HEIGHT = 90;\r
+static const int16 SETTING_BUTTON_FONT = 30;\r
 \r
 AlipaySetting::AlipaySetting(AlipayPresenter *presenter)\r
 {\r
@@ -118,7 +120,7 @@ bool AlipaySetting::AlipayInitLabel(void)
     labelName->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, SETTING_NAME_FONT);\r
 \r
     labelName->SetPosition(SETTING_NAME_X, SETTING_NAME_Y, SETTING_NAME_WIDTH, SETTING_NAME_HEIGHT);\r
-    labelName->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE);\r
+    labelName->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
     labelName->SetStyle(STYLE_TEXT_FONT, SETTING_NAME_FONT);\r
     labelName->SetAlign(TEXT_ALIGNMENT_CENTER);\r
     labelName->SetRollSpeed(23);\r
@@ -136,7 +138,7 @@ bool AlipaySetting::AlipayInitLabel(void)
     labelId->SetText((const char *)strID);\r
     labelId->SetFont(DEFAULT_VECTOR_FONT_FILENAME, SETTING_ID_FONT);\r
     labelId->SetPosition(SETTING_ID_X, SETTING_ID_Y, SETTING_ID_WIDTH, SETTING_ID_HEIGHT);\r
-    labelId->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE);\r
+    labelId->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
     labelId->SetTextColor(Color::GetColorFromRGBA(0x99, 0x99, 0x99, 0xff));\r
     labelId->SetStyle(STYLE_TEXT_FONT, SETTING_ID_FONT);\r
     labelId->SetAlign(TEXT_ALIGNMENT_CENTER);\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransTips.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransTips.cpp
index 1170666..79ffdd8 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransTips.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransTips.cpp
@@ -10,14 +10,16 @@
 #include "font/ui_font.h"\r
 #include <string>\r
 #include "cmsis_os.h"\r
-#include "AlipayTransTips.h"\r
-#include "AlipayModel.h"\r
+// #include "AlipayTransTips.h"\r
+// #include "AlipayModel.h"\r
+#include "alipay/include/AlipayTrans/AlipayTransTips.h"\r
+#include "alipay/include/AlipayModel.h"\r
 \r
 namespace OHOS {\r
-static const int16 TIPS_LABEL_X_FIRST = 38;\r
-static const int16 TIPS_LABEL_Y_FIRST = 179;\r
-static const int16 TIPS_LABEL_WIDTH_FIRST = 378;\r
-static const int16 TIPS_LABEL_HEIGHT_FIRST = 84;\r
+static const int16 TIPS_LABEL_X_FIRST = (HORIZONTAL_RESOLUTION - 360) / 2;\r
+static const int16 TIPS_LABEL_Y_FIRST = 180;\r
+static const int16 TIPS_LABEL_WIDTH_FIRST = 360;\r
+static const int16 TIPS_LABEL_HEIGHT_FIRST = 70;\r
 static const int16 TIPS_LABEL_FONT_FIRST = 30;\r
 \r
 static const char *TIPS_LABEL_TEXT_1 = (char *)"未知错误_具体错误码，请联系设备厂商解决";\r
@@ -26,17 +28,17 @@ static const char *TIPS_LABEL_TEXT_3 = (char *)"存在安全风险，12小时内
 static const char *TIPS_LABEL_TEXT_4 = (char *)"未知错误_具体错误码，请联系设备厂商解决";\r
 static const char *TIPS_LABEL_TEXT_5 = (char *)"暂不支持，请切换到手机侧使用";\r
 \r
-static const int16 RES_IMAGE_X = 170;\r
-static const int16 RES_IMAGE_Y = 55;\r
+static const int16 RES_IMAGE_X = (HORIZONTAL_RESOLUTION - 112) / 2;\r
+static const int16 RES_IMAGE_Y = 50;\r
 static const int16 RES_IMAGE_WIDTH = 112;\r
 static const int16 RES_IMAGE_HEIGHT = 112;\r
 \r
 static const char *RECOGNIZE_BUTTON = (char *)"确定";\r
-static const int16 RECOGNIZE_BUTTON_FONT = 38;\r
-static const int16 RECOGNIZE_BUTTON_X = 120;\r
-static const int16 RECOGNIZE_BUTTON_Y = 320;\r
-static const int16 RECOGNIZE_BUTTON_WIDTH = 212;\r
-static const int16 RECOGNIZE_BUTTON_HEIGHT = 73;\r
+static const int16 RECOGNIZE_BUTTON_FONT = 30;\r
+static const int16 RECOGNIZE_BUTTON_X = (HORIZONTAL_RESOLUTION - 280) / 2;\r
+static const int16 RECOGNIZE_BUTTON_Y = 315;\r
+static const int16 RECOGNIZE_BUTTON_WIDTH = 280;\r
+static const int16 RECOGNIZE_BUTTON_HEIGHT = 90;\r
 \r
 typedef struct AlipayTransTipsInfo {\r
     const char *str;\r
@@ -120,7 +122,7 @@ bool AlipayTransTips::AlipayInitImage(const char *imageSrc)
 \r
     // Set additional property\r
     alipayImage->SetAutoEnable(false);\r
-    alipayImage->SetResizeMode(UIImageView::FILL);\r
+    alipayImage->SetResizeMode(UIImageView::CENTER);\r
 \r
     Add(alipayImage);\r
     return true;\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 19f6b89..0107e26 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayUnbind.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayUnbind.cpp
@@ -10,7 +10,8 @@
 #include "font/ui_font.h"\r
 #include <string>\r
 #include "cmsis_os.h"\r
-#include "AlipayUnbind.h"\r
+// #include "AlipayUnbind.h"\r
+#include "alipay/include/AlipayUnbind.h"\r
 \r
 namespace OHOS {\r
 static const int16 EXIT_LABEL_X_FIRST = 83;\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 2bbfe63..9a3c629 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayUnbindFinish.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayUnbindFinish.cpp
@@ -8,8 +8,8 @@
 #include "UiConfig.h"\r
 #include <string>\r
 #include "cmsis_os.h"\r
-#include "AlipayUnbindFinish.h"\r
-\r
+// #include "AlipayUnbindFinish.h"\r
+#include "alipay/include/AlipayUnbindFinish.h"\r
 namespace OHOS {\r
 static AlipayUnbindFinish *g_alipayUnbindFinish = nullptr;\r
 \r
@@ -19,23 +19,23 @@ static const char *UNBIND_FINISH_TEXT =
 \r
 static const char *UNBIND_FINISH_BUTTON = (char *)"确认";\r
 \r
-static const int16 UNBIND_FINISH_TITLE_FONT = 38;\r
-static const int16 UNBIND_FINISH_TITLE_X = 0;\r
-static const int16 UNBIND_FINISH_TITLE_Y = 35;\r
-static const int16 UNBIND_FINISH_TITLE_WIDTH = 454;\r
-static const int16 UNBIND_FINISH_TITLE_HEIGHT = 53;\r
+static const int16 UNBIND_FINISH_TITLE_FONT = 30;\r
+static const int16 UNBIND_FINISH_TITLE_X = (HORIZONTAL_RESOLUTION - 300) / 2;\r
+static const int16 UNBIND_FINISH_TITLE_Y = 50;\r
+static const int16 UNBIND_FINISH_TITLE_WIDTH = 300;\r
+static const int16 UNBIND_FINISH_TITLE_HEIGHT = 35;\r
 \r
 static const int16 UNBIND_FINISH_TEXT_FONT = 30;\r
-static const int16 UNBIND_FINISH_TEXT_X = 38;\r
-static const int16 UNBIND_FINISH_TEXT_Y = 126;\r
-static const int16 UNBIND_FINISH_TEXT_WIDTH = 380;\r
-static const int16 UNBIND_FINISH_TEXT_HEIGHT = 166;\r
+static const int16 UNBIND_FINISH_TEXT_X = (HORIZONTAL_RESOLUTION - 360) / 2 ;\r
+static const int16 UNBIND_FINISH_TEXT_Y = 130;\r
+static const int16 UNBIND_FINISH_TEXT_WIDTH = 360;\r
+static const int16 UNBIND_FINISH_TEXT_HEIGHT = 140;\r
 \r
-static const int16 UNBIND_FINISH_BUTTON_FONT = 38;\r
-static const int16 UNBIND_FINISH_BUTTON_X = 120;\r
-static const int16 UNBIND_FINISH_BUTTON_Y = 320;\r
-static const int16 UNBIND_FINISH_BUTTON_WIDTH = 212;\r
-static const int16 UNBIND_FINISH_BUTTON_HEIGHT = 73;\r
+static const int16 UNBIND_FINISH_BUTTON_FONT = 30;\r
+static const int16 UNBIND_FINISH_BUTTON_X = (HORIZONTAL_RESOLUTION - 280) / 2;\r
+static const int16 UNBIND_FINISH_BUTTON_Y = 315;\r
+static const int16 UNBIND_FINISH_BUTTON_WIDTH = 280;\r
+static const int16 UNBIND_FINISH_BUTTON_HEIGHT = 90;\r
 \r
 AlipayUnbindFinish::AlipayUnbindFinish(AlipayPresenter *presenter)\r
 {\r
@@ -90,7 +90,7 @@ bool AlipayUnbindFinish::AlipayInitLabel(void)
         UNBIND_FINISH_TEXT_HEIGHT);\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->SetStyle(STYLE_LINE_SPACE, 6);\r
     textUnbind->SetTextColor(Color::GetColorFromRGBA(0xAA, 0xAA, 0xAA, 0xFF));\r
     textUnbind->SetAlign(TEXT_ALIGNMENT_CENTER);\r
     Add(textUnbind);\r