Merge branch 'feature/dev-zeyu-2026-3-20'

commonlibrary/build.gradle

@@ -5,6 +5,24 @@ import com.yc.buildsrc.*
 android {
     resourcePrefix "common_"
 
+    buildTypes {
+        debug {
+            buildConfigField "String", "ENV", "\"test\""
+            buildConfigField "String", "URL_BASE", "\"http://test.api.tianka.chat/\""
+            buildConfigField "String", "WSS_BASE", "\"wss://test.link.tianka.chat/access\""
+            buildConfigField "String", "H5_BASE_URL", "\"https://test.h5.tianka.chat/\""
+            buildConfigField "String", "ZEGO_APP_ID", "\"864542469\""
+            buildConfigField "String", "ZEGO_APP_SIGN", "\"b9bcdbde3ad4af448f9af7e990a4457b1ae186d7ad52a74f3f321213768b15eb\""
+        }
+        release {
+            buildConfigField "String", "ENV", "\"prod\""
+            buildConfigField "String", "URL_BASE", "\"https://api.whzytkj.online/\""
+            buildConfigField "String", "WSS_BASE", "\"wss://link.whzytkj.online/access\""
+            buildConfigField "String", "H5_BASE_URL", "\"https://h5.whzytkj.online/\""
+            buildConfigField "String", "ZEGO_APP_ID", "\"1223504772\""
+            buildConfigField "String", "ZEGO_APP_SIGN", "\"ed4c608d30b05c1390d0e862fdd05c8e670a596b1cd66434a7c7f2df1783742c\""
+        }
+    }
 }
 
 dependencies {
@@ -16,4 +34,4 @@ dependencies {
     api project(path: ':libBytedance')
     kapt DependencyConfig.GitHub.AutoServiceAnnotations
     kapt DependencyConfig.JetPack.LifecycleCompilerAPT
-}
+}

commonlibrary/src/main/java/com/yc/commonlibrary/Constans.kt

@@ -2,33 +2,50 @@ package com.yc.commonlibrary
 
 /** Created by yc on 2021/9/11
  * http地址配置
- **/
+
 const val URL_BASE = "https://api.whzytkj.online/"
 const val WSS_BASE = "wss://link.whzytkj.online/access"
-//const val URL_BASE = "https://api.manbowangluo.fun/"
-//const val URL_BASE = "https://dev-api.syjinshanshan.com"
-
-const val AGREE = "https://h5.whzytkj.online/agree"//用户协议
-const val CONCEAL = "https://h5.whzytkj.online/conceal"//用户隐私协议
-const val ANCHOR = "https://h5.whzytkj.online/anchor"//主播协议
-const val RECHARGE = "https://h5.whzytkj.online/recharge"//用户充值协议
-const val SERVICE = "https://h5.whzytkj.online/contactService"//客服
-const val HELP = "https://h5.whzytkj.online/help"//帮助
-const val EXCHANGE = "https://h5.whzytkj.online/newExchangeCoin"//兑换
-const val CERTIFIED = "https://h5.whzytkj.online/certificationMain"//实名
-const val LEVEL = "https://h5.whzytkj.online/equityLevel"//等级
-const val GIFT_WALL = "https://h5.whzytkj.online/giftWall"//礼物墙活动规则
+ **/
+
+@JvmField
+val env: String = BuildConfig.ENV
+
+@JvmField
+val URL_BASE: String = BuildConfig.URL_BASE
+
+@JvmField
+val WSS_BASE: String = BuildConfig.WSS_BASE
+
+@JvmField
+val H5_BASE_URL: String = BuildConfig.H5_BASE_URL
+
+@JvmField
+val zego_app_id: String = BuildConfig.ZEGO_APP_ID
+
+@JvmField
+val zego_appSign: String = BuildConfig.ZEGO_APP_SIGN
+
+val AGREE: String = H5_BASE_URL + "agree"//用户协议
+val CONCEAL: String = H5_BASE_URL + "conceal"//用户隐私协议
+val ANCHOR: String = H5_BASE_URL + "anchor"//主播协议
+val RECHARGE: String = H5_BASE_URL + "recharge"//用户充值协议
+val SERVICE: String = H5_BASE_URL + "contactService"//客服
+val HELP: String = H5_BASE_URL + "help"//帮助
+val EXCHANGE: String = H5_BASE_URL + "newExchangeCoin"//兑换
+val CERTIFIED: String = H5_BASE_URL + "certificationMain"//实名
+val LEVEL: String = H5_BASE_URL + "equityLevel"//等级
+val GIFT_WALL: String = H5_BASE_URL + "giftWall"//礼物墙活动规则
 const val DEF_HEAD = "https://resources.syjinshanshan.com/UserResources/Default/icon_app_def.png"//礼物墙活动规则
 
