1.修改添加和获取APP网络白名单列表的方法。

2.修改获得网址白名单列表的方法。

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

@@ -735,9 +735,7 @@ class ManageApplication : MultiDexApplication() {
             if (ModelNameUtils.IS_LianxX505f() || ModelNameUtils.IS_LianxX6e6f()|| ModelNameUtils.IS_LianxTB223FC()) {
                 if (ModelNameUtils.IS_LianxTB223FC()){
                   try {
-                      pkgList.forEach {
-                          TB23FCAfwUtils.jurisdiction(1,TB23FCAfwUtils.getUUid(instance!!,it).toInt())
-                      }
+                      TB23FCAfwUtils.addAppWhiteList(pkgList, instance!!)
                   }catch (e:Exception){
 
                   }

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

@@ -9,6 +9,7 @@ import android.content.pm.PackageManager
 import android.os.Bundle
 import android.os.IBinder
 import android.util.Log
+import cn.com.microtrust.firewall.afw.AFWUtils
 import cn.com.microtrust.firewall.aidl.IAFWService
 import com.xhly.corelib.utils.AppUtils
 
@@ -77,49 +78,31 @@ object TB23FCAfwUtils {
 
        }
     }
-    fun getNetAppBlockList():String{
-        val sb=StringBuffer()
-        sb.append("黑名单应用")
+
+    //添加app白名单 2025.3.18
+    fun addAppWhiteList(appList:List<String>,context: Context){
         try {
             if (iafwService != null) {
-                val afwRes = iafwService!!.blackRules
-                val data = afwRes.data
-                for (i in data.indices) {
-                    Log.i(TAG, "blackRules=" + data[i])
-                    sb.append(data[i])
+                appList.forEach {app->
+                    AFWUtils.addAppWhiteRule(context, iafwService,app)
                 }
             } else {
                 Log.i(TAG, "iafwService=null")
-                sb.append("iafwService=null")
             }
         } catch (e: java.lang.Exception) {
             e.printStackTrace()
             Log.e(TAG, e.toString())
-            sb.append("有问题$e")
         }
-        return sb.toString()
     }
+    /**
+     * 使用新方法获得app白名单 2025.3.18
+     */
     fun getNetAppWhiteList(context: Context):ArrayList<String>{
         val appList= arrayListOf<String>()
         try {
-            var getAllAppList = AppUtils.GetAllAppList(context)
             if (iafwService != null) {
-                val afwRes = iafwService!!.whiteRules
-                val data = afwRes.data
-                for (i in data.indices) {
-                    Log.i(TAG, "whiteRules=" + data[i])
-                    try {
-                        //转换成功则认为是APP否则是网址
-                        val toInt = data[i].toInt()
-                        getAllAppList.forEach { appInfo ->
-                            if (getUUid(context,appInfo.packageName).toInt() == toInt) {
-                                appList.add(appInfo.packageName)
-                            }
-                        }
-                    }catch (e:Exception){
-
-                    }
-                }
+                val appWhiteRules = AFWUtils.getAppWhiteRules(context, iafwService)
+                appList.addAll(appWhiteRules)
             } else {
                 Log.i(TAG, "iafwService=null")
             }
@@ -130,34 +113,30 @@ object TB23FCAfwUtils {
         return appList
     }
 
-    /**
-     * 获得网址白名单
-     */
-    fun getUrlWhiteList():ArrayList<String>{
-        val urlList= arrayListOf<String>()
+    fun getNetAppBlockList():String{
+        val sb=StringBuffer()
+        sb.append("黑名单应用")
         try {
             if (iafwService != null) {
-                val afwRes = iafwService!!.whiteRules
+                val afwRes = iafwService!!.blackRules
                 val data = afwRes.data
                 for (i in data.indices) {
-                    Log.i(TAG, "whiteRules=" + data[i])
-                    try {
-                        //转换成功则认为是APP否则是网址
-                        data[i].toInt()
-                    }catch (e:Exception){
-                        urlList.add(data[i])
-                    }
+                    Log.i(TAG, "blackRules=" + data[i])
+                    sb.append(data[i])
                 }
             } else {
                 Log.i(TAG, "iafwService=null")
+                sb.append("iafwService=null")
             }
         } catch (e: java.lang.Exception) {
             e.printStackTrace()
             Log.e(TAG, e.toString())
+            sb.append("有问题$e")
         }
-        return urlList
+        return sb.toString()
     }
 
+
     /**
      * 添加网址白名单
      */
@@ -177,6 +156,27 @@ object TB23FCAfwUtils {
         }
     }
 
+    /**
+     * 获得网址白名单
+     */
+    fun getUrlWhiteList():ArrayList<String>{
+        val urlList= arrayListOf<String>()
+        try {
+            if (iafwService != null) {
+                val whiteRules = AFWUtils.getWhiteRules(iafwService)
+                urlList.addAll(whiteRules)
+            } else {
+                Log.i(TAG, "iafwService=null")
+            }
+        } catch (e: java.lang.Exception) {
+            e.printStackTrace()
+            Log.e(TAG, e.toString())
+        }
+        return urlList
+    }
+
+
+
     /**
      * 添加网址黑名单
      */