flu-cli-core 1.0.5 → 1.1.1

package/templates/core_files/network/interceptors/global_params_interceptor.dart.template

@@ -0,0 +1,77 @@
+import 'package:dio/dio.dart';
+import 'package:flutter/foundation.dart';
+
+/// 全局参数自动注入拦截器。
+class GlobalParamsInterceptor extends Interceptor {
+  GlobalParamsInterceptor({
+    required this.getParams,
+    this.injectToData = true,
+  });
+
+  final Map<String, dynamic> Function() getParams;
+  final bool injectToData;
+
+  static bool _isGetLike(String? method) {
+    final m = (method ?? 'GET').toUpperCase();
+    return m == 'GET' || m == 'HEAD';
+  }
+
+  void _mergeIntoQuery(RequestOptions options, Map<String, dynamic> params) {
+    final newQueryParams = Map<String, dynamic>.from(options.queryParameters);
+    newQueryParams.addAll(params);
+    options.queryParameters = newQueryParams;
+  }
+
+  void _mergeIntoBody(RequestOptions options, Map<String, dynamic> params) {
+    if (options.data == null) {
+      options.data = Map<String, dynamic>.from(params);
+      return;
+    }
+    if (options.data is Map) {
+      final newData = Map<String, dynamic>.from(options.data as Map);
+      newData.addAll(params);
+      options.data = newData;
+      return;
+    }
+    if (options.data is FormData) {
+      final formData = options.data as FormData;
+      for (final entry in params.entries) {
+        formData.fields.add(MapEntry(entry.key, entry.value?.toString() ?? ''));
+      }
+      return;
+    }
+    assert(() {
+      debugPrint(
+        'GlobalParamsInterceptor: 未注入全局参数，body 类型 '
+        '${options.data.runtimeType} 不支持合并',
+      );
+      return true;
+    }());
+  }
+
+  @override
+  void onRequest(RequestOptions options, RequestInterceptorHandler handler) {
+    try {
+      final params = getParams();
+      if (params.isEmpty) {
+        return handler.next(options);
+      }
+
+      if (_isGetLike(options.method)) {
+        _mergeIntoQuery(options, params);
+        return handler.next(options);
+      }
+
+      if (injectToData) {
+        _mergeIntoBody(options, params);
+      } else {
+        _mergeIntoQuery(options, params);
+      }
+
+      handler.next(options);
+    } catch (error) {
+      debugPrint('GlobalParamsInterceptor Error: $error');
+      handler.next(options);
+    }
+  }
+}

package/templates/core_files/network/interceptors/index.dart.template

@@ -1,6 +1,9 @@
 export 'app_response_interceptor.dart';
