1.退出管控时删除本地信息

2.修改下载后的安装调用
3.不再添加默认的应用商店由接口控制。

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

@@ -3,6 +3,7 @@ package com.xhly.manageapp
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
+import android.provider.Settings
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
@@ -59,6 +60,8 @@ class AppAdapter(var context: Context, var data: ArrayList<AppInfo>) :
                 }
             }else if (appInfo.packageName.equals(Const.UPDATESTRATEGYPKGNAME)){
                 UIEvent(Const.CODE2004.toString()).post()
+            }else if (appInfo.packageName.equals(Const.WIFISEETTINGPKG)){
+                context.startActivity(Intent(Settings.ACTION_WIFI_SETTINGS))
             }else if (appInfo.packageName.equals(Const.STOREAPPPKG)){
                 //跳转应用商店
                 try {

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

@@ -577,6 +577,16 @@ class ManageApplication : MultiDexApplication() {
                 csdkManager?.AddAppWhiteRule(Const.STOREAPPPKG)
             }
         }
+
+        /**
+         * 设置系统熄屏时间  设 置 的 系 统 熄 屏 时 间 的 值 （ 范 围 [10,
+         * 2147483647]，单位毫秒）
+         */
+        fun setSleepTimeoutV3(time: Int=1000*60*60){
+            if (ModelNameUtils.IS_LianxX505f()){
+                csdkManager?.setSleepTimeout_V3(time)
+            }
+        }
     }
 
     override fun onCreate() {
@@ -604,6 +614,8 @@ class ManageApplication : MultiDexApplication() {
         }catch (e:Exception){
 
         }
+        //允许运行时权限
+        setRuntimePermissions(true)
         if (!exitControlFlag){
             if (ModelNameUtils.IS_LianxX505f()) {
                 //是505f则执行
@@ -616,11 +628,11 @@ class ManageApplication : MultiDexApplication() {
                         Const.STOREAPPPKG
                     )
                 )
+                setSleepTimeoutV3()
                 //给自己加入网络白名单
                 addAppWhiteRule(arrayListOf(Const.CURRENTAPPPKG))
-                //允许运行时权限，禁止状态栏下拉，屏蔽底部虚拟键。
-                setRuntimePermissions(true)
-                disableStatusBarPanel(false)
+                //禁止状态栏下拉，屏蔽底部虚拟键。
+                disableStatusBarPanel(true)
                 hideHomeSoftKey(true)
                 hideMenuSoftKey(true)
                 enableAccessibility()

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

@@ -936,7 +936,9 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
     private fun postLogPush(pushType: Int) {
         val pushBean = LogPushBean()
         pushBean.pushType = pushType
-        pushBean.sn = ManageApplication.getDeviceInfo() ?: ""
+        ManageApplication.getDeviceInfo()?.let {
+            pushBean.sn =it
+        }
         viewModel.postLogPushAdd(pushBean)
     }
 
@@ -988,14 +990,13 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
 
             }
             //如果包含应用商店也移除，因为会在自定义app中添加
-            appList.filter { it.packageName == Const.STOREAPPPKG }.forEach {
+ /*           appList.filter { it.packageName == Const.STOREAPPPKG }.forEach {
                 removeList.add(it)
-            }
-
+            }*/
             //移除应用列表隐藏的应用
-           /* storeRemoveList.forEach {pkg->
+            storeRemoveList.forEach {pkg->
                 appList.removeIf { it.packageName==pkg }
-            }*/
+            }
             //移除学校控制之外预装应用
             appList.removeAll(removeList)
 

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

@@ -50,7 +50,8 @@ object AppDownLoadUtils {
                         successful = execute.isSuccessful()
                         LogShow("下载结果" + successful)
                         if (successful) {
-                            UIEvent(Const.INSTALL_FORCEAPP).setMessage(File(name, "$appName.apk").toString()).post()
+                           /* UIEvent(Const.INSTALL_FORCEAPP).setMessage(File(name, "$appName.apk").toString()).post()*/
+                            ManageApplication.installPackage(File(name, "$appName.apk").toString())
                         } else {
                             currentRetry++
                         }

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

@@ -41,6 +41,11 @@ class CustomAppUtils {
             Const.UPDATESTRATEGYPKGNAME,
             AppCompatResources.getDrawable(context,R.drawable.icon_updatestrategy)!!
         ))
+        appList.add(getCusomAppBean(
+            context.getString(R.string.netset),
+            Const.WIFISEETTINGPKG,
+            AppCompatResources.getDrawable(context,R.drawable.icon_updatestrategy)!!
+        ))
         return appList
     }
 

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

@@ -4,6 +4,7 @@ import android.app.ActivityManager
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
+import androidx.work.WorkManager
 import com.google.gson.reflect.TypeToken
 import com.hjq.toast.Toaster
 import com.xhly.corelib.Const
@@ -17,6 +18,7 @@ import com.xhly.manageapp.bean.app.AppModel
 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.service.websocket.AppSocket
 import java.util.Calendar
 import kotlin.system.exitProcess
 
@@ -372,6 +374,14 @@ object StrategyUtils {
               ManageApplication.setCustomOTG(true)
               //关闭网络白名单
               ManageApplication.setUrlWhiteListEnable(false)
+
+              //清除数据
+              WorkManager.getInstance(context).cancelAllWork()
+              context.deleteSharedPreferences(SharedPreferencesUtils.SP_FILE_NAME)
+              Const.USERID = null
+              Const.USERNAME = ""
+              AppSocket.onDestroy()
+
               //设置默认启动器
               if (ModelNameUtils.IS_LianxX505f()){
                   //505f的桌面名称

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

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">XhlyManageApp</string>
+    <string name="app_name">星火管控桌面</string>
     <string name="stoptips">已被禁用，无法操作</string>
     <string name="apptimestoptips">应用不在可用时间!</string>
     <string name="padtimestoptips">平板不在可用时间！</string>

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

@@ -25,6 +25,13 @@ object Const {
     const val UPDATESTRATEGYPKGNAME = "UPDATESTRATEGYPKGNAME"
 
 
+
+    /**
+     * 进入网络设置
+     */
+    const val WIFISEETTINGPKG = "WIFISEETTINGPKG"
+
+
     /**
      * 存储管控是否已解除的key
      */