From 22bb57a6beda624f2b04070640cf43b5cc9f28f0 Mon Sep 17 00:00:00 2001 From: Tome Date: Wed, 3 Sep 2025 14:56:25 +0800 Subject: [PATCH] alarm repair Signed-off-by: Tome --- services/cameraservice/base/src/dcamera_capture_info_cmd.cpp | 2 +- .../src/distributedcameramgr/dcamera_sink_controller.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services/cameraservice/base/src/dcamera_capture_info_cmd.cpp b/services/cameraservice/base/src/dcamera_capture_info_cmd.cpp index 13014ff8..8bb50d0a 100644 --- a/services/cameraservice/base/src/dcamera_capture_info_cmd.cpp +++ b/services/cameraservice/base/src/dcamera_capture_info_cmd.cpp @@ -114,7 +114,7 @@ int32_t DCameraCaptureInfoCmd::Unmarshal(const std::string& jsonStr) if (tokenId == nullptr || !cJSON_IsNumber(tokenId)) { tokenId_ = 0; } else { - tokenId_ = tokenId->valueint; + tokenId_ = static_cast(tokenId->valueint); } cJSON *accountId = cJSON_GetObjectItemCaseSensitive(rootValue, "accountId"); if (accountId == nullptr || !cJSON_IsString(accountId) || (accountId->valuestring == nullptr)) { diff --git a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp index 2f89cf0b..14870317 100644 --- a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp +++ b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp @@ -724,11 +724,11 @@ bool DCameraSinkController::CheckAclRight() .tokenId = tokenId_, }; DmAccessCallee dmDstCallee = { - .networkId = sinkDevId, .accountId = accountId, + .networkId = sinkDevId, .userId = userId, - .tokenId = sinkTokenId_, .pkgName = DCAMERA_PKG_NAME, + .tokenId = sinkTokenId_, }; DHLOGI("CheckAclRight srcDevId: %{public}s, accountId: %{public}s, sinkDevId: %{public}s", GetAnonyString(srcDevId_).c_str(), GetAnonyString(accountId).c_str(), GetAnonyString(sinkDevId).c_str()); -- Gitee