version:2.1 MTK

fix:修复强制安装应用时报错
update:优化桌面图标隐藏

app/build.gradle

@@ -296,7 +296,7 @@ dependencies {
     //高德地图定位
     implementation 'com.amap.api:location:5.1.0'
     //MMKV
-    implementation 'com.tencent:mmkv-static:1.2.12'
+    implementation 'com.tencent:mmkv-static:1.2.13'
     //腾讯移动推送 TPNS
     implementation 'com.tencent.tpns:tpns:1.3.2.0-release'
 //    //RxHttp

app/src/main/java/com/aoleyun/sn/base/BaseActivity.java

@@ -27,6 +27,7 @@ public abstract class BaseActivity extends AppCompatActivity implements Lifecycl
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        lifecycleSubject.onNext(ActivityEvent.CREATE);
         setBar();
         //状态栏改变放在setContentView前后有所不同
         setContentView(this.getLayoutId());

app/src/main/java/com/aoleyun/sn/service/main/MainSPresenter.java

@@ -340,6 +340,7 @@ public class MainSPresenter implements MainSContact.Presenter {
                 .getDesktopIcon(true, getLifecycle(), new NetInterfaceManager.onCompleteCallback() {
                     @Override
                     public void onComplete() {
+                        Log.e("getDesktopIcon", "onComplete: ");
                         JGYUtils.getInstance().hideSystemAPP();
                         mView.getDesktopIconFinish();
                     }

app/src/main/java/com/aoleyun/sn/tpush/MessageReceiver.java

@@ -470,7 +470,7 @@ public class MessageReceiver extends XGPushBaseReceiver {
                         NetInterfaceManager.getInstance().getDefaultDesktop();
                         NetInterfaceManager.getInstance().getNetAndLaunchSetting();
                     }
-                },1234);
+                }, 1234);
                 break;
             case MSG_SETTING:
                 ToastUtil.betaShow("收到管控：系统设置");
@@ -511,7 +511,7 @@ public class MessageReceiver extends XGPushBaseReceiver {
                         NetInterfaceManager.getInstance().getDesktopIcon();
                         NetInterfaceManager.getInstance().getDefaultDesktop();
                     }
-                },1234);
+                }, 1234);
                 break;
             case MSG_LOCK:
                 ToastUtil.betaShow("收到管控：设备锁定");
@@ -1246,7 +1246,14 @@ public class MessageReceiver extends XGPushBaseReceiver {
         } catch (PackageManager.NameNotFoundException e) {
             e.printStackTrace();
         }
