diff --git a/app/build.gradle b/app/build.gradle
index 7a05f97..e43bb9c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: "com.tencent.android.tpns"
 
 def appName() {
-    return "UIUIAppStore"
+    return "ZYAppStore"
 }
 
 def releaseTime() {
@@ -14,9 +14,11 @@ android {
     compileSdkVersion 29
     buildToolsVersion "29.0.3"
     defaultConfig {
-        applicationId "com.uiui.appstore"
+        applicationId "com.uiui.zyappstore"
         minSdkVersion 26
         targetSdkVersion 29
+        versionCode 2
+        versionName "1.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -41,99 +43,25 @@ android {
         checkReleaseBuilds false
     }
 
-    //多版本
-    productFlavors {
-        official {
-            flavorDimensions "default"
-            versionCode 74
-            versionName "8.3"
-        }
-    }
-
     //签名
     signingConfigs {
-        zhanRui {
-            storeFile file("keystore/zhanxun.keystore")
-            storePassword "123456"
-            keyAlias "zhanxun"
-            keyPassword "123456"
-            v1SigningEnabled true
-            v2SigningEnabled true
-        }
-
-        teclastuserdebug {
-            storeFile file("keystore/TeclastUserDebug.jks")
-            storePassword "123456"
-            keyAlias "teclast"
-            keyPassword "123456"
-            v1SigningEnabled true
-            v2SigningEnabled true
-        }
-
-        mtk {
-            storeFile file("keystore/xueshibaoos.jks")
-            storePassword "123456"
-            keyAlias "xueshibaoos"
-            keyPassword "123456"
-            v1SigningEnabled true
-            v2SigningEnabled true
-        }
-
         mtk12 {
-            storeFile file("keystore/mtkAndroid12.keystore")
+            storeFile file("keystore/TeclastMTK12.jks")
             storePassword "123456"
-            keyAlias "mtk12"
+            keyAlias "TeclastMTK12"
             keyPassword "123456"
-            v1SigningEnabled true
-            v2SigningEnabled true
+            v2SigningEnabled false
         }
     }
 
     buildTypes {
-        MTKAndroid12Release.initWith(release)
-        MTKAndroid12Release {
-            buildConfigField "String", "platform", '"MTK"'
-            signingConfig signingConfigs.mtk12
-        }
-
-        MTKAndroid12Debug.initWith(debug)
-        MTKAndroid12Debug {
-            buildConfigField "String", "platform", '"MTK"'
-            versionNameSuffix "-debug"
-            debuggable true
-            signingConfig signingConfigs.mtk12
-        }
-
-        zhanRuiRelease.initWith(release)
-        zhanRuiRelease {
-            buildConfigField "String", "platform", '"ZhanRui"'
-            signingConfig signingConfigs.zhanRui
-        }
-
-        zhanRuiDebug.initWith(debug)
-        zhanRuiDebug {
-            versionNameSuffix "-debug"
-            buildConfigField "String", "platform", '"ZhanRui"'
-            debuggable true
-            signingConfig signingConfigs.zhanRui
-        }
-
-        //userdebug rom使用这个版本
-        zhanRuiUserdebug.initWith(zhanRuiDebug)
-        zhanRuiUserdebug {
-            buildConfigField "String", "platform", '"ZhanRui"'
-            versionNameSuffix "-debug"
-            debuggable true
-            signingConfig signingConfigs.teclastuserdebug
-        }
-
         debug {
-            buildConfigField "String", "platform", '"MTK"'
+            buildConfigField "String", "platform", '"TeclastMTK12"'
             versionNameSuffix "-debug"
             minifyEnabled false
             //Zipalign优化
             zipAlignEnabled true
-            signingConfig signingConfigs.mtk
+            signingConfig signingConfigs.mtk12
             applicationVariants.all { variant ->
                 variant.outputs.each { output ->
                     if (outputFile != null) {
@@ -144,7 +72,7 @@ android {
             }
         }
         release {
-            buildConfigField "String", "platform", '"MTK"'
+            buildConfigField "String", "platform", '"TeclastMTK12"'
             //混淆
             minifyEnabled false
             //Zipalign优化
@@ -152,7 +80,7 @@ android {
             //前一部分代表系统默认的android程序的混淆文件，该文件已经包含了基本的混淆声明，后一个文件是自己的定义混淆文件
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             //签名
-            signingConfig signingConfigs.mtk
+            signingConfig signingConfigs.mtk12
 //            将release版本的包名重命名，加上版本及日期
             applicationVariants.all { variant ->
                 variant.outputs.each { output ->
@@ -222,6 +150,8 @@ dependencies {
     implementation 'com.tencent:mmkv-static:1.2.13'
     //腾讯移动推送 TPNS
     implementation 'com.tencent.tpns:tpns:1.3.2.0-release'
+    //阿里云推送
+    implementation 'com.aliyun.ams:alicloud-android-push:3.8.0'
     //banner图
     implementation 'com.zhpan.library:bannerview:2.6.4'
     //更换字体框架
@@ -230,4 +160,4 @@ dependencies {
     implementation 'com.blankj:utilcodex:1.31.1'
     //沉浸状态栏
     implementation 'com.gitee.zackratos:UltimateBarX:0.8.0'
-}
+}
\ No newline at end of file
diff --git a/app/keystore/TeclastMTK12.jks b/app/keystore/TeclastMTK12.jks
new file mode 100644
index 0000000..669cfa9
Binary files /dev/null and b/app/keystore/TeclastMTK12.jks differ
diff --git a/app/keystore/TeclastUserDebug.jks b/app/keystore/TeclastUserDebug.jks
deleted file mode 100644
index 072af4b..0000000
Binary files a/app/keystore/TeclastUserDebug.jks and /dev/null differ
diff --git a/app/keystore/mtkAndroid12.keystore b/app/keystore/mtkAndroid12.keystore
deleted file mode 100644
index 860f30f..0000000
Binary files a/app/keystore/mtkAndroid12.keystore and /dev/null differ
diff --git a/app/keystore/xueshibaoos.jks b/app/keystore/xueshibaoos.jks
deleted file mode 100644
index b94a626..0000000
Binary files a/app/keystore/xueshibaoos.jks and /dev/null differ
diff --git a/app/keystore/zhanxun.keystore b/app/keystore/zhanxun.keystore
deleted file mode 100644
index 7c46fbc..0000000
Binary files a/app/keystore/zhanxun.keystore and /dev/null differ
diff --git a/app/src/androidTest/java/com/uiui/appstore/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/uiui/zyappstore/ExampleInstrumentedTest.java
similarity index 86%
rename from app/src/androidTest/java/com/uiui/appstore/ExampleInstrumentedTest.java
rename to app/src/androidTest/java/com/uiui/zyappstore/ExampleInstrumentedTest.java
index f2c3712..8f6e653 100644
--- a/app/src/androidTest/java/com/uiui/appstore/ExampleInstrumentedTest.java
+++ b/app/src/androidTest/java/com/uiui/zyappstore/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore;
+package com.uiui.zyappstore;
 
 import android.content.Context;
 
@@ -22,6 +22,6 @@ public class ExampleInstrumentedTest {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
 
-        assertEquals("com.uiui.appstore", appContext.getPackageName());
+        assertEquals("com.uiui.zyappstore", appContext.getPackageName());
     }
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 592435f..ac92408 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.uiui.appstore"
+    package="com.uiui.zyappstore"
     android:sharedUserId="android.uid.system">
 
     <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
@@ -22,13 +22,13 @@
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="com.uiui.appstore.permission.JPUSH_MESSAGE" />
+    <uses-permission android:name="com.uiui.zyappstore.permission.JPUSH_MESSAGE" />
 
     <!-- 【必须】 移动推送 TPNS SDK VIP版本所需权限 -->
     <permission
-        android:name="com.uiui.appstore.permission.XGPUSH_RECEIVE"
+        android:name="com.uiui.zyappstore.permission.XGPUSH_RECEIVE"
         android:protectionLevel="signature" />
-    <uses-permission android:name="com.uiui.appstore.permission.XGPUSH_RECEIVE" />
+    <uses-permission android:name="com.uiui.zyappstore.permission.XGPUSH_RECEIVE" />
 
     <!-- 【必须】 移动推送 TPNS SDK 所需权限 -->
     <uses-permission android:name="android.permission.INTERNET" />
@@ -44,7 +44,7 @@
     <uses-permission android:name="android.permission.GET_TASKS" />
 
     <application
-        android:name=".base.BaseApplication"
+        android:name="com.uiui.zyappstore.base.BaseApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -53,11 +53,11 @@
         android:roundIcon="@mipmap/ic_launcher"
         android:supportsRtl="true"
         android:theme="@style/ImmerseTheme">
-        <activity android:name=".activity.ClassAppActivity" />
-        <activity android:name=".activity.MoreAppActivity" />
-        <activity android:name=".activity.ManagerAppActivity" />
+        <activity android:name="com.uiui.zyappstore.activity.ClassAppActivity" />
+        <activity android:name="com.uiui.zyappstore.activity.MoreAppActivity" />
+        <activity android:name="com.uiui.zyappstore.activity.ManagerAppActivity" />
         <activity
-            android:name=".activity.MainActivity"
+            android:name="com.uiui.zyappstore.activity.MainActivity"
             android:configChanges="keyboardHidden|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -66,50 +66,50 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".activity.PrivacyPolicyActivity"
+            android:name="com.uiui.zyappstore.activity.PrivacyPolicyActivity"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".activity.UserAgreementActivity"
+            android:name="com.uiui.zyappstore.activity.UserAgreementActivity"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".activity.CopyrightActivity"
+            android:name="com.uiui.zyappstore.activity.CopyrightActivity"
             android:screenOrientation="behind" />
         <activity
-            android:name=".activity.AboutActivity"
+            android:name="com.uiui.zyappstore.activity.AboutActivity"
             android:screenOrientation="behind" />
         <activity
-            android:name=".activity.SearcherActivity"
+            android:name="com.uiui.zyappstore.activity.SearcherActivity"
             android:screenOrientation="behind" />
         <activity
-            android:name=".activity.HintActivity"
+            android:name="com.uiui.zyappstore.activity.HintActivity"
             android:launchMode="singleTask"
             android:screenOrientation="sensor"
             android:theme="@style/activity_styles" />
         <activity
-            android:name=".activity.KindDetailActivity"
+            android:name="com.uiui.zyappstore.activity.KindDetailActivity"
             android:screenOrientation="behind" />
         <activity
-            android:name=".activity.DetailsActivity"
+            android:name="com.uiui.zyappstore.activity.DetailsActivity"
             android:screenOrientation="behind" />
         <activity
-            android:name=".activity.LocalManagerActivity"
+            android:name="com.uiui.zyappstore.activity.LocalManagerActivity"
             android:screenOrientation="behind" />
         <activity
-            android:name=".activity.DownloadManagerActivity"
+            android:name="com.uiui.zyappstore.activity.DownloadManagerActivity"
             android:screenOrientation="behind" />
 
-        <service android:name=".service.GuardService" />
-        <service android:name=".service.StepService" />
-        <service android:name=".service.MyDownloadService" />
+        <service android:name="com.uiui.zyappstore.service.GuardService" />
+        <service android:name="com.uiui.zyappstore.service.StepService" />
+        <service android:name="com.uiui.zyappstore.service.DownloadService" />
         <service
-            android:name=".service.main.MainService"
+            android:name="com.uiui.zyappstore.service.main.MainService"
             android:enabled="true"
             android:exported="true" />
 
         <receiver
-            android:name=".receiver.BootReceiver"
+            android:name="com.uiui.zyappstore.receiver.BootReceiver"
             android:enabled="true"
             android:exported="true">
             <intent-filter android:priority="1000">
@@ -117,7 +117,7 @@
             </intent-filter>
         </receiver>
         <receiver
-            android:name=".receiver.AppManagerReceiver"
+            android:name="com.uiui.zyappstore.receiver.AppManagerReceiver"
             android:enabled="true"
             android:exported="true"
             android:permission="com.example.broadcast.permission">
@@ -132,11 +132,11 @@
             </intent-filter>
         </receiver>
         <receiver
-            android:name=".receiver.InstallResultReceiver"
+            android:name="com.uiui.zyappstore.receiver.InstallResultReceiver"
             android:enabled="true"
             android:exported="true" />
         <receiver
-            android:name=".receiver.NewAppReceiver"
+            android:name="com.uiui.zyappstore.receiver.NewAppReceiver"
             android:enabled="true"
             android:exported="true"
             android:permission="com.example.broadcast.permission">
@@ -151,7 +151,7 @@
 
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="com.uiui.appstore.fileprovider"
+            android:authorities="com.uiui.zyappstore.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data
@@ -233,28 +233,28 @@
             android:exported="false">
             <intent-filter>
                 <!-- 【必须】请修改为当前APP名包.XGVIP_PUSH_ACTION -->
-                <action android:name="com.uiui.appstore.XGVIP_PUSH_ACTION" />
+                <action android:name="com.uiui.zyappstore.XGVIP_PUSH_ACTION" />
             </intent-filter>
         </service> <!-- 【必须】【注意】authorities 修改为包名.XGVIP_PUSH_AUTH -->
         <provider
             android:name="com.tencent.android.tpush.XGPushProvider"
-            android:authorities="com.uiui.appstore.XGVIP_PUSH_AUTH" />
+            android:authorities="com.uiui.zyappstore.XGVIP_PUSH_AUTH" />
 
         <!-- 【必须】【注意】authorities 修改为包名.TPUSH_PROVIDER -->
         <provider
             android:name="com.tencent.android.tpush.SettingsContentProvider"
-            android:authorities="com.uiui.appstore.TPUSH_PROVIDER" />
+            android:authorities="com.uiui.zyappstore.TPUSH_PROVIDER" />
 
         <!-- 【可选】用于增强保活能力 -->
         <provider
             android:name="com.tencent.android.tpush.XGVipPushKAProvider"
-            android:authorities="com.uiui.appstore.AUTH_XGPUSH_KEEPALIVE"
+            android:authorities="com.uiui.zyappstore.AUTH_XGPUSH_KEEPALIVE"
             android:exported="true"
             tools:replace="android:exported" />
 
         <!-- 【可选】APP实现的Receiver，用于接收消息透传和操作结果的回调，请根据需要添加 -->
         <!-- YOUR_PACKAGE_PATH.CustomPushReceiver需要改为自己的Receiver： -->
-        <receiver android:name=".tpush.MessageReceiver">
+        <receiver android:name="com.uiui.zyappstore.push.tpush.MessageReceiver">
             <intent-filter>
                 <!-- 接收消息透传 -->
                 <action android:name="com.tencent.android.xg.vip.action.PUSH_MESSAGE" />
@@ -271,10 +271,39 @@
 
         <provider
             android:name="com.tencent.tpns.baseapi.base.SettingsContentProvider"
-            android:authorities="com.uiui.appstore.XG_SETTINGS_PROVIDER"
+            android:authorities="com.uiui.zyappstore.XG_SETTINGS_PROVIDER"
             android:exported="false" />
         <!-- MQTT END -->
 
+        <!-- 消息接收监听器 （用户可自主扩展） -->
+        <receiver
+            android:name=".push.alipush.AliyunMessageReceiver"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.alibaba.push2.action.NOTIFICATION_OPENED" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.alibaba.push2.action.NOTIFICATION_REMOVED" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.alibaba.sdk.android.push.RECEIVE" />
+            </intent-filter>
+        </receiver>
+
+        <service
+            android:name=".push.alipush.AliMessageIntentService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.alibaba.push2.action.NOTIFICATION_OPENED" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.alibaba.push2.action.NOTIFICATION_REMOVED" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.alibaba.sdk.android.push.RECEIVE" />
+            </intent-filter>
+        </service>
+
         <!-- 【必须】 请修改为 APP 的 AccessId，“15”开头的10位数字，中间没空格 -->
         <meta-data
             android:name="XG_V2_ACCESS_ID"
@@ -283,6 +312,15 @@
         <meta-data
             android:name="XG_V2_ACCESS_KEY"
             android:value="A5QBQVQ7KLQD" />
+
+        <!-- 请填写你自己的- appKey -->
+        <meta-data
+            android:name="com.alibaba.app.appkey"
+            android:value="333816246" />
+        <!-- 请填写你自己的appSecret -->
+        <meta-data
+            android:name="com.alibaba.app.appsecret"
+            android:value="b8cdbee64b5a4d1a8e212924ee71b0d3" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/aidl/com/uiui/appstore/KeepAliveConnection.aidl b/app/src/main/aidl/com/uiui/zyappstore/KeepAliveConnection.aidl
similarity index 81%
rename from app/src/main/aidl/com/uiui/appstore/KeepAliveConnection.aidl
rename to app/src/main/aidl/com/uiui/zyappstore/KeepAliveConnection.aidl
index 0e34b5f..4196c03 100644
--- a/app/src/main/aidl/com/uiui/appstore/KeepAliveConnection.aidl
+++ b/app/src/main/aidl/com/uiui/zyappstore/KeepAliveConnection.aidl
@@ -1,5 +1,5 @@
 // KeepAliveConnection.aidl
-package com.uiui.appstore;
+package com.uiui.zyappstore;
 
 // Declare any non-default types here with import statements
 
diff --git a/app/src/main/java/com/uiui/appstore/base/BaseView.java b/app/src/main/java/com/uiui/appstore/base/BaseView.java
deleted file mode 100644
index 3238992..0000000
--- a/app/src/main/java/com/uiui/appstore/base/BaseView.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.uiui.appstore.base;
-
-public interface BaseView {
-}
diff --git a/app/src/main/java/com/uiui/appstore/TextCode/MessageWhat.java b/app/src/main/java/com/uiui/zyappstore/TextCode/MessageWhat.java
similarity index 66%
rename from app/src/main/java/com/uiui/appstore/TextCode/MessageWhat.java
rename to app/src/main/java/com/uiui/zyappstore/TextCode/MessageWhat.java
index 16b478c..6869135 100644
--- a/app/src/main/java/com/uiui/appstore/TextCode/MessageWhat.java
+++ b/app/src/main/java/com/uiui/zyappstore/TextCode/MessageWhat.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.TextCode;
+package com.uiui.zyappstore.TextCode;
 
 public class MessageWhat {
     public static int CODE_SUCCESSFUL = 200;
diff --git a/app/src/main/java/com/uiui/appstore/activity/AboutActivity.java b/app/src/main/java/com/uiui/zyappstore/activity/AboutActivity.java
similarity index 90%
rename from app/src/main/java/com/uiui/appstore/activity/AboutActivity.java
rename to app/src/main/java/com/uiui/zyappstore/activity/AboutActivity.java
index 8058453..c78fa74 100644
--- a/app/src/main/java/com/uiui/appstore/activity/AboutActivity.java
+++ b/app/src/main/java/com/uiui/zyappstore/activity/AboutActivity.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.activity;
+package com.uiui.zyappstore.activity;
 
 import android.content.Intent;
 import android.graphics.Paint;
@@ -6,9 +6,9 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.uiui.appstore.BuildConfig;
-import com.uiui.appstore.R;
-import com.uiui.appstore.base.BaseActivity;
+import com.uiui.zyappstore.BuildConfig;
+import com.uiui.zyappstore.R;
+import com.uiui.zyappstore.base.BaseActivity;
 
 public class AboutActivity extends BaseActivity {
     private ImageView iv_exit;
diff --git a/app/src/main/java/com/uiui/appstore/activity/ClassAppActivity.java b/app/src/main/java/com/uiui/zyappstore/activity/ClassAppActivity.java
similarity index 91%
rename from app/src/main/java/com/uiui/appstore/activity/ClassAppActivity.java
rename to app/src/main/java/com/uiui/zyappstore/activity/ClassAppActivity.java
index 333ebc8..357cdeb 100644
--- a/app/src/main/java/com/uiui/appstore/activity/ClassAppActivity.java
+++ b/app/src/main/java/com/uiui/zyappstore/activity/ClassAppActivity.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.activity;
+package com.uiui.zyappstore.activity;
 
 import android.content.Intent;
 import android.text.TextUtils;
@@ -10,13 +10,13 @@ import android.widget.TextView;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.uiui.appstore.R;
-import com.uiui.appstore.adapter.AppAdapter;
-import com.uiui.appstore.base.BaseActivity;
-import com.uiui.appstore.bean.AppInfo;
-import com.uiui.appstore.bean.BaseResponse;
-import com.uiui.appstore.common.CommonDatas;
-import com.uiui.appstore.network.NetInterfaceManager;
+import com.uiui.zyappstore.R;
+import com.uiui.zyappstore.adapter.AppAdapter;
+import com.uiui.zyappstore.base.BaseActivity;
+import com.uiui.zyappstore.bean.AppInfo;
+import com.uiui.zyappstore.bean.BaseResponse;
+import com.uiui.zyappstore.common.CommonDatas;
+import com.uiui.zyappstore.network.NetInterfaceManager;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/uiui/appstore/activity/CopyrightActivity.java b/app/src/main/java/com/uiui/zyappstore/activity/CopyrightActivity.java
similarity index 74%
rename from app/src/main/java/com/uiui/appstore/activity/CopyrightActivity.java
rename to app/src/main/java/com/uiui/zyappstore/activity/CopyrightActivity.java
index 4ac8458..16d7002 100644
--- a/app/src/main/java/com/uiui/appstore/activity/CopyrightActivity.java
+++ b/app/src/main/java/com/uiui/zyappstore/activity/CopyrightActivity.java
@@ -1,7 +1,7 @@
-package com.uiui.appstore.activity;
+package com.uiui.zyappstore.activity;
 
-import com.uiui.appstore.R;
-import com.uiui.appstore.base.BaseActivity;
+import com.uiui.zyappstore.R;
+import com.uiui.zyappstore.base.BaseActivity;
 
 public class CopyrightActivity extends BaseActivity {
 
diff --git a/app/src/main/java/com/uiui/appstore/activity/DetailsActivity.java b/app/src/main/java/com/uiui/zyappstore/activity/DetailsActivity.java
similarity index 94%
rename from app/src/main/java/com/uiui/appstore/activity/DetailsActivity.java
rename to app/src/main/java/com/uiui/zyappstore/activity/DetailsActivity.java
index 1cc6e0b..dda360e 100644
--- a/app/src/main/java/com/uiui/appstore/activity/DetailsActivity.java
+++ b/app/src/main/java/com/uiui/zyappstore/activity/DetailsActivity.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.activity;
+package com.uiui.zyappstore.activity;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -25,18 +25,18 @@ import com.bumptech.glide.Glide;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import com.uiui.appstore.R;
-import com.uiui.appstore.adapter.ImageAdapter;
-import com.uiui.appstore.base.BaseActivity;
-import com.uiui.appstore.bean.AppInfo;
-import com.uiui.appstore.bean.BaseResponse;
-import com.uiui.appstore.bean.GlideCircleWithBorder;
-import com.uiui.appstore.helper.CustomSnapHelper;
-import com.uiui.appstore.network.NetInterfaceManager;
-import com.uiui.appstore.utils.ApkUtils;
-import com.uiui.appstore.utils.FileUtils;
-import com.uiui.appstore.utils.StorageUtils;
-import com.uiui.appstore.utils.ToastUtil;
+import com.uiui.zyappstore.R;
+import com.uiui.zyappstore.adapter.ImageAdapter;
+import com.uiui.zyappstore.base.BaseActivity;
+import com.uiui.zyappstore.bean.AppInfo;
+import com.uiui.zyappstore.bean.BaseResponse;
+import com.uiui.zyappstore.bean.GlideCircleWithBorder;
+import com.uiui.zyappstore.helper.CustomSnapHelper;
+import com.uiui.zyappstore.network.NetInterfaceManager;
+import com.uiui.zyappstore.utils.ApkUtils;
+import com.uiui.zyappstore.utils.FileUtils;
+import com.uiui.zyappstore.utils.StorageUtils;
+import com.uiui.zyappstore.utils.ToastUtil;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -266,9 +266,9 @@ public class DetailsActivity extends BaseActivity {
         if (myReceiver == null) {
             myReceiver = new installReceiver();
             IntentFilter filter = new IntentFilter();
-            filter.addAction("com.uiui.appstore.PACKAGE_ADDED");
-            filter.addAction("com.uiui.appstore.PACKAGE_REPLACED");
-            filter.addAction("com.uiui.appstore.PACKAGE_REMOVED");
+            filter.addAction("com.uiui.zyappstore.PACKAGE_ADDED");
+            filter.addAction("com.uiui.zyappstore.PACKAGE_REPLACED");
+            filter.addAction("com.uiui.zyappstore.PACKAGE_REMOVED");
             filter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);
             registerReceiver(myReceiver, filter);
         }
@@ -349,7 +349,7 @@ public class DetailsActivity extends BaseActivity {
         public void onReceive(Context context, Intent intent) {
             String action = intent.getAction();
             //接收安装广播
-            if ("com.uiui.appstore.PACKAGE_ADDED".equals(action) || "com.uiui.appstore.PACKAGE_REPLACED".equals(action)) {
+            if ("com.uiui.zyappstore.PACKAGE_ADDED".equals(action) || "com.uiui.zyappstore.PACKAGE_REPLACED".equals(action)) {
                 String packageName = intent.getStringExtra("package");
                 if (packageName.equalsIgnoreCase(appInfo.getApp_package())) {
                     tv_download.setText("打开");
diff --git a/app/src/main/java/com/uiui/appstore/activity/DownloadManagerActivity.java b/app/src/main/java/com/uiui/zyappstore/activity/DownloadManagerActivity.java
similarity index 94%
rename from app/src/main/java/com/uiui/appstore/activity/DownloadManagerActivity.java
rename to app/src/main/java/com/uiui/zyappstore/activity/DownloadManagerActivity.java
index 9196551..7aff279 100644
--- a/app/src/main/java/com/uiui/appstore/activity/DownloadManagerActivity.java
+++ b/app/src/main/java/com/uiui/zyappstore/activity/DownloadManagerActivity.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.activity;
+package com.uiui.zyappstore.activity;
 
 import android.os.Handler;
 import android.os.Message;
@@ -9,9 +9,9 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.uiui.appstore.R;
-import com.uiui.appstore.adapter.DownloadManagerAdapter;
-import com.uiui.appstore.base.BaseActivity;
+import com.uiui.zyappstore.R;
+import com.uiui.zyappstore.adapter.DownloadManagerAdapter;
+import com.uiui.zyappstore.base.BaseActivity;
 
 public class DownloadManagerActivity extends BaseActivity /*implements XExecutor.OnAllTaskEndListener*/ {
     private RecyclerView recyclerView;
diff --git a/app/src/main/java/com/uiui/appstore/activity/HintActivity.java b/app/src/main/java/com/uiui/zyappstore/activity/HintActivity.java
similarity index 91%
rename from app/src/main/java/com/uiui/appstore/activity/HintActivity.java
rename to app/src/main/java/com/uiui/zyappstore/activity/HintActivity.java
index ba71753..4b3f4b5 100644
--- a/app/src/main/java/com/uiui/appstore/activity/HintActivity.java
+++ b/app/src/main/java/com/uiui/zyappstore/activity/HintActivity.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.activity;
+package com.uiui.zyappstore.activity;
 
 import android.content.Intent;
 import android.text.TextUtils;
@@ -9,9 +9,8 @@ import android.widget.TextView;
 
 import androidx.constraintlayout.widget.ConstraintLayout;
 
-import com.uiui.appstore.R;
-import com.uiui.appstore.base.BaseActivity;
-import com.uiui.appstore.utils.ApkUtils;
+import com.uiui.zyappstore.R;
+import com.uiui.zyappstore.base.BaseActivity;
 
 public class HintActivity extends BaseActivity {
     private ConstraintLayout root;
diff --git a/app/src/main/java/com/uiui/appstore/activity/KindDetailActivity.java b/app/src/main/java/com/uiui/zyappstore/activity/KindDetailActivity.java
similarity index 85%
rename from app/src/main/java/com/uiui/appstore/activity/KindDetailActivity.java
rename to app/src/main/java/com/uiui/zyappstore/activity/KindDetailActivity.java
index 1f64139..e8987c8 100644
--- a/app/src/main/java/com/uiui/appstore/activity/KindDetailActivity.java
+++ b/app/src/main/java/com/uiui/zyappstore/activity/KindDetailActivity.java
@@ -1,28 +1,21 @@
-package com.uiui.appstore.activity;
+package com.uiui.zyappstore.activity;
 
-import android.os.Handler;
-import android.os.Message;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.uiui.appstore.R;
-import com.uiui.appstore.adapter.AppAdapter;
-import com.uiui.appstore.base.BaseActivity;
-import com.uiui.appstore.base.RefreshManager;
-import com.uiui.appstore.bean.AppInfo;
-import com.uiui.appstore.utils.SPUtils;
+import com.uiui.zyappstore.R;
+import com.uiui.zyappstore.adapter.AppAdapter;
+import com.uiui.zyappstore.base.BaseActivity;
+import com.uiui.zyappstore.base.RefreshManager;
+import com.uiui.zyappstore.utils.SPUtils;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
 
-import java.util.ArrayList;
-import java.util.List;
-
 
 public class KindDetailActivity extends BaseActivity implements RefreshManager.RefreshInterface {
     private TextView title;
diff --git a/app/src/main/java/com/uiui/appstore/activity/LocalManagerActivity.java b/app/src/main/java/com/uiui/zyappstore/activity/LocalManagerActivity.java
similarity index 81%
rename from app/src/main/java/com/uiui/appstore/activity/LocalManagerActivity.java
rename to app/src/main/java/com/uiui/zyappstore/activity/LocalManagerActivity.java
index 01c4419..67477ef 100644
--- a/app/src/main/java/com/uiui/appstore/activity/LocalManagerActivity.java
+++ b/app/src/main/java/com/uiui/zyappstore/activity/LocalManagerActivity.java
@@ -1,30 +1,21 @@
-package com.uiui.appstore.activity;
+package com.uiui.zyappstore.activity;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.graphics.drawable.Drawable;
-import android.provider.Settings;
-import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 
-import com.uiui.appstore.R;
-import com.uiui.appstore.adapter.LocalAppAdapter;
-import com.uiui.appstore.base.BaseActivity;
-import com.uiui.appstore.base.RefreshManager;
-import com.uiui.appstore.bean.LocalApp;
-import com.uiui.appstore.utils.ApkUtils;
+import com.uiui.zyappstore.R;
+import com.uiui.zyappstore.adapter.LocalAppAdapter;
+import com.uiui.zyappstore.base.BaseActivity;
+import com.uiui.zyappstore.base.RefreshManager;
+import com.uiui.zyappstore.bean.LocalApp;
+import com.uiui.zyappstore.utils.ApkUtils;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/app/src/main/java/com/uiui/appstore/activity/MainActivity.java b/app/src/main/java/com/uiui/zyappstore/activity/MainActivity.java
similarity index 92%
rename from app/src/main/java/com/uiui/appstore/activity/MainActivity.java
rename to app/src/main/java/com/uiui/zyappstore/activity/MainActivity.java
index 7cb095e..cadedd0 100644
--- a/app/src/main/java/com/uiui/appstore/activity/MainActivity.java
+++ b/app/src/main/java/com/uiui/zyappstore/activity/MainActivity.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.activity;
+package com.uiui.zyappstore.activity;
 
 import android.content.Intent;
 import android.content.res.Configuration;
@@ -19,22 +19,21 @@ import com.flyco.tablayout.SlidingTabLayout;
 import com.hjq.permissions.OnPermission;
 import com.hjq.permissions.Permission;
 import com.hjq.permissions.XXPermissions;
-import com.uiui.appstore.R;
-import com.uiui.appstore.base.BaseActivity;
-import com.uiui.appstore.bean.AppInfo;
-import com.uiui.appstore.bean.BaseResponse;
-import com.uiui.appstore.bean.UserInfo;
-import com.uiui.appstore.fragment.FeaturedFragment;
-import com.uiui.appstore.fragment.ManageFragment;
-import com.uiui.appstore.network.NetInterfaceManager;
-import com.uiui.appstore.service.GuardService;
-import com.uiui.appstore.service.MyDownloadService;
-import com.uiui.appstore.service.StepService;
-import com.uiui.appstore.service.main.MainService;
-import com.uiui.appstore.utils.JGYUtils;
-import com.uiui.appstore.utils.SPUtils;
-import com.uiui.appstore.utils.ToastUtil;
-import com.uiui.appstore.utils.Utils;
+import com.uiui.zyappstore.R;
+import com.uiui.zyappstore.base.BaseActivity;
+import com.uiui.zyappstore.bean.AppInfo;
+import com.uiui.zyappstore.bean.BaseResponse;
+import com.uiui.zyappstore.bean.UserInfo;
+import com.uiui.zyappstore.fragment.FeaturedFragment;
+import com.uiui.zyappstore.network.NetInterfaceManager;
+import com.uiui.zyappstore.service.GuardService;
+import com.uiui.zyappstore.service.DownloadService;
+import com.uiui.zyappstore.service.StepService;
+import com.uiui.zyappstore.service.main.MainService;
+import com.uiui.zyappstore.utils.JGYUtils;
+import com.uiui.zyappstore.utils.SPUtils;
+import com.uiui.zyappstore.utils.ToastUtil;
+import com.uiui.zyappstore.utils.Utils;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -60,7 +59,7 @@ public class MainActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         Log.e(TAG, "onCreate");
-        startService(new Intent(MainActivity.this, MyDownloadService.class));
+        startService(new Intent(MainActivity.this, DownloadService.class));
         starService();
     }
 
@@ -68,7 +67,7 @@ public class MainActivity extends BaseActivity {
         startService(new Intent(this, GuardService.class));
         startService(new Intent(this, StepService.class));
         startService(new Intent(this, MainService.class));
-        startService(new Intent(this, MyDownloadService.class));
+        startService(new Intent(this, DownloadService.class));
     }
 
     @Override
diff --git a/app/src/main/java/com/uiui/appstore/activity/ManagerAppActivity.java b/app/src/main/java/com/uiui/zyappstore/activity/ManagerAppActivity.java
similarity index 81%
rename from app/src/main/java/com/uiui/appstore/activity/ManagerAppActivity.java
rename to app/src/main/java/com/uiui/zyappstore/activity/ManagerAppActivity.java
index acc2af4..c6befc6 100644
--- a/app/src/main/java/com/uiui/appstore/activity/ManagerAppActivity.java
+++ b/app/src/main/java/com/uiui/zyappstore/activity/ManagerAppActivity.java
@@ -1,9 +1,9 @@
-package com.uiui.appstore.activity;
+package com.uiui.zyappstore.activity;
 
 import android.view.View;
 
-import com.uiui.appstore.R;
-import com.uiui.appstore.base.BaseActivity;
+import com.uiui.zyappstore.R;
+import com.uiui.zyappstore.base.BaseActivity;
 
 import butterknife.ButterKnife;
 
diff --git a/app/src/main/java/com/uiui/appstore/activity/MoreAppActivity.java b/app/src/main/java/com/uiui/zyappstore/activity/MoreAppActivity.java
similarity index 92%
rename from app/src/main/java/com/uiui/appstore/activity/MoreAppActivity.java
rename to app/src/main/java/com/uiui/zyappstore/activity/MoreAppActivity.java
index 4e092cf..6e6dd86 100644
--- a/app/src/main/java/com/uiui/appstore/activity/MoreAppActivity.java
+++ b/app/src/main/java/com/uiui/zyappstore/activity/MoreAppActivity.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.activity;
+package com.uiui.zyappstore.activity;
 
 import android.content.Intent;
 import android.text.TextUtils;
@@ -10,14 +10,14 @@ import android.widget.TextView;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.uiui.appstore.R;
-import com.uiui.appstore.adapter.AppAdapter;
-import com.uiui.appstore.base.BaseActivity;
-import com.uiui.appstore.bean.AppInfo;
-import com.uiui.appstore.bean.BaseResponse;
-import com.uiui.appstore.common.CommonDatas;
-import com.uiui.appstore.fragment.FeaturedFragment;
-import com.uiui.appstore.network.NetInterfaceManager;
+import com.uiui.zyappstore.R;
+import com.uiui.zyappstore.adapter.AppAdapter;
+import com.uiui.zyappstore.base.BaseActivity;
+import com.uiui.zyappstore.bean.AppInfo;
+import com.uiui.zyappstore.bean.BaseResponse;
+import com.uiui.zyappstore.common.CommonDatas;
+import com.uiui.zyappstore.fragment.FeaturedFragment;
+import com.uiui.zyappstore.network.NetInterfaceManager;
 
 import java.util.Comparator;
 import java.util.List;
diff --git a/app/src/main/java/com/uiui/appstore/activity/PrivacyPolicyActivity.java b/app/src/main/java/com/uiui/zyappstore/activity/PrivacyPolicyActivity.java
similarity index 96%
rename from app/src/main/java/com/uiui/appstore/activity/PrivacyPolicyActivity.java
rename to app/src/main/java/com/uiui/zyappstore/activity/PrivacyPolicyActivity.java
index 494cdd8..3f2dcab 100644
--- a/app/src/main/java/com/uiui/appstore/activity/PrivacyPolicyActivity.java
+++ b/app/src/main/java/com/uiui/zyappstore/activity/PrivacyPolicyActivity.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.activity;
+package com.uiui.zyappstore.activity;
 
 import android.util.Log;
 import android.view.View;
@@ -6,8 +6,8 @@ import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.widget.TextView;
 
-import com.uiui.appstore.R;
-import com.uiui.appstore.base.BaseActivity;
+import com.uiui.zyappstore.R;
+import com.uiui.zyappstore.base.BaseActivity;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/app/src/main/java/com/uiui/appstore/activity/SearcherActivity.java b/app/src/main/java/com/uiui/zyappstore/activity/SearcherActivity.java
similarity index 95%
rename from app/src/main/java/com/uiui/appstore/activity/SearcherActivity.java
rename to app/src/main/java/com/uiui/zyappstore/activity/SearcherActivity.java
index bf6cbe7..274a155 100644
--- a/app/src/main/java/com/uiui/appstore/activity/SearcherActivity.java
+++ b/app/src/main/java/com/uiui/zyappstore/activity/SearcherActivity.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.activity;
+package com.uiui.zyappstore.activity;
 
 import android.provider.Settings;
 import android.text.TextUtils;
@@ -14,14 +14,13 @@ import android.widget.TextView;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.uiui.appstore.R;
-import com.uiui.appstore.adapter.AppAdapter;
-import com.uiui.appstore.base.BaseActivity;
-import com.uiui.appstore.bean.AppInfo;
-import com.uiui.appstore.bean.BaseResponse;
-import com.uiui.appstore.network.NetInterfaceManager;
-import com.uiui.appstore.utils.ToastUtil;
-import com.uiui.appstore.utils.Utils;
+import com.uiui.zyappstore.R;
+import com.uiui.zyappstore.adapter.AppAdapter;
+import com.uiui.zyappstore.base.BaseActivity;
+import com.uiui.zyappstore.bean.AppInfo;
+import com.uiui.zyappstore.bean.BaseResponse;
+import com.uiui.zyappstore.network.NetInterfaceManager;
+import com.uiui.zyappstore.utils.ToastUtil;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/com/uiui/appstore/activity/UserAgreementActivity.java b/app/src/main/java/com/uiui/zyappstore/activity/UserAgreementActivity.java
similarity index 96%
rename from app/src/main/java/com/uiui/appstore/activity/UserAgreementActivity.java
rename to app/src/main/java/com/uiui/zyappstore/activity/UserAgreementActivity.java
index b2e47de..01c50e0 100644
--- a/app/src/main/java/com/uiui/appstore/activity/UserAgreementActivity.java
+++ b/app/src/main/java/com/uiui/zyappstore/activity/UserAgreementActivity.java
@@ -1,12 +1,12 @@
-package com.uiui.appstore.activity;
+package com.uiui.zyappstore.activity;
 
 import android.util.Log;
 import android.view.View;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 
-import com.uiui.appstore.R;
-import com.uiui.appstore.base.BaseActivity;
+import com.uiui.zyappstore.R;
+import com.uiui.zyappstore.base.BaseActivity;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/app/src/main/java/com/uiui/appstore/adapter/AppAdapter.java b/app/src/main/java/com/uiui/zyappstore/adapter/AppAdapter.java
similarity index 96%
rename from app/src/main/java/com/uiui/appstore/adapter/AppAdapter.java
rename to app/src/main/java/com/uiui/zyappstore/adapter/AppAdapter.java
index 943b599..e33f5ce 100644
--- a/app/src/main/java/com/uiui/appstore/adapter/AppAdapter.java
+++ b/app/src/main/java/com/uiui/zyappstore/adapter/AppAdapter.java
@@ -1,8 +1,7 @@
-package com.uiui.appstore.adapter;
+package com.uiui.zyappstore.adapter;
 
 import android.content.Context;
 import android.content.Intent;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -22,14 +21,14 @@ import com.bumptech.glide.Glide;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import com.uiui.appstore.R;
-import com.uiui.appstore.activity.DetailsActivity;
-import com.uiui.appstore.bean.AppInfo;
-import com.uiui.appstore.bean.GlideCircleWithBorder;
-import com.uiui.appstore.utils.ApkUtils;
-import com.uiui.appstore.utils.FileUtils;
-import com.uiui.appstore.utils.StorageUtils;
-import com.uiui.appstore.utils.Utils;
+import com.uiui.zyappstore.R;
+import com.uiui.zyappstore.activity.DetailsActivity;
+import com.uiui.zyappstore.bean.AppInfo;
+import com.uiui.zyappstore.bean.GlideCircleWithBorder;
+import com.uiui.zyappstore.utils.ApkUtils;
+import com.uiui.zyappstore.utils.FileUtils;
+import com.uiui.zyappstore.utils.StorageUtils;
+import com.uiui.zyappstore.utils.Utils;
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/app/src/main/java/com/uiui/appstore/adapter/BannerViewHolder.java b/app/src/main/java/com/uiui/zyappstore/adapter/BannerViewHolder.java
similarity index 83%
rename from app/src/main/java/com/uiui/appstore/adapter/BannerViewHolder.java
rename to app/src/main/java/com/uiui/zyappstore/adapter/BannerViewHolder.java
index ee6e3f9..6e6fd20 100644
--- a/app/src/main/java/com/uiui/appstore/adapter/BannerViewHolder.java
+++ b/app/src/main/java/com/uiui/zyappstore/adapter/BannerViewHolder.java
@@ -1,9 +1,9 @@
-package com.uiui.appstore.adapter;
+package com.uiui.zyappstore.adapter;
 
 import android.view.View;
 
-import com.uiui.appstore.R;
-import com.uiui.appstore.view.CornerImageView;
+import com.uiui.zyappstore.R;
+import com.uiui.zyappstore.view.CornerImageView;
 import com.bumptech.glide.Glide;
 import com.zhpan.bannerview.holder.ViewHolder;
 
diff --git a/app/src/main/java/com/uiui/appstore/adapter/ClassAdapter.java b/app/src/main/java/com/uiui/zyappstore/adapter/ClassAdapter.java
similarity index 93%
rename from app/src/main/java/com/uiui/appstore/adapter/ClassAdapter.java
rename to app/src/main/java/com/uiui/zyappstore/adapter/ClassAdapter.java
index a8886c5..2d37c47 100644
--- a/app/src/main/java/com/uiui/appstore/adapter/ClassAdapter.java
+++ b/app/src/main/java/com/uiui/zyappstore/adapter/ClassAdapter.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.adapter;
+package com.uiui.zyappstore.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -10,8 +10,8 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.bumptech.glide.Glide;
-import com.uiui.appstore.R;
-import com.uiui.appstore.bean.AppClassBean;
+import com.uiui.zyappstore.R;
+import com.uiui.zyappstore.bean.AppClassBean;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/uiui/appstore/adapter/DownloadManagerAdapter.java b/app/src/main/java/com/uiui/zyappstore/adapter/DownloadManagerAdapter.java
similarity index 98%
rename from app/src/main/java/com/uiui/appstore/adapter/DownloadManagerAdapter.java
rename to app/src/main/java/com/uiui/zyappstore/adapter/DownloadManagerAdapter.java
index a5a5932..35341a8 100644
--- a/app/src/main/java/com/uiui/appstore/adapter/DownloadManagerAdapter.java
+++ b/app/src/main/java/com/uiui/zyappstore/adapter/DownloadManagerAdapter.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.adapter;
+package com.uiui.zyappstore.adapter;
 
 import android.content.Context;
 import android.os.Handler;
@@ -20,10 +20,10 @@ import com.arialyy.aria.core.task.DownloadTask;
 import com.bumptech.glide.Glide;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import com.uiui.appstore.R;
-import com.uiui.appstore.bean.GlideCircleWithBorder;
-import com.uiui.appstore.utils.FileUtils;
-import com.uiui.appstore.view.NumberProgressBar;
+import com.uiui.zyappstore.R;
+import com.uiui.zyappstore.bean.GlideCircleWithBorder;
+import com.uiui.zyappstore.utils.FileUtils;
+import com.uiui.zyappstore.view.NumberProgressBar;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/uiui/appstore/adapter/ImageAdapter.java b/app/src/main/java/com/uiui/zyappstore/adapter/ImageAdapter.java
similarity index 95%
rename from app/src/main/java/com/uiui/appstore/adapter/ImageAdapter.java
rename to app/src/main/java/com/uiui/zyappstore/adapter/ImageAdapter.java
index 6542e7a..2c743a4 100644
--- a/app/src/main/java/com/uiui/appstore/adapter/ImageAdapter.java
+++ b/app/src/main/java/com/uiui/zyappstore/adapter/ImageAdapter.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.adapter;
+package com.uiui.zyappstore.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -8,7 +8,7 @@ import android.widget.ImageView;
 
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.uiui.appstore.R;
+import com.uiui.zyappstore.R;
 import com.bumptech.glide.Glide;
 
 import org.jetbrains.annotations.NotNull;
diff --git a/app/src/main/java/com/uiui/appstore/adapter/KindAdapter.java b/app/src/main/java/com/uiui/zyappstore/adapter/KindAdapter.java
similarity index 95%
rename from app/src/main/java/com/uiui/appstore/adapter/KindAdapter.java
rename to app/src/main/java/com/uiui/zyappstore/adapter/KindAdapter.java
index e8cb905..a7fa334 100644
--- a/app/src/main/java/com/uiui/appstore/adapter/KindAdapter.java
+++ b/app/src/main/java/com/uiui/zyappstore/adapter/KindAdapter.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.adapter;
+package com.uiui.zyappstore.adapter;
 
 import android.content.Context;
 import android.content.Intent;
@@ -11,9 +11,9 @@ import android.widget.TextView;
 
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.uiui.appstore.R;
-import com.uiui.appstore.activity.KindDetailActivity;
-import com.uiui.appstore.bean.Kind;
+import com.uiui.zyappstore.R;
+import com.uiui.zyappstore.activity.KindDetailActivity;
+import com.uiui.zyappstore.bean.Kind;
 import com.bumptech.glide.Glide;
 
 import java.util.List;
diff --git a/app/src/main/java/com/uiui/appstore/adapter/LocalAppAdapter.java b/app/src/main/java/com/uiui/zyappstore/adapter/LocalAppAdapter.java
similarity index 92%
rename from app/src/main/java/com/uiui/appstore/adapter/LocalAppAdapter.java
rename to app/src/main/java/com/uiui/zyappstore/adapter/LocalAppAdapter.java
index 362c955..83db20f 100644
--- a/app/src/main/java/com/uiui/appstore/adapter/LocalAppAdapter.java
+++ b/app/src/main/java/com/uiui/zyappstore/adapter/LocalAppAdapter.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.adapter;
+package com.uiui.zyappstore.adapter;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -13,12 +13,12 @@ import android.widget.TextView;
 
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.uiui.appstore.R;
-import com.uiui.appstore.bean.GlideCircleWithBorder;
-import com.uiui.appstore.bean.LocalApp;
-import com.uiui.appstore.utils.ApkUtils;
-import com.uiui.appstore.utils.TimeUtils;
-import com.uiui.appstore.utils.Utils;
+import com.uiui.zyappstore.R;
+import com.uiui.zyappstore.bean.GlideCircleWithBorder;
+import com.uiui.zyappstore.bean.LocalApp;
+import com.uiui.zyappstore.utils.ApkUtils;
+import com.uiui.zyappstore.utils.TimeUtils;
+import com.uiui.zyappstore.utils.Utils;
 import com.bumptech.glide.Glide;
 
 import java.util.List;
diff --git a/app/src/main/java/com/uiui/appstore/adapter/ShowImageAdapter.java b/app/src/main/java/com/uiui/zyappstore/adapter/ShowImageAdapter.java
similarity index 92%
rename from app/src/main/java/com/uiui/appstore/adapter/ShowImageAdapter.java
rename to app/src/main/java/com/uiui/zyappstore/adapter/ShowImageAdapter.java
index f0af7c2..3676a29 100644
--- a/app/src/main/java/com/uiui/appstore/adapter/ShowImageAdapter.java
+++ b/app/src/main/java/com/uiui/zyappstore/adapter/ShowImageAdapter.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.adapter;
+package com.uiui.zyappstore.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -8,8 +8,8 @@ import android.widget.ImageView;
 
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.uiui.appstore.R;
-import com.uiui.appstore.bean.GlideCircleWithBorder;
+import com.uiui.zyappstore.R;
+import com.uiui.zyappstore.bean.GlideCircleWithBorder;
 import com.bumptech.glide.Glide;
 
 import java.util.List;
diff --git a/app/src/main/java/com/uiui/appstore/adapter/UpdateAppAdapter.java b/app/src/main/java/com/uiui/zyappstore/adapter/UpdateAppAdapter.java
similarity index 98%
rename from app/src/main/java/com/uiui/appstore/adapter/UpdateAppAdapter.java
rename to app/src/main/java/com/uiui/zyappstore/adapter/UpdateAppAdapter.java
index 5c351c8..5fd73e1 100644
--- a/app/src/main/java/com/uiui/appstore/adapter/UpdateAppAdapter.java
+++ b/app/src/main/java/com/uiui/zyappstore/adapter/UpdateAppAdapter.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.adapter;
+package com.uiui.zyappstore.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -10,8 +10,8 @@ import android.widget.TextView;
 
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.uiui.appstore.R;
-import com.uiui.appstore.bean.UpdateAppInfo;
+import com.uiui.zyappstore.R;
+import com.uiui.zyappstore.bean.UpdateAppInfo;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/uiui/appstore/base/BaseActivity.java b/app/src/main/java/com/uiui/zyappstore/base/BaseActivity.java
similarity index 98%
rename from app/src/main/java/com/uiui/appstore/base/BaseActivity.java
rename to app/src/main/java/com/uiui/zyappstore/base/BaseActivity.java
index d3783ab..c682534 100644
--- a/app/src/main/java/com/uiui/appstore/base/BaseActivity.java
+++ b/app/src/main/java/com/uiui/zyappstore/base/BaseActivity.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.base;
+package com.uiui.zyappstore.base;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
@@ -12,7 +12,7 @@ import android.view.WindowManager;
 
 import androidx.appcompat.app.AppCompatActivity;
 
-import com.uiui.appstore.R;
+import com.uiui.zyappstore.R;
 import com.zackratos.ultimatebarx.ultimatebarx.java.UltimateBarX;
 
 import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper;
diff --git a/app/src/main/java/com/uiui/appstore/base/BaseApplication.java b/app/src/main/java/com/uiui/zyappstore/base/BaseApplication.java
similarity index 72%
rename from app/src/main/java/com/uiui/appstore/base/BaseApplication.java
rename to app/src/main/java/com/uiui/zyappstore/base/BaseApplication.java
index 2824e77..6bb5fae 100644
--- a/app/src/main/java/com/uiui/appstore/base/BaseApplication.java
+++ b/app/src/main/java/com/uiui/zyappstore/base/BaseApplication.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.base;
+package com.uiui.zyappstore.base;
 
 import android.app.Application;
 import android.content.Context;
@@ -11,6 +11,9 @@ import android.util.Log;
 
 import androidx.annotation.NonNull;
 
+import com.alibaba.sdk.android.push.CloudPushService;
+import com.alibaba.sdk.android.push.CommonCallback;
+import com.alibaba.sdk.android.push.noonesdk.PushServiceFactory;
 import com.arialyy.aria.core.Aria;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.scwang.smartrefresh.layout.api.DefaultRefreshFooterCreator;
@@ -24,14 +27,15 @@ import com.tencent.android.tpush.XGIOperateCallback;
 import com.tencent.android.tpush.XGPushConfig;
 import com.tencent.android.tpush.XGPushManager;
 import com.tencent.mmkv.MMKV;
-import com.uiui.appstore.R;
-import com.uiui.appstore.manager.ConnectManager;
-import com.uiui.appstore.network.NetInterfaceManager;
-import com.uiui.appstore.receiver.AppManagerReceiver;
-import com.uiui.appstore.utils.JGYUtils;
-import com.uiui.appstore.utils.LogUtils;
-import com.uiui.appstore.utils.ToastUtil;
-import com.uiui.appstore.utils.Utils;
+import com.uiui.zyappstore.R;
+import com.uiui.zyappstore.manager.ConnectManager;
+import com.uiui.zyappstore.network.NetInterfaceManager;
+import com.uiui.zyappstore.push.PushManager;
+import com.uiui.zyappstore.receiver.AppManagerReceiver;
+import com.uiui.zyappstore.utils.JGYUtils;
+import com.uiui.zyappstore.utils.LogUtils;
+import com.uiui.zyappstore.utils.ToastUtil;
+import com.uiui.zyappstore.utils.Utils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -42,17 +46,6 @@ import java.util.List;
 public class BaseApplication extends Application {
     private static final String TAG = BaseApplication.class.getSimpleName();
 
-    private static BaseApplication app;
-
-    public static BaseApplication getInstance() {
-        return app;
-    }
-
-    public Context getAppContext() {
-        return getApplicationContext();
-    }
-
-    //static 代码段可以防止内存泄露
     static {
         //设置全局的Header构建器
         SmartRefreshLayout.setDefaultRefreshHeaderCreator(new DefaultRefreshHeaderCreator() {
@@ -76,13 +69,14 @@ public class BaseApplication extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
-        app = this;
         String rootDir = MMKV.initialize(this);
         Log.i(TAG, "mmkv root: " + rootDir);
 
-        tPushInit();
-        ToastUtil.init(this);
         JGYUtils.init(this);
+        PushManager.init(this);
+        tPushInit();
+        aliyunPushInit();
+        ToastUtil.init(this);
         ConnectManager.init(this);
         Aria.init(this);
         Aria.get(this).getDownloadConfig().setMaxTaskNum(1);
@@ -134,6 +128,50 @@ public class BaseApplication extends Application {
         });
     }
 
+    private void aliyunPushInit() {
+        PushServiceFactory.init(this);
+        final CloudPushService pushService = PushServiceFactory.getCloudPushService();
+        pushService.setLogLevel(CloudPushService.LOG_DEBUG);
+        pushService.register(this, new CommonCallback() {
+            @Override
+            public void onSuccess(String response) {
+                Log.e("AliyunPush", "init cloudchannel success");
+                Log.e("AliyunPush", "init cloudchannel success  " + pushService.getDeviceId());
+            }
+
+            @Override
+            public void onFailed(String errorCode, String errorMessage) {
+                Log.e("AliyunPush", "init cloudchannel failed -- errorcode:" + errorCode + " -- errorMessage:" + errorMessage);
+            }
+        });
+        String account = Utils.getSerial();
+        pushService.bindAccount(account, new CommonCallback() {
+            @Override
+            public void onSuccess(String s) {
+                Log.e("AliyunPush", "bind account " + account + " success\n");
+            }
+
+            @Override
+            public void onFailed(String errorCode, String errorMsg) {
+                Log.e("AliyunPush", "bind account " + account + " failed." +
+                        "errorCode: " + errorCode + ", errorMsg:" + errorMsg);
+            }
+        });
+        String alias = Utils.getSerial();
+        pushService.addAlias(account, new CommonCallback() {
+            @Override
+            public void onSuccess(String s) {
+                Log.e("AliyunPush", "add alias " + alias + " success\n");
+            }
+
+            @Override
+            public void onFailed(String errorCode, String errorMsg) {
+                Log.e("AliyunPush", "add alias " + alias + " failed." +
+                        "errorCode: " + errorCode + ", errorMsg:" + errorMsg + "\n");
+            }
+        });
+    }
+
 
     private AppManagerReceiver mAppManagerReceiver;
 
diff --git a/app/src/main/java/com/uiui/appstore/base/BaseFragment.java b/app/src/main/java/com/uiui/zyappstore/base/BaseFragment.java
similarity index 95%
rename from app/src/main/java/com/uiui/appstore/base/BaseFragment.java
rename to app/src/main/java/com/uiui/zyappstore/base/BaseFragment.java
index cf0655f..47820c6 100644
--- a/app/src/main/java/com/uiui/appstore/base/BaseFragment.java
+++ b/app/src/main/java/com/uiui/zyappstore/base/BaseFragment.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.base;
+package com.uiui.zyappstore.base;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -8,7 +8,7 @@ import android.view.View;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.uiui.appstore.utils.LogUtils;
+import com.uiui.zyappstore.utils.LogUtils;
 
 /**
  * Created by asus on 2017/8/4.
diff --git a/app/src/main/java/com/uiui/appstore/base/BasePresenter.java b/app/src/main/java/com/uiui/zyappstore/base/BasePresenter.java
similarity index 76%
rename from app/src/main/java/com/uiui/appstore/base/BasePresenter.java
rename to app/src/main/java/com/uiui/zyappstore/base/BasePresenter.java
index 54921c8..8765812 100644
--- a/app/src/main/java/com/uiui/appstore/base/BasePresenter.java
+++ b/app/src/main/java/com/uiui/zyappstore/base/BasePresenter.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.base;
+package com.uiui.zyappstore.base;
 
 public interface BasePresenter<V extends BaseView> {
     void attachView(V view);
diff --git a/app/src/main/java/com/uiui/zyappstore/base/BaseView.java b/app/src/main/java/com/uiui/zyappstore/base/BaseView.java
new file mode 100644
index 0000000..4d1dee8
--- /dev/null
+++ b/app/src/main/java/com/uiui/zyappstore/base/BaseView.java
@@ -0,0 +1,4 @@
+package com.uiui.zyappstore.base;
+
+public interface BaseView {
+}
diff --git a/app/src/main/java/com/uiui/appstore/base/LazyLoadFragment.java b/app/src/main/java/com/uiui/zyappstore/base/LazyLoadFragment.java
similarity index 98%
rename from app/src/main/java/com/uiui/appstore/base/LazyLoadFragment.java
rename to app/src/main/java/com/uiui/zyappstore/base/LazyLoadFragment.java
index d2df5dc..e9319c1 100644
--- a/app/src/main/java/com/uiui/appstore/base/LazyLoadFragment.java
+++ b/app/src/main/java/com/uiui/zyappstore/base/LazyLoadFragment.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.base;
+package com.uiui.zyappstore.base;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
diff --git a/app/src/main/java/com/uiui/appstore/base/RefreshManager.java b/app/src/main/java/com/uiui/zyappstore/base/RefreshManager.java
similarity index 97%
rename from app/src/main/java/com/uiui/appstore/base/RefreshManager.java
rename to app/src/main/java/com/uiui/zyappstore/base/RefreshManager.java
index b3700cb..f323d4a 100644
--- a/app/src/main/java/com/uiui/appstore/base/RefreshManager.java
+++ b/app/src/main/java/com/uiui/zyappstore/base/RefreshManager.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.base;
+package com.uiui.zyappstore.base;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/com/uiui/appstore/bean/AppClassBean.java b/app/src/main/java/com/uiui/zyappstore/bean/AppClassBean.java
similarity index 94%
rename from app/src/main/java/com/uiui/appstore/bean/AppClassBean.java
rename to app/src/main/java/com/uiui/zyappstore/bean/AppClassBean.java
index 2c4475a..7cbfa02 100644
--- a/app/src/main/java/com/uiui/appstore/bean/AppClassBean.java
+++ b/app/src/main/java/com/uiui/zyappstore/bean/AppClassBean.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.bean;
+package com.uiui.zyappstore.bean;
 
 import java.io.Serializable;
 
diff --git a/app/src/main/java/com/uiui/appstore/bean/AppDateInfo.java b/app/src/main/java/com/uiui/zyappstore/bean/AppDateInfo.java
similarity index 99%
rename from app/src/main/java/com/uiui/appstore/bean/AppDateInfo.java
rename to app/src/main/java/com/uiui/zyappstore/bean/AppDateInfo.java
index c9c8a9b..dae562b 100644
--- a/app/src/main/java/com/uiui/appstore/bean/AppDateInfo.java
+++ b/app/src/main/java/com/uiui/zyappstore/bean/AppDateInfo.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.bean;
+package com.uiui.zyappstore.bean;
 
 import java.io.Serializable;
 
diff --git a/app/src/main/java/com/uiui/appstore/bean/AppDownloadInfo.java b/app/src/main/java/com/uiui/zyappstore/bean/AppDownloadInfo.java
similarity index 98%
rename from app/src/main/java/com/uiui/appstore/bean/AppDownloadInfo.java
rename to app/src/main/java/com/uiui/zyappstore/bean/AppDownloadInfo.java
index 0d53be2..e2304cf 100644
--- a/app/src/main/java/com/uiui/appstore/bean/AppDownloadInfo.java
+++ b/app/src/main/java/com/uiui/zyappstore/bean/AppDownloadInfo.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.bean;
+package com.uiui.zyappstore.bean;
 
 import java.io.Serializable;
 
diff --git a/app/src/main/java/com/uiui/appstore/bean/AppInfo.java b/app/src/main/java/com/uiui/zyappstore/bean/AppInfo.java
similarity index 99%
rename from app/src/main/java/com/uiui/appstore/bean/AppInfo.java
rename to app/src/main/java/com/uiui/zyappstore/bean/AppInfo.java
index dd24d00..340e670 100644
--- a/app/src/main/java/com/uiui/appstore/bean/AppInfo.java
+++ b/app/src/main/java/com/uiui/zyappstore/bean/AppInfo.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.bean;
+package com.uiui.zyappstore.bean;
 
 import com.google.gson.annotations.SerializedName;
 
diff --git a/app/src/main/java/com/uiui/appstore/bean/AppInfos.java b/app/src/main/java/com/uiui/zyappstore/bean/AppInfos.java
similarity index 99%
rename from app/src/main/java/com/uiui/appstore/bean/AppInfos.java
rename to app/src/main/java/com/uiui/zyappstore/bean/AppInfos.java
index c303b26..67d3f9b 100644
--- a/app/src/main/java/com/uiui/appstore/bean/AppInfos.java
+++ b/app/src/main/java/com/uiui/zyappstore/bean/AppInfos.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.bean;
+package com.uiui.zyappstore.bean;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/app/src/main/java/com/uiui/appstore/bean/Banner.java b/app/src/main/java/com/uiui/zyappstore/bean/Banner.java
similarity index 95%
rename from app/src/main/java/com/uiui/appstore/bean/Banner.java
rename to app/src/main/java/com/uiui/zyappstore/bean/Banner.java
index 2e3f5a3..945db9d 100644
--- a/app/src/main/java/com/uiui/appstore/bean/Banner.java
+++ b/app/src/main/java/com/uiui/zyappstore/bean/Banner.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.bean;
+package com.uiui.zyappstore.bean;
 
 import java.io.Serializable;
 
diff --git a/app/src/main/java/com/uiui/appstore/bean/BannerImage.java b/app/src/main/java/com/uiui/zyappstore/bean/BannerImage.java
similarity index 95%
rename from app/src/main/java/com/uiui/appstore/bean/BannerImage.java
rename to app/src/main/java/com/uiui/zyappstore/bean/BannerImage.java
index c9a69e4..eb1ce4c 100644
--- a/app/src/main/java/com/uiui/appstore/bean/BannerImage.java
+++ b/app/src/main/java/com/uiui/zyappstore/bean/BannerImage.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.bean;
+package com.uiui.zyappstore.bean;
 
 import java.io.Serializable;
 
diff --git a/app/src/main/java/com/uiui/appstore/bean/BaseResponse.java b/app/src/main/java/com/uiui/zyappstore/bean/BaseResponse.java
similarity index 93%
rename from app/src/main/java/com/uiui/appstore/bean/BaseResponse.java
rename to app/src/main/java/com/uiui/zyappstore/bean/BaseResponse.java
index 4ad995f..53854f7 100644
--- a/app/src/main/java/com/uiui/appstore/bean/BaseResponse.java
+++ b/app/src/main/java/com/uiui/zyappstore/bean/BaseResponse.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.bean;
+package com.uiui.zyappstore.bean;
 
 import androidx.annotation.NonNull;
 
diff --git a/app/src/main/java/com/uiui/appstore/bean/BatchID.java b/app/src/main/java/com/uiui/zyappstore/bean/BatchID.java
similarity index 94%
rename from app/src/main/java/com/uiui/appstore/bean/BatchID.java
rename to app/src/main/java/com/uiui/zyappstore/bean/BatchID.java
index 2e7ac9b..2a8eb49 100644
--- a/app/src/main/java/com/uiui/appstore/bean/BatchID.java
+++ b/app/src/main/java/com/uiui/zyappstore/bean/BatchID.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.bean;
+package com.uiui.zyappstore.bean;
 
 import androidx.annotation.NonNull;
 
diff --git a/app/src/main/java/com/uiui/appstore/bean/GlideCircleWithBorder.java b/app/src/main/java/com/uiui/zyappstore/bean/GlideCircleWithBorder.java
similarity index 98%
rename from app/src/main/java/com/uiui/appstore/bean/GlideCircleWithBorder.java
rename to app/src/main/java/com/uiui/zyappstore/bean/GlideCircleWithBorder.java
index cad19fc..86113ad 100644
--- a/app/src/main/java/com/uiui/appstore/bean/GlideCircleWithBorder.java
+++ b/app/src/main/java/com/uiui/zyappstore/bean/GlideCircleWithBorder.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.bean;
+package com.uiui.zyappstore.bean;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -12,7 +12,7 @@ import androidx.annotation.NonNull;
 
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;
-import com.uiui.appstore.R;
+import com.uiui.zyappstore.R;
 
 import java.security.MessageDigest;
 
diff --git a/app/src/main/java/com/uiui/appstore/bean/ImageUrl.java b/app/src/main/java/com/uiui/zyappstore/bean/ImageUrl.java
similarity index 85%
rename from app/src/main/java/com/uiui/appstore/bean/ImageUrl.java
rename to app/src/main/java/com/uiui/zyappstore/bean/ImageUrl.java
index 4d3c4ff..073b467 100644
--- a/app/src/main/java/com/uiui/appstore/bean/ImageUrl.java
+++ b/app/src/main/java/com/uiui/zyappstore/bean/ImageUrl.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.bean;
+package com.uiui.zyappstore.bean;
 
 public class ImageUrl {
     String img_url;
diff --git a/app/src/main/java/com/uiui/appstore/bean/Kind.java b/app/src/main/java/com/uiui/zyappstore/bean/Kind.java
similarity index 96%
rename from app/src/main/java/com/uiui/appstore/bean/Kind.java
rename to app/src/main/java/com/uiui/zyappstore/bean/Kind.java
index e1da6ee..cab70c8 100644
--- a/app/src/main/java/com/uiui/appstore/bean/Kind.java
+++ b/app/src/main/java/com/uiui/zyappstore/bean/Kind.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.bean;
+package com.uiui.zyappstore.bean;
 
 /**
  * Created by asus on 2017/10/25.
diff --git a/app/src/main/java/com/uiui/appstore/bean/LocalApp.java b/app/src/main/java/com/uiui/zyappstore/bean/LocalApp.java
similarity index 98%
rename from app/src/main/java/com/uiui/appstore/bean/LocalApp.java
rename to app/src/main/java/com/uiui/zyappstore/bean/LocalApp.java
index 48ca6a1..d48eea0 100644
--- a/app/src/main/java/com/uiui/appstore/bean/LocalApp.java
+++ b/app/src/main/java/com/uiui/zyappstore/bean/LocalApp.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.bean;
+package com.uiui.zyappstore.bean;
 
 import android.graphics.drawable.Drawable;
 
diff --git a/app/src/main/java/com/uiui/appstore/bean/UpdateAppInfo.java b/app/src/main/java/com/uiui/zyappstore/bean/UpdateAppInfo.java
similarity index 98%
rename from app/src/main/java/com/uiui/appstore/bean/UpdateAppInfo.java
rename to app/src/main/java/com/uiui/zyappstore/bean/UpdateAppInfo.java
index 5009776..72f2b8e 100644
--- a/app/src/main/java/com/uiui/appstore/bean/UpdateAppInfo.java
+++ b/app/src/main/java/com/uiui/zyappstore/bean/UpdateAppInfo.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.bean;
+package com.uiui.zyappstore.bean;
 
 import android.graphics.drawable.Drawable;
 
diff --git a/app/src/main/java/com/uiui/appstore/bean/UserInfo.java b/app/src/main/java/com/uiui/zyappstore/bean/UserInfo.java
similarity index 98%
rename from app/src/main/java/com/uiui/appstore/bean/UserInfo.java
rename to app/src/main/java/com/uiui/zyappstore/bean/UserInfo.java
index 9262e86..9b5e2bd 100644
--- a/app/src/main/java/com/uiui/appstore/bean/UserInfo.java
+++ b/app/src/main/java/com/uiui/zyappstore/bean/UserInfo.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.bean;
+package com.uiui.zyappstore.bean;
 
 import java.io.Serializable;
 
diff --git a/app/src/main/java/com/uiui/appstore/common/BuikdConf.java b/app/src/main/java/com/uiui/zyappstore/common/BuikdConf.java
similarity index 67%
rename from app/src/main/java/com/uiui/appstore/common/BuikdConf.java
rename to app/src/main/java/com/uiui/zyappstore/common/BuikdConf.java
index c720b5e..2859b96 100644
--- a/app/src/main/java/com/uiui/appstore/common/BuikdConf.java
+++ b/app/src/main/java/com/uiui/zyappstore/common/BuikdConf.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.common;
+package com.uiui.zyappstore.common;
 
 public class BuikdConf {
     public static final boolean Isdebug = true;
diff --git a/app/src/main/java/com/uiui/appstore/common/CommonDatas.java b/app/src/main/java/com/uiui/zyappstore/common/CommonDatas.java
similarity index 88%
rename from app/src/main/java/com/uiui/appstore/common/CommonDatas.java
rename to app/src/main/java/com/uiui/zyappstore/common/CommonDatas.java
index 2bca2f5..193bf50 100644
--- a/app/src/main/java/com/uiui/appstore/common/CommonDatas.java
+++ b/app/src/main/java/com/uiui/zyappstore/common/CommonDatas.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.common;
+package com.uiui.zyappstore.common;
 
 
 public class CommonDatas {
diff --git a/app/src/main/java/com/uiui/appstore/disklrucache/CacheHelper.java b/app/src/main/java/com/uiui/zyappstore/disklrucache/CacheHelper.java
similarity index 99%
rename from app/src/main/java/com/uiui/appstore/disklrucache/CacheHelper.java
rename to app/src/main/java/com/uiui/zyappstore/disklrucache/CacheHelper.java
index 0b83d99..69eb96e 100644
--- a/app/src/main/java/com/uiui/appstore/disklrucache/CacheHelper.java
+++ b/app/src/main/java/com/uiui/zyappstore/disklrucache/CacheHelper.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.disklrucache;
+package com.uiui.zyappstore.disklrucache;
 
 import android.content.Context;
 import android.graphics.Bitmap;
diff --git a/app/src/main/java/com/uiui/appstore/disklrucache/Utils.java b/app/src/main/java/com/uiui/zyappstore/disklrucache/Utils.java
similarity index 98%
rename from app/src/main/java/com/uiui/appstore/disklrucache/Utils.java
rename to app/src/main/java/com/uiui/zyappstore/disklrucache/Utils.java
index da0171b..1f26f38 100644
--- a/app/src/main/java/com/uiui/appstore/disklrucache/Utils.java
+++ b/app/src/main/java/com/uiui/zyappstore/disklrucache/Utils.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.disklrucache;
+package com.uiui.zyappstore.disklrucache;
 
 import android.content.Context;
 import android.content.pm.PackageInfo;
diff --git a/app/src/main/java/com/uiui/appstore/fragment/FeaturedFragment.java b/app/src/main/java/com/uiui/zyappstore/fragment/FeaturedFragment.java
similarity index 97%
rename from app/src/main/java/com/uiui/appstore/fragment/FeaturedFragment.java
rename to app/src/main/java/com/uiui/zyappstore/fragment/FeaturedFragment.java
index e5c7fc1..598fc48 100644
--- a/app/src/main/java/com/uiui/appstore/fragment/FeaturedFragment.java
+++ b/app/src/main/java/com/uiui/zyappstore/fragment/FeaturedFragment.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.fragment;
+package com.uiui.zyappstore.fragment;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -32,25 +32,25 @@ import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
 import com.bumptech.glide.request.target.CustomTarget;
 import com.bumptech.glide.request.transition.Transition;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
-import com.uiui.appstore.R;
-import com.uiui.appstore.activity.ClassAppActivity;
-import com.uiui.appstore.activity.ManagerAppActivity;
-import com.uiui.appstore.activity.MoreAppActivity;
-import com.uiui.appstore.adapter.AppAdapter;
-import com.uiui.appstore.adapter.BannerViewHolder;
-import com.uiui.appstore.base.LazyLoadFragment;
-import com.uiui.appstore.base.RefreshManager;
-import com.uiui.appstore.bean.AppClassBean;
-import com.uiui.appstore.bean.AppInfo;
-import com.uiui.appstore.bean.Banner;
-import com.uiui.appstore.bean.BaseResponse;
-import com.uiui.appstore.bean.ImageUrl;
-import com.uiui.appstore.common.CommonDatas;
-import com.uiui.appstore.network.NetInterfaceManager;
-import com.uiui.appstore.utils.DensityUtil;
-import com.uiui.appstore.utils.LogUtils;
-import com.uiui.appstore.utils.ToastUtil;
-import com.uiui.appstore.utils.Utils;
+import com.uiui.zyappstore.R;
+import com.uiui.zyappstore.activity.ClassAppActivity;
+import com.uiui.zyappstore.activity.ManagerAppActivity;
+import com.uiui.zyappstore.activity.MoreAppActivity;
+import com.uiui.zyappstore.adapter.AppAdapter;
+import com.uiui.zyappstore.adapter.BannerViewHolder;
+import com.uiui.zyappstore.base.LazyLoadFragment;
+import com.uiui.zyappstore.base.RefreshManager;
+import com.uiui.zyappstore.bean.AppClassBean;
+import com.uiui.zyappstore.bean.AppInfo;
+import com.uiui.zyappstore.bean.Banner;
+import com.uiui.zyappstore.bean.BaseResponse;
+import com.uiui.zyappstore.bean.ImageUrl;
+import com.uiui.zyappstore.common.CommonDatas;
+import com.uiui.zyappstore.network.NetInterfaceManager;
+import com.uiui.zyappstore.utils.DensityUtil;
+import com.uiui.zyappstore.utils.LogUtils;
+import com.uiui.zyappstore.utils.ToastUtil;
+import com.uiui.zyappstore.utils.Utils;
 import com.zhpan.bannerview.BannerViewPager;
 import com.zhpan.bannerview.constants.IndicatorSlideMode;
 import com.zhpan.bannerview.constants.PageStyle;
diff --git a/app/src/main/java/com/uiui/appstore/fragment/KindFragment.java b/app/src/main/java/com/uiui/zyappstore/fragment/KindFragment.java
similarity index 94%
rename from app/src/main/java/com/uiui/appstore/fragment/KindFragment.java
rename to app/src/main/java/com/uiui/zyappstore/fragment/KindFragment.java
index 6ce0dbf..d29d8df 100644
--- a/app/src/main/java/com/uiui/appstore/fragment/KindFragment.java
+++ b/app/src/main/java/com/uiui/zyappstore/fragment/KindFragment.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.fragment;
+package com.uiui.zyappstore.fragment;
 
 import android.os.Bundle;
 
@@ -14,11 +14,11 @@ import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.uiui.appstore.R;
-import com.uiui.appstore.adapter.KindAdapter;
-import com.uiui.appstore.base.BaseFragment;
-import com.uiui.appstore.base.RefreshManager;
-import com.uiui.appstore.bean.Kind;
+import com.uiui.zyappstore.R;
+import com.uiui.zyappstore.adapter.KindAdapter;
+import com.uiui.zyappstore.base.BaseFragment;
+import com.uiui.zyappstore.base.RefreshManager;
+import com.uiui.zyappstore.bean.Kind;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
diff --git a/app/src/main/java/com/uiui/appstore/fragment/ManageFragment.java b/app/src/main/java/com/uiui/zyappstore/fragment/ManageFragment.java
similarity index 86%
rename from app/src/main/java/com/uiui/appstore/fragment/ManageFragment.java
rename to app/src/main/java/com/uiui/zyappstore/fragment/ManageFragment.java
index ec0be79..de379b4 100644
--- a/app/src/main/java/com/uiui/appstore/fragment/ManageFragment.java
+++ b/app/src/main/java/com/uiui/zyappstore/fragment/ManageFragment.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.fragment;
+package com.uiui.zyappstore.fragment;
 
 import android.content.Context;
 import android.content.Intent;
@@ -12,16 +12,16 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.arialyy.aria.core.Aria;
-import com.uiui.appstore.BuildConfig;
-import com.uiui.appstore.R;
-import com.uiui.appstore.activity.DownloadManagerActivity;
-import com.uiui.appstore.activity.LocalManagerActivity;
-import com.uiui.appstore.adapter.UpdateAppAdapter;
-import com.uiui.appstore.base.LazyLoadFragment;
-import com.uiui.appstore.bean.AppInfo;
-import com.uiui.appstore.bean.LocalApp;
-import com.uiui.appstore.bean.UpdateAppInfo;
-import com.uiui.appstore.utils.ApkUtils;
+import com.uiui.zyappstore.BuildConfig;
+import com.uiui.zyappstore.R;
+import com.uiui.zyappstore.activity.DownloadManagerActivity;
+import com.uiui.zyappstore.activity.LocalManagerActivity;
+import com.uiui.zyappstore.adapter.UpdateAppAdapter;
+import com.uiui.zyappstore.base.LazyLoadFragment;
+import com.uiui.zyappstore.bean.AppInfo;
+import com.uiui.zyappstore.bean.LocalApp;
+import com.uiui.zyappstore.bean.UpdateAppInfo;
+import com.uiui.zyappstore.utils.ApkUtils;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/com/uiui/appstore/fragment/RankFragment.java b/app/src/main/java/com/uiui/zyappstore/fragment/RankFragment.java
similarity index 85%
rename from app/src/main/java/com/uiui/appstore/fragment/RankFragment.java
rename to app/src/main/java/com/uiui/zyappstore/fragment/RankFragment.java
index 71cd650..88beba0 100644
--- a/app/src/main/java/com/uiui/appstore/fragment/RankFragment.java
+++ b/app/src/main/java/com/uiui/zyappstore/fragment/RankFragment.java
@@ -1,29 +1,22 @@
-package com.uiui.appstore.fragment;
+package com.uiui.zyappstore.fragment;
 
 import android.os.Bundle;
 
-import android.os.Handler;
-import android.os.Message;
 import android.view.View;
 
 
-import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.uiui.appstore.R;
-import com.uiui.appstore.adapter.AppAdapter;
-import com.uiui.appstore.base.LazyLoadFragment;
-import com.uiui.appstore.base.RefreshManager;
-import com.uiui.appstore.bean.AppInfo;
-import com.uiui.appstore.utils.LogUtils;
+import com.uiui.zyappstore.R;
+import com.uiui.zyappstore.adapter.AppAdapter;
+import com.uiui.zyappstore.base.LazyLoadFragment;
+import com.uiui.zyappstore.base.RefreshManager;
+import com.uiui.zyappstore.utils.LogUtils;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
 
-import java.util.ArrayList;
-import java.util.List;
-
 
 /**
  * Created by asus on 2017/10/23.
diff --git a/app/src/main/java/com/uiui/appstore/gson/GsonUtils.java b/app/src/main/java/com/uiui/zyappstore/gson/GsonUtils.java
similarity index 99%
rename from app/src/main/java/com/uiui/appstore/gson/GsonUtils.java
rename to app/src/main/java/com/uiui/zyappstore/gson/GsonUtils.java
index f4fc637..2973b0b 100644
--- a/app/src/main/java/com/uiui/appstore/gson/GsonUtils.java
+++ b/app/src/main/java/com/uiui/zyappstore/gson/GsonUtils.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.gson;
+package com.uiui.zyappstore.gson;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
diff --git a/app/src/main/java/com/uiui/appstore/gson/IntegerDefault0Adapter.java b/app/src/main/java/com/uiui/zyappstore/gson/IntegerDefault0Adapter.java
similarity index 96%
rename from app/src/main/java/com/uiui/appstore/gson/IntegerDefault0Adapter.java
rename to app/src/main/java/com/uiui/zyappstore/gson/IntegerDefault0Adapter.java
index 91eb4dc..b14cbdf 100644
--- a/app/src/main/java/com/uiui/appstore/gson/IntegerDefault0Adapter.java
+++ b/app/src/main/java/com/uiui/zyappstore/gson/IntegerDefault0Adapter.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.gson;
+package com.uiui.zyappstore.gson;
 
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
diff --git a/app/src/main/java/com/uiui/appstore/gson/NullStringToEmptyAdapterFactory.java b/app/src/main/java/com/uiui/zyappstore/gson/NullStringToEmptyAdapterFactory.java
similarity index 97%
rename from app/src/main/java/com/uiui/appstore/gson/NullStringToEmptyAdapterFactory.java
rename to app/src/main/java/com/uiui/zyappstore/gson/NullStringToEmptyAdapterFactory.java
index 0fdfae8..4353925 100644
--- a/app/src/main/java/com/uiui/appstore/gson/NullStringToEmptyAdapterFactory.java
+++ b/app/src/main/java/com/uiui/zyappstore/gson/NullStringToEmptyAdapterFactory.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.gson;
+package com.uiui.zyappstore.gson;
 
 import com.google.gson.Gson;
 import com.google.gson.TypeAdapter;
diff --git a/app/src/main/java/com/uiui/appstore/helper/CustomSnapHelper.java b/app/src/main/java/com/uiui/zyappstore/helper/CustomSnapHelper.java
similarity index 98%
rename from app/src/main/java/com/uiui/appstore/helper/CustomSnapHelper.java
rename to app/src/main/java/com/uiui/zyappstore/helper/CustomSnapHelper.java
index 20baa45..abdc7d2 100644
--- a/app/src/main/java/com/uiui/appstore/helper/CustomSnapHelper.java
+++ b/app/src/main/java/com/uiui/zyappstore/helper/CustomSnapHelper.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.helper;
+package com.uiui.zyappstore.helper;
 
 import android.view.View;
 
diff --git a/app/src/main/java/com/uiui/appstore/image/ImageLoader.java b/app/src/main/java/com/uiui/zyappstore/image/ImageLoader.java
similarity index 98%
rename from app/src/main/java/com/uiui/appstore/image/ImageLoader.java
rename to app/src/main/java/com/uiui/zyappstore/image/ImageLoader.java
index eeda65a..0def115 100644
--- a/app/src/main/java/com/uiui/appstore/image/ImageLoader.java
+++ b/app/src/main/java/com/uiui/zyappstore/image/ImageLoader.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.image;
+package com.uiui.zyappstore.image;
 
 import android.app.Activity;
 import android.content.Context;
@@ -15,7 +15,7 @@ import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.SimpleTarget;
 import com.bumptech.glide.request.target.Target;
 import com.bumptech.glide.request.transition.Transition;
-import com.uiui.appstore.R;
+import com.uiui.zyappstore.R;
 
 
 // ImageLoader 加载图片 清除缓存
diff --git a/app/src/main/java/com/uiui/appstore/manager/ConnectManager.java b/app/src/main/java/com/uiui/zyappstore/manager/ConnectManager.java
similarity index 98%
rename from app/src/main/java/com/uiui/appstore/manager/ConnectManager.java
rename to app/src/main/java/com/uiui/zyappstore/manager/ConnectManager.java
index b59a29f..12a879d 100644
--- a/app/src/main/java/com/uiui/appstore/manager/ConnectManager.java
+++ b/app/src/main/java/com/uiui/zyappstore/manager/ConnectManager.java
@@ -1,11 +1,11 @@
-package com.uiui.appstore.manager;
+package com.uiui.zyappstore.manager;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.util.Log;
 
 import com.tencent.mmkv.MMKV;
-import com.uiui.appstore.utils.TimeUtils;
+import com.uiui.zyappstore.utils.TimeUtils;
 
 public class ConnectManager {
     private static final String TAG = ConnectManager.class.getSimpleName();
diff --git a/app/src/main/java/com/uiui/appstore/manager/ConnectMode.java b/app/src/main/java/com/uiui/zyappstore/manager/ConnectMode.java
similarity index 80%
rename from app/src/main/java/com/uiui/appstore/manager/ConnectMode.java
rename to app/src/main/java/com/uiui/zyappstore/manager/ConnectMode.java
index 937474b..237aa01 100644
--- a/app/src/main/java/com/uiui/appstore/manager/ConnectMode.java
+++ b/app/src/main/java/com/uiui/zyappstore/manager/ConnectMode.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.manager;
+package com.uiui.zyappstore.manager;
 
 public enum ConnectMode {
     DEFAULT,
diff --git a/app/src/main/java/com/uiui/appstore/network/HTTPInterface.java b/app/src/main/java/com/uiui/zyappstore/network/HTTPInterface.java
similarity index 93%
rename from app/src/main/java/com/uiui/appstore/network/HTTPInterface.java
rename to app/src/main/java/com/uiui/zyappstore/network/HTTPInterface.java
index e2a56c8..7c1095a 100644
--- a/app/src/main/java/com/uiui/appstore/network/HTTPInterface.java
+++ b/app/src/main/java/com/uiui/zyappstore/network/HTTPInterface.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.network;
+package com.uiui.zyappstore.network;
 
 import android.content.Context;
 import android.content.pm.PackageInfo;
@@ -9,11 +9,11 @@ import android.util.Log;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import com.uiui.appstore.BuildConfig;
-import com.uiui.appstore.bean.AppInfo;
-import com.uiui.appstore.bean.BaseResponse;
-import com.uiui.appstore.utils.FileUtils;
-import com.uiui.appstore.utils.JGYUtils;
+import com.uiui.zyappstore.BuildConfig;
+import com.uiui.zyappstore.bean.AppInfo;
+import com.uiui.zyappstore.bean.BaseResponse;
+import com.uiui.zyappstore.utils.FileUtils;
+import com.uiui.zyappstore.utils.JGYUtils;
 
 import io.reactivex.rxjava3.core.Observer;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
diff --git a/app/src/main/java/com/uiui/appstore/network/NetInterfaceManager.java b/app/src/main/java/com/uiui/zyappstore/network/NetInterfaceManager.java
similarity index 76%
rename from app/src/main/java/com/uiui/appstore/network/NetInterfaceManager.java
rename to app/src/main/java/com/uiui/zyappstore/network/NetInterfaceManager.java
index 78cca4f..fc71fbf 100644
--- a/app/src/main/java/com/uiui/appstore/network/NetInterfaceManager.java
+++ b/app/src/main/java/com/uiui/zyappstore/network/NetInterfaceManager.java
@@ -1,35 +1,40 @@
-package com.uiui.appstore.network;
+package com.uiui.zyappstore.network;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Environment;
 import android.util.Log;
 
+import com.alibaba.sdk.android.push.CloudPushService;
+import com.alibaba.sdk.android.push.CommonCallback;
+import com.alibaba.sdk.android.push.noonesdk.PushServiceFactory;
 import com.tencent.android.tpush.XGIOperateCallback;
 import com.tencent.android.tpush.XGPushManager;
 import com.tencent.mmkv.MMKV;
-import com.uiui.appstore.bean.AppClassBean;
-import com.uiui.appstore.bean.AppInfo;
-import com.uiui.appstore.bean.Banner;
-import com.uiui.appstore.bean.BaseResponse;
-import com.uiui.appstore.disklrucache.CacheHelper;
-import com.uiui.appstore.network.api.AdminAppApi;
-import com.uiui.appstore.network.api.AdminAppClassApi;
-import com.uiui.appstore.network.api.BannerImage;
-import com.uiui.appstore.network.api.ClassAppApi;
-import com.uiui.appstore.network.api.DownloadApp;
-import com.uiui.appstore.network.api.GetBanner;
-import com.uiui.appstore.network.api.NewestAppUpdate;
-import com.uiui.appstore.network.api.QueryAllApp;
-import com.uiui.appstore.network.api.QueryPackageApp;
-import com.uiui.appstore.network.api.SNInfo;
-import com.uiui.appstore.network.api.SearchAdminAppApi;
-import com.uiui.appstore.network.api.SearchAppApi;
-import com.uiui.appstore.network.interceptor.RepeatRequestInterceptor;
-import com.uiui.appstore.utils.JGYUtils;
-import com.uiui.appstore.utils.Utils;
+import com.uiui.zyappstore.bean.AppClassBean;
+import com.uiui.zyappstore.bean.AppInfo;
+import com.uiui.zyappstore.bean.Banner;
+import com.uiui.zyappstore.bean.BaseResponse;
+import com.uiui.zyappstore.disklrucache.CacheHelper;
+import com.uiui.zyappstore.network.api.AdminAppApi;
+import com.uiui.zyappstore.network.api.AdminAppClassApi;
+import com.uiui.zyappstore.network.api.BannerImage;
+import com.uiui.zyappstore.network.api.ClassAppApi;
+import com.uiui.zyappstore.network.api.DownloadApp;
+import com.uiui.zyappstore.network.api.GetBanner;
+import com.uiui.zyappstore.network.api.NewestAppUpdate;
+import com.uiui.zyappstore.network.api.QueryAllApp;
+import com.uiui.zyappstore.network.api.QueryPackageApp;
+import com.uiui.zyappstore.network.api.SNInfo;
+import com.uiui.zyappstore.network.api.SearchAdminAppApi;
+import com.uiui.zyappstore.network.api.SearchAppApi;
+import com.uiui.zyappstore.network.interceptor.RepeatRequestInterceptor;
+import com.uiui.zyappstore.utils.JGYUtils;
+import com.uiui.zyappstore.utils.Utils;
 
 import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -191,7 +196,7 @@ public class NetInterfaceManager {
     }
 
     public void setPushTags(onCompleteCallback callback) {
-        Set set = new HashSet();
+        Set<String> set = new HashSet<>();
         JGYUtils.getInstance().getAppPlatform(platform -> {
             if (platform == JGYUtils.MTKPlatform) {
                 set.add(JGYUtils.MTKTag);
@@ -201,13 +206,17 @@ public class NetInterfaceManager {
                 set.add(JGYUtils.NewZhanruiTag);
             } else if (platform == JGYUtils.UMTK11Platform) {
                 set.add(JGYUtils.UMTK11Tag);
+            } else if (platform == JGYUtils.UZY12Platform) {
+                set.add(JGYUtils.UZY12Tag);
+            } else if (platform == JGYUtils.TeclastMTK12Platform) {
+                set.add(JGYUtils.TeclastMTK12Tag);
             }
         });
-        clearAndAppendTags(set);
+        setpushTag(set);
         callback.onComplete();
     }
 
-    private void clearAndAppendTags(Set tagSets) {
+    private void setpushTag(Set<String> tagSets) {
         XGPushManager.clearAndAppendTags(mContext, "clearAndAppendTags :" + System.currentTimeMillis(), tagSets, new XGIOperateCallback() {
             @Override
             public void onSuccess(Object o, int i) {
@@ -219,6 +228,19 @@ public class NetInterfaceManager {
                 Log.e("setPushTags", "onFail: " + o);
             }
         });
-    }
+        String[] tag = new ArrayList<>(tagSets).toArray(new String[tagSets.size()]);
+        CloudPushService pushService = PushServiceFactory.getCloudPushService();
+        pushService.bindTag(CloudPushService.DEVICE_TARGET, tag, null, new CommonCallback() {
+            @Override
+            public void onSuccess(String s) {
+                Log.e("bindTag","bind tag " + Arrays.toString(tag) + " success\n");
+            }
 
-}
+            @Override
+            public void onFailed(String errorCode, String errorMsg) {
+                Log.e("bindTag","bind tag " + Arrays.toString(tag) + " failed." +
+                        "errorCode: " + errorCode + ", errorMsg:" + errorMsg + "\n");
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/uiui/appstore/network/UrlAddress.java b/app/src/main/java/com/uiui/zyappstore/network/UrlAddress.java
similarity index 87%
rename from app/src/main/java/com/uiui/appstore/network/UrlAddress.java
rename to app/src/main/java/com/uiui/zyappstore/network/UrlAddress.java
index a5dd3d4..ad92c67 100644
--- a/app/src/main/java/com/uiui/appstore/network/UrlAddress.java
+++ b/app/src/main/java/com/uiui/zyappstore/network/UrlAddress.java
@@ -1,7 +1,7 @@
-package com.uiui.appstore.network;
+package com.uiui.zyappstore.network;
 
 public class UrlAddress {
-    final static String ROOT_URL = "https://led.zuoyepad.com/android/";
+    public static final String ROOT_URL = "https://led.aolelearn.com/android/";
 
     //获取所有应用
     public final static String GET_ALL_APPINFO = "app/queryAllApp";
diff --git a/app/src/main/java/com/uiui/appstore/network/api/AdminAppApi.java b/app/src/main/java/com/uiui/zyappstore/network/api/AdminAppApi.java
similarity index 56%
rename from app/src/main/java/com/uiui/appstore/network/api/AdminAppApi.java
rename to app/src/main/java/com/uiui/zyappstore/network/api/AdminAppApi.java
index e5e2648..3bc28c6 100644
--- a/app/src/main/java/com/uiui/appstore/network/api/AdminAppApi.java
+++ b/app/src/main/java/com/uiui/zyappstore/network/api/AdminAppApi.java
@@ -1,8 +1,8 @@
-package com.uiui.appstore.network.api;
+package com.uiui.zyappstore.network.api;
 
-import com.uiui.appstore.bean.AppInfo;
-import com.uiui.appstore.bean.BaseResponse;
-import com.uiui.appstore.network.UrlAddress;
+import com.uiui.zyappstore.bean.AppInfo;
+import com.uiui.zyappstore.bean.BaseResponse;
+import com.uiui.zyappstore.network.UrlAddress;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/uiui/appstore/network/api/AdminAppClassApi.java b/app/src/main/java/com/uiui/zyappstore/network/api/AdminAppClassApi.java
similarity index 58%
rename from app/src/main/java/com/uiui/appstore/network/api/AdminAppClassApi.java
rename to app/src/main/java/com/uiui/zyappstore/network/api/AdminAppClassApi.java
index f81e47d..2735239 100644
--- a/app/src/main/java/com/uiui/appstore/network/api/AdminAppClassApi.java
+++ b/app/src/main/java/com/uiui/zyappstore/network/api/AdminAppClassApi.java
@@ -1,8 +1,8 @@
-package com.uiui.appstore.network.api;
+package com.uiui.zyappstore.network.api;
 
-import com.uiui.appstore.bean.AppClassBean;
-import com.uiui.appstore.bean.BaseResponse;
-import com.uiui.appstore.network.UrlAddress;
+import com.uiui.zyappstore.bean.AppClassBean;
+import com.uiui.zyappstore.bean.BaseResponse;
+import com.uiui.zyappstore.network.UrlAddress;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/uiui/appstore/network/api/BannerImage.java b/app/src/main/java/com/uiui/zyappstore/network/api/BannerImage.java
similarity index 62%
rename from app/src/main/java/com/uiui/appstore/network/api/BannerImage.java
rename to app/src/main/java/com/uiui/zyappstore/network/api/BannerImage.java
index 46f3f96..3b0d043 100644
--- a/app/src/main/java/com/uiui/appstore/network/api/BannerImage.java
+++ b/app/src/main/java/com/uiui/zyappstore/network/api/BannerImage.java
@@ -1,8 +1,8 @@
-package com.uiui.appstore.network.api;
+package com.uiui.zyappstore.network.api;
 
-import com.uiui.appstore.bean.BaseResponse;
-import com.uiui.appstore.bean.ImageUrl;
-import com.uiui.appstore.network.UrlAddress;
+import com.uiui.zyappstore.bean.BaseResponse;
+import com.uiui.zyappstore.bean.ImageUrl;
+import com.uiui.zyappstore.network.UrlAddress;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/uiui/appstore/network/api/ClassAppApi.java b/app/src/main/java/com/uiui/zyappstore/network/api/ClassAppApi.java
similarity index 63%
rename from app/src/main/java/com/uiui/appstore/network/api/ClassAppApi.java
rename to app/src/main/java/com/uiui/zyappstore/network/api/ClassAppApi.java
index 7debda6..31a4af6 100644
--- a/app/src/main/java/com/uiui/appstore/network/api/ClassAppApi.java
+++ b/app/src/main/java/com/uiui/zyappstore/network/api/ClassAppApi.java
@@ -1,8 +1,8 @@
-package com.uiui.appstore.network.api;
+package com.uiui.zyappstore.network.api;
 
-import com.uiui.appstore.bean.AppInfo;
-import com.uiui.appstore.bean.BaseResponse;
-import com.uiui.appstore.network.UrlAddress;
+import com.uiui.zyappstore.bean.AppInfo;
+import com.uiui.zyappstore.bean.BaseResponse;
+import com.uiui.zyappstore.network.UrlAddress;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/uiui/appstore/network/api/DownloadApp.java b/app/src/main/java/com/uiui/zyappstore/network/api/DownloadApp.java
similarity index 77%
rename from app/src/main/java/com/uiui/appstore/network/api/DownloadApp.java
rename to app/src/main/java/com/uiui/zyappstore/network/api/DownloadApp.java
index 1658596..a4f3575 100644
--- a/app/src/main/java/com/uiui/appstore/network/api/DownloadApp.java
+++ b/app/src/main/java/com/uiui/zyappstore/network/api/DownloadApp.java
@@ -1,7 +1,7 @@
-package com.uiui.appstore.network.api;
+package com.uiui.zyappstore.network.api;
 
-import com.uiui.appstore.bean.BaseResponse;
-import com.uiui.appstore.network.UrlAddress;
+import com.uiui.zyappstore.bean.BaseResponse;
+import com.uiui.zyappstore.network.UrlAddress;
 
 import io.reactivex.rxjava3.core.Observable;
 import retrofit2.http.Field;
diff --git a/app/src/main/java/com/uiui/appstore/network/api/GetBanner.java b/app/src/main/java/com/uiui/zyappstore/network/api/GetBanner.java
similarity index 52%
rename from app/src/main/java/com/uiui/appstore/network/api/GetBanner.java
rename to app/src/main/java/com/uiui/zyappstore/network/api/GetBanner.java
index 082cc0f..d93b853 100644
--- a/app/src/main/java/com/uiui/appstore/network/api/GetBanner.java
+++ b/app/src/main/java/com/uiui/zyappstore/network/api/GetBanner.java
@@ -1,8 +1,8 @@
-package com.uiui.appstore.network.api;
+package com.uiui.zyappstore.network.api;
 
-import com.uiui.appstore.bean.Banner;
-import com.uiui.appstore.bean.BaseResponse;
-import com.uiui.appstore.network.UrlAddress;
+import com.uiui.zyappstore.bean.Banner;
+import com.uiui.zyappstore.bean.BaseResponse;
+import com.uiui.zyappstore.network.UrlAddress;
 
 import io.reactivex.rxjava3.core.Observable;
 import retrofit2.http.GET;
diff --git a/app/src/main/java/com/uiui/appstore/network/api/NewestAppUpdate.java b/app/src/main/java/com/uiui/zyappstore/network/api/NewestAppUpdate.java
similarity index 68%
rename from app/src/main/java/com/uiui/appstore/network/api/NewestAppUpdate.java
rename to app/src/main/java/com/uiui/zyappstore/network/api/NewestAppUpdate.java
index 90fbf97..bbe7785 100644
--- a/app/src/main/java/com/uiui/appstore/network/api/NewestAppUpdate.java
+++ b/app/src/main/java/com/uiui/zyappstore/network/api/NewestAppUpdate.java
@@ -1,10 +1,10 @@
-package com.uiui.appstore.network.api;
+package com.uiui.zyappstore.network.api;
 
 
 
-import com.uiui.appstore.bean.AppInfo;
-import com.uiui.appstore.bean.BaseResponse;
-import com.uiui.appstore.network.UrlAddress;
+import com.uiui.zyappstore.bean.AppInfo;
+import com.uiui.zyappstore.bean.BaseResponse;
+import com.uiui.zyappstore.network.UrlAddress;
 
 import io.reactivex.rxjava3.core.Observable;
 import retrofit2.http.GET;
diff --git a/app/src/main/java/com/uiui/appstore/network/api/QueryAllApp.java b/app/src/main/java/com/uiui/zyappstore/network/api/QueryAllApp.java
similarity index 62%
rename from app/src/main/java/com/uiui/appstore/network/api/QueryAllApp.java
rename to app/src/main/java/com/uiui/zyappstore/network/api/QueryAllApp.java
index eff8fb0..fad2815 100644
--- a/app/src/main/java/com/uiui/appstore/network/api/QueryAllApp.java
+++ b/app/src/main/java/com/uiui/zyappstore/network/api/QueryAllApp.java
@@ -1,8 +1,8 @@
-package com.uiui.appstore.network.api;
+package com.uiui.zyappstore.network.api;
 
-import com.uiui.appstore.bean.AppInfo;
-import com.uiui.appstore.bean.BaseResponse;
-import com.uiui.appstore.network.UrlAddress;
+import com.uiui.zyappstore.bean.AppInfo;
+import com.uiui.zyappstore.bean.BaseResponse;
+import com.uiui.zyappstore.network.UrlAddress;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/uiui/appstore/network/api/QueryPackageApp.java b/app/src/main/java/com/uiui/zyappstore/network/api/QueryPackageApp.java
similarity index 66%
rename from app/src/main/java/com/uiui/appstore/network/api/QueryPackageApp.java
rename to app/src/main/java/com/uiui/zyappstore/network/api/QueryPackageApp.java
index 527297d..b2322fd 100644
--- a/app/src/main/java/com/uiui/appstore/network/api/QueryPackageApp.java
+++ b/app/src/main/java/com/uiui/zyappstore/network/api/QueryPackageApp.java
@@ -1,8 +1,8 @@
-package com.uiui.appstore.network.api;
+package com.uiui.zyappstore.network.api;
 
-import com.uiui.appstore.bean.AppInfo;
-import com.uiui.appstore.bean.BaseResponse;
-import com.uiui.appstore.network.UrlAddress;
+import com.uiui.zyappstore.bean.AppInfo;
+import com.uiui.zyappstore.bean.BaseResponse;
+import com.uiui.zyappstore.network.UrlAddress;
 
 import io.reactivex.rxjava3.core.Observable;
 import retrofit2.http.GET;
diff --git a/app/src/main/java/com/uiui/appstore/network/api/SNInfo.java b/app/src/main/java/com/uiui/zyappstore/network/api/SNInfo.java
similarity index 60%
rename from app/src/main/java/com/uiui/appstore/network/api/SNInfo.java
rename to app/src/main/java/com/uiui/zyappstore/network/api/SNInfo.java
index 943b3ea..97b1c47 100644
--- a/app/src/main/java/com/uiui/appstore/network/api/SNInfo.java
+++ b/app/src/main/java/com/uiui/zyappstore/network/api/SNInfo.java
@@ -1,8 +1,8 @@
-package com.uiui.appstore.network.api;
+package com.uiui.zyappstore.network.api;
 
-import com.uiui.appstore.bean.BaseResponse;
-import com.uiui.appstore.bean.UserInfo;
-import com.uiui.appstore.network.UrlAddress;
+import com.uiui.zyappstore.bean.BaseResponse;
+import com.uiui.zyappstore.bean.UserInfo;
+import com.uiui.zyappstore.network.UrlAddress;
 
 import io.reactivex.rxjava3.core.Observable;
 import retrofit2.http.GET;
diff --git a/app/src/main/java/com/uiui/appstore/network/api/SearchAdminAppApi.java b/app/src/main/java/com/uiui/zyappstore/network/api/SearchAdminAppApi.java
similarity index 64%
rename from app/src/main/java/com/uiui/appstore/network/api/SearchAdminAppApi.java
rename to app/src/main/java/com/uiui/zyappstore/network/api/SearchAdminAppApi.java
index f28778e..2eb5aa9 100644
--- a/app/src/main/java/com/uiui/appstore/network/api/SearchAdminAppApi.java
+++ b/app/src/main/java/com/uiui/zyappstore/network/api/SearchAdminAppApi.java
@@ -1,8 +1,8 @@
-package com.uiui.appstore.network.api;
+package com.uiui.zyappstore.network.api;
 
-import com.uiui.appstore.bean.AppInfo;
-import com.uiui.appstore.bean.BaseResponse;
-import com.uiui.appstore.network.UrlAddress;
+import com.uiui.zyappstore.bean.AppInfo;
+import com.uiui.zyappstore.bean.BaseResponse;
+import com.uiui.zyappstore.network.UrlAddress;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/uiui/appstore/network/api/SearchAppApi.java b/app/src/main/java/com/uiui/zyappstore/network/api/SearchAppApi.java
similarity index 66%
rename from app/src/main/java/com/uiui/appstore/network/api/SearchAppApi.java
rename to app/src/main/java/com/uiui/zyappstore/network/api/SearchAppApi.java
index 00e2ece..3f02384 100644
--- a/app/src/main/java/com/uiui/appstore/network/api/SearchAppApi.java
+++ b/app/src/main/java/com/uiui/zyappstore/network/api/SearchAppApi.java
@@ -1,8 +1,8 @@
-package com.uiui.appstore.network.api;
+package com.uiui.zyappstore.network.api;
 
-import com.uiui.appstore.bean.AppInfo;
-import com.uiui.appstore.bean.BaseResponse;
-import com.uiui.appstore.network.UrlAddress;
+import com.uiui.zyappstore.bean.AppInfo;
+import com.uiui.zyappstore.bean.BaseResponse;
+import com.uiui.zyappstore.network.UrlAddress;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/uiui/appstore/network/interceptor/RepeatRequestInterceptor.java b/app/src/main/java/com/uiui/zyappstore/network/interceptor/RepeatRequestInterceptor.java
similarity index 96%
rename from app/src/main/java/com/uiui/appstore/network/interceptor/RepeatRequestInterceptor.java
rename to app/src/main/java/com/uiui/zyappstore/network/interceptor/RepeatRequestInterceptor.java
index 5b69268..3b1eca7 100644
--- a/app/src/main/java/com/uiui/appstore/network/interceptor/RepeatRequestInterceptor.java
+++ b/app/src/main/java/com/uiui/zyappstore/network/interceptor/RepeatRequestInterceptor.java
@@ -1,10 +1,10 @@
-package com.uiui.appstore.network.interceptor;
+package com.uiui.zyappstore.network.interceptor;
 
 import android.util.Log;
 
 
-import com.uiui.appstore.BuildConfig;
-import com.uiui.appstore.utils.MD5Util;
+import com.uiui.zyappstore.BuildConfig;
+import com.uiui.zyappstore.utils.MD5Util;
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/app/src/main/java/com/uiui/zyappstore/push/PushManager.java b/app/src/main/java/com/uiui/zyappstore/push/PushManager.java
new file mode 100644
index 0000000..de90ba9
--- /dev/null
+++ b/app/src/main/java/com/uiui/zyappstore/push/PushManager.java
@@ -0,0 +1,85 @@
+package com.uiui.zyappstore.push;
+
+import android.annotation.SuppressLint;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.text.TextUtils;
+
+import com.arialyy.aria.core.Aria;
+import com.arialyy.aria.core.download.DownloadEntity;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.uiui.zyappstore.disklrucache.CacheHelper;
+import com.uiui.zyappstore.utils.FileUtils;
+import com.uiui.zyappstore.utils.JGYUtils;
+import com.uiui.zyappstore.utils.ToastUtil;
+
+import java.io.File;
+import java.util.List;
+
+public class PushManager {
+    private static final String TAG = PushManager.class.getSimpleName();
+
+    @SuppressLint("StaticFieldLeak")
+    private static PushManager sInstance;
+    private Context mContext;
+    private ContentResolver mResolver;
+    private CacheHelper mCacheHelper;
+
+    private PushManager(Context context) {
+        if (context == null) {
+            throw new RuntimeException("Context is NULL");
+        }
+        this.mContext = context;
+        this.mResolver = context.getContentResolver();
+        this.mCacheHelper = new CacheHelper(context);
+    }
+
+    public static void init(Context context) {
+        if (sInstance == null) {
+            sInstance = new PushManager(context);
+        }
+    }
+
+    public static PushManager getInstance() {
+        if (sInstance == null) {
+            throw new IllegalStateException("You must be init PushManager first");
+        }
+        return sInstance;
+    }
+
+    // 9.强制安装应用
+    private static final String ACTION_FORCE_INSTALLAPK = "9";
+
+    public void setPushContent(String title, String extras) {
+        switch (title) {
+            case ACTION_FORCE_INSTALLAPK:
+                forceInstallApk( extras);
+                break;
+            default:
+        }
+    }
+
+    private void forceInstallApk(String jsonString) {
+        if (TextUtils.isEmpty(jsonString)) {
+            return;
+        }
+        JsonObject jsonObject = JsonParser.parseString(jsonString).getAsJsonObject();
+        final String packages = jsonObject.get("package").getAsString();
+        ToastUtil.debugShow("收到应用安装消息：包名" + packages);
+        String url = jsonObject.get("url").getAsString();
+        if (TextUtils.isEmpty(url)) {
+            return;
+        }
+        if (Aria.download(this).taskExists(url)) {
+            List<DownloadEntity> entity = Aria.download(this).getDownloadEntity(url);
+            for (DownloadEntity downloadEntity : entity) {
+                Aria.download(this).load(downloadEntity.getId()).cancel(true);
+            }
+        }
+        File file = new File(JGYUtils.getInstance().getDownLoadPath());
+        file.mkdirs();
+        FileUtils.ariaDownload(mContext, url, jsonObject);
+        Aria.download(this).resumeAllTask();
+    }
+}
diff --git a/app/src/main/java/com/uiui/zyappstore/push/alipush/AliMessageIntentService.java b/app/src/main/java/com/uiui/zyappstore/push/alipush/AliMessageIntentService.java
new file mode 100644
index 0000000..58e371b
--- /dev/null
+++ b/app/src/main/java/com/uiui/zyappstore/push/alipush/AliMessageIntentService.java
@@ -0,0 +1,99 @@
+package com.uiui.zyappstore.push.alipush;
+
+import android.content.Context;
+import android.util.Log;
+
+import com.alibaba.sdk.android.push.AliyunMessageIntentService;
+import com.alibaba.sdk.android.push.notification.CPushMessage;
+
+import java.util.Map;
+
+/**
+ * Created by liyazhou on 17/8/22.
+ * 为避免推送广播被系统拦截的小概率事件,我们推荐用户通过IntentService处理消息互调,接入步骤:
+ * 1. 创建IntentService并继承AliyunMessageIntentService
+ * 2. 覆写相关方法,并在Manifest的注册该Service
+ * 3. 调用接口CloudPushService.setPushIntentService
+ * 详细用户可参考:https://help.aliyun.com/document_detail/30066.html#h2-2-messagereceiver-aliyunmessageintentservice
+ */
+
+public class AliMessageIntentService extends AliyunMessageIntentService {
+    private static final String TAG = AliyunMessageIntentService.class.getSimpleName();
+
+    /**
+     * 推送通知的回调方法
+     *
+     * @param context
+     * @param title
+     * @param summary
+     * @param extraMap
+     */
+    @Override
+    protected void onNotification(Context context, String title, String summary, Map<String, String> extraMap) {
+        Log.i(TAG, "收到一条推送通知 ： " + title + ", summary:" + summary);
+    }
+
+    /**
+     * 推送消息的回调方法
+     *
+     * @param context
+     * @param cPushMessage
+     */
+    @Override
+    protected void onMessage(Context context, CPushMessage cPushMessage) {
+        Log.i(TAG, "收到一条推送消息 ： " + cPushMessage.getTitle() + ", content:" + cPushMessage.getContent());
+    }
+
+    /**
+     * 从通知栏打开通知的扩展处理
+     *
+     * @param context
+     * @param title
+     * @param summary
+     * @param extraMap
+     */
+    @Override
+    protected void onNotificationOpened(Context context, String title, String summary, String extraMap) {
+        Log.i(TAG, "onNotificationOpened ： " + " : " + title + " : " + summary + " : " + extraMap);
+    }
+
+    /**
+     * 无动作通知点击回调。当在后台或阿里云控制台指定的通知动作为无逻辑跳转时,通知点击回调为onNotificationClickedWithNoAction而不是onNotificationOpened
+     *
+     * @param context
+     * @param title
+     * @param summary
+     * @param extraMap
+     */
+    @Override
+    protected void onNotificationClickedWithNoAction(Context context, String title, String summary, String extraMap) {
+        Log.i(TAG, "onNotificationClickedWithNoAction ： " + " : " + title + " : " + summary + " : " + extraMap);
+    }
+
+    /**
+     * 通知删除回调
+     *
+     * @param context
+     * @param messageId
+     */
+    @Override
+    protected void onNotificationRemoved(Context context, String messageId) {
+        Log.i(TAG, "onNotificationRemoved ： " + messageId);
+    }
+
+    /**
+     * 应用处于前台时通知到达回调。注意:该方法仅对自定义样式通知有效,相关详情请参考https://help.aliyun.com/document_detail/30066.html#h3-3-4-basiccustompushnotification-api
+     *
+     * @param context
+     * @param title
+     * @param summary
+     * @param extraMap
+     * @param openType
+     * @param openActivity
+     * @param openUrl
+     */
+    @Override
+    protected void onNotificationReceivedInApp(Context context, String title, String summary, Map<String, String> extraMap, int openType, String openActivity, String openUrl) {
+        Log.i(TAG, "onNotificationReceivedInApp ： " + " : " + title + " : " + summary + "  " + extraMap + " : " + openType + " : " + openActivity + " : " + openUrl);
+    }
+}
diff --git a/app/src/main/java/com/uiui/zyappstore/push/alipush/AliyunMessageReceiver.java b/app/src/main/java/com/uiui/zyappstore/push/alipush/AliyunMessageReceiver.java
new file mode 100644
index 0000000..37a04d0
--- /dev/null
+++ b/app/src/main/java/com/uiui/zyappstore/push/alipush/AliyunMessageReceiver.java
@@ -0,0 +1,116 @@
+package com.uiui.zyappstore.push.alipush;
+
+import android.content.Context;
+import android.util.Log;
+
+import com.alibaba.sdk.android.push.MessageReceiver;
+import com.alibaba.sdk.android.push.notification.CPushMessage;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.uiui.zyappstore.push.PushManager;
+
+import java.util.Map;
+
+/**
+ * @author: 正纬
+ * @since: 15/4/9
+ * @version: 1.1
+ * @feature: 用于接收推送的通知和消息
+ */
+public class AliyunMessageReceiver extends MessageReceiver {
+    // 消息接收部分的LOG_TAG
+    public static final String TAG = AliyunMessageReceiver.class.getSimpleName();
+
+    /**
+     * 推送通知的回调方法
+     *
+     * @param context
+     * @param title
+     * @param summary
+     * @param extraMap
+     */
+    @Override
+    public void onNotification(Context context, String title, String summary, Map<String, String> extraMap) {
+        // TODO 处理推送通知
+        if (null != extraMap) {
+            for (Map.Entry<String, String> entry : extraMap.entrySet()) {
+                Log.i(TAG, "@Get diy param : Key=" + entry.getKey() + " , Value=" + entry.getValue());
+            }
+        } else {
+            Log.i(TAG, "@收到通知 && 自定义消息为空");
+        }
+        Log.i(TAG, "收到一条推送通知 ： " + title + ", summary:" + summary);
+    }
+
+    /**
+     * 应用处于前台时通知到达回调。注意:该方法仅对自定义样式通知有效,相关详情请参考https://help.aliyun.com/document_detail/30066.html?spm=5176.product30047.6.620.wjcC87#h3-3-4-basiccustompushnotification-api
+     *
+     * @param context
+     * @param title
+     * @param summary
+     * @param extraMap
+     * @param openType
+     * @param openActivity
+     * @param openUrl
+     */
+    @Override
+    protected void onNotificationReceivedInApp(Context context, String title, String summary, Map<String, String> extraMap, int openType, String openActivity, String openUrl) {
+        Log.i(TAG, "onNotificationReceivedInApp ： " + " : " + title + " : " + summary + "  " + extraMap + " : " + openType + " : " + openActivity + " : " + openUrl);
+    }
+
+    /**
+     * 推送消息的回调方法
+     *
+     * @param context
+     * @param cPushMessage
+     */
+    @Override
+    public void onMessage(Context context, CPushMessage cPushMessage) {
+        Log.e(TAG, "收到一条推送消息 ： " + cPushMessage.getTitle() + ", content:" + cPushMessage.getContent());
+        String title = cPushMessage.getTitle();
+        String content = cPushMessage.getContent();
+        JsonObject extrasJson = JsonParser.parseString(content).getAsJsonObject();
+        String extras = "";
+        if (extrasJson.get("extras") != null) {
+            extras = extrasJson.get("extras").toString();
+        }
+        PushManager.getInstance().setPushContent(title, extras);
+    }
+
+    /**
+     * 从通知栏打开通知的扩展处理
+     *
+     * @param context
+     * @param title
+     * @param summary
+     * @param extraMap
+     */
+    @Override
+    public void onNotificationOpened(Context context, String title, String summary, String extraMap) {
+        Log.i(TAG, "onNotificationOpened ： " + " : " + title + " : " + summary + " : " + extraMap);
+    }
+
+    /**
+     * 通知删除回调
+     *
+     * @param context
+     * @param messageId
+     */
+    @Override
+    public void onNotificationRemoved(Context context, String messageId) {
+        Log.i(TAG, "onNotificationRemoved ： " + messageId);
+    }
+
+    /**
+     * 无动作通知点击回调。当在后台或阿里云控制台指定的通知动作为无逻辑跳转时,通知点击回调为onNotificationClickedWithNoAction而不是onNotificationOpened
+     *
+     * @param context
+     * @param title
+     * @param summary
+     * @param extraMap
+     */
+    @Override
+    protected void onNotificationClickedWithNoAction(Context context, String title, String summary, String extraMap) {
+        Log.i(TAG, "onNotificationClickedWithNoAction ： " + " : " + title + " : " + summary + " : " + extraMap);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/uiui/appstore/tpush/Constants.java b/app/src/main/java/com/uiui/zyappstore/push/tpush/Constants.java
similarity index 92%
rename from app/src/main/java/com/uiui/appstore/tpush/Constants.java
rename to app/src/main/java/com/uiui/zyappstore/push/tpush/Constants.java
index f1800dc..8984373 100644
--- a/app/src/main/java/com/uiui/appstore/tpush/Constants.java
+++ b/app/src/main/java/com/uiui/zyappstore/push/tpush/Constants.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.tpush;
+package com.uiui.zyappstore.push.tpush;
 
 /**
  * Created by chacewang on 2019/7/5.
diff --git a/app/src/main/java/com/uiui/appstore/tpush/MessageReceiver.java b/app/src/main/java/com/uiui/zyappstore/push/tpush/MessageReceiver.java
similarity index 87%
rename from app/src/main/java/com/uiui/appstore/tpush/MessageReceiver.java
rename to app/src/main/java/com/uiui/zyappstore/push/tpush/MessageReceiver.java
index a148706..393806e 100644
--- a/app/src/main/java/com/uiui/appstore/tpush/MessageReceiver.java
+++ b/app/src/main/java/com/uiui/zyappstore/push/tpush/MessageReceiver.java
@@ -1,10 +1,9 @@
-package com.uiui.appstore.tpush;
+package com.uiui.zyappstore.push.tpush;
 
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.os.Environment;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
@@ -19,11 +18,12 @@ import com.tencent.android.tpush.XGPushClickedResult;
 import com.tencent.android.tpush.XGPushRegisterResult;
 import com.tencent.android.tpush.XGPushShowedResult;
 import com.tencent.android.tpush.XGPushTextMessage;
-import com.uiui.appstore.tpush.common.NotificationService;
-import com.uiui.appstore.tpush.po.XGNotification;
-import com.uiui.appstore.utils.FileUtils;
-import com.uiui.appstore.utils.JGYUtils;
-import com.uiui.appstore.utils.ToastUtil;
+import com.uiui.zyappstore.push.PushManager;
+import com.uiui.zyappstore.push.tpush.common.NotificationService;
+import com.uiui.zyappstore.push.tpush.po.XGNotification;
+import com.uiui.zyappstore.utils.FileUtils;
+import com.uiui.zyappstore.utils.JGYUtils;
+import com.uiui.zyappstore.utils.ToastUtil;
 
 import java.io.File;
 import java.text.SimpleDateFormat;
@@ -295,9 +295,6 @@ public class MessageReceiver extends XGPushBaseReceiver {
 //        Toast.makeText(context, text, Toast.LENGTH_SHORT).show();
     }
 
-    // 9.强制安装应用
-    private static final String ACTION_FORCE_INSTALLAPK = "9";
-
     private void processCustomMessage(Context context, XGPushTextMessage message) {
         if (context == null || message == null) {
             return;
@@ -311,36 +308,6 @@ public class MessageReceiver extends XGPushBaseReceiver {
         if (extrasJson.get("extras") != null) {
             extras = extrasJson.get("extras").toString();
         }
-
-        switch (title) {
-            case ACTION_FORCE_INSTALLAPK:
-                forceInstallApk(context, extras);
-                break;
-            default:
-        }
-
-    }
-
-    private void forceInstallApk(Context context, String jsonString) {
-        if (TextUtils.isEmpty(jsonString)) {
-            return;
-        }
-        JsonObject jsonObject = JsonParser.parseString(jsonString).getAsJsonObject();
-        final String packages = jsonObject.get("package").getAsString();
-        ToastUtil.debugShow("收到应用安装消息：包名" + packages);
-        String url = jsonObject.get("url").getAsString();
-        if (TextUtils.isEmpty(url)) {
-            return;
-        }
-        if (Aria.download(this).taskExists(url)) {
-            List<DownloadEntity> entity = Aria.download(this).getDownloadEntity(url);
-            for (DownloadEntity downloadEntity : entity) {
-                Aria.download(this).load(downloadEntity.getId()).cancel(true);
-            }
-        }
-        File file = new File(JGYUtils.getInstance().getDownLoadPath());
-        file.mkdirs();
-        FileUtils.ariaDownload(context, url, jsonObject);
-        Aria.download(this).resumeAllTask();
+        PushManager.getInstance().setPushContent(title, extras);
     }
 }
diff --git a/app/src/main/java/com/uiui/appstore/tpush/common/DBOpenHelper.java b/app/src/main/java/com/uiui/zyappstore/push/tpush/common/DBOpenHelper.java
similarity index 93%
rename from app/src/main/java/com/uiui/appstore/tpush/common/DBOpenHelper.java
rename to app/src/main/java/com/uiui/zyappstore/push/tpush/common/DBOpenHelper.java
index 70d5b53..5bd3d59 100644
--- a/app/src/main/java/com/uiui/appstore/tpush/common/DBOpenHelper.java
+++ b/app/src/main/java/com/uiui/zyappstore/push/tpush/common/DBOpenHelper.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.tpush.common;
+package com.uiui.zyappstore.push.tpush.common;
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
diff --git a/app/src/main/java/com/uiui/appstore/tpush/common/NotificationService.java b/app/src/main/java/com/uiui/zyappstore/push/tpush/common/NotificationService.java
similarity index 97%
rename from app/src/main/java/com/uiui/appstore/tpush/common/NotificationService.java
rename to app/src/main/java/com/uiui/zyappstore/push/tpush/common/NotificationService.java
index fa2c565..323bd58 100644
--- a/app/src/main/java/com/uiui/appstore/tpush/common/NotificationService.java
+++ b/app/src/main/java/com/uiui/zyappstore/push/tpush/common/NotificationService.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.tpush.common;
+package com.uiui.zyappstore.push.tpush.common;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -6,7 +6,7 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 
 
-import com.uiui.appstore.tpush.po.XGNotification;
+import com.uiui.zyappstore.push.tpush.po.XGNotification;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/com/uiui/appstore/tpush/po/XGNotification.java b/app/src/main/java/com/uiui/zyappstore/push/tpush/po/XGNotification.java
similarity index 97%
rename from app/src/main/java/com/uiui/appstore/tpush/po/XGNotification.java
rename to app/src/main/java/com/uiui/zyappstore/push/tpush/po/XGNotification.java
index bf4be2a..8c239e7 100644
--- a/app/src/main/java/com/uiui/appstore/tpush/po/XGNotification.java
+++ b/app/src/main/java/com/uiui/zyappstore/push/tpush/po/XGNotification.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.tpush.po;
+package com.uiui.zyappstore.push.tpush.po;
 
 public class XGNotification {
 	private Integer id;
diff --git a/app/src/main/java/com/uiui/appstore/receiver/AppManagerReceiver.java b/app/src/main/java/com/uiui/zyappstore/receiver/AppManagerReceiver.java
similarity index 84%
rename from app/src/main/java/com/uiui/appstore/receiver/AppManagerReceiver.java
rename to app/src/main/java/com/uiui/zyappstore/receiver/AppManagerReceiver.java
index 705718d..4ec2f3b 100644
--- a/app/src/main/java/com/uiui/appstore/receiver/AppManagerReceiver.java
+++ b/app/src/main/java/com/uiui/zyappstore/receiver/AppManagerReceiver.java
@@ -1,14 +1,14 @@
-package com.uiui.appstore.receiver;
+package com.uiui.zyappstore.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
 
-import com.uiui.appstore.utils.ApkUtils;
-import com.uiui.appstore.utils.LogUtils;
-import com.uiui.appstore.utils.SPUtils;
-import com.uiui.appstore.utils.ToastUtil;
+import com.uiui.zyappstore.utils.ApkUtils;
+import com.uiui.zyappstore.utils.LogUtils;
+import com.uiui.zyappstore.utils.SPUtils;
+import com.uiui.zyappstore.utils.ToastUtil;
 
 import java.util.Arrays;
 
@@ -28,11 +28,11 @@ public class AppManagerReceiver extends BroadcastReceiver {
         if (action.equals(Intent.ACTION_PACKAGE_ADDED) || action.equals(Intent.ACTION_PACKAGE_REPLACED)) {
             String packageName = intent.getDataString().replace("package:", "");
             if (action.equals(Intent.ACTION_PACKAGE_ADDED)) {
-                Intent intents = new Intent("com.uiui.appstore.PACKAGE_ADDED");
+                Intent intents = new Intent("com.uiui.zyappstore.PACKAGE_ADDED");
                 intents.putExtra("package", packageName);
                 context.sendBroadcast(intents);
             } else {
-                Intent intents = new Intent("com.uiui.appstore.PACKAGE_REPLACED");
+                Intent intents = new Intent("com.uiui.zyappstore.PACKAGE_REPLACED");
                 intents.putExtra("package", packageName);
                 context.sendBroadcast(intents);
             }
@@ -53,7 +53,7 @@ public class AppManagerReceiver extends BroadcastReceiver {
         if (action.equals(Intent.ACTION_PACKAGE_REMOVED)) {
             String packageName = intent.getDataString().replace("package:", "");
             LogUtils.e(TAG, "卸载了:" + packageName + "包名的程序");
-            Intent intents = new Intent("com.uiui.appstore.PACKAGE_REMOVED");
+            Intent intents = new Intent("com.uiui.zyappstore.PACKAGE_REMOVED");
             context.sendBroadcast(intents);
             if (!packageName.equals(context.getPackageName()) && !Arrays.asList(packages).contains(packageName)) {
                 if (admin_id == -1 || sn_id == -1) {
@@ -71,7 +71,7 @@ public class AppManagerReceiver extends BroadcastReceiver {
     }
 
     String[] packages = {
-            "com.uiui.appstore",
+            "com.uiui.zyappstore",
             "com.uiuios.updatetools",
             "com.uiui.sn",
             "com.android.uiuios",
diff --git a/app/src/main/java/com/uiui/appstore/receiver/BootReceiver.java b/app/src/main/java/com/uiui/zyappstore/receiver/BootReceiver.java
similarity index 78%
rename from app/src/main/java/com/uiui/appstore/receiver/BootReceiver.java
rename to app/src/main/java/com/uiui/zyappstore/receiver/BootReceiver.java
index c9906af..982b474 100644
--- a/app/src/main/java/com/uiui/appstore/receiver/BootReceiver.java
+++ b/app/src/main/java/com/uiui/zyappstore/receiver/BootReceiver.java
@@ -1,15 +1,15 @@
-package com.uiui.appstore.receiver;
+package com.uiui.zyappstore.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
 
-import com.uiui.appstore.service.GuardService;
-import com.uiui.appstore.service.main.MainService;
-import com.uiui.appstore.service.StepService;
-import com.uiui.appstore.utils.JGYUtils;
-import com.uiui.appstore.utils.LogUtils;
+import com.uiui.zyappstore.service.GuardService;
+import com.uiui.zyappstore.service.main.MainService;
+import com.uiui.zyappstore.service.StepService;
+import com.uiui.zyappstore.utils.JGYUtils;
+import com.uiui.zyappstore.utils.LogUtils;
 
 public class BootReceiver extends BroadcastReceiver {
     public static final String BOOT_COMPLETED = "zuoyeos.action.BOOT_COMPLETED";
diff --git a/app/src/main/java/com/uiui/appstore/receiver/InstallResultReceiver.java b/app/src/main/java/com/uiui/zyappstore/receiver/InstallResultReceiver.java
similarity index 96%
rename from app/src/main/java/com/uiui/appstore/receiver/InstallResultReceiver.java
rename to app/src/main/java/com/uiui/zyappstore/receiver/InstallResultReceiver.java
index da1d53e..ab1035f 100644
--- a/app/src/main/java/com/uiui/appstore/receiver/InstallResultReceiver.java
+++ b/app/src/main/java/com/uiui/zyappstore/receiver/InstallResultReceiver.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.receiver;
+package com.uiui.zyappstore.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -9,7 +9,7 @@ import android.util.Log;
 
 import androidx.annotation.RequiresApi;
 
-import com.uiui.appstore.utils.ToastUtil;
+import com.uiui.zyappstore.utils.ToastUtil;
 
 
 public class InstallResultReceiver extends BroadcastReceiver {
diff --git a/app/src/main/java/com/uiui/appstore/receiver/NewAppReceiver.java b/app/src/main/java/com/uiui/zyappstore/receiver/NewAppReceiver.java
similarity index 96%
rename from app/src/main/java/com/uiui/appstore/receiver/NewAppReceiver.java
rename to app/src/main/java/com/uiui/zyappstore/receiver/NewAppReceiver.java
index 98cca4e..49a0642 100644
--- a/app/src/main/java/com/uiui/appstore/receiver/NewAppReceiver.java
+++ b/app/src/main/java/com/uiui/zyappstore/receiver/NewAppReceiver.java
@@ -1,14 +1,13 @@
-package com.uiui.appstore.receiver;
+package com.uiui.zyappstore.receiver;
 
 import android.annotation.SuppressLint;
 import android.content.BroadcastReceiver;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.uiui.appstore.utils.JGYUtils;
+import com.uiui.zyappstore.utils.JGYUtils;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/app/src/main/java/com/uiui/appstore/service/MyDownloadService.java b/app/src/main/java/com/uiui/zyappstore/service/DownloadService.java
similarity index 90%
rename from app/src/main/java/com/uiui/appstore/service/MyDownloadService.java
rename to app/src/main/java/com/uiui/zyappstore/service/DownloadService.java
index d41a1a8..e9646a5 100644
--- a/app/src/main/java/com/uiui/appstore/service/MyDownloadService.java
+++ b/app/src/main/java/com/uiui/zyappstore/service/DownloadService.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.service;
+package com.uiui.zyappstore.service;
 
 import android.app.Service;
 import android.content.Intent;
@@ -7,7 +7,7 @@ import android.os.IBinder;
 import androidx.annotation.Nullable;
 
 //  下载管理服务
-public class MyDownloadService extends Service {
+public class DownloadService extends Service {
 
 
     @Override
diff --git a/app/src/main/java/com/uiui/appstore/service/GuardService.java b/app/src/main/java/com/uiui/zyappstore/service/GuardService.java
similarity index 90%
rename from app/src/main/java/com/uiui/appstore/service/GuardService.java
rename to app/src/main/java/com/uiui/zyappstore/service/GuardService.java
index c156557..2624205 100644
--- a/app/src/main/java/com/uiui/appstore/service/GuardService.java
+++ b/app/src/main/java/com/uiui/zyappstore/service/GuardService.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.service;
+package com.uiui.zyappstore.service;
 
 /**
  * 作者 mjsheng
@@ -23,15 +23,15 @@ import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.task.DownloadTask;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import com.uiui.appstore.KeepAliveConnection;
-import com.uiui.appstore.bean.BaseResponse;
-import com.uiui.appstore.network.NetInterfaceManager;
-import com.uiui.appstore.receiver.NewAppReceiver;
-import com.uiui.appstore.utils.ApkUtils;
-import com.uiui.appstore.utils.LogUtils;
-import com.uiui.appstore.utils.SPUtils;
-import com.uiui.appstore.utils.ServiceAliveUtils;
-import com.uiui.appstore.utils.Utils;
+import com.uiui.zyappstore.KeepAliveConnection;
+import com.uiui.zyappstore.bean.BaseResponse;
+import com.uiui.zyappstore.network.NetInterfaceManager;
+import com.uiui.zyappstore.receiver.NewAppReceiver;
+import com.uiui.zyappstore.utils.ApkUtils;
+import com.uiui.zyappstore.utils.LogUtils;
+import com.uiui.zyappstore.utils.SPUtils;
+import com.uiui.zyappstore.utils.ServiceAliveUtils;
+import com.uiui.zyappstore.utils.Utils;
 
 import java.io.File;
 
@@ -54,9 +54,9 @@ public class GuardService extends Service {
         @Override
         public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
             LogUtils.e(TAG, "GuardService:建立链接");
-            boolean isServiceRunning = ServiceAliveUtils.isServiceAlice();
+            boolean isServiceRunning = ServiceAliveUtils.isServiceAlice(GuardService.this);
             if (!isServiceRunning) {
-                Intent i = new Intent(GuardService.this, MyDownloadService.class);
+                Intent i = new Intent(GuardService.this, DownloadService.class);
                 startService(i);
             }
         }
diff --git a/app/src/main/java/com/uiui/appstore/service/StepService.java b/app/src/main/java/com/uiui/zyappstore/service/StepService.java
similarity index 85%
rename from app/src/main/java/com/uiui/appstore/service/StepService.java
rename to app/src/main/java/com/uiui/zyappstore/service/StepService.java
index 39afbdf..1986662 100644
--- a/app/src/main/java/com/uiui/appstore/service/StepService.java
+++ b/app/src/main/java/com/uiui/zyappstore/service/StepService.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.service;
+package com.uiui.zyappstore.service;
 
 /**
  * 作者 mjsheng
@@ -16,9 +16,9 @@ import android.os.IBinder;
 
 import androidx.annotation.Nullable;
 
-import com.uiui.appstore.KeepAliveConnection;
-import com.uiui.appstore.utils.LogUtils;
-import com.uiui.appstore.utils.ServiceAliveUtils;
+import com.uiui.zyappstore.KeepAliveConnection;
+import com.uiui.zyappstore.utils.LogUtils;
+import com.uiui.zyappstore.utils.ServiceAliveUtils;
 
 /**
  * 主进程 双进程通讯
@@ -33,9 +33,9 @@ public class StepService extends Service {
         @Override
         public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
             LogUtils.e(TAG, "StepService:建立链接");
-            boolean isServiceRunning = ServiceAliveUtils.isServiceAlice();
+            boolean isServiceRunning = ServiceAliveUtils.isServiceAlice(StepService.this);
             if (!isServiceRunning) {
-                Intent i = new Intent(StepService.this, MyDownloadService.class);
+                Intent i = new Intent(StepService.this, DownloadService.class);
                 startService(i);
             }
         }
diff --git a/app/src/main/java/com/uiui/appstore/service/main/MainSContact.java b/app/src/main/java/com/uiui/zyappstore/service/main/MainSContact.java
similarity index 63%
rename from app/src/main/java/com/uiui/appstore/service/main/MainSContact.java
rename to app/src/main/java/com/uiui/zyappstore/service/main/MainSContact.java
index 5b70c78..9fe4df3 100644
--- a/app/src/main/java/com/uiui/appstore/service/main/MainSContact.java
+++ b/app/src/main/java/com/uiui/zyappstore/service/main/MainSContact.java
@@ -1,7 +1,7 @@
-package com.uiui.appstore.service.main;
+package com.uiui.zyappstore.service.main;
 
-import com.uiui.appstore.base.BasePresenter;
-import com.uiui.appstore.base.BaseView;
+import com.uiui.zyappstore.base.BasePresenter;
+import com.uiui.zyappstore.base.BaseView;
 
 public class MainSContact {
     public interface MainView  extends BaseView {
diff --git a/app/src/main/java/com/uiui/appstore/service/main/MainSPresenter.java b/app/src/main/java/com/uiui/zyappstore/service/main/MainSPresenter.java
similarity index 92%
rename from app/src/main/java/com/uiui/appstore/service/main/MainSPresenter.java
rename to app/src/main/java/com/uiui/zyappstore/service/main/MainSPresenter.java
index 1985013..9b0352d 100644
--- a/app/src/main/java/com/uiui/appstore/service/main/MainSPresenter.java
+++ b/app/src/main/java/com/uiui/zyappstore/service/main/MainSPresenter.java
@@ -1,9 +1,9 @@
-package com.uiui.appstore.service.main;
+package com.uiui.zyappstore.service.main;
 
 import android.content.Context;
 
 import com.trello.rxlifecycle4.android.ActivityEvent;
-import com.uiui.appstore.network.NetInterfaceManager;
+import com.uiui.zyappstore.network.NetInterfaceManager;
 
 import io.reactivex.rxjava3.subjects.BehaviorSubject;
 
diff --git a/app/src/main/java/com/uiui/appstore/service/main/MainService.java b/app/src/main/java/com/uiui/zyappstore/service/main/MainService.java
similarity index 85%
rename from app/src/main/java/com/uiui/appstore/service/main/MainService.java
rename to app/src/main/java/com/uiui/zyappstore/service/main/MainService.java
index df46575..8cabc2b 100644
--- a/app/src/main/java/com/uiui/appstore/service/main/MainService.java
+++ b/app/src/main/java/com/uiui/zyappstore/service/main/MainService.java
@@ -1,8 +1,7 @@
-package com.uiui.appstore.service.main;
+package com.uiui.zyappstore.service.main;
 
 import android.app.Service;
 import android.content.Intent;
-import android.os.Environment;
 import android.os.IBinder;
 import android.util.Log;
 
@@ -12,22 +11,15 @@ import com.trello.rxlifecycle4.LifecycleTransformer;
 import com.trello.rxlifecycle4.RxLifecycle;
 import com.trello.rxlifecycle4.android.ActivityEvent;
 import com.trello.rxlifecycle4.android.RxLifecycleAndroid;
-import com.uiui.appstore.KeepAliveConnection;
-import com.uiui.appstore.network.HTTPInterface;
-import com.uiui.appstore.utils.JGYUtils;
-import com.uiui.appstore.utils.SPUtils;
-import com.uiui.appstore.utils.ToastUtil;
+import com.uiui.zyappstore.KeepAliveConnection;
+import com.uiui.zyappstore.network.HTTPInterface;
+import com.uiui.zyappstore.utils.JGYUtils;
 
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
-import java.util.concurrent.TimeUnit;
 
 import io.reactivex.rxjava3.core.Observable;
-import io.reactivex.rxjava3.core.ObservableEmitter;
-import io.reactivex.rxjava3.core.ObservableOnSubscribe;
-import io.reactivex.rxjava3.core.Observer;
-import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.subjects.BehaviorSubject;
 
 public class MainService extends Service implements MainSContact.MainView, NetworkUtils.OnNetworkStatusChangedListener, LifecycleProvider<ActivityEvent> {
diff --git a/app/src/main/java/com/uiui/appstore/utils/ApkUtils.java b/app/src/main/java/com/uiui/zyappstore/utils/ApkUtils.java
similarity index 98%
rename from app/src/main/java/com/uiui/appstore/utils/ApkUtils.java
rename to app/src/main/java/com/uiui/zyappstore/utils/ApkUtils.java
index 4f1dfd2..5579ef0 100644
--- a/app/src/main/java/com/uiui/appstore/utils/ApkUtils.java
+++ b/app/src/main/java/com/uiui/zyappstore/utils/ApkUtils.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.utils;
+package com.uiui.zyappstore.utils;
 
 import android.app.PendingIntent;
 import android.content.Context;
@@ -12,8 +12,6 @@ import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Binder;
 import android.os.Build;
-import android.provider.Settings;
-import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.widget.Toast;
@@ -21,10 +19,10 @@ import android.widget.Toast;
 import androidx.annotation.RequiresApi;
 import androidx.core.content.FileProvider;
 
-import com.uiui.appstore.BuildConfig;
-import com.uiui.appstore.R;
-import com.uiui.appstore.bean.LocalApp;
-import com.uiui.appstore.receiver.InstallResultReceiver;
+import com.uiui.zyappstore.BuildConfig;
+import com.uiui.zyappstore.R;
+import com.uiui.zyappstore.bean.LocalApp;
+import com.uiui.zyappstore.receiver.InstallResultReceiver;
 
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
@@ -36,11 +34,9 @@ import java.io.OutputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
@@ -106,7 +102,7 @@ public class ApkUtils {
         if (Build.VERSION.SDK_INT >= 24) { //判读版本是否在7.0以上
             //参数1 上下文, 参数2 Provider主机地址 和配置文件中保持一致   参数3  共享的文件
             Uri apkUri =
-                    FileProvider.getUriForFile(context, "com.uiui.appstore.fileprovider", uriFile);
+                    FileProvider.getUriForFile(context, "com.uiui.zyappstore.fileprovider", uriFile);
             //添加这一句表示对目标应用临时授权该Uri所代表的文件
             intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
             intent.setDataAndType(apkUri, "application/vnd.android.package-archive");
diff --git a/app/src/main/java/com/uiui/appstore/utils/DensityUtil.java b/app/src/main/java/com/uiui/zyappstore/utils/DensityUtil.java
similarity index 95%
rename from app/src/main/java/com/uiui/appstore/utils/DensityUtil.java
rename to app/src/main/java/com/uiui/zyappstore/utils/DensityUtil.java
index 38d8a0d..d1c36ef 100644
--- a/app/src/main/java/com/uiui/appstore/utils/DensityUtil.java
+++ b/app/src/main/java/com/uiui/zyappstore/utils/DensityUtil.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.utils;
+package com.uiui.zyappstore.utils;
 
 import android.content.Context;
 
diff --git a/app/src/main/java/com/uiui/appstore/utils/FileUtils.java b/app/src/main/java/com/uiui/zyappstore/utils/FileUtils.java
similarity index 99%
rename from app/src/main/java/com/uiui/appstore/utils/FileUtils.java
rename to app/src/main/java/com/uiui/zyappstore/utils/FileUtils.java
index 4ae2d55..d844cb8 100644
--- a/app/src/main/java/com/uiui/appstore/utils/FileUtils.java
+++ b/app/src/main/java/com/uiui/zyappstore/utils/FileUtils.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.utils;
+package com.uiui.zyappstore.utils;
 
 import android.content.Context;
 import android.util.Log;
diff --git a/app/src/main/java/com/uiui/appstore/utils/JGYUtils.java b/app/src/main/java/com/uiui/zyappstore/utils/JGYUtils.java
similarity index 90%
rename from app/src/main/java/com/uiui/appstore/utils/JGYUtils.java
rename to app/src/main/java/com/uiui/zyappstore/utils/JGYUtils.java
index 9fca034..aa13bec 100644
--- a/app/src/main/java/com/uiui/appstore/utils/JGYUtils.java
+++ b/app/src/main/java/com/uiui/zyappstore/utils/JGYUtils.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.utils;
+package com.uiui.zyappstore.utils;
 
 import android.annotation.SuppressLint;
 import android.content.ComponentName;
@@ -20,8 +20,8 @@ import android.util.Log;
 
 import androidx.core.content.ContextCompat;
 
-import com.uiui.appstore.BuildConfig;
-import com.uiui.appstore.receiver.BootReceiver;
+import com.uiui.zyappstore.BuildConfig;
+import com.uiui.zyappstore.receiver.BootReceiver;
 
 import java.io.File;
 import java.lang.reflect.Constructor;
@@ -42,12 +42,16 @@ public class JGYUtils {
     public static final int CubePlatform = 2;
     public static final int ZhanruiPlatform = 3;
     public static final int UMTK11Platform = 4;
+    public static final int UZY12Platform = 7;
+    public static final int TeclastMTK12Platform = 8;
     public static final int UnknowPlatform = 0;
 
     public static final String MTKTag = "MTK";
     public static final String ZhanruiTag = "展锐";//酷比展睿
     public static final String NewZhanruiTag = "新展锐";
     public static final String UMTK11Tag = "UMTK11";
+    public static final String UZY12Tag = "UZY12";
+    public static final String TeclastMTK12Tag = "TeclastMTK12";
 
 
     private JGYUtils(Context context) {
@@ -297,19 +301,25 @@ public class JGYUtils {
 
     public int checkAppPlatform() {
         String platform = BuildConfig.platform;
-        if ("MTK".equalsIgnoreCase(platform)) {
+        if (MTKTag.equalsIgnoreCase(platform)) {
             Log.i(TAG, "checkAppPlatform: " + "MTK平台");
             return MTKPlatform;
-        } else if ("展锐".equalsIgnoreCase(platform)) {
+        } else if (ZhanruiTag.equalsIgnoreCase(platform)) {
             Log.i(TAG, "checkAppPlatform: " + "展锐平台");
             return CubePlatform;
-        } else if ("新展锐".equalsIgnoreCase(platform)) {
+        } else if (NewZhanruiTag.equalsIgnoreCase(platform)) {
             Log.i(TAG, "checkAppPlatform: " + "新展锐平台");
             return ZhanruiPlatform;
-        }else if ("UMTK11".equalsIgnoreCase(platform)) {
+        } else if (UMTK11Tag.equalsIgnoreCase(platform)) {
             Log.i(TAG, "checkAppPlatform: " + "UMTK11");
             return UMTK11Platform;
-        }  else {
+        } else if (UZY12Tag.equalsIgnoreCase(platform)) {
+            Log.i(TAG, "checkAppPlatform: " + "UZY12");
+            return UZY12Platform;
+        }else if (TeclastMTK12Tag.equalsIgnoreCase(platform)) {
+            Log.i(TAG, "checkAppPlatform: " + "TeclastMTK12");
+            return TeclastMTK12Platform;
+        } else {
             Log.i(TAG, "checkAppPlatform: " + "没有数据");
             return UnknowPlatform;
         }
@@ -330,24 +340,28 @@ public class JGYUtils {
 
     public void getAppPlatform(GetAppPlatformCallback getAppPlatformCallback) {
         String platform = BuildConfig.platform;
-        if ("MTK".equalsIgnoreCase(platform)) {
+        if (MTKTag.equalsIgnoreCase(platform)) {
             getAppPlatformCallback.AppPlatform(MTKPlatform);
-        } else if ("展锐".equalsIgnoreCase(platform)) {
+        } else if (ZhanruiTag.equalsIgnoreCase(platform)) {
             getAppPlatformCallback.AppPlatform(CubePlatform);
-        }  else if ("新展锐".equalsIgnoreCase(platform)) {
+        } else if (NewZhanruiTag.equalsIgnoreCase(platform)) {
             getAppPlatformCallback.AppPlatform(ZhanruiPlatform);
-        } else if ("UMTK11".equalsIgnoreCase(platform)) {
+        } else if (UMTK11Tag.equalsIgnoreCase(platform)) {
             getAppPlatformCallback.AppPlatform(UMTK11Platform);
+        } else if (UZY12Tag.equalsIgnoreCase(platform)) {
+            getAppPlatformCallback.AppPlatform(UZY12Platform);
+        } else if (TeclastMTK12Tag.equalsIgnoreCase(platform)) {
+            getAppPlatformCallback.AppPlatform(TeclastMTK12Platform);
         } else {
             getAppPlatformCallback.AppPlatform(UnknowPlatform);
         }
     }
 
     public static final String PACKAGE_DEVICEINFO = "com.uiui.sn";
-    public static final String PACKAGE_APPSTORE = "com.uiui.appstore";
+    public static final String PACKAGE_APPSTORE = "com.uiui.zyappstore";
     public static final String PACKAGE_UPDATETOOLS = "com.uiui.updatetools";
     public static final String CLASS_DEVICEINFO = "com.uiui.sn.receiver.BootReceiver";
-    public static final String CLASS_APPSTORE = "com.uiui.appstore.receiver.BootReceiver";
+    public static final String CLASS_APPSTORE = "com.uiui.zyappstore.receiver.BootReceiver";
     public static final String CLASS_UPDATETOOLS = "com.uiui.updatetools.receiver.BootReceiver";
 
     public void wakeUpDeviceInfo() {
@@ -400,6 +414,11 @@ public class JGYUtils {
         }
     }
 
+    public String getPushMac() {
+        String macaddr = Utils.getAndroid10MAC(mContext);
+        return macaddr.replace(":", "");
+    }
+
     public boolean isScreenOn() {
         PowerManager powerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
         //true为打开，false为关闭
diff --git a/app/src/main/java/com/uiui/appstore/utils/LogUtils.java b/app/src/main/java/com/uiui/zyappstore/utils/LogUtils.java
similarity index 90%
rename from app/src/main/java/com/uiui/appstore/utils/LogUtils.java
rename to app/src/main/java/com/uiui/zyappstore/utils/LogUtils.java
index 62f9b95..8653b30 100644
--- a/app/src/main/java/com/uiui/appstore/utils/LogUtils.java
+++ b/app/src/main/java/com/uiui/zyappstore/utils/LogUtils.java
@@ -1,8 +1,8 @@
-package com.uiui.appstore.utils;
+package com.uiui.zyappstore.utils;
 
 import android.util.Log;
 
-import com.uiui.appstore.BuildConfig;
+import com.uiui.zyappstore.BuildConfig;
 
 public class LogUtils {
     public static void v(String tag, String msg) {
diff --git a/app/src/main/java/com/uiui/appstore/utils/MD5Util.java b/app/src/main/java/com/uiui/zyappstore/utils/MD5Util.java
similarity index 98%
rename from app/src/main/java/com/uiui/appstore/utils/MD5Util.java
rename to app/src/main/java/com/uiui/zyappstore/utils/MD5Util.java
index cb7c754..f9d2360 100644
--- a/app/src/main/java/com/uiui/appstore/utils/MD5Util.java
+++ b/app/src/main/java/com/uiui/zyappstore/utils/MD5Util.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.utils;
+package com.uiui.zyappstore.utils;
 
 import android.annotation.SuppressLint;
 
diff --git a/app/src/main/java/com/uiui/appstore/utils/SPUtils.java b/app/src/main/java/com/uiui/zyappstore/utils/SPUtils.java
similarity index 98%
rename from app/src/main/java/com/uiui/appstore/utils/SPUtils.java
rename to app/src/main/java/com/uiui/zyappstore/utils/SPUtils.java
index c13ab81..7bff828 100644
--- a/app/src/main/java/com/uiui/appstore/utils/SPUtils.java
+++ b/app/src/main/java/com/uiui/zyappstore/utils/SPUtils.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.utils;
+package com.uiui.zyappstore.utils;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -9,7 +9,7 @@ import android.util.Base64;
 import android.widget.ImageView;
 
 
-import com.uiui.appstore.common.CommonDatas;
+import com.uiui.zyappstore.common.CommonDatas;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/app/src/main/java/com/uiui/appstore/utils/ServiceAliveUtils.java b/app/src/main/java/com/uiui/zyappstore/utils/ServiceAliveUtils.java
similarity index 69%
rename from app/src/main/java/com/uiui/appstore/utils/ServiceAliveUtils.java
rename to app/src/main/java/com/uiui/zyappstore/utils/ServiceAliveUtils.java
index cea3bca..f9a902f 100644
--- a/app/src/main/java/com/uiui/appstore/utils/ServiceAliveUtils.java
+++ b/app/src/main/java/com/uiui/zyappstore/utils/ServiceAliveUtils.java
@@ -1,16 +1,16 @@
-package com.uiui.appstore.utils;
+package com.uiui.zyappstore.utils;
 
 import android.app.ActivityManager;
 import android.content.Context;
 
-import com.uiui.appstore.base.BaseApplication;
+import com.uiui.zyappstore.base.BaseApplication;
 
 public class ServiceAliveUtils {
 
-    public static boolean isServiceAlice() {
+    public static boolean isServiceAlice(Context context) {
         boolean isServiceRunning = false;
         ActivityManager manager =
-                (ActivityManager) BaseApplication.getInstance().getAppContext().getSystemService(Context.ACTIVITY_SERVICE);
+                (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
         if (manager == null) {
             return true;
         }
diff --git a/app/src/main/java/com/uiui/appstore/utils/StatusBarUtil.java b/app/src/main/java/com/uiui/zyappstore/utils/StatusBarUtil.java
similarity index 99%
rename from app/src/main/java/com/uiui/appstore/utils/StatusBarUtil.java
rename to app/src/main/java/com/uiui/zyappstore/utils/StatusBarUtil.java
index 8f90d22..259d66d 100644
--- a/app/src/main/java/com/uiui/appstore/utils/StatusBarUtil.java
+++ b/app/src/main/java/com/uiui/zyappstore/utils/StatusBarUtil.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.utils;
+package com.uiui.zyappstore.utils;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/app/src/main/java/com/uiui/appstore/utils/StorageUtils.java b/app/src/main/java/com/uiui/zyappstore/utils/StorageUtils.java
similarity index 99%
rename from app/src/main/java/com/uiui/appstore/utils/StorageUtils.java
rename to app/src/main/java/com/uiui/zyappstore/utils/StorageUtils.java
index 1ed0e34..b21e5aa 100644
--- a/app/src/main/java/com/uiui/appstore/utils/StorageUtils.java
+++ b/app/src/main/java/com/uiui/zyappstore/utils/StorageUtils.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.utils;
+package com.uiui.zyappstore.utils;
 
 import android.content.Context;
 import android.os.Build;
diff --git a/app/src/main/java/com/uiui/appstore/utils/TimeUtils.java b/app/src/main/java/com/uiui/zyappstore/utils/TimeUtils.java
similarity index 96%
rename from app/src/main/java/com/uiui/appstore/utils/TimeUtils.java
rename to app/src/main/java/com/uiui/zyappstore/utils/TimeUtils.java
index c14bce2..19eae5e 100644
--- a/app/src/main/java/com/uiui/appstore/utils/TimeUtils.java
+++ b/app/src/main/java/com/uiui/zyappstore/utils/TimeUtils.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.utils;
+package com.uiui.zyappstore.utils;
 
 import android.os.Build;
 
diff --git a/app/src/main/java/com/uiui/appstore/utils/ToastUtil.java b/app/src/main/java/com/uiui/zyappstore/utils/ToastUtil.java
similarity index 95%
rename from app/src/main/java/com/uiui/appstore/utils/ToastUtil.java
rename to app/src/main/java/com/uiui/zyappstore/utils/ToastUtil.java
index 412fc2a..e14169c 100644
--- a/app/src/main/java/com/uiui/appstore/utils/ToastUtil.java
+++ b/app/src/main/java/com/uiui/zyappstore/utils/ToastUtil.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.utils;
+package com.uiui.zyappstore.utils;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -6,7 +6,7 @@ import android.os.Handler;
 import android.os.Looper;
 import android.widget.Toast;
 
-import com.uiui.appstore.BuildConfig;
+import com.uiui.zyappstore.BuildConfig;
 
 /**
  * Created by haoge on 2017/3/2.
diff --git a/app/src/main/java/com/uiui/appstore/utils/Utils.java b/app/src/main/java/com/uiui/zyappstore/utils/Utils.java
similarity index 87%
rename from app/src/main/java/com/uiui/appstore/utils/Utils.java
rename to app/src/main/java/com/uiui/zyappstore/utils/Utils.java
index 5616511..ff49a8f 100644
--- a/app/src/main/java/com/uiui/appstore/utils/Utils.java
+++ b/app/src/main/java/com/uiui/zyappstore/utils/Utils.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.utils;
+package com.uiui.zyappstore.utils;
 
 import android.annotation.SuppressLint;
 import android.app.admin.DevicePolicyManager;
@@ -22,6 +22,7 @@ import android.graphics.PorterDuffXfermode;
 import android.graphics.drawable.Drawable;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
+import android.net.wifi.WifiManager;
 import android.os.Build;
 import android.provider.Settings;
 import android.telephony.TelephonyManager;
@@ -33,9 +34,15 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.Toast;
 
-import com.uiui.appstore.R;
+import androidx.annotation.VisibleForTesting;
 
+import com.uiui.zyappstore.R;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.FileReader;
+import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.LineNumberReader;
 import java.io.Reader;
@@ -50,8 +57,11 @@ import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 
+import static android.content.Context.WIFI_SERVICE;
+
 public class Utils {
 
+    private static final String TAG = Utils.class.getSimpleName();
     protected static Toast toast = null;
     private static String oldMsg;
     private static long oneTime = 0;
@@ -80,6 +90,63 @@ public class Utils {
 //        }
 //    }
 
+//    @SuppressLint("HardwareIds")
+//    @VisibleForTesting
+//    public static String getMacAddress(Context mContext) {
+//        WifiManager mWifiManager = (WifiManager) mContext.getSystemService(WIFI_SERVICE);
+//        final String[] macAddresses = mWifiManager.getFactoryMacAddresses();
+//        String macAddress = null;
+//        if (macAddresses != null && macAddresses.length > 0) {
+//            macAddress = macAddresses[0];
+//        }
+//
+//        if (TextUtils.isEmpty(macAddress)) {
+//            String mac = getMacFromFile();
+//            // Add for CTCC Feature:WIFI MAC should be gotten while wifi disabled.
+//            // Get Wifi MAC from file since we can not get it with WifiManager.
+//            if (!TextUtils.isEmpty(mac)) {
+//                macAddress = mac;
+//            } else {
+//                macAddress = "";
+//            }
+//        }
+//        return macAddress.toUpperCase();
+//    }
+
+    /**
+     * Add for CTCC Feature:WIFI MAC should be gotten while wifi disabled.
+     * get Wifi MAC from /mnt/vendor/wifimac.txt
+     *
+     * @{
+     */
+    private static String MACID_FILE_PATH = "/mnt/vendor/wifimac.txt";
+
+    private static String getMacFromFile() {
+        File file = new File(MACID_FILE_PATH);
+        BufferedReader reader = null;
+        String macAddress = null;
+        try {
+            reader = new BufferedReader(new FileReader(file));
+            String line;
+            while ((line = reader.readLine()) != null) {
+                macAddress = line;
+                break;
+            }
+        } catch (FileNotFoundException e) {
+            Log.w(TAG, "Mac file not exist", e);
+        } catch (Exception e) {
+            Log.w(TAG, "get mac from file caught exception", e);
+        } finally {
+            try {
+                if (reader != null)
+                    reader.close();
+            } catch (IOException e) {
+                Log.w(TAG, "reader close exception");
+            }
+        }
+        return macAddress;
+    }
+
     /**
      * 获取手机的MAC地址
      *
@@ -582,30 +649,46 @@ public class Utils {
         context.startActivity(intent);
     }
 
+    public static String getSerial() {
+        String mac = JGYUtils.getInstance().getPushMac();
+        return mac;
+    }
+
+//    /**
+//     * 获取设备序列号
+//     *
+//     * @return
+//     */
+//    @SuppressLint({"MissingPermission", "NewApi"})
+//    public static String getSerial() {
+//        String serial = "unknow";
+//        try {
+//            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {//9.0+
+//                serial = Build.getSerial();
+//            } else if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N) {//8.0+
+//                serial = Build.SERIAL;
+//            } else {//8.0-
+//                Class<?> c = Class.forName("android.os.SystemProperties");
+//                Method get = c.getMethod("get", String.class);
+//                serial = (String) get.invoke(c, "ro.serialno");
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            Log.e("e", "读取设备序列号异常：" + e.toString());
+//        }
+//        return serial;
+//    }
+
     /**
-     * 获取设备序列号
-     *
+     * @param context 获取真实的MAC地址
      * @return
      */
-    @SuppressLint({"MissingPermission", "NewApi"})
-    public static String getSerial() {
-//        return JGYUtils.getInstance().getIMEI();
-        String serial = "unknow";
-        try {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {//9.0+
-                serial = Build.getSerial();
-            } else if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N) {//8.0+
-                serial = Build.SERIAL;
-            } else {//8.0-
-                Class<?> c = Class.forName("android.os.SystemProperties");
-                Method get = c.getMethod("get", String.class);
-                serial = (String) get.invoke(c, "ro.serialno");
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            Log.e("e", "读取设备序列号异常：" + e.toString());
+    public static String getAndroid10MAC(Context context) {
+        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N_MR1) {
+            return getMac();
+        } else {
+            return getAndroid7MAC();
         }
-        return serial;
     }
 
     public static final long A_GB = 1073741824;
diff --git a/app/src/main/java/com/uiui/appstore/view/CornerImageView.kt b/app/src/main/java/com/uiui/zyappstore/view/CornerImageView.kt
similarity index 94%
rename from app/src/main/java/com/uiui/appstore/view/CornerImageView.kt
rename to app/src/main/java/com/uiui/zyappstore/view/CornerImageView.kt
index 46227a0..3418fdc 100644
--- a/app/src/main/java/com/uiui/appstore/view/CornerImageView.kt
+++ b/app/src/main/java/com/uiui/zyappstore/view/CornerImageView.kt
@@ -1,4 +1,4 @@
-package com.uiui.appstore.view
+package com.uiui.zyappstore.view
 
 import android.content.Context
 import android.os.Build
diff --git a/app/src/main/java/com/uiui/appstore/view/HorizontalItemDecoration.java b/app/src/main/java/com/uiui/zyappstore/view/HorizontalItemDecoration.java
similarity index 97%
rename from app/src/main/java/com/uiui/appstore/view/HorizontalItemDecoration.java
rename to app/src/main/java/com/uiui/zyappstore/view/HorizontalItemDecoration.java
index e612417..488fed5 100644
--- a/app/src/main/java/com/uiui/appstore/view/HorizontalItemDecoration.java
+++ b/app/src/main/java/com/uiui/zyappstore/view/HorizontalItemDecoration.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore.view;
+package com.uiui.zyappstore.view;
 
 import android.content.Context;
 import android.graphics.Rect;
diff --git a/app/src/main/java/com/uiui/appstore/view/NumberProgressBar.java b/app/src/main/java/com/uiui/zyappstore/view/NumberProgressBar.java
similarity index 99%
rename from app/src/main/java/com/uiui/appstore/view/NumberProgressBar.java
rename to app/src/main/java/com/uiui/zyappstore/view/NumberProgressBar.java
index 4256e19..6961ea8 100644
--- a/app/src/main/java/com/uiui/appstore/view/NumberProgressBar.java
+++ b/app/src/main/java/com/uiui/zyappstore/view/NumberProgressBar.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.uiui.appstore.view;
+package com.uiui.zyappstore.view;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -26,7 +26,7 @@ import android.os.Parcelable;
 import android.util.AttributeSet;
 import android.view.View;
 
-import com.uiui.appstore.R;
+import com.uiui.zyappstore.R;
 
 /**
  * ================================================
diff --git a/app/src/main/res/layout-land/item_download_manager.xml b/app/src/main/res/layout-land/item_download_manager.xml
index 033d956..a7e783b 100644
--- a/app/src/main/res/layout-land/item_download_manager.xml
+++ b/app/src/main/res/layout-land/item_download_manager.xml
@@ -41,7 +41,7 @@
                 android:textSize="@dimen/sp_11"
                 android:textStyle="bold" />
 
-            <com.uiui.appstore.view.NumberProgressBar
+            <com.uiui.zyappstore.view.NumberProgressBar
                 android:id="@+id/pbProgress"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
diff --git a/app/src/main/res/layout-land/item_net.xml b/app/src/main/res/layout-land/item_net.xml
index 6073541..9a8da5d 100644
--- a/app/src/main/res/layout-land/item_net.xml
+++ b/app/src/main/res/layout-land/item_net.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <com.uiui.appstore.view.CornerImageView
+    <com.uiui.zyappstore.view.CornerImageView
         android:id="@+id/banner_image"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout-port/item_download_manager.xml b/app/src/main/res/layout-port/item_download_manager.xml
index aa7a24b..542b5b2 100644
--- a/app/src/main/res/layout-port/item_download_manager.xml
+++ b/app/src/main/res/layout-port/item_download_manager.xml
@@ -41,7 +41,7 @@
                 android:textSize="@dimen/sp_11"
                 android:textStyle="bold" />
 
-            <com.uiui.appstore.view.NumberProgressBar
+            <com.uiui.zyappstore.view.NumberProgressBar
                 android:id="@+id/pbProgress"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
diff --git a/app/src/main/res/layout-port/item_net.xml b/app/src/main/res/layout-port/item_net.xml
index 6073541..9a8da5d 100644
--- a/app/src/main/res/layout-port/item_net.xml
+++ b/app/src/main/res/layout-port/item_net.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <com.uiui.appstore.view.CornerImageView
+    <com.uiui.zyappstore.view.CornerImageView
         android:id="@+id/banner_image"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/activity_manager_app.xml b/app/src/main/res/layout/activity_manager_app.xml
index 316decb..a544d58 100644
--- a/app/src/main/res/layout/activity_manager_app.xml
+++ b/app/src/main/res/layout/activity_manager_app.xml
@@ -44,7 +44,7 @@
 
     <fragment
         android:id="@+id/fragment"
-        android:name="com.uiui.appstore.fragment.ManageFragment"
+        android:name="com.uiui.zyappstore.fragment.ManageFragment"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/test/java/com/uiui/appstore/ExampleUnitTest.java b/app/src/test/java/com/uiui/zyappstore/ExampleUnitTest.java
similarity index 92%
rename from app/src/test/java/com/uiui/appstore/ExampleUnitTest.java
rename to app/src/test/java/com/uiui/zyappstore/ExampleUnitTest.java
index 054b005..3955f83 100644
--- a/app/src/test/java/com/uiui/appstore/ExampleUnitTest.java
+++ b/app/src/test/java/com/uiui/zyappstore/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.uiui.appstore;
+package com.uiui.zyappstore;
 
 import org.junit.Test;
 
diff --git a/app/tpns-configs.json b/app/tpns-configs.json
index 6647f02..ac23e3a 100644
--- a/app/tpns-configs.json
+++ b/app/tpns-configs.json
@@ -3,7 +3,7 @@
         "access_id": "1500033122",
         "access_key": "A5QBQVQ7KLQD"
     },
-    "com.uiui.appstore": {
+    "com.uiui.zyappstore": {
         "channel": {
             "enable": true
         }
diff --git a/build.gradle b/build.gradle
index 0d10158..117b882 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,9 +6,11 @@ buildscript {
         google()
         mavenCentral()
         maven { url "https://jitpack.io" }
+        maven { url 'http://developer.huawei.com/repo/' }
         maven { url 'http://maven.aliyun.com/nexus/content/repositories/jcenter' }
-        maven {url 'http://developer.huawei.com/repo/'}
+        maven { url 'http://maven.aliyun.com/nexus/content/repositories/releases/' }
     }
+
     dependencies {
         classpath 'com.android.tools.build:gradle:3.6.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -24,8 +26,9 @@ allprojects {
         google()
         mavenCentral()
         maven { url "https://jitpack.io" }
+        maven { url 'http://developer.huawei.com/repo/' }
         maven { url 'http://maven.aliyun.com/nexus/content/repositories/jcenter' }
-        maven {url 'http://developer.huawei.com/repo/'}
+        maven { url 'http://maven.aliyun.com/nexus/content/repositories/releases/' }
     }
 }
 
diff --git a/settings.gradle b/settings.gradle
index ee7f5fa..886d1e1 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,2 @@
 include ':app'
-rootProject.name='UIUI应用市场'
+rootProject.name='科大讯飞应用市场'