下拉控制菜单更新省电，查找手机图标为4G，支付宝图标

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 0f20340..0c06b94 100644 (file)
--- 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]) {\r
         AlipayModel::GetInstance()->AlipayStopSwitchTimer();\r
         AlipayModel::GetInstance()->AlipayStopBindTimer();\r
-        NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST);\r
+        // NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST);\r
+        NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);\r
     } else if (&view == container[ALIPAY_TRANS_LIST_VIEW]) {\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayMainView::DropView::container[ALIPAY_TRANS_LIST_VIEW]");\r
         ChangeView(ALIPAY_TRANS_LIST_VIEW, ALIPAY_LIST_VIEW);\r

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 e530e1c..43d5469 100644 (file)
--- 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();\r
     if (!alipayMode_->AlipayInitModel()) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayPresenter::OnStart AlipayInitModel fail.");\r
-        NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST);\r
+        // NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST);\r
+        NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);\r
         return;\r
     }\r
     svr_alipay_create_task();\r
@@ -99,8 +100,9 @@ bool AlipayPresenter::OnDrag(UIView &view, const DragEvent &event)
 void AlipayPresenter::ClickExitAlipay(UIView &view)\r
 {\r
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayPresenter::ClickExitAlipay start");\r
-    uint16 preSlice = NativeAbility::GetInstance().GetPreSliceId();\r
-    NativeAbility::GetInstance().ChangeSlice(preSlice);\r
+    // uint16 preSlice = NativeAbility::GetInstance().GetPreSliceId();\r
+    // NativeAbility::GetInstance().ChangeSlice(preSlice);\r
+    NativeAbility::GetInstance().Back();\r
     return;\r
 }\r
 \r
@@ -432,7 +434,7 @@ bool AlipayPresenter::OnKeyAct(UIView &view, const KeyEvent &event)
     if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) &&  keyState == 0 && uapi_get_screen_state() == 0)\r
     {\r
         uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId();\r
-        NativeAbility::GetInstance().ChangeSlice(preSlice);\r
+        NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);\r
     }\r
     return true;\r
 \r

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 6698e36..827ce08 100644 (file)
--- 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 c824011..a1189d2 100644 (file)
--- 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 (file)
index 0000000..5dc86ed
--- /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 (file)
index 0000000..e3c3b71
--- /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