From ab0cda3f4faaf6723b2ab2f53ed9e1015d1ed69f Mon Sep 17 00:00:00 2001 From: HYH Date: Tue, 15 Nov 2022 08:45:31 +0000 Subject: [PATCH 01/11] Modify test config Signed-off-by: HYH --- interfaces/plugin/vibrator/test/unittest/config.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/interfaces/plugin/vibrator/test/unittest/config.json b/interfaces/plugin/vibrator/test/unittest/config.json index cff58d3..9753f29 100644 --- a/interfaces/plugin/vibrator/test/unittest/config.json +++ b/interfaces/plugin/vibrator/test/unittest/config.json @@ -16,7 +16,8 @@ "package": "com.example.myapplication", "name": ".MyApplication", "deviceType": [ - "phone" + "default", + "tablet" ], "distro": { "deliveryWithInstall": true, -- Gitee From c0d222ed9eb17e9f6fb0af8d3a164ef35e7e1e85 Mon Sep 17 00:00:00 2001 From: h00514358 Date: Sat, 19 Nov 2022 10:42:25 +0800 Subject: [PATCH 02/11] add test Signed-off-by: h00514358 Change-Id: I27c18c4bb3746d319bd2930733515c413fe59212 --- frameworks/native/miscdevice/BUILD.gn | 32 +- .../miscdevice/include/i_miscdevice_service.h | 36 +- .../miscdevice/include/light_service_client.h | 43 --- .../include/miscdevice_service_proxy.h | 23 -- .../include/vibrator_service_client.h | 6 - .../miscdevice/src/light_service_client.cpp | 133 ------- .../src/miscdevice_service_proxy.cpp | 330 ------------------ .../src/vibrator_service_client.cpp | 79 ----- .../include/miscdevice_service.h | 13 - .../src/miscdevice_service.cpp | 67 ---- .../src/miscdevice_service_stub.cpp | 117 +------ 11 files changed, 3 insertions(+), 876 deletions(-) delete mode 100755 frameworks/native/miscdevice/include/light_service_client.h delete mode 100644 frameworks/native/miscdevice/src/light_service_client.cpp diff --git a/frameworks/native/miscdevice/BUILD.gn b/frameworks/native/miscdevice/BUILD.gn index e1ccadb..99a430d 100644 --- a/frameworks/native/miscdevice/BUILD.gn +++ b/frameworks/native/miscdevice/BUILD.gn @@ -15,33 +15,6 @@ import("//build/ohos.gni") SUBSYSTEM_DIR = "//base/sensors" -############################################## -ohos_shared_library("liblight_native") { - sources = [ - "src/light_service_client.cpp", - "src/miscdevice_service_proxy.cpp", - ] - - include_dirs = [ - "include", - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", - "$SUBSYSTEM_DIR/miscdevice/utils/include", - "//utils/jni/jnikit/include", - ] - cflags = [ "-fstack-protector-all" ] - - external_deps = [ - "c_utils:utils", - "hisysevent_native:libhisysevent", - "hiviewdfx_hilog_native:libhilog", - "ipc:ipc_core", - "samgr:samgr_proxy", - ] - part_name = "miscdevice" - subsystem_name = "sensors" -} - ############################################## ohos_shared_library("libvibrator_native") { sources = [ @@ -72,8 +45,5 @@ ohos_shared_library("libvibrator_native") { ############################################## group("miscdevice_native_target") { - deps = [ - ":liblight_native", - ":libvibrator_native", - ] + deps = [ ":libvibrator_native" ] } diff --git a/frameworks/native/miscdevice/include/i_miscdevice_service.h b/frameworks/native/miscdevice/include/i_miscdevice_service.h index 40a2f82..0c6936c 100755 --- a/frameworks/native/miscdevice/include/i_miscdevice_service.h +++ b/frameworks/native/miscdevice/include/i_miscdevice_service.h @@ -32,12 +32,6 @@ public: DECLARE_INTERFACE_DESCRIPTOR(u"IMiscdeviceService"); - virtual bool IsAbilityAvailable(MiscdeviceDeviceId groupID) = 0; - - virtual bool IsVibratorEffectAvailable(int32_t vibratorId, const std::string &effectType) = 0; - - virtual std::vector GetVibratorIdList() = 0; - virtual int32_t Vibrate(int32_t vibratorId, int32_t timeOut, int32_t usage) = 0; virtual int32_t CancelVibrator(int32_t vibratorId) = 0; @@ -45,41 +39,13 @@ public: virtual int32_t PlayVibratorEffect(int32_t vibratorId, const std::string &effect, int32_t loopCount, int32_t usage) = 0; - virtual int32_t PlayCustomVibratorEffect(int32_t vibratorId, const std::vector &timing, - const std::vector &intensity, int32_t periodCount) = 0; - virtual int32_t StopVibratorEffect(int32_t vibratorId, const std::string &effect) = 0; - virtual int32_t SetVibratorParameter(int32_t vibratorId, const std::string &cmd) = 0; - - virtual std::string GetVibratorParameter(int32_t vibratorId, const std::string &cmd) = 0; - - virtual std::vector GetLightSupportId() = 0; - - virtual bool IsLightEffectSupport(int32_t lightId, const std::string &effectId) = 0; - - virtual int32_t Light(int32_t lightId, uint64_t brightness, uint32_t timeOn, uint32_t timeOff) = 0; - - virtual int32_t PlayLightEffect(int32_t lightId, const std::string &type) = 0; - - virtual int32_t StopLightEffect(int32_t lightId) = 0; - enum { - IS_ABILITY_AVAILABLE = 0, - GET_VIBRATOR_ID_LIST, - IS_VIBRATOR_EFFECT_AVAILABLE, VIBRATE, CANCEL_VIBRATOR, PLAY_VIBRATOR_EFFECT, - PLAY_CUSTOM_VIBRATOR_EFFECT, - STOP_VIBRATOR_EFFECT, - SET_VIBRATOR_PARA, - GET_VIBRATOR_PARA, - GET_LIGHT_SUPPORT_ID, - IS_LIGHT_EFFECT_SUPPORT, - LIGHT, - PLAY_LIGHT_EFFECT, - STOP_LIGHT_EFFECT, + STOP_VIBRATOR_EFFECT }; }; } // namespace Sensors diff --git a/frameworks/native/miscdevice/include/light_service_client.h b/frameworks/native/miscdevice/include/light_service_client.h deleted file mode 100755 index 15eb964..0000000 --- a/frameworks/native/miscdevice/include/light_service_client.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef LIGHT_SERVICE_CLIENT_H -#define LIGHT_SERVICE_CLIENT_H - -#include -#include "iremote_object.h" -#include "miscdevice_service_proxy.h" -#include "singleton.h" - -namespace OHOS { -namespace Sensors { -class LightServiceClient : public Singleton { -public: - std::vector GetLightIdList(); - bool IsLightEffectSupport(int32_t lightId, const std::string &effectId); - int32_t Light(int32_t lightId, uint64_t brightness, uint32_t timeOn, uint32_t timeOff); - int32_t PlayLightEffect(int32_t lightId, const std::string &type); - int32_t StopLightEffect(int32_t lightId); - void ProcessDeathObserver(const wptr &object); - -private: - int32_t InitServiceClient(); - sptr serviceDeathObserver_; - sptr miscdeviceProxy_; - std::mutex clientMutex_; -}; -} // namespace Sensors -} // namespace OHOS -#endif // LIGHT_SERVICE_CLIENT_H diff --git a/frameworks/native/miscdevice/include/miscdevice_service_proxy.h b/frameworks/native/miscdevice/include/miscdevice_service_proxy.h index 2be25dd..3819b0a 100755 --- a/frameworks/native/miscdevice/include/miscdevice_service_proxy.h +++ b/frameworks/native/miscdevice/include/miscdevice_service_proxy.h @@ -28,12 +28,6 @@ public: ~MiscdeviceServiceProxy() = default; - virtual bool IsAbilityAvailable(MiscdeviceDeviceId groupID) override; - - virtual bool IsVibratorEffectAvailable(int32_t vibratorId, const std::string &effectType) override; - - virtual std::vector GetVibratorIdList() override; - virtual int32_t Vibrate(int32_t vibratorId, int32_t timeOut, int32_t usage) override; virtual int32_t CancelVibrator(int32_t vibratorId) override; @@ -41,25 +35,8 @@ public: virtual int32_t PlayVibratorEffect(int32_t vibratorId, const std::string &effect, int32_t loopCount, int32_t usage) override; - virtual int32_t PlayCustomVibratorEffect(int32_t vibratorId, const std::vector &timing, - const std::vector &intensity, int32_t periodCount) override; - virtual int32_t StopVibratorEffect(int32_t vibratorId, const std::string &effect) override; - virtual int32_t SetVibratorParameter(int32_t vibratorId, const std::string &cmd) override; - - virtual std::string GetVibratorParameter(int32_t vibratorId, const std::string &cmd) override; - - virtual std::vector GetLightSupportId() override; - - virtual bool IsLightEffectSupport(int32_t lightId, const std::string &effectId) override; - - virtual int32_t Light(int32_t lightId, uint64_t brightness, uint32_t timeOn, uint32_t timeOff) override; - - virtual int32_t PlayLightEffect(int32_t lightId, const std::string &type) override; - - virtual int32_t StopLightEffect(int32_t lightId) override; - private: DISALLOW_COPY_AND_MOVE(MiscdeviceServiceProxy); static inline BrokerDelegator delegator_; diff --git a/frameworks/native/miscdevice/include/vibrator_service_client.h b/frameworks/native/miscdevice/include/vibrator_service_client.h index 2776394..3f08c58 100755 --- a/frameworks/native/miscdevice/include/vibrator_service_client.h +++ b/frameworks/native/miscdevice/include/vibrator_service_client.h @@ -25,15 +25,9 @@ namespace OHOS { namespace Sensors { class VibratorServiceClient : public Singleton { public: - std::vector GetVibratorIdList(); - bool IsVibratorEffectSupport(int32_t vibratorId, const std::string &effect); int32_t Vibrate(int32_t vibratorId, int32_t timeOut, int32_t usage); int32_t Vibrate(int32_t vibratorId, const std::string &effect, int32_t loopCount, int32_t usage); - int32_t Vibrate(int32_t vibratorId, std::vector timing, std::vector intensity, - int32_t periodCount); int32_t Stop(int32_t vibratorId, const std::string &type); - int32_t SetVibratorParameter(int32_t vibratorId, const std::string &cmd); - std::string GetVibratorParameter(int32_t vibratorId, const std::string &command); void ProcessDeathObserver(const wptr &object); private: diff --git a/frameworks/native/miscdevice/src/light_service_client.cpp b/frameworks/native/miscdevice/src/light_service_client.cpp deleted file mode 100644 index fcda840..0000000 --- a/frameworks/native/miscdevice/src/light_service_client.cpp +++ /dev/null @@ -1,133 +0,0 @@ -/* - * Copyright (c) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "light_service_client.h" - -#include -#include "death_recipient_template.h" -#include "hisysevent.h" -#include "iservice_registry.h" -#include "sensors_errors.h" -#include "system_ability_definition.h" - -namespace OHOS { -namespace Sensors { -using namespace OHOS::HiviewDFX; - -namespace { -constexpr HiLogLabel LABEL = { LOG_CORE, MISC_LOG_DOMAIN, "LightServiceClient" }; -constexpr int32_t GET_SERVICE_MAX_COUNT = 30; -constexpr uint32_t WAIT_MS = 200; -} // namespace - -int32_t LightServiceClient::InitServiceClient() -{ - CALL_LOG_ENTER; - std::lock_guard clientLock(clientMutex_); - if (miscdeviceProxy_ != nullptr) { - MISC_HILOGD("miscdeviceProxy_ already init"); - return ERR_OK; - } - auto sm = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - CHKPR(sm, MISC_NATIVE_SAM_ERR); - int32_t retry = 0; - while (retry < GET_SERVICE_MAX_COUNT) { - miscdeviceProxy_ = iface_cast(sm->GetSystemAbility(MISCDEVICE_SERVICE_ABILITY_ID)); - if (miscdeviceProxy_ != nullptr) { - MISC_HILOGD("miscdeviceProxy_ get service success, retry : %{public}d", retry); - serviceDeathObserver_ = new (std::nothrow) DeathRecipientTemplate(*const_cast(this)); - if (serviceDeathObserver_ != nullptr) { - miscdeviceProxy_->AsObject()->AddDeathRecipient(serviceDeathObserver_); - } - return ERR_OK; - } - MISC_HILOGW("get service failed, retry : %{public}d", retry); - std::this_thread::sleep_for(std::chrono::milliseconds(WAIT_MS)); - retry++; - } - HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::MISCDEVICE, "MISC_SERVICE_EXCEPTION", - HiSysEvent::EventType::FAULT, "PKG_NAME", "InitServiceClient", "ERROR_CODE", MISC_NATIVE_GET_SERVICE_ERR); - MISC_HILOGE("get service failed"); - return MISC_NATIVE_GET_SERVICE_ERR; -} - -std::vector LightServiceClient::GetLightIdList() -{ - CALL_LOG_ENTER; - int32_t ret = InitServiceClient(); - if (ret != ERR_OK) { - MISC_HILOGE("InitServiceClient failed, ret : %{public}d", ret); - return {}; - } - return miscdeviceProxy_->GetLightSupportId(); -} // namespace Sensors - -bool LightServiceClient::IsLightEffectSupport(int32_t lightId, const std::string &effectId) -{ - CALL_LOG_ENTER; - int32_t ret = InitServiceClient(); - if (ret != ERR_OK) { - MISC_HILOGE("InitServiceClient failed, ret : %{public}d", ret); - return false; - } - return miscdeviceProxy_->IsLightEffectSupport(lightId, effectId); -} - -int32_t LightServiceClient::Light(int32_t lightId, uint64_t brightness, uint32_t timeOn, uint32_t timeOff) -{ - CALL_LOG_ENTER; - int32_t ret = InitServiceClient(); - if (ret != ERR_OK) { - MISC_HILOGE("InitServiceClient failed, ret : %{public}d", ret); - return MISC_NATIVE_GET_SERVICE_ERR; - } - return miscdeviceProxy_->Light(lightId, brightness, timeOn, timeOff); -} - -int32_t LightServiceClient::PlayLightEffect(int32_t lightId, const std::string &type) -{ - CALL_LOG_ENTER; - int32_t ret = InitServiceClient(); - if (ret != ERR_OK) { - MISC_HILOGE("InitServiceClient failed, ret : %{public}d", ret); - return MISC_NATIVE_GET_SERVICE_ERR; - } - return miscdeviceProxy_->PlayLightEffect(lightId, type); -} - -int32_t LightServiceClient::StopLightEffect(int32_t lightId) -{ - CALL_LOG_ENTER; - int32_t ret = InitServiceClient(); - if (ret != ERR_OK) { - MISC_HILOGE("InitServiceClient failed, ret : %{public}d", ret); - return MISC_NATIVE_GET_SERVICE_ERR; - } - return miscdeviceProxy_->StopLightEffect(lightId); -} - -void LightServiceClient::ProcessDeathObserver(const wptr &object) -{ - CALL_LOG_ENTER; - (void)object; - miscdeviceProxy_ = nullptr; - auto ret = InitServiceClient(); - if (ret != ERR_OK) { - MISC_HILOGE("InitServiceClient failed, ret : %{public}d", ret); - return; - } -} -} // namespace Sensors -} // namespace OHOS diff --git a/frameworks/native/miscdevice/src/miscdevice_service_proxy.cpp b/frameworks/native/miscdevice/src/miscdevice_service_proxy.cpp index 7ac5555..ffc5cad 100644 --- a/frameworks/native/miscdevice/src/miscdevice_service_proxy.cpp +++ b/frameworks/native/miscdevice/src/miscdevice_service_proxy.cpp @@ -24,99 +24,11 @@ using namespace OHOS::HiviewDFX; namespace { constexpr HiLogLabel LABEL = { LOG_CORE, MISC_LOG_DOMAIN, "MiscdeviceServiceProxy" }; -constexpr int32_t MAX_VIBRATOR_COUNT = 0XFF; -constexpr int32_t MAX_LIGHT_COUNT = 0XFF; } MiscdeviceServiceProxy::MiscdeviceServiceProxy(const sptr &impl) : IRemoteProxy(impl) {} -bool MiscdeviceServiceProxy::IsAbilityAvailable(MiscdeviceDeviceId groupID) -{ - MessageParcel data; - MessageParcel reply; - MessageOption option; - if (!data.WriteInterfaceToken(MiscdeviceServiceProxy::GetDescriptor())) { - MISC_HILOGE("write descriptor failed"); - return false; - } - if (!data.WriteUint32(static_cast(groupID))) { - MISC_HILOGE("write groupID failed"); - return false; - } - sptr remote = Remote(); - CHKPR(remote, ERROR); - int32_t ret = remote->SendRequest(IS_ABILITY_AVAILABLE, data, reply, option); - if (ret != NO_ERROR) { - HiSysEvent::Write(HiSysEvent::Domain::MISCDEVICE, "MISC_SERVICE_IPC_EXCEPTION", - HiSysEvent::EventType::FAULT, "PKG_NAME", "IsAbilityAvailable", "ERROR_CODE", ret); - MISC_HILOGE("sendRequest failed, ret : %{public}d", ret); - return false; - } - return reply.ReadBool(); -} - -bool MiscdeviceServiceProxy::IsVibratorEffectAvailable(int32_t vibratorId, const std::string &effectType) -{ - MessageParcel data; - MessageParcel reply; - MessageOption option; - if (!data.WriteInterfaceToken(MiscdeviceServiceProxy::GetDescriptor())) { - MISC_HILOGE("write descriptor failed"); - return false; - } - if (!data.WriteInt32(vibratorId)) { - MISC_HILOGE("WriteInt32 failed"); - return false; - } - if (!data.WriteString(effectType)) { - MISC_HILOGE("WriteString failed"); - return false; - } - sptr remote = Remote(); - CHKPR(remote, ERROR); - int32_t ret = remote->SendRequest(IS_VIBRATOR_EFFECT_AVAILABLE, data, reply, option); - if (ret != NO_ERROR) { - HiSysEvent::Write(HiSysEvent::Domain::MISCDEVICE, "MISC_SERVICE_IPC_EXCEPTION", - HiSysEvent::EventType::FAULT, "PKG_NAME", "IsVibratorEffectAvailable", "ERROR_CODE", ret); - MISC_HILOGE("SendRequest failed, ret : %{public}d", ret); - return false; - } - return reply.ReadBool(); -} - -std::vector MiscdeviceServiceProxy::GetVibratorIdList() -{ - MessageParcel data; - MessageParcel reply; - MessageOption option; - std::vector idVec; - if (!data.WriteInterfaceToken(MiscdeviceServiceProxy::GetDescriptor())) { - MISC_HILOGE("write descriptor failed"); - return idVec; - } - sptr remote = Remote(); - if (remote == nullptr) { - MISC_HILOGE("remote is null"); - return idVec; - } - int32_t ret = remote->SendRequest(GET_VIBRATOR_ID_LIST, data, reply, option); - if (ret != NO_ERROR) { - HiSysEvent::Write(HiSysEvent::Domain::MISCDEVICE, "MISC_SERVICE_IPC_EXCEPTION", - HiSysEvent::EventType::FAULT, "PKG_NAME", "GetVibratorIdList", "ERROR_CODE", ret); - MISC_HILOGE("SendRequest failed, ret : %{public}d", ret); - return idVec; - } - uint32_t setCount = reply.ReadUint32(); - if (setCount == 0 || setCount > MAX_VIBRATOR_COUNT) { - MISC_HILOGE("setCount: %{public}d is invalid", setCount); - return idVec; - } - idVec.resize(setCount); - reply.ReadInt32Vector(&idVec); - return idVec; -} - int32_t MiscdeviceServiceProxy::Vibrate(int32_t vibratorId, int32_t timeOut, int32_t usage) { MessageParcel data; @@ -210,43 +122,6 @@ int32_t MiscdeviceServiceProxy::PlayVibratorEffect(int32_t vibratorId, const std return ret; } -int32_t MiscdeviceServiceProxy::PlayCustomVibratorEffect(int32_t vibratorId, const std::vector &timing, - const std::vector &intensity, int32_t periodCount) -{ - MessageParcel data; - MessageParcel reply; - MessageOption option; - if (!data.WriteInterfaceToken(MiscdeviceServiceProxy::GetDescriptor())) { - MISC_HILOGE("write descriptor failed"); - return WRITE_MSG_ERR; - } - if (!data.WriteInt32(vibratorId)) { - MISC_HILOGE("WriteInt32 vibratorId failed"); - return WRITE_MSG_ERR; - } - if (!data.WriteInt32Vector(timing)) { - MISC_HILOGE("WriteInt32Vector timing failed"); - return WRITE_MSG_ERR; - } - if (!data.WriteInt32Vector(intensity)) { - MISC_HILOGE("WriteInt32Vector intensity failed"); - return WRITE_MSG_ERR; - } - if (!data.WriteInt32(periodCount)) { - MISC_HILOGE("WriteInt32 periodCount failed"); - return WRITE_MSG_ERR; - } - sptr remote = Remote(); - CHKPR(remote, ERROR); - int32_t ret = remote->SendRequest(PLAY_CUSTOM_VIBRATOR_EFFECT, data, reply, option); - if (ret != NO_ERROR) { - HiSysEvent::Write(HiSysEvent::Domain::MISCDEVICE, "MISC_SERVICE_IPC_EXCEPTION", - HiSysEvent::EventType::FAULT, "PKG_NAME", "PlayCustomVibratorEffect", "ERROR_CODE", ret); - MISC_HILOGE("ret : %{public}d", ret); - } - return ret; -} - int32_t MiscdeviceServiceProxy::StopVibratorEffect(int32_t vibratorId, const std::string &effect) { MessageParcel data; @@ -274,210 +149,5 @@ int32_t MiscdeviceServiceProxy::StopVibratorEffect(int32_t vibratorId, const std } return ret; } - -int32_t MiscdeviceServiceProxy::SetVibratorParameter(int32_t vibratorId, const std::string &cmd) -{ - MessageParcel data; - MessageParcel reply; - MessageOption option; - if (!data.WriteInterfaceToken(MiscdeviceServiceProxy::GetDescriptor())) { - MISC_HILOGE("write descriptor failed"); - return WRITE_MSG_ERR; - } - if (!data.WriteInt32(vibratorId)) { - MISC_HILOGE("WriteInt32 vibratorId failed"); - return WRITE_MSG_ERR; - } - if (!data.WriteString(cmd)) { - MISC_HILOGE("WriteString cmd failed"); - return WRITE_MSG_ERR; - } - sptr remote = Remote(); - CHKPR(remote, ERROR); - int32_t ret = remote->SendRequest(SET_VIBRATOR_PARA, data, reply, option); - if (ret != NO_ERROR) { - HiSysEvent::Write(HiSysEvent::Domain::MISCDEVICE, "MISC_SERVICE_IPC_EXCEPTION", - HiSysEvent::EventType::FAULT, "PKG_NAME", "SetVibratorParameter", "ERROR_CODE", ret); - MISC_HILOGE("ret : %{public}d", ret); - } - return ret; -} - -std::string MiscdeviceServiceProxy::GetVibratorParameter(int32_t vibratorId, const std::string &cmd) -{ - MessageParcel data; - MessageParcel reply; - MessageOption option; - if (!data.WriteInterfaceToken(MiscdeviceServiceProxy::GetDescriptor())) { - MISC_HILOGE("write descriptor failed"); - return ""; - } - if (!data.WriteInt32(vibratorId)) { - MISC_HILOGE("WriteInt32 vibratorId failed"); - return ""; - } - if (!data.WriteString(cmd)) { - MISC_HILOGE("WriteString cmd failed"); - return ""; - } - sptr remote = Remote(); - CHKPS(remote); - int32_t ret = remote->SendRequest(GET_VIBRATOR_PARA, data, reply, option); - if (ret != NO_ERROR) { - HiSysEvent::Write(HiSysEvent::Domain::MISCDEVICE, "MISC_SERVICE_IPC_EXCEPTION", - HiSysEvent::EventType::FAULT, "PKG_NAME", "GetVibratorParameter", "ERROR_CODE", ret); - MISC_HILOGE("ret : %{public}d", ret); - return ""; - } - return reply.ReadString(); -} - -std::vector MiscdeviceServiceProxy::GetLightSupportId() -{ - MessageParcel data; - MessageParcel reply; - MessageOption option; - std::vector idVec; - if (!data.WriteInterfaceToken(MiscdeviceServiceProxy::GetDescriptor())) { - MISC_HILOGE("write descriptor failed"); - return idVec; - } - sptr remote = Remote(); - if (remote == nullptr) { - MISC_HILOGE("remote is null"); - return idVec; - } - int32_t ret = remote->SendRequest(GET_LIGHT_SUPPORT_ID, data, reply, option); - if (ret != NO_ERROR) { - HiSysEvent::Write(HiSysEvent::Domain::MISCDEVICE, "MISC_SERVICE_IPC_EXCEPTION", - HiSysEvent::EventType::FAULT, "PKG_NAME", "GetLightSupportId", "ERROR_CODE", ret); - MISC_HILOGE("sendRequest failed, ret : %{public}d", ret); - } - uint32_t setCount = reply.ReadUint32(); - if (setCount == 0 || setCount > MAX_LIGHT_COUNT) { - MISC_HILOGE("setCount: %{public}d is invalid", setCount); - return idVec; - } - idVec.resize(setCount); - reply.ReadInt32Vector(&idVec); - return idVec; -} - -bool MiscdeviceServiceProxy::IsLightEffectSupport(int32_t lightId, const std::string &effectId) -{ - MessageParcel data; - MessageParcel reply; - MessageOption option; - if (!data.WriteInterfaceToken(MiscdeviceServiceProxy::GetDescriptor())) { - MISC_HILOGE("write descriptor failed"); - return false; - } - if (!data.WriteInt32(lightId)) { - MISC_HILOGE("WriteInt32 lightId failed"); - return false; - } - if (!data.WriteString(effectId)) { - MISC_HILOGE("WriteString effectId failed"); - return false; - } - sptr remote = Remote(); - CHKPF(remote); - int32_t ret = remote->SendRequest(IS_LIGHT_EFFECT_SUPPORT, data, reply, option); - if (ret != NO_ERROR) { - HiSysEvent::Write(HiSysEvent::Domain::MISCDEVICE, "MISC_SERVICE_IPC_EXCEPTION", - HiSysEvent::EventType::FAULT, "PKG_NAME", "IsLightEffectSupport", "ERROR_CODE", ret); - MISC_HILOGE("sendRequest failed, ret : %{public}d", ret); - return false; - } - return reply.ReadBool(); -} - -int32_t MiscdeviceServiceProxy::Light(int32_t id, uint64_t brightness, uint32_t timeOn, uint32_t timeOff) -{ - MessageParcel data; - MessageParcel reply; - MessageOption option; - if (!data.WriteInterfaceToken(MiscdeviceServiceProxy::GetDescriptor())) { - MISC_HILOGE("write descriptor failed"); - return WRITE_MSG_ERR; - } - if (!data.WriteInt32(id)) { - MISC_HILOGE("WriteInt32 id failed"); - return WRITE_MSG_ERR; - } - if (!data.WriteUint64(brightness)) { - MISC_HILOGE("WriteUint64 brightness failed"); - return WRITE_MSG_ERR; - } - if (!data.WriteUint32(timeOn)) { - MISC_HILOGE("WriteUint32 timeOn failed"); - return WRITE_MSG_ERR; - } - if (!data.WriteUint32(timeOff)) { - MISC_HILOGE("WriteUint32 timeOff failed"); - return WRITE_MSG_ERR; - } - sptr remote = Remote(); - CHKPR(remote, ERROR); - int32_t ret = remote->SendRequest(LIGHT, data, reply, option); - if (ret != NO_ERROR) { - HiSysEvent::Write(HiSysEvent::Domain::MISCDEVICE, "MISC_SERVICE_IPC_EXCEPTION", - HiSysEvent::EventType::FAULT, "PKG_NAME", "Light", "ERROR_CODE", ret); - MISC_HILOGE("sendRequest failed, ret : %{public}d", ret); - } - return ret; -} - -int32_t MiscdeviceServiceProxy::PlayLightEffect(int32_t id, const std::string &type) -{ - MessageParcel data; - MessageParcel reply; - MessageOption option; - if (!data.WriteInterfaceToken(MiscdeviceServiceProxy::GetDescriptor())) { - MISC_HILOGE("write descriptor failed"); - return WRITE_MSG_ERR; - } - if (!data.WriteInt32(id)) { - MISC_HILOGE("WriteInt32 id failed"); - return WRITE_MSG_ERR; - } - if (!data.WriteString(type)) { - MISC_HILOGE("WriteString type failed"); - return WRITE_MSG_ERR; - } - sptr remote = Remote(); - CHKPR(remote, ERROR); - int32_t ret = remote->SendRequest(PLAY_LIGHT_EFFECT, data, reply, option); - if (ret != NO_ERROR) { - HiSysEvent::Write(HiSysEvent::Domain::MISCDEVICE, "MISC_SERVICE_IPC_EXCEPTION", - HiSysEvent::EventType::FAULT, "PKG_NAME", "PlayLightEffect", "ERROR_CODE", ret); - MISC_HILOGE("sendRequest failed, ret : %{public}d", ret); - } - return ret; -} - -int32_t MiscdeviceServiceProxy::StopLightEffect(int32_t id) -{ - MessageParcel data; - MessageParcel reply; - MessageOption option; - if (!data.WriteInterfaceToken(MiscdeviceServiceProxy::GetDescriptor())) { - MISC_HILOGE("write descriptor failed"); - return WRITE_MSG_ERR; - } - if (!data.WriteInt32(id)) { - MISC_HILOGE("WriteInt32 id failed"); - return WRITE_MSG_ERR; - } - sptr remote = Remote(); - CHKPR(remote, ERROR); - int32_t ret = remote->SendRequest(STOP_LIGHT_EFFECT, data, reply, option); - if (ret != NO_ERROR) { - HiSysEvent::Write(HiSysEvent::Domain::MISCDEVICE, "MISC_SERVICE_IPC_EXCEPTION", - HiSysEvent::EventType::FAULT, "PKG_NAME", "StopLightEffect", "ERROR_CODE", ret); - MISC_HILOGE("sendRequest failed, ret : %{public}d", ret); - } - return ret; -} } // namespace Sensors } // namespace OHOS diff --git a/frameworks/native/miscdevice/src/vibrator_service_client.cpp b/frameworks/native/miscdevice/src/vibrator_service_client.cpp index 395555a..d99eda8 100644 --- a/frameworks/native/miscdevice/src/vibrator_service_client.cpp +++ b/frameworks/native/miscdevice/src/vibrator_service_client.cpp @@ -68,39 +68,6 @@ int32_t VibratorServiceClient::InitServiceClient() return MISC_NATIVE_GET_SERVICE_ERR; } -std::vector VibratorServiceClient::GetVibratorIdList() -{ - CALL_LOG_ENTER; - int32_t ret = InitServiceClient(); - if (ret != ERR_OK) { - MISC_HILOGE("InitServiceClient failed, ret : %{public}d", ret); - return {}; - } - if (miscdeviceProxy_ == nullptr) { - MISC_HILOGE("miscdeviceProxy_ is null"); - return {}; - } - StartTrace(HITRACE_TAG_SENSORS, "GetVibratorIdList"); - std::vector vibratorIdList = miscdeviceProxy_->GetVibratorIdList(); - FinishTrace(HITRACE_TAG_SENSORS); - return vibratorIdList; -} - -bool VibratorServiceClient::IsVibratorEffectSupport(int32_t vibratorId, const std::string &effect) -{ - CALL_LOG_ENTER; - int32_t ret = InitServiceClient(); - if (ret != ERR_OK) { - MISC_HILOGE("InitServiceClient failed, ret : %{public}d", ret); - return false; - } - CHKPF(miscdeviceProxy_); - StartTrace(HITRACE_TAG_SENSORS, "IsVibratorEffectSupport"); - bool status = miscdeviceProxy_->IsVibratorEffectAvailable(vibratorId, effect); - FinishTrace(HITRACE_TAG_SENSORS); - return status; -} - int32_t VibratorServiceClient::Vibrate(int32_t vibratorId, int32_t timeOut, int32_t usage) { MISC_HILOGD("Vibrate begin, timeOut : %{public}u", timeOut); @@ -132,22 +99,6 @@ int32_t VibratorServiceClient::Vibrate(int32_t vibratorId, const std::string &ef return ret; } -int32_t VibratorServiceClient::Vibrate(int32_t vibratorId, std::vector timing, std::vector intensity, - int32_t periodCount) -{ - CALL_LOG_ENTER; - int32_t ret = InitServiceClient(); - if (ret != ERR_OK) { - MISC_HILOGE("InitServiceClient failed, ret : %{public}d", ret); - return MISC_NATIVE_GET_SERVICE_ERR; - } - CHKPR(miscdeviceProxy_, ERROR); - StartTrace(HITRACE_TAG_SENSORS, "CustomVibrate"); - ret = miscdeviceProxy_->PlayCustomVibratorEffect(vibratorId, timing, intensity, periodCount); - FinishTrace(HITRACE_TAG_SENSORS); - return ret; -} - int32_t VibratorServiceClient::Stop(int32_t vibratorId, const std::string &type) { MISC_HILOGD("Stop begin, vibratorId : %{public}d, type : %{public}s", vibratorId, type.c_str()); @@ -167,36 +118,6 @@ int32_t VibratorServiceClient::Stop(int32_t vibratorId, const std::string &type) return ret; } -int32_t VibratorServiceClient::SetVibratorParameter(int32_t vibratorId, const std::string &cmd) -{ - CALL_LOG_ENTER; - int32_t ret = InitServiceClient(); - if (ret != ERR_OK) { - MISC_HILOGE("InitServiceClient failed, ret : %{public}d", ret); - return MISC_NATIVE_GET_SERVICE_ERR; - } - CHKPR(miscdeviceProxy_, ERROR); - StartTrace(HITRACE_TAG_SENSORS, "SetVibratorParameter"); - ret = miscdeviceProxy_->SetVibratorParameter(vibratorId, cmd); - FinishTrace(HITRACE_TAG_SENSORS); - return ret; -} - -std::string VibratorServiceClient::GetVibratorParameter(int32_t vibratorId, const std::string &command) -{ - CALL_LOG_ENTER; - int32_t ret = InitServiceClient(); - if (ret != ERR_OK) { - MISC_HILOGE("InitServiceClient failed, ret : %{public}d", ret); - return ""; - } - CHKPS(miscdeviceProxy_); - StartTrace(HITRACE_TAG_SENSORS, "GetVibratorParameter"); - std::string parameter = miscdeviceProxy_->GetVibratorParameter(vibratorId, command); - FinishTrace(HITRACE_TAG_SENSORS); - return parameter; -} - void VibratorServiceClient::ProcessDeathObserver(const wptr &object) { CALL_LOG_ENTER; diff --git a/services/miscdevice_service/include/miscdevice_service.h b/services/miscdevice_service/include/miscdevice_service.h index 1c9c113..fc0f3b2 100644 --- a/services/miscdevice_service/include/miscdevice_service.h +++ b/services/miscdevice_service/include/miscdevice_service.h @@ -51,23 +51,11 @@ public: void OnStart() override; void OnStop() override; int32_t Dump(int32_t fd, const std::vector &args) override; - virtual bool IsAbilityAvailable(MiscdeviceDeviceId groupID) override; - virtual bool IsVibratorEffectAvailable(int32_t vibratorId, const std::string &effectType) override; - virtual std::vector GetVibratorIdList() override; virtual int32_t Vibrate(int32_t vibratorId, int32_t timeOut, int32_t usage) override; virtual int32_t CancelVibrator(int32_t vibratorId) override; virtual int32_t PlayVibratorEffect(int32_t vibratorId, const std::string &effect, int32_t loopCount, int32_t usage) override; - virtual int32_t PlayCustomVibratorEffect(int32_t vibratorId, const std::vector &timing, - const std::vector &intensity, int32_t periodCount) override; virtual int32_t StopVibratorEffect(int32_t vibratorId, const std::string &effect) override; - virtual int32_t SetVibratorParameter(int32_t vibratorId, const std::string &cmd) override; - virtual std::string GetVibratorParameter(int32_t vibratorId, const std::string &cmd) override; - virtual std::vector GetLightSupportId() override; - virtual bool IsLightEffectSupport(int32_t lightId, const std::string &effectId) override; - virtual int32_t Light(int32_t lightId, uint64_t brightness, uint32_t timeOn, uint32_t timeOff) override; - virtual int32_t PlayLightEffect(int32_t lightId, const std::string &type) override; - virtual int32_t StopLightEffect(int32_t lightId) override; private: DISALLOW_COPY_AND_MOVE(MiscdeviceService); @@ -78,7 +66,6 @@ private: VibratorHdiConnection &vibratorHdiConnection_ = VibratorHdiConnection::GetInstance(); bool lightExist_; bool vibratorExist_; - std::set lightSupportId_; std::map miscDdeviceIdMap_; MiscdeviceServiceState state_; std::shared_ptr vibratorThread_; diff --git a/services/miscdevice_service/src/miscdevice_service.cpp b/services/miscdevice_service/src/miscdevice_service.cpp index 87212ab..aaaea72 100644 --- a/services/miscdevice_service/src/miscdevice_service.cpp +++ b/services/miscdevice_service/src/miscdevice_service.cpp @@ -29,7 +29,6 @@ namespace { constexpr HiLogLabel LABEL = { LOG_CORE, MISC_LOG_DOMAIN, "MiscdeviceService" }; constexpr int32_t MIN_VIBRATOR_TIME = 0; constexpr int32_t MAX_VIBRATOR_TIME = 1800000; -constexpr int32_t DEFAULT_VIBRATOR_ID = 123; } // namespace REGISTER_SYSTEM_ABILITY_BY_ID(MiscdeviceService, MISCDEVICE_SERVICE_ABILITY_ID, true); @@ -108,26 +107,6 @@ void MiscdeviceService::OnStop() } } -bool MiscdeviceService::IsAbilityAvailable(MiscdeviceDeviceId groupID) -{ - auto it = miscDdeviceIdMap_.find(groupID); - if (it == miscDdeviceIdMap_.end()) { - MISC_HILOGE("cannot find groupID : %{public}d", groupID); - return false; - } - return it->second; -} - -bool MiscdeviceService::IsVibratorEffectAvailable(int32_t vibratorId, const std::string &effectType) -{ - return true; -} - -std::vector MiscdeviceService::GetVibratorIdList() -{ - std::vector vibratorIds = { DEFAULT_VIBRATOR_ID }; - return vibratorIds; -} bool MiscdeviceService::ShouldIgnoreVibrate(const VibrateInfo &info) { @@ -212,16 +191,6 @@ void MiscdeviceService::StartVibrateThread(VibrateInfo info) DumpHelper->SaveVibrateRecord(info); } -int32_t MiscdeviceService::PlayCustomVibratorEffect(int32_t vibratorId, const std::vector &timing, - const std::vector &intensity, int32_t periodCount) -{ - if (!MiscdeviceCommon::CheckCustomVibratorEffect(timing, intensity, periodCount)) { - MISC_HILOGE("params are invalid"); - return ERR_INVALID_VALUE; - } - return NO_ERROR; -} - int32_t MiscdeviceService::StopVibratorEffect(int32_t vibratorId, const std::string &effect) { std::lock_guard lock(vibratorThreadMutex_); @@ -273,42 +242,6 @@ std::string MiscdeviceService::GetPackageName(AccessTokenID tokenId) return packageName; } -int32_t MiscdeviceService::SetVibratorParameter(int32_t vibratorId, const std::string &cmd) -{ - return 0; -} - -std::string MiscdeviceService::GetVibratorParameter(int32_t vibratorId, const std::string &cmd) -{ - return cmd; -} - -std::vector MiscdeviceService::GetLightSupportId() -{ - std::vector list; - return list; -} - -bool MiscdeviceService::IsLightEffectSupport(int32_t lightId, const std::string &effectId) -{ - return false; -} - -int32_t MiscdeviceService::Light(int32_t lightId, uint64_t brightness, uint32_t timeOn, uint32_t timeOff) -{ - return 0; -} - -int32_t MiscdeviceService::PlayLightEffect(int32_t lightId, const std::string &type) -{ - return 0; -} - -int32_t MiscdeviceService::StopLightEffect(int32_t lightId) -{ - return 0; -} - int32_t MiscdeviceService::Dump(int32_t fd, const std::vector &args) { CALL_LOG_ENTER; diff --git a/services/miscdevice_service/src/miscdevice_service_stub.cpp b/services/miscdevice_service/src/miscdevice_service_stub.cpp index 9c612a5..25f3f1a 100644 --- a/services/miscdevice_service/src/miscdevice_service_stub.cpp +++ b/services/miscdevice_service/src/miscdevice_service_stub.cpp @@ -37,44 +37,18 @@ const std::string VIBRATE_PERMISSION = "ohos.permission.VIBRATE"; MiscdeviceServiceStub::MiscdeviceServiceStub() { MISC_HILOGI("MiscdeviceServiceStub begin, %{public}p", this); - baseFuncs_[IS_ABILITY_AVAILABLE] = &MiscdeviceServiceStub::IsAbilityAvailablePb; - baseFuncs_[IS_VIBRATOR_EFFECT_AVAILABLE] = &MiscdeviceServiceStub::IsVibratorEffectAvailablePb; - baseFuncs_[GET_VIBRATOR_ID_LIST] = &MiscdeviceServiceStub::GetVibratorIdListPb; baseFuncs_[VIBRATE] = &MiscdeviceServiceStub::VibratePb; baseFuncs_[CANCEL_VIBRATOR] = &MiscdeviceServiceStub::CancelVibratorPb; baseFuncs_[PLAY_VIBRATOR_EFFECT] = &MiscdeviceServiceStub::PlayVibratorEffectPb; - baseFuncs_[PLAY_CUSTOM_VIBRATOR_EFFECT] = &MiscdeviceServiceStub::PlayCustomVibratorEffectPb; baseFuncs_[STOP_VIBRATOR_EFFECT] = &MiscdeviceServiceStub::StopVibratorEffectPb; - baseFuncs_[SET_VIBRATOR_PARA] = &MiscdeviceServiceStub::SetVibratorParameterPb; - baseFuncs_[GET_VIBRATOR_PARA] = &MiscdeviceServiceStub::GetVibratorParameterPb; - baseFuncs_[GET_LIGHT_SUPPORT_ID] = &MiscdeviceServiceStub::GetLightSupportIdPb; - baseFuncs_[IS_LIGHT_EFFECT_SUPPORT] = &MiscdeviceServiceStub::IsLightEffectSupportPb; - baseFuncs_[LIGHT] = &MiscdeviceServiceStub::LightPb; - baseFuncs_[PLAY_LIGHT_EFFECT] = &MiscdeviceServiceStub::PlayLightEffectPb; - baseFuncs_[STOP_LIGHT_EFFECT] = &MiscdeviceServiceStub::StopLightEffectPb; } MiscdeviceServiceStub::~MiscdeviceServiceStub() { - MISC_HILOGI("~MiscdeviceServiceStub begin, xigou %{public}p", this); + MISC_HILOGI("~MiscdeviceServiceStub begin, destruct %{public}p", this); baseFuncs_.clear(); } -int32_t MiscdeviceServiceStub::IsAbilityAvailablePb(MessageParcel &data, MessageParcel &reply) -{ - MiscdeviceDeviceId groupId = static_cast(data.ReadUint32()); - reply.WriteBool(IsAbilityAvailable(groupId)); - return NO_ERROR; -} - -int32_t MiscdeviceServiceStub::IsVibratorEffectAvailablePb(MessageParcel &data, MessageParcel &reply) -{ - int32_t vibratorId = data.ReadInt32(); - std::string effectType = data.ReadString(); - reply.WriteBool(IsVibratorEffectAvailable(vibratorId, effectType)); - return NO_ERROR; -} - int32_t MiscdeviceServiceStub::VibratePb(MessageParcel &data, MessageParcel &reply) { PermissionUtil &permissionUtil = PermissionUtil::GetInstance(); @@ -95,14 +69,6 @@ int32_t MiscdeviceServiceStub::VibratePb(MessageParcel &data, MessageParcel &rep return Vibrate(vibratorId, duration, usage); } -int32_t MiscdeviceServiceStub::GetVibratorIdListPb(MessageParcel &data, MessageParcel &reply) -{ - std::vector idSet = GetVibratorIdList(); - reply.WriteUint32(static_cast(idSet.size())); - reply.WriteInt32Vector(idSet); - return NO_ERROR; -} - int32_t MiscdeviceServiceStub::CancelVibratorPb(MessageParcel &data, MessageParcel &reply) { PermissionUtil &permissionUtil = PermissionUtil::GetInstance(); @@ -139,25 +105,6 @@ int32_t MiscdeviceServiceStub::PlayVibratorEffectPb(MessageParcel &data, Message return PlayVibratorEffect(vibratorId, effect, count, usage); } -int32_t MiscdeviceServiceStub::PlayCustomVibratorEffectPb(MessageParcel &data, MessageParcel &reply) -{ - PermissionUtil &permissionUtil = PermissionUtil::GetInstance(); - int32_t ret = permissionUtil.CheckVibratePermission(this->GetCallingTokenID(), VIBRATE_PERMISSION); - if (ret != PERMISSION_GRANTED) { - HiSysEvent::Write(HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_PERMISSIONS_EXCEPTION", - HiSysEvent::EventType::SECURITY, "PKG_NAME", "PlayCustomVibratorEffectPb", "ERROR_CODE", ret); - MISC_HILOGE("result: %{public}d", ret); - return PERMISSION_DENIED; - } - int32_t vibratorId = data.ReadInt32(); - std::vector timing; - data.ReadInt32Vector(&timing); - std::vector intensity; - data.ReadInt32Vector(&intensity); - int32_t periodCount = data.ReadInt32(); - return PlayCustomVibratorEffect(vibratorId, timing, intensity, periodCount); -} - int32_t MiscdeviceServiceStub::StopVibratorEffectPb(MessageParcel &data, MessageParcel &reply) { PermissionUtil &permissionUtil = PermissionUtil::GetInstance(); @@ -173,68 +120,6 @@ int32_t MiscdeviceServiceStub::StopVibratorEffectPb(MessageParcel &data, Message return StopVibratorEffect(vibratorId, effectType); } -int32_t MiscdeviceServiceStub::SetVibratorParameterPb(MessageParcel &data, MessageParcel &reply) -{ - PermissionUtil &permissionUtil = PermissionUtil::GetInstance(); - int32_t ret = permissionUtil.CheckVibratePermission(this->GetCallingTokenID(), VIBRATE_PERMISSION); - if (ret != PERMISSION_GRANTED) { - HiSysEvent::Write(HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_PERMISSIONS_EXCEPTION", - HiSysEvent::EventType::SECURITY, "PKG_NAME", "SetVibratorParameterPb", "ERROR_CODE", ret); - MISC_HILOGE("result: %{public}d", ret); - return PERMISSION_DENIED; - } - int32_t vibratorId = data.ReadInt32(); - std::string cmd = data.ReadString(); - return SetVibratorParameter(vibratorId, cmd); -} - -int32_t MiscdeviceServiceStub::GetVibratorParameterPb(MessageParcel &data, MessageParcel &reply) -{ - int32_t vibratorId = data.ReadInt32(); - std::string cmd = data.ReadString(); - std::string ret = GetVibratorParameter(vibratorId, cmd); - reply.WriteString(ret); - return NO_ERROR; -} - -int32_t MiscdeviceServiceStub::GetLightSupportIdPb(MessageParcel &data, MessageParcel &reply) -{ - std::vector idSet = GetLightSupportId(); - reply.WriteUint32(static_cast(idSet.size())); - reply.WriteInt32Vector(idSet); - return NO_ERROR; -} - -int32_t MiscdeviceServiceStub::IsLightEffectSupportPb(MessageParcel &data, MessageParcel &reply) -{ - int32_t id = data.ReadInt32(); - std::string effect = data.ReadString(); - reply.WriteBool(IsLightEffectSupport(id, effect)); - return NO_ERROR; -} - -int32_t MiscdeviceServiceStub::LightPb(MessageParcel &data, MessageParcel &reply) -{ - int32_t id = data.ReadInt32(); - uint32_t brightness = data.ReadUint64(); - uint32_t timeOn = data.ReadUint32(); - uint32_t timeOff = data.ReadUint32(); - return Light(id, brightness, timeOn, timeOff); -} - -int32_t MiscdeviceServiceStub::PlayLightEffectPb(MessageParcel &data, MessageParcel &reply) -{ - int32_t id = data.ReadInt32(); - std::string type = data.ReadString(); - return PlayLightEffect(id, type); -} - -int32_t MiscdeviceServiceStub::StopLightEffectPb(MessageParcel &data, MessageParcel &reply) -{ - int32_t id = data.ReadInt32(); - return StopLightEffect(id); -} - int32_t MiscdeviceServiceStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { -- Gitee From 3e8c4af73990520c8e5bdc7a097490f7b6278130 Mon Sep 17 00:00:00 2001 From: hui1975 Date: Thu, 15 Dec 2022 09:59:25 +0800 Subject: [PATCH 03/11] add light Signed-off-by: hui1975 Change-Id: I2f87d7427680f79a0514e931210bc78a5681ba7f --- bundle.json | 5 +- frameworks/native/miscdevice/BUILD.gn | 38 ++- .../miscdevice/include/i_miscdevice_service.h | 15 +- .../native/miscdevice/include/light_client.h | 51 +++ .../include/miscdevice_service_proxy.h | 8 +- .../native/miscdevice/src/light_client.cpp | 188 +++++++++++ .../src/miscdevice_service_proxy.cpp | 109 ++++++- .../src/vibrator_service_client.cpp | 2 +- interfaces/native/light/BUILD.gn | 68 ++++ interfaces/native/light/include/light_agent.h | 72 +++++ .../native/light/include/light_agent_type.h | 118 +++++++ interfaces/native/light/liblight.json | 15 + interfaces/native/light/src/light_agent.cpp | 71 +++++ interfaces/native/light/test/BUILD.gn | 47 +++ .../native/light/test/fuzztest/BUILD.gn | 25 ++ .../test/fuzztest/startlight_fuzzer/BUILD.gn | 52 +++ .../fuzztest/startlight_fuzzer/corpus/init | 14 + .../fuzztest/startlight_fuzzer/project.xml | 25 ++ .../startlight_fuzzer/startlight_fuzzer.cpp | 56 ++++ .../startlight_fuzzer/startlight_fuzzer.h | 22 ++ .../test/fuzztest/stoplight_fuzzer/BUILD.gn | 52 +++ .../fuzztest/stoplight_fuzzer/corpus/init | 14 + .../fuzztest/stoplight_fuzzer/project.xml | 25 ++ .../stoplight_fuzzer/stoplight_fuzzer.cpp | 52 +++ .../stoplight_fuzzer/stoplight_fuzzer.h | 22 ++ .../light/test/unittest/light_agent_test.cpp | 300 ++++++++++++++++++ interfaces/native/vibrator/BUILD.gn | 2 + services/miscdevice_service/BUILD.gn | 11 +- .../include/compatible_connection.h | 0 .../include/compatible_light_connection.h | 43 +++ .../include/hdi_connection.h | 0 .../adapter/include/hdi_light_connection.h | 47 +++ .../src/compatible_connection.cpp | 0 .../src/compatible_light_connection.cpp | 83 +++++ .../src/hdi_connection.cpp | 10 +- .../adapter/src/hdi_light_connection.cpp | 164 ++++++++++ .../include/i_light_hdi_connection.h | 42 +++ .../interface/include/light_hdi_connection.h | 42 +++ .../interface/src/light_hdi_connection.cpp | 93 ++++++ .../include/miscdevice_service.h | 12 +- .../include/miscdevice_service_stub.h | 9 +- .../src/miscdevice_service.cpp | 101 +++++- .../src/miscdevice_service_stub.cpp | 58 +++- utils/include/miscdevice_common.h | 2 +- 44 files changed, 2142 insertions(+), 43 deletions(-) create mode 100755 frameworks/native/miscdevice/include/light_client.h create mode 100755 frameworks/native/miscdevice/src/light_client.cpp create mode 100755 interfaces/native/light/BUILD.gn create mode 100755 interfaces/native/light/include/light_agent.h create mode 100755 interfaces/native/light/include/light_agent_type.h create mode 100755 interfaces/native/light/liblight.json create mode 100755 interfaces/native/light/src/light_agent.cpp create mode 100755 interfaces/native/light/test/BUILD.gn create mode 100755 interfaces/native/light/test/fuzztest/BUILD.gn create mode 100755 interfaces/native/light/test/fuzztest/startlight_fuzzer/BUILD.gn create mode 100755 interfaces/native/light/test/fuzztest/startlight_fuzzer/corpus/init create mode 100755 interfaces/native/light/test/fuzztest/startlight_fuzzer/project.xml create mode 100755 interfaces/native/light/test/fuzztest/startlight_fuzzer/startlight_fuzzer.cpp create mode 100755 interfaces/native/light/test/fuzztest/startlight_fuzzer/startlight_fuzzer.h create mode 100755 interfaces/native/light/test/fuzztest/stoplight_fuzzer/BUILD.gn create mode 100755 interfaces/native/light/test/fuzztest/stoplight_fuzzer/corpus/init create mode 100755 interfaces/native/light/test/fuzztest/stoplight_fuzzer/project.xml create mode 100755 interfaces/native/light/test/fuzztest/stoplight_fuzzer/stoplight_fuzzer.cpp create mode 100755 interfaces/native/light/test/fuzztest/stoplight_fuzzer/stoplight_fuzzer.h create mode 100755 interfaces/native/light/test/unittest/light_agent_test.cpp rename services/miscdevice_service/hdi_connection/{adpter => adapter}/include/compatible_connection.h (100%) create mode 100755 services/miscdevice_service/hdi_connection/adapter/include/compatible_light_connection.h rename services/miscdevice_service/hdi_connection/{adpter => adapter}/include/hdi_connection.h (100%) create mode 100755 services/miscdevice_service/hdi_connection/adapter/include/hdi_light_connection.h rename services/miscdevice_service/hdi_connection/{adpter => adapter}/src/compatible_connection.cpp (100%) create mode 100755 services/miscdevice_service/hdi_connection/adapter/src/compatible_light_connection.cpp rename services/miscdevice_service/hdi_connection/{adpter => adapter}/src/hdi_connection.cpp (90%) create mode 100755 services/miscdevice_service/hdi_connection/adapter/src/hdi_light_connection.cpp create mode 100755 services/miscdevice_service/hdi_connection/interface/include/i_light_hdi_connection.h create mode 100755 services/miscdevice_service/hdi_connection/interface/include/light_hdi_connection.h create mode 100755 services/miscdevice_service/hdi_connection/interface/src/light_hdi_connection.cpp diff --git a/bundle.json b/bundle.json index cad1f51..d7b6bc9 100644 --- a/bundle.json +++ b/bundle.json @@ -38,6 +38,7 @@ "fwk_group": [ "//base/sensors/miscdevice/interfaces/plugin:vibrator_js_target", "//base/sensors/miscdevice/interfaces/native/vibrator:vibrator_target", + "//base/sensors/miscdevice/interfaces/native/light:light_target", "//base/sensors/miscdevice/frameworks/native/miscdevice:miscdevice_native_target", "//base/sensors/miscdevice/utils:miscdevice_utils_target" ], @@ -61,7 +62,9 @@ "test": [ "//base/sensors/miscdevice/interfaces/plugin/vibrator/test/unittest:unittest", "//base/sensors/miscdevice/interfaces/native/vibrator/test/fuzztest:fuzztest", - "//base/sensors/miscdevice/interfaces/native/vibrator/test:unittest" + "//base/sensors/miscdevice/interfaces/native/light/test/fuzztest:fuzztest", + "//base/sensors/miscdevice/interfaces/native/vibrator/test:unittest", + "//base/sensors/miscdevice/interfaces/native/light/test:unittest" ] } } diff --git a/frameworks/native/miscdevice/BUILD.gn b/frameworks/native/miscdevice/BUILD.gn index 99a430d..89bc0ee 100644 --- a/frameworks/native/miscdevice/BUILD.gn +++ b/frameworks/native/miscdevice/BUILD.gn @@ -15,6 +15,38 @@ import("//build/ohos.gni") SUBSYSTEM_DIR = "//base/sensors" +############################################## +ohos_shared_library("liblight_native") { + sources = [ + "src/light_client.cpp", + "src/miscdevice_service_proxy.cpp", + ] + + include_dirs = [ + "include", + "//commonlibrary/c_utils/base/include", + "//utils/system/safwk/native/include", + "$SUBSYSTEM_DIR/miscdevice/interfaces/native/light/include", + "$SUBSYSTEM_DIR/miscdevice/utils/include", + "//utils/jni/jnikit/include", + ] + cflags = [ "-fstack-protector-all" ] + deps = [ + "$SUBSYSTEM_DIR/miscdevice/interfaces/native/light:light_ndk_header", + "$SUBSYSTEM_DIR/miscdevice/utils:libmiscdevice_utils", + ] + + external_deps = [ + "c_utils:utils", + "hisysevent_native:libhisysevent", + "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", + "samgr:samgr_proxy", + ] + part_name = "miscdevice" + subsystem_name = "sensors" +} + ############################################## ohos_shared_library("libvibrator_native") { sources = [ @@ -26,6 +58,7 @@ ohos_shared_library("libvibrator_native") { "include", "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", + "$SUBSYSTEM_DIR/miscdevice/interfaces/native/light/include", "$SUBSYSTEM_DIR/miscdevice/utils/include", "//utils/jni/jnikit/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", @@ -45,5 +78,8 @@ ohos_shared_library("libvibrator_native") { ############################################## group("miscdevice_native_target") { - deps = [ ":libvibrator_native" ] + deps = [ + ":liblight_native", + ":libvibrator_native", + ] } diff --git a/frameworks/native/miscdevice/include/i_miscdevice_service.h b/frameworks/native/miscdevice/include/i_miscdevice_service.h index 0c6936c..2f2549e 100755 --- a/frameworks/native/miscdevice/include/i_miscdevice_service.h +++ b/frameworks/native/miscdevice/include/i_miscdevice_service.h @@ -20,6 +20,7 @@ #include #include "iremote_broker.h" +#include "light_agent_type.h" #include "miscdevice_common.h" namespace OHOS { @@ -27,25 +28,25 @@ namespace Sensors { class IMiscdeviceService : public IRemoteBroker { public: IMiscdeviceService() = default; - virtual ~IMiscdeviceService() = default; - DECLARE_INTERFACE_DESCRIPTOR(u"IMiscdeviceService"); - virtual int32_t Vibrate(int32_t vibratorId, int32_t timeOut, int32_t usage) = 0; - virtual int32_t CancelVibrator(int32_t vibratorId) = 0; - virtual int32_t PlayVibratorEffect(int32_t vibratorId, const std::string &effect, int32_t loopCount, int32_t usage) = 0; - virtual int32_t StopVibratorEffect(int32_t vibratorId, const std::string &effect) = 0; + virtual std::vector GetLightList() = 0; + virtual int32_t TurnOn(int32_t lightId, const LightColor &color, const LightAnimation &animation) = 0; + virtual int32_t TurnOff(int32_t lightId) = 0; enum { VIBRATE, CANCEL_VIBRATOR, PLAY_VIBRATOR_EFFECT, - STOP_VIBRATOR_EFFECT + STOP_VIBRATOR_EFFECT, + GET_LIGHT_LIST, + TURN_ON, + TURN_OFF, }; }; } // namespace Sensors diff --git a/frameworks/native/miscdevice/include/light_client.h b/frameworks/native/miscdevice/include/light_client.h new file mode 100755 index 0000000..a71bace --- /dev/null +++ b/frameworks/native/miscdevice/include/light_client.h @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef LIGHT_CLIENT_H +#define LIGHT_CLIENT_H + +#include + +#include "iremote_object.h" +#include "miscdevice_service_proxy.h" +#include "singleton.h" + +namespace OHOS { +namespace Sensors { +class LightClient : public Singleton { +public: + int32_t GetLightList(LightInfo **lightInfo, int32_t &count); + int32_t TurnOn(int32_t lightId, const LightColor &color, const LightAnimation &animation); + int32_t TurnOff(int32_t lightId); + void ProcessDeathObserver(wptr object); + +private: + bool IsValid(int32_t lightId); + void ClearLightInfos(); + int32_t ConvertLightInfos(); + int32_t InitLightClient(); + bool IsLightAnimationValid(const LightAnimation &animation); + bool IsLightIdValid(int32_t lightId); + std::mutex lightInfosMutex_; + LightInfo *lightInfos_ {nullptr}; + int32_t lightInfoCount_ {-1}; + sptr serviceDeathObserver_ = nullptr; + sptr miscdeviceProxy_ = nullptr; + std::vector lightInfoList_; + std::mutex clientMutex_; +}; +} // namespace Sensors +} // namespace OHOS +#endif // LIGHT_CLIENT_H diff --git a/frameworks/native/miscdevice/include/miscdevice_service_proxy.h b/frameworks/native/miscdevice/include/miscdevice_service_proxy.h index 3819b0a..3641dc2 100755 --- a/frameworks/native/miscdevice/include/miscdevice_service_proxy.h +++ b/frameworks/native/miscdevice/include/miscdevice_service_proxy.h @@ -25,17 +25,15 @@ namespace Sensors { class MiscdeviceServiceProxy : public IRemoteProxy { public: explicit MiscdeviceServiceProxy(const sptr &impl); - ~MiscdeviceServiceProxy() = default; - virtual int32_t Vibrate(int32_t vibratorId, int32_t timeOut, int32_t usage) override; - virtual int32_t CancelVibrator(int32_t vibratorId) override; - virtual int32_t PlayVibratorEffect(int32_t vibratorId, const std::string &effect, int32_t loopCount, int32_t usage) override; - virtual int32_t StopVibratorEffect(int32_t vibratorId, const std::string &effect) override; + virtual std::vector GetLightList() override; + virtual int32_t TurnOn(int32_t lightId, const LightColor &color, const LightAnimation &animation) override; + virtual int32_t TurnOff(int32_t lightId) override; private: DISALLOW_COPY_AND_MOVE(MiscdeviceServiceProxy); diff --git a/frameworks/native/miscdevice/src/light_client.cpp b/frameworks/native/miscdevice/src/light_client.cpp new file mode 100755 index 0000000..4a0962b --- /dev/null +++ b/frameworks/native/miscdevice/src/light_client.cpp @@ -0,0 +1,188 @@ +/* + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "light_client.h" + +#include +#include + +#include "death_recipient_template.h" +#include "hisysevent.h" +#include "iservice_registry.h" +#include "sensors_errors.h" +#include "system_ability_definition.h" + +namespace OHOS { +namespace Sensors { + +namespace { +constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MISC_LOG_DOMAIN, "LightClient" }; +constexpr int32_t GET_SERVICE_MAX_COUNT = 30; +constexpr uint32_t MAX_LIGHT_LIST_SIZE = 0X00ff; +constexpr uint32_t WAIT_MS = 200; +} // namespace + +int32_t LightClient::InitLightClient() +{ + CALL_LOG_ENTER; + std::lock_guard clientLock(clientMutex_); + if (miscdeviceProxy_ != nullptr) { + MISC_HILOGD("miscdeviceProxy_ already init"); + return ERR_OK; + } + auto systemManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); + CHKPR(systemManager, MISC_NATIVE_SAM_ERR); + int32_t retry = 0; + while (retry < GET_SERVICE_MAX_COUNT) { + miscdeviceProxy_ = iface_cast(systemManager->GetSystemAbility( + MISCDEVICE_SERVICE_ABILITY_ID)); + if (miscdeviceProxy_ != nullptr) { + MISC_HILOGD("miscdeviceProxy_ get service success, retry:%{public}d", retry); + serviceDeathObserver_ = new (std::nothrow) DeathRecipientTemplate(*const_cast(this)); + if (serviceDeathObserver_ != nullptr) { + miscdeviceProxy_->AsObject()->AddDeathRecipient(serviceDeathObserver_); + } + lightInfoList_ = miscdeviceProxy_->GetLightList(); + return ERR_OK; + } + MISC_HILOGW("Get service failed, retry:%{public}d", retry); + std::this_thread::sleep_for(std::chrono::milliseconds(WAIT_MS)); + retry++; + } + HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::MISCDEVICE, "MISC_SERVICE_EXCEPTION", + HiviewDFX::HiSysEvent::EventType::FAULT, "PKG_NAME", "InitLightClient", "ERROR_CODE", MISC_NATIVE_GET_SERVICE_ERR); + MISC_HILOGE("Get service failed"); + return MISC_NATIVE_GET_SERVICE_ERR; +} + +bool LightClient::IsLightIdValid(int32_t lightId) +{ + int32_t ret = InitLightClient(); + if (ret != ERR_OK) { + MISC_HILOGE("InitLightClient failed, ret:%{public}d", ret); + return false; + } + for (const auto &item : lightInfoList_) { + if (lightId == item.lightId) { + return true; + } + } + return false; +} + +int32_t LightClient::GetLightList(LightInfo **lightInfo, int32_t &count) +{ + CALL_LOG_ENTER; + CHKPR(lightInfo, ERROR); + int32_t ret = InitLightClient(); + if (ret != ERR_OK) { + MISC_HILOGE("InitLightClient failed"); + return ERROR; + } + std::lock_guard lightInfosLock(lightInfosMutex_); + if (lightInfos_ == nullptr) { + int32_t ret = ConvertLightInfos(); + if (ret != ERR_OK) { + MISC_HILOGE("Convert light lists failed"); + ClearLightInfos(); + return ERROR; + } + } + *lightInfo = lightInfos_; + count = lightInfoCount_; + return ERR_OK; +} + +bool LightClient::IsLightAnimationValid(const LightAnimation &animation) +{ + if ((animation.mode < 0) || (animation.mode >= LIGHT_MODE_BUTT)) { + MISC_HILOGE("animation mode is invalid, mode:%{pubilc}d", animation.mode); + return false; + } + if ((animation.onTime < 0) || (animation.offTime < 0)) { + MISC_HILOGE("animation onTime or offTime is invalid, onTime:%{pubilc}d, offTime:%{pubilc}d", + animation.onTime, animation.offTime); + return false; + } + return true; +} + +int32_t LightClient::TurnOn(int32_t lightId, const LightColor &color, const LightAnimation &animation) +{ + CALL_LOG_ENTER; + if (!IsLightIdValid(lightId)) { + MISC_HILOGE("lightId is invalid, lightId:%{pubilc}d", lightId); + return PARAMETER_ERROR; + } + if (!IsLightAnimationValid(animation)) { + MISC_HILOGE("animation is invalid"); + return PARAMETER_ERROR; + } + CHKPR(miscdeviceProxy_, ERROR); + return miscdeviceProxy_->TurnOn(lightId, color, animation); +} + +int32_t LightClient::TurnOff(int32_t lightId) +{ + CALL_LOG_ENTER; + if (!IsLightIdValid(lightId)) { + MISC_HILOGE("lightId is invalid, lightId:%{pubilc}d", lightId); + return LIGHT_ID_NOT_SUPPORT; + } + CHKPR(miscdeviceProxy_, ERROR); + return miscdeviceProxy_->TurnOff(lightId); +} + +void LightClient::ProcessDeathObserver(wptr object) +{ + CALL_LOG_ENTER; + (void)object; + miscdeviceProxy_ = nullptr; + auto ret = InitLightClient(); + if (ret != ERR_OK) { + MISC_HILOGE("InitLightClient failed, ret:%{public}d", ret); + return; + } +} + +void LightClient::ClearLightInfos() +{ + CHKPV(lightInfos_); + free(lightInfos_); + lightInfos_ = nullptr; +} + +int32_t LightClient::ConvertLightInfos() +{ + CALL_LOG_ENTER; + if (lightInfoList_.empty()) { + MISC_HILOGE("get light lists failed"); + return ERROR; + } + size_t count = lightInfoList_.size(); + if (count > MAX_LIGHT_LIST_SIZE) { + MISC_HILOGE("The number of lights exceed the maximum value"); + return ERROR; + } + lightInfos_ = (LightInfo *)malloc(sizeof(LightInfo) * count); + CHKPR(lightInfos_, ERROR); + for (size_t i = 0; i < count; ++i) { + *(lightInfos_ + i) = lightInfoList_[i]; + } + lightInfoCount_ = static_cast(count); + return SUCCESS; +} +} // namespace Sensors +} // namespace OHOS diff --git a/frameworks/native/miscdevice/src/miscdevice_service_proxy.cpp b/frameworks/native/miscdevice/src/miscdevice_service_proxy.cpp index ffc5cad..7d5077b 100644 --- a/frameworks/native/miscdevice/src/miscdevice_service_proxy.cpp +++ b/frameworks/native/miscdevice/src/miscdevice_service_proxy.cpp @@ -16,6 +16,7 @@ #include "miscdevice_service_proxy.h" #include "hisysevent.h" +#include "securec.h" #include "sensors_errors.h" namespace OHOS { @@ -24,6 +25,7 @@ using namespace OHOS::HiviewDFX; namespace { constexpr HiLogLabel LABEL = { LOG_CORE, MISC_LOG_DOMAIN, "MiscdeviceServiceProxy" }; +constexpr int32_t MAX_LIGHT_COUNT = 0XFF; } MiscdeviceServiceProxy::MiscdeviceServiceProxy(const sptr &impl) : IRemoteProxy(impl) @@ -54,7 +56,7 @@ int32_t MiscdeviceServiceProxy::Vibrate(int32_t vibratorId, int32_t timeOut, int CHKPR(remote, ERROR); int32_t ret = remote->SendRequest(VIBRATE, data, reply, option); if (ret != NO_ERROR) { - HiSysEvent::Write(HiSysEvent::Domain::MISCDEVICE, "MISC_SERVICE_IPC_EXCEPTION", + HiSysEventWrite(HiSysEvent::Domain::MISCDEVICE, "MISC_SERVICE_IPC_EXCEPTION", HiSysEvent::EventType::FAULT, "PKG_NAME", "Vibrate", "ERROR_CODE", ret); MISC_HILOGE("sendRequest ret : %{public}d", ret); } @@ -78,7 +80,7 @@ int32_t MiscdeviceServiceProxy::CancelVibrator(int32_t vibratorId) CHKPR(remote, ERROR); int32_t ret = remote->SendRequest(CANCEL_VIBRATOR, data, reply, option); if (ret != NO_ERROR) { - HiSysEvent::Write(HiSysEvent::Domain::MISCDEVICE, "MISC_SERVICE_IPC_EXCEPTION", + HiSysEventWrite(HiSysEvent::Domain::MISCDEVICE, "MISC_SERVICE_IPC_EXCEPTION", HiSysEvent::EventType::FAULT, "PKG_NAME", "CancelVibrator", "ERROR_CODE", ret); MISC_HILOGE("ret : %{public}d", ret); } @@ -115,7 +117,7 @@ int32_t MiscdeviceServiceProxy::PlayVibratorEffect(int32_t vibratorId, const std CHKPR(remote, ERROR); int32_t ret = remote->SendRequest(PLAY_VIBRATOR_EFFECT, data, reply, option); if (ret != NO_ERROR) { - HiSysEvent::Write(HiSysEvent::Domain::MISCDEVICE, "MISC_SERVICE_IPC_EXCEPTION", + HiSysEventWrite(HiSysEvent::Domain::MISCDEVICE, "MISC_SERVICE_IPC_EXCEPTION", HiSysEvent::EventType::FAULT, "PKG_NAME", "PlayVibratorEffect", "ERROR_CODE", ret); MISC_HILOGE("ret : %{public}d", ret); } @@ -143,11 +145,110 @@ int32_t MiscdeviceServiceProxy::StopVibratorEffect(int32_t vibratorId, const std CHKPR(remote, ERROR); int32_t ret = remote->SendRequest(STOP_VIBRATOR_EFFECT, data, reply, option); if (ret != NO_ERROR) { - HiSysEvent::Write(HiSysEvent::Domain::MISCDEVICE, "MISC_SERVICE_IPC_EXCEPTION", + HiSysEventWrite(HiSysEvent::Domain::MISCDEVICE, "MISC_SERVICE_IPC_EXCEPTION", HiSysEvent::EventType::FAULT, "PKG_NAME", "StopVibratorEffect", "ERROR_CODE", ret); MISC_HILOGE("ret : %{public}d", ret); } return ret; } +std::vector MiscdeviceServiceProxy::GetLightList() +{ + MessageParcel data; + MessageParcel reply; + MessageOption option; + std::vector lightInfos; + if (!data.WriteInterfaceToken(MiscdeviceServiceProxy::GetDescriptor())) { + MISC_HILOGE("WriteInterfaceToken failed"); + return lightInfos; + } + sptr remote = Remote(); + if (remote == nullptr) { + MISC_HILOGE("remote is null"); + return lightInfos; + } + int32_t ret = remote->SendRequest(GET_LIGHT_LIST, data, reply, option); + if (ret != NO_ERROR) { + MISC_HILOGE("failed, ret:%{public}d", ret); + return lightInfos; + } + uint32_t lightCount = 0; + if (!reply.ReadUint32(lightCount)) { + MISC_HILOGE("Parcel read failed"); + return lightInfos; + } + if (lightCount > MAX_LIGHT_COUNT) { + lightCount = MAX_LIGHT_COUNT; + } + for (uint32_t i = 0; i < lightCount; ++i) { + const uint8_t *info = reply.ReadBuffer(sizeof(LightInfo)); + if (info == nullptr) { + MISC_HILOGE("ReadBuffer failed"); + return lightInfos; + } + LightInfo lightInfo; + if (memcpy_s(&lightInfo, sizeof(LightInfo), info, sizeof(LightInfo)) != EOK) { + MISC_HILOGE("memcpy_s failed"); + return lightInfos; + } + lightInfos.push_back(lightInfo); + } + return lightInfos; +} + +int32_t MiscdeviceServiceProxy::TurnOn(int32_t lightId, const LightColor &color, const LightAnimation &animation) +{ + MessageParcel data; + MessageParcel reply; + MessageOption option; + if (!data.WriteInterfaceToken(MiscdeviceServiceProxy::GetDescriptor())) { + MISC_HILOGE("write descriptor failed"); + return WRITE_MSG_ERR; + } + if (!data.WriteInt32(lightId)) { + MISC_HILOGE("WriteUint32 lightId failed"); + return WRITE_MSG_ERR; + } + if (!data.WriteBuffer(&color, sizeof(LightColor))) { + MISC_HILOGE("WriteBuffer color failed"); + return WRITE_MSG_ERR; + } + if (!data.WriteBuffer(&animation, sizeof(LightAnimation))) { + MISC_HILOGE("WriteBuffer animation failed"); + return WRITE_MSG_ERR; + } + sptr remote = Remote(); + CHKPR(remote, ERROR); + int32_t ret = remote->SendRequest(TURN_ON, data, reply, option); + if (ret != NO_ERROR) { + HiSysEventWrite(HiSysEvent::Domain::MISCDEVICE, "MISC_SERVICE_IPC_EXCEPTION", + HiSysEvent::EventType::FAULT, "PKG_NAME", "TurnOn", "ERROR_CODE", ret); + MISC_HILOGE("sendRequest failed, ret:%{public}d", ret); + } + return ret; +} + +int32_t MiscdeviceServiceProxy::TurnOff(int32_t lightId) +{ + MessageParcel data; + MessageParcel reply; + MessageOption option; + if (!data.WriteInterfaceToken(MiscdeviceServiceProxy::GetDescriptor())) { + MISC_HILOGE("write descriptor failed"); + return WRITE_MSG_ERR; + } + if (!data.WriteInt32(lightId)) { + MISC_HILOGE("WriteInt32 lightId failed"); + return WRITE_MSG_ERR; + } + sptr remote = Remote(); + CHKPR(remote, ERROR); + int32_t ret = remote->SendRequest(TURN_OFF, data, reply, option); + if (ret != NO_ERROR) { + HiSysEventWrite(HiSysEvent::Domain::MISCDEVICE, "MISC_SERVICE_IPC_EXCEPTION", + HiSysEvent::EventType::FAULT, "PKG_NAME", "TurnOff", "ERROR_CODE", ret); + MISC_HILOGE("sendRequest failed, ret:%{public}d", ret); + } + return ret; +} } // namespace Sensors } // namespace OHOS diff --git a/frameworks/native/miscdevice/src/vibrator_service_client.cpp b/frameworks/native/miscdevice/src/vibrator_service_client.cpp index d99eda8..bf63e63 100644 --- a/frameworks/native/miscdevice/src/vibrator_service_client.cpp +++ b/frameworks/native/miscdevice/src/vibrator_service_client.cpp @@ -62,7 +62,7 @@ int32_t VibratorServiceClient::InitServiceClient() std::this_thread::sleep_for(std::chrono::milliseconds(WAIT_MS)); retry++; } - HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::MISCDEVICE, "MISC_SERVICE_EXCEPTION", + HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::MISCDEVICE, "MISC_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "PKG_NAME", "InitServiceClient", "ERROR_CODE", MISC_NATIVE_GET_SERVICE_ERR); MISC_HILOGE("get service failed"); return MISC_NATIVE_GET_SERVICE_ERR; diff --git a/interfaces/native/light/BUILD.gn b/interfaces/native/light/BUILD.gn new file mode 100755 index 0000000..985f8db --- /dev/null +++ b/interfaces/native/light/BUILD.gn @@ -0,0 +1,68 @@ +# Copyright (c) 2022 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//build/ohos.gni") + +SUBSYSTEM_DIR = "//base/sensors/miscdevice" +ohos_ndk_library("liblight_ndk") { + output_name = "light_agent" + ndk_description_file = "./liblight.json" + min_compact_version = "7" +} + +ohos_ndk_headers("light_ndk_header") { + dest_dir = "$ndk_headers_out_dir/sensors" + sources = [ + "./include/light_agent.h", + "./include/light_agent_type.h", + ] +} + +config("light_config") { + include_dirs = [ "include" ] +} + +ohos_shared_library("light_interface_native") { + output_name = "light_agent" + sources = [ "src/light_agent.cpp" ] + + include_dirs = [ + "include", + "//base/sensors/miscdevice/frameworks/native/miscdevice/include", + "//base/sensors/miscdevice/utils/include", + "//commonlibrary/c_utils/base/include", + "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", + ] + + cflags = [ "-Wno-error=inconsistent-missing-override" ] + + deps = [ + "$SUBSYSTEM_DIR/frameworks/native/miscdevice:liblight_native", + "$SUBSYSTEM_DIR/interfaces/native/light:liblight_ndk", + "$SUBSYSTEM_DIR/interfaces/native/light:light_ndk_header", + ] + + external_deps = [ + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", + ] + + public_configs = [ ":light_config" ] + part_name = "miscdevice" + subsystem_name = "sensors" +} + +group("light_target") { + deps = [ ":light_interface_native" ] +} diff --git a/interfaces/native/light/include/light_agent.h b/interfaces/native/light/include/light_agent.h new file mode 100755 index 0000000..01e87e1 --- /dev/null +++ b/interfaces/native/light/include/light_agent.h @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file light_agent.h + * + * @brief Declares the functions for starting or stopping a light. + * @since 10 + */ + +#ifndef LIGHT_AGENT_H +#define LIGHT_AGENT_H + +#include "light_agent_type.h" + +#ifdef __cplusplus +extern "C" { +#endif + +namespace OHOS { +namespace Sensors { +/** + * @brief Obtains information about all the lights in the system. + * + * @param lightInfo Indicates the list of the light information. + * @param count Indicates the count of all the lights in the system. + * @return Returns 0 if the operation is successful. + * @return Returns a negative value if the operation fails. + * @since 10 + */ +int32_t GetLightList(LightInfo **lightInfo, int32_t &count); + +/** + * @brief Turns on available lights in the list based on the specified light id. + * + * @param lightId Indicates the light id. + * @param color：Color corresponding to the light. + * @param animation Indicates the blinking parameters. + * @return Returns 0 if the operation is successful. + * @return Returns a negative value if the operation fails. + * @since 10 + */ +int32_t TurnOn(int32_t lightId, const LightColor &color, const LightAnimation &animation); + +/** + * @brief Turns off available lights in the list based on the specified light id. + * + * @param lightId Indicates the light id. + * @return Returns 0 if the operation is successful. + * @return Returns a negative value if the operation fails. + * @since 10 + */ +int32_t TurnOff(int32_t lightId); +} // namespace Sensors +} // namespace OHOS +#ifdef __cplusplus +}; +#endif +/** @} */ +#endif // endif LIGHT_AGENT_H diff --git a/interfaces/native/light/include/light_agent_type.h b/interfaces/native/light/include/light_agent_type.h new file mode 100755 index 0000000..2e67108 --- /dev/null +++ b/interfaces/native/light/include/light_agent_type.h @@ -0,0 +1,118 @@ +/* + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef LIGHT_AGENT_TYPE_H +#define LIGHT_AGENT_TYPE_H + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/** Maximum length of the light name */ +#ifndef NAME_MAX_LEN +#define NAME_MAX_LEN 32 +#endif /* NAME_MAX_LEN */ +/** + * @brief Enumerates the light types. + * + * @since 10 + */ +enum LightType { + LIGHT_TYPE_SINGLE_COLOR = 1, + LIGHT_TYPE_RGB_COLOR = 2, + LIGHT_TYPE_WRGB_COLOR = 3, +}; + +/** + * @brief Defines the basic light information. + * + * @since 10 + */ +typedef struct { + char lightName[NAME_MAX_LEN]; /**< light name */ + int32_t lightId; /**< Light id */ + int32_t lightNumber; /**< Number of physical lights in the logic controller */ + int32_t lightType; /** Light type. For details, see {@link LightType}. */ +} LightInfo; + +/** + * @brief Enumerates the lighting modes. + * + * @since 10 + */ +typedef enum { + LIGHT_MODE_DEFAULT = 0, /**< No flicker mode. */ + LIGHT_MODE_BLINK = 1, /**< Timed flashing mode. */ + LIGHT_MODE_GRADIENT = 2, /**< Gradient mode. */ + LIGHT_MODE_BUTT = 3, /**< Invalid mode. */ +} FlashMode; + +/** + * @brief Defines the blinking parameters. + * + * @since 10 + */ +struct LightAnimation { + int32_t mode = LIGHT_MODE_DEFAULT; /**< Blinking mode. For details, see {@link FlashMode}. */ + int32_t onTime; /**< Duration (in ms) for which the light is on in a blinking period. */ + int32_t offTime; /**< Duration (in ms) for which the light is off in a blinking period. */ +}; + +/** + * @brief Defines the color and custom extended information of the light. + * + * The parameters include the These parameters include red, green, blue values and custom extended information. + * + * @since 10 + */ +struct RGBColor { + uint8_t r; /** Red value range 0-255. */ + uint8_t g; /** Green value range 0-255. */ + uint8_t b; /** Blue value range 0-255. */ + uint8_t reserved; /** Custom extended information */ +}; + +/** + * @brief Defines the color of the light. + * + * The parameters include the These parameters include red, green, blue and white values. + ght idNumber of physical lights in the logic controllerint reservedCustom extended information. + * @since 10 + */ +struct WRGBColor { + uint8_t w; /** White value range 0-255. */ + uint8_t r; /** Red value range 0-255. */ + uint8_t g; /** Green value range 0-255. */ + uint8_t b; /** Blue value range 0-255. */ +}; + +/** + * @brief Defines the color of the light。 + * + * @since 10 + */ +union LightColor { + int32_t singleColor; /** Single color mode. */ + RGBColor rgbColor; /** RGB mode, see {@link RGBColor}. */ + WRGBColor wrgbColor; /** WRGB mode, see {@link WRGBColor}. */ +}; + +/** @} */ +#ifdef __cplusplus +}; +#endif +#endif // endif LIGHT_AGENT_TYPE_H diff --git a/interfaces/native/light/liblight.json b/interfaces/native/light/liblight.json new file mode 100755 index 0000000..969401a --- /dev/null +++ b/interfaces/native/light/liblight.json @@ -0,0 +1,15 @@ +[ + { + "first_introduced": "7", + "name": "GetLightList" + }, + { + "name": "TurnOn" + }, + { + "name": "TurnOnMulti" + }, + { + "name": "TurnOff" + } + ] \ No newline at end of file diff --git a/interfaces/native/light/src/light_agent.cpp b/interfaces/native/light/src/light_agent.cpp new file mode 100755 index 0000000..ca88a66 --- /dev/null +++ b/interfaces/native/light/src/light_agent.cpp @@ -0,0 +1,71 @@ +/* + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#include "light_agent.h" + +#include "light_client.h" +#include "sensors_errors.h" + +namespace OHOS { +namespace Sensors { +using OHOS::HiviewDFX::HiLog; +using OHOS::HiviewDFX::HiLogLabel; + +namespace { +constexpr HiLogLabel LABEL = { LOG_CORE, MISC_LOG_DOMAIN, "LightNDK" }; +} // namespace + +int32_t GetLightList(LightInfo **lightInfo, int32_t &count) +{ + CHKPR(lightInfo, ERROR); + auto &client = LightClient::GetInstance(); + int32_t ret = client.GetLightList(lightInfo, count); + if (ret != ERR_OK) { + MISC_HILOGE("GetLightList failed"); + return ERROR; + } + return SUCCESS; +} + +int32_t TurnOn(int32_t lightId, const LightColor &color, const LightAnimation &animation) +{ + if (lightId < 0) { + MISC_HILOGE("lightId is invalid"); + return ERROR; + } + auto &client = LightClient::GetInstance(); + int32_t ret = client.TurnOn(lightId, color, animation); + if (ret != ERR_OK) { + MISC_HILOGE("TurnOn failed, lightId:%{public}d,ret:%{public}d ", lightId, ret); + return ERROR; + } + return SUCCESS; +} + +int32_t TurnOff(int32_t lightId) +{ + if (lightId < 0) { + MISC_HILOGE("lightId is error"); + return ERROR; + } + auto &client = LightClient::GetInstance(); + int32_t ret = client.TurnOff(lightId); + if (ret != ERR_OK) { + MISC_HILOGE("TurnOff failed, lightId:%{public}d,ret:%{public}d", lightId, ret); + return ERROR; + } + return SUCCESS; +} +} // namespace Sensors +} // namespace OHOS diff --git a/interfaces/native/light/test/BUILD.gn b/interfaces/native/light/test/BUILD.gn new file mode 100755 index 0000000..15a3f92 --- /dev/null +++ b/interfaces/native/light/test/BUILD.gn @@ -0,0 +1,47 @@ +# Copyright (c) 2021 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//build/test.gni") + +SUBSYSTEM_DIR = "//base/sensors" +module_output_path = "sensors/miscdevice/interfaces" + +###########################LightAgentTest########################### +ohos_unittest("LightAgentTest") { + module_out_path = module_output_path + + sources = [ "unittest/light_agent_test.cpp" ] + + include_dirs = [ + "//commonlibrary/c_utils/base/include", + "$SUBSYSTEM_DIR/miscdevice/utils/include", + "$SUBSYSTEM_DIR/miscdevice/interfaces/native/light/include", + ] + + deps = [ + "$SUBSYSTEM_DIR/miscdevice/interfaces/native/light:light_interface_native", + "$SUBSYSTEM_DIR/miscdevice/utils:libmiscdevice_utils", + "//third_party/googletest:gmock_main", + "//third_party/googletest:gtest_main", + ] + external_deps = [ + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", + ] +} + +###########################end########################### +group("unittest") { + testonly = true + deps = [ ":LightAgentTest" ] +} diff --git a/interfaces/native/light/test/fuzztest/BUILD.gn b/interfaces/native/light/test/fuzztest/BUILD.gn new file mode 100755 index 0000000..019a7ff --- /dev/null +++ b/interfaces/native/light/test/fuzztest/BUILD.gn @@ -0,0 +1,25 @@ +# Copyright (c) 2022 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//build/config/features.gni") +import("//build/ohos.gni") +import("//build/test.gni") + +group("fuzztest") { + testonly = true + deps = [] + deps += [ + "startlight_fuzzer:fuzztest", + "stoplight_fuzzer:fuzztest", + ] +} diff --git a/interfaces/native/light/test/fuzztest/startlight_fuzzer/BUILD.gn b/interfaces/native/light/test/fuzztest/startlight_fuzzer/BUILD.gn new file mode 100755 index 0000000..fbf2a3c --- /dev/null +++ b/interfaces/native/light/test/fuzztest/startlight_fuzzer/BUILD.gn @@ -0,0 +1,52 @@ +# Copyright (c) 2022 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//build/config/features.gni") +import("//build/ohos.gni") +import("//build/test.gni") +module_output_path = "sensors/light" + +ohos_fuzztest("StartLightFuzzTest") { + module_out_path = module_output_path + + fuzz_config_file = "//base/sensors/miscdevice/interfaces/native/light/test/fuzztest/startlight_fuzzer" + + include_dirs = [ + "//base/sensors/miscdevice/interfaces/native/light/test/fuzztest/startlight_fuzzer", + "//base/sensors/miscdevice/interfaces/native/light/include", + ] + + cflags = [ + "-g", + "-O0", + "-Wno-unused-variable", + "-fno-omit-frame-pointer", + ] + + sources = [ "startlight_fuzzer.cpp" ] + + deps = [ + "//base/sensors/miscdevice/interfaces/native/light:light_interface_native", + ] + + external_deps = [ "c_utils:utils" ] +} + +group("fuzztest") { + testonly = true + deps = [] + deps += [ + # deps file + ":StartLightFuzzTest", + ] +} diff --git a/interfaces/native/light/test/fuzztest/startlight_fuzzer/corpus/init b/interfaces/native/light/test/fuzztest/startlight_fuzzer/corpus/init new file mode 100755 index 0000000..bc977bd --- /dev/null +++ b/interfaces/native/light/test/fuzztest/startlight_fuzzer/corpus/init @@ -0,0 +1,14 @@ +# Copyright (c) 2022 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +FUZZ \ No newline at end of file diff --git a/interfaces/native/light/test/fuzztest/startlight_fuzzer/project.xml b/interfaces/native/light/test/fuzztest/startlight_fuzzer/project.xml new file mode 100755 index 0000000..20dc766 --- /dev/null +++ b/interfaces/native/light/test/fuzztest/startlight_fuzzer/project.xml @@ -0,0 +1,25 @@ + + + + + + 1000 + + 120 + + 2048 + + diff --git a/interfaces/native/light/test/fuzztest/startlight_fuzzer/startlight_fuzzer.cpp b/interfaces/native/light/test/fuzztest/startlight_fuzzer/startlight_fuzzer.cpp new file mode 100755 index 0000000..fbcdc11 --- /dev/null +++ b/interfaces/native/light/test/fuzztest/startlight_fuzzer/startlight_fuzzer.cpp @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "startlight_fuzzer.h" +#include "securec.h" +#include "light_agent.h" + +namespace OHOS { +namespace Sensors { +template +size_t GetObject(T &object, const uint8_t *data, size_t size) +{ + size_t objectSize = sizeof(object); + if (objectSize > size) { + return 0; + } + errno_t ret = memcpy_s(&object, objectSize, data, objectSize); + if (ret != EOK) { + return 0; + } + return objectSize; +} + +void StartLightFuzzTest(const uint8_t* data, size_t size) +{ + size_t startPos = 0; + int32_t lightId; + startPos += GetObject(lightId, data + startPos, size - startPos); + LightColor color; + startPos += GetObject(color, data + startPos, size - startPos); + LightAnimation animation; + GetObject(animation, data + startPos, size - startPos); + OHOS::Sensors::TurnOn(lightId, color, animation); +} +} // Sensors +} // OHOS + +/* Fuzzer entry point */ +extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) +{ + /* Run your code on data */ + OHOS::Sensors::StartLightFuzzTest(data, size); + return 0; +} diff --git a/interfaces/native/light/test/fuzztest/startlight_fuzzer/startlight_fuzzer.h b/interfaces/native/light/test/fuzztest/startlight_fuzzer/startlight_fuzzer.h new file mode 100755 index 0000000..e40c223 --- /dev/null +++ b/interfaces/native/light/test/fuzztest/startlight_fuzzer/startlight_fuzzer.h @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef SENSOR_DISABLE_FUZZER_H +#define SENSOR_DISABLE_FUZZER_H + +#define FUZZ_PROJECT_NAME "startlightfuzzer" + +#endif + diff --git a/interfaces/native/light/test/fuzztest/stoplight_fuzzer/BUILD.gn b/interfaces/native/light/test/fuzztest/stoplight_fuzzer/BUILD.gn new file mode 100755 index 0000000..c99f261 --- /dev/null +++ b/interfaces/native/light/test/fuzztest/stoplight_fuzzer/BUILD.gn @@ -0,0 +1,52 @@ +# Copyright (c) 2022 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//build/config/features.gni") +import("//build/ohos.gni") +import("//build/test.gni") +module_output_path = "sensors/light" + +ohos_fuzztest("StopLightFuzzTest") { + module_out_path = module_output_path + + fuzz_config_file = "//base/sensors/miscdevice/interfaces/native/light/test/fuzztest/stoplight_fuzzer" + + include_dirs = [ + "//base/sensors/miscdevice/interfaces/native/light/test/fuzztest/stoplight_fuzzer", + "//base/sensors/miscdevice/interfaces/native/light/include", + ] + + cflags = [ + "-g", + "-O0", + "-Wno-unused-variable", + "-fno-omit-frame-pointer", + ] + + sources = [ "stoplight_fuzzer.cpp" ] + + deps = [ + "//base/sensors/miscdevice/interfaces/native/light:light_interface_native", + ] + + external_deps = [ "c_utils:utils" ] +} + +group("fuzztest") { + testonly = true + deps = [] + deps += [ + # deps file + ":StopLightFuzzTest", + ] +} diff --git a/interfaces/native/light/test/fuzztest/stoplight_fuzzer/corpus/init b/interfaces/native/light/test/fuzztest/stoplight_fuzzer/corpus/init new file mode 100755 index 0000000..bc977bd --- /dev/null +++ b/interfaces/native/light/test/fuzztest/stoplight_fuzzer/corpus/init @@ -0,0 +1,14 @@ +# Copyright (c) 2022 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +FUZZ \ No newline at end of file diff --git a/interfaces/native/light/test/fuzztest/stoplight_fuzzer/project.xml b/interfaces/native/light/test/fuzztest/stoplight_fuzzer/project.xml new file mode 100755 index 0000000..20dc766 --- /dev/null +++ b/interfaces/native/light/test/fuzztest/stoplight_fuzzer/project.xml @@ -0,0 +1,25 @@ + + + + + + 1000 + + 120 + + 2048 + + diff --git a/interfaces/native/light/test/fuzztest/stoplight_fuzzer/stoplight_fuzzer.cpp b/interfaces/native/light/test/fuzztest/stoplight_fuzzer/stoplight_fuzzer.cpp new file mode 100755 index 0000000..b106001 --- /dev/null +++ b/interfaces/native/light/test/fuzztest/stoplight_fuzzer/stoplight_fuzzer.cpp @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "stoplight_fuzzer.h" +#include "securec.h" +#include "light_agent.h" + +namespace OHOS { +namespace Sensors { +template +size_t GetObject(T &object, const uint8_t *data, size_t size) +{ + size_t objectSize = sizeof(object); + if (objectSize > size) { + return 0; + } + errno_t ret = memcpy_s(&object, objectSize, data, objectSize); + if (ret != EOK) { + return 0; + } + return objectSize; +} + +void StopLightuzzTest(const uint8_t* data, size_t size) +{ + size_t startPos = 0; + int32_t lightId; + GetObject(lightId, data + startPos, size - startPos); + OHOS::Sensors::TurnOff(lightId); +} +} // Sensors +} // OHOS + +/* Fuzzer entry point */ +extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) +{ + /* Run your code on data */ + OHOS::Sensors::StopLightuzzTest(data, size); + return 0; +} diff --git a/interfaces/native/light/test/fuzztest/stoplight_fuzzer/stoplight_fuzzer.h b/interfaces/native/light/test/fuzztest/stoplight_fuzzer/stoplight_fuzzer.h new file mode 100755 index 0000000..9a01984 --- /dev/null +++ b/interfaces/native/light/test/fuzztest/stoplight_fuzzer/stoplight_fuzzer.h @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef SENSOR_DISABLE_FUZZER_H +#define SENSOR_DISABLE_FUZZER_H + +#define FUZZ_PROJECT_NAME "stoplight_fuzzer" + +#endif + diff --git a/interfaces/native/light/test/unittest/light_agent_test.cpp b/interfaces/native/light/test/unittest/light_agent_test.cpp new file mode 100755 index 0000000..88d8846 --- /dev/null +++ b/interfaces/native/light/test/unittest/light_agent_test.cpp @@ -0,0 +1,300 @@ +/* + * Copyright (c) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include + +#include "light_agent.h" +#include "sensors_errors.h" + +namespace OHOS { +namespace Sensors { +using namespace testing::ext; +using namespace OHOS::HiviewDFX; + +namespace { + constexpr HiLogLabel LABEL = { LOG_CORE, MISC_LOG_DOMAIN, "LightAgentTest" }; +} // namespace + +class LightAgentTest : public testing::Test { +public: + static void SetUpTestCase() {} + static void TearDownTestCase() {} + void SetUp() {} + void TearDown() {} +}; + +LightInfo *lightInfo_ = nullptr; +int32_t lightId_ = -1; +int32_t invalidLightId_ = -1; +int32_t lightType_ = -1; + +/** + * @tc.name: StartLightTest_001 + * @tc.desc: Verify GetLightList + * @tc.type: FUNC + * @tc.require: I63TFA + */ +HWTEST_F(LightAgentTest, StartLightTest_001, TestSize.Level1) +{ + CALL_LOG_ENTER; + int32_t count = -1; + int32_t ret = GetLightList(&lightInfo_, count); + for (int32_t i = 0; i < count; ++i) { + MISC_HILOGI("lightId: %{public}d, lightName: %{public}s, lightNumber: %{public}d, lightType: %{public}d", + lightInfo_[i].lightId, lightInfo_[i].lightName, lightInfo_[i].lightNumber, lightInfo_[i].lightType); + lightId_ = lightInfo_[i].lightId; + lightType_ = lightInfo_[i].lightType; + } + ASSERT_EQ(ret, 0); +} + +/** + * @tc.name: StartLightTest_002 + * @tc.desc: Verify GetLightList + * @tc.type: FUNC + * @tc.require: I63TFA + */ +HWTEST_F(LightAgentTest, StartLightTest_002, TestSize.Level1) +{ + CALL_LOG_ENTER; + int32_t count = -1; + int32_t ret = GetLightList(nullptr, count); + ASSERT_EQ(ret, -1); +} + +bool GetLightColor(LightColor &color, int32_t lightType) +{ + switch (lightType) { + case LIGHT_TYPE_SINGLE_COLOR: { + color.singleColor = 0Xff; + return true; + } + case LIGHT_TYPE_RGB_COLOR: { + color.rgbColor = { + .r = 0Xff, + .g = 0Xff, + .b = 0Xff + }; + return true; + } + case LIGHT_TYPE_WRGB_COLOR: { + color.wrgbColor = { + .w = 0Xff, + .r = 0Xff, + .g = 0Xff, + .b = 0Xff + }; + return true; + } + default: { + MISC_HILOGE("lightType: %{public}d invalid", lightType); + return false; + } + } +} + +/** + * @tc.name: StartLightTest_003 + * @tc.desc: Verify TurnOn + * @tc.type: FUNC + * @tc.require: I63TFA + */ +HWTEST_F(LightAgentTest, StartLightTest_003, TestSize.Level1) +{ + CALL_LOG_ENTER; + int32_t powerLightId = 1; + TurnOff(powerLightId); + LightColor color; + bool ret = GetLightColor(color, lightType_); + if (!ret) { + ASSERT_EQ(ret, -1); + } else { + LightAnimation animation; + animation.mode = LIGHT_MODE_DEFAULT; + animation.onTime = 50; + animation.offTime = 50; + int32_t ret = TurnOn(lightId_, color, animation); + sleep(5); + ASSERT_EQ(ret, 0); + } +} + +/** + * @tc.name: StartLightTest_004 + * @tc.desc: Verify TurnOn + * @tc.type: FUNC + * @tc.require: I63TFA + */ +HWTEST_F(LightAgentTest, StartLightTest_004, TestSize.Level1) +{ + CALL_LOG_ENTER; + LightColor color; + bool ret = GetLightColor(color, lightType_); + if (!ret) { + ASSERT_EQ(ret, -1); + } else { + LightAnimation animation; + animation.mode = LIGHT_MODE_BUTT; + animation.onTime = 50; + animation.offTime = 50; + int32_t ret = TurnOn(lightId_, color, animation); + ASSERT_EQ(ret, -1); + } +} + +/** + * @tc.name: StartLightTest_005 + * @tc.desc: Verify TurnOn + * @tc.type: FUNC + * @tc.require: I63TFA + */ +HWTEST_F(LightAgentTest, StartLightTest_005, TestSize.Level1) +{ + CALL_LOG_ENTER; + LightColor color; + bool ret = GetLightColor(color, lightType_); + if (!ret) { + ASSERT_EQ(ret, -1); + } else { + LightAnimation animation; + animation.mode = -1; + animation.onTime = 50; + animation.offTime = 50; + int32_t ret = TurnOn(lightId_, color, animation); + ASSERT_EQ(ret, -1); + } +} + +/** + * @tc.name: StartLightTest_006 + * @tc.desc: Verify TurnOn + * @tc.type: FUNC + * @tc.require: I63TFA + */ +HWTEST_F(LightAgentTest, StartLightTest_006, TestSize.Level1) +{ + CALL_LOG_ENTER; + LightColor color; + bool ret = GetLightColor(color, lightType_); + if (!ret) { + ASSERT_EQ(ret, -1); + } else { + LightAnimation animation; + animation.mode = LIGHT_MODE_DEFAULT; + animation.onTime = -1; + animation.offTime = 50; + int32_t ret = TurnOn(lightId_, color, animation); + ASSERT_EQ(ret, -1); + } +} + +/** + * @tc.name: StartLightTest_007 + * @tc.desc: Verify TurnOn + * @tc.type: FUNC + * @tc.require: I63TFA + */ +HWTEST_F(LightAgentTest, StartLightTest_007, TestSize.Level1) +{ + CALL_LOG_ENTER; + LightColor color; + bool ret = GetLightColor(color, lightType_); + if (!ret) { + ASSERT_EQ(ret, -1); + } else { + LightAnimation animation; + animation.mode = LIGHT_MODE_DEFAULT; + animation.onTime = 50; + animation.offTime = -1; + int32_t ret = TurnOn(lightId_, color, animation); + ASSERT_EQ(ret, -1); + } +} + +/** + * @tc.name: StartLightTest_008 + * @tc.desc: Verify TurnOn + * @tc.type: FUNC + * @tc.require: I63TFA + */ +HWTEST_F(LightAgentTest, StartLightTest_008, TestSize.Level1) +{ + CALL_LOG_ENTER; + LightColor color; + bool ret = GetLightColor(color, lightType_); + if (!ret) { + ASSERT_EQ(ret, -1); + } else { + LightAnimation animation; + animation.mode = LIGHT_MODE_DEFAULT; + animation.onTime = 2; + animation.offTime = 2; + int32_t ret = TurnOn(lightId_, color, animation); + sleep(5); + ASSERT_EQ(ret, 0); + } +} + +/** + * @tc.name: StartLightTest_009 + * @tc.desc: Verify TurnOn + * @tc.type: FUNC + * @tc.require: I63TFA + */ +HWTEST_F(LightAgentTest, StartLightTest_009, TestSize.Level1) +{ + CALL_LOG_ENTER; + LightColor color; + bool ret = GetLightColor(color, lightType_); + if (!ret) { + ASSERT_EQ(ret, -1); + } else { + LightAnimation animation; + animation.mode = LIGHT_MODE_DEFAULT; + animation.onTime = 2; + animation.offTime = 2; + int32_t ret = TurnOn(invalidLightId_, color, animation); + ASSERT_EQ(ret, -1); + } +} + +/** + * @tc.name: StartLightTest_010 + * @tc.desc: Verify TurnOff + * @tc.type: FUNC + * @tc.require: I63TFA + */ +HWTEST_F(LightAgentTest, StartLightTest_010, TestSize.Level1) +{ + CALL_LOG_ENTER; + int32_t ret = TurnOff(lightId_); + ASSERT_EQ(ret, 0); +} + +/** + * @tc.name: StartLightTest_011 + * @tc.desc: Verify TurnOff + * @tc.type: FUNC + * @tc.require: I63TFA + */ +HWTEST_F(LightAgentTest, StartLightTest_011, TestSize.Level1) +{ + CALL_LOG_ENTER; + int32_t ret = TurnOff(invalidLightId_); + ASSERT_EQ(ret, -1); +} +} // namespace Sensors +} // namespace OHOS diff --git a/interfaces/native/vibrator/BUILD.gn b/interfaces/native/vibrator/BUILD.gn index 48349c1..4a58c2e 100644 --- a/interfaces/native/vibrator/BUILD.gn +++ b/interfaces/native/vibrator/BUILD.gn @@ -41,6 +41,7 @@ ohos_shared_library("vibrator_interface_native") { "//commonlibrary/c_utils/base/include", "//base/sensors/miscdevice/utils/include", "//base/sensors/miscdevice/frameworks/native/miscdevice/include", + "//base/sensors/miscdevice/interfaces/native/light/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] @@ -48,6 +49,7 @@ ohos_shared_library("vibrator_interface_native") { deps = [ "$SUBSYSTEM_DIR/frameworks/native/miscdevice:libvibrator_native", + "$SUBSYSTEM_DIR/interfaces/native/light:light_ndk_header", "$SUBSYSTEM_DIR/interfaces/native/vibrator:libvibrator_ndk", ] diff --git a/services/miscdevice_service/BUILD.gn b/services/miscdevice_service/BUILD.gn index f83b144..cc87ec7 100644 --- a/services/miscdevice_service/BUILD.gn +++ b/services/miscdevice_service/BUILD.gn @@ -16,8 +16,11 @@ import("//build/ohos.gni") SUBSYSTEM_DIR = "//base/sensors" ohos_shared_library("libmiscdevice_service") { sources = [ - "hdi_connection/adpter/src/compatible_connection.cpp", - "hdi_connection/adpter/src/hdi_connection.cpp", + "hdi_connection/adapter/src/compatible_connection.cpp", + "hdi_connection/adapter/src/compatible_light_connection.cpp", + "hdi_connection/adapter/src/hdi_connection.cpp", + "hdi_connection/adapter/src/hdi_light_connection.cpp", + "hdi_connection/interface/src/light_hdi_connection.cpp", "hdi_connection/interface/src/vibrator_hdi_connection.cpp", "src/miscdevice_dump.cpp", "src/miscdevice_service.cpp", @@ -31,8 +34,9 @@ ohos_shared_library("libmiscdevice_service") { "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "$SUBSYSTEM_DIR/miscdevice/frameworks/native/miscdevice/include", + "$SUBSYSTEM_DIR/miscdevice/interfaces/native/light/include", "$SUBSYSTEM_DIR/miscdevice/utils/include", - "hdi_connection/adpter/include", + "hdi_connection/adapter/include", "hdi_connection/interface/include", "//third_party/cJSON", ] @@ -43,6 +47,7 @@ ohos_shared_library("libmiscdevice_service") { external_deps = [ "access_token:libaccesstoken_sdk", "c_utils:utils", + "drivers_interface_light:liblight_proxy_1.0", "drivers_interface_vibrator:libvibrator_proxy_1.1", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", diff --git a/services/miscdevice_service/hdi_connection/adpter/include/compatible_connection.h b/services/miscdevice_service/hdi_connection/adapter/include/compatible_connection.h similarity index 100% rename from services/miscdevice_service/hdi_connection/adpter/include/compatible_connection.h rename to services/miscdevice_service/hdi_connection/adapter/include/compatible_connection.h diff --git a/services/miscdevice_service/hdi_connection/adapter/include/compatible_light_connection.h b/services/miscdevice_service/hdi_connection/adapter/include/compatible_light_connection.h new file mode 100755 index 0000000..5228793 --- /dev/null +++ b/services/miscdevice_service/hdi_connection/adapter/include/compatible_light_connection.h @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef COMPATIBLE_LIGHT_CONNECTION_H +#define COMPATIBLE_LIGHT_CONNECTION_H + +#include +#include +#include + +#include "i_light_hdi_connection.h" +namespace OHOS { +namespace Sensors { +class CompatibleLightConnection : public ILightHdiConnection { +public: + CompatibleLightConnection() = default; + virtual ~CompatibleLightConnection() = default; + int32_t ConnectHdi() override; + int32_t GetLightList(std::vector& lightList) const override; + int32_t TurnOn(int32_t lightId, const LightColor &color, const LightAnimation &animation) override; + int32_t TurnOff(int32_t lightId) override; + int32_t DestroyHdiConnection() override; + +private: + std::vector turnOnLights_; + static std::atomic_bool isStop_; + DISALLOW_COPY_AND_MOVE(CompatibleLightConnection); +}; +} // namespace Sensors +} // namespace OHOS +#endif // COMPATIBLE_LIGHT_CONNECTION_H \ No newline at end of file diff --git a/services/miscdevice_service/hdi_connection/adpter/include/hdi_connection.h b/services/miscdevice_service/hdi_connection/adapter/include/hdi_connection.h similarity index 100% rename from services/miscdevice_service/hdi_connection/adpter/include/hdi_connection.h rename to services/miscdevice_service/hdi_connection/adapter/include/hdi_connection.h diff --git a/services/miscdevice_service/hdi_connection/adapter/include/hdi_light_connection.h b/services/miscdevice_service/hdi_connection/adapter/include/hdi_light_connection.h new file mode 100755 index 0000000..b67c338 --- /dev/null +++ b/services/miscdevice_service/hdi_connection/adapter/include/hdi_light_connection.h @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef HDI_LIGHT_CONNECTION_H +#define HDI_LIGHT_CONNECTION_H + +#include "death_recipient_template.h" +#include "i_light_hdi_connection.h" +#include "v1_0/light_interface_proxy.h" + +namespace OHOS { +namespace Sensors { +using OHOS::HDI::Light::V1_0::ILightInterface; +class HdiLightConnection : public ILightHdiConnection { +public: + HdiLightConnection() = default; + virtual ~HdiLightConnection() {}; + int32_t ConnectHdi() override; + int32_t GetLightList(std::vector& lightList) const override; + int32_t TurnOn(int32_t lightId, const LightColor &color, const LightAnimation &animation) override; + int32_t TurnOff(int32_t lightId) override; + int32_t DestroyHdiConnection() override; + void ProcessDeathObserver(const wptr &object); + +private: + DISALLOW_COPY_AND_MOVE(HdiLightConnection); + sptr hdiDeathObserver_; + sptr lightInterface_ = nullptr; + void RegisterHdiDeathRecipient(); + void UnregisterHdiDeathRecipient(); + void Reconnect(); +}; +} // namespace Sensors +} // namespace OHOS +#endif // HDI_LIGHT_CONNECTION_H \ No newline at end of file diff --git a/services/miscdevice_service/hdi_connection/adpter/src/compatible_connection.cpp b/services/miscdevice_service/hdi_connection/adapter/src/compatible_connection.cpp similarity index 100% rename from services/miscdevice_service/hdi_connection/adpter/src/compatible_connection.cpp rename to services/miscdevice_service/hdi_connection/adapter/src/compatible_connection.cpp diff --git a/services/miscdevice_service/hdi_connection/adapter/src/compatible_light_connection.cpp b/services/miscdevice_service/hdi_connection/adapter/src/compatible_light_connection.cpp new file mode 100755 index 0000000..871e5dd --- /dev/null +++ b/services/miscdevice_service/hdi_connection/adapter/src/compatible_light_connection.cpp @@ -0,0 +1,83 @@ +/* + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#include "compatible_light_connection.h" + +#include +#include +#include + +#include "sensors_errors.h" + +namespace OHOS { +namespace Sensors { +namespace { +constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MISC_LOG_DOMAIN, "CompatibleLightConnection" }; +} +std::vector lightInfo = { + {"light_test", 1, 3, 1} +}; +std::vector supportLights = { 1 }; + +int32_t CompatibleLightConnection::ConnectHdi() +{ + CALL_LOG_ENTER; + return ERR_OK; +} + +int32_t CompatibleLightConnection::GetLightList(std::vector& lightList) const +{ + CALL_LOG_ENTER; + lightList.assign(lightInfo.begin(), lightInfo.end()); + return ERR_OK; +} + +int32_t CompatibleLightConnection::TurnOn(int32_t lightId, const LightColor &color, const LightAnimation &animation) +{ + CALL_LOG_ENTER; + if (std::find(supportLights.begin(), supportLights.end(), lightId) == supportLights.end()) { + MISC_HILOGE("not support TurnOn lightId:%{public}d", lightId); + return LIGHT_ID_NOT_SUPPORT; + } + if (std::find(turnOnLights_.begin(), turnOnLights_.end(), lightId) != turnOnLights_.end()) { + MISC_HILOGI("lightId:%{public}d has been turnOn", lightId); + return ERR_OK; + } + turnOnLights_.push_back(lightId); + return ERR_OK; +} + +int32_t CompatibleLightConnection::TurnOff(int32_t lightId) +{ + CALL_LOG_ENTER; + if (std::find(supportLights.begin(), supportLights.end(), lightId) == supportLights.end()) { + MISC_HILOGE("not support TurnOff lightId:%{public}d", lightId); + return LIGHT_ID_NOT_SUPPORT; + } + if (std::find(turnOnLights_.begin(), turnOnLights_.end(), lightId) == turnOnLights_.end()) { + MISC_HILOGE("lightId:%{public}d should not be turn off", lightId); + return LIGHT_END_ERROR; + } + std::vector::iterator iter = std::find(turnOnLights_.begin(), turnOnLights_.end(), lightId); + turnOnLights_.erase(iter); + return ERR_OK; +} + +int32_t CompatibleLightConnection::DestroyHdiConnection() +{ + CALL_LOG_ENTER; + return ERR_OK; +} +} // namespace Sensors +} // namespace OHOS diff --git a/services/miscdevice_service/hdi_connection/adpter/src/hdi_connection.cpp b/services/miscdevice_service/hdi_connection/adapter/src/hdi_connection.cpp similarity index 90% rename from services/miscdevice_service/hdi_connection/adpter/src/hdi_connection.cpp rename to services/miscdevice_service/hdi_connection/adapter/src/hdi_connection.cpp index 13c24e1..da638c7 100644 --- a/services/miscdevice_service/hdi_connection/adpter/src/hdi_connection.cpp +++ b/services/miscdevice_service/hdi_connection/adapter/src/hdi_connection.cpp @@ -40,7 +40,7 @@ int32_t HdiConnection::ConnectHdi() MISC_HILOGW("connect hdi service failed, retry : %{public}d", retry); std::this_thread::sleep_for(std::chrono::milliseconds(WAIT_MS)); } - HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_HDF_SERVICE_EXCEPTION", + HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_HDF_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "PKG_NAME", "ConnectHdi", "ERROR_CODE", VIBRATOR_HDF_CONNECT_ERR); MISC_HILOGE("vibrator interface initialization failed"); return ERR_INVALID_VALUE; @@ -50,7 +50,7 @@ int32_t HdiConnection::StartOnce(uint32_t duration) { int32_t ret = vibratorInterface_->StartOnce(duration); if (ret < 0) { - HiSysEvent::Write(HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_HDF_SERVICE_EXCEPTION", + HiSysEventWrite(HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_HDF_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "PKG_NAME", "StartOnce", "ERROR_CODE", ret); MISC_HILOGE("StartOnce failed"); return ret; @@ -66,7 +66,7 @@ int32_t HdiConnection::Start(const std::string &effectType) } int32_t ret = vibratorInterface_->Start(effectType); if (ret < 0) { - HiSysEvent::Write(HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_HDF_SERVICE_EXCEPTION", + HiSysEventWrite(HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_HDF_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "PKG_NAME", "Start", "ERROR_CODE", ret); MISC_HILOGE("Start failed"); return ret; @@ -78,7 +78,7 @@ int32_t HdiConnection::Stop(VibratorStopMode mode) { int32_t ret = vibratorInterface_->Stop(static_cast(mode)); if (ret < 0) { - HiSysEvent::Write(HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_HDF_SERVICE_EXCEPTION", + HiSysEventWrite(HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_HDF_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "PKG_NAME", "Stop", "ERROR_CODE", ret); MISC_HILOGE("Stop failed"); return ret; @@ -133,7 +133,7 @@ void HdiConnection::Reconnect() { int32_t ret = ConnectHdi(); if (ret != ERR_OK) { - HiSysEvent::Write(HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_HDF_SERVICE_EXCEPTION", + HiSysEventWrite(HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_HDF_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "PKG_NAME", "Reconnect", "ERROR_CODE", ret); MISC_HILOGE("connect hdi fail"); } diff --git a/services/miscdevice_service/hdi_connection/adapter/src/hdi_light_connection.cpp b/services/miscdevice_service/hdi_connection/adapter/src/hdi_light_connection.cpp new file mode 100755 index 0000000..8fddf4e --- /dev/null +++ b/services/miscdevice_service/hdi_connection/adapter/src/hdi_light_connection.cpp @@ -0,0 +1,164 @@ +/* + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "hdi_light_connection.h" + +#include +#include +#include +#include + +#include "hisysevent.h" +#include "v1_0/light_interface_proxy.h" +#include "sensors_errors.h" + +namespace OHOS { +namespace Sensors { +namespace { +constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MISC_LOG_DOMAIN, "HdiLightConnection" }; +constexpr int32_t GET_HDI_SERVICE_COUNT = 10; +constexpr uint32_t WAIT_MS = 100; +} + +int32_t HdiLightConnection::ConnectHdi() +{ + CALL_LOG_ENTER; + int32_t retry = 0; + while (retry < GET_HDI_SERVICE_COUNT) { + lightInterface_ = ILightInterface::Get(); + if (lightInterface_ != nullptr) { + RegisterHdiDeathRecipient(); + return ERR_OK; + } + retry++; + MISC_HILOGW("connect hdi service failed, retry:%{public}d", retry); + std::this_thread::sleep_for(std::chrono::milliseconds(WAIT_MS)); + } + return ERR_INVALID_VALUE; +} + +int32_t HdiLightConnection::GetLightList(std::vector &lightList) const +{ + CALL_LOG_ENTER; + std::vector lightInfos; + CHKPR(lightInterface_, ERROR); + int32_t ret = lightInterface_->GetLightInfo(lightInfos); + if (ret != 0) { + MISC_HILOGE("get light info failed"); + return ret; + } + for (size_t i = 0; i < lightInfos.size(); ++i) { + LightInfo light; + light.lightId = lightInfos[i].lightId; + light.lightNumber = lightInfos[i].lightNumber; + auto ret = memcpy_s(light.lightName, NAME_MAX_LEN, lightInfos[i].lightName.c_str(), + lightInfos[i].lightName.length()); + if (ret != EOK) { + MISC_HILOGE("memcpy_s failed, error number: %{public}d", errno); + return ret; + } + light.lightType = lightInfos[i].lightType; + lightList.push_back(light); + } + return ERR_OK; +} + +int32_t HdiLightConnection::TurnOn(int32_t lightId, const LightColor &color, const LightAnimation &animation) +{ + CALL_LOG_ENTER; + HDI::Light::V1_0::HdfLightColor lightColor = { + .colorValue = color.singleColor + }; + HDI::Light::V1_0::HdfLightFlashEffect flashEffect = { + .flashMode = animation.mode, + .onTime = animation.onTime, + .offTime = animation.offTime + }; + HDI::Light::V1_0::HdfLightEffect effect = { + .lightColor = lightColor, + .flashEffect = flashEffect + }; + CHKPR(lightInterface_, ERROR); + int32_t ret = lightInterface_->TurnOnLight(lightId, effect); + if (ret < 0) { + MISC_HILOGE("TurnOn failed"); + return ret; + } + return ERR_OK; +} + +int32_t HdiLightConnection::TurnOff(int32_t lightId) +{ + CALL_LOG_ENTER; + CHKPR(lightInterface_, ERROR); + int32_t ret = lightInterface_->TurnOffLight(lightId); + if (ret < 0) { + MISC_HILOGE("TurnOff failed"); + return ret; + } + return ERR_OK; +} + +int32_t HdiLightConnection::DestroyHdiConnection() +{ + UnregisterHdiDeathRecipient(); + return ERR_OK; +} + +void HdiLightConnection::RegisterHdiDeathRecipient() +{ + CALL_LOG_ENTER; + if (lightInterface_ == nullptr) { + MISC_HILOGE("connect v1_0 hdi failed"); + return; + } + hdiDeathObserver_ = new (std::nothrow) DeathRecipientTemplate(*const_cast(this)); + if (hdiDeathObserver_ == nullptr) { + MISC_HILOGE("hdiDeathObserver_ is nullptr"); + return; + } + OHOS::HDI::hdi_objcast(lightInterface_)->AddDeathRecipient(hdiDeathObserver_); +} + +void HdiLightConnection::UnregisterHdiDeathRecipient() +{ + CALL_LOG_ENTER; + if (lightInterface_ == nullptr || hdiDeathObserver_ == nullptr) { + MISC_HILOGE("lightInterface_ or hdiDeathObserver_ is nullptr"); + return; + } + OHOS::HDI::hdi_objcast(lightInterface_)->RemoveDeathRecipient(hdiDeathObserver_); +} + +void HdiLightConnection::ProcessDeathObserver(const wptr &object) +{ + CALL_LOG_ENTER; + sptr hdiService = object.promote(); + if (hdiService == nullptr || hdiDeathObserver_ == nullptr) { + MISC_HILOGE("invalid remote object or hdiDeathObserver_ is null"); + return; + } + hdiService->RemoveDeathRecipient(hdiDeathObserver_); + Reconnect(); +} + +void HdiLightConnection::Reconnect() +{ + if (ConnectHdi() != ERR_OK) { + MISC_HILOGE("connect hdi failed"); + } +} +} // namespace Sensors +} // namespace OHOS diff --git a/services/miscdevice_service/hdi_connection/interface/include/i_light_hdi_connection.h b/services/miscdevice_service/hdi_connection/interface/include/i_light_hdi_connection.h new file mode 100755 index 0000000..4dd299f --- /dev/null +++ b/services/miscdevice_service/hdi_connection/interface/include/i_light_hdi_connection.h @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef I_LIGHT_HDI_CONNECTION_H +#define I_LIGHT_HDI_CONNECTION_H + +#include +#include +#include + +#include "light_agent_type.h" + +namespace OHOS { +namespace Sensors { +class ILightHdiConnection { +public: + ILightHdiConnection() = default; + virtual ~ILightHdiConnection() = default; + virtual int32_t ConnectHdi() = 0; + virtual int32_t GetLightList(std::vector& lightList) const = 0; + virtual int32_t TurnOn(int32_t lightId, const LightColor &color, const LightAnimation &animation) = 0; + virtual int32_t TurnOff(int32_t lightId) = 0; + virtual int32_t DestroyHdiConnection() = 0; + +private: + DISALLOW_COPY_AND_MOVE(ILightHdiConnection); +}; +} // namespace Sensors +} // namespace OHOS +#endif // I_LIGHT_HDI_CONNECTION_H diff --git a/services/miscdevice_service/hdi_connection/interface/include/light_hdi_connection.h b/services/miscdevice_service/hdi_connection/interface/include/light_hdi_connection.h new file mode 100755 index 0000000..e98223f --- /dev/null +++ b/services/miscdevice_service/hdi_connection/interface/include/light_hdi_connection.h @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef LIGHT_HDI_CONNECTION_H +#define LIGHT_HDI_CONNECTION_H + +#include + +#include "i_light_hdi_connection.h" +#include "singleton.h" + +namespace OHOS { +namespace Sensors { +class LightHdiConnection : public ILightHdiConnection, public Singleton { +public: + LightHdiConnection() = default; + virtual ~LightHdiConnection() {} + int32_t ConnectHdi() override; + int32_t GetLightList(std::vector &lightList) const override; + int32_t TurnOn(int32_t lightId, const LightColor &color, const LightAnimation &animation) override; + int32_t TurnOff(int32_t lightId) override; + int32_t DestroyHdiConnection() override; +private: + DISALLOW_COPY_AND_MOVE(LightHdiConnection); + std::unique_ptr iLightHdiConnection_; + std::vector lightInfoList_; +}; +} // namespace Sensors +} // namespace OHOS +#endif // LIGHT_HDI_CONNECTION_H diff --git a/services/miscdevice_service/hdi_connection/interface/src/light_hdi_connection.cpp b/services/miscdevice_service/hdi_connection/interface/src/light_hdi_connection.cpp new file mode 100755 index 0000000..86a7e19 --- /dev/null +++ b/services/miscdevice_service/hdi_connection/interface/src/light_hdi_connection.cpp @@ -0,0 +1,93 @@ +/* + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#include "light_hdi_connection.h" + +#include + +#include "compatible_light_connection.h" +#include "hdi_light_connection.h" +#include "hitrace_meter.h" +#include "sensors_errors.h" + +namespace OHOS { +namespace Sensors { +using namespace OHOS::HiviewDFX; + +namespace { +constexpr HiLogLabel LABEL = { LOG_CORE, MISC_LOG_DOMAIN, "LightHdiConnection" }; +} + +int32_t LightHdiConnection::ConnectHdi() +{ + iLightHdiConnection_ = std::make_unique(); + int32_t ret = iLightHdiConnection_->ConnectHdi(); + if (ret != 0) { + MISC_HILOGE("hdi direct failed"); + iLightHdiConnection_ = std::make_unique(); + CHKPR(iLightHdiConnection_, ERROR); + ret = iLightHdiConnection_->ConnectHdi(); + } + if (ret != 0) { + MISC_HILOGE("hdi connection failed"); + return LIGHT_HDF_CONNECT_ERR; + } + ret = iLightHdiConnection_->GetLightList(lightInfoList_); + if (ret != 0) { + MISC_HILOGE("GetLightList failed"); + return LIGHT_ERR; + } + return ERR_OK; +} + +int32_t LightHdiConnection::GetLightList(std::vector& lightList) const +{ + lightList.assign(lightInfoList_.begin(), lightInfoList_.end()); + return ERR_OK; +} + +int32_t LightHdiConnection::TurnOn(int32_t lightId, const LightColor &color, const LightAnimation &animation) +{ + CHKPR(iLightHdiConnection_, ERROR); + int32_t ret = iLightHdiConnection_->TurnOn(lightId, color, animation); + if (ret != 0) { + MISC_HILOGE("TurnOn failed"); + return LIGHT_ID_NOT_SUPPORT; + } + return ERR_OK; +} + +int32_t LightHdiConnection::TurnOff(int32_t lightId) +{ + CHKPR(iLightHdiConnection_, ERROR); + int32_t ret = iLightHdiConnection_->TurnOff(lightId); + if (ret != 0) { + MISC_HILOGE("TurnOff failed"); + return LIGHT_ERR; + } + return ERR_OK; +} + +int32_t LightHdiConnection::DestroyHdiConnection() +{ + CHKPR(iLightHdiConnection_, ERROR); + int32_t ret = iLightHdiConnection_->DestroyHdiConnection(); + if (ret != 0) { + MISC_HILOGE("DestroyHdiConnection failed"); + return LIGHT_HDF_CONNECT_ERR; + } + return ERR_OK; +} +} // namespace Sensors +} // namespace OHOS diff --git a/services/miscdevice_service/include/miscdevice_service.h b/services/miscdevice_service/include/miscdevice_service.h index fc0f3b2..716914b 100644 --- a/services/miscdevice_service/include/miscdevice_service.h +++ b/services/miscdevice_service/include/miscdevice_service.h @@ -27,6 +27,7 @@ #include "system_ability.h" #include "thread_ex.h" +#include "light_hdi_connection.h" #include "miscdevice_common.h" #include "miscdevice_dump.h" #include "miscdevice_service_stub.h" @@ -50,23 +51,32 @@ public: void OnDump() override; void OnStart() override; void OnStop() override; + bool IsValid(int32_t lightId); + bool IsLightAnimationValid(const LightAnimation &animation); int32_t Dump(int32_t fd, const std::vector &args) override; virtual int32_t Vibrate(int32_t vibratorId, int32_t timeOut, int32_t usage) override; virtual int32_t CancelVibrator(int32_t vibratorId) override; virtual int32_t PlayVibratorEffect(int32_t vibratorId, const std::string &effect, int32_t loopCount, int32_t usage) override; virtual int32_t StopVibratorEffect(int32_t vibratorId, const std::string &effect) override; + virtual std::vector GetLightList() override; + virtual int32_t TurnOn(int32_t lightId, const LightColor &color, const LightAnimation &animation) override; + virtual int32_t TurnOff(int32_t lightId) override; private: DISALLOW_COPY_AND_MOVE(MiscdeviceService); bool InitInterface(); + bool InitLightInterface(); std::string GetPackageName(AccessTokenID tokenId); void StartVibrateThread(VibrateInfo info); bool ShouldIgnoreVibrate(const VibrateInfo &info); + bool InitLightList(); VibratorHdiConnection &vibratorHdiConnection_ = VibratorHdiConnection::GetInstance(); + LightHdiConnection &lightHdiConnection_ = LightHdiConnection::GetInstance(); bool lightExist_; bool vibratorExist_; - std::map miscDdeviceIdMap_; + std::vector lightInfos_; + std::map miscDeviceIdMap_; MiscdeviceServiceState state_; std::shared_ptr vibratorThread_; std::mutex vibratorThreadMutex_; diff --git a/services/miscdevice_service/include/miscdevice_service_stub.h b/services/miscdevice_service/include/miscdevice_service_stub.h index 22dd5df..f768850 100755 --- a/services/miscdevice_service/include/miscdevice_service_stub.h +++ b/services/miscdevice_service/include/miscdevice_service_stub.h @@ -51,12 +51,9 @@ private: int32_t StopVibratorEffectPb(MessageParcel &data, MessageParcel &reply); int32_t SetVibratorParameterPb(MessageParcel &data, MessageParcel &reply); int32_t GetVibratorParameterPb(MessageParcel &data, MessageParcel &reply); - int32_t GetLightSupportIdPb(MessageParcel &data, MessageParcel &reply); - int32_t IsLightEffectSupportPb(MessageParcel &data, MessageParcel &reply); - int32_t LightPb(MessageParcel &data, MessageParcel &reply); - int32_t PlayLightEffectPb(MessageParcel &data, MessageParcel &reply); - int32_t StopLightEffectPb(MessageParcel &data, MessageParcel &reply); - + int32_t GetLightListPb(MessageParcel &data, MessageParcel &reply); + int32_t TurnOnPb(MessageParcel &data, MessageParcel &reply); + int32_t TurnOffPb(MessageParcel &data, MessageParcel &reply); bool CheckVibratePermission(); std::map baseFuncs_; diff --git a/services/miscdevice_service/src/miscdevice_service.cpp b/services/miscdevice_service/src/miscdevice_service.cpp index aaaea72..553f23f 100644 --- a/services/miscdevice_service/src/miscdevice_service.cpp +++ b/services/miscdevice_service/src/miscdevice_service.cpp @@ -20,6 +20,7 @@ #include "sensors_errors.h" #include "system_ability_definition.h" #include "vibration_priority_manager.h" +#include "v1_0/light_interface_proxy.h" namespace OHOS { namespace Sensors { @@ -66,18 +67,22 @@ void MiscdeviceService::OnStart() MISC_HILOGE("Init interface error"); return; } + if (!InitLightInterface()) { + MISC_HILOGE("InitLightInterface failed"); + return; + } if (!SystemAbility::Publish(this)) { MISC_HILOGE("publish MiscdeviceService failed"); return; } - auto ret = miscDdeviceIdMap_.insert(std::make_pair(MiscdeviceDeviceId::LED, lightExist_)); + auto ret = miscDeviceIdMap_.insert(std::make_pair(MiscdeviceDeviceId::LED, lightExist_)); if (!ret.second) { - MISC_HILOGI("light exist in miscDdeviceIdMap_"); + MISC_HILOGI("light exist in miscDeviceIdMap_"); ret.first->second = lightExist_; } - ret = miscDdeviceIdMap_.insert(std::make_pair(MiscdeviceDeviceId::VIBRATOR, vibratorExist_)); + ret = miscDeviceIdMap_.insert(std::make_pair(MiscdeviceDeviceId::VIBRATOR, vibratorExist_)); if (!ret.second) { - MISC_HILOGI("vibrator exist in miscDdeviceIdMap_"); + MISC_HILOGI("vibrator exist in miscDeviceIdMap_"); ret.first->second = vibratorExist_; } state_ = MiscdeviceServiceState::STATE_RUNNING; @@ -93,6 +98,41 @@ bool MiscdeviceService::InitInterface() return true; } +bool MiscdeviceService::InitLightInterface() +{ + auto ret = lightHdiConnection_.ConnectHdi(); + if (ret != ERR_OK) { + MISC_HILOGE("ConnectHdi failed"); + return false; + } + return true; +} + +bool MiscdeviceService::IsValid(int32_t lightId) +{ + CALL_LOG_ENTER; + for (const auto &item : lightInfos_) { + if (lightId == item.lightId) { + return true; + } + } + return false; +} + +bool MiscdeviceService::IsLightAnimationValid(const LightAnimation &animation) +{ + if ((animation.mode < 0) || (animation.mode >= LIGHT_MODE_BUTT)) { + MISC_HILOGE("animation mode is invalid, mode:%{pubilc}d", animation.mode); + return false; + } + if ((animation.onTime < 0) || (animation.offTime < 0)) { + MISC_HILOGE("animation onTime or offTime is invalid, onTime:%{pubilc}d, offTime:%{pubilc}d", + animation.onTime, animation.offTime); + return false; + } + return true; +} + void MiscdeviceService::OnStop() { CALL_LOG_ENTER; @@ -242,6 +282,59 @@ std::string MiscdeviceService::GetPackageName(AccessTokenID tokenId) return packageName; } +std::vector MiscdeviceService::GetLightList() +{ + if (!InitLightList()) { + MISC_HILOGE("InitLightList init failed"); + return lightInfos_; + } + return lightInfos_; +} + +bool MiscdeviceService::InitLightList() +{ + int32_t ret = lightHdiConnection_.GetLightList(lightInfos_); + if (ret != ERR_OK) { + MISC_HILOGE("InitLightList failed, ret:%{public}d", ret); + return false; + } + return true; +} + +int32_t MiscdeviceService::TurnOn(int32_t lightId, const LightColor &color, const LightAnimation &animation) +{ + CALL_LOG_ENTER; + if (!IsValid(lightId)) { + MISC_HILOGE("lightId is invalid, lightId:%{pubilc}d", lightId); + return MISCDEVICE_NATIVE_SAM_ERR; + } + if (!IsLightAnimationValid(animation)) { + MISC_HILOGE("animation is invalid"); + return MISCDEVICE_NATIVE_SAM_ERR; + } + int32_t ret = lightHdiConnection_.TurnOn(lightId, color, animation); + if (ret != ERR_OK) { + MISC_HILOGE("TurnOn failed, error:%{public}d", ret); + return ERROR; + } + return ret; +} + +int32_t MiscdeviceService::TurnOff(int32_t lightId) +{ + CALL_LOG_ENTER; + if (!IsValid(lightId)) { + MISC_HILOGE("lightId is invalid, lightId:%{pubilc}d", lightId); + return MISCDEVICE_NATIVE_SAM_ERR; + } + int32_t ret = lightHdiConnection_.TurnOff(lightId); + if (ret != ERR_OK) { + MISC_HILOGE("TurnOff failed, error:%{public}d", ret); + return ERROR; + } + return ret; +} + int32_t MiscdeviceService::Dump(int32_t fd, const std::vector &args) { CALL_LOG_ENTER; diff --git a/services/miscdevice_service/src/miscdevice_service_stub.cpp b/services/miscdevice_service/src/miscdevice_service_stub.cpp index 25f3f1a..c122e3d 100644 --- a/services/miscdevice_service/src/miscdevice_service_stub.cpp +++ b/services/miscdevice_service/src/miscdevice_service_stub.cpp @@ -21,6 +21,7 @@ #include "hisysevent.h" #include "ipc_skeleton.h" #include "message_parcel.h" +#include "securec.h" #include "permission_util.h" #include "sensors_errors.h" @@ -41,6 +42,9 @@ MiscdeviceServiceStub::MiscdeviceServiceStub() baseFuncs_[CANCEL_VIBRATOR] = &MiscdeviceServiceStub::CancelVibratorPb; baseFuncs_[PLAY_VIBRATOR_EFFECT] = &MiscdeviceServiceStub::PlayVibratorEffectPb; baseFuncs_[STOP_VIBRATOR_EFFECT] = &MiscdeviceServiceStub::StopVibratorEffectPb; + baseFuncs_[GET_LIGHT_LIST] = &MiscdeviceServiceStub::GetLightListPb; + baseFuncs_[TURN_ON] = &MiscdeviceServiceStub::TurnOnPb; + baseFuncs_[TURN_OFF] = &MiscdeviceServiceStub::TurnOffPb; } MiscdeviceServiceStub::~MiscdeviceServiceStub() @@ -54,7 +58,7 @@ int32_t MiscdeviceServiceStub::VibratePb(MessageParcel &data, MessageParcel &rep PermissionUtil &permissionUtil = PermissionUtil::GetInstance(); int32_t ret = permissionUtil.CheckVibratePermission(this->GetCallingTokenID(), VIBRATE_PERMISSION); if (ret != PERMISSION_GRANTED) { - HiSysEvent::Write(HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_PERMISSIONS_EXCEPTION", + HiSysEventWrite(HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_PERMISSIONS_EXCEPTION", HiSysEvent::EventType::SECURITY, "PKG_NAME", "VibratePb", "ERROR_CODE", ret); MISC_HILOGE("result: %{public}d", ret); return PERMISSION_DENIED; @@ -74,7 +78,7 @@ int32_t MiscdeviceServiceStub::CancelVibratorPb(MessageParcel &data, MessageParc PermissionUtil &permissionUtil = PermissionUtil::GetInstance(); int32_t ret = permissionUtil.CheckVibratePermission(this->GetCallingTokenID(), VIBRATE_PERMISSION); if (ret != PERMISSION_GRANTED) { - HiSysEvent::Write(HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_PERMISSIONS_EXCEPTION", + HiSysEventWrite(HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_PERMISSIONS_EXCEPTION", HiSysEvent::EventType::SECURITY, "PKG_NAME", "CancelVibratorPb", "ERROR_CODE", ret); MISC_HILOGE("result: %{public}d", ret); return PERMISSION_DENIED; @@ -88,7 +92,7 @@ int32_t MiscdeviceServiceStub::PlayVibratorEffectPb(MessageParcel &data, Message PermissionUtil &permissionUtil = PermissionUtil::GetInstance(); int32_t ret = permissionUtil.CheckVibratePermission(this->GetCallingTokenID(), VIBRATE_PERMISSION); if (ret != PERMISSION_GRANTED) { - HiSysEvent::Write(HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_PERMISSIONS_EXCEPTION", + HiSysEventWrite(HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_PERMISSIONS_EXCEPTION", HiSysEvent::EventType::SECURITY, "PKG_NAME", "PlayVibratorEffectPb", "ERROR_CODE", ret); MISC_HILOGE("result: %{public}d", ret); return PERMISSION_DENIED; @@ -110,7 +114,7 @@ int32_t MiscdeviceServiceStub::StopVibratorEffectPb(MessageParcel &data, Message PermissionUtil &permissionUtil = PermissionUtil::GetInstance(); int32_t ret = permissionUtil.CheckVibratePermission(this->GetCallingTokenID(), VIBRATE_PERMISSION); if (ret != PERMISSION_GRANTED) { - HiSysEvent::Write(HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_PERMISSIONS_EXCEPTION", + HiSysEventWrite(HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_PERMISSIONS_EXCEPTION", HiSysEvent::EventType::SECURITY, "PKG_NAME", "StopVibratorEffectPb", "ERROR_CODE", ret); MISC_HILOGE("result: %{public}d", ret); return PERMISSION_DENIED; @@ -120,6 +124,52 @@ int32_t MiscdeviceServiceStub::StopVibratorEffectPb(MessageParcel &data, Message return StopVibratorEffect(vibratorId, effectType); } +int32_t MiscdeviceServiceStub::GetLightListPb(MessageParcel &data, MessageParcel &reply) +{ + (void)data; + std::vector lightInfos(GetLightList()); + size_t lightCount = lightInfos.size(); + MISC_HILOGE("lightCount:%{public}zu", lightCount); + if (!reply.WriteUint32(lightCount)) { + MISC_HILOGE("Parcel write failed"); + return WRITE_MSG_ERR; + } + for (size_t i = 0; i < lightCount; ++i) { + if (!reply.WriteBuffer(&lightInfos[i], sizeof(LightInfo))) { + MISC_HILOGE("WriteBuffer failed"); + return WRITE_MSG_ERR; + } + } + return NO_ERROR; +} + +int32_t MiscdeviceServiceStub::TurnOnPb(MessageParcel &data, MessageParcel &reply) +{ + int32_t lightId = data.ReadInt32(); + const unsigned char *info = data.ReadBuffer(sizeof(LightColor)); + CHKPR(info, ERROR); + LightColor lightColor; + if (memcpy_s(&lightColor, sizeof(LightColor), info, sizeof(LightColor)) != EOK) { + MISC_HILOGE("memcpy_s lightColor failed"); + return ERROR; + } + + const unsigned char *buf = data.ReadBuffer(sizeof(LightAnimation)); + CHKPR(buf, ERROR); + LightAnimation lightAnimation; + if (memcpy_s(&lightAnimation, sizeof(LightAnimation), buf, sizeof(LightAnimation)) != EOK) { + MISC_HILOGE("memcpy_s lightAnimation failed"); + return ERROR; + } + return TurnOn(lightId, lightColor, lightAnimation); +} + +int32_t MiscdeviceServiceStub::TurnOffPb(MessageParcel &data, MessageParcel &reply) +{ + int32_t lightId = data.ReadInt32(); + return TurnOff(lightId); +} + int32_t MiscdeviceServiceStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { diff --git a/utils/include/miscdevice_common.h b/utils/include/miscdevice_common.h index 9932d56..ad74227 100755 --- a/utils/include/miscdevice_common.h +++ b/utils/include/miscdevice_common.h @@ -21,7 +21,7 @@ namespace OHOS { namespace Sensors { -// These LightId correspand to logical lights +// These LightId correspond to logical lights enum LightId { LIGHT_ID_LED = 0, LIGHT_ID_KEYBOARD, -- Gitee From 726b5fd48793e8139becc5e6f659382bfccc1bd1 Mon Sep 17 00:00:00 2001 From: hui1975 Date: Thu, 15 Dec 2022 19:53:08 +0800 Subject: [PATCH 04/11] add light Signed-off-by: hui1975 Change-Id: I52e7737e2a4cc2fe15cc506daca00ae67b290421 --- .../native/miscdevice/src/miscdevice_service_proxy.cpp | 8 ++++---- .../native/miscdevice/src/vibrator_service_client.cpp | 2 +- services/miscdevice_service/BUILD.gn | 10 +++++----- .../include/compatible_connection.h | 0 .../include/compatible_light_connection.h | 0 .../{adapter => adpter}/include/hdi_connection.h | 0 .../{adapter => adpter}/include/hdi_light_connection.h | 0 .../{adapter => adpter}/src/compatible_connection.cpp | 0 .../src/compatible_light_connection.cpp | 0 .../{adapter => adpter}/src/hdi_connection.cpp | 10 +++++----- .../{adapter => adpter}/src/hdi_light_connection.cpp | 0 .../miscdevice_service/include/miscdevice_service.h | 2 +- services/miscdevice_service/src/miscdevice_service.cpp | 8 ++++---- .../miscdevice_service/src/miscdevice_service_stub.cpp | 8 ++++---- utils/include/miscdevice_common.h | 2 +- 15 files changed, 25 insertions(+), 25 deletions(-) rename services/miscdevice_service/hdi_connection/{adapter => adpter}/include/compatible_connection.h (100%) rename services/miscdevice_service/hdi_connection/{adapter => adpter}/include/compatible_light_connection.h (100%) rename services/miscdevice_service/hdi_connection/{adapter => adpter}/include/hdi_connection.h (100%) rename services/miscdevice_service/hdi_connection/{adapter => adpter}/include/hdi_light_connection.h (100%) rename services/miscdevice_service/hdi_connection/{adapter => adpter}/src/compatible_connection.cpp (100%) rename services/miscdevice_service/hdi_connection/{adapter => adpter}/src/compatible_light_connection.cpp (100%) rename services/miscdevice_service/hdi_connection/{adapter => adpter}/src/hdi_connection.cpp (90%) rename services/miscdevice_service/hdi_connection/{adapter => adpter}/src/hdi_light_connection.cpp (100%) diff --git a/frameworks/native/miscdevice/src/miscdevice_service_proxy.cpp b/frameworks/native/miscdevice/src/miscdevice_service_proxy.cpp index 7d5077b..3090953 100644 --- a/frameworks/native/miscdevice/src/miscdevice_service_proxy.cpp +++ b/frameworks/native/miscdevice/src/miscdevice_service_proxy.cpp @@ -56,7 +56,7 @@ int32_t MiscdeviceServiceProxy::Vibrate(int32_t vibratorId, int32_t timeOut, int CHKPR(remote, ERROR); int32_t ret = remote->SendRequest(VIBRATE, data, reply, option); if (ret != NO_ERROR) { - HiSysEventWrite(HiSysEvent::Domain::MISCDEVICE, "MISC_SERVICE_IPC_EXCEPTION", + HiSysEvent::Write(HiSysEvent::Domain::MISCDEVICE, "MISC_SERVICE_IPC_EXCEPTION", HiSysEvent::EventType::FAULT, "PKG_NAME", "Vibrate", "ERROR_CODE", ret); MISC_HILOGE("sendRequest ret : %{public}d", ret); } @@ -80,7 +80,7 @@ int32_t MiscdeviceServiceProxy::CancelVibrator(int32_t vibratorId) CHKPR(remote, ERROR); int32_t ret = remote->SendRequest(CANCEL_VIBRATOR, data, reply, option); if (ret != NO_ERROR) { - HiSysEventWrite(HiSysEvent::Domain::MISCDEVICE, "MISC_SERVICE_IPC_EXCEPTION", + HiSysEvent::Write(HiSysEvent::Domain::MISCDEVICE, "MISC_SERVICE_IPC_EXCEPTION", HiSysEvent::EventType::FAULT, "PKG_NAME", "CancelVibrator", "ERROR_CODE", ret); MISC_HILOGE("ret : %{public}d", ret); } @@ -117,7 +117,7 @@ int32_t MiscdeviceServiceProxy::PlayVibratorEffect(int32_t vibratorId, const std CHKPR(remote, ERROR); int32_t ret = remote->SendRequest(PLAY_VIBRATOR_EFFECT, data, reply, option); if (ret != NO_ERROR) { - HiSysEventWrite(HiSysEvent::Domain::MISCDEVICE, "MISC_SERVICE_IPC_EXCEPTION", + HiSysEvent::Write(HiSysEvent::Domain::MISCDEVICE, "MISC_SERVICE_IPC_EXCEPTION", HiSysEvent::EventType::FAULT, "PKG_NAME", "PlayVibratorEffect", "ERROR_CODE", ret); MISC_HILOGE("ret : %{public}d", ret); } @@ -145,7 +145,7 @@ int32_t MiscdeviceServiceProxy::StopVibratorEffect(int32_t vibratorId, const std CHKPR(remote, ERROR); int32_t ret = remote->SendRequest(STOP_VIBRATOR_EFFECT, data, reply, option); if (ret != NO_ERROR) { - HiSysEventWrite(HiSysEvent::Domain::MISCDEVICE, "MISC_SERVICE_IPC_EXCEPTION", + HiSysEvent::Write(HiSysEvent::Domain::MISCDEVICE, "MISC_SERVICE_IPC_EXCEPTION", HiSysEvent::EventType::FAULT, "PKG_NAME", "StopVibratorEffect", "ERROR_CODE", ret); MISC_HILOGE("ret : %{public}d", ret); } diff --git a/frameworks/native/miscdevice/src/vibrator_service_client.cpp b/frameworks/native/miscdevice/src/vibrator_service_client.cpp index bf63e63..d99eda8 100644 --- a/frameworks/native/miscdevice/src/vibrator_service_client.cpp +++ b/frameworks/native/miscdevice/src/vibrator_service_client.cpp @@ -62,7 +62,7 @@ int32_t VibratorServiceClient::InitServiceClient() std::this_thread::sleep_for(std::chrono::milliseconds(WAIT_MS)); retry++; } - HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::MISCDEVICE, "MISC_SERVICE_EXCEPTION", + HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::MISCDEVICE, "MISC_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "PKG_NAME", "InitServiceClient", "ERROR_CODE", MISC_NATIVE_GET_SERVICE_ERR); MISC_HILOGE("get service failed"); return MISC_NATIVE_GET_SERVICE_ERR; diff --git a/services/miscdevice_service/BUILD.gn b/services/miscdevice_service/BUILD.gn index cc87ec7..fd80002 100644 --- a/services/miscdevice_service/BUILD.gn +++ b/services/miscdevice_service/BUILD.gn @@ -16,10 +16,10 @@ import("//build/ohos.gni") SUBSYSTEM_DIR = "//base/sensors" ohos_shared_library("libmiscdevice_service") { sources = [ - "hdi_connection/adapter/src/compatible_connection.cpp", - "hdi_connection/adapter/src/compatible_light_connection.cpp", - "hdi_connection/adapter/src/hdi_connection.cpp", - "hdi_connection/adapter/src/hdi_light_connection.cpp", + "hdi_connection/adpter/src/compatible_connection.cpp", + "hdi_connection/adpter/src/compatible_light_connection.cpp", + "hdi_connection/adpter/src/hdi_connection.cpp", + "hdi_connection/adpter/src/hdi_light_connection.cpp", "hdi_connection/interface/src/light_hdi_connection.cpp", "hdi_connection/interface/src/vibrator_hdi_connection.cpp", "src/miscdevice_dump.cpp", @@ -36,7 +36,7 @@ ohos_shared_library("libmiscdevice_service") { "$SUBSYSTEM_DIR/miscdevice/frameworks/native/miscdevice/include", "$SUBSYSTEM_DIR/miscdevice/interfaces/native/light/include", "$SUBSYSTEM_DIR/miscdevice/utils/include", - "hdi_connection/adapter/include", + "hdi_connection/adpter/include", "hdi_connection/interface/include", "//third_party/cJSON", ] diff --git a/services/miscdevice_service/hdi_connection/adapter/include/compatible_connection.h b/services/miscdevice_service/hdi_connection/adpter/include/compatible_connection.h similarity index 100% rename from services/miscdevice_service/hdi_connection/adapter/include/compatible_connection.h rename to services/miscdevice_service/hdi_connection/adpter/include/compatible_connection.h diff --git a/services/miscdevice_service/hdi_connection/adapter/include/compatible_light_connection.h b/services/miscdevice_service/hdi_connection/adpter/include/compatible_light_connection.h similarity index 100% rename from services/miscdevice_service/hdi_connection/adapter/include/compatible_light_connection.h rename to services/miscdevice_service/hdi_connection/adpter/include/compatible_light_connection.h diff --git a/services/miscdevice_service/hdi_connection/adapter/include/hdi_connection.h b/services/miscdevice_service/hdi_connection/adpter/include/hdi_connection.h similarity index 100% rename from services/miscdevice_service/hdi_connection/adapter/include/hdi_connection.h rename to services/miscdevice_service/hdi_connection/adpter/include/hdi_connection.h diff --git a/services/miscdevice_service/hdi_connection/adapter/include/hdi_light_connection.h b/services/miscdevice_service/hdi_connection/adpter/include/hdi_light_connection.h similarity index 100% rename from services/miscdevice_service/hdi_connection/adapter/include/hdi_light_connection.h rename to services/miscdevice_service/hdi_connection/adpter/include/hdi_light_connection.h diff --git a/services/miscdevice_service/hdi_connection/adapter/src/compatible_connection.cpp b/services/miscdevice_service/hdi_connection/adpter/src/compatible_connection.cpp similarity index 100% rename from services/miscdevice_service/hdi_connection/adapter/src/compatible_connection.cpp rename to services/miscdevice_service/hdi_connection/adpter/src/compatible_connection.cpp diff --git a/services/miscdevice_service/hdi_connection/adapter/src/compatible_light_connection.cpp b/services/miscdevice_service/hdi_connection/adpter/src/compatible_light_connection.cpp similarity index 100% rename from services/miscdevice_service/hdi_connection/adapter/src/compatible_light_connection.cpp rename to services/miscdevice_service/hdi_connection/adpter/src/compatible_light_connection.cpp diff --git a/services/miscdevice_service/hdi_connection/adapter/src/hdi_connection.cpp b/services/miscdevice_service/hdi_connection/adpter/src/hdi_connection.cpp similarity index 90% rename from services/miscdevice_service/hdi_connection/adapter/src/hdi_connection.cpp rename to services/miscdevice_service/hdi_connection/adpter/src/hdi_connection.cpp index da638c7..13c24e1 100644 --- a/services/miscdevice_service/hdi_connection/adapter/src/hdi_connection.cpp +++ b/services/miscdevice_service/hdi_connection/adpter/src/hdi_connection.cpp @@ -40,7 +40,7 @@ int32_t HdiConnection::ConnectHdi() MISC_HILOGW("connect hdi service failed, retry : %{public}d", retry); std::this_thread::sleep_for(std::chrono::milliseconds(WAIT_MS)); } - HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_HDF_SERVICE_EXCEPTION", + HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_HDF_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "PKG_NAME", "ConnectHdi", "ERROR_CODE", VIBRATOR_HDF_CONNECT_ERR); MISC_HILOGE("vibrator interface initialization failed"); return ERR_INVALID_VALUE; @@ -50,7 +50,7 @@ int32_t HdiConnection::StartOnce(uint32_t duration) { int32_t ret = vibratorInterface_->StartOnce(duration); if (ret < 0) { - HiSysEventWrite(HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_HDF_SERVICE_EXCEPTION", + HiSysEvent::Write(HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_HDF_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "PKG_NAME", "StartOnce", "ERROR_CODE", ret); MISC_HILOGE("StartOnce failed"); return ret; @@ -66,7 +66,7 @@ int32_t HdiConnection::Start(const std::string &effectType) } int32_t ret = vibratorInterface_->Start(effectType); if (ret < 0) { - HiSysEventWrite(HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_HDF_SERVICE_EXCEPTION", + HiSysEvent::Write(HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_HDF_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "PKG_NAME", "Start", "ERROR_CODE", ret); MISC_HILOGE("Start failed"); return ret; @@ -78,7 +78,7 @@ int32_t HdiConnection::Stop(VibratorStopMode mode) { int32_t ret = vibratorInterface_->Stop(static_cast(mode)); if (ret < 0) { - HiSysEventWrite(HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_HDF_SERVICE_EXCEPTION", + HiSysEvent::Write(HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_HDF_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "PKG_NAME", "Stop", "ERROR_CODE", ret); MISC_HILOGE("Stop failed"); return ret; @@ -133,7 +133,7 @@ void HdiConnection::Reconnect() { int32_t ret = ConnectHdi(); if (ret != ERR_OK) { - HiSysEventWrite(HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_HDF_SERVICE_EXCEPTION", + HiSysEvent::Write(HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_HDF_SERVICE_EXCEPTION", HiSysEvent::EventType::FAULT, "PKG_NAME", "Reconnect", "ERROR_CODE", ret); MISC_HILOGE("connect hdi fail"); } diff --git a/services/miscdevice_service/hdi_connection/adapter/src/hdi_light_connection.cpp b/services/miscdevice_service/hdi_connection/adpter/src/hdi_light_connection.cpp similarity index 100% rename from services/miscdevice_service/hdi_connection/adapter/src/hdi_light_connection.cpp rename to services/miscdevice_service/hdi_connection/adpter/src/hdi_light_connection.cpp diff --git a/services/miscdevice_service/include/miscdevice_service.h b/services/miscdevice_service/include/miscdevice_service.h index 716914b..dc8a446 100644 --- a/services/miscdevice_service/include/miscdevice_service.h +++ b/services/miscdevice_service/include/miscdevice_service.h @@ -76,7 +76,7 @@ private: bool lightExist_; bool vibratorExist_; std::vector lightInfos_; - std::map miscDeviceIdMap_; + std::map miscDdeviceIdMap_; MiscdeviceServiceState state_; std::shared_ptr vibratorThread_; std::mutex vibratorThreadMutex_; diff --git a/services/miscdevice_service/src/miscdevice_service.cpp b/services/miscdevice_service/src/miscdevice_service.cpp index 553f23f..d011a8f 100644 --- a/services/miscdevice_service/src/miscdevice_service.cpp +++ b/services/miscdevice_service/src/miscdevice_service.cpp @@ -75,14 +75,14 @@ void MiscdeviceService::OnStart() MISC_HILOGE("publish MiscdeviceService failed"); return; } - auto ret = miscDeviceIdMap_.insert(std::make_pair(MiscdeviceDeviceId::LED, lightExist_)); + auto ret = miscDdeviceIdMap_.insert(std::make_pair(MiscdeviceDeviceId::LED, lightExist_)); if (!ret.second) { - MISC_HILOGI("light exist in miscDeviceIdMap_"); + MISC_HILOGI("light exist in miscDdeviceIdMap_"); ret.first->second = lightExist_; } - ret = miscDeviceIdMap_.insert(std::make_pair(MiscdeviceDeviceId::VIBRATOR, vibratorExist_)); + ret = miscDdeviceIdMap_.insert(std::make_pair(MiscdeviceDeviceId::VIBRATOR, vibratorExist_)); if (!ret.second) { - MISC_HILOGI("vibrator exist in miscDeviceIdMap_"); + MISC_HILOGI("vibrator exist in miscDdeviceIdMap_"); ret.first->second = vibratorExist_; } state_ = MiscdeviceServiceState::STATE_RUNNING; diff --git a/services/miscdevice_service/src/miscdevice_service_stub.cpp b/services/miscdevice_service/src/miscdevice_service_stub.cpp index c122e3d..78bb820 100644 --- a/services/miscdevice_service/src/miscdevice_service_stub.cpp +++ b/services/miscdevice_service/src/miscdevice_service_stub.cpp @@ -58,7 +58,7 @@ int32_t MiscdeviceServiceStub::VibratePb(MessageParcel &data, MessageParcel &rep PermissionUtil &permissionUtil = PermissionUtil::GetInstance(); int32_t ret = permissionUtil.CheckVibratePermission(this->GetCallingTokenID(), VIBRATE_PERMISSION); if (ret != PERMISSION_GRANTED) { - HiSysEventWrite(HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_PERMISSIONS_EXCEPTION", + HiSysEvent::Write(HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_PERMISSIONS_EXCEPTION", HiSysEvent::EventType::SECURITY, "PKG_NAME", "VibratePb", "ERROR_CODE", ret); MISC_HILOGE("result: %{public}d", ret); return PERMISSION_DENIED; @@ -78,7 +78,7 @@ int32_t MiscdeviceServiceStub::CancelVibratorPb(MessageParcel &data, MessageParc PermissionUtil &permissionUtil = PermissionUtil::GetInstance(); int32_t ret = permissionUtil.CheckVibratePermission(this->GetCallingTokenID(), VIBRATE_PERMISSION); if (ret != PERMISSION_GRANTED) { - HiSysEventWrite(HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_PERMISSIONS_EXCEPTION", + HiSysEvent::Write(HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_PERMISSIONS_EXCEPTION", HiSysEvent::EventType::SECURITY, "PKG_NAME", "CancelVibratorPb", "ERROR_CODE", ret); MISC_HILOGE("result: %{public}d", ret); return PERMISSION_DENIED; @@ -92,7 +92,7 @@ int32_t MiscdeviceServiceStub::PlayVibratorEffectPb(MessageParcel &data, Message PermissionUtil &permissionUtil = PermissionUtil::GetInstance(); int32_t ret = permissionUtil.CheckVibratePermission(this->GetCallingTokenID(), VIBRATE_PERMISSION); if (ret != PERMISSION_GRANTED) { - HiSysEventWrite(HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_PERMISSIONS_EXCEPTION", + HiSysEvent::Write(HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_PERMISSIONS_EXCEPTION", HiSysEvent::EventType::SECURITY, "PKG_NAME", "PlayVibratorEffectPb", "ERROR_CODE", ret); MISC_HILOGE("result: %{public}d", ret); return PERMISSION_DENIED; @@ -114,7 +114,7 @@ int32_t MiscdeviceServiceStub::StopVibratorEffectPb(MessageParcel &data, Message PermissionUtil &permissionUtil = PermissionUtil::GetInstance(); int32_t ret = permissionUtil.CheckVibratePermission(this->GetCallingTokenID(), VIBRATE_PERMISSION); if (ret != PERMISSION_GRANTED) { - HiSysEventWrite(HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_PERMISSIONS_EXCEPTION", + HiSysEvent::Write(HiSysEvent::Domain::MISCDEVICE, "VIBRATOR_PERMISSIONS_EXCEPTION", HiSysEvent::EventType::SECURITY, "PKG_NAME", "StopVibratorEffectPb", "ERROR_CODE", ret); MISC_HILOGE("result: %{public}d", ret); return PERMISSION_DENIED; diff --git a/utils/include/miscdevice_common.h b/utils/include/miscdevice_common.h index ad74227..9932d56 100755 --- a/utils/include/miscdevice_common.h +++ b/utils/include/miscdevice_common.h @@ -21,7 +21,7 @@ namespace OHOS { namespace Sensors { -// These LightId correspond to logical lights +// These LightId correspand to logical lights enum LightId { LIGHT_ID_LED = 0, LIGHT_ID_KEYBOARD, -- Gitee From 299c79f073ab77d947385e93c0b5244b8fc92b29 Mon Sep 17 00:00:00 2001 From: hui1975 Date: Fri, 16 Dec 2022 11:50:32 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: hui1975 Change-Id: Ibc78160f6dc41773a25993ec86c48ab2c78ffa91 --- interfaces/native/light/liblight.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/native/light/liblight.json b/interfaces/native/light/liblight.json index 969401a..06a5c8b 100755 --- a/interfaces/native/light/liblight.json +++ b/interfaces/native/light/liblight.json @@ -1,6 +1,6 @@ [ { - "first_introduced": "7", + "first_introduced": "10", "name": "GetLightList" }, { -- Gitee From 6d773cf2c430a4e5a9213ae43f2006bb8e057dac Mon Sep 17 00:00:00 2001 From: "zhangyafei.echo" Date: Sat, 10 Dec 2022 17:31:33 +0800 Subject: [PATCH 06/11] fixed 6f248ca from https://gitee.com/zhangyafei-echo/sensors_miscdevice/pulls/145 IssueNo:#I65M0O Description:Change the dependency on cjson_static to cjson in standard system. Sig:SIG_ApplicationFramework Feature or BugFix: Feature Binary Source: No Signed-off-by: zhangyafei.echo Change-Id: Ia22f746fc510e87626d9b017b6e82559352e3d6a --- utils/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 3077862..af82006 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -27,7 +27,7 @@ ohos_shared_library("libmiscdevice_utils") { "//third_party/cJSON", ] - deps = [ "//third_party/cJSON:cjson_static" ] + deps = [ "//third_party/cJSON:cjson" ] external_deps = [ "access_token:libaccesstoken_sdk", -- Gitee From 0a1446b8f0aa0db6106428348efd0b1263810d29 Mon Sep 17 00:00:00 2001 From: hellohyh001 Date: Tue, 14 Feb 2023 10:14:50 +0000 Subject: [PATCH 07/11] fixed 88941d3 from https://gitee.com/hellohyh001/sensors_miscdevice/pulls/165 update Signed-off-by: hellohyh001 --- services/miscdevice_service/src/miscdevice_service_stub.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/services/miscdevice_service/src/miscdevice_service_stub.cpp b/services/miscdevice_service/src/miscdevice_service_stub.cpp index 78bb820..c4facb4 100644 --- a/services/miscdevice_service/src/miscdevice_service_stub.cpp +++ b/services/miscdevice_service/src/miscdevice_service_stub.cpp @@ -37,7 +37,6 @@ const std::string VIBRATE_PERMISSION = "ohos.permission.VIBRATE"; MiscdeviceServiceStub::MiscdeviceServiceStub() { - MISC_HILOGI("MiscdeviceServiceStub begin, %{public}p", this); baseFuncs_[VIBRATE] = &MiscdeviceServiceStub::VibratePb; baseFuncs_[CANCEL_VIBRATOR] = &MiscdeviceServiceStub::CancelVibratorPb; baseFuncs_[PLAY_VIBRATOR_EFFECT] = &MiscdeviceServiceStub::PlayVibratorEffectPb; @@ -49,7 +48,6 @@ MiscdeviceServiceStub::MiscdeviceServiceStub() MiscdeviceServiceStub::~MiscdeviceServiceStub() { - MISC_HILOGI("~MiscdeviceServiceStub begin, destruct %{public}p", this); baseFuncs_.clear(); } -- Gitee From 9a02a0c07b74b4d3643f5f76143132ee91f8d096 Mon Sep 17 00:00:00 2001 From: lixiangpeng5 Date: Mon, 20 Feb 2023 02:33:29 +0000 Subject: [PATCH 08/11] fix testcase and hdi connection Signed-off-by: lixiangpeng5 Change-Id: Ibd8bc041282cde9fc70479e6a72d92a12842dd13 --- .../test/unittest/ExampleJsunit.test.js | 992 ++++++++++-------- .../interface/src/vibrator_hdi_connection.cpp | 4 +- 2 files changed, 551 insertions(+), 445 deletions(-) diff --git a/interfaces/plugin/vibrator/test/unittest/ExampleJsunit.test.js b/interfaces/plugin/vibrator/test/unittest/ExampleJsunit.test.js index 4893345..5dcf6e0 100644 --- a/interfaces/plugin/vibrator/test/unittest/ExampleJsunit.test.js +++ b/interfaces/plugin/vibrator/test/unittest/ExampleJsunit.test.js @@ -14,29 +14,34 @@ */ import vibrator from '@ohos.vibrator' import systemVibrator from '@system.vibrator' +import deviceInfo from '@ohos.deviceInfo' import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' describe("VibratorJsTest", function () { + var g_execute = true; beforeAll(function() { /* * @tc.setup: setup invoked before all testcases */ - console.info('beforeAll called') + console.info('beforeAll called') + if (deviceInfo.deviceType == "tablet") { + g_execute = false; + } }) afterAll(function() { /* * @tc.teardown: teardown invoked after all testcases */ - console.info('afterAll called') + console.info('afterAll called') }) beforeEach(function() { /* * @tc.setup: setup invoked before each testcases */ - console.info('beforeEach called') + console.info('beforeEach called') }) afterEach(function() { @@ -195,19 +200,25 @@ describe("VibratorJsTest", function () { * @tc.require: Issue Number */ it("VibratorJsTest007", 0, async function (done) { - function vibrateCallback(error) { - if (error) { - console.info('VibratorJsTest007 vibrator error'); - expect(false).assertTrue(); - } else { - console.info('VibratorJsTest007 vibrator success'); - expect(true).assertTrue(); + if (g_execute) { + function vibrateCallback(error) { + if (error) { + console.info('VibratorJsTest007 vibrator error'); + expect(false).assertTrue(); + } else { + console.info('VibratorJsTest007 vibrator success'); + expect(true).assertTrue(); + } + setTimeout(()=>{ + done(); + }, 500); } - setTimeout(()=>{ - done(); - }, 500); + vibrator.vibrate("haptic.clock.timer", vibrateCallback); + } else { + console.info('VibratorJsTest007 vibrator success'); + expect(true).assertTrue(); + done(); } - vibrator.vibrate("haptic.clock.timer", vibrateCallback); }) /* @@ -217,17 +228,37 @@ describe("VibratorJsTest", function () { * @tc.require: Issue Number */ it("VibratorJsTest008", 0, async function (done) { - function stopPromise() { - return new Promise((resolve, reject) => { - vibrator.stop("preset", (error)=>{ + if (g_execute) { + function stopPromise() { + return new Promise((resolve, reject) => { + vibrator.stop("preset", (error)=>{ + if (error) { + console.info('VibratorJsTest008 stop error'); + expect(false).assertTrue(); + setTimeout(()=>{ + reject(); + }, 500); + } else { + console.info('VibratorJsTest008 stop success'); + expect(true).assertTrue(); + setTimeout(()=>{ + resolve(); + }, 500); + } + }); + }) + } + + let promise = new Promise((resolve, reject) => { + vibrator.vibrate("haptic.clock.timer", (error)=>{ if (error) { - console.info('VibratorJsTest008 stop error'); + console.info('VibratorJsTest008 vibrate error'); expect(false).assertTrue(); setTimeout(()=>{ reject(); }, 500); } else { - console.info('VibratorJsTest008 stop success'); + console.info('VibratorJsTest008 vibrate success'); expect(true).assertTrue(); setTimeout(()=>{ resolve(); @@ -235,32 +266,18 @@ describe("VibratorJsTest", function () { } }); }) + + await promise.then(() =>{ + return stopPromise(); + }, ()=>{ + console.info("VibratorJsTest008 reject"); + }) + done(); + } else { + console.info('VibratorJsTest008 vibrator success'); + expect(true).assertTrue(); + done(); } - - let promise = new Promise((resolve, reject) => { - vibrator.vibrate("haptic.clock.timer", (error)=>{ - if (error) { - console.info('VibratorJsTest008 vibrate error'); - expect(false).assertTrue(); - setTimeout(()=>{ - reject(); - }, 500); - } else { - console.info('VibratorJsTest008 vibrate success'); - expect(true).assertTrue(); - setTimeout(()=>{ - resolve(); - }, 500); - } - }); - }) - - await promise.then(() =>{ - return stopPromise(); - }, ()=>{ - console.info("VibratorJsTest008 reject"); - }) - done(); }) /* @@ -270,7 +287,6 @@ describe("VibratorJsTest", function () { * @tc.require: Issue Number */ it("VibratorJsTest009", 0, async function (done) { - console.info('----------------------SensorJsTest001---------------------------'); function stopPromise() { return new Promise((resolve, reject) => { vibrator.stop("time", (error)=>{ @@ -419,19 +435,25 @@ describe("VibratorJsTest", function () { * @tc.require: Issue Number */ it("VibratorJsTest014", 0, async function (done) { - vibrator.vibrate("haptic.clock.timer").then(() => { - console.log("VibratorJsTest014 vibrate success"); + if (g_execute) { + vibrator.vibrate("haptic.clock.timer").then(() => { + console.log("VibratorJsTest014 vibrate success"); + expect(true).assertTrue(); + setTimeout(()=>{ + done(); + }, 500); + }, (error)=>{ + expect(false).assertTrue(); + console.log("VibratorJsTest014 vibrate error"); + setTimeout(()=>{ + done(); + }, 500); + }); + } else { + console.info('VibratorJsTest014 vibrator success'); expect(true).assertTrue(); - setTimeout(()=>{ - done(); - }, 500); - }, (error)=>{ - expect(false).assertTrue(); - console.log("VibratorJsTest014 vibrate error"); - setTimeout(()=>{ - done(); - }, 500); - }); + done(); + } }) /* @@ -441,46 +463,52 @@ describe("VibratorJsTest", function () { * @tc.require: Issue Number */ it("VibratorJsTest015", 0, async function (done) { - function stopPromise() { - return new Promise((resolve, reject) => { - vibrator.stop("preset").then(() => { - console.log("VibratorJsTest015 off success"); + if (g_execute) { + function stopPromise() { + return new Promise((resolve, reject) => { + vibrator.stop("preset").then(() => { + console.log("VibratorJsTest015 off success"); + expect(true).assertTrue(); + setTimeout(()=>{ + resolve(); + }, 500); + }, (error)=>{ + expect(false).assertTrue(); + console.log("VibratorJsTest015 off error"); + setTimeout(()=>{ + reject(); + }, 500); + }); + }) + } + + let promise = new Promise((resolve, reject) => { + vibrator.vibrate("haptic.clock.timer").then(() => { + console.log("VibratorJsTest015 vibrate success"); expect(true).assertTrue(); setTimeout(()=>{ resolve(); }, 500); }, (error)=>{ expect(false).assertTrue(); - console.log("VibratorJsTest015 off error"); + console.log("VibratorJsTest015 vibrate error"); setTimeout(()=>{ reject(); }, 500); }); }) + + await promise.then(() =>{ + return stopPromise(); + }, ()=>{ + console.info("VibratorJsTest015 reject"); + }) + done(); + } else { + console.info('VibratorJsTest015 vibrator success'); + expect(true).assertTrue(); + done(); } - - let promise = new Promise((resolve, reject) => { - vibrator.vibrate("haptic.clock.timer").then(() => { - console.log("VibratorJsTest015 vibrate success"); - expect(true).assertTrue(); - setTimeout(()=>{ - resolve(); - }, 500); - }, (error)=>{ - expect(false).assertTrue(); - console.log("VibratorJsTest015 vibrate error"); - setTimeout(()=>{ - reject(); - }, 500); - }); - }) - - await promise.then(() =>{ - return stopPromise(); - }, ()=>{ - console.info("VibratorJsTest009 reject"); - }) - done(); }) /* @@ -740,24 +768,30 @@ describe("VibratorJsTest", function () { * @tc.require: I53SGE */ it("VibrateTest003", 0, async function (done) { - vibrator.startVibration({ - type: "preset", - effectId: "haptic.clock.timer", - count: 1, - }, { - usage: "unknown" - }, (error)=>{ - if (error) { - console.info('VibrateTest003 vibrator error'); - expect(false).assertTrue(); - } else { - console.info('VibrateTest003 vibrator success'); - expect(true).assertTrue(); - } - setTimeout(()=>{ - done(); - }, 500); - }); + if (g_execute) { + vibrator.startVibration({ + type: "preset", + effectId: "haptic.clock.timer", + count: 1, + }, { + usage: "unknown" + }, (error)=>{ + if (error) { + console.info('VibrateTest003 vibrator error'); + expect(false).assertTrue(); + } else { + console.info('VibrateTest003 vibrator success'); + expect(true).assertTrue(); + } + setTimeout(()=>{ + done(); + }, 500); + }); + } else { + console.info('VibrateTest003 vibrator success'); + expect(true).assertTrue(); + done(); + } }) /* @@ -799,23 +833,29 @@ describe("VibratorJsTest", function () { * @tc.require: I53SGE */ it("VibrateTest005", 0, async function (done) { - try { - vibrator.startVibration({ - type: "preset", - effectId: "haptic.clock.timer", - count: 3, - }, { - usage: "" - }, (error)=>{ - expect(false).assertTrue(); - setTimeout(()=>{ - done(); - }, 500); - }); - } catch (error) { - console.info(error); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + if (g_execute) { + try { + vibrator.startVibration({ + type: "preset", + effectId: "haptic.clock.timer", + count: 3, + }, { + usage: "" + }, (error)=>{ + expect(false).assertTrue(); + setTimeout(()=>{ + done(); + }, 500); + }); + } catch (error) { + console.info(error); + expect(error.code).assertEqual(PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + done(); + } + } else { + console.info('VibrateTest005 vibrator success'); + expect(true).assertTrue(); done(); } }) @@ -891,18 +931,24 @@ describe("VibratorJsTest", function () { * @tc.require: I53SGE */ it("VibrateTest009", 0, async function (done) { - await vibrator.startVibration({ - type: "preset", - effectId: "haptic.clock.timer", - count: 1, - }, { - usage: "unknown" - }).then(()=>{ + if (g_execute) { + await vibrator.startVibration({ + type: "preset", + effectId: "haptic.clock.timer", + count: 1, + }, { + usage: "unknown" + }).then(()=>{ + expect(true).assertTrue(); + }).catch((error)=>{ + expect(false).assertTrue(); + }); + done(); + } else { + console.info('VibrateTest009 vibrator success'); expect(true).assertTrue(); - }).catch((error)=>{ - expect(false).assertTrue(); - }); - done(); + done(); + } }) /* @@ -941,24 +987,30 @@ describe("VibratorJsTest", function () { * @tc.require: I53SGE */ it("VibrateTest011", 0, async function (done) { - try { - vibrator.startVibration({ - type: "preset", - effectId: "haptic.clock.timer", - count: 3, - }, { - usage: "" - }).then(()=>{ - expect(false).assertTrue(); - done(); - }).catch((error)=>{ - expect(true).assertTrue(); + if (g_execute) { + try { + vibrator.startVibration({ + type: "preset", + effectId: "haptic.clock.timer", + count: 3, + }, { + usage: "" + }).then(()=>{ + expect(false).assertTrue(); + done(); + }).catch((error)=>{ + expect(true).assertTrue(); + done(); + }); + } catch (error) { + console.info(error); + expect(error.code).assertEqual(PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); - }); - } catch (error) { - console.info(error); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + } + } else { + console.info('VibrateTest011 vibrator success'); + expect(true).assertTrue(); done(); } }) @@ -1044,52 +1096,58 @@ describe("VibratorJsTest", function () { * @tc.require: I53SGE */ it("VibrateTest014", 0, async function (done) { - function vibratePromise() { - return new Promise((resolve, reject) => { + if (g_execute) { + function vibratePromise() { + return new Promise((resolve, reject) => { + vibrator.startVibration({ + type: "preset", + effectId: "haptic.clock.timer", + count: 1, + }, { + usage: "unknown" + }, (error)=>{ + if (error) { + expect(error.code).assertEqual(OPERATION_FAIL_CODE); + expect(error.message).assertEqual(OPERATION_FAIL_MSG); + } else { + expect(false).assertTrue(); + } + setTimeout(()=>{ + done(); + }, 500); + }); + }) + } + + let promise = new Promise((resolve, reject) => { vibrator.startVibration({ - type: "preset", - effectId: "haptic.clock.timer", - count: 1, + type: "time", + duration: 100 }, { - usage: "unknown" + usage: "alarm" }, (error)=>{ if (error) { - expect(error.code).assertEqual(OPERATION_FAIL_CODE); - expect(error.message).assertEqual(OPERATION_FAIL_MSG); - } else { expect(false).assertTrue(); + reject(); + } else { + expect(true).assertTrue(); + resolve(); } - setTimeout(()=>{ - done(); - }, 500); }); }) + + await promise.then(() =>{ + return vibratePromise(); + }, ()=>{ + console.info("VibrateTest014 reject"); + }) + done(); + } else { + console.info('VibrateTest014 vibrator success'); + expect(true).assertTrue(); + done(); } - - let promise = new Promise((resolve, reject) => { - vibrator.startVibration({ - type: "time", - duration: 100 - }, { - usage: "alarm" - }, (error)=>{ - if (error) { - expect(false).assertTrue(); - reject(); - } else { - expect(true).assertTrue(); - resolve(); - } - }); - }) - - await promise.then(() =>{ - return vibratePromise(); - }, ()=>{ - console.info("VibrateTest014 reject"); - }) - done(); - }) + }) /* * @tc.name:VibrateTest015 @@ -1098,49 +1156,55 @@ describe("VibratorJsTest", function () { * @tc.require: I53SGE */ it("VibrateTest015", 0, async function (done) { - function vibratePromise() { - return new Promise((resolve, reject) => { + if (g_execute) { + function vibratePromise() { + return new Promise((resolve, reject) => { + vibrator.startVibration({ + type: "preset", + effectId: "haptic.clock.timer", + count: 3, + }, { + usage: "unknown", + }, (error)=>{ + if (error) { + expect(false).assertTrue(); + } else { + expect(true).assertTrue(); + } + setTimeout(()=>{ + done(); + }, 500); + }); + }) + } + + let promise = new Promise((resolve, reject) => { vibrator.startVibration({ - type: "preset", - effectId: "haptic.clock.timer", - count: 3, + type: "time", + duration: 10000 }, { - usage: "unknown", + usage: "alarm" }, (error)=>{ if (error) { expect(false).assertTrue(); + reject(); } else { expect(true).assertTrue(); + resolve(); } - setTimeout(()=>{ - done(); - }, 500); }); }) + await promise.then(() =>{ + return vibratePromise(); + }, ()=>{ + console.info("VibrateTest015 reject"); + }) + done(); + } else { + console.info('VibrateTest015 vibrator success'); + expect(true).assertTrue(); + done(); } - - let promise = new Promise((resolve, reject) => { - vibrator.startVibration({ - type: "time", - duration: 10000 - }, { - usage: "alarm" - }, (error)=>{ - if (error) { - expect(false).assertTrue(); - reject(); - } else { - expect(true).assertTrue(); - resolve(); - } - }); - }) - await promise.then(() =>{ - return vibratePromise(); - }, ()=>{ - console.info("VibrateTest015 reject"); - }) - done(); }) /* @@ -1150,52 +1214,58 @@ describe("VibratorJsTest", function () { * @tc.require: I53SGE */ it("VibrateTest016", 0, async function (done) { - function vibratePromise() { - return new Promise((resolve, reject) => { + if (g_execute) { + function vibratePromise() { + return new Promise((resolve, reject) => { + vibrator.startVibration({ + type: "preset", + effectId: "haptic.clock.timer", + count: 1, + }, { + usage: "unknown", + }, (error)=>{ + if (error) { + expect(error.code).assertEqual(OPERATION_FAIL_CODE); + expect(error.message).assertEqual(OPERATION_FAIL_MSG); + } else { + expect(false).assertTrue(); + } + setTimeout(()=>{ + done(); + }, 500); + }); + }) + } + + let promise = new Promise((resolve, reject) => { vibrator.startVibration({ type: "preset", effectId: "haptic.clock.timer", - count: 1, + count: 3, }, { usage: "unknown", }, (error)=>{ if (error) { - expect(error.code).assertEqual(OPERATION_FAIL_CODE); - expect(error.message).assertEqual(OPERATION_FAIL_MSG); - } else { expect(false).assertTrue(); + reject(); + } else { + expect(true).assertTrue(); + resolve(); } - setTimeout(()=>{ - done(); - }, 500); }); }) + + await promise.then(() =>{ + return vibratePromise(); + }, ()=>{ + console.info("VibrateTest016 reject"); + }) + done(); + } else { + console.info('VibrateTest016 vibrator success'); + expect(true).assertTrue(); + done(); } - - let promise = new Promise((resolve, reject) => { - vibrator.startVibration({ - type: "preset", - effectId: "haptic.clock.timer", - count: 3, - }, { - usage: "unknown", - }, (error)=>{ - if (error) { - expect(false).assertTrue(); - reject(); - } else { - expect(true).assertTrue(); - resolve(); - } - }); - }) - - await promise.then(() =>{ - return vibratePromise(); - }, ()=>{ - console.info("VibrateTest016 reject"); - }) - done(); }) /* @@ -1205,51 +1275,57 @@ describe("VibratorJsTest", function () { * @tc.require: I53SGE */ it("VibrateTest017", 0, async function (done) { - function vibratePromise() { - return new Promise((resolve, reject) => { + if (g_execute) { + function vibratePromise() { + return new Promise((resolve, reject) => { + vibrator.startVibration({ + type: "time", + duration: 3000, + }, { + usage: "alarm" + }, (error)=>{ + if (error) { + expect(error.code).assertEqual(OPERATION_FAIL_CODE); + expect(error.message).assertEqual(OPERATION_FAIL_MSG); + } else { + expect(false).assertTrue(); + } + setTimeout(()=>{ + done(); + }, 500); + }); + }) + } + + let promise = new Promise((resolve, reject) => { vibrator.startVibration({ - type: "time", - duration: 3000, + type: "preset", + effectId: "haptic.clock.timer", + count: 3, }, { - usage: "alarm" + usage: "unknown" }, (error)=>{ if (error) { - expect(error.code).assertEqual(OPERATION_FAIL_CODE); - expect(error.message).assertEqual(OPERATION_FAIL_MSG); - } else { expect(false).assertTrue(); + reject(); + } else { + expect(true).assertTrue(); + resolve(); } - setTimeout(()=>{ - done(); - }, 500); }); }) + + await promise.then(() =>{ + return vibratePromise(); + }, ()=>{ + console.info("VibrateTest017 reject"); + }) + done(); + } else { + console.info('VibrateTest017 vibrator success'); + expect(true).assertTrue(); + done(); } - - let promise = new Promise((resolve, reject) => { - vibrator.startVibration({ - type: "preset", - effectId: "haptic.clock.timer", - count: 3, - }, { - usage: "unknown" - }, (error)=>{ - if (error) { - expect(false).assertTrue(); - reject(); - } else { - expect(true).assertTrue(); - resolve(); - } - }); - }) - - await promise.then(() =>{ - return vibratePromise(); - }, ()=>{ - console.info("VibrateTest017 reject"); - }) - done(); }) /* @@ -1259,50 +1335,56 @@ describe("VibratorJsTest", function () { * @tc.require: I53SGE */ it("VibrateTest018", 0, async function (done) { - function vibratePromise() { - return new Promise((resolve, reject) => { + if (g_execute) { + function vibratePromise() { + return new Promise((resolve, reject) => { + vibrator.startVibration({ + type: "time", + duration: 3000, + }, { + usage: "alarm" + }, (error)=>{ + if (error) { + expect(false).assertTrue(); + } else { + expect(true).assertTrue(); + } + setTimeout(()=>{ + done(); + }, 500); + }); + }) + } + + let promise = new Promise((resolve, reject) => { vibrator.startVibration({ - type: "time", - duration: 3000, + type: "preset", + effectId: "haptic.clock.timer", + count: 1, }, { - usage: "alarm" + usage: "unknown" }, (error)=>{ if (error) { expect(false).assertTrue(); + reject(); } else { expect(true).assertTrue(); + resolve(); } - setTimeout(()=>{ - done(); - }, 500); }); }) + + await promise.then(() =>{ + return vibratePromise(); + }, ()=>{ + console.info("VibrateTest018 reject"); + }) + done(); + } else { + console.info('VibrateTest018 vibrator success'); + expect(true).assertTrue(); + done(); } - - let promise = new Promise((resolve, reject) => { - vibrator.startVibration({ - type: "preset", - effectId: "haptic.clock.timer", - count: 1, - }, { - usage: "unknown" - }, (error)=>{ - if (error) { - expect(false).assertTrue(); - reject(); - } else { - expect(true).assertTrue(); - resolve(); - } - }); - }) - - await promise.then(() =>{ - return vibratePromise(); - }, ()=>{ - console.info("VibrateTest018 reject"); - }) - done(); }) /* @@ -1312,8 +1394,29 @@ describe("VibratorJsTest", function () { * @tc.require: I53SGE */ it("VibrateTest019", 0, async function (done) { - function vibratePromise() { - return new Promise((resolve, reject) => { + if (g_execute) { + function vibratePromise() { + return new Promise((resolve, reject) => { + vibrator.startVibration({ + type: "preset", + effectId: "haptic.clock.timer", + count: 3, + }, { + usage: "unknown" + }, (error)=>{ + if (error) { + expect(false).assertTrue(); + } else { + expect(true).assertTrue(); + } + setTimeout(()=>{ + done(); + }, 500); + }); + }) + } + + let promise = new Promise((resolve, reject) => { vibrator.startVibration({ type: "preset", effectId: "haptic.clock.timer", @@ -1323,40 +1426,25 @@ describe("VibratorJsTest", function () { }, (error)=>{ if (error) { expect(false).assertTrue(); + reject(); } else { expect(true).assertTrue(); + resolve(); } - setTimeout(()=>{ - done(); - }, 500); }); }) + + await promise.then(() =>{ + return vibratePromise(); + }, ()=>{ + console.info("VibrateTest019 reject"); + }) + done(); + } else { + console.info('VibrateTest019 vibrator success'); + expect(true).assertTrue(); + done(); } - - let promise = new Promise((resolve, reject) => { - vibrator.startVibration({ - type: "preset", - effectId: "haptic.clock.timer", - count: 3, - }, { - usage: "unknown" - }, (error)=>{ - if (error) { - expect(false).assertTrue(); - reject(); - } else { - expect(true).assertTrue(); - resolve(); - } - }); - }) - - await promise.then(() =>{ - return vibratePromise(); - }, ()=>{ - console.info("VibrateTest019 reject"); - }) - done(); }) /* @@ -1366,51 +1454,57 @@ describe("VibratorJsTest", function () { * @tc.require: I53SGE */ it("VibrateTest020", 0, async function (done) { - function vibratePromise() { - return new Promise((resolve, reject) => { + if (g_execute) { + function vibratePromise() { + return new Promise((resolve, reject) => { + vibrator.startVibration({ + type: "preset", + effectId: "haptic.clock.timer", + count: 1, + }, { + usage: "ring" + }, (error)=>{ + if (error) { + expect(false).assertTrue(); + } else { + expect(true).assertTrue(); + } + setTimeout(()=>{ + done(); + }, 500); + }); + }) + } + + let promise = new Promise((resolve, reject) => { vibrator.startVibration({ type: "preset", effectId: "haptic.clock.timer", count: 1, }, { - usage: "ring" + usage: "notification" }, (error)=>{ if (error) { expect(false).assertTrue(); + reject(); } else { expect(true).assertTrue(); + resolve(); } - setTimeout(()=>{ - done(); - }, 500); }); }) + + await promise.then(() =>{ + return vibratePromise(); + }, ()=>{ + console.info("VibrateTest020 reject"); + }) + done(); + } else { + console.info('VibrateTest020 vibrator success'); + expect(true).assertTrue(); + done(); } - - let promise = new Promise((resolve, reject) => { - vibrator.startVibration({ - type: "preset", - effectId: "haptic.clock.timer", - count: 1, - }, { - usage: "notification" - }, (error)=>{ - if (error) { - expect(false).assertTrue(); - reject(); - } else { - expect(true).assertTrue(); - resolve(); - } - }); - }) - - await promise.then(() =>{ - return vibratePromise(); - }, ()=>{ - console.info("VibrateTest020 reject"); - }) - done(); }) /* @@ -1420,52 +1514,58 @@ describe("VibratorJsTest", function () { * @tc.require: I53SGE */ it("VibrateTest021", 0, async function (done) { - function vibratePromise() { - return new Promise((resolve, reject) => { + if (g_execute) { + function vibratePromise() { + return new Promise((resolve, reject) => { + vibrator.startVibration({ + type: "preset", + effectId: "haptic.clock.timer", + count: 1, + }, { + usage: "unknown" + }, (error)=>{ + if (error) { + expect(error.code).assertEqual(OPERATION_FAIL_CODE); + expect(error.message).assertEqual(OPERATION_FAIL_MSG); + } else { + expect(false).assertTrue(); + } + setTimeout(()=>{ + done(); + }, 500); + }); + }) + } + + let promise = new Promise((resolve, reject) => { vibrator.startVibration({ type: "preset", effectId: "haptic.clock.timer", count: 1, }, { - usage: "unknown" + usage: "notification" }, (error)=>{ if (error) { - expect(error.code).assertEqual(OPERATION_FAIL_CODE); - expect(error.message).assertEqual(OPERATION_FAIL_MSG); - } else { expect(false).assertTrue(); + reject(); + } else { + expect(true).assertTrue(); + resolve(); } - setTimeout(()=>{ - done(); - }, 500); }); }) + + await promise.then(() =>{ + return vibratePromise(); + }, ()=>{ + console.info("VibrateTest021 reject"); + }) + done(); + } else { + console.info('VibrateTest021 vibrator success'); + expect(true).assertTrue(); + done(); } - - let promise = new Promise((resolve, reject) => { - vibrator.startVibration({ - type: "preset", - effectId: "haptic.clock.timer", - count: 1, - }, { - usage: "notification" - }, (error)=>{ - if (error) { - expect(false).assertTrue(); - reject(); - } else { - expect(true).assertTrue(); - resolve(); - } - }); - }) - - await promise.then(() =>{ - return vibratePromise(); - }, ()=>{ - console.info("VibrateTest020 reject"); - }) - done(); }) /* @@ -1504,46 +1604,52 @@ describe("VibratorJsTest", function () { * @tc.require: I5SWJI */ it("VibrateTest023", 0, async function (done) { - function stopPromise() { - return new Promise((resolve, reject) => { - vibrator.stopVibration("preset").then(() => { - console.log("VibrateTest023 off success"); + if (g_execute) { + function stopPromise() { + return new Promise((resolve, reject) => { + vibrator.stopVibration("preset").then(() => { + console.log("VibrateTest023 off success"); + expect(true).assertTrue(); + setTimeout(()=>{ + resolve(); + }, 500); + }, (error)=>{ + expect(false).assertTrue(); + console.log("VibrateTest023 off error"); + setTimeout(()=>{ + reject(); + }, 500); + }); + }) + } + + let promise = new Promise((resolve, reject) => { + vibrator.startVibration("haptic.clock.timer").then(() => { + console.log("VibrateTest023 vibrate success"); expect(true).assertTrue(); setTimeout(()=>{ resolve(); }, 500); }, (error)=>{ expect(false).assertTrue(); - console.log("VibrateTest023 off error"); + console.log("VibrateTest023 vibrate error"); setTimeout(()=>{ reject(); }, 500); }); }) + + await promise.then(() =>{ + return stopPromise(); + }, ()=>{ + console.info("VibrateTest023 reject"); + }) + done(); + } else { + console.info('VibrateTest023 vibrator success'); + expect(true).assertTrue(); + done(); } - - let promise = new Promise((resolve, reject) => { - vibrator.startVibration("haptic.clock.timer").then(() => { - console.log("VibrateTest023 vibrate success"); - expect(true).assertTrue(); - setTimeout(()=>{ - resolve(); - }, 500); - }, (error)=>{ - expect(false).assertTrue(); - console.log("VibrateTest023 vibrate error"); - setTimeout(()=>{ - reject(); - }, 500); - }); - }) - - await promise.then(() =>{ - return stopPromise(); - }, ()=>{ - console.info("VibrateTest023 reject"); - }) - done(); }) /* diff --git a/services/miscdevice_service/hdi_connection/interface/src/vibrator_hdi_connection.cpp b/services/miscdevice_service/hdi_connection/interface/src/vibrator_hdi_connection.cpp index 31bda01..2edf896 100644 --- a/services/miscdevice_service/hdi_connection/interface/src/vibrator_hdi_connection.cpp +++ b/services/miscdevice_service/hdi_connection/interface/src/vibrator_hdi_connection.cpp @@ -29,11 +29,11 @@ constexpr HiLogLabel LABEL = { LOG_CORE, MISC_LOG_DOMAIN, "VibratorHdiConnection int32_t VibratorHdiConnection::ConnectHdi() { - iVibratorHdiConnection_ = std::make_unique(); + iVibratorHdiConnection_ = std::make_unique(); int32_t ret = iVibratorHdiConnection_->ConnectHdi(); if (ret != 0) { MISC_HILOGE("hdi direct failed"); - iVibratorHdiConnection_ = std::make_unique(); + iVibratorHdiConnection_ = std::make_unique(); ret = iVibratorHdiConnection_->ConnectHdi(); } if (ret != 0) { -- Gitee From ab6964d47859dbd5974add8f844c3942b2f1e455 Mon Sep 17 00:00:00 2001 From: lixiangpeng5 Date: Thu, 23 Feb 2023 11:48:02 +0000 Subject: [PATCH 09/11] adjust test cases Signed-off-by: lixiangpeng5 Change-Id: Id0f62ffe4dc1d99b43417d363156c9f370a840f6 --- .../test/unittest/ExampleJsunit.test.js | 1298 ++++++----------- 1 file changed, 438 insertions(+), 860 deletions(-) diff --git a/interfaces/plugin/vibrator/test/unittest/ExampleJsunit.test.js b/interfaces/plugin/vibrator/test/unittest/ExampleJsunit.test.js index 5dcf6e0..b70fd62 100644 --- a/interfaces/plugin/vibrator/test/unittest/ExampleJsunit.test.js +++ b/interfaces/plugin/vibrator/test/unittest/ExampleJsunit.test.js @@ -14,37 +14,32 @@ */ import vibrator from '@ohos.vibrator' import systemVibrator from '@system.vibrator' -import deviceInfo from '@ohos.deviceInfo' -import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' +import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index' describe("VibratorJsTest", function () { - var g_execute = true; - beforeAll(function() { + beforeAll(function () { /* * @tc.setup: setup invoked before all testcases */ console.info('beforeAll called') - if (deviceInfo.deviceType == "tablet") { - g_execute = false; - } }) - - afterAll(function() { + + afterAll(function () { /* * @tc.teardown: teardown invoked after all testcases */ console.info('afterAll called') }) - - beforeEach(function() { + + beforeEach(function () { /* * @tc.setup: setup invoked before each testcases */ console.info('beforeEach called') }) - - afterEach(function() { + + afterEach(function () { /* * @tc.teardown: teardown invoked after each testcases */ @@ -56,7 +51,7 @@ describe("VibratorJsTest", function () { const OPERATION_FAIL_CODE = 14600101; const PERMISSION_ERROR_CODE = 201; const PARAMETER_ERROR_CODE = 401; - + const OPERATION_FAIL_MSG = 'Device operation failed.' const PERMISSION_ERROR_MSG = 'Permission denied.' const PARAMETER_ERROR_MSG = 'The parameter invalid.' @@ -76,7 +71,7 @@ describe("VibratorJsTest", function () { console.info('VibratorJsTest001 vibrator success'); expect(true).assertTrue(); } - setTimeout(()=>{ + setTimeout(() => { done(); }, 500); } @@ -98,7 +93,7 @@ describe("VibratorJsTest", function () { console.info('VibratorJsTest002 vibrator error'); expect(false).assertTrue(); } - setTimeout(()=>{ + setTimeout(() => { done(); }, 500); } @@ -120,7 +115,7 @@ describe("VibratorJsTest", function () { console.info('VibratorJsTest003 vibrator error'); expect(false).assertTrue(); } - setTimeout(()=>{ + setTimeout(() => { done(); }, 500); } @@ -142,7 +137,7 @@ describe("VibratorJsTest", function () { console.info('VibratorJsTest004 vibrator success'); expect(true).assertTrue(); } - setTimeout(()=>{ + setTimeout(() => { done(); }, 500); } @@ -164,7 +159,7 @@ describe("VibratorJsTest", function () { console.info('VibratorJsTest005 vibrator error'); expect(false).assertTrue(); } - setTimeout(()=>{ + setTimeout(() => { done(); }, 500); } @@ -186,7 +181,7 @@ describe("VibratorJsTest", function () { console.info('VibratorJsTest006 vibrator error'); expect(false).assertTrue(); } - setTimeout(()=>{ + setTimeout(() => { done(); }, 500); } @@ -200,25 +195,19 @@ describe("VibratorJsTest", function () { * @tc.require: Issue Number */ it("VibratorJsTest007", 0, async function (done) { - if (g_execute) { - function vibrateCallback(error) { - if (error) { - console.info('VibratorJsTest007 vibrator error'); - expect(false).assertTrue(); - } else { - console.info('VibratorJsTest007 vibrator success'); - expect(true).assertTrue(); - } - setTimeout(()=>{ - done(); - }, 500); + function vibrateCallback(error) { + if (error) { + console.info('VibratorJsTest007 vibrator error'); + expect(false).assertTrue(); + } else { + console.info('VibratorJsTest007 vibrator success'); + expect(true).assertTrue(); } - vibrator.vibrate("haptic.clock.timer", vibrateCallback); - } else { - console.info('VibratorJsTest007 vibrator success'); - expect(true).assertTrue(); - done(); + setTimeout(() => { + done(); + }, 500); } + vibrator.vibrate("haptic.clock.timer", vibrateCallback); }) /* @@ -228,78 +217,19 @@ describe("VibratorJsTest", function () { * @tc.require: Issue Number */ it("VibratorJsTest008", 0, async function (done) { - if (g_execute) { - function stopPromise() { - return new Promise((resolve, reject) => { - vibrator.stop("preset", (error)=>{ - if (error) { - console.info('VibratorJsTest008 stop error'); - expect(false).assertTrue(); - setTimeout(()=>{ - reject(); - }, 500); - } else { - console.info('VibratorJsTest008 stop success'); - expect(true).assertTrue(); - setTimeout(()=>{ - resolve(); - }, 500); - } - }); - }) - } - - let promise = new Promise((resolve, reject) => { - vibrator.vibrate("haptic.clock.timer", (error)=>{ - if (error) { - console.info('VibratorJsTest008 vibrate error'); - expect(false).assertTrue(); - setTimeout(()=>{ - reject(); - }, 500); - } else { - console.info('VibratorJsTest008 vibrate success'); - expect(true).assertTrue(); - setTimeout(()=>{ - resolve(); - }, 500); - } - }); - }) - - await promise.then(() =>{ - return stopPromise(); - }, ()=>{ - console.info("VibratorJsTest008 reject"); - }) - done(); - } else { - console.info('VibratorJsTest008 vibrator success'); - expect(true).assertTrue(); - done(); - } - }) - - /* - * @tc.name:VibratorJsTest009 - * @tc.desc:verify app info is not null - * @tc.type: FUNC - * @tc.require: Issue Number - */ - it("VibratorJsTest009", 0, async function (done) { function stopPromise() { return new Promise((resolve, reject) => { - vibrator.stop("time", (error)=>{ + vibrator.stop("time", (error) => { if (error) { - console.info('VibratorJsTest009 stop error'); + console.info('VibratorJsTest008 stop error'); expect(false).assertTrue(); - setTimeout(()=>{ + setTimeout(() => { reject(); }, 500); } else { - console.info('VibratorJsTest009 stop success'); + console.info('VibratorJsTest008 stop success'); expect(true).assertTrue(); - setTimeout(()=>{ + setTimeout(() => { resolve(); }, 500); } @@ -308,48 +238,48 @@ describe("VibratorJsTest", function () { } let promise = new Promise((resolve, reject) => { - vibrator.vibrate(180000, (error)=>{ + vibrator.vibrate(180000, (error) => { if (error) { - console.info('VibratorJsTest009 vibrate error'); + console.info('VibratorJsTest008 vibrate error'); expect(false).assertTrue(); - setTimeout(()=>{ + setTimeout(() => { reject(); }, 500); } else { - console.info('VibratorJsTest009 vibrate success'); + console.info('VibratorJsTest008 vibrate success'); expect(true).assertTrue(); - setTimeout(()=>{ + setTimeout(() => { resolve(); }, 500); } }); }) - await promise.then(() =>{ + await promise.then(() => { return stopPromise(); - }, ()=>{ - console.info("VibratorJsTest009 reject"); + }, () => { + console.info("VibratorJsTest008 reject"); }) done(); }) /* - * @tc.name:VibratorJsTest010 + * @tc.name:VibratorJsTest009 * @tc.desc:verify app info is not null * @tc.type: FUNC * @tc.require: Issue Number */ - it("VibratorJsTest010", 0, async function (done) { + it("VibratorJsTest009", 0, async function (done) { try { function vibrateCallback(error) { if (error) { - console.info('VibratorJsTest010 stop success'); + console.info('VibratorJsTest009 stop success'); expect(true).assertTrue(); } else { - console.info('VibratorJsTest010 stop off'); + console.info('VibratorJsTest009 stop off'); expect(false).assertTrue(); } - setTimeout(()=>{ + setTimeout(() => { done(); }, 500); } @@ -359,198 +289,137 @@ describe("VibratorJsTest", function () { expect(error.code).assertEqual(PARAMETER_ERROR_CODE); expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); - } + } }) /* - * @tc.name:VibratorJsTest011 + * @tc.name:VibratorJsTest010 * @tc.desc:verify app info is not null * @tc.type: FUNC * @tc.require: Issue Number */ - it("VibratorJsTest011", 0, async function (done) { + it("VibratorJsTest010", 0, async function (done) { vibrator.vibrate(1000).then(() => { - console.log("VibratorJsTest011 vibrate success"); + console.log("VibratorJsTest010 vibrate success"); expect(true).assertTrue(); - setTimeout(()=>{ + setTimeout(() => { done(); }, 500); - }, (error)=>{ + }, (error) => { expect(false).assertTrue(); - console.log("VibratorJsTest011 vibrate error"); - setTimeout(()=>{ + console.log("VibratorJsTest010 vibrate error"); + setTimeout(() => { done(); }, 500); }); }) /* - * @tc.name:VibratorJsTest012 + * @tc.name:VibratorJsTest011 * @tc.desc:verify app info is not null * @tc.type: FUNC * @tc.require: Issue Number */ - it("VibratorJsTest012", 0, async function (done) { + it("VibratorJsTest011", 0, async function (done) { vibrator.vibrate(-1).then(() => { - console.log("VibratorJsTest012 vibrate error"); + console.log("VibratorJsTest011 vibrate error"); expect(false).assertTrue(); - setTimeout(()=>{ + setTimeout(() => { done(); }, 500); - }, (error)=>{ + }, (error) => { expect(true).assertTrue(); - console.log("VibratorJsTest012 vibrate success"); - setTimeout(()=>{ + console.log("VibratorJsTest011 vibrate success"); + setTimeout(() => { done(); }, 500); }); }) /* - * @tc.name:VibratorJsTest013 + * @tc.name:VibratorJsTest012 * @tc.desc:verify app info is not null * @tc.type: FUNC * @tc.require: Issue Number */ - it("VibratorJsTest013", 0, async function (done) { + it("VibratorJsTest012", 0, async function (done) { vibrator.vibrate(1800000 + 1).then(() => { - console.log("VibratorJsTest013 vibrate error"); + console.log("VibratorJsTest012 vibrate error"); expect(false).assertTrue(); - setTimeout(()=>{ + setTimeout(() => { done(); }, 500); - }, (error)=>{ + }, (error) => { expect(true).assertTrue(); - console.log("VibratorJsTest013 vibrate success"); - setTimeout(()=>{ + console.log("VibratorJsTest012 vibrate success"); + setTimeout(() => { done(); }, 500); }); }) /* - * @tc.name:VibratorJsTest014 - * @tc.desc:verify app info is not null - * @tc.type: FUNC - * @tc.require: Issue Number - */ - it("VibratorJsTest014", 0, async function (done) { - if (g_execute) { - vibrator.vibrate("haptic.clock.timer").then(() => { - console.log("VibratorJsTest014 vibrate success"); - expect(true).assertTrue(); - setTimeout(()=>{ - done(); - }, 500); - }, (error)=>{ - expect(false).assertTrue(); - console.log("VibratorJsTest014 vibrate error"); - setTimeout(()=>{ - done(); - }, 500); - }); - } else { - console.info('VibratorJsTest014 vibrator success'); - expect(true).assertTrue(); - done(); - } - }) - - /* - * @tc.name:VibratorJsTest015 + * @tc.name:VibratorJsTest013 * @tc.desc:verify app info is not null * @tc.type: FUNC * @tc.require: Issue Number */ - it("VibratorJsTest015", 0, async function (done) { - if (g_execute) { - function stopPromise() { - return new Promise((resolve, reject) => { - vibrator.stop("preset").then(() => { - console.log("VibratorJsTest015 off success"); - expect(true).assertTrue(); - setTimeout(()=>{ - resolve(); - }, 500); - }, (error)=>{ - expect(false).assertTrue(); - console.log("VibratorJsTest015 off error"); - setTimeout(()=>{ - reject(); - }, 500); - }); - }) - } - - let promise = new Promise((resolve, reject) => { - vibrator.vibrate("haptic.clock.timer").then(() => { - console.log("VibratorJsTest015 vibrate success"); - expect(true).assertTrue(); - setTimeout(()=>{ - resolve(); - }, 500); - }, (error)=>{ - expect(false).assertTrue(); - console.log("VibratorJsTest015 vibrate error"); - setTimeout(()=>{ - reject(); - }, 500); - }); - }) - - await promise.then(() =>{ - return stopPromise(); - }, ()=>{ - console.info("VibratorJsTest015 reject"); - }) - done(); - } else { - console.info('VibratorJsTest015 vibrator success'); + it("VibratorJsTest013", 0, async function (done) { + vibrator.vibrate("haptic.clock.timer").then(() => { + console.log("VibratorJsTest013 vibrate success"); expect(true).assertTrue(); - done(); - } + setTimeout(() => { + done(); + }, 500); + }, (error) => { + expect(false).assertTrue(); + console.log("VibratorJsTest013 vibrate error"); + setTimeout(() => { + done(); + }, 500); + }); }) /* - * @tc.name:VibratorJsTest016 + * @tc.name:VibratorJsTest014 * @tc.desc:verify app info is not null * @tc.type: FUNC * @tc.require: Issue Number */ - it("VibratorJsTest016", 0, async function (done) { + it("VibratorJsTest014", 0, async function (done) { vibrator.vibrate("").then(() => { - console.log("VibratorJsTest016 vibrate error"); + console.log("VibratorJsTest014 vibrate error"); expect(false).assertTrue(); - setTimeout(()=>{ + setTimeout(() => { done(); }, 500); - }, (error)=>{ + }, (error) => { expect(true).assertTrue(); - console.log("VibratorJsTest016 vibrate success"); - setTimeout(()=>{ + console.log("VibratorJsTest014 vibrate success"); + setTimeout(() => { done(); }, 500); }); }) /* - * @tc.name:VibratorJsTest017 + * @tc.name:VibratorJsTest015 * @tc.desc:verify app info is not null * @tc.type: FUNC * @tc.require: Issue Number */ - it("VibratorJsTest017", 0, async function (done) { + it("VibratorJsTest015", 0, async function (done) { try { vibrator.stop("").then(() => { - console.log("VibratorJsTest017 stop error"); + console.log("VibratorJsTest015 stop error"); expect(false).assertTrue(); - setTimeout(()=>{ + setTimeout(() => { done(); }, 500); - }, (error)=>{ + }, (error) => { expect(true).assertTrue(); - console.log("VibratorJsTest017 stop success"); - setTimeout(()=>{ + console.log("VibratorJsTest015 stop success"); + setTimeout(() => { done(); }, 500); }); @@ -563,24 +432,24 @@ describe("VibratorJsTest", function () { }) /* - * @tc.name:VibratorJsTest018 + * @tc.name:VibratorJsTest016 * @tc.desc:verify app info is not null * @tc.type: FUNC * @tc.require: Issue Number */ - it("VibratorJsTest018", 0, async function (done) { + it("VibratorJsTest016", 0, async function (done) { function stopPromise() { return new Promise((resolve, reject) => { vibrator.stop("time").then(() => { - console.log("VibratorJsTest018 stop success"); + console.log("VibratorJsTest016 stop success"); expect(true).assertTrue(); - setTimeout(()=>{ + setTimeout(() => { resolve(); }, 500); - }, (error)=>{ + }, (error) => { expect(false).assertTrue(); - console.log("VibratorJsTest018 stop error"); - setTimeout(()=>{ + console.log("VibratorJsTest016 stop error"); + setTimeout(() => { reject(); }, 500); }); @@ -589,119 +458,119 @@ describe("VibratorJsTest", function () { let promise = new Promise((resolve, reject) => { vibrator.vibrate(180000).then(() => { - console.log("VibratorJsTest018 vibrate success"); + console.log("VibratorJsTest016 vibrate success"); expect(true).assertTrue(); - setTimeout(()=>{ + setTimeout(() => { resolve(); }, 500); - }, (error)=>{ + }, (error) => { expect(false).assertTrue(); - console.log("VibratorJsTest018 vibrate error"); - setTimeout(()=>{ + console.log("VibratorJsTest016 vibrate error"); + setTimeout(() => { reject(); }, 500); }); }) - await promise.then(() =>{ + await promise.then(() => { return stopPromise(); - }, ()=>{ - console.info("VibratorJsTest018 reject"); + }, () => { + console.info("VibratorJsTest016 reject"); }) done(); }) /* - * @tc.name:VibratorJsTest019 + * @tc.name:VibratorJsTest017 * @tc.desc:verify app info is not null * @tc.type: FUNC - * @tc.require: Issue Number + * @tc.require: I5SWJI */ - it("VibratorJsTest019", 0, async function (done) { + it("VibratorJsTest017", 0, async function (done) { systemVibrator.vibrate({ mode: 'short', - success: function() { - expect(true).assertTrue(); - console.log('vibrate is successful'); - done(); + success: function () { + expect(true).assertTrue(); + console.log('vibrate is successful'); + done(); }, - fail: function(data, code) { - expect(false).assertTrue(); - console.log('vibrate is failed, data: ' + data + "code: " + code); - done(); + fail: function (data, code) { + expect(false).assertTrue(); + console.log('vibrate is failed, data: ' + data + "code: " + code); + done(); }, - complete: function() { - console.log('vibrate is completed'); - done(); + complete: function () { + console.log('vibrate is completed'); + done(); } - }); + }); }) /* - * @tc.name:VibratorJsTest020 + * @tc.name:VibratorJsTest018 * @tc.desc:verify app info is not null * @tc.type: FUNC - * @tc.require: Issue Number + * @tc.require: I53SGE */ - it("VibratorJsTest020", 0, async function (done) { + it("VibratorJsTest018", 0, async function (done) { systemVibrator.vibrate({ mode: 'long', - success: function() { - expect(true).assertTrue(); - console.log('vibrate is successful'); - done(); + success: function () { + expect(true).assertTrue(); + console.log('vibrate is successful'); + done(); }, - fail: function(data, code) { - expect(false).assertTrue(); - console.log('vibrate is failed, data: ' + data + "code: " + code); - done(); + fail: function (data, code) { + expect(false).assertTrue(); + console.log('vibrate is failed, data: ' + data + "code: " + code); + done(); }, - complete: function() { - console.log('vibrate is completed'); - done(); + complete: function () { + console.log('vibrate is completed'); + done(); } - }); + }); }) /* - * @tc.name:VibratorJsTest021 + * @tc.name:VibratorJsTest019 * @tc.desc:verify app info is not null * @tc.type: FUNC - * @tc.require: Issue Number + * @tc.require: I53SGE */ - it("VibratorJsTest021", 0, async function (done) { + it("VibratorJsTest019", 0, async function (done) { systemVibrator.vibrate({ - success: function() { - expect(true).assertTrue(); - console.log('vibrate is successful'); - done(); + success: function () { + expect(true).assertTrue(); + console.log('vibrate is successful'); + done(); }, - fail: function(data, code) { - expect(false).assertTrue(); - console.log('vibrate is failed, data: ' + data + "code: " + code); - done(); + fail: function (data, code) { + expect(false).assertTrue(); + console.log('vibrate is failed, data: ' + data + "code: " + code); + done(); }, - complete: function() { - console.log('vibrate is completed'); - done(); + complete: function () { + console.log('vibrate is completed'); + done(); } - }); + }); }) /* - * @tc.name:VibratorJsTest022 + * @tc.name:VibratorJsTest020 * @tc.desc:verify app info is not null * @tc.type: FUNC - * @tc.require: Issue Number + * @tc.require: I53SGE */ - it("VibratorJsTest022", 0, async function (done) { + it("VibratorJsTest020", 0, async function (done) { systemVibrator.vibrate({ - success: function() { - expect(true).assertTrue(); - console.log('vibrate is successful'); - done(); + success: function () { + expect(true).assertTrue(); + console.log('vibrate is successful'); + done(); }, - }); + }); }) /* @@ -716,7 +585,7 @@ describe("VibratorJsTest", function () { duration: 1000 }, { usage: "unknown" - }, (error)=>{ + }, (error) => { if (error) { console.info('VibrateTest001 startVibration error'); expect(false).assertTrue(); @@ -724,7 +593,7 @@ describe("VibratorJsTest", function () { console.info('VibrateTest001 startVibration success'); expect(true).assertTrue(); } - setTimeout(()=>{ + setTimeout(() => { done(); }, 500); }); @@ -743,13 +612,13 @@ describe("VibratorJsTest", function () { duration: 1000 }, { usage: "unknown" - }, (error)=>{ + }, (error) => { if (error) { expect(true).assertTrue(); } else { expect(false).assertTrue(); } - setTimeout(()=>{ + setTimeout(() => { done(); }, 500); }); @@ -768,30 +637,24 @@ describe("VibratorJsTest", function () { * @tc.require: I53SGE */ it("VibrateTest003", 0, async function (done) { - if (g_execute) { - vibrator.startVibration({ - type: "preset", - effectId: "haptic.clock.timer", - count: 1, - }, { - usage: "unknown" - }, (error)=>{ - if (error) { - console.info('VibrateTest003 vibrator error'); - expect(false).assertTrue(); - } else { - console.info('VibrateTest003 vibrator success'); - expect(true).assertTrue(); - } - setTimeout(()=>{ - done(); - }, 500); - }); - } else { - console.info('VibrateTest003 vibrator success'); - expect(true).assertTrue(); - done(); - } + vibrator.startVibration({ + type: "preset", + effectId: "haptic.clock.timer", + count: 1, + }, { + usage: "unknown" + }, (error) => { + if (error) { + console.info('VibrateTest003 vibrator error'); + expect(false).assertTrue(); + } else { + console.info('VibrateTest003 vibrator success'); + expect(true).assertTrue(); + } + setTimeout(() => { + done(); + }, 500); + }); }) /* @@ -808,13 +671,13 @@ describe("VibratorJsTest", function () { count: 3, }, { usage: "unknown" - }, (error)=>{ + }, (error) => { if (error) { expect(true).assertTrue(); } else { expect(false).assertTrue(); } - setTimeout(()=>{ + setTimeout(() => { done(); }, 500); }); @@ -833,29 +696,23 @@ describe("VibratorJsTest", function () { * @tc.require: I53SGE */ it("VibrateTest005", 0, async function (done) { - if (g_execute) { - try { - vibrator.startVibration({ - type: "preset", - effectId: "haptic.clock.timer", - count: 3, - }, { - usage: "" - }, (error)=>{ - expect(false).assertTrue(); - setTimeout(()=>{ - done(); - }, 500); - }); - } catch (error) { - console.info(error); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); - done(); - } - } else { - console.info('VibrateTest005 vibrator success'); - expect(true).assertTrue(); + try { + vibrator.startVibration({ + type: "preset", + effectId: "haptic.clock.timer", + count: 3, + }, { + usage: "" + }, (error) => { + expect(false).assertTrue(); + setTimeout(() => { + done(); + }, 500); + }); + } catch (error) { + console.info(error); + expect(error.code).assertEqual(PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); } }) @@ -889,9 +746,9 @@ describe("VibratorJsTest", function () { duration: 1000, }, { usage: "unknown" - }).then(()=>{ + }).then(() => { expect(true).assertTrue(); - }).catch((error)=>{ + }).catch((error) => { expect(false).assertTrue(); }); done(); @@ -910,9 +767,9 @@ describe("VibratorJsTest", function () { duration: 1000 }, { usage: "unknown" - }).then(()=>{ + }).then(() => { expect(false).assertTrue(); - }).catch((error)=>{ + }).catch((error) => { expect(true).assertTrue(); }); done(); @@ -931,24 +788,18 @@ describe("VibratorJsTest", function () { * @tc.require: I53SGE */ it("VibrateTest009", 0, async function (done) { - if (g_execute) { - await vibrator.startVibration({ - type: "preset", - effectId: "haptic.clock.timer", - count: 1, - }, { - usage: "unknown" - }).then(()=>{ - expect(true).assertTrue(); - }).catch((error)=>{ - expect(false).assertTrue(); - }); - done(); - } else { - console.info('VibrateTest009 vibrator success'); + await vibrator.startVibration({ + type: "preset", + effectId: "haptic.clock.timer", + count: 1, + }, { + usage: "unknown" + }).then(() => { expect(true).assertTrue(); - done(); - } + }).catch((error) => { + expect(false).assertTrue(); + }); + done(); }) /* @@ -965,10 +816,10 @@ describe("VibratorJsTest", function () { count: 3, }, { usage: "unknown" - }).then(()=>{ + }).then(() => { expect(false).assertTrue(); done(); - }).catch((error)=>{ + }).catch((error) => { expect(true).assertTrue(); done(); }); @@ -987,30 +838,24 @@ describe("VibratorJsTest", function () { * @tc.require: I53SGE */ it("VibrateTest011", 0, async function (done) { - if (g_execute) { - try { - vibrator.startVibration({ - type: "preset", - effectId: "haptic.clock.timer", - count: 3, - }, { - usage: "" - }).then(()=>{ - expect(false).assertTrue(); - done(); - }).catch((error)=>{ - expect(true).assertTrue(); - done(); - }); - } catch (error) { - console.info(error); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + try { + vibrator.startVibration({ + type: "preset", + effectId: "haptic.clock.timer", + count: 3, + }, { + usage: "" + }).then(() => { + expect(false).assertTrue(); done(); - } - } else { - console.info('VibrateTest011 vibrator success'); - expect(true).assertTrue(); + }).catch((error) => { + expect(true).assertTrue(); + done(); + }); + } catch (error) { + console.info(error); + expect(error.code).assertEqual(PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); } }) @@ -1051,13 +896,13 @@ describe("VibratorJsTest", function () { duration: 100 }, { usage: "unknown" - }, (error)=>{ + }, (error) => { if (error) { expect(false).assertTrue(); } else { expect(true).assertTrue(); } - setTimeout(()=>{ + setTimeout(() => { done(); }, 500); }); @@ -1070,7 +915,7 @@ describe("VibratorJsTest", function () { duration: 100 }, { usage: "unknown" - }, (error)=>{ + }, (error) => { if (error) { expect(false).assertTrue(); reject(); @@ -1081,9 +926,9 @@ describe("VibratorJsTest", function () { }); }) - await promise.then(() =>{ + await promise.then(() => { return vibratePromise(); - }, ()=>{ + }, () => { console.info("StartVibrationTest013 reject"); }) done(); @@ -1096,57 +941,51 @@ describe("VibratorJsTest", function () { * @tc.require: I53SGE */ it("VibrateTest014", 0, async function (done) { - if (g_execute) { - function vibratePromise() { - return new Promise((resolve, reject) => { - vibrator.startVibration({ - type: "preset", - effectId: "haptic.clock.timer", - count: 1, - }, { - usage: "unknown" - }, (error)=>{ - if (error) { - expect(error.code).assertEqual(OPERATION_FAIL_CODE); - expect(error.message).assertEqual(OPERATION_FAIL_MSG); - } else { - expect(false).assertTrue(); - } - setTimeout(()=>{ - done(); - }, 500); - }); - }) - } - - let promise = new Promise((resolve, reject) => { + function vibratePromise() { + return new Promise((resolve, reject) => { vibrator.startVibration({ - type: "time", - duration: 100 + type: "preset", + effectId: "haptic.clock.timer", + count: 1, }, { - usage: "alarm" - }, (error)=>{ + usage: "unknown" + }, (error) => { if (error) { - expect(false).assertTrue(); - reject(); + expect(error.code).assertEqual(OPERATION_FAIL_CODE); + expect(error.message).assertEqual(OPERATION_FAIL_MSG); } else { - expect(true).assertTrue(); - resolve(); + expect(false).assertTrue(); } + setTimeout(() => { + done(); + }, 500); }); }) - - await promise.then(() =>{ - return vibratePromise(); - }, ()=>{ - console.info("VibrateTest014 reject"); - }) - done(); - } else { - console.info('VibrateTest014 vibrator success'); - expect(true).assertTrue(); - done(); } + + let promise = new Promise((resolve, reject) => { + vibrator.startVibration({ + type: "time", + duration: 100 + }, { + usage: "alarm" + }, (error) => { + if (error) { + expect(false).assertTrue(); + reject(); + } else { + expect(true).assertTrue(); + resolve(); + } + }); + }) + + await promise.then(() => { + return vibratePromise(); + }, () => { + console.info("VibrateTest014 reject"); + }) + done(); }) /* @@ -1156,55 +995,49 @@ describe("VibratorJsTest", function () { * @tc.require: I53SGE */ it("VibrateTest015", 0, async function (done) { - if (g_execute) { - function vibratePromise() { - return new Promise((resolve, reject) => { - vibrator.startVibration({ - type: "preset", - effectId: "haptic.clock.timer", - count: 3, - }, { - usage: "unknown", - }, (error)=>{ - if (error) { - expect(false).assertTrue(); - } else { - expect(true).assertTrue(); - } - setTimeout(()=>{ - done(); - }, 500); - }); - }) - } - - let promise = new Promise((resolve, reject) => { + function vibratePromise() { + return new Promise((resolve, reject) => { vibrator.startVibration({ - type: "time", - duration: 10000 + type: "preset", + effectId: "haptic.clock.timer", + count: 3, }, { - usage: "alarm" - }, (error)=>{ + usage: "unknown", + }, (error) => { if (error) { expect(false).assertTrue(); - reject(); } else { expect(true).assertTrue(); - resolve(); } + setTimeout(() => { + done(); + }, 500); }); }) - await promise.then(() =>{ - return vibratePromise(); - }, ()=>{ - console.info("VibrateTest015 reject"); - }) - done(); - } else { - console.info('VibrateTest015 vibrator success'); - expect(true).assertTrue(); - done(); } + + let promise = new Promise((resolve, reject) => { + vibrator.startVibration({ + type: "time", + duration: 10000 + }, { + usage: "alarm" + }, (error) => { + if (error) { + expect(false).assertTrue(); + reject(); + } else { + expect(true).assertTrue(); + resolve(); + } + }); + }) + await promise.then(() => { + return vibratePromise(); + }, () => { + console.info("VibrateTest015 reject"); + }) + done(); }) /* @@ -1214,58 +1047,50 @@ describe("VibratorJsTest", function () { * @tc.require: I53SGE */ it("VibrateTest016", 0, async function (done) { - if (g_execute) { - function vibratePromise() { - return new Promise((resolve, reject) => { - vibrator.startVibration({ - type: "preset", - effectId: "haptic.clock.timer", - count: 1, - }, { - usage: "unknown", - }, (error)=>{ - if (error) { - expect(error.code).assertEqual(OPERATION_FAIL_CODE); - expect(error.message).assertEqual(OPERATION_FAIL_MSG); - } else { - expect(false).assertTrue(); - } - setTimeout(()=>{ - done(); - }, 500); - }); - }) - } - - let promise = new Promise((resolve, reject) => { + function vibratePromise() { + return new Promise((resolve, reject) => { vibrator.startVibration({ - type: "preset", - effectId: "haptic.clock.timer", - count: 3, + type: "time", + duration: 3000, }, { - usage: "unknown", - }, (error)=>{ + usage: "alarm" + }, (error) => { if (error) { expect(false).assertTrue(); - reject(); } else { expect(true).assertTrue(); - resolve(); } + setTimeout(() => { + done(); + }, 500); }); }) - - await promise.then(() =>{ - return vibratePromise(); - }, ()=>{ - console.info("VibrateTest016 reject"); - }) - done(); - } else { - console.info('VibrateTest016 vibrator success'); - expect(true).assertTrue(); - done(); } + + let promise = new Promise((resolve, reject) => { + vibrator.startVibration({ + type: "preset", + effectId: "haptic.clock.timer", + count: 1, + }, { + usage: "unknown" + }, (error) => { + if (error) { + expect(false).assertTrue(); + reject(); + } else { + expect(true).assertTrue(); + resolve(); + } + }); + }) + + await promise.then(() => { + return vibratePromise(); + }, () => { + console.info("VibrateTest016 reject"); + }) + done(); }) /* @@ -1275,57 +1100,51 @@ describe("VibratorJsTest", function () { * @tc.require: I53SGE */ it("VibrateTest017", 0, async function (done) { - if (g_execute) { - function vibratePromise() { - return new Promise((resolve, reject) => { - vibrator.startVibration({ - type: "time", - duration: 3000, - }, { - usage: "alarm" - }, (error)=>{ - if (error) { - expect(error.code).assertEqual(OPERATION_FAIL_CODE); - expect(error.message).assertEqual(OPERATION_FAIL_MSG); - } else { - expect(false).assertTrue(); - } - setTimeout(()=>{ - done(); - }, 500); - }); - }) - } - - let promise = new Promise((resolve, reject) => { + function vibratePromise() { + return new Promise((resolve, reject) => { vibrator.startVibration({ type: "preset", effectId: "haptic.clock.timer", count: 3, }, { usage: "unknown" - }, (error)=>{ + }, (error) => { if (error) { expect(false).assertTrue(); - reject(); } else { expect(true).assertTrue(); - resolve(); } + setTimeout(() => { + done(); + }, 500); }); }) - - await promise.then(() =>{ - return vibratePromise(); - }, ()=>{ - console.info("VibrateTest017 reject"); - }) - done(); - } else { - console.info('VibrateTest017 vibrator success'); - expect(true).assertTrue(); - done(); } + + let promise = new Promise((resolve, reject) => { + vibrator.startVibration({ + type: "preset", + effectId: "haptic.clock.timer", + count: 3, + }, { + usage: "unknown" + }, (error) => { + if (error) { + expect(false).assertTrue(); + reject(); + } else { + expect(true).assertTrue(); + resolve(); + } + }); + }) + + await promise.then(() => { + return vibratePromise(); + }, () => { + console.info("VibrateTest017 reject"); + }) + done(); }) /* @@ -1335,255 +1154,69 @@ describe("VibratorJsTest", function () { * @tc.require: I53SGE */ it("VibrateTest018", 0, async function (done) { - if (g_execute) { - function vibratePromise() { - return new Promise((resolve, reject) => { - vibrator.startVibration({ - type: "time", - duration: 3000, - }, { - usage: "alarm" - }, (error)=>{ - if (error) { - expect(false).assertTrue(); - } else { - expect(true).assertTrue(); - } - setTimeout(()=>{ - done(); - }, 500); - }); - }) - } - - let promise = new Promise((resolve, reject) => { + function vibratePromise() { + return new Promise((resolve, reject) => { vibrator.startVibration({ type: "preset", effectId: "haptic.clock.timer", count: 1, }, { - usage: "unknown" - }, (error)=>{ + usage: "ring" + }, (error) => { if (error) { expect(false).assertTrue(); - reject(); } else { expect(true).assertTrue(); - resolve(); } + setTimeout(() => { + done(); + }, 500); }); }) - - await promise.then(() =>{ - return vibratePromise(); - }, ()=>{ - console.info("VibrateTest018 reject"); - }) - done(); - } else { - console.info('VibrateTest018 vibrator success'); - expect(true).assertTrue(); - done(); } - }) - /* - * @tc.name:VibrateTest019 - * @tc.desc:verify app info is not null - * @tc.type: FUNC - * @tc.require: I53SGE - */ - it("VibrateTest019", 0, async function (done) { - if (g_execute) { - function vibratePromise() { - return new Promise((resolve, reject) => { - vibrator.startVibration({ - type: "preset", - effectId: "haptic.clock.timer", - count: 3, - }, { - usage: "unknown" - }, (error)=>{ - if (error) { - expect(false).assertTrue(); - } else { - expect(true).assertTrue(); - } - setTimeout(()=>{ - done(); - }, 500); - }); - }) - } - - let promise = new Promise((resolve, reject) => { - vibrator.startVibration({ - type: "preset", - effectId: "haptic.clock.timer", - count: 3, - }, { - usage: "unknown" - }, (error)=>{ - if (error) { - expect(false).assertTrue(); - reject(); - } else { - expect(true).assertTrue(); - resolve(); - } - }); - }) - - await promise.then(() =>{ - return vibratePromise(); - }, ()=>{ - console.info("VibrateTest019 reject"); - }) - done(); - } else { - console.info('VibrateTest019 vibrator success'); - expect(true).assertTrue(); - done(); - } - }) + let promise = new Promise((resolve, reject) => { + vibrator.startVibration({ + type: "preset", + effectId: "haptic.clock.timer", + count: 1, + }, { + usage: "notification" + }, (error) => { + if (error) { + expect(false).assertTrue(); + reject(); + } else { + expect(true).assertTrue(); + resolve(); + } + }); + }) - /* - * @tc.name:VibrateTest020 - * @tc.desc:verify app info is not null - * @tc.type: FUNC - * @tc.require: I53SGE - */ - it("VibrateTest020", 0, async function (done) { - if (g_execute) { - function vibratePromise() { - return new Promise((resolve, reject) => { - vibrator.startVibration({ - type: "preset", - effectId: "haptic.clock.timer", - count: 1, - }, { - usage: "ring" - }, (error)=>{ - if (error) { - expect(false).assertTrue(); - } else { - expect(true).assertTrue(); - } - setTimeout(()=>{ - done(); - }, 500); - }); - }) - } - - let promise = new Promise((resolve, reject) => { - vibrator.startVibration({ - type: "preset", - effectId: "haptic.clock.timer", - count: 1, - }, { - usage: "notification" - }, (error)=>{ - if (error) { - expect(false).assertTrue(); - reject(); - } else { - expect(true).assertTrue(); - resolve(); - } - }); - }) - - await promise.then(() =>{ - return vibratePromise(); - }, ()=>{ - console.info("VibrateTest020 reject"); - }) - done(); - } else { - console.info('VibrateTest020 vibrator success'); - expect(true).assertTrue(); - done(); - } + await promise.then(() => { + return vibratePromise(); + }, () => { + console.info("VibrateTest018 reject"); + }) + done(); }) /* - * @tc.name:VibrateTest021 - * @tc.desc:verify app info is not null - * @tc.type: FUNC - * @tc.require: I53SGE - */ - it("VibrateTest021", 0, async function (done) { - if (g_execute) { - function vibratePromise() { - return new Promise((resolve, reject) => { - vibrator.startVibration({ - type: "preset", - effectId: "haptic.clock.timer", - count: 1, - }, { - usage: "unknown" - }, (error)=>{ - if (error) { - expect(error.code).assertEqual(OPERATION_FAIL_CODE); - expect(error.message).assertEqual(OPERATION_FAIL_MSG); - } else { - expect(false).assertTrue(); - } - setTimeout(()=>{ - done(); - }, 500); - }); - }) - } - - let promise = new Promise((resolve, reject) => { - vibrator.startVibration({ - type: "preset", - effectId: "haptic.clock.timer", - count: 1, - }, { - usage: "notification" - }, (error)=>{ - if (error) { - expect(false).assertTrue(); - reject(); - } else { - expect(true).assertTrue(); - resolve(); - } - }); - }) - - await promise.then(() =>{ - return vibratePromise(); - }, ()=>{ - console.info("VibrateTest021 reject"); - }) - done(); - } else { - console.info('VibrateTest021 vibrator success'); - expect(true).assertTrue(); - done(); - } - }) - - /* - * @tc.name:VibratorJsTest022 - * @tc.desc:verify app info is not null - * @tc.type: FUNC - * @tc.require: I5SWJI - */ - it("VibrateTest022", 0, async function (done) { + * @tc.name:VibratorJsTest019 + * @tc.desc:verify app info is not null + * @tc.type: FUNC + * @tc.require: I5SWJI + */ + it("VibratorJsTest019", 0, async function (done) { function vibrateCallback(error) { if (error) { - console.info('VibrateTest022 stop fail'); + console.info('VibratorJsTest019 stop fail'); expect(false).assertTrue(); } else { - console.info('VibrateTest022 stop off'); + console.info('VibratorJsTest019 stop off'); expect(false).assertTrue(); } - setTimeout(()=>{ + setTimeout(() => { done(); }, 500); } @@ -1598,78 +1231,23 @@ describe("VibratorJsTest", function () { }) /* - * @tc.name:VibrateTest023 - * @tc.desc:verify app info is not null - * @tc.type: FUNC - * @tc.require: I5SWJI - */ - it("VibrateTest023", 0, async function (done) { - if (g_execute) { - function stopPromise() { - return new Promise((resolve, reject) => { - vibrator.stopVibration("preset").then(() => { - console.log("VibrateTest023 off success"); - expect(true).assertTrue(); - setTimeout(()=>{ - resolve(); - }, 500); - }, (error)=>{ - expect(false).assertTrue(); - console.log("VibrateTest023 off error"); - setTimeout(()=>{ - reject(); - }, 500); - }); - }) - } - - let promise = new Promise((resolve, reject) => { - vibrator.startVibration("haptic.clock.timer").then(() => { - console.log("VibrateTest023 vibrate success"); - expect(true).assertTrue(); - setTimeout(()=>{ - resolve(); - }, 500); - }, (error)=>{ - expect(false).assertTrue(); - console.log("VibrateTest023 vibrate error"); - setTimeout(()=>{ - reject(); - }, 500); - }); - }) - - await promise.then(() =>{ - return stopPromise(); - }, ()=>{ - console.info("VibrateTest023 reject"); - }) - done(); - } else { - console.info('VibrateTest023 vibrator success'); - expect(true).assertTrue(); - done(); - } - }) - - /* - * @tc.name:VibrateTest024 + * @tc.name:VibrateTest020 * @tc.desc:verify app info is not null * @tc.type: FUNC * @tc.require: I5SWJI */ - it("VibrateTest024", 0, async function (done) { + it("VibrateTest020", 0, async function (done) { try { vibrator.stopVibration("").then(() => { - console.log("VibrateTest024 stop error"); + console.log("VibrateTest020 stop error"); expect(false).assertTrue(); - setTimeout(()=>{ + setTimeout(() => { done(); }, 500); - }, (error)=>{ + }, (error) => { expect(false).assertTrue(); - console.log("VibrateTest024 stop error"); - setTimeout(()=>{ + console.log("VibrateTest020 stop error"); + setTimeout(() => { done(); }, 500); }); @@ -1682,24 +1260,24 @@ describe("VibratorJsTest", function () { }) /* - * @tc.name:VibrateTest025 + * @tc.name:VibrateTest021 * @tc.desc:verify app info is not null * @tc.type: FUNC * @tc.require: I5SWJI */ - it("VibrateTest025", 0, async function (done) { + it("VibrateTest021", 0, async function (done) { function stopPromise() { return new Promise((resolve, reject) => { vibrator.stopVibration("time").then(() => { - console.log("VibrateTest025 stop success"); + console.log("VibrateTest021 stop success"); expect(true).assertTrue(); - setTimeout(()=>{ + setTimeout(() => { resolve(); }, 500); - }, (error)=>{ + }, (error) => { expect(false).assertTrue(); - console.log("VibrateTest025 stop error"); - setTimeout(()=>{ + console.log("VibrateTest021 stop error"); + setTimeout(() => { reject(); }, 500); }); @@ -1708,24 +1286,24 @@ describe("VibratorJsTest", function () { let promise = new Promise((resolve, reject) => { vibrator.vibrate(180000).then(() => { - console.log("VibrateTest025 vibrate success"); + console.log("VibrateTest021 vibrate success"); expect(true).assertTrue(); - setTimeout(()=>{ + setTimeout(() => { resolve(); }, 500); - }, (error)=>{ + }, (error) => { expect(false).assertTrue(); - console.log("VibrateTest025 vibrate error"); - setTimeout(()=>{ + console.log("VibrateTest021 vibrate error"); + setTimeout(() => { reject(); }, 500); }); }) - await promise.then(() =>{ + await promise.then(() => { return stopPromise(); - }, ()=>{ - console.info("VibrateTest025 reject"); + }, () => { + console.info("VibrateTest021 reject"); }) done(); }) -- Gitee From 656cc63d7fd4a21e498779e2586ae32d77755ee4 Mon Sep 17 00:00:00 2001 From: hellohyh001 Date: Wed, 1 Mar 2023 09:25:06 +0000 Subject: [PATCH 10/11] fixed 5488a3b from https://gitee.com/hellohyh001/sensors_miscdevice/pulls/174 update Signed-off-by: hellohyh001 --- services/miscdevice_service/src/miscdevice_service.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/miscdevice_service/src/miscdevice_service.cpp b/services/miscdevice_service/src/miscdevice_service.cpp index d011a8f..5d829a1 100644 --- a/services/miscdevice_service/src/miscdevice_service.cpp +++ b/services/miscdevice_service/src/miscdevice_service.cpp @@ -47,6 +47,7 @@ MiscdeviceService::~MiscdeviceService() if (vibratorThread_ != nullptr) { while (vibratorThread_->IsRunning()) { vibratorThread_->NotifyExit(); + vibratorThread_->NotifyExitSync(); } } } @@ -187,6 +188,7 @@ int32_t MiscdeviceService::CancelVibrator(int32_t vibratorId) while (vibratorThread_->IsRunning()) { MISC_HILOGD("Notify the vibratorThread, vibratorId : %{public}d", vibratorId); vibratorThread_->NotifyExit(); + vibratorThread_->NotifyExitSync(); } return NO_ERROR; } @@ -225,6 +227,7 @@ void MiscdeviceService::StartVibrateThread(VibrateInfo info) } while (vibratorThread_->IsRunning()) { vibratorThread_->NotifyExit(); + vibratorThread_->NotifyExitSync(); } vibratorThread_->UpdateVibratorEffect(info); vibratorThread_->Start("VibratorThread"); @@ -246,6 +249,7 @@ int32_t MiscdeviceService::StopVibratorEffect(int32_t vibratorId, const std::str while (vibratorThread_->IsRunning()) { MISC_HILOGD("notify the vibratorThread, vibratorId : %{public}d", vibratorId); vibratorThread_->NotifyExit(); + vibratorThread_->NotifyExitSync(); } return NO_ERROR; } -- Gitee From e342e81cb2375db48433846adb809c1ecaac5539 Mon Sep 17 00:00:00 2001 From: hellohyh001 Date: Mon, 27 Feb 2023 03:12:25 +0000 Subject: [PATCH 11/11] fixed 361a81d from https://gitee.com/hellohyh001/sensors_miscdevice_9/pulls/172 update Signed-off-by: hellohyh001 Change-Id: I43cc231aa237f47040a0a2808cbd1cfad54e6a7f --- interfaces/plugin/vibrator/src/vibrator_napi_error.cpp | 3 +++ .../plugin/vibrator/test/unittest/ExampleJsunit.test.js | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/interfaces/plugin/vibrator/src/vibrator_napi_error.cpp b/interfaces/plugin/vibrator/src/vibrator_napi_error.cpp index 159af0d..7fc86db 100755 --- a/interfaces/plugin/vibrator/src/vibrator_napi_error.cpp +++ b/interfaces/plugin/vibrator/src/vibrator_napi_error.cpp @@ -51,8 +51,11 @@ void ThrowErr(const napi_env &env, const int32_t errCode, const std::string &pri MISC_HILOGE("errCode: %{public}d is invalid", errCode); return; } + napi_handle_scope scope = nullptr; + napi_open_handle_scope(env, &scope); napi_value error = CreateBusinessError(env, errCode, msg.value()); napi_throw(env, error); + napi_close_handle_scope(env, scope); } } // namespace Sensors } // namespace OHOS \ No newline at end of file diff --git a/interfaces/plugin/vibrator/test/unittest/ExampleJsunit.test.js b/interfaces/plugin/vibrator/test/unittest/ExampleJsunit.test.js index b70fd62..136fd5a 100644 --- a/interfaces/plugin/vibrator/test/unittest/ExampleJsunit.test.js +++ b/interfaces/plugin/vibrator/test/unittest/ExampleJsunit.test.js @@ -992,7 +992,7 @@ describe("VibratorJsTest", function () { * @tc.name:VibrateTest015 * @tc.desc:verify app info is not null * @tc.type: FUNC - * @tc.require: I53SGE + * @tc.require: I6HKTI */ it("VibrateTest015", 0, async function (done) { function vibratePromise() { @@ -1044,7 +1044,7 @@ describe("VibratorJsTest", function () { * @tc.name:VibrateTest016 * @tc.desc:verify app info is not null * @tc.type: FUNC - * @tc.require: I53SGE + * @tc.require: I6HKTI */ it("VibrateTest016", 0, async function (done) { function vibratePromise() { @@ -1097,7 +1097,7 @@ describe("VibratorJsTest", function () { * @tc.name:VibrateTest017 * @tc.desc:verify app info is not null * @tc.type: FUNC - * @tc.require: I53SGE + * @tc.require: I6HKTI */ it("VibrateTest017", 0, async function (done) { function vibratePromise() { @@ -1151,7 +1151,7 @@ describe("VibratorJsTest", function () { * @tc.name:VibrateTest018 * @tc.desc:verify app info is not null * @tc.type: FUNC - * @tc.require: I53SGE + * @tc.require: I6HKTI */ it("VibrateTest018", 0, async function (done) { function vibratePromise() { -- Gitee