Commit 97a67642 authored by yinjiacheng's avatar yinjiacheng

update XBrid版本升级更新platformId和环境配置

parent 44aad908
...@@ -22,7 +22,7 @@ android { ...@@ -22,7 +22,7 @@ android {
buildConfigField("boolean", "IS_ENCRYPT", rootProject.ext.android.isEncrypt) buildConfigField("boolean", "IS_ENCRYPT", rootProject.ext.android.isEncrypt)
buildConfigField("boolean", "IS_UMENG_RELEASE", rootProject.ext.android.isUmengRelease) buildConfigField("boolean", "IS_UMENG_RELEASE", rootProject.ext.android.isUmengRelease)
buildConfigField("boolean", "IS_ENCRYPT_DEBUG_KEY", rootProject.ext.android.isEncryptDebugKey) buildConfigField("boolean", "IS_ENCRYPT_DEBUG_KEY", rootProject.ext.android.isEncryptDebugKey)
buildConfigField("boolean", "IS_APP_UPGRADE_ONLINE", rootProject.ext.android.isAppUpgradeOnline) buildConfigField("boolean", "IS_UPGRADE_ONLINE", rootProject.ext.android.isUpgradeOnline)
buildConfigField("String", "TOWER_API_ENV", rootProject.ext.android.towerApiEnv) buildConfigField("String", "TOWER_API_ENV", rootProject.ext.android.towerApiEnv)
manifestPlaceholders = [qqappid: "101923771"] manifestPlaceholders = [qqappid: "101923771"]
......
...@@ -26,7 +26,8 @@ class AppConfig { ...@@ -26,7 +26,8 @@ class AppConfig {
const val platform = "1" const val platform = "1"
// Tower Pro 动态下发管理 // Tower Pro 动态下发管理
const val TowerProPlatformId = 29 const val TowerProAppUpgradePlatformId = 29 // App版本升级
const val TowerProXBridUpgradePlatformId = 32 // XBrid版本升级
const val TowerProPlatform = "Android" const val TowerProPlatform = "Android"
// TowerPro 通用配置模块 // TowerPro 通用配置模块
......
...@@ -14,7 +14,7 @@ android { ...@@ -14,7 +14,7 @@ android {
versionCode rootProject.ext.android.versionCode versionCode rootProject.ext.android.versionCode
versionName rootProject.ext.android.versionName versionName rootProject.ext.android.versionName
buildConfigField("boolean", "IS_ENCRYPT_DEBUG_KEY", rootProject.ext.android.isEncryptDebugKey) buildConfigField("boolean", "IS_ENCRYPT_DEBUG_KEY", rootProject.ext.android.isEncryptDebugKey)
buildConfigField("boolean", "IS_APP_UPGRADE_ONLINE", rootProject.ext.android.isAppUpgradeOnline) buildConfigField("boolean", "IS_UPGRADE_ONLINE", rootProject.ext.android.isUpgradeOnline)
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
manifestPlaceholders = [qqappid: "101923771"] manifestPlaceholders = [qqappid: "101923771"]
......
...@@ -18,7 +18,6 @@ import com.yidian.common.services.ImageService ...@@ -18,7 +18,6 @@ import com.yidian.common.services.ImageService
import com.yidian.common.services.XEventService import com.yidian.common.services.XEventService
import com.yidian.common.services.XPageService import com.yidian.common.services.XPageService
import com.yidian.common.services.http.MBHttpReqService import com.yidian.common.services.http.MBHttpReqService
import com.yidian.common.utils.AppUtils
import com.yidian.common.utils.UMConfigUtils import com.yidian.common.utils.UMConfigUtils
import com.yidian.commonutil.CommonUtilLifecycleModule import com.yidian.commonutil.CommonUtilLifecycleModule
import com.yidian.framework.mobile.xdiamond.SecretUtil import com.yidian.framework.mobile.xdiamond.SecretUtil
...@@ -168,10 +167,10 @@ class YdSubwayApplication : YdBaseApplication() { ...@@ -168,10 +167,10 @@ class YdSubwayApplication : YdBaseApplication() {
private fun initXBridManager() { private fun initXBridManager() {
XBridManager.init( XBridManager.init(
XBridApp(applicationContext) { XBridApp(applicationContext) {
online = true // 线上、线下 online = BuildConfig.IS_UPGRADE_ONLINE // 线上、线下
assetRoot = "www/src"//对应assets目录下存放xbrid资源对应的目录名 assetRoot = "www/src"//对应assets目录下存放xbrid资源对应的目录名
appId = applicationContext.packageName //当前应用包名 appId = applicationContext.packageName //当前应用包名
platformId = 16 //需要去平台申请 platformId = AppConfig.TowerProXBridUpgradePlatformId //需要去平台申请
appVersion = AppConfig.cv//当前应用版本号 appVersion = AppConfig.cv//当前应用版本号
deviceFinger = FtDeviceFingerManager.getDeviceFinger()//设备指纹 deviceFinger = FtDeviceFingerManager.getDeviceFinger()//设备指纹
androidChannel = AppConfig.distribution//对应渠道名 androidChannel = AppConfig.distribution//对应渠道名
...@@ -239,8 +238,8 @@ class YdSubwayApplication : YdBaseApplication() { ...@@ -239,8 +238,8 @@ class YdSubwayApplication : YdBaseApplication() {
val logger = XLogger("appUpgrade") val logger = XLogger("appUpgrade")
logger.debugOn(BuildConfig.DEBUG) logger.debugOn(BuildConfig.DEBUG)
YDAppUpdateManager.init(PmUpdateApp(this) { YDAppUpdateManager.init(PmUpdateApp(this) {
online = BuildConfig.IS_APP_UPGRADE_ONLINE // 线上true、线下false online = BuildConfig.IS_UPGRADE_ONLINE // 线上true、线下false
platformId = AppConfig.TowerProPlatformId // 平台Id platformId = AppConfig.TowerProAppUpgradePlatformId // 平台Id
platform = AppConfig.TowerProPlatform // ios/Android platform = AppConfig.TowerProPlatform // ios/Android
appId = packageName // 应用包名 appId = packageName // 应用包名
appVersion = AppConfig.cv // 客户端版本号 appVersion = AppConfig.cv // 客户端版本号
......
ext { ext {
// ⚠️⚠️ 上线前需要注意修改以下配置项 // ⚠️⚠️ 上线前需要注意修改以下配置项
android = [ android = [
applicationId : "com.shenghuoquan.business", applicationId : "com.shenghuoquan.business",
versionCode : 100, versionCode : 100,
versionName : "1.0.0", versionName : "1.0.0",
serviceVersion : '"000100"', // 上线前需要和服务端确认并更新 serviceVersion : '"000100"', // 上线前需要和服务端确认并更新
isEncrypt : 'true', // 上线时改成true开启加密 isEncrypt : 'true', // 上线时改成true开启加密
isEncryptDebugKey : 'true', // 上线前需要使用正式加密key 置为false isEncryptDebugKey: 'true', // 上线前需要使用正式加密key 置为false
isUmengRelease : 'false', // 上线时改成true,使用上线版本的友盟配置 isUmengRelease : 'false', // 上线时改成true,使用上线版本的友盟配置
isApplication : false, isApplication : false,
isAppUpgradeOnline: 'true', // 上线前需要开启版本升级线上环境 true isUpgradeOnline : 'true', // 上线前需要开启版本升级线上环境 true 此开关同时影响app版本升级和xbrid版本升级
towerApiEnv : '"0"' // Tower Api环境 0:测试环境 1:内网-正式环境 2:外网-正式环境 3:内网外网-正式环境 towerApiEnv : '"0"' // Tower Api环境 0:测试环境 1:内网-正式环境 2:外网-正式环境 3:内网外网-正式环境
] ]
// 高德地图的key // 高德地图的key
amap = [ amap = [
......
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