feat：私聊列表touid 由int改为long类型

m-im/src/main/java/com/yidianling/im/ui/page/NewMultiMessageFragment.kt

@@ -22,6 +22,8 @@ import com.yidianling.common.tools.ToastUtil
 import com.yidianling.im.R
 import com.yidianling.im.api.event.ImLogoutEvent
 import com.yidianling.im.api.event.UpdateBottomBarUnreadNumEvent
+import com.yidianling.im.bridge.P2PCustomActionHandlerImpl
+import com.yidianling.im.config.constants.ImConstants
 import com.yidianling.im.event.MessageListRefreshEvent
 import com.yidianling.im.event.ReQureyUnreadNum
 import com.yidianling.im.event.UpdateTabUnreadNumEvent
@@ -38,7 +40,7 @@ import com.yidianling.im.ui.page.fragment.bean.UnreadMessageBean
 import com.yidianling.im.ui.page.popupWindow.ChatSettingPopupWindow
 import com.yidianling.im.ui.param.ClearMessageParam
 import com.yidianling.im.ui.param.UnreadParam
-import com.yidianling.uikit.business.team.activity.AdvancedTeamInfoActivity
+import com.yidianling.uikit.api.NimUIKit
 import de.greenrobot.event.EventBus
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
@@ -344,17 +346,15 @@ class NewMultiMessageFragment : BaseFragment() {
      */
     private fun initKefu() {
         ll_kefu.setOnClickListener {
-//            ActionCountUtils.count("ydl_user_message_page|ydl_user_message_xiaoyi_click")
-//            if (ImIn.isLogin()) {
-//                SessionHelper.startP2PSession(context, -1, ImConstants.KEFUXIAOYI, null,
-//                        P2PCustomActionHandlerImpl(ImConstants.KEFUXIAOYI, "客服小壹", ImConstants.KEFUXIAOYI)
-//                )
-//            } else {
-//                ToastUtil.toastShort("请登录后再试")
-//            }
-//            NimUIKit.startYDLChatting(context,"4597318766",SessionTypeEnum.Team,null,null,null)
-            SessionHelper.startTeamSession(context,"4642080120")
-//            AdvancedTeamInfoActivity.start(context, "4621534238")
+            ActionCountUtils.count("ydl_user_message_page|ydl_user_message_xiaoyi_click")
+            if (ImIn.isLogin()) {
+                SessionHelper.startP2PSession(context, -1, ImConstants.KEFUXIAOYI, null,
+                        P2PCustomActionHandlerImpl(ImConstants.KEFUXIAOYI, "客服小壹", ImConstants.KEFUXIAOYI)
+                )
+            } else {
+                ToastUtil.toastShort("请登录后再试")
+            }
+            NimUIKit.startYDLChatting(context,"4597318766",SessionTypeEnum.Team,null,null,null)
         }
     }
     /**

m-im/src/main/java/com/yidianling/im/ui/page/fragment/ChatFragment.kt

@@ -87,7 +87,7 @@ class ChatFragment : BaseFragment(), XRecyclerView.LoadingListener {
 
         if (ImIn.getUserInfo()?.uid != "0") {
             var dis = ImHttpImpl.getInstance()
-                .getAllChatMessage(ChatParam("${ImIn.getUserInfo()?.uid}", "${selectType}"))
+                .getAllChatMessage(ChatParam("${ImIn.getUserInfo()?.uid}", "${selectType}","1"))
                 .compose(RxUtils.applySchedulers(this))
                 .compose<ChatModelBean>(RxUtils.resultJavaData())
                 .subscribe({ it ->

m-im/src/main/java/com/yidianling/im/ui/page/fragment/adapter/ChatAdapter.kt

@@ -63,7 +63,11 @@ class ChatAdapter(var context: Context, private var mList: ArrayList<ChatItemBea
                                 P2PCustomActionHandlerImpl("4108805", "课程小助手-壹壹", "4108805"))
                     }else {
 //                        IMUtil.startChat(context as AppCompatActivity, mList[position].toUid.toString(), 0, 0, null, 0, true)
-                        IMChatUtil.startChat(context as AppCompatActivity, mList[position])
+                        if (mList[position].chat_type==2){
+                            SessionHelper.startTeamSession(context,mList[position].toUid.toString())
+                        }else{
+                            IMChatUtil.startChat(context as AppCompatActivity, mList[position])
+                        }
                     }
                 }
 

m-im/src/main/java/com/yidianling/im/ui/page/fragment/bean/ChatItemBean.kt

@@ -20,7 +20,7 @@ class ChatItemBean(
         var timestamp: Long = 0.toLong(),
         var title: String = "",
         var toName: String = "",
-        var toUid: Int = 0,
+        var toUid: Long = 0,
         var type: Int = 0,//私聊群聊type=3
         var utype: Int = 0,
         var timeStr: String = "",

m-im/src/main/java/com/yidianling/im/ui/param/ChatParam.kt

@@ -4,4 +4,4 @@ package com.yidianling.im.ui.param
  * 消息列表请求参数  selectTab:0(全部),1(服务中),2(服务过)
  * Created by xj on 2019/10/21.
  */
-data class ChatParam(var uid: String, var selectType: String,var includeGroupChat:Int=1)
\ No newline at end of file
+data class ChatParam(var uid: String, var selectType: String,var includeGroupChat:String="1")
\ No newline at end of file

ydl-net/src/main/java/com/ydl/ydlnet/builder/interceptor/log/DefaultFormatPrinter.java

@@ -57,9 +57,7 @@ public class DefaultFormatPrinter {
         logLines(tag, new String[]{URL_TAG + request.url()}, false);
         logLines(tag, getRequest(request), true);
         logLines(tag, requestBody.split(LINE_SEPARATOR), true);
-        if (!request.url().toString().contains("writemaidiandata")){
-            NetLogUtils.debugInfo(tag, END_LINE);
-        }
+        NetLogUtils.debugInfo(tag, END_LINE);
     }
 
     /**
@@ -124,12 +122,14 @@ public class DefaultFormatPrinter {
                                   @NonNull List<String> segments, @NonNull String message, @NonNull final String responseUrl) {
         final String tag = getTag(false);
         final String[] urlLine = {URL_TAG + responseUrl, N};
+        if (!responseUrl.contains("writeMaiDianData")){
+            NetLogUtils.debugInfo(tag, RESPONSE_UP_LINE);
+            logLines(tag, urlLine, true);
+            logLines(tag, getResponse(headers, chainMs, code, isSuccessful, segments, message), true);
+            logLines(tag, OMITTED_RESPONSE, true);
+            NetLogUtils.debugInfo(tag, END_LINE);
+        }
 
-        NetLogUtils.debugInfo(tag, RESPONSE_UP_LINE);
-        logLines(tag, urlLine, true);
-        logLines(tag, getResponse(headers, chainMs, code, isSuccessful, segments, message), true);
-        logLines(tag, OMITTED_RESPONSE, true);
-        NetLogUtils.debugInfo(tag, END_LINE);
     }
 
     /**