修复bug

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

@@ -1054,6 +1054,7 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
                                 dialog.dismiss();
                             });
                         });
+                        clearUploadMessage();
                     }
                 });
     }
@@ -1145,7 +1146,7 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
                 ToastUtil.getInstance().showShort("上传失败，请重新选择");
                 upLoadFileFaile();
             }
-//            clearUploadMessage();
+            clearUploadMessage();
             return;
         } else if (requestCode == 1011) {
             //选择地址
@@ -1172,6 +1173,16 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
 
     }
 
+    /**
+     * webview没有选择文件也要传null，防止下次无法执行
+     */
+    private void clearUploadMessage() {
+        if (mUploadCallbackAboveL != null) {
+            mUploadCallbackAboveL.onReceiveValue(null);
+            mUploadCallbackAboveL = null;
+        }
+    }
+
     @Override
     protected void onDestroy() {
         super.onDestroy();

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

@@ -65,6 +65,7 @@ import com.cooleshow.teacher.bean.alipay.AuthResult;
 import com.cooleshow.teacher.bean.alipay.PayResult;
 import com.cooleshow.teacher.bean.weixinpay.WeixinPayInfo;
 import com.cooleshow.teacher.databinding.ActivityHtml1Binding;
+import com.cooleshow.teacher.ui.live.TeacherLiveRoomActivity;
 import com.cooleshow.teacher.widgets.FileUtils;
 import com.cooleshow.teacher.widgets.LollipopFixedWebView;
 import com.cooleshow.teacher.widgets.helper.JsInterfaceUtils;
@@ -539,7 +540,10 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
 
     @Override
     public void joinLiveRoom(String roomId, String teacherId) {
-
+        //加入直播间
+        if (!TextUtils.isEmpty(roomId)) {
+            TeacherLiveRoomActivity.start(HtmlActivity.this, roomId);
+        }
     }
 
     @Override
@@ -1048,6 +1052,7 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
                                 dialog.dismiss();
                             });
                         });
+                        clearUploadMessage();
                     }
                 });
     }
@@ -1136,7 +1141,7 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
                 ToastUtil.getInstance().showShort("上传失败，请重新选择");
                 upLoadFileFaile();
             }
-//            clearUploadMessage();
+            clearUploadMessage();
             return;
         } else if (requestCode == 1011) {
             if (data == null) {
@@ -1165,6 +1170,16 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
 
     }
 
+    /**
+     * webview没有选择文件也要传null，防止下次无法执行
+     */
+    private void clearUploadMessage() {
+        if (mUploadCallbackAboveL != null) {
+            mUploadCallbackAboveL.onReceiveValue(null);
+            mUploadCallbackAboveL = null;
+        }
+    }
+
     @Override
     protected void onDestroy() {
         super.onDestroy();