From: luozheng <1732036298@qq.com>
Date: Mon, 16 Jun 2025 10:26:27 +0000 (+0800)
Subject: 1.支付宝-乘车码界面修改
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=1fdf78a25ac235d8707d5c7f02c59cffeb8be343;p=mirrors%2FFD230.git

1.支付宝-乘车码界面修改
2.添加支付宝界面投票
---

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayPresenter.cpp
index 402be8ccd..396c190c4 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayPresenter.cpp
@@ -29,6 +29,37 @@
 #include "gfx_utils/mem_check.h"
 #include "AlipayC.h"
 namespace OHOS {
+
+#ifdef __cplusplus
+    extern "C"
+    {
+#endif
+
+#include "pm.h"
+#include "pm_veto.h"
+
+        void remove_ALIPAY_vote(void)
+        {
+            uint8_t cnt = pm_veto_get_id_cnt(PM_ID_ALIPAY);
+            if (cnt == 1)
+            {
+                uapi_pm_remove_sleep_veto(PM_ID_ALIPAY);
+            }
+        }
+
+        void add_ALIPAY_vote(void)
+        {
+            uint8_t cnt = pm_veto_get_id_cnt(PM_ID_ALIPAY);
+            if (cnt == 0)
+            {
+                uapi_pm_add_sleep_veto(PM_ID_ALIPAY);
+            }
+        }
+
+#ifdef __cplusplus
+    }
+#endif
+
 static AlipayPresenter *g_alipayPresenter = nullptr;
 
 ColorType AlipayPresenter::CyanColor()
@@ -69,6 +100,7 @@ void AlipayPresenter::OnStart()
     Presenter<AlipayMainView>::OnStart();
  
     /* -------------------------------- 设置支付宝界面常亮 ------------------------------- */
+    add_ALIPAY_vote();
     alipayMode_->AlipayScreenControl(true);
     /* -------------------------------------------------------------------------- */
     alipayMode_->AlipayExitLpm();
@@ -100,6 +132,7 @@ void AlipayPresenter::OnStop(void)
     alipayMode_->AlipayEnterLpm();
 
     /* -------------------------------- 恢复屏幕保持亮屏的时间 ------------------------------- */
+    remove_ALIPAY_vote();
     alipayMode_->AlipayScreenControl(false);
 }
 
diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayGetTransList.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayGetTransList.cpp
index ec161aa9b..7d5521813 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayGetTransList.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayGetTransList.cpp
@@ -14,21 +14,21 @@
 #include "alipay/include/AlipayTrans/AlipayGetTransList.h"
 
 namespace OHOS {
-static const int16 EXIT_LABEL_X_FIRST = 60;
-static const int16 EXIT_LABEL_Y_FIRST = 79;
-static const int16 EXIT_LABEL_WIDTH_FIRST = 333;
-static const int16 EXIT_LABEL_HEIGHT_FIRST = 238;
+static const int16 EXIT_LABEL_X_FIRST = 53;
+static const int16 EXIT_LABEL_Y_FIRST = 100;
+static const int16 EXIT_LABEL_WIDTH_FIRST = 360;
+static const int16 EXIT_LABEL_HEIGHT_FIRST = 175;
 
 static const int16 EXIT_LABEL_FONT_FIRST = 30;
 static const char *GET_TRANS_LIST_TEXT_1 =
-    (char *)"初次使用，完成以下步骤\n1.手机设置-蓝牙，打开并与手表连接配对；\n2.手机“运动健康”确保设备已连接；";
+    (char *)"初次使用，完成以下步骤\n1.手机设置-蓝牙，打开并与手表连接配对；\n2.手机“KUMI COMM”确保设备已连接；";
 static const char *GET_TRANS_LIST_TEXT_2 =
-    (char *)"完成以下步骤,请重试\n1.手机设置-蓝牙，打开并与手表连接配对；\n2.手机“运动健康”确保设备已连接；";
-static const int16 EXIT_BUTTON_EXIT_X = 50;
-static const int16 EXIT_BUTTON_EXIT_Y = 312;
+    (char *)"完成以下步骤,请重试\n1.手机设置-蓝牙，打开并与手表连接配对；\n2.手机“KUMI COMM”确保设备已连接；";
+static const int16 EXIT_BUTTON_EXIT_X = 58;
+static const int16 EXIT_BUTTON_EXIT_Y = 320;
 
-static const int16 EXIT_BUTTON_BIND_X = 233;
-static const int16 EXIT_BUTTON_BIND_Y = 312;
+static const int16 EXIT_BUTTON_BIND_X = 238;
+static const int16 EXIT_BUTTON_BIND_Y = 320;
 
 static const char *GET_TRANS_LISTBUTTON_TEXT_LEFT1 = (char *)"退出";
 static const char *GET_TRANS_LISTBUTTON_TEXT_RIGHT1 = (char *)"已完成";
@@ -36,9 +36,9 @@ static const char *GET_TRANS_LISTBUTTON_TEXT_RIGHT1 = (char *)"已完成";
 static const char *GET_TRANS_LISTBUTTON_TEXT_LEFT2 = (char *)"重试";
 static const char *GET_TRANS_LISTBUTTON_TEXT_RIGHT2 = (char *)"详情";
 
-static const int16 EXIT_BUTTON_WIDTH = 169;
-static const int16 EXIT_BUTTON_HEIGHT = 73;
-static const int16 EXIT_BUTTON_FONT = 38;
+static const int16 EXIT_BUTTON_WIDTH = 170;
+static const int16 EXIT_BUTTON_HEIGHT = 90;
+static const int16 EXIT_BUTTON_FONT = 26;
 
 typedef struct AlipayTransGetListInfo {
     const char *str;
@@ -110,11 +110,11 @@ bool AlipayGetTransList::InitSimilarButton(int16 num, int16 alipayX, int16 alipa
     }
     int64_t backColor = 0;
     if (num == 0) {
-        backColor = 0xff4a83bf;
-        alipayButton[num]->SetTextColor(Color::GetColorFromRGBA(0x00, 0x00, 0x00, 0xff));
-        alipayButton[num]->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff);
+        backColor = 0xff0176ff;
+        // alipayButton[num]->SetTextColor(Color::GetColorFromRGBA(0x00, 0x00, 0x00, 0xff));
+        alipayButton[num]->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919);
     } else if (num == 1) {
-        backColor = 0xff0b1928;
+        backColor = 0xff0176ff;
     }
     alipayButton[num]->SetPosition(alipayX, alipayY, EXIT_BUTTON_WIDTH, EXIT_BUTTON_HEIGHT);
     alipayButton[num]->SetText(buttonStr);
diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransRes.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransRes.cpp
index c7b5558b2..e8a11372f 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransRes.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransRes.cpp
@@ -14,14 +14,14 @@
 #include "AlipayModel.h"
 
 namespace OHOS {
-static const int16 EXIT_LABEL_X_FIRST = 38;
-static const int16 EXIT_LABEL_Y_FIRST = 179;
-static const int16 EXIT_LABEL_WIDTH_FIRST = 378;
-static const int16 EXIT_LABEL_HEIGHT_FIRST = 84;
+static const int16 EXIT_LABEL_X_FIRST = 53;
+static const int16 EXIT_LABEL_Y_FIRST = 180;
+static const int16 EXIT_LABEL_WIDTH_FIRST = 360;
+static const int16 EXIT_LABEL_HEIGHT_FIRST = 70;
 
 static const int16 EXIT_LABEL_FONT_FIRST = 30;
 
-static const char *EXIT_LABEL_TEXT_1 = (char *)"网络异常，请打开手机运动健康app，并确保设备已连接后再重试";
+static const char *EXIT_LABEL_TEXT_1 = (char *)"网络异常，请打开手机“KUMI COMM”并确保设备已连接后再重试";
 
 static const int16 RES_IMAGE_X = 170;
 static const int16 RES_IMAGE_Y = 55;
@@ -29,18 +29,18 @@ static const int16 RES_IMAGE_WIDTH = 112;
 static const int16 RES_IMAGE_HEIGHT = 112;
 
 static const char *RECOGNIZE_BUTTON = (char *)"确定";
-static const int16 RECOGNIZE_BUTTON_FONT = 38;
-static const int16 RECOGNIZE_BUTTON_X = 50;
-static const int16 RECOGNIZE_BUTTON_Y = 312;
-static const int16 RECOGNIZE_BUTTON_WIDTH = 169;
-static const int16 RECOGNIZE_BUTTON_HEIGHT = 73;
+static const int16 RECOGNIZE_BUTTON_FONT = 30;
+static const int16 RECOGNIZE_BUTTON_X = 58;
+static const int16 RECOGNIZE_BUTTON_Y = 320;
+static const int16 RECOGNIZE_BUTTON_WIDTH = 170;
+static const int16 RECOGNIZE_BUTTON_HEIGHT = 90;
 
 static const char *RECOGNIZE_BUTTON_SEC = (char *)"详情";
-static const int16 RECOGNIZE_BUTTON_SEC_FONT = 38;
-static const int16 RECOGNIZE_BUTTON_SEC_X = 233;
-static const int16 RECOGNIZE_BUTTON_SEC_Y = 312;
-static const int16 RECOGNIZE_BUTTON_SEC_WIDTH = 169;
-static const int16 RECOGNIZE_BUTTON_SEC_HEIGHT = 73;
+static const int16 RECOGNIZE_BUTTON_SEC_FONT = 30;
+static const int16 RECOGNIZE_BUTTON_SEC_X = 238;
+static const int16 RECOGNIZE_BUTTON_SEC_Y = 320;
+static const int16 RECOGNIZE_BUTTON_SEC_WIDTH = 170;
+static const int16 RECOGNIZE_BUTTON_SEC_HEIGHT = 90;
 
 typedef struct AlipayTransResInfo {
     const char *str;
@@ -107,7 +107,7 @@ bool AlipayTransRes::AlipayInitLabel(const char *resStr)
     alipayLabel->SetText(resStr);
     alipayLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, EXIT_LABEL_FONT_FIRST);
     alipayLabel->SetStyle(STYLE_TEXT_FONT, EXIT_LABEL_FONT_FIRST);
-    alipayLabel->SetAlign(TEXT_ALIGNMENT_LEFT);
+    alipayLabel->SetAlign(TEXT_ALIGNMENT_CENTER,TEXT_ALIGNMENT_CENTER);
     alipayLabel->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);
 
     Add(alipayLabel);
@@ -146,10 +146,10 @@ bool AlipayTransRes::AlipayInitButton(uint32_t index)
     alipayButton->SetAlign(TEXT_ALIGNMENT_CENTER);
     alipayButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME, RECOGNIZE_BUTTON_FONT);
     alipayButton->SetViewId(g_AlipayTransResMapper[index].button_left);
-    alipayButton->SetStyleForState(STYLE_BORDER_COLOR, 0xff4a83bf, UIButton::PRESSED);
+    alipayButton->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED);
     alipayButton->SetOnClickListener(presenter_);
