Pq 3 سال پیش
والد
کامیت
1276e8a041

+ 1 - 1
BaseLibrary/src/main/java/com/cooleshow/base/utils/JumpUtils.java

@@ -41,7 +41,7 @@ public class JumpUtils {
                     if (TextUtils.equals(routeBean.pageTag, RouteConstants.PAGE_TAG_EVALUATE)) {
                         //跳转评价页面
                         if (BaseApplication.Companion.isTeacherClient()) {
-                            ARouter.getInstance().build(RouterPath.CommentCenter.TEACHER_COURSE_COMMENT)
+                            ARouter.getInstance().build(RouterPath.CommentCenter.TEACHER_RECEIVED_COMMENT)
                                     .navigation();
                         }
                     }

+ 12 - 0
live_teaching/src/main/java/com/daya/live_teaching/im/message/MemberChangedMessage.java

@@ -25,12 +25,14 @@ public class MemberChangedMessage extends MessageContent {
     private int action;     // 用户行为:1.加入;2.离开;3.踢出
     private String userId;
     private String userName;
+    private String avatar;
     private int role;       // 用户角色
     private long timestamp;
     private boolean metronomeSwitch;
     private boolean handUpOn;
     private boolean examSongSwitch;
 
+
     public MemberChangedMessage(byte[] data) {
         String jsonStr = null;
         try {
@@ -52,6 +54,7 @@ public class MemberChangedMessage extends MessageContent {
             JSONObject roomMemberJson = jsonObject.optJSONObject("roomMember");
             userId = roomMemberJson.optString("userId");
             userName = roomMemberJson.optString("username");
+            avatar = roomMemberJson.optString("avatar");
             role = roomMemberJson.optInt("role");
             timestamp = roomMemberJson.optLong("timestamp");
             metronomeSwitch = jsonObject.optBoolean("metronomeSwitch");
@@ -105,6 +108,14 @@ public class MemberChangedMessage extends MessageContent {
         return examSongSwitch;
     }
 
+    public String getHeadUrl() {
+        return avatar;
+    }
+
+    public void setHeadUrl(String headUrl) {
+        this.avatar = headUrl;
+    }
+
     @Override
     public byte[] encode() {
         JSONObject jsonObject = new JSONObject();
@@ -112,6 +123,7 @@ public class MemberChangedMessage extends MessageContent {
 //            jsonObject.put("action", action);
             jsonObject.put("userId", userId);
             jsonObject.put("username", userName);
+            jsonObject.put("avatar", avatar);
             jsonObject.put("role", role);
             jsonObject.put("timestamp", timestamp);
             jsonObject.put("metronomeSwitch", metronomeSwitch);

+ 1 - 0
live_teaching/src/main/java/com/daya/live_teaching/repository/ClassRepository.java

@@ -600,6 +600,7 @@ public class ClassRepository extends BaseRepository {
                 classMember.setRole(memberChangedMessage.getRole().getValue());
                 classMember.setUserId(memberChangedMessage.getUserId());
                 classMember.setUserName(memberChangedMessage.getUserName());
+                classMember.setHeadUrl(memberChangedMessage.getHeadUrl());
                 try {
                     long timestamp = memberChangedMessage.getTimestamp();
                     String millon = DateUtil.getMillon(timestamp);

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

@@ -504,6 +504,7 @@ public class LiveActivity extends BaseActivity<ActivityLiveBinding> {
         // 需要由登录进入此界面,当不含登录信息时关闭
         if (loginResult == null) {
             finish();
+            return;
         }
         roomId = loginResult.getRoomId();
         userInfo = loginResult.roomMember;

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/adapter/ReceivedCommentListAdapter.java

@@ -38,7 +38,7 @@ public class ReceivedCommentListAdapter extends BaseQuickAdapter<ReceivedComment
         //时间
         holder.setText(R.id.tv_time, UiUtils.getCourseTimeString(bean.startTime,bean.endTime));
         //评价内容
-        holder.setText(R.id.tv_comment_content, bean.studentReplied);
+        holder.setText(R.id.tv_comment_content, bean.studentRepliedStr);
         //评分
         RatingBar ratingBar = holder.getView(R.id.rating_bar_for_student);
         int rating = 0;

+ 1 - 0
teacher/src/main/java/com/cooleshow/teacher/bean/ReceivedCommentListBean.java

@@ -93,6 +93,7 @@ public class ReceivedCommentListBean {
         public String score;
         public String startTime;
         public String studentReplied;
+        public String studentRepliedStr;
         public int subjectId;
         public String subjectName;
         public int userId;

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/presenter/income/MineIncomePresenter.java

@@ -58,7 +58,7 @@ public class MineIncomePresenter extends BasePresenter<MineIncomeContract.MineIn
         }
         JSONObject jsonObject = new JSONObject();
         try {
-//            jsonObject.put("bizType",bizType);
+            jsonObject.put("bizType",bizType);
             jsonObject.put("searchDate",searchDate);
             jsonObject.putOpt("page", page);
             jsonObject.putOpt("rows", Constants.DEFAULT_DATA_SIZE);