1、增加马甲包

app/build.gradle

@@ -10,7 +10,6 @@ def releaseTime() {
 }
 
 
-
 android {
     compileSdkVersion config.compileSdkVersion
     defaultConfig {
@@ -43,54 +42,463 @@ android {
     flavorDimensions "version"
     productFlavors {
         qj_01 {
+            def myAppName = "球聚体育"
+            def myAppNamePY = "qiujutiyu"
             manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY          : "${myAppNamePY}",
                     API_CHANNEL_ID     : "0",
                     UMENG_CHANNEL_VALUE: "qj_01"
             ]
         }
         qj_02 {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "qj_02"]
+            def myAppName = "球聚体育"
+            def myAppNamePY = "qiujutiyu"
+            manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY          : "${myAppNamePY}",
+                    UMENG_CHANNEL_VALUE: "qj_02"]
         }
         qj_baidu {
+            def myAppName = "球聚体育"
+            def myAppNamePY = "qiujutiyu"
             manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY          : "${myAppNamePY}",
                     API_CHANNEL_ID     : "3",
                     UMENG_CHANNEL_VALUE: "qj_baidu"
             ]
         }
         qj_huawei_01 {
-
+            def myAppName = "球聚体育"
+            def myAppNamePY = "qiujutiyu"
             manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY          : "${myAppNamePY}",
                     API_CHANNEL_ID     : "4",
                     UMENG_CHANNEL_VALUE: "qj_huawei_01"
             ]
         }
         qj_xiaomi_01 {
+            def myAppName = "球聚体育"
+            def myAppNamePY = "qiujutiyu"
             manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY          : "${myAppNamePY}",
                     API_CHANNEL_ID     : "6",
                     UMENG_CHANNEL_VALUE: "qj_xiaomi_01"
             ]
         }
         qj_vivo_01 {
+            def myAppName = "球聚体育"
+            def myAppNamePY = "qiujutiyu"
             manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY          : "${myAppNamePY}",
                     API_CHANNEL_ID     : "7",
                     UMENG_CHANNEL_VALUE: "qj_vivo_01"
             ]
 
         }
         qj_oppo_01 {
+            def myAppName = "球聚体育"
+            def myAppNamePY = "qiujutiyu"
             manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY          : "${myAppNamePY}",
                     API_CHANNEL_ID     : "8",
                     UMENG_CHANNEL_VALUE: "qj_oppo_01"
             ]
 
         }
         qj_sanxing_01 {
+            def myAppName = "球聚体育"
+            def myAppNamePY = "qiujutiyu"
             manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY          : "${myAppNamePY}",
                     API_CHANNEL_ID     : "9",
                     UMENG_CHANNEL_VALUE: "qj_sanxing_01"
             ]
 
         }
