From 8876c5f6b7343f3b63b7e4b5dcb2acbd82e88741 Mon Sep 17 00:00:00 2001 From: 1 <1> Date: Mon, 23 Sep 2024 19:37:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=87=E4=BB=B6=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E9=87=8D=E5=A4=8D=E5=AF=BC=E5=85=A5=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 4 ++-- .../assets/assets/{index-zUG0paJ1.js => index-Dtblmhnv.js} | 2 +- app/src/main/assets/index.html | 2 +- app/src/main/java/com/donut/mixfile/util/file/FileImport.kt | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) rename app/src/main/assets/assets/{index-zUG0paJ1.js => index-Dtblmhnv.js} (99%) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f1ed69c..1240453 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -14,8 +14,8 @@ android { applicationId = "com.donut.mixfile" minSdk = 24 targetSdk = 34 - versionCode = 32 - versionName = "1.4.1" + versionCode = 33 + versionName = "1.4.2" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { diff --git a/app/src/main/assets/assets/index-zUG0paJ1.js b/app/src/main/assets/assets/index-Dtblmhnv.js similarity index 99% rename from app/src/main/assets/assets/index-zUG0paJ1.js rename to app/src/main/assets/assets/index-Dtblmhnv.js index 6602bf1..b80c7c7 100644 --- a/app/src/main/assets/assets/index-zUG0paJ1.js +++ b/app/src/main/assets/assets/index-Dtblmhnv.js @@ -346,7 +346,7 @@ To suppress this warning, you need to explicitly provide the \`palette.${t}Chann color: blueviolet; box-shadow: 0 0 13px 3px blueviolet; } -`,Qc=new lS(2);async function uS(e,t){const n=new AbortController,r=`${Yo}api/upload?name=${encodeURIComponent(e.name)}`;t({tip:"等待中",progress:0,title:e.name,cancel(){n.abort()}}),await Qc.acquire(),console.log("await"),t({tip:`上传中: 0/${yo(e.size)}`,progress:0,title:e.name,cancel(){n.abort()}});try{await Be.put(r,e,{onUploadProgress:o=>{const{loaded:i,total:s}=o;t({tip:`上传中: ${yo(i,!0)}/${yo(s)}`,progress:i/s*100,title:e.name,cancel(){n.abort(),ra("上传已取消")}})},signal:n.signal})}catch(o){t({error:!0,tip:"上传失败",progress:0,title:e.name}),o.message;return}finally{Qc.release()}t({tip:"上传完成",progress:100,title:e.name})}function dS(e){return $(cS,{children:[$("input",{type:"file",id:"select-file",hidden:!0,onChange:t=>{Jc(t.target.files),t.target.value=""},multiple:"multiple"}),$(eS,{onTargetClick:()=>{document.querySelector("#select-file").click()},onDrop:(t,n)=>{Jc(t)},children:"选择/拖入文件"})]})}const fS=cn.div` +`,Qc=new lS(2);async function uS(e,t){const n=new AbortController,r=`${Yo}api/upload?name=${encodeURIComponent(e.name)}`;t({tip:"等待中",progress:0,title:e.name,cancel(){n.abort()}}),await Qc.acquire(),t({tip:`上传中: 0/${yo(e.size)}`,progress:0,title:e.name,cancel(){n.abort()}});try{await Be.put(r,e,{onUploadProgress:o=>{const{loaded:i,total:s}=o;t({tip:`上传中: ${yo(i,!0)}/${yo(s)}`,progress:i/s*100,title:e.name,cancel(){n.abort(),ra("上传已取消")}})},signal:n.signal})}catch(o){t({error:!0,tip:"上传失败",progress:0,title:e.name}),o.message;return}finally{Qc.release()}t({tip:"上传完成",progress:100,title:e.name})}function dS(e){return $(cS,{children:[$("input",{type:"file",id:"select-file",hidden:!0,onChange:t=>{Jc(t.target.files),t.target.value=""},multiple:"multiple"}),$(eS,{onTargetClick:()=>{document.querySelector("#select-file").click()},onDrop:(t,n)=>{Jc(t)},children:"选择/拖入文件"})]})}const fS=cn.div` margin: 5vh auto; display: flex; justify-content: center; diff --git a/app/src/main/assets/index.html b/app/src/main/assets/index.html index 28f4699..75ef293 100644 --- a/app/src/main/assets/index.html +++ b/app/src/main/assets/index.html @@ -6,7 +6,7 @@ MixFile - + diff --git a/app/src/main/java/com/donut/mixfile/util/file/FileImport.kt b/app/src/main/java/com/donut/mixfile/util/file/FileImport.kt index 04e377c..88130f5 100644 --- a/app/src/main/java/com/donut/mixfile/util/file/FileImport.kt +++ b/app/src/main/java/com/donut/mixfile/util/file/FileImport.kt @@ -50,6 +50,7 @@ fun showFileList(fileList: List) { favCategories += it.category } favorites += fileList + favorites = favorites.distinct() showToast("导入了 ${favorites.size - prevSize} 个文件") closeDialog() }