Browse Source

优化图片清除未购买的情况下不用登录

zk 1 year ago
parent
commit
9d41680352

+ 5 - 1
app/src/main/java/com/datarecovery/master/module/imgrecover/ImageRecoverViewModel.java

@@ -128,7 +128,11 @@ public class ImageRecoverViewModel extends BaseViewModel {
     }
 
     public boolean isTrial() {
-        return isTrial;
+        if (Objects.equals(type, MemberType.APP_IMAGE_CLEAN)) {
+            return !deviceFuncRepository.isHaveAuth(type);
+        } else {
+            return isTrial;
+        }
     }
 
     public LiveData<List<Uri>> getDeleteUriListSdk11() {

+ 16 - 8
app/src/main/java/com/datarecovery/master/module/main/MainActivity.java

@@ -67,14 +67,22 @@ public class MainActivity extends BaseActivity<ActivityMainBinding> {
         if (intent != null) {
             String targetType = intent.getStringExtra(MEMBER_TYPE);
             if (targetType != null) {
-                if (targetType.equals(MemberType.APP_IMAGE_RECOVER)) {
-                    ImageRecoverActivity.start(this, MemberType.APP_IMAGE_RECOVER);
-                } else if (targetType.equals(MemberType.APP_FILE_RECOVER)) {
-                    FileRecoverActivity.start(this, false);
-                } else if (targetType.equals(MemberType.APP_VIDEO_RECOVER)) {
-                    VideoRecoverActivity.start(this, false);
-                } else if (targetType.equals(MemberType.APP_AUDIO_RECOVER)) {
-                    AudioRecoverActivity.start(this, false);
+                switch (targetType) {
+                    case MemberType.APP_IMAGE_RECOVER:
+                        ImageRecoverActivity.start(this, MemberType.APP_IMAGE_RECOVER);
+                        break;
+                    case MemberType.APP_FILE_RECOVER:
+                        FileRecoverActivity.start(this, false);
+                        break;
+                    case MemberType.APP_VIDEO_RECOVER:
+                        VideoRecoverActivity.start(this, false);
+                        break;
+                    case MemberType.APP_AUDIO_RECOVER:
+                        AudioRecoverActivity.start(this, false);
+                        break;
+                    case MemberType.APP_IMAGE_CLEAN:
+                        ImageRecoverActivity.start(this, MemberType.APP_IMAGE_CLEAN);
+                        break;
                 }
             }
         }

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

@@ -157,7 +157,7 @@ public class MemberActivity extends BaseActivity<ActivityMemberBinding> {
                 MainActivity.startToTargetActivity(this, MemberType.APP_AUDIO_RECOVER);
                 break;
             case MemberType.APP_IMAGE_CLEAN:
-                ImageRecoverActivity.start(this, MemberType.APP_IMAGE_CLEAN);
+                MainActivity.startToTargetActivity(this, MemberType.APP_IMAGE_CLEAN);
                 break;
         }
     }