From: luozheng <1732036298@qq.com> Date: Sat, 3 Aug 2024 09:15:55 +0000 (+0800) Subject: 下拉4G和支付宝位置互换 X-Git-Tag: release_V1.2.70_20241020_135402~704 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=a772a12bd7eca3f84e9a40628158caba9653147a;p=mirrors%2FFD230.git 下拉4G和支付宝位置互换 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp index 32081059d..212bea74f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp @@ -44,8 +44,8 @@ namespace OHOS {DROPDOWN_CLICK_SETTING, VIEW_SETTING}, // 设置 {DROPDOWN_CLICK_BLUETOOTH, VIEW_CLASSIC_BLUETOOTH}, // 蓝牙 {DROPDOWN_CLICK_DNOTDISTURB, VIEW_DNOTDISTURB}, // 勿扰 - {DROPDOWN_CLICK_SAVEELE, VIEW_NETWORKANDCALL}, // 4G - {DROPDOWN_CLICK_FINDMYPHONE, VIEW_MAIN_ALIPAY}, // 支付宝 + {DROPDOWN_CLICK_SAVEELE, VIEW_MAIN_ALIPAY}, // 支付宝 + {DROPDOWN_CLICK_FINDMYPHONE, VIEW_NETWORKANDCALL}, // 4G {MAIN_CLICK_BLOOD, VIEW_BLOOD_CHECK}, // 血氧检查 {MAIN_CLICK_SETCARD, VIEW_ADD_CARD}, // 卡片管理 }; diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp index 1df4fe495..6c66b173e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-06-26 18:14:24 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-07-31 20:53:09 + * @LastEditTime: 2024-08-03 17:11:11 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp */ @@ -43,13 +43,13 @@ namespace OHOS static constexpr uint16_t SAVEPOWER_IMG_X = 296; static constexpr uint16_t SAVEPOWER_IMG_Y = 76; // static constexpr const char *DROPDOWN_SAVEPOWER_IMAGE = "/user/res/dropdown/DROPDOWN_SAVEPOWER.bin"; - static constexpr const char *DROPDOWN_SAVEPOWER_IMAGE = "/user/res/dropdown/DROPDOWN_4G.bin";/*4G*/ + static constexpr const char *DROPDOWN_SAVEPOWER_IMAGE = "/user/res/dropdown/DROPDOWN_ALIPAY.bin";/*支付宝*/ // 找手机 static constexpr uint16_t FINDPHONE_IMG_X = 342; static constexpr uint16_t FINDPHONE_IMG_Y = 186; // static constexpr const char *DROPDOWN_FINDPHONE_IMAGE = "/user/res/dropdown/DROPDOWN_FINDPHONE.bin"; - static constexpr const char *DROPDOWN_FINDPHONE_IMAGE = "/user/res/dropdown/DROPDOWN_ALIPAY.bin";/*支付宝*/ + static constexpr const char *DROPDOWN_FINDPHONE_IMAGE = "/user/res/dropdown/DROPDOWN_4G.bin";/*4G*/ // line static constexpr uint16_t LINE_IMG_X = 193;