From: SnickerSun Date: Sat, 13 Apr 2024 07:29:28 +0000 (+0800) Subject: 没有乘车码,UI暂时关闭 X-Git-Tag: release_V1.2.70_20241020_135402~1199^2 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=c6011721cae1a5b0055aa80bbb4d83b3481ca4c5;p=mirrors%2FFD230.git 没有乘车码,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 aef570a44..a9d5d3dda 100644 --- 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,10 +15,13 @@ namespace OHOS { /* * alipayList id. */ +#define SUPPORT_ALIPAY_TRANS 0 typedef enum : uint16_t { // alipayList item index ALIPAY_LIST_ITEM_PAY, +#if SUPPORT_ALIPAY_TRANS ALIPAY_LIST_ITEM_TRANS, +#endif ALIPAY_LIST_ITEM_SETTING, ALIPAY_LIST_ITEM_HELP, ALIPAY_LIST_ITEM_MAX 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 3c44c3a59..c1f508b90 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayList/AlipayListView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayList/AlipayListView.cpp @@ -72,9 +72,14 @@ void AlipayList::InitAlipayListItem() { 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 alipayLists[1] = {ALIPAY_LIST_ITEM_TRANS, ALIPAY_LIST_TRANS_BUTTON, PNG_ALIPAY_LIST_TRANS, "乘车码", true}; 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}; +#else + 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 } bool AlipayList::InitListView() diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayModel.cpp index 7f3176a77..b169557ac 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayModel.cpp @@ -580,7 +580,7 @@ char* AlipayModel::AlipayGetCardTitle(void) /// @param turnOnFlag void AlipayModel::AlipayScreenControl(bool turnOnFlag) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayModel::AlipayScreenControl"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayModel::AlipayScreenControl %d",turnOnFlag); const power_display_svr_api_t *display_api = power_display_svr_get_api(); if(turnOnFlag) {