Commit afaef8d1 authored by wanglei's avatar wanglei

Merge remote-tracking branch 'origin/master'

parents 817b40e3 34704608
...@@ -73,7 +73,7 @@ object ActivityJumpHelps { ...@@ -73,7 +73,7 @@ object ActivityJumpHelps {
fun requestPermission( fun requestPermission(
context: Context, context: Context,
launcher: ActivityLauncher, launcher: ActivityLauncher,
block: (() -> Unit?)? = null block: (() -> Unit)? = null
) { ) {
if (PermissionHelps.checkFilesAccessPermission(context)) { if (PermissionHelps.checkFilesAccessPermission(context)) {
block?.invoke() block?.invoke()
......
...@@ -124,6 +124,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(FragmentHomeBinding::infl ...@@ -124,6 +124,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(FragmentHomeBinding::infl
} }
private fun initData() { private fun initData() {
ActivityJumpHelps.requestPermission(requireContext(), launcher) {
lifecycleScope.launch(Dispatchers.IO) { lifecycleScope.launch(Dispatchers.IO) {
val totalStorage = async { AppHelps.getTotalExternalSize() } val totalStorage = async { AppHelps.getTotalExternalSize() }
val availableStorage = async { AppHelps.getAvailableExternalSize() } val availableStorage = async { AppHelps.getAvailableExternalSize() }
...@@ -168,6 +169,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(FragmentHomeBinding::infl ...@@ -168,6 +169,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(FragmentHomeBinding::infl
} }
} }
} }
}
private fun showDay() { private fun showDay() {
val installTime = SpUtils.getInstance().getLong(KEY_INSTALL_TIME) val installTime = SpUtils.getInstance().getLong(KEY_INSTALL_TIME)
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
android:id="@+id/iv_icon" android:id="@+id/iv_icon"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="15dp" android:layout_marginTop="10dp"
android:src="@mipmap/icon_junk_scan" android:src="@mipmap/icon_junk_scan"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment