1、新开分支

app/build.gradle

@@ -14,7 +14,7 @@ android {
     compileSdkVersion config.compileSdkVersion
     defaultConfig {
 //        applicationId "com.qiuju.live.app"
-        applicationId "com.qiuju.app"
+        applicationId "com.hadalive.app"
         minSdkVersion config.minSdkVersion
         targetSdkVersion config.targetSdkVersion
         versionCode config.versionCode
@@ -44,28 +44,28 @@ android {
     }
     flavorDimensions "version"
     productFlavors {
-        qj_01 {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_01 {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
                     API_CHANNEL_ID     : "0",
-                    UMENG_CHANNEL_VALUE: "qj_01"
+                    UMENG_CHANNEL_VALUE: "hd_01"
             ]
         }
-        qj_02 {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_02 {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
-                    UMENG_CHANNEL_VALUE: "qj_02"]
+                    UMENG_CHANNEL_VALUE: "hd_02"]
         }
 
-        qj_bianxianmao {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_bianxianmao {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
@@ -73,19 +73,19 @@ android {
                     UMENG_CHANNEL_VALUE: "bianxianmao"]
         }
 
-        qj_meizu {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_meizu {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
                     API_CHANNEL_ID     : "12",
-                    UMENG_CHANNEL_VALUE: "qj_meizu"
+                    UMENG_CHANNEL_VALUE: "hd_meizu"
             ]
         }
-        qj_mubaotoutiao {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_mubaotoutiao {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
@@ -94,9 +94,9 @@ android {
             ]
         }
 
-        qj_mubao {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_mubao {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
@@ -104,9 +104,9 @@ android {
                     UMENG_CHANNEL_VALUE: "mubao"
             ]
         }
-        qj_mubao1 {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_mubao1 {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
@@ -114,9 +114,9 @@ android {
                     UMENG_CHANNEL_VALUE: "mubao1"
             ]
         }
-        qj_mubao2 {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_mubao2 {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
@@ -124,9 +124,9 @@ android {
                     UMENG_CHANNEL_VALUE: "mubao2"
             ]
         }
-        qj_mubao3 {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_mubao3 {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
@@ -134,9 +134,9 @@ android {
                     UMENG_CHANNEL_VALUE: "mubao3"
             ]
         }
-        qj_mubao4 {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_mubao4 {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
@@ -144,9 +144,9 @@ android {
                     UMENG_CHANNEL_VALUE: "mubao4"
             ]
         }
-        qj_mubao5 {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_mubao5 {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
@@ -154,9 +154,9 @@ android {
                     UMENG_CHANNEL_VALUE: "mubao5"
             ]
         }
-        qj_mubao6 {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_mubao6 {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
@@ -164,9 +164,9 @@ android {
                     UMENG_CHANNEL_VALUE: "mubao6"
             ]
         }
-        qj_mubao7 {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_mubao7 {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
@@ -175,9 +175,9 @@ android {
             ]
         }
 
-        qj_mubao8 {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_mubao8 {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
@@ -186,9 +186,9 @@ android {
             ]
         }
 
-        qj_mubao9 {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_mubao9 {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
@@ -197,9 +197,9 @@ android {
             ]
         }
 
-        qj_mubao10 {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_mubao10 {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
@@ -208,9 +208,9 @@ android {
             ]
         }
 
-        qj_mubao11 {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_mubao11 {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
@@ -219,9 +219,9 @@ android {
             ]
         }
 
-        qj_mubao12 {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_mubao12 {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
@@ -230,9 +230,9 @@ android {
             ]
         }
 
-        qj_mubao13 {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_mubao13 {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
@@ -241,9 +241,9 @@ android {
             ]
         }
 
-        qj_exe1 {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_exe1 {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
@@ -251,9 +251,9 @@ android {
                     UMENG_CHANNEL_VALUE: "exe1"
             ]
         }
-        qj_exe2 {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_exe2 {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
@@ -261,9 +261,9 @@ android {
                     UMENG_CHANNEL_VALUE: "exe2"
             ]
         }
-        qj_exe3 {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_exe3 {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
@@ -271,9 +271,9 @@ android {
                     UMENG_CHANNEL_VALUE: "exe3"
             ]
         }
-        qj_exe4{
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_exe4{
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
@@ -281,9 +281,9 @@ android {
                     UMENG_CHANNEL_VALUE: "exe4"
             ]
         }
-        qj_exe5{
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_exe5{
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
@@ -292,9 +292,9 @@ android {
             ]
         }
 
-        qj_exe6 {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_exe6 {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
@@ -302,9 +302,9 @@ android {
                     UMENG_CHANNEL_VALUE: "exe6"
             ]
         }
-        qj_exe7 {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_exe7 {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
@@ -312,9 +312,9 @@ android {
                     UMENG_CHANNEL_VALUE: "exe7"
             ]
         }
-        qj_exe8 {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_exe8 {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
@@ -322,9 +322,9 @@ android {
                     UMENG_CHANNEL_VALUE: "exe8"
             ]
         }
-        qj_exe9 {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_exe9 {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
@@ -332,9 +332,9 @@ android {
                     UMENG_CHANNEL_VALUE: "exe9"
             ]
         }
-        qj_exe10 {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_exe10 {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
@@ -343,9 +343,9 @@ android {
             ]
         }
 
-        qj_exe11 {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_exe11 {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
@@ -354,112 +354,123 @@ android {
             ]
         }
 
-        qj_1001 {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_1001 {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
                     API_CHANNEL_ID     : "1001",
-                    UMENG_CHANNEL_VALUE: "qj_1001"
+                    UMENG_CHANNEL_VALUE: "hd_1001"
             ]
         }
-        qj_1002 {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_1002 {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
                     API_CHANNEL_ID     : "1002",
-                    UMENG_CHANNEL_VALUE: "qj_1002"
+                    UMENG_CHANNEL_VALUE: "hd_1002"
             ]
         }
-        qj_1003 {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_1003 {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
                     API_CHANNEL_ID     : "1003",
-                    UMENG_CHANNEL_VALUE: "qj_1003"
+                    UMENG_CHANNEL_VALUE: "hd_1003"
             ]
         }
 
-        qj_baidu {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_1005 {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
+            manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY        : "${myAppNamePY}",
+                    API_CHANNEL_ID     : "1005",
+                    UMENG_CHANNEL_VALUE: "hd_1005"
+            ]
+        }
+
+        hd_baidu {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
                     API_CHANNEL_ID     : "3",
-                    UMENG_CHANNEL_VALUE: "qj_baidu"
+                    UMENG_CHANNEL_VALUE: "hd_baidu"
             ]
         }
-        qj_huawei_01 {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_huawei_01 {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
                     API_CHANNEL_ID     : "4",
-                    UMENG_CHANNEL_VALUE: "qj_huawei_01"
+                    UMENG_CHANNEL_VALUE: "hd_huawei_01"
             ]
         }
-        qj_xiaomi_01 {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_xiaomi_01 {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
                     API_CHANNEL_ID     : "6",
-                    UMENG_CHANNEL_VALUE: "qj_xiaomi_01"
+                    UMENG_CHANNEL_VALUE: "hd_xiaomi_01"
             ]
         }
-        qj_yingyongbao {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_yingyongbao {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
                     API_CHANNEL_ID     : "16",
-                    UMENG_CHANNEL_VALUE: "qj_yingyongbao"
+                    UMENG_CHANNEL_VALUE: "hd_yingyongbao"
             ]
         }
 
-        qj_vivo_01 {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_vivo_01 {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
                     API_CHANNEL_ID     : "7",
-                    UMENG_CHANNEL_VALUE: "qj_vivo_01"
+                    UMENG_CHANNEL_VALUE: "hd_vivo_01"
             ]
 
         }
-        qj_oppo_01 {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_oppo_01 {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
                     API_CHANNEL_ID     : "8",
-                    UMENG_CHANNEL_VALUE: "qj_oppo_01"
+                    UMENG_CHANNEL_VALUE: "hd_oppo_01"
             ]
 
         }
-        qj_sanxing_01 {
-            def myAppName = "球聚体育"
-            def myAppNamePY = "qiujutiyu"
+        hd_sanxing_01 {
+            def myAppName = "哈达直播"
+            def myAppNamePY = "hada"
             manifestPlaceholders = [
                     myAppName          : "${myAppName}",
                     myAppNamePY        : "${myAppNamePY}",
                     API_CHANNEL_ID     : "9",
-                    UMENG_CHANNEL_VALUE: "qj_sanxing_01"
+                    UMENG_CHANNEL_VALUE: "hd_sanxing_01"
             ]
 
         }
-        qj_yuyan {
+        hd_yuyan {
             def myAppName = "雨燕直播"
             def myAppNamePY = "yuyan"
             manifestPlaceholders = [
@@ -470,7 +481,7 @@ android {
             ]
 
         }
-        qj_jrs {
+        hd_jrs {
             def myAppName = "JRS"
             def myAppNamePY = "JRS"
             manifestPlaceholders = [
@@ -481,7 +492,7 @@ android {
             ]
 
         }
-        qj_uu_qiu {
+        hd_uu_qiu {
             def myAppName = "UU球直播"
             def myAppNamePY = "uuqiu"
             manifestPlaceholders = [
@@ -493,7 +504,7 @@ android {
 
         }
 
-        qj_lebo {
+        hd_lebo {
             def myAppName = "乐博体育"
             def myAppNamePY = "lebo"
             manifestPlaceholders = [
@@ -504,7 +515,7 @@ android {
             ]
 
         }
-        qj_daishu {
+        hd_daishu {
             def myAppName = "袋鼠直播"
             def myAppNamePY = "daishu"
             manifestPlaceholders = [
@@ -516,7 +527,7 @@ android {
 
         }
 
-        qj_guangqiujie {
+        hd_guangqiujie {
             def myAppName = "逛球街"
             def myAppNamePY = "kuangqiujie"
             manifestPlaceholders = [
@@ -528,7 +539,7 @@ android {
 
         }
 
-        qj_huanqiutiyu {
+        hd_huanqiutiyu {
             def myAppName = "环球体育"
             def myAppNamePY = "huanqiu"
             manifestPlaceholders = [
@@ -540,7 +551,7 @@ android {
 
         }
 
-        qj_jikezuqiu {
+        hd_jikezuqiu {
             def myAppName = "即刻足球"
             def myAppNamePY = "jike"
             manifestPlaceholders = [
@@ -552,7 +563,7 @@ android {
 
         }
 
-        qj_jiaoqiu {
+        hd_jiaoqiu {
             def myAppName = "角球之家"
             def myAppNamePY = "jike"
             manifestPlaceholders = [
@@ -564,7 +575,7 @@ android {
 
         }
 
-        qj_kanqiubao {
+        hd_kanqiubao {
             def myAppName = "看球宝"
             def myAppNamePY = "kanqiubao"
             manifestPlaceholders = [
@@ -576,7 +587,7 @@ android {
 
         }
 
-        qj_kanqiubao2 {
+        hd_kanqiubao2 {
             def myAppName = "看球宝"
             def myAppNamePY = "kanqiubao2"
             manifestPlaceholders = [
@@ -588,7 +599,7 @@ android {
 
         }
 
-        qj_lanjingtiyu {
+        hd_lanjingtiyu {
             def myAppName = "蓝鲸体育"
             def myAppNamePY = "lanjing"
             manifestPlaceholders = [
@@ -599,7 +610,7 @@ android {
             ]
 
         }
-        qj_lanjian {
+        hd_lanjian {
             def myAppName = "篮箭比赛"
             def myAppNamePY = "lanjian"
             manifestPlaceholders = [
@@ -611,7 +622,7 @@ android {
 
         }
 
-        qj_leisu {
+        hd_leisu {
             def myAppName = "雷速体育直播"
             def myAppNamePY = "lansu"
             manifestPlaceholders = [
@@ -623,7 +634,7 @@ android {
 
         }
 
-        qj_qie {
+        hd_qie {
             def myAppName = "企鹅体育"
             def myAppNamePY = "qie"
             manifestPlaceholders = [
@@ -635,7 +646,7 @@ android {
 
         }
 
-        qj_qiuhui {
+        hd_qiuhui {
             def myAppName = "球会体育"
             def myAppNamePY = "qiuhui"
             manifestPlaceholders = [
@@ -647,7 +658,7 @@ android {
 
         }
 
-        qj_qiuke {
+        hd_qiuke {
             def myAppName = "球客体育"
             def myAppNamePY = "qiuke"
             manifestPlaceholders = [
@@ -659,7 +670,7 @@ android {
 
         }
 
-        qj_renren {
+        hd_renren {
             def myAppName = "人人体育"
             def myAppNamePY = "renren"
             manifestPlaceholders = [
@@ -671,7 +682,7 @@ android {
 
         }
 
-        qj_riqiu {
+        hd_riqiu {
             def myAppName = "日球体育"
             def myAppNamePY = "riqiu"
             manifestPlaceholders = [
@@ -683,7 +694,7 @@ android {
 
         }
 
-        qj_woao {
+        hd_woao {
             def myAppName = "我奥篮球破解版"
             def myAppNamePY = "woao"
             manifestPlaceholders = [
@@ -694,7 +705,7 @@ android {
             ]
 
         }
-        qj_wuxing {
+        hd_wuxing {
             def myAppName = "五星体育"
             def myAppNamePY = "wuxing"
             manifestPlaceholders = [
@@ -706,7 +717,7 @@ android {
 
         }
 
-        qj_yingqiu {
+        hd_yingqiu {
             def myAppName = "赢球大师"
             def myAppNamePY = "yingqiu"
             manifestPlaceholders = [
@@ -717,7 +728,7 @@ android {
             ]
 
         }
-        qj_88zhibo {
+        hd_88zhibo {
             def myAppName = "88直播"
             def myAppNamePY = "88zhibo"
             manifestPlaceholders = [
@@ -728,7 +739,7 @@ android {
             ]
 
         }
-        qj_91tiyu {
+        hd_91tiyu {
             def myAppName = "91体育"
             def myAppNamePY = "91tiyu"
             manifestPlaceholders = [
@@ -739,7 +750,7 @@ android {
             ]
 
         }
-        qj_365tiyu {
+        hd_365tiyu {
             def myAppName = "365体育"
             def myAppNamePY = "365tiyu"
             manifestPlaceholders = [
@@ -750,7 +761,7 @@ android {
             ]
 
         }
-        qj_baihu {
+        hd_baihu {
             def myAppName = "百狐体育"
             def myAppNamePY = "baihu"
             manifestPlaceholders = [
@@ -761,7 +772,7 @@ android {
             ]
 
         }
-        qj_douqiu {
+        hd_douqiu {
             def myAppName = "斗球"
             def myAppNamePY = "douqiu"
             manifestPlaceholders = [
@@ -772,7 +783,7 @@ android {
             ]
 
         }
-        qj_hetun {
+        hd_hetun {
             def myAppName = "河豚直播"
             def myAppNamePY = "hetun"
             manifestPlaceholders = [
@@ -783,7 +794,7 @@ android {
             ]
 
         }
-        qj_heibai {
+        hd_heibai {
             def myAppName = "黑白足球"
             def myAppNamePY = "heibai"
             manifestPlaceholders = [
@@ -794,7 +805,7 @@ android {
             ]
 
         }
-        qj_jiguang {
+        hd_jiguang {
             def myAppName = "极光体育"
             def myAppNamePY = "jiguang"
             manifestPlaceholders = [
@@ -805,7 +816,7 @@ android {
             ]
 
         }
-        qj_jiaoying {
+        hd_jiaoying {
             def myAppName = "骄英体育"
             def myAppNamePY = "jiaoying"
             manifestPlaceholders = [
@@ -816,7 +827,7 @@ android {
             ]
 
         }
-        qj_kangeqiu {
+        hd_kangeqiu {
             def myAppName = "看个球"
             def myAppNamePY = "kangeqiu"
             manifestPlaceholders = [
@@ -827,7 +838,7 @@ android {
             ]
 
         }
-        qj_lemi {
+        hd_lemi {
             def myAppName = "乐米体育"
             def myAppNamePY = "lemi"
             manifestPlaceholders = [
@@ -838,7 +849,7 @@ android {
             ]
 
         }
-        qj_obao {
+        hd_obao {
             def myAppName = "欧宝体育"
             def myAppNamePY = "obao"
             manifestPlaceholders = [
@@ -849,7 +860,7 @@ android {
             ]
 
         }
-        qj_sulei {
+        hd_sulei {
             def myAppName = "速雷快讯"
             def myAppNamePY = "sulei"
             manifestPlaceholders = [
@@ -860,7 +871,7 @@ android {
             ]
 
         }
-        qj_wulou {
+        hd_wulou {
             def myAppName = "五楼直播"
             def myAppNamePY = "wulou"
             manifestPlaceholders = [
@@ -871,7 +882,7 @@ android {
             ]
 
         }
-        qj_yuntu {
+        hd_yuntu {
             def myAppName = "云图体育"
             def myAppNamePY = "yuntu"
             manifestPlaceholders = [
@@ -882,7 +893,7 @@ android {
             ]
 
         }
-        qj_zhibo8 {
+        hd_zhibo8 {
             def myAppName = "直播8"
             def myAppNamePY = "zhibo8"
             manifestPlaceholders = [
@@ -893,7 +904,7 @@ android {
             ]
 
         }
-        qj_zhuafan {
+        hd_zhuafan {
             def myAppName = "抓饭直播"
             def myAppNamePY = "zhuafan"
             manifestPlaceholders = [
@@ -905,7 +916,7 @@ android {
 
         }
 
-        qj_9qiu1 {
+        hd_9qiu1 {
             def myAppName = "9球直播"
             def myAppNamePY = "9qiu"
             manifestPlaceholders = [
@@ -917,7 +928,7 @@ android {
 
         }
 
-        qj_9qiu2 {
+        hd_9qiu2 {
             def myAppName = "9球直播"
             def myAppNamePY = "9qiu2"
             manifestPlaceholders = [
@@ -929,7 +940,7 @@ android {
 
         }
 
-        qj_88p {
+        hd_88p {
             def myAppName = "88p直播安卓官方版"
             def myAppNamePY = "88p"
             manifestPlaceholders = [
@@ -941,7 +952,7 @@ android {
 
         }
 
-        qj_A8 {
+        hd_A8 {
             def myAppName = "A8直播"
             def myAppNamePY = "a8"
             manifestPlaceholders = [
@@ -953,7 +964,7 @@ android {
 
         }
 
-        qj_Gyoulanjing {
+        hd_Gyoulanjing {
             def myAppName = "G友蓝鲸直播"
             def myAppNamePY = "gyoulanjing"
             manifestPlaceholders = [
@@ -965,7 +976,7 @@ android {
 
         }
 
-        qj_NBAshanmao {
+        hd_NBAshanmao {
             def myAppName = "NBA山猫直播"
             def myAppNamePY = "NBAshanmao"
             manifestPlaceholders = [
@@ -977,7 +988,7 @@ android {
 
         }
 
-        qj_bobotiyu {
+        hd_bobotiyu {
             def myAppName = "波波球体育"
             def myAppNamePY = "bobotiyuNBA"
             manifestPlaceholders = [
@@ -989,7 +1000,7 @@ android {
 
         }
 
-        qj_duobao {
+        hd_duobao {
             def myAppName = "多宝体育"
             def myAppNamePY = "duobao"
             manifestPlaceholders = [
@@ -1001,7 +1012,7 @@ android {
 
         }
 
-        qj_NBAchaojizhibo {
+        hd_NBAchaojizhibo {
             def myAppName = "NBA超级直播"
             def myAppNamePY = "NBAchaojizhibo"
             manifestPlaceholders = [
@@ -1014,7 +1025,7 @@ android {
         }
 
 
-        qj_fengkuang11ren {
+        hd_fengkuang11ren {
             def myAppName = "疯狂11人"
             def myAppNamePY = "fengkuang11ren"
             manifestPlaceholders = [
@@ -1026,7 +1037,7 @@ android {
 
         }
 
-        qj_heibai2 {
+        hd_heibai2 {
             def myAppName = "黑白直播"
             def myAppNamePY = "heibai2"
             manifestPlaceholders = [
@@ -1038,7 +1049,7 @@ android {
 
         }
 
-        qj_hongyingtao {
+        hd_hongyingtao {
             def myAppName = "红樱桃直播"
             def myAppNamePY = "hongyingtao"
             manifestPlaceholders = [
@@ -1050,7 +1061,7 @@ android {
 
         }
 
-        qj_hulishipin {
+        hd_hulishipin {
             def myAppName = "狐狸直播"
             def myAppNamePY = "hulishipin"
             manifestPlaceholders = [
@@ -1062,7 +1073,7 @@ android {
 
         }
 
-        qj_huaxin {
+        hd_huaxin {
             def myAppName = "花心直播"
             def myAppNamePY = "huaxin"
             manifestPlaceholders = [
@@ -1074,7 +1085,7 @@ android {
 
         }
 
-        qj_huatihui {
+        hd_huatihui {
             def myAppName = "华体会"
             def myAppNamePY = "huatihui"
             manifestPlaceholders = [
@@ -1086,7 +1097,7 @@ android {
 
         }
 
-        qj_kanqiubao3 {
+        hd_kanqiubao3 {
             def myAppName = "看球宝"
             def myAppNamePY = "kanqiubao3"
             manifestPlaceholders = [
@@ -1098,7 +1109,7 @@ android {
 
         }
 
-        qj_kele {
+        hd_kele {
             def myAppName = "可乐直播"
             def myAppNamePY = "kele"
             manifestPlaceholders = [
@@ -1110,7 +1121,7 @@ android {
 
         }
 
-        qj_kele2 {
+        hd_kele2 {
             def myAppName = "可乐直播"
             def myAppNamePY = "kele2"
             manifestPlaceholders = [
@@ -1122,7 +1133,7 @@ android {
 
         }
 
-        qj_midou {
+        hd_midou {
             def myAppName = "米斗跟单"
             def myAppNamePY = "midou"
             manifestPlaceholders = [
@@ -1134,7 +1145,7 @@ android {
 
         }
 
-        qj_mile {
+        hd_mile {
             def myAppName = "米乐直播"
             def myAppNamePY = "mile"
             manifestPlaceholders = [
@@ -1146,7 +1157,7 @@ android {
 
         }
 
-        qj_oumei {
+        hd_oumei {
             def myAppName = "欧美直播"
             def myAppNamePY = "oume"
             manifestPlaceholders = [
@@ -1158,7 +1169,7 @@ android {
 
         }
 
-        qj_qiulaile {
+        hd_qiulaile {
             def myAppName = "球来了"
             def myAppNamePY = "qiulaile"
             manifestPlaceholders = [
@@ -1170,7 +1181,7 @@ android {
 
         }
 
-        qj_qiuyou {
+        hd_qiuyou {
             def myAppName = "球友直播"
             def myAppNamePY = "qiuyou"
             manifestPlaceholders = [
@@ -1182,7 +1193,7 @@ android {
 
         }
 
-        qj_shuoqiudi {
+        hd_shuoqiudi {
             def myAppName = "说球帝"
             def myAppNamePY = "shuoqiudi"
             manifestPlaceholders = [
@@ -1194,7 +1205,7 @@ android {
 
         }
 
-        qj_weilai {
+        hd_weilai {
             def myAppName = "纬来体育"
             def myAppNamePY = "weilai"
             manifestPlaceholders = [
@@ -1206,7 +1217,7 @@ android {
 
         }
 
-        qj_xiaojibaohe {
+        hd_xiaojibaohe {
             def myAppName = "小鸡宝盒直播app"
             def myAppNamePY = "xiaojibaohe"
             manifestPlaceholders = [
@@ -1218,7 +1229,7 @@ android {
 
         }
 
-        qj_xiaomanyao {
+        hd_xiaomanyao {
             def myAppName = "小蛮腰"
             def myAppNamePY = "xiaomanyao"
             manifestPlaceholders = [
@@ -1230,7 +1241,7 @@ android {
 
         }
 
-        qj_xiaosongshu {
+        hd_xiaosongshu {
             def myAppName = "小松鼠直播"
             def myAppNamePY = "xiaosongshu"
             manifestPlaceholders = [
@@ -1242,7 +1253,7 @@ android {
 
         }
 
-        qj_jiebao {
+        hd_jiebao {
             def myAppName = "捷报比分"
             def myAppNamePY = "jiebao"
             manifestPlaceholders = [
@@ -1254,7 +1265,7 @@ android {
 
         }
 
-        qj_chaojidianshi {
+        hd_chaojidianshi {
             def myAppName = "超级电视直播"
             def myAppNamePY = "chaojidianshi"
             manifestPlaceholders = [
@@ -1266,7 +1277,7 @@ android {
 
         }
 
-        qj_boboqiu {
+        hd_boboqiu {
             def myAppName = "波波球直播"
             def myAppNamePY = "boboqiu"
             manifestPlaceholders = [
@@ -1278,7 +1289,7 @@ android {
 
         }
 
-        qj_zhanqi {
+        hd_zhanqi {
             def myAppName = "战旗直播"
             def myAppNamePY = "zhanqi"
             manifestPlaceholders = [
@@ -1290,7 +1301,7 @@ android {
 
         }
 
-        qj_599bifen {
+        hd_599bifen {
             def myAppName = "599比分app"
             def myAppNamePY = "599bifen"
             manifestPlaceholders = [
@@ -1302,7 +1313,7 @@ android {
 
         }
 
-        qj_599bifen2 {
+        hd_599bifen2 {
             def myAppName = "599比分高级版"
             def myAppNamePY = "599bifen2"
             manifestPlaceholders = [
@@ -1314,7 +1325,7 @@ android {
 
         }
 
-        qj_599bifen3 {
+        hd_599bifen3 {
             def myAppName = "599比分智能大数据"
             def myAppNamePY = "599bifen3"
             manifestPlaceholders = [
@@ -1326,7 +1337,7 @@ android {
 
         }
 
-        qj_didiaokan {
+        hd_didiaokan {
             def myAppName = "低调看"
             def myAppNamePY = "didiaokan"
             manifestPlaceholders = [
@@ -1338,7 +1349,7 @@ android {
 
         }
 
-        qj_jingqiutiyu {
+        hd_jingqiutiyu {
             def myAppName = "精球体育"
             def myAppNamePY = "jingqiutiyu"
             manifestPlaceholders = [
@@ -1350,7 +1361,7 @@ android {
 
         }
 
-        qj_juqiumi {
+        hd_juqiumi {
             def myAppName = "聚球迷官方版"
             def myAppNamePY = "juqiumi"
             manifestPlaceholders = [
@@ -1362,7 +1373,7 @@ android {
 
         }
 
-        qj_juqiumi2 {
+        hd_juqiumi2 {
             def myAppName = "聚球迷专业版"
             def myAppNamePY = "juqiumi2"
             manifestPlaceholders = [
@@ -1374,7 +1385,7 @@ android {
 
         }
 
-        qj_leshitiyu{
+        hd_leshitiyu{
             def myAppName = "乐视体育"
             def myAppNamePY = "leshitiyu"
             manifestPlaceholders = [
@@ -1386,7 +1397,7 @@ android {
 
         }
 
-        qj_lvyintiyu{
+        hd_lvyintiyu{
             def myAppName = "绿茵体育"
             def myAppNamePY = "lvyintiyu"
             manifestPlaceholders = [
@@ -1398,7 +1409,7 @@ android {
 
         }
 
-        qj_lvyinzhongguo{
+        hd_lvyinzhongguo{
             def myAppName = "绿茵中国"
             def myAppNamePY = "lvyinzhongguo"
             manifestPlaceholders = [
@@ -1410,7 +1421,7 @@ android {
 
         }
 
-        qj_xingguitiyu{
+        hd_xingguitiyu{
             def myAppName = "星轨体育"
             def myAppNamePY = "xingguitiyu"
             manifestPlaceholders = [
@@ -2814,358 +2825,358 @@ android {
             jniLibs.srcDirs = ['libs']
         }
 
-        qj_yuyan {
+        hd_yuyan {
             res.srcDirs = ['src/main/X-YUYAN/res']
         }
-        qj_boboqiu {
+        hd_boboqiu {
             res.srcDirs = ['src/main/X-BOBOQIU/res']
         }
-        qj_chaojidianshi {
+        hd_chaojidianshi {
             res.srcDirs = ['src/main/X-CHAOJIDIANSHI/res']
         }
-        qj_jiebao {
+        hd_jiebao {
             res.srcDirs = ['src/main/X-JIEBAO/res']
         }
 
-        qj_jrs {
+        hd_jrs {
             res.srcDirs = ['src/main/X-JRS/res']
 
         }
-        qj_uu_qiu {
+        hd_uu_qiu {
             res.srcDirs = ['src/main/X-UUQIU/res']
 
         }
 
-        qj_daishu {
+        hd_daishu {
             res.srcDirs = ['src/main/X-DAISHU/res']
 
         }
 
-        qj_NBAchaojizhibo {
+        hd_NBAchaojizhibo {
             res.srcDirs = ['src/main/X-NBACHAOJIZHIBO/res']
 
         }
-        qj_lebo {
+        hd_lebo {
             res.srcDirs = ['src/main/X-LEBO/res']
 
         }
 
-        qj_guangqiujie {
+        hd_guangqiujie {
             res.srcDirs = ['src/main/X-GUANGQIUJIE/res']
 
         }
 
-        qj_huanqiutiyu {
+        hd_huanqiutiyu {
             res.srcDirs = ['src/main/X-HUANQIU/res']
 
         }
 
-        qj_jikezuqiu {
+        hd_jikezuqiu {
             res.srcDirs = ['src/main/X-JIKE/res']
 
         }
 
-        qj_jiaoqiu {
+        hd_jiaoqiu {
             res.srcDirs = ['src/main/X-JIAOQIU/res']
 
         }
 
-        qj_kanqiubao {
+        hd_kanqiubao {
             res.srcDirs = ['src/main/X-KANQIUBAO/res']
 
         }
 
-        qj_kanqiubao2 {
+        hd_kanqiubao2 {
             res.srcDirs = ['src/main/X-KANQIUBAO2/res']
 
         }
 
-        qj_lanjingtiyu {
+        hd_lanjingtiyu {
             res.srcDirs = ['src/main/X-LANJING/res']
 
         }
-        qj_lanjian {
+        hd_lanjian {
             res.srcDirs = ['src/main/X-LANJIAN/res']
 
         }
 
-        qj_leisu {
+        hd_leisu {
             res.srcDirs = ['src/main/X-LEISU/res']
 
         }
 
-        qj_qie {
+        hd_qie {
             res.srcDirs = ['src/main/X-QIE/res']
 
         }
 
-        qj_qiuhui {
+        hd_qiuhui {
             res.srcDirs = ['src/main/X-QIUHUI/res']
 
         }
 
-        qj_qiuke {
+        hd_qiuke {
             res.srcDirs = ['src/main/X-QIUKE/res']
 
         }
 
-        qj_renren {
+        hd_renren {
             res.srcDirs = ['src/main/X-RENREN/res']
 
         }
 
-        qj_riqiu {
+        hd_riqiu {
             res.srcDirs = ['src/main/X-RIQIU/res']
 
         }
 
-        qj_woao {
+        hd_woao {
             res.srcDirs = ['src/main/X-WOAO/res']
 
         }
-        qj_wuxing {
+        hd_wuxing {
             res.srcDirs = ['src/main/X-WUXING/res']
 
         }
 
-        qj_yingqiu {
+        hd_yingqiu {
             res.srcDirs = ['src/main/X-YINGQIU/res']
 
         }
-        qj_88zhibo {
+        hd_88zhibo {
             res.srcDirs = ['src/main/X-88ZHIBO/res']
 
         }
-        qj_91tiyu {
+        hd_91tiyu {
             res.srcDirs = ['src/main/X-91TIYU/res']
 
         }
-        qj_365tiyu {
+        hd_365tiyu {
             res.srcDirs = ['src/main/X-365TIYU/res']
 
         }
-        qj_baihu {
+        hd_baihu {
             res.srcDirs = ['src/main/X-BAIHU/res']
 
         }
-        qj_douqiu {
+        hd_douqiu {
             res.srcDirs = ['src/main/X-DOUQIU/res']
 
         }
-        qj_hetun {
+        hd_hetun {
             res.srcDirs = ['src/main/X-HETUN/res']
 
         }
-        qj_heibai {
+        hd_heibai {
             res.srcDirs = ['src/main/X-HEIBAI/res']
 
         }
-        qj_jiguang {
+        hd_jiguang {
             res.srcDirs = ['src/main/X-JIGUANGres']
 
         }
-        qj_jiaoying {
+        hd_jiaoying {
             res.srcDirs = ['src/main/X-JIAOYING/res']
 
         }
-        qj_kangeqiu {
+        hd_kangeqiu {
             res.srcDirs = ['src/main/X-KANGEQIUres']
 
         }
-        qj_lemi {
+        hd_lemi {
             res.srcDirs = ['src/main/X-LEMIres']
 
         }
-        qj_obao {
+        hd_obao {
             res.srcDirs = ['src/main/X-OBAO/res']
 
         }
-        qj_sulei {
+        hd_sulei {
             res.srcDirs = ['src/main/X-SULEI/res']
 
         }
-        qj_wulou {
+        hd_wulou {
             res.srcDirs = ['src/main/X-WULOU/res']
 
         }
-        qj_yuntu {
+        hd_yuntu {
             res.srcDirs = ['src/main/X-YUNTU/res']
 
         }
-        qj_zhibo8 {
+        hd_zhibo8 {
             res.srcDirs = ['src/main/X-ZHIBO8/res']
 
         }
-        qj_zhuafan {
+        hd_zhuafan {
             res.srcDirs = ['src/main/X-ZHUAFAN/res']
 
         }
-        qj_9qiu1 {
+        hd_9qiu1 {
             res.srcDirs = ['src/main/X-JIUQIU/res']
 
         }
-        qj_9qiu2 {
+        hd_9qiu2 {
             res.srcDirs = ['src/main/X-JIUQIU2/res']
 
         }
-        qj_88p {
+        hd_88p {
             res.srcDirs = ['src/main/X-88P/res']
 
         }
-        qj_A8 {
+        hd_A8 {
             res.srcDirs = ['src/main/X-A8/res']
 
         }
-        qj_Gyoulanjing {
+        hd_Gyoulanjing {
             res.srcDirs = ['src/main/X-GYOU/res']
 
         }
-        qj_NBAshanmao {
+        hd_NBAshanmao {
             res.srcDirs = ['src/main/X-SHANMAO/res']
 
         }
-        qj_bobotiyu {
+        hd_bobotiyu {
             res.srcDirs = ['src/main/X-BOBO/res']
 
         }
-        qj_duobao {
+        hd_duobao {
             res.srcDirs = ['src/main/X-DUOBAO/res']
 
         }
-        qj_fengkuang11ren {
+        hd_fengkuang11ren {
             res.srcDirs = ['src/main/X-FENGKUANG11REN/res']
 
         }
-        qj_heibai2 {
+        hd_heibai2 {
             res.srcDirs = ['src/main/X-HEIBAIMIANFEI/res']
 
         }
-        qj_hongyingtao {
+        hd_hongyingtao {
             res.srcDirs = ['src/main/X-HONGYINGTAO/res']
 
         }
-        qj_hulishipin {
+        hd_hulishipin {
             res.srcDirs = ['src/main/X-HULI/res']
 
         }
-        qj_huaxin {
+        hd_huaxin {
             res.srcDirs = ['src/main/X-HUAXIN/res']
 
         }
-        qj_huatihui {
+        hd_huatihui {
             res.srcDirs = ['src/main/X-HUATIHUI/res']
 
         }
-        qj_kanqiubao3 {
+        hd_kanqiubao3 {
             res.srcDirs = ['src/main/X-KANQIUBAO3/res']
 
         }
-        qj_kele {
+        hd_kele {
             res.srcDirs = ['src/main/X-KELE/res']
 
         }
-        qj_kele2 {
+        hd_kele2 {
             res.srcDirs = ['src/main/X-KELEGUANWANG/res']
 
         }
-        qj_midou {
+        hd_midou {
             res.srcDirs = ['src/main/X-MIDOU/res']
 
         }
-        qj_mile {
+        hd_mile {
             res.srcDirs = ['src/main/X-MILE/res']
 
         }
-        qj_oumei {
+        hd_oumei {
             res.srcDirs = ['src/main/X-OUMEI/res']
 
         }
-        qj_qiulaile {
+        hd_qiulaile {
             res.srcDirs = ['src/main/X-OIULAILE/res']
 
         }
-        qj_qiuyou {
+        hd_qiuyou {
             res.srcDirs = ['src/main/X-OIUYOU/res']
 
         }
-        qj_shuoqiudi {
+        hd_shuoqiudi {
             res.srcDirs = ['src/main/X-SHUOQIUDI/res']
 
         }
-        qj_weilai {
+        hd_weilai {
             res.srcDirs = ['src/main/X-WEILAI/res']
 
         }
-        qj_xiaojibaohe {
+        hd_xiaojibaohe {
             res.srcDirs = ['src/main/X-XIAOJIBAOHE/res']
 
         }
-        qj_xiaomanyao {
+        hd_xiaomanyao {
             res.srcDirs = ['src/main/X-XIAOMANYAO/res']
 
         }
-        qj_xiaosongshu {
+        hd_xiaosongshu {
             res.srcDirs = ['src/main/X-XIAOSONGSHU/res']
 
         }
 
-        qj_zhanqi {
+        hd_zhanqi {
             res.srcDirs = ['src/main/X-ZHANQI/res']
 
         }
 
-        qj_599bifen {
+        hd_599bifen {
             res.srcDirs = ['src/main/X-599BIFEN/res']
 
         }
 
-        qj_599bifen2 {
+        hd_599bifen2 {
             res.srcDirs = ['src/main/X-599BIFEN2/res']
 
         }
 
-        qj_599bifen3 {
+        hd_599bifen3 {
             res.srcDirs = ['src/main/X-599BIFEN3/res']
 
         }
 
-        qj_didiaokan {
+        hd_didiaokan {
             res.srcDirs = ['src/main/X-DIDIAOKAN/res']
 
         }
 
 
-        qj_jingqiutiyu {
+        hd_jingqiutiyu {
             res.srcDirs = ['src/main/X-JINGQIUTIYU/res']
 
         }
 
-        qj_juqiumi {
+        hd_juqiumi {
             res.srcDirs = ['src/main/X-JUQIUMI/res']
 
         }
 
-        qj_juqiumi2 {
+        hd_juqiumi2 {
             res.srcDirs = ['src/main/X-JUQIUMI2/res']
 
         }
 
-        qj_leshitiyu {
+        hd_leshitiyu {
             res.srcDirs = ['src/main/X-LESHITIYU/res']
 
         }
 
-        qj_lvyintiyu {
+        hd_lvyintiyu {
             res.srcDirs = ['src/main/X-LVYINTIYU/res']
 
         }
 
-        qj_lvyinzhongguo {
+        hd_lvyinzhongguo {
             res.srcDirs = ['src/main/X-LVYINZHONGGUO/res']
 
         }
 
-        qj_xingguitiyu {
+        hd_xingguitiyu {
             res.srcDirs = ['src/main/X-XINGGUITIYU/res']
 
         }
@@ -3724,6 +3735,7 @@ dependencies {
     implementation files('src\\lib\\core-3.3.0.jar')
     implementation files('src\\lib\\GDTActionSDK.min.1.8.2.aar')
     implementation files('src\\lib\\monitorsdk-1.0.10.aar')
+//    implementation files('src\\lib\\oaid_sdk_1.2.1.aar')
 //    implementation files('src\\lib\\humesdk-1.0.0.aar')
 
     implementation library.flexbox

app/proguard-rules.pro

@@ -455,6 +455,46 @@ native <methods>;
 
 
 # ==================gdt end===================
+# ==================oaid start===================
+
+
+# sdk
+-keep class com.bun.miitmdid.** { *; }
+-keep interface com.bun.supplier.** { *; }
+
+# asus
+-keep class com.asus.msa.SupplementaryDID.** { *; }
+-keep class com.asus.msa.sdid.** { *; }
+# freeme
+-keep class com.android.creator.** { *; }
+-keep class com.android.msasdk.** { *; }
+# huawei
+-keep class com.huawei.hms.ads.** { *; }
+-keep interface com.huawei.hms.ads.** {*; }
+# lenovo
+-keep class com.zui.deviceidservice.** { *; }
+-keep class com.zui.opendeviceidlibrary.** { *; }
+# meizu
+-keep class com.meizu.flyme.openidsdk.** { *; }
+# nubia
+-keep class com.bun.miitmdid.provider.nubia.NubiaIdentityImpl { *; }
+# oppo
+-keep class com.heytap.openid.** { *; }
+# samsung
+-keep class com.samsung.android.deviceidservice.** { *; }
+# vivo
+-keep class com.vivo.identifier.** { *; }
+# xiaomi
+-keep class com.bun.miitmdid.provider.xiaomi.IdentifierManager { *; }
+# zte
+-keep class com.bun.lib.** { *; }
+# coolpad
+-keep class com.coolpad.deviceidsupport.** { *; }
+
+
+
+
+# ==================gdt end===================
 
 
 

app/src/main/AndroidManifest.xml

@@ -75,11 +75,11 @@
         <!-- 设置环信应用的AppKey -->
         <meta-data
             android:name="EASEMOB_APPKEY"
-            android:value="1102211214116810#room" />
+            android:value="1118210302098649#hongshanliving" />
 
         <meta-data
             android:name="UMENG_APPKEY"
-            android:value="625d03d7d024421570beb456" />
+            android:value="62e64bf005844627b507fd59" />
         <meta-data
             android:name="UMENG_CHANNEL"
             android:value="${UMENG_CHANNEL_VALUE}" />

app/src/main/assets/supplierconfig.json

+{
+  "supplier":{
+    "vivo":{
+      "appid":"100215079"
+    }
+  }
+}

app/src/main/java/com/hupu/tv/player/app/api/HostUrl.kt

@@ -20,7 +20,7 @@ interface HostUrl {
 
 
 //        const val HOST_URL = "http://129.226.169.250:8051/excuse/"
-        const val HOST_URL = "http://api.qiujuzb.com/excuse/"
+        const val HOST_URL = "http://api.hadazb.com/excuse/"
 
 
         /**
@@ -48,6 +48,11 @@ interface HostUrl {
 
         const val POST_LIST_ICON = "capi/index/listIcon"
 
+        /**
+         * 敏感词正则表达式
+         */
+        const val COMMON_GET_CONFIG_VALUE = "common/getConfigValue"
+
 
         /**
          * 登录接口

app/src/main/java/com/hupu/tv/player/app/api/RetrofitService.kt

@@ -2,6 +2,7 @@ package com.hupu.tv.player.app.api
 
 import com.softgarden.baselibrary.network.BaseBean
 import com.hupu.tv.player.app.bean.*
+import com.hupu.tv.player.app.utils.JsonUtils
 import com.hupu.tv.player.app.utils.ProductFlavors
 import io.reactivex.rxjava3.core.Observable
 
@@ -124,6 +125,13 @@ interface RetrofitService {/*@Field("is_new") int is_new*/
     @POST(HostUrl.POST_WINNER)
     fun getWinnerList(): Observable<BaseBean<List<String>>>
 
+
+    /**
+     * 敏感词正则表达式
+     */
+    @POST(HostUrl.COMMON_GET_CONFIG_VALUE)
+    fun getConfigValue(@Body body: RequestBody = JsonUtils.toRequestBody(hashMapOf("configName" to "FILTER_KEYWORDS"))): Observable<BaseBean<String>>
+
     /**
      * 购买影片支付接口
      */

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

@@ -8,6 +8,7 @@ import android.widget.ImageView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.multidex.MultiDex
 import com.blankj.utilcode.util.LogUtils
+//import com.bun.miitmdid.core.MdidSdkHelper
 import com.bytedance.applog.AppLog
 import com.bytedance.applog.ILogger
 import com.bytedance.applog.InitConfig
@@ -110,6 +111,8 @@ class App : BaseApplication() {
     }
 
     fun initLib() {
+//        System.loadLibrary("msaoaidsec")
+//        MdidSdkHelper.InitCert()
         MultiDex.install(this)
         initUpdate()
         initCrash()

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

@@ -455,6 +455,9 @@ object Constants {
 
     const val MATCH_BEAN_ID = "match_bean_id"
 
+    //敏感词正则表达式
+    const val CONFIG_VALUE = "CONFIG_VALUE"
+
     const val USER_PHONE = "user_phone"
     const val USER_CODE = "user_code"
 
@@ -533,5 +536,8 @@ object Constants {
     const val HX_ID =  "HX_ID"
     const val CONVERSATION_ID =  "CONVERSATION_ID"
 
+    const val USER_PRIVATE = "https://m.hadazb.com/privacy.html"
+    const val USER_AGREE = "http://m.hadazb.com/agreement.html"
+
 
 }
\ No newline at end of file

app/src/main/java/com/hupu/tv/player/app/oaid/CertUtil.java

+package com.hupu.tv.player.app.oaid;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateExpiredException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.CertificateNotYetValidException;
+import java.security.cert.X509Certificate;
+import java.text.SimpleDateFormat;
+
+public class CertUtil {
+
+    public static String getCertInfo(String appCertPem){
+        CertificateFactory fact;
+        InputStream in = new ByteArrayInputStream(appCertPem.getBytes());
+        X509Certificate appCert;
+        try {
+            fact = CertificateFactory.getInstance("X.509");
+            appCert = (X509Certificate) fact.generateCertificate(in);
+        } catch (CertificateException e) {
+            return "[Cert Format Error]";
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String certInfo = "Cert: \nSubjectName: " + appCert.getSubjectX500Principal().getName() +
+                "\nNot Before: " + sdf.format(appCert.getNotBefore()) +
+                "\nNot After: " + sdf.format(appCert.getNotAfter());
+        try {
+            appCert.checkValidity();
+        } catch (CertificateExpiredException e) {
+            return certInfo +"\n[Expired]";
+        } catch (CertificateNotYetValidException e) {
+            return certInfo +"\n[NotYetValid]";
+        }
+        return certInfo+ "\n[Valid]";
+    }
+}

app/src/main/java/com/hupu/tv/player/app/oaid/DemoHelper.java

+//package com.hupu.tv.player.app.oaid;
+//
+//import android.content.Context;
+//import android.util.Log;
+//
+//import com.bun.miitmdid.core.InfoCode;
+//import com.bun.miitmdid.core.MdidSdkHelper;
+//import com.bun.miitmdid.interfaces.IIdentifierListener;
+//import com.bun.miitmdid.interfaces.IdSupplier;
+//import com.bun.miitmdid.pojo.IdSupplierImpl;
+//
+//import java.io.BufferedReader;
+//import java.io.IOException;
+//import java.io.InputStream;
+//import java.io.InputStreamReader;
+//
+///**
+//* Date: 16:27 2021/2/26 0026
+// * Version: 1.0.3
+//**/
+//public class DemoHelper implements IIdentifierListener {
+//
+//    public static final String TAG = "DemoHelper";
+//    public static final int HELPER_VERSION_CODE = 20220520; // DemoHelper版本号
+//    private final AppIdsUpdater appIdsUpdater;
+//    private boolean isCertInit = false;
+//
+//    public boolean isSDKLogOn = true;          // TODO （1）设置 是否开启sdk日志
+//    public static final String ASSET_FILE_NAME_CERT = "com.example.oaidtest2.cert.pem";  // TODO （2）设置 asset证书文件名
+//
+//    public DemoHelper(AppIdsUpdater appIdsUpdater){
+//        // TODO （3）加固版本在调用前必须载入SDK安全库,因为加载有延迟，推荐在application中调用loadLibrary方法
+//        //        System.loadLibrary("msaoaidsec");
+//        // DemoHelper版本建议与SDK版本一致
+//        if(MdidSdkHelper.SDK_VERSION_CODE != HELPER_VERSION_CODE){
+//            Log.w(TAG,"SDK version not match.");
+//        }
+//        this.appIdsUpdater = appIdsUpdater;
+//    }
+//
+//    public void getDeviceIds(Context cxt){
+//        getDeviceIds(cxt, true, true, true);
+//    }
+//
+//
+//
+//    /**
+//     * 获取OAID
+//     * @param cxt
+//     */
+//    public void getDeviceIds(Context cxt,boolean isGetOAID,boolean isGetVAID,boolean isGetAAID){
+//        // TODO （4）初始化SDK证书
+//        if(!isCertInit){ // 证书只需初始化一次
+//            // 证书为PEM文件中的所有文本内容（包括首尾行、换行符）
+//            try {
+//                isCertInit = MdidSdkHelper.InitCert(cxt, loadPemFromAssetFile(cxt, ASSET_FILE_NAME_CERT));
+//            } catch (Error e) {
+//                e.printStackTrace();
+//            }
+//            if(!isCertInit){
+//                Log.w(TAG, "getDeviceIds: cert init failed");
+//            }
+//        }
+//
+//        //（可选）设置InitSDK接口回调超时时间(仅适用于接口为异步)，默认值为5000ms.
+//        // 注：请在调用前设置一次后就不再更改，否则可能导致回调丢失、重复等问题
+//        try {
+//            MdidSdkHelper.setGlobalTimeout(5000);
+//        } catch (Error error) {
+//            error.printStackTrace();
+//        }
+//        int code = 0;
+//        // TODO （5）调用SDK获取ID
+//        try {
+//            code = MdidSdkHelper.InitSdk(cxt, isSDKLogOn, isGetOAID, isGetVAID, isGetAAID, this);
+//        } catch (Error error) {
+//            error.printStackTrace();
+//        }
+//
+//        // TODO （6）根据SDK返回的code进行不同处理
+//        IdSupplierImpl unsupportedIdSupplier = new IdSupplierImpl();
+//        if(code == InfoCode.INIT_ERROR_CERT_ERROR){                         // 证书未初始化或证书无效，SDK内部不会回调onSupport
+//            // APP自定义逻辑
+//            Log.w(TAG,"cert not init or check not pass");
+//            onSupport(unsupportedIdSupplier);
+//        }else if(code == InfoCode.INIT_ERROR_DEVICE_NOSUPPORT){             // 不支持的设备, SDK内部不会回调onSupport
+//            // APP自定义逻辑
+//            Log.w(TAG,"device not supported");
+//            onSupport(unsupportedIdSupplier);
+//        }else if( code == InfoCode.INIT_ERROR_LOAD_CONFIGFILE){            // 加载配置文件出错, SDK内部不会回调onSupport
+//            // APP自定义逻辑
+//            Log.w(TAG,"failed to load config file");
+//            onSupport(unsupportedIdSupplier);
+//        }else if(code == InfoCode.INIT_ERROR_MANUFACTURER_NOSUPPORT){      // 不支持的设备厂商, SDK内部不会回调onSupport
+//            // APP自定义逻辑
+//            Log.w(TAG,"manufacturer not supported");
+//            onSupport(unsupportedIdSupplier);
+//        }else if(code == InfoCode.INIT_ERROR_SDK_CALL_ERROR){             // sdk调用出错, SSDK内部不会回调onSupport
+//            // APP自定义逻辑
+//            Log.w(TAG,"sdk call error");
+//            onSupport(unsupportedIdSupplier);
+//        } else if(code == InfoCode.INIT_INFO_RESULT_DELAY) {             // 获取接口是异步的，SDK内部会回调onSupport
+//            Log.i(TAG, "result delay (async)");
+//        }else if(code == InfoCode.INIT_INFO_RESULT_OK){                  // 获取接口是同步的，SDK内部会回调onSupport
+//            Log.i(TAG, "result ok (sync)");
+//        }else {
+//            // sdk版本高于DemoHelper代码版本可能出现的情况，无法确定是否调用onSupport
+//            // 不影响成功的OAID获取
+//            Log.w(TAG,"getDeviceIds: unknown code: " + code);
+//        }
+//    }
+//
+//    /**
+//     * APP自定义的getDeviceIds(Context cxt)的接口回调
+//     * @param supplier
+//     */
+//    @Override
+//    public void onSupport(IdSupplier supplier) {
+//        if(supplier==null) {
+//            Log.w(TAG, "onSupport: supplier is null");
+//            return;
+//        }
+//        if(appIdsUpdater ==null) {
+//            Log.w(TAG, "onSupport: callbackListener is null");
+//            return;
+//        }
+//        // 获取Id信息
+//        // 注：IdSupplier中的内容为本次调用MdidSdkHelper.InitSdk()的结果，不会实时更新。 如需更新，需调用MdidSdkHelper.InitSdk()
+//        boolean isSupported = supplier.isSupported();
+//        boolean isLimited  = supplier.isLimited();
+//        String oaid=supplier.getOAID();
+//        String vaid=supplier.getVAID();
+//        String aaid=supplier.getAAID();
+//
+//        //TODO (7) 自定义后续流程，以下显示到UI的示例
+//        String idsText= "support: " + (isSupported ? "true" : "false") +
+//                "\nlimit: " + (isLimited ? "true" : "false") +
+//                "\nOAID: " + oaid +
+//                "\nVAID: " + vaid +
+//                "\nAAID: " + aaid + "\n";
+//        Log.d(TAG, "onSupport: ids: \n" + idsText);
+//        appIdsUpdater.onIdsValid(idsText);
+//    }
+//
+//    public interface AppIdsUpdater{
+//        void onIdsValid(String ids);
+//    }
+//
+//    /**
+//     * 从asset文件读取证书内容
+//     * @param context
+//     * @param assetFileName
+//     * @return 证书字符串
+//     */
+//    public static String loadPemFromAssetFile(Context context, String assetFileName){
+//        try {
+//            InputStream is = context.getAssets().open(assetFileName);
+//            BufferedReader in = new BufferedReader(new InputStreamReader(is));
+//            StringBuilder builder = new StringBuilder();
+//            String line;
+//            while ((line = in.readLine()) != null){
+//                builder.append(line);
+//                builder.append('\n');
+//            }
+//            return builder.toString();
+//        } catch (IOException e) {
+//            Log.e(TAG, "loadPemFromAssetFile failed");
+//            return "";
+//        }
+//    }
+//}
+//

app/src/main/java/com/hupu/tv/player/app/oaid/SystemInfoUtil.java

+package com.hupu.tv.player.app.oaid;
+
+import android.os.Build;
+
+import java.text.SimpleDateFormat;
+
+public class SystemInfoUtil {
+
+    /**
+     * 获取当前手机系统版本号
+     * @return  系统时间
+     */
+    public static String getSystemTime(){
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        return sdf.format(System.currentTimeMillis());
+    }
+    /**
+     * 获取当前手机系统版本号
+     * @return  系统版本号
+     */
+    public static String getSystemVersion() {
+        return Build.VERSION.RELEASE;
+    }
+
+    /**
+     * 获取手机型号
+     * @return  手机型号
+     */
+    public static String getSystemModel() {
+        return Build.MODEL;
+    }
+
+    /**
+     * 获取手机厂商
+     * @return  手机厂商
+     */
+    public static String getDeviceBrand() {
+        return Build.BRAND;
+    }
+
+    /**
+     * 获取手机制造商
+     * @return  手机制造商
+     */
+    public static String getDeviceManufacturer() {
+        return Build.MANUFACTURER;
+    }
+}

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

@@ -353,7 +353,7 @@ class LiveActivity : RefreshActivity<LiveActivityPresenter>(), LiveActivityConta
 
     override fun onRequestRoomInfo(bean: RoomInfoEntity?) {
         UmengUtils.umengJoinLive()
-        sportType = bean?.sportsType?: 0
+        sportType = bean?.matchInfo?.sportsType?: 0
         matchId = bean?.matchId ?: ""
         addMessage("请求房间信息成功 直播间 IM userId = ${bean?.huanXinUserId}")
 

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

@@ -143,7 +143,7 @@ class LoginActivity : RefreshActivity<LoginActivityPresenter>(), LoginActivityCo
                 DialogUtils.showLoginAgreement(
                     this@LoginActivity,
                     getString(R.string.string_user_agreement_title_user),
-                    getString(R.string.string_user_agreement)
+                    Constants.USER_AGREE
                 )
 
             }
@@ -155,12 +155,7 @@ class LoginActivity : RefreshActivity<LoginActivityPresenter>(), LoginActivityCo
                 DialogUtils.showLoginAgreement(
                     this@LoginActivity,
                     getString(R.string.string_user_agreement_title_private),
-                    if (VersionControl.getCurrentFlavor() == VersionControl.YINGYONGBAO){
-                        getString(R.string.string_user_private_xiaomi)
-                    }else{
-                          getString(R.string.string_user_private)
-                    }
-
+                    Constants.USER_PRIVATE
                 )
 
             }

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

@@ -88,7 +88,7 @@ class MainActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay {
         get() = this
 
     override fun initialize() {
-        DialogSettings.modalDialog = true
+        DialogSettings.modalDialog = false
         showAdDialog()
         initTabLayout()
         EventBus.getDefault().register(this)

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

@@ -77,7 +77,7 @@ class RegisterActivity : RefreshActivity<RegisterActivityPresenter>(),
                 DialogUtils.showLoginAgreement(
                     this@RegisterActivity,
                     getString(R.string.string_user_agreement_title_user),
-                    getString(R.string.string_user_agreement)
+                    Constants.USER_AGREE
                 )
 
             }
@@ -89,11 +89,7 @@ class RegisterActivity : RefreshActivity<RegisterActivityPresenter>(),
                 DialogUtils.showLoginAgreement(
                     this@RegisterActivity,
                     getString(R.string.string_user_agreement_title_private),
-                    if (VersionControl.getCurrentFlavor() == VersionControl.YINGYONGBAO) {
-                        getString(R.string.string_user_private_xiaomi)
-                    } else {
-                        getString(R.string.string_user_private)
-                    }
+                    Constants.USER_PRIVATE
                 )
 
             }

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

@@ -72,11 +72,19 @@ class SettingActivity : RefreshActivity<SettingPresenter>(), SettingContact.Disp
         }
 
         ll_user.onSingleClick {
-            startActivity(UserAgreementActivity::class.java)
+            DialogUtils.showLoginAgreement(
+                this,
+                getString(R.string.string_user_agreement_title_user),
+                Constants.USER_AGREE
+            )
         }
 
         ll_private.onSingleClick {
-            startActivity(UserPrivateActivity::class.java)
+            DialogUtils.showLoginAgreement(
+                this,
+                getString(R.string.string_user_agreement_title_private),
+                Constants.USER_PRIVATE
+            )
         }
 
         switch_message.setOnCheckedChangeListener { buttonView, isChecked ->

app/src/main/java/com/hupu/tv/player/app/ui/contact/MainFragmentContact.kt

@@ -14,7 +14,6 @@ interface MainFragmentContact {
     }
     interface Presenter{
         fun getCategory()
-        fun getShowConfig()
-
+        fun getConfigValue()
     }
 }
\ No newline at end of file

app/src/main/java/com/hupu/tv/player/app/ui/fragment/MainFragment.kt

@@ -40,7 +40,7 @@ class MainFragment : RefreshFragment<MainFragmentPresenter>(), MainFragmentConta
 
     override fun lazyLoad() {
         presenter?.getCategory()
-        presenter?.getShowConfig()
+        presenter?.getConfigValue()
     }
 
     private fun initViewPager() {

app/src/main/java/com/hupu/tv/player/app/ui/presenter/MainFragmentPresenter.kt

@@ -43,16 +43,17 @@ class MainFragmentPresenter : IBasePresenter, MainFragmentContact.Presenter {
 //                })
     }
 
-    override fun getShowConfig() {
-//                RetrofitClient.retrofitService
-//                .getLiveConfig()
-//                .compose(NetworkTransformer(mView))
-//                .subscribe(object : RxCallback<ShowConifgEntity>() {
-//                    override fun onSuccess(data: ShowConifgEntity?) {
-//                        VersionControl.saveConfig(data?.show?:false)
-//
-//                    }
-//                })
+
+
+    override fun getConfigValue() {
+        RetrofitClient.retrofitService
+            .getConfigValue()
+            .compose(NetworkTransformer(mView))
+            .subscribe(object : RxCallback<String>() {
+                override fun onSuccess(data: String?) {
+                    SPUtil.put(Constants.CONFIG_VALUE,data)
+                }
+            })
     }
 
 

app/src/main/java/com/hupu/tv/player/app/utils/DialogUtils.kt

@@ -29,6 +29,7 @@ import com.hupu.tv.player.app.ui.activity.LoginActivity
 import com.hupu.tv.player.app.ui.adapter.GiftAdapter
 import com.hupu.tv.player.app.ui.adapter.MatchLiveAdapter
 import com.hupu.tv.player.app.ui.adapter.NewSignAdapter
+import com.hupu.tv.player.app.widget.CustomWebView
 import com.hupu.tv.player.app.widget.customIm.CustomCircleImageView
 import org.greenrobot.eventbus.EventBus
 
@@ -440,9 +441,11 @@ object DialogUtils {
 
     fun showLoginAgreement(activity: AppCompatActivity?, title: String, content: String) {
         CustomDialog.show(activity, R.layout.dialog_login_agreement) { dialog, v ->
-//            setView(dialog)
             v.findViewById<TextView>(R.id.tv_title).text = title
-            v.findViewById<TextView>(R.id.tv_content).text = content
+            v.findViewById<CustomWebView>(R.id.custom_webView).apply {
+                setProgressBar(v.findViewById(R.id.mProgressBar))
+                customLoadUrl(content)
+            }
             v.findViewById<TextView>(R.id.tv_close).setOnClickListener { dialog.doDismiss() }
         }
 
@@ -472,9 +475,12 @@ object DialogUtils {
                     activity?.let {
                         tvAgreement.highlightColor = it.resources.getColor(R.color.transparent)
                     }
-
-                    llLogin.visibility = View.GONE
-                    rlUserAgreement.visibility = View.VISIBLE
+                    showLoginAgreement(
+                        activity, activity?.getString(R.string.string_user_agreement_title_user).orEmpty(),
+                        Constants.USER_AGREE
+                    )
+//                    llLogin.visibility = View.GONE
+//                    rlUserAgreement.visibility = View.VISIBLE
                 }
             }
 
@@ -483,8 +489,12 @@ object DialogUtils {
                     activity?.let {
                         tvAgreement.highlightColor = it.resources.getColor(R.color.transparent)
                     }
-                    llLogin.visibility = View.GONE
-                    rlUserPrivate.visibility = View.VISIBLE
+                    showLoginAgreement(
+                        activity, activity?.getString(R.string.string_user_agreement_title_private).orEmpty(),
+                        Constants.USER_PRIVATE
+                    )
+//                    llLogin.visibility = View.GONE
+//                    rlUserPrivate.visibility = View.VISIBLE
                 }
             }
 
@@ -550,19 +560,26 @@ object DialogUtils {
                     activity?.let {
                         tvAgreement.highlightColor = it.resources.getColor(R.color.transparent)
                     }
-
-                    llLogin.visibility = View.GONE
-                    rlUserAgreement.visibility = View.VISIBLE
+                    showLoginAgreement(
+                        activity, activity?.getString(R.string.string_user_agreement_title_user).orEmpty(),
+                        Constants.USER_AGREE
+                    )
+//                    llLogin.visibility = View.GONE
+//                    rlUserAgreement.visibility = View.VISIBLE
                 }
             }
-
             val twoSpan = object : ClickableSpan() {
                 override fun onClick(widget: View) {
                     activity?.let {
                         tvAgreement.highlightColor = it.resources.getColor(R.color.transparent)
                     }
-                    llLogin.visibility = View.GONE
-                    rlUserPrivate.visibility = View.VISIBLE
+                    showLoginAgreement(
+                        activity, activity?.getString(R.string.string_user_agreement_title_private).orEmpty(),
+                        Constants.USER_PRIVATE
+                    )
+//                    llLogin.visibility = View.GONE
+//                    rlUserPrivate.visibility = View.VISIBLE
+
                 }
             }
 

app/src/main/java/com/hupu/tv/player/app/utils/VersionControl.kt

@@ -11,21 +11,21 @@ import com.softgarden.baselibrary.utils.SPUtil
  *
  */
 object VersionControl {
-    private const val OFFICIAL_1 = "qj_01"
-    private const val OFFICIAL_2 = "qj_02"
-    private const val OFFICIAL_3 = "qj_03"
-    private const val exe6 = "qj_exe6"
-    private const val exe11 = "qj_exe11"
-    private const val OFFICIAL_1001 = "qj_1001"
-    private const val OFFICIAL_1002 = "qj_1002"
-    private const val OFFICIAL_1003 = "qj_1003"
-    private const val BAIDU = "qj_baidu"
-    private const val VIVO = "qj_vivo_01"
-    private const val HUAWEI = "qj_huawei_01"
-    private const val OPPO = "qj_oppo_01"
-    private const val MEIZU = "qj_meizu"
-    const val YINGYONGBAO = "qj_yingyongbao"
-    const val MUBAOTOUTIAO = "qj_mubaotoutiao"
+    private const val OFFICIAL_1 = "hd_01"
+    private const val OFFICIAL_2 = "hd_02"
+    private const val OFFICIAL_3 = "hd_03"
+    private const val exe6 = "hd_exe6"
+    private const val exe11 = "hd_exe11"
+    private const val OFFICIAL_1001 = "hd_1001"
+    private const val OFFICIAL_1002 = "hd_1002"
+    private const val OFFICIAL_1003 = "hd_1003"
+    private const val BAIDU = "hd_baidu"
+    private const val VIVO = "hd_vivo_01"
+    private const val HUAWEI = "hd_huawei_01"
+    private const val OPPO = "hd_oppo_01"
+    private const val MEIZU = "hd_meizu"
+    const val YINGYONGBAO = "hd_yingyongbao"
+    const val MUBAOTOUTIAO = "hd_mubaotoutiao"
 
 
     fun isShowLive(): Boolean {

app/src/main/java/com/hupu/tv/player/app/widget/danmuku/CustomChatPrimaryMenu.java

@@ -245,21 +245,25 @@ public class CustomChatPrimaryMenu extends RelativeLayout implements IChatPrimar
 //            ToastUtil.Companion.s("敏感词汇不能发送，请检查后重新发送");
 //            return;
 //        }
+        String msg = checkSend(message);
         if (listener != null) {
             editText.setText("");
-            listener.onSendBtnClicked(message);
+            listener.onSendBtnClicked(msg);
 
         }
     }
 
-//    private boolean checkSend(String content){
-//        String regex = (String) SPUtil.Companion.get(Constants.CONFIG_VALUE, "");
-//        Pattern pattern = Pattern.compile(regex);
-//        Matcher matcher = pattern.matcher(content);
-//        boolean matches =matcher.find();
-//        LogUtils.i("regex = "+regex + "input content = "+content+ "matches = "+matches );
-//        return matches;
-//    }
+    private String checkSend(String content){
+        String regex = (String) SPUtil.Companion.get(Constants.CONFIG_VALUE, "");
+        String[] split = regex.split(",");
+        for (String s : split) {
+            if (content.contains(s)){
+                String replace = content.replace(s, "***");
+                content = replace;
+            }
+        }
+        return content;
+    }
 
 
     @Override

app/src/main/res/layout/dialog_login_agreement.xml

@@ -6,17 +6,17 @@
     android:layout_height="match_parent"
     android:layout_gravity="center"
     android:orientation="vertical"
-    tools:background="@color/black">
+    >
 
     <androidx.cardview.widget.CardView
-        android:layout_width="300dp"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_360"
+        android:layout_height="match_parent"
         android:layout_gravity="center"
         android:layout_marginTop="@dimen/dp_23"
         android:layout_marginBottom="@dimen/dp_23"
         android:background="@color/white"
         android:gravity="center_horizontal"
-        android:minHeight="300dp"
+        android:minHeight="700dp"
         android:orientation="vertical"
         app:cardCornerRadius="@dimen/dp_8"
         app:cardPreventCornerOverlap="false"
@@ -28,7 +28,7 @@
             android:id="@+id/rl_user_agreement"
             android:orientation="vertical"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="match_parent">
             <TextView
                 android:id="@+id/tv_title"
                 android:gravity="center"
@@ -36,7 +36,7 @@
                 android:textColor="@color/white"
                 android:background="@color/main_select"
                 tools:text="用户协议"
-                android:textSize="@dimen/dp_16"
+                android:textSize="@dimen/sp_16"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"/>
 
@@ -48,23 +48,21 @@
                 android:id="@+id/tv_close"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"/>
-            <ScrollView
-                android:scrollbars="none"
+
+            <ProgressBar
                 android:layout_below="@id/tv_title"
-                android:paddingStart="@dimen/dp_15"
-                android:paddingEnd="@dimen/dp_15"
-                android:id="@+id/scroll_view"
+                android:id="@+id/mProgressBar"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <TextView
-                    android:textColor="@color/normal_text_3"
-                    android:id="@+id/tv_content"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    tools:text="@string/string_user_agreement" />
-            </ScrollView>
+                android:layout_height="2dp"
+                android:max="100"
+                android:visibility="gone" />
 
+            <com.hupu.tv.player.app.widget.CustomWebView
+                android:id="@+id/custom_webView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/mProgressBar" />
 
         </RelativeLayout>