修改部分bug

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

@@ -164,7 +164,7 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
     private String authorization;
     private final int PORTRAIT_REQUEST_CODE = 1002;
     private final int ADD_ACCOMPANIMENT_CODE = 1003;
-        private ShareAction mShareAction;
+    private ShareAction mShareAction;
     int ivActionIcon = -1;
     int startType = -1;
 
@@ -577,7 +577,7 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
     }
 
     @Override
-    public void savePicture(String base64,String uuid) {
+    public void savePicture(String base64, String uuid) {
 
     }
 
@@ -1018,6 +1018,18 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
             } catch (JSONException e) {
                 e.printStackTrace();
             }
+        } else if (requestCode == PictureConfig.CHOOSE_REQUEST && mUploadCallbackAboveL != null) {
+            // 图片、视频、音频选择结果回调
+            List<LocalMedia> selectList = PictureSelector.obtainMultipleResult(data);
+            String avatar = selectList.get(0).getCompressPath();
+
+            if (avatar != null) {
+                mUploadCallbackAboveL.onReceiveValue(new Uri[]{PictureFileUtils.parUri(getApplicationContext(), new File(avatar))});
+            } else {
+                mUploadCallbackAboveL.onReceiveValue(new Uri[]{});
+            }
+            mUploadCallbackAboveL = null;
+
         } else if (requestCode == 1000) {
             if (data != null) {
                 try {
@@ -1037,22 +1049,6 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
                     e.printStackTrace();
                 }
             }
-            if (requestCode == PictureConfig.CHOOSE_REQUEST && mUploadCallbackAboveL != null) {
-                // 图片、视频、音频选择结果回调
-                List<LocalMedia> selectList = PictureSelector.obtainMultipleResult(data);
-                String avatar = selectList.get(0).getCompressPath();
-
-                if (avatar != null) {
-                    mUploadCallbackAboveL.onReceiveValue(new Uri[]{PictureFileUtils.parUri(getApplicationContext(), new File(avatar))});
-                } else {
-                    mUploadCallbackAboveL.onReceiveValue(new Uri[]{});
-                }
-                mUploadCallbackAboveL = null;
-
-            } else {
-                if (mUploadCallbackAboveL != null)
-                    mUploadCallbackAboveL.onReceiveValue(new Uri[]{});
-            }
         } else if (requestCode == REQUEST_CODE_FILE_CHOOSER) {
             Uri result = data == null || resultCode != RESULT_OK ? null : data.getData();
             if (result != null) {
@@ -1096,6 +1092,9 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
         } else if (requestCode == 1011) {
             String selectAddress = data.getStringExtra("selectAddress");
             selectAddress(selectAddress);
+        } else {
+            if (mUploadCallbackAboveL != null)
+                mUploadCallbackAboveL.onReceiveValue(new Uri[]{});
         }
 
     }