diff --git a/app/build.gradle b/app/build.gradle
index 1d9ecc6..35d9999 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -80,16 +80,16 @@ android {
         //酷比魔方
         cube {
             flavorDimensions "default"
-            versionCode 57
-            versionName "6.5"
+            versionCode 58
+            versionName "6.6"
             buildConfigField "String", "platform", '"ZhanRuiCube"'
         }
 
         //MTK
         MTKnewly {
             flavorDimensions "default"
-            versionCode 27
-            versionName "3.6"
+            versionCode 29
+            versionName "3.8"
             buildConfigField "String", "platform", '"MTK"'
         }
     }
diff --git a/app/src/main/aidl/com/aoleyun/sn/SystemInfoInterface.aidl b/app/src/main/aidl/com/aoleyun/sn/SystemInfoInterface.aidl
index 429660e..24bef78 100644
--- a/app/src/main/aidl/com/aoleyun/sn/SystemInfoInterface.aidl
+++ b/app/src/main/aidl/com/aoleyun/sn/SystemInfoInterface.aidl
@@ -15,6 +15,6 @@ interface SystemInfoInterface {
     List<String> getHideIcon();
     List<String> getDisableIcon();
     String getTopAppPackage();
-    boolean SystemPutInt(String name , int value);
+    boolean SystemPutInt(String name, int value);
     void setDefaultDesktop(String pkg);
 }
diff --git a/app/src/main/java/com/aoleyun/sn/network/NetInterfaceManager.java b/app/src/main/java/com/aoleyun/sn/network/NetInterfaceManager.java
index 670670b..c74403b 100644
--- a/app/src/main/java/com/aoleyun/sn/network/NetInterfaceManager.java
+++ b/app/src/main/java/com/aoleyun/sn/network/NetInterfaceManager.java
@@ -1006,7 +1006,7 @@ public class NetInterfaceManager {
                     JSONObject data = JSON.parseObject(jsonString);
                     cacheHelper.put(UrlAddress.GET_DESKTOP, jsonString);
                     JGYUtils.getInstance().installDesktop(data);
-                    JGYUtils.getInstance().setDefaultDesktop(desktopInfo.getApp_package());
+                    setDefaultDesktop(desktopInfo.getApp_package());
                 } else {
                     Log.e("getDefaultDesktop", "onNext: " + "删除定制桌面");
                     cacheHelper.put(UrlAddress.GET_DESKTOP, "");
@@ -1663,7 +1663,7 @@ public class NetInterfaceManager {
                 }.getType();
                 DefaultApp defaultApp = gson.fromJson(jsonString, type);
                 if (defaultApp != null) {
-                    JGYUtils.getInstance().setDefaultDesktop(defaultApp.getDefault_launcher());
+                    setDefaultDesktop(defaultApp.getDefault_launcher());
                 }
                 callback.onComplete();
             }
@@ -1685,18 +1685,9 @@ public class NetInterfaceManager {
                         int code = defaultAppBaseResponse.code;
                         if (code == OK) {
                             DefaultApp defaultApp = defaultAppBaseResponse.data;
-                            JGYUtils.getInstance().setDefaultDesktop(defaultApp.getDefault_launcher());
-                            if (defaultApp.getDefault_launcher() != null) {
-                                SPUtils.put(mContext, "default_launcher", defaultApp.getDefault_launcher());
-                            }
+                            setDefaultDesktop(defaultApp.getDefault_launcher());
                         } else {
-                            String default_launcher = (String) SPUtils.get(mContext, "default_launcher", "");
-                            Log.e("getDefaultApp", "onNext: " + default_launcher);
-                            if (TextUtils.isEmpty(default_launcher)) {
-                                JGYUtils.getInstance().setDefaultDesktop();
-                            } else {
-                                JGYUtils.getInstance().setDefaultDesktop(default_launcher);
-                            }
+                            setDefaultDesktop(null);
                             Log.e("getDefaultApp", "onNext: " + defaultAppBaseResponse.msg);
                         }
                     }
@@ -1715,6 +1706,25 @@ public class NetInterfaceManager {
                 });
     }
 
+    private void setDefaultDesktop(String defaultApp) {
+        int aihuaUnlock = Settings.System.getInt(mContext.getContentResolver(), CommonConfig.AIHUA_UNLOCK, 0);
+        if (aihuaUnlock == 1) {
+            JGYUtils.getInstance().setDefaultDesktop(PackageNames.DESKTOP);
+        } else {
+            if (!TextUtils.isEmpty(defaultApp)) {
+                JGYUtils.getInstance().setDefaultDesktop(defaultApp);
+                SPUtils.put(mContext, "default_launcher", defaultApp);
+            } else {
+                String default_launcher = (String) SPUtils.get(mContext, "default_launcher", "");
+                Log.e("getDefaultApp", "onNext: " + default_launcher);
+                if (TextUtils.isEmpty(default_launcher)) {
+                    JGYUtils.getInstance().setDefaultDesktop();
+                } else {
+                    JGYUtils.getInstance().setDefaultDesktop(default_launcher);
+                }
+            }
+        }
+    }
 
     public interface StudesInfoListener {
         void setStudentsInfo(StudentsInfo studentsInfo);
diff --git a/app/src/main/java/com/aoleyun/sn/service/RemoteService.java b/app/src/main/java/com/aoleyun/sn/service/RemoteService.java
index e01a09c..7fde924 100644
--- a/app/src/main/java/com/aoleyun/sn/service/RemoteService.java
+++ b/app/src/main/java/com/aoleyun/sn/service/RemoteService.java
@@ -8,6 +8,7 @@ import android.provider.Settings;
 import android.util.Log;
 
 import com.aoleyun.sn.SystemInfoInterface;
+import com.aoleyun.sn.comm.PackageNames;
 import com.aoleyun.sn.utils.ForegroundAppUtil;
 import com.aoleyun.sn.utils.JGYUtils;
 import com.aoleyun.sn.utils.SPUtils;
@@ -72,6 +73,9 @@ public class RemoteService extends Service {
         public void setDefaultDesktop(String pkg) throws RemoteException {
             JGYUtils.getInstance().setDefaultDesktop(pkg);
             SPUtils.put(RemoteService.this, "default_launcher", pkg);
+            if (PackageNames.DESKTOP.equals(pkg)) {
+                JGYUtils.getInstance().killPackage("com.aoleyunos.dop2");
+            }
         }
     };
 }