+{{#if_auth}}
 export 'auth_interceptor.dart';
+{{/if_auth}}
 export 'error_interceptor.dart';
+export 'global_params_interceptor.dart';
 export 'log_interceptor.dart';
 export 'network_error_interceptor.dart';
 export 'retry_interceptor.dart';

package/templates/core_files/network/network_monitor.dart.template

@@ -0,0 +1,18 @@
+import 'package:connectivity_plus/connectivity_plus.dart';
+
+/// 提供最小网络状态监听封装，供项目初始化或全局状态层接入。
+class NetworkMonitor {
+  NetworkMonitor({
+    Connectivity? connectivity,
+  }) : _connectivity = connectivity ?? Connectivity();
+
+  final Connectivity _connectivity;
+
+  Stream<List<ConnectivityResult>> watch() {
+    return _connectivity.onConnectivityChanged;
+  }
+
+  Future<List<ConnectivityResult>> current() {
+    return _connectivity.checkConnectivity();
+  }
+}

package/templates/core_files/network/response_adapter.dart.template

@@ -13,6 +13,14 @@ abstract class AppResponseAdapter {
 class DefaultResponseAdapter extends AppResponseAdapter {
   @override
   Map<String, dynamic> adapt(dynamic json) {
+    if (json is List) {
+      return {
+        'code': AppErrorCode.success,
+        'msg': '成功',
+        'data': json,
+      };
+    }
+
     if (json is Map) {
       return {
         'code': json['code'] ?? AppErrorCode.networkError,
@@ -48,22 +56,3 @@ Map<String, dynamic> _buildError(String msg) {
     'data': null,
   };
 }
-
-/// 图虫 API 适配器
-/// 对应格式: { "result": "SUCCESS", "message": "...", "feedList": [...] }
-class TuChongAdapter extends AppResponseAdapter {
-  @override
-  Map<String, dynamic> adapt(dynamic json) {
-    if (json is Map) {
-      final result = json['result'];
-      final isSuccess = result == 'SUCCESS';
-
-      return {
-        'code': isSuccess ? 200 : -1,
-        'msg': json['message'] ?? '',
-        'data': json['feedList'] ?? json['data'],
-      };
-    }
-    return _buildError('数据格式错误');
-  }
-}

package/templates/core_files/router/app_routes.dart.template

@@ -12,8 +12,7 @@ class AppRoutes {
   // 路由常量
   static const String home = '/';
   static const String splash = '/splash';
-  static const String egList = '/eg-list';
-  static const String userList = '/user-list';
+  // 网络示例路由 - 由 CLI 动态注入
 
   // __ROUTE_CONFIG_START__
   /// Material 路由映射
@@ -21,10 +20,8 @@ class AppRoutes {
   static Map<String, WidgetBuilder> get routes {
     return {
       home: (context) => const HomePage(),
-      userList: (context) => const UserListPage(),
-      {{#if_network}}
-      egList: (context) => const EgListPage(),
-      {{/if_network}}
+      splash: (context) => const SplashPage(),
+      // 网络示例路由映射 - 由 CLI 动态注入
       // --- 在此下方添加您的自定义路由 ---
     };
   }

package/templates/core_files/storage/storage_keys.dart.template

@@ -10,6 +10,12 @@ abstract class StorageKeys {
   /// 当前应用版本（用于版本迁移）
   static const appVersion = 'app_version';
 
+  /// 是否已同意隐私协议
+  static const privacyAgreed = 'app_privacy_agreed';
+
+  /// 已接受的协议版本
+  static const agreementAcceptedVersion = 'app_agreement_accepted_version';
+
   // ==================== 用户相关 ====================
 
   /// 用户 Token

package/templates/core_files/theme/app_color_config.dart.template

@@ -0,0 +1,32 @@
+import 'package:flutter/material.dart';
+
+/// 统一维护项目级颜色令牌，供 Theme 和文本样式配置复用。
+class AppColorConfig {
+  static AppColorConfig get I => const AppColorConfig();
+
+  const AppColorConfig({
+    this.primary = const Color(0xFF3B82F6),
+    this.secondary = const Color(0xFF22C55E),
+    this.background = const Color(0xFFF8FAFC),
+    this.surface = Colors.white,
+    this.title = const Color(0xFF111827),
+    this.titleSecondary = const Color(0xFF4B5563),
+    this.caption = const Color(0xFF6B7280),
+    this.divider = const Color(0xFFE5E7EB),
+    this.error = const Color(0xFFEF4444),
+    this.success = const Color(0xFF22C55E),
+    this.warning = const Color(0xFFF59E0B),
+  });
+
+  final Color primary;
+  final Color secondary;
+  final Color background;
+  final Color surface;
+  final Color title;
+  final Color titleSecondary;
+  final Color caption;
+  final Color divider;
+  final Color error;
+  final Color success;
+  final Color warning;
+}

package/templates/core_files/theme/app_text_size_config.dart.template

@@ -0,0 +1,22 @@
+/// 统一维护语义化字号，避免模板默认暴露 s12/s14 这类数字别名。
+class AppTextSizeConfig {
+  const AppTextSizeConfig({
+    this.caption = 12,
+    this.bodySmall = 13,
+    this.body = 14,
+    this.bodyLarge = 16,
+    this.titleSmall = 18,
+    this.title = 20,
+    this.titleLarge = 24,
+    this.headline = 28,
+  });
+
+  final double caption;
+  final double bodySmall;
+  final double body;
+  final double bodyLarge;
+  final double titleSmall;
+  final double title;
+  final double titleLarge;
+  final double headline;
+}

package/templates/core_files/theme/app_text_style_config.dart.template

@@ -0,0 +1,139 @@
+import 'package:flutter/material.dart';
+
+import 'app_color_config.dart';
+import 'app_text_size_config.dart';
+
+/// 基于颜色和字号配置生成语义化文本样式，允许调用方按场景覆盖细节。
+class AppTextStyleConfig {
+  const AppTextStyleConfig({
+    this.colors = const AppColorConfig(),
+    this.sizes = const AppTextSizeConfig(),
+    this.fontFamily,
+  });
+
+  static AppTextStyleConfig get I => const AppTextStyleConfig();
+
+  final AppColorConfig colors;
+  final AppTextSizeConfig sizes;
+  final String? fontFamily;
+
+  TextStyle caption({
+    Color? color,
+    FontWeight? fontWeight,
+    double? height,
+  }) {
+    return _style(
+      fontSize: sizes.caption,
+      color: color ?? colors.caption,
+      fontWeight: fontWeight,
+      height: height,
+    );
+  }
+
+  TextStyle bodySmall({
+    Color? color,
+    FontWeight? fontWeight,
+    double? height,
+  }) {
+    return _style(
+      fontSize: sizes.bodySmall,
+      color: color ?? colors.titleSecondary,
+      fontWeight: fontWeight,
+      height: height,
+    );
+  }
+
+  TextStyle body({
+    Color? color,
+    FontWeight? fontWeight,
+    double? height,
+  }) {
+    return _style(
+      fontSize: sizes.body,
+      color: color ?? colors.title,
+      fontWeight: fontWeight,
+      height: height,
+    );
+  }
+
+  TextStyle bodyLarge({
+    Color? color,
+    FontWeight? fontWeight,
+    double? height,
+  }) {
+    return _style(
+      fontSize: sizes.bodyLarge,
+      color: color ?? colors.title,
+      fontWeight: fontWeight,
+      height: height,
+    );
+  }
+
+  TextStyle titleSmall({
+    Color? color,
+    FontWeight? fontWeight,
+    double? height,
+  }) {
+    return _style(
+      fontSize: sizes.titleSmall,
+      color: color ?? colors.title,
+      fontWeight: fontWeight ?? FontWeight.w600,
+      height: height,
+    );
+  }
+
+  TextStyle title({
+    Color? color,
+    FontWeight? fontWeight,
+    double? height,
+  }) {
+    return _style(
+      fontSize: sizes.title,
+      color: color ?? colors.title,
+      fontWeight: fontWeight ?? FontWeight.w600,
+      height: height,
+    );
+  }
+
+  TextStyle titleLarge({
+    Color? color,
+    FontWeight? fontWeight,
+    double? height,
+  }) {
+    return _style(
+      fontSize: sizes.titleLarge,
+      color: color ?? colors.title,
+      fontWeight: fontWeight ?? FontWeight.w700,
+      height: height,
+    );
+  }
+
+  TextStyle headline({
+    Color? color,
+    FontWeight? fontWeight,
+    double? height,
+  }) {
+    return _style(
+      fontSize: sizes.headline,
+      color: color ?? colors.title,
+      fontWeight: fontWeight ?? FontWeight.w700,
+      height: height,
+    );
+  }
+
+  TextStyle _style({
+    required double fontSize,
+    required Color color,
+    FontWeight? fontWeight,
+    double? height,
+  }) {
+    // 所有语义样式最终都落到同一个底层构造，避免模板里出现重复 TextStyle 拼装。
+    return TextStyle(
+      fontSize: fontSize,
+      color: color,
+      fontWeight: fontWeight,
+      height: height,
+      fontFamily: fontFamily,
+    );
+  }
+}

package/templates/core_files/theme/app_theme.dart.template

@@ -1,36 +1,96 @@
 import 'package:flutter/material.dart';
 
+import 'app_color_config.dart';
+import 'app_text_style_config.dart';
+
 class AppTheme {
+  static const AppColorConfig _lightColors = AppColorConfig();
+  static const AppTextStyleConfig _lightTextStyles = AppTextStyleConfig(
+    colors: _lightColors,
+  );
+
   /// 亮色主题（函数级注释）
   static ThemeData light() {
     return ThemeData(
       brightness: Brightness.light,
-      primaryColor: const Color(0xFF3B82F6),
-      colorScheme: const ColorScheme.light(
-        primary: Color(0xFF3B82F6),
-        secondary: Color(0xFF22C55E),
+      primaryColor: _lightColors.primary,
+      colorScheme: ColorScheme.light(
+        primary: _lightColors.primary,
+        secondary: _lightColors.secondary,
+        error: _lightColors.error,
+        surface: _lightColors.surface,
       ),
-      appBarTheme: const AppBarTheme(
+      appBarTheme: AppBarTheme(
         elevation: 0,
         centerTitle: true,
-        backgroundColor: Colors.white,
-        foregroundColor: Colors.black87,
+        backgroundColor: _lightColors.surface,
+        foregroundColor: _lightColors.title,
+        titleTextStyle: _lightTextStyles.title(
+          color: _lightColors.title,
+        ),
+      ),
+      scaffoldBackgroundColor: _lightColors.background,
+      dividerColor: _lightColors.divider,
+      textTheme: TextTheme(
+        bodySmall: _lightTextStyles.bodySmall(),
+        bodyMedium: _lightTextStyles.body(),
+        bodyLarge: _lightTextStyles.bodyLarge(),
+        titleSmall: _lightTextStyles.titleSmall(),
+        titleMedium: _lightTextStyles.title(),
+        titleLarge: _lightTextStyles.titleLarge(),
+        headlineSmall: _lightTextStyles.headline(),
+        labelSmall: _lightTextStyles.caption(),
       ),
-      scaffoldBackgroundColor: const Color(0xFFF8FAFC),
     );
   }
 
   /// 暗色主题（函数级注释）
   static ThemeData dark() {
+    const darkColors = AppColorConfig(
+      primary: Color(0xFF60A5FA),
+      secondary: Color(0xFF34D399),
+      background: Color(0xFF0F172A),
+      surface: Color(0xFF111827),
+      title: Color(0xFFF9FAFB),
+      titleSecondary: Color(0xFFD1D5DB),
+      caption: Color(0xFF9CA3AF),
+      divider: Color(0xFF1F2937),
+      error: Color(0xFFF87171),
+      success: Color(0xFF34D399),
+      warning: Color(0xFFFBBF24),
+    );
+    const darkTextStyles = AppTextStyleConfig(
+      colors: darkColors,
+    );
+
     return ThemeData(
       brightness: Brightness.dark,
-      colorScheme: const ColorScheme.dark(
-        primary: Color(0xFF60A5FA),
-        secondary: Color(0xFF34D399),
+      colorScheme: ColorScheme.dark(
+        primary: darkColors.primary,
+        secondary: darkColors.secondary,
+        error: darkColors.error,
+        surface: darkColors.surface,
       ),
-      appBarTheme: const AppBarTheme(
+      appBarTheme: AppBarTheme(
         elevation: 0,
         centerTitle: true,
+        backgroundColor: darkColors.surface,
+        foregroundColor: darkColors.title,
+        titleTextStyle: darkTextStyles.title(
+          color: darkColors.title,
+        ),
+      ),
+      scaffoldBackgroundColor: darkColors.background,
+      dividerColor: darkColors.divider,
+      textTheme: TextTheme(
+        bodySmall: darkTextStyles.bodySmall(),
+        bodyMedium: darkTextStyles.body(),
+        bodyLarge: darkTextStyles.bodyLarge(),
+        titleSmall: darkTextStyles.titleSmall(),
+        titleMedium: darkTextStyles.title(),
+        titleLarge: darkTextStyles.titleLarge(),
+        headlineSmall: darkTextStyles.headline(),
+        labelSmall: darkTextStyles.caption(),
       ),
     );
   }

package/templates/core_files/theme/index.dart.template

@@ -1,3 +1,6 @@
 // 导出主题类 (按字母顺序排列)
+export 'app_color_config.dart';
+export 'app_text_size_config.dart';
+export 'app_text_style_config.dart';
 export 'app_theme.dart';
 export 'status_views_theme.dart';

package/templates/core_files/utils/loading_util.dart.template

@@ -34,7 +34,7 @@ class LoadingUtil {
               mainAxisSize: MainAxisSize.min,
               children: [
                 const CircularProgressIndicator(),
-                if (message != null) ...[
+                if (message.isNotEmpty) ...[
                   const SizedBox(height: 16),
                   Text(
                     message,

package/templates/examples/eg_list_page.dart.template

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import '{{CORE_IMPORT}}';
-
 {{#if_clean}}
 import '{{DATA_IMPORT}}';
 {{else}}
@@ -166,7 +165,7 @@ class ExampleTuItmeImagelessV extends StatelessWidget {
     body = Container(
       padding: const EdgeInsets.all(5),
       decoration: BoxDecoration(
-        color: Colors.lightBlue.withOpacity(0.1),
+        color: Colors.lightBlue.withAlpha(26),
         borderRadius: BorderRadius.circular(
           10,
         ),

package/templates/examples/eg_service.dart.template

@@ -35,10 +35,9 @@ class EgService {
       };
     }
 
-    final response = await _http.get(
-      '/feed-app',
-      queryParameters: queryParameters,
-    );
+    AppHttp.init(adapter: TuChongExampleAdapter());
+
+    final response = await _http.get('/feed-app', queryParameters: queryParameters);
 
     if (response.isSuccess && response.data is List) {
       return (response.data as List)
@@ -76,3 +75,27 @@ class EgService {
     return [];
   }
 }
+
+/// 图集示例专用响应适配器。
+///
+/// 这个适配器只随 networkGallery 示例生成，不属于默认网络 Core。
+class TuChongExampleAdapter extends AppResponseAdapter {
+  @override
+  Map<String, dynamic> adapt(dynamic json) {
+    if (json is Map) {
+      final result = json['result'];
+      final isSuccess = result == 'SUCCESS';
+
+      return {
+        'code': isSuccess ? 200 : -1,
+        'msg': json['message'] ?? '',
+        'data': json['feedList'] ?? json['data'],
+      };
+    }
+    return {
+      'code': AppErrorCode.parseError,
+      'msg': '数据格式错误',
+      'data': null,
+    };
+  }
+}

package/templates/examples/home_feed_service.dart.template

@@ -0,0 +1,37 @@
+{{#if_network_example}}
+import '{{CORE_IMPORT}}';
+
+class HomeFeedService {
+  HomeFeedService({
+    AppHttp? http,
+  }) : _http = http ?? AppHttp();
+
+  final AppHttp _http;
+
+  Future<List<Map<String, dynamic>>> fetchPosts({
+    required int page,
+    required int pageSize,
+  }) async {
+    final response = await _http.get<List<Map<String, dynamic>>>(
+      '/posts',
+      queryParameters: {
+        '_page': page,
+        '_limit': pageSize,
+      },
+      showError: false,
+      fromJson: (json) {
+        final list = json as List;
+        return list
+            .map((item) => Map<String, dynamic>.from(item as Map))
+            .toList();
+      },
+    );
+
+    if (response.isSuccess && response.data != null) {
+      return response.data!;
+    }
+
+    throw Exception(response.msg);
+  }
+}
+{{/if_network_example}}