feat(routing): 分流规则子屏 UI(模式/内置/我的规则/添加/冲突提示)

- 新增 RoutingScreen(ConsumerWidget):代理模式段选(全局/智能/直连)→setMode、
  内置规则卡(国内直连开关 + LAN 强制锁定行)、我的规则 ReorderableListView
  (拖动排序→reorder、删除→removeRule)、添加规则弹层(类型 chip + 目标输入 +
  动作段选→addRule)、FINAL 兜底行。非智能分流模式「我的规则」区灰化+忽略提示。
- 冲突提示:①同 type+value 被更靠前规则遮蔽 →「已被上面规则覆盖」(纯本地计算);
  ②自定义 ip_cidr 规则落在私网/回环地址段 → 系统锁定提示(启发式,详见文件头注释
  ——真正的私有服务域名清单未经 API 下发给客户端,是已知缺口)。
- l10n 新增 9 个 key(routingTypeDomain/DomainKeyword/IpCidr/Geoip、
  routingRuleShadowed、routingModeNote、routingRuleValueHint、routingNoRules),
  经 design/i18n/strings.json 单源 + gen_l10n_dart.mjs 生成六语。
- 补生成 pangolin_icons.dart 的 plus 图标(design/prototype/icons.js 已有,
  codegen 之前未跑过)。
