修改部分ui

student/src/main/java/com/cooleshow/student/api/APIService.java

@@ -179,7 +179,6 @@ public interface APIService {
     Observable<BaseResponse<HomeLiveAndVideoBean>> queryLiveAndVideo(@Query("platform") String platform, @Query("version") String version);
 
 
-
     /**
      * 首页统计数据
      *
@@ -227,6 +226,7 @@ public interface APIService {
 
     /**
      * 学生端-我的-我的课程-购买的视频课组
+     *
      * @param body
      * @return
      */
@@ -234,7 +234,6 @@ public interface APIService {
     Observable<BaseResponse<SelectMyGroupBean>> selectMyGroup(@Body RequestBody body);
 
 
-
     /**
      * 获取声部搜索下拉框
      *
@@ -270,6 +269,7 @@ public interface APIService {
      */
     @POST(STUDENT_GROUP + "sysMessage/list")
     Observable<BaseResponse<SystemMessageBean>> sysMessageList(@Body RequestBody body);
+
     /**
      * 一键已读
      *
@@ -350,6 +350,7 @@ public interface APIService {
 
     /**
      * 陪练课-作业提交
+     *
      * @param body
      * @return
      */
@@ -376,6 +377,7 @@ public interface APIService {
 
     /**
      * 根据声部编号查询声部
+     *
      * @param id
      * @return
      */
@@ -384,6 +386,7 @@ public interface APIService {
 
     /**
      * 设置声部
+     *
      * @param subjectIds
      * @return
      */
@@ -395,7 +398,7 @@ public interface APIService {
      *
      * @return
      */
-    @GET(STUDENT_GROUP+"liveRoom/studentCheckRoomInfo")
+    @GET(STUDENT_GROUP + "liveRoom/studentCheckRoomInfo")
     Observable<BaseResponse<LiveRoomInfoBean>> getLiveRoomInfo(@Query("roomUid") String roomUid);
 
     /**
@@ -403,7 +406,7 @@ public interface APIService {
      *
      * @return
      */
-    @GET(STUDENT_GROUP+"liveRoom/joinRoom")
+    @GET(STUDENT_GROUP + "liveRoom/joinRoom")
     Observable<BaseResponse<Object>> notifyJoinRoomAction(@Query("roomUid") String roomUid, @Query("userId") String userId);
 
     /**
@@ -411,7 +414,7 @@ public interface APIService {
      *
      * @return
      */
-    @POST(STUDENT_GROUP+"liveRoom/syncUserStatus")
+    @POST(STUDENT_GROUP + "liveRoom/syncUserStatus")
     Observable<BaseResponse<Object>> notifyLeaveRoomAction(@Body RequestBody body);
 
     /**
@@ -419,8 +422,8 @@ public interface APIService {
      *
      * @return
      */
-    @GET("api-student/imGroup/queryFriendDetail")
-    Observable<BaseResponse<FriendInfoBean>> queryFriendDetail(@Query("userId") String userId);
+    @POST(STUDENT_GROUP + "imUserFriend/getDetail/{userId}")
+    Observable<BaseResponse<FriendInfoBean>> queryFriendDetail(@Path("userId") String userId);
 
     /**
      * 意见反馈
@@ -453,8 +456,9 @@ public interface APIService {
 
     /**
      * 校验图片验证码
+     * <p>
+     * type:类型（PASSWD:修改密码，LOGIN:登录或注册,BANK:绑定银行卡,PHONE:修改手机号）
      *
-     *             type:类型（PASSWD:修改密码，LOGIN:登录或注册,BANK:绑定银行卡,PHONE:修改手机号）
      * @return
      */
     @FormUrlEncoded

student/src/main/java/com/cooleshow/student/bean/FriendInfoBean.java

@@ -4,129 +4,7 @@ package com.cooleshow.student.bean;
  * Author by pq, Date on 2022/4/11.
  */
 public class FriendInfoBean {
-
-    /**
-     * friend : {"roles":null,"username":"嗷嗷","password":"$2a$10$Ex7buphWImsizz8iVpZVwu9znDsRGUadunLNfiyxURdJtg3gY1uNK","gender":1,"certificateType":"","delFlag":0,"organId":1007,"salt":"","organName":"","userType":"STUDENT","phone":"18341111119","avatar":"","currentClass":"2班","currentGrade":"","birthdate":null,"idCardNo":"","imToken":"lCvSFgo4OaH5OzMX/k6QoO1hdlQbTOD5RxAXMAscMjM=@n56a.cn.rongnav.com;n56a.cn.rongcfg.com","createTime":"2022-02-25 16:46:49","email":"","teacherId":0,"isSuperAdmin":false,"lockFlag":0,"deptId":0,"deptIds":"","postDeptIds":"","updateTime":"2022-03-08 11:05:19","organIdList":"","currentGradeNum":2,"operatingTag":0,"serviceTag":0,"postalCode":"","postIds":"","bankCard":"","openBankAddress":"","positionName":"","positions":"","superAdmin":false,"wxOpenid":"","qqOpenid":"","nation":"","wechatId":"","contactAddress":"","id":2163097,"realName":"","tenantId":1}
-     * tags :
-     * userId : 0
-     * memberRankSettingId : 0
-     * createTime : null
-     * memo :
-     * subjectId :
-     * friendId : 2163097
-     * updateTime : null
-     * subjectName :
-     * friendNickname : 嗷嗷
-     * id : 0
-     * tenantId : 1
-     */
-
-    public FriendBean friend;
-    public String tags;
-    public int userId;
-    public int memberRankSettingId;
-    public Object createTime;
-    public String memo;
-    public String subjectId;
+    public String friendAvatar;
     public String friendId;
-    public Object updateTime;
-    public String subjectName;
     public String friendNickname;
-    public int id;
-    public int tenantId;
-
-    public static class FriendBean {
-        /**
-         * roles : null
-         * username : 嗷嗷
-         * password : $2a$10$Ex7buphWImsizz8iVpZVwu9znDsRGUadunLNfiyxURdJtg3gY1uNK
-         * gender : 1
-         * certificateType :
-         * delFlag : 0
-         * organId : 1007
-         * salt :
-         * organName :
-         * userType : STUDENT
-         * phone : 18341111119
-         * avatar :
-         * currentClass : 2班
-         * currentGrade :
-         * birthdate : null
-         * idCardNo :
-         * imToken : lCvSFgo4OaH5OzMX/k6QoO1hdlQbTOD5RxAXMAscMjM=@n56a.cn.rongnav.com;n56a.cn.rongcfg.com
-         * createTime : 2022-02-25 16:46:49
-         * email :
-         * teacherId : 0
-         * isSuperAdmin : false
-         * lockFlag : 0
-         * deptId : 0
-         * deptIds :
-         * postDeptIds :
-         * updateTime : 2022-03-08 11:05:19
-         * organIdList :
-         * currentGradeNum : 2
-         * operatingTag : 0
-         * serviceTag : 0
-         * postalCode :
-         * postIds :
-         * bankCard :
-         * openBankAddress :
-         * positionName :
-         * positions :
-         * superAdmin : false
-         * wxOpenid :
-         * qqOpenid :
-         * nation :
-         * wechatId :
-         * contactAddress :
-         * id : 2163097
-         * realName :
-         * tenantId : 1
-         */
-
-        public Object roles;
-        public String username;
-        public String password;
-        public int gender;
-        public String certificateType;
-        public int organId;
-        public String salt;
-        public String organName;
-        public String userType;
-        public String phone;
-        public String avatar;
-        public String currentClass;
-        public String currentGrade;
-        public Object birthdate;
-        public String idCardNo;
-        public String imToken;
-        public String createTime;
-        public String email;
-        public int teacherId;
-        public boolean isSuperAdmin;
-        public int lockFlag;
-        public int deptId;
-        public String deptIds;
-        public String postDeptIds;
-        public String updateTime;
-        public String organIdList;
-        public int currentGradeNum;
-        public int operatingTag;
-        public int serviceTag;
-        public String postalCode;
-        public String postIds;
-        public String bankCard;
-        public String openBankAddress;
-        public String positionName;
-        public String positions;
-        public boolean superAdmin;
-        public String wxOpenid;
-        public String qqOpenid;
-        public String nation;
-        public String wechatId;
-        public String contactAddress;
-        public int id;
-        public String realName;
-        public int tenantId;
-    }
 }

student/src/main/java/com/cooleshow/student/ui/live/LiveRoomActivity.java

@@ -1427,7 +1427,7 @@ public class LiveRoomActivity extends BaseMVPActivity<ActivityLiveroomLayoutBind
         if (isFinishing() || isDestroyed()) {
             return;
         }
-        if (mLlMicContainer != null) {
+        if (mLlMicContainer != null && friendInfoBean != null) {
             mLlMicContainer.updateTargetUserInfo(new UserInfo(friendInfoBean.friendId, friendInfoBean.friendNickname, null));
         }
     }

student/src/main/res/layout/activity_feedback.xml

@@ -30,6 +30,7 @@
         android:textColorHint="@color/color_999999"
         android:textSize="@dimen/sp_16" />
     <EditText
+        android:visibility="gone"
         android:id="@+id/et_connect"
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_48"
@@ -56,7 +57,7 @@
         android:textColor="@color/gray_777"
         android:lineSpacingExtra="4dp"
         android:layout_marginRight="17dp"
-        android:text="或通过以下方式联系我们：\n微信公众号：DYME-2002\n邮箱：dyme2002@dayaedu.com"
+        android:text="或通过以下方式联系我们：\n邮箱：dyme2002@dayaedu.com"
         android:layout_marginTop="14dp"/>
     <TextView
         android:id="@+id/tv_submit"

teacher/src/main/res/layout/activity_feedback.xml

@@ -57,7 +57,7 @@
         android:textColor="@color/gray_777"
         android:lineSpacingExtra="4dp"
         android:layout_marginRight="17dp"
-        android:text="或通过以下方式联系我们：\n微信公众号：DYME-2002\n邮箱：dyme2002@dayaedu.com"
+        android:text="或通过以下方式联系我们：\n邮箱：dyme2002@dayaedu.com"
         android:layout_marginTop="14dp"/>
     <TextView
         android:id="@+id/tv_submit"