From 8bc2d5a027afdb440023b79588087ee85b574740 Mon Sep 17 00:00:00 2001 From: lumingfei0525 Date: Fri, 17 Nov 2023 11:19:33 +0800 Subject: [PATCH] add analysis permission & set analysis status Signed-off-by: lumingfei0525 --- .../src/media_datashare_ext_ability.cpp | 4 ++++ .../src/medialibrary_object_utils.cpp | 4 +--- .../src/medialibrary_photo_operations.cpp | 5 +++-- .../inner_api/media_library_helper/include/vision_column.h | 1 - 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/frameworks/innerkitsimpl/medialibrary_data_extension/src/media_datashare_ext_ability.cpp b/frameworks/innerkitsimpl/medialibrary_data_extension/src/media_datashare_ext_ability.cpp index 3f79b42d57..c097f01e33 100644 --- a/frameworks/innerkitsimpl/medialibrary_data_extension/src/media_datashare_ext_ability.cpp +++ b/frameworks/innerkitsimpl/medialibrary_data_extension/src/media_datashare_ext_ability.cpp @@ -355,6 +355,10 @@ static int32_t PhotoAccessHelperPermCheck(MediaLibraryCommand &cmd, const bool i OperationObject::PAH_ALBUM, OperationObject::PAH_MAP, OperationObject::PAH_FORM_MAP, + OperationObject::ANALYSIS_PHOTO_ALBUM, + OperationObject::ANALYSIS_PHOTO_MAP, + OperationObject::VISION_OCR, + OperationObject::VISION_AESTHETICS, }; int32_t err = HandleSecurityComponentPermission(cmd); diff --git a/frameworks/innerkitsimpl/medialibrary_data_extension/src/medialibrary_object_utils.cpp b/frameworks/innerkitsimpl/medialibrary_data_extension/src/medialibrary_object_utils.cpp index 9326eb1f3e..5af3c43c6f 100644 --- a/frameworks/innerkitsimpl/medialibrary_data_extension/src/medialibrary_object_utils.cpp +++ b/frameworks/innerkitsimpl/medialibrary_data_extension/src/medialibrary_object_utils.cpp @@ -1603,9 +1603,7 @@ static int32_t GetRootDirAssetByRelativePath(const string &relativePath, DirAsse void MediaLibraryObjectUtils::UpdateAnalysisProp(const std::string value) { int ret = SetParameter("persist.multimedia.media_analysis_service.hasdata", value.c_str()); - if (ret == 0) { - MEDIA_INFO_LOG("UpdateAnalysisProp succ"); - } else { + if (ret != 0) { MEDIA_ERR_LOG("Failed to UpdateAnalysisProp, result:%{public}d", ret); } } diff --git a/frameworks/innerkitsimpl/medialibrary_data_extension/src/medialibrary_photo_operations.cpp b/frameworks/innerkitsimpl/medialibrary_data_extension/src/medialibrary_photo_operations.cpp index 8a7d19e9c5..c7828a4c2e 100644 --- a/frameworks/innerkitsimpl/medialibrary_data_extension/src/medialibrary_photo_operations.cpp +++ b/frameworks/innerkitsimpl/medialibrary_data_extension/src/medialibrary_photo_operations.cpp @@ -58,6 +58,7 @@ using namespace OHOS::RdbDataShareAdapter; namespace OHOS { namespace Media { +static const string ANALYSIS_HAS_DATA = "1"; shared_ptr PhotoEditingRecord::instance_ = nullptr; mutex PhotoEditingRecord::mutex_; @@ -390,7 +391,7 @@ int32_t MediaLibraryPhotoOperations::CreateV9(MediaLibraryCommand& cmd) return E_HAS_DB_ERROR; } transactionOprn.Finish(); - MediaLibraryObjectUtils::UpdateAnalysisProp("0"); + MediaLibraryObjectUtils::UpdateAnalysisProp(ANALYSIS_HAS_DATA); return outRow; } @@ -476,7 +477,7 @@ int32_t MediaLibraryPhotoOperations::CreateV10(MediaLibraryCommand& cmd) CHECK_AND_RETURN_RET(ret == E_OK, ret); } cmd.SetResult(fileUri); - MediaLibraryObjectUtils::UpdateAnalysisProp("0"); + MediaLibraryObjectUtils::UpdateAnalysisProp(ANALYSIS_HAS_DATA); return outRow; } diff --git a/interfaces/inner_api/media_library_helper/include/vision_column.h b/interfaces/inner_api/media_library_helper/include/vision_column.h index 939e0feea3..6cfb2eea9b 100644 --- a/interfaces/inner_api/media_library_helper/include/vision_column.h +++ b/interfaces/inner_api/media_library_helper/include/vision_column.h @@ -44,7 +44,6 @@ const std::string OCR_VERSION = "ocr_version"; const std::string OCR_TEXT_MSG = "ocr_text_msg"; const std::string OCR_WIDTH = "width"; const std::string OCR_HEIGHT = "height"; -const std::string OCR_PRE_MSG = "ocr_pre_msg"; const std::string CREATE_TAB_ANALYSIS_OCR = "CREATE TABLE IF NOT EXISTS " + VISION_OCR_TABLE + " (" + ID + " INTEGER PRIMARY KEY AUTOINCREMENT, " + FILE_ID + " INT UNIQUE, " + -- Gitee