From 8140eb00548bc732ea846bb88004f9b9ab05f4c9 Mon Sep 17 00:00:00 2001
From: Amos_huang <hb@ub-tech.cn>
Date: Mon, 17 Oct 2022 18:55:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=87=8D=E5=91=BD=E5=90=8D?=
 =?UTF-8?q?=E5=90=8E=E5=88=A0=E9=99=A4=E5=9B=BE=E7=89=87=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 entry/src/main/ets/pages/ImagePreview.ets | 38 ++++++++---------------
 1 file changed, 13 insertions(+), 25 deletions(-)

diff --git a/entry/src/main/ets/pages/ImagePreview.ets b/entry/src/main/ets/pages/ImagePreview.ets
index 9f78ef0..f799f5f 100644
--- a/entry/src/main/ets/pages/ImagePreview.ets
+++ b/entry/src/main/ets/pages/ImagePreview.ets
@@ -7,6 +7,7 @@ import MediaUtils from '../model/MediaUtils'
 import Logger from '../model/Logger'
 
 import environment from '@ohos.environment'
+import prompt from '@system.prompt';
 
 
 
@@ -169,10 +170,8 @@ struct ImagePreview {
   private mediaTest: mediaLibrary.MediaLibrary = mediaLibrary.getMediaLibrary(globalThis.abilityContext)
   @State mediaList: Array<mediaLibrary.FileAsset> = []
   @State selectMedia: mediaLibrary.FileAsset = undefined
-  @State relativePath:string=''
-
-
 
+  @State relativePath:string=''
 
 
   //刷新数据
@@ -215,7 +214,7 @@ struct ImagePreview {
 
     for (var index = 0;index < this.mediaList.length; index++) {
       console.log(this.TAG+',onRenameAccept,this.mediaList[index].uri='+this.mediaList[index].uri)
-      if(this.mediaList[index].uri==this.image) {
+      if(this.image.indexOf(this.mediaList[index].uri) != -1) {
         this.selectMedia=this.mediaList[index]
         Logger.info(this.TAG, `renameMedia newName = ${this.selectMedia.displayName}`)
         Logger.info(this.TAG, `renameMedia title = ${this.title}`)
@@ -229,12 +228,21 @@ struct ImagePreview {
         this.selectMedia.commitModify(err => {
           if (err !== undefined) {
             Logger.info(this.TAG, `commitModify,err: ${err}`)
+            prompt.showToast({
+              message: '重命名失败'+err,
+              duration: 2000,
+            });
             return
           }
           Logger.info(this.TAG, 'commitModify success')
           //this.dialogRename.close()
           this.refreshData()
+          prompt.showToast({
+            message: '重命名成功',
+            duration: 2000,
+          });
         })
+        break
 //        console.log(this.TAG+',onRenameAccept,this.mediaList.length='+this.selectMedia.relativePath+this.selectMedia.displayName)
       }
     }
@@ -254,8 +262,6 @@ struct ImagePreview {
     autoCancel: true
   })
 
-
-
   //点击删除弹窗取消事件
     onDeleteCancel() {
     console.log(this.TAG+',Callback when the first button is clicked')
@@ -274,6 +280,7 @@ struct ImagePreview {
         console.info(this.TAG+",deleteFile callback");
         this.image=""//删除图片
         this.title=""
+        router.back()
       }).catch(err => {
         console.error(this.TAG+`,deleteFile err,err: ${err}`);
       })
@@ -384,24 +391,6 @@ struct ImagePreview {
             image:this.image
           }
         })
-        console.log('albumName'+this.albumName+'11111')
-        console.log('albumName'+this.image+'111112222')
-
-
-
-
-//        let fd = fileIo.openSync(this.image, 0o2);
-//        let buf = new ArrayBuffer(4096);
-//        fileIo.read(fd, buf).then(function(readOut){
-//          console.info("read file data succeed");
-//          //console.log(String.fromCharCode.apply(null, new Uint8Array(readOut.buffer)));
-//        }).catch(function(err){
-//          console.info("read file data failed with error:"+ err);
-//        });
-
-
-
-
       })
 
       Column({ space: 20 }) {
@@ -414,7 +403,6 @@ struct ImagePreview {
       .margin({left:50})
       .onClick(() => {
         console.info(this.TAG +',onClick Rename window')
-
         this.dialogRename.open()
       })
 
-- 
Gitee