瀏覽代碼

修复bug

Pq 3 年之前
父節點
當前提交
311fa84837

+ 2 - 2
live_teaching/src/main/java/com/daya/live_teaching/api/LiveTeachingApi.java

@@ -37,8 +37,8 @@ public interface LiveTeachingApi {
      * 签到
      * @return
      */
-    @GET(LiveTeachingUrls.QUERY_NO_JOIN_STU)
-    Call<Result<List<ClassMember>>> queryNoJoinStu(@Query("roomId") String roomId);
+    @POST(LiveTeachingUrls.QUERY_NO_JOIN_STU)
+    Call<Result<List<ClassMember>>> queryNoJoinStu(@Body RequestBody body);
 
     /**
      * 开关节拍器

+ 6 - 6
live_teaching/src/main/java/com/daya/live_teaching/model/ClassMember.java

@@ -25,8 +25,8 @@ public class ClassMember implements Serializable {
     private boolean micFlag;//是否开启麦克风
     private int role;
     private String userId;
-    private String headUrl;
-    private String userName;
+    private String avatar;
+    private String username;
 
     public boolean isMusicMode() {
         return musicModeFlag;
@@ -55,11 +55,11 @@ public class ClassMember implements Serializable {
 
 
     public String getHeadUrl() {
-        return headUrl;
+        return avatar;
     }
 
     public void setHeadUrl(String headUrl) {
-        this.headUrl = headUrl;
+        this.avatar = headUrl;
     }
 
 
@@ -120,11 +120,11 @@ public class ClassMember implements Serializable {
     }
 
     public String getUserName() {
-        return userName;
+        return username;
     }
 
     public void setUserName(String userName) {
-        this.userName = userName;
+        this.username = userName;
     }
 
     public PlayMidiJsonBean getPlayMidiJson() {

+ 15 - 7
live_teaching/src/main/java/com/daya/live_teaching/repository/ClassRepository.java

@@ -146,7 +146,14 @@ public class ClassRepository extends BaseRepository {
     }
 
     public void queryNoJoinStu(String roomId, final ResultCallback<List<ClassMember>> callBack) {
-        sealClassService.queryNoJoinStu(roomId).enqueue(new CallBackWrapper<List<ClassMember>>(callBack));
+
+        JSONObject jsonObject = new JSONObject();
+        try {
+            jsonObject.put("roomId", roomId);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        sealClassService.queryNoJoinStu(RequestBodyUtil.convertToRequestBodyJson(jsonObject.toString())).enqueue(new CallBackWrapper<List<ClassMember>>(callBack));
     }
 
 
@@ -416,12 +423,12 @@ public class ClassRepository extends BaseRepository {
      * @param callBack
      */
     public void createWhiteBoard(String roomId, ResultCallback<WhiteCreateBean> callBack) {
-        JSONObject jsonObject =new JSONObject();
-        try{
-            jsonObject.put("name","Page1");
-            jsonObject.put("userNum",0);
-            jsonObject.put("courseScheduleId",roomId);
-        }catch (Exception e){
+        JSONObject jsonObject = new JSONObject();
+        try {
+            jsonObject.put("name", "Page1");
+            jsonObject.put("userNum", 0);
+            jsonObject.put("courseScheduleId", roomId);
+        } catch (Exception e) {
             e.printStackTrace();
         }
         whiteBoardService.hereWhiteCreat(RequestBodyUtil.convertToRequestBodyJson(jsonObject.toString()))
@@ -432,6 +439,7 @@ public class ClassRepository extends BaseRepository {
                     protected void onSuccess(WhiteCreateBean data) {
                         callBack.onSuccess(data);
                     }
+
                     @Override
                     public void onError(Throwable e) {
                         super.onError(e);

+ 1 - 1
live_teaching/src/main/java/com/daya/live_teaching/ui/LiveActivity.java

@@ -515,7 +515,7 @@ public class LiveActivity extends BaseActivity<ActivityLiveBinding> {
 
         handler = new Handler();
         classViewModel = ViewModelProviders.of(this, new ClassViewModel.Factory(loginResult, this.getApplication())).get(ClassViewModel.class);
-        classViewModel.setClassId(intent.getStringExtra(CLASS_ID));
+        classViewModel.setClassId(loginResult.roomId);
 
         showFirstMemberToast();
         observeModel();

+ 1 - 0
rong_im/kit/src/main/java/io/rong/imkit/conversationlist/ConversationListFragment.java

@@ -123,6 +123,7 @@ public class ConversationListFragment extends Fragment implements BaseAdapter.On
      * 初始化刷新模块
      */
     protected void initRefreshView() {
+        mRefreshLayout.setEnableLoadMoreWhenContentNotFull(false);
         mRefreshLayout.setNestedScrollingEnabled(false);
         mRefreshLayout.setRefreshHeader(new RongRefreshHeader(getContext()));
         mRefreshLayout.setRefreshFooter(new RongRefreshHeader(getContext()));