diff --git a/app/src/main/java/com/aoleyun/sn/utils/JgyUtils.java b/app/src/main/java/com/aoleyun/sn/utils/JgyUtils.java index 3a49c66..e594a07 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/JgyUtils.java +++ b/app/src/main/java/com/aoleyun/sn/utils/JgyUtils.java @@ -3521,29 +3521,50 @@ public class JgyUtils { public void checkAoleyunApp() { boolean availableSn = ApkUtils.isAvailable(mContext, "com.aoleyun.sn"); - boolean disableSn = ApkUtils.isDisable(mContext, "com.aoleyun.sn"); - Log.e(TAG, "checkAoleyunApp: sn isAvailable = " + availableSn); - if (!availableSn || disableSn) { + 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"); - boolean disableAudos = ApkUtils.isDisable(mContext, "com.aoleyun.audos"); - Log.e(TAG, "checkAoleyunApp: audos isAvailable = " + availableAudos); - if (!availableAudos || 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); - } +// 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"); - boolean disableOs = ApkUtils.isDisable(mContext, "com.aoleyun.os"); - Log.e(TAG, "checkAoleyunApp: os isAvailable = " + availableOs); - if (!availableOs || disableOs) { + 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"); @@ -3551,15 +3572,22 @@ public class JgyUtils { } -// boolean availableAppstore = ApkUtils.isAvailable(mContext, "com.aoleyun.appstore"); -// boolean disableAppstore = ApkUtils.isDisable(mContext, "com.aoleyun.audos"); -// Log.e(TAG, "checkAoleyunApp: appstore isAvailable = " + availableAppstore); -// if (!availableAppstore || 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); -// } + 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); + } }