diff --git a/build.gradle b/build.gradle index 53ae0d1..56c322b 100644 --- a/build.gradle +++ b/build.gradle @@ -75,8 +75,8 @@ android { minSdkVersion 26 targetSdkVersion 28 - versionCode 203 - versionName "1.6.0526" + versionCode 204 + versionName "1.6.0711" ndk { //选择要添加的对应 cpu 类型的 .so 库。 diff --git a/res/drawable-hdpi/com_aoleyun_sn.png b/res/drawable-hdpi/com_aoleyun_sn.png deleted file mode 100644 index 86f4829..0000000 Binary files a/res/drawable-hdpi/com_aoleyun_sn.png and /dev/null differ diff --git a/res/drawable-hdpi/com_aoleyun_update.png b/res/drawable-hdpi/com_aoleyun_update.png index d0c9e8d..3083cc8 100644 Binary files a/res/drawable-hdpi/com_aoleyun_update.png and b/res/drawable-hdpi/com_aoleyun_update.png differ diff --git a/src/com/aoleyun/os/Launcher.java b/src/com/aoleyun/os/Launcher.java index d9a925e..e47439f 100644 --- a/src/com/aoleyun/os/Launcher.java +++ b/src/com/aoleyun/os/Launcher.java @@ -47,6 +47,7 @@ import android.os.Build; import android.os.Bundle; import android.os.Environment; import android.os.Handler; +import android.os.Looper; import android.os.Parcelable; import android.os.Process; import android.os.StrictMode; @@ -78,6 +79,7 @@ import com.aoleyun.os.allapps.AllAppsStore; import com.aoleyun.os.allapps.AllAppsTransitionController; import com.aoleyun.os.allapps.DiscoveryBounce; import com.aoleyun.os.anim.PropertyListBuilder; +import com.aoleyun.os.comm.CommonConfig; import com.aoleyun.os.compat.AppWidgetManagerCompat; import com.aoleyun.os.compat.LauncherAppsCompatVO; import com.aoleyun.os.config.FeatureFlags; @@ -203,6 +205,8 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, public static final String TAG = "Launcher"; static final boolean LOGD = false; + private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE); + static final boolean DEBUG_STRICT_MODE = false; private static final int REQUEST_CREATE_SHORTCUT = 1; @@ -1243,10 +1247,10 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, } private void removeRecentTask() { - Handler.getMain().postDelayed(new Runnable() { + new Handler(Looper.getMainLooper()).postDelayed(new Runnable() { @Override public void run() { - String ApplicationLock = MMKV.defaultMMKV().decodeString("ApplicationLock"); + String ApplicationLock = mMMKV.decodeString("ApplicationLock"); Type type = new TypeToken>() { }.getType(); Gson gson = new Gson(); diff --git a/src/com/aoleyun/os/disklrucache/CacheHelper.java b/src/com/aoleyun/os/disklrucache/CacheHelper.java index 2800dae..9e2976f 100644 --- a/src/com/aoleyun/os/disklrucache/CacheHelper.java +++ b/src/com/aoleyun/os/disklrucache/CacheHelper.java @@ -6,6 +6,7 @@ import android.graphics.drawable.Drawable; import android.os.Environment; import android.util.Log; +import com.aoleyun.os.comm.CommonConfig; import com.jakewharton.disklrucache.DiskLruCache; import com.tencent.mmkv.MMKV; @@ -30,7 +31,7 @@ import java.io.Serializable; public class CacheHelper { private static final String TAG = "DiskLruCacheHelper"; - private MMKV mMMKV = MMKV.defaultMMKV(); + private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE); private static final String DIR_NAME = "diskCache"; private static final int MAX_COUNT = 5 * 1024 * 1024; diff --git a/src/com/aoleyun/os/manager/ConnectManager.java b/src/com/aoleyun/os/manager/ConnectManager.java index 38c6a3d..4b594ca 100644 --- a/src/com/aoleyun/os/manager/ConnectManager.java +++ b/src/com/aoleyun/os/manager/ConnectManager.java @@ -4,6 +4,7 @@ import android.annotation.SuppressLint; import android.content.Context; import android.util.Log; +import com.aoleyun.os.comm.CommonConfig; import com.aoleyun.os.uiuiutils.TimeUtils; import com.tencent.mmkv.MMKV; @@ -33,7 +34,7 @@ public class ConnectManager { @SuppressLint("StaticFieldLeak") private static ConnectManager sInstance; private Context mContext; - private MMKV mMMKV = MMKV.defaultMMKV(); + private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE); private ConnectManager(Context context) { if (context == null) { diff --git a/src/com/aoleyun/os/network/NetInterfaceManager.java b/src/com/aoleyun/os/network/NetInterfaceManager.java index 82e929f..438e55f 100644 --- a/src/com/aoleyun/os/network/NetInterfaceManager.java +++ b/src/com/aoleyun/os/network/NetInterfaceManager.java @@ -5,6 +5,7 @@ import android.content.Context; import android.text.TextUtils; import android.util.Log; +import com.aoleyun.os.comm.CommonConfig; import com.aoleyun.os.disklrucache.CacheHelper; import com.aoleyun.os.manager.ConnectManager; import com.aoleyun.os.manager.ConnectMode; @@ -54,7 +55,7 @@ public class NetInterfaceManager { private Context mContext; private Retrofit mRetrofit; private OkHttpClient okHttpClient; - private MMKV mMMKV = MMKV.defaultMMKV(); + private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE); private CacheHelper cacheHelper; //超时时间 @@ -267,10 +268,10 @@ public class NetInterfaceManager { if (listBaseResponse.code == 200) { List beanList = listBaseResponse.data; String jsonString = JsonParser.parseString(new Gson().toJson(beanList)).getAsJsonArray().toString(); - MMKV.defaultMMKV().encode("ApplicationLock", jsonString); + mMMKV.encode("ApplicationLock", jsonString); Log.e("getAppPasswd", "onNext: " + jsonString); } else { - MMKV.defaultMMKV().encode("ApplicationLock", ""); + mMMKV.remove("ApplicationLock"); } } diff --git a/src/com/aoleyun/os/touch/ItemClickHandler.java b/src/com/aoleyun/os/touch/ItemClickHandler.java index 72b646f..b1337d3 100644 --- a/src/com/aoleyun/os/touch/ItemClickHandler.java +++ b/src/com/aoleyun/os/touch/ItemClickHandler.java @@ -44,6 +44,7 @@ import com.aoleyun.os.ItemInfo; import com.aoleyun.os.Launcher; import com.aoleyun.os.LauncherAppWidgetInfo; import com.aoleyun.os.LauncherAppWidgetProviderInfo; +import com.aoleyun.os.comm.CommonConfig; import com.aoleyun.os.uiuiutils.CustomDialog; import com.aoleyun.os.uiuiutils.JgyUtils; import com.hjq.toast.Toaster; @@ -72,6 +73,7 @@ import java.util.List; * Class for handling clicks on workspace and all-apps items */ public class ItemClickHandler { + private static MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE); /** * Instance used for click handling on items @@ -113,7 +115,7 @@ public class ItemClickHandler { return; } //获取本地密码 - String ApplicationLock = MMKV.defaultMMKV().decodeString("ApplicationLock"); + String ApplicationLock = mMMKV.decodeString("ApplicationLock"); Log.e("onClick", "onClick: " + ApplicationLock); Type type = new TypeToken>() { }.getType();