-    alipayButton->SetTextColor(Color::GetColorFromRGBA(0x00, 0x00, 0x00, 0xff));
-    alipayButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff);
+    // alipayButton->SetTextColor(Color::GetColorFromRGBA(0x00, 0x00, 0x00, 0xff));
+    alipayButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919);
     Add(alipayButton);
 
     alipayButtonSec = new UILabelButton();
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 79ffdd814..4aec64daf 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransTips.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransTips.cpp
@@ -17,19 +17,19 @@
 
 namespace OHOS {
 static const int16 TIPS_LABEL_X_FIRST = (HORIZONTAL_RESOLUTION - 360) / 2;
-static const int16 TIPS_LABEL_Y_FIRST = 180;
+static const int16 TIPS_LABEL_Y_FIRST = 200;
 static const int16 TIPS_LABEL_WIDTH_FIRST = 360;
 static const int16 TIPS_LABEL_HEIGHT_FIRST = 70;
 static const int16 TIPS_LABEL_FONT_FIRST = 30;
 
 static const char *TIPS_LABEL_TEXT_1 = (char *)"未知错误_具体错误码，请联系设备厂商解决";
-static const char *TIPS_LABEL_TEXT_2 = (char *)"开通的乘车码数量太多，清在手机支付宝-出行-管理中，管理后再用";
+static const char *TIPS_LABEL_TEXT_2 = (char *)"开通的乘车码数量太多，请在手机支付宝-出行-管理中管理后再用";
 static const char *TIPS_LABEL_TEXT_3 = (char *)"存在安全风险，12小时内不可用，请切换到手机侧使用";
 static const char *TIPS_LABEL_TEXT_4 = (char *)"未知错误_具体错误码，请联系设备厂商解决";
 static const char *TIPS_LABEL_TEXT_5 = (char *)"暂不支持，请切换到手机侧使用";
 
 static const int16 RES_IMAGE_X = (HORIZONTAL_RESOLUTION - 112) / 2;
-static const int16 RES_IMAGE_Y = 50;
+static const int16 RES_IMAGE_Y = 55;
 static const int16 RES_IMAGE_WIDTH = 112;
 static const int16 RES_IMAGE_HEIGHT = 112;
 
@@ -102,7 +102,7 @@ bool AlipayTransTips::AlipayInitLabel(const char *resStr)
     alipayLabel->SetText((const char *)resStr);
     alipayLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, TIPS_LABEL_FONT_FIRST);
     alipayLabel->SetStyle(STYLE_TEXT_FONT, TIPS_LABEL_FONT_FIRST);
-    alipayLabel->SetAlign(TEXT_ALIGNMENT_LEFT);
+    alipayLabel->SetAlign(TEXT_ALIGNMENT_CENTER,TEXT_ALIGNMENT_CENTER);
     alipayLabel->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);
 
     Add(alipayLabel);
diff --git a/code/sdk/middleware/chips/brandy/pm/include/pm_definition.h b/code/sdk/middleware/chips/brandy/pm/include/pm_definition.h
index b4eb91933..382e10465 100755
--- a/code/sdk/middleware/chips/brandy/pm/include/pm_definition.h
+++ b/code/sdk/middleware/chips/brandy/pm/include/pm_definition.h
@@ -51,6 +51,9 @@ typedef enum {
     PM_ID_P_TEST,//产测
     PM_ID_BUTTON_GPIO,//gpio按键
     PM_ID_4G_AI,//4g AI
+#ifdef SUPPORT_ALIPAY_SEC
+    PM_ID_ALIPAY,//支付宝
+#endif
 #ifdef ENABLE_BN02
     PM_ID_BP,//血压
 #endif
diff --git a/code/sdk/middleware/chips/brandy/pm/pm.c b/code/sdk/middleware/chips/brandy/pm/pm.c
index 4fb1675ba..ce3332292 100755
--- a/code/sdk/middleware/chips/brandy/pm/pm.c
+++ b/code/sdk/middleware/chips/brandy/pm/pm.c
@@ -240,6 +240,9 @@ const char* pm_id_name_arr[] ={
     "PM_ID_P_TEST",
     "PM_ID_BUTTON_GPIO",//GPIO按键
     "PM_ID_4G_AI",//AI投票
+#ifdef SUPPORT_ALIPAY_SEC
+    "PM_ID_ALIPAY",//支付宝
+#endif
 #ifdef ENABLE_BN02
     "PM_ID_BP",//血压
 #endif