Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
ShenghuoquanBusiness
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bp
ShenghuoquanBusiness
Commits
97a67642
Commit
97a67642
authored
Jul 14, 2021
by
yinjiacheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update XBrid版本升级更新platformId和环境配置
parent
44aad908
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
18 deletions
+18
-18
build.gradle
CommonLib/Common/build.gradle
+1
-1
AppConfig.kt
...onLib/Common/src/main/java/com/yidian/common/AppConfig.kt
+2
-1
build.gradle
app/build.gradle
+1
-1
YdSubwayApplication.kt
...ain/java/com/shenghuoquan/business/YdSubwayApplication.kt
+4
-5
config.gradle
config/config.gradle
+10
-10
No files found.
CommonLib/Common/build.gradle
View file @
97a67642
...
@@ -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
.
isApp
UpgradeOnline
)
buildConfigField
(
"boolean"
,
"IS_
UPGRADE_ONLINE"
,
rootProject
.
ext
.
android
.
is
UpgradeOnline
)
buildConfigField
(
"String"
,
"TOWER_API_ENV"
,
rootProject
.
ext
.
android
.
towerApiEnv
)
buildConfigField
(
"String"
,
"TOWER_API_ENV"
,
rootProject
.
ext
.
android
.
towerApiEnv
)
manifestPlaceholders
=
[
qqappid:
"101923771"
]
manifestPlaceholders
=
[
qqappid:
"101923771"
]
...
...
CommonLib/Common/src/main/java/com/yidian/common/AppConfig.kt
View file @
97a67642
...
@@ -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 通用配置模块
...
...
app/build.gradle
View file @
97a67642
...
@@ -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
.
isApp
UpgradeOnline
)
buildConfigField
(
"boolean"
,
"IS_
UPGRADE_ONLINE"
,
rootProject
.
ext
.
android
.
is
UpgradeOnline
)
testInstrumentationRunner
"androidx.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"androidx.test.runner.AndroidJUnitRunner"
manifestPlaceholders
=
[
qqappid:
"101923771"
]
manifestPlaceholders
=
[
qqappid:
"101923771"
]
...
...
app/src/main/java/com/shenghuoquan/business/YdSubwayApplication.kt
View file @
97a67642
...
@@ -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
.
TowerPro
AppUpgrade
PlatformId
// 平台Id
platform
=
AppConfig
.
TowerProPlatform
// ios/Android
platform
=
AppConfig
.
TowerProPlatform
// ios/Android
appId
=
packageName
// 应用包名
appId
=
packageName
// 应用包名
appVersion
=
AppConfig
.
cv
// 客户端版本号
appVersion
=
AppConfig
.
cv
// 客户端版本号
...
...
config/config.gradle
View file @
97a67642
...
@@ -6,10 +6,10 @@ ext {
...
@@ -6,10 +6,10 @@ ext {
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
,
is
AppUpgradeOnline:
'true'
,
// 上线前需要开启版本升级线上环境 true
is
UpgradeOnline
:
'true'
,
// 上线前需要开启版本升级线上环境 true 此开关同时影响app版本升级和xbrid版本升级
towerApiEnv
:
'"0"'
// Tower Api环境 0:测试环境 1:内网-正式环境 2:外网-正式环境 3:内网外网-正式环境
towerApiEnv
:
'"0"'
// Tower Api环境 0:测试环境 1:内网-正式环境 2:外网-正式环境 3:内网外网-正式环境
]
]
// 高德地图的key
// 高德地图的key
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment