1.增加UserBean信息

2.增加应用网络白名单。

app/src/main/java/com/xhly/manageapp/ManageApplication.kt

                 }
             }
         }
+        /**
+         * 添加网络应用白名单
+         */
+        fun addAppWhiteRule(pkgList: ArrayList<String>){
+            clearAppWhiteRule()
+            if (ModelNameUtils.IS_LianxX505f()) {
+                pkgList.forEach {
+                    csdkManager?.AddAppWhiteRule(it)
+                }
+            }
+        }
+        /**
+         * 移除网络应用白名单
+         */
+        fun clearAppWhiteRule(){
+            if (ModelNameUtils.IS_LianxX505f()) {
+                csdkManager?.ClearAppRules()
+                //不移除自己和商店
+                csdkManager?.AddAppWhiteRule(Const.CURRENTAPPPKG)
+                csdkManager?.AddAppWhiteRule(Const.STOREAPPPKG)
+            }
+        }
     }
 
     override fun onCreate() {
             addInstallPackageWhiteList(
                 arrayListOf(
                     Const.CURRENTAPPPKG,
-                    "com.xhkjedu.xh_control_appstore"
+                    Const.STOREAPPPKG
                 )
             )
+            //给自己加入网络白名单
+            addAppWhiteRule(arrayListOf(Const.CURRENTAPPPKG))
             //允许运行时权限，禁止状态栏下拉，屏蔽底部虚拟键。
            // setRuntimePermissions(true)
             disableStatusBarPanel(true)

app/src/main/java/com/xhly/manageapp/bean/user/UserBean.kt

     //记录登录返回的msg
     var xhlyLoginMessage:String?=""
 
-    var userid = 1L
-    var schoolid = 1L
-
-    //区域码
-    var regionid = 1L
+    /**
+     * id
+     */
+    var userid = 0L
 
+    /**
+     * 姓名
+     */
     var username: String? = null
+
+    /**
+     * 账号
+     */
     var loginname: String? = null
-    var classid: Long? = null
+
+    /**
+     * 密码
+     */
     var loginpwd:String=""
+    /**
+     *手机号
+     */
+    var userphone:String?=null
+    /**
+     * 学号
+     */
+    var studentno:String?=null
 
+    /**
+     * 身份证号
+     */
+    var cardid:String?=null
     /**
      * 管控状态1管控中2解除管控
      */
     var control=1
+    /**
+     * 是否启用1启用2禁用
+     */
+    var enabled=0
 
     /**
-     *手机号
+     *是否删除0未删除1已删除
      */
-    var userphone:String?=null
+    var deleted=0
 
     /**
-     * 版本
+     * 版本(不是app的版本号)
      */
     var rversion=0L
 
+
     /**
-     * Xh-Token-Key
+     * tokenKey
      */
     var Xh_Token_Key:String?=null
-
+    /**
+     * token
+     */
     var Xh_Token_Value:String?=null
+
+    /**
+     *班级id
+     */
+    var classid: Long? = null
+
+    /**
+     *学校id
+     */
+    var schoolid = 0L
+
+    /**
+     * 区域id
+     */
+    var regionid = 0L
+
+    /**
+     * sn 设备号
+     */
+    var sn:String?=""
+    /**
+     *是否强制绑定:1是0否
+     */
+    var forceBind=0
+    /**
+     *区域码
+     */
+    var regionCode=0
+    /**
+     * 区域名称
+     */
+    var regionName:String?=null
+
+    /**
+     * 认证密钥
+     */
+    var authKey:String?=null
+    /**
+     *认证地址
+     */
+    var authUrl:String?=null
+    /**
+     *认证类型：1账号2学号3手机号码4身份证号
+     */
+    var authType=0
+    /**
+     *学校编码
+     */
+    var schoolCode:String?=null
+    /**
+     *学校名称
+     */
+    var schoolName:String?=null
+    /**
+     *班级名称
+     */
+    var classname:String?=null
 }

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

 import android.content.pm.PackageManager
 import android.graphics.Color
 import android.graphics.drawable.Drawable
+import android.os.Build
 import android.provider.Settings
+import android.text.TextUtils
 import android.view.View
 import android.widget.Button
 import android.widget.EditText
 import com.xhly.manageapp.ManageApplication
 import com.xhly.manageapp.bean.EventLog
 import com.xhly.manageapp.bean.SocketMsgBean
-import com.xhly.manageapp.bean.log.UpdateBean
 import com.xhly.manageapp.bean.log.LogPushBean
 import com.xhly.manageapp.bean.log.LogdOperateBean
