From 41a3fdf5a51dbf8a2e857328eb320db9387100b8 Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Mon, 29 Jul 2024 15:44:17 +0800 Subject: [PATCH] =?utf8?q?=E4=B8=8B=E6=8B=89=E6=8E=A7=E5=88=B6=E8=8F=9C?= =?utf8?q?=E5=8D=95=E6=9B=B4=E6=96=B0=E7=9C=81=E7=94=B5=EF=BC=8C=E6=9F=A5?= =?utf8?q?=E6=89=BE=E6=89=8B=E6=9C=BA=E5=9B=BE=E6=A0=87=E4=B8=BA4G?= =?utf8?q?=EF=BC=8C=E6=94=AF=E4=BB=98=E5=AE=9D=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../fd230app/nativeui/alipay/src/AlipayMainView.cpp | 3 ++- .../fd230app/nativeui/alipay/src/AlipayPresenter.cpp | 10 ++++++---- .../fd230app/nativeui/main/src/MainPresenterSample.cpp | 4 ++-- .../fd230app/nativeui/main/src/PullUpDownView.cpp | 8 +++++--- .../fd230/fs/user/res/dropdown/DROPDOWN_4G.bin | 3 +++ .../fd230/fs/user/res/dropdown/DROPDOWN_ALIPAY.bin | 3 +++ 6 files changed, 21 insertions(+), 10 deletions(-) create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dropdown/DROPDOWN_4G.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dropdown/DROPDOWN_ALIPAY.bin diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayMainView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayMainView.cpp index 0f2034009..0c06b94ff 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayMainView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayMainView.cpp @@ -231,7 +231,8 @@ void AlipayMainView::DropView(UIView &view) } else if (&view == container[ALIPAY_LIST_VIEW] || &view == container[ALIPAY_BIND_VIEW]) { AlipayModel::GetInstance()->AlipayStopSwitchTimer(); AlipayModel::GetInstance()->AlipayStopBindTimer(); - NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST); + // NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST); + NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); } else if (&view == container[ALIPAY_TRANS_LIST_VIEW]) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayMainView::DropView::container[ALIPAY_TRANS_LIST_VIEW]"); ChangeView(ALIPAY_TRANS_LIST_VIEW, ALIPAY_LIST_VIEW); 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 e530e1c54..43d546996 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayPresenter.cpp @@ -59,7 +59,8 @@ void AlipayPresenter::OnStart() alipayMode_->AlipayExitLpm(); if (!alipayMode_->AlipayInitModel()) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayPresenter::OnStart AlipayInitModel fail."); - NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST); + // NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST); + NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); return; } svr_alipay_create_task(); @@ -99,8 +100,9 @@ bool AlipayPresenter::OnDrag(UIView &view, const DragEvent &event) void AlipayPresenter::ClickExitAlipay(UIView &view) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayPresenter::ClickExitAlipay start"); - uint16 preSlice = NativeAbility::GetInstance().GetPreSliceId(); - NativeAbility::GetInstance().ChangeSlice(preSlice); + // uint16 preSlice = NativeAbility::GetInstance().GetPreSliceId(); + // NativeAbility::GetInstance().ChangeSlice(preSlice); + NativeAbility::GetInstance().Back(); return; } @@ -432,7 +434,7 @@ bool AlipayPresenter::OnKeyAct(UIView &view, const KeyEvent &event) if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0) { uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId(); - NativeAbility::GetInstance().ChangeSlice(preSlice); + NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); } return true; 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 6698e3683..827ce0874 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp @@ -42,8 +42,8 @@ namespace OHOS {DROPDOWN_CLICK_SETTING, VIEW_SETTING}, // 设置 {DROPDOWN_CLICK_BLUETOOTH, VIEW_CLASSIC_BLUETOOTH}, // 蓝牙 {DROPDOWN_CLICK_DNOTDISTURB, VIEW_DNOTDISTURB}, // 勿扰 - {DROPDOWN_CLICK_SAVEELE, VIEW_SAVEELE}, // 省电模式 - {DROPDOWN_CLICK_FINDMYPHONE, VIEW_FIND_PHONE}, // 查找手机 + {DROPDOWN_CLICK_SAVEELE, VIEW_NETWORKANDCALL}, // 4G + {DROPDOWN_CLICK_FINDMYPHONE, VIEW_MAIN_ALIPAY}, // 支付宝 }; static MainPresenterSample *g_pMainPresenterSample = nullptr; 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 c82401102..a1189d2a2 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-23 18:13:38 + * @LastEditTime: 2024-07-29 15:14:53 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp */ @@ -42,12 +42,14 @@ 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_SAVEPOWER.bin"; + static constexpr const char *DROPDOWN_SAVEPOWER_IMAGE = "/user/res/dropdown/DROPDOWN_4G.bin";/*4G*/ // 找手机 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_FINDPHONE.bin"; + static constexpr const char *DROPDOWN_FINDPHONE_IMAGE = "/user/res/dropdown/DROPDOWN_ALIPAY.bin";/*支付宝*/ // line static constexpr uint16_t LINE_IMG_X = 193; diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dropdown/DROPDOWN_4G.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dropdown/DROPDOWN_4G.bin new file mode 100644 index 000000000..5dc86ed60 --- /dev/null +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dropdown/DROPDOWN_4G.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:277695f9fdc21305e157071bc7e48614ab82f94536e52217bdc1db466d5011aa +size 920 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dropdown/DROPDOWN_ALIPAY.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dropdown/DROPDOWN_ALIPAY.bin new file mode 100644 index 000000000..e3c3b71a4 --- /dev/null +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dropdown/DROPDOWN_ALIPAY.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab593a7db1ccde5bb02c986b1076727469120da3706eb58f0c2d7341aff6b79a +size 1560 -- 2.17.1