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 402be8c..396c190 100644 (file)
--- 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"\r
 #include "AlipayC.h"\r
 namespace OHOS {\r
+\r
+#ifdef __cplusplus\r
+    extern "C"\r
+    {\r
+#endif\r
+\r
+#include "pm.h"\r
+#include "pm_veto.h"\r
+\r
+        void remove_ALIPAY_vote(void)\r
+        {\r
+            uint8_t cnt = pm_veto_get_id_cnt(PM_ID_ALIPAY);\r
+            if (cnt == 1)\r
+            {\r
+                uapi_pm_remove_sleep_veto(PM_ID_ALIPAY);\r
+            }\r
+        }\r
+\r
+        void add_ALIPAY_vote(void)\r
+        {\r
+            uint8_t cnt = pm_veto_get_id_cnt(PM_ID_ALIPAY);\r
+            if (cnt == 0)\r
+            {\r
+                uapi_pm_add_sleep_veto(PM_ID_ALIPAY);\r
+            }\r
+        }\r
+\r
+#ifdef __cplusplus\r
+    }\r
+#endif\r
+\r
 static AlipayPresenter *g_alipayPresenter = nullptr;\r
 \r
 ColorType AlipayPresenter::CyanColor()\r
@@ -69,6 +100,7 @@ void AlipayPresenter::OnStart()
     Presenter<AlipayMainView>::OnStart();\r
  \r
     /* -------------------------------- 设置支付宝界面常亮 ------------------------------- */\r
+    add_ALIPAY_vote();\r
     alipayMode_->AlipayScreenControl(true);\r
     /* -------------------------------------------------------------------------- */\r
     alipayMode_->AlipayExitLpm();\r
@@ -100,6 +132,7 @@ void AlipayPresenter::OnStop(void)
     alipayMode_->AlipayEnterLpm();\r
 \r
     /* -------------------------------- 恢复屏幕保持亮屏的时间 ------------------------------- */\r
+    remove_ALIPAY_vote();\r
     alipayMode_->AlipayScreenControl(false);\r
 }\r
 \r

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 ec161aa..7d55218 100644 (file)
--- 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"\r
 \r
 namespace OHOS {\r
-static const int16 EXIT_LABEL_X_FIRST = 60;\r
-static const int16 EXIT_LABEL_Y_FIRST = 79;\r
-static const int16 EXIT_LABEL_WIDTH_FIRST = 333;\r
-static const int16 EXIT_LABEL_HEIGHT_FIRST = 238;\r
+static const int16 EXIT_LABEL_X_FIRST = 53;\r
+static const int16 EXIT_LABEL_Y_FIRST = 100;\r
+static const int16 EXIT_LABEL_WIDTH_FIRST = 360;\r
+static const int16 EXIT_LABEL_HEIGHT_FIRST = 175;\r
 \r
 static const int16 EXIT_LABEL_FONT_FIRST = 30;\r
 static const char *GET_TRANS_LIST_TEXT_1 =\r
-    (char *)"初次使用，完成以下步骤\n1.手机设置-蓝牙，打开并与手表连接配对；\n2.手机“运动健康”确保设备已连接；";\r
+    (char *)"初次使用，完成以下步骤\n1.手机设置-蓝牙，打开并与手表连接配对；\n2.手机“KUMI COMM”确保设备已连接；";\r
 static const char *GET_TRANS_LIST_TEXT_2 =\r
-    (char *)"完成以下步骤,请重试\n1.手机设置-蓝牙，打开并与手表连接配对；\n2.手机“运动健康”确保设备已连接；";\r
-static const int16 EXIT_BUTTON_EXIT_X = 50;\r
-static const int16 EXIT_BUTTON_EXIT_Y = 312;\r
+    (char *)"完成以下步骤,请重试\n1.手机设置-蓝牙，打开并与手表连接配对；\n2.手机“KUMI COMM”确保设备已连接；";\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 *GET_TRANS_LISTBUTTON_TEXT_LEFT1 = (char *)"退出";\r
 static const char *GET_TRANS_LISTBUTTON_TEXT_RIGHT1 = (char *)"已完成";\r
@@ -36,9 +36,9 @@ static const char *GET_TRANS_LISTBUTTON_TEXT_RIGHT1 = (char *)"已完成";
 static const char *GET_TRANS_LISTBUTTON_TEXT_LEFT2 = (char *)"重试";\r
 static const char *GET_TRANS_LISTBUTTON_TEXT_RIGHT2 = (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
 typedef struct AlipayTransGetListInfo {\r
     const char *str;\r
@@ -110,11 +110,11 @@ bool AlipayGetTransList::InitSimilarButton(int16 num, int16 alipayX, int16 alipa
     }\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 = 0xff0176ff;\r
+        // alipayButton[num]->SetTextColor(Color::GetColorFromRGBA(0x00, 0x00, 0x00, 0xff));\r
+        alipayButton[num]->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919);\r
     } else if (num == 1) {\r
-        backColor = 0xff0b1928;\r
+        backColor = 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/AlipayTrans/AlipayTransRes.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransRes.cpp
index c7b5558..e8a1137 100644 (file)
--- 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"\r
 \r
 namespace OHOS {\r
-static const int16 EXIT_LABEL_X_FIRST = 38;\r
-static const int16 EXIT_LABEL_Y_FIRST = 179;\r
-static const int16 EXIT_LABEL_WIDTH_FIRST = 378;\r
-static const int16 EXIT_LABEL_HEIGHT_FIRST = 84;\r
+static const int16 EXIT_LABEL_X_FIRST = 53;\r
+static const int16 EXIT_LABEL_Y_FIRST = 180;\r
+static const int16 EXIT_LABEL_WIDTH_FIRST = 360;\r
+static const int16 EXIT_LABEL_HEIGHT_FIRST = 70;\r
 \r
 static const int16 EXIT_LABEL_FONT_FIRST = 30;\r
 \r
-static const char *EXIT_LABEL_TEXT_1 = (char *)"网络异常，请打开手机运动健康app，并确保设备已连接后再重试";\r
+static const char *EXIT_LABEL_TEXT_1 = (char *)"网络异常，请打开手机“KUMI COMM”并确保设备已连接后再重试";\r
 \r
 static const int16 RES_IMAGE_X = 170;\r
 static const int16 RES_IMAGE_Y = 55;\r
@@ -29,18 +29,18 @@ static const int16 RES_IMAGE_WIDTH = 112;
 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 = 50;\r
-static const int16 RECOGNIZE_BUTTON_Y = 312;\r
-static const int16 RECOGNIZE_BUTTON_WIDTH = 169;\r
-static const int16 RECOGNIZE_BUTTON_HEIGHT = 73;\r
+static const int16 RECOGNIZE_BUTTON_FONT = 30;\r
+static const int16 RECOGNIZE_BUTTON_X = 58;\r
+static const int16 RECOGNIZE_BUTTON_Y = 320;\r
+static const int16 RECOGNIZE_BUTTON_WIDTH = 170;\r
+static const int16 RECOGNIZE_BUTTON_HEIGHT = 90;\r
 \r
 static const char *RECOGNIZE_BUTTON_SEC = (char *)"详情";\r
-static const int16 RECOGNIZE_BUTTON_SEC_FONT = 38;\r
-static const int16 RECOGNIZE_BUTTON_SEC_X = 233;\r
-static const int16 RECOGNIZE_BUTTON_SEC_Y = 312;\r
-static const int16 RECOGNIZE_BUTTON_SEC_WIDTH = 169;\r
-static const int16 RECOGNIZE_BUTTON_SEC_HEIGHT = 73;\r
+static const int16 RECOGNIZE_BUTTON_SEC_FONT = 30;\r
+static const int16 RECOGNIZE_BUTTON_SEC_X = 238;\r
+static const int16 RECOGNIZE_BUTTON_SEC_Y = 320;\r
+static const int16 RECOGNIZE_BUTTON_SEC_WIDTH = 170;\r
+static const int16 RECOGNIZE_BUTTON_SEC_HEIGHT = 90;\r
 \r
 typedef struct AlipayTransResInfo {\r
     const char *str;\r
@@ -107,7 +107,7 @@ bool AlipayTransRes::AlipayInitLabel(const char *resStr)
     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_LEFT);\r
+    alipayLabel->SetAlign(TEXT_ALIGNMENT_CENTER,TEXT_ALIGNMENT_CENTER);\r
     alipayLabel->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);\r
 \r
     Add(alipayLabel);\r
@@ -146,10 +146,10 @@ bool AlipayTransRes::AlipayInitButton(uint32_t index)
     alipayButton->SetAlign(TEXT_ALIGNMENT_CENTER);\r
     alipayButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME, RECOGNIZE_BUTTON_FONT);\r
     alipayButton->SetViewId(g_AlipayTransResMapper[index].button_left);\r
-    alipayButton->SetStyleForState(STYLE_BORDER_COLOR, 0xff4a83bf, UIButton::PRESSED);\r
+    alipayButton->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED);\r
     alipayButton->SetOnClickListener(presenter_);\r
