調整扫描结束直接关闭搜索弹窗

app/src/main/java/com/datarecovery/master/dialog/ScanProgressDialog.java

@@ -54,20 +54,21 @@ public class ScanProgressDialog extends BaseDialog<DialogScanProgressBinding> {
     }
 
     public void detectedFinish() {
-        float limit = 100 - binding.getPercentageValue();
-        ValueAnimator valueAnimator = ValueAnimator.ofFloat(binding.getPercentageValue(), 100);
-        valueAnimator.addUpdateListener(animation -> {
-            float value = (float) valueAnimator.getAnimatedValue();
-            binding.setPercentageValue(value);
-        });
-        valueAnimator.setDuration((int) limit * 100L);
-        valueAnimator.start();
-        valueAnimator.addListener(new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                dismiss();
-            }
-        });
+        dismiss();
+//        float limit = 100 - binding.getPercentageValue();
+//        ValueAnimator valueAnimator = ValueAnimator.ofFloat(binding.getPercentageValue(), 100);
+//        valueAnimator.addUpdateListener(animation -> {
+//            float value = (float) valueAnimator.getAnimatedValue();
+//            binding.setPercentageValue(value);
+//        });
+//        valueAnimator.setDuration((int) limit * 100L);
+//        valueAnimator.start();
+//        valueAnimator.addListener(new AnimatorListenerAdapter() {
+//            @Override
+//            public void onAnimationEnd(Animator animation) {
+//                dismiss();
+//            }
+//        });
     }
 
 

app/src/main/java/com/datarecovery/master/utils/FilePermissionHelper.java

@@ -29,9 +29,9 @@ public class FilePermissionHelper {
     Disposable disposable;
 
     public void requestDataFilePermission(ComponentActivity activity, NextStepCallback stepCallback) {
-        Single.just(AccountRepository.token)
-                .flatMap(token -> {
-                    if (TextUtils.isEmpty(token)) {
+        Single.just(Build.VERSION.SDK_INT)
+                .flatMap(sdkInt -> {
+                    if (TextUtils.isEmpty(AccountRepository.token)) {
                         return (SingleSource<Integer>) observer -> activity.runOnUiThread(() -> {
                             PermissionDialog loginDialog = new PermissionDialog(activity);
                             loginDialog.setDialogContent(R.string.dialog_no_login)
@@ -47,7 +47,7 @@ public class FilePermissionHelper {
                                                         if (!TextUtils.isEmpty(AccountRepository.token)) {
                                                             loginDialog.dismiss();
                                                             activity.getLifecycle().removeObserver(this);
-                                                            observer.onSuccess(Build.VERSION.SDK_INT);
+                                                            observer.onSuccess(sdkInt);
                                                         }
                                                     } else if (event == Lifecycle.Event.ON_DESTROY) {
                                                         activity.getLifecycle().removeObserver(this);
@@ -61,9 +61,10 @@ public class FilePermissionHelper {
                                             observer.onError(new CancelException());
                                         }
                                     });
+                            loginDialog.show();
                         });
                     } else {
-                        return Single.just(Build.VERSION.SDK_INT);
+                        return Single.just(sdkInt);
                     }
                 })
                 .flatMap((Function<Integer, SingleSource<Integer>>) sdkInt -> {