+        qj_yuyan {
+            def myAppName = "雨燕直播"
+            def myAppNamePY = "yuyan"
+            manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY          : "${myAppNamePY}",
+                    API_CHANNEL_ID     : "10",
+                    UMENG_CHANNEL_VALUE: "third_yuyan"
+            ]
+
+        }
+        qj_jrs {
+            def myAppName = "JRS"
+            def myAppNamePY = "JRS"
+            manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY          : "${myAppNamePY}",
+                    API_CHANNEL_ID     : "10",
+                    UMENG_CHANNEL_VALUE: "third_jrs"
+            ]
+
+        }
+        qj_uu_qiu {
+            def myAppName = "UU球直播"
+            def myAppNamePY = "uuqiu"
+            manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY          : "${myAppNamePY}",
+                    API_CHANNEL_ID     : "10",
+                    UMENG_CHANNEL_VALUE: "third_uu_qiu"
+            ]
+
+        }
+
+        qj_lebo {
+            def myAppName = "乐博体育"
+            def myAppNamePY = "lebo"
+            manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY          : "${myAppNamePY}",
+                    API_CHANNEL_ID     : "10",
+                    UMENG_CHANNEL_VALUE: "third_lebo"
+            ]
+
+        }
+        qj_daishu {
+            def myAppName = "袋鼠直播"
+            def myAppNamePY = "daishu"
+            manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY          : "${myAppNamePY}",
+                    API_CHANNEL_ID     : "10",
+                    UMENG_CHANNEL_VALUE: "third_daishu"
+            ]
+
+        }
+
+        qj_guangqiujie {
+            def myAppName = "逛球街"
+            def myAppNamePY = "kuangqiujie"
+            manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY          : "${myAppNamePY}",
+                    API_CHANNEL_ID     : "10",
+                    UMENG_CHANNEL_VALUE: "third_kuangqiujie"
+            ]
+
+        }
+
+        qj_huanqiutiyu {
+            def myAppName = "环球体育"
+            def myAppNamePY = "huanqiu"
+            manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY          : "${myAppNamePY}",
+                    API_CHANNEL_ID     : "10",
+                    UMENG_CHANNEL_VALUE: "third_huanqiu"
+            ]
+
+        }
+
+        qj_jikezuqiu {
+            def myAppName = "即刻足球"
+            def myAppNamePY = "jike"
+            manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY          : "${myAppNamePY}",
+                    API_CHANNEL_ID     : "10",
+                    UMENG_CHANNEL_VALUE: "third_jike"
+            ]
+
+        }
+
+        qj_jiaoqiu {
+            def myAppName = "角球之家"
+            def myAppNamePY = "jike"
+            manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY          : "${myAppNamePY}",
+                    API_CHANNEL_ID     : "10",
+                    UMENG_CHANNEL_VALUE: "third_jiaoqiu"
+            ]
+
+        }
+
+        qj_kanqiubao {
+            def myAppName = "看球宝"
+            def myAppNamePY = "kanqiubao"
+            manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY          : "${myAppNamePY}",
+                    API_CHANNEL_ID     : "10",
+                    UMENG_CHANNEL_VALUE: "third_kanqiubao"
+            ]
+
+        }
+
+        qj_kanqiubao2 {
+            def myAppName = "看球宝"
+            def myAppNamePY = "kanqiubao2"
+            manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY          : "${myAppNamePY}",
+                    API_CHANNEL_ID     : "10",
+                    UMENG_CHANNEL_VALUE: "third_kanqiubao2"
+            ]
+
+        }
+
+        qj_lanjingtiyu {
+            def myAppName = "蓝鲸体育"
+            def myAppNamePY = "lanjing"
+            manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY          : "${myAppNamePY}",
+                    API_CHANNEL_ID     : "10",
+                    UMENG_CHANNEL_VALUE: "third_lanjing"
+            ]
+
+        }
+        qj_lanjian {
+            def myAppName = "篮箭比赛"
+            def myAppNamePY = "lanjian"
+            manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY          : "${myAppNamePY}",
+                    API_CHANNEL_ID     : "10",
+                    UMENG_CHANNEL_VALUE: "third_lanjian"
+            ]
+
+        }
+
+        qj_leisu {
+            def myAppName = "雷速体育直播"
+            def myAppNamePY = "lansu"
+            manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY          : "${myAppNamePY}",
+                    API_CHANNEL_ID     : "10",
+                    UMENG_CHANNEL_VALUE: "third_leisu"
+            ]
+
+        }
+
+        qj_qie {
+            def myAppName = "企鹅体育"
+            def myAppNamePY = "qie"
+            manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY          : "${myAppNamePY}",
+                    API_CHANNEL_ID     : "10",
+                    UMENG_CHANNEL_VALUE: "third_qie"
+            ]
+
+        }
+
+        qj_qiuhui {
+            def myAppName = "球会体育"
+            def myAppNamePY = "qiuhui"
+            manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY          : "${myAppNamePY}",
+                    API_CHANNEL_ID     : "10",
+                    UMENG_CHANNEL_VALUE: "third_qiuhui"
+            ]
+
+        }
+
+        qj_qiuke {
+            def myAppName = "球客体育"
+            def myAppNamePY = "qiuke"
+            manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY          : "${myAppNamePY}",
+                    API_CHANNEL_ID     : "10",
+                    UMENG_CHANNEL_VALUE: "third_qiuke"
+            ]
+
+        }
+
+        qj_renren {
+            def myAppName = "人人体育"
+            def myAppNamePY = "renren"
+            manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY          : "${myAppNamePY}",
+                    API_CHANNEL_ID     : "10",
+                    UMENG_CHANNEL_VALUE: "third_renren"
+            ]
+
+        }
+
+        qj_riqiu {
+            def myAppName = "日球体育"
+            def myAppNamePY = "riqiu"
+            manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY          : "${myAppNamePY}",
+                    API_CHANNEL_ID     : "10",
+                    UMENG_CHANNEL_VALUE: "third_riqiu"
+            ]
+
+        }
+
+        qj_woao {
+            def myAppName = "我奥篮球破解版"
+            def myAppNamePY = "woao"
+            manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY          : "${myAppNamePY}",
+                    API_CHANNEL_ID     : "10",
+                    UMENG_CHANNEL_VALUE: "third_woao"
+            ]
+
+        }
+        qj_wuxing {
+            def myAppName = "五星体育"
+            def myAppNamePY = "wuxing"
+            manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY          : "${myAppNamePY}",
+                    API_CHANNEL_ID     : "10",
+                    UMENG_CHANNEL_VALUE: "third_wuxing"
+            ]
+
+        }
+
+        qj_yingqiu {
+            def myAppName = "赢球大师"
+            def myAppNamePY = "yingqiu"
+            manifestPlaceholders = [
+                    myAppName          : "${myAppName}",
+                    myAppNamePY          : "${myAppNamePY}",
+                    API_CHANNEL_ID     : "10",
+                    UMENG_CHANNEL_VALUE: "third_yingqiu"
+            ]
+
+        }
+        
+    }
+    sourceSets {
+        main {
+            manifest.srcFile 'src/main/AndroidManifest.xml'
+            java.srcDirs = ['src/main/java']
+            resources.srcDirs = ['src/main/resources']
+            aidl.srcDirs = ['src/main/aidl']
+            renderscript.srcDirs = ['src/maom']
+            res.srcDirs = ['src/main/res']
+            assets.srcDirs = ['src/main/assets']
+            jniLibs.srcDirs = ['libs']
+        }
+
+        qj_yuyan {
+            res.srcDirs = ['src/main/X-YUYAN/res']
+        }
+
+        qj_jrs {
+            res.srcDirs = ['src/main/X-JRS/res']
+
+        }
+        qj_uu_qiu {
+            res.srcDirs = ['src/main/X-UUQIU/res']
+
+        }
+
+        qj_daishu {
+            res.srcDirs = ['src/main/X-DAISHU/res']
+
+        }
+        qj_lebo {
+            res.srcDirs = ['src/main/X-LEBO/res']
+
+        }
+
+        qj_guangqiujie {
+            res.srcDirs = ['src/main/X-GUANGQIUJIE/res']
+
+        }
+
+        qj_huanqiutiyu {
+            res.srcDirs = ['src/main/X-HUANQIU/res']
+
+        }
+
+        qj_jikezuqiu {
+            res.srcDirs = ['src/main/X-JIKE/res']
+
+        }
+
+        qj_jiaoqiu {
+            res.srcDirs = ['src/main/X-JIAOQIU/res']
+
+        }
+
+        qj_kanqiubao {
+            res.srcDirs = ['src/main/X-KANQIUBAO/res']
+
+        }
+
+        qj_kanqiubao2 {
+            res.srcDirs = ['src/main/X-KANQIUBAO2/res']
+
+        }
+
+        qj_lanjingtiyu {
+            res.srcDirs = ['src/main/X-LANJING/res']
+
+        }
+        qj_lanjian {
+            res.srcDirs = ['src/main/X-LANJIAN/res']
+
+        }
+
+        qj_leisu {
+            res.srcDirs = ['src/main/X-LEISU/res']
+
+        }
+
+        qj_qie {
+            res.srcDirs = ['src/main/X-QIE/res']
+
+        }
+
+        qj_qiuhui {
+            res.srcDirs = ['src/main/X-QIUHUI/res']
+
+        }
+
+        qj_qiuke {
+            res.srcDirs = ['src/main/X-QIUKE/res']
+
+        }
+
+        qj_renren {
+            res.srcDirs = ['src/main/X-RENREN/res']
+
+        }
+
+        qj_riqiu {
+            res.srcDirs = ['src/main/X-RIQIU/res']
+
+        }
+
+        qj_woao {
+            res.srcDirs = ['src/main/X-WOAO/res']
+
+        }
+        qj_wuxing {
+            res.srcDirs = ['src/main/X-WUXING/res']
+
+        }
+
+        qj_yingqiu {
+            res.srcDirs = ['src/main/X-YINGQIU/res']
+
+        }
+
     }
 
 

