diff --git a/app/build.gradle b/app/build.gradle
index 0bff609..db4519d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,11 +13,11 @@ android {
     compileSdkVersion 29
 
     defaultConfig {
-        applicationId "com.uiui.aios"
+        applicationId "com.uiuios.aios"
         minSdkVersion 24
         targetSdkVersion 29
-        versionCode 42
-        versionName "5.1"
+        versionCode 2
+        versionName "1.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -28,8 +28,8 @@ android {
         }
 
         manifestPlaceholders = [
-                XG_ACCESS_ID : "1500030457",
-                XG_ACCESS_KEY: "AZZXANJF4HBD",
+                XG_ACCESS_ID : "1580013523",
+                XG_ACCESS_KEY: "ASJ3MCYWCTTF",
         ]
 
         manifestPlaceholders = [
diff --git a/app/src/androidTest/java/com/uiui/aios/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/uiuios/aios/ExampleInstrumentedTest.java
similarity index 87%
rename from app/src/androidTest/java/com/uiui/aios/ExampleInstrumentedTest.java
rename to app/src/androidTest/java/com/uiuios/aios/ExampleInstrumentedTest.java
index 93cbad8..cffd3f8 100644
--- a/app/src/androidTest/java/com/uiui/aios/ExampleInstrumentedTest.java
+++ b/app/src/androidTest/java/com/uiuios/aios/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package com.uiui.aios;
+package com.uiuios.aios;
 
 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.aios", appContext.getPackageName());
+        assertEquals("com.uiuios.aios", appContext.getPackageName());
     }
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5be463b..d51de96 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.aios"
+    package="com.uiuios.aios"
     android:sharedUserId="android.uid.system">
 
     <uses-permission android:name="android.permission.WAKE_LOCK" />
@@ -61,7 +61,7 @@
     <uses-permission android:name="android.permission.GET_TASKS" />
 
     <application
-        android:name=".base.BaseApplication"
+        android:name="com.uiuios.aios.base.BaseApplication"
         android:allowBackup="true"
         android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
@@ -72,7 +72,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:name=".activity.main.MainActivity"
+            android:name="com.uiuios.aios.activity.main.MainActivity"
             android:clearTaskOnLaunch="true"
             android:enabled="true"
             android:excludeFromRecents="true"
@@ -80,8 +80,9 @@
             android:resizeableActivity="true"
             android:resumeWhilePausing="true"
             android:stateNotNeeded="true"
+            android:configChanges="screenSize|keyboardHidden|orientation"
             android:taskAffinity="com.example.taskaffinity.newtask"
-            android:windowSoftInputMode="adjustPan">
+            >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -92,30 +93,30 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".activity.contact.ContactActivity" />
+        <activity android:name="com.uiuios.aios.activity.contact.ContactActivity" />
         <activity
-            android:name=".activity.code.HealthCodeActivity"
+            android:name="com.uiuios.aios.activity.code.HealthCodeActivity"
             android:launchMode="singleTask"
             android:screenOrientation="sensorPortrait" />
         <activity
-            android:name=".activity.weather.WeatherActivity"
+            android:name="com.uiuios.aios.activity.weather.WeatherActivity"
             android:launchMode="singleTask" />
         <activity
-            android:name=".activity.EmergencyActivity"
+            android:name="com.uiuios.aios.activity.EmergencyActivity"
             android:launchMode="singleTask" />
         <activity
-            android:name=".activity.NoticeActivity"
+            android:name="com.uiuios.aios.activity.NoticeActivity"
             android:excludeFromRecents="true"
             android:screenOrientation="portrait"
             android:theme="@style/activity_styles" />
-        <activity android:name=".activity.APPListActivity" />
+        <activity android:name="com.uiuios.aios.activity.APPListActivity" />
         <activity
-            android:name=".activity.alarm.AlarmClockActivity"
+            android:name="com.uiuios.aios.activity.alarm.AlarmClockActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppWhiteTheme" />
 
         <receiver
-            android:name=".receiver.BootReceiver"
+            android:name="com.uiuios.aios.receiver.BootReceiver"
             android:enabled="true"
             android:exported="true">
             <intent-filter android:priority="1000">
@@ -133,16 +134,16 @@
             </intent-filter>
         </receiver>
         <receiver
-            android:name=".receiver.InstallResultReceiver"
+            android:name="com.uiuios.aios.receiver.InstallResultReceiver"
             android:enabled="true"
             android:exported="true" />
 
         <service
-            android:name=".alarm.AlarmService"
+            android:name="com.uiuios.aios.alarm.AlarmService"
             android:enabled="true"
             android:exported="true" />
         <service
-            android:name=".service.main.MainService"
+            android:name="com.uiuios.aios.service.main.MainService"
             android:enabled="true"
             android:exported="true">
             <intent-filter android:priority="1000">
@@ -154,7 +155,7 @@
             </intent-filter>
         </service>
         <service
-            android:name=".service.NotificationService"
+            android:name="com.uiuios.aios.service.NotificationService"
             android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
             <intent-filter>
                 <action android:name="android.service.notification.NotificationListenerService" />
@@ -183,7 +184,7 @@
             </intent-filter>
             <intent-filter>
                 <data
-                    android:host="com.uiui.aios"
+                    android:host="com.uiuios.aios"
                     android:scheme="tpns" />
 
                 <action android:name="android.intent.action.VIEW" />
@@ -207,7 +208,7 @@
             </intent-filter>
             <intent-filter>
                 <data
-                    android:host="com.uiui.aios"
+                    android:host="com.uiuios.aios"
                     android:scheme="stpns" />
 
                 <action android:name="android.intent.action.VIEW" />
@@ -264,7 +265,7 @@
             tools:replace="android:exported" />
         <!-- 【可选】APP实现的Receiver，用于接收消息透传和操作结果的回调，请根据需要添加 -->
         <!-- YOUR_PACKAGE_PATH.CustomPushReceiver需要改为自己的Receiver： -->
-        <receiver android:name=".tpush.MessageReceiver">
+        <receiver android:name="com.uiuios.aios.tpush.MessageReceiver">
             <intent-filter>
 
                 <!-- 接收消息透传 -->
@@ -289,10 +290,10 @@
         <!-- 【必须】 请修改为 APP 的 AccessId，“15”开头的10位数字，中间没空格 -->
         <meta-data
             android:name="XG_V2_ACCESS_ID"
-            android:value="1500030457" />
+            android:value="1580013523" />
         <!-- 【必须】 请修改为APP的AccessKey，“A”开头的12位字符串，中间没空格 -->
         <meta-data
             android:name="XG_V2_ACCESS_KEY"
-            android:value="AZZXANJF4HBD" />
+            android:value="ASJ3MCYWCTTF" />
     </application>
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/uiui/aios/utils/Utils.java b/app/src/main/java/com/uiui/aios/utils/Utils.java
deleted file mode 100644
index a846748..0000000
--- a/app/src/main/java/com/uiui/aios/utils/Utils.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.uiui.aios.utils;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.ContextWrapper;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.os.BatteryManager;
-import android.os.Build;
-import android.os.Environment;
-import android.util.Log;
-
-import androidx.core.content.ContextCompat;
-
-import com.uiui.aios.BuildConfig;
-
-import java.io.File;
-import java.lang.reflect.Method;
-
-public class Utils {
-    /**
-     * 获取设备序列号
-     *
-     * @return
-     */
-    @SuppressLint("MissingPermission")
-    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());
-        }
-        if (BuildConfig.DEBUG) {
-//            return "QNG2DKB00463";
-        }
-        return serial;
-    }
-
-    public static String getDeviceSN() {
-        String serial = null;
-        try {
-            Class<?> c = Class.forName("android.os.SystemProperties");
-            Method get = c.getMethod("get", String.class);
-            serial = (String) get.invoke(c, "persist.sys.hrSerial");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return serial;
-    }
-
-    /**
-     * 获取电量
-     *
-     * @param mContext
-     * @return
-     */
-    synchronized public static int getBatteryLevel(Context mContext) {
-        if (Build.VERSION.SDK_INT >= 21) {
-            return ((BatteryManager) mContext.getSystemService(Context.BATTERY_SERVICE)).getIntProperty(4);
-        } else {
-            Intent intent = (new ContextWrapper(mContext)).registerReceiver(null, new IntentFilter("android.intent.action.BATTERY_CHANGED"));
-            return intent.getIntExtra("level", -1) * 100 / intent.getIntExtra("scale", -1);
-        }
-    }
-
-    public static String getDownLoadPath(Context context) {
-        String path = ContextCompat.getExternalFilesDirs(context, Environment.DIRECTORY_DOWNLOADS)[0].getAbsolutePath();
-        return path + File.separator;
-    }
-
-    public static String getFileNamefromURL(String url) {
-        int position = url.lastIndexOf("/");
-        return url.substring(position + 1);
-    }
-
-}
diff --git a/app/src/main/java/com/uiui/aios/AppInfo.java b/app/src/main/java/com/uiuios/aios/AppInfo.java
similarity index 86%
rename from app/src/main/java/com/uiui/aios/AppInfo.java
rename to app/src/main/java/com/uiuios/aios/AppInfo.java
index 0081c0a..eb10c2c 100644
--- a/app/src/main/java/com/uiui/aios/AppInfo.java
+++ b/app/src/main/java/com/uiuios/aios/AppInfo.java
@@ -1,4 +1,4 @@
-package com.uiui.aios;
+package com.uiuios.aios;
 
 import java.io.Serializable;
 
diff --git a/app/src/main/java/com/uiui/aios/activity/APPListActivity.java b/app/src/main/java/com/uiuios/aios/activity/APPListActivity.java
similarity index 91%
rename from app/src/main/java/com/uiui/aios/activity/APPListActivity.java
rename to app/src/main/java/com/uiuios/aios/activity/APPListActivity.java
index 50de7b2..c3aa56e 100644
--- a/app/src/main/java/com/uiui/aios/activity/APPListActivity.java
+++ b/app/src/main/java/com/uiuios/aios/activity/APPListActivity.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.activity;
+package com.uiuios.aios.activity;
 
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
@@ -13,14 +13,14 @@ import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 
-import com.uiui.aios.R;
-import com.uiui.aios.adapter.APPListAdapter;
-import com.uiui.aios.base.BaseActivity;
-import com.uiui.aios.bean.AppListInfo;
-import com.uiui.aios.service.NotificationService;
-import com.uiui.aios.utils.ApkUtils;
-import com.uiui.aios.utils.BitmapUtils;
-import com.uiui.aios.view.RecyclerViewSpacesItemDecoration;
+import com.uiuios.aios.R;
+import com.uiuios.aios.adapter.APPListAdapter;
+import com.uiuios.aios.base.BaseActivity;
+import com.uiuios.aios.bean.AppListInfo;
+import com.uiuios.aios.service.NotificationService;
+import com.uiuios.aios.utils.ApkUtils;
+import com.uiuios.aios.utils.BitmapUtils;
+import com.uiuios.aios.view.RecyclerViewSpacesItemDecoration;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/app/src/main/java/com/uiui/aios/activity/EmergencyActivity.java b/app/src/main/java/com/uiuios/aios/activity/EmergencyActivity.java
similarity index 95%
rename from app/src/main/java/com/uiui/aios/activity/EmergencyActivity.java
rename to app/src/main/java/com/uiuios/aios/activity/EmergencyActivity.java
index e498a71..7ffce97 100644
--- a/app/src/main/java/com/uiui/aios/activity/EmergencyActivity.java
+++ b/app/src/main/java/com/uiuios/aios/activity/EmergencyActivity.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.activity;
+package com.uiuios.aios.activity;
 
 import androidx.appcompat.app.AppCompatActivity;
 
@@ -15,20 +15,19 @@ import android.widget.TextView;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.tencent.mmkv.MMKV;
-import com.uiui.aios.R;
-import com.uiui.aios.bean.BaseResponse;
-import com.uiui.aios.bean.Contact;
-import com.uiui.aios.disklrucache.CacheHelper;
-import com.uiui.aios.manager.AmapManager;
-import com.uiui.aios.network.NetInterfaceManager;
-import com.uiui.aios.network.URLAddress;
-import com.uiui.aios.receiver.BootReceiver;
-import com.uiui.aios.utils.ToastUtil;
+import com.uiuios.aios.R;
+import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.bean.Contact;
+import com.uiuios.aios.disklrucache.CacheHelper;
+import com.uiuios.aios.manager.AmapManager;
+import com.uiuios.aios.network.NetInterfaceManager;
+import com.uiuios.aios.network.URLAddress;
+import com.uiuios.aios.receiver.BootReceiver;
+import com.uiuios.aios.utils.ToastUtil;
 
 import java.lang.reflect.Type;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 import butterknife.BindView;
