1.管理页面取消按键隐藏。

2.已安装应用的app名字优先使用商店的名字。
3.登陆时重新设置策略。

app/src/main/java/com/xhly/manageapp/ui/login/activity/LoginActivity.kt

@@ -245,8 +245,8 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
         if (exitControlFlag){
             //如果解除了管控，登录成功则重新添加管控
             currentSpUtils.setParam(Const.EXIT_CONTROL,false)
-            StrategyUtils.initControlStrategy()
         }
+        StrategyUtils.initControlStrategy()
         //提交登录事件
         val data = LogdOperateBean()
         ManageApplication.getDeviceInfo()?.let {

app/src/main/java/com/xhly/manageapp/ui/main/activity/MainActivity.kt

@@ -844,7 +844,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
     private fun updateAppInstallInfo() {
         try {
             //获得已安装应用列表
-            val appList = AppUtils.GetAppList(this)
+            val appList = AppUtils.GetAllAppList(this)
             try {
                 //获得预装应用的包名
                 val currentList =
@@ -863,15 +863,24 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
                 }
                 //除了管控之类的我们的app之外的预装都不在统计范围,所以移除
                 appList.removeAll(removeList)
+                //获得存储的应用商店包名
+                getAppStoreList()
             } catch (e: Exception) {
 
             }
+
             val userBean = spUtils.getFromJson(Const.USERINFO, UserBean().javaClass) as UserBean
             val appInstallList = arrayListOf<AppInstallBean>()
             appList.forEach {
                 val appInstallBean = AppInstallBean()
                 appInstallBean.userid = userBean.userid
-                appInstallBean.appName = it.name
+                val filter =
+                    appStroeList.filter { store -> store.appPackage.equals(it.packageName) }
+                if (filter.isNotEmpty()){
+                    appInstallBean.appName = filter[0].appName
+                }else{
+                    appInstallBean.appName = it.name
+                }
                 appInstallBean.appVersion = it.versionName
                 appInstallBean.appNum = it.versionNum
                 appInstallBean.appPackage = it.packageName

app/src/main/res/layout/activity_manage.xml

@@ -213,6 +213,7 @@
                     android:layout_width="0dp"
                     android:layout_height="80dp"
                     android:layout_weight="1"
+                    android:visibility="gone"
                     android:text="隐藏底部按键" />
                 <androidx.appcompat.widget.AppCompatButton
                     android:id="@+id/clear_btn"

corelib/src/main/java/com/xhly/corelib/Const.kt

@@ -67,7 +67,7 @@ object Const {
 
     //存储区域码，存在则在弹窗出现时显示
     const val REGIONCODEKEY="REGIONCODEKEY"
-    //接口地址
+    //接口地址 正式地址mc.xhkjedu.com测试地址mcapitest.xhkjedu.com
     const val URL1: String = "https://mcapitest.xhkjedu.com/"
 
     //接口地址

corelib/src/main/java/com/xhly/corelib/utils/AppUtils.java

@@ -18,6 +18,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class AppUtils {
+    /**
+     * 获得不包含自己的app列表
+     */
     public static List<AppInfo> GetAppList(Context context) {
         List<AppInfo> list = new ArrayList<>();
         List<String>  pkgList=new ArrayList<>();
@@ -59,6 +62,49 @@ public class AppUtils {
         return list;
     }
 
+    /**
+     * 获得包含自己的app列表
+     */
+    public static List<AppInfo> GetAllAppList(Context context) {
+        List<AppInfo> list = new ArrayList<>();
+        List<String>  pkgList=new ArrayList<>();
+        PackageManager pm = context.getPackageManager();
+        Intent mainIntent = new Intent(Intent.ACTION_MAIN, null);
+        mainIntent.addCategory(Intent.CATEGORY_LAUNCHER);
+        List<ResolveInfo> activities = pm.queryIntentActivities(mainIntent, 0);
+        for (ResolveInfo info : activities) {
+            String packName = info.activityInfo.packageName;
+            //去重
+            if (pkgList.contains(packName)) {
+                continue;
+            }
+            AppInfo mInfo = new AppInfo();
+            mInfo.setIco(info.activityInfo.applicationInfo.loadIcon(pm));
+            mInfo.setName(info.activityInfo.applicationInfo.loadLabel(pm).toString());
+            mInfo.setPackageName(packName);
+            pkgList.add(packName);
+            try {
+                PackageInfo packageInfo = context.getPackageManager().getPackageInfo(packName, PackageManager.GET_META_DATA);
+                mInfo.setVersionName(packageInfo.versionName);
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P){
+                    mInfo.setVersionNum(packageInfo.getLongVersionCode());
+                }else {
+                    mInfo.setVersionNum(packageInfo.versionCode);
+                }
+            } catch (PackageManager.NameNotFoundException e) {
+                throw new RuntimeException(e);
+            }
+            // 为应用程序的启动Activity 准备Intent
+            Intent launchIntent = new Intent();
+            launchIntent.setComponent(new ComponentName(packName,
+                    info.activityInfo.name));
+            launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            mInfo.setIntent(launchIntent);
+            list.add(mInfo);
+        }
+        return list;
+    }
+
     /**
      * 判断应用是否已经安装
      */