From 6b134f59e0c808fbe8a2f8dd0ab81fe56b4b553c Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E8=83=A1=E4=BC=A0=E5=86=9B?= <1224667075@qq.com> Date: Tue, 20 May 2025 10:13:57 +0000 Subject: [PATCH] Merge #1773 into sdk650pathc0423 from refs/changes/1773/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Code review from 胡传军 * refs/changes/1773/head: (9 commits squashed) - 修改安装app回复错误指令bug - Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0423 - Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0423 - Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0423 - 提交hfp部分代码 - 修改appble处理函数 - Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0423 - 修改bleservice代码编译问题 - Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0423 Signed-off-by: aliyun8003852482 <1224667075@qq.com> Merged-by: Caisking <3449750381@qq.com> CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1773 --- .../msg_center/src/notify/transmitting.cpp | 1191 ----------------- .../ble_service/bleservice/bleService.c | 47 +- 2 files changed, 28 insertions(+), 1210 deletions(-) delete mode 100644 code/sdk/application/wearable/service/msg_center/src/notify/transmitting.cpp diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/transmitting.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/transmitting.cpp deleted file mode 100644 index 85920cae1..000000000 --- a/code/sdk/application/wearable/service/msg_center/src/notify/transmitting.cpp +++ /dev/null @@ -1,1191 +0,0 @@ -#include "notification_manager.h" -#include "wearable_log.h" -#include "UiConfig.h" -#include "AlarmPopUpPresenter.h" -#include "components/ui_image_view.h" -#include "components/ui_label.h" -#include "components/ui_label_ext.h" -#include "components/ui_label_button_ext.h" -#include "battery_service.h" -#include "NativeAbility.h" -#include "custom_utils.h" -#include "components/ui_slider.h" -// #include "UiConfig.h" -#include "bleEvent.h" -#include "power_display_service.h" -#include "uicomponents/UIComponents.h" -#include "upg.h" -#include "custom_runtime.h" -#include "PhoneService.h" -#include "ConfigModelC.h" -#include "ConfigModel.h" -#include "languagecode/LanguageInit.h" -namespace OHOS -{ - static UIImageView *imageCharge = nullptr; - static UIViewGroup *UIViewGroup_transmitting=nullptr; - - static UIImageView *transmitting_img=nullptr; - - static UISlider *updatasider=nullptr; - - static UILabelExt *Title=nullptr; - - static UILabelExt *label_=nullptr; - - static UIImageAnimatorView *downImageAnimatorView=nullptr; - - static constexpr char *ShutDownPaths = "/user/res/down/"; - static constexpr int16_t SHUTDOWN_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 24; // 图片帧数 - static constexpr int16_t SHUTDOWN_IMAGE_ANIMATOR_TIME = 150; // 图片更新间隔 - static ImageAnimatorInfo ImageInfo_animator[SHUTDOWN_IMAGE_ANIMATOR_VIEW_NUM_FRAMES]; // 关机图像的信息 - static constexpr int16_t SHUTDOWN_IMAGE_ANIMATOR_VIEW_X = 183; - static constexpr int16_t SHUTDOWN_IMAGE_ANIMATOR_VIEW_Y = 140; - static constexpr int16_t SHUTDOWN_IMAGE_ANIMATOR_VIEW_W = 100; - static constexpr int16_t SHUTDOWN_IMAGE_ANIMATOR_VIEW_H = 100; - - const ImageInfo **imageInfo_dwon{nullptr}; // 关机图片路径数组 - - #define TRANSMITTING_SUCC_PATH PNG_SUCC_IMAGE; - #define TRANSMITTING_FAIL_PATH PNG_ATTENTION_IMAGE; - #define TRANSMITTING_OTA_DOWN "/user/res/system/KUMILOGO.bin" - - - - #define LOW_POWER_BUTTON "LOW_POWER_BUTTON" - - - - static void CreatetransmittingAnimator(void) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ShutDownAnimatorView::ShowUpShutDownAnimatorView"); - imageInfo_dwon = CreateImageInfoArray(ShutDownPaths,SHUTDOWN_IMAGE_ANIMATOR_VIEW_NUM_FRAMES, "bin"); - - if (downImageAnimatorView == nullptr) - { - downImageAnimatorView = new UIImageAnimatorView(); - if (downImageAnimatorView == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BluetoothEarPhoneView new downImageAnimatorView fail"); - return; - } - for (uint8_t i = 0; i < SHUTDOWN_IMAGE_ANIMATOR_VIEW_NUM_FRAMES; i++) - { - ImageInfo_animator[i].imageInfo = (imageInfo_dwon[i]); - ImageInfo_animator[i].imageType = IMG_SRC_IMAGE_INFO; - ImageInfo_animator[i].pos.x = SHUTDOWN_IMAGE_ANIMATOR_VIEW_X; - ImageInfo_animator[i].pos.y = SHUTDOWN_IMAGE_ANIMATOR_VIEW_Y; - ImageInfo_animator[i].width = SHUTDOWN_IMAGE_ANIMATOR_VIEW_W; - ImageInfo_animator[i].height = SHUTDOWN_IMAGE_ANIMATOR_VIEW_H; - } - downImageAnimatorView->SetPosition(SHUTDOWN_IMAGE_ANIMATOR_VIEW_X, SHUTDOWN_IMAGE_ANIMATOR_VIEW_Y, SHUTDOWN_IMAGE_ANIMATOR_VIEW_W, SHUTDOWN_IMAGE_ANIMATOR_VIEW_H); - downImageAnimatorView->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff); - downImageAnimatorView->SetStyle(STYLE_BACKGROUND_OPA, 0xff); - downImageAnimatorView->SetImageAnimatorSrc(ImageInfo_animator, SHUTDOWN_IMAGE_ANIMATOR_VIEW_NUM_FRAMES, 100); - downImageAnimatorView->SetRepeat(true); - downImageAnimatorView->SetRepeatTimes(1); - - } - downImageAnimatorView->SetVisible(true); - downImageAnimatorView->Start(); - //downImageAnimatorView->Start(); - - return ; - } - - - - - static uint8_t Transmitting_falg=1; - void set_transmittingShow_falg(uint8_t falg) - { - Transmitting_falg=falg; - } - - static osTimerId_t transmitting_timer= NULL; - - void Freetransmitting(void) - { - if (UIViewGroup_transmitting != nullptr) - { - UIViewGroup_transmitting->RemoveAll(); - - if(transmitting_img) - { - delete transmitting_img; - transmitting_img = nullptr; - } - if(Title) - { - delete Title; - Title = nullptr; - } - if(label_) - { - delete label_; - label_ = nullptr; - } - if(downImageAnimatorView) - { - FreeImageInfoArray(imageInfo_dwon,ShutDownPaths, SHUTDOWN_IMAGE_ANIMATOR_VIEW_NUM_FRAMES,"bin"); - delete downImageAnimatorView; - downImageAnimatorView = nullptr; - } - if(updatasider) - { - delete updatasider; - updatasider = nullptr; - } - if(transmitting_timer) - { - - osTimerStop(transmitting_timer); - osStatus_t ret = osTimerDelete(transmitting_timer); - if (ret != osOK) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Disatransmitting_timer failed ret = %lx!", ret); - //return; - } - transmitting_timer = nullptr; - } - - const power_display_svr_api_t *display_api = power_display_svr_get_api(); - if (display_api->get_screen_state() != SCREEN_ON) - { - display_api->turn_on_screen(); - } - display_api->set_auto_timeout_function(true); - - uapi_take_to_wake(1); - - RootView::GetInstance()->Remove(UIViewGroup_transmitting); - delete UIViewGroup_transmitting; - UIViewGroup_transmitting = nullptr; - - uapi_dev_runtime_set_transmitting_status(0); - } - } - static uint8_t timer_falg_low_power=5; - - static uint8_t test_flag=0; - - static void OTATimerCallBackProc(int data) - { - #if 0 - if(updatasider) - updatasider->SetValue(test_flag++); - #else - if(updatasider) - updatasider->SetValue(get_OTA_recv_value()); - #endif - if(updatasider) - updatasider->Invalidate(); - } - - void OTATimerCallBack(int data) - { - GraphicService::GetInstance()->PostGraphicEvent(std::bind(OTATimerCallBackProc, data)); - } - - void dialtimerCallBack(int data) - { - NotificationManager::GetInstance()->StopNotify(); - } - - - - void creat_down_OTA() - { - if (Title == nullptr) { - Title = new UILabelExt(); - } - Title->SetPosition(83, 50); // widget's left position and top position - Title->Resize(300, 35); // widget's width and height - Title->SetViewId("label1");// Set style - Title->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property - Title->SetText("OTA下载中"); - Title->SetTextId (STR_OTA_DOWNLOAD); - - Title->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS); - Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - Title->SetRollSpeed(0); - Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - - // Add to rootView - UIViewGroup_transmitting->Add(Title); - - if (updatasider == nullptr) - { - updatasider = new UISlider(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView new fail"); - - } - - updatasider->SetSliderColor(Color::Gray(), Color::Silver()); - updatasider->SetPosition(63, 317, 340, 50); - updatasider->SetViewId("SystemUpdateView_updatasider"); - updatasider->SetRange(0, 100); - - updatasider->SetStyle(STYLE_BORDER_RADIUS, 100); - updatasider->SetBackgroundStyle(STYLE_LINE_CAP, CapType::CAP_ROUND); - updatasider->SetForegroundStyle(STYLE_LINE_CAP, CapType::CAP_ROUND); - updatasider->SetSliderColor(Color::GetColorFromRGBA(0x19, 0x19, 0x19, 0xff), Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0xff)); - updatasider->SetForegroundStyle(STYLE_BACKGROUND_OPA, 0xff); - updatasider->SetDraggable(false); - updatasider->SetTouchable(false); - updatasider->SetValue(0); - UIViewGroup_transmitting->Add(updatasider); - - - if (label_ == nullptr) { - label_ = new UILabelExt(); - } - label_->SetPosition(60, 220); // widget's left position and top position - label_->Resize(345, 101); // widget's width and height - label_->SetViewId("label2");// Set style - label_->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property - label_->SetText("软件正在更新"); - label_->SetTextId(STR_OTA_DOWNLOADING); - label_->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); - label_->SetTextColor(Color::GetColorFromRGBA(0xAA, 0xAA, 0xAA, 0xff)); - label_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label_->SetRollSpeed(0); - label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - // Add to rootView - UIViewGroup_transmitting->Add(label_); - - //Add ImageView to App - - if (transmitting_img == nullptr) - { - transmitting_img = new UIImageView(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); - - } - transmitting_img->SetPosition(117, 87, 230, 160); - const char *imagesPath = TRANSMITTING_OTA_DOWN; - transmitting_img->SetSrc(imagesPath); - UIViewGroup_transmitting->Add(transmitting_img); - - uint32_t tick; - osStatus_t retTimer; - - Set_OTA_recv_value(); - if(transmitting_timer!=NULL) - { - osTimerStop(transmitting_timer); - osTimerDelete(transmitting_timer); - transmitting_timer = NULL; - } - transmitting_timer = osTimerNew((osTimerFunc_t)OTATimerCallBack, osTimerPeriodic, NULL, NULL); - tick =500;// osMs2Tick(1000); - retTimer = osTimerStart(transmitting_timer, tick); - if (retTimer != osOK && transmitting_timer != NULL) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"StartCallTimer osTimerStart failed, ret = %lx!!", retTimer); - osTimerDelete(transmitting_timer); - transmitting_timer = NULL; - return ; - } - } - static upg_result_t upg_result; - static uint32_t last_image_index; - - static char updata_fail_str[32]={0}; - - static uint8_t TRANSMIT_DATA; - - void get_updatafail_data(void) - { - errcode_t ret; - ret = uapi_upg_get_result(&upg_result, &last_image_index); - if (ret != ERRCODE_SUCC) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"uapi_upg_get_result error = 0x%x\r\n", ret); - } else { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"upg_result = %d, last_image_index:%d\r\n", upg_result, last_image_index); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"uapi_upg_get_result OK!!\r\n"); - if(upg_result!=UPG_RESULT_UPDATE_SUCCESS) - { - sprintf_s(updata_fail_str,32,"%d_%d",(int)upg_result,last_image_index); - TRANSMIT_DATA=OTA_UPDATA_FAIL; - if(ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_OTA_UPGRADE)) - { - CustomEventPublish(TOPIC_EVENT_BLE_TRANSMIT,&TRANSMIT_DATA,1); - ConfigModel::GetInstance()->set_condigData_Int(ConfigModel::CONFIGMODEL_ITEM_OTA_UPGRADE,0); - } - } - - } - } - - void Creat_OTA_Updata_FAIL() - { - if (Title == nullptr) { - Title = new UILabelExt(); - } - Title->SetPosition(83, 50); // widget's left position and top position - Title->Resize(300, 35); // widget's width and height - Title->SetViewId("label1");// Set style - Title->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property - Title->SetText("OTA upgrade failure"); - Title->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS); - Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - Title->SetRollSpeed(0); - Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30); - - UIViewGroup_transmitting->Add(Title); - - if (label_ == nullptr) { - label_ = new UILabelExt(); - } - label_->SetPosition(60, 281); // widget's left position and top position - label_->Resize(345, 101); // widget's width and height - label_->SetViewId("label2");// Set style - label_->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property - char fail_str[128]={0}; - sprintf_s(fail_str,128,"ota升级失败，请尝试重启设备"); - - label_->SetText(fail_str); - label_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); - label_->SetTextColor(Color::GetColorFromRGBA(0xAA, 0xAA, 0xAA, 0xff)); - label_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label_->SetRollSpeed(0); - label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30); - - UIViewGroup_transmitting->Add(label_); - - //Add ImageView to App - - if (transmitting_img == nullptr) - { - transmitting_img = new UIImageView(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); - } - transmitting_img->SetPosition(193, 150,80, 80); - const char *imagesPath = TRANSMITTING_FAIL_PATH; - transmitting_img->SetSrc(imagesPath); - UIViewGroup_transmitting->Add(transmitting_img); - } - - void Creat_CAT1_OTA_Updata() - { - if (Title == nullptr) { - Title = new UILabelExt(); - } - Title->SetPosition(83, 50); // widget's left position and top position - Title->Resize(300, 35); // widget's width and height - Title->SetViewId("label1");// Set style - Title->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property - Title->SetText("CAT1 OTA upgradeing"); - Title->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS); - Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - Title->SetRollSpeed(0); - Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30); - - UIViewGroup_transmitting->Add(Title); - - if (label_ == nullptr) { - label_ = new UILabelExt(); - } - label_->SetPosition(60, 281); // widget's left position and top position - label_->Resize(345, 101); // widget's width and height - label_->SetViewId("label2");// Set style - label_->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property - - - label_->SetText("4G模块OTA升级中，请勿操作，升级成功后会自动重启"); - label_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); - label_->SetTextColor(Color::GetColorFromRGBA(0xAA, 0xAA, 0xAA, 0xff)); - label_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label_->SetRollSpeed(0); - label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30); - - UIViewGroup_transmitting->Add(label_); - - // Add ImageView to App - - if (transmitting_img == nullptr) - { - transmitting_img = new UIImageView(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); - } - transmitting_img->SetPosition(193, 150,80, 80); - const char *imagesPath = TRANSMITTING_FAIL_PATH; - transmitting_img->SetSrc(imagesPath); - UIViewGroup_transmitting->Add(transmitting_img); - } - - - - - - void creat_down_OTA_FAIL() - { - if (Title == nullptr) { - Title = new UILabelExt(); - } - Title->SetPosition(143, 51); // widget's left position and top position - Title->Resize(800, 88); // widget's width and height - Title->SetViewId("label1");// Set style - Title->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property - Title->SetText("OTA下载失败"); - Title->SetTextId (STR_OTA_DOWNLOADFIAL); - Title->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); - Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - Title->SetRollSpeed(0); - Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - - // Add to rootView - UIViewGroup_transmitting->Add(Title); - if (label_ == nullptr) { - label_ = new UILabelExt(); - } - label_->SetPosition(60, 281); // widget's left position and top position - label_->Resize(345, 101); // widget's width and height - label_->SetViewId("label2");// Set style - label_->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property - label_->SetText("下载升级包失败，请退出或者重新下载"); - label_->SetTextId(STR_OTA_DOWNLOADFIAL_TRY); - - label_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); - label_->SetTextColor(Color::GetColorFromRGBA(0xAA, 0xAA, 0xAA, 0xff)); - label_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label_->SetRollSpeed(0); - label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - UIViewGroup_transmitting->Add(label_); - - //Add ImageView to App - - if (transmitting_img == nullptr) - { - transmitting_img = new UIImageView(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); - } - transmitting_img->SetPosition(117, 87, 230, 160); - const char *imagesPath = TRANSMITTING_OTA_DOWN; - transmitting_img->SetSrc(imagesPath); - UIViewGroup_transmitting->Add(transmitting_img); - } - - void creat_down_OTA_SUCC() - { - if (Title == nullptr) { - Title = new UILabelExt(); - } - Title->SetPosition(143, 51); // widget's left position and top position - Title->Resize(800, 88); // widget's width and height - Title->SetViewId("label1");// Set style - Title->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property - Title->SetText("OTA下载成功"); - Title->SetTextId (STR_OTA_DOWNLOADSUCC); - Title->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); - Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - Title->SetRollSpeed(0); - Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - - // Add to rootView - UIViewGroup_transmitting->Add(Title); - - if (label_ == nullptr) { - label_ = new UILabelExt(); - } - label_->SetPosition(60, 281); // widget's left position and top position - label_->Resize(345, 101); // widget's width and height - label_->SetViewId("label2");// Set style - label_->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property - label_->SetText("下载升级包成功，可以开始升级手表"); - label_->SetTextId(STR_OTA_DOWNLOADSUCC_UPDATA); - label_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); - label_->SetTextColor(Color::GetColorFromRGBA(0xAA, 0xAA, 0xAA, 0xff)); - label_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label_->SetRollSpeed(0); - label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - // Add to rootView - UIViewGroup_transmitting->Add(label_); - - - //Add ImageView to App - - if (transmitting_img == nullptr) - { - transmitting_img = new UIImageView(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); - - } - transmitting_img->SetPosition(117, 87, 230, 160); - const char *imagesPath = TRANSMITTING_OTA_DOWN; - transmitting_img->SetSrc(imagesPath); - UIViewGroup_transmitting->Add(transmitting_img); - } - - - - - void creat_down_Dial() - { - if (Title == nullptr) { - Title = new UILabelExt(); - } - Title->SetPosition(158, 51); // widget's left position and top position - Title->Resize(800, 88); // widget's width and height - Title->SetViewId("label1");// Set style - Title->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property - Title->SetText("表盘安装中"); - Title->SetTextId (STR_DIAL_DOWNLOADING_TITLE); - Title->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); - Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - Title->SetRollSpeed(0); - Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - // Add to rootView - UIViewGroup_transmitting->Add(Title); - Title->SetVisible(true); - - - if (label_ == nullptr) { - label_ = new UILabelExt(); - } - label_->SetPosition(60, 281); // widget's left position and top position - label_->Resize(345, 101); // widget's width and height - label_->SetViewId("label2");// Set style - label_->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property - label_->SetText("正在安装表盘，请不要做其他操作或关闭手表"); - label_->SetTextId(STR_DIAL_DOWNLOADING_LABEL); - label_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); - label_->SetTextColor(Color::GetColorFromRGBA(0xAA, 0xAA, 0xAA, 0xff)); - label_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label_->SetRollSpeed(0); - label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - // Add to rootView - UIViewGroup_transmitting->Add(label_); - label_->SetVisible(true); - - CreatetransmittingAnimator(); - // UIViewGroup_transmitting->Add(updatasider); - - UIViewGroup_transmitting->Add(downImageAnimatorView); - } - - - void creat_down_MP3() - { - if (Title == nullptr) { - Title = new UILabelExt(); - } - Title->SetPosition(158, 51); // widget's left position and top position - Title->Resize(800, 88); // widget's width and height - Title->SetViewId("label1");// Set style - Title->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property - Title->SetText("音乐传输中"); - Title->SetTextId (STR_MUSIC_TRANSMIT); - - Title->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); - Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - Title->SetRollSpeed(0); - Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - // Add to rootView - UIViewGroup_transmitting->Add(Title); - Title->SetVisible(true); - - - if (label_ == nullptr) { - label_ = new UILabelExt(); - } - label_->SetPosition(60, 281); // widget's left position and top position - label_->Resize(345, 101); // widget's width and height - label_->SetViewId("label2");// Set style - label_->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property - label_->SetText("正在传输音乐，请不要做其他操作或关闭手表"); - label_->SetTextId(STR_MUSIC_TRANSMIT_NOTE); - label_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); - label_->SetTextColor(Color::GetColorFromRGBA(0xAA, 0xAA, 0xAA, 0xff)); - label_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label_->SetRollSpeed(0); - label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - // Add to rootView - UIViewGroup_transmitting->Add(label_); - label_->SetVisible(true); - - CreatetransmittingAnimator(); - // UIViewGroup_transmitting->Add(updatasider); - - UIViewGroup_transmitting->Add(downImageAnimatorView); - } - - void creat_down_MP3_succ() - { - if (Title == nullptr) { - Title = new UILabelExt(); - } - Title->SetPosition(173, 51); // widget's left position and top position - Title->Resize(800, 88); // widget's width and height - Title->SetViewId("label1");// Set style - Title->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property - Title->SetText("传输成功"); - Title->SetTextId (STR_MP3_SUCC_TITLE); - Title->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); - Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - Title->SetRollSpeed(0); - Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - // Add to rootView - UIViewGroup_transmitting->Add(Title); - Title->SetVisible(true); - - - if (label_ == nullptr) { - label_ = new UILabelExt(); - } - label_->SetPosition(60, 281); // widget's left position and top position - label_->Resize(345, 101); // widget's width and height - label_->SetViewId("label2");// Set style - label_->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property - label_->SetText("音乐传输成功正在校验，请稍等"); - label_->SetTextId(STR_MUSIC_TRANSMIT_SUCCESS_NOTE); - label_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); - label_->SetTextColor(Color::GetColorFromRGBA(0xAA, 0xAA, 0xAA, 0xff)); - label_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label_->SetRollSpeed(0); - label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - - - if (transmitting_img == nullptr) - { - transmitting_img = new UIImageView(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); - } - transmitting_img->SetPosition(193, 150,80, 80); - const char *imagesPath = TRANSMITTING_SUCC_PATH; - transmitting_img->SetSrc(imagesPath); - UIViewGroup_transmitting->Add(transmitting_img); - - uint32_t tick; - osStatus_t retTimer; - if(transmitting_timer!=NULL) - { - osTimerStop(transmitting_timer); - osTimerDelete(transmitting_timer); - transmitting_timer = NULL; - } - transmitting_timer = osTimerNew((osTimerFunc_t)dialtimerCallBack, osTimerPeriodic, NULL, NULL); - tick =2000;// osMs2Tick(1000); - retTimer = osTimerStart(transmitting_timer, tick); - if (retTimer != osOK && transmitting_timer != NULL) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"StartCallTimer osTimerStart failed, ret = %lx!!", retTimer); - osTimerDelete(transmitting_timer); - transmitting_timer = NULL; - return ; - } - - // Add to rootView - UIViewGroup_transmitting->Add(label_); - label_->SetVisible(true); - } - - - - void creat_down_Dial_succ() - { - if (Title == nullptr) { - Title = new UILabelExt(); - } - Title->SetPosition(173, 51); // widget's left position and top position - Title->Resize(800, 88); // widget's width and height - Title->SetViewId("label1");// Set style - Title->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property - Title->SetText("安装成功"); - Title->SetTextId (STR_DIAL_SUCC_TITLE); - Title->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); - Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - Title->SetRollSpeed(0); - Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - // Add to rootView - UIViewGroup_transmitting->Add(Title); - Title->SetVisible(true); - - - if (label_ == nullptr) { - label_ = new UILabelExt(); - } - label_->SetPosition(60, 281); // widget's left position and top position - label_->Resize(345, 101); // widget's width and height - label_->SetViewId("label2");// Set style - label_->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property - label_->SetText("表盘安装成功正在更新表盘，请稍等"); - label_->SetTextId(STR_DIAL_SUCC_LABEL); - label_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); - label_->SetTextColor(Color::GetColorFromRGBA(0xAA, 0xAA, 0xAA, 0xff)); - label_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label_->SetRollSpeed(0); - label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - - - if (transmitting_img == nullptr) - { - transmitting_img = new UIImageView(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); - } - transmitting_img->SetPosition(193, 150,80, 80); - const char *imagesPath = TRANSMITTING_SUCC_PATH; - transmitting_img->SetSrc(imagesPath); - UIViewGroup_transmitting->Add(transmitting_img); - - uint32_t tick; - osStatus_t retTimer; - if(transmitting_timer!=NULL) - { - osTimerStop(transmitting_timer); - osTimerDelete(transmitting_timer); - transmitting_timer = NULL; - } - transmitting_timer = osTimerNew((osTimerFunc_t)dialtimerCallBack, osTimerPeriodic, NULL, NULL); - tick =2000;// osMs2Tick(1000); - retTimer = osTimerStart(transmitting_timer, tick); - if (retTimer != osOK && transmitting_timer != NULL) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"StartCallTimer osTimerStart failed, ret = %lx!!", retTimer); - osTimerDelete(transmitting_timer); - transmitting_timer = NULL; - return ; - } - - // Add to rootView - UIViewGroup_transmitting->Add(label_); - label_->SetVisible(true); - } - - - void creat_down_max_Dial_fail() - { - if (Title == nullptr) { - Title = new UILabelExt(); - } - Title->SetPosition(173, 51); // widget's left position and top position - Title->Resize(800, 88); // widget's width and height - Title->SetViewId("label1");// Set style - Title->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property - Title->SetTextId(STR_OPERAT_FAIL);//TODO:多国语言 - //Title->SetTextId (STR_DIAL_FAIL_TITLE); - Title->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); - Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - Title->SetRollSpeed(0); - Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - // Add to rootView - UIViewGroup_transmitting->Add(Title); - Title->SetVisible(true); - - - if (label_ == nullptr) { - label_ = new UILabelExt(); - } - label_->SetPosition(60, 281); // widget's left position and top position - label_->Resize(345, 101); // widget's width and height - label_->SetViewId("label2");// Set style - label_->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property - - label_->SetTextId(STR_DIAL_NOTE);//TODO:多国语言 - - label_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); - label_->SetTextColor(Color::GetColorFromRGBA(0xAA, 0xAA, 0xAA, 0xff)); - label_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label_->SetRollSpeed(0); - label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - - - if (transmitting_img == nullptr) - { - transmitting_img = new UIImageView(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); - } - transmitting_img->SetPosition(193, 150,80, 80); - const char *imagesPath = TRANSMITTING_FAIL_PATH; - transmitting_img->SetSrc(imagesPath); - UIViewGroup_transmitting->Add(transmitting_img); - - // Add to rootView - UIViewGroup_transmitting->Add(label_); - label_->SetVisible(true); - - - - } - - void creat_down_max_MP3_fail() - { - if (Title == nullptr) { - Title = new UILabelExt(); - } - Title->SetPosition(173, 51); // widget's left position and top position - Title->Resize(800, 88); // widget's width and height - Title->SetViewId("label1");// Set style - Title->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property - Title->SetTextId(STR_OPERAT_FAIL);//TODO:多国语言 - //Title->SetTextId (STR_DIAL_FAIL_TITLE); - Title->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); - Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - Title->SetRollSpeed(0); - Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - // Add to rootView - UIViewGroup_transmitting->Add(Title); - Title->SetVisible(true); - - - if (label_ == nullptr) { - label_ = new UILabelExt(); - } - label_->SetPosition(60, 281); // widget's left position and top position - label_->Resize(345, 101); // widget's width and height - label_->SetViewId("label2");// Set style - label_->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property - - // label_->SetTextId(STR_DIAL_NOTE);//TODO:多国语言 - // - // - if(ConfigModel::GetInstance()->GetLanguage() == ZH_CN) - label_->SetText("本地下载音乐已达到存储上限；请先删除部分歌曲再进行上传"); - else - label_->SetText( - "The storage capacity of locally downloaded music has reached the upper limit.\ - Please delete some songs before uploading"); - - - - - label_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); - label_->SetTextColor(Color::GetColorFromRGBA(0xAA, 0xAA, 0xAA, 0xff)); - label_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label_->SetRollSpeed(0); - label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - - - if (transmitting_img == nullptr) - { - transmitting_img = new UIImageView(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); - } - transmitting_img->SetPosition(193, 150,80, 80); - const char *imagesPath = TRANSMITTING_FAIL_PATH; - transmitting_img->SetSrc(imagesPath); - UIViewGroup_transmitting->Add(transmitting_img); - - // Add to rootView - UIViewGroup_transmitting->Add(label_); - label_->SetVisible(true); - - - - } - - void creat_down_Dial_fail() - { - if (Title == nullptr) { - Title = new UILabelExt(); - } - Title->SetPosition(173, 51); // widget's left position and top position - Title->Resize(800, 88); // widget's width and height - Title->SetViewId("label1");// Set style - Title->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property - Title->SetText("安装失败"); - Title->SetTextId (STR_DIAL_FAIL_TITLE); - Title->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); - Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - Title->SetRollSpeed(0); - Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - // Add to rootView - UIViewGroup_transmitting->Add(Title); - Title->SetVisible(true); - - - if (label_ == nullptr) { - label_ = new UILabelExt(); - } - label_->SetPosition(60, 281); // widget's left position and top position - label_->Resize(345, 101); // widget's width and height - label_->SetViewId("label2");// Set style - label_->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property - - - label_->SetTextId(STR_DIAL_FAIL_LABEL); - - - label_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); - label_->SetTextColor(Color::GetColorFromRGBA(0xAA, 0xAA, 0xAA, 0xff)); - label_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label_->SetRollSpeed(0); - label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - - - if (transmitting_img == nullptr) - { - transmitting_img = new UIImageView(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); - } - transmitting_img->SetPosition(193, 150,80, 80); - const char *imagesPath = TRANSMITTING_FAIL_PATH; - transmitting_img->SetSrc(imagesPath); - UIViewGroup_transmitting->Add(transmitting_img); - - // Add to rootView - UIViewGroup_transmitting->Add(label_); - label_->SetVisible(true); - - - - } - - void creat_down_MP3_fail() - { - if (Title == nullptr) { - Title = new UILabelExt(); - } - Title->SetPosition(173, 51); // widget's left position and top position - Title->Resize(800, 88); // widget's width and height - Title->SetViewId("label1");// Set style - Title->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property - Title->SetText("传输失败"); - Title->SetTextId (STR_MP3_FAIL_TITL); - Title->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); - Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - Title->SetRollSpeed(0); - Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - // Add to rootView - UIViewGroup_transmitting->Add(Title); - Title->SetVisible(true); - - - if (label_ == nullptr) { - label_ = new UILabelExt(); - } - label_->SetPosition(60, 281); // widget's left position and top position - label_->Resize(345, 101); // widget's width and height - label_->SetViewId("label2");// Set style - label_->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property - label_->SetText("音乐传输失败，请退出或重新安装"); - label_->SetTextId(STR_MP3_FAIL_LABEL); - label_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); - label_->SetTextColor(Color::GetColorFromRGBA(0xAA, 0xAA, 0xAA, 0xff)); - label_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label_->SetRollSpeed(0); - label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - - - if (transmitting_img == nullptr) - { - transmitting_img = new UIImageView(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); - } - transmitting_img->SetPosition(193, 150,80, 80); - const char *imagesPath = TRANSMITTING_FAIL_PATH; - transmitting_img->SetSrc(imagesPath); - UIViewGroup_transmitting->Add(transmitting_img); - - // Add to rootView - UIViewGroup_transmitting->Add(label_); - label_->SetVisible(true); - - - - } - - - bool transmittingISShow(void) - { - if(uapi_dev_runtime_get_transmitting_status()) - return true; - else - return false; - } - - UIViewGroup *transmittingShow() - { - - if (UIViewGroup_transmitting == nullptr) { - UIViewGroup_transmitting = new UIViewGroup(); - UIViewGroup_transmitting->SetPosition(0, 0, 466, 466); - //UIViewGroup_transmitting->SetStyle(STYLE_BACKGROUND_OPA, 0); - } - else - { - UIViewGroup_transmitting->RemoveAll(); - } - uapi_dev_runtime_set_transmitting_status(1); - switch (Transmitting_falg) - { - case TRANS_DIAL_TRANSMITTING: - creat_down_Dial(); - break; - case TRANS_DIAL_SUCC: - creat_down_Dial_succ(); - break; - case TRANS_DIAL_FAIL: - creat_down_Dial_fail(); - break; - case TRANS_DIAL_MAX_FAIL: - creat_down_max_Dial_fail(); - break; - - case TRANS_OTA_TRANSMITTING: - creat_down_OTA(); - break; - case TRANS_OTA_SUCC: - creat_down_OTA_SUCC(); - break; - case TRANS_OTA_FAIL: - creat_down_OTA_FAIL(); - break; - case TRANS_MP3_TRANSMITTING: - creat_down_MP3(); - break; - case TRANS_MP3_SUCC: - creat_down_MP3_succ(); - break; - case TRANS_MP3_FAIL: - creat_down_MP3_fail(); - break; - case OTA_UPDATA_FAIL: - Creat_OTA_Updata_FAIL(); - break; - case START_CAT1_OTA: - Creat_CAT1_OTA_Updata(); - break; - case TRANS_MP3_MAX_FAIL: - creat_down_max_MP3_fail(); - break; - - - default: - break; - } - if(Transmitting_falg==TRANS_DIAL_TRANSMITTING || Transmitting_falg==TRANS_OTA_TRANSMITTING || Transmitting_falg==TRANS_MP3_TRANSMITTING) - { - if(uapi_hfp_connect_state()) - { - uapi_hfp_disconnect(); - } - } - else if(Transmitting_falg!=OTA_UPDATA_FAIL) - { - if(uapi_dev_runtime_get_bt_powerstat() && cm_get_HFP_switch()) - { - uapi_hfp_connect(); - } - - } - - UIView::OnClickListener *button1Click = static_cast(transmittingViewEventListener::GetInstance()); - UIViewGroup_transmitting->SetOnClickListener(button1Click); - UIViewGroup_transmitting->SetTouchable(true); - - const power_display_svr_api_t *display_api = power_display_svr_get_api(); - if (display_api->get_screen_state() != SCREEN_ON) - { - display_api->turn_on_screen(); - } - display_api->set_auto_timeout_function(false); - uapi_take_to_wake(0); - - - NotificationManager::GetInstance()->RegisterNotifyCleanupFunction(Freetransmitting); - return UIViewGroup_transmitting; - } - - transmittingViewEventListener::transmittingViewEventListener() - { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CallViewEventListener :%p", this); - } - - transmittingViewEventListener::~transmittingViewEventListener() - { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "~CallViewEventListener"); - } - - transmittingViewEventListener *transmittingViewEventListener::GetInstance(void) - { - static transmittingViewEventListener lowppowrViewEventListene_t; - return &lowppowrViewEventListene_t; - } - - bool transmittingViewEventListener::OnClick(UIView& view, const ClickEvent& event) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OnClick"); - if(Transmitting_falg!=TRANS_DIAL_TRANSMITTING - && Transmitting_falg!=TRANS_OTA_TRANSMITTING - && Transmitting_falg!=TRANS_MP3_TRANSMITTING - && Transmitting_falg!=START_CAT1_OTA) - { - NotificationManager::GetInstance()->StopNotify(); - } - return true; - UNUSED(event); - } - -} diff --git a/code/sdk/zhihui/services/ble_service/bleservice/bleService.c b/code/sdk/zhihui/services/ble_service/bleservice/bleService.c index 593137afb..678b7048e 100644 --- a/code/sdk/zhihui/services/ble_service/bleservice/bleService.c +++ b/code/sdk/zhihui/services/ble_service/bleservice/bleService.c @@ -28,7 +28,9 @@ extern "C" { // #include "battery_hal.h" #include "bleService.h" #include "alipay_feature.h" +#ifdef AILPAY_SUPPORT // #include "alipay_bluetooth.h" +#endif #include "bts_a2dp_sink.h" #include "osal_timer.h" #include "bleEvent.h" @@ -38,8 +40,9 @@ extern "C" { #ifdef FACTORYTEST_SERVICE #include "factorytestService.h" #endif - -// #include "ppgBleService.h" +#ifdef SUPPORT_PPG_BLE_SERVICE +#include "ppgBleService.h" +#endif #include "build_version.h" #include "custom_runtime.h" @@ -1272,12 +1275,14 @@ static void svr_ble_bt_gatts_service_add_cb(uint8_t server_id, bt_uuid_t *uuid, } bt_uuid_t ble_service_uuid = {0}; bts_data_to_uuid_len2(BLE_SERVICE_UUID, &ble_service_uuid); - - // bt_uuid_t hid_service_uuid = {0}; - // bts_data_to_uuid_len2(BLE_UUID_HUMAN_INTERFACE_DEVICE, &hid_service_uuid); - +#ifdef SUPPORT_HID_SERVICE + bt_uuid_t hid_service_uuid = {0}; + bts_data_to_uuid_len2(BLE_UUID_HUMAN_INTERFACE_DEVICE, &hid_service_uuid); +#endif +#ifdef AILPAY_SUPPORT // // bt_uuid_t alipay_service_uuid = {0}; // // bts_data_to_uuid_len2(ALIPAYY_SERVICE_ID, &alipay_service_uuid);//0x3802 +#endif #ifdef FACTORYTEST_SERVICE bt_uuid_t factory_service_uuid = {0}; @@ -1326,12 +1331,14 @@ static void svr_ble_bt_gatts_service_add_cb(uint8_t server_id, bt_uuid_t *uuid, gatts_start_service(server_id, srv_handle); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "svr_ble_bt_gatts_service_add_cb 2\r\n"); } +#ifdef SUPPORT_HID_SERVICE + if (ble_gatts_cmp_uuid(uuid, &hid_service_uuid) == true){ + ble_hid_add_characters_and_descriptors(server_id, srv_handle); + ret = gatts_start_service(server_id, srv_handle); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "hid service svr_ble_bt_gatts_service_add_cb ret:%d\r\n",ret); + } +#endif - // if (ble_gatts_cmp_uuid(uuid, &hid_service_uuid) == true){ - // ble_hid_add_characters_and_descriptors(server_id, srv_handle); - // ret = gatts_start_service(server_id, srv_handle); - // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "hid service svr_ble_bt_gatts_service_add_cb ret:%d\r\n",ret); - // } #ifdef FACTORYTEST_SERVICE if (ble_gatts_cmp_uuid(uuid, &factory_service_uuid) == true){ ble_factorytest_add_characters_and_descriptors(server_id,srv_handle); @@ -1354,11 +1361,13 @@ static void svr_ble_bt_gatts_service_add_cb(uint8_t server_id, bt_uuid_t *uuid, } #endif +#ifdef AILPAY_SUPPORT // if (ble_gatts_cmp_uuid(uuid, &alipay_service_uuid) == true){ // alipay_add_chart_decr_recv_cmd1(server_id,srv_handle); // ret = gatts_start_service(server_id, srv_handle); // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "alipay_service_uuid service svr_ble_bt_gatts_service_add_cb ret:%d\r\n",ret); // } +#endif } uint16_t alipay_handle = 0; @@ -1997,7 +2006,6 @@ static void svr_ble_register_service(void) memcpy_s(uuid.uuid, sizeof(uuid.uuid), (char *)&ser_id, sizeof(ser_id)); #ifndef SUPPORT_OHOSFWK -xxxxxxxxxx ret = gatts_register_server(&uuid, &serverId); /* 注册gatt server */ WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "gatts_register_server ret: 0x%x serverId = 0x%x uuid.uuid_len:%d", ret, serverId,uuid.uuid_len); #else @@ -2069,14 +2077,15 @@ void svr_ble_bluetooth_init(void) #ifdef AILPAY_SUPPORT svr_alipay_bluetooth_init(g_ble_server_id); #endif - - // ble_factory_server_init(g_ble_server_id); - - // ble_ppgtest_server_init(g_ble_server_id); - -#ifdef SUPPORT_CYWEE_BLE_SERVICE + #ifdef FACTORYTEST_SERVICE + ble_factory_server_init(g_ble_server_id); + #endif + #ifdef SUPPORT_PPG_BLE_SERVICE + ble_ppgtest_server_init(g_ble_server_id); + #endif + #ifdef SUPPORT_CYWEE_BLE_SERVICE ble_cywee_server_init(g_ble_server_id); -#endif + #endif gattc_reg_id(); g_custom_ble_init_flag = true; -- 2.17.1