diff --git a/app/build.gradle b/app/build.gradle
index b52a012..424665c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -51,8 +51,37 @@ android {
             enabled true
         }
 
+        sourceSets {
+            main {
+                jniLibs.srcDir(['libs'])
+            }
+        }
+
+        repositories {
+            flatDir {
+                dirs 'libs'
+            }
+        }
+
         buildConfigField "String", "QweatherId", "\"${qweatherConfigs.credential.id}\""
         buildConfigField "String", "QweatherKey", "\"${qweatherConfigs.credential.key}\""
+
+        manifestPlaceholders = [
+                JPUSH_PKGNAME : applicationId,
+                JPUSH_APPKEY  : "d779178d9900d4fb5d633678", //JPush 上注册的包名对应的 Appkey.
+                JPUSH_CHANNEL : "developer-default", //暂时填写默认值即可.
+                MEIZU_APPKEY  : "MZ-魅族的APPKEY",
+                MEIZU_APPID   : "MZ-魅族的APPID",
+                XIAOMI_APPID  : "小米的APPID",//JPush5.5.3开始，可以不添加MI-前缀.
+                XIAOMI_APPKEY : "小米的APPKEY",//JPush5.5.3开始，可以不添加MI-前缀.
+                OPPO_APPKEY   : "OP-oppo的APPKEY",
+                OPPO_APPID    : "OP-oppo的APPID",
+                OPPO_APPSECRET: "OP-oppo的APPSECRET",
+                VIVO_APPKEY   : "vivo的APPKEY",
+                VIVO_APPID    : "vivo的APPID",
+                HONOR_APPID   : "honor的APPID",
+                NIO_APPID     : "nio的APPID"
+        ]
     }
 
     signingConfigs {
@@ -69,9 +98,27 @@ android {
             keyAlias rootProject.ext.signingConfigs.crosshatch.keyAlias
             keyPassword rootProject.ext.signingConfigs.crosshatch.keyPassword
         }
+
+        zhanxun {
+            storeFile file(rootProject.ext.signingConfigs.zhanxun.storeFile)
+            storePassword rootProject.ext.signingConfigs.zhanxun.storePassword
+            keyAlias rootProject.ext.signingConfigs.zhanxun.keyAlias
+            keyPassword rootProject.ext.signingConfigs.zhanxun.keyPassword
+        }
     }
 
     buildTypes {
+        zhanRuiDebug.initWith(debug)
+        zhanRuiDebug {
+            debuggable true
+            signingConfig signingConfigs.zhanxun
+        }
+
+        zhanRuiRelease.initWith(release)
+        zhanRuiRelease {
+            signingConfig signingConfigs.zhanxun
+        }
+
         CrosshatchDebug.initWith(debug)
         CrosshatchDebug {
             debuggable true
@@ -82,6 +129,7 @@ android {
         CrosshatchRelease {
             signingConfig signingConfigs.crosshatch
         }
+
         debug {
             versionNameSuffix "_debug"
             debuggable true
@@ -122,6 +170,10 @@ android {
 
 }
 
+ext {
+    jpush = [version: "5.7.0"]
+}
+
 dependencies {
 //    implementation fileTree(dir: 'libs', include: ['*.jar'])
     //Android 4.4+
@@ -192,16 +244,59 @@ dependencies {
     //bugly
     implementation 'com.tencent.bugly:crashreport:4.1.9.3'
     implementation 'com.iqiyi.xcrash:xcrash-android-lib:3.0.0'
+
     // 替换成最新版本, 需要注意的是api
     // 要与compiler匹配使用，均使用最新版可以保证兼容
     implementation 'com.alibaba:arouter-api:1.5.2'
     annotationProcessor 'com.alibaba:arouter-compiler:1.5.2'
+
+    //推送
+    //阿里云
+    implementation 'com.aliyun.ams:alicloud-android-push:3.9.3'
+    //极光
+    // 此处以JPush 5.6.0 版本为例，注意：从 5.0.0 版本开始可以自动拉取 JCore 包，无需另外配置
+    implementation "cn.jiguang.sdk:jpush:$jpush.version"
+    //若不集成厂商通道，可直接跳过以下依赖
+    // 极光厂商插件版本与接入 JPush 版本保持一致，下同
+    // 接入华为厂商
+    implementation 'com.huawei.hms:push:6.13.0.300'
+    implementation "cn.jiguang.sdk.plugin:huawei:$jpush.version"
+    // 接入 FCM 厂商
+    implementation 'com.google.firebase:firebase-messaging:24.1.0'
+    implementation "cn.jiguang.sdk.plugin:fcm:$jpush.version"
+    // 接入魅族厂商
+    implementation "cn.jiguang.sdk.plugin:meizu:$jpush.version"
+    // JPush Android SDK v5.2.3 开始，需要单独引入 魅族 厂商 aar ，请下载官网 SDK 包并把 jpush-android-xxx-release/third-push/meizu/libs 下的 aar 文件单独拷贝一份到应用 module/libs 下
+    implementation(name: 'push-internal-5.0.5', ext: 'aar')
+    // 接入 VIVO 厂商
+    implementation "cn.jiguang.sdk.plugin:vivo:$jpush.version"
+    // 接入小米厂商
+    implementation "cn.jiguang.sdk.plugin:xiaomi:$jpush.version"
+    // 接入 OPPO 厂商
+    implementation "cn.jiguang.sdk.plugin:oppo:$jpush.version"
+    // JPush Android SDK v4.6.0 开始，需要单独引入 oppo 厂商 aar ，请下载官网 SDK 包并把 jpush-android-xxx-release/third-push/oppo/libs 下的 aar 文件单独拷贝一份到应用 module/libs 下
+    implementation(name: 'com.heytap.msp_V3.7.1', ext: 'aar')
+    //以下为 OPPO 3.1.0 aar需要依赖
+    implementation 'com.google.code.gson:gson:2.10.1'
+    implementation 'commons-codec:commons-codec:1.6'
+    implementation 'androidx.annotation:annotation:1.1.0'
+    // 接入荣耀厂商
+    implementation "cn.jiguang.sdk.plugin:honor:$jpush.version"
+    //需要单独引入荣耀厂商 aar ，请下载官网 SDK 包并把 jpush-android-xxx-release/third-push/honor/libs 下的 aar 文件单独拷贝一份到应用 module/libs 下
+    implementation(name: 'HiPushSDK-8.0.12.307', ext: 'aar')
+    // 接入蔚来厂商
+    implementation "cn.jiguang.sdk.plugin:nio:$jpush.version"
+    //JPush Android SDK v5.6.0 开始需要单独引入蔚来厂商 aar ，请下载官网 SDK 包并把 jpush-android-xxx-release/third-push/nio/libs 下的 aar 文件单独拷贝一份到应用 module/libs 下
+    implementation(name: 'niopush-sdk-v1.0', ext: 'aar')
+
+
     //地图组件
     implementation 'com.baidu.lbsyun:BaiduMapSDK_Map:7.6.4'
     //基础定位组件
     implementation 'com.baidu.lbsyun:BaiduMapSDK_Location:9.6.4'
     //全量定位组件
 //    implementation 'com.baidu.lbsyun:BaiduMapSDK_Location_All:9.6.4'
+
     //TTS组件
     implementation 'com.baidu.lbsyun:NaviTts:3.2.13'
 
diff --git a/app/libs/HiPushSDK-8.0.12.307.aar b/app/libs/HiPushSDK-8.0.12.307.aar
new file mode 100644
index 0000000..c6514d7
Binary files /dev/null and b/app/libs/HiPushSDK-8.0.12.307.aar differ
diff --git a/app/libs/com.heytap.msp_V3.7.1.aar b/app/libs/com.heytap.msp_V3.7.1.aar
new file mode 100644
index 0000000..b887595
Binary files /dev/null and b/app/libs/com.heytap.msp_V3.7.1.aar differ
diff --git a/app/libs/niopush-sdk-v1.0.aar b/app/libs/niopush-sdk-v1.0.aar
new file mode 100644
index 0000000..1fccd99
Binary files /dev/null and b/app/libs/niopush-sdk-v1.0.aar differ
diff --git a/app/libs/push-internal-5.0.5.aar b/app/libs/push-internal-5.0.5.aar
new file mode 100644
index 0000000..9cbf7bb
Binary files /dev/null and b/app/libs/push-internal-5.0.5.aar differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 03bf1ef..387fd91 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -38,6 +38,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
+
         <activity
             android:name=".activity.main.MainActivity"
             android:exported="true"
@@ -67,6 +68,20 @@
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
 
+        <service
+            android:name=".service.DialerAccessibilityService"
+            android:exported="true"
+            android:label="@string/accessibility_service_label"
+            android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
+            <!-- android:priority="10000" 可提高服务在设置中的权重，排在前面 -->
+            <intent-filter android:priority="10000">
+                <action android:name="android.accessibilityservice.AccessibilityService" />
+            </intent-filter>
+            <meta-data
+                android:name="android.accessibilityservice"
+                android:resource="@xml/accessibility_service_config" />
+        </service>
+
         <receiver
             android:name=".receiver.AppChangedReceiver"
             android:enabled="true"
@@ -94,19 +109,32 @@
             android:name="com.baidu.location.f"
             android:enabled="true"
             android:process=":remote" />
+
+        <!--(jpush|jad)_config_start，jpush和jad公用的组件-->
+        <!-- 可配置android:process参数将PushService放在其他进程中 -->
+        <!--User defined.  For test only 继承自cn.jpush.android.service.JCommonService-->
         <service
-            android:name=".service.DialerAccessibilityService"
-            android:exported="true"
-            android:label="@string/accessibility_service_label"
-            android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
-            <!-- android:priority="10000" 可提高服务在设置中的权重，排在前面 -->
-            <intent-filter android:priority="10000">
-                <action android:name="android.accessibilityservice.AccessibilityService" />
+            android:name=".push.jpush.JpushService"
+            android:enabled="true"
+            android:exported="false"
+            android:process=":pushcore">
+            <intent-filter>
+                <action android:name="cn.jiguang.user.service.action" />
             </intent-filter>
-            <meta-data
-                android:name="android.accessibilityservice"
-                android:resource="@xml/accessibility_service_config" />
         </service>
+        <!--(jpush|jad)_config_end-->
+
+
+        <!-- User defined.  For test only  用户自定义接收消息器,3.0.7开始支持,目前新tag/alias接口设置结果会在该广播接收器对应的方法中回调-->
+        <!--since 5.2.0 接收JPush相关事件-->
+        <receiver
+            android:name=".push.jpush.PushMessageService"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="cn.jpush.android.intent.SERVICE_MESSAGE" />
+                <category android:name="${applicationId}" />
+            </intent-filter>
+        </receiver>
 
         <meta-data
             android:name="com.baidu.lbsapi.API_KEY"
diff --git a/app/src/main/java/com/ttstd/dialer/base/BaseApplication.java b/app/src/main/java/com/ttstd/dialer/base/BaseApplication.java
index 82cf094..4063019 100644
--- a/app/src/main/java/com/ttstd/dialer/base/BaseApplication.java
+++ b/app/src/main/java/com/ttstd/dialer/base/BaseApplication.java
@@ -19,6 +19,10 @@ import com.ttstd.dialer.manager.AppManager;
 import com.ttstd.dialer.utils.SystemUtils;
 import com.ttstd.iconloader.IconCacheManager;
 
+import cn.jiguang.api.JCoreInterface;
+import cn.jiguang.api.utils.JCollectionAuth;
+import cn.jpush.android.api.JPushInterface;
+
 
 public class BaseApplication extends Application {
     private static final String TAG = "BaseApplication";
@@ -54,6 +58,26 @@ public class BaseApplication extends Application {
             String rootDir = MMKV.initialize(this);
             Log.e(TAG, "mmkv root: " + rootDir);
 
+            /*jpush start*/
+            JPushInterface.setDebugMode(true);
+            // 调整点一：调用启用推送业务功能代码前增加setAuth调用
+            boolean isPrivacyReady = true; // app根据是否已弹窗获取隐私授权来赋值
+            if (!isPrivacyReady) {
+                // JCore 5.0.4之前版本需要显式设置false
+                if (JCoreInterface.getJCoreSDKVersionInt() < 504) { // 5.0.4版本号对应504
+                    JCollectionAuth.setAuth(context, false);
+                }
+                // 所有版本在未授权时都不应初始化SDK
+                return;
+            }
+            JPushInterface.init(this);
+            JPushInterface.setAlias(this, );
+
+            // 调整点二：App用户同意了隐私政策授权，并且开发者确定要开启推送服务后调用
+            // JCore 5.0.4+会自动处理授权状态，可不需要显式设置true
+            JCollectionAuth.setAuth(context, true);
+            /*jpush end*/
+
             HeConfig.init(BuildConfig.QweatherId, BuildConfig.QweatherKey);
             //切换至免费订阅
             HeConfig.switchToDevService();
diff --git a/app/src/main/java/com/ttstd/dialer/push/jpush/JpushService.java b/app/src/main/java/com/ttstd/dialer/push/jpush/JpushService.java
new file mode 100644
index 0000000..5e9c66b
--- /dev/null
+++ b/app/src/main/java/com/ttstd/dialer/push/jpush/JpushService.java
@@ -0,0 +1,7 @@
+package com.ttstd.dialer.push.jpush;
+
+import cn.jpush.android.service.JCommonService;
+
+public class JpushService extends JCommonService {
+
+}
diff --git a/app/src/main/java/com/ttstd/dialer/push/jpush/PushMessageService.java b/app/src/main/java/com/ttstd/dialer/push/jpush/PushMessageService.java
new file mode 100644
index 0000000..4b7164d
--- /dev/null
+++ b/app/src/main/java/com/ttstd/dialer/push/jpush/PushMessageService.java
@@ -0,0 +1,20 @@
+package com.ttstd.dialer.push.jpush;
+
+import android.content.Context;
+
+import cn.jpush.android.api.CustomMessage;
+import cn.jpush.android.api.JPushMessage;
+import cn.jpush.android.service.JPushMessageReceiver;
+
+public class PushMessageService extends JPushMessageReceiver {
+
+    @Override
+    public void onMessage(Context context, CustomMessage customMessage) {
+        super.onMessage(context, customMessage);
+    }
+
+    @Override
+    public void onAliasOperatorResult(Context context, JPushMessage jPushMessage) {
+        super.onAliasOperatorResult(context, jPushMessage);
+    }
+}
diff --git a/build.gradle b/build.gradle
index 8d0ffcd..990efa5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,12 +2,13 @@
 apply from: "config.gradle"
 
 buildscript {
-    
+
     repositories {
         google()
 //        mavenCentral()
         maven { url "https://jitpack.io" }
         maven { url 'https://developer.huawei.com/repo/' }
+        maven { url "https://maven.google.com" }
         maven { url 'https://maven.aliyun.com/repository/central' }
         maven { url "https://maven.aliyun.com/repository/jcenter" }
         maven { url 'https://maven.aliyun.com/repository/public' }
@@ -15,7 +16,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.6.4'
-        
+
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -28,6 +29,7 @@ allprojects {
 //        mavenCentral()
         maven { url "https://jitpack.io" }
         maven { url 'https://developer.huawei.com/repo/' }
+        maven { url "https://maven.google.com" }
         maven { url 'https://maven.aliyun.com/repository/central' }
         maven { url "https://maven.aliyun.com/repository/jcenter" }
         maven { url 'https://maven.aliyun.com/repository/public' }
diff --git a/iconloader/build.gradle b/iconloader/build.gradle
index bff5da9..d6764d8 100644
--- a/iconloader/build.gradle
+++ b/iconloader/build.gradle
@@ -15,6 +15,8 @@ android {
     }
 
     buildTypes {
+        zhanRuiDebug {}
+        zhanRuiRelease {}
         CrosshatchDebug {}
         CrosshatchRelease {}
         debug {}
diff --git a/niceimageview/build.gradle b/niceimageview/build.gradle
index 7f768ff..ae03978 100644
--- a/niceimageview/build.gradle
+++ b/niceimageview/build.gradle
@@ -9,6 +9,8 @@ android {
     }
 
     buildTypes {
+        zhanRuiDebug {}
+        zhanRuiRelease {}
         CrosshatchDebug {}
         CrosshatchRelease {}
         debug {}