-    alipayButton->SetTextColor(Color::GetColorFromRGBA(0x00, 0x00, 0x00, 0xff));\r
-    alipayButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff);\r
+    // alipayButton->SetTextColor(Color::GetColorFromRGBA(0x00, 0x00, 0x00, 0xff));\r
+    alipayButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919);\r
     Add(alipayButton);\r
 \r
     alipayButtonSec = new UILabelButton();\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 79ffdd8..4aec64d 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
@@ -17,19 +17,19 @@
 \r
 namespace OHOS {\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_Y_FIRST = 200;\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
-static const char *TIPS_LABEL_TEXT_2 = (char *)"开通的乘车码数量太多，清在手机支付宝-出行-管理中，管理后再用";\r
+static const char *TIPS_LABEL_TEXT_2 = (char *)"开通的乘车码数量太多，请在手机支付宝-出行-管理中管理后再用";\r
 static const char *TIPS_LABEL_TEXT_3 = (char *)"存在安全风险，12小时内不可用，请切换到手机侧使用";\r
 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 = (HORIZONTAL_RESOLUTION - 112) / 2;\r
-static const int16 RES_IMAGE_Y = 50;\r
+static const int16 RES_IMAGE_Y = 55;\r
 static const int16 RES_IMAGE_WIDTH = 112;\r
 static const int16 RES_IMAGE_HEIGHT = 112;\r
 \r
@@ -102,7 +102,7 @@ bool AlipayTransTips::AlipayInitLabel(const char *resStr)
     alipayLabel->SetText((const char *)resStr);\r
     alipayLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, TIPS_LABEL_FONT_FIRST);\r
     alipayLabel->SetStyle(STYLE_TEXT_FONT, TIPS_LABEL_FONT_FIRST);\r
-    alipayLabel->SetAlign(TEXT_ALIGNMENT_LEFT);\r
+    alipayLabel->SetAlign(TEXT_ALIGNMENT_CENTER,TEXT_ALIGNMENT_CENTER);\r
     alipayLabel->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);\r
 \r
     Add(alipayLabel);\r

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 b4eb919..382e104 100755 (executable)
--- 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 4fb1675..ce33322 100755 (executable)
--- 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