From: Caisking <3449750381@qq.com> Date: Mon, 25 Mar 2024 07:37:24 +0000 (+0800) Subject: 增加充电退出省电模式 X-Git-Tag: release_V1.2.70_20241020_135402~1268 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=482a82c23631b72d3e6dc1e74c3d33b7711431a0;p=mirrors%2FFD230.git 增加充电退出省电模式 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/saveele/include/SaveBatPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/saveele/include/SaveBatPresenter.h index 8136c7555..aa35ea550 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/saveele/include/SaveBatPresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/saveele/include/SaveBatPresenter.h @@ -27,6 +27,7 @@ namespace OHOS static SaveBatPresenter *GetInstance(); virtual void Notify() override; + void ExitView(void); private: // 因为继承了OnClickListener,所以有OnClick属性,至于参数,原函数也这样直接继承; diff --git a/code/sdk/application/wearable/fd230app/nativeui/saveele/include/SaveEleModel.h b/code/sdk/application/wearable/fd230app/nativeui/saveele/include/SaveEleModel.h index e69de29bb..1d056ce5d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/saveele/include/SaveEleModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/saveele/include/SaveEleModel.h @@ -0,0 +1,24 @@ + +#ifndef SaveEle_MODEL_H +#define SaveEle_MODEL_H + +namespace OHOS +{ + class SaveEleModel + { + public: + static SaveEleModel *GetInstance(void); + int GetChargeStuaut(); + void SetChargeStuaut(int chargestuaut); + + private: + SaveEleModel() = default; + ~SaveEleModel() {} + SaveEleModel(const SaveEleModel &) = delete; + SaveEleModel &operator=(const SaveEleModel &) = delete; + + int ChargeStuaut = 0; // 充电状态 + }; +} + +#endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveBatPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveBatPresenter.cpp index 27435868f..a64e5d93b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveBatPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveBatPresenter.cpp @@ -18,7 +18,7 @@ #include "NativeAbility.h" #include "saveele/include/SaveBatPresenter.h" - +#include "saveele/include/SaveEleModel.h" namespace OHOS { @@ -76,11 +76,6 @@ namespace OHOS bool SaveBatPresenter::OnClick(UIView &view, const ClickEvent &event) { - // 执行点击事件的处理逻辑 - // 根据控件id查找是哪个控件触发了点击回调 - // if (strcmp(view.GetViewId(), 控件ID) == 0 - // 返回 true 以消耗点击事件 - return true; } bool SaveBatPresenter::OnLongPress(UIView &view, const LongPressEvent &event) @@ -94,8 +89,16 @@ namespace OHOS } return true; } + void SaveBatPresenter::ExitView(void) + { + if (SaveEleModel::GetInstance()->GetChargeStuaut()) + { + NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN); + } + } void SaveBatPresenter::Notify(void) { SaveBatView::GetInstance()->RefreshView(); + ExitView(); } } \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveEleModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveEleModel.cpp index e69de29bb..8f7d9f698 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveEleModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveEleModel.cpp @@ -0,0 +1,19 @@ +#include "saveele/include/SaveEleModel.h" + +namespace OHOS +{ + + SaveEleModel *SaveEleModel::GetInstance(void) + { + static SaveEleModel instance; + return &instance; + } + int SaveEleModel::GetChargeStuaut() + { + return ChargeStuaut; + } + void SaveEleModel::SetChargeStuaut(int chargestuaut) + { + ChargeStuaut = chargestuaut; + } +} \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemModel.h b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemModel.h index 4715f7371..162acebfc 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemModel.h @@ -1,3 +1,11 @@ +/*** + * @Author: Caisking 3449750381@qq.com + * @Date: 2024-01-29 19:58:37 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-03-25 15:25:13 + * @FilePath: /sdk/application/wearable/fd230app/nativeui/system/include/SystemModel.h + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ #ifndef SYSTEM_MODEL_H #define SYSTEM_MODEL_H diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemModel.cpp index 8e77ce1da..93d58761c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemModel.cpp @@ -1,3 +1,11 @@ +/*** + * @Author: Caisking 3449750381@qq.com + * @Date: 2024-01-29 19:58:37 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-03-25 15:24:17 + * @FilePath: /sdk/application/wearable/fd230app/nativeui/system/src/SystemModel.cpp + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ #include "system/include/SystemModel.h" namespace OHOS diff --git a/code/sdk/application/wearable/service/msg_center/CMakeLists.txt b/code/sdk/application/wearable/service/msg_center/CMakeLists.txt index 3e0f3bd12..89ac13c40 100755 --- a/code/sdk/application/wearable/service/msg_center/CMakeLists.txt +++ b/code/sdk/application/wearable/service/msg_center/CMakeLists.txt @@ -16,6 +16,7 @@ set(PRIVATE_HEADER ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/main/include/dial ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/bloodoxygen/include ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/heartrate/include + ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/saveele/include/ ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/main/include ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/player/include ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/bluetooth/include @@ -114,6 +115,7 @@ set(PRIVATE_HEADER ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/clock/include ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/activity/include ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/rtcservice/include + ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/saveele/include/ ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/player/include ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/bluetooth/include ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativelauncher/include diff --git a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp index bd758a761..711ea4b18 100755 --- a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp +++ b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp @@ -21,6 +21,7 @@ #include "DialModelSPO2.h" #include "BloodOxygenModel.h" #include "HeartModel.h" +#include "SaveEleModel.h" #include "ppg_service.h" #include "CallerLogModel.h" #include "notification_manager.h" @@ -200,6 +201,7 @@ void MsgCenterNotifyChargePlugProc(const Topic topic, Request* req) display_api->turn_on_screen(); } DialModelCharge::GetInstance()->UpdateChargeStuaut(1); + SaveEleModel::GetInstance()->SetChargeStuaut(1); testCHANINGView *t=testCHANINGView::GetInstance(); if(t!=NULL) @@ -215,6 +217,8 @@ void MsgCenterNotifyChargeUnPlugProc(const Topic topic, Request* req) unused(topic); WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "MsgCenterNotifyProc:: CHarger UnPlug !"); DialModelCharge::GetInstance()->UpdateChargeStuaut(0); + SaveEleModel::GetInstance()->SetChargeStuaut(0); + testCHANINGView *t=testCHANINGView::GetInstance(); if(t!=NULL) { @@ -271,6 +275,7 @@ void MsgCenterNotifyHfpWatchProc(const Topic topic, Request* req) } #ifdef SUPPORT_SPO2_NOTIFICATION_TEST uint32_t md = PPG_SERVICE_CMD_TYPE_DO_PPG_TEST; +//灰卡测试 void MsgCenterNotifyCardhProc(const Topic topic, Request* req) { unused(topic); @@ -296,7 +301,7 @@ void MsgCenterNotifyCardhProc(const Topic topic, Request* req) } } - +//漏光测试 void MsgCenterNotifyleaklighthProc(const Topic topic, Request* req) { unused(topic);