Browse Source

1.修改自定义AfwUtils名为TB23FCAfwUtils

2.添加新的防火墙aar
2025_1_17_tb223fc
wangwanlei 2 weeks ago
parent
commit
6006d8f429

BIN
app/libs/AFW_SDK-release.aar View File


+ 18
- 16
app/src/main/java/com/xhly/manageapp/ManageApplication.kt View File

15
 import com.kongzue.dialogx.DialogX
15
 import com.kongzue.dialogx.DialogX
16
 import com.tencent.bugly.crashreport.CrashReport
16
 import com.tencent.bugly.crashreport.CrashReport
17
 import com.xhly.corelib.Const
17
 import com.xhly.corelib.Const
18
-import com.xhly.corelib.utils.AppUtils
19
 import com.xhly.corelib.utils.LogShow
18
 import com.xhly.corelib.utils.LogShow
20
 import com.xhly.corelib.utils.LogUtils
19
 import com.xhly.corelib.utils.LogUtils
21
 import com.xhly.corelib.utils.ModelNameUtils
20
 import com.xhly.corelib.utils.ModelNameUtils
23
 import com.xhly.corelib.utils.SystemUtil
22
 import com.xhly.corelib.utils.SystemUtil
24
 import com.xhly.manageapp.bean.user.UserBean
23
 import com.xhly.manageapp.bean.user.UserBean
25
 import com.xhly.manageapp.service.websocket.AppSocket
24
 import com.xhly.manageapp.service.websocket.AppSocket
26
-import com.xhly.manageapp.utils.AfwUtils
25
+import com.xhly.manageapp.utils.TB23FCAfwUtils
27
 import com.xhly.manageapp.utils.CurrentAppSharedPreferencesUtils
26
 import com.xhly.manageapp.utils.CurrentAppSharedPreferencesUtils
28
 import com.xhly.manageapp.utils.StrategyUtils
27
 import com.xhly.manageapp.utils.StrategyUtils
29
 import com.xhly.manageapp.utils.ZJAPPUtils
28
 import com.xhly.manageapp.utils.ZJAPPUtils
45
                 //先移除,再添加。
44
                 //先移除,再添加。
46
                 removeInstallPackageWhiteList(getInstallPackageWhiteList())
45
                 removeInstallPackageWhiteList(getInstallPackageWhiteList())
47
                 pkgList.add(Const.CURRENTAPPPKG)
46
                 pkgList.add(Const.CURRENTAPPPKG)
48
-                pkgList.add(Const.CURRENTAPPPKG)
47
+                pkgList.add(Const.STOREAPPPKG)
49
                 pkgList.add("com.xhkjedu.pinyin")
48
                 pkgList.add("com.xhkjedu.pinyin")
50
                 csdkManager?.addInstallPackageWhiteList(pkgList)
49
                 csdkManager?.addInstallPackageWhiteList(pkgList)
51
             }
50
             }
290
          *禁用/启用OTG true:允许连接外部OTG
289
          *禁用/启用OTG true:允许连接外部OTG
291
          */
290
          */
292
         fun setCustomOTG(enableFlag: Boolean) {
291
         fun setCustomOTG(enableFlag: Boolean) {
293
-            if (ModelNameUtils.IS_LianxX505f() || ModelNameUtils.IS_LianxX6e6f()|| ModelNameUtils.IS_LianxTB223FC()) {
294
-                //csdkManager?.customOTG = enableFlag
292
+            if (ModelNameUtils.IS_LianxX505f() || ModelNameUtils.IS_LianxX6e6f()) {
293
+                csdkManager?.customOTG = enableFlag
294
+            }else if (ModelNameUtils.IS_LianxTB223FC()){
295
+                //223FC使用这个方法和拦截存储卡方法一致。
296
+                enableMassStorage(enableFlag)
295
             }
297
             }
296
         }
298
         }
297
 
299
 
629
                 list.add(Const.BASEURL)
631
                 list.add(Const.BASEURL)
630
                 list.addAll(Const.whiteList)
632
                 list.addAll(Const.whiteList)
