调整图片恢复&清理类型传入

app/src/main/java/com/datarecovery/master/module/audiorecover/AudioRecoverActivity.java

@@ -24,6 +24,7 @@ import com.datarecovery.master.databinding.PopupAudioRecoverFilterBinding;
 import com.datarecovery.master.dialog.CommonLoadingDialog;
 import com.datarecovery.master.dialog.CommonSureDialog;
 import com.datarecovery.master.dialog.ScanProgressDialog;
+import com.datarecovery.master.module.member.MemberType;
 import com.datarecovery.master.module.preview.PreviewActivity;
 import com.datarecovery.master.utils.BoxingUtil;
 import com.datarecovery.master.utils.FilePermissionHelper;
@@ -68,7 +69,7 @@ public class AudioRecoverActivity extends BaseActivity<ActivityAudioRecoverBindi
     }
 
     private void initPermission() {
-        new FilePermissionHelper().requestDataFilePermission(this, "hf11007", new FilePermissionHelper.NextStepCallback() {
+        new FilePermissionHelper().requestDataFilePermission(this, MemberType.APP_AUDIO_RECOVER, new FilePermissionHelper.NextStepCallback() {
             @Override
             public void onNextStep() {
                 audioRecoverViewModel.startAudioScanning();

app/src/main/java/com/datarecovery/master/module/filerecover/FileRecoverActivity.java

@@ -17,6 +17,7 @@ import com.datarecovery.master.databinding.ItemTabFileRecoverBinding;
 import com.datarecovery.master.dialog.CommonLoadingDialog;
 import com.datarecovery.master.dialog.CommonSureDialog;
 import com.datarecovery.master.dialog.ScanProgressDialog;
+import com.datarecovery.master.module.member.MemberType;
 import com.datarecovery.master.utils.BoxingUtil;
 import com.datarecovery.master.utils.FilePermissionHelper;
 import com.google.android.material.tabs.TabLayout;
@@ -57,7 +58,7 @@ public class FileRecoverActivity extends BaseActivity<ActivityFileRecoverBinding
     }
 
     private void initPermission() {
-        new FilePermissionHelper().requestDataFilePermission(this, "hf11003", new FilePermissionHelper.NextStepCallback() {
+        new FilePermissionHelper().requestDataFilePermission(this, MemberType.APP_FILE_RECOVER, new FilePermissionHelper.NextStepCallback() {
             @Override
             public void onNextStep() {
                 fileRecoverViewModel.startFileScanning();

app/src/main/java/com/datarecovery/master/module/homepage/HomePageViewModel.java

@@ -82,7 +82,7 @@ public class HomePageViewModel extends BaseViewModel {
     }
 
     public void onImgRecoveryClick() {
-        isHaveAuths(MemberType.APP_IMAGE_RECOVER, () -> ImageRecoverActivity.start(ActivityUtil.getTopActivity(), ImageRecoverActivity.Type.RECOVER));
+        isHaveAuths(MemberType.APP_IMAGE_RECOVER, () -> ImageRecoverActivity.start(ActivityUtil.getTopActivity(), MemberType.APP_IMAGE_RECOVER));
     }
 
     public void isHaveAuths(@MemberType String type, NextStepCallback stepCallback) {
@@ -106,7 +106,7 @@ public class HomePageViewModel extends BaseViewModel {
                 isHaveAuths(MemberType.APP_FILE_RECOVER, () -> FileRecoverActivity.start(ActivityUtil.getTopActivity()));
                 break;
             case FunctionBean.IMG_CLEARING:
-                isHaveAuths(MemberType.APP_IMAGE_CLEAN, () -> ImageRecoverActivity.start(ActivityUtil.getTopActivity(), ImageRecoverActivity.Type.DELETE));
+                isHaveAuths(MemberType.APP_IMAGE_CLEAN, () -> ImageRecoverActivity.start(ActivityUtil.getTopActivity(), MemberType.APP_IMAGE_CLEAN));
                 break;
             case FunctionBean.VIDEO_RECOVERY:
                 isHaveAuths(MemberType.APP_VIDEO_RECOVER, () -> VideoRecoverActivity.start(ActivityUtil.getTopActivity()));

app/src/main/java/com/datarecovery/master/module/imgrecover/ImageRecoverActivity.java

@@ -7,7 +7,6 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.view.KeyEvent;
 
-import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.ConcatAdapter;
@@ -21,6 +20,7 @@ import com.datarecovery.master.databinding.ItemTabImageRecoverBinding;
 import com.datarecovery.master.dialog.CommonLoadingDialog;
 import com.datarecovery.master.dialog.CommonSureDialog;
 import com.datarecovery.master.dialog.ScanProgressDialog;
+import com.datarecovery.master.module.member.MemberType;
 import com.datarecovery.master.module.preview.PreviewActivity;
 import com.datarecovery.master.utils.BoxingUtil;
 import com.datarecovery.master.utils.FilePermissionHelper;
@@ -29,9 +29,8 @@ import com.datarecovery.master.utils.ImageDeepDetector;
 import com.google.android.material.tabs.TabLayout;
 import com.gyf.immersionbar.ImmersionBar;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.util.List;
+import java.util.Objects;
 
 import dagger.hilt.android.AndroidEntryPoint;
 
@@ -42,12 +41,6 @@ public class ImageRecoverActivity extends BaseActivity<ActivityImageRecoverBindi
 
     private ConcatAdapter concatAdapter;
 
-    @IntDef({Type.RECOVER, Type.DELETE})
-    @Retention(RetentionPolicy.SOURCE)
-    public @interface Type {
-        int RECOVER = 1;
-        int DELETE = 2;
-    }
 
     private static final String TYPE = "type";
     ImageRecoverViewModel imageRecoverViewModel;
@@ -64,7 +57,7 @@ public class ImageRecoverActivity extends BaseActivity<ActivityImageRecoverBindi
     private ImageItemAdapter otherAdapter;
     private GridLayoutManager gridLayoutManager;
 
-    public static void start(Context context, @Type int type) {
+    public static void start(Context context, @MemberType String type) {
         Intent intent = new Intent(context, ImageRecoverActivity.class);
         if (!(context instanceof Activity)) {
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -83,7 +76,7 @@ public class ImageRecoverActivity extends BaseActivity<ActivityImageRecoverBindi
     }
 
     private void initPermission() {
-        new FilePermissionHelper().requestDataFilePermission(this, (imageRecoverViewModel.getType() == Type.RECOVER) ? "hf11001" : "hf11013", new FilePermissionHelper.NextStepCallback() {
+        new FilePermissionHelper().requestDataFilePermission(this, imageRecoverViewModel.getType(), new FilePermissionHelper.NextStepCallback() {
             @Override
             public void onNextStep() {
                 imageRecoverViewModel.startImageScanning();
@@ -99,7 +92,7 @@ public class ImageRecoverActivity extends BaseActivity<ActivityImageRecoverBindi
     private void initData() {
         Intent intent = getIntent();
         if (intent != null) {
-            imageRecoverViewModel.setOperationType(intent.getIntExtra(TYPE, Type.RECOVER));
+            imageRecoverViewModel.setType(intent.getStringExtra(TYPE));
         }
     }
 
@@ -205,7 +198,7 @@ public class ImageRecoverActivity extends BaseActivity<ActivityImageRecoverBindi
         if (imageFile == null) {
             return;
         }
-        if (imageRecoverViewModel.getType() == Type.DELETE) {
+        if (Objects.equals(imageRecoverViewModel.getType(), MemberType.APP_IMAGE_CLEAN)) {
             imageRecoverViewModel.setItemCheck(imageFile);
         } else {
             imageRecoverViewModel.checkPreview(imageFile);
@@ -334,7 +327,7 @@ public class ImageRecoverActivity extends BaseActivity<ActivityImageRecoverBindi
         if (BoxingUtil.boxing(show)) {
             if (loadingDialog == null) {
                 loadingDialog = new CommonLoadingDialog(this);
-                loadingDialog.setMessage((imageRecoverViewModel.getType()) == Type.DELETE ? R.string.deleting : R.string.exporting);
+                loadingDialog.setMessage(Objects.equals(imageRecoverViewModel.getType(), MemberType.APP_IMAGE_CLEAN) ? R.string.deleting : R.string.exporting);
             }
             loadingDialog.show();
         } else {

app/src/main/java/com/datarecovery/master/module/imgrecover/ImageRecoverViewModel.java

@@ -19,6 +19,7 @@ import org.reactivestreams.Subscription;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 import javax.inject.Inject;
@@ -61,7 +62,9 @@ public class ImageRecoverViewModel extends BaseViewModel {
     private final MutableLiveData<List<ImageDeepDetector.ImageFile>> selectedList = new MutableLiveData<>(new ArrayList<>());
     private LiveData<String> selectedCountTxt;
     private Disposable scanDisposable;
-    private int type;
+
+    @MemberType
+    private String type;
 
 
     @Inject
@@ -148,7 +151,7 @@ public class ImageRecoverViewModel extends BaseViewModel {
         return barTitle;
     }
 
-    public int getType() {
+    public String getType() {
         return type;
     }
 
@@ -271,19 +274,19 @@ public class ImageRecoverViewModel extends BaseViewModel {
     }
 
     public void checkPreview(@NonNull ImageDeepDetector.ImageFile imageFile) {
-        if (type == ImageRecoverActivity.Type.DELETE) {
+        if (Objects.equals(type, MemberType.APP_IMAGE_CLEAN)) {
             return;
         }
-        if (type == ImageRecoverActivity.Type.RECOVER && !deviceFuncRepository.isHaveAuth(MemberType.APP_IMAGE_RECOVER)) {
+        if (Objects.equals(type, MemberType.APP_IMAGE_RECOVER) && !deviceFuncRepository.isHaveAuth(type)) {
             return;
-        } else if (type == ImageRecoverActivity.Type.DELETE && !deviceFuncRepository.isHaveAuth(MemberType.APP_IMAGE_CLEAN)) {
+        } else if (Objects.equals(type, MemberType.APP_IMAGE_CLEAN) && !deviceFuncRepository.isHaveAuth(type)) {
             return;
         }
         previewEvent.setValue(imageFile);
     }
 
     public void onOperationClick() {
-        if (type == ImageRecoverActivity.Type.DELETE) {
+        if (Objects.equals(type, MemberType.APP_IMAGE_CLEAN)) {
             showClearDialog.call();
         } else {
             onExportClick();
@@ -331,9 +334,9 @@ public class ImageRecoverViewModel extends BaseViewModel {
         if (list.size() == 0) {
             return;
         }
-        if (type == ImageRecoverActivity.Type.RECOVER && !deviceFuncRepository.isHaveAuth(MemberType.APP_IMAGE_RECOVER)) {
+        if (Objects.equals(type, MemberType.APP_IMAGE_RECOVER) && !deviceFuncRepository.isHaveAuth(type)) {
             return;
-        } else if (type == ImageRecoverActivity.Type.DELETE && !deviceFuncRepository.isHaveAuth(MemberType.APP_IMAGE_CLEAN)) {
+        } else if (Objects.equals(type, MemberType.APP_IMAGE_CLEAN) && !deviceFuncRepository.isHaveAuth(type)) {
             return;
         }
         showLoadingEvent.setValue(true);
@@ -370,10 +373,10 @@ public class ImageRecoverViewModel extends BaseViewModel {
     }
 
 
-    public void setOperationType(@ImageRecoverActivity.Type int type) {
+    public void setType(@MemberType String type) {
         this.type = type;
         switch (type) {
-            case ImageRecoverActivity.Type.DELETE:
+            case MemberType.APP_IMAGE_CLEAN:
                 selectedCountTxt = Transformations.map(selectedList, list -> {
                     if (list == null || list.isEmpty()) {
                         return ContextUtil.getContext().getString(R.string.delete);
@@ -381,7 +384,7 @@ public class ImageRecoverViewModel extends BaseViewModel {
                     return ContextUtil.getContext().getString(R.string.delete_count, list.size());
                 });
                 break;
-            case ImageRecoverActivity.Type.RECOVER:
+            case MemberType.APP_IMAGE_RECOVER:
                 selectedCountTxt = Transformations.map(selectedList, list -> {
                     if (list == null || list.isEmpty()) {
                         return ContextUtil.getContext().getString(R.string.export);

app/src/main/java/com/datarecovery/master/module/member/MemberActivity.java

@@ -152,7 +152,7 @@ public class MemberActivity extends BaseActivity<ActivityMemberBinding> {
                 WeChatRecoverActivity.start(this, MemberType.APP_WX_FRIEND_RECOVER);
                 break;
             case MemberType.APP_IMAGE_RECOVER:
-                ImageRecoverActivity.start(this, ImageRecoverActivity.Type.RECOVER);
+                ImageRecoverActivity.start(this, MemberType.APP_IMAGE_RECOVER);
                 break;
             case MemberType.APP_FILE_RECOVER:
                 FileRecoverActivity.start(this);
@@ -164,7 +164,7 @@ public class MemberActivity extends BaseActivity<ActivityMemberBinding> {
                 AudioRecoverActivity.start(this);
                 break;
             case MemberType.APP_IMAGE_CLEAN:
-                ImageRecoverActivity.start(this, ImageRecoverActivity.Type.DELETE);
+                ImageRecoverActivity.start(this, MemberType.APP_IMAGE_CLEAN);
                 break;
         }
     }

app/src/main/java/com/datarecovery/master/module/member/MemberViewModel.java

@@ -25,6 +25,7 @@ import com.datarecovery.master.module.member.bean.EvaluateBean;
 import com.datarecovery.master.module.member.bean.SuperScenesBean;
 import com.datarecovery.master.utils.BoxingUtil;
 import com.datarecovery.master.utils.OrderReportHelper;
+import com.datarecovery.master.utils.ReportUtil;
 import com.datarecovery.master.utils.RxHttpHandler;
 import com.datarecovery.master.utils.ToastUtil;
 import com.google.gson.Gson;
@@ -315,7 +316,7 @@ public class MemberViewModel extends BaseViewModel {
                     RxHttpHandler.ServerErrorException serverErrorException = (RxHttpHandler.ServerErrorException) throwable;
                     if (serverErrorException.getCode() == Constants.ERROR_CODE_NO_LOGIN_ERROR) {
                         ToastUtil.show(R.string.no_login, ToastUtil.LENGTH_SHORT);
-                        LoginActivity.start(ActivityUtil.getTopActivity(), getReportId());
+                        LoginActivity.start(ActivityUtil.getTopActivity(), ReportUtil.getReportId(memberType));
                     } else {
                         ToastUtil.show(serverErrorException.getMsg(), ToastUtil.LENGTH_SHORT);
                     }
@@ -326,24 +327,6 @@ public class MemberViewModel extends BaseViewModel {
         });
     }
 
-    public String getReportId() {
-        if (Objects.equals(memberType, MemberType.APP_WX_MESSAGE_RECOVER)) {
-            return "hf11011";
-        } else if (Objects.equals(memberType, MemberType.APP_WX_FRIEND_RECOVER)) {
-            return "hf11009";
-        } else if (Objects.equals(memberType, MemberType.APP_IMAGE_RECOVER)) {
-            return "hf11001";
-        } else if (Objects.equals(memberType, MemberType.APP_FILE_RECOVER)) {
-            return "hf11003";
-        } else if (Objects.equals(memberType, MemberType.APP_VIDEO_RECOVER)) {
-            return "hf11005";
-        } else if (Objects.equals(memberType, MemberType.APP_AUDIO_RECOVER)) {
-            return "hf11007";
-        } else if (Objects.equals(memberType, MemberType.APP_IMAGE_CLEAN)) {
-            return "hf11013";
-        }
-        return null;
-    }
 
     private void onAliPayScan(String s, String orderId) {
         showAliQRPaymentEvent.setValue(new Pair<>(s, orderId));

app/src/main/java/com/datarecovery/master/module/preview/PreviewViewModel.java

@@ -167,7 +167,9 @@ public class PreviewViewModel extends BaseViewModel {
     }
 
     public void onExportClick() {
-        if (type == ImageRecoverActivity.Type.RECOVER && !deviceFuncRepository.isHaveAuth(MemberType.APP_IMAGE_RECOVER)) {
+        if (type == PreviewActivity.TYPE_IMG && !deviceFuncRepository.isHaveAuth(MemberType.APP_IMAGE_RECOVER)) {
+            return;
+        } else if (type == PreviewActivity.TYPE_AUDIO && !deviceFuncRepository.isHaveAuth(MemberType.APP_AUDIO_RECOVER)) {
             return;
         }
         RxJavaUtil.doInBackground(() -> {

app/src/main/java/com/datarecovery/master/module/videorecover/VideoRecoverActivity.java

@@ -16,6 +16,7 @@ import com.datarecovery.master.databinding.ActivityVideoRecoverBinding;
 import com.datarecovery.master.dialog.CommonLoadingDialog;
 import com.datarecovery.master.dialog.CommonSureDialog;
 import com.datarecovery.master.dialog.ScanProgressDialog;
+import com.datarecovery.master.module.member.MemberType;
 import com.datarecovery.master.module.preview.PreviewActivity;
 import com.datarecovery.master.utils.BoxingUtil;
 import com.datarecovery.master.utils.FilePermissionHelper;
@@ -54,7 +55,7 @@ public class VideoRecoverActivity extends BaseActivity<ActivityVideoRecoverBindi
     }
 
     private void initPermission() {
-        new FilePermissionHelper().requestDataFilePermission(this, "hf11005", new FilePermissionHelper.NextStepCallback() {
+        new FilePermissionHelper().requestDataFilePermission(this, MemberType.APP_VIDEO_RECOVER, new FilePermissionHelper.NextStepCallback() {
             @Override
             public void onNextStep() {
                 videoRecoverViewModel.startVideoScanning();

app/src/main/java/com/datarecovery/master/module/wxrecover/WeChatRecoverActivity.java

@@ -17,6 +17,7 @@ import com.datarecovery.master.dialog.PermissionDialog;
 import com.datarecovery.master.module.login.LoginActivity;
 import com.datarecovery.master.module.member.MemberType;
 import com.datarecovery.master.utils.FilePermissionHelper;
+import com.datarecovery.master.utils.ReportUtil;
 import com.gyf.immersionbar.ImmersionBar;
 
 import dagger.hilt.android.AndroidEntryPoint;
@@ -61,7 +62,7 @@ public class WeChatRecoverActivity extends BaseActivity<ActivityWxRecoverBinding
                 .setOnDialogClickListener(new PermissionDialog.OnDialogClickListener() {
                     @Override
                     public void onClickSure() {
-                        LoginActivity.start(WeChatRecoverActivity.this, weChatViewModel.getReportId());
+                        LoginActivity.start(WeChatRecoverActivity.this, ReportUtil.getReportId(weChatViewModel.getType()));
                     }
 
                     @Override

app/src/main/java/com/datarecovery/master/module/wxrecover/WeChatViewModel.java

@@ -34,6 +34,7 @@ public class WeChatViewModel extends BaseViewModel {
 
     private final MutableLiveData<FindOrderResponse> findOrderDetail = new MutableLiveData<>();
     private final PayRepository payRepository;
+    @MemberType
     private String type;
 
     @Inject
@@ -117,11 +118,4 @@ public class WeChatViewModel extends BaseViewModel {
         return type;
     }
 
-    public String getReportId() {
-        if (Objects.equals(type, MemberType.APP_WX_MESSAGE_RECOVER)) {
-            return "hf11011";
-        } else {
-            return "hf11009";
-        }
-    }
 }

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

@@ -14,6 +14,7 @@ import com.datarecovery.master.R;
 import com.datarecovery.master.data.repositories.AccountRepository;
 import com.datarecovery.master.dialog.PermissionDialog;
 import com.datarecovery.master.module.login.LoginActivity;
+import com.datarecovery.master.module.member.MemberType;
 import com.datarecovery.master.utils.xfile.XFilePermission;
 
 import atmob.reactivex.rxjava3.annotations.NonNull;
@@ -28,7 +29,7 @@ public class FilePermissionHelper {
 
     Disposable disposable;
 
-    public void requestDataFilePermission(ComponentActivity activity, String reportId, NextStepCallback stepCallback) {
+    public void requestDataFilePermission(ComponentActivity activity, @MemberType String memberType, NextStepCallback stepCallback) {
         Single.just(Build.VERSION.SDK_INT)
                 .flatMap(sdkInt -> {
                     if (TextUtils.isEmpty(AccountRepository.token)) {
@@ -39,7 +40,7 @@ public class FilePermissionHelper {
                                     .setOnDialogClickListener(new PermissionDialog.OnDialogClickListener() {
                                         @Override
                                         public void onClickSure() {
-                                            LoginActivity.start(activity, reportId);
+                                            LoginActivity.start(activity, ReportUtil.getReportId(memberType));
                                             activity.getLifecycle().addObserver(new LifecycleEventObserver() {
                                                 @Override
                                                 public void onStateChanged(@androidx.annotation.NonNull LifecycleOwner lifecycleOwner, @androidx.annotation.NonNull Lifecycle.Event event) {

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

@@ -0,0 +1,27 @@
+package com.datarecovery.master.utils;
+
+import com.datarecovery.master.module.member.MemberType;
+
+import java.util.Objects;
+
+public class ReportUtil {
+
+    public static String getReportId(@MemberType String memberType) {
+        if (Objects.equals(memberType, MemberType.APP_WX_MESSAGE_RECOVER)) {
+            return "hf11011";
+        } else if (Objects.equals(memberType, MemberType.APP_WX_FRIEND_RECOVER)) {
+            return "hf11009";
+        } else if (Objects.equals(memberType, MemberType.APP_IMAGE_RECOVER)) {
+            return "hf11001";
+        } else if (Objects.equals(memberType, MemberType.APP_FILE_RECOVER)) {
+            return "hf11003";
+        } else if (Objects.equals(memberType, MemberType.APP_VIDEO_RECOVER)) {
+            return "hf11005";
+        } else if (Objects.equals(memberType, MemberType.APP_AUDIO_RECOVER)) {
+            return "hf11007";
+        } else if (Objects.equals(memberType, MemberType.APP_IMAGE_CLEAN)) {
+            return "hf11013";
+        }
+        return null;
+    }
+}