+import com.xhly.manageapp.bean.log.UpdateBean
 import com.xhly.manageapp.bean.school.SchoolDeviceSetBean
 import com.xhly.manageapp.bean.strategy.StrategyBean
 import com.xhly.manageapp.bean.user.UserBean
     private var mMyInstallReceiver: AppInstallReceiver? = null
     private var dataList: ArrayList<AppInfo> = arrayListOf()
     private var userBean: UserBean? = null
-    private var timer: Timer?=null
-    private val currentSpUtils by lazy {  CurrentAppSharedPreferencesUtils.getInstance(this) }
+    private var timer: Timer? = null
+    private val currentSpUtils by lazy { CurrentAppSharedPreferencesUtils.getInstance(this) }
     override fun getBinding() = ActivityMainBinding.inflate(layoutInflater)
 
     override fun initData() {
         }
         adapter = AppAdapter(this, dataList)
         mBinding.rv.layoutManager = GridLayoutManager(this, 6, GridLayoutManager.VERTICAL, false)
-        adapter?.changePwdListener=getChangeCodeListener()
+        adapter?.changePwdListener = getChangeCodeListener()
         mBinding.rv.adapter = adapter
         updateAppRv()
         // checkAccessibility(this)
 
         viewModel.listAppData.observe(this) { modelList ->
             //存储商店应用包名到本地
-            val appNameList= arrayListOf<String>()
+            val appNameList = arrayListOf<String>()
+            val whiteList= arrayListOf<String>()
             modelList.forEach {
                 appNameList.add(it.appPackage)
+                if (it.whited==1){
+                   whiteList.add(it.appPackage)
+                }
             }
-            spUtils.saveJson(Const.APPSTOREKEY,appNameList)
+            ManageApplication.addAppWhiteRule(whiteList)
+            spUtils.saveJson(Const.APPSTOREKEY, appNameList)
             //获得应用集合，必装应用和推荐应用，再加上预装应用，其余应用需要静默卸载,必装应用需要进行静默下载和安装。安装应用从forceapp接口获取
             val appList = AppUtils.GetAppList(this)
-            val firstAppList= arrayListOf<String>()
+            val firstAppList = arrayListOf<String>()
             try {
                 //获得预装应用的包名
                 val currentList =
-                    currentSpUtils.getFromJson(Const.FIRSTAPPLIST, ArrayList<String>().javaClass) as ArrayList<String>
+                    currentSpUtils.getFromJson(
+                        Const.FIRSTAPPLIST,
+                        ArrayList<String>().javaClass
+                    ) as ArrayList<String>
                 firstAppList.addAll(currentList)
-            }catch (e:Exception){
-               LogShow("冻结失败"+e.toString())
+            } catch (e: Exception) {
+                LogShow("冻结失败" + e.toString())
             }
             appList.forEach { app ->
                 val filter = modelList.filter { it.appPackage.equals(app.packageName) }
                 val appInfos = firstAppList.filter { app.packageName.equals(it) }
                 //接口列表以及初始化列表中不存在则将应用冻结或者卸载,目前是冻结
-                LogShow("${app.name},被冻结"+(filter.isEmpty() && appInfos.isEmpty()))
-                if (filter.isEmpty() && appInfos.isEmpty()){
-                   ManageApplication.setPackageEnabled(app.packageName, (filter.isNotEmpty()))
+                LogShow("${app.name},被冻结" + (filter.isEmpty() && appInfos.isEmpty()))
+                if (filter.isEmpty() && appInfos.isEmpty()) {
+                    ManageApplication.setPackageEnabled(app.packageName, (filter.isNotEmpty()))
                 }
             }
         }
         viewModel.loginOutData.observe(this) {
             if (it) {
                 loginOut()
-            }else{
+            } else {
                 Toast(getString(R.string.codeerror))
             }
         }
             initSchoolSet(it)
             updateAppRv()
         }