631
                 if (ModelNameUtils.IS_LianxTB223FC()){
633
                 if (ModelNameUtils.IS_LianxTB223FC()){
632
-                  AfwUtils.addUrLWhiteList(list)
633
-                  AfwUtils.addUrLBlackList(arrayListOf("*"))
634
+                  TB23FCAfwUtils.addUrLWhiteList(list)
635
+                  TB23FCAfwUtils.addUrLBlackList(arrayListOf("*"))
634
                 }else{
636
                 }else{
635
                     csdkManager?.urlWhiteListWrite(list)
637
                     csdkManager?.urlWhiteListWrite(list)
636
                     csdkManager?.urlBlackListWrite(arrayListOf("*"))
638
                     csdkManager?.urlBlackListWrite(arrayListOf("*"))
652
                 list.add(Const.BASEURL)
654
                 list.add(Const.BASEURL)
653
                 list.addAll(Const.whiteList)
655
                 list.addAll(Const.whiteList)
654
                 if (ModelNameUtils.IS_LianxTB223FC()){
656
                 if (ModelNameUtils.IS_LianxTB223FC()){
655
-                    AfwUtils.addUrLWhiteList(list)
656
-                    AfwUtils.addUrLBlackList(arrayListOf("*"))
657
+                    TB23FCAfwUtils.addUrLWhiteList(list)
658
+                    TB23FCAfwUtils.addUrLBlackList(arrayListOf("*"))
657
                 }else{
659
                 }else{
658
                     csdkManager?.urlWhiteListWrite(list)
660
                     csdkManager?.urlWhiteListWrite(list)
659
                     csdkManager?.urlBlackListWrite(arrayListOf("*"))
661
                     csdkManager?.urlBlackListWrite(arrayListOf("*"))
667
         fun setUrlWhiteListEnable(enableFlag: Boolean) {
669
         fun setUrlWhiteListEnable(enableFlag: Boolean) {
668
             if (ModelNameUtils.IS_LianxX505f() || ModelNameUtils.IS_LianxX6e6f()|| ModelNameUtils.IS_LianxTB223FC()) {
670
             if (ModelNameUtils.IS_LianxX505f() || ModelNameUtils.IS_LianxX6e6f()|| ModelNameUtils.IS_LianxTB223FC()) {
669
                 if (ModelNameUtils.IS_LianxTB223FC()){
671
                 if (ModelNameUtils.IS_LianxTB223FC()){
670
-                    AfwUtils.setEnable(enableFlag)
672
+                    TB23FCAfwUtils.setEnable(enableFlag)
671
                 }else{
673
                 }else{
672
                     csdkManager?.SetEnable(enableFlag)
674
                     csdkManager?.SetEnable(enableFlag)
673
                 }
675
                 }
680
         fun ClearIpHostRules(): Boolean {
682
         fun ClearIpHostRules(): Boolean {
681
             if (ModelNameUtils.IS_LianxX505f() || ModelNameUtils.IS_LianxX6e6f()|| ModelNameUtils.IS_LianxTB223FC()) {
683
             if (ModelNameUtils.IS_LianxX505f() || ModelNameUtils.IS_LianxX6e6f()|| ModelNameUtils.IS_LianxTB223FC()) {
682
                 if (ModelNameUtils.IS_LianxTB223FC()){
684
                 if (ModelNameUtils.IS_LianxTB223FC()){
683
-                    AfwUtils.clearIpHostRules()
685
+                    TB23FCAfwUtils.clearIpHostRules()
684
                 }else{
686
                 }else{
685
                     val clearIpHostRules = csdkManager?.ClearIpHostRules()
687
                     val clearIpHostRules = csdkManager?.ClearIpHostRules()
686
                     clearIpHostRules?.let {
688
                     clearIpHostRules?.let {
734
                 if (ModelNameUtils.IS_LianxTB223FC()){
736
                 if (ModelNameUtils.IS_LianxTB223FC()){
735
                   try {
737
                   try {
736
                       pkgList.forEach {
738
                       pkgList.forEach {
737
-                          AfwUtils.jurisdiction(1,AfwUtils.getUUid(instance!!,it).toInt())
739
+                          TB23FCAfwUtils.jurisdiction(1,TB23FCAfwUtils.getUUid(instance!!,it).toInt())
738
                       }
740
                       }
739
                   }catch (e:Exception){
741
                   }catch (e:Exception){
740
 
742
 
753
         fun clearAppWhiteRule() {
755
         fun clearAppWhiteRule() {
754
             if (ModelNameUtils.IS_LianxX505f() || ModelNameUtils.IS_LianxX6e6f()|| ModelNameUtils.IS_LianxTB223FC()) {
756
             if (ModelNameUtils.IS_LianxX505f() || ModelNameUtils.IS_LianxX6e6f()|| ModelNameUtils.IS_LianxTB223FC()) {
755
                 if (ModelNameUtils.IS_LianxTB223FC()){
757
                 if (ModelNameUtils.IS_LianxTB223FC()){
756
-                    AfwUtils.clearAppRules()
758
+                    TB23FCAfwUtils.clearAppRules()
757
                 }else{
759
                 }else{
758
                     csdkManager?.ClearAppRules()
760
                     csdkManager?.ClearAppRules()
759
                     //不移除自己和商店
761
                     //不移除自己和商店
772
             if (ModelNameUtils.IS_LianxX505f() || ModelNameUtils.IS_LianxX6e6f()|| ModelNameUtils.IS_LianxTB223FC()) {
774
             if (ModelNameUtils.IS_LianxX505f() || ModelNameUtils.IS_LianxX6e6f()|| ModelNameUtils.IS_LianxTB223FC()) {
773
                 if (ModelNameUtils.IS_LianxTB223FC()){
775
                 if (ModelNameUtils.IS_LianxTB223FC()){
774
                     instance?.let {
776
                     instance?.let {
775
-                        appList.addAll(AfwUtils.getNetAppWhiteList(it))
777
+                        appList.addAll(TB23FCAfwUtils.getNetAppWhiteList(it))
776
                     }
778
                     }
777
                 }else{
779
                 }else{
778
                     val appWhiteRules = csdkManager?.appWhiteRules
780
                     val appWhiteRules = csdkManager?.appWhiteRules
802
         fun urlWhiteListRead(): List<String> {
804
         fun urlWhiteListRead(): List<String> {
803
             if (ModelNameUtils.IS_LianxX505f() || ModelNameUtils.IS_LianxX6e6f()|| ModelNameUtils.IS_LianxTB223FC()) {
805
             if (ModelNameUtils.IS_LianxX505f() || ModelNameUtils.IS_LianxX6e6f()|| ModelNameUtils.IS_LianxTB223FC()) {
804
                 if (ModelNameUtils.IS_LianxTB223FC()){
806
                 if (ModelNameUtils.IS_LianxTB223FC()){
805
-                    return AfwUtils.getUrlWhiteList()
807
+                    return TB23FCAfwUtils.getUrlWhiteList()
806
                 }else{
808
                 }else{
807
                     csdkManager?.urlWhiteListRead()?.let {
809
                     csdkManager?.urlWhiteListRead()?.let {
808
                         return it
810
                         return it
926
             Toaster.init(this)
928
             Toaster.init(this)
927
             DialogX.init(this)
929
             DialogX.init(this)
928
             if (ModelNameUtils.IS_LianxTB223FC()){
930
             if (ModelNameUtils.IS_LianxTB223FC()){
929
-                AfwUtils.startBindService(this)
931
+                TB23FCAfwUtils.startBindService(this)
930
             }
932
             }
931
             if (ModelNameUtils.IS_LianxX505f() || ModelNameUtils.IS_LianxX6e6f()|| ModelNameUtils.IS_LianxTB223FC()) {
933
             if (ModelNameUtils.IS_LianxX505f() || ModelNameUtils.IS_LianxX6e6f()|| ModelNameUtils.IS_LianxTB223FC()) {
932
                 csdkManager = CSDKManager(this)
934
                 csdkManager = CSDKManager(this)

+ 1
- 0
app/src/main/java/com/xhly/manageapp/ui/login/activity/LoginActivity.kt View File

164
         }
164
         }
165
         mBinding.netsetLlayout.setOnClickListener {
165
         mBinding.netsetLlayout.setOnClickListener {
166
             val intent = Intent(Settings.ACTION_WIFI_SETTINGS)
166
             val intent = Intent(Settings.ACTION_WIFI_SETTINGS)
167
+            intent.putExtra("full_screen",true)
167
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
168
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
168
             startActivity(intent)
169
             startActivity(intent)
169
         }
170
         }

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

13
 import com.xhly.corelib.utils.AppUtils
13
 import com.xhly.corelib.utils.AppUtils
14
 
14
 
15
 
15
 
16
-object AfwUtils {
16
+object TB23FCAfwUtils {
17
     var TAG = "AFW_TEST"
17
     var TAG = "AFW_TEST"
18
     val PACKAGE_NAME = "cn.com.microtrust.firewall"
18
     val PACKAGE_NAME = "cn.com.microtrust.firewall"
19
     val ACTION = "cn.com.microtrust.firewall.IAFWService"
19
     val ACTION = "cn.com.microtrust.firewall.IAFWService"

Loading…
Cancel
Save