Browse Source

优化七鱼客服权限弹窗内容以及dispose问题

zk 1 year ago
parent
commit
0f5604a753

+ 2 - 2
app/src/main/java/com/datarecovery/master/module/about/AboutActivity.java

@@ -78,7 +78,7 @@ public class AboutActivity extends BaseActivity<ActivityAboutBinding> {
         });
         binding.vTrial.setOnClickListener(v -> {
             if (times == 0) {
-                if (subscribe != null) {
+                if (subscribe != null && !subscribe.isDisposed()) {
                     subscribe.dispose();
                 }
                 subscribe = Observable.timer(5000, TimeUnit.MILLISECONDS)
@@ -95,7 +95,7 @@ public class AboutActivity extends BaseActivity<ActivityAboutBinding> {
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        if (subscribe != null) {
+        if (subscribe != null && !subscribe.isDisposed()) {
             subscribe.dispose();
         }
     }

+ 1 - 1
app/src/main/java/com/datarecovery/master/module/audiorecover/AudioRecoverViewModel.java

@@ -225,7 +225,7 @@ public class AudioRecoverViewModel extends BaseViewModel {
     }
 
     public void cancelScan() {
-        if (scanDisposable != null) scanDisposable.dispose();
+        if (scanDisposable != null && !scanDisposable.isDisposed()) scanDisposable.dispose();
         showScanDialogEvent.setValue(false);
         setFreeExport();
     }

+ 1 - 1
app/src/main/java/com/datarecovery/master/module/filerecover/FileRecoverViewModel.java

@@ -242,7 +242,7 @@ public class FileRecoverViewModel extends BaseViewModel {
     }
 
     public void cancelScan() {
-        if (scanDisposable != null) scanDisposable.dispose();
+        if (scanDisposable != null && !scanDisposable.isDisposed()) scanDisposable.dispose();
         showScanDialogEvent.setValue(false);
         setFreeExport();
     }

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

@@ -369,7 +369,7 @@ public class ImageRecoverViewModel extends BaseViewModel {
     }
 
     public void cancelScan() {
-        if (scanDisposable != null) scanDisposable.dispose();
+        if (scanDisposable != null && !scanDisposable.isDisposed()) scanDisposable.dispose();
         showScanDialogEvent.setValue(false);
         setFreeExport();
     }

+ 2 - 2
app/src/main/java/com/datarecovery/master/module/login/LoginViewModel.java

@@ -143,14 +143,14 @@ public class LoginViewModel extends BaseViewModel {
     }
 
     private void stopGetCodeCountdown() {
-        if (getCodeCountdownDisposable != null) {
+        if (getCodeCountdownDisposable != null && !getCodeCountdownDisposable.isDisposed()) {
             getCodeCountdownDisposable.dispose();
         }
         isRequestCodeCountdown.setValue(false);
     }
 
     private void startGetCodeCountdown() {
-        if (getCodeCountdownDisposable != null) {
+        if (getCodeCountdownDisposable != null && !getCodeCountdownDisposable.isDisposed()) {
             getCodeCountdownDisposable.dispose();
         }
         isRequestCodeCountdown.setValue(true);

+ 1 - 1
app/src/main/java/com/datarecovery/master/module/videorecover/VideoRecoverViewModel.java

@@ -212,7 +212,7 @@ public class VideoRecoverViewModel extends BaseViewModel {
     }
 
     public void cancelScan() {
-        if (scanDisposable != null) scanDisposable.dispose();
+        if (scanDisposable != null && !scanDisposable.isDisposed()) scanDisposable.dispose();
         showScanDialogEvent.setValue(false);
         setFreeExport();
     }

+ 6 - 11
app/src/main/java/com/datarecovery/master/sdk/qiyu/QiYuHelper.java

@@ -160,26 +160,21 @@ public class QiYuHelper {
             int type = requestPermissionEventEntry.getScenesType();
             String content = null;
             switch (type) {
-                case 0:
-                    content = "使用媒体权限,用于发送媒体客服协助解答疑惑";
-                    break;
-                case 1:
-                    content = "使用拍摄视频场景相关权限,用于发送客服协助解答疑惑";
-                    break;
                 case 4:
-                    content = "使用视频权限,用于发送视频客服协助解答疑惑";
+                    content = "使用视频权限,用于发送视频文件,与在线客服联系并协助您解答疑惑";
                     break;
+                case 0:
                 case 5:
-                    content = "使用文件权限,用于发送文件客服协助解答疑惑";
+                    content = "使用存储权限,用于发送文件,与在线客服联系并协助您解答疑惑";
                     break;
                 case 6:
-                    content = "使用相册权限,用于发送图片客服协助解答疑惑";
+                    content = "使用相册权限,用于发送图片文件,与在线客服联系并协助解答疑惑";
                     break;
                 case 7:
-                    content = "使用相机权限,用于发送客服协助解答疑惑";
+                    content = "使用相机拍摄权限,用于发送图片,与在线客服联系并协助解答疑惑";
                     break;
                 case 8:
-                    content = "使用录音权限,用于发送客服协助解答疑惑";
+                    content = "使用麦克风录音权限,用于发送语音,与在线客服联系并协助解答疑惑";
                     break;
             }
             if (TextUtils.isEmpty(content)) {