From 665e9ed9601e6ac59e8d973d8e47f7fdd2db02e9 Mon Sep 17 00:00:00 2001 From: hcj <1224667075@qq.com> Date: Thu, 12 Sep 2024 16:14:40 +0800 Subject: [PATCH] =?utf8?q?=E4=BF=AE=E5=A4=8D=E6=81=A2=E5=A4=8D=E5=87=BA?= =?utf8?q?=E5=8E=82=E6=97=A0=E6=B3=95=E8=A7=A3=E7=BB=91=20#323=20#324?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../wearable/service/ble_service/blemoder/CMakeLists.txt | 5 ++++- .../wearable/service/ble_service/blemoder/bletest.cpp | 9 +++++++++ .../wearable/service/ble_service/blemoder/bletest.h | 1 + code/sdk/drivers/peripheral/utils/custom_cmd_service.c | 2 ++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/code/sdk/application/wearable/service/ble_service/blemoder/CMakeLists.txt b/code/sdk/application/wearable/service/ble_service/blemoder/CMakeLists.txt index a48e9f423..5374ad0e3 100644 --- a/code/sdk/application/wearable/service/ble_service/blemoder/CMakeLists.txt +++ b/code/sdk/application/wearable/service/ble_service/blemoder/CMakeLists.txt @@ -38,7 +38,10 @@ ${ROOT_DIR}/application/wearable/fd230app/nativeui/aivoice/include ${ROOT_DIR}/application/wearable/fd230app/nativeui/alarm/include ${ROOT_DIR}/application/wearable/fd230app/nativeui/musicplayer/include ${ROOT_DIR}/application/wearable/fd230app/nativeui/schedule/include - +${ROOT_DIR}/middleware/services/gui/uikit/ui/interfaces/innerkits +# /home/hcj/FD230/code/sdk/middleware/services/gui/uikit/ui/interfaces/innerkits/engines/gfx/gfx_engine_manager.h +${ROOT_DIR}/application/wearable/fd230app/nativeui/alipay/include +# /home/hcj/FD230/code/sdk/application/wearable/nativeapp/nativeui/alipay/include/AlipayModel.h #/home/hcj/FD230/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmClockModel.h #/home/hcj/FD230/code/sdk/middleware/services/media/foundation/player/interfaces/kits/player.h #/home/hcj/FD230/code/sdk/middleware/services/gui/uikit/surface/interfaces/kits/surface.h diff --git a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp index 5e532bc7c..42c354438 100644 --- a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp +++ b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp @@ -83,9 +83,18 @@ extern "C" { #include #include "power_display_service.h" #include "ScheduleData.h" +#include "alipay_feature.h" #define before_file_day 30 + +void ble_Alipayunbind(void) +{ + const alipay_svr_api_t *alipay_api = alipay_svr_get_api(); + alipay_api->remove_bind(); +} + + void get_music_path(char *buf,uint8_t max_len) { std::string path= OHOS::MusicPlayerModel::GetInstance().GetMusicPlayPath(); diff --git a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.h b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.h index 21cad6756..2b12901ea 100644 --- a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.h +++ b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.h @@ -362,6 +362,7 @@ bool get_lcd_state(void); ////////////////////////////////////////////////////////////////////////// bool Ble_Set_ScheduleInfo(uint8_t id,uint32_t timetamp_begin,uint32_t timetamp_end,char *title,char *data,bool is_end); +void ble_Alipayunbind(void); #ifdef __cplusplus #if __cplusplus diff --git a/code/sdk/drivers/peripheral/utils/custom_cmd_service.c b/code/sdk/drivers/peripheral/utils/custom_cmd_service.c index 0fd459f3e..04dbbbc07 100644 --- a/code/sdk/drivers/peripheral/utils/custom_cmd_service.c +++ b/code/sdk/drivers/peripheral/utils/custom_cmd_service.c @@ -37,6 +37,7 @@ #include "ui_serviceC.h" +#include "bletest.h" typedef struct { @@ -140,6 +141,7 @@ static void custom_cmd_service_check_task(void const *arg) break; case CUSTOM_CMD_MSG_TYPE_RESTORE_FACTORY_SETTING: { + ble_Alipayunbind(); UnbindSucessCmd(1);//1确认解绑 uapi_restore_factory_setting(); } -- 2.17.1