From cedbf144922b231536725c8dd9e955358b50bf40 Mon Sep 17 00:00:00 2001
From: wangzhiyusss <wangzhiyu12@huawei.com>
Date: Mon, 30 Jan 2023 10:35:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E6=97=B6=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wangzhiyusss <wangzhiyu12@huawei.com>
---
 .../main/ets/components/NoteContentComp.ets   | 16 ++++++++++
 .../components/NoteContentCompPortrait.ets    | 16 ++++++++++
 .../default/src/main/ets/pages/MyNoteHome.ets | 29 -------------------
 3 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/features/src/main/ets/components/NoteContentComp.ets b/features/src/main/ets/components/NoteContentComp.ets
index 85ffc53..8e7a623 100644
--- a/features/src/main/ets/components/NoteContentComp.ets
+++ b/features/src/main/ets/components/NoteContentComp.ets
@@ -641,6 +641,22 @@ export struct ToolBarComp {
                 .height(24)
                 .width(24)
                 .onClick(async () => {
+                  let permissionList: Array<string> = [
+                    "ohos.permission.READ_MEDIA",
+                    "ohos.permission.WRITE_MEDIA",
+                  ]
+                  let context: any = getContext(this);
+                  await context.requestPermissionsFromUser(permissionList).then((data) => {
+                    LogUtil.info(TAG, 'data permissions : ' + data.permissions)
+                    LogUtil.info(TAG, 'data result: ' + data.authResults)
+                    let sum = 0
+                    for (let i = 0; i < data.authResults.length; i++) {
+                      sum += data.authResults[i]
+                    }
+                    LogUtil.info(TAG, 'request permissions sum: ' + sum)
+                  }).catch((err) => {
+                    LogUtil.warn(TAG, 'failed to requestPermissionsFromUser : ' + err.code);
+                  })
                   // 退出键盘
                   // @ts-ignore
                   inputMethod.getController().stopInputSession();
diff --git a/features/src/main/ets/components/NoteContentCompPortrait.ets b/features/src/main/ets/components/NoteContentCompPortrait.ets
index 7c4d77b..5d338d4 100644
--- a/features/src/main/ets/components/NoteContentCompPortrait.ets
+++ b/features/src/main/ets/components/NoteContentCompPortrait.ets
@@ -190,6 +190,22 @@ export struct NoteContentCompPortrait {
       this.editContentDialogCtl.open()
     },
     openAlbum: async () => {
+      let permissionList: Array<string> = [
+        "ohos.permission.READ_MEDIA",
+        "ohos.permission.WRITE_MEDIA",
+      ]
+      let context: any = getContext(this);
+      await context.requestPermissionsFromUser(permissionList).then((data) => {
+        LogUtil.info(TAG, 'data permissions : ' + data.permissions)
+        LogUtil.info(TAG, 'data result: ' + data.authResults)
+        let sum = 0
+        for (let i = 0; i < data.authResults.length; i++) {
+          sum += data.authResults[i]
+        }
+        LogUtil.info(TAG, 'request permissions sum: ' + sum)
+      }).catch((err) => {
+        LogUtil.warn(TAG, 'failed to requestPermissionsFromUser : ' + err.code);
+      })
       LogUtil.info(TAG, 'startAbility start')
       await globalThis.noteContext.startAbilityForResult({
         parameters: { uri: "singleselect" },
diff --git a/product/default/src/main/ets/pages/MyNoteHome.ets b/product/default/src/main/ets/pages/MyNoteHome.ets
index a29aee3..7f2a6fe 100644
--- a/product/default/src/main/ets/pages/MyNoteHome.ets
+++ b/product/default/src/main/ets/pages/MyNoteHome.ets
@@ -71,36 +71,7 @@ export struct MyNoteHomeComp {
       return
     }
 
-    let permissionList: Array<string> = [
-      "ohos.permission.READ_MEDIA",
-      "ohos.permission.WRITE_MEDIA",
-      "ohos.permission.DISTRIBUTED_DATASYNC"
-    ]
-    if (deviceInfo.deviceType === 'phone' || deviceInfo.deviceType === 'default') {
-      permissionList = [
-        "ohos.permission.READ_MEDIA",
-        "ohos.permission.WRITE_MEDIA",
-        "ohos.permission.MEDIA_LOCATION",
-        "ohos.permission.DISTRIBUTED_DATASYNC"
-      ]
-    }
-    LogUtil.info(this.TAG, 'permissions need to require from user')
     let context: any = getContext(this);
-    let AtManager = abilityAccessCtrl.createAtManager();
-    //requestPermissionsFromUser会判断权限的授权状态来决定是否唤起弹窗
-    // @ts-ignore
-    AtManager.requestPermissionsFromUser(context, ["ohos.permission.MANAGE_DISPOSED_APP_STATUS"]).then((data) => {
-      LogUtil.info(this.TAG, 'data permissions : ' + data.permissions)
-      LogUtil.info(this.TAG, 'data result: ' + data.authResults)
-      let sum = 0
-      for (let i = 0; i < data.authResults.length; i++) {
-        sum += data.authResults[i]
-      }
-      LogUtil.info(this.TAG, 'request permissions sum: ' + sum)
-    }).catch((err) => {
-      LogUtil.warn(this.TAG, 'failed to requestPermissionsFromUser : ' + err.code);
-    })
-
     let dbExist = false;
     let dbPath = context.databaseDir + "/db/note.db"
     try {
-- 
Gitee