1.处理学校设置得设置设置例如图标隐藏。

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

@@ -39,6 +39,7 @@ import com.xhly.manageapp.bean.EventLog
 import com.xhly.manageapp.bean.SocketMsgBean
 import com.xhly.manageapp.bean.UpdateBean
 import com.xhly.manageapp.bean.log.LogdOperateBean
+import com.xhly.manageapp.bean.school.SchoolDeviceSetBean
 import com.xhly.manageapp.bean.strategy.StrategyBean
 import com.xhly.manageapp.bean.user.UserBean
 import com.xhly.manageapp.broadcastreceiver.AppInstallReceiver
@@ -49,6 +50,7 @@ import com.xhly.manageapp.ui.ManageActivity
 import com.xhly.manageapp.ui.login.activity.LoginActivity
 import com.xhly.manageapp.ui.main.viewmodel.MainViewModel
 import com.xhly.manageapp.utils.AppDownLoadUtils
+import com.xhly.manageapp.utils.CustomAppUtils
 import com.xhly.manageapp.utils.PadInfoUtils
 import com.xhly.manageapp.utils.StrategyUtils
 import com.xhly.manageapp.workmanager.TimingWorker
@@ -73,11 +75,10 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         } else {
             userBean = json as UserBean
         }
-        val getAppList1 = AppUtils.GetAppList(this)
-        dataList.addAll(getAppList1)
         adapter = AppAdapter(this, dataList)
         mBinding.rv.layoutManager = GridLayoutManager(this, 6, GridLayoutManager.VERTICAL, false)
         mBinding.rv.adapter = adapter
+        updateAppRv()
         // checkAccessibility(this)
         mBinding.btn.setOnClickListener {
             startIntentActivity(ManageActivity().javaClass)
@@ -145,7 +146,14 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
             }
         }
         viewModel.updateInfoData.observe(this) {
-            //TODO 需要编写更新代码
+            //成功则保存不在提交
+            if (it){
+                spUtils.setParam(Const.PADUPDATETIMEKEY,System.currentTimeMillis())
+            }
+        }
+        viewModel.schoolSetData.observe(this){
+            spUtils.saveJson(Const.SCHOOLSETDEVICE,it)
+            updateAppRv()
         }
         startWorkManager()
     }
@@ -174,6 +182,9 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
             //屏蔽返回
             /*    viewModel.getAppList()
                 viewModel.getForceAppList()*/
+            userBean?.let {
+                viewModel.postDevicesetDetail(it.schoolid)
+            }
         }
     }
 
@@ -182,7 +193,9 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         super.onResume()
         viewModel.updateStrategy()
         viewModel.uploadAppStrategy()
-        viewModel.postDevicesetDetail("1")
+        userBean?.let {
+            viewModel.postDevicesetDetail(it.schoolid)
+        }
         useTimeStrategy()
         updatePadInfo()
         updateMcApp()
