From 0adf9d84b8cb4022a4075af9cb9ad0e49ff35975 Mon Sep 17 00:00:00 2001 From: xue <2144439972@qq.com> Date: Fri, 19 Sep 2025 10:50:18 +0800 Subject: [PATCH] =?utf8?q?=E5=A2=9E=E5=8A=A0=E6=B5=8B=E8=AF=95AT?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../thunderbird/src/ThunderBirdPresenter.cpp | 14 +++++++------- code/sdk/zhihui/leiniao/imsl_ln/leiniao_api_at.c | 12 +++++++++++- code/sdk/zhihui/leiniao/imsl_ln/ln_api.c | 5 +++++ code/sdk/zhihui/leiniao/imsl_ln/ln_api.h | 2 ++ 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdPresenter.cpp index 4e5b7989c..a7d6efd97 100644 --- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdPresenter.cpp +++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdPresenter.cpp @@ -123,7 +123,7 @@ namespace OHOS /*************************语音键*************************/ if(keyID == static_cast(ZliteKeyCode::ZLITE_KEY_FUNC) && keyState == 1 && uapi_get_screen_state() == 0) { - if(ThunderBirdModel::GetInstance()->CheckBindingStatus() == ThunderBirdModel::BindingStatus::NOT_BOUND) + if(ThunderBirdModel::GetInstance()->CheckBindingStatus() != ThunderBirdModel::BindingStatus::BOUND) { if(ThunderBirdMainView::GetInstance()->GetCurrentSubView() != ThunderBirdGuideView::THUNDERBIRD_GUIDEVIEW_3) { @@ -149,7 +149,7 @@ namespace OHOS /*************************VENDOR_UP键*************************/ if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_VENDOR_UP) && keyState == 1 && uapi_get_screen_state() == 0) { - if(ThunderBirdModel::GetInstance()->CheckBindingStatus() == ThunderBirdModel::BindingStatus::NOT_BOUND) + if(ThunderBirdModel::GetInstance()->CheckBindingStatus() != ThunderBirdModel::BindingStatus::BOUND) { if(ThunderBirdMainView::GetInstance()->GetCurrentSubView() != ThunderBirdGuideView::THUNDERBIRD_GUIDEVIEW_3) { @@ -181,13 +181,13 @@ namespace OHOS ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_GUIDEVIEW, ThunderBirdGuideView::THUNDERBIRD_GUIDEVIEW_2); } else if(currentSubView == ThunderBirdGuideView::THUNDERBIRD_GUIDEVIEW_2) + { + ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_GUIDEVIEW, ThunderBirdOtaView::THUNDERBIRD_GUIDEVIEW_3); + } + else if(currentSubView == ThunderBirdGuideView::THUNDERBIRD_GUIDEVIEW_3) { ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_OTAVIEW, ThunderBirdOtaView::THUNDERBIRD_OTAVIEW_NORMAL); } - // else if(currentSubView == ThunderBirdGuideView::THUNDERBIRD_GUIDEVIEW_3) - // { - // ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_OTAVIEW, ThunderBirdOtaView::THUNDERBIRD_OTAVIEW_NORMAL); - // } return true; } // 对话界面导航 @@ -333,7 +333,7 @@ namespace OHOS if(keyID == static_cast(ZliteKeyCode::ZLITE_KEY_VENDOR_DOWN) && keyState == 1 && uapi_get_screen_state() == 0) { - if(ThunderBirdModel::GetInstance()->CheckBindingStatus() == ThunderBirdModel::BindingStatus::NOT_BOUND) + if(ThunderBirdModel::GetInstance()->CheckBindingStatus() != ThunderBirdModel::BindingStatus::BOUND ) { if(ThunderBirdMainView::GetInstance()->GetCurrentSubView() != ThunderBirdGuideView::THUNDERBIRD_GUIDEVIEW_3) { diff --git a/code/sdk/zhihui/leiniao/imsl_ln/leiniao_api_at.c b/code/sdk/zhihui/leiniao/imsl_ln/leiniao_api_at.c index 53e385dca..bbaf3dfd9 100644 --- a/code/sdk/zhihui/leiniao/imsl_ln/leiniao_api_at.c +++ b/code/sdk/zhihui/leiniao/imsl_ln/leiniao_api_at.c @@ -589,7 +589,16 @@ static uint32_t ln_device_get_userid_at(uint8_t *para, uint32_t paraLen, char *s do_ln_http_server_send_data(LN_HTTP_SERVICE_CMD_GET_USER_ID, NULL, 0); return ERRCODE_SUCC; } - +/* 设备-设置绑定用户ID：AT^LN_SET_DEV_USERID */ +static uint32_t ln_device_set_userid_at(uint8_t *para, uint32_t paraLen, char *strCommonCmd) +{ + VAD_UNUSED(para); + VAD_UNUSED(paraLen); + VAD_UNUSED(strCommonCmd); + printf("[LN][DEVICE_SET_USER_ID]\n"); + uapi_ln_set_device_bound(); + return ERRCODE_SUCC; +} /* OTA-获取升级任务：AT^LN_OTA_GET_TASK */ static uint32_t ln_ota_get_task_at(uint8_t *para, uint32_t paraLen, char *strCommonCmd) { @@ -745,6 +754,7 @@ static const at_cmd_table_t g_ln_api_cmd[] = { {(char *)"AT^LN_STORY_FINISH", ln_story_finish_at, (char *)"确认结束哄睡(JSON): AT^LN_STORY_FINISH"}, {(char *)"AT^LN_DEV_CHARACTER", ln_device_get_character_at, (char *)"获取设备角色信息(JSON,GET): AT^LN_DEV_CHARACTER"}, {(char *)"AT^LN_DEV_USERID", ln_device_get_userid_at, (char *)"获取设备绑定用户ID(JSON,GET): AT^LN_DEV_USERID"}, + // {(char *)"AT^LN_SET_DEV_USERID", ln_device_set_userid_at, (char *)"获取设备绑定用户ID(JSON,SET): AT^LN_DEV_USERID"}, {(char *)"AT^LN_OTA_GET_TASK", ln_ota_get_task_at, (char *)"获取OTA升级任务(JSON,GET): AT^LN_OTA_GET_TASK"}, {(char *)"AT^LN_OTA_DOWNLOAD", ln_ota_download_at, (char *)"下载OTA升级包(JSON,GET->下载): AT^LN_OTA_DOWNLOAD"}, diff --git a/code/sdk/zhihui/leiniao/imsl_ln/ln_api.c b/code/sdk/zhihui/leiniao/imsl_ln/ln_api.c index 577758138..3df3df0b5 100644 --- a/code/sdk/zhihui/leiniao/imsl_ln/ln_api.c +++ b/code/sdk/zhihui/leiniao/imsl_ln/ln_api.c @@ -174,6 +174,11 @@ const char* uapi_ln_get_user_id(void) { return g_ln_device_user_id; } +/* 获取是否绑定用户 */ +void uapi_ln_set_device_bound(void) +{ + g_ln_is_device_bound = 1; +} /* 获取设备角色配置 */ LnCharacterConfig uapi_ln_get_character_config(void) diff --git a/code/sdk/zhihui/leiniao/imsl_ln/ln_api.h b/code/sdk/zhihui/leiniao/imsl_ln/ln_api.h index 2bbd55d2d..74e3e9957 100644 --- a/code/sdk/zhihui/leiniao/imsl_ln/ln_api.h +++ b/code/sdk/zhihui/leiniao/imsl_ln/ln_api.h @@ -213,6 +213,8 @@ const char *uapi_ln_get_story_choose_audio_path(void); void uapi_ln_audio_download_is_cancel(int status); /* 获取是否绑定用户 */ uint32_t uapi_ln_is_device_bound(void); +/* 设置是否绑定用户 */ +void uapi_ln_set_device_bound(void); /* 获取设备绑定用户ID */ const char* uapi_ln_get_user_id(void); /* 获取设备角色配置 */ -- 2.17.1