codex Signed-off-by:xia-haoran1<xiahaoran@huawei.com>

Signed-off-by: xia-haoran1 <xia-haoran1>
This commit is contained in:
xia-haoran1 2022-04-06 15:37:25 +08:00
parent c64a4d045f
commit 2b4cddb669
3 changed files with 24 additions and 1 deletions

View File

@ -27,6 +27,10 @@ void DeviceStatusAgent::DeviceStatusAgentCallback::OnDevicestatusChanged(
static_cast<DevicestatusDataUtils::DevicestatusType>(devicestatusData.type),
static_cast<DevicestatusDataUtils::DevicestatusValue>(devicestatusData.value));
std::shared_ptr<DeviceStatusAgent> agent = agent_.lock();
if (agent == nullptr) {
DEV_HILOGE(SERVICE, "agent is nullptr");
return;
}
agent->agentEvent_->OnEventResult(devicestatusData);
}

View File

@ -97,6 +97,10 @@ void DevicestatusClient::SubscribeCallback(const DevicestatusDataUtils::Devicest
{
DEV_HILOGD(INNERKIT, "Enter");
DEVICESTATUS_RETURN_IF((callback == nullptr) || (Connect() != ERR_OK));
if (devicestatusProxy_ == nullptr) {
DEV_HILOGE(SERVICE, "devicestatusProxy_ is nullptr");
return;
}
devicestatusProxy_->Subscribe(type, callback);
DEV_HILOGD(INNERKIT, "Exit");
}
@ -106,6 +110,10 @@ void DevicestatusClient::UnSubscribeCallback(const DevicestatusDataUtils::Device
{
DEV_HILOGD(INNERKIT, "Enter");
DEVICESTATUS_RETURN_IF((callback == nullptr) || (Connect() != ERR_OK));
if (devicestatusProxy_ == nullptr) {
DEV_HILOGE(SERVICE, "devicestatusProxy_ is nullptr");
return;
}
devicestatusProxy_->UnSubscribe(type, callback);
DEV_HILOGD(INNERKIT, "Exit");
}
@ -119,6 +127,10 @@ DevicestatusDataUtils::DevicestatusData DevicestatusClient::GetDevicestatusData(
devicestatusData.value = DevicestatusDataUtils::DevicestatusValue::VALUE_INVALID;
DEVICESTATUS_RETURN_IF_WITH_RET((Connect() != ERR_OK), devicestatusData);
if (devicestatusProxy_ == nullptr) {
DEV_HILOGE(SERVICE, "devicestatusProxy_ is nullptr");
return devicestatusData;
}
devicestatusData = devicestatusProxy_->GetCache(type);
DEV_HILOGD(INNERKIT, "Exit");
return devicestatusData;

View File

@ -78,6 +78,10 @@ void DevicestatusMsdpRdb::Disable()
ErrCode DevicestatusMsdpRdb::NotifyMsdpImpl(const DevicestatusDataUtils::DevicestatusData& data)
{
DEV_HILOGI(SERVICE, "Enter");
if (g_rdb == nullptr) {
DEV_HILOGE(SERVICE, "g_rdb is nullptr");
return ERR_NG;
}
if (g_rdb->GetCallbacksImpl() == nullptr) {
DEV_HILOGI(SERVICE, "callbacksImpl is nullptr");
return ERR_NG;
@ -114,7 +118,10 @@ int32_t DevicestatusMsdpRdb::TrigerData(const std::unique_ptr<NativeRdb::ResultS
{
int32_t columnIndex;
int32_t intVal;
if (resultSet == nullptr) {
DEV_HILOGE(SERVICE, "resultSet is nullptr");
return ERR_NG;
}
int32_t ret = resultSet->GetColumnIndex("ID", columnIndex);
DEV_HILOGI(SERVICE, "TrigerDatabaseObserver GetColumnIndex = %{public}d", columnIndex);
if (ret != ERR_OK) {