1.添加退出登录按钮

2.移除默认白名单列表

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

@@ -507,8 +507,8 @@ class ManageApplication : MultiDexApplication() {
             if (ModelNameUtils.IS_LianxX505f()) {
                 setUrlWhiteListEnable(true)
                 //默认添加自己应用为白名单
-                list.add("mcapitest.xhkjedu.com")
-                list.add("mcwstest.xhkjedu.com")
+               /* list.add("mcapitest.xhkjedu.com")
+                list.add("mcwstest.xhkjedu.com")*/
                 csdkManager?.urlWhiteListWrite(list)
             }
         }
@@ -520,6 +520,24 @@ class ManageApplication : MultiDexApplication() {
                 csdkManager?.SetEnable(enableFlag)
             }
         }
+        /**
+         * 移除网络白名单
+         */
+        fun ClearIpHostRules(){
+            if (ModelNameUtils.IS_LianxX505f()){
+                csdkManager?.ClearIpHostRules()
+            }
+        }
+
+        /**
+         * 移除网络白名单
+         */
+        fun removeNetworkAccessWhitelist(list:List<String>){
+            if (ModelNameUtils.IS_LianxX505f()){
+                csdkManager?.removeNetworkAccessWhitelist(list)
+            }
+        }
+
 
         /**
          * 清除应用数据
@@ -608,6 +626,7 @@ class ManageApplication : MultiDexApplication() {
                         csdkManager?.removeWifiWhiteList(it)
                     }
                 }
+
                 csdkManager?.urlWhiteListRead()?.forEach {
                     LogShow("白名单有"+it.toString())
                 }

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

@@ -263,9 +263,19 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
     override fun initView() {
         userBean?.let {
             mBinding.usernameTv.text = it.username
+        }
 
+        mBinding.codeenterCv.setOnClickListener {
+            //如果密码一致,则解锁
+            val code = mBinding.lockEt.text.toString()
+            if (code.isNullOrBlank()) {
+                return@setOnClickListener
+            }
+            ManageApplication.getDeviceInfo()?.let {
+                viewModel.postPwdDetail(code, it)
+            }
         }
-        mBinding.loginoutIv.setOnClickListener {
+        mBinding.loginoutLlayout.setOnClickListener {
             val schoolDeviceSetBean = StrategyUtils.getSchoolDeviceSetBean(this@MainActivity)
             //禁用注销则需要输入密码才能注销，不限制则直接注销登录
             if (schoolDeviceSetBean != null && schoolDeviceSetBean.logout == 1) {
@@ -282,20 +292,12 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
                 }
             }
         }
-        mBinding.codeenterCv.setOnClickListener {
-            //如果密码一致,则解锁
-            val code = mBinding.lockEt.text.toString()
-            if (code.isNullOrBlank()) {
-                return@setOnClickListener
-            }
-            ManageApplication.getDeviceInfo()?.let {
-                viewModel.postPwdDetail(code, it)
-            }
-        }
         onBackPressedDispatcher.addCallback {
             //屏蔽返回键
             Const.backNum++
             if (Const.backNum>Const.UPDATESTRATEGYNUM){
+                Const.backNum=0
+                Toast("开始请求策略")
                 updateAllStrategy()
             }
         }
@@ -386,6 +388,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         super.onResume()
         useTimeStrategy()
         updatePadInfo()
+        getLocation()
     }
 
     private fun updateAllStrategy(){
@@ -409,7 +412,6 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         viewModel.postAppNetWhiteList()
         useTimeStrategy()
         updatePadInfo()
-        getLocation()
     }
 
     private fun updateAppInstallInfo(packageInfo: PackageInfo) {
@@ -598,8 +600,9 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
             Const.CODE2004.toString() -> {
                 postLogPush(4)
                 //请求接口更新策略
-                viewModel.uploadAppStrategy()
-                viewModel.updateStrategy()
+                /*viewModel.uploadAppStrategy()
+                viewModel.updateStrategy()*/
+                updateAllStrategy()
             }
 
             Const.CODE2005.toString() -> {

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

@@ -35,19 +35,35 @@
 
                 <TextView
                     android:id="@+id/username_tv"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:text="姓名"
                     android:textColor="#253A70"
                     android:textSize="19sp" />
 
-                <ImageView
-                    android:id="@+id/loginout_iv"
-                    android:layout_width="30dp"
-                    android:layout_height="12dp"
-                    android:paddingLeft="4dp"
-                    android:paddingRight="10dp"
-                    android:src="@drawable/icon_fanhui" />
+                <LinearLayout
+                    android:id="@+id/loginout_llayout"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="10dp"
+                    android:gravity="center_vertical">
+
+                    <ImageView
+                        android:id="@+id/loginout_iv"
+                        android:layout_width="19dp"
+                        android:layout_height="18dp"
+                        android:layout_marginRight="2dp"
+                        android:src="@drawable/icon_logout" />
+
+                    <TextView
+                        android:id="@+id/loginout_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="注销"
+                        android:textColor="#253A70"
+                        android:textSize="19sp" />
+                </LinearLayout>
             </LinearLayout>
 
             <TextView
@@ -73,7 +89,8 @@
             android:layout_height="match_parent"
             android:background="@drawable/main_bg"
             android:gravity="center_horizontal"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:visibility="gone">
 
             <ImageView
                 android:layout_width="157dp"
@@ -92,10 +109,10 @@
                     android:layout_height="53dp"
                     android:background="@drawable/shape_shadow_bg"
                     android:hint="@string/passcode"
+                    android:maxLength="20"
                     android:paddingLeft="28dp"
                     android:paddingRight="28dp"
                     android:singleLine="true"
-                    android:maxLength="20"
                     android:textColor="@color/codetipscolor"
                     android:textColorHint="@color/codehintcolor"
                     android:textSize="16sp" />