优化德国和英国 VoWiFi 规则，简化条件表达式

rule/WiFiCalling/DE/DE.list

@@ -1,5 +1,3 @@
 # 德国 VoWiFi / ePDG
-AND,((GEOIP,DE),(AND,((PROTOCOL,UDP),(OR,((DEST-PORT,500),(DEST-PORT,4500)))))))
+AND,((GEOIP,DE),(PROTOCOL,UDP),(OR,((DEST-PORT,500),(DEST-PORT,4500))))
-
+DOMAIN-KEYWORD,mcc262
-# 沃达丰
-DOMAIN-KEYWORD, mcc262

rule/WiFiCalling/DE/DE.yaml

@@ -1,6 +1,4 @@
 payload:
   # 德国 VoWiFi / ePDG
-  - AND,((GEOIP,DE),(AND,((PROTOCOL,UDP),(OR,((DEST-PORT,500),(DEST-PORT,4500)))))))
+  - AND,((GEOIP,DE),(NETWORK,UDP),(OR,((DST-PORT,500),(DST-PORT,4500))))
-
-  # 沃达丰
   - DOMAIN-KEYWORD, mcc262

rule/WiFiCalling/UK/UK.list

@@ -2,10 +2,10 @@
 # DOMAIN-SUFFIX,gspe1-ssl.ls.apple.com
 
 # 英国 VoWiFi / ePDG
-AND,((GEOIP,GB),(AND,((PROTOCOL,UDP),(OR,((DEST-PORT,500),(DEST-PORT,4500)))))))
+AND,((GEOIP,GB),(PROTOCOL,UDP),(OR,((DEST-PORT,500),(DEST-PORT,4500))))
+DOMAIN-KEYWORD, mcc234
 
 # 沃达丰 / VOXI
-DOMAIN-KEYWORD, mcc234
 DOMAIN-SUFFIX, entsrv-uk.vodafone.com
 DOMAIN-SUFFIX, vuk-gto.prod.ondemandconnectivity.com
 IP-CIDR, 88.82.0.0/19,no-resolve

rule/WiFiCalling/UK/UK.yaml

@@ -3,10 +3,10 @@ payload:
   # - DOMAIN-SUFFIX,gspe1-ssl.ls.apple.com
 
   # 英国 VoWiFi / ePDG
-  - AND,((GEOIP,GB),(AND,((PROTOCOL,UDP),(OR,((DEST-PORT,500),(DEST-PORT,4500)))))))
+  - AND,((GEOIP,GB),(NETWORK,UDP),(OR,((DST-PORT,500),(DST-PORT,4500))))
+  - DOMAIN-KEYWORD, mcc234
 
   # 沃达丰 / VOXI
-  - DOMAIN-KEYWORD, mcc234
   - DOMAIN-SUFFIX, entsrv-uk.vodafone.com
   - DOMAIN-SUFFIX, vuk-gto.prod.ondemandconnectivity.com
   - IP-CIDR, 88.82.0.0/19,no-resolve