Commit 95814381 by Dell

1、增加马甲包

parent 8abb05b4
...@@ -50,11 +50,12 @@ ...@@ -50,11 +50,12 @@
android:allowBackup="true" android:allowBackup="true"
android:configChanges="locale|layoutDirection" android:configChanges="locale|layoutDirection"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="${myAppName}"
android:networkSecurityConfig="@xml/android_p_network_security_config" android:networkSecurityConfig="@xml/android_p_network_security_config"
android:requestLegacyExternalStorage="true" android:requestLegacyExternalStorage="true"
android:sharedUserId="android.uid.system" android:sharedUserId="android.uid.system"
android:supportsRtl="true" android:supportsRtl="true"
tools:replace="android:label"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme">
<!-- android:authorities="com.hslive.app.FileProvider"--> <!-- android:authorities="com.hslive.app.FileProvider"-->
...@@ -84,6 +85,13 @@ ...@@ -84,6 +85,13 @@
android:name="API_CHANNEL" android:name="API_CHANNEL"
android:value="${API_CHANNEL_ID}" /> 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核心功能--> <!-- 声明SDK所需的service SDK核心功能-->
<service <service
android:name="com.hyphenate.chat.EMChatService" android:name="com.hyphenate.chat.EMChatService"
......
...@@ -149,7 +149,8 @@ public class LoggingInterceptor implements Interceptor { ...@@ -149,7 +149,8 @@ public class LoggingInterceptor implements Interceptor {
Request.Builder builder = request.newBuilder(); Request.Builder builder = request.newBuilder();
builder.addHeader(Constants.DEVICE_ID, (String) SPUtil.Companion.get(Constants.DEVICE_ID, "")); 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.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"); builder.header("Connection","close").header("Accept-Encoding", "identity");
request = builder.build(); request = builder.build();
......
package com.hupu.tv.player.app.api package com.hupu.tv.player.app.api
import com.hupu.tv.player.app.BuildConfig
import com.softgarden.baselibrary.network.BaseBean import com.softgarden.baselibrary.network.BaseBean
import com.hupu.tv.player.app.bean.* import com.hupu.tv.player.app.bean.*
import com.hupu.tv.player.app.utils.ProductFlavors import com.hupu.tv.player.app.utils.ProductFlavors
...@@ -84,7 +83,7 @@ interface RetrofitService {/*@Field("is_new") int is_new*/ ...@@ -84,7 +83,7 @@ interface RetrofitService {/*@Field("is_new") int is_new*/
* 获取首页banner * 获取首页banner
*/ */
@POST(HostUrl.ADD_DOWNLOAD) @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 * 获取有料banner
...@@ -155,7 +154,7 @@ interface RetrofitService {/*@Field("is_new") int is_new*/ ...@@ -155,7 +154,7 @@ interface RetrofitService {/*@Field("is_new") int is_new*/
@POST(HostUrl.USER_REGISTER) @POST(HostUrl.USER_REGISTER)
fun register( fun register(
@Body requestBody: RequestBody, @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>> ): Observable<BaseBean<String>>
/** /**
......
...@@ -52,6 +52,9 @@ object Constants { ...@@ -52,6 +52,9 @@ object Constants {
//API_CHANNEL //API_CHANNEL
const val API_CHANNEL = "api-channel" const val API_CHANNEL = "api-channel"
//API_CHANNEL
const val APP_NAME = "app_name"
//分享码 //分享码
const val SHARE_CODE = "share_code" const val SHARE_CODE = "share_code"
......
...@@ -8,6 +8,7 @@ import com.softgarden.baselibrary.base.IBaseDisplay ...@@ -8,6 +8,7 @@ import com.softgarden.baselibrary.base.IBaseDisplay
import com.softgarden.baselibrary.base.IBasePresenter import com.softgarden.baselibrary.base.IBasePresenter
import com.hupu.tv.player.app.R import com.hupu.tv.player.app.R
import com.hupu.tv.player.app.base.RefreshActivity 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.activity_about.*
import kotlinx.android.synthetic.main.layout_title.* import kotlinx.android.synthetic.main.layout_title.*
...@@ -31,6 +32,7 @@ class AboutActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay { ...@@ -31,6 +32,7 @@ class AboutActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay {
iv_left_icon.setOnClickListener { iv_left_icon.setOnClickListener {
finish() finish()
} }
tv_name.text = ProductFlavors.getString(ProductFlavors.APP_NAME)
tv_version.text = BuildConfig.VERSION_NAME tv_version.text = BuildConfig.VERSION_NAME
} }
......
...@@ -16,11 +16,13 @@ object ProductFlavors { ...@@ -16,11 +16,13 @@ object ProductFlavors {
//这个常量值必须在 androidManifest配置后引用 productFlavors的才能用 //这个常量值必须在 androidManifest配置后引用 productFlavors的才能用
const val UM_CHANNEL_ID = "UMENG_CHANNEL" const val UM_CHANNEL_ID = "UMENG_CHANNEL"
const val API_CHANNEL = "API_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) return getMetaDataStr(data)
} }
fun getAPIChannel(data: String): Int { fun getInt(data: String): Int {
return getMetaDataInt(data) return getMetaDataInt(data)
} }
...@@ -30,7 +32,7 @@ object ProductFlavors { ...@@ -30,7 +32,7 @@ object ProductFlavors {
} }
fun getMetaDataInt(key: String?): Int { private fun getMetaDataInt(key: String?): Int {
return getAppInfoBundle()?.getInt(key) ?: 0 return getAppInfoBundle()?.getInt(key) ?: 0
} }
......
...@@ -13,6 +13,7 @@ import com.softgarden.baselibrary.utils.SPUtil ...@@ -13,6 +13,7 @@ import com.softgarden.baselibrary.utils.SPUtil
object VersionControl { object VersionControl {
private const val OFFICIAL_1 = "qj_01" private const val OFFICIAL_1 = "qj_01"
private const val OFFICIAL_2 = "qj_02" private const val OFFICIAL_2 = "qj_02"
private const val OFFICIAL_3 = "qj_yuyan_01"
private const val BAIDU = "qj_baidu" private const val BAIDU = "qj_baidu"
private const val VIVO = "qj_vivo_01" private const val VIVO = "qj_vivo_01"
private const val HUAWEI = "qj_huawei_01" private const val HUAWEI = "qj_huawei_01"
...@@ -25,8 +26,8 @@ object VersionControl { ...@@ -25,8 +26,8 @@ object VersionControl {
fun saveConfig(showConfig: Boolean) { fun saveConfig(showConfig: Boolean) {
when (BuildConfig.FLAVOR) { when (BuildConfig.FLAVOR) {
OFFICIAL_1, OFFICIAL_2 -> SPUtil.put(Constants.SHOW_LIVE_CONFIG, true) BAIDU, VIVO, HUAWEI, OPPO -> SPUtil.put(Constants.SHOW_LIVE_CONFIG, showConfig)
else -> SPUtil.put(Constants.SHOW_LIVE_CONFIG, showConfig) else -> SPUtil.put(Constants.SHOW_LIVE_CONFIG, true)
} }
} }
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
android:textSize="23dp" android:textSize="23dp"
android:textColor="@color/black" android:textColor="@color/black"
android:textStyle="bold" android:textStyle="bold"
android:text="球聚体育" tools:text="球聚体育"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
......
...@@ -301,7 +301,7 @@ ...@@ -301,7 +301,7 @@
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginStart="@dimen/dp_11" android:layout_marginStart="@dimen/dp_11"
android:layout_weight="1" android:layout_weight="1"
android:text="举报" android:text="投诉"
android:textColor="@color/color_333333" android:textColor="@color/color_333333"
android:textSize="@dimen/dp_15" /> android:textSize="@dimen/dp_15" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment