1 新增上传JSON数据接口

YangShuai
1 parent 1fbabddd
Showing 12 changed files with 489 additions and 109 deletions
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/presenter/SetFriendsRolePresenter.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/SelectIMFriendView.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/SetFriendsRoleView.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/netWork/ApiServiceCMCC.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/netWork/ApiServiceXiaoJia.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/netWork/BasicParamsInterceptor.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/netWork/CmccRequest.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/netWork/bean/InvitFamilyBean1.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/SetFriendsRoleActivity.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/adapter/AllRoleDetailAdapter.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/adapter/SetRoleAdapter.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/SelectIMFriendFragment.java
 package com.cnlive.strike.xiaojiaspeaker.frame.presenter;
  
+import android.app.Activity;
 import android.content.Context;
 import android.util.Log;
 import android.view.View;
@@ -9,36 +10,88 @@ import com.cnlive.libs.base.logic.callback.DataCallback;
 import com.cnlive.libs.base.logic.callback.FailureCallback;
 import com.cnlive.libs.base.logic.callback.SuccessCallback;
 import com.cnlive.strike.xiaojiaspeaker.frame.view.SetFriendsRoleView;
+import com.cnlive.strike.xiaojiaspeaker.netWork.ApiServiceCMCC;
 import com.cnlive.strike.xiaojiaspeaker.netWork.ApiServiceXiaoJia;
+import com.cnlive.strike.xiaojiaspeaker.netWork.CmccRequest;
+import com.cnlive.strike.xiaojiaspeaker.netWork.bean.InvitFamilyBean1;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.RoleNetBean;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.APIBaseInfo;
 import com.cnlive.strike.xiaojiaspeaker.netWork.result.SubscriptionRequest;
+import com.cnlive.strike.xiaojiaspeaker.util.GsonUtil;
 import com.cnlive.strike.xiaojiaspeaker.util.QMUITipDialogUtil;