-const val GUIZU= "https://h5.whzytkj.online/nobility?"//guizu
-const val ANQUAN= "https://h5.whzytkj.online/interactionRules"//
-const val FAMILY= "https://h5.whzytkj.online/familyManagement"//
-const val ANCHOR_CENTER= "https://h5.whzytkj.online/anchorCenter"//
-const val APPLY_ANCHOR_FAMILY= "https://h5.whzytkj.online/myUnion"//
+val GUIZU: String = H5_BASE_URL + "nobility?"//guizu
+val ANQUAN: String = H5_BASE_URL + "interactionRules"//
+val FAMILY: String = H5_BASE_URL + "familyManagement"//
+val ANCHOR_CENTER: String = H5_BASE_URL + "anchorCenter"//
+val APPLY_ANCHOR_FAMILY: String = H5_BASE_URL + "myUnion"//
 
 
 const val WECHAT_APPID = "wx6b967b3a9c0f56eb"//微信appid
 const val WECHAT_KEY = "ea0bc9c1cbccb5e4a939b32f53825fa8"//微信key
 const val UMENG_KEY = "69649a458560e3487222d4ef"//友盟appid
 const val QQ_ID = "102096577"//QQ appid
-const val QQ_KEY = "Vt43oLeiX7TFoAJF"//QQ appid
+const val QQ_KEY = "Vt43oLeiX7TFoAJF"//QQ appid

module_base/src/main/java/com/yc/module_base/websocket/DiaochanSocket.kt

@@ -181,6 +181,10 @@ class DiaochanSocket : BaseSocketConnect() {
                         )
                 }
 
+                CODE_ROOM_BAN -> {
+                    toast("房间被封禁，具体请联系客服")
+                }
+
                 CODE_ROOM_USER_NOT_FOUND -> {
                     toast("用户未找到")
                 }

module_base/src/main/java/com/yc/module_base/websocket/SocketErrorCode.kt

@@ -41,6 +41,7 @@ const val CODE_ROOM_USER_INVALID    = 302 // 用户无效（不在房的用户
 const val CODE_ROOM_LIVE_END        = 303 // 房间直播已结束
 const val CODE_ROOM_CHAT_SILENCE    = 305 // 聊天被房间禁言
 const val CODE_KICKED               = 306 // 被踢出
+const val CODE_ROOM_BAN               = 307 // 房间被封禁
 const val CODE_ROOM_JUMP_NOT_SAME   = 308 // 不允许跳转到相同房间
 const val CODE_SYS_CHAT_SILENCE     = 309 // 聊天被系统禁言
 const val CODE_ROOM_PWD_FAILED      = 310 // 密码房密码错误

module_live/src/main/java/com/yc/module_live/stats/KeyCenter.java

@@ -1,18 +1,20 @@
 package com.yc.module_live.stats;
 
+import com.yc.commonlibrary.ConstansKt;
+
 public final class KeyCenter {
 
     // Developers can get appID from admin console.
     // https://console.zego.im/dashboard
     // for example: 123456789L;
-    private long _appID = 1223504772;
+    private long _appID = Long.parseLong(ConstansKt.zego_app_id);
 
     // AppSign only meets simple authentication requirements.
     // If you need to upgrade to a more secure authentication method,
     // please refer to [Guide for upgrading the authentication mode from using the AppSign to Token](https://docs.zegocloud.com/faq/token_upgrade)
     // Developers can get AppSign from admin [console](https://console.zego.im/dashboard)
     // for example: "abcdefghijklmnopqrstuvwxyz0123456789abcdegfhijklmnopqrstuvwxyz01";
-    private String _appSign = "ed4c608d30b05c1390d0e862fdd05c8e670a596b1cd66434a7c7f2df1783742c";
+    private String _appSign =  ConstansKt.zego_appSign;
 
     private static KeyCenter instance = new KeyCenter();
     private KeyCenter() {}