feat(app): 更新导入功能和权限请求逻辑
- 修改导入完成提示文本 - 更新应用版本号至1.0.1 -修复权限请求完成后未调用回调函数的问题 - 在WarehouseFragment中添加权限请求逻辑 - 新增导入提示字符串资源
This commit is contained in:
parent
f392dc98b7
commit
c55d77cf6f
|
@ -25,8 +25,8 @@ android {
|
||||||
applicationId "com.coldmint.rust.lite"
|
applicationId "com.coldmint.rust.lite"
|
||||||
minSdkVersion 23
|
minSdkVersion 23
|
||||||
targetSdkVersion 34
|
targetSdkVersion 34
|
||||||
versionCode 1
|
versionCode 2
|
||||||
versionName "1.0"
|
versionName "1.0.1"
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -8,6 +8,7 @@ import com.coldmint.rust.pro.R
|
||||||
import com.coldmint.rust.pro.adapters.WarehouseAdapter
|
import com.coldmint.rust.pro.adapters.WarehouseAdapter
|
||||||
import com.coldmint.rust.pro.base.BaseFragment
|
import com.coldmint.rust.pro.base.BaseFragment
|
||||||
import com.coldmint.rust.pro.databinding.FragmentWarehouseBinding
|
import com.coldmint.rust.pro.databinding.FragmentWarehouseBinding
|
||||||
|
import com.coldmint.rust.pro.tool.GlobalMethod
|
||||||
import com.google.android.material.tabs.TabLayoutMediator
|
import com.google.android.material.tabs.TabLayoutMediator
|
||||||
|
|
||||||
|
|
||||||
|
@ -45,6 +46,10 @@ class WarehouseFragment : BaseFragment<FragmentWarehouseBinding>() {
|
||||||
viewBinding.pager.adapter = WarehouseAdapter(this)
|
viewBinding.pager.adapter = WarehouseAdapter(this)
|
||||||
//解决启动为仓库页面,点击社区,再返回仓库重复崩溃的问题
|
//解决启动为仓库页面,点击社区,再返回仓库重复崩溃的问题
|
||||||
viewBinding.pager.isSaveEnabled = false
|
viewBinding.pager.isSaveEnabled = false
|
||||||
|
// 在需要申请权限的地方调用如下方法
|
||||||
|
GlobalMethod.requestStoragePermissions(requireActivity()) {
|
||||||
|
|
||||||
|
}
|
||||||
loadTab()
|
loadTab()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -288,6 +288,7 @@ object GlobalMethod {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
if (XXPermissions.isGranted(activity, list)) {
|
if (XXPermissions.isGranted(activity, list)) {
|
||||||
|
requestCompleted.invoke(true)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
MaterialAlertDialogBuilder(activity).setTitle(R.string.permission_request_title)
|
MaterialAlertDialogBuilder(activity).setTitle(R.string.permission_request_title)
|
||||||
|
@ -301,7 +302,6 @@ object GlobalMethod {
|
||||||
requestCompleted.invoke(allGranted)
|
requestCompleted.invoke(allGranted)
|
||||||
}
|
}
|
||||||
}.setNegativeButton(R.string.dialog_cancel, null).setCancelable(false).show()
|
}.setNegativeButton(R.string.dialog_cancel, null).setCancelable(false).show()
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_margin="8dp"
|
android:layout_margin="8dp"
|
||||||
android:text="@string/import_effor7" />
|
android:text="@string/import_complete" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/okButton"
|
android:id="@+id/okButton"
|
||||||
|
|
|
@ -163,6 +163,7 @@
|
||||||
<!--导入-->
|
<!--导入-->
|
||||||
<string name="importing">导入中...</string>
|
<string name="importing">导入中...</string>
|
||||||
<string name="import_name">导入</string>
|
<string name="import_name">导入</string>
|
||||||
|
<string name="import_tip">等待导入...</string>
|
||||||
<string name="import_complete">%1$s 导入成功。</string>
|
<string name="import_complete">%1$s 导入成功。</string>
|
||||||
<string name="import_failed">%1$s 导入失败。</string>
|
<string name="import_failed">%1$s 导入失败。</string>
|
||||||
<string name="app_version_error">%1$s 专为高版本助手开发,无法导入。</string>
|
<string name="app_version_error">%1$s 专为高版本助手开发,无法导入。</string>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user