+import com.cnlive.strike.xiaojiaspeaker.util.subutil.util.http.Request;
 import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
  
 import java.util.HashMap;
 import java.util.Map;
  
 import io.reactivex.disposables.Disposable;
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
  
 public class SetFriendsRolePresenter extends MvpBasePresenter<SetFriendsRoleView> {
  
     private String TAG = "SetFriendsRolePresenter";
  
-    public void invitFamilyMember(Context context,  String contactsInvite) {
+
+    public void queryConfigDeviceNetResult(Activity context, String contactsInvite) {
+        InvitFamilyBean1 bean1=new InvitFamilyBean1();
+        bean1.setType("2");
+        bean1.setContactsInvite(GsonUtil.jsonToList(contactsInvite, InvitFamilyBean1.ContactsInviteBean.class));
+
+        CmccRequest.getInstance(ApiServiceCMCC.class)
+                .invitFamilyMember(bean1)
+                .enqueue(new Callback<APIBaseInfo>() {
+                    @Override
+                    public void onResponse(Call<APIBaseInfo> call, Response<APIBaseInfo> response) {
+                        if (null == getView()) {
+                            return;
+                        }
+                        QMUITipDialogUtil.dismessDialog();
+//                        ConfigDeviceNetResult result = response.body();
+//                        //响应成功
+//                        if (CmccRequest.SUCCRSS == result.getResult()) {
+//                            Log.e(TAG, "onResponse: ");
+//                            if ("success".equals(result.getData().getResult())) {
+//                                context.finish();
+//                                ConnBluetoothSuccessActivity.startActivity(context);
+//                            } else {
+//                                AlertUtil.showDeftToast(context, "配网失败,请稍后重试");
+//                            }
+//                        } else {
+//                            //响应失败
+//                            AlertUtil.showDeftToast(context, "配网失败,请稍后重试");
+//                        }
+                    }
+
+                    @Override
+                    public void onFailure(Call<APIBaseInfo> call, Throwable t) {
+                        QMUITipDialogUtil.dismessDialog();
+                    }
+                });
+    }
+
+    public void invitFamilyMember(Context context, String contactsInvite) {
         if (null == getView()) {
             return;
         }
         QMUITipDialogUtil.loadingDialog(context, "请稍后", true);
-        getView().showLoadingView();
-        Map<String, String> map = new HashMap<>();
-        map.put("type", "2");//联系人邀请
-        map.put("contactsInvite", contactsInvite);
-        Logic.create(map)
-                .action(new Logic.Action<Map<String, String>, APIBaseInfo>() {
+//        Map<String, RequestBody> map = new HashMap<>();
+//        map.put("type", getRequestString("2"));//联系人邀请
+//        map.put("contactsInvite", getRequestString(contactsInvite));
+        InvitFamilyBean1 bean1=new InvitFamilyBean1();
+        bean1.setType("2");
+        bean1.setContactsInvite(GsonUtil.jsonToList(contactsInvite, InvitFamilyBean1.ContactsInviteBean.class));
+        String test=GsonUtil.GsonString(bean1);
+        RequestBody body = RequestBody.create(MediaType.parse("application/json; charset=utf-8"),test);
+        Logic.create(bean1)
+                .action(new Logic.Action<RequestBody , APIBaseInfo>() {
                     @Override
-                    public Disposable action(Map<String, String> paramsMap, DataCallback<APIBaseInfo> dataCallback) {
-                        return SubscriptionRequest.service(ApiServiceXiaoJia.class, api -> api.invitFamilyMember(paramsMap)).subscribe(context, dataCallback);
+                    public Disposable action(RequestBody invitFamilyBean1, DataCallback<APIBaseInfo> dataCallback) {
+                        return SubscriptionRequest.service(ApiServiceXiaoJia.class, api -> api.invitFamilyMember(invitFamilyBean1)).subscribe(context, dataCallback);
                     }
                 }).<APIBaseInfo>event()
                 .setSuccessCallback(new SuccessCallback<APIBaseInfo>() {
@@ -50,6 +103,7 @@ public class SetFriendsRolePresenter extends MvpBasePresenter&lt;SetFriendsRoleView
                             return;
                         }
                         QMUITipDialogUtil.dismessDialog();
+                        QMUITipDialogUtil.successDialog(context, "邀请成功", 1);
                     }
                 })
                 .setFailureCallback(new FailureCallback() {
@@ -68,6 +122,11 @@ public class SetFriendsRolePresenter extends MvpBasePresenter&lt;SetFriendsRoleView
                 .start();
     }
  
+    private static RequestBody getRequestString(String value) {
+        RequestBody requestString = RequestBody.create(MediaType.parse("text/plain"), value);
+        return requestString;
+    }
+
     /**
      * 获取用户角色
      *
@@ -40,6 +40,10 @@ public class SelectIMFriendView implements MvpView, LetterBarView.OnLetterSelect
     private String TAG = "SelectIMFriendView";
     private boolean isFirst = true;
  
+    public void setCurrentSelectFamilyId(String currentSelectFamilyId) {
+        this.currentSelectFamilyId = currentSelectFamilyId;
+    }
+
     public SelectIMFriendView(SelectIMFriendFragment fragment) {
         this.fragment = fragment;
     }
@@ -96,82 +100,86 @@ public class SelectIMFriendView implements MvpView, LetterBarView.OnLetterSelect
         });
     }
  
-    public void initView(List<IMFriendNoLetterInfo> noLetterInfoList) {
+    public void initView(List<IMFriendNoLetterInfo> list) {
         //设置按钮不可点击
         nextBtnCanNotClick();
         //假设这个是原有数据
-        this.noLetterInfoList = noLetterInfoList;
-//        IMFriendNoLetterInfo noLetterInfo = new IMFriendNoLetterInfo();
-//        noLetterInfo.setUserName("韩亚云");
-//        noLetterInfo.setCantSelect(true);
-//        noLetterInfo.setId("352660");
-//        noLetterInfoList.add(noLetterInfo);
-//
-//        noLetterInfo = new IMFriendNoLetterInfo();
-//        noLetterInfo.setUserName("杨帅");
-//        noLetterInfo.setId("352668");
-//        noLetterInfoList.add(noLetterInfo);
-//
-//        noLetterInfo = new IMFriendNoLetterInfo();
-//        noLetterInfo.setUserName("杨杨");
-//        noLetterInfo.setId("352700");
-//        noLetterInfoList.add(noLetterInfo);
-//
-//        noLetterInfo = new IMFriendNoLetterInfo();
-//        noLetterInfo.setUserName("杨天");
-//        noLetterInfo.setId("352782");
-//        noLetterInfoList.add(noLetterInfo);
-//
-//        noLetterInfo = new IMFriendNoLetterInfo();
-//        noLetterInfo.setUserName("郭瑞鹏");
-//        noLetterInfo.setId("352898");
-//        noLetterInfoList.add(noLetterInfo);
-//
-//        noLetterInfo = new IMFriendNoLetterInfo();
-//        noLetterInfo.setUserName("殷巧娟");
-//        noLetterInfo.setId("353001");
-//        noLetterInfoList.add(noLetterInfo);
-//
-//        noLetterInfo = new IMFriendNoLetterInfo();
-//        noLetterInfo.setUserName("张晓文");
-//        noLetterInfo.setId("353036");
-//        noLetterInfoList.add(noLetterInfo);
-//
-//
-//        noLetterInfo = new IMFriendNoLetterInfo();
-//        noLetterInfo.setUserName("小明");
-//        noLetterInfo.setId("353360");
-//        noLetterInfoList.add(noLetterInfo);
-//
-//        noLetterInfo = new IMFriendNoLetterInfo();
-//        noLetterInfo.setUserName("小红");
-//        noLetterInfo.setId("353417");
-//        noLetterInfoList.add(noLetterInfo);
-//
-//        noLetterInfo = new IMFriendNoLetterInfo();
-//        noLetterInfo.setUserName("小绿");
-//        noLetterInfo.setId("353557");
-//        noLetterInfoList.add(noLetterInfo);
-//
-//        noLetterInfo = new IMFriendNoLetterInfo();
-//        noLetterInfo.setUserName("小黄");
-//        noLetterInfo.setId("353651");
-//        noLetterInfoList.add(noLetterInfo);
-//
-//        noLetterInfo = new IMFriendNoLetterInfo();
-//        noLetterInfo.setUserName("张三");
-//        noLetterInfo.setId("353728");
-//        noLetterInfoList.add(noLetterInfo);
-//
-//        noLetterInfo = new IMFriendNoLetterInfo();
-//        noLetterInfo.setUserName("李四");
-//        noLetterInfo.setId("353777");
-//        noLetterInfoList.add(noLetterInfo);
-//
-//        noLetterInfo = new IMFriendNoLetterInfo();
-//        noLetterInfo.setUserName("王五");
-//        noLetterInfo.setId("353789");
-//        noLetterInfoList.add(noLetterInfo);
+//        this.noLetterInfoList = noLetterInfoList;
+
+        this.noLetterInfoList=new ArrayList<>();
+        IMFriendNoLetterInfo noLetterInfo = new IMFriendNoLetterInfo();
+        noLetterInfo.setUserName("韩亚云");
+        noLetterInfo.setCantSelect(true);
+        noLetterInfo.setId("352660");
+        noLetterInfoList.add(noLetterInfo);
+
+        noLetterInfo = new IMFriendNoLetterInfo();
+        noLetterInfo.setUserName("杨帅");
+        noLetterInfo.setId("352668");
+        noLetterInfoList.add(noLetterInfo);
+
+        noLetterInfo = new IMFriendNoLetterInfo();
+        noLetterInfo.setUserName("杨杨");
+        noLetterInfo.setId("352700");
+        noLetterInfoList.add(noLetterInfo);
+
+        noLetterInfo = new IMFriendNoLetterInfo();
+        noLetterInfo.setUserName("杨天");
+        noLetterInfo.setId("352782");
+        noLetterInfoList.add(noLetterInfo);
+
+        noLetterInfo = new IMFriendNoLetterInfo();
+        noLetterInfo.setUserName("郭瑞鹏");
+        noLetterInfo.setId("352898");
+        noLetterInfoList.add(noLetterInfo);
+
+        noLetterInfo = new IMFriendNoLetterInfo();
+        noLetterInfo.setUserName("殷巧娟");
+        noLetterInfo.setId("353001");
+        noLetterInfoList.add(noLetterInfo);
+
+        noLetterInfo = new IMFriendNoLetterInfo();
+        noLetterInfo.setUserName("张晓文");
+        noLetterInfo.setId("353036");
+        noLetterInfoList.add(noLetterInfo);
+
+
+        noLetterInfo = new IMFriendNoLetterInfo();
+        noLetterInfo.setUserName("小明");
+        noLetterInfo.setId("353360");
+        noLetterInfoList.add(noLetterInfo);
+
+        noLetterInfo = new IMFriendNoLetterInfo();
+        noLetterInfo.setUserName("小红");
+        noLetterInfo.setId("353417");
+        noLetterInfoList.add(noLetterInfo);
+
+        noLetterInfo = new IMFriendNoLetterInfo();
+        noLetterInfo.setUserName("小绿");
+        noLetterInfo.setId("353557");
+        noLetterInfoList.add(noLetterInfo);
+
+        noLetterInfo = new IMFriendNoLetterInfo();
+        noLetterInfo.setUserName("小黄");
+        noLetterInfo.setId("353651");
+        noLetterInfoList.add(noLetterInfo);
+
+        noLetterInfo = new IMFriendNoLetterInfo();
+        noLetterInfo.setUserName("张三");
+        noLetterInfo.setId("353728");
+        noLetterInfoList.add(noLetterInfo);
+
+        noLetterInfo = new IMFriendNoLetterInfo();
+        noLetterInfo.setUserName("李四");
+        noLetterInfo.setId("353777");
+        noLetterInfoList.add(noLetterInfo);
+
+        noLetterInfo = new IMFriendNoLetterInfo();
+        noLetterInfo.setUserName("王五");
+        noLetterInfo.setId("353789");
+        noLetterInfoList.add(noLetterInfo);
+
+
         //对数据进行排序
         Collections.sort(noLetterInfoList, new LetterComparator());
  
@@ -101,7 +101,7 @@ public class SetFriendsRoleView implements MvpView {
                 if (null != adapter) {
                     String result = adapter.getRoleSetResult();
                     if (!TextUtils.isEmpty(result)) {
-                        fragment.getPresenter().invitFamilyMember(getContext(), result);
+                        fragment.getPresenter().queryConfigDeviceNetResult(getContext(), result);
                     } else {
                         AlertUtil.showDeftToast(getContext(), "发送参数异常");
                     }
 package com.cnlive.strike.xiaojiaspeaker.netWork;
  
  
+import com.cnlive.strike.xiaojiaspeaker.netWork.bean.APIBaseInfo;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.ConfigDeviceNetParam;
+import com.cnlive.strike.xiaojiaspeaker.netWork.bean.InvitFamilyBean1;
 import com.cnlive.strike.xiaojiaspeaker.netWork.result.ConfigDeviceNetResult;
  
+import io.reactivex.Observable;
+import okhttp3.RequestBody;
 import retrofit2.Call;
+import retrofit2.adapter.rxjava2.Result;
 import retrofit2.http.Body;
+import retrofit2.http.Headers;
 import retrofit2.http.POST;
  
 /**
@@ -20,4 +26,8 @@ public interface ApiServiceCMCC {
      */
     @POST("users/custom")
     Call<ConfigDeviceNetResult> queryDeviceConfigNet(@Body ConfigDeviceNetParam param);
+
+
+    @POST("Daren/sound/familyGroupInviteYD.action")
+    Call<APIBaseInfo>  invitFamilyMember(@Body InvitFamilyBean1 body);
 }
@@ -4,6 +4,7 @@ package com.cnlive.strike.xiaojiaspeaker.netWork;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.DeviceDetail;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.FamilyListBean;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.FamilyRoleBean;
+import com.cnlive.strike.xiaojiaspeaker.netWork.bean.InvitFamilyBean1;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.NetworkResultBean;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.RoleNetBean;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.APIBaseInfo;
@@ -12,9 +13,14 @@ import com.cnlive.strike.xiaojiaspeaker.netWork.bean.XiaoJiaContactInfo;
 import java.util.Map;
  
 import io.reactivex.Observable;
+import okhttp3.RequestBody;
 import retrofit2.adapter.rxjava2.Result;
+import retrofit2.http.Body;
 import retrofit2.http.GET;
+import retrofit2.http.Headers;
+import retrofit2.http.Multipart;
 import retrofit2.http.POST;
+import retrofit2.http.PartMap;
 import retrofit2.http.QueryMap;
  
 /**
@@ -140,10 +146,11 @@ public interface ApiServiceXiaoJia {
      * }
      * ]
      *
-     * @param maps
      * @return
      */
     @POST("/Daren/sound/familyGroupInviteYD.action")
-    Observable<Result<APIBaseInfo>> invitFamilyMember(@QueryMap() Map<String, String> maps);
+    @Headers({"Content-Type: application/json","Accept: application/json"})//需要添加头
+//    @Multipart
+    Observable<Result<APIBaseInfo>> invitFamilyMember( @Body RequestBody body);
 }
  
+package com.cnlive.strike.xiaojiaspeaker.netWork;
+
+import android.text.TextUtils;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import okhttp3.FormBody;
+import okhttp3.Headers;
+import okhttp3.HttpUrl;
+import okhttp3.Interceptor;
+import okhttp3.MediaType;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+import okio.Buffer;
+
+public class BasicParamsInterceptor implements Interceptor {
+    Map<String, String> queryParamsMap = new HashMap<>(); // 添加到 URL 末尾，Get Post 方法都使用
+    Map<String, String> paramsMap = new HashMap<>(); // 添加到公共参数到消息体，适用 Post 请求
+    Map<String, String> headerParamsMap = new HashMap<>(); // 公共 Headers 添加
+    List<String> headerLinesList = new ArrayList<>(); // 消息头 集合形式，一次添加一行
+
+    // 私有构造器
+    private BasicParamsInterceptor() {
+    }
+
+    @Override
+    public Response intercept(Chain chain) throws IOException {
+
+        Request request = chain.request();
+        Request.Builder requestBuilder = request.newBuilder();
+
+        // process header params inject
+        Headers.Builder headerBuilder = request.headers().newBuilder();
+        // 以 Entry 添加消息头
+        if (headerParamsMap.size() > 0) {
+            Iterator iterator = headerParamsMap.entrySet().iterator();
+            while (iterator.hasNext()) {
+                Map.Entry entry = (Map.Entry) iterator.next();
+                headerBuilder.add((String) entry.getKey(), (String) entry.getValue());
+            }
+        }
+        // 以 String 形式添加消息头
+        if (headerLinesList.size() > 0) {
+            for (String line : headerLinesList) {
+                headerBuilder.add(line);
+            }
+            requestBuilder.headers(headerBuilder.build());
+        }
+        // process header params end
+
+
+        // process queryParams inject whatever it's GET or POST
+        if (queryParamsMap.size() > 0) {
+            request = injectParamsIntoUrl(request.url().newBuilder(), requestBuilder, queryParamsMap);
+        }
+
+        // process post body inject
+        if (paramsMap.size() > 0) {
+            if (canInjectIntoBody(request)) {
+                FormBody.Builder formBodyBuilder = new FormBody.Builder();
+                for (Map.Entry<String, String> entry : paramsMap.entrySet()) {
+                    formBodyBuilder.add((String) entry.getKey(), (String) entry.getValue());
+                }
+
+                RequestBody formBody = formBodyBuilder.build();
+                String postBodyString = bodyToString(request.body());
+                postBodyString += ((postBodyString.length() > 0) ? "&" : "") + bodyToString(formBody);
+                requestBuilder.post(RequestBody.create(MediaType.parse("application/x-www-form-urlencoded;charset=UTF-8"), postBodyString));
+            }
+        }
+        request = requestBuilder.build();
+        return chain.proceed(request);
+    }
+
+    /**
+     * 确认是否是 post 请求
+     *
+     * @param request 发出的请求
+     * @return true 需要注入公共参数
+     */
+    private boolean canInjectIntoBody(Request request) {
+        if (request == null) {
+            return false;
+        }
+        if (!TextUtils.equals(request.method(), "POST")) {
+            return false;
+        }
+        RequestBody body = request.body();
+        if (body == null) {
+            return false;
+        }
+        MediaType mediaType = body.contentType();
+        if (mediaType == null) {
+            return false;
+        }
+        if (!TextUtils.equals(mediaType.subtype(), "x-www-form-urlencoded")) {
+            return false;
+        }
+        return true;
+    }
+
+    // func to inject params into url
+    private Request injectParamsIntoUrl(HttpUrl.Builder httpUrlBuilder, Request.Builder requestBuilder, Map<String, String> paramsMap) {
+        if (paramsMap.size() > 0) {
+            Iterator iterator = paramsMap.entrySet().iterator();
+            while (iterator.hasNext()) {
+                Map.Entry entry = (Map.Entry) iterator.next();
+                httpUrlBuilder.addQueryParameter((String) entry.getKey(), (String) entry.getValue());
+            }
+            requestBuilder.url(httpUrlBuilder.build());
+            return requestBuilder.build();
+        }
+        return null;
+    }
+
+    private static String bodyToString(final RequestBody request) {
+        try {
+            final RequestBody copy = request;
+            final Buffer buffer = new Buffer();
+            if (copy != null)
+                copy.writeTo(buffer);
+            else
+                return "";
+            return buffer.readUtf8();
+        } catch (final IOException e) {
+            return "did not work";
+        }
+    }
+
+    public static class Builder {
+
+        BasicParamsInterceptor interceptor;
+
+        public Builder() {
+            interceptor = new BasicParamsInterceptor();
+        }
+
+        // 添加公共参数到 post 消息体
+        public Builder addParam(String key, String value) {
+            interceptor.paramsMap.put(key, value);
+            return this;
+        }
+
+        // 添加公共参数到 post 消息体
+        public Builder addParamsMap(Map<String, String> paramsMap) {
+            interceptor.paramsMap.putAll(paramsMap);
+            return this;
+        }
+
+        // 添加公共参数到消息头
+        public Builder addHeaderParam(String key, String value) {
+            interceptor.headerParamsMap.put(key, value);
+            return this;
+        }
+
+        // 添加公共参数到消息头
+        public Builder addHeaderParamsMap(Map<String, String> headerParamsMap) {
+            interceptor.headerParamsMap.putAll(headerParamsMap);
+            return this;
+        }
+
+        // 添加公共参数到消息头
+        public Builder addHeaderLine(String headerLine) {
+            int index = headerLine.indexOf(":");
+            if (index == -1) {
+                throw new IllegalArgumentException("Unexpected header: " + headerLine);
+            }
+            interceptor.headerLinesList.add(headerLine);
+            return this;
+        }
+
+        // 添加公共参数到消息头
+        public Builder addHeaderLinesList(List<String> headerLinesList) {
+            for (String headerLine : headerLinesList) {
+                int index = headerLine.indexOf(":");
+                if (index == -1) {
+                    throw new IllegalArgumentException("Unexpected header: " + headerLine);
+                }
+                interceptor.headerLinesList.add(headerLine);
+            }
+            return this;
+        }
+
+        // 添加公共参数到 URL
+        public Builder addQueryParam(String key, String value) {
+            interceptor.queryParamsMap.put(key, value);
+            return this;
+        }
+
+        // 添加公共参数到 URL
+        public Builder addQueryParamsMap(Map<String, String> queryParamsMap) {
+            interceptor.queryParamsMap.putAll(queryParamsMap);
+            return this;
+        }
+
+        public BasicParamsInterceptor build() {
+            return interceptor;
+        }
+
+    }
+
+}
@@ -17,7 +17,9 @@ public class CmccRequest {
     private static Class mclass;
     //移动官方接口
     private static final String CMCC_API_DEBUG_URL = "http://storybox.roobo.net/";
-    private static final String CMCC_API_REA_URL = "https://storybox-api.roobo.com/rtoy/";
+    //    private static final String CMCC_API_REA_URL = "https://storybox-api.roobo.com/rtoy/";
+    private static final String CMCC_API_REA_URL = "http://apiwjjtest.cnlive.com/";
+
     private static String TAG = "CmccRequest";
  
     //错误状态码
@@ -26,20 +28,27 @@ public class CmccRequest {
  
     public static ApiServiceCMCC getInstance(Class<ApiServiceCMCC> mclass) {
         if (null == retrofit) {
+            BasicParamsInterceptor basicParamsInterceptor = new BasicParamsInterceptor.Builder()
+                    .addQueryParam("loginSid", "10510277") //添加公共参数到 post 请求体
+                    .addHeaderParam("Content-Type", "application/json;charset=UTF-8")
+//                    .addQueryParam("version","1")  // 添加公共版本号，加在 URL 后面
+                    .build();
             //    创建Retrofit对象
             retrofit = new Retrofit.Builder()
                     .baseUrl(CMCC_API_REA_URL)//设置网络请求url，后面一段写在网络请求接口里面
                     .addConverterFactory(GsonConverterFactory.create())//添加Gson支持，然后Retrofit就会使用Gson将响应体（api接口的Take）转换我们想要的类型。
-                    .client(new OkHttpClient.Builder().addInterceptor(new Interceptor() {
-                        @Override
-                        public Response intercept(Chain chain) throws IOException {
-                            Request request = chain.request()
-                                    .newBuilder()
-                                    .addHeader("Content-Type", "application/json;charset=UTF-8")
-                                    .build();
-                            return chain.proceed(request);
-                        }
-                    }).build())
+//                    .client(new OkHttpClient.Builder().addInterceptor(new Interceptor() {
+//                        @Override
+//                        public Response intercept(Chain chain) throws IOException {
+//                            Request request = chain.request()
+//                                    .newBuilder()
+//                                    .addHeader("Content-Type", "application/json;charset=UTF-8")
+//                                    .build();
+//                            return chain.proceed(request);
+//                        }
+//                    }).build())
+                    .client(new OkHttpClient.Builder().addInterceptor(basicParamsInterceptor).build())
+//                    .client(new OkHttpClient.Builder().addInterceptor(basicParamsInterceptor))
                     .build();
         }
         return retrofit.create(mclass);
+package com.cnlive.strike.xiaojiaspeaker.netWork.bean;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 邀请家人上传的数据
+ */
+public class InvitFamilyBean1 implements Serializable {
+
+    /**
+     * type : 2
+     * contactsInvite : [{"familyId":"1111","sid":105102771,"roleId":1},{"familyId":"1111","sid":105102772,"roleId":1}]
+     */
+
+    private String type;
+    private List<ContactsInviteBean> contactsInvite;
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public List<ContactsInviteBean> getContactsInvite() {
+        return contactsInvite;
+    }
+
+    public void setContactsInvite(List<ContactsInviteBean> contactsInvite) {
+        this.contactsInvite = contactsInvite;
+    }
+
+    public static class ContactsInviteBean  implements Serializable{
+        /**
+         * familyId : 1111
+         * sid : 105102771
+         * roleId : 1
+         */
+
+        private String familyId;
+        private int sid;
+        private int roleId;
+
+        public String getFamilyId() {
+            return familyId;
+        }
+
+        public void setFamilyId(String familyId) {
+            this.familyId = familyId;
+        }
+
+        public int getSid() {
+            return sid;
+        }
+
+        public void setSid(int sid) {
+            this.sid = sid;
+        }
+
+        public int getRoleId() {
+            return roleId;
+        }
+
+        public void setRoleId(int roleId) {
+            this.roleId = roleId;
+        }
+    }
+}
@@ -4,7 +4,9 @@ import android.app.Activity;
 import android.content.Intent;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.text.TextUtils;
  
+import com.cnlive.libs.base.util.AlertUtil;
 import com.cnlive.strike.xiaojiaspeaker.R;
 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.SelectWifiFragment;
 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.SetFriendsRoleFragment;
@@ -20,15 +22,19 @@ public class SetFriendsRoleActivity extends AppCompatActivity {
         setContentView(R.layout.activity_set_friends_role);
         if (null != getIntent().getExtras()) {
             String selectUid = getIntent().getExtras().getString("selectUid");
-            String currentSelectFamilyId= getIntent().getExtras().getString("currentSelectFamilyId");
-            getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, SetFriendsRoleFragment.newInstance(selectUid,currentSelectFamilyId)).commitAllowingStateLoss();
+            String currentSelectFamilyId = getIntent().getExtras().getString("currentSelectFamilyId");
+            if (!TextUtils.isEmpty(selectUid) && !TextUtils.isEmpty(currentSelectFamilyId)) {
+                getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, SetFriendsRoleFragment.newInstance(selectUid, currentSelectFamilyId)).commitAllowingStateLoss();
+            }else {
+                AlertUtil.showDeftToast(this,"参数异常");
+            }
         } else {
             finish();
         }
  
     }
  
-    public static void startActivity(Activity activity, String selectUid,String currentSelectFamilyId) {
+    public static void startActivity(Activity activity, String selectUid, String currentSelectFamilyId) {
         Intent intent = new Intent(activity, SetFriendsRoleActivity.class);
         intent.putExtra("selectUid", selectUid);
         intent.putExtra("currentSelectFamilyId", currentSelectFamilyId);
@@ -123,26 +123,26 @@ public class AllRoleDetailAdapter extends RecyclerView.Adapter {
                 binding.checkBox.toggle();
                 //开始设置全局状态
                 if (binding.checkBox.isChecked()) {
-                    if (null != onAllRoleClickListener) {
-                        onAllRoleClickListener.onSelect(allRoleList.get(position).getId());
-                    }
-                    if (null != onDialogRoleClickListener) {
-                        onDialogRoleClickListener.onSelect(allRoleList.get(position));
-                    }
                     //添加到选中的集合
                     if (!selectId.equals(currentRoleId)) {
                         //重置状态
                         allowSelectMap.put(selectId, true);
                         setRoleAdapter.getRoleInfoList().get(allRoleList.get(position).getParentPosition()).setSelectId(currentRoleId);
                     }
+                    if (null != onAllRoleClickListener) {
+                        onAllRoleClickListener.onSelect(allRoleList.get(position).getId());
+                    }
+                    if (null != onDialogRoleClickListener) {
+                        onDialogRoleClickListener.onSelect(allRoleList.get(position));
+                    }
                 } else {
+                    setRoleAdapter.getRoleInfoList().get(allRoleList.get(position).getParentPosition()).setSelectId("");
                     if (null != onAllRoleClickListener) {
                         onAllRoleClickListener.onCancel();
                     }
                     if (null != onDialogRoleClickListener) {
                         onDialogRoleClickListener.onCancel();
                     }
-                    setRoleAdapter.getRoleInfoList().get(allRoleList.get(position).getParentPosition()).setSelectId("");
                 }
                 //设置全局不允许选择
                 allowSelectMap.put(currentRoleId, !binding.checkBox.isChecked());
@@ -15,6 +15,7 @@ import com.cnlive.strike.xiaojiaspeaker.R;
 import com.cnlive.strike.xiaojiaspeaker.databinding.ItemListSetRoleBinding;
 import com.cnlive.strike.xiaojiaspeaker.model.RoleInfo;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.InvitFamilyBean;
+import com.cnlive.strike.xiaojiaspeaker.netWork.bean.InvitFamilyBean1;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.RoleNetBean;
 import com.cnlive.strike.xiaojiaspeaker.util.GsonUtil;
  
@@ -71,9 +72,9 @@ public class SetRoleAdapter extends RecyclerView.Adapter {
         if (TextUtils.isEmpty(currentSelectFamilyId)) {
             return result;
         }
-        List<InvitFamilyBean> invitFamilyBeanList = new ArrayList<>();
+        List<InvitFamilyBean1.ContactsInviteBean> invitFamilyBeanList = new ArrayList<>();
         for (int i = 0; i < roleInfoList.size(); i++) {
-            InvitFamilyBean bean = new InvitFamilyBean();
+            InvitFamilyBean1.ContactsInviteBean bean=new InvitFamilyBean1.ContactsInviteBean();
             bean.setFamilyId(currentSelectFamilyId);
             bean.setRoleId(Integer.parseInt(roleInfoList.get(i).getSelectId()));
             bean.setSid(Integer.parseInt(roleInfoList.get(i).getUid()));
@@ -49,7 +49,9 @@ public class SelectIMFriendFragment extends MvpBindingFragment&lt;SelectIMFriendVie
             if (null != getArguments()) {
                 String currentSelectFamilyId = getArguments().getString("currentSelectFamilyId");
                 if (!TextUtils.isEmpty(currentSelectFamilyId)) {
-                    getPresenter().getFamilyMember(getActivity(), currentSelectFamilyId);
+                    getMvpView().setCurrentSelectFamilyId(currentSelectFamilyId);
+                    getMvpView().initView(null);
+//                    getPresenter().getFamilyMember(getActivity(), currentSelectFamilyId);
                 }
             }