From d83f1544767fed7a4c08b398c0f41cb211e592a7 Mon Sep 17 00:00:00 2001 From: tongtongstudio Date: Tue, 27 May 2025 16:40:53 +0800 Subject: [PATCH] =?UTF-8?q?1.5.0522=20=E5=A2=9E=E5=8A=A0=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E5=8D=B8=E8=BD=BD=E5=92=8C=E9=9A=90=E8=97=8F=E7=9B=91=E5=90=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AndroidManifest-common.xml | 40 ++++--- build.gradle | 73 +++++++++++- iconloaderlib/build.gradle | 6 + keystore/P50TD.jks | Bin 0 -> 2685 bytes keystore/T40Air.jks | Bin 0 -> 2354 bytes keystore/aiud.keystore | Bin 0 -> 3982 bytes src/com/aoleyun/os/AppFilter.java | 4 + src/com/aoleyun/os/ButtonDropTarget.java | 5 +- src/com/aoleyun/os/DeleteDropTarget.java | 3 - src/com/aoleyun/os/Launcher.java | 23 ++-- src/com/aoleyun/os/base/BaseApplication.java | 4 +- src/com/aoleyun/os/folder/Folder.java | 4 +- src/com/aoleyun/os/model/LoaderTask.java | 71 +++++++++--- .../aoleyun/os/model/PackageUpdatedTask.java | 12 +- .../os/network/NetInterfaceManager.java | 48 ++++---- .../aoleyun/os/receiver/NewAppReceiver.java | 54 +++++++++ .../aoleyun/os/touch/ItemClickHandler.java | 10 +- src/com/aoleyun/os/uiuiutils/ApkUtils.java | 23 ++++ .../{JGYUtils.java => JgyUtils.java} | 107 +++++++++++++++--- .../os/shortcuts/DeepShortcutManager.java | 1 - 20 files changed, 384 insertions(+), 104 deletions(-) create mode 100644 keystore/P50TD.jks create mode 100644 keystore/T40Air.jks create mode 100644 keystore/aiud.keystore create mode 100644 src/com/aoleyun/os/receiver/NewAppReceiver.java rename src/com/aoleyun/os/uiuiutils/{JGYUtils.java => JgyUtils.java} (66%) diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml index a1afe87..f739445 100644 --- a/AndroidManifest-common.xml +++ b/AndroidManifest-common.xml @@ -79,8 +79,8 @@ @@ -102,27 +102,41 @@ - + - + + + + + + + + + + + @@ -136,7 +150,7 @@ android:value="true" /> @@ -181,7 +195,7 @@ The settings activity. To extend point settings_fragment_name to appropriate fragment class --> @@ -192,7 +206,7 @@ K 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 literal 0 HcmV?d00001 diff --git a/keystore/T40Air.jks b/keystore/T40Air.jks new file mode 100644 index 0000000000000000000000000000000000000000..04a061ac217c81e9c9f8e8af303bcc96a513d052 GIT binary patch literal 2354 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 literal 0 HcmV?d00001 diff --git a/keystore/aiud.keystore b/keystore/aiud.keystore new file mode 100644 index 0000000000000000000000000000000000000000..5ac03d9ef93c0ba88335302c1ff2c60f91842bbc GIT binary patch literal 3982 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 literal 0 HcmV?d00001 diff --git a/src/com/aoleyun/os/AppFilter.java b/src/com/aoleyun/os/AppFilter.java index 39d8a4e..f1e2dd0 100644 --- a/src/com/aoleyun/os/AppFilter.java +++ b/src/com/aoleyun/os/AppFilter.java @@ -4,6 +4,7 @@ import android.content.ComponentName; import android.content.Context; import com.aoleyun.os.R; +import com.aoleyun.os.model.LoaderTask; import com.aoleyun.os.util.ResourceBasedOverride; public class AppFilter implements ResourceBasedOverride { @@ -13,6 +14,9 @@ public class AppFilter implements ResourceBasedOverride { } public boolean shouldShowApp(ComponentName app) { + if (LoaderTask.SYSTEM_HIDE_APP.contains(app.getPackageName())) { + return false; + } return true; } } diff --git a/src/com/aoleyun/os/ButtonDropTarget.java b/src/com/aoleyun/os/ButtonDropTarget.java index e8eb260..6761c7d 100644 --- a/src/com/aoleyun/os/ButtonDropTarget.java +++ b/src/com/aoleyun/os/ButtonDropTarget.java @@ -41,13 +41,12 @@ import android.view.accessibility.AccessibilityEvent; import android.widget.PopupWindow; import android.widget.TextView; -import com.aoleyun.os.R; import com.aoleyun.os.anim.Interpolators; import com.aoleyun.os.dragndrop.DragController; import com.aoleyun.os.dragndrop.DragLayer; import com.aoleyun.os.dragndrop.DragOptions; import com.aoleyun.os.dragndrop.DragView; -import com.aoleyun.os.uiuiutils.JGYUtils; +import com.aoleyun.os.uiuiutils.JgyUtils; import com.aoleyun.os.userevent.nano.LauncherLogProto.Target; import com.aoleyun.os.util.Themes; import com.aoleyun.os.util.Thunk; @@ -249,7 +248,7 @@ public abstract class ButtonDropTarget extends TextView if (intent != null) { String pkg = intent.getComponent().getPackageName(); Log.e("beginDrag", "beginDrag: " + pkg); - if (JGYUtils.getInstance().isEnforceApp(pkg)) { + if (JgyUtils.getInstance().isEnforceApp(pkg)) { mActive = false; } } diff --git a/src/com/aoleyun/os/DeleteDropTarget.java b/src/com/aoleyun/os/DeleteDropTarget.java index af1c07a..94b3355 100644 --- a/src/com/aoleyun/os/DeleteDropTarget.java +++ b/src/com/aoleyun/os/DeleteDropTarget.java @@ -22,15 +22,12 @@ import static com.aoleyun.os.userevent.nano.LauncherLogProto.ControlType.UNDO; import android.content.Context; import android.text.TextUtils; import android.util.AttributeSet; -import android.util.Log; import android.view.View; -import com.aoleyun.os.R; import com.aoleyun.os.accessibility.LauncherAccessibilityDelegate; import com.aoleyun.os.dragndrop.DragOptions; import com.aoleyun.os.logging.LoggerUtils; import com.aoleyun.os.model.ModelWriter; -import com.aoleyun.os.uiuiutils.JGYUtils; import com.aoleyun.os.userevent.nano.LauncherLogProto.ControlType; import com.aoleyun.os.userevent.nano.LauncherLogProto.Target; diff --git a/src/com/aoleyun/os/Launcher.java b/src/com/aoleyun/os/Launcher.java index 3677bd1..8906929 100644 --- a/src/com/aoleyun/os/Launcher.java +++ b/src/com/aoleyun/os/Launcher.java @@ -115,7 +115,7 @@ import com.aoleyun.os.testing.TestProtocol; import com.aoleyun.os.touch.ItemClickHandler; import com.aoleyun.os.uioverrides.UiFactory; import com.aoleyun.os.uiuiutils.ApkUtils; -import com.aoleyun.os.uiuiutils.JGYUtils; +import com.aoleyun.os.uiuiutils.JgyUtils; import com.aoleyun.os.uiuiutils.TimeUtils; import com.aoleyun.os.uiuiutils.Utils; import com.aoleyun.os.userevent.nano.LauncherLogProto; @@ -470,8 +470,8 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, } } }); - JGYUtils.getInstance().wakeUpAppstore(); - JGYUtils.getInstance().wakeUpDeviceInfo(); + JgyUtils.getInstance().wakeUpAppstore(); + JgyUtils.getInstance().wakeUpDeviceInfo(); } private void SetWallPaper() { @@ -479,7 +479,9 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, //利用WallpaparManager,添加权限set_wallpaper WallpaperManager wallpaperManager = WallpaperManager.getInstance(this); try { - if ("Aiud_A8_ag_1095".equals(Build.MODEL)) { + if ("Aiud_A8_ag_1095".equals(Build.MODEL) + ||JgyUtils.getInstance().checkAppPlatform() == JgyUtils.seewoPlatform + ) { wallpaperManager.setBitmap(BitmapFactory.decodeResource(getResources(), R.drawable.wallpapers_aiudu)); }else { wallpaperManager.setBitmap(BitmapFactory.decodeResource(getResources(), R.drawable.wallpapers)); @@ -551,7 +553,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, UserHandle user = Process.myUserHandle(); Log.i("settingssssssstemf", (add ? "Adding" : "Removing") + " package as role holder, role: " + roleName + ", package: " + packageName); - if (JGYUtils.getInstance().checkAppPlatform() != JGYUtils.MTKPlatform) { + if (JgyUtils.getInstance().checkAppPlatform() != JgyUtils.MTKPlatform) { RoleManager roleManager = context.getSystemService(RoleManager.class); Executor executor = context.getMainExecutor(); Consumer callback = successful -> { @@ -1225,17 +1227,18 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, mPasswd.getPassword(System.currentTimeMillis()); TimeUtils.getInstance().setAppPackageName(BuildConfig.APPLICATION_ID); HTTPInterface.sendRunningApp(Launcher.this); - JGYUtils.getInstance().wakeUpAppstore(); - JGYUtils.getInstance().wakeUpDeviceInfo(); + JgyUtils.getInstance().wakeUpAppstore(); + JgyUtils.getInstance().wakeUpDeviceInfo(); checkIsRest(); + JgyUtils.getInstance().checkAoleyunApp(); } private void checkIsRest() { int desktop_clear = Settings.Global.getInt(getContentResolver(), "desktop_clear", 0); int aihuaUnlock = Settings.Global.getInt(getContentResolver(), "Aihua_unlock_state", 0); - if ((!JGYUtils.getInstance().getDeviceIsLocked() || aihuaUnlock == 1) && desktop_clear != 1) { + if ((!JgyUtils.getInstance().getDeviceIsLocked() || aihuaUnlock == 1) && desktop_clear != 1) { Settings.Global.putInt(getContentResolver(), "desktop_clear", 1); - JGYUtils.getInstance().cleanAoleLauncher3Cache(); + JgyUtils.getInstance().cleanAoleLauncher3Cache(); } } @@ -1337,7 +1340,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, .getCheckUpdateObservable() .getCheckUpdate(BuildConfig.APPLICATION_ID, BuildConfig.VERSION_CODE, - JGYUtils.getInstance().checkAppPlatform()) + JgyUtils.getInstance().checkAppPlatform()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer>() { diff --git a/src/com/aoleyun/os/base/BaseApplication.java b/src/com/aoleyun/os/base/BaseApplication.java index 2a7b930..98ca544 100644 --- a/src/com/aoleyun/os/base/BaseApplication.java +++ b/src/com/aoleyun/os/base/BaseApplication.java @@ -5,7 +5,7 @@ import android.util.Log; import com.aoleyun.os.manager.ConnectManager; import com.aoleyun.os.network.NetInterfaceManager; -import com.aoleyun.os.uiuiutils.JGYUtils; +import com.aoleyun.os.uiuiutils.JgyUtils; import com.aoleyun.os.uiuiutils.TimeUtils; import com.arialyy.aria.core.Aria; import com.hjq.toast.Toaster; @@ -20,7 +20,7 @@ public class BaseApplication extends Application { String rootDir = MMKV.initialize(this); Log.e(TAG, "onCreate: " + rootDir); - JGYUtils.init(this); + JgyUtils.init(this); TimeUtils.init(this); Aria.init(this); NetInterfaceManager.init(this); diff --git a/src/com/aoleyun/os/folder/Folder.java b/src/com/aoleyun/os/folder/Folder.java index 8029a47..39f5b95 100644 --- a/src/com/aoleyun/os/folder/Folder.java +++ b/src/com/aoleyun/os/folder/Folder.java @@ -535,7 +535,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo * is played. */ public void animateOpen() { - Bitmap bm = blur(getWallpaperBg()); +// Bitmap bm = blur(getWallpaperBg()); Folder openFolder = getOpen(mLauncher); if (openFolder != null && openFolder != this) { // Close any open folder before opening a folder. @@ -545,7 +545,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo mIsOpen = true; DragLayer dragLayer = mLauncher.getDragLayer(); - dragLayer.setBackground(new BitmapDrawable(bm)); +// dragLayer.setBackground(new BitmapDrawable(bm)); // Just verify that the folder hasn't already been added to the DragLayer. // There was a one-off crash where the folder had a parent already. if (getParent() == null) { diff --git a/src/com/aoleyun/os/model/LoaderTask.java b/src/com/aoleyun/os/model/LoaderTask.java index e38b3b3..6c423d8 100644 --- a/src/com/aoleyun/os/model/LoaderTask.java +++ b/src/com/aoleyun/os/model/LoaderTask.java @@ -37,7 +37,6 @@ import android.os.Handler; import android.os.Process; import android.os.UserHandle; import android.provider.Settings; -import android.provider.SettingsValidators; import android.text.TextUtils; import android.util.Log; import android.util.LongSparseArray; @@ -75,7 +74,7 @@ import com.aoleyun.os.logging.FileLog; import com.aoleyun.os.provider.ImportDataTask; import com.aoleyun.os.shortcuts.DeepShortcutManager; import com.aoleyun.os.shortcuts.ShortcutKey; -import com.aoleyun.os.uiuiutils.JGYUtils; +import com.aoleyun.os.uiuiutils.JgyUtils; import com.aoleyun.os.util.ComponentKey; import com.aoleyun.os.util.LooperIdleLock; import com.aoleyun.os.util.MultiHashMap; @@ -265,6 +264,9 @@ public class LoaderTask implements Runnable { this.add("org.chromium.browser"); this.add("com.android.email"); this.add("com.android.soundrecorder"); + this.add("com.elink.autotest"); + this.add("com.emdoor.pressure.tester"); + this.add("emdoor.digit.tester"); }}; /*爱优读需要隐藏的图标*/ @@ -289,7 +291,7 @@ public class LoaderTask implements Runnable { /** * 系统应用只显示这几个 */ - public static final HashSet showApp = new HashSet() {{ + public static final HashSet SYSTEM_FORCE_APP = new HashSet() {{ // this.add(BuildConfig.APPLICATION_ID); //aoleyun this.add("com.aoleyun.sn"); @@ -335,6 +337,27 @@ public class LoaderTask implements Runnable { this.add("com.tongyi.aistudent"); }}; + public static final HashSet SYSTEM_HIDE_APP = new HashSet() {{ + this.add("com.android.browser"); + this.add("com.android.calendar"); + this.add("com.android.contacts"); + this.add("com.android.dialer"); + this.add("com.android.gallery3d"); + this.add("com.android.mms"); + this.add("com.android.music"); + this.add("com.android.documentsui"); + this.add("com.android.fmradio"); + this.add("com.android.inputmethod.latin"); + this.add("com.android.stk"); + + this.add("com.eduyun.app.factory.ykt"); + this.add("com.huawei.appmarket"); + this.add("com.qiyi.video"); + this.add("com.ss.android.ugc.aweme"); + this.add("com.tencent.mm"); + }}; + + //add for load all app on workspace private void verifyApplications() { final Context context = mApp.getContext(); @@ -350,27 +373,36 @@ public class LoaderTask implements Runnable { ArrayList added = new ArrayList(); synchronized (this) { for (LauncherActivityInfo app : apps) { - Log.e("verifyApplications", "AllAPP: " + app.getApplicationInfo().packageName); - if (BuildConfig.APPLICATION_ID.equals(app.getApplicationInfo().packageName) -// || "com.ygyb.yischool".equals(app.getApplicationInfo().packageName) - ) + String packageNmae = app.getApplicationInfo().packageName; + if (BuildConfig.APPLICATION_ID.equals(packageNmae) + || "com.aoleyun.ailog".equals(packageNmae) + ) { continue; + } + if (SYSTEM_HIDE_APP.contains(packageNmae)) { + continue; + } /*系统应用*/ - if (JGYUtils.getInstance().getDeviceIsLocked() && aihuaUnlock != 1) { + if (JgyUtils.getInstance().getDeviceIsLocked() && aihuaUnlock != 1) { if ((app.getApplicationFlags() & ApplicationInfo.FLAG_SYSTEM) == 1) { - if (hideApp.contains(app.getApplicationInfo().packageName)) { - Log.e("verifyApplications", "skip1: " + app.getApplicationInfo().packageName); + Log.e("verifyApplications", "AllAPP system: " + app.getApplicationInfo().packageName); + + if (hideApp.contains(packageNmae)) { + Log.e("verifyApplications", "skip1: " + packageNmae); continue; } + } else { + Log.e("verifyApplications", "AllAPP user: " + app.getApplicationInfo().packageName); + if (TextUtils.isEmpty(whiteList)) { - if (hideApp.contains(app.getApplicationInfo().packageName)) { - Log.e("verifyApplications", "skip2: " + app.getApplicationInfo().packageName); + if (hideApp.contains(packageNmae)) { + Log.e("verifyApplications", "skip2: " + packageNmae); continue; } - } else if (!whiteList.contains(app.getApplicationInfo().packageName)) { - if (hideApp.contains(app.getApplicationInfo().packageName)) { - Log.e("verifyApplications", "skip3: " + app.getApplicationInfo().packageName); + } else if (!whiteList.contains(packageNmae)) { + if (hideApp.contains(packageNmae)) { + Log.e("verifyApplications", "skip3: " + packageNmae); continue; } } @@ -378,15 +410,15 @@ public class LoaderTask implements Runnable { } if ("Aiud_A8_ag_1095".equals(Build.MODEL)) { - if (AiudHideApp.contains(app.getApplicationInfo().packageName)) { + if (AiudHideApp.contains(packageNmae)) { continue; } - if ("com.aoleyun.sn".equals(app.getApplicationInfo().packageName) && "com.aoleyun.sn.activity.CleanupActivity".equals(app.getComponentName().getClassName())) { + if ("com.aoleyun.sn".equals(packageNmae) && "com.aoleyun.sn.activity.CleanupActivity".equals(app.getComponentName().getClassName())) { continue; } } - Log.e("verifyApplications", "AddApp: " + app.getApplicationInfo().packageName); + Log.e("verifyApplications", "AddApp: " + packageNmae); Log.e("verifyApplications", "AddApp: " + app.getApplicationInfo().classLoaderName); InstallShortcutReceiver.PendingInstallShortcutInfo pendingInstallShortcutInfo = new InstallShortcutReceiver.PendingInstallShortcutInfo(app, context); added.add(pendingInstallShortcutInfo); @@ -972,6 +1004,9 @@ public class LoaderTask implements Runnable { for (int i = 0; i < apps.size(); i++) { LauncherActivityInfo app = apps.get(i); // This builds the icon bitmaps. + if (SYSTEM_HIDE_APP.contains(app.getComponentName().getPackageName())) { + continue; + } mBgAllAppsList.add(new AppInfo(app, user, quietMode), app); } allActivityList.addAll(apps); diff --git a/src/com/aoleyun/os/model/PackageUpdatedTask.java b/src/com/aoleyun/os/model/PackageUpdatedTask.java index 59b5d8d..6126fbe 100644 --- a/src/com/aoleyun/os/model/PackageUpdatedTask.java +++ b/src/com/aoleyun/os/model/PackageUpdatedTask.java @@ -45,7 +45,7 @@ import com.aoleyun.os.icons.BitmapInfo; import com.aoleyun.os.icons.LauncherIcons; import com.aoleyun.os.logging.FileLog; import com.aoleyun.os.shortcuts.DeepShortcutManager; -import com.aoleyun.os.uiuiutils.JGYUtils; +import com.aoleyun.os.uiuiutils.JgyUtils; import com.aoleyun.os.util.FlagOp; import com.aoleyun.os.util.IntSparseArrayMap; import com.aoleyun.os.util.ItemInfoMatcher; @@ -105,7 +105,7 @@ public class PackageUpdatedTask extends BaseModelUpdateTask { case OP_ADD: { for (int i = 0; i < N; i++) { if (DEBUG) Log.e(TAG, "mAllAppsList.addPackage " + packages[i]); - if (JGYUtils.getInstance().getDeviceIsLocked()) { + if (JgyUtils.getInstance().getDeviceIsLocked()) { if (hideAppList.contains(packages[i])) continue; } iconCache.updateIconsForPkg(packages[i], mUser); @@ -125,9 +125,11 @@ public class PackageUpdatedTask extends BaseModelUpdateTask { case OP_UPDATE: for (int i = 0; i < N; i++) { if (DEBUG) Log.e(TAG, "mAllAppsList.updatePackage " + packages[i]); - iconCache.updateIconsForPkg(packages[i], mUser); - appsList.updatePackage(context, packages[i], mUser); - app.getWidgetCache().removePackage(packages[i], mUser); + if (!LoaderTask.SYSTEM_HIDE_APP.contains(packages[i])) { + iconCache.updateIconsForPkg(packages[i], mUser); + appsList.updatePackage(context, packages[i], mUser); + app.getWidgetCache().removePackage(packages[i], mUser); + } } // Since package was just updated, the target must be available now. flagOp = FlagOp.removeFlag(WorkspaceItemInfo.FLAG_DISABLED_NOT_AVAILABLE); diff --git a/src/com/aoleyun/os/network/NetInterfaceManager.java b/src/com/aoleyun/os/network/NetInterfaceManager.java index fe68b0a..815fc0c 100644 --- a/src/com/aoleyun/os/network/NetInterfaceManager.java +++ b/src/com/aoleyun/os/network/NetInterfaceManager.java @@ -19,13 +19,11 @@ import com.aoleyun.os.network.bean.AppPasswdBean; import com.aoleyun.os.network.bean.BaseResponse; import com.aoleyun.os.network.bean.Batch; import com.aoleyun.os.network.interceptor.RepeatRequestInterceptor; -import com.aoleyun.os.uiuiutils.JGYUtils; +import com.aoleyun.os.uiuiutils.JgyUtils; import com.aoleyun.os.uiuiutils.Utils; import com.tencent.mmkv.MMKV; import java.io.File; -import java.util.ArrayList; -import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -179,29 +177,31 @@ public class NetInterfaceManager { public void setPushTag(onCompleteCallback callback) { Set set = new HashSet(); - JGYUtils.getInstance().getAppPlatform(new JGYUtils.GetAppPlatformCallback() { + JgyUtils.getInstance().getAppPlatform(new JgyUtils.GetAppPlatformCallback() { @Override public void AppPlatform(int platform) { - if (platform == JGYUtils.MTKPlatform) { - set.add(JGYUtils.MTKTag); - } else if (platform == JGYUtils.ZhanruiPlatform) { - set.add(JGYUtils.ZhanruiTag); - } else if (platform == JGYUtils.CubePlatform) { - set.add(JGYUtils.CubeTag); - } else if (platform == JGYUtils.MTK11Platform) { - set.add(JGYUtils.MTK11Tag); - } else if (platform == JGYUtils.TeclastP20sPlatform) { - set.add(JGYUtils.TeclastP20sTag); - } else if (platform == JGYUtils.AH6016Platform) { - set.add(JGYUtils.AH6016Tag); - } else if (platform == JGYUtils.ZR6016Platform) { - set.add(JGYUtils.ZR6016Tag); - } else if (platform == JGYUtils.G10PPlatform) { - set.add(JGYUtils.G10PTag); - } else if (platform == JGYUtils.C2Platform) { - set.add(JGYUtils.C2Tag); - } else if (platform == JGYUtils.AUDG104Platform) { - set.add(JGYUtils.AUDG104Tag); + if (platform == JgyUtils.MTKPlatform) { + set.add(JgyUtils.MTKTag); + } else if (platform == JgyUtils.ZhanruiPlatform) { + set.add(JgyUtils.ZhanruiTag); + } else if (platform == JgyUtils.CubePlatform) { + set.add(JgyUtils.CubeTag); + } else if (platform == JgyUtils.MTK11Platform) { + set.add(JgyUtils.MTK11Tag); + } else if (platform == JgyUtils.TeclastP20sPlatform) { + set.add(JgyUtils.TeclastP20sTag); + } else if (platform == JgyUtils.AH6016Platform) { + set.add(JgyUtils.AH6016Tag); + } else if (platform == JgyUtils.ZR6016Platform) { + set.add(JgyUtils.ZR6016Tag); + } else if (platform == JgyUtils.G10PPlatform) { + set.add(JgyUtils.G10PTag); + } else if (platform == JgyUtils.C2Platform) { + set.add(JgyUtils.C2Tag); + } else if (platform == JgyUtils.AUDG104Platform) { + set.add(JgyUtils.AUDG104Tag); + } else if (platform == JgyUtils.seewoPlatform) { + set.add(JgyUtils.seewoTag); } } }); diff --git a/src/com/aoleyun/os/receiver/NewAppReceiver.java b/src/com/aoleyun/os/receiver/NewAppReceiver.java new file mode 100644 index 0000000..db51a48 --- /dev/null +++ b/src/com/aoleyun/os/receiver/NewAppReceiver.java @@ -0,0 +1,54 @@ +package com.aoleyun.os.receiver; + +import android.annotation.SuppressLint; +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import android.text.TextUtils; +import android.util.Log; + +import com.aoleyun.os.uiuiutils.ApkUtils; +import com.aoleyun.os.uiuiutils.CmdUtil; +import com.aoleyun.os.uiuiutils.JgyUtils; + +public class NewAppReceiver extends BroadcastReceiver { + private static final String TAG = "NewAppReceiver"; + + @SuppressLint("StaticFieldLeak") + private static Context mContext; + + @Override + public void onReceive(Context context, Intent intent) { + mContext = context; + String action = intent.getAction(); + Log.e(TAG, "onReceive: " + "action = " + action); + if (TextUtils.isEmpty(action)) { + Log.e(TAG, "onReceive: " + "action is empty "); + return; + } + String packageName = intent.getDataString().replace("package:", ""); + String state; + switch (action) { + case Intent.ACTION_PACKAGE_ADDED: + state = "安装了:"; + break; + case Intent.ACTION_PACKAGE_REPLACED: + state = "重装了:"; + break; + case Intent.ACTION_PACKAGE_REMOVED: + JgyUtils.getInstance().checkAoleyunApp(); + state = "卸载了:"; + break; + case Intent.ACTION_PACKAGE_CHANGED: + // 判断是禁用还是启用 + boolean isDisabled = ApkUtils.isDisable(mContext, packageName); + JgyUtils.getInstance().checkAoleyunApp(); + state = (isDisabled ? "禁用:" : "启用:"); + break; + default: + state = "未知:"; + break; + } + Log.e(TAG, "sendAppInfo: " + state + packageName); + } +} diff --git a/src/com/aoleyun/os/touch/ItemClickHandler.java b/src/com/aoleyun/os/touch/ItemClickHandler.java index a186393..72b646f 100644 --- a/src/com/aoleyun/os/touch/ItemClickHandler.java +++ b/src/com/aoleyun/os/touch/ItemClickHandler.java @@ -45,19 +45,15 @@ import com.aoleyun.os.Launcher; import com.aoleyun.os.LauncherAppWidgetInfo; import com.aoleyun.os.LauncherAppWidgetProviderInfo; import com.aoleyun.os.uiuiutils.CustomDialog; -import com.aoleyun.os.uiuiutils.JGYUtils; +import com.aoleyun.os.uiuiutils.JgyUtils; import com.hjq.toast.Toaster; -import com.aoleyun.os.base.BaseApplication; import com.aoleyun.os.PromiseAppInfo; import com.aoleyun.os.R; -import com.aoleyun.os.statistics.AppInformation; -import com.aoleyun.os.statistics.StatisticsInfo; import com.aoleyun.os.WorkspaceItemInfo; import com.aoleyun.os.compat.AppWidgetManagerCompat; import com.aoleyun.os.folder.Folder; import com.aoleyun.os.folder.FolderIcon; import com.aoleyun.os.network.bean.AppPasswdBean; -import com.aoleyun.os.network.HTTPInterface; import com.aoleyun.os.testing.TestProtocol; import com.aoleyun.os.uiuiutils.TimeUtils; import com.aoleyun.os.util.PackageManagerHelper; @@ -183,10 +179,10 @@ public class ItemClickHandler { } private static boolean is_forbid(Context context, String pkg) { - if (JGYUtils.isUnlocked(context)) { + if (JgyUtils.isUnlocked(context)) { return false; } - if (JGYUtils.isDisable(context, pkg)) { + if (JgyUtils.isDisable(context, pkg)) { Toaster.show("应用已被禁用"); return true; } diff --git a/src/com/aoleyun/os/uiuiutils/ApkUtils.java b/src/com/aoleyun/os/uiuiutils/ApkUtils.java index 4c9f744..2e86726 100644 --- a/src/com/aoleyun/os/uiuiutils/ApkUtils.java +++ b/src/com/aoleyun/os/uiuiutils/ApkUtils.java @@ -105,6 +105,20 @@ public class ApkUtils { return intent; } + /** + * 检查手机上是否安装了指定的软件 + */ + public static boolean isAvailable(Context context, String packageName) { + PackageManager packageManager = context.getPackageManager(); + PackageInfo info = null; + try { + info = packageManager.getPackageInfo(packageName, 0); + } catch (PackageManager.NameNotFoundException e) { + e.printStackTrace(); + } + return info != null; + } + //判断是否为系统应用 public static boolean isSystemApp(Context context, String pkgName) { boolean isSystemApp = false; @@ -127,6 +141,15 @@ public class ApkUtils { return isSystemApp; } + public static boolean isDisable(Context context, String pkg) { + PackageManager pm = context.getPackageManager(); + if (pm.getApplicationEnabledSetting(pkg) == PackageManager.COMPONENT_ENABLED_STATE_DISABLED) { + return true; + } else { + return false; + } + } + //获取APP版本号 public static String getAPPVersionName(Context context, String packageName) { String versionName = "0"; diff --git a/src/com/aoleyun/os/uiuiutils/JGYUtils.java b/src/com/aoleyun/os/uiuiutils/JgyUtils.java similarity index 66% rename from src/com/aoleyun/os/uiuiutils/JGYUtils.java rename to src/com/aoleyun/os/uiuiutils/JgyUtils.java index 94d2a30..fb07860 100644 --- a/src/com/aoleyun/os/uiuiutils/JGYUtils.java +++ b/src/com/aoleyun/os/uiuiutils/JgyUtils.java @@ -20,11 +20,11 @@ import java.util.Arrays; import java.util.HashSet; -public class JGYUtils { - private static final String TAG = JGYUtils.class.getSimpleName(); +public class JgyUtils { + private static final String TAG = JgyUtils.class.getSimpleName(); @SuppressLint("StaticFieldLeak") - private static JGYUtils sInstance; + private static JgyUtils sInstance; private Context mContext; private ContentResolver mResolver; @@ -44,7 +44,7 @@ public class JGYUtils { public static final int G11Platform = 16; public static final int MT8768Platform = 17; public static final int AUDG104Platform = 18; - + public static final int seewoPlatform = 25; public static final String Other = "其他"; public static final String MTKTag = "MTK"; @@ -61,8 +61,10 @@ public class JGYUtils { public static final String G11TAG = "MTKG11"; public static final String MT8768Tag = "MT8768"; public static final String AUDG104Tag = "AUDG104"; + public static final String seewoTag = "seewo"; - private JGYUtils(Context context) { + + private JgyUtils(Context context) { if (context == null) { throw new RuntimeException("Context is NULL"); } @@ -72,13 +74,13 @@ public class JGYUtils { public static void init(Context context) { if (sInstance == null) { - sInstance = new JGYUtils(context); + sInstance = new JgyUtils(context); } } - public static JGYUtils getInstance() { + public static JgyUtils getInstance() { if (sInstance == null) { - throw new IllegalStateException("You must be init JGYUtils first"); + throw new IllegalStateException("You must be init JgyUtils first"); } return sInstance; } @@ -115,6 +117,9 @@ public class JGYUtils { } else if (AUDG104Tag.equalsIgnoreCase(platform)) { Log.i(TAG, "checkAppPlatform: " + "AUDG104"); return AUDG104Platform; + } else if (seewoTag.equalsIgnoreCase(platform)) { + Log.i(TAG, "checkAppPlatform: " + "seewo"); + return seewoPlatform; } else { Log.i(TAG, "checkAppPlatform: " + "没有数据"); return UnknowPlatform; @@ -147,23 +152,25 @@ public class JGYUtils { getAppPlatformCallback.AppPlatform(C2Platform); } else if (AUDG104Tag.equalsIgnoreCase(platform)) { getAppPlatformCallback.AppPlatform(AUDG104Platform); + } else if (seewoTag.equalsIgnoreCase(platform)) { + getAppPlatformCallback.AppPlatform(seewoPlatform); } else { getAppPlatformCallback.AppPlatform(UnknowPlatform); } } public static boolean isOfficialVersion() { - String channelValue = JGYUtils.getInstance().getStringMetaData(); + String channelValue = JgyUtils.getInstance().getStringMetaData(); return "official".equals(channelValue); } public static boolean isNewlyVersion() { - String channelValue = JGYUtils.getInstance().getStringMetaData(); + String channelValue = JgyUtils.getInstance().getStringMetaData(); return "beta".equals(channelValue); } public static boolean isBetaVersion() { - String channelValue = JGYUtils.getInstance().getStringMetaData(); + String channelValue = JgyUtils.getInstance().getStringMetaData(); return "beta".equals(channelValue); } @@ -185,7 +192,7 @@ public class JGYUtils { } public static String getCustomVersion() { - if (JGYUtils.getInstance().checkAppPlatform() == JGYUtils.ZhanruiPlatform) { + if (JgyUtils.getInstance().checkAppPlatform() == JgyUtils.ZhanruiPlatform) { return getProperty("ro.build.display.id", "获取失败"); } else { return getProperty("ro.custom.build.version", "获取失败"); @@ -193,7 +200,7 @@ public class JGYUtils { } public static String getRomVersion() { - if (JGYUtils.getInstance().checkAppPlatform() == JGYUtils.ZhanruiPlatform) { + if (JgyUtils.getInstance().checkAppPlatform() == JgyUtils.ZhanruiPlatform) { return getProperty("ro.build.id", "获取失败"); } else { return getProperty("ro.build.display.id", "获取失败"); @@ -227,7 +234,7 @@ public class JGYUtils { if (TextUtils.isEmpty(appString)) return false; Log.e("isEnforceApp", "appString: " + appString); HashSet appSet = new HashSet<>(Arrays.asList(appString.split(","))); - appSet.addAll(LoaderTask.showApp); + appSet.addAll(LoaderTask.SYSTEM_FORCE_APP); return appSet.contains(pkg); } @@ -293,5 +300,77 @@ public class JGYUtils { } } + public void checkAoleyunApp() { + boolean availableSn = ApkUtils.isAvailable(mContext, "com.aoleyun.sn"); + if (availableSn) { + boolean disableSn = ApkUtils.isDisable(mContext, "com.aoleyun.sn"); + Log.e(TAG, "checkAoleyunApp: sn isAvailable = " + availableSn); + if (disableSn) { + CmdUtil.Result installResult = CmdUtil.execute("cmd package install-existing com.aoleyun.sn"); + Log.e(TAG, "checkAoleyunApp: sn install = " + installResult); + CmdUtil.Result enableResult = CmdUtil.execute("pm enable com.aoleyun.sn"); + Log.e(TAG, "checkAoleyunApp: sn enable = " + enableResult); + } + } else { + CmdUtil.Result installResult = CmdUtil.execute("cmd package install-existing com.aoleyun.sn"); + Log.e(TAG, "checkAoleyunApp: sn install = " + installResult); + CmdUtil.Result enableResult = CmdUtil.execute("pm enable com.aoleyun.sn"); + Log.e(TAG, "checkAoleyunApp: sn enable = " + enableResult); + } + +// boolean availableAudos = ApkUtils.isAvailable(mContext, "com.aoleyun.audos"); +// if (availableAudos) { +// boolean disableAudos = ApkUtils.isDisable(mContext, "com.aoleyun.audos"); +// Log.e(TAG, "checkAoleyunApp: audos isAvailable = " + availableAudos); +// if (disableAudos) { +// CmdUtil.Result installResult = CmdUtil.execute("cmd package install-existing com.aoleyun.audos"); +// Log.e(TAG, "checkAoleyunApp: audos install = " + installResult); +// CmdUtil.Result enableResult = CmdUtil.execute("pm enable com.aoleyun.audos"); +// Log.e(TAG, "checkAoleyunApp: audos enable = " + enableResult); +// } +// } else { +// CmdUtil.Result installResult = CmdUtil.execute("cmd package install-existing com.aoleyun.audos"); +// Log.e(TAG, "checkAoleyunApp: audos install = " + installResult); +// CmdUtil.Result enableResult = CmdUtil.execute("pm enable com.aoleyun.audos"); +// Log.e(TAG, "checkAoleyunApp: audos enable = " + enableResult); +// } + + boolean availableOs = ApkUtils.isAvailable(mContext, "com.aoleyun.os"); + if (availableOs) { + boolean disableOs = ApkUtils.isDisable(mContext, "com.aoleyun.os"); + Log.e(TAG, "checkAoleyunApp: os isAvailable = " + availableOs); + if (disableOs) { + CmdUtil.Result installResult = CmdUtil.execute("cmd package install-existing com.aoleyun.os"); + Log.e(TAG, "checkAoleyunApp: os install = " + installResult); + CmdUtil.Result enableResult = CmdUtil.execute("pm enable com.aoleyun.os"); + Log.e(TAG, "checkAoleyunApp: os enable = " + enableResult); + } + } else { + CmdUtil.Result installResult = CmdUtil.execute("cmd package install-existing com.aoleyun.os"); + Log.e(TAG, "checkAoleyunApp: os install = " + installResult); + CmdUtil.Result enableResult = CmdUtil.execute("pm enable com.aoleyun.os"); + Log.e(TAG, "checkAoleyunApp: os enable = " + enableResult); + } + + + boolean availableAppstore = ApkUtils.isAvailable(mContext, "com.aoleyun.appstore"); + if (availableAppstore) { + boolean disableAppstore = ApkUtils.isDisable(mContext, "com.aoleyun.appstore"); + Log.e(TAG, "checkAoleyunApp: appstore isAvailable = " + availableAppstore); + if (disableAppstore) { + CmdUtil.Result installResult = CmdUtil.execute("cmd package install-existing com.aoleyun.appstore"); + Log.e(TAG, "checkAoleyunApp: appstore install = " + installResult); + CmdUtil.Result enableResult = CmdUtil.execute("pm enable com.aoleyun.appstore"); + Log.e(TAG, "checkAoleyunApp: appstore enable = " + enableResult); + } + } else { + CmdUtil.Result installResult = CmdUtil.execute("cmd package install-existing com.aoleyun.appstore"); + Log.e(TAG, "checkAoleyunApp: appstore install = " + installResult); + CmdUtil.Result enableResult = CmdUtil.execute("pm enable com.aoleyun.appstore"); + Log.e(TAG, "checkAoleyunApp: appstore enable = " + enableResult); + } + + } + } diff --git a/src_shortcuts_overrides/com/aoleyun/os/shortcuts/DeepShortcutManager.java b/src_shortcuts_overrides/com/aoleyun/os/shortcuts/DeepShortcutManager.java index 984cf1f..b758503 100644 --- a/src_shortcuts_overrides/com/aoleyun/os/shortcuts/DeepShortcutManager.java +++ b/src_shortcuts_overrides/com/aoleyun/os/shortcuts/DeepShortcutManager.java @@ -31,7 +31,6 @@ import android.util.Log; import com.aoleyun.os.ItemInfo; import com.aoleyun.os.LauncherSettings; import com.aoleyun.os.WorkspaceItemInfo; -import com.aoleyun.os.uiuiutils.JGYUtils; import java.util.ArrayList; import java.util.Collections;