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() { 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" />