@@ -62,7 +61,7 @@ public class EmergencyActivity extends AppCompatActivity {
 
         //发送紧急广播
         Intent bootIntent = new Intent(BootReceiver.SOS);
-        bootIntent.setComponent(new ComponentName("com.uiui.sn", "com.uiui.sn.receiver.BootReceiver"));
+        bootIntent.setComponent(new ComponentName("com.uiuios.sn", "com.uiuios.sn.receiver.BootReceiver"));
         sendBroadcast(bootIntent);
 
         Intent intent = getIntent();
diff --git a/app/src/main/java/com/uiui/aios/activity/NoticeActivity.java b/app/src/main/java/com/uiuios/aios/activity/NoticeActivity.java
similarity index 95%
rename from app/src/main/java/com/uiui/aios/activity/NoticeActivity.java
rename to app/src/main/java/com/uiuios/aios/activity/NoticeActivity.java
index 80b9947..4a811fc 100644
--- a/app/src/main/java/com/uiui/aios/activity/NoticeActivity.java
+++ b/app/src/main/java/com/uiuios/aios/activity/NoticeActivity.java
@@ -1,10 +1,9 @@
-package com.uiui.aios.activity;
+package com.uiuios.aios.activity;
 
 import android.content.Context;
 import android.content.Intent;
 import android.media.AudioManager;
 import android.media.MediaPlayer;
-import android.net.Uri;
 import android.os.Bundle;
 import android.os.PowerManager;
 import android.os.Vibrator;
@@ -22,16 +21,16 @@ import com.blankj.utilcode.util.FileUtils;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.bumptech.glide.request.RequestOptions;
-import com.uiui.aios.R;
-import com.uiui.aios.alarm.AlarmUtils;
-import com.uiui.aios.bean.AlarmClockData;
-import com.uiui.aios.bean.BaseResponse;
-import com.uiui.aios.network.NetInterfaceManager;
-import com.uiui.aios.utils.FileUtil;
-import com.uiui.aios.utils.ScreenUtils;
-import com.uiui.aios.utils.Utils;
-import com.uiui.aios.utils.WakeUpUtils;
-import com.uiui.aios.view.JzvdStdAssert;
+import com.uiuios.aios.R;
+import com.uiuios.aios.alarm.AlarmUtils;
+import com.uiuios.aios.bean.AlarmClockData;
+import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.network.NetInterfaceManager;
+import com.uiuios.aios.utils.FileUtil;
+import com.uiuios.aios.utils.ScreenUtils;
+import com.uiuios.aios.utils.Utils;
+import com.uiuios.aios.utils.WakeUpUtils;
+import com.uiuios.aios.view.JzvdStdAssert;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/app/src/main/java/com/uiui/aios/activity/alarm/AlarmClockActivity.java b/app/src/main/java/com/uiuios/aios/activity/alarm/AlarmClockActivity.java
similarity index 90%
rename from app/src/main/java/com/uiui/aios/activity/alarm/AlarmClockActivity.java
rename to app/src/main/java/com/uiuios/aios/activity/alarm/AlarmClockActivity.java
index 96fd313..a2c4094 100644
--- a/app/src/main/java/com/uiui/aios/activity/alarm/AlarmClockActivity.java
+++ b/app/src/main/java/com/uiuios/aios/activity/alarm/AlarmClockActivity.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.activity.alarm;
+package com.uiuios.aios.activity.alarm;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -11,13 +11,12 @@ import android.widget.ImageView;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.uiui.aios.R;
-import com.uiui.aios.adapter.AlarmAdapter;
-import com.uiui.aios.alarm.AlarmUtils;
-import com.uiui.aios.base.BaseActivity;
-import com.uiui.aios.bean.AlarmClockData;
-import com.uiui.aios.tpush.MessageReceiver;
-import com.uiui.aios.utils.ToastUtil;
+import com.uiuios.aios.R;
+import com.uiuios.aios.adapter.AlarmAdapter;
+import com.uiuios.aios.base.BaseActivity;
+import com.uiuios.aios.bean.AlarmClockData;
+import com.uiuios.aios.tpush.MessageReceiver;
+import com.uiuios.aios.utils.ToastUtil;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/uiui/aios/activity/alarm/AlarmClockContact.java b/app/src/main/java/com/uiuios/aios/activity/alarm/AlarmClockContact.java
similarity index 67%
rename from app/src/main/java/com/uiui/aios/activity/alarm/AlarmClockContact.java
rename to app/src/main/java/com/uiuios/aios/activity/alarm/AlarmClockContact.java
index ce8385e..08998f7 100644
--- a/app/src/main/java/com/uiui/aios/activity/alarm/AlarmClockContact.java
+++ b/app/src/main/java/com/uiuios/aios/activity/alarm/AlarmClockContact.java
@@ -1,8 +1,8 @@
-package com.uiui.aios.activity.alarm;
+package com.uiuios.aios.activity.alarm;
 
-import com.uiui.aios.base.BasePresenter;
-import com.uiui.aios.base.BaseView;
-import com.uiui.aios.bean.AlarmClockData;
+import com.uiuios.aios.base.BasePresenter;
+import com.uiuios.aios.base.BaseView;
+import com.uiuios.aios.bean.AlarmClockData;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/uiui/aios/activity/alarm/AlarmClockPresenter.java b/app/src/main/java/com/uiuios/aios/activity/alarm/AlarmClockPresenter.java
similarity index 91%
rename from app/src/main/java/com/uiui/aios/activity/alarm/AlarmClockPresenter.java
rename to app/src/main/java/com/uiuios/aios/activity/alarm/AlarmClockPresenter.java
index 3689ecf..5c5f00d 100644
--- a/app/src/main/java/com/uiui/aios/activity/alarm/AlarmClockPresenter.java
+++ b/app/src/main/java/com/uiuios/aios/activity/alarm/AlarmClockPresenter.java
@@ -1,12 +1,12 @@
-package com.uiui.aios.activity.alarm;
+package com.uiuios.aios.activity.alarm;
 
 import android.content.Context;
 
 import androidx.annotation.NonNull;
 
 import com.trello.rxlifecycle4.android.ActivityEvent;
-import com.uiui.aios.bean.AlarmClockData;
-import com.uiui.aios.network.NetInterfaceManager;
+import com.uiuios.aios.bean.AlarmClockData;
+import com.uiuios.aios.network.NetInterfaceManager;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/uiui/aios/activity/code/HealthCodeActivity.java b/app/src/main/java/com/uiuios/aios/activity/code/HealthCodeActivity.java
similarity index 79%
rename from app/src/main/java/com/uiui/aios/activity/code/HealthCodeActivity.java
rename to app/src/main/java/com/uiuios/aios/activity/code/HealthCodeActivity.java
index c4e68f6..fa0546d 100644
--- a/app/src/main/java/com/uiui/aios/activity/code/HealthCodeActivity.java
+++ b/app/src/main/java/com/uiuios/aios/activity/code/HealthCodeActivity.java
@@ -1,24 +1,18 @@
-package com.uiui.aios.activity.code;
+package com.uiuios.aios.activity.code;
 
 import android.graphics.Color;
-import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 
 import androidx.viewpager.widget.ViewPager;
 
 import com.bumptech.glide.Glide;
-import com.trello.rxlifecycle4.RxLifecycle;
-import com.trello.rxlifecycle4.android.ActivityEvent;
-import com.uiui.aios.R;
-import com.uiui.aios.adapter.HealthCodeAdapter;
-import com.uiui.aios.base.BaseActivity;
-import com.uiui.aios.bean.BaseResponse;
-import com.uiui.aios.bean.HealthCode;
-import com.uiui.aios.network.NetInterfaceManager;
-import com.uiui.aios.utils.ToastUtil;
-import com.uiui.aios.utils.Utils;
-import com.uiui.aios.view.ScaleCircleNavigator;
+import com.uiuios.aios.R;
+import com.uiuios.aios.adapter.HealthCodeAdapter;
+import com.uiuios.aios.base.BaseActivity;
+import com.uiuios.aios.bean.HealthCode;
+import com.uiuios.aios.utils.ToastUtil;
+import com.uiuios.aios.view.ScaleCircleNavigator;
 
 import net.lucode.hackware.magicindicator.MagicIndicator;
 import net.lucode.hackware.magicindicator.ViewPagerHelper;
@@ -28,11 +22,6 @@ import java.util.List;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
-import io.reactivex.rxjava3.annotations.NonNull;
-import io.reactivex.rxjava3.core.Observer;
-import io.reactivex.rxjava3.disposables.Disposable;
-import io.reactivex.rxjava3.schedulers.Schedulers;
 
 public class HealthCodeActivity extends BaseActivity implements HealthCodeContact.CodeView {
     @BindView(R.id.viewPager)
diff --git a/app/src/main/java/com/uiui/aios/activity/code/HealthCodeContact.java b/app/src/main/java/com/uiuios/aios/activity/code/HealthCodeContact.java
similarity index 67%
rename from app/src/main/java/com/uiui/aios/activity/code/HealthCodeContact.java
rename to app/src/main/java/com/uiuios/aios/activity/code/HealthCodeContact.java
index 1572a5c..39ebaaf 100644
--- a/app/src/main/java/com/uiui/aios/activity/code/HealthCodeContact.java
+++ b/app/src/main/java/com/uiuios/aios/activity/code/HealthCodeContact.java
@@ -1,8 +1,8 @@
-package com.uiui.aios.activity.code;
+package com.uiuios.aios.activity.code;
 
-import com.uiui.aios.base.BasePresenter;
-import com.uiui.aios.base.BaseView;
-import com.uiui.aios.bean.HealthCode;
+import com.uiuios.aios.base.BasePresenter;
+import com.uiuios.aios.base.BaseView;
+import com.uiuios.aios.bean.HealthCode;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/uiui/aios/activity/code/HealthCodePresenter.java b/app/src/main/java/com/uiuios/aios/activity/code/HealthCodePresenter.java
similarity index 89%
rename from app/src/main/java/com/uiui/aios/activity/code/HealthCodePresenter.java
rename to app/src/main/java/com/uiuios/aios/activity/code/HealthCodePresenter.java
index 6cdc816..2e14a77 100644
--- a/app/src/main/java/com/uiui/aios/activity/code/HealthCodePresenter.java
+++ b/app/src/main/java/com/uiuios/aios/activity/code/HealthCodePresenter.java
@@ -1,15 +1,13 @@
-package com.uiui.aios.activity.code;
+package com.uiuios.aios.activity.code;
 
 import android.content.Context;
 import android.util.Log;
-import android.view.View;
 
 import androidx.annotation.NonNull;
 
 import com.trello.rxlifecycle4.android.ActivityEvent;
-import com.uiui.aios.bean.HealthCode;
-import com.uiui.aios.network.NetInterfaceManager;
-import com.uiui.aios.utils.ToastUtil;
+import com.uiuios.aios.bean.HealthCode;
+import com.uiuios.aios.network.NetInterfaceManager;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/uiui/aios/activity/contact/ContactActivity.java b/app/src/main/java/com/uiuios/aios/activity/contact/ContactActivity.java
similarity index 89%
rename from app/src/main/java/com/uiui/aios/activity/contact/ContactActivity.java
rename to app/src/main/java/com/uiuios/aios/activity/contact/ContactActivity.java
index 5190a69..1e34a75 100644
--- a/app/src/main/java/com/uiui/aios/activity/contact/ContactActivity.java
+++ b/app/src/main/java/com/uiuios/aios/activity/contact/ContactActivity.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.activity.contact;
+package com.uiuios.aios.activity.contact;
 
 import android.content.res.Configuration;
 import android.view.View;
@@ -6,13 +6,12 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.uiui.aios.R;
-import com.uiui.aios.adapter.ContactAdapter;
-import com.uiui.aios.base.BaseActivity;
-import com.uiui.aios.bean.Contact;
+import com.uiuios.aios.R;
+import com.uiuios.aios.adapter.ContactAdapter;
+import com.uiuios.aios.base.BaseActivity;
+import com.uiuios.aios.bean.Contact;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/uiui/aios/activity/contact/ContactContact.java b/app/src/main/java/com/uiuios/aios/activity/contact/ContactContact.java
similarity index 62%
rename from app/src/main/java/com/uiui/aios/activity/contact/ContactContact.java
rename to app/src/main/java/com/uiuios/aios/activity/contact/ContactContact.java
index 20041c6..8aa65cb 100644
--- a/app/src/main/java/com/uiui/aios/activity/contact/ContactContact.java
+++ b/app/src/main/java/com/uiuios/aios/activity/contact/ContactContact.java
@@ -1,8 +1,8 @@
-package com.uiui.aios.activity.contact;
+package com.uiuios.aios.activity.contact;
 
-import com.uiui.aios.base.BasePresenter;
-import com.uiui.aios.base.BaseView;
-import com.uiui.aios.bean.Contact;
+import com.uiuios.aios.base.BasePresenter;
+import com.uiuios.aios.base.BaseView;
+import com.uiuios.aios.bean.Contact;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/uiui/aios/activity/contact/ContactPresenter.java b/app/src/main/java/com/uiuios/aios/activity/contact/ContactPresenter.java
similarity index 92%
rename from app/src/main/java/com/uiui/aios/activity/contact/ContactPresenter.java
rename to app/src/main/java/com/uiuios/aios/activity/contact/ContactPresenter.java
index 61bc49c..88eee86 100644
--- a/app/src/main/java/com/uiui/aios/activity/contact/ContactPresenter.java
+++ b/app/src/main/java/com/uiuios/aios/activity/contact/ContactPresenter.java
@@ -1,13 +1,13 @@
-package com.uiui.aios.activity.contact;
+package com.uiuios.aios.activity.contact;
 
 import android.content.Context;
 import android.util.Log;
 
 import com.trello.rxlifecycle4.RxLifecycle;
 import com.trello.rxlifecycle4.android.ActivityEvent;
-import com.uiui.aios.bean.BaseResponse;
-import com.uiui.aios.bean.Contact;
-import com.uiui.aios.network.NetInterfaceManager;
+import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.bean.Contact;
+import com.uiuios.aios.network.NetInterfaceManager;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/uiui/aios/activity/main/MainActivity.java b/app/src/main/java/com/uiuios/aios/activity/main/MainActivity.java
similarity index 95%
rename from app/src/main/java/com/uiui/aios/activity/main/MainActivity.java
rename to app/src/main/java/com/uiuios/aios/activity/main/MainActivity.java
index dac6897..909840c 100644
--- a/app/src/main/java/com/uiui/aios/activity/main/MainActivity.java
+++ b/app/src/main/java/com/uiuios/aios/activity/main/MainActivity.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.activity.main;
+package com.uiuios.aios.activity.main;
 
 import android.content.ActivityNotFoundException;
 import android.content.BroadcastReceiver;
@@ -26,20 +26,20 @@ import androidx.viewpager.widget.ViewPager;
 import com.alarmclock.uiui.IAlarmAidlInterface;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
-import com.uiui.aios.BuildConfig;
-import com.uiui.aios.R;
-import com.uiui.aios.base.BaseActivity;
-import com.uiui.aios.bean.AlarmItem;
-import com.uiui.aios.bean.DesktopIcon;
-import com.uiui.aios.fragment.AppListFragment;
-import com.uiui.aios.fragment.BaseFragmentPagerAdapter;
-import com.uiui.aios.fragment.CustomFragment;
-import com.uiui.aios.fragment.SecondFragment;
-import com.uiui.aios.service.NotificationService;
-import com.uiui.aios.utils.ApkUtils;
-import com.uiui.aios.utils.AppUsedTimeUtils;
-import com.uiui.aios.utils.ToastUtil;
-import com.uiui.aios.view.ScaleCircleNavigator;
+import com.uiuios.aios.BuildConfig;
+import com.uiuios.aios.R;
+import com.uiuios.aios.base.BaseActivity;
+import com.uiuios.aios.bean.AlarmItem;
+import com.uiuios.aios.bean.DesktopIcon;
+import com.uiuios.aios.fragment.AppListFragment;
+import com.uiuios.aios.fragment.BaseFragmentPagerAdapter;
+import com.uiuios.aios.fragment.CustomFragment;
+import com.uiuios.aios.fragment.SecondFragment;
+import com.uiuios.aios.service.NotificationService;
+import com.uiuios.aios.utils.ApkUtils;
+import com.uiuios.aios.utils.AppUsedTimeUtils;
+import com.uiuios.aios.utils.ToastUtil;
+import com.uiuios.aios.view.ScaleCircleNavigator;
 
 import net.lucode.hackware.magicindicator.MagicIndicator;
 import net.lucode.hackware.magicindicator.ViewPagerHelper;
@@ -96,7 +96,7 @@ public class MainActivity extends BaseActivity implements MainContact.MainView {
 //        fragmentTransaction.add(R.id.viewPager, appListFragment);
 //        fragmentTransaction.commit();
 
-        is_twoscreen = Settings.Global.getInt(getContentResolver(), "is_twoscreen", 0) == 1;
+        is_twoscreen = Settings.Global.getInt(getContentResolver(), "is_twoscreen", 1) == 1;
         if (is_twoscreen) {
             appListIndex = 2;
             defaultCurrent = 1;
diff --git a/app/src/main/java/com/uiui/aios/activity/main/MainContact.java b/app/src/main/java/com/uiuios/aios/activity/main/MainContact.java
similarity index 86%
rename from app/src/main/java/com/uiui/aios/activity/main/MainContact.java
rename to app/src/main/java/com/uiuios/aios/activity/main/MainContact.java
index 7de0405..2c930a8 100644
--- a/app/src/main/java/com/uiui/aios/activity/main/MainContact.java
+++ b/app/src/main/java/com/uiuios/aios/activity/main/MainContact.java
@@ -1,7 +1,7 @@
-package com.uiui.aios.activity.main;
+package com.uiuios.aios.activity.main;
 
-import com.uiui.aios.base.BasePresenter;
-import com.uiui.aios.base.BaseView;
+import com.uiuios.aios.base.BasePresenter;
+import com.uiuios.aios.base.BaseView;
 
 public class MainContact {
     public interface Presenter extends BasePresenter<MainView> {
diff --git a/app/src/main/java/com/uiui/aios/activity/main/MainPresenter.java b/app/src/main/java/com/uiuios/aios/activity/main/MainPresenter.java
similarity index 95%
rename from app/src/main/java/com/uiui/aios/activity/main/MainPresenter.java
rename to app/src/main/java/com/uiuios/aios/activity/main/MainPresenter.java
index b4fd44c..49aa452 100644
--- a/app/src/main/java/com/uiui/aios/activity/main/MainPresenter.java
+++ b/app/src/main/java/com/uiuios/aios/activity/main/MainPresenter.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.activity.main;
+package com.uiuios.aios.activity.main;
 
 import android.content.Context;
 import android.content.Intent;
@@ -8,14 +8,14 @@ import android.util.Log;
 import com.google.gson.JsonObject;
 import com.trello.rxlifecycle4.RxLifecycle;
 import com.trello.rxlifecycle4.android.ActivityEvent;
-import com.uiui.aios.BuildConfig;
-import com.uiui.aios.bean.BaseResponse;
-import com.uiui.aios.bean.Contact;
-import com.uiui.aios.bean.NetDesktopIcon;
-import com.uiui.aios.network.NetInterfaceManager;
-import com.uiui.aios.utils.ApkUtils;
-import com.uiui.aios.utils.AppUsedTimeUtils;
-import com.uiui.aios.utils.Utils;
+import com.uiuios.aios.BuildConfig;
+import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.bean.Contact;
+import com.uiuios.aios.bean.NetDesktopIcon;
+import com.uiuios.aios.network.NetInterfaceManager;
+import com.uiuios.aios.utils.ApkUtils;
+import com.uiuios.aios.utils.AppUsedTimeUtils;
+import com.uiuios.aios.utils.Utils;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/uiui/aios/activity/weather/WeatherActivity.java b/app/src/main/java/com/uiuios/aios/activity/weather/WeatherActivity.java
similarity index 93%
rename from app/src/main/java/com/uiui/aios/activity/weather/WeatherActivity.java
rename to app/src/main/java/com/uiuios/aios/activity/weather/WeatherActivity.java
index af0b397..8814537 100644
--- a/app/src/main/java/com/uiui/aios/activity/weather/WeatherActivity.java
+++ b/app/src/main/java/com/uiuios/aios/activity/weather/WeatherActivity.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.activity.weather;
+package com.uiuios.aios.activity.weather;
 
 import android.content.res.Configuration;
 import android.content.res.Resources;
@@ -10,10 +10,10 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.qweather.sdk.bean.weather.WeatherDailyBean;
-import com.uiui.aios.R;
-import com.uiui.aios.adapter.WeatherDayApdapter;
-import com.uiui.aios.base.BaseActivity;
-import com.uiui.aios.view.HorizontalItemDecoration;
+import com.uiuios.aios.R;
+import com.uiuios.aios.adapter.WeatherDayApdapter;
+import com.uiuios.aios.base.BaseActivity;
+import com.uiuios.aios.view.HorizontalItemDecoration;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
diff --git a/app/src/main/java/com/uiui/aios/activity/weather/WeatherContact.java b/app/src/main/java/com/uiuios/aios/activity/weather/WeatherContact.java
similarity index 83%
rename from app/src/main/java/com/uiui/aios/activity/weather/WeatherContact.java
rename to app/src/main/java/com/uiuios/aios/activity/weather/WeatherContact.java
index 0e0950f..3fbbf69 100644
--- a/app/src/main/java/com/uiui/aios/activity/weather/WeatherContact.java
+++ b/app/src/main/java/com/uiuios/aios/activity/weather/WeatherContact.java
@@ -1,8 +1,8 @@
-package com.uiui.aios.activity.weather;
+package com.uiuios.aios.activity.weather;
 
 import com.qweather.sdk.bean.weather.WeatherDailyBean;
-import com.uiui.aios.base.BasePresenter;
-import com.uiui.aios.base.BaseView;
+import com.uiuios.aios.base.BasePresenter;
+import com.uiuios.aios.base.BaseView;
 
 public class WeatherContact {
     public interface Presenter extends BasePresenter<WeatherView> {
diff --git a/app/src/main/java/com/uiui/aios/activity/weather/WeatherPresenter.java b/app/src/main/java/com/uiuios/aios/activity/weather/WeatherPresenter.java
similarity index 97%
rename from app/src/main/java/com/uiui/aios/activity/weather/WeatherPresenter.java
rename to app/src/main/java/com/uiuios/aios/activity/weather/WeatherPresenter.java
index c0c65f9..e949c77 100644
--- a/app/src/main/java/com/uiui/aios/activity/weather/WeatherPresenter.java
+++ b/app/src/main/java/com/uiuios/aios/activity/weather/WeatherPresenter.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.activity.weather;
+package com.uiuios.aios.activity.weather;
 
 import android.content.Context;
 import android.util.Log;
@@ -12,7 +12,7 @@ import com.qweather.sdk.bean.weather.WeatherDailyBean;
 import com.qweather.sdk.view.QWeather;
 import com.tencent.mmkv.MMKV;
 import com.trello.rxlifecycle4.android.ActivityEvent;
-import com.uiui.aios.manager.AmapManager;
+import com.uiuios.aios.manager.AmapManager;
 
 import java.lang.reflect.Type;
 
diff --git a/app/src/main/java/com/uiui/aios/adapter/APPListAdapter.java b/app/src/main/java/com/uiuios/aios/adapter/APPListAdapter.java
similarity index 92%
rename from app/src/main/java/com/uiui/aios/adapter/APPListAdapter.java
rename to app/src/main/java/com/uiuios/aios/adapter/APPListAdapter.java
index 303a6ed..5e73b3a 100644
--- a/app/src/main/java/com/uiui/aios/adapter/APPListAdapter.java
+++ b/app/src/main/java/com/uiuios/aios/adapter/APPListAdapter.java
@@ -1,11 +1,10 @@
-package com.uiui.aios.adapter;
+package com.uiuios.aios.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -13,10 +12,10 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
 
 
-import com.uiui.aios.R;
-import com.uiui.aios.bean.AppListInfo;
-import com.uiui.aios.service.NotificationService;
-import com.uiui.aios.utils.ApkUtils;
+import com.uiuios.aios.R;
+import com.uiuios.aios.bean.AppListInfo;
+import com.uiuios.aios.service.NotificationService;
+import com.uiuios.aios.utils.ApkUtils;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/uiui/aios/adapter/AlarmAdapter.java b/app/src/main/java/com/uiuios/aios/adapter/AlarmAdapter.java
similarity index 96%
rename from app/src/main/java/com/uiui/aios/adapter/AlarmAdapter.java
rename to app/src/main/java/com/uiuios/aios/adapter/AlarmAdapter.java
index ecd7590..8a9b3bb 100644
--- a/app/src/main/java/com/uiui/aios/adapter/AlarmAdapter.java
+++ b/app/src/main/java/com/uiuios/aios/adapter/AlarmAdapter.java
@@ -1,10 +1,8 @@
-package com.uiui.aios.adapter;
+package com.uiuios.aios.adapter;
 
-import android.content.Context;
 import android.graphics.Bitmap;
 import android.media.AudioAttributes;
 import android.media.MediaPlayer;
-import android.os.Build;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -22,12 +20,11 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.bumptech.glide.request.RequestOptions;
-import com.uiui.aios.R;
-import com.uiui.aios.bean.AlarmClockData;
-import com.uiui.aios.utils.FFmpegUtils;
-import com.uiui.aios.utils.ScreenUtils;
-import com.uiui.aios.view.JzvdStdRound;
-import com.uiui.aios.view.MyJzvdStdNoTitleNoClarity;
+import com.uiuios.aios.R;
+import com.uiuios.aios.bean.AlarmClockData;
+import com.uiuios.aios.utils.FFmpegUtils;
+import com.uiuios.aios.utils.ScreenUtils;
+import com.uiuios.aios.view.JzvdStdRound;
 
 import java.io.IOException;
 import java.text.ParseException;
diff --git a/app/src/main/java/com/uiui/aios/adapter/AlarmClockAdapter.java b/app/src/main/java/com/uiuios/aios/adapter/AlarmClockAdapter.java
similarity index 94%
rename from app/src/main/java/com/uiui/aios/adapter/AlarmClockAdapter.java
rename to app/src/main/java/com/uiuios/aios/adapter/AlarmClockAdapter.java
index 97dcd3e..520e15b 100644
--- a/app/src/main/java/com/uiui/aios/adapter/AlarmClockAdapter.java
+++ b/app/src/main/java/com/uiuios/aios/adapter/AlarmClockAdapter.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.adapter;
+package com.uiuios.aios.adapter;
 
 import android.view.LayoutInflater;
 import android.view.View;
@@ -8,8 +8,8 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.uiui.aios.R;
-import com.uiui.aios.bean.AlarmItem;
+import com.uiuios.aios.R;
+import com.uiuios.aios.bean.AlarmItem;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/uiui/aios/adapter/ContactAdapter.java b/app/src/main/java/com/uiuios/aios/adapter/ContactAdapter.java
similarity index 96%
rename from app/src/main/java/com/uiui/aios/adapter/ContactAdapter.java
rename to app/src/main/java/com/uiuios/aios/adapter/ContactAdapter.java
index b8d80dc..fa07f6a 100644
--- a/app/src/main/java/com/uiui/aios/adapter/ContactAdapter.java
+++ b/app/src/main/java/com/uiuios/aios/adapter/ContactAdapter.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.adapter;
+package com.uiuios.aios.adapter;
 
 import android.content.Context;
 import android.content.Intent;
@@ -7,7 +7,6 @@ import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -16,8 +15,8 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.bumptech.glide.Glide;
 import com.shehuan.niv.NiceImageView;
-import com.uiui.aios.R;
-import com.uiui.aios.bean.Contact;
+import com.uiuios.aios.R;
+import com.uiuios.aios.bean.Contact;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/uiui/aios/adapter/HealthCodeAdapter.java b/app/src/main/java/com/uiuios/aios/adapter/HealthCodeAdapter.java
similarity index 97%
rename from app/src/main/java/com/uiui/aios/adapter/HealthCodeAdapter.java
rename to app/src/main/java/com/uiuios/aios/adapter/HealthCodeAdapter.java
index d50c7e5..e184f3f 100644
--- a/app/src/main/java/com/uiui/aios/adapter/HealthCodeAdapter.java
+++ b/app/src/main/java/com/uiuios/aios/adapter/HealthCodeAdapter.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.adapter;
+package com.uiuios.aios.adapter;
 
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/com/uiui/aios/adapter/NotificationAdapter.java b/app/src/main/java/com/uiuios/aios/adapter/NotificationAdapter.java
similarity index 96%
rename from app/src/main/java/com/uiui/aios/adapter/NotificationAdapter.java
rename to app/src/main/java/com/uiuios/aios/adapter/NotificationAdapter.java
index 7ce5523..1df1cb5 100644
--- a/app/src/main/java/com/uiui/aios/adapter/NotificationAdapter.java
+++ b/app/src/main/java/com/uiuios/aios/adapter/NotificationAdapter.java
@@ -1,7 +1,6 @@
-package com.uiui.aios.adapter;
+package com.uiuios.aios.adapter;
 
 import android.content.Context;
-import android.content.Intent;
 import android.media.AudioAttributes;
 import android.media.MediaPlayer;
 import android.text.TextUtils;
@@ -15,9 +14,9 @@ import androidx.annotation.NonNull;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.uiui.aios.R;
-import com.uiui.aios.bean.AlarmClockData;
-import com.uiui.aios.utils.FFmpegUtils;
+import com.uiuios.aios.R;
+import com.uiuios.aios.bean.AlarmClockData;
+import com.uiuios.aios.utils.FFmpegUtils;
 
 import java.io.IOException;
 import java.text.ParseException;
diff --git a/app/src/main/java/com/uiui/aios/adapter/SOSNnmberAdapter.java b/app/src/main/java/com/uiuios/aios/adapter/SOSNnmberAdapter.java
similarity index 93%
rename from app/src/main/java/com/uiui/aios/adapter/SOSNnmberAdapter.java
rename to app/src/main/java/com/uiuios/aios/adapter/SOSNnmberAdapter.java
index 0f01007..d8a9669 100644
--- a/app/src/main/java/com/uiui/aios/adapter/SOSNnmberAdapter.java
+++ b/app/src/main/java/com/uiuios/aios/adapter/SOSNnmberAdapter.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.adapter;
+package com.uiuios.aios.adapter;
 
 import android.content.Context;
 import android.content.Intent;
@@ -11,9 +11,9 @@ import androidx.annotation.NonNull;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.uiui.aios.R;
-import com.uiui.aios.activity.EmergencyActivity;
-import com.uiui.aios.bean.Contact;
+import com.uiuios.aios.R;
+import com.uiuios.aios.activity.EmergencyActivity;
+import com.uiuios.aios.bean.Contact;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/uiui/aios/adapter/WeatherDayApdapter.java b/app/src/main/java/com/uiuios/aios/adapter/WeatherDayApdapter.java
similarity index 97%
rename from app/src/main/java/com/uiui/aios/adapter/WeatherDayApdapter.java
rename to app/src/main/java/com/uiuios/aios/adapter/WeatherDayApdapter.java
index d19ee49..23d8219 100644
--- a/app/src/main/java/com/uiui/aios/adapter/WeatherDayApdapter.java
+++ b/app/src/main/java/com/uiuios/aios/adapter/WeatherDayApdapter.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.adapter;
+package com.uiuios.aios.adapter;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
@@ -14,7 +14,7 @@ import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.qweather.sdk.bean.weather.WeatherDailyBean;
-import com.uiui.aios.R;
+import com.uiuios.aios.R;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -83,7 +83,7 @@ public class WeatherDayApdapter extends RecyclerView.Adapter<WeatherDayApdapter.
     }
 
     private Drawable getWeatherDrawable(String iconName) {
-        int resID = mContext.getResources().getIdentifier("he" + iconName, "drawable", "com.uiui.aios");
+        int resID = mContext.getResources().getIdentifier("he" + iconName, "drawable", "com.uiuios.aios");
         if (resID == 0) {
             Log.e(TAG, "getView: not found src : " + iconName);
             return mContext.getResources().getDrawable(R.drawable.he100);
diff --git a/app/src/main/java/com/uiui/aios/alarm/AlarmOpenHelper.java b/app/src/main/java/com/uiuios/aios/alarm/AlarmOpenHelper.java
similarity index 98%
rename from app/src/main/java/com/uiui/aios/alarm/AlarmOpenHelper.java
rename to app/src/main/java/com/uiuios/aios/alarm/AlarmOpenHelper.java
index 0ac96eb..ce0dd8f 100644
--- a/app/src/main/java/com/uiui/aios/alarm/AlarmOpenHelper.java
+++ b/app/src/main/java/com/uiuios/aios/alarm/AlarmOpenHelper.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.alarm;
+package com.uiuios.aios.alarm;
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
diff --git a/app/src/main/java/com/uiui/aios/alarm/AlarmService.java b/app/src/main/java/com/uiuios/aios/alarm/AlarmService.java
similarity index 89%
rename from app/src/main/java/com/uiui/aios/alarm/AlarmService.java
rename to app/src/main/java/com/uiuios/aios/alarm/AlarmService.java
index bde59c6..9b46d3d 100644
--- a/app/src/main/java/com/uiui/aios/alarm/AlarmService.java
+++ b/app/src/main/java/com/uiuios/aios/alarm/AlarmService.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.alarm;
+package com.uiuios.aios.alarm;
 
 import android.app.Service;
 import android.content.Intent;
diff --git a/app/src/main/java/com/uiui/aios/alarm/AlarmUtils.java b/app/src/main/java/com/uiuios/aios/alarm/AlarmUtils.java
similarity index 99%
rename from app/src/main/java/com/uiui/aios/alarm/AlarmUtils.java
rename to app/src/main/java/com/uiuios/aios/alarm/AlarmUtils.java
index 2a85b80..3ee4085 100644
--- a/app/src/main/java/com/uiui/aios/alarm/AlarmUtils.java
+++ b/app/src/main/java/com/uiuios/aios/alarm/AlarmUtils.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.alarm;
+package com.uiuios.aios.alarm;
 
 import android.annotation.SuppressLint;
 import android.app.AlarmManager;
@@ -14,10 +14,10 @@ import android.util.Log;
 import com.arialyy.aria.core.Aria;
 import com.blankj.utilcode.util.FileUtils;
 import com.bumptech.glide.Glide;
-import com.uiui.aios.bean.AlarmClockData;
-import com.uiui.aios.service.main.MainService;
-import com.uiui.aios.utils.FileUtil;
-import com.uiui.aios.utils.Utils;
+import com.uiuios.aios.bean.AlarmClockData;
+import com.uiuios.aios.service.main.MainService;
+import com.uiuios.aios.utils.FileUtil;
+import com.uiuios.aios.utils.Utils;
 
 import java.io.File;
 import java.text.ParseException;
diff --git a/app/src/main/java/com/uiui/aios/base/BaseActivity.java b/app/src/main/java/com/uiuios/aios/base/BaseActivity.java
similarity index 98%
rename from app/src/main/java/com/uiui/aios/base/BaseActivity.java
rename to app/src/main/java/com/uiuios/aios/base/BaseActivity.java
index 1186354..37e8ad3 100644
--- a/app/src/main/java/com/uiui/aios/base/BaseActivity.java
+++ b/app/src/main/java/com/uiuios/aios/base/BaseActivity.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.base;
+package com.uiuios.aios.base;
 
 import android.os.Bundle;
 
@@ -15,7 +15,7 @@ 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.aios.R;
+import com.uiuios.aios.R;
 import com.zackratos.ultimatebarx.ultimatebarx.java.UltimateBarX;
 
 import io.reactivex.rxjava3.core.Observable;
diff --git a/app/src/main/java/com/uiui/aios/base/BaseApplication.java b/app/src/main/java/com/uiuios/aios/base/BaseApplication.java
similarity index 92%
rename from app/src/main/java/com/uiui/aios/base/BaseApplication.java
rename to app/src/main/java/com/uiuios/aios/base/BaseApplication.java
index 525f967..491291b 100644
--- a/app/src/main/java/com/uiui/aios/base/BaseApplication.java
+++ b/app/src/main/java/com/uiuios/aios/base/BaseApplication.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.base;
+package com.uiuios.aios.base;
 
 import android.annotation.SuppressLint;
 import android.app.Application;
@@ -14,14 +14,14 @@ 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.aios.BuildConfig;
-import com.uiui.aios.manager.ConnectManager;
-import com.uiui.aios.network.NetInterfaceManager;
-import com.uiui.aios.service.main.MainService;
-import com.uiui.aios.alarm.AlarmUtils;
-import com.uiui.aios.manager.AmapManager;
-import com.uiui.aios.utils.AppUsedTimeUtils;
-import com.uiui.aios.utils.Utils;
+import com.uiuios.aios.BuildConfig;
+import com.uiuios.aios.manager.ConnectManager;
+import com.uiuios.aios.network.NetInterfaceManager;
+import com.uiuios.aios.service.main.MainService;
+import com.uiuios.aios.alarm.AlarmUtils;
+import com.uiuios.aios.manager.AmapManager;
+import com.uiuios.aios.utils.AppUsedTimeUtils;
+import com.uiuios.aios.utils.Utils;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/com/uiui/aios/base/BaseFragment.java b/app/src/main/java/com/uiuios/aios/base/BaseFragment.java
similarity index 99%
rename from app/src/main/java/com/uiui/aios/base/BaseFragment.java
rename to app/src/main/java/com/uiuios/aios/base/BaseFragment.java
index 61c14b6..13313b2 100644
--- a/app/src/main/java/com/uiui/aios/base/BaseFragment.java
+++ b/app/src/main/java/com/uiuios/aios/base/BaseFragment.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.base;
+package com.uiuios.aios.base;
 
 import android.os.Bundle;
 import android.view.View;
diff --git a/app/src/main/java/com/uiui/aios/base/BasePresenter.java b/app/src/main/java/com/uiuios/aios/base/BasePresenter.java
similarity index 83%
rename from app/src/main/java/com/uiui/aios/base/BasePresenter.java
rename to app/src/main/java/com/uiuios/aios/base/BasePresenter.java
index c2e48aa..29ff126 100644
--- a/app/src/main/java/com/uiui/aios/base/BasePresenter.java
+++ b/app/src/main/java/com/uiuios/aios/base/BasePresenter.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.base;
+package com.uiuios.aios.base;
 
 import androidx.annotation.NonNull;
 
diff --git a/app/src/main/java/com/uiui/aios/base/BaseService.java b/app/src/main/java/com/uiuios/aios/base/BaseService.java
similarity index 98%
rename from app/src/main/java/com/uiui/aios/base/BaseService.java
rename to app/src/main/java/com/uiuios/aios/base/BaseService.java
index 4d323ab..82c0345 100644
--- a/app/src/main/java/com/uiui/aios/base/BaseService.java
+++ b/app/src/main/java/com/uiuios/aios/base/BaseService.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.base;
+package com.uiuios.aios.base;
 
 import android.app.Service;
 import android.content.Intent;
diff --git a/app/src/main/java/com/uiui/aios/base/BaseView.java b/app/src/main/java/com/uiuios/aios/base/BaseView.java
similarity index 50%
rename from app/src/main/java/com/uiui/aios/base/BaseView.java
rename to app/src/main/java/com/uiuios/aios/base/BaseView.java
index b97fe9a..0fef6e2 100644
--- a/app/src/main/java/com/uiui/aios/base/BaseView.java
+++ b/app/src/main/java/com/uiuios/aios/base/BaseView.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.base;
+package com.uiuios.aios.base;
 
 public interface BaseView {
 }
diff --git a/app/src/main/java/com/uiui/aios/bean/ActivityBean.java b/app/src/main/java/com/uiuios/aios/bean/ActivityBean.java
similarity index 98%
rename from app/src/main/java/com/uiui/aios/bean/ActivityBean.java
rename to app/src/main/java/com/uiuios/aios/bean/ActivityBean.java
index b6ed51c..5798d96 100644
--- a/app/src/main/java/com/uiui/aios/bean/ActivityBean.java
+++ b/app/src/main/java/com/uiuios/aios/bean/ActivityBean.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.bean;
+package com.uiuios.aios.bean;
 
 import java.io.Serializable;
 
diff --git a/app/src/main/java/com/uiui/aios/bean/AlarmClockData.java b/app/src/main/java/com/uiuios/aios/bean/AlarmClockData.java
similarity index 98%
rename from app/src/main/java/com/uiui/aios/bean/AlarmClockData.java
rename to app/src/main/java/com/uiuios/aios/bean/AlarmClockData.java
index dfe6d77..cb503af 100644
--- a/app/src/main/java/com/uiui/aios/bean/AlarmClockData.java
+++ b/app/src/main/java/com/uiuios/aios/bean/AlarmClockData.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.bean;
+package com.uiuios.aios.bean;
 
 import android.text.TextUtils;
 import android.util.Log;
@@ -8,7 +8,7 @@ import androidx.annotation.Nullable;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonParser;
-import com.uiui.aios.alarm.AlarmUtils;
+import com.uiuios.aios.alarm.AlarmUtils;
 
 import java.io.Serializable;
 import java.text.ParseException;
diff --git a/app/src/main/java/com/uiui/aios/bean/AlarmItem.java b/app/src/main/java/com/uiuios/aios/bean/AlarmItem.java
similarity index 95%
rename from app/src/main/java/com/uiui/aios/bean/AlarmItem.java
rename to app/src/main/java/com/uiuios/aios/bean/AlarmItem.java
index 4b3a886..bcec009 100644
--- a/app/src/main/java/com/uiui/aios/bean/AlarmItem.java
+++ b/app/src/main/java/com/uiuios/aios/bean/AlarmItem.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.bean;
+package com.uiuios.aios.bean;
 
 import java.io.Serializable;
 
diff --git a/app/src/main/java/com/uiui/aios/bean/AppListInfo.java b/app/src/main/java/com/uiuios/aios/bean/AppListInfo.java
similarity index 96%
rename from app/src/main/java/com/uiui/aios/bean/AppListInfo.java
rename to app/src/main/java/com/uiuios/aios/bean/AppListInfo.java
index e557432..c374919 100644
--- a/app/src/main/java/com/uiui/aios/bean/AppListInfo.java
+++ b/app/src/main/java/com/uiuios/aios/bean/AppListInfo.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.bean;
+package com.uiuios.aios.bean;
 
 import android.graphics.Bitmap;
 
diff --git a/app/src/main/java/com/uiui/aios/bean/ArticleDetails.java b/app/src/main/java/com/uiuios/aios/bean/ArticleDetails.java
similarity index 96%
rename from app/src/main/java/com/uiui/aios/bean/ArticleDetails.java
rename to app/src/main/java/com/uiuios/aios/bean/ArticleDetails.java
index a12813e..bb3714d 100644
--- a/app/src/main/java/com/uiui/aios/bean/ArticleDetails.java
+++ b/app/src/main/java/com/uiuios/aios/bean/ArticleDetails.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.bean;
+package com.uiuios.aios.bean;
 
 import java.io.Serializable;
 
diff --git a/app/src/main/java/com/uiui/aios/bean/ArticleInfo.java b/app/src/main/java/com/uiuios/aios/bean/ArticleInfo.java
similarity index 97%
rename from app/src/main/java/com/uiui/aios/bean/ArticleInfo.java
rename to app/src/main/java/com/uiuios/aios/bean/ArticleInfo.java
index 9005b48..82d0efa 100644
--- a/app/src/main/java/com/uiui/aios/bean/ArticleInfo.java
+++ b/app/src/main/java/com/uiuios/aios/bean/ArticleInfo.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.bean;
+package com.uiuios.aios.bean;
 
 import java.io.Serializable;
 
diff --git a/app/src/main/java/com/uiui/aios/bean/BaseResponse.java b/app/src/main/java/com/uiuios/aios/bean/BaseResponse.java
similarity index 94%
rename from app/src/main/java/com/uiui/aios/bean/BaseResponse.java
rename to app/src/main/java/com/uiuios/aios/bean/BaseResponse.java
index 8a3a171..ccaca1c 100644
--- a/app/src/main/java/com/uiui/aios/bean/BaseResponse.java
+++ b/app/src/main/java/com/uiuios/aios/bean/BaseResponse.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.bean;
+package com.uiuios.aios.bean;
 
 import androidx.annotation.NonNull;
 
diff --git a/app/src/main/java/com/uiui/aios/bean/Contact.java b/app/src/main/java/com/uiuios/aios/bean/Contact.java
similarity index 97%
rename from app/src/main/java/com/uiui/aios/bean/Contact.java
rename to app/src/main/java/com/uiuios/aios/bean/Contact.java
index c26bd49..fdb1499 100644
--- a/app/src/main/java/com/uiui/aios/bean/Contact.java
+++ b/app/src/main/java/com/uiuios/aios/bean/Contact.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.bean;
+package com.uiuios.aios.bean;
 
 import androidx.annotation.NonNull;
 
diff --git a/app/src/main/java/com/uiui/aios/bean/DemandBean.java b/app/src/main/java/com/uiuios/aios/bean/DemandBean.java
similarity index 98%
rename from app/src/main/java/com/uiui/aios/bean/DemandBean.java
rename to app/src/main/java/com/uiuios/aios/bean/DemandBean.java
index 6a05de1..69507b8 100644
--- a/app/src/main/java/com/uiui/aios/bean/DemandBean.java
+++ b/app/src/main/java/com/uiuios/aios/bean/DemandBean.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.bean;
+package com.uiuios.aios.bean;
 
 import java.io.Serializable;
 
diff --git a/app/src/main/java/com/uiui/aios/bean/DesktopIcon.java b/app/src/main/java/com/uiuios/aios/bean/DesktopIcon.java
similarity index 98%
rename from app/src/main/java/com/uiui/aios/bean/DesktopIcon.java
rename to app/src/main/java/com/uiuios/aios/bean/DesktopIcon.java
index 6262eee..6a300b7 100644
--- a/app/src/main/java/com/uiui/aios/bean/DesktopIcon.java
+++ b/app/src/main/java/com/uiuios/aios/bean/DesktopIcon.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.bean;
+package com.uiuios.aios.bean;
 
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
diff --git a/app/src/main/java/com/uiui/aios/bean/GoodsDetails.java b/app/src/main/java/com/uiuios/aios/bean/GoodsDetails.java
similarity index 98%
rename from app/src/main/java/com/uiui/aios/bean/GoodsDetails.java
rename to app/src/main/java/com/uiuios/aios/bean/GoodsDetails.java
index bcafe80..9c3d99f 100644
--- a/app/src/main/java/com/uiui/aios/bean/GoodsDetails.java
+++ b/app/src/main/java/com/uiuios/aios/bean/GoodsDetails.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.bean;
+package com.uiuios.aios.bean;
 
 import java.io.Serializable;
 
diff --git a/app/src/main/java/com/uiui/aios/bean/GoodsInfo.java b/app/src/main/java/com/uiuios/aios/bean/GoodsInfo.java
similarity index 98%
rename from app/src/main/java/com/uiui/aios/bean/GoodsInfo.java
rename to app/src/main/java/com/uiuios/aios/bean/GoodsInfo.java
index b3f6af7..9b2a498 100644
--- a/app/src/main/java/com/uiui/aios/bean/GoodsInfo.java
+++ b/app/src/main/java/com/uiuios/aios/bean/GoodsInfo.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.bean;
+package com.uiuios.aios.bean;
 
 import java.io.Serializable;
 
diff --git a/app/src/main/java/com/uiui/aios/bean/HealthCode.java b/app/src/main/java/com/uiuios/aios/bean/HealthCode.java
similarity index 93%
rename from app/src/main/java/com/uiui/aios/bean/HealthCode.java
rename to app/src/main/java/com/uiuios/aios/bean/HealthCode.java
index 133c2e3..5500e23 100644
--- a/app/src/main/java/com/uiui/aios/bean/HealthCode.java
+++ b/app/src/main/java/com/uiuios/aios/bean/HealthCode.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.bean;
+package com.uiuios.aios.bean;
 
 import java.io.Serializable;
 
diff --git a/app/src/main/java/com/uiui/aios/bean/NetDesktopIcon.java b/app/src/main/java/com/uiuios/aios/bean/NetDesktopIcon.java
similarity index 97%
rename from app/src/main/java/com/uiui/aios/bean/NetDesktopIcon.java
rename to app/src/main/java/com/uiuios/aios/bean/NetDesktopIcon.java
index f941f55..cde212d 100644
--- a/app/src/main/java/com/uiui/aios/bean/NetDesktopIcon.java
+++ b/app/src/main/java/com/uiuios/aios/bean/NetDesktopIcon.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.bean;
+package com.uiuios.aios.bean;
 
 import android.graphics.Bitmap;
 
diff --git a/app/src/main/java/com/uiui/aios/bean/SnInfo.java b/app/src/main/java/com/uiuios/aios/bean/SnInfo.java
similarity index 99%
rename from app/src/main/java/com/uiui/aios/bean/SnInfo.java
rename to app/src/main/java/com/uiuios/aios/bean/SnInfo.java
index 1d1dd06..3755dce 100644
--- a/app/src/main/java/com/uiui/aios/bean/SnInfo.java
+++ b/app/src/main/java/com/uiuios/aios/bean/SnInfo.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.bean;
+package com.uiuios.aios.bean;
 
 import androidx.annotation.NonNull;
 
diff --git a/app/src/main/java/com/uiui/aios/bean/SystemSettings.java b/app/src/main/java/com/uiuios/aios/bean/SystemSettings.java
similarity index 99%
rename from app/src/main/java/com/uiui/aios/bean/SystemSettings.java
rename to app/src/main/java/com/uiuios/aios/bean/SystemSettings.java
index 81946d5..3a8eedb 100644
--- a/app/src/main/java/com/uiui/aios/bean/SystemSettings.java
+++ b/app/src/main/java/com/uiuios/aios/bean/SystemSettings.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.bean;
+package com.uiuios.aios.bean;
 
 
 import com.google.gson.Gson;
diff --git a/app/src/main/java/com/uiui/aios/bean/UserAvatarInfo.java b/app/src/main/java/com/uiuios/aios/bean/UserAvatarInfo.java
similarity index 96%
rename from app/src/main/java/com/uiui/aios/bean/UserAvatarInfo.java
rename to app/src/main/java/com/uiuios/aios/bean/UserAvatarInfo.java
index b538052..1ed238e 100644
--- a/app/src/main/java/com/uiui/aios/bean/UserAvatarInfo.java
+++ b/app/src/main/java/com/uiuios/aios/bean/UserAvatarInfo.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.bean;
+package com.uiuios.aios.bean;
 
 import java.io.Serializable;
 
diff --git a/app/src/main/java/com/uiui/aios/bean/UserId.java b/app/src/main/java/com/uiuios/aios/bean/UserId.java
similarity index 91%
rename from app/src/main/java/com/uiui/aios/bean/UserId.java
rename to app/src/main/java/com/uiuios/aios/bean/UserId.java
index 635cb91..406a0da 100644
--- a/app/src/main/java/com/uiui/aios/bean/UserId.java
+++ b/app/src/main/java/com/uiuios/aios/bean/UserId.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.bean;
+package com.uiuios.aios.bean;
 
 import java.io.Serializable;
 
diff --git a/app/src/main/java/com/uiui/aios/bean/WeatherDailyJson.java b/app/src/main/java/com/uiuios/aios/bean/WeatherDailyJson.java
similarity index 99%
rename from app/src/main/java/com/uiui/aios/bean/WeatherDailyJson.java
rename to app/src/main/java/com/uiuios/aios/bean/WeatherDailyJson.java
index 82dbfd8..3c6d2dc 100644
--- a/app/src/main/java/com/uiui/aios/bean/WeatherDailyJson.java
+++ b/app/src/main/java/com/uiuios/aios/bean/WeatherDailyJson.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.bean;
+package com.uiuios.aios.bean;
 
 import com.qweather.sdk.bean.Basic;
 import com.qweather.sdk.bean.Refer;
diff --git a/app/src/main/java/com/uiuios/aios/dialog/PasswordDialog.java b/app/src/main/java/com/uiuios/aios/dialog/PasswordDialog.java
new file mode 100644
index 0000000..3abfe38
--- /dev/null
+++ b/app/src/main/java/com/uiuios/aios/dialog/PasswordDialog.java
@@ -0,0 +1,273 @@
+package com.uiuios.aios.dialog;
+
+
+import android.content.Context;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.appcompat.app.AlertDialog;
+
+import com.uiuios.aios.R;
+
+
+/**
+ * description:自定义dialog
+ */
+
+public class PasswordDialog extends AlertDialog {
+    /**
+     * 显示的图片
+     */
+    private ImageView imageIv;
+
+    /**
+     * 显示的标题
+     */
+    private TextView titleTv;
+
+    /**
+     * 显示的消息
+     */
+    private EditText messageTv;
+
+    /**
+     * 确认和取消按钮
+     */
+    private TextView positiveBn;
+    private TextView negtiveBn;
+
+    /**
+     * 按钮之间的分割线
+     */
+//    private View columnLineView;
+
+    private Context mContext;
+
+    public PasswordDialog(Context context) {
+        super(context, R.style.CustomDialog);
+        this.mContext = context;
+    }
+
+    /**
+     * 都是内容数据
+     */
+    private String message;
+    private String title;
+    private String positive, negtive;
+    private int imageResId = -1;
+
+    /**
+     * 底部是否只有一个按钮
+     */
+    private boolean isSingle = false;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.password_dialog);
+        //按空白处不能取消动画
+        setCanceledOnTouchOutside(false);
+        //初始化界面控件
+        initView();
+        //初始化界面数据
+        refreshView();
+        //初始化界面控件的事件
+        initEvent();
+    }
+
+    /**
+     * 初始化界面的确定和取消监听器
+     */
+    private void initEvent() {
+        //设置确定按钮被点击后，向外界提供监听
+        positiveBn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (onClickBottomListener != null) {
+                    onClickBottomListener.onPositiveClick();
+                }
+            }
+        });
+        //设置取消按钮被点击后，向外界提供监听
+        negtiveBn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (onClickBottomListener != null) {
+                    onClickBottomListener.onNegtiveClick();
+                }
+            }
+        });
+    }
+
+    /**
+     * 初始化界面控件的显示数据
+     */
+    private void refreshView() {
+        //如果用户自定了title和message
+        if (!TextUtils.isEmpty(title)) {
+            titleTv.setText(title);
+            titleTv.setVisibility(View.VISIBLE);
+        } else {
+            titleTv.setVisibility(View.GONE);
+        }
+        if (!TextUtils.isEmpty(message)) {
+            messageTv.setText(message);
+        }
+        //如果设置按钮的文字
+        if (!TextUtils.isEmpty(positive)) {
+            positiveBn.setText(positive);
+        } else {
+            positiveBn.setText("确定");
+        }
+        if (!TextUtils.isEmpty(negtive)) {
+            negtiveBn.setText(negtive);
+        } else {
+            negtiveBn.setText("取消");
+        }
+
+        if (imageResId != -1) {
+            imageIv.setImageResource(imageResId);
+            imageIv.setVisibility(View.VISIBLE);
+        } else {
+            imageIv.setVisibility(View.GONE);
+        }
+        /**
+         * 只显示一个按钮的时候隐藏取消按钮，回掉只执行确定的事件
+         */
+//        if (isSingle) {
+////            columnLineView.setVisibility(View.GONE);
+//            negtiveBn.setVisibility(View.GONE);
+//        } else {
+//            negtiveBn.setVisibility(View.VISIBLE);
+////            columnLineView.setVisibility(View.VISIBLE);
+//        }
+    }
+
+    @Override
+    public void show() {
+        super.show();
+        refreshView();
+    }
+
+    /**
+     * 初始化界面控件
+     */
+    private void initView() {
+        negtiveBn = findViewById(R.id.negtive);
+        positiveBn = findViewById(R.id.positive);
+        titleTv = findViewById(R.id.title);
+        messageTv = findViewById(R.id.message);
+        imageIv = findViewById(R.id.image);
+//        columnLineView = findViewById(R.id.column_line);
+        showKeyboard();
+    }
+
+    public void showKeyboard() {
+        if (messageTv != null) {
+            //设置可获得焦点
+            messageTv.setFocusable(true);
+            messageTv.setFocusableInTouchMode(true);
+            //请求获得焦点
+            messageTv.requestFocus();
+            //调用系统输入法
+            InputMethodManager inputManager = (InputMethodManager) messageTv
+                    .getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+            inputManager.showSoftInput(messageTv, 0);
+        }
+    }
+
+    /**
+     * 设置确定取消按钮的回调
+     */
+    private OnClickBottomListener onClickBottomListener;
+
+    public void setOnClickBottomListener(OnClickBottomListener onClickBottomListener) {
+        this.onClickBottomListener = onClickBottomListener;
+    }
+
+    public interface OnClickBottomListener {
+        /**
+         * 点击确定按钮事件
+         */
+        void onPositiveClick();
+
+        /**
+         * 点击取消按钮事件
+         */
+        void onNegtiveClick();
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public PasswordDialog setMessage(String message) {
+        this.message = message;
+        return this;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public PasswordDialog setTitle(String title) {
+        this.title = title;
+        return this;
+    }
+
+    public String getPositive() {
+        return positive;
+    }
+
+    public PasswordDialog setPositive(String positive) {
+        this.positive = positive;
+        return this;
+    }
+
+    public String getNegtive() {
+        return negtive;
+    }
+
+    public PasswordDialog setNegtive(String negtive) {
+        this.negtive = negtive;
+        return this;
+    }
+
+//    public SingleDialog setNegtiveText(String negtive) {
+//        negtiveBn.setText(negtive);
+//        return this;
+//    }
+
+    public int getImageResId() {
+        return imageResId;
+    }
+
+    public boolean isSingle() {
+        return isSingle;
+    }
+
+    public PasswordDialog setSingle(boolean single) {
+        isSingle = single;
+        return this;
+    }
+
+    public PasswordDialog setImageResId(int imageResId) {
+        this.imageResId = imageResId;
+        return this;
+    }
+
+    public String getPassword() {
+        String passwd = messageTv.getText().toString();
+        return passwd;
+    }
+
+    @Override
+    public void dismiss() {
+        super.dismiss();
+    }
+}
diff --git a/app/src/main/java/com/uiui/aios/dialog/SingleDialog.java b/app/src/main/java/com/uiuios/aios/dialog/SingleDialog.java
similarity index 99%
rename from app/src/main/java/com/uiui/aios/dialog/SingleDialog.java
rename to app/src/main/java/com/uiuios/aios/dialog/SingleDialog.java
index 5b96579..58488ec 100644
--- a/app/src/main/java/com/uiui/aios/dialog/SingleDialog.java
+++ b/app/src/main/java/com/uiuios/aios/dialog/SingleDialog.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.dialog;
+package com.uiuios.aios.dialog;
 
 
 import android.content.Context;
@@ -10,7 +10,7 @@ import android.widget.TextView;
 
 import androidx.appcompat.app.AlertDialog;
 
-import com.uiui.aios.R;
+import com.uiuios.aios.R;
 
 
 /**
diff --git a/app/src/main/java/com/uiui/aios/disklrucache/CacheHelper.java b/app/src/main/java/com/uiuios/aios/disklrucache/CacheHelper.java
similarity index 99%
rename from app/src/main/java/com/uiui/aios/disklrucache/CacheHelper.java
rename to app/src/main/java/com/uiuios/aios/disklrucache/CacheHelper.java
index 1591ce9..c89cf43 100644
--- a/app/src/main/java/com/uiui/aios/disklrucache/CacheHelper.java
+++ b/app/src/main/java/com/uiuios/aios/disklrucache/CacheHelper.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.disklrucache;
+package com.uiuios.aios.disklrucache;
 
 import android.content.Context;
 import android.graphics.Bitmap;
diff --git a/app/src/main/java/com/uiui/aios/disklrucache/Utils.java b/app/src/main/java/com/uiuios/aios/disklrucache/Utils.java
similarity index 98%
rename from app/src/main/java/com/uiui/aios/disklrucache/Utils.java
rename to app/src/main/java/com/uiuios/aios/disklrucache/Utils.java
index 59970d7..d33782c 100644
--- a/app/src/main/java/com/uiui/aios/disklrucache/Utils.java
+++ b/app/src/main/java/com/uiuios/aios/disklrucache/Utils.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.disklrucache;
+package com.uiuios.aios.disklrucache;
 
 import android.content.Context;
 import android.content.pm.PackageInfo;
diff --git a/app/src/main/java/com/uiui/aios/fragment/AppListFragment.java b/app/src/main/java/com/uiuios/aios/fragment/AppListFragment.java
similarity index 94%
rename from app/src/main/java/com/uiui/aios/fragment/AppListFragment.java
rename to app/src/main/java/com/uiuios/aios/fragment/AppListFragment.java
index 1caa0ec..04b1e9c 100644
--- a/app/src/main/java/com/uiui/aios/fragment/AppListFragment.java
+++ b/app/src/main/java/com/uiuios/aios/fragment/AppListFragment.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.fragment;
+package com.uiuios.aios.fragment;
 
 import android.content.Context;
 import android.content.pm.PackageManager;
@@ -14,20 +14,19 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.google.gson.JsonObject;
-import com.uiui.aios.R;
-import com.uiui.aios.bean.BaseResponse;
-import com.uiui.aios.bean.DesktopIcon;
-import com.uiui.aios.network.NetInterfaceManager;
-import com.uiui.aios.service.NotificationService;
-import com.uiui.aios.utils.ApkUtils;
-import com.uiui.aios.utils.BitmapUtils;
-import com.uiui.aios.utils.IconUtils;
-import com.uiui.aios.utils.AppUsedTimeUtils;
-import com.uiui.aios.view.MyGridLayout;
+import com.uiuios.aios.R;
+import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.bean.DesktopIcon;
+import com.uiuios.aios.network.NetInterfaceManager;
+import com.uiuios.aios.service.NotificationService;
+import com.uiuios.aios.utils.ApkUtils;
+import com.uiuios.aios.utils.BitmapUtils;
+import com.uiuios.aios.utils.IconUtils;
+import com.uiuios.aios.utils.AppUsedTimeUtils;
+import com.uiuios.aios.view.MyGridLayout;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -126,7 +125,7 @@ public class AppListFragment extends Fragment {
                     int i = IconUtils.appClassNameList.indexOf(pkg);
                     if (i != -1) {
                         String val = IconUtils.appIconList.get(i);
-                        int resID = getActivity().getResources().getIdentifier(val, "drawable", "com.uiui.aios");
+                        int resID = getActivity().getResources().getIdentifier(val, "drawable", "com.uiuios.aios");
                         int size = NotificationService.getNotificationLength(pkg);
                         if (size == 0) {
                             bg.setVisibility(View.GONE);
diff --git a/app/src/main/java/com/uiui/aios/fragment/BaseFragmentPagerAdapter.java b/app/src/main/java/com/uiuios/aios/fragment/BaseFragmentPagerAdapter.java
similarity index 99%
rename from app/src/main/java/com/uiui/aios/fragment/BaseFragmentPagerAdapter.java
rename to app/src/main/java/com/uiuios/aios/fragment/BaseFragmentPagerAdapter.java
index f5f06ca..f2b812c 100644
--- a/app/src/main/java/com/uiui/aios/fragment/BaseFragmentPagerAdapter.java
+++ b/app/src/main/java/com/uiuios/aios/fragment/BaseFragmentPagerAdapter.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.fragment;
+package com.uiuios.aios.fragment;
 
 import android.util.SparseArray;
 
diff --git a/app/src/main/java/com/uiui/aios/fragment/CustomFragment.java b/app/src/main/java/com/uiuios/aios/fragment/CustomFragment.java
similarity index 91%
rename from app/src/main/java/com/uiui/aios/fragment/CustomFragment.java
rename to app/src/main/java/com/uiuios/aios/fragment/CustomFragment.java
index b04f28a..e81f659 100644
--- a/app/src/main/java/com/uiui/aios/fragment/CustomFragment.java
+++ b/app/src/main/java/com/uiuios/aios/fragment/CustomFragment.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.fragment;
+package com.uiuios.aios.fragment;
 
 import android.app.Activity;
 import android.app.ActivityManager;
@@ -17,9 +17,11 @@ import android.os.Handler;
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -41,35 +43,36 @@ import com.qweather.sdk.bean.weather.WeatherHourlyBean;
 import com.qweather.sdk.bean.weather.WeatherNowBean;
 import com.qweather.sdk.view.QWeather;
 import com.tencent.mmkv.MMKV;
-import com.uiui.aios.BuildConfig;
-import com.uiui.aios.R;
-import com.uiui.aios.activity.EmergencyActivity;
-import com.uiui.aios.activity.alarm.AlarmClockActivity;
-import com.uiui.aios.activity.code.HealthCodeActivity;
-import com.uiui.aios.activity.contact.ContactActivity;
-import com.uiui.aios.activity.weather.WeatherActivity;
-import com.uiui.aios.adapter.NotificationAdapter;
-import com.uiui.aios.adapter.SOSNnmberAdapter;
-import com.uiui.aios.alarm.AlarmUtils;
-import com.uiui.aios.bean.AlarmClockData;
-import com.uiui.aios.bean.AlarmItem;
-import com.uiui.aios.bean.BaseResponse;
-import com.uiui.aios.bean.Contact;
-import com.uiui.aios.bean.HealthCode;
-import com.uiui.aios.bean.SnInfo;
-import com.uiui.aios.bean.UserAvatarInfo;
-import com.uiui.aios.dialog.SingleDialog;
-import com.uiui.aios.disklrucache.CacheHelper;
-import com.uiui.aios.manager.AmapManager;
-import com.uiui.aios.network.NetInterfaceManager;
-import com.uiui.aios.network.URLAddress;
-import com.uiui.aios.tpush.MessageReceiver;
-import com.uiui.aios.utils.ApkUtils;
-import com.uiui.aios.utils.AppUtil;
-import com.uiui.aios.utils.NetStateUtils;
-import com.uiui.aios.utils.SchemeUtils;
-import com.uiui.aios.utils.ToastUtil;
-import com.uiui.aios.utils.Utils;
+import com.uiuios.aios.BuildConfig;
+import com.uiuios.aios.R;
+import com.uiuios.aios.activity.EmergencyActivity;
+import com.uiuios.aios.activity.alarm.AlarmClockActivity;
+import com.uiuios.aios.activity.code.HealthCodeActivity;
+import com.uiuios.aios.activity.contact.ContactActivity;
+import com.uiuios.aios.activity.weather.WeatherActivity;
+import com.uiuios.aios.adapter.NotificationAdapter;
+import com.uiuios.aios.adapter.SOSNnmberAdapter;
+import com.uiuios.aios.alarm.AlarmUtils;
+import com.uiuios.aios.bean.AlarmClockData;
+import com.uiuios.aios.bean.AlarmItem;
+import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.bean.Contact;
+import com.uiuios.aios.bean.HealthCode;
+import com.uiuios.aios.bean.SnInfo;
+import com.uiuios.aios.bean.UserAvatarInfo;
+import com.uiuios.aios.dialog.PasswordDialog;
+import com.uiuios.aios.dialog.SingleDialog;
+import com.uiuios.aios.disklrucache.CacheHelper;
+import com.uiuios.aios.manager.AmapManager;
+import com.uiuios.aios.network.NetInterfaceManager;
+import com.uiuios.aios.network.URLAddress;
+import com.uiuios.aios.tpush.MessageReceiver;
+import com.uiuios.aios.utils.ApkUtils;
+import com.uiuios.aios.utils.AppUtil;
+import com.uiuios.aios.utils.NetStateUtils;
+import com.uiuios.aios.utils.SchemeUtils;
+import com.uiuios.aios.utils.ToastUtil;
+import com.uiuios.aios.utils.Utils;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
@@ -108,6 +111,9 @@ public class CustomFragment extends Fragment implements NetworkUtils.OnNetworkSt
     ConstraintLayout cl_ai;
     @BindView(R.id.cl_appstore)
     ConstraintLayout cl_appstore;
+    @BindView(R.id.cl_exit)
+    ConstraintLayout cl_exit;
+
 
     //    @BindView(R.id.cl_battery)
 //    ConstraintLayout cl_battery;
@@ -447,12 +453,43 @@ public class CustomFragment extends Fragment implements NetworkUtils.OnNetworkSt
         cl_appstore.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                ApkUtils.openApp(mContext, "com.uiui.appstore");
+                ApkUtils.openApp(mContext, "com.uiuios.appstore");
+            }
+        });
+        cl_exit.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                showPassword();
             }
         });
         refreshMemory();
     }
 
+    private void showPassword() {
+        PasswordDialog passwordDialog = new PasswordDialog(mContext);
+        passwordDialog.setTitle("请输入密码退出关怀系统");
+        passwordDialog.setOnClickBottomListener(new PasswordDialog.OnClickBottomListener() {
+            @Override
+            public void onPositiveClick() {
+                if ("666666".equals(passwordDialog.getPassword())) {
+                    Utils.openLauncher3(mContext);
+                    passwordDialog.dismiss();
+                } else {
+                    ToastUtil.show("密码错误");
+                }
+            }
+
+            @Override
+            public void onNegtiveClick() {
+                passwordDialog.dismiss();
+            }
+        });
+        passwordDialog.show();
+        passwordDialog.getWindow().setGravity(Gravity.CENTER);
+        passwordDialog.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
+        passwordDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
+    }
+
     private void checkSosNumber() {
         NetInterfaceManager.getInstance().getContactList(new NetInterfaceManager.ContactCallback() {
             @Override
diff --git a/app/src/main/java/com/uiui/aios/fragment/CustomPagerAdapter.java b/app/src/main/java/com/uiuios/aios/fragment/CustomPagerAdapter.java
similarity index 95%
rename from app/src/main/java/com/uiui/aios/fragment/CustomPagerAdapter.java
rename to app/src/main/java/com/uiuios/aios/fragment/CustomPagerAdapter.java
index 173265c..4bbee94 100644
--- a/app/src/main/java/com/uiui/aios/fragment/CustomPagerAdapter.java
+++ b/app/src/main/java/com/uiuios/aios/fragment/CustomPagerAdapter.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.fragment;
+package com.uiuios.aios.fragment;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
diff --git a/app/src/main/java/com/uiui/aios/fragment/SecondFragment.java b/app/src/main/java/com/uiuios/aios/fragment/SecondFragment.java
similarity index 97%
rename from app/src/main/java/com/uiui/aios/fragment/SecondFragment.java
rename to app/src/main/java/com/uiuios/aios/fragment/SecondFragment.java
index 733b16d..7a61694 100644
--- a/app/src/main/java/com/uiui/aios/fragment/SecondFragment.java
+++ b/app/src/main/java/com/uiuios/aios/fragment/SecondFragment.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.fragment;
+package com.uiuios.aios.fragment;
 
 import android.content.ComponentName;
 import android.content.ContentResolver;
@@ -22,14 +22,14 @@ import com.bumptech.glide.Glide;
 import com.shehuan.niv.NiceImageView;
 import com.trello.rxlifecycle4.RxLifecycle;
 import com.trello.rxlifecycle4.android.FragmentEvent;
-import com.uiui.aios.R;
-import com.uiui.aios.base.BaseFragment;
-import com.uiui.aios.bean.ActivityBean;
-import com.uiui.aios.bean.ArticleInfo;
-import com.uiui.aios.bean.BaseResponse;
-import com.uiui.aios.bean.DemandBean;
-import com.uiui.aios.bean.GoodsInfo;
-import com.uiui.aios.network.NetInterfaceManager;
+import com.uiuios.aios.R;
+import com.uiuios.aios.base.BaseFragment;
+import com.uiuios.aios.bean.ActivityBean;
+import com.uiuios.aios.bean.ArticleInfo;
+import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.bean.DemandBean;
+import com.uiuios.aios.bean.GoodsInfo;
+import com.uiuios.aios.network.NetInterfaceManager;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
diff --git a/app/src/main/java/com/uiui/aios/fragment/ViewPager2Adapter.java b/app/src/main/java/com/uiuios/aios/fragment/ViewPager2Adapter.java
similarity index 98%
rename from app/src/main/java/com/uiui/aios/fragment/ViewPager2Adapter.java
rename to app/src/main/java/com/uiuios/aios/fragment/ViewPager2Adapter.java
index 7524fbd..84b575f 100644
--- a/app/src/main/java/com/uiui/aios/fragment/ViewPager2Adapter.java
+++ b/app/src/main/java/com/uiuios/aios/fragment/ViewPager2Adapter.java
@@ -1,11 +1,10 @@
-package com.uiui.aios.fragment;
+package com.uiuios.aios.fragment;
 
 import android.util.SparseArray;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentPagerAdapter;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.Lifecycle;
 import androidx.viewpager2.adapter.FragmentStateAdapter;
diff --git a/app/src/main/java/com/uiui/aios/iconpostition/IconPositionDBHelper.java b/app/src/main/java/com/uiuios/aios/iconpostition/IconPositionDBHelper.java
similarity index 96%
rename from app/src/main/java/com/uiui/aios/iconpostition/IconPositionDBHelper.java
rename to app/src/main/java/com/uiuios/aios/iconpostition/IconPositionDBHelper.java
index 261a73e..3c9907c 100644
--- a/app/src/main/java/com/uiui/aios/iconpostition/IconPositionDBHelper.java
+++ b/app/src/main/java/com/uiuios/aios/iconpostition/IconPositionDBHelper.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.iconpostition;
+package com.uiuios.aios.iconpostition;
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
diff --git a/app/src/main/java/com/uiui/aios/iconpostition/IconPositionManager.java b/app/src/main/java/com/uiuios/aios/iconpostition/IconPositionManager.java
similarity index 96%
rename from app/src/main/java/com/uiui/aios/iconpostition/IconPositionManager.java
rename to app/src/main/java/com/uiuios/aios/iconpostition/IconPositionManager.java
index 402e968..fc2c59f 100644
--- a/app/src/main/java/com/uiui/aios/iconpostition/IconPositionManager.java
+++ b/app/src/main/java/com/uiuios/aios/iconpostition/IconPositionManager.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.iconpostition;
+package com.uiuios.aios.iconpostition;
 
 import android.annotation.SuppressLint;
 import android.content.ContentValues;
@@ -6,8 +6,8 @@ import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 
-import com.uiui.aios.bean.NetDesktopIcon;
-import com.uiui.aios.utils.ApkUtils;
+import com.uiuios.aios.bean.NetDesktopIcon;
+import com.uiuios.aios.utils.ApkUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/app/src/main/java/com/uiui/aios/iconpostition/IconUtils.java b/app/src/main/java/com/uiuios/aios/iconpostition/IconUtils.java
similarity index 97%
rename from app/src/main/java/com/uiui/aios/iconpostition/IconUtils.java
rename to app/src/main/java/com/uiuios/aios/iconpostition/IconUtils.java
index 7c0d06c..f8e9456 100644
--- a/app/src/main/java/com/uiui/aios/iconpostition/IconUtils.java
+++ b/app/src/main/java/com/uiuios/aios/iconpostition/IconUtils.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.iconpostition;
+package com.uiuios.aios.iconpostition;
 
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
diff --git a/app/src/main/java/com/uiui/aios/manager/AmapManager.java b/app/src/main/java/com/uiuios/aios/manager/AmapManager.java
similarity index 99%
rename from app/src/main/java/com/uiui/aios/manager/AmapManager.java
rename to app/src/main/java/com/uiuios/aios/manager/AmapManager.java
index 5e8cc74..deaf57a 100644
--- a/app/src/main/java/com/uiui/aios/manager/AmapManager.java
+++ b/app/src/main/java/com/uiuios/aios/manager/AmapManager.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.manager;
+package com.uiuios.aios.manager;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
diff --git a/app/src/main/java/com/uiui/aios/manager/ConnectManager.java b/app/src/main/java/com/uiuios/aios/manager/ConnectManager.java
similarity index 98%
rename from app/src/main/java/com/uiui/aios/manager/ConnectManager.java
rename to app/src/main/java/com/uiuios/aios/manager/ConnectManager.java
index 7d7ece1..ddddceb 100644
--- a/app/src/main/java/com/uiui/aios/manager/ConnectManager.java
+++ b/app/src/main/java/com/uiuios/aios/manager/ConnectManager.java
@@ -1,11 +1,11 @@
-package com.uiui.aios.manager;
+package com.uiuios.aios.manager;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.util.Log;
 
 import com.tencent.mmkv.MMKV;
-import com.uiui.aios.utils.TimeUtils;
+import com.uiuios.aios.utils.TimeUtils;
 
 public class ConnectManager {
     private static final String TAG = ConnectManager.class.getSimpleName();
diff --git a/app/src/main/java/com/uiui/aios/manager/ConnectMode.java b/app/src/main/java/com/uiuios/aios/manager/ConnectMode.java
similarity index 81%
rename from app/src/main/java/com/uiui/aios/manager/ConnectMode.java
rename to app/src/main/java/com/uiuios/aios/manager/ConnectMode.java
index ea36582..8f2790d 100644
--- a/app/src/main/java/com/uiui/aios/manager/ConnectMode.java
+++ b/app/src/main/java/com/uiuios/aios/manager/ConnectMode.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.manager;
+package com.uiuios.aios.manager;
 
 public enum ConnectMode {
     DEFAULT,
diff --git a/app/src/main/java/com/uiui/aios/network/NetInterfaceManager.java b/app/src/main/java/com/uiuios/aios/network/NetInterfaceManager.java
similarity index 95%
rename from app/src/main/java/com/uiui/aios/network/NetInterfaceManager.java
rename to app/src/main/java/com/uiuios/aios/network/NetInterfaceManager.java
index 717f73b..be0b912 100644
--- a/app/src/main/java/com/uiui/aios/network/NetInterfaceManager.java
+++ b/app/src/main/java/com/uiuios/aios/network/NetInterfaceManager.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.network;
+package com.uiuios.aios.network;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -10,45 +10,45 @@ import com.tencent.mmkv.MMKV;
 import com.trello.rxlifecycle4.RxLifecycle;
 import com.trello.rxlifecycle4.android.ActivityEvent;
 import com.trello.rxlifecycle4.android.FragmentEvent;
-import com.uiui.aios.alarm.AlarmUtils;
-import com.uiui.aios.bean.ActivityBean;
-import com.uiui.aios.bean.AlarmClockData;
-import com.uiui.aios.bean.ArticleInfo;
-import com.uiui.aios.bean.BaseResponse;
-import com.uiui.aios.bean.Contact;
-import com.uiui.aios.bean.DemandBean;
-import com.uiui.aios.bean.GoodsInfo;
-import com.uiui.aios.bean.HealthCode;
-import com.uiui.aios.bean.NetDesktopIcon;
-import com.uiui.aios.bean.SnInfo;
-import com.uiui.aios.bean.SystemSettings;
-import com.uiui.aios.bean.UserAvatarInfo;
-import com.uiui.aios.bean.UserId;
-import com.uiui.aios.disklrucache.CacheHelper;
-import com.uiui.aios.manager.ConnectManager;
-import com.uiui.aios.manager.ConnectMode;
-import com.uiui.aios.network.api.ActivityListApi;
-import com.uiui.aios.network.api.AlarmClockApi;
-import com.uiui.aios.network.api.AppUsageRecordApi;
-import com.uiui.aios.network.api.ArticleListApi;
-import com.uiui.aios.network.api.DemandListApi;
-import com.uiui.aios.network.api.GetAdminSnSettingApi;
-import com.uiui.aios.network.api.GetDesktopApi;
-import com.uiui.aios.network.api.GetMailList;
-import com.uiui.aios.network.api.GetUserIDApi;
-import com.uiui.aios.network.api.GoodsListApi;
-import com.uiui.aios.network.api.HealthCodeApi;
-import com.uiui.aios.network.api.RunNewApp;
-import com.uiui.aios.network.api.SNInfoApi;
-import com.uiui.aios.network.api.SOSRecordApi;
-import com.uiui.aios.network.api.SendScreenshotApi;
-import com.uiui.aios.network.api.Setting;
-import com.uiui.aios.network.api.UpdateAlarmClockApi;
-import com.uiui.aios.network.api.UpdateDesktopApi;
-import com.uiui.aios.network.api.UserInfoControl;
-import com.uiui.aios.network.interceptor.RepeatRequestInterceptor;
-import com.uiui.aios.utils.GsonUtils;
-import com.uiui.aios.utils.Utils;
+import com.uiuios.aios.alarm.AlarmUtils;
+import com.uiuios.aios.bean.ActivityBean;
+import com.uiuios.aios.bean.AlarmClockData;
+import com.uiuios.aios.bean.ArticleInfo;
+import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.bean.Contact;
+import com.uiuios.aios.bean.DemandBean;
+import com.uiuios.aios.bean.GoodsInfo;
+import com.uiuios.aios.bean.HealthCode;
+import com.uiuios.aios.bean.NetDesktopIcon;
+import com.uiuios.aios.bean.SnInfo;
+import com.uiuios.aios.bean.SystemSettings;
+import com.uiuios.aios.bean.UserAvatarInfo;
+import com.uiuios.aios.bean.UserId;
+import com.uiuios.aios.disklrucache.CacheHelper;
+import com.uiuios.aios.manager.ConnectManager;
+import com.uiuios.aios.manager.ConnectMode;
+import com.uiuios.aios.network.api.ActivityListApi;
+import com.uiuios.aios.network.api.AlarmClockApi;
+import com.uiuios.aios.network.api.AppUsageRecordApi;
+import com.uiuios.aios.network.api.ArticleListApi;
+import com.uiuios.aios.network.api.DemandListApi;
+import com.uiuios.aios.network.api.GetAdminSnSettingApi;
+import com.uiuios.aios.network.api.GetDesktopApi;
+import com.uiuios.aios.network.api.GetMailList;
+import com.uiuios.aios.network.api.GetUserIDApi;
+import com.uiuios.aios.network.api.GoodsListApi;
+import com.uiuios.aios.network.api.HealthCodeApi;
+import com.uiuios.aios.network.api.RunNewApp;
+import com.uiuios.aios.network.api.SNInfoApi;
+import com.uiuios.aios.network.api.SOSRecordApi;
+import com.uiuios.aios.network.api.SendScreenshotApi;
+import com.uiuios.aios.network.api.Setting;
+import com.uiuios.aios.network.api.UpdateAlarmClockApi;
+import com.uiuios.aios.network.api.UpdateDesktopApi;
+import com.uiuios.aios.network.api.UserInfoControl;
+import com.uiuios.aios.network.interceptor.RepeatRequestInterceptor;
+import com.uiuios.aios.utils.GsonUtils;
+import com.uiuios.aios.utils.Utils;
 
 import java.io.File;
 import java.lang.reflect.Type;
diff --git a/app/src/main/java/com/uiui/aios/network/URLAddress.java b/app/src/main/java/com/uiuios/aios/network/URLAddress.java
similarity index 98%
rename from app/src/main/java/com/uiui/aios/network/URLAddress.java
rename to app/src/main/java/com/uiuios/aios/network/URLAddress.java
index f21b4b6..49d7900 100644
--- a/app/src/main/java/com/uiui/aios/network/URLAddress.java
+++ b/app/src/main/java/com/uiuios/aios/network/URLAddress.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.network;
+package com.uiuios.aios.network;
 
 public class URLAddress {
     public static final String ROOT_URL = "https://led.zuoyepad.com/android/";
diff --git a/app/src/main/java/com/uiui/aios/network/api/ActivityListApi.java b/app/src/main/java/com/uiuios/aios/network/api/ActivityListApi.java
similarity index 73%
rename from app/src/main/java/com/uiui/aios/network/api/ActivityListApi.java
rename to app/src/main/java/com/uiuios/aios/network/api/ActivityListApi.java
index 29ac4df..ef8cbfe 100644
--- a/app/src/main/java/com/uiui/aios/network/api/ActivityListApi.java
+++ b/app/src/main/java/com/uiuios/aios/network/api/ActivityListApi.java
@@ -1,8 +1,8 @@
-package com.uiui.aios.network.api;
+package com.uiuios.aios.network.api;
 
-import com.uiui.aios.bean.ActivityBean;
-import com.uiui.aios.bean.BaseResponse;
-import com.uiui.aios.network.URLAddress;
+import com.uiuios.aios.bean.ActivityBean;
+import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.network.URLAddress;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/uiui/aios/network/api/AlarmClockApi.java b/app/src/main/java/com/uiuios/aios/network/api/AlarmClockApi.java
similarity index 65%
rename from app/src/main/java/com/uiui/aios/network/api/AlarmClockApi.java
rename to app/src/main/java/com/uiuios/aios/network/api/AlarmClockApi.java
index ad5e53d..a76abf9 100644
--- a/app/src/main/java/com/uiui/aios/network/api/AlarmClockApi.java
+++ b/app/src/main/java/com/uiuios/aios/network/api/AlarmClockApi.java
@@ -1,8 +1,8 @@
-package com.uiui.aios.network.api;
+package com.uiuios.aios.network.api;
 
-import com.uiui.aios.bean.AlarmClockData;
-import com.uiui.aios.bean.BaseResponse;
-import com.uiui.aios.network.URLAddress;
+import com.uiuios.aios.bean.AlarmClockData;
+import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.network.URLAddress;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/uiui/aios/network/api/AppUsageRecordApi.java b/app/src/main/java/com/uiuios/aios/network/api/AppUsageRecordApi.java
similarity index 81%
rename from app/src/main/java/com/uiui/aios/network/api/AppUsageRecordApi.java
rename to app/src/main/java/com/uiuios/aios/network/api/AppUsageRecordApi.java
index ed1e2a3..edb3646 100644
--- a/app/src/main/java/com/uiui/aios/network/api/AppUsageRecordApi.java
+++ b/app/src/main/java/com/uiuios/aios/network/api/AppUsageRecordApi.java
@@ -1,7 +1,7 @@
-package com.uiui.aios.network.api;
+package com.uiuios.aios.network.api;
 
-import com.uiui.aios.bean.BaseResponse;
-import com.uiui.aios.network.URLAddress;
+import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.network.URLAddress;
 
 import io.reactivex.rxjava3.core.Observable;
 import retrofit2.http.Field;
diff --git a/app/src/main/java/com/uiui/aios/network/api/ArticleDetailsApi.java b/app/src/main/java/com/uiuios/aios/network/api/ArticleDetailsApi.java
similarity index 63%
rename from app/src/main/java/com/uiui/aios/network/api/ArticleDetailsApi.java
rename to app/src/main/java/com/uiuios/aios/network/api/ArticleDetailsApi.java
index 71b2145..038daf2 100644
--- a/app/src/main/java/com/uiui/aios/network/api/ArticleDetailsApi.java
+++ b/app/src/main/java/com/uiuios/aios/network/api/ArticleDetailsApi.java
@@ -1,8 +1,8 @@
-package com.uiui.aios.network.api;
+package com.uiuios.aios.network.api;
 
-import com.uiui.aios.bean.ArticleDetails;
-import com.uiui.aios.bean.BaseResponse;
-import com.uiui.aios.network.URLAddress;
+import com.uiuios.aios.bean.ArticleDetails;
+import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.network.URLAddress;
 
 import io.reactivex.rxjava3.core.Observable;
 import retrofit2.http.GET;
diff --git a/app/src/main/java/com/uiui/aios/network/api/ArticleListApi.java b/app/src/main/java/com/uiuios/aios/network/api/ArticleListApi.java
similarity index 65%
rename from app/src/main/java/com/uiui/aios/network/api/ArticleListApi.java
rename to app/src/main/java/com/uiuios/aios/network/api/ArticleListApi.java
index 532e68b..37f1e10 100644
--- a/app/src/main/java/com/uiui/aios/network/api/ArticleListApi.java
+++ b/app/src/main/java/com/uiuios/aios/network/api/ArticleListApi.java
@@ -1,8 +1,8 @@
-package com.uiui.aios.network.api;
+package com.uiuios.aios.network.api;
 
-import com.uiui.aios.bean.ArticleInfo;
-import com.uiui.aios.bean.BaseResponse;
-import com.uiui.aios.network.URLAddress;
+import com.uiuios.aios.bean.ArticleInfo;
+import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.network.URLAddress;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/uiui/aios/network/api/DemandListApi.java b/app/src/main/java/com/uiuios/aios/network/api/DemandListApi.java
similarity index 73%
rename from app/src/main/java/com/uiui/aios/network/api/DemandListApi.java
rename to app/src/main/java/com/uiuios/aios/network/api/DemandListApi.java
index c65674f..64843de 100644
--- a/app/src/main/java/com/uiui/aios/network/api/DemandListApi.java
+++ b/app/src/main/java/com/uiuios/aios/network/api/DemandListApi.java
@@ -1,8 +1,8 @@
-package com.uiui.aios.network.api;
+package com.uiuios.aios.network.api;
 
-import com.uiui.aios.bean.BaseResponse;
-import com.uiui.aios.bean.DemandBean;
-import com.uiui.aios.network.URLAddress;
+import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.bean.DemandBean;
+import com.uiuios.aios.network.URLAddress;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/uiui/aios/network/api/GetAdminSnSettingApi.java b/app/src/main/java/com/uiuios/aios/network/api/GetAdminSnSettingApi.java
similarity index 69%
rename from app/src/main/java/com/uiui/aios/network/api/GetAdminSnSettingApi.java
rename to app/src/main/java/com/uiuios/aios/network/api/GetAdminSnSettingApi.java
index 604fccc..16cf0b3 100644
--- a/app/src/main/java/com/uiui/aios/network/api/GetAdminSnSettingApi.java
+++ b/app/src/main/java/com/uiuios/aios/network/api/GetAdminSnSettingApi.java
@@ -1,7 +1,7 @@
-package com.uiui.aios.network.api;
+package com.uiuios.aios.network.api;
 
-import com.uiui.aios.bean.BaseResponse;
-import com.uiui.aios.network.URLAddress;
+import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.network.URLAddress;
 
 import io.reactivex.rxjava3.core.Observable;
 import retrofit2.http.GET;
diff --git a/app/src/main/java/com/uiui/aios/network/api/GetDesktopApi.java b/app/src/main/java/com/uiuios/aios/network/api/GetDesktopApi.java
similarity index 65%
rename from app/src/main/java/com/uiui/aios/network/api/GetDesktopApi.java
rename to app/src/main/java/com/uiuios/aios/network/api/GetDesktopApi.java
index 0b4b6b6..5eef4e3 100644
--- a/app/src/main/java/com/uiui/aios/network/api/GetDesktopApi.java
+++ b/app/src/main/java/com/uiuios/aios/network/api/GetDesktopApi.java
@@ -1,8 +1,8 @@
-package com.uiui.aios.network.api;
+package com.uiuios.aios.network.api;
 
-import com.uiui.aios.bean.BaseResponse;
-import com.uiui.aios.bean.NetDesktopIcon;
-import com.uiui.aios.network.URLAddress;
+import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.bean.NetDesktopIcon;
+import com.uiuios.aios.network.URLAddress;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/uiui/aios/network/api/GetMailList.java b/app/src/main/java/com/uiuios/aios/network/api/GetMailList.java
similarity index 64%
rename from app/src/main/java/com/uiui/aios/network/api/GetMailList.java
rename to app/src/main/java/com/uiuios/aios/network/api/GetMailList.java
index d24d4a6..e637554 100644
--- a/app/src/main/java/com/uiui/aios/network/api/GetMailList.java
+++ b/app/src/main/java/com/uiuios/aios/network/api/GetMailList.java
@@ -1,8 +1,8 @@
-package com.uiui.aios.network.api;
+package com.uiuios.aios.network.api;
 
-import com.uiui.aios.bean.BaseResponse;
-import com.uiui.aios.bean.Contact;
-import com.uiui.aios.network.URLAddress;
+import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.bean.Contact;
+import com.uiuios.aios.network.URLAddress;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/uiui/aios/network/api/GetUserIDApi.java b/app/src/main/java/com/uiuios/aios/network/api/GetUserIDApi.java
similarity index 62%
rename from app/src/main/java/com/uiui/aios/network/api/GetUserIDApi.java
rename to app/src/main/java/com/uiuios/aios/network/api/GetUserIDApi.java
index cf8340c..1273c6b 100644
--- a/app/src/main/java/com/uiui/aios/network/api/GetUserIDApi.java
+++ b/app/src/main/java/com/uiuios/aios/network/api/GetUserIDApi.java
@@ -1,8 +1,8 @@
-package com.uiui.aios.network.api;
+package com.uiuios.aios.network.api;
 
-import com.uiui.aios.bean.BaseResponse;
-import com.uiui.aios.bean.UserId;
-import com.uiui.aios.network.URLAddress;
+import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.bean.UserId;
+import com.uiuios.aios.network.URLAddress;
 
 import io.reactivex.rxjava3.core.Observable;
 import retrofit2.http.GET;
diff --git a/app/src/main/java/com/uiui/aios/network/api/GoodsDetailsApi.java b/app/src/main/java/com/uiuios/aios/network/api/GoodsDetailsApi.java
similarity index 62%
rename from app/src/main/java/com/uiui/aios/network/api/GoodsDetailsApi.java
rename to app/src/main/java/com/uiuios/aios/network/api/GoodsDetailsApi.java
index 3a0db76..ba17978 100644
--- a/app/src/main/java/com/uiui/aios/network/api/GoodsDetailsApi.java
+++ b/app/src/main/java/com/uiuios/aios/network/api/GoodsDetailsApi.java
@@ -1,8 +1,8 @@
-package com.uiui.aios.network.api;
+package com.uiuios.aios.network.api;
 
-import com.uiui.aios.bean.BaseResponse;
-import com.uiui.aios.bean.GoodsDetails;
-import com.uiui.aios.network.URLAddress;
+import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.bean.GoodsDetails;
+import com.uiuios.aios.network.URLAddress;
 
 import io.reactivex.rxjava3.core.Observable;
 import retrofit2.http.GET;
diff --git a/app/src/main/java/com/uiui/aios/network/api/GoodsListApi.java b/app/src/main/java/com/uiuios/aios/network/api/GoodsListApi.java
similarity index 65%
rename from app/src/main/java/com/uiui/aios/network/api/GoodsListApi.java
rename to app/src/main/java/com/uiuios/aios/network/api/GoodsListApi.java
index fe7a5d7..e4f11d1 100644
--- a/app/src/main/java/com/uiui/aios/network/api/GoodsListApi.java
+++ b/app/src/main/java/com/uiuios/aios/network/api/GoodsListApi.java
@@ -1,8 +1,8 @@
-package com.uiui.aios.network.api;
+package com.uiuios.aios.network.api;
 
-import com.uiui.aios.bean.BaseResponse;
-import com.uiui.aios.bean.GoodsInfo;
-import com.uiui.aios.network.URLAddress;
+import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.bean.GoodsInfo;
+import com.uiuios.aios.network.URLAddress;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/uiui/aios/network/api/HealthCodeApi.java b/app/src/main/java/com/uiuios/aios/network/api/HealthCodeApi.java
similarity index 65%
rename from app/src/main/java/com/uiui/aios/network/api/HealthCodeApi.java
rename to app/src/main/java/com/uiuios/aios/network/api/HealthCodeApi.java
index db5b1e3..e47310e 100644
--- a/app/src/main/java/com/uiui/aios/network/api/HealthCodeApi.java
+++ b/app/src/main/java/com/uiuios/aios/network/api/HealthCodeApi.java
@@ -1,8 +1,8 @@
-package com.uiui.aios.network.api;
+package com.uiuios.aios.network.api;
 
-import com.uiui.aios.bean.BaseResponse;
-import com.uiui.aios.bean.HealthCode;
-import com.uiui.aios.network.URLAddress;
+import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.bean.HealthCode;
+import com.uiuios.aios.network.URLAddress;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/uiui/aios/network/api/RunNewApp.java b/app/src/main/java/com/uiuios/aios/network/api/RunNewApp.java
similarity index 74%
rename from app/src/main/java/com/uiui/aios/network/api/RunNewApp.java
rename to app/src/main/java/com/uiuios/aios/network/api/RunNewApp.java
index 1bd4534..35820a6 100644
--- a/app/src/main/java/com/uiui/aios/network/api/RunNewApp.java
+++ b/app/src/main/java/com/uiuios/aios/network/api/RunNewApp.java
@@ -1,7 +1,7 @@
-package com.uiui.aios.network.api;
+package com.uiuios.aios.network.api;
 
-import com.uiui.aios.bean.BaseResponse;
-import com.uiui.aios.network.URLAddress;
+import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.network.URLAddress;
 
 import io.reactivex.rxjava3.core.Observable;
 import retrofit2.http.Field;
diff --git a/app/src/main/java/com/uiui/aios/network/api/SNInfoApi.java b/app/src/main/java/com/uiuios/aios/network/api/SNInfoApi.java
similarity index 61%
rename from app/src/main/java/com/uiui/aios/network/api/SNInfoApi.java
rename to app/src/main/java/com/uiuios/aios/network/api/SNInfoApi.java
index 60cf13e..3fcb47a 100644
--- a/app/src/main/java/com/uiui/aios/network/api/SNInfoApi.java
+++ b/app/src/main/java/com/uiuios/aios/network/api/SNInfoApi.java
@@ -1,8 +1,8 @@
-package com.uiui.aios.network.api;
+package com.uiuios.aios.network.api;
 
-import com.uiui.aios.bean.BaseResponse;
-import com.uiui.aios.bean.SnInfo;
-import com.uiui.aios.network.URLAddress;
+import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.bean.SnInfo;
+import com.uiuios.aios.network.URLAddress;
 
 import io.reactivex.rxjava3.core.Observable;
 import retrofit2.http.GET;
diff --git a/app/src/main/java/com/uiui/aios/network/api/SOSRecordApi.java b/app/src/main/java/com/uiuios/aios/network/api/SOSRecordApi.java
similarity index 79%
rename from app/src/main/java/com/uiui/aios/network/api/SOSRecordApi.java
rename to app/src/main/java/com/uiuios/aios/network/api/SOSRecordApi.java
index c82454d..6fda567 100644
--- a/app/src/main/java/com/uiui/aios/network/api/SOSRecordApi.java
+++ b/app/src/main/java/com/uiuios/aios/network/api/SOSRecordApi.java
@@ -1,7 +1,7 @@
-package com.uiui.aios.network.api;
+package com.uiuios.aios.network.api;
 
-import com.uiui.aios.bean.BaseResponse;
-import com.uiui.aios.network.URLAddress;
+import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.network.URLAddress;
 
 import io.reactivex.rxjava3.core.Observable;
 import retrofit2.http.Field;
diff --git a/app/src/main/java/com/uiui/aios/network/api/SendScreenshotApi.java b/app/src/main/java/com/uiuios/aios/network/api/SendScreenshotApi.java
similarity index 77%
rename from app/src/main/java/com/uiui/aios/network/api/SendScreenshotApi.java
rename to app/src/main/java/com/uiuios/aios/network/api/SendScreenshotApi.java
index 774d008..09311dc 100644
--- a/app/src/main/java/com/uiui/aios/network/api/SendScreenshotApi.java
+++ b/app/src/main/java/com/uiuios/aios/network/api/SendScreenshotApi.java
@@ -1,8 +1,8 @@
-package com.uiui.aios.network.api;
+package com.uiuios.aios.network.api;
 
 
-import com.uiui.aios.bean.BaseResponse;
-import com.uiui.aios.network.URLAddress;
+import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.network.URLAddress;
 
 import io.reactivex.rxjava3.core.Observable;
 import okhttp3.MultipartBody;
diff --git a/app/src/main/java/com/uiui/aios/network/api/Setting.java b/app/src/main/java/com/uiuios/aios/network/api/Setting.java
similarity index 61%
rename from app/src/main/java/com/uiui/aios/network/api/Setting.java
rename to app/src/main/java/com/uiuios/aios/network/api/Setting.java
index 41e4cde..eed2b1a 100644
--- a/app/src/main/java/com/uiui/aios/network/api/Setting.java
+++ b/app/src/main/java/com/uiuios/aios/network/api/Setting.java
@@ -1,8 +1,8 @@
-package com.uiui.aios.network.api;
+package com.uiuios.aios.network.api;
 
-import com.uiui.aios.bean.BaseResponse;
-import com.uiui.aios.bean.SystemSettings;
-import com.uiui.aios.network.URLAddress;
+import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.bean.SystemSettings;
+import com.uiuios.aios.network.URLAddress;
 
 import io.reactivex.rxjava3.core.Observable;
 import retrofit2.http.GET;
diff --git a/app/src/main/java/com/uiui/aios/network/api/UpdateAlarmClockApi.java b/app/src/main/java/com/uiuios/aios/network/api/UpdateAlarmClockApi.java
similarity index 74%
rename from app/src/main/java/com/uiui/aios/network/api/UpdateAlarmClockApi.java
rename to app/src/main/java/com/uiuios/aios/network/api/UpdateAlarmClockApi.java
index 3ffe26c..edebc3b 100644
--- a/app/src/main/java/com/uiui/aios/network/api/UpdateAlarmClockApi.java
+++ b/app/src/main/java/com/uiuios/aios/network/api/UpdateAlarmClockApi.java
@@ -1,7 +1,7 @@
-package com.uiui.aios.network.api;
+package com.uiuios.aios.network.api;
 
-import com.uiui.aios.bean.BaseResponse;
-import com.uiui.aios.network.URLAddress;
+import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.network.URLAddress;
 
 import io.reactivex.rxjava3.core.Observable;
 import retrofit2.http.Field;
diff --git a/app/src/main/java/com/uiui/aios/network/api/UpdateDesktopApi.java b/app/src/main/java/com/uiuios/aios/network/api/UpdateDesktopApi.java
similarity index 75%
rename from app/src/main/java/com/uiui/aios/network/api/UpdateDesktopApi.java
rename to app/src/main/java/com/uiuios/aios/network/api/UpdateDesktopApi.java
index 034e387..8c9ca5a 100644
--- a/app/src/main/java/com/uiui/aios/network/api/UpdateDesktopApi.java
+++ b/app/src/main/java/com/uiuios/aios/network/api/UpdateDesktopApi.java
@@ -1,7 +1,7 @@
-package com.uiui.aios.network.api;
+package com.uiuios.aios.network.api;
 
-import com.uiui.aios.bean.BaseResponse;
-import com.uiui.aios.network.URLAddress;
+import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.network.URLAddress;
 
 import io.reactivex.rxjava3.core.Observable;
 import retrofit2.http.Field;
diff --git a/app/src/main/java/com/uiui/aios/network/api/UserInfoControl.java b/app/src/main/java/com/uiuios/aios/network/api/UserInfoControl.java
similarity index 67%
rename from app/src/main/java/com/uiui/aios/network/api/UserInfoControl.java
rename to app/src/main/java/com/uiuios/aios/network/api/UserInfoControl.java
index 316594e..b0f5492 100644
--- a/app/src/main/java/com/uiui/aios/network/api/UserInfoControl.java
+++ b/app/src/main/java/com/uiuios/aios/network/api/UserInfoControl.java
@@ -1,9 +1,9 @@
-package com.uiui.aios.network.api;
+package com.uiuios.aios.network.api;
 
 
-import com.uiui.aios.bean.BaseResponse;
-import com.uiui.aios.bean.UserAvatarInfo;
-import com.uiui.aios.network.URLAddress;
+import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.bean.UserAvatarInfo;
+import com.uiuios.aios.network.URLAddress;
 
 import io.reactivex.rxjava3.core.Observable;
 import retrofit2.http.Field;
diff --git a/app/src/main/java/com/uiui/aios/network/interceptor/RepeatRequestInterceptor.java b/app/src/main/java/com/uiuios/aios/network/interceptor/RepeatRequestInterceptor.java
similarity index 96%
rename from app/src/main/java/com/uiui/aios/network/interceptor/RepeatRequestInterceptor.java
rename to app/src/main/java/com/uiuios/aios/network/interceptor/RepeatRequestInterceptor.java
index 83d8973..6adb389 100644
--- a/app/src/main/java/com/uiui/aios/network/interceptor/RepeatRequestInterceptor.java
+++ b/app/src/main/java/com/uiuios/aios/network/interceptor/RepeatRequestInterceptor.java
@@ -1,9 +1,9 @@
-package com.uiui.aios.network.interceptor;
+package com.uiuios.aios.network.interceptor;
 
 import android.util.Log;
 
-import com.uiui.aios.BuildConfig;
-import com.uiui.aios.utils.MD5Util;
+import com.uiuios.aios.BuildConfig;
+import com.uiuios.aios.utils.MD5Util;
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/app/src/main/java/com/uiui/aios/receiver/BootReceiver.java b/app/src/main/java/com/uiuios/aios/receiver/BootReceiver.java
similarity index 96%
rename from app/src/main/java/com/uiui/aios/receiver/BootReceiver.java
rename to app/src/main/java/com/uiuios/aios/receiver/BootReceiver.java
index 892a0e0..3a67207 100644
--- a/app/src/main/java/com/uiui/aios/receiver/BootReceiver.java
+++ b/app/src/main/java/com/uiuios/aios/receiver/BootReceiver.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.receiver;
+package com.uiuios.aios.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -6,7 +6,7 @@ import android.content.Intent;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.uiui.aios.service.main.MainService;
+import com.uiuios.aios.service.main.MainService;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/app/src/main/java/com/uiui/aios/receiver/InstallResultReceiver.java b/app/src/main/java/com/uiuios/aios/receiver/InstallResultReceiver.java
similarity index 98%
rename from app/src/main/java/com/uiui/aios/receiver/InstallResultReceiver.java
rename to app/src/main/java/com/uiuios/aios/receiver/InstallResultReceiver.java
index 94d2ed3..a283f97 100644
--- a/app/src/main/java/com/uiui/aios/receiver/InstallResultReceiver.java
+++ b/app/src/main/java/com/uiuios/aios/receiver/InstallResultReceiver.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.receiver;
+package com.uiuios.aios.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/app/src/main/java/com/uiui/aios/service/NotificationService.java b/app/src/main/java/com/uiuios/aios/service/NotificationService.java
similarity index 98%
rename from app/src/main/java/com/uiui/aios/service/NotificationService.java
rename to app/src/main/java/com/uiuios/aios/service/NotificationService.java
index e23ba1b..f7f8d6c 100644
--- a/app/src/main/java/com/uiui/aios/service/NotificationService.java
+++ b/app/src/main/java/com/uiuios/aios/service/NotificationService.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.service;
+package com.uiuios.aios.service;
 
 import android.service.notification.NotificationListenerService;
 import android.service.notification.StatusBarNotification;
diff --git a/app/src/main/java/com/uiui/aios/service/main/MainSContact.java b/app/src/main/java/com/uiuios/aios/service/main/MainSContact.java
similarity index 67%
rename from app/src/main/java/com/uiui/aios/service/main/MainSContact.java
rename to app/src/main/java/com/uiuios/aios/service/main/MainSContact.java
index 9632b5a..f5e44a3 100644
--- a/app/src/main/java/com/uiui/aios/service/main/MainSContact.java
+++ b/app/src/main/java/com/uiuios/aios/service/main/MainSContact.java
@@ -1,8 +1,8 @@
-package com.uiui.aios.service.main;
+package com.uiuios.aios.service.main;
 
-import com.uiui.aios.base.BasePresenter;
-import com.uiui.aios.base.BaseView;
-import com.uiui.aios.bean.AlarmClockData;
+import com.uiuios.aios.base.BasePresenter;
+import com.uiuios.aios.base.BaseView;
+import com.uiuios.aios.bean.AlarmClockData;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/uiui/aios/service/main/MainSPresenter.java b/app/src/main/java/com/uiuios/aios/service/main/MainSPresenter.java
similarity index 85%
rename from app/src/main/java/com/uiui/aios/service/main/MainSPresenter.java
rename to app/src/main/java/com/uiuios/aios/service/main/MainSPresenter.java
index 4f2433d..282a22d 100644
--- a/app/src/main/java/com/uiui/aios/service/main/MainSPresenter.java
+++ b/app/src/main/java/com/uiuios/aios/service/main/MainSPresenter.java
@@ -1,19 +1,15 @@
-package com.uiui.aios.service.main;
+package com.uiuios.aios.service.main;
 
 import android.content.Context;
 import android.util.Log;
 
 import com.tencent.mmkv.MMKV;
 import com.trello.rxlifecycle4.android.ActivityEvent;
-import com.uiui.aios.bean.AlarmClockData;
-import com.uiui.aios.bean.BaseResponse;
-import com.uiui.aios.network.NetInterfaceManager;
-import com.uiui.aios.alarm.AlarmUtils;
+import com.uiuios.aios.bean.AlarmClockData;
+import com.uiuios.aios.network.NetInterfaceManager;
 
 import java.util.List;
 
-import io.reactivex.rxjava3.core.Observer;
-import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.subjects.BehaviorSubject;
 
 
diff --git a/app/src/main/java/com/uiui/aios/service/main/MainService.java b/app/src/main/java/com/uiuios/aios/service/main/MainService.java
similarity index 96%
rename from app/src/main/java/com/uiui/aios/service/main/MainService.java
rename to app/src/main/java/com/uiuios/aios/service/main/MainService.java
index 85a2b17..743cb9c 100644
--- a/app/src/main/java/com/uiui/aios/service/main/MainService.java
+++ b/app/src/main/java/com/uiuios/aios/service/main/MainService.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.service.main;
+package com.uiuios.aios.service.main;
 
 import android.annotation.SuppressLint;
 import android.content.BroadcastReceiver;
@@ -15,19 +15,19 @@ import com.arialyy.annotations.Download;
 import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.task.DownloadTask;
 import com.blankj.utilcode.util.NetworkUtils;
-import com.uiui.aios.BuildConfig;
-import com.uiui.aios.activity.NoticeActivity;
-import com.uiui.aios.alarm.AlarmUtils;
-import com.uiui.aios.base.BaseService;
-import com.uiui.aios.bean.AlarmClockData;
-import com.uiui.aios.bean.BaseResponse;
-import com.uiui.aios.network.NetInterfaceManager;
-import com.uiui.aios.utils.ApkUtils;
-import com.uiui.aios.utils.CmdUtil;
-import com.uiui.aios.utils.ForegroundAppUtil;
-import com.uiui.aios.utils.AppUsedTimeUtils;
-import com.uiui.aios.utils.ToastUtil;
-import com.uiui.aios.utils.Utils;
+import com.uiuios.aios.BuildConfig;
+import com.uiuios.aios.activity.NoticeActivity;
+import com.uiuios.aios.alarm.AlarmUtils;
+import com.uiuios.aios.base.BaseService;
+import com.uiuios.aios.bean.AlarmClockData;
+import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.network.NetInterfaceManager;
+import com.uiuios.aios.utils.ApkUtils;
+import com.uiuios.aios.utils.CmdUtil;
+import com.uiuios.aios.utils.ForegroundAppUtil;
+import com.uiuios.aios.utils.AppUsedTimeUtils;
+import com.uiuios.aios.utils.ToastUtil;
+import com.uiuios.aios.utils.Utils;
 
 import java.io.File;
 import java.io.FileNotFoundException;
diff --git a/app/src/main/java/com/uiui/aios/tpush/Constants.java b/app/src/main/java/com/uiuios/aios/tpush/Constants.java
similarity index 94%
rename from app/src/main/java/com/uiui/aios/tpush/Constants.java
rename to app/src/main/java/com/uiuios/aios/tpush/Constants.java
index b838f48..7f33c3e 100644
--- a/app/src/main/java/com/uiui/aios/tpush/Constants.java
+++ b/app/src/main/java/com/uiuios/aios/tpush/Constants.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.tpush;
+package com.uiuios.aios.tpush;
 
 /**
  * Created by chacewang on 2019/7/5.
diff --git a/app/src/main/java/com/uiui/aios/tpush/MessageReceiver.java b/app/src/main/java/com/uiuios/aios/tpush/MessageReceiver.java
similarity index 98%
rename from app/src/main/java/com/uiui/aios/tpush/MessageReceiver.java
rename to app/src/main/java/com/uiuios/aios/tpush/MessageReceiver.java
index 2fc1cbb..4cc2b96 100644
--- a/app/src/main/java/com/uiui/aios/tpush/MessageReceiver.java
+++ b/app/src/main/java/com/uiuios/aios/tpush/MessageReceiver.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.tpush;
+package com.uiuios.aios.tpush;
 
 import android.content.ContentResolver;
 import android.content.Context;
@@ -16,10 +16,9 @@ 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.aios.service.main.MainService;
-import com.uiui.aios.tpush.common.NotificationService;
-import com.uiui.aios.tpush.po.XGNotification;
-import com.uiui.aios.utils.ToastUtil;
+import com.uiuios.aios.tpush.common.NotificationService;
+import com.uiuios.aios.tpush.po.XGNotification;
+import com.uiuios.aios.utils.ToastUtil;
 
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
diff --git a/app/src/main/java/com/uiui/aios/tpush/common/DBOpenHelper.java b/app/src/main/java/com/uiuios/aios/tpush/common/DBOpenHelper.java
similarity index 94%
rename from app/src/main/java/com/uiui/aios/tpush/common/DBOpenHelper.java
rename to app/src/main/java/com/uiuios/aios/tpush/common/DBOpenHelper.java
index fa225b4..6a0dca2 100644
--- a/app/src/main/java/com/uiui/aios/tpush/common/DBOpenHelper.java
+++ b/app/src/main/java/com/uiuios/aios/tpush/common/DBOpenHelper.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.tpush.common;
+package com.uiuios.aios.tpush.common;
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
diff --git a/app/src/main/java/com/uiui/aios/tpush/common/NotificationService.java b/app/src/main/java/com/uiuios/aios/tpush/common/NotificationService.java
similarity index 98%
rename from app/src/main/java/com/uiui/aios/tpush/common/NotificationService.java
rename to app/src/main/java/com/uiuios/aios/tpush/common/NotificationService.java
index 10344d1..20faa41 100644
--- a/app/src/main/java/com/uiui/aios/tpush/common/NotificationService.java
+++ b/app/src/main/java/com/uiuios/aios/tpush/common/NotificationService.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.tpush.common;
+package com.uiuios.aios.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.aios.tpush.po.XGNotification;
+import com.uiuios.aios.tpush.po.XGNotification;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/com/uiui/aios/tpush/po/XGNotification.java b/app/src/main/java/com/uiuios/aios/tpush/po/XGNotification.java
similarity index 97%
rename from app/src/main/java/com/uiui/aios/tpush/po/XGNotification.java
rename to app/src/main/java/com/uiuios/aios/tpush/po/XGNotification.java
index c13e3d9..da0de05 100644
--- a/app/src/main/java/com/uiui/aios/tpush/po/XGNotification.java
+++ b/app/src/main/java/com/uiuios/aios/tpush/po/XGNotification.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.tpush.po;
+package com.uiuios.aios.tpush.po;
 
 public class XGNotification {
 	private Integer id;
diff --git a/app/src/main/java/com/uiui/aios/utils/ApkUtils.java b/app/src/main/java/com/uiuios/aios/utils/ApkUtils.java
similarity index 97%
rename from app/src/main/java/com/uiui/aios/utils/ApkUtils.java
rename to app/src/main/java/com/uiuios/aios/utils/ApkUtils.java
index fd5c512..7a31326 100644
--- a/app/src/main/java/com/uiui/aios/utils/ApkUtils.java
+++ b/app/src/main/java/com/uiuios/aios/utils/ApkUtils.java
@@ -1,9 +1,11 @@
-package com.uiui.aios.utils;
+package com.uiuios.aios.utils;
 
 import android.app.PendingIntent;
+import android.app.role.RoleManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageInstaller;
@@ -11,15 +13,18 @@ import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.os.Binder;
 import android.os.Build;
+import android.os.Process;
+import android.os.SystemProperties;
+import android.os.UserHandle;
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Log;
 
 import androidx.annotation.RequiresApi;
 
-import com.uiui.aios.BuildConfig;
-import com.uiui.aios.bean.DesktopIcon;
-import com.uiui.aios.receiver.InstallResultReceiver;
+import com.uiuios.aios.BuildConfig;
+import com.uiuios.aios.bean.DesktopIcon;
+import com.uiuios.aios.receiver.InstallResultReceiver;
 
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
@@ -32,7 +37,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
-import java.util.function.Predicate;
+import java.util.concurrent.Executor;
+import java.util.function.Consumer;
 
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.core.Observable;
@@ -55,7 +61,7 @@ public class ApkUtils {
         this.add("com.uiui.os");
         this.add("com.uiui.health");
         this.add("com.tencent.android.qqdownloader");
-        this.add("com.uiui.appstore");
+        this.add("com.uiuios.appstore");
     }};
     private static HashSet<String> showPackageName = new HashSet<String>() {{
         this.add("com.android.dialer");
@@ -129,8 +135,8 @@ public class ApkUtils {
         this.add("com.android.gallery3d");
         this.add("com.android.camera2");
         this.add("com.android.settings");
-        this.add("com.uiui.sn");
-        this.add("com.uiui.appstore");
+        this.add("com.uiuios.sn");
+        this.add("com.uiuios.appstore");
     }};
 
     /**
@@ -492,4 +498,5 @@ public class ApkUtils {
     public static int getUserId(int uid) {
         return uid / PER_USER_RANGE;
     }
-}
+
+   }
diff --git a/app/src/main/java/com/uiui/aios/utils/AppUsedTimeUtils.java b/app/src/main/java/com/uiuios/aios/utils/AppUsedTimeUtils.java
similarity index 99%
rename from app/src/main/java/com/uiui/aios/utils/AppUsedTimeUtils.java
rename to app/src/main/java/com/uiuios/aios/utils/AppUsedTimeUtils.java
index a632406..a5a10a7 100644
--- a/app/src/main/java/com/uiui/aios/utils/AppUsedTimeUtils.java
+++ b/app/src/main/java/com/uiuios/aios/utils/AppUsedTimeUtils.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.utils;
+package com.uiuios.aios.utils;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
diff --git a/app/src/main/java/com/uiui/aios/utils/AppUtil.java b/app/src/main/java/com/uiuios/aios/utils/AppUtil.java
similarity index 98%
rename from app/src/main/java/com/uiui/aios/utils/AppUtil.java
rename to app/src/main/java/com/uiuios/aios/utils/AppUtil.java
index d2f6113..08eb338 100644
--- a/app/src/main/java/com/uiui/aios/utils/AppUtil.java
+++ b/app/src/main/java/com/uiuios/aios/utils/AppUtil.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.uiui.aios.utils;
+package com.uiuios.aios.utils;
 
 
 import android.app.ActivityManager;
diff --git a/app/src/main/java/com/uiui/aios/utils/BitmapUtils.java b/app/src/main/java/com/uiuios/aios/utils/BitmapUtils.java
similarity index 98%
rename from app/src/main/java/com/uiui/aios/utils/BitmapUtils.java
rename to app/src/main/java/com/uiuios/aios/utils/BitmapUtils.java
index b804413..4a0cc9b 100644
--- a/app/src/main/java/com/uiui/aios/utils/BitmapUtils.java
+++ b/app/src/main/java/com/uiuios/aios/utils/BitmapUtils.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.utils;
+package com.uiuios.aios.utils;
 
 import android.content.Context;
 import android.graphics.Bitmap;
diff --git a/app/src/main/java/com/uiui/aios/utils/CmdUtil.java b/app/src/main/java/com/uiuios/aios/utils/CmdUtil.java
similarity index 98%
rename from app/src/main/java/com/uiui/aios/utils/CmdUtil.java
rename to app/src/main/java/com/uiuios/aios/utils/CmdUtil.java
index 3dd5591..3d34268 100644
--- a/app/src/main/java/com/uiui/aios/utils/CmdUtil.java
+++ b/app/src/main/java/com/uiuios/aios/utils/CmdUtil.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.utils;
+package com.uiuios.aios.utils;
 
 import android.text.TextUtils;
 import android.util.Log;
diff --git a/app/src/main/java/com/uiui/aios/utils/FFmpegUtils.java b/app/src/main/java/com/uiuios/aios/utils/FFmpegUtils.java
similarity index 97%
rename from app/src/main/java/com/uiui/aios/utils/FFmpegUtils.java
rename to app/src/main/java/com/uiuios/aios/utils/FFmpegUtils.java
index 39e8acd..1fded33 100644
--- a/app/src/main/java/com/uiui/aios/utils/FFmpegUtils.java
+++ b/app/src/main/java/com/uiuios/aios/utils/FFmpegUtils.java
@@ -1,6 +1,5 @@
-package com.uiui.aios.utils;
+package com.uiuios.aios.utils;
 
-import android.content.Context;
 import android.graphics.Bitmap;
 import android.util.Log;
 
diff --git a/app/src/main/java/com/uiui/aios/utils/FileUtil.java b/app/src/main/java/com/uiuios/aios/utils/FileUtil.java
similarity index 98%
rename from app/src/main/java/com/uiui/aios/utils/FileUtil.java
rename to app/src/main/java/com/uiuios/aios/utils/FileUtil.java
index b381e39..acac874 100644
--- a/app/src/main/java/com/uiui/aios/utils/FileUtil.java
+++ b/app/src/main/java/com/uiuios/aios/utils/FileUtil.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.utils;
+package com.uiuios.aios.utils;
 
 import android.text.TextUtils;
 
diff --git a/app/src/main/java/com/uiui/aios/utils/ForegroundAppUtil.java b/app/src/main/java/com/uiuios/aios/utils/ForegroundAppUtil.java
similarity index 99%
rename from app/src/main/java/com/uiui/aios/utils/ForegroundAppUtil.java
rename to app/src/main/java/com/uiuios/aios/utils/ForegroundAppUtil.java
index fbcd566..6a19170 100644
--- a/app/src/main/java/com/uiui/aios/utils/ForegroundAppUtil.java
+++ b/app/src/main/java/com/uiuios/aios/utils/ForegroundAppUtil.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.utils;
+package com.uiuios.aios.utils;
 
 import android.app.ActivityManager;
 import android.app.usage.UsageStats;
diff --git a/app/src/main/java/com/uiui/aios/utils/GlideLoadUtils.java b/app/src/main/java/com/uiuios/aios/utils/GlideLoadUtils.java
similarity index 98%
rename from app/src/main/java/com/uiui/aios/utils/GlideLoadUtils.java
rename to app/src/main/java/com/uiuios/aios/utils/GlideLoadUtils.java
index 3885fc6..bb5a06b 100644
--- a/app/src/main/java/com/uiui/aios/utils/GlideLoadUtils.java
+++ b/app/src/main/java/com/uiuios/aios/utils/GlideLoadUtils.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.utils;
+package com.uiuios.aios.utils;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
diff --git a/app/src/main/java/com/uiui/aios/utils/GsonUtils.java b/app/src/main/java/com/uiuios/aios/utils/GsonUtils.java
similarity index 95%
rename from app/src/main/java/com/uiui/aios/utils/GsonUtils.java
rename to app/src/main/java/com/uiuios/aios/utils/GsonUtils.java
index 9ea2b86..d71a588 100644
--- a/app/src/main/java/com/uiui/aios/utils/GsonUtils.java
+++ b/app/src/main/java/com/uiuios/aios/utils/GsonUtils.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.utils;
+package com.uiuios.aios.utils;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
diff --git a/app/src/main/java/com/uiui/aios/utils/IconUtils.java b/app/src/main/java/com/uiuios/aios/utils/IconUtils.java
similarity index 96%
rename from app/src/main/java/com/uiui/aios/utils/IconUtils.java
rename to app/src/main/java/com/uiuios/aios/utils/IconUtils.java
index 01cb120..4434da7 100644
--- a/app/src/main/java/com/uiui/aios/utils/IconUtils.java
+++ b/app/src/main/java/com/uiuios/aios/utils/IconUtils.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.utils;
+package com.uiuios.aios.utils;
 
 import android.util.Log;
 
@@ -7,11 +7,11 @@ import java.util.List;
 
 public class IconUtils {
     public static List<String> appClassNameList = new ArrayList<String>() {{
-        this.add("com.uiui.sn");//设别信息
-        this.add("com.uiui.appstore");//应用市场
+        this.add("com.uiuios.sn");//设别信息
+        this.add("com.uiuios.appstore");//应用市场
         this.add("com.uiui.weather");//天气
         this.add("com.android.browser");//浏览器
-        this.add("com.uiui.browser");//浏览器
+        this.add("com.uiuios.browser");//浏览器
         this.add("com.aoleyun.browser");//浏览器
         this.add("com.android.calculator2");//计算器
         this.add("com.android.calendar");//日历
diff --git a/app/src/main/java/com/uiui/aios/utils/MD5Util.java b/app/src/main/java/com/uiuios/aios/utils/MD5Util.java
similarity index 98%
rename from app/src/main/java/com/uiui/aios/utils/MD5Util.java
rename to app/src/main/java/com/uiuios/aios/utils/MD5Util.java
index ad473f5..2cd148a 100644
--- a/app/src/main/java/com/uiui/aios/utils/MD5Util.java
+++ b/app/src/main/java/com/uiuios/aios/utils/MD5Util.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.utils;
+package com.uiuios.aios.utils;
 
 import android.annotation.SuppressLint;
 
diff --git a/app/src/main/java/com/uiui/aios/utils/NetStateUtils.java b/app/src/main/java/com/uiuios/aios/utils/NetStateUtils.java
similarity index 98%
rename from app/src/main/java/com/uiui/aios/utils/NetStateUtils.java
rename to app/src/main/java/com/uiuios/aios/utils/NetStateUtils.java
index 694f1a6..e033692 100644
--- a/app/src/main/java/com/uiui/aios/utils/NetStateUtils.java
+++ b/app/src/main/java/com/uiuios/aios/utils/NetStateUtils.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.utils;
+package com.uiuios.aios.utils;
 
 import android.content.Context;
 import android.net.ConnectivityManager;
diff --git a/app/src/main/java/com/uiui/aios/utils/SchemeUtils.java b/app/src/main/java/com/uiuios/aios/utils/SchemeUtils.java
similarity index 96%
rename from app/src/main/java/com/uiui/aios/utils/SchemeUtils.java
rename to app/src/main/java/com/uiuios/aios/utils/SchemeUtils.java
index 8a3c80d..0a51472 100644
--- a/app/src/main/java/com/uiui/aios/utils/SchemeUtils.java
+++ b/app/src/main/java/com/uiuios/aios/utils/SchemeUtils.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.utils;
+package com.uiuios.aios.utils;
 
 import android.app.Activity;
 import android.content.Intent;
diff --git a/app/src/main/java/com/uiui/aios/utils/ScreenUtils.java b/app/src/main/java/com/uiuios/aios/utils/ScreenUtils.java
similarity index 97%
rename from app/src/main/java/com/uiui/aios/utils/ScreenUtils.java
rename to app/src/main/java/com/uiuios/aios/utils/ScreenUtils.java
index 06a8e7c..07670b0 100644
--- a/app/src/main/java/com/uiui/aios/utils/ScreenUtils.java
+++ b/app/src/main/java/com/uiuios/aios/utils/ScreenUtils.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.utils;
+package com.uiuios.aios.utils;
 
 import android.content.Context;
 import android.content.res.Resources;
diff --git a/app/src/main/java/com/uiui/aios/utils/TimeUtils.java b/app/src/main/java/com/uiuios/aios/utils/TimeUtils.java
similarity index 96%
rename from app/src/main/java/com/uiui/aios/utils/TimeUtils.java
rename to app/src/main/java/com/uiuios/aios/utils/TimeUtils.java
index 70b3712..a5bc99d 100644
--- a/app/src/main/java/com/uiui/aios/utils/TimeUtils.java
+++ b/app/src/main/java/com/uiuios/aios/utils/TimeUtils.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.utils;
+package com.uiuios.aios.utils;
 
 import android.os.Build;
 
diff --git a/app/src/main/java/com/uiui/aios/utils/ToastUtil.java b/app/src/main/java/com/uiuios/aios/utils/ToastUtil.java
similarity index 97%
rename from app/src/main/java/com/uiui/aios/utils/ToastUtil.java
rename to app/src/main/java/com/uiuios/aios/utils/ToastUtil.java
index 87fb3da..8375104 100644
--- a/app/src/main/java/com/uiui/aios/utils/ToastUtil.java
+++ b/app/src/main/java/com/uiuios/aios/utils/ToastUtil.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.utils;
+package com.uiuios.aios.utils;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -10,7 +10,7 @@ import android.util.Log;
 import android.widget.Toast;
 
 import com.blankj.utilcode.util.ToastUtils;
-import com.uiui.aios.BuildConfig;
+import com.uiuios.aios.BuildConfig;
 
 
 /**
diff --git a/app/src/main/java/com/uiuios/aios/utils/Utils.java b/app/src/main/java/com/uiuios/aios/utils/Utils.java
new file mode 100644
index 0000000..e1c08df
--- /dev/null
+++ b/app/src/main/java/com/uiuios/aios/utils/Utils.java
@@ -0,0 +1,207 @@
+package com.uiuios.aios.utils;
+
+import android.annotation.SuppressLint;
+import android.app.role.RoleManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.ContextWrapper;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.BatteryManager;
+import android.os.Build;
+import android.os.Environment;
+import android.os.SystemProperties;
+import android.os.UserHandle;
+import android.text.TextUtils;
+import android.util.Log;
+
+import androidx.core.content.ContextCompat;
+
+import com.uiuios.aios.BuildConfig;
+
+import java.io.File;
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.function.Consumer;
+
+public class Utils {
+    private static final String TAG = Utils.class.getSimpleName();
+
+    /**
+     * 获取设备序列号
+     *
+     * @return
+     */
+    @SuppressLint("MissingPermission")
+    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());
+        }
+        if (BuildConfig.DEBUG) {
+//            return "QNG2DKB00463";
+        }
+        return serial;
+    }
+
+    public static String getDeviceSN() {
+        String serial = null;
+        try {
+            Class<?> c = Class.forName("android.os.SystemProperties");
+            Method get = c.getMethod("get", String.class);
+            serial = (String) get.invoke(c, "persist.sys.hrSerial");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return serial;
+    }
+
+    /**
+     * 获取电量
+     *
+     * @param mContext
+     * @return
+     */
+    synchronized public static int getBatteryLevel(Context mContext) {
+        if (Build.VERSION.SDK_INT >= 21) {
+            return ((BatteryManager) mContext.getSystemService(Context.BATTERY_SERVICE)).getIntProperty(4);
+        } else {
+            Intent intent = (new ContextWrapper(mContext)).registerReceiver(null, new IntentFilter("android.intent.action.BATTERY_CHANGED"));
+            return intent.getIntExtra("level", -1) * 100 / intent.getIntExtra("scale", -1);
+        }
+    }
+
+    public static String getDownLoadPath(Context context) {
+        String path = ContextCompat.getExternalFilesDirs(context, Environment.DIRECTORY_DOWNLOADS)[0].getAbsolutePath();
+        return path + File.separator;
+    }
+
+    public static String getFileNamefromURL(String url) {
+        int position = url.lastIndexOf("/");
+        return url.substring(position + 1);
+    }
+
+    public static void openLauncher3(Context context) {
+        setDefaultDesktop(context, Launcher3, Launcher3Class);
+//        ApkUtils.openPackage(mContext, Launcher3);
+        gotoLauncher(context);
+    }
+
+    public static void gotoLauncher(Context context) {
+        Intent i = new Intent(Intent.ACTION_MAIN);
+        i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); //android123提示如果是服务里调用，必须加入new task标识
+        i.addCategory(Intent.CATEGORY_HOME);
+        context.startActivity(i);
+    }
+
+    private static String Launcher3 = "com.android.launcher3";
+    private static String Launcher3Class = "com.android.launcher3.Launcher";
+
+    public static void setDefaultDesktop(Context context, String pkg, String className) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            setRoleHolderAsUser(context, pkg);
+            Log.e(TAG, "setDefaultDesktop: setRoleHolderAsUser");
+        } else {
+            //爱华设置，暂时屏蔽
+//            setDefaultLauncher(mContext, pkg, className);
+            Log.e(TAG, "setDefaultDesktop: setDefaultLauncher");
+        }
+//        String oldDesktop = (String) SPUtils.get(mContext, "default_launcher", "");
+//        if (Objects.equals(oldDesktop, pkg)) {
+//            Log.e(TAG, "setDefaultDesktop: " + "数据一致");
+//            return;
+//        }
+        Intent intent = new Intent("setDefaultLauncher");
+        intent.putExtra("package", pkg);
+        intent.putExtra("className", className);
+//        if (JGYUtils.getInstance().checkAppPlatform() == MTKPlatform) {
+        Log.e(TAG, "setDefaultDesktop: MTK");
+        //爱华定制
+        intent.setComponent(new ComponentName("com.android.settings", "com.android.settings.AoleReceiver"));
+        // TODO: 2022/7/6 有问题
+        setDefaultLauncher(context, "com.android.transfer", "com.android.transfer.MainActivity");
+        SystemProperties.set("persist.sys.launcher.pkgname", pkg);
+        SystemProperties.set("persist.sys.launcher.classname", className);
+//        }
+        intent.setPackage("com.android.settings");
+        context.sendBroadcast(intent);
+//        ApkUtils.openPackage(mContext, pkg);
+        Log.e(TAG, "setDefaultDesktop: " + pkg + ":" + className);
+        Log.e(TAG, "setDefaultDesktop: " + "persist.sys.launcher.pkgname = " + SystemProperties.get("persist.sys.launcher.pkgname"));
+        Log.e(TAG, "setDefaultDesktop: " + "persist.sys.launcher.classname = " + SystemProperties.get("persist.sys.launcher.classname"));
+    }
+
+    public static void setDefaultLauncher(Context context, String defPackageName, String defClassName) {
+        try {
+            if (!TextUtils.isEmpty(defPackageName) && !TextUtils.isEmpty(defClassName)) {
+                IntentFilter filter = new IntentFilter();
+                filter.addAction("android.intent.action.MAIN");
+                filter.addCategory("android.intent.category.HOME");
+                filter.addCategory("android.intent.category.DEFAULT");
+                Intent intent = new Intent(Intent.ACTION_MAIN);
+                intent.addCategory(Intent.CATEGORY_HOME);
+                // 返回给定条件的所有ResolveInfo对象(本质上是Activity)
+                List<ResolveInfo> list = context.getPackageManager().queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY);
+                int bestMatch = 0;
+                final int size = list.size();
+                ComponentName[] set = new ComponentName[size];
+                for (int i = 0; i < size; i++) {
+                    ResolveInfo ri = list.get(i);
+                    set[i] = new ComponentName(ri.activityInfo.packageName, ri.activityInfo.name);
+                    if (ri.match > bestMatch) {
+                        bestMatch = ri.match;
+                    }
+                }
+                ComponentName preActivity = new ComponentName(defPackageName, defClassName);
+                context.getPackageManager().addPreferredActivity(filter, bestMatch, set, preActivity);
+            }
+        } catch (java.lang.SecurityException e) {
+            e.printStackTrace();
+            Log.e(TAG, "setDefaultLauncher: " + e.getMessage());
+        }
+    }
+
+
+    public static void setRoleHolderAsUser(Context context, String packageName) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            String roleName = "android.app.role.HOME";
+            boolean add = true;
+            int flags = 0;
+            UserHandle user = android.os.Process.myUserHandle();
+            Log.i("settingssssssstemf", (add ? "Adding" : "Removing") + " package as role holder, role: "
+                    + roleName + ", package: " + packageName);
+//            if (JGYUtils.getInstance().checkAppPlatform() != JGYUtils.MTKPlatform) {
+            RoleManager roleManager = context.getSystemService(RoleManager.class);
+            Executor executor = context.getMainExecutor();
+            Consumer<Boolean> callback = successful -> {
+                if (successful) {
+                    Log.d("settingssssssstemf", "Package " + (add ? "added" : "removed")
+                            + " as role holder, role: " + roleName + ", package: " + packageName);
+                } else {
+                    Log.d("settingssssssstemf", "Failed to " + (add ? "add" : "remove")
+                            + " package as role holder, role: " + roleName + ", package: "
+                            + packageName);
+                }
+            };
+            roleManager.addRoleHolderAsUser(roleName, packageName, flags, user, executor, callback);
+            Log.i("settingssssssstemf", "addRoleHolderAsUser done");
+//            }
+        }
+    }
+
+
+}
diff --git a/app/src/main/java/com/uiui/aios/utils/WakeUpUtils.java b/app/src/main/java/com/uiuios/aios/utils/WakeUpUtils.java
similarity index 99%
rename from app/src/main/java/com/uiui/aios/utils/WakeUpUtils.java
rename to app/src/main/java/com/uiuios/aios/utils/WakeUpUtils.java
index fb35a7b..9196f94 100644
--- a/app/src/main/java/com/uiui/aios/utils/WakeUpUtils.java
+++ b/app/src/main/java/com/uiuios/aios/utils/WakeUpUtils.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.utils;
+package com.uiuios.aios.utils;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
diff --git a/app/src/main/java/com/uiui/aios/view/CustomContent.java b/app/src/main/java/com/uiuios/aios/view/CustomContent.java
similarity index 98%
rename from app/src/main/java/com/uiui/aios/view/CustomContent.java
rename to app/src/main/java/com/uiuios/aios/view/CustomContent.java
index 4737752..e42221f 100644
--- a/app/src/main/java/com/uiui/aios/view/CustomContent.java
+++ b/app/src/main/java/com/uiuios/aios/view/CustomContent.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.view;
+package com.uiuios.aios.view;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/app/src/main/java/com/uiui/aios/view/CustomContentCallbacks.java b/app/src/main/java/com/uiuios/aios/view/CustomContentCallbacks.java
similarity index 95%
rename from app/src/main/java/com/uiui/aios/view/CustomContentCallbacks.java
rename to app/src/main/java/com/uiuios/aios/view/CustomContentCallbacks.java
index dafaef8..60428fb 100644
--- a/app/src/main/java/com/uiui/aios/view/CustomContentCallbacks.java
+++ b/app/src/main/java/com/uiuios/aios/view/CustomContentCallbacks.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.view;
+package com.uiuios.aios.view;
 
 
 // add by codemx.cn ---- 20190712 ---plus- start
diff --git a/app/src/main/java/com/uiui/aios/view/HorizontalItemDecoration.java b/app/src/main/java/com/uiuios/aios/view/HorizontalItemDecoration.java
similarity index 97%
rename from app/src/main/java/com/uiui/aios/view/HorizontalItemDecoration.java
rename to app/src/main/java/com/uiuios/aios/view/HorizontalItemDecoration.java
index afd8b97..bf49ee7 100644
--- a/app/src/main/java/com/uiui/aios/view/HorizontalItemDecoration.java
+++ b/app/src/main/java/com/uiuios/aios/view/HorizontalItemDecoration.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.view;
+package com.uiuios.aios.view;
 
 import android.content.Context;
 import android.graphics.Rect;
diff --git a/app/src/main/java/com/uiui/aios/view/JzvdStdAssert.java b/app/src/main/java/com/uiuios/aios/view/JzvdStdAssert.java
similarity index 98%
rename from app/src/main/java/com/uiui/aios/view/JzvdStdAssert.java
rename to app/src/main/java/com/uiuios/aios/view/JzvdStdAssert.java
index fdf4462..21863b1 100644
--- a/app/src/main/java/com/uiui/aios/view/JzvdStdAssert.java
+++ b/app/src/main/java/com/uiuios/aios/view/JzvdStdAssert.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.view;
+package com.uiuios.aios.view;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/app/src/main/java/com/uiui/aios/view/JzvdStdRound.java b/app/src/main/java/com/uiuios/aios/view/JzvdStdRound.java
similarity index 98%
rename from app/src/main/java/com/uiui/aios/view/JzvdStdRound.java
rename to app/src/main/java/com/uiuios/aios/view/JzvdStdRound.java
index b16208b..0989dc4 100644
--- a/app/src/main/java/com/uiui/aios/view/JzvdStdRound.java
+++ b/app/src/main/java/com/uiuios/aios/view/JzvdStdRound.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.view;
+package com.uiuios.aios.view;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -9,7 +9,7 @@ import android.graphics.Path;
 import android.graphics.RectF;
 import android.util.AttributeSet;
 
