From 19e1ba952809e4908c28b2e4033f3da5085fe718 Mon Sep 17 00:00:00 2001
From: zgf <zenggaofeng2@h-partners.com>
Date: Tue, 23 Jul 2024 16:30:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4READ=5FIMAGEVIDEO=E5=92=8CWRI?=
 =?UTF-8?q?TE=5FIMAGEVIDEO=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zgf <zenggaofeng2@h-partners.com>
---
 .../main/ets/entryability/EntryAbility.ets    | 22 +++++++--------
 .../main/ets/pages/dataShareUriLoadPage.ets   | 28 +++++++------------
 entry/src/main/module.json5                   | 20 -------------
 3 files changed, 21 insertions(+), 49 deletions(-)

diff --git a/entry/src/main/ets/entryability/EntryAbility.ets b/entry/src/main/ets/entryability/EntryAbility.ets
index eac694c..488dcce 100644
--- a/entry/src/main/ets/entryability/EntryAbility.ets
+++ b/entry/src/main/ets/entryability/EntryAbility.ets
@@ -33,17 +33,17 @@ export default class EntryAbility extends UIAbility {
 
   async onWindowStageCreate(windowStage: window.WindowStage): Promise<void> {
     // Main window is created, set main page for this ability
-    let list: Array<Permissions> = ['ohos.permission.READ_IMAGEVIDEO', 'ohos.permission.WRITE_IMAGEVIDEO'];
-    let permissionRequestResult: Object;
-    let atManager = abilityAccessCtrl.createAtManager();
-    atManager.requestPermissionsFromUser(this.context, list, (err: BusinessError, result: Object) => {
-      if (err) {
-
-      } else {
-        permissionRequestResult = result;
-
-      }
-    })
+    // let list: Array<Permissions> = ['ohos.permission.READ_IMAGEVIDEO', 'ohos.permission.WRITE_IMAGEVIDEO'];
+    // let permissionRequestResult: Object;
+    // let atManager = abilityAccessCtrl.createAtManager();
+    // atManager.requestPermissionsFromUser(this.context, list, (err: BusinessError, result: Object) => {
+    //   if (err) {
+    //
+    //   } else {
+    //     permissionRequestResult = result;
+    //
+    //   }
+    // })
 
     hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onWindowStageCreate');
 
diff --git a/entry/src/main/ets/pages/dataShareUriLoadPage.ets b/entry/src/main/ets/pages/dataShareUriLoadPage.ets
index 4627686..bb71ac2 100644
--- a/entry/src/main/ets/pages/dataShareUriLoadPage.ets
+++ b/entry/src/main/ets/pages/dataShareUriLoadPage.ets
@@ -36,24 +36,16 @@ struct DataShareUriLoadPage {
         Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) {
           Button("点击加载Uri并展示")
             .onClick(async () => {
-              const context = getContext(this)
-              let phAccessHelper = photoAccessHelper.getPhotoAccessHelper(context)
-              let predicates: dataSharePredicates.DataSharePredicates = new dataSharePredicates.DataSharePredicates
-              let fetchOptions: photoAccessHelper.FetchOptions = {
-                fetchColumns:[],
-                predicates:predicates
-              }
-              let fetchResult = await phAccessHelper.getAssets(fetchOptions)
-              if(fetchResult != undefined) {
-                console.info("fetchResult success")
-                let photoAsset: photoAccessHelper.PhotoAsset = await fetchResult.getFirstObject()
-                if(photoAsset != undefined) {
-                  console.info("photoAsset.displayName :"+photoAsset.displayName)
-                  this.imageKnifeOption1 = {
-                    loadSrc: photoAsset.uri,
-                    placeholderSrc:$r('app.media.loading')
-                  }
-                }
+              let photoSelectOptions = new photoAccessHelper.PhotoSelectOptions();
+              photoSelectOptions.MIMEType = photoAccessHelper.PhotoViewMIMETypes.IMAGE_TYPE;
+              photoSelectOptions.maxSelectNumber = 1;
+              let uris: Array<string> = [];
+              let photoViewPicker = new photoAccessHelper.PhotoViewPicker();
+              let photoSelectResult: photoAccessHelper.PhotoSelectResult = await photoViewPicker.select(photoSelectOptions);
+              uris = photoSelectResult.photoUris;
+              this.imageKnifeOption1 = {
+                loadSrc: uris[0],
+                placeholderSrc:$r('app.media.loading')
               }
             }).margin({ top: 5, left: 3 })
           ImageKnifeComponent({ imageKnifeOption: this.imageKnifeOption1 }).width(300).height(300)
diff --git a/entry/src/main/module.json5 b/entry/src/main/module.json5
index e9c6f3e..9036eb0 100644
--- a/entry/src/main/module.json5
+++ b/entry/src/main/module.json5
@@ -43,26 +43,6 @@
           ],
           "when": "always"
         }
-      },
-      {
-        "name": "ohos.permission.WRITE_IMAGEVIDEO",
-        "reason":"$string:app_permission_WRITE_IMAGEVIDEO",
-        "usedScene": {
-          "abilities": [
-            "EntryAbility"
-          ],
-          "when": "always"
-        }
-      },
-      {
-        "name": "ohos.permission.READ_IMAGEVIDEO",
-        "reason": "$string:app_permission_READ_IMAGEVIDEO",
-        "usedScene": {
-          "abilities": [
-            "EntryAbility"
-          ],
-          "when": "always"
-        }
       }
     ]
   }