-        viewModel.wallpaperData.observe(this){
-            if (!it.hpath.isNullOrBlank()){
-                Glide.with(this).load(Const.URL1+it.hpath).placeholder(R.drawable.main_bg).error(R.drawable.main_bg).into(object:CustomViewTarget<LinearLayout,Drawable>(mBinding.root){
-                    override fun onLoadFailed(errorDrawable: Drawable?) {
-                        errorDrawable?.let {drawble->
-                            mBinding.root.background=drawble
+        viewModel.wallpaperData.observe(this) {
+            if (!it.hpath.isNullOrBlank()) {
+                Glide.with(this).load(Const.URL1 + it.hpath).placeholder(R.drawable.main_bg)
+                    .error(R.drawable.main_bg)
+                    .into(object : CustomViewTarget<LinearLayout, Drawable>(mBinding.root) {
+                        override fun onLoadFailed(errorDrawable: Drawable?) {
+                            errorDrawable?.let { drawble ->
+                                mBinding.root.background = drawble
+                            }
                         }
-                    }
 
-                    override fun onResourceCleared(placeholder: Drawable?) {
-                        placeholder?.let {drawble->
-                            mBinding.root.background=drawble
+                        override fun onResourceCleared(placeholder: Drawable?) {
+                            placeholder?.let { drawble ->
+                                mBinding.root.background = drawble
+                            }
                         }
-                    }
 
-                    override fun onResourceReady(
-                        resource: Drawable,
-                        transition: Transition<in Drawable>?
-                    ) {
-                        mBinding.root.background=resource
-                    }
-                })
+                        override fun onResourceReady(
+                            resource: Drawable,
+                            transition: Transition<in Drawable>?
+                        ) {
+                            mBinding.root.background = resource
+                        }
+                    })
             }
         }
-        viewModel.netWhiteListData.observe(this){
-           StrategyUtils.setNetWhiteList(it)
+        viewModel.netWhiteListData.observe(this) {
+            StrategyUtils.setNetWhiteList(it)
         }
-        viewModel.pwdResultData.observe(this){
-            if (it){
+        viewModel.pwdResultData.observe(this) {
+            if (it) {
                 unBindBlock()
-            }else{
+            } else {
                 Toast(getString(R.string.codeerror))
             }
         }
         }
         mBinding.loginoutIv.setOnClickListener {
             val schoolDeviceSetBean = StrategyUtils.getSchoolDeviceSetBean(this@MainActivity)
-            if (schoolDeviceSetBean !=null&&schoolDeviceSetBean.logout==1){
+            if (schoolDeviceSetBean != null && schoolDeviceSetBean.logout == 1) {
                 //禁用注销
                 return@setOnClickListener
-            }else{
+            } else {
                 showEditDialog()
             }
         }
         mBinding.codeenterCv.setOnClickListener {
             //如果密码一致,则解锁
             val code = mBinding.lockEt.text.toString()
-            if (code.isNullOrBlank()){
+            if (code.isNullOrBlank()) {
                 return@setOnClickListener
             }
             ManageApplication.getDeviceInfo()?.let {
-                viewModel.postPwdDetail(code,it)
+                viewModel.postPwdDetail(code, it)
             }
         }
         onBackPressedDispatcher.addCallback {
             //屏蔽返回键
-           getLocation()
+            getLocation()
         }
     }
 
         }
     }
 
-    private fun getChangeCodeListener():AppAdapter.ChangePwdListener{
-        return object :AppAdapter.ChangePwdListener{
+    private fun getChangeCodeListener(): AppAdapter.ChangePwdListener {
+        return object : AppAdapter.ChangePwdListener {
             override fun changeCode() {
                 val deviceSetBean = StrategyUtils.getSchoolDeviceSetBean(this@MainActivity)
-                var showFlag=true
-                if (deviceSetBean!=null&&deviceSetBean.changePwd==0){
+                var showFlag = true
+                if (deviceSetBean != null && deviceSetBean.changePwd == 0) {
                     //学校设置是否禁止修改密码
-                    showFlag=false
+                    showFlag = false
                 }
-                if (showFlag){
+                if (showFlag) {
                     showChangeCodeDialog()
                 }
             }
                     val enterTv = v.findViewById<TextView>(R.id.dialog_enter_tv)
                     val cancelTv = v.findViewById<TextView>(R.id.dialog_cancel_tv)
                     val editText = v.findViewById<EditText>(R.id.dialog_et)
-                    val oldCodeEt=v.findViewById<EditText>(R.id.dialog_oldcode_et)
-                    val newCodeEt=v.findViewById<EditText>(R.id.dialog_newcode_et)
+                    val oldCodeEt = v.findViewById<EditText>(R.id.dialog_oldcode_et)
+                    val newCodeEt = v.findViewById<EditText>(R.id.dialog_newcode_et)
                     enterTv.setOnClickListener {
                         val enterCode = editText.text.toString()
                         val oldCode = oldCodeEt.text.toString()
                         val newCode = newCodeEt.text.toString()
-                        if (!getTextFlag(enterCode)||!getTextFlag(oldCode)||!getTextFlag(newCode)){
+                        if (!getTextFlag(enterCode) || !getTextFlag(oldCode) || !getTextFlag(newCode)) {
                             Toast("密码不符合规则")
                             return@setOnClickListener
                         }
-                        if (oldCode.equals(newCode)){
+                        if (oldCode.equals(newCode)) {
                             Toast("新密码不能和旧密码一致。")
                             return@setOnClickListener
                         }
 
-                        if (!newCode.equals(enterCode)){
+                        if (!newCode.equals(enterCode)) {
                             Toast("两次输入的新密码不一致。")
                             return@setOnClickListener
                         }
                             val userBean = spUtils.getFromJson(
                                 Const.USERINFO, UserBean().javaClass
                             ) as UserBean
-                            viewModel.postEditPwd(userBean.userid,newCode,oldCode)
+                            viewModel.postEditPwd(userBean.userid, newCode, oldCode)
                         } catch (e: Exception) {
 
                         }
             .setAlign(CustomDialog.ALIGN.CENTER).show()
     }
 
-    private fun getTextFlag(code:String?):Boolean{
+    private fun getTextFlag(code: String?): Boolean {
         try {
-            return (!code.isNullOrBlank())&&code.length>=6&&code.length<=16
-        }catch (e:Exception){
+            return (!code.isNullOrBlank()) && code.length >= 6 && code.length <= 16
+        } catch (e: Exception) {
             return false
         }
     }
     override fun onResume() {
         super.onResume()
         userBean?.let {
-            Const.USERID=it.userid
-            Const.USERNAME=it.username.toString()
+            Const.USERID = it.userid
+            Const.USERNAME = it.username.toString()
             viewModel.postDevicesetDetail(it.schoolid)
+            val name=StringBuffer()
+            if (!it.schoolName.isNullOrBlank()){
+                name.append(it.schoolName)
+            }
+            if (!it.classname.isNullOrBlank()){
+                name.append(it.classname)
+            }
+            mBinding.userschoolTv.text =name.toString()
         }
         viewModel.postWallpaperPad()
         viewModel.updateStrategy()
     @SuppressLint("CheckResult")
     private fun getLocation() {
         val rxPermissions = RxPermissions(this)
+        //  Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS
         rxPermissions.request(
-            Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION,
-            Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS
+            Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION
         ).subscribe({
             if (it) {
-                SystemUtil.getLocation(this)
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                    rxPermissions.request(Manifest.permission.ACCESS_BACKGROUND_LOCATION)
+                        .subscribe {
+                            SystemUtil.getLocation(this)
+                        }
+                } else {
+                    SystemUtil.getLocation(this)
+                }
             } else {
                 LogShow("没有权限")
             }
     }
 
     private fun initSchoolSet(schoolDeviceSetBean: SchoolDeviceSetBean? = null) {
-        schoolDeviceSetBean?.let {bean->
+        schoolDeviceSetBean?.let { bean ->
             //是否启用截屏:1是0否
             ManageApplication.enableCaptureScreen(schoolDeviceSetBean.screenshots == 1)
             if (bean.forceBind == 1) {
     }
 
     private fun startTimeTask(bean: SchoolDeviceSetBean) {
-        if (bean.remindDuration==1&&bean.duration>0){
+        if (bean.remindDuration == 1 && bean.duration > 0) {
             //如果设置的有时间则执行任务
             try {
                 timer?.cancel()
-                timer= Timer()
-            }catch (e:Exception){
+                timer = Timer()
+            } catch (e: Exception) {
 
             }
             timer?.let {
-                timer?.schedule( object : TimerTask() {
+                timer?.schedule(object : TimerTask() {
                     override fun run() {
                         // 在这里编写您的定时任务代码
-                        Toast(getString(R.string.durationtips)+"|||"+bean.duration)
+                        Toast(getString(R.string.durationtips) + "|||" + bean.duration)
                     }
-                },bean.duration*60*1000L,bean.duration*60*1000L)
+                }, bean.duration * 60 * 1000L, bean.duration * 60 * 1000L)
             }
         }
         //如果设置的有时间则取消所有任务
-        if (bean.remindDuration!=1){
-            if (timer!=null){
+        if (bean.remindDuration != 1) {
+            if (timer != null) {
                 timer?.cancel()
-                timer=null
+                timer = null
             }
         }
     }
                 data.doEvent = EventLog.USBDISCONNECTEVENT
                 viewModel.eventLog(data)
             }
-            Const.ACCOUNTLOGINOUT->{
+
+            Const.ACCOUNTLOGINOUT -> {
                 loginOut()
             }
         }
     }
 
-    private fun postLogPush(pushType:Int){
-        val pushBean= LogPushBean()
-        pushBean.pushType=pushType
-        pushBean.pushObjid=Const.SCHOOLID
+    private fun postLogPush(pushType: Int) {
+        val pushBean = LogPushBean()
+        pushBean.pushType = pushType
+        pushBean.pushObjid = Const.SCHOOLID
         Const.USERID?.let {
-            pushBean.userids= longArrayOf(it)
+            pushBean.userids = longArrayOf(it)
         }
         Const.USERNAME?.let {
-            pushBean.pushObjname=it
+            pushBean.pushObjname = it
         }
         viewModel.postLogPushAdd(pushBean)
     }
             dataList.addAll(appList)
             if (adapter == null) {
                 adapter = AppAdapter(this, dataList)
-                adapter?.changePwdListener=getChangeCodeListener()
+                adapter?.changePwdListener = getChangeCodeListener()
                 mBinding.rv.adapter = adapter
             }
             adapter?.let {
                     titleTv.text = getString(R.string.exit)
                     enterTv.setOnClickListener {
                         val code = editText.text
-                        if ((!code.isNullOrBlank())&&code.length>=6&&code.length<=16) {
+                        if ((!code.isNullOrBlank()) && code.length >= 6 && code.length <= 16) {
                             dialog.dismiss()
                             try {
                                 val userBean = spUtils.getFromJson(
                         titleTv.text = msgBean.title
                         contentTv.text = msgBean.content
                     } catch (e: Exception) {
-                        LogShow("解析失败"+e.toString())
+                        LogShow("解析失败" + e.toString())
                     }
                     closeBtn.setOnClickListener {
                         dialog.dismiss()
         viewModel.eventLog(data)
         WorkManager.getInstance(this).cancelAllWork()
         deleteSharedPreferences(SharedPreferencesUtils.SP_FILE_NAME)
-        Const.USERID=null
-        Const.USERNAME=""
+        Const.USERID = null
+        Const.USERNAME = ""
         startIntentActivity(LoginActivity().javaClass)
         finish()
     }
 
     override fun onDestroy() {
         super.onDestroy()
-        if (timer!=null){
+        if (timer != null) {
             timer?.cancel()
-            timer=null
+            timer = null
         }
         mMyInstallReceiver?.let {
             unregisterReceiver(it)

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

               ManageApplication.enableMassStorage(true)
               //允许OTG
               ManageApplication.setCustomOTG(true)
+              //关闭网络白名单
+              ManageApplication.setUrlWhiteListEnable(false)
               //设置默认启动器
               ManageApplication.setCustomLauncher("com.tblenovo.launcher","com.android.iotlauncher.IotLauncher")
           }catch (e:Exception){

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

                 android:layout_height="wrap_content"
                 android:layout_marginLeft="21dp"
                 android:layout_marginRight="21dp"
-                android:text="学校"
                 android:textColor="#798CB5"
                 android:textSize="15sp" />
 

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

      */
     const val CURRENTAPPPKG="com.xhkjedu.manageapp"
 
+    /**
+     * 商店包名
+     */
+    const val STOREAPPPKG="com.xhkjedu.xh_control_appstore"
+
     //用户id
     var USERID :Long?= 1L
 

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

 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.location.Location;
+import android.location.LocationListener;
 import android.location.LocationManager;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
     public static Location getLocation(Context context) {
         Location data = null;
         try {
-            LocationManager systemService = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
+            LocationManager locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
                   String bestProvider = "";
-            List<String> providers = systemService.getProviders(true);
+            List<String> providers = locationManager.getProviders(true);
             if (ActivityCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED &&
-                    ActivityCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
+                    ActivityCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED
+               &&ActivityCompat.checkSelfPermission(context,Manifest.permission.ACCESS_BACKGROUND_LOCATION)== PackageManager.PERMISSION_GRANTED
+            ) {
                 for (String provider : providers) {
-                    Location lastKnownLocation = systemService.getLastKnownLocation(provider);
+                    Location lastKnownLocation =locationManager.getLastKnownLocation(provider);
                     if (lastKnownLocation==null){
                         continue;
                     }
         return data;
     }
 
+    // 获取定位信息
+
+
     // 检查屏幕是否允许旋转
     public static boolean isRotationAllowed(Context context) {
         try{