Przeglądaj źródła

修改首页权限获取流程,防止隐私政策检测不通过

Pq 1 rok temu
rodzic
commit
d57c82ebda

+ 1 - 8
institution/src/main/java/com/cooleshow/institution/stu/ui/main/MainActivity.java

@@ -292,14 +292,7 @@ public class MainActivity extends BaseMVPActivity<ActivityInstitutionMainLayoutB
      * 申请存储权限
      */
     private void requestPermission() {
-        new RxPermissions(this)
-                .request(Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE)
-                .subscribe(permission -> {
-                    if (permission) {
-                        checkAppVersion();
-                        MidiFileHelper.initMidFile();
-                    }
-                });
+        checkAppVersion();
     }
 
     private void checkAppVersion() {

+ 1 - 8
student/src/main/java/com/cooleshow/student/ui/main/MainActivity.java

@@ -251,14 +251,7 @@ public class MainActivity extends BaseMVPActivity<ActivityMainBinding, MainPrese
      * 申请存储权限
      */
     private void requestPermission() {
-        new RxPermissions(this)
-                .request(Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE)
-                .subscribe(permission -> {
-                    if (permission) {
-                        checkAppVersion();
-                        MidiFileHelper.initMidFile();
-                    }
-                });
+        checkAppVersion();
     }
 
 

+ 22 - 0
student/src/main/java/com/cooleshow/student/ui/web/AccompanyActivity.java

@@ -2,6 +2,7 @@ package com.cooleshow.student.ui.web;
 
 import static com.cooleshow.base.common.WebConstants.WEB_URL;
 
+import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Intent;
@@ -33,6 +34,7 @@ import com.cooleshow.base.utils.FileUtils;
 import com.cooleshow.base.utils.LOG;
 import com.cooleshow.base.utils.MyFileUtils;
 import com.cooleshow.base.utils.ToastUtil;
+import com.cooleshow.base.utils.helper.MidiFileHelper;
 import com.cooleshow.base.utils.helper.WebParamsHelper;
 import com.cooleshow.base.utils.helper.upload.UploadHelper;
 import com.cooleshow.student.R;
@@ -41,6 +43,7 @@ import com.cooleshow.student.helper.AccompanyHelper;
 import com.cooleshow.student.presenter.web.AccompanyPresenter;
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.gyf.immersionbar.ImmersionBar;
+import com.tbruyelle.rxpermissions3.RxPermissions;
 import com.wonderkiln.camerakit.CameraKit;
 import com.wonderkiln.camerakit.CameraView;
 import com.wonderkiln.camerakit.events.CameraKitError;
@@ -298,6 +301,25 @@ public class AccompanyActivity extends BaseMVPActivity<ActivityAccompanyBinding,
         startService(intentOne);
     }
 
+    @Override
+    public void initData() {
+        super.initData();
+        requestPermission();
+    }
+
+    /**
+     * 申请存储权限
+     */
+    private void requestPermission() {
+        new RxPermissions(this)
+                .request(android.Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE)
+                .subscribe(permission -> {
+                    if (permission) {
+                        MidiFileHelper.initMidFile();
+                    }
+                });
+    }
+
     private void mixMp3AndMp4(String accompanimentUrl, String videoPath) {
         AccompanyHelper.getInstance().download(accompanimentUrl, new ResultCallback<String>() {
             @Override

+ 1 - 8
teacher/src/main/java/com/cooleshow/teacher/ui/main/MainActivity.java

@@ -225,14 +225,7 @@ public class MainActivity extends BaseMVPActivity<ActivityMainBinding, MainPrese
      * 申请存储权限
      */
     private void requestPermission() {
-        new RxPermissions(this)
-                .request(Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE)
-                .subscribe(permission -> {
-                    if (permission) {
-                        checkAppVersion();
-                        MidiFileHelper.initMidFile();
-                    }
-                });
+        checkAppVersion();
     }
 
 

+ 28 - 6
teacher/src/main/java/com/cooleshow/teacher/ui/web/AccompanyActivity.java

@@ -1,5 +1,6 @@
 package com.cooleshow.teacher.ui.web;
 
+import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
@@ -31,6 +32,7 @@ import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.FileUtils;
 import com.cooleshow.base.utils.LOG;
 import com.cooleshow.base.utils.ToastUtil;
+import com.cooleshow.base.utils.helper.MidiFileHelper;
 import com.cooleshow.base.utils.helper.WebParamsHelper;
 import com.cooleshow.base.utils.helper.upload.UploadHelper;
 import com.cooleshow.teacher.R;
@@ -40,6 +42,7 @@ import com.cooleshow.teacher.presenter.web.AccompanyPresenter;
 import com.cooleshow.base.utils.MyFileUtils;
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.gyf.immersionbar.ImmersionBar;
+import com.tbruyelle.rxpermissions3.RxPermissions;
 import com.wonderkiln.camerakit.CameraKit;
 import com.wonderkiln.camerakit.CameraView;
 import com.wonderkiln.camerakit.events.CameraKitError;
@@ -160,7 +163,7 @@ public class AccompanyActivity extends BaseMVPActivity<ActivityAccompanyBinding,
 
                         @Override
                         public void onEvent(CameraKitEvent cameraKitEvent) {
-                            if(TextUtils.equals(cameraKitEvent.getType(),CameraKitEvent.TYPE_CAMERA_OPEN)){
+                            if (TextUtils.equals(cameraKitEvent.getType(), CameraKitEvent.TYPE_CAMERA_OPEN)) {
                                 if (cameraView != null) {
                                     //cameraView的onMeasure会根据mAdjustViewBounds计算宽高,所以保证cameraView里面的getPreviewSize有值以后再刷新一下根据cameraView的mAdjustViewBounds确认宽高
                                     cameraView.requestLayout();
@@ -299,6 +302,25 @@ public class AccompanyActivity extends BaseMVPActivity<ActivityAccompanyBinding,
         startService(intentOne);
     }
 
+    @Override
+    public void initData() {
+        super.initData();
+        requestPermission();
+    }
+
+    /**
+     * 申请存储权限
+     */
+    private void requestPermission() {
+        new RxPermissions(this)
+                .request(android.Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE)
+                .subscribe(permission -> {
+                    if (permission) {
+                        MidiFileHelper.initMidFile();
+                    }
+                });
+    }
+
     private void toStartCapture() {
         Observable.create(new ObservableOnSubscribe<Object>() {
                     @Override
@@ -346,11 +368,11 @@ public class AccompanyActivity extends BaseMVPActivity<ActivityAccompanyBinding,
 
     private void saveVideoToGallery(String filePath) {
         Observable.create(new ObservableOnSubscribe<Object>() {
-            @Override
-            public void subscribe(@NonNull ObservableEmitter<Object> emitter) throws Throwable {
-                FileUtils.saveVideoToGallery(AccompanyActivity.this.getApplicationContext(), filePath);
-            }
-        }).subscribeOn(Schedulers.newThread())
+                    @Override
+                    public void subscribe(@NonNull ObservableEmitter<Object> emitter) throws Throwable {
+                        FileUtils.saveVideoToGallery(AccompanyActivity.this.getApplicationContext(), filePath);
+                    }
+                }).subscribeOn(Schedulers.newThread())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Consumer<Object>() {
                     @Override