1:修改点唱房的bug

2：添加公会消息类型

BaseModule/src/main/java/com/xscm/moduleutil/bean/NewsMessageList.java

@@ -10,7 +10,7 @@ import lombok.Data;
 @Data
 public class NewsMessageList {
     private int id;
-    private int type;//类型 1：系统消息 2：官方公告 3：活动中心
+    private int type;//类型 1：系统消息 2：官方公告 3：活动中心 6：邀请加入公会
     private int admin_id;
     private String title;//标题
     private String content;//内容
@@ -22,4 +22,5 @@ public class NewsMessageList {
     private String createtime;
     private String updatetime;
     private String delete_time;
+    private int guild_invited_status;
 }

BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java

@@ -125,6 +125,9 @@ public interface ApiServer {
     @POST(Constants.POST_MESSAGE_LIST)
     Call<BaseModel<List<NewsMessageList>>> getMessagetitle(@Field("type") String type, @Field("page") String page, @Field("page_limit") String page_limit);
 
+    @FormUrlEncoded
+    @POST(Constants.POST_INVITE)
+    Call<BaseModel<String>> postInvite(@Field("apply_id") String apply_id, @Field("type") String type);
     @GET(Constants.GET_TEMP_KEY)
     Call<BaseModel<TempKeyBean>> getTempKey();
 

BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java

@@ -518,6 +518,34 @@ public class RetrofitClient {
         });
     }
 
+    public void postInvite(String apply_id,String type,BaseObserver<String> observer) {
+        sApiServer.postInvite(apply_id,type).enqueue(new Callback<BaseModel<String>>() {
+
+            @Override
+            public void onResponse(Call<BaseModel<String>> call, Response<BaseModel<String>> response) {
+                if (response.code() == 200) {
+                    BaseModel<String> baseModel = response.body();
+                    if (baseModel.getCode() == 1)
+                        observer.onNext(baseModel.getMsg());
+                    else if (baseModel.getCode() == 301) {
+                        try {
+                            ToastUtils.showShort(baseModel.getMsg());
+                            CommonAppContext.getInstance().clearLoginInfo();
+                        } catch (ClassNotFoundException e) {
+                        }
+                    } else {
+                        observer.onNext(baseModel.getMsg());
+                    }
+                }
+            }
+
+            @Override
+            public void onFailure(Call<BaseModel<String>> call, Throwable t) {
+                LogUtils.e("修改公会公告失败",t.fillInStackTrace());
+            }
+        });
+    }
+
     public void singerAuth(String url, BaseObserver<String> observer) {
         sApiServer.singerAuth(url).enqueue(new Callback<BaseModel<String>>() {
 

BaseModule/src/main/java/com/xscm/moduleutil/widget/Constants.java

@@ -366,6 +366,7 @@ public class Constants {
     public static final String GET_APP_UPDATE = "/api/Version/get_app_version";//版本更新
     public static final String POST_CLEAR_USER_CHARM = "/api/Room/clear_user_charm";//清除魅力值
     public static final String POST_MESSAGE_LIST = "/api/UserMessage/get_user_message_list";//消息列表
+    public static final String POST_INVITE = "/api/Guild/invite_apply_handle";//【新】受邀申请处理
     public static final String POST_BIND_DETAIL = "/api/Bind/bind_detail";//绑定详情
     public static final String POST_USER_WALL = "/api/User/user_gift_wall";//礼物墙
     public static final String POST_USER_OLINE_STATUS = "/api/Room/user_online_status";//用户在线状态