- 新增 widget 测试 test/widget/routing_screen_test.dart:模式段选/规则行/添加
  按钮可见、非智能模式灰化、重复规则遮蔽提示,共 3 例。

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
wangjia
2026-07-28 08:51:40 +08:00
parent 057c11eee2
commit d73b6da110
11 changed files with 741 additions and 0 deletions
+8
View File
@@ -649,10 +649,18 @@ abstract class AppText {
String get routingTypeDomainSuffixCi; // 域名后缀 · CI 源 / Domain suffix · CI source
String get routingTypeDomainSuffixMirror; // 域名后缀 · 镜像 / Domain suffix · Mirror
String get routingTypeGeosite; // GeoSite 规则集 / GeoSite rule-set
String get routingTypeDomain; // 域名 / Domain
String get routingTypeDomainKeyword; // 域名关键字 / Domain keyword
String get routingTypeIpCidr; // IP 段(CIDR) / IP range (CIDR)
String get routingTypeGeoip; // GeoIP 规则集 / GeoIP rule-set
String get routingActDirect; // 直连 / Direct
String get routingActProxy; // 走隧道 / Tunnel
String get routingActReject; // 拒绝 / Reject
String get routingForcedRow; // ⚠ 该域名由系统强制走隧道,此规则不生效 / ⚠ Forced to tunnel by the system; this rule is inactive
String get routingRuleShadowed; // 已被上面规则覆盖 / Overridden by a rule above
String get routingModeNote; // 「我的规则」仅在智能分流模式生效说明 / "My rules" only applies in Smart mode note
String get routingRuleValueHint; // 目标输入框占位 / Target input placeholder
String get routingNoRules; // 暂无自定义规则 / No custom rules yet
String get routingAddRule; // 添加规则 / Add rule
String get routingImport; // 从文本导入 / Import from text
String get routingReset; // 重置默认 / Reset defaults
+16
View File
@@ -543,6 +543,14 @@ class StringsEn extends AppText {
@override
String get routingTypeGeosite => 'GeoSite rule-set';
@override
String get routingTypeDomain => 'Domain';
@override
String get routingTypeDomainKeyword => 'Domain keyword';
@override
String get routingTypeIpCidr => 'IP range (CIDR)';
@override
String get routingTypeGeoip => 'GeoIP rule-set';
@override
String get routingActDirect => 'Direct';
@override
String get routingActProxy => 'Tunnel';
@@ -551,6 +559,14 @@ class StringsEn extends AppText {
@override
String get routingForcedRow => '⚠ Forced to tunnel by the system; this rule is inactive';
@override
String get routingRuleShadowed => 'Overridden by a rule above';
@override
String get routingModeNote => '"My rules" only take effect in Smart mode. Global / Direct mode ignores custom rules entirely (system-forced rules still apply).';
@override
String get routingRuleValueHint => 'e.g. example.com or 192.168.1.0/24';
@override
String get routingNoRules => 'No custom rules yet';
@override
String get routingAddRule => 'Add rule';
@override
String get routingImport => 'Import from text';
+16
View File
@@ -543,6 +543,14 @@ class StringsEs extends AppText {
@override
String get routingTypeGeosite => 'Conjunto de reglas GeoSite';
@override
String get routingTypeDomain => 'Dominio';
@override
String get routingTypeDomainKeyword => 'Palabra clave de dominio';
@override
String get routingTypeIpCidr => 'Rango de IP (CIDR)';
@override
String get routingTypeGeoip => 'Conjunto de reglas GeoIP';
@override
String get routingActDirect => 'Directo';
@override
String get routingActProxy => 'Túnel';
@@ -551,6 +559,14 @@ class StringsEs extends AppText {
@override
String get routingForcedRow => '⚠ El sistema fuerza el túnel para este dominio; esta regla no se aplica';
@override
String get routingRuleShadowed => 'Sustituida por una regla anterior';
@override
String get routingModeNote => '"Mis reglas" solo se aplican en modo Inteligente. El modo Global / Directo ignora las reglas personalizadas (las reglas forzadas por el sistema siguen aplicándose).';
@override
String get routingRuleValueHint => 'p. ej. example.com o 192.168.1.0/24';
@override
String get routingNoRules => 'Aún no hay reglas personalizadas';
@override
String get routingAddRule => 'Añadir regla';
@override
String get routingImport => 'Importar desde texto';
+16
View File
@@ -543,6 +543,14 @@ class StringsJa extends AppText {
@override
String get routingTypeGeosite => 'GeoSite ルールセット';
@override
String get routingTypeDomain => 'ドメイン';
@override
String get routingTypeDomainKeyword => 'ドメインキーワード';
@override
String get routingTypeIpCidr => 'IP範囲(CIDR)';
@override
String get routingTypeGeoip => 'GeoIP ルールセット';
@override
String get routingActDirect => '直接接続';
@override
String get routingActProxy => 'トンネル';
@@ -551,6 +559,14 @@ class StringsJa extends AppText {
@override
String get routingForcedRow => '⚠ このドメインはシステムにより強制的にトンネル経由となり、このルールは無効です';
@override
String get routingRuleShadowed => '上のルールに上書きされました';
@override
String get routingModeNote => '「マイルール」はスマート分流モードでのみ有効です。全体プロキシ / 全体直接接続では独自ルールは無視されます(システム強制ルールは引き続き適用)。';
@override
String get routingRuleValueHint => '例:example.com または 192.168.1.0/24';
@override
String get routingNoRules => 'カスタムルールはまだありません';
@override
String get routingAddRule => 'ルールを追加';
@override
String get routingImport => 'テキストから読み込み';
+16
View File
@@ -543,6 +543,14 @@ class StringsKo extends AppText {
@override
String get routingTypeGeosite => 'GeoSite 규칙 세트';
@override
String get routingTypeDomain => '도메인';
@override
String get routingTypeDomainKeyword => '도메인 키워드';
@override
String get routingTypeIpCidr => 'IP 대역(CIDR)';
@override
String get routingTypeGeoip => 'GeoIP 규칙 세트';
@override
String get routingActDirect => '직접 연결';
@override
String get routingActProxy => '터널';
@@ -551,6 +559,14 @@ class StringsKo extends AppText {
@override
String get routingForcedRow => '⚠ 이 도메인은 시스템에 의해 강제로 터널을 사용하며, 이 규칙은 적용되지 않습니다';
@override
String get routingRuleShadowed => '위 규칙에 의해 재정의됨';
@override
String get routingModeNote => '"내 규칙"은 스마트 분산 모드에서만 적용됩니다. 전체 프록시 / 전체 직접 연결에서는 사용자 규칙이 무시됩니다(시스템 강제 규칙은 계속 적용).';
@override
String get routingRuleValueHint => '예: example.com 또는 192.168.1.0/24';
@override
String get routingNoRules => '아직 사용자 규칙이 없습니다';
@override
String get routingAddRule => '규칙 추가';
@override
String get routingImport => '텍스트에서 가져오기';
+16
View File
@@ -543,6 +543,14 @@ class StringsRu extends AppText {
@override
String get routingTypeGeosite => 'Набор правил GeoSite';
@override
String get routingTypeDomain => 'Домен';
@override
String get routingTypeDomainKeyword => 'Ключевое слово домена';
@override
String get routingTypeIpCidr => 'Диапазон IP (CIDR)';
@override
String get routingTypeGeoip => 'Набор правил GeoIP';
@override
String get routingActDirect => 'Напрямую';
@override
String get routingActProxy => 'Туннель';
@@ -551,6 +559,14 @@ class StringsRu extends AppText {
@override
String get routingForcedRow => '⚠ Домен принудительно направлен через туннель системой; правило неактивно';
@override
String get routingRuleShadowed => 'Перекрыто правилом выше';
@override
String get routingModeNote => '«Мои правила» действуют только в режиме умной маршрутизации. Глобальный прокси / прямое соединение игнорируют пользовательские правила (принудительные системные правила по-прежнему применяются).';
@override
String get routingRuleValueHint => 'например, example.com или 192.168.1.0/24';
@override
String get routingNoRules => 'Пользовательских правил пока нет';
@override
String get routingAddRule => 'Добавить правило';
@override
String get routingImport => 'Импорт из текста';
+16
View File
@@ -543,6 +543,14 @@ class StringsZh extends AppText {
@override
String get routingTypeGeosite => 'GeoSite 规则集';
@override
String get routingTypeDomain => '域名';
@override
String get routingTypeDomainKeyword => '域名关键字';
@override
String get routingTypeIpCidr => 'IP 段(CIDR)';
@override
String get routingTypeGeoip => 'GeoIP 规则集';
@override
String get routingActDirect => '直连';
@override
String get routingActProxy => '走隧道';
@@ -551,6 +559,14 @@ class StringsZh extends AppText {
@override
String get routingForcedRow => '⚠ 该域名由系统强制走隧道,此规则不生效';
@override
String get routingRuleShadowed => '已被上面规则覆盖';
@override
String get routingModeNote => '「我的规则」仅在智能分流模式生效;全局代理 / 全部直连为一刀切,忽略自定义规则(系统强制层仍保留)。';
@override
String get routingRuleValueHint => '如 example.com 或 192.168.1.0/24';
@override
String get routingNoRules => '暂无自定义规则';
@override
String get routingAddRule => '添加规则';
@override
String get routingImport => '从文本导入';