diff --git a/app/build.gradle b/app/build.gradle
index 85f38ff401..f7f14fa17e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -68,6 +68,11 @@ android {
buildConfigField "String", "LETO_APPID", "\"${LETO_APPID}\""
buildConfigField "String", "TTAD_APPID", "\"${TTAD_APPID}\""
+ buildConfigField "String", "MIPUSH_APPID", "\"${MIPUSH_APPID}\""
+ buildConfigField "String", "MIPUSH_APPKEY", "\"${MIPUSH_APPKEY}\""
+ buildConfigField "String", "MEIZUPUSH_APPID", "\"${MEIZUPUSH_APPID}\""
+ buildConfigField "String", "MEIZUPUSH_APPKEY", "\"${MEIZUPUSH_APPKEY}\""
+
/**
* Build Time 供区分 jenkins 打包时间用
*/
@@ -126,18 +131,7 @@ android {
buildConfigField "String", "UMENG_APPKEY", "\"${UMENG_APPKEY}\""
buildConfigField "String", "UMENG_MESSAGE_SECRET", "\"${UMENG_MESSAGE_SECRET}\""
- buildConfigField "String", "MIPUSH_APPID", "\"${MIPUSH_APPID}\""
- buildConfigField "String", "MIPUSH_APPKEY", "\"${MIPUSH_APPKEY}\""
- buildConfigField "String", "MEIZUPUSH_APPID", "\"${MEIZUPUSH_APPID}\""
- buildConfigField "String", "MEIZUPUSH_APPKEY", "\"${MEIZUPUSH_APPKEY}\""
- buildConfigField "String", "OPPOPUSH_APPKEY", "\"${OPPO_PUSH_APPKEY}\""
- buildConfigField "String", "OPPOPUSH_APPSERVICE", "\"${OPPO_PUSH_APP_SECRECT}\""
-
buildConfigField "String", "BUGLY_APPID", "\"${BUGLY_APPID}\""
-
- resValue "string", "vivo_push_id", "${VIVO_PUSH_APPID}"
- resValue "string", "vivo_push_service", "${VIVO_PUSH_APP_SECRECT}"
- resValue "string", "huawei_push_appid", "appid=${HUAWEI_PUSH_APPID}"
}
// internal test dev host
internal {
@@ -146,20 +140,9 @@ android {
buildConfigField "String", "API_HOST", "\"${DEV_API_HOST}\""
- buildConfigField "String", "UMENG_APPKEY", "\"${DEBUG_UMENG_APPKEY}\""
- buildConfigField "String", "UMENG_MESSAGE_SECRET", "\"${DEBUG_UMENG_MESSAGE_SECRET}\""
- buildConfigField "String", "MIPUSH_APPID", "\"${DEBUG_MIPUSH_APPID}\""
- buildConfigField "String", "MIPUSH_APPKEY", "\"${DEBUG_MIPUSH_APPKEY}\""
- buildConfigField "String", "MEIZUPUSH_APPID", "\"${DEBUG_MEIZUPUSH_APPID}\""
- buildConfigField "String", "MEIZUPUSH_APPKEY", "\"${DEBUG_MEIZUPUSH_APPKEY}\""
- buildConfigField "String", "OPPOPUSH_APPKEY", "\"${OPPO_PUSH_APPKEY}\""
- buildConfigField "String", "OPPOPUSH_APPSERVICE", "\"${OPPO_PUSH_APP_SECRECT}\""
-
- buildConfigField "String", "BUGLY_APPID", "\"${DEBUG_BUGLY_APPID}\""
-
- resValue "string", "vivo_push_id", "${DEBUG_VIVO_PUSH_APPID}"
- resValue "string", "vivo_push_service", "${DEBUG_VIVO_PUSH_APP_SECRECT}"
- resValue "string", "huawei_push_appid", "appid=${DEBUG_HUAWEI_PUSH_APPID}"
+ buildConfigField "String", "UMENG_APPKEY", "\"${DEV_UMENG_APPKEY}\""
+ buildConfigField "String", "UMENG_MESSAGE_SECRET", "\"${DEV_UMENG_MESSAGE_SECRET}\""
+ buildConfigField "String", "BUGLY_APPID", "\"${DEV_BUGLY_APPID}\""
}
}
}
@@ -183,7 +166,7 @@ rebuildChannel {
repositories {
flatDir {
- dirs 'libs','libs/aars'
+ dirs 'libs', 'libs/aars'
}
}
@@ -275,7 +258,7 @@ dependencies {
implementation "com.squareup.picasso:picasso:${picasso}"
// for video streaming
- implementation ("com.shuyu:gsyVideoPlayer-java:$gsyVideo",{
+ implementation("com.shuyu:gsyVideoPlayer-java:$gsyVideo", {
exclude module: "gsyvideoplayer-androidvideocache"
})
implementation "com.shuyu:GSYVideoPlayer-exo2:$gsyVideo"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2654133090..efa9acfe71 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -607,10 +607,6 @@
-
-
-
-
diff --git a/app/src/main/java/com/gh/common/PushManager.kt b/app/src/main/java/com/gh/common/PushManager.kt
index a70ae8ec15..3c70010565 100644
--- a/app/src/main/java/com/gh/common/PushManager.kt
+++ b/app/src/main/java/com/gh/common/PushManager.kt
@@ -22,8 +22,6 @@ import okhttp3.MediaType
import okhttp3.RequestBody
import org.android.agoo.huawei.HuaWeiRegister
import org.android.agoo.mezu.MeizuRegister
-import org.android.agoo.oppo.OppoRegister
-import org.android.agoo.vivo.VivoRegister
import org.android.agoo.xiaomi.MiPushRegistar
import org.json.JSONObject
@@ -50,8 +48,6 @@ object PushManager {
MiPushRegistar.register(mApplication, Config.MIPUSH_APPID, Config.MIPUSH_APPKEY)
HuaWeiRegister.register(mApplication)
MeizuRegister.register(mApplication, BuildConfig.MEIZUPUSH_APPID, BuildConfig.MEIZUPUSH_APPKEY)
- OppoRegister.register(mApplication, BuildConfig.OPPOPUSH_APPKEY, BuildConfig.OPPOPUSH_APPSERVICE)
- VivoRegister.register(mApplication)
val aliasInSp = PreferenceManager.getDefaultSharedPreferences(mApplication).getString(SP_PUSH_ALIAS, "")
mPreviousAlias = aliasInSp?.toObject()
diff --git a/gradle.properties b/gradle.properties
index 9b24241fff..13a927bd09 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,31 +21,18 @@ org.gradle.parallel=true
channel_file=channel.txt
# 测试环境的KEY(部分)
-DEBUG_UMENG_APPKEY=58e5b0b9c62dca35a00005e6
-DEBUG_UMENG_MESSAGE_SECRET=ca08596492f8a7fde2ab48dceab8c1f3
-DEBUG_MIPUSH_APPID=2882303761517564447
-DEBUG_MIPUSH_APPKEY=5761756481447
-DEBUG_HUAWEI_PUSH_APPID=100139697
-DEBUG_MEIZUPUSH_APPID=1001214
-DEBUG_MEIZUPUSH_APPKEY=844a28c566154306aef87aef95af3750
-DEBUG_BUGLY_APPID=43104840f8
-DEBUG_OPPO_PUSH_APPKEY=
-DEBUG_OPPO_PUSH_APP_SECRECT=
-DEBUG_VIVO_PUSH_APPID=
-DEBUG_VIVO_PUSH_APP_SECRECT=
+DEV_BUGLY_APPID=43104840f8
+DEV_UMENG_APPKEY=58e5b0b9c62dca35a00005e6
+DEV_UMENG_MESSAGE_SECRET=ca08596492f8a7fde2ab48dceab8c1f3
# 正式环境的KEY
MIPUSH_APPID=2882303761517352993
MIPUSH_APPKEY=5451735292993
UMENG_APPKEY=585a29fa8f4a9d327600023e
UMENG_MESSAGE_SECRET=8bcce6bed547ee624f5c2cc64d39a9e9
-MEIZUPUSH_APPID=1001212
-MEIZUPUSH_APPKEY=86792462189846c0b8b701e7bb4d11c1
+MEIZUPUSH_APPID=114752
+MEIZUPUSH_APPKEY=7cba83b9524a44239b3fca5c1ae8baed
HUAWEI_PUSH_APPID=100030919
-OPPO_PUSH_APPKEY=
-OPPO_PUSH_APP_SECRECT=
-VIVO_PUSH_APPID=
-VIVO_PUSH_APP_SECRECT=
WECHAT_APPID=wx3ffd0785fad18396
WECHAT_SECRET=368b49e8471857575a033b206218f9fb
TD_APPID=81DB144D555386A38A70B833537EC256
diff --git a/libraries/UmengPush/build.gradle b/libraries/UmengPush/build.gradle
index 08ba4076f7..6c9176cf75 100644
--- a/libraries/UmengPush/build.gradle
+++ b/libraries/UmengPush/build.gradle
@@ -30,14 +30,6 @@ dependencies {
// 魅族
api 'com.umeng.umsdk:meizu-push:3.8.7'
api 'com.umeng.umsdk:meizu-umengaccs:1.1.1'
-
- // OPPO
- api 'com.umeng.umsdk:oppo-push:2.0.2'
- api 'com.umeng.umsdk:oppo-umengaccs:1.0.6'
-
- // VIVO
- api 'com.umeng.umsdk:vivo-push:2.3.5'
- api 'com.umeng.umsdk:vivo-umengaccs:1.1.0'
}
android {