-import com.uiui.aios.R;
+import com.uiuios.aios.R;
 
 import cn.jzvd.JzvdStd;
 
diff --git a/app/src/main/java/com/uiui/aios/view/MyGridLayout.java b/app/src/main/java/com/uiuios/aios/view/MyGridLayout.java
similarity index 95%
rename from app/src/main/java/com/uiui/aios/view/MyGridLayout.java
rename to app/src/main/java/com/uiuios/aios/view/MyGridLayout.java
index bff1a0d..4afe95a 100644
--- a/app/src/main/java/com/uiui/aios/view/MyGridLayout.java
+++ b/app/src/main/java/com/uiuios/aios/view/MyGridLayout.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.view;
+package com.uiuios.aios.view;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -8,8 +8,8 @@ import android.view.View;
 import android.view.ViewGroup;
 
 
-import com.uiui.aios.R;
-import com.uiui.aios.bean.DesktopIcon;
+import com.uiuios.aios.R;
+import com.uiuios.aios.bean.DesktopIcon;
 
 import java.util.ArrayList;
 
@@ -22,7 +22,7 @@ import static android.view.View.MeasureSpec.makeMeasureSpec;
  * @author zihao
  */
 public class MyGridLayout extends ViewGroup {
-    int margin = 2;// 每个格子的水平和垂直间隔
+    int margin = 0;// 每个格子的水平和垂直间隔
     int colums = 4;//列数
     int rows = 3;//行数
     int count = 0;
@@ -36,7 +36,7 @@ public class MyGridLayout extends ViewGroup {
         if (attrs != null) {
             TypedArray a = getContext().obtainStyledAttributes(attrs,
                     R.styleable.MyGridLayout);
-            margin = a.getInteger(R.styleable.MyGridLayout_itemMargin, 2);
+//            margin = a.getInteger(R.styleable.MyGridLayout_itemMargin, 2);
             colums = a.getInteger(R.styleable.MyGridLayout_numColumns, 4);
             rows = a.getInteger(R.styleable.MyGridLayout_numRows, 3);
         }
diff --git a/app/src/main/java/com/uiui/aios/view/MyJzvdStdNoTitleNoClarity.java b/app/src/main/java/com/uiuios/aios/view/MyJzvdStdNoTitleNoClarity.java
similarity index 88%
rename from app/src/main/java/com/uiui/aios/view/MyJzvdStdNoTitleNoClarity.java
rename to app/src/main/java/com/uiuios/aios/view/MyJzvdStdNoTitleNoClarity.java
index 381dd75..5f959bb 100644
--- a/app/src/main/java/com/uiui/aios/view/MyJzvdStdNoTitleNoClarity.java
+++ b/app/src/main/java/com/uiuios/aios/view/MyJzvdStdNoTitleNoClarity.java
@@ -1,9 +1,9 @@
-package com.uiui.aios.view;
+package com.uiuios.aios.view;
 
 import android.content.Context;
 import android.util.AttributeSet;
 
-import com.uiui.aios.R;
+import com.uiuios.aios.R;
 
 import cn.jzvd.JzvdStd;
 
diff --git a/app/src/main/java/com/uiui/aios/view/RecyclerItemDecoration.java b/app/src/main/java/com/uiuios/aios/view/RecyclerItemDecoration.java
similarity index 97%
rename from app/src/main/java/com/uiui/aios/view/RecyclerItemDecoration.java
rename to app/src/main/java/com/uiuios/aios/view/RecyclerItemDecoration.java
index 4efb0c2..7718e45 100644
--- a/app/src/main/java/com/uiui/aios/view/RecyclerItemDecoration.java
+++ b/app/src/main/java/com/uiuios/aios/view/RecyclerItemDecoration.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.view;
+package com.uiuios.aios.view;
 
 import android.graphics.Rect;
 import android.view.View;
diff --git a/app/src/main/java/com/uiui/aios/view/RecyclerViewSpacesItemDecoration.java b/app/src/main/java/com/uiuios/aios/view/RecyclerViewSpacesItemDecoration.java
similarity index 97%
rename from app/src/main/java/com/uiui/aios/view/RecyclerViewSpacesItemDecoration.java
rename to app/src/main/java/com/uiuios/aios/view/RecyclerViewSpacesItemDecoration.java
index ed8f17d..db8813d 100644
--- a/app/src/main/java/com/uiui/aios/view/RecyclerViewSpacesItemDecoration.java
+++ b/app/src/main/java/com/uiuios/aios/view/RecyclerViewSpacesItemDecoration.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.view;
+package com.uiuios.aios.view;
 
 import android.graphics.Rect;
 import android.view.View;
diff --git a/app/src/main/java/com/uiui/aios/view/ScaleCircleNavigator.java b/app/src/main/java/com/uiuios/aios/view/ScaleCircleNavigator.java
similarity index 99%
rename from app/src/main/java/com/uiui/aios/view/ScaleCircleNavigator.java
rename to app/src/main/java/com/uiuios/aios/view/ScaleCircleNavigator.java
index 0eb58d5..eb90d77 100644
--- a/app/src/main/java/com/uiui/aios/view/ScaleCircleNavigator.java
+++ b/app/src/main/java/com/uiuios/aios/view/ScaleCircleNavigator.java
@@ -1,4 +1,4 @@
-package com.uiui.aios.view;
+package com.uiuios.aios.view;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/app/src/main/res/drawable-hdpi/app_exit.jpg b/app/src/main/res/drawable-hdpi/app_exit.jpg
new file mode 100644
index 0000000..774942f
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/app_exit.jpg differ
diff --git a/app/src/main/res/drawable/actions_item_selector.xml b/app/src/main/res/drawable/actions_item_selector.xml
index df26a4a..9b13a1b 100644
--- a/app/src/main/res/drawable/actions_item_selector.xml
+++ b/app/src/main/res/drawable/actions_item_selector.xml
@@ -5,7 +5,7 @@
     <item android:drawable="@color/actions_item_pressed" android:state_pressed="true" />
     <item>
         <shape>
-            <solid android:color="@color/colorPrimary" />
+            <solid android:color="@color/transparent" />
         </shape>
     </item>
 
diff --git a/app/src/main/res/drawable/custom_bg_white.xml b/app/src/main/res/drawable/custom_bg_white.xml
new file mode 100644
index 0000000..82577af
--- /dev/null
+++ b/app/src/main/res/drawable/custom_bg_white.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 内部颜色 -->
+    <solid
+        android:color="@color/white" />
+    <!-- 圆角的幅度 -->
+    <corners
+        android:topLeftRadius="10dp"
+        android:topRightRadius="10dp"
+        android:bottomLeftRadius="10dp"
+        android:bottomRightRadius="10dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/et_bg.xml b/app/src/main/res/drawable/et_bg.xml
new file mode 100644
index 0000000..5514a47
--- /dev/null
+++ b/app/src/main/res/drawable/et_bg.xml
@@ -0,0 +1,8 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#FFFFFF" />
+    <stroke
+        android:width="2px"
+        android:color="@color/lightGray" />
+    <corners android:radius="@dimen/dp_8" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/joined_background.xml b/app/src/main/res/drawable/joined_background.xml
index b025032..184e579 100644
--- a/app/src/main/res/drawable/joined_background.xml
+++ b/app/src/main/res/drawable/joined_background.xml
@@ -3,7 +3,7 @@
     <!-- 内部颜色 -->
     <solid android:color="@color/lightGray" />
     <!-- 圆角的幅度 -->
-    <corners android:radius="16dp" />
+    <corners android:radius="@dimen/dp_8" />
 
     <padding
         android:bottom="0dp"
diff --git a/app/src/main/res/drawable/main_bg.xml b/app/src/main/res/drawable/main_bg.xml
new file mode 100644
index 0000000..b9fa409
--- /dev/null
+++ b/app/src/main/res/drawable/main_bg.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:angle="270"
+        android:endColor="#5f7ff0"
+        android:startColor="#9e6bfe"
+        android:type="linear" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/fragment_custom.xml b/app/src/main/res/layout-land/fragment_custom.xml
index 6bf77c8..8e67606 100644
--- a/app/src/main/res/layout-land/fragment_custom.xml
+++ b/app/src/main/res/layout-land/fragment_custom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.uiui.aios.view.CustomContent xmlns:android="http://schemas.android.com/apk/res/android"
+<com.uiuios.aios.view.CustomContent xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -101,7 +101,7 @@
                 android:layout_marginEnd="4dp"
                 android:layout_marginBottom="4dp"
                 android:layout_weight="3"
-                android:background="@drawable/custom_bg_clean"
+                android:background="@drawable/custom_bg_white"
                 tools:ignore="NestedWeights">
 
                 <TextView
@@ -111,7 +111,7 @@
                     android:layout_marginStart="8dp"
                     android:layout_marginTop="8dp"
                     android:text="一键加速"
-                    android:textColor="@color/white"
+                    android:textColor="@color/lightGray"
                     android:textSize="@dimen/sp_16"
                     android:textStyle="bold"
                     app:layout_constraintStart_toStartOf="parent"
@@ -136,7 +136,7 @@
                     app:cpvDuration="1000"
                     app:cpvLabelTextSize="26sp"
                     app:cpvProgressColor="#27602f"
-                    app:cpvLabelTextColor="@color/white"
+                    app:cpvLabelTextColor="@color/black"
                     app:cpvNormalColor="#c1d4c4"
                     app:cpvShowTick="false"
                     app:cpvStrokeWidth="@dimen/dp_8"
@@ -156,7 +156,7 @@
                 android:layout_marginEnd="8dp"
                 android:layout_marginBottom="4dp"
                 android:layout_weight="2"
-                android:background="@drawable/custom_bg_sos">
+                android:background="@drawable/custom_bg_white">
 
                 <TextView
                     android:id="@+id/textView7"
@@ -165,7 +165,7 @@
                     android:layout_marginStart="8dp"
                     android:layout_marginTop="8dp"
                     android:text="紧急呼叫"
-                    android:textColor="@color/white"
+                    android:textColor="@color/lightGray"
                     android:textSize="@dimen/sp_16"
                     android:textStyle="bold"
                     app:layout_constraintStart_toStartOf="parent"
@@ -354,7 +354,7 @@
                 android:layout_marginEnd="4dp"
                 android:layout_marginBottom="8dp"
                 android:layout_weight="1"
-                android:background="@drawable/custom_bg_contact">
+                android:background="@drawable/custom_bg_white">
 
                 <TextView
                     android:id="@+id/textView2"
@@ -363,7 +363,7 @@
                     android:layout_marginStart="8dp"
                     android:layout_marginTop="8dp"
                     android:text="通讯录"
-                    android:textColor="@color/white"
+                    android:textColor="@color/lightGray"
                     android:textSize="@dimen/sp_16"
                     android:textStyle="bold"
                     app:layout_constraintStart_toStartOf="parent"
@@ -399,7 +399,7 @@
                     android:layout_marginStart="8dp"
                     android:layout_marginTop="8dp"
                     android:text="应用市场"
-                    android:textColor="@color/white"
+                    android:textColor="@color/lightGray"
                     android:textSize="@dimen/sp_16"
                     android:textStyle="bold"
                     app:layout_constraintStart_toStartOf="parent"
@@ -434,7 +434,7 @@
                     android:layout_marginStart="8dp"
                     android:layout_marginTop="8dp"
                     android:text="AI问诊"
-                    android:textColor="@color/white"
+                    android:textColor="@color/lightGray"
                     android:textSize="@dimen/sp_16"
                     android:textStyle="bold"
                     app:layout_constraintStart_toStartOf="parent"
@@ -452,6 +452,40 @@
                     app:layout_constraintTop_toTopOf="parent" />
             </androidx.constraintlayout.widget.ConstraintLayout>
 
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/cl_exit"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_marginStart="4dp"
+                android:layout_marginTop="4dp"
+                android:layout_marginEnd="8dp"
+                android:layout_marginBottom="8dp"
+                android:layout_weight="1"
+                android:background="@drawable/custom_bg_ai">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginTop="8dp"
+                    android:text="切换系统"
+                    android:textColor="@color/lightGray"
+                    android:textSize="@dimen/sp_16"
+                    android:textStyle="bold"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <ImageView
+                    android:layout_width="@dimen/dp_68"
+                    android:layout_height="@dimen/dp_68"
+                    android:adjustViewBounds="true"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/app_exit"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </LinearLayout>
     </LinearLayout>
-</com.uiui.aios.view.CustomContent>
\ No newline at end of file
+</com.uiuios.aios.view.CustomContent>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/fragment_custom_back.xml b/app/src/main/res/layout-land/fragment_custom_back.xml
index fd9325d..b989012 100644
--- a/app/src/main/res/layout-land/fragment_custom_back.xml
+++ b/app/src/main/res/layout-land/fragment_custom_back.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.uiui.aios.view.CustomContent xmlns:android="http://schemas.android.com/apk/res/android"
+<com.uiuios.aios.view.CustomContent xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -419,4 +419,4 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
         </LinearLayout>
     </LinearLayout>
-</com.uiui.aios.view.CustomContent>
\ No newline at end of file
+</com.uiuios.aios.view.CustomContent>
\ No newline at end of file
diff --git a/app/src/main/res/layout-port/fragment_custom.xml b/app/src/main/res/layout-port/fragment_custom.xml
index a535d1c..2daeb53 100644
--- a/app/src/main/res/layout-port/fragment_custom.xml
+++ b/app/src/main/res/layout-port/fragment_custom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.uiui.aios.view.CustomContent xmlns:android="http://schemas.android.com/apk/res/android"
+<com.uiuios.aios.view.CustomContent xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -176,7 +176,7 @@
                     android:layout_marginEnd="@dimen/dp_4"
                     android:layout_marginBottom="@dimen/dp_2"
                     android:layout_weight="1"
-                    android:background="@drawable/custom_bg_sos">
+                    android:background="@drawable/custom_bg_white">
 
                     <TextView
                         android:id="@+id/textView7"
@@ -184,7 +184,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/dp_8"
                         android:text="紧急呼叫"
-                        android:textColor="@color/white"
+                        android:textColor="@color/lightGray"
                         android:textSize="@dimen/sp_17"
                         android:textStyle="bold"
                         app:layout_constraintBottom_toBottomOf="parent"
@@ -199,7 +199,7 @@
                         android:singleLine="true"
                         android:text="危险请按我"
                         android:layout_marginTop="@dimen/dp_2"
-                        android:textColor="@color/white"
+                        android:textColor="@color/lightGray"
                         app:layout_constraintStart_toStartOf="@+id/textView7"
                         app:layout_constraintTop_toBottomOf="@+id/textView7" />
 
@@ -235,7 +235,7 @@
                     android:layout_marginEnd="@dimen/dp_4"
                     android:layout_marginBottom="@dimen/dp_2"
                     android:layout_weight="1"
-                    android:background="@drawable/custom_bg_clean"
+                    android:background="@drawable/custom_bg_white"
                     tools:ignore="NestedWeights">
 
                     <TextView
@@ -244,7 +244,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/dp_8"
                         android:text="一键加速"
-                        android:textColor="@color/white"
+                        android:textColor="@color/lightGray"
                         android:textSize="@dimen/sp_17"
                         android:textStyle="bold"
                         app:layout_constraintBottom_toBottomOf="parent"
@@ -259,7 +259,7 @@
                         android:singleLine="true"
                         android:text="卡顿就按我"
                         android:layout_marginTop="@dimen/dp_2"
-                        android:textColor="@color/white"
+                        android:textColor="@color/lightGray"
                         app:layout_constraintStart_toStartOf="@+id/textView5"
                         app:layout_constraintTop_toBottomOf="@+id/textView5" />
 
@@ -282,7 +282,7 @@
                         android:layout_marginEnd="@dimen/dp_8"
                         app:cpvDuration="1000"
                         app:cpvLabelTextSize="26sp"
-                        app:cpvLabelTextColor="@color/white"
+                        app:cpvLabelTextColor="@color/black"
                         app:cpvProgressColor="#27602f"
                         app:cpvNormalColor="#c1d4c4"
                         app:cpvShowTick="false"
@@ -407,7 +407,7 @@
                 android:layout_marginEnd="@dimen/dp_2"
                 android:layout_marginBottom="@dimen/dp_4"
                 android:layout_weight="1"
-                android:background="@drawable/custom_bg_contact">
+                android:background="@drawable/custom_bg_white">
 
                 <TextView
                     android:id="@+id/textView2"
@@ -417,7 +417,7 @@
                     android:layout_marginTop="@dimen/dp_8"
                     android:layout_marginBottom="@dimen/dp_16"
                     android:text="通讯录"
-                    android:textColor="@color/white"
+                    android:textColor="@color/lightGray"
                     android:textSize="@dimen/sp_17"
                     android:textStyle="bold"
                     app:layout_constraintBottom_toBottomOf="parent"
@@ -445,7 +445,7 @@
                 android:layout_marginEnd="@dimen/dp_4"
                 android:layout_marginBottom="@dimen/dp_4"
                 android:layout_weight="1"
-                android:background="@drawable/custom_bg_ai"
+                android:background="@drawable/custom_bg_health"
                 android:visibility="gone">
 
                 <TextView
@@ -483,7 +483,7 @@
                 android:layout_marginEnd="@dimen/dp_4"
                 android:layout_marginBottom="@dimen/dp_4"
                 android:layout_weight="1"
-                android:background="@drawable/custom_bg_ai">
+                android:background="@drawable/custom_bg_health">
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -512,6 +512,44 @@
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/cl_exit"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_marginStart="@dimen/dp_2"
+                android:layout_marginTop="@dimen/dp_2"
+                android:layout_marginEnd="@dimen/dp_4"
+                android:layout_marginBottom="@dimen/dp_4"
+                android:layout_weight="1"
+                android:background="@drawable/custom_bg_health">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/dp_8"
+                    android:layout_marginTop="@dimen/dp_8"
+                    android:layout_marginBottom="@dimen/dp_16"
+                    android:text="切换系统"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/sp_17"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent" />
+
+                <ImageView
+                    android:layout_width="@dimen/dp_52"
+                    android:layout_height="@dimen/dp_52"
+                    android:adjustViewBounds="true"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/app_exit"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
         </LinearLayout>
     </LinearLayout>
-</com.uiui.aios.view.CustomContent>
\ No newline at end of file
+</com.uiuios.aios.view.CustomContent>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 812bc15..9738844 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@drawable/main_bg"
     tools:context=".activity.main.MainActivity">
 
     <androidx.viewpager.widget.ViewPager
diff --git a/app/src/main/res/layout/activity_notice.xml b/app/src/main/res/layout/activity_notice.xml
index 0162943..bee77c0 100644
--- a/app/src/main/res/layout/activity_notice.xml
+++ b/app/src/main/res/layout/activity_notice.xml
@@ -58,7 +58,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/cl_voice">
 
-        <com.uiui.aios.view.JzvdStdAssert
+        <com.uiuios.aios.view.JzvdStdAssert
             android:id="@+id/jz_video"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
diff --git a/app/src/main/res/layout/fragment_applist.xml b/app/src/main/res/layout/fragment_applist.xml
index cbb612c..458cfdd 100644
--- a/app/src/main/res/layout/fragment_applist.xml
+++ b/app/src/main/res/layout/fragment_applist.xml
@@ -6,11 +6,10 @@
     android:layout_height="match_parent"
     tools:context=".fragment.AppListFragment">
 
-    <com.uiui.aios.view.MyGridLayout
+    <com.uiuios.aios.view.MyGridLayout
         android:id="@+id/list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/colorPrimaryDark"
         android:orientation="vertical"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/item_actions.xml b/app/src/main/res/layout/item_actions.xml
index 02be38f..5f64bbe 100644
--- a/app/src/main/res/layout/item_actions.xml
+++ b/app/src/main/res/layout/item_actions.xml
@@ -17,6 +17,38 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
+        <ImageView
+            android:layout_width="2px"
+            android:layout_height="0dp"
+            android:background="@color/line_color"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+            android:layout_width="2px"
+            android:layout_height="0dp"
+            android:background="@color/line_color"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+            android:layout_width="0dp"
+            android:layout_height="2px"
+            android:background="@color/line_color"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+            android:layout_width="0dp"
+            android:layout_height="2px"
+            android:background="@color/line_color"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
         <ImageView
             android:id="@+id/iv"
             android:layout_width="@dimen/dp_48"
diff --git a/app/src/main/res/layout/item_alarm_clock.xml b/app/src/main/res/layout/item_alarm_clock.xml
index 877855b..856de9f 100644
--- a/app/src/main/res/layout/item_alarm_clock.xml
+++ b/app/src/main/res/layout/item_alarm_clock.xml
@@ -121,7 +121,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent">
 
-            <com.uiui.aios.view.JzvdStdRound
+            <com.uiuios.aios.view.JzvdStdRound
                 android:id="@+id/jz_video"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/password_dialog.xml b/app/src/main/res/layout/password_dialog.xml
new file mode 100644
index 0000000..b1bc34e
--- /dev/null
+++ b/app/src/main/res/layout/password_dialog.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="@dimen/dp_300"
+        android:layout_height="@dimen/dp_200"
+        android:layout_centerInParent="true"
+        android:background="@drawable/bg_dialog"
+        android:minWidth="@dimen/dp_240"
+        android:orientation="vertical"
+        android:paddingTop="@dimen/dp_8"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+
+        <LinearLayout
+            android:id="@+id/linearLayout2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_8"
+            android:gravity="center"
+            android:orientation="horizontal"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <ImageView
+                android:id="@+id/image"
+                android:layout_width="@dimen/dp_30"
+                android:layout_height="@dimen/dp_30"
+                android:layout_gravity="center"
+                android:layout_marginEnd="16dp"
+                android:maxWidth="@dimen/dp_80"
+                android:maxHeight="@dimen/dp_80"
+                android:visibility="gone" />
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center_vertical"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18"
+                android:textStyle="bold"
+                android:visibility="visible"
+                tools:text="请输入密码退出关怀系统" />
+        </LinearLayout>
+
+        <EditText
+            android:id="@+id/message"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_20"
+            android:layout_marginEnd="@dimen/dp_20"
+            android:gravity="center"
+            android:inputType="number"
+            android:lineSpacingExtra="@dimen/dp_3"
+            android:lineSpacingMultiplier="1.2"
+            android:maxLines="1"
+            android:background="@drawable/et_bg"
+            android:minHeight="@dimen/dp_32"
+            android:singleLine="true"
+            android:hint="请输入密码"
+            android:textColor="#999999"
+            android:textSize="@dimen/sp_14"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/linearLayout3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_20"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent">
+
+            <TextView
+                android:id="@+id/positive"
+                android:layout_width="@dimen/dp_64"
+                android:layout_height="@dimen/dp_28"
+                android:layout_weight="1"
+                android:background="@drawable/join_background"
+                android:gravity="center"
+                android:singleLine="true"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_14"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:text="确定" />
+
+            <TextView
+                android:id="@+id/negtive"
+                android:layout_width="@dimen/dp_64"
+                android:layout_height="@dimen/dp_28"
+                android:layout_marginStart="@dimen/dp_24"
+                android:layout_weight="1"
+                android:background="@drawable/joined_background"
+                android:gravity="center"
+                android:singleLine="true"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_14"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/positive"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_bias="0.0"
+                tools:text="取消" />
+
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 100d2b3..b26396a 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -15,7 +15,7 @@
     <color name="notice_blue">#0480FF</color>
     <color name="ok_button">#4D4B50</color>
     <color name="red">#FF0000</color>
-    <color name="actions_item_pressed">#424144</color>
+    <color name="actions_item_pressed">#4f1fdb</color>
     <color name="default_background_color">#8e6afb</color>
 
     <color name="voice_color">#00D56B</color>
@@ -28,5 +28,6 @@
     <color name="appstore_bg_color">#2c77ba</color>
 
     <color name="noti_color">#f4bea3</color>
+    <color name="line_color">#5d55b2</color>
 
 </resources>
diff --git a/app/src/test/java/com/uiui/aios/ExampleUnitTest.java b/app/src/test/java/com/uiuios/aios/ExampleUnitTest.java
similarity index 93%
rename from app/src/test/java/com/uiui/aios/ExampleUnitTest.java
rename to app/src/test/java/com/uiuios/aios/ExampleUnitTest.java
index ec22a89..65cb693 100644
--- a/app/src/test/java/com/uiui/aios/ExampleUnitTest.java
+++ b/app/src/test/java/com/uiuios/aios/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.uiui.aios;
+package com.uiuios.aios;
 
 import org.junit.Test;
 
diff --git a/app/tpns-configs.json b/app/tpns-configs.json
index b27cd81..04d6828 100644
--- a/app/tpns-configs.json
+++ b/app/tpns-configs.json
@@ -1,9 +1,9 @@
 {
     "tpns": {
-        "access_id": "1500030457",
-        "access_key": "AZZXANJF4HBD"
+        "access_id": "1580013523",
+        "access_key": "ASJ3MCYWCTTF"
     },
-    "com.uiui.aios": {
+    "com.uiuios.aios": {
         "channel": {
             "enable": true
         }