diff --git a/build.gradle b/build.gradle index 2759314..816d051 100644 --- a/build.gradle +++ b/build.gradle @@ -71,8 +71,8 @@ android { // versionName "2.3.9" //cube - versionCode 115 - versionName "1.4.0319" + versionCode 126 + versionName "1.4.0428" ndk { //选择要添加的对应 cpu 类型的 .so 库。 @@ -135,7 +135,7 @@ android { v2SigningEnabled false } - zhanruiG10Z{ + zhanruiG10Z { storeFile file("keystore/zhanruiG10Z.keystore") storePassword "123456" keyAlias "zhanruiG10Z" @@ -169,9 +169,32 @@ android { keyPassword "123456" v2SigningEnabled false } + + Huaruian8768 { + storeFile file("keystore/Huaruian8768.jks") + storePassword "123456" + keyAlias "Huaruian8768" + keyPassword "123456" + v1SigningEnabled true + v2SigningEnabled true + } } buildTypes { + Huaruian8768Debug.initWith(debug) + Huaruian8768Debug { + versionNameSuffix "-debug" + debuggable true + signingConfig signingConfigs.Huaruian8768 + buildConfigField "String", "platform", '"MT8768"' + } + + Huaruian8768Release.initWith(release) + Huaruian8768Release { + signingConfig signingConfigs.Huaruian8768 + buildConfigField "String", "platform", '"MT8768"' + } + G11Debug.initWith(debug) G11Debug { versionNameSuffix "-debug" @@ -182,7 +205,7 @@ android { G11Release.initWith(release) G11Release { - signingConfig signingConfigs.G10P + signingConfig signingConfigs.G11Userdebug buildConfigField "String", "platform", '"MTKG11"' } diff --git a/iconloaderlib/build.gradle b/iconloaderlib/build.gradle index ba434f1..49f5098 100644 --- a/iconloaderlib/build.gradle +++ b/iconloaderlib/build.gradle @@ -13,6 +13,8 @@ android { } buildTypes { + Huaruian8768Debug {} + Huaruian8768Release {} G11Debug {} G11Release {} YXPD1Debug {} diff --git a/keystore/Huaruian8768.jks b/keystore/Huaruian8768.jks new file mode 100644 index 0000000..80bf674 Binary files /dev/null and b/keystore/Huaruian8768.jks differ diff --git a/src/com/aoleyun/os/Launcher.java b/src/com/aoleyun/os/Launcher.java index 2ec56bc..f10cff7 100644 --- a/src/com/aoleyun/os/Launcher.java +++ b/src/com/aoleyun/os/Launcher.java @@ -337,8 +337,6 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, private DeviceProfile mStableDeviceProfile; private RotationMode mRotationMode = RotationMode.NORMAL; - public static boolean isForeground = false; - @Override protected void onCreate(Bundle savedInstanceState) { RaceConditionTracker.onEvent(ON_CREATE_EVT, ENTER); @@ -545,6 +543,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, } private void SetWallPaper() { + Log.e(TAG, "SetWallPaper: "); //利用WallpaparManager,添加权限set_wallpaper WallpaperManager wallpaperManager = WallpaperManager.getInstance(this); try { @@ -1277,7 +1276,6 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, RaceConditionTracker.onEvent(ON_RESUME_EVT, EXIT); Log.e(TAG, "onResume: "); - isForeground = true; /*打开霸屏应用*/ String always_top_packagename = Settings.System.getString(getContentResolver(), "always_top_packagename"); if (!TextUtils.isEmpty(always_top_packagename)) { @@ -1481,7 +1479,6 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, if (mLauncherCallbacks != null) { mLauncherCallbacks.onPause(); } - isForeground = false; } @Override diff --git a/src/com/aoleyun/os/model/LoaderTask.java b/src/com/aoleyun/os/model/LoaderTask.java index 0bcd17f..521cda1 100644 --- a/src/com/aoleyun/os/model/LoaderTask.java +++ b/src/com/aoleyun/os/model/LoaderTask.java @@ -255,7 +255,7 @@ public class LoaderTask implements Runnable { /** * 需要隐藏的图标 */ - private HashSet hideApp = new HashSet() {{ + private static final HashSet hideApp = new HashSet() {{ this.add(BuildConfig.APPLICATION_ID); this.add("com.android.quicksearchbox"); this.add("com.st.nfc.dta.mobile"); @@ -263,12 +263,13 @@ public class LoaderTask implements Runnable { this.add("com.mediatek.factorymode"); this.add("org.chromium.browser"); this.add("com.android.email"); + this.add("com.android.soundrecorder"); }}; /** * 系统应用只显示这几个 */ - public static HashSet showApp = new HashSet() {{ + public static final HashSet showApp = new HashSet() {{ // this.add(BuildConfig.APPLICATION_ID); //aoleyun this.add("com.aoleyun.sn"); @@ -337,18 +338,18 @@ public class LoaderTask implements Runnable { /*系统应用*/ if (JGYUtils.getInstance().getDeviceIsLocked() && aihuaUnlock != 1) { if ((app.getApplicationFlags() & ApplicationInfo.FLAG_SYSTEM) == 1) { - if (!showApp.contains(app.getApplicationInfo().packageName)) { + if (hideApp.contains(app.getApplicationInfo().packageName)) { Log.e("verifyApplications", "skip1: " + app.getApplicationInfo().packageName); continue; } } else { if (TextUtils.isEmpty(whiteList)) { - if (!showApp.contains(app.getApplicationInfo().packageName)) { + if (hideApp.contains(app.getApplicationInfo().packageName)) { Log.e("verifyApplications", "skip2: " + app.getApplicationInfo().packageName); continue; } } else if (!whiteList.contains(app.getApplicationInfo().packageName)) { - if (!showApp.contains(app.getApplicationInfo().packageName)) { + if (hideApp.contains(app.getApplicationInfo().packageName)) { Log.e("verifyApplications", "skip3: " + app.getApplicationInfo().packageName); continue; } diff --git a/src/com/aoleyun/os/touch/ItemClickHandler.java b/src/com/aoleyun/os/touch/ItemClickHandler.java index 4e2191a..e1addb9 100644 --- a/src/com/aoleyun/os/touch/ItemClickHandler.java +++ b/src/com/aoleyun/os/touch/ItemClickHandler.java @@ -246,15 +246,6 @@ public class ItemClickHandler { return false; } - public static String[] packages = { - "com.appstore.uiui", - "com.uiuios.updatetools", - "com.info.sn", - "com.android.uiuios", - "com.easyold.uiuios", - "com.jiaoguanyi.store" - }; - /** * Event handler for a folder icon click. *