Pre Merge pull request !327 from yaofangyong/3.x

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 list: Array<Permissions> = ['ohos.permission.READ_IMAGEVIDEO', 'ohos.permission.WRITE_IMAGEVIDEO'];
-    // let permissionRequestResult: Object;
+    let permissionRequestResult: Object;
-    // let atManager = abilityAccessCtrl.createAtManager();
+    let atManager = abilityAccessCtrl.createAtManager();
-    // atManager.requestPermissionsFromUser(this.context, list, (err: BusinessError, result: Object) => {
+    atManager.requestPermissionsFromUser(this.context, list, (err: BusinessError, result: Object) => {
-    //   if (err) {
+      if (err) {
-    //
+
-    //   } else {
+      } else {
-    //     permissionRequestResult = result;
+        permissionRequestResult = result;
-    //
+
-    //   }
+      }
-    // })
+    })
 
     hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onWindowStageCreate');
 

entry/src/main/ets/pages/dataShareUriLoadPage.ets

@@ -36,16 +36,24 @@ struct DataShareUriLoadPage {
         Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) {
           Button("点击加载Uri并展示")
             .onClick(async () => {
-              let photoSelectOptions = new photoAccessHelper.PhotoSelectOptions();
+              const context = getContext(this)
-              photoSelectOptions.MIMEType = photoAccessHelper.PhotoViewMIMETypes.IMAGE_TYPE;
+              let phAccessHelper = photoAccessHelper.getPhotoAccessHelper(context)
-              photoSelectOptions.maxSelectNumber = 1;
+              let predicates: dataSharePredicates.DataSharePredicates = new dataSharePredicates.DataSharePredicates
-              let uris: Array<string> = [];
+              let fetchOptions: photoAccessHelper.FetchOptions = {
-              let photoViewPicker = new photoAccessHelper.PhotoViewPicker();
+                fetchColumns:[],
-              let photoSelectResult: photoAccessHelper.PhotoSelectResult = await photoViewPicker.select(photoSelectOptions);
+                predicates:predicates
-              uris = photoSelectResult.photoUris;
+              }
-              this.imageKnifeOption1 = {
+              let fetchResult = await phAccessHelper.getAssets(fetchOptions)
-                loadSrc: uris[0],
+              if(fetchResult != undefined) {
-                placeholderSrc:$r('app.media.loading')
+                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')
+                  }
+                }
               }
             }).margin({ top: 5, left: 3 })
           ImageKnifeComponent({ imageKnifeOption: this.imageKnifeOption1 }).width(300).height(300)

entry/src/main/module.json5

@@ -43,6 +43,26 @@
           ],
           "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"
+        }
       }
     ]
   }