1、增加11个渠道包

2、修复shouError：Token过期时，显示错误布局的bug
3、修复聊天文本的换行问题

app/build.gradle

@@ -983,6 +983,138 @@ android {
             ]
 
         }
+
+        qj_599bifen {
+            def myAppName = "599比分app"
+            def myAppNamePY = "599bifen"
+            manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY        : "${myAppNamePY}",
+                    API_CHANNEL_ID     : "10",
+                    UMENG_CHANNEL_VALUE: "third_599bifen"
+            ]
+
+        }
+
+        qj_599bifen2 {
+            def myAppName = "599比分高级版"
+            def myAppNamePY = "599bifen2"
+            manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY        : "${myAppNamePY}",
+                    API_CHANNEL_ID     : "10",
+                    UMENG_CHANNEL_VALUE: "third_599bifen2"
+            ]
+
+        }
+
+        qj_599bifen3 {
+            def myAppName = "599比分智能大数据"
+            def myAppNamePY = "599bifen3"
+            manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY        : "${myAppNamePY}",
+                    API_CHANNEL_ID     : "10",
+                    UMENG_CHANNEL_VALUE: "third_599bifen3"
+            ]
+
+        }
+
+        qj_didiaokan {
+            def myAppName = "低调看"
+            def myAppNamePY = "didiaokan"
+            manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY        : "${myAppNamePY}",
+                    API_CHANNEL_ID     : "10",
+                    UMENG_CHANNEL_VALUE: "third_didiaokan"
+            ]
+
+        }
+
+        qj_jingqiutiyu {
+            def myAppName = "精球体育"
+            def myAppNamePY = "jingqiutiyu"
+            manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY        : "${myAppNamePY}",
+                    API_CHANNEL_ID     : "10",
+                    UMENG_CHANNEL_VALUE: "third_jingqiutiyu"
+            ]
+
+        }
+
+        qj_juqiumi {
+            def myAppName = "聚球迷官方版"
+            def myAppNamePY = "juqiumi"
+            manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY        : "${myAppNamePY}",
+                    API_CHANNEL_ID     : "10",
+                    UMENG_CHANNEL_VALUE: "third_juqiumi"
+            ]
+
+        }
+
+        qj_juqiumi2 {
+            def myAppName = "聚球迷专业版"
+            def myAppNamePY = "juqiumi2"
+            manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY        : "${myAppNamePY}",
+                    API_CHANNEL_ID     : "10",
+                    UMENG_CHANNEL_VALUE: "third_juqiumi2"
+            ]
+
+        }
+
+        qj_leshitiyu{
+            def myAppName = "乐视体育"
+            def myAppNamePY = "leshitiyu"
+            manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY        : "${myAppNamePY}",
+                    API_CHANNEL_ID     : "10",
+                    UMENG_CHANNEL_VALUE: "third_leshitiyu"
+            ]
+
+        }
+
+        qj_lvyintiyu{
+            def myAppName = "绿茵体育"
+            def myAppNamePY = "lvyintiyu"
+            manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY        : "${myAppNamePY}",
+                    API_CHANNEL_ID     : "10",
+                    UMENG_CHANNEL_VALUE: "third_lvyintiyu"
+            ]
+
+        }
+
+        qj_lvyinzhongguo{
+            def myAppName = "绿茵中国"
+            def myAppNamePY = "lvyinzhongguo"
+            manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY        : "${myAppNamePY}",
+                    API_CHANNEL_ID     : "10",
+                    UMENG_CHANNEL_VALUE: "third_lvyinzhongguo"
+            ]
+
+        }
+
+        qj_xingguitiyu{
+            def myAppName = "星轨体育"
+            def myAppNamePY = "xingguitiyu"
+            manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY        : "${myAppNamePY}",
+                    API_CHANNEL_ID     : "10",
+                    UMENG_CHANNEL_VALUE: "third_xingguitiyu"
+            ]
+
+        }
     }
     sourceSets {
         main {
@@ -1296,6 +1428,65 @@ android {
 
         }
 
+        qj_599bifen {
+            res.srcDirs = ['src/main/X-599BIFEN/res']
+
+        }
+
+        qj_599bifen2 {
+            res.srcDirs = ['src/main/X-599BIFEN2/res']
+
+        }
+
+        qj_599bifen3 {
+            res.srcDirs = ['src/main/X-599BIFEN3/res']
+
+        }
+
+        qj_didiaokan {
+            res.srcDirs = ['src/main/X-DIDIAOKAN/res']
+
+        }
+
+
+        qj_jingqiutiyu {
+            res.srcDirs = ['src/main/X-JINGQIUTIYU/res']
+
+        }
+
+        qj_juqiumi {
+            res.srcDirs = ['src/main/X-JUQIUMI/res']
+
+        }
+
+        qj_juqiumi2 {
+            res.srcDirs = ['src/main/X-JUQIUMI2/res']
+
+        }
+
+        qj_leshitiyu {
+            res.srcDirs = ['src/main/X-LESHITIYU/res']
+
+        }
+
+        qj_lvyintiyu {
+            res.srcDirs = ['src/main/X-LVYINTIYU/res']
+
+        }
+
+        qj_lvyinzhongguo {
+            res.srcDirs = ['src/main/X-LVYINZHONGGUO/res']
+
+        }
+
+        qj_xingguitiyu {
+            res.srcDirs = ['src/main/X-XINGGUITIYU/res']
+
+        }
+
+
+
+
 
     }
 

app/src/main/java/com/hupu/tv/player/app/app/Constants.kt

@@ -469,7 +469,7 @@ object Constants {
     const val MESSAGE_USER_ID = "user_id"
     const val MESSAGE_USER_RID = "user_rid"
     const val USER_HX_ID = "user_hx_id"
-    const val ROOM_NUM = "roomNum"
+    const val ROOM_NUM = "room_num"
 
     const val GIFT_BEAN = "gift_bean"
     const val SPORT_TYPE= "sport_type"

app/src/main/java/com/hupu/tv/player/app/base/RefreshActivity.kt

@@ -378,12 +378,13 @@ abstract class RefreshActivity<P : IBasePresenter?> : ToolbarActivity<P>(),
 
 
     override fun onApiException(e: ApiException) {
-        super.onApiException(e)
         if (e.message == Constants.ERROR_TOKEN) {
             UserHelper.userExitLoginSuccess()
             val intent = Intent(this, LoginActivity::class.java)
             intent.putExtra(Constants.ERROR_TOKEN, true)
             startActivity(intent)
+        }else{
+            showCustomException(e)
         }
     }
 

app/src/main/java/com/hupu/tv/player/app/base/RefreshFragment.kt

 package com.hupu.tv.player.app.base
 
+import android.content.Intent
 import android.graphics.Color
 
 import android.view.View
@@ -23,7 +24,11 @@ import com.softgarden.baselibrary.utils.ScreenUtil
 import com.softgarden.baselibrary.widget.ColorDividerDecoration
 import com.softgarden.baselibrary.widget.GridDividerDecoration
 import com.hupu.tv.player.app.R
+import com.hupu.tv.player.app.app.Constants
+import com.hupu.tv.player.app.ui.activity.LoginActivity
 import com.hupu.tv.player.app.utils.EmptyConfig
+import com.hupu.tv.player.app.utils.UserHelper
+import com.softgarden.baselibrary.network.ApiException
 
 /**
  * @author by DELL
@@ -84,6 +89,17 @@ abstract class RefreshFragment<P : IBasePresenter?> : BaseLazyFragment<P>(),
         super.onFirstUserVisible()
     }
 
+    override fun onApiException(e: ApiException) {
+        if (e.message == Constants.ERROR_TOKEN) {
+            UserHelper.userExitLoginSuccess()
+            val intent = Intent(requireContext(), LoginActivity::class.java)
+            intent.putExtra(Constants.ERROR_TOKEN, true)
+            startActivity(intent)
+        }else{
+            super.onApiException(e)
+        }
+    }
+
 
     /**
      * 开关刷新

app/src/main/java/com/hupu/tv/player/app/base/RefreshVP2Fragment.kt

 package com.hupu.tv.player.app.base
 
+import android.content.Intent
 import android.graphics.Color
 import android.util.Log
 
@@ -16,7 +17,10 @@ import androidx.recyclerview.widget.SimpleItemAnimator
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.BaseQuickAdapter.RequestLoadMoreListener
 import com.hupu.tv.player.app.R
+import com.hupu.tv.player.app.app.Constants
+import com.hupu.tv.player.app.ui.activity.LoginActivity
 import com.hupu.tv.player.app.utils.EmptyConfig
+import com.hupu.tv.player.app.utils.UserHelper
 import com.scwang.smartrefresh.layout.SmartRefreshLayout
 import com.softgarden.baselibrary.base.IBasePresenter
 import com.softgarden.baselibrary.utils.DisplayUtil
@@ -25,6 +29,7 @@ import com.softgarden.baselibrary.utils.ScreenUtil
 import com.softgarden.baselibrary.widget.ColorDividerDecoration
 import com.softgarden.baselibrary.widget.GridDividerDecoration
 import com.softgarden.baselibrary.base.BaseVP2LazyFragment
+import com.softgarden.baselibrary.network.ApiException
 
 /**
  * @author by DELL
@@ -79,6 +84,17 @@ abstract class RefreshVP2Fragment<P : IBasePresenter?> : BaseVP2LazyFragment<P>(
 
     }
 
+    override fun onApiException(e: ApiException) {
+        if (e.message == Constants.ERROR_TOKEN) {
+            UserHelper.userExitLoginSuccess()
+            val intent = Intent(requireContext(), LoginActivity::class.java)
+            intent.putExtra(Constants.ERROR_TOKEN, true)
+            startActivity(intent)
+        }else{
+            super.onApiException(e)
+        }
+    }
+
     fun setPageCount(pageCount: Int) {
         PAGE_COUNT = pageCount
     }

app/src/main/java/com/hupu/tv/player/app/ui/activity/MaterialDetailActivity.kt

@@ -398,10 +398,7 @@ class MaterialDetailActivity : RefreshActivity<MaterialDetailPresenter>(),
 
     }
 
-    override fun onApiException(t: ApiException) {
-        super.onApiException(t)
-        mStatusLayoutManager.showErrorLayout()
-    }
+
 
     override val ctx: Context
         get() = this

app/src/main/java/com/hupu/tv/player/app/ui/activity/RedDetailActivity.kt

@@ -385,10 +385,7 @@ class RedDetailActivity : RefreshActivity<RedDetailPresenter>(), RedDetailContac
 
     }
 
-    override fun onApiException(t: ApiException) {
-        super.onApiException(t)
-        mStatusLayoutManager.showErrorLayout()
-    }
+
 
     override val ctx: Context
         get() = this

app/src/main/java/com/hupu/tv/player/app/ui/im/CustomTextRow.java

@@ -20,6 +20,9 @@ import com.hyphenate.easeui.widget.chatrow.EaseChatRowText;
 import com.hupu.tv.player.app.R;
 import com.hupu.tv.player.app.app.Constants;
 
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 
 /**
  * @author by Dell
@@ -56,7 +59,8 @@ public class CustomTextRow extends EaseChatRowText {
     @Override
     public void onSetUpView() {
         EMTextMessageBody txtBody = (EMTextMessageBody) message.getBody();
-        Spannable span = EaseSmileUtils.getSmiledText(context, txtBody.getMessage());
+        String replaceBlank = replaceBlank(txtBody.getMessage());
+        Spannable span = EaseSmileUtils.getSmiledText(context, replaceBlank);
         // 设置内容
         String userNick = message.getStringAttribute(Constants.USER_NICK, message.getFrom());
         if (position % 2 == 0) {
@@ -81,6 +85,18 @@ public class CustomTextRow extends EaseChatRowText {
         userAvatarView.setVisibility(View.GONE);
     }
 
+    public  String replaceBlank(String str) {
+        String dest = "";
+        if (str != null) {
+            Pattern p = Pattern.compile("\\s*|\t|\r|\n");
+            Matcher m = p.matcher(str);
+            dest = m.replaceAll("");
+        }
+        return dest;
+
+    }
+
+
     @Override
     protected void onInflateView() {
         inflater.inflate(R.layout.custom_row_received_message, this);

baselibrary/src/main/java/com/softgarden/baselibrary/base/BaseFragment.kt

@@ -146,7 +146,6 @@ abstract class BaseFragment<P : IBasePresenter?> : RxFragment(), IBaseDisplay {
 
     override fun onApiException(e: ApiException) {
         showCustomException(e)
-
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@@ -199,7 +198,8 @@ abstract class BaseFragment<P : IBasePresenter?> : RxFragment(), IBaseDisplay {
                 //通用的Api异常处理
                 //通用的Api异常处理
                 if (isConfigStatus) {
-                    showCustomException(t)
+                    onApiException(t)
+
                 } else {
                     ToastUtil.s(t.message)
                 }