修改权限申请

student/src/main/java/com/cooleshow/student/ui/main/MainActivity.java

@@ -1,5 +1,6 @@
 package com.cooleshow.student.ui.main;
 
+import android.Manifest;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -25,6 +26,7 @@ import com.cooleshow.usercenter.helper.UserHelper;
 import com.daya.live_teaching.common.ResultCallback;
 import com.daya.live_teaching.im.IMManager;
 import com.google.android.material.bottomnavigation.BottomNavigationView;
+import com.tbruyelle.rxpermissions3.RxPermissions;
 
 import java.util.ArrayList;
 
@@ -100,10 +102,22 @@ public class MainActivity extends BaseMVPActivity<ActivityMainBinding, MainPrese
     @Override
     public void initData() {
         super.initData();
+        requestPermission();
         connectIM();
     }
 
     /**
+     * 申请存储权限
+     */
+    private void requestPermission() {
+        new RxPermissions(this)
+                .request(Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE)
+                .subscribe(permission -> {
+                });
+    }
+
+
+    /**
      * 连接rong IM
      */
     private void connectIM() {
@@ -182,10 +196,10 @@ public class MainActivity extends BaseMVPActivity<ActivityMainBinding, MainPrese
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        if (resultCode==RESULT_OK){
-            if (requestCode==1011){
+        if (resultCode == RESULT_OK) {
+            if (requestCode == 1011) {
                 String selectAddress = data.getStringExtra("selectAddress");
-                if (null!=shopMallFragment){
+                if (null != shopMallFragment) {
                     shopMallFragment.selectAddress(selectAddress);
                 }
             }

student/src/main/java/com/cooleshow/student/ui/web/HtmlActivity.java

@@ -1079,11 +1079,13 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
             if (result != null) {
                 File file = UriUtils.uri2File(result);
                 if (file != null && file.exists()) {
+                    showLoading();
                     UploadHelper uploadHelper = new UploadHelper(HtmlActivity.this);
                     uploadHelper.uploadFile(file);
                     uploadHelper.setUpLoadCallBack(new UploadHelper.UpLoadCallBack() {
                         @Override
                         public void onSuccess(String url) {
+                            hideLoading();
                             try {
                                 JSONObject jsonObject = new JSONObject();
                                 JSONObject contentObj = baseJsonObject.getJSONObject("content");
@@ -1100,6 +1102,7 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
 
                         @Override
                         public void onFailure() {
+                            hideLoading();
                             ToastUtils.showShort("上传失败，请重新选择");
                             upLoadFileFaile();
                         }

teacher/src/main/java/com/cooleshow/teacher/ui/main/MainActivity.java

@@ -1,5 +1,6 @@
 package com.cooleshow.teacher.ui.main;
 
+import android.Manifest;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.MenuItem;
@@ -9,6 +10,7 @@ import com.common.im.ui.MessageFragment;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.LogUtils;
+import com.cooleshow.base.utils.helper.DialogHelper;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.HomePageAdapter;
@@ -21,6 +23,7 @@ import com.cooleshow.usercenter.helper.UserHelper;
 import com.daya.live_teaching.common.ResultCallback;
 import com.daya.live_teaching.im.IMManager;
 import com.google.android.material.bottomnavigation.BottomNavigationView;
+import com.tbruyelle.rxpermissions3.RxPermissions;
 
 import java.util.ArrayList;
 
@@ -101,9 +104,20 @@ public class MainActivity extends BaseMVPActivity<ActivityMainBinding, MainPrese
     @Override
     public void initData() {
         super.initData();
+        requestPermission();
         connectIM();
     }
 
+    /**
+     * 申请存储权限
+     */
+    private void requestPermission() {
+        new RxPermissions(this)
+                .request(Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE)
+                .subscribe(permission -> {
+                });
+    }
+
 
     /**
      * 连接rong IM
@@ -129,6 +143,7 @@ public class MainActivity extends BaseMVPActivity<ActivityMainBinding, MainPrese
             }
         }
     }
+
     /*
     上一次的tab位置
      */
@@ -136,33 +151,33 @@ public class MainActivity extends BaseMVPActivity<ActivityMainBinding, MainPrese
 
     private boolean onTabClick(int viewId) {
         if (viewId == R.id.menu_home) {
-            if (lastCurrentItemPosition!=0){
+            if (lastCurrentItemPosition != 0) {
                 presenter.getTeacherUserInfo();
             }
-            lastCurrentItemPosition=0;
+            lastCurrentItemPosition = 0;
             getViewBinding().viewPager.setCurrentItem(0, false);
             return true;
         }
         if (viewId == R.id.menu_coursetable) {
-            lastCurrentItemPosition=1;
+            lastCurrentItemPosition = 1;
             getViewBinding().viewPager.setCurrentItem(1, false);
             return true;
         }
         if (viewId == R.id.menu_chat) {
-            lastCurrentItemPosition=2;
+            lastCurrentItemPosition = 2;
             getViewBinding().viewPager.setCurrentItem(2, false);
             return true;
         }
         if (viewId == R.id.menu_mall) {
-            lastCurrentItemPosition=3;
+            lastCurrentItemPosition = 3;
             getViewBinding().viewPager.setCurrentItem(3, false);
             return true;
         }
         if (viewId == R.id.menu_mine) {
-            if (lastCurrentItemPosition!=4){
+            if (lastCurrentItemPosition != 4) {
                 presenter.getTeacherUserInfo();
             }
-            lastCurrentItemPosition=4;
+            lastCurrentItemPosition = 4;
             getViewBinding().viewPager.setCurrentItem(4, false);
         }
         return true;