app/src/main/AndroidManifest.xml

@@ -50,11 +50,12 @@
         android:allowBackup="true"
         android:configChanges="locale|layoutDirection"
         android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
+        android:label="${myAppName}"
         android:networkSecurityConfig="@xml/android_p_network_security_config"
         android:requestLegacyExternalStorage="true"
         android:sharedUserId="android.uid.system"
         android:supportsRtl="true"
+        tools:replace="android:label"
         android:theme="@style/AppTheme">
 
 <!--        android:authorities="com.hslive.app.FileProvider"-->
@@ -84,6 +85,13 @@
             android:name="API_CHANNEL"
             android:value="${API_CHANNEL_ID}" />
 
+        <meta-data
+            android:name="APP_NAME"
+            android:value="${myAppName}" />
+        <meta-data
+            android:name="APP_NAME_PY"
+            android:value="${myAppNamePY}" />
+
         <!-- 声明SDK所需的service SDK核心功能-->
         <service
             android:name="com.hyphenate.chat.EMChatService"

app/src/main/java/com/hupu/tv/player/app/api/LoggingInterceptor.java

@@ -149,7 +149,8 @@ public class LoggingInterceptor implements Interceptor {
         Request.Builder builder = request.newBuilder();
         builder.addHeader(Constants.DEVICE_ID, (String) SPUtil.Companion.get(Constants.DEVICE_ID, ""));
         builder.addHeader(Constants.TOKEN, (String) SPUtil.Companion.get(Constants.TOKEN, ""));
-        builder.addHeader(Constants.API_CHANNEL, String.valueOf( ProductFlavors.INSTANCE.getAPIChannel(ProductFlavors.API_CHANNEL)));
+        builder.addHeader(Constants.API_CHANNEL, String.valueOf( ProductFlavors.INSTANCE.getInt(ProductFlavors.API_CHANNEL)));
+        builder.addHeader(Constants.APP_NAME,  (String) ProductFlavors.INSTANCE.getString(ProductFlavors.APP_NAME_PY));
         builder.header("Connection","close").header("Accept-Encoding", "identity");
         request = builder.build();
 

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

 package com.hupu.tv.player.app.api
 
-import com.hupu.tv.player.app.BuildConfig
 import com.softgarden.baselibrary.network.BaseBean
 import com.hupu.tv.player.app.bean.*
 import com.hupu.tv.player.app.utils.ProductFlavors
@@ -84,7 +83,7 @@ interface RetrofitService {/*@Field("is_new") int is_new*/
      * 获取首页banner
      */
     @POST(HostUrl.ADD_DOWNLOAD)
-    fun addDownNum(@Header("api-channel") umChannel: String = ProductFlavors.getChannelId(ProductFlavors.UM_CHANNEL_ID)): Observable<BaseBean<Any>>
+    fun addDownNum(@Header("api-channel") umChannel: String = ProductFlavors.getString(ProductFlavors.UM_CHANNEL_ID)): Observable<BaseBean<Any>>
 
     /**
      * 获取有料banner
@@ -155,7 +154,7 @@ interface RetrofitService {/*@Field("is_new") int is_new*/
     @POST(HostUrl.USER_REGISTER)
     fun register(
         @Body requestBody: RequestBody,
-        @Header("api-channel") umChannel: String = ProductFlavors.getChannelId(ProductFlavors.UM_CHANNEL_ID)
+        @Header("api-channel") umChannel: String = ProductFlavors.getString(ProductFlavors.UM_CHANNEL_ID)
     ): Observable<BaseBean<String>>
 
     /**

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

@@ -52,6 +52,9 @@ object Constants {
     //API_CHANNEL
     const val API_CHANNEL = "api-channel"
 
+    //API_CHANNEL
+    const val APP_NAME = "app_name"
+
     //分享码
     const val SHARE_CODE = "share_code"
 

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

@@ -8,6 +8,7 @@ import com.softgarden.baselibrary.base.IBaseDisplay
 import com.softgarden.baselibrary.base.IBasePresenter
 import com.hupu.tv.player.app.R
 import com.hupu.tv.player.app.base.RefreshActivity
+import com.hupu.tv.player.app.utils.ProductFlavors
 import kotlinx.android.synthetic.main.activity_about.*
 import kotlinx.android.synthetic.main.layout_title.*
 
@@ -31,6 +32,7 @@ class AboutActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay {
         iv_left_icon.setOnClickListener {
             finish()
         }
+        tv_name.text = ProductFlavors.getString(ProductFlavors.APP_NAME)
         tv_version.text = BuildConfig.VERSION_NAME
 
     }

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

@@ -16,11 +16,13 @@ object ProductFlavors {
     //这个常量值必须在 androidManifest配置后引用 productFlavors的才能用
     const val UM_CHANNEL_ID = "UMENG_CHANNEL"
     const val API_CHANNEL = "API_CHANNEL"
+    const val APP_NAME = "APP_NAME"
+    const val APP_NAME_PY = "APP_NAME_PY"
 
-    fun getChannelId(data: String): String {
+    fun getString(data: String): String {
         return getMetaDataStr(data)
     }
-    fun getAPIChannel(data: String): Int {
+    fun getInt(data: String): Int {
         return getMetaDataInt(data)
     }
 
@@ -30,7 +32,7 @@ object ProductFlavors {
 
     }
 
-    fun getMetaDataInt(key: String?): Int {
+    private  fun getMetaDataInt(key: String?): Int {
         return getAppInfoBundle()?.getInt(key) ?: 0
 
     }

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

@@ -13,6 +13,7 @@ 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_yuyan_01"
     private const val BAIDU = "qj_baidu"
     private const val VIVO = "qj_vivo_01"
     private const val HUAWEI = "qj_huawei_01"
@@ -25,8 +26,8 @@ object VersionControl {
 
     fun saveConfig(showConfig: Boolean) {
         when (BuildConfig.FLAVOR) {
-            OFFICIAL_1, OFFICIAL_2 -> SPUtil.put(Constants.SHOW_LIVE_CONFIG, true)
-            else -> SPUtil.put(Constants.SHOW_LIVE_CONFIG, showConfig)
+            BAIDU, VIVO, HUAWEI, OPPO -> SPUtil.put(Constants.SHOW_LIVE_CONFIG, showConfig)
+            else -> SPUtil.put(Constants.SHOW_LIVE_CONFIG, true)
         }
     }
 

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

@@ -25,7 +25,7 @@
         android:textSize="23dp"
         android:textColor="@color/black"
         android:textStyle="bold"
-        android:text="球聚体育"
+        tools:text="球聚体育"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 

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

@@ -301,7 +301,7 @@
                                 android:layout_gravity="center"
                                 android:layout_marginStart="@dimen/dp_11"
                                 android:layout_weight="1"
-                                android:text="举报"
+                                android:text="投诉"
                                 android:textColor="@color/color_333333"
                                 android:textSize="@dimen/dp_15" />