From 5fc3af6ff8475d959cbc0c0d728ba1c978fc3c83 Mon Sep 17 00:00:00 2001
From: zhanghang133 <zhanghang133@huawei.com>
Date: Fri, 26 Jul 2024 11:06:00 +0800
Subject: [PATCH] updata interface from cameraDevice->GetResourceCost to
 cameraHost->GetResourceCost

Signed-off-by: zhanghang133 <zhanghang133@huawei.com>
---
 camera/metadata/src/camera_metadata_info.cpp |  4 ++--
 camera/v1_3/ICameraDevice.idl                | 14 --------------
 camera/v1_3/ICameraHost.idl                  | 15 +++++++++++++++
 camera/v1_3/Types.idl                        |  4 ++--
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/camera/metadata/src/camera_metadata_info.cpp b/camera/metadata/src/camera_metadata_info.cpp
index 90a36eb2..4a764de9 100644
--- a/camera/metadata/src/camera_metadata_info.cpp
+++ b/camera/metadata/src/camera_metadata_info.cpp
@@ -1403,7 +1403,7 @@ std::string CameraMetadata::MetadataItemDump(const common_metadata_header_t *met
 
     int ret = FindCameraMetadataItem(metadataHeader, item, &entry);
     if (ret != 0) {
-        METADATA_ERR_LOG("get item error and item = %{public}d", item);
+        METADATA_ERR_LOG("get item error and item = %{public}u", item);
         return st;
     }
 
@@ -1430,7 +1430,7 @@ std::string CameraMetadata::MetadataItemDump(const common_metadata_header_t *met
             st = RationalItemToString(item, entry);
             break;
         default:
-            METADATA_ERR_LOG("invalid param and item = %{public}d", item);
+            METADATA_ERR_LOG("invalid param and item = %{public}u", item);
             break;
     }
 
diff --git a/camera/v1_3/ICameraDevice.idl b/camera/v1_3/ICameraDevice.idl
index 29d1f253..fe92417d 100644
--- a/camera/v1_3/ICameraDevice.idl
+++ b/camera/v1_3/ICameraDevice.idl
@@ -27,7 +27,6 @@ package ohos.hdi.camera.v1_3;
 import ohos.hdi.camera.v1_2.ICameraDevice;
 import ohos.hdi.camera.v1_3.IStreamOperatorCallback;
 import ohos.hdi.camera.v1_2.IStreamOperator;
-import ohos.hdi.camera.v1_3.Types;
 
 interface ICameraDevice extends ohos.hdi.camera.v1_2.ICameraDevice {
     /**
@@ -59,17 +58,4 @@ interface ICameraDevice extends ohos.hdi.camera.v1_2.ICameraDevice {
      * @version 1.0
      */
     GetSecureCameraSeq([out] unsigned long SeqId);
-
-    /**
-     * @brief Obtains the resourceCost of camera device.
-     *
-     * @param resourceCost Indicates the resources required to open this camera device.
-     * 
-     * @return Returns <b>NO_ERROR</b> if the operation is successful; returns an error code defined
-     * in {@link CamRetCode} otherwise.
-     *
-     * @since 5.0
-     * @version 1.0
-     */
-    GetResourceCost([out] CameraDeviceResourceCost resourceCost);
 }
diff --git a/camera/v1_3/ICameraHost.idl b/camera/v1_3/ICameraHost.idl
index e99b2f45..d526a887 100644
--- a/camera/v1_3/ICameraHost.idl
+++ b/camera/v1_3/ICameraHost.idl
@@ -27,6 +27,7 @@ package ohos.hdi.camera.v1_3;
 import ohos.hdi.camera.v1_2.ICameraHost;
 import ohos.hdi.camera.v1_3.ICameraDevice;
 import ohos.hdi.camera.v1_0.ICameraDeviceCallback;
+import ohos.hdi.camera.v1_3.Types;
 
 interface ICameraHost extends ohos.hdi.camera.v1_2.ICameraHost {
     /**
@@ -64,4 +65,18 @@ interface ICameraHost extends ohos.hdi.camera.v1_2.ICameraHost {
      * @version 1.0
      */
     OpenSecureCamera([in] String cameraId, [in] ICameraDeviceCallback callbackObj, [out] ICameraDevice device);
+
+    /**
+     * @brief Obtains the resourceCost of camera device.
+     *
+     * @param resourceCost Indicates the resources required to open this camera device.
+     * @param cameraId Indicates the ID of the camera device.
+     * 
+     * @return Returns <b>NO_ERROR</b> if the operation is successful; returns an error code defined
+     * in {@link CamRetCode} otherwise.
+     *
+     * @since 5.0
+     * @version 1.0
+     */
+    GetResourceCost([in] String cameraId, [out] CameraDeviceResourceCost resourceCost);
 }
diff --git a/camera/v1_3/Types.idl b/camera/v1_3/Types.idl
index db105483..3ea45f91 100644
--- a/camera/v1_3/Types.idl
+++ b/camera/v1_3/Types.idl
@@ -122,11 +122,11 @@ enum OperationMode : ohos.hdi.camera.v1_2.OperationMode_V1_2 {
     APERTURE_VIDEO = 20,
 
     /**
-    * flourscence photo mode, which dedicated to flourscence photo mode
+    * fluorescence photo mode, which dedicated to fluorescence photo mode
     * @since 5.0
     * @version 1.0
     */
-    FLOURSCENCE_PHOTO = 21,
+    FLUORESCENCE_PHOTO = 21,
 };
 
 /**
-- 
Gitee