From 6f06cada5977336ea09f5bde57993e01a701e56e Mon Sep 17 00:00:00 2001 From: Caisking Date: Wed, 4 Mar 2026 15:56:31 +0800 Subject: [PATCH] =?utf8?q?=E5=85=B3=E9=97=AD=E5=A4=9A=E4=BD=99=E7=9A=84not?= =?utf8?q?ify=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../nativeui/activity/src/ActivityModel.cpp | 228 +++++++++--------- .../nativeui/heartrate/src/HeartModel.cpp | 217 ++++++++--------- .../takephotos/src/TakephotosModel.cpp | 222 ++++++++--------- 3 files changed, 334 insertions(+), 333 deletions(-) diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/activity/src/ActivityModel.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/activity/src/ActivityModel.cpp index 83939eab1..bc00622f6 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/activity/src/ActivityModel.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/activity/src/ActivityModel.cpp @@ -46,120 +46,120 @@ // #include "goal/include/goalmodel.h" using namespace std; -#ifdef __cplusplus -extern "C" { -#endif -// #include "cywee_hal.h" - -using namespace OHOS; - -static void Notify(void *args, const Topic topic, Request *request); - -Subscriber subscirber = { - .identity = nullptr, - .args = nullptr, - .Notify = Notify, -}; - -void StepSubscribeTopic(Topic topic) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "StepSubscribeTopic, topic=%u", topic); - BroadcastApi *broadcastApi = nullptr; - IUnknown *api = SAMGR_GetInstance()->GetFeatureApi(BROADCAST_SERVICE_NAME, - BROADCAST_FEATURE_NAME); - if (api == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, - "StepSubscribeTopic, GetFeatureApi failed"); - return; - } - int result = - api->QueryInterface(api, DEFAULT_VERSION, (void **)&broadcastApi); - if (result != 0 || broadcastApi == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, - "StepSubscribeTopic, QueryInterface failed"); - return; - } - broadcastApi->SubscribeTopic((IUnknown *)broadcastApi, topic, &subscirber); - broadcastApi->Release((IUnknown *)broadcastApi); -} - -void StepUnsubscribeTopic(Topic topic) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "StepUnsubscribeTopic, topic=%u", - topic); - BroadcastApi *broadcastApi = nullptr; - IUnknown *api = SAMGR_GetInstance()->GetFeatureApi(BROADCAST_SERVICE_NAME, - BROADCAST_FEATURE_NAME); - if (api == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, - "StepUnsubscribeTopic, GetFeatureApi failed"); - return; - } - int result = - api->QueryInterface(api, DEFAULT_VERSION, (void **)&broadcastApi); - if (result != 0 || broadcastApi == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, - "StepUnsubscribeTopic, QueryInterface failed"); - return; - } - broadcastApi->UnsubscribeTopic((IUnknown *)broadcastApi, topic, &subscirber); - broadcastApi->Release((IUnknown *)broadcastApi); -} - -static void RefreshStepControls(const uint32_t &value, const uint16 &msgId) { - MainClockView *mainClockView = OHOS::MainClockView::GetInstance(); - if (mainClockView != nullptr) { - GraphicService::GetInstance()->PostGraphicEvent( - std::bind(&MainClockView::RefreshStep, mainClockView, value)); - } - - IndoorWalkPresenter *indoorWalkPresenter = - OHOS::IndoorWalkPresenter::GetInstance(); - if (indoorWalkPresenter != nullptr) { - GraphicService::GetInstance()->PostGraphicEvent(std::bind( - &IndoorWalkPresenter::ModifiesSteps, indoorWalkPresenter, value)); - } - - ActivityWeekView *activityWeekView = OHOS::ActivityWeekView::GetInstance(); - if (activityWeekView == nullptr) { - return; - } - GraphicService::GetInstance()->PostGraphicEvent( - std::bind(&ActivityWeekView::RefreshSteps, activityWeekView, value)); - - if (msgId == TOPIC_EVENT_STEPDATA_UPDATE) { - GraphicService::GetInstance()->PostGraphicEvent(std::bind( - &ActivityWeekView::RefreshTodayView, activityWeekView, value)); - } else if (msgId == TOPIC_EVENT_NEXTDAY_UPDATE) { - GraphicService::GetInstance()->PostGraphicEvent( - std::bind(&ActivityWeekView::InitAvgStep, activityWeekView)); - if (OHOS::ActivityModel::GetInstance()->GetWeekToday() == - MONDAY_STEP_COUNTER) { - GraphicService::GetInstance()->PostGraphicEvent( - std::bind(&ActivityWeekView::InitWeekView, activityWeekView)); - } - } -} - -static uint8_t goal_type = 0; - -static void Notify(void *args, const Topic topic, Request *request) { - UNUSED(args); - UNUSED(topic); - if (request == nullptr) { - return; - } - - if (request->msgId == TOPIC_EVENT_NEXTDAY_UPDATE) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "STEP:TOPIC_EVENT_NEXTDAY_UPDATE"); - - // uint32_t refreshValue = - // OHOS::ActivityModel::GetInstance()->ZeroHourStepHandle(); - // RefreshStepControls(refreshValue, TOPIC_EVENT_NEXTDAY_UPDATE); - } -} - -#ifdef __cplusplus -} -#endif +// #ifdef __cplusplus +// extern "C" { +// #endif +// // #include "cywee_hal.h" + +// using namespace OHOS; + +// static void Notify(void *args, const Topic topic, Request *request); + +// Subscriber subscirber = { +// .identity = nullptr, +// .args = nullptr, +// .Notify = Notify, +// }; + +// void StepSubscribeTopic(Topic topic) { +// WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "StepSubscribeTopic, topic=%u", topic); +// BroadcastApi *broadcastApi = nullptr; +// IUnknown *api = SAMGR_GetInstance()->GetFeatureApi(BROADCAST_SERVICE_NAME, +// BROADCAST_FEATURE_NAME); +// if (api == nullptr) { +// WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, +// "StepSubscribeTopic, GetFeatureApi failed"); +// return; +// } +// int result = +// api->QueryInterface(api, DEFAULT_VERSION, (void **)&broadcastApi); +// if (result != 0 || broadcastApi == nullptr) { +// WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, +// "StepSubscribeTopic, QueryInterface failed"); +// return; +// } +// broadcastApi->SubscribeTopic((IUnknown *)broadcastApi, topic, &subscirber); +// broadcastApi->Release((IUnknown *)broadcastApi); +// } + +// void StepUnsubscribeTopic(Topic topic) { +// WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "StepUnsubscribeTopic, topic=%u", +// topic); +// BroadcastApi *broadcastApi = nullptr; +// IUnknown *api = SAMGR_GetInstance()->GetFeatureApi(BROADCAST_SERVICE_NAME, +// BROADCAST_FEATURE_NAME); +// if (api == nullptr) { +// WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, +// "StepUnsubscribeTopic, GetFeatureApi failed"); +// return; +// } +// int result = +// api->QueryInterface(api, DEFAULT_VERSION, (void **)&broadcastApi); +// if (result != 0 || broadcastApi == nullptr) { +// WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, +// "StepUnsubscribeTopic, QueryInterface failed"); +// return; +// } +// broadcastApi->UnsubscribeTopic((IUnknown *)broadcastApi, topic, &subscirber); +// broadcastApi->Release((IUnknown *)broadcastApi); +// } + +// static void RefreshStepControls(const uint32_t &value, const uint16 &msgId) { +// MainClockView *mainClockView = OHOS::MainClockView::GetInstance(); +// if (mainClockView != nullptr) { +// GraphicService::GetInstance()->PostGraphicEvent( +// std::bind(&MainClockView::RefreshStep, mainClockView, value)); +// } + +// IndoorWalkPresenter *indoorWalkPresenter = +// OHOS::IndoorWalkPresenter::GetInstance(); +// if (indoorWalkPresenter != nullptr) { +// GraphicService::GetInstance()->PostGraphicEvent(std::bind( +// &IndoorWalkPresenter::ModifiesSteps, indoorWalkPresenter, value)); +// } + +// ActivityWeekView *activityWeekView = OHOS::ActivityWeekView::GetInstance(); +// if (activityWeekView == nullptr) { +// return; +// } +// GraphicService::GetInstance()->PostGraphicEvent( +// std::bind(&ActivityWeekView::RefreshSteps, activityWeekView, value)); + +// if (msgId == TOPIC_EVENT_STEPDATA_UPDATE) { +// GraphicService::GetInstance()->PostGraphicEvent(std::bind( +// &ActivityWeekView::RefreshTodayView, activityWeekView, value)); +// } else if (msgId == TOPIC_EVENT_NEXTDAY_UPDATE) { +// GraphicService::GetInstance()->PostGraphicEvent( +// std::bind(&ActivityWeekView::InitAvgStep, activityWeekView)); +// if (OHOS::ActivityModel::GetInstance()->GetWeekToday() == +// MONDAY_STEP_COUNTER) { +// GraphicService::GetInstance()->PostGraphicEvent( +// std::bind(&ActivityWeekView::InitWeekView, activityWeekView)); +// } +// } +// } + +// static uint8_t goal_type = 0; + +// static void Notify(void *args, const Topic topic, Request *request) { +// UNUSED(args); +// UNUSED(topic); +// if (request == nullptr) { +// return; +// } + +// if (request->msgId == TOPIC_EVENT_NEXTDAY_UPDATE) { +// WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "STEP:TOPIC_EVENT_NEXTDAY_UPDATE"); + +// // uint32_t refreshValue = +// // OHOS::ActivityModel::GetInstance()->ZeroHourStepHandle(); +// // RefreshStepControls(refreshValue, TOPIC_EVENT_NEXTDAY_UPDATE); +// } +// } + +// #ifdef __cplusplus +// } +// #endif namespace OHOS { StepAllData g_stepData1 = {10050, 13421, 12312, 4252, 8993, 12314, 3423}; diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/heartrate/src/HeartModel.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/heartrate/src/HeartModel.cpp index c48c3e799..245b2eb0f 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/heartrate/src/HeartModel.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/heartrate/src/HeartModel.cpp @@ -60,9 +60,6 @@ #include -#ifdef __cplusplus -extern "C" { -#endif #define MAX_UNWEAR_COUNT 10 #define MAX_VALID_HRS_COUNT 10 //最大有效数 @@ -84,103 +81,107 @@ enum { using namespace OHOS; #define LEN 32 -static void Notify(void *args, const Topic topic, Request *request); - -Subscriber heartSubscirber = { - .identity = nullptr, - .args = nullptr, - .Notify = Notify, -}; -static void ProcessHeartRateUpdate(Request *request); -static void RefreshHeartData(); -void save_heart_maxmin(); -void HeartDataSubscribeTopic(Topic topic) { - BroadcastApi *broadcastApi = nullptr; - IUnknown *api = SAMGR_GetInstance()->GetFeatureApi(BROADCAST_SERVICE_NAME, - BROADCAST_FEATURE_NAME); - if (api == nullptr) { - return; - } - int result = - api->QueryInterface(api, DEFAULT_VERSION, (void **)&broadcastApi); - if (result != 0 || broadcastApi == nullptr) { - return; - } - int ret = broadcastApi->SubscribeTopic((IUnknown *)broadcastApi, topic, - &heartSubscirber); - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartSubscribeTopic ret=%d,topic=%u", - ret, topic); - broadcastApi->Release((IUnknown *)broadcastApi); -} - -void HearDatatUnsubscribeTopic(Topic topic) { - BroadcastApi *broadcastApi = nullptr; - IUnknown *api = SAMGR_GetInstance()->GetFeatureApi(BROADCAST_SERVICE_NAME, - BROADCAST_FEATURE_NAME); - if (api == nullptr) { - return; - } - int result = - api->QueryInterface(api, DEFAULT_VERSION, (void **)&broadcastApi); - if (result != 0 || broadcastApi == nullptr) { - return; - } - broadcastApi->UnsubscribeTopic((IUnknown *)broadcastApi, topic, - &heartSubscirber); - broadcastApi->Release((IUnknown *)broadcastApi); -} - -static void Notify(void *args, const Topic topic, Request *request) { - UNUSED(args); - UNUSED(topic); - - // 训练过程中不需要判断数据准确性，不需要存储心率数据 - if (uapi_dev_runtime_get_train_status() == 1 || - uapi_dev_runtime_get_respiratory_training_status() || request == NULL) { - return; - } - if (request->msgId == TOPIC_EVENT_HEARTRATE_UPDATA) { - GraphicService::GetInstance()->PostGraphicEvent(std::bind( - &HeartModel::RefreshHeartRateScreen, HeartModel::GetInstance())); - } -} - -static void ProcessHeartRateUpdate(Request *request) { - uint16_t preheart = *reinterpret_cast(request->data); - - // 直接处理心率数据，不进行筛选 - uint16_t index_ = HeartModel::GetInstance()->GetIndex(); - HeartDatas *heartInfo = (HeartDatas *)malloc(sizeof(HeartDatas)); - if (heartInfo == NULL) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[Notify] malloc fail"); - return; - } - - heartInfo->index = index_; - heartInfo->maxX = index_; - heartInfo->minX = index_; - heartInfo->perSec = preheart; - heartInfo->rest = preheart; - /*最大最小值不为0*/ - heartInfo->maxValue = preheart; - heartInfo->minValue = preheart; - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "heartRateData=%d%d", heartInfo->index, - preheart); - OHOS::HeartModel::GetInstance()->HeartRatePros(heartInfo); - - free(heartInfo); // 释放内存 - heartInfo = nullptr; -} - -static void RefreshHeartData() { - OHOS::HeartModel::GetInstance()->ClearHeartData(); - GraphicService::GetInstance()->PostGraphicEvent(std::bind( - &OHOS::HeartModel::Heart_Update_View, OHOS::HeartModel::GetInstance())); -} - -#ifdef __cplusplus -} -#endif +// #ifdef __cplusplus +// extern "C" { +// #endif + +// static void Notify(void *args, const Topic topic, Request *request); + +// Subscriber heartSubscirber = { +// .identity = nullptr, +// .args = nullptr, +// .Notify = Notify, +// }; +// static void ProcessHeartRateUpdate(Request *request); +// static void RefreshHeartData(); +// void save_heart_maxmin(); +// void HeartDataSubscribeTopic(Topic topic) { +// BroadcastApi *broadcastApi = nullptr; +// IUnknown *api = SAMGR_GetInstance()->GetFeatureApi(BROADCAST_SERVICE_NAME, +// BROADCAST_FEATURE_NAME); +// if (api == nullptr) { +// return; +// } +// int result = +// api->QueryInterface(api, DEFAULT_VERSION, (void **)&broadcastApi); +// if (result != 0 || broadcastApi == nullptr) { +// return; +// } +// int ret = broadcastApi->SubscribeTopic((IUnknown *)broadcastApi, topic, +// &heartSubscirber); +// WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartSubscribeTopic ret=%d,topic=%u", +// ret, topic); +// broadcastApi->Release((IUnknown *)broadcastApi); +// } + +// void HearDatatUnsubscribeTopic(Topic topic) { +// BroadcastApi *broadcastApi = nullptr; +// IUnknown *api = SAMGR_GetInstance()->GetFeatureApi(BROADCAST_SERVICE_NAME, +// BROADCAST_FEATURE_NAME); +// if (api == nullptr) { +// return; +// } +// int result = +// api->QueryInterface(api, DEFAULT_VERSION, (void **)&broadcastApi); +// if (result != 0 || broadcastApi == nullptr) { +// return; +// } +// broadcastApi->UnsubscribeTopic((IUnknown *)broadcastApi, topic, +// &heartSubscirber); +// broadcastApi->Release((IUnknown *)broadcastApi); +// } + +// static void Notify(void *args, const Topic topic, Request *request) { +// UNUSED(args); +// UNUSED(topic); + +// // 训练过程中不需要判断数据准确性，不需要存储心率数据 +// if (uapi_dev_runtime_get_train_status() == 1 || +// uapi_dev_runtime_get_respiratory_training_status() || request == NULL) { +// return; +// } +// if (request->msgId == TOPIC_EVENT_HEARTRATE_UPDATA) { +// GraphicService::GetInstance()->PostGraphicEvent(std::bind( +// &HeartModel::RefreshHeartRateScreen, HeartModel::GetInstance())); +// } +// } + +// static void ProcessHeartRateUpdate(Request *request) { +// uint16_t preheart = *reinterpret_cast(request->data); + +// // 直接处理心率数据，不进行筛选 +// uint16_t index_ = HeartModel::GetInstance()->GetIndex(); +// HeartDatas *heartInfo = (HeartDatas *)malloc(sizeof(HeartDatas)); +// if (heartInfo == NULL) { +// WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[Notify] malloc fail"); +// return; +// } + +// heartInfo->index = index_; +// heartInfo->maxX = index_; +// heartInfo->minX = index_; +// heartInfo->perSec = preheart; +// heartInfo->rest = preheart; +// /*最大最小值不为0*/ +// heartInfo->maxValue = preheart; +// heartInfo->minValue = preheart; +// WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "heartRateData=%d%d", heartInfo->index, +// preheart); +// OHOS::HeartModel::GetInstance()->HeartRatePros(heartInfo); + +// free(heartInfo); // 释放内存 +// heartInfo = nullptr; +// } + +// static void RefreshHeartData() { +// OHOS::HeartModel::GetInstance()->ClearHeartData(); +// GraphicService::GetInstance()->PostGraphicEvent(std::bind( +// &OHOS::HeartModel::Heart_Update_View, OHOS::HeartModel::GetInstance())); +// } + +// #ifdef __cplusplus +// } +// #endif namespace OHOS { void HeartModel::ClearHeartData(void) { @@ -236,10 +237,10 @@ HeartModel::HeartModel() { HeartModel::~HeartModel() { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartModel::~HeartModel()"); - HearDatatUnsubscribeTopic(TOPIC_EVENT_HEARTRATE_UPDATA); - HearDatatUnsubscribeTopic(TOPIC_EVENT_NEXTDAY_UPDATE); - HearDatatUnsubscribeTopic(TOPIC_EVENT_UTCTIME_UPDATE); - HearDatatUnsubscribeTopic(TOPIC_EVENT_WEARSTATE_UPDATE); + // HearDatatUnsubscribeTopic(TOPIC_EVENT_HEARTRATE_UPDATA); + // HearDatatUnsubscribeTopic(TOPIC_EVENT_NEXTDAY_UPDATE); + // HearDatatUnsubscribeTopic(TOPIC_EVENT_UTCTIME_UPDATE); + // HearDatatUnsubscribeTopic(TOPIC_EVENT_WEARSTATE_UPDATE); } HeartModel *HeartModel::GetInstance(void) { @@ -250,10 +251,10 @@ uint16_t HeartModel::GetIndex() { return index_; } void HeartModel::SetIndex(uint16_t index) { index_ = index; } void HeartModel::Init(void) { - HeartDataSubscribeTopic(TOPIC_EVENT_HEARTRATE_UPDATA); - HeartDataSubscribeTopic(TOPIC_EVENT_NEXTDAY_UPDATE); - HeartDataSubscribeTopic(TOPIC_EVENT_UTCTIME_UPDATE); - HeartDataSubscribeTopic(TOPIC_EVENT_WEARSTATE_UPDATE); + // HeartDataSubscribeTopic(TOPIC_EVENT_HEARTRATE_UPDATA); + // HeartDataSubscribeTopic(TOPIC_EVENT_NEXTDAY_UPDATE); + // HeartDataSubscribeTopic(TOPIC_EVENT_UTCTIME_UPDATE); + // HeartDataSubscribeTopic(TOPIC_EVENT_WEARSTATE_UPDATE); } Point *HeartModel::GetAveHeartRate(void) { return healthDatas.heartRateAvg; } diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/takephotos/src/TakephotosModel.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/takephotos/src/TakephotosModel.cpp index 7dad5e410..5d747231b 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/takephotos/src/TakephotosModel.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/takephotos/src/TakephotosModel.cpp @@ -34,117 +34,117 @@ #include "vibrator_service.h" -#ifdef __cplusplus -extern "C" -{ -#endif - static void Notify(void *args, const Topic topic, Request *request); +// #ifdef __cplusplus +// extern "C" +// { +// #endif +// static void Notify(void *args, const Topic topic, Request *request); - using namespace OHOS; +// using namespace OHOS; - Subscriber TakephotosSubscirber = { - .identity = NULL, - .args = NULL, - .Notify = Notify, - }; - void TakephotosSubscribeTopic(Topic topic) - { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "stepsubscribeTopic, topic=%u", topic); - BroadcastApi *broadcastApi = NULL; - IUnknown *api = SAMGR_GetInstance()->GetFeatureApi(BROADCAST_SERVICE_NAME, - BROADCAST_FEATURE_NAME); - if (api == NULL) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, - "stepsubscribeTopic, GetFeatureApi failed"); - return; - } - int result = - api->QueryInterface(api, DEFAULT_VERSION, (void **)&broadcastApi); - if (result != 0 || broadcastApi == NULL) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, - "stepsubscribeTopic, QueryInterface failed"); - return; - } - broadcastApi->SubscribeTopic((IUnknown *)broadcastApi, topic, - &TakephotosSubscirber); - broadcastApi->Release((IUnknown *)broadcastApi); - } +// Subscriber TakephotosSubscirber = { +// .identity = NULL, +// .args = NULL, +// .Notify = Notify, +// }; +// void TakephotosSubscribeTopic(Topic topic) +// { +// WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "stepsubscribeTopic, topic=%u", topic); +// BroadcastApi *broadcastApi = NULL; +// IUnknown *api = SAMGR_GetInstance()->GetFeatureApi(BROADCAST_SERVICE_NAME, +// BROADCAST_FEATURE_NAME); +// if (api == NULL) +// { +// WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, +// "stepsubscribeTopic, GetFeatureApi failed"); +// return; +// } +// int result = +// api->QueryInterface(api, DEFAULT_VERSION, (void **)&broadcastApi); +// if (result != 0 || broadcastApi == NULL) +// { +// WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, +// "stepsubscribeTopic, QueryInterface failed"); +// return; +// } +// broadcastApi->SubscribeTopic((IUnknown *)broadcastApi, topic, +// &TakephotosSubscirber); +// broadcastApi->Release((IUnknown *)broadcastApi); +// } - void TakephotosUnsubscribeTopic(Topic topic) - { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TakephotosUnsubscribeTopic, topic=%u", - topic); - BroadcastApi *broadcastApi = NULL; - IUnknown *api = SAMGR_GetInstance()->GetFeatureApi(BROADCAST_SERVICE_NAME, - BROADCAST_FEATURE_NAME); - if (api == NULL) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, - "TakephotosUnsubscribeTopic, GetFeatureApi failed"); - return; - } - int result = - api->QueryInterface(api, DEFAULT_VERSION, (void **)&broadcastApi); - if (result != 0 || broadcastApi == NULL) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, - "TakephotosUnsubscribeTopic, QueryInterface failed"); - return; - } - broadcastApi->UnsubscribeTopic((IUnknown *)broadcastApi, topic, - &TakephotosSubscirber); - broadcastApi->Release((IUnknown *)broadcastApi); - } +// void TakephotosUnsubscribeTopic(Topic topic) +// { +// WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TakephotosUnsubscribeTopic, topic=%u", +// topic); +// BroadcastApi *broadcastApi = NULL; +// IUnknown *api = SAMGR_GetInstance()->GetFeatureApi(BROADCAST_SERVICE_NAME, +// BROADCAST_FEATURE_NAME); +// if (api == NULL) +// { +// WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, +// "TakephotosUnsubscribeTopic, GetFeatureApi failed"); +// return; +// } +// int result = +// api->QueryInterface(api, DEFAULT_VERSION, (void **)&broadcastApi); +// if (result != 0 || broadcastApi == NULL) +// { +// WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, +// "TakephotosUnsubscribeTopic, QueryInterface failed"); +// return; +// } +// broadcastApi->UnsubscribeTopic((IUnknown *)broadcastApi, topic, +// &TakephotosSubscirber); +// broadcastApi->Release((IUnknown *)broadcastApi); +// } - static void Notify(void *args, const Topic topic, Request *request) - { - UNUSED(args); - UNUSED(topic); - if (request == NULL) - { - return; - } - // 进入拍照界面 - if (request->msgId == TOPIC_EVENT_ENTER_CMAERA) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, " 遥控拍照 \r\n"); - uapi_set_screen_on_api(); // 亮屏 - TakephotosModel::GetInstance()->SetPopStaust(PopupPhoto::TakePopup); - // 获取当前界面Id - int16_t curviewid = OHOS::NativeAbility::GetInstance().GetCurSliceId(); - // 已经处于遥控拍照界面 - if (curviewid == VIEW_TAKEPHOTOS) - { - NativeAbility::GetInstance().ChangeSlice(VIEW_TAKEPHOTOS); - } - else - { - NativeAbility::GetInstance().EnterSlice(VIEW_TAKEPHOTOS); - } - } - // 退出拍照 - if (request->msgId == TOPIC_EVENT_CANCEL_CMAERA) - { - // 获取当前界面Id - int16_t curviewid = OHOS::NativeAbility::GetInstance().GetCurSliceId(); - // 已经处于遥控拍照界面 - if (curviewid == VIEW_TAKEPHOTOS) - { - // 点亮屏幕 - uapi_set_screen_on_api(); - NativeAbility::GetInstance().Back(); -#ifdef SUPPORT_BLE_SERVICE - cameraSend(3); -#endif - TakephotosModel::GetInstance()->SetPopStaust(PopupPhoto::CreamPopup); - } - } - } -#ifdef __cplusplus -} -#endif +// static void Notify(void *args, const Topic topic, Request *request) +// { +// UNUSED(args); +// UNUSED(topic); +// if (request == NULL) +// { +// return; +// } +// // 进入拍照界面 +// if (request->msgId == TOPIC_EVENT_ENTER_CMAERA) +// { +// WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, " 遥控拍照 \r\n"); +// uapi_set_screen_on_api(); // 亮屏 +// TakephotosModel::GetInstance()->SetPopStaust(PopupPhoto::TakePopup); +// // 获取当前界面Id +// int16_t curviewid = OHOS::NativeAbility::GetInstance().GetCurSliceId(); +// // 已经处于遥控拍照界面 +// if (curviewid == VIEW_TAKEPHOTOS) +// { +// NativeAbility::GetInstance().ChangeSlice(VIEW_TAKEPHOTOS); +// } +// else +// { +// NativeAbility::GetInstance().EnterSlice(VIEW_TAKEPHOTOS); +// } +// } +// // 退出拍照 +// if (request->msgId == TOPIC_EVENT_CANCEL_CMAERA) +// { +// // 获取当前界面Id +// int16_t curviewid = OHOS::NativeAbility::GetInstance().GetCurSliceId(); +// // 已经处于遥控拍照界面 +// if (curviewid == VIEW_TAKEPHOTOS) +// { +// // 点亮屏幕 +// uapi_set_screen_on_api(); +// NativeAbility::GetInstance().Back(); +// #ifdef SUPPORT_BLE_SERVICE +// cameraSend(3); +// #endif +// TakephotosModel::GetInstance()->SetPopStaust(PopupPhoto::CreamPopup); +// } +// } +// } +// #ifdef __cplusplus +// } +// #endif namespace OHOS { @@ -156,8 +156,8 @@ namespace OHOS TakephotosModel ::~TakephotosModel() { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TakephotosModel::~TakephotosModel()"); - TakephotosUnsubscribeTopic(TOPIC_EVENT_ENTER_CMAERA); // 取消订阅 - TakephotosUnsubscribeTopic(TOPIC_EVENT_CANCEL_CMAERA); + // TakephotosUnsubscribeTopic(TOPIC_EVENT_ENTER_CMAERA); // 取消订阅 + // TakephotosUnsubscribeTopic(TOPIC_EVENT_CANCEL_CMAERA); } TakephotosModel *TakephotosModel::GetInstance(void) { @@ -167,8 +167,8 @@ namespace OHOS void TakephotosModel ::Init() { - TakephotosSubscribeTopic(TOPIC_EVENT_ENTER_CMAERA); // 进行消息订阅 - TakephotosSubscribeTopic(TOPIC_EVENT_CANCEL_CMAERA); + // TakephotosSubscribeTopic(TOPIC_EVENT_ENTER_CMAERA); // 进行消息订阅 + // TakephotosSubscribeTopic(TOPIC_EVENT_CANCEL_CMAERA); } // 设置弹窗状态 -- 2.17.1