From c55d77cf6f8e4f3ec7a95e5921f16637db39c8e9 Mon Sep 17 00:00:00 2001
From: Cold-Mint <cold_mint@qq.com>
Date: Mon, 10 Feb 2025 22:10:35 +0800
Subject: [PATCH] =?UTF-8?q?feat(app):=20=E6=9B=B4=E6=96=B0=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=8A=9F=E8=83=BD=E5=92=8C=E6=9D=83=E9=99=90=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改导入完成提示文本
- 更新应用版本号至1.0.1
-修复权限请求完成后未调用回调函数的问题
- 在WarehouseFragment中添加权限请求逻辑
- 新增导入提示字符串资源
---
 app/build.gradle                                             | 4 ++--
 .../com/coldmint/rust/pro/fragments/WarehouseFragment.kt     | 5 +++++
 app/src/main/java/com/coldmint/rust/pro/tool/GlobalMethod.kt | 2 +-
 app/src/main/res/layout/activity_importer.xml                | 2 +-
 app/src/main/res/values/strings.xml                          | 1 +
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1234dff..ed720ac 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,8 +25,8 @@ android {
         applicationId "com.coldmint.rust.lite"
         minSdkVersion 23
         targetSdkVersion 34
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.0.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/app/src/main/java/com/coldmint/rust/pro/fragments/WarehouseFragment.kt b/app/src/main/java/com/coldmint/rust/pro/fragments/WarehouseFragment.kt
index 68b3ba1..eff0eb0 100644
--- a/app/src/main/java/com/coldmint/rust/pro/fragments/WarehouseFragment.kt
+++ b/app/src/main/java/com/coldmint/rust/pro/fragments/WarehouseFragment.kt
@@ -8,6 +8,7 @@ import com.coldmint.rust.pro.R
 import com.coldmint.rust.pro.adapters.WarehouseAdapter
 import com.coldmint.rust.pro.base.BaseFragment
 import com.coldmint.rust.pro.databinding.FragmentWarehouseBinding
+import com.coldmint.rust.pro.tool.GlobalMethod
 import com.google.android.material.tabs.TabLayoutMediator
 
 
@@ -45,6 +46,10 @@ class WarehouseFragment : BaseFragment<FragmentWarehouseBinding>() {
         viewBinding.pager.adapter = WarehouseAdapter(this)
         //解决启动为仓库页面，点击社区，再返回仓库重复崩溃的问题
         viewBinding.pager.isSaveEnabled = false
+        // 在需要申请权限的地方调用如下方法
+        GlobalMethod.requestStoragePermissions(requireActivity()) {
+
+        }
         loadTab()
     }
 
diff --git a/app/src/main/java/com/coldmint/rust/pro/tool/GlobalMethod.kt b/app/src/main/java/com/coldmint/rust/pro/tool/GlobalMethod.kt
index f58d4c7..91ff987 100644
--- a/app/src/main/java/com/coldmint/rust/pro/tool/GlobalMethod.kt
+++ b/app/src/main/java/com/coldmint/rust/pro/tool/GlobalMethod.kt
@@ -288,6 +288,7 @@ object GlobalMethod {
             )
         }
         if (XXPermissions.isGranted(activity, list)) {
+            requestCompleted.invoke(true)
             return
         }
         MaterialAlertDialogBuilder(activity).setTitle(R.string.permission_request_title)
@@ -301,7 +302,6 @@ object GlobalMethod {
                     requestCompleted.invoke(allGranted)
                 }
             }.setNegativeButton(R.string.dialog_cancel, null).setCancelable(false).show()
-
     }
 
 
diff --git a/app/src/main/res/layout/activity_importer.xml b/app/src/main/res/layout/activity_importer.xml
index 185abce..a60fb9f 100644
--- a/app/src/main/res/layout/activity_importer.xml
+++ b/app/src/main/res/layout/activity_importer.xml
@@ -36,7 +36,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="8dp"
-                android:text="@string/import_effor7" />
+                android:text="@string/import_complete" />
 
             <Button
                 android:id="@+id/okButton"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0f20265..a5dc786 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -163,6 +163,7 @@
     <!--导入-->
     <string name="importing">导入中...</string>
     <string name="import_name">导入</string>
+    <string name="import_tip">等待导入...</string>
     <string name="import_complete">%1$s 导入成功。</string>
     <string name="import_failed">%1$s 导入失败。</string>
     <string name="app_version_error">%1$s 专为高版本助手开发，无法导入。</string>