diff --git a/app/build.gradle b/app/build.gradle
index c15a0e396f..85f38ff401 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -130,8 +130,14 @@ android {
             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,8 +152,14 @@ android {
             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}"
         }
     }
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index dc41930b04..2654133090 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -82,6 +82,7 @@
         android:largeHeap="true"
         android:resizeableActivity="true"
         android:theme="@style/AppCompatTheme.APP"
+        tools:replace="android:allowBackup"
         tools:targetApi="n">
 
         <!--android:launchMode = "singleTask"-->
@@ -518,6 +519,7 @@
         <activity
             android:name="com.gh.gamecenter.PushProxyActivity"
             android:exported="true"
+            android:launchMode="singleTask"
             android:theme="@android:style/Theme.Translucent" />
 
         <activity
@@ -580,7 +582,7 @@
         </receiver>
 
         <!--魅族push应用定义消息receiver声明 -->
-        <receiver android:name="com.gh.gamecenter.receiver.MeizuPushReceiver">
+        <receiver android:name="com.gh.gamecenter.receiver.UmengMeizuPushReceiver">
             <intent-filter>
                 <!-- 接收push消息 -->
                 <action android:name="com.meizu.flyme.push.intent.MESSAGE" />
@@ -605,7 +607,13 @@
             </intent-filter>
         </receiver>
 
-        <service android:name="com.gh.base.GHUmengNotificationService" />
+        <meta-data android:name="com.huawei.hms.client.appid" android:value="@string/huawei_push_appid"/>
+        <meta-data android:name="com.vivo.push.api_key" android:value="@string/vivo_push_service" />
+        <meta-data android:name="com.vivo.push.app_id" android:value="@string/vivo_push_id" />
+
+        <service
+            android:name="com.gh.base.GHUmengNotificationService"
+            android:permission="android.permission.BIND_JOB_SERVICE" />
 
         <!--<service android:name = "com.gh.gamecenter.statistics.AppStaticService" />-->
 
diff --git a/app/src/main/java/com/gh/common/PushManager.kt b/app/src/main/java/com/gh/common/PushManager.kt
index 2fabc99816..a70ae8ec15 100644
--- a/app/src/main/java/com/gh/common/PushManager.kt
+++ b/app/src/main/java/com/gh/common/PushManager.kt
@@ -22,6 +22,8 @@ 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
 
