1.修改自定义AfwUtils名为TB23FCAfwUtils

2.添加新的防火墙aar

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

@@ -15,7 +15,6 @@ import com.hjq.toast.Toaster
 import com.kongzue.dialogx.DialogX
 import com.tencent.bugly.crashreport.CrashReport
 import com.xhly.corelib.Const
-import com.xhly.corelib.utils.AppUtils
 import com.xhly.corelib.utils.LogShow
 import com.xhly.corelib.utils.LogUtils
 import com.xhly.corelib.utils.ModelNameUtils
@@ -23,7 +22,7 @@ import com.xhly.corelib.utils.SharedPreferencesUtils
 import com.xhly.corelib.utils.SystemUtil
 import com.xhly.manageapp.bean.user.UserBean
 import com.xhly.manageapp.service.websocket.AppSocket
-import com.xhly.manageapp.utils.AfwUtils
+import com.xhly.manageapp.utils.TB23FCAfwUtils
 import com.xhly.manageapp.utils.CurrentAppSharedPreferencesUtils
 import com.xhly.manageapp.utils.StrategyUtils
 import com.xhly.manageapp.utils.ZJAPPUtils
@@ -45,7 +44,7 @@ class ManageApplication : MultiDexApplication() {
                 //先移除，再添加。
                 removeInstallPackageWhiteList(getInstallPackageWhiteList())
                 pkgList.add(Const.CURRENTAPPPKG)
-                pkgList.add(Const.CURRENTAPPPKG)
+                pkgList.add(Const.STOREAPPPKG)
                 pkgList.add("com.xhkjedu.pinyin")
                 csdkManager?.addInstallPackageWhiteList(pkgList)
             }