@@ -196,7 +209,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
     }
 
     private fun updateMcApp() {
-        //每天请求一次app更新接口
+        //每天请求一次app更新接口，这个接口是用于提交版本信息统计
         try {
             var userBean = spUtils.getFromJson(Const.USERINFO, UserBean().javaClass) as UserBean
             //存储pad更新请求时间，如果为同一天则不在上传，不然继续上传
@@ -461,8 +474,22 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
 
     private fun updateAppRv() {
         try {
+            var schoolDeviceSetBean:SchoolDeviceSetBean?=null
+            try {
+                val beanStr =
+                    spUtils.getFromJson(Const.SCHOOLSETDEVICE, SchoolDeviceSetBean().javaClass)
+                if (beanStr!=null){
+                    schoolDeviceSetBean=beanStr as SchoolDeviceSetBean
+                }
+            }catch (e:Exception){
+                //为了不影响列表显示
+            }
             dataList.clear()
-            val appList = AppUtils.GetAppList(this)
+            var appList = AppUtils.GetAppList(this)
+            appList.addAll(CustomAppUtils().getCustomAppList(this))
+            if (schoolDeviceSetBean!=null){
+                appList=StrategyUtils.setSchoolSetDevice(schoolDeviceSetBean,appList)
+            }
             dataList.addAll(appList)
             if (adapter == null) {
                 adapter = AppAdapter(this, dataList)

app/src/main/java/com/xhly/manageapp/ui/main/viewmodel/MainViewModel.kt

@@ -9,6 +9,7 @@ import com.xhly.manageapp.bean.ListAppBean
 import com.xhly.manageapp.bean.UpdateBean
 import com.xhly.manageapp.bean.log.LogdOperateBean
 import com.xhly.manageapp.bean.log.PadInfoBean
+import com.xhly.manageapp.bean.school.SchoolDeviceSetBean
 import com.xhly.manageapp.bean.strategy.AppTimeManageBean
 import com.xhly.manageapp.bean.strategy.StrategyBean
 import com.xhly.manageapp.network.app.AppService
@@ -36,6 +37,8 @@ class MainViewModel : CommonBaseViewModel() {
     val updateInfoData: LiveData<Boolean> = updateInfo
     private val loginOut = MutableLiveData<Boolean>()
     val loginOutData: LiveData<Boolean> = loginOut
+    private val schoolSet=MutableLiveData<SchoolDeviceSetBean>()
+    val schoolSetData:LiveData<SchoolDeviceSetBean> =schoolSet
 
     fun getAppList() {
         launchUI {
@@ -138,13 +141,13 @@ class MainViewModel : CommonBaseViewModel() {
     /**
      * 获得设备设置管理
      */
-    fun postDevicesetDetail(schoolid: String) {
+    fun postDevicesetDetail(schoolid:Long) {
         launchUI {
             val map = HashMap<String, Any>()
             map["schoolid"] = schoolid
             val result = strategyService.postDevicesetDetail(map)
             if (result.code == 0) {
-
+               schoolSet.value=result.obj
             } else {
                 netMessage.value = result.msg
             }

app/src/main/java/com/xhly/manageapp/utils/CustomAppUtils.kt

@@ -0,0 +1,39 @@
+package com.xhly.manageapp.utils
+
+import android.content.Context
+import android.graphics.drawable.Drawable
+import androidx.appcompat.content.res.AppCompatResources
+import com.xhly.corelib.Const
+import com.xhly.corelib.bean.AppInfo
+import com.xhly.manageapp.R
+
+//用来创建一键加速，清除缓存，和自动旋转的appbean类
+class CustomAppUtils {
+    public fun getCustomAppList(context: Context): ArrayList<AppInfo> {
+        val appList= arrayListOf<AppInfo>()
+        appList.add(getCusomAppBean(
+            context.getString(R.string.speed),
+            Const.CUSTOMSPEEDAPP,
+           AppCompatResources.getDrawable(context,R.drawable.icon_speed)!!
+        ))
+        appList.add(getCusomAppBean(
+            context.getString(R.string.clear),
+            Const.CUSTOMCLEARAPP,
+            AppCompatResources.getDrawable(context,R.drawable.icon_clear)!!
+        ))
+        appList.add(getCusomAppBean(
+            context.getString(R.string.rotation),
+            Const.CUSTOMROTATIONAPP,
+            AppCompatResources.getDrawable(context,R.drawable.icon_speed)!!
+        ))
+        return appList
+    }
+
+    private fun getCusomAppBean(name: String, pkg: String, icon: Drawable):AppInfo{
+        val appInfo = AppInfo()
+        appInfo.name = name
+        appInfo.packageName = pkg
+        appInfo.ico = icon
+        return appInfo
+    }
+}

app/src/main/java/com/xhly/manageapp/utils/StrategyUtils.kt

@@ -3,10 +3,13 @@ package com.xhly.manageapp.utils
 import android.content.Context
 import com.google.gson.reflect.TypeToken
 import com.xhly.corelib.Const
+import com.xhly.corelib.bean.AppInfo
 import com.xhly.corelib.utils.LogShow
+import com.xhly.corelib.utils.ModelNameUtils
 import com.xhly.corelib.utils.SharedPreferencesUtils
 import com.xhly.corelib.utils.hourToCurrentDateLong
 import com.xhly.manageapp.ManageApplication
+import com.xhly.manageapp.bean.school.SchoolDeviceSetBean
 import com.xhly.manageapp.bean.strategy.AppTimeManageBean
 import com.xhly.manageapp.bean.strategy.StrategyBean
 import java.util.Calendar
@@ -29,21 +32,21 @@ object StrategyUtils {
             ManageApplication.enableWifiWhiteList(false)
         }
         //是否开启应用策略,不使用，通过app列表接口获取。
-  /*      if (strategyBean.hasapp == 1) {
-            //TODO 应用策略可能需要应用下载安装以及卸载
-            //开启
-            strategyBean.padApps?.let { appArray ->
-                val list = arrayListOf<String>()
-                appArray.forEach {
-                    list.add(it.appPackage)
-                }
-                ManageApplication.addInstallPackageWhiteList(list)
-            }
-        } else {
-            //不开启应用策略
-            val installPackageWhiteList = ManageApplication.getInstallPackageWhiteList()
-            ManageApplication.removeInstallPackageWhiteList(installPackageWhiteList)
-        }*/
+        /*      if (strategyBean.hasapp == 1) {
+                  //TODO 应用策略可能需要应用下载安装以及卸载
+                  //开启
+                  strategyBean.padApps?.let { appArray ->
+                      val list = arrayListOf<String>()
+                      appArray.forEach {
+                          list.add(it.appPackage)
+                      }
+                      ManageApplication.addInstallPackageWhiteList(list)
+                  }
+              } else {
+                  //不开启应用策略
+                  val installPackageWhiteList = ManageApplication.getInstallPackageWhiteList()
+                  ManageApplication.removeInstallPackageWhiteList(installPackageWhiteList)
+              }*/
 
         //是否开启时间策略，这个策略在生命周期中调用getPadTimeStrategy(strategyBean)
 
@@ -214,4 +217,49 @@ object StrategyUtils {
             return true
         }
     }
+
+    /**
+     * 处理学校设置的设备设置管理,设计隐藏的隐藏图标，
+     */
+    public fun setSchoolSetDevice(schoolDeviceSetBean: SchoolDeviceSetBean, appList: List<AppInfo>):ArrayList<AppInfo> {
+        val dataList = arrayListOf<AppInfo>()
+        appList.forEach { appinfo ->
+            if (ModelNameUtils.IS_LianxX505f()){
+                //启用电话短信:1是0否
+                if (schoolDeviceSetBean.simcard == 0 && (appinfo.packageName.equals(Const.ANDROIDPHONE) || appinfo.packageName.equals(Const.ANDROIDMMS))) {
+                    return@forEach
+                }
+                //日历:1是0否
+                if (schoolDeviceSetBean.calendar == 0 && appinfo.packageName.equals(Const.ANDROIDCALENDAR)) {
+                    return@forEach
+                }
+                //闹钟:1是0否
+                if (schoolDeviceSetBean.alarmClock == 0 && appinfo.packageName.equals(Const.ANDROIDDESKCLOCK)) {
+                    return@forEach
+                }
+                //相机:1是0否
+                if (schoolDeviceSetBean.camera == 0 && appinfo.packageName.equals(Const.ANDROIDCAMERA)) {
+                    return@forEach
+                }
+                //相册:1是0否
+                if (schoolDeviceSetBean.gallery == 0 && appinfo.packageName.equals(Const.ANDROIDGALLERY)) {
+                    return@forEach
+                }
+            }
+            //一键加速:1是0否
+            if (schoolDeviceSetBean.accelerate==0&&appinfo.packageName.equals(Const.CUSTOMSPEEDAPP)){
+                return@forEach
+            }
+            //清理缓存:1是0否
+            if (schoolDeviceSetBean.cleanup==0&&appinfo.packageName.equals(Const.CUSTOMCLEARAPP)){
+                return@forEach
+            }
+            //自动旋转:1是0否
+            if (schoolDeviceSetBean.rotateSetting==0&&appinfo.packageName.equals(Const.CUSTOMROTATIONAPP)){
+                return@forEach
+            }
+            dataList.add(appinfo)
+        }
+        return dataList
+    }
 }

app/src/main/res/values/strings.xml

@@ -19,5 +19,6 @@
     <string name="close">关闭</string>
     <string name="clear">清除缓存</string>
     <string name="speed">一键加速</string>
+    <string name="rotation">自动旋转</string>
     <string name="locktips">您的设备已违规或者被管理员限制使用，请联系管理员</string>
 </resources>

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

@@ -101,6 +101,9 @@ object Const {
     //存储用户信息
     const val USERINFO = "USERINFO"
 
+    //存储学校设置的设备设置
+    const val SCHOOLSETDEVICE="SCHOOLSETDEVICE"
+
     //记录设备策略名称
     const val DEVICETYPE1 = "摄像头"
     const val DEVICETYPE2 = "蓝牙"
@@ -112,4 +115,49 @@ object Const {
     const val DEVICETYPE8 = "WiFi高级选项"
     const val DEVICETYPE9 = "SD卡"
     const val DEVICETYPE10 = "OTG"
+
+    //记录系统应用名称
+    /**
+     * 电话包名
+     */
+    const val ANDROIDPHONE="com.android.contacts"
+    /**
+     * 短信包名
+     */
+    const val ANDROIDMMS="com.android.mms"
+    /**
+     * 日历
+     */
+    const val ANDROIDCALENDAR="com.android.calendar"
+    /**
+     * 录音机
+     */
+    const val ANDROIDRECORDER="com.android.soundrecorder"
+    /**
+     *时钟
+     */
+    const val ANDROIDDESKCLOCK="com.android.deskclock"
+    /**
+     * 联想相机相机
+     */
+    const val ANDROIDCAMERA="com.dtab.camera"
+    /**
+     * 联想相册
+     */
+    const val ANDROIDGALLERY="com.android.gallery3d"
+
+    /**
+     *标记自定义的一键清理名称
+     */
+    const val CUSTOMSPEEDAPP="CUSTOMSPEEDAPP"
+
+    /**
+     *标记自定义的清除缓存名称
+     */
+    const val CUSTOMCLEARAPP="CUSTOMCLEARAPP"
+
+    /**
+     *标记自定义的自动旋转名称
+     */
+    const val CUSTOMROTATIONAPP="CUSTOMROTATIONAPP"
 }