@@ -38,21 +40,18 @@ object PushManager {
     fun init(channel: String) {
         tryWithDefaultCatch {
             //初始化友盟推送
-            UMConfigure.init(mApplication,
-                    Config.UMENG_APPKEY, channel,
-                    UMConfigure.DEVICE_TYPE_PHONE,
-                    Config.UMENG_MESSAGE_SECRET)
+            UMConfigure.init(mApplication, Config.UMENG_APPKEY, channel, UMConfigure.DEVICE_TYPE_PHONE, Config.UMENG_MESSAGE_SECRET)
+
+            val pushAgent = PushAgent.getInstance(mApplication)
+
+            runOnIoThread { registerDevice() }
 
             // 注册小米、华为和魅族通道
             MiPushRegistar.register(mApplication, Config.MIPUSH_APPID, Config.MIPUSH_APPKEY)
             HuaWeiRegister.register(mApplication)
             MeizuRegister.register(mApplication, BuildConfig.MEIZUPUSH_APPID, BuildConfig.MEIZUPUSH_APPKEY)
-
-            //友盟推送
-            val pushAgent = PushAgent.getInstance(mApplication)
-
-            //注册推送服务，每次调用register方法都会回调该接口
-            runOnIoThread { registerDevice() }
+            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/app/src/main/java/com/gh/gamecenter/receiver/MeizuPushReceiver.kt b/app/src/main/java/com/gh/gamecenter/receiver/MeizuPushReceiver.kt
index c68e442ba3..021f47bd63 100644
--- a/app/src/main/java/com/gh/gamecenter/receiver/MeizuPushReceiver.kt
+++ b/app/src/main/java/com/gh/gamecenter/receiver/MeizuPushReceiver.kt
@@ -1,5 +1,5 @@
 package com.gh.gamecenter.receiver
 
-import com.umeng.message.meizu.UmengMeizuPushReceiver
+import org.android.agoo.mezu.MeizuPushReceiver
 
-class MeizuPushReceiver : UmengMeizuPushReceiver()
\ No newline at end of file
+class UmengMeizuPushReceiver : MeizuPushReceiver()
\ No newline at end of file
diff --git a/app/src/main/java/com/halo/assistant/HaloApp.java b/app/src/main/java/com/halo/assistant/HaloApp.java
index 21f359906d..5f0455665f 100644
--- a/app/src/main/java/com/halo/assistant/HaloApp.java
+++ b/app/src/main/java/com/halo/assistant/HaloApp.java
@@ -31,8 +31,8 @@ import com.gh.gamecenter.receiver.ActivitySkipReceiver;
 import com.gh.gamecenter.receiver.DownloadReceiver;
 import com.gh.gamecenter.receiver.InstallAndUninstallReceiver;
 import com.gh.gamecenter.receiver.InstallReceiver;
-import com.gh.gamecenter.receiver.MeizuPushReceiver;
 import com.gh.gamecenter.receiver.NetworkStateReceiver;
+import com.gh.gamecenter.receiver.UmengMeizuPushReceiver;
 import com.gh.gamecenter.receiver.UmengMessageReceiver;
 import com.gh.gamecenter.user.UserRepository;
 import com.gh.gid.GidHelper;
@@ -225,7 +225,7 @@ public class HaloApp extends TinkerAppLike {
         imFilter.addAction("action_finish");
         getApplication().registerReceiver(imReceiver, imFilter);
 
-        MeizuPushReceiver pushReceiver = new MeizuPushReceiver();
+        UmengMeizuPushReceiver pushReceiver = new UmengMeizuPushReceiver();
         IntentFilter pushFilter = new IntentFilter();
         pushFilter.addAction("com.meizu.flyme.push.intent.MESSAGE");
         pushFilter.addAction("com.meizu.flyme.push.intent.REGISTER.FEEDBACK");
diff --git a/build.gradle b/build.gradle
index 8348ff04e1..30c4b41873 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,6 +10,7 @@ buildscript {
         jcenter()
         maven { url 'https://jitpack.io' }
         maven { url "https://maven.google.com" }
+        maven { url 'https://dl.bintray.com/umsdk/release' }
         maven { url "https://dl.bintray.com/thelasterstar/maven/" } //weiboSDK
     }
 
@@ -40,6 +41,7 @@ allprojects {
         maven { url 'http://maven.aliyun.com/nexus/content/repositories/releases/' }
         maven { url  "http://dl.bintray.com/piasy/maven" }
         maven { url 'https://dl.bintray.com/guardian/android' }
+        maven { url 'https://dl.bintray.com/umsdk/release' }
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index ca55f90b82..9b24241fff 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,27 +20,38 @@ org.gradle.parallel=true
 # channel packages
 channel_file=channel.txt
 
-# Third-party keys
+# 测试环境的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=
 
+# 正式环境的KEY
 MIPUSH_APPID=2882303761517352993
 MIPUSH_APPKEY=5451735292993
+UMENG_APPKEY=585a29fa8f4a9d327600023e
+UMENG_MESSAGE_SECRET=8bcce6bed547ee624f5c2cc64d39a9e9
+MEIZUPUSH_APPID=1001212
+MEIZUPUSH_APPKEY=86792462189846c0b8b701e7bb4d11c1
+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
 TENCENT_APPID=1104659243
 MTA_APPKEY=APV567FTBS7J
 WEIBO_APPKEY=1723629218
-UMENG_APPKEY=585a29fa8f4a9d327600023e
-UMENG_MESSAGE_SECRET=8bcce6bed547ee624f5c2cc64d39a9e9
-MEIZUPUSH_APPID=1001212
-MEIZUPUSH_APPKEY=86792462189846c0b8b701e7bb4d11c1
 BUGLY_APPID=d5de44c594
 LETO_APPID=1001276
 TTAD_APPID=5065631
diff --git a/libraries/LGLibrary b/libraries/LGLibrary
index 2546c9162b..393e2e3230 160000
--- a/libraries/LGLibrary
+++ b/libraries/LGLibrary
@@ -1 +1 @@
-Subproject commit 2546c9162b748e9dd9da3e6c0689c6cbef501fff
+Subproject commit 393e2e32302aa26616f97cdd9b4ab814afee6abc
diff --git a/libraries/UmengPush/build.gradle b/libraries/UmengPush/build.gradle
index 8fc2902dec..08ba4076f7 100644
--- a/libraries/UmengPush/build.gradle
+++ b/libraries/UmengPush/build.gradle
@@ -3,20 +3,51 @@ apply plugin: 'com.android.library'
 dependencies {
     api fileTree(dir: 'libs', exclude: 'android-support-*.jar', include: '*.jar')
     api project(':libraries:LGLibrary')
-//    //PushSDK必须依赖基础组件库，所以需要加入对应依赖
-//    api 'com.umeng.sdk:common:1.5.3'
-//    //PushSDK必须依赖utdid库，所以需要加入对应依赖
-//    api 'com.umeng.sdk:utdid:1.1.5.3'
-//    //PushSDK
-//    api 'com.umeng.sdk:push:4.2.0'
 
-    api 'com.umeng.sdk:push-xiaomi:1.0.0'
-    api 'com.umeng.sdk:push-huawei:1.0.0'
-    api 'com.umeng.sdk:push-meizu:1.0.0'
+    //基础组件库依赖(必须) Push 605版本必须升级新版本Common SDK
+    api 'com.umeng.umsdk:common:2.2.2'
+    api 'com.umeng.umsdk:utdid:1.5.2'
+
+    //友盟push相关依赖(必须)
+    api 'com.umeng.umsdk:push:6.0.5'
+    api 'com.umeng.umsdk:alicloud-httpdns:1.2.5'
+    api 'com.umeng.umsdk:alicloud-utils:1.1.5'
+    api 'com.umeng.umsdk:alicloud_beacon:1.0.1'
+    api 'com.umeng.umsdk:agoo-accs:3.3.8.8-open-fix2'
+    api 'com.umeng.umsdk:agoo_networksdk:3.5.5'
+    api 'com.umeng.umsdk:agoo_tlog:3.0.0.17'
+    api 'com.umeng.umsdk:agoo_tnet4android:3.1.14.9'
+
+    // 小米
+    api 'com.umeng.umsdk:xiaomi-push:3.7.0'
+    api 'com.umeng.umsdk:xiaomi-umengaccs:1.1.4'
+
+    // 华为
+    api 'com.umeng.umsdk:huawei-basetb:2.6.3.306'
+    api 'com.umeng.umsdk:huawei-pushtb:2.6.3.306'
+    api 'com.umeng.umsdk:huawei-umengaccs:1.2.4'
+
+    // 魅族
+    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 {
     defaultConfig {
         consumerProguardFiles 'proguard-library.txt'
     }
+
+    sourceSets {
+        main {
+            jniLibs.srcDirs = ['libs']
+        }
+    }
 }
\ No newline at end of file
diff --git a/libraries/UmengPush/src/main/jniLibs/arm64-v8a/libcocklogic-1.1.3.so b/libraries/UmengPush/libs/arm64-v8a/libcocklogic-1.1.3.so
similarity index 100%
rename from libraries/UmengPush/src/main/jniLibs/arm64-v8a/libcocklogic-1.1.3.so
rename to libraries/UmengPush/libs/arm64-v8a/libcocklogic-1.1.3.so
diff --git a/libraries/UmengPush/libs/arm64-v8a/libtnet-3.1.14.so b/libraries/UmengPush/libs/arm64-v8a/libtnet-3.1.14.so
new file mode 100644
index 0000000000..a1561220f5
Binary files /dev/null and b/libraries/UmengPush/libs/arm64-v8a/libtnet-3.1.14.so differ
diff --git a/libraries/UmengPush/src/main/jniLibs/armeabi-v7a/libcocklogic-1.1.3.so b/libraries/UmengPush/libs/armeabi-v7a/libcocklogic-1.1.3.so
similarity index 100%
rename from libraries/UmengPush/src/main/jniLibs/armeabi-v7a/libcocklogic-1.1.3.so
rename to libraries/UmengPush/libs/armeabi-v7a/libcocklogic-1.1.3.so
diff --git a/libraries/UmengPush/libs/armeabi-v7a/libtnet-3.1.14.so b/libraries/UmengPush/libs/armeabi-v7a/libtnet-3.1.14.so
new file mode 100644
index 0000000000..3390a9c8e4
Binary files /dev/null and b/libraries/UmengPush/libs/armeabi-v7a/libtnet-3.1.14.so differ
diff --git a/libraries/UmengPush/src/main/jniLibs/armeabi/libcocklogic-1.1.3.so b/libraries/UmengPush/libs/armeabi/libcocklogic-1.1.3.so
similarity index 100%
rename from libraries/UmengPush/src/main/jniLibs/armeabi/libcocklogic-1.1.3.so
rename to libraries/UmengPush/libs/armeabi/libcocklogic-1.1.3.so
diff --git a/libraries/UmengPush/libs/armeabi/libtnet-3.1.14.so b/libraries/UmengPush/libs/armeabi/libtnet-3.1.14.so
new file mode 100644
index 0000000000..9750af66f0
Binary files /dev/null and b/libraries/UmengPush/libs/armeabi/libtnet-3.1.14.so differ
diff --git a/libraries/UmengPush/libs/umeng-common-1.5.3.jar b/libraries/UmengPush/libs/umeng-common-1.5.3.jar
deleted file mode 100644
index d3cd588467..0000000000
Binary files a/libraries/UmengPush/libs/umeng-common-1.5.3.jar and /dev/null differ
diff --git a/libraries/UmengPush/libs/umeng-push-4.2.0.jar b/libraries/UmengPush/libs/umeng-push-4.2.0.jar
deleted file mode 100644
index 22deeca15c..0000000000
Binary files a/libraries/UmengPush/libs/umeng-push-4.2.0.jar and /dev/null differ
diff --git a/libraries/UmengPush/libs/utdid4all-1.1.5.3_proguard.jar b/libraries/UmengPush/libs/utdid4all-1.1.5.3_proguard.jar
deleted file mode 100644
index 5eed5beed5..0000000000
Binary files a/libraries/UmengPush/libs/utdid4all-1.1.5.3_proguard.jar and /dev/null differ
diff --git a/libraries/UmengPush/src/main/jniLibs/x86/libcocklogic-1.1.3.so b/libraries/UmengPush/libs/x86/libcocklogic-1.1.3.so
similarity index 100%
rename from libraries/UmengPush/src/main/jniLibs/x86/libcocklogic-1.1.3.so
rename to libraries/UmengPush/libs/x86/libcocklogic-1.1.3.so
diff --git a/libraries/UmengPush/libs/x86/libtnet-3.1.14.so b/libraries/UmengPush/libs/x86/libtnet-3.1.14.so
new file mode 100644
index 0000000000..0a59fea81c
Binary files /dev/null and b/libraries/UmengPush/libs/x86/libtnet-3.1.14.so differ
diff --git a/libraries/UmengPush/libs/x86_64/libcocklogic-1.1.3.so b/libraries/UmengPush/libs/x86_64/libcocklogic-1.1.3.so
new file mode 100755
index 0000000000..390dae4d38
Binary files /dev/null and b/libraries/UmengPush/libs/x86_64/libcocklogic-1.1.3.so differ
diff --git a/libraries/UmengPush/libs/x86_64/libtnet-3.1.14.so b/libraries/UmengPush/libs/x86_64/libtnet-3.1.14.so
new file mode 100644
index 0000000000..0e940e69c8
Binary files /dev/null and b/libraries/UmengPush/libs/x86_64/libtnet-3.1.14.so differ
diff --git a/libraries/UmengPush/src/main/AndroidManifest.xml b/libraries/UmengPush/src/main/AndroidManifest.xml
index 4b25c1b1e1..44b41345e0 100644
--- a/libraries/UmengPush/src/main/AndroidManifest.xml
+++ b/libraries/UmengPush/src/main/AndroidManifest.xml
@@ -1,197 +1,166 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android = "http://schemas.android.com/apk/res/android"
-          package = "com.umeng.message.lib"
-          android:versionCode = "1"
-          android:versionName = "1.0" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.umeng.message.lib">
 
-	<permission android:name="${applicationId}.permission.MIPUSH_RECEIVE" android:protectionLevel="signatureOrSystem"/>
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.BROADCAST_PACKAGE_ADDED" />
+    <uses-permission android:name="android.permission.BROADCAST_PACKAGE_CHANGED" />
+    <uses-permission android:name="android.permission.BROADCAST_PACKAGE_INSTALL" />
+    <uses-permission android:name="android.permission.BROADCAST_PACKAGE_REPLACED" />
+    <uses-permission android:name="android.permission.GET_TASKS" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
-	<uses-permission android:name = "android.permission.INTERNET" />
-	<uses-permission android:name = "android.permission.ACCESS_NETWORK_STATE" />
-	<uses-permission android:name = "android.permission.ACCESS_WIFI_STATE" />
-	<uses-permission android:name = "android.permission.WRITE_EXTERNAL_STORAGE" />
-	<uses-permission android:name = "android.permission.WAKE_LOCK" />
-	<uses-permission android:name = "android.permission.READ_PHONE_STATE" />
-	<uses-permission android:name = "android.permission.BROADCAST_PACKAGE_ADDED" />
-	<uses-permission android:name = "android.permission.BROADCAST_PACKAGE_CHANGED" />
-	<uses-permission android:name = "android.permission.BROADCAST_PACKAGE_INSTALL" />
-	<uses-permission android:name = "android.permission.BROADCAST_PACKAGE_REPLACED" />
-	<uses-permission android:name = "android.permission.RESTART_PACKAGES" />
-	<uses-permission android:name = "android.permission.GET_TASKS" />
-	<uses-permission android:name = "android.permission.RECEIVE_BOOT_COMPLETED" />
-	<uses-permission android:name = "android.permission.CHANGE_NETWORK_STATE" />
-	<uses-permission android:name = "android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="${applicationId}.permission.MIPUSH_RECEIVE"/>
-
-	<application >
-
-		<service
-				android:name = "com.taobao.accs.ChannelService"
-				android:exported = "true"
-				android:process = ":channel" >
-			<intent-filter >
-				<action android:name = "com.taobao.accs.intent.action.SERVICE" />
-			</intent-filter >
-			<intent-filter >
-				<action android:name = "com.taobao.accs.intent.action.ELECTION" />
-			</intent-filter >
-		</service >
-
-		<service
-				android:name = "com.taobao.accs.data.MsgDistributeService"
-				android:exported = "true" >
-			<intent-filter >
-				<action android:name = "com.taobao.accs.intent.action.RECEIVE" />
-			</intent-filter >
-		</service >
-
-		<receiver
-				android:name = "com.taobao.accs.EventReceiver"
-				android:process = ":channel" >
-			<intent-filter >
-				<action android:name = "android.intent.action.BOOT_COMPLETED" />
-			</intent-filter >
-			<intent-filter >
-				<action android:name = "android.net.conn.CONNECTIVITY_CHANGE" />
-			</intent-filter >
-			<intent-filter >
-				<action android:name = "android.intent.action.PACKAGE_REMOVED" />
-				<data android:scheme = "package" />
-			</intent-filter >
-			<intent-filter >
-				<action android:name = "android.intent.action.USER_PRESENT" />
-			</intent-filter >
-		</receiver >
+    <application>
 
         <service
-            android:name = "com.taobao.accs.internal.AccsJobService"
-            android:permission = "android.permission.BIND_JOB_SERVICE"
-            android:process = ":channel" />
+            android:name="com.taobao.accs.ChannelService"
+            android:exported="true"
+            android:process=":channel">
+            <intent-filter>
+                <action android:name="com.taobao.accs.intent.action.SERVICE" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.taobao.accs.intent.action.ELECTION" />
+            </intent-filter>
+        </service>
 
-		<receiver
-				android:name = "com.taobao.accs.ServiceReceiver"
-				android:process = ":channel" >
-			<intent-filter >
-				<action android:name = "com.taobao.accs.intent.action.COMMAND" />
-			</intent-filter >
-			<intent-filter >
-				<action android:name = "com.taobao.accs.intent.action.START_FROM_AGOO" />
-			</intent-filter >
-		</receiver >
-
-		<service
-				android:name = "com.taobao.accs.ChannelService$KernelService"
-				android:process = ":channel" />
-
-		<service
-				android:name = "org.android.agoo.accs.AgooService"
-				android:exported = "true" >
-			<intent-filter >
-				<action android:name = "com.taobao.accs.intent.action.RECEIVE" />
-			</intent-filter >
-		</service >
-
-		<service
-				android:name = "com.umeng.message.UmengIntentService"
-				android:exported = "true"
-				android:process = ":channel" >
-			<intent-filter >
-				<action android:name = "org.agoo.android.intent.action.RECEIVE" />
-			</intent-filter >
-		</service >
-
-		<service
-				android:name = "com.umeng.message.XiaomiIntentService"
-				android:exported = "true"
-				android:process = ":channel" >
-			<intent-filter >
-				<action android:name = "org.agoo.android.intent.action.RECEIVE" />
-			</intent-filter >
-		</service >
-
-		<receiver
-				android:name = "com.taobao.agoo.AgooCommondReceiver"
-				android:exported = "true"
-				android:process = ":channel" >
-			<intent-filter >
-				<action android:name = "${applicationId}.intent.action.COMMAND" />
-			</intent-filter >
-			<intent-filter >
-				<action android:name = "android.intent.action.PACKAGE_REMOVED" />
-				<data android:scheme = "package" />
-			</intent-filter >
-		</receiver >
-
-		<service
-				android:name = "com.umeng.message.UmengMessageIntentReceiverService"
-				android:exported = "true"
-				android:process = ":channel" >
-			<intent-filter >
-				<action android:name = "org.android.agoo.client.MessageReceiverService" />
-			</intent-filter >
-		</service >
-
-		<receiver
-				android:name = "com.umeng.message.NotificationProxyBroadcastReceiver"
-				android:exported = "false" />
-
-		<service
-				android:name = "com.umeng.message.UmengMessageCallbackHandlerService"
-				android:exported = "false" >
-			<intent-filter >
-				<action android:name = "com.umeng.messge.registercallback.action" />
-			</intent-filter >
-			<intent-filter >
-				<action android:name = "com.umeng.message.enablecallback.action" />
-			</intent-filter >
-			<intent-filter >
-				<action android:name = "com.umeng.message.disablecallback.action" />
-			</intent-filter >
-			<intent-filter >
-				<action android:name = "com.umeng.message.message.handler.action" />
-			</intent-filter >
-		</service >
-
-		<service
-				android:name = "com.umeng.message.UmengDownloadResourceService"
-				android:exported = "false" />
-
-		<provider
-				android:name = "com.umeng.message.provider.MessageProvider"
-				android:authorities = "${applicationId}.umeng.message"
-				android:exported = "false" >
-			<grant-uri-permission android:pathPattern = ".*" />
-		</provider >
-
-        <!-- mipush -->
         <service
-            android:name = "com.xiaomi.mipush.sdk.PushMessageHandler"
-            android:enabled = "true"
-            android:exported = "true" />
-        <service
-            android:name = "com.xiaomi.mipush.sdk.MessageHandleService"
-            android:enabled = "true" />
+            android:name="com.taobao.accs.data.MsgDistributeService"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="com.taobao.accs.intent.action.RECEIVE" />
+            </intent-filter>
+        </service>
 
         <receiver
-            android:name = "org.android.agoo.xiaomi.MiPushBroadcastReceiver"
-            android:exported = "true" >
-            <intent-filter >
-                <action android:name = "com.xiaomi.mipush.RECEIVE_MESSAGE" />
-            </intent-filter >
-            <intent-filter >
-                <action android:name = "com.xiaomi.mipush.ERROR" />
-            </intent-filter >
-        </receiver >
+            android:name="com.taobao.accs.EventReceiver"
+            android:process=":channel">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.PACKAGE_REMOVED" />
+                <data android:scheme="package" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.USER_PRESENT" />
+            </intent-filter>
+        </receiver>
 
-        <!-- huawei push -->
-        <receiver android:name = "org.android.agoo.huawei.HuaWeiReceiver" >
-            <intent-filter >
-                <action android:name = "com.huawei.android.push.intent.REGISTRATION" />
-                <action android:name = "com.huawei.android.push.intent.RECEIVE" />
-                <action android:name = "com.huawei.intent.action.PUSH" />
-                <action android:name = "com.huawei.intent.action.PUSH_STATE" />
-            </intent-filter >
-        </receiver >
-	</application >
+        <receiver
+            android:name="com.taobao.accs.ServiceReceiver"
+            android:process=":channel">
+            <intent-filter>
+                <action android:name="com.taobao.accs.intent.action.COMMAND" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.taobao.accs.intent.action.START_FROM_AGOO" />
+            </intent-filter>
+        </receiver>
 
-</manifest >
+        <service
+            android:name="com.taobao.accs.internal.AccsJobService"
+            android:permission="android.permission.BIND_JOB_SERVICE"
+            android:process=":channel" />
+
+        <service
+            android:name="com.taobao.accs.ChannelService$KernelService"
+            android:process=":channel" />
+
+        <service
+            android:name="org.android.agoo.accs.AgooService"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="com.taobao.accs.intent.action.RECEIVE" />
+            </intent-filter>
+        </service>
+
+        <service
+            android:name="com.umeng.message.UmengIntentService"
+            android:exported="true"
+            android:process=":channel">
+            <intent-filter>
+                <action android:name="org.agoo.android.intent.action.RECEIVE" />
+            </intent-filter>
+        </service>
+
+        <service
+            android:name="com.umeng.message.XiaomiIntentService"
+            android:exported="true"
+            android:process=":channel">
+            <intent-filter>
+                <action android:name="org.agoo.android.intent.action.RECEIVE" />
+            </intent-filter>
+        </service>
+
+        <receiver
+            android:name="com.taobao.agoo.AgooCommondReceiver"
+            android:exported="true"
+            android:process=":channel">
+            <intent-filter>
+                <action android:name="${applicationId}.intent.action.COMMAND" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.PACKAGE_REMOVED" />
+                <data android:scheme="package" />
+            </intent-filter>
+        </receiver>
+
+        <service
+            android:name="com.umeng.message.UmengMessageIntentReceiverService"
+            android:exported="true"
+            android:process=":channel">
+            <intent-filter>
+                <action android:name="org.android.agoo.client.MessageReceiverService" />
+            </intent-filter>
+        </service>
+
+        <receiver
+            android:name="com.umeng.message.NotificationProxyBroadcastReceiver"
+            android:exported="false" />
+
+        <service
+            android:name="com.umeng.message.UmengMessageCallbackHandlerService"
+            android:exported="false"
+            android:permission="android.permission.BIND_JOB_SERVICE">
+            <intent-filter>
+                <action android:name="com.umeng.messge.registercallback.action" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.umeng.message.enablecallback.action" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.umeng.message.disablecallback.action" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.umeng.message.message.handler.action" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.umeng.message.message.sendmessage.action" />
+            </intent-filter>
+        </service>
+
+        <service
+            android:name="com.umeng.message.UmengDownloadResourceService"
+            android:exported="false"
+            android:permission="android.permission.BIND_JOB_SERVICE" />
+
+        <provider
+            android:name="com.umeng.message.provider.MessageProvider"
+            android:authorities="${applicationId}.umeng.message"
+            android:exported="false">
+            <grant-uri-permission android:pathPattern=".*" />
+        </provider>
+        <!-- 以下为基本配置信息，需要自行添加至您的AndroidManifest文件中 end-->
+
+    </application>
+
+</manifest>
diff --git a/libraries/UmengPush/src/main/jniLibs/arm64-v8a/libtnet-3.1.11.so b/libraries/UmengPush/src/main/jniLibs/arm64-v8a/libtnet-3.1.11.so
deleted file mode 100755
index c8a5db6b12..0000000000
Binary files a/libraries/UmengPush/src/main/jniLibs/arm64-v8a/libtnet-3.1.11.so and /dev/null differ
diff --git a/libraries/UmengPush/src/main/jniLibs/armeabi-v7a/libtnet-3.1.11.so b/libraries/UmengPush/src/main/jniLibs/armeabi-v7a/libtnet-3.1.11.so
deleted file mode 100755
index 5c1bbfeba1..0000000000
Binary files a/libraries/UmengPush/src/main/jniLibs/armeabi-v7a/libtnet-3.1.11.so and /dev/null differ
diff --git a/libraries/UmengPush/src/main/jniLibs/armeabi/libtnet-3.1.11.so b/libraries/UmengPush/src/main/jniLibs/armeabi/libtnet-3.1.11.so
deleted file mode 100755
index 64c082af03..0000000000
Binary files a/libraries/UmengPush/src/main/jniLibs/armeabi/libtnet-3.1.11.so and /dev/null differ
diff --git a/libraries/UmengPush/src/main/jniLibs/x86/libtnet-3.1.11.so b/libraries/UmengPush/src/main/jniLibs/x86/libtnet-3.1.11.so
deleted file mode 100755
index c65faf92a3..0000000000
Binary files a/libraries/UmengPush/src/main/jniLibs/x86/libtnet-3.1.11.so and /dev/null differ