!345 去除READ_IMAGEVIDEO和WRITE_IMAGEVIDEO权限以及修复部分heif图无法解码

Merge pull request !345 from zgf/master

CHANGELOG.md

@@ -1,5 +1,6 @@
 ## 2.3.0-rc.2
 - 加载优先级Priority类型改为taskpool.Priority类型
+- 修复部分heif图无法解码
 
 ## 2.3.0-rc.1
 - 修复file://格式图片无法显示

entry/src/main/ets/entryability/EntryAbility.ets

@@ -23,17 +23,17 @@ import { BusinessError } from '@ohos.base'
 export default class EntryAbility extends UIAbility {
   onWindowStageCreate(windowStage: window.WindowStage) {
     // 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;
-
+    //
-      }
+    //   }
-    })
+    // })
 
     windowStage.loadContent('pages/index', (err: BusinessError, data: void) => {
     });

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

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

entry/src/main/module.json5

@@ -50,26 +50,6 @@
           ],
           "when": "always"
         }
-      },
-      {
-        "name": "ohos.permission.READ_IMAGEVIDEO",
-        "reason": "$string:app_permission_READ_IMAGEVIDEO",
-        "usedScene": {
-          "abilities": [
-            "EntryAbility"
-          ],
-          "when": "always"
-        }
-      },
-      {
-        "name": "ohos.permission.WRITE_IMAGEVIDEO",
-        "reason": "$string:app_permission_WRITE_IMAGEVIDEO",
-        "usedScene": {
-          "abilities": [
-            "EntryAbility"
-          ],
-          "when": "always"
-        }
       }
     ]
   }

library/src/main/ets/components/imageknife/utils/FileTypeUtil.ets

@@ -26,7 +26,7 @@ export class FileTypeUtil {
     'webp': [new Uint8Array([0x52, 0x49, 0x46, 0x46])],
     'tiff': [new Uint8Array([0x49, 0x20, 0x49]), new Uint8Array([0x49, 0x49, 0x2A, 0x00]), new Uint8Array([0x4D, 0x4D, 0x00, 0x2A]), new Uint8Array([0x4D, 0x4D, 0x00, 0x2B])],
     // 添加更多的文件类型和特征
-    'heic': [new Uint8Array([0x00, 0x00, 0x00, 0x18, 0x66, 0x74, 0x79, 0x70, 0x68, 0x65, 0x69, 0x63, 0x00, 0x00, 0x00, 0x00])],
+    'heic': [new Uint8Array([0x00, 0x00, 0x00, 0x18, 0x66, 0x74, 0x79, 0x70, 0x68, 0x65, 0x69, 0x63, 0x00, 0x00, 0x00, 0x00]),new Uint8Array([0x00, 0x00, 0x00, 0x1C, 0x66, 0x74, 0x79, 0x70, 0x68, 0x65, 0x69, 0x63, 0x00, 0x00, 0x00, 0x00])],
   };