-        if (packageInfo == null || packageInfo.getLongVersionCode() < version_code) {
+        long appVersionCode;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            appVersionCode = packageInfo.getLongVersionCode();
+        } else {
+            appVersionCode = packageInfo.versionCode;
+        }
+        if (packageInfo == null || appVersionCode < version_code) {
+
             Utils.ariaDownload(mContext, jsonObject.getString("app_url"), jsonObject);
         } else {
             Log.e(TAG, "checkAPPInstall: " + "已经是最新版");

app/src/main/java/com/aoleyun/sn/utils/ApkUtils.java

@@ -714,6 +714,7 @@ public class ApkUtils {
         this.add("com.android.deskclock");//时钟
         this.add("com.android.music");//音乐
         this.add("com.mediatek.camera");//相机
+        this.add("com.android.camera");
         this.add("com.android.camera2");//展讯相机
         this.add("com.android.documentsui");//文件
         this.add("com.mediatek.filemanager");//文件
@@ -927,22 +928,34 @@ public class ApkUtils {
         this.add("cn.com.bifa.eyeshiely");
     }};
 
-    public static List aihuaApp = new ArrayList(){{
+    public static List aihuaApp = new ArrayList() {{
         this.add("com.liuyang.jcstudentside");
         this.add("com.alibaba.android.rimet");
         this.add("com.tencent.wemeet.app");
         this.add("com.qi.studycomputer.launcher");
+
+        this.add("com.qi.xiaoshi");
+        this.add("com.hardware.cn");
+        this.add("com.qi.gamemodel");
+        this.add("com.wyt.tongbuyouxue");
+        this.add("com.qi.wyt.setting");
+        this.add("air.wyt.modloader");
+        this.add("com.google.android.inputmethod.pinyin");
+        this.add("com.android.calculator2");
+        this.add("com.qi.TFSystem");
+        this.add("com.qi.appstore");
+
     }};
 
     public static void showAllAPP(Context context) {
         PackageManager pm = context.getPackageManager();
         // 查询所有已经安装的应用程序
-        List<PackageInfo> packages = pm.getInstalledPackages(0);
+        List<PackageInfo> packages = pm.getInstalledPackages(PackageManager.COMPONENT_ENABLED_STATE_ENABLED | PackageManager.COMPONENT_ENABLED_STATE_DISABLED);
         for (PackageInfo packageInfo : packages) {
+
             //如果是自带可以卸载的，除开不需要管控的
             if (canremove_systemapp.contains(packageInfo.packageName)
-                    && !show_canremove_systemapp.contains(packageInfo.packageName)
+                    && !show_canremove_systemapp.contains(packageInfo.packageName)) {
-            ) {
                 continue;
             }
 
@@ -951,7 +964,7 @@ public class ApkUtils {
                     //10.0上日历和电子邮件是可卸载的
                     //7.0是系统应用
                     if (show_canremove_systemapp.contains(packageInfo.packageName)) {
-//                        Logger.e("showAllAPP2", "packageName:" + packageInfo.packageName);
+                        Logger.e("showAllAPP2", "packageName:" + packageInfo.packageName);
                         try {
                             pm.setApplicationEnabledSetting(packageInfo.packageName, PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0);
                         } catch (Exception e) {
@@ -960,7 +973,7 @@ public class ApkUtils {
                     }
                 }
             } else {
-//                Logger.e("showAllAPP", "packageName:" + packageInfo.packageName);
+                Logger.e("showAllAPP", "packageName:" + packageInfo.packageName);
                 try {
                     pm.setApplicationEnabledSetting(packageInfo.packageName, PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0);
                 } catch (Exception e) {

app/src/main/java/com/aoleyun/sn/utils/JGYUtils.java

@@ -1331,6 +1331,9 @@ public class JGYUtils {
                 if (ApkUtils.canremove_systemapp.contains(packageName)) {
                     continue;
                 }
+                if (ApkUtils.aihuaApp.contains(packageName)) {
+                    continue;
+                }
                 if (PackageNames.DEVICE_INFO.equals(packageName) || PackageNames.APPSTORE.equals(packageName)
                 ) {
                     continue;
@@ -1351,21 +1354,33 @@ public class JGYUtils {
         this.add("com.android.contacts");
         this.add("com.android.deskclock");
         this.add("com.android.camera2");
+        this.add("com.android.camera");
+        this.add("com.mediatek.camera");
         this.add("com.android.messaging");
         this.add("com.android.music");
         this.add("com.android.settings");
 //        this.add("org.chromium.browser");
-        this.add("com.aoleyun.browser");
+
-        this.add("com.aoleyun.os");
         this.add("com.android.calculator2");
         this.add("com.android.dialer");
         this.add("com.android.documentsui");
         this.add("com.android.soundrecorder");
+        this.add("com.android.gallery3d");
         this.add("com.sprd.sprdnote");
+
         this.add("com.aoleyun.appstore");
         this.add("com.aoleyun.info");
         this.add("com.aoleyun.sn");
-        this.add("com.android.gallery3d");
+        this.add("com.aoleyun.browser");
+        this.add("com.aoleyun.os");
+        this.add("com.aoleyunos.dop1");
+        this.add("com.aoleyunos.dop2");
+
+        //aihua
+        this.add("com.liuyang.jcstudentside");
+        this.add("com.alibaba.android.rimet");
+        this.add("com.tencent.wemeet.app");
+        this.add("com.qi.studycomputer.launcher");
     }};
 
     /**