tongtong/CubeAoleyunSN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version:2.2.6

Browse Source 
update:
fix:在线状态更新
add:增加清除极光别名过多
This commit is contained in:
fanhuitong
2021-09-17 18:26:42 +08:00
parent a318e07db9
commit 0c27e60b29
33 changed files with 1189 additions and 488 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
app/build.gradle
View File

@@ -41,47 +41,48 @@ android {
//新平台正式
newly {
flavorDimensions "default"
versionCode 623
versionCode 626
//versionCode 1037
versionName "2.2.3"
versionName "2.2.6"
/*********************************极光推送************************************/
manifestPlaceholders = [
JPUSH_PKGNAME: "com.jiaoguanyi.appstore",
JPUSH_APPKEY : "20f70bbeb78bad23eddd08d0", //JPush上注册的包名对应的appkey.
JPUSH_CHANNEL: "developer-default", //暂时填写默认值即可.
channel_value: "newly" ,
channel_value: "newly",
// AMAP_KEY: "546eb5646a65ac6a5b7d1c7456466e05"
]
/*********************************极光推送end************************************/
buildConfigField "String", "ROOT_URL", '"http://name.jiaoguanyi.cn/api/"'
buildConfigField "String", "WebsocketURL", '"ws://47.119.147.245:2345"'
// buildConfigField "String", "WebsocketURL", '"ws://47.119.147.245:2345"'
buildConfigField "String", "WebsocketURL", '"wss://name.jiaoguanyi.cn:2018"'
buildConfigField "String", "SCREEN_URL", '"https://name.jiaoguanyi.cn:2018/wm/is_online"'
}
MTKnewly {
flavorDimensions "default"
versionCode 717
versionCode 719
//versionCode 1037
versionName "2.1.7"
versionName "2.1.9"
/*********************************极光推送************************************/
manifestPlaceholders = [
JPUSH_PKGNAME: "com.jiaoguanyi.appstore",
JPUSH_APPKEY : "20f70bbeb78bad23eddd08d0", //JPush上注册的包名对应的appkey.
JPUSH_CHANNEL: "developer-default", //暂时填写默认值即可.
channel_value: "newly" ,
channel_value: "newly",
// AMAP_KEY: "546eb5646a65ac6a5b7d1c7456466e05"
]
/*********************************极光推送end************************************/
buildConfigField "String", "ROOT_URL", '"http://name.jiaoguanyi.cn/api/"'
buildConfigField "String", "WebsocketURL", '"ws://47.119.147.245:2345"'
buildConfigField "String", "WebsocketURL", '"wss://name.jiaoguanyi.cn:2018"'
buildConfigField "String", "SCREEN_URL", '"https://name.jiaoguanyi.cn:2018/wm/is_online"'
}
//新平台测试
beta {
flavorDimensions "default"
versionCode 2
versionName "1.1"
versionCode 4
versionName "1.3"
// versionCode 633
// versionName "2.2.3"
/*********************************极光推送************************************/
@@ -89,12 +90,12 @@ android {
JPUSH_PKGNAME: "com.jiaoguanyi.appstore",
JPUSH_APPKEY : "52d81643665bb2cadacf0e9e", //JPush上注册的包名对应的appkey.
JPUSH_CHANNEL: "developer-default", //暂时填写默认值即可.
channel_value: "beta" ,
channel_value: "beta",
// AMAP_KEY: "5b68c8ee39800ff700a3762b6e028b78"
]
/*********************************极光推送end************************************/
buildConfigField "String", "ROOT_URL", '"http://name.uiuios.com/api/"'
buildConfigField "String", "WebsocketURL", '"ws://39.108.116.195:2345"'
buildConfigField "String", "WebsocketURL", '"wss://name.uiuios.com:2018"'
buildConfigField "String", "SCREEN_URL", '"https://name.uiuios.com:2018/wm/is_online"'
versionNameSuffix "-beta"
}
@@ -185,16 +186,16 @@ android {
// Disable release builds for now
android.variantFilter { variant ->
if (variant.buildType.name.endsWith('zhanRuiRelease')) {
variant.setIgnore(variant.getFlavors().get(0).name.equals('official')||variant.getFlavors().get(0).name.equals('zhongyou'))
variant.setIgnore(variant.getFlavors().get(0).name.equals('official') || variant.getFlavors().get(0).name.equals('zhongyou'))
}
if (variant.buildType.name.endsWith('zhanRuiDebug')) {
variant.setIgnore(variant.getFlavors().get(0).name.equals('official')||variant.getFlavors().get(0).name.equals('zhongyou'))
variant.setIgnore(variant.getFlavors().get(0).name.equals('official') || variant.getFlavors().get(0).name.equals('zhongyou'))
}
if (name.contains("MTKnewly")){
variant.setIgnore(variant.buildType.name.endsWith("zhanRuiRelease")||variant.buildType.name.endsWith("zhanRuiDebug")||variant.buildType.name.endsWith("zhanRuiUserdebug")
||variant.buildType.name.endsWith("zhanRuiUserdebugReleas"))
if (name.contains("MTKnewly")) {
variant.setIgnore(variant.buildType.name.endsWith("zhanRuiRelease") || variant.buildType.name.endsWith("zhanRuiDebug") || variant.buildType.name.endsWith("zhanRuiUserdebug")
|| variant.buildType.name.endsWith("zhanRuiUserdebugReleas"))
}
if (name.endsWith("newlyDebug")||name.endsWith("newlyRelease")){
if (name.endsWith("newlyDebug") || name.endsWith("newlyRelease")) {
variant.setIgnore(!name.contains("MTK"))
}
@@ -297,10 +298,15 @@ android {
}
}
}
externalNativeBuild {
cmake {
path file('CMakeLists.txt')
}
}
}
dependencies {
//implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation fileTree(dir: "libs", include: ["*.jar"])
compileOnly files('src/main/libs/classes.jar')
implementation 'androidx.appcompat:appcompat:1.3.1'
@@ -336,7 +342,8 @@ dependencies {
//okhttp框架
implementation 'com.github.liujingxing.rxhttp:rxhttp:2.6.5'
//implementation 'com.squareup.okhttp3:okhttp:4.9.1' //rxhttp v2.2.2版本起，需要手动依赖okhttp
annotationProcessor 'com.github.liujingxing.rxhttp:rxhttp-compiler:2.6.5' //生成RxHttp类，纯Java项目，请使用annotationProcessor代替kapt
annotationProcessor 'com.github.liujingxing.rxhttp:rxhttp-compiler:2.6.5'
//生成RxHttp类，纯Java项目，请使用annotationProcessor代替kapt
implementation 'com.github.liujingxing.rxlife:rxlife-coroutine:2.1.0' //管理协程生命周期，页面销毁，关闭请求
//rxjava2 (RxJava2/Rxjava3二选一，使用asXxx方法时必须)
//implementation 'io.reactivex.rxjava2:rxjava:2.2.8'
@@ -350,6 +357,10 @@ dependencies {
implementation 'com.amap.api:location:5.1.0'
//压缩文件解压
implementation 'org.zeroturnaround:zt-zip:1.13'
//生命周期管理
implementation 'com.trello.rxlifecycle2:rxlifecycle:2.2.2'
implementation 'com.trello.rxlifecycle2:rxlifecycle-android:2.2.2'
implementation 'com.trello.rxlifecycle2:rxlifecycle-components:2.2.2'
}
preBuild {