@@ -290,8 +289,11 @@ class ManageApplication : MultiDexApplication() {
          *禁用/启用OTG true：允许连接外部OTG
          */
         fun setCustomOTG(enableFlag: Boolean) {
-            if (ModelNameUtils.IS_LianxX505f() || ModelNameUtils.IS_LianxX6e6f()|| ModelNameUtils.IS_LianxTB223FC()) {
-                //csdkManager?.customOTG = enableFlag
+            if (ModelNameUtils.IS_LianxX505f() || ModelNameUtils.IS_LianxX6e6f()) {
+                csdkManager?.customOTG = enableFlag
+            }else if (ModelNameUtils.IS_LianxTB223FC()){
+                //223FC使用这个方法和拦截存储卡方法一致。
+                enableMassStorage(enableFlag)
             }
         }
 
@@ -629,8 +631,8 @@ class ManageApplication : MultiDexApplication() {
                 list.add(Const.BASEURL)
                 list.addAll(Const.whiteList)
                 if (ModelNameUtils.IS_LianxTB223FC()){
-                  AfwUtils.addUrLWhiteList(list)
-                  AfwUtils.addUrLBlackList(arrayListOf("*"))
+                  TB23FCAfwUtils.addUrLWhiteList(list)
+                  TB23FCAfwUtils.addUrLBlackList(arrayListOf("*"))
                 }else{
                     csdkManager?.urlWhiteListWrite(list)
                     csdkManager?.urlBlackListWrite(arrayListOf("*"))
@@ -652,8 +654,8 @@ class ManageApplication : MultiDexApplication() {
                 list.add(Const.BASEURL)
                 list.addAll(Const.whiteList)
                 if (ModelNameUtils.IS_LianxTB223FC()){
-                    AfwUtils.addUrLWhiteList(list)
-                    AfwUtils.addUrLBlackList(arrayListOf("*"))
+                    TB23FCAfwUtils.addUrLWhiteList(list)
+                    TB23FCAfwUtils.addUrLBlackList(arrayListOf("*"))
                 }else{
                     csdkManager?.urlWhiteListWrite(list)
                     csdkManager?.urlBlackListWrite(arrayListOf("*"))
@@ -667,7 +669,7 @@ class ManageApplication : MultiDexApplication() {
         fun setUrlWhiteListEnable(enableFlag: Boolean) {
             if (ModelNameUtils.IS_LianxX505f() || ModelNameUtils.IS_LianxX6e6f()|| ModelNameUtils.IS_LianxTB223FC()) {
                 if (ModelNameUtils.IS_LianxTB223FC()){
-                    AfwUtils.setEnable(enableFlag)
+                    TB23FCAfwUtils.setEnable(enableFlag)
                 }else{
                     csdkManager?.SetEnable(enableFlag)
                 }
@@ -680,7 +682,7 @@ class ManageApplication : MultiDexApplication() {
         fun ClearIpHostRules(): Boolean {
             if (ModelNameUtils.IS_LianxX505f() || ModelNameUtils.IS_LianxX6e6f()|| ModelNameUtils.IS_LianxTB223FC()) {
                 if (ModelNameUtils.IS_LianxTB223FC()){
-                    AfwUtils.clearIpHostRules()
+                    TB23FCAfwUtils.clearIpHostRules()
                 }else{
                     val clearIpHostRules = csdkManager?.ClearIpHostRules()
                     clearIpHostRules?.let {
@@ -734,7 +736,7 @@ class ManageApplication : MultiDexApplication() {
                 if (ModelNameUtils.IS_LianxTB223FC()){
                   try {
                       pkgList.forEach {
-                          AfwUtils.jurisdiction(1,AfwUtils.getUUid(instance!!,it).toInt())
+                          TB23FCAfwUtils.jurisdiction(1,TB23FCAfwUtils.getUUid(instance!!,it).toInt())
                       }
                   }catch (e:Exception){
 
@@ -753,7 +755,7 @@ class ManageApplication : MultiDexApplication() {
         fun clearAppWhiteRule() {
             if (ModelNameUtils.IS_LianxX505f() || ModelNameUtils.IS_LianxX6e6f()|| ModelNameUtils.IS_LianxTB223FC()) {
                 if (ModelNameUtils.IS_LianxTB223FC()){
-                    AfwUtils.clearAppRules()
+                    TB23FCAfwUtils.clearAppRules()
                 }else{
                     csdkManager?.ClearAppRules()
                     //不移除自己和商店
@@ -772,7 +774,7 @@ class ManageApplication : MultiDexApplication() {
             if (ModelNameUtils.IS_LianxX505f() || ModelNameUtils.IS_LianxX6e6f()|| ModelNameUtils.IS_LianxTB223FC()) {
                 if (ModelNameUtils.IS_LianxTB223FC()){
                     instance?.let {
-                        appList.addAll(AfwUtils.getNetAppWhiteList(it))
+                        appList.addAll(TB23FCAfwUtils.getNetAppWhiteList(it))
                     }
                 }else{
                     val appWhiteRules = csdkManager?.appWhiteRules
@@ -802,7 +804,7 @@ class ManageApplication : MultiDexApplication() {
         fun urlWhiteListRead(): List<String> {
             if (ModelNameUtils.IS_LianxX505f() || ModelNameUtils.IS_LianxX6e6f()|| ModelNameUtils.IS_LianxTB223FC()) {
                 if (ModelNameUtils.IS_LianxTB223FC()){
-                    return AfwUtils.getUrlWhiteList()
+                    return TB23FCAfwUtils.getUrlWhiteList()
                 }else{
                     csdkManager?.urlWhiteListRead()?.let {
                         return it
@@ -926,7 +928,7 @@ class ManageApplication : MultiDexApplication() {
             Toaster.init(this)
             DialogX.init(this)
             if (ModelNameUtils.IS_LianxTB223FC()){
-                AfwUtils.startBindService(this)
+                TB23FCAfwUtils.startBindService(this)
             }
             if (ModelNameUtils.IS_LianxX505f() || ModelNameUtils.IS_LianxX6e6f()|| ModelNameUtils.IS_LianxTB223FC()) {
                 csdkManager = CSDKManager(this)

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

@@ -164,6 +164,7 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
         }
         mBinding.netsetLlayout.setOnClickListener {
             val intent = Intent(Settings.ACTION_WIFI_SETTINGS)
+            intent.putExtra("full_screen",true)
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
             startActivity(intent)
         }

app/src/main/java/com/xhly/manageapp/utils/AfwUtils.kt → app/src/main/java/com/xhly/manageapp/utils/TB23FCAfwUtils.kt

@@ -13,7 +13,7 @@ import cn.com.microtrust.firewall.aidl.IAFWService
 import com.xhly.corelib.utils.AppUtils
 
 
-object AfwUtils {
+object TB23FCAfwUtils {
     var TAG = "AFW_TEST"
     val PACKAGE_NAME = "cn.com.microtrust.firewall"
     val ACTION = "cn.com.microtrust.firewall.IAFWService"