From 236bffb1bc1eb1bc3eb953ce1f7f9144c6e36d70 Mon Sep 17 00:00:00 2001 From: Developer Date: Sun, 19 Apr 2026 04:26:55 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=844?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/main.dart | 8 ++--- lib/src/app_binding.dart | 16 ++++----- lib/src/config/app_routes.dart | 36 +++++++++---------- .../controllers/browse/home_controller.dart | 4 +-- .../browse/recipe_detail_controller.dart | 14 ++++---- .../controllers/browse/search_controller.dart | 6 ++-- .../data/meal_record_controller.dart | 8 ++--- .../data/rating_records_controller.dart | 8 ++--- .../data/shopping_list_controller.dart | 8 ++--- .../data/weekly_menu_controller.dart | 8 ++--- .../farm/farm_achievement_controller.dart | 6 ++-- .../farm/farm_game_controller.dart | 14 ++++---- .../farm/farm_inventory_controller.dart | 4 +-- .../farm/farm_shop_controller.dart | 10 +++--- .../controllers/feed/action_controller.dart | 4 +-- lib/src/controllers/feed/feed_controller.dart | 8 ++--- lib/src/controllers/feed/hot_controller.dart | 4 +-- .../tools/bedtime_reminder_controller.dart | 6 ++-- .../tools/ingredient_detail_controller.dart | 6 ++-- .../tools/ingredient_manage_controller.dart | 4 +-- .../tools/order_assistant_controller.dart | 6 ++-- .../controllers/tools/tools_controller.dart | 6 ++-- .../controllers/tools/weight_controller.dart | 8 ++--- .../tools/what_to_eat_controller.dart | 4 +-- .../user/favorites_controller.dart | 8 ++--- .../controllers/user/online_controller.dart | 4 +-- .../user/personalization_controller.dart | 4 +-- .../user/preference_controller.dart | 4 +-- .../controllers/user/profile_controller.dart | 4 +-- lib/src/models/app/tool_item_model.dart | 4 +-- .../farm/config/achievement_registry.dart | 4 +-- lib/src/models/farm/config/crop_registry.dart | 4 +-- lib/src/models/farm/entity/farm_land.dart | 4 +-- lib/src/models/feed/waterfall_slot.dart | 6 ++-- .../components/tool_detail_sheet.dart | 4 +-- .../components/tools_panel_widget.dart | 4 +-- lib/src/pages/discover/discover_page.dart | 4 +-- .../discover/ingredient_recipe_list_page.dart | 4 +-- .../mini_card/mini_card_image_view.dart | 4 +-- .../discover/mini_card/mini_card_page.dart | 10 +++--- .../discover/mini_card/mini_card_viewer.dart | 6 ++-- lib/src/pages/home/home_card_carousel.dart | 6 ++-- lib/src/pages/home/home_page.dart | 14 ++++---- lib/src/pages/home/home_products.dart | 4 +-- lib/src/pages/home/home_recommended.dart | 4 +-- lib/src/pages/home/recipe_detail_page.dart | 6 ++-- .../pages/profile/data/cache_manage_page.dart | 8 ++--- .../pages/profile/data/data_center_page.dart | 4 +-- lib/src/pages/profile/info/about_page.dart | 12 +++---- lib/src/pages/profile/info/guide_page.dart | 8 ++--- .../profile/nutrition/add_meal_sheet.dart | 4 +-- .../nutrition/nutrition_center_page.dart | 4 +-- lib/src/pages/profile/profile_settings.dart | 4 +-- .../settings/personalization_page.dart | 4 +-- .../profile/settings/preference_page.dart | 4 +-- .../profile/social/email_history_page.dart | 6 ++-- .../social/favorites_item_builders.dart | 6 ++-- .../pages/profile/social/favorites_page.dart | 6 ++-- .../profile/social/favorites_tools_panel.dart | 4 +-- .../pages/profile/social/footprints_page.dart | 6 ++-- .../profile/social/share_records_page.dart | 4 +-- .../pages/profile/tools/data_export_page.dart | 4 +-- .../profile/tools/rating_records_page.dart | 4 +-- .../profile/tools/shopping_list_page.dart | 4 +-- .../calculator/order_assistant_page.dart | 4 +-- .../tools/cooking/cooking_note_page.dart | 4 +-- .../tools/cooking/widgets/add_item_sheet.dart | 4 +-- .../widgets/browse_history_picker.dart | 6 ++-- .../cooking/widgets/manual_input_sheet.dart | 4 +-- .../cooking/widgets/order_item_card.dart | 4 +-- .../cooking/widgets/qr_barcode_dialog.dart | 4 +-- .../tools/farm/farm_achievement_page.dart | 4 +-- .../pages/tools/farm/farm_inventory_page.dart | 4 +-- lib/src/pages/tools/farm/farm_shop_page.dart | 4 +-- .../tools/health/allergen_report_page.dart | 4 +-- .../tools/health/weight_manage_page.dart | 4 +-- .../ingredient/cooking_tip_detail_page.dart | 4 +-- .../ingredient/cooking_tips_list_page.dart | 6 ++-- .../ingredient/ingredient_manage_page.dart | 6 ++-- .../ingredient_detail_info_cards.dart | 4 +-- .../ingredient_detail_nutrition_cards.dart | 4 +-- .../ingredient_detail_page.dart | 4 +-- .../pages/tools/planning/daily_menu_page.dart | 6 ++-- .../tools/planning/meal_planner_page.dart | 6 ++-- .../planning/weekly_menu_planner_page.dart | 4 +-- .../pages/tools/ranking/dish_pick_sheet.dart | 10 +++--- .../ranking/dish_ranking_controller.dart | 6 ++-- .../tools/ranking/dish_ranking_page.dart | 4 +-- lib/src/pages/tools/tool_detail_page.dart | 4 +-- .../pages/tools/tool_item_detail_page.dart | 4 +-- .../pages/tools/tools_category_widgets.dart | 4 +-- lib/src/pages/tools/tools_center_page.dart | 4 +-- .../pages/tools/tools_featured_section.dart | 4 +-- lib/src/repositories/action_repository.dart | 4 +-- lib/src/repositories/discover_repository.dart | 6 ++-- lib/src/repositories/feed_repository.dart | 6 ++-- lib/src/repositories/online_repository.dart | 4 +-- lib/src/repositories/recipe_repository.dart | 8 ++--- lib/src/services/api/order_api_service.dart | 4 +-- lib/src/services/core/app_service.dart | 12 +++---- .../data/business/data_export_service.dart | 4 +-- .../services/data/business/email_service.dart | 6 ++-- .../data/business/mini_card_service.dart | 4 +-- .../services/data/storage/cache_service.dart | 4 +-- .../services/data/storage/hive_service.dart | 14 ++++---- .../data/storage/local_data_service.dart | 4 +-- .../data/storage/offline_service.dart | 4 +-- .../system/recommendation_service.dart | 4 +-- lib/src/widgets/base/app_page_scaffold.dart | 4 +-- .../discover/category_discover_card.dart | 4 +-- .../content/mini_card_discover_card.dart | 4 +-- .../content/nutrition_discover_card.dart | 4 +-- .../content/recipe_discover_card.dart | 4 +-- .../discover/content/tag_discover_card.dart | 4 +-- .../content/tool_card_discover_card.dart | 4 +-- .../widgets/discover/discover_waterfall.dart | 20 +++++------ .../discover/ingredient_discover_card.dart | 4 +-- .../discover/meal_time_discover_card.dart | 4 +-- lib/src/widgets/navigation_widgets.dart | 6 ++-- .../info/recipe_allergen_warning.dart | 4 +-- .../info/recipe_meal_record_sheet.dart | 4 +-- .../info/recipe_taste_preference.dart | 4 +-- .../interaction/recipe_email_button.dart | 4 +-- .../interaction/recipe_qr_poster.dart | 4 +-- lib/src/widgets/states/offline_banner.dart | 6 ++-- lib/src/widgets/states/offline_indicator.dart | 4 +-- packages/badges | 2 +- 127 files changed, 367 insertions(+), 367 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index e31b20a..5decfb5 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,4 +1,4 @@ -import 'dart:async'; +import 'dart:async'; import 'package:flutter/cupertino.dart'; import 'package:flutter/foundation.dart'; import 'package:get/get.dart'; @@ -10,11 +10,11 @@ import 'package:mom_kitchen/src/config/app_routes.dart'; import 'package:mom_kitchen/src/services/core/app_service.dart'; import 'package:mom_kitchen/src/services/api/api_service.dart'; -import 'package:mom_kitchen/src/services/orientation_service.dart'; +import 'package:mom_kitchen/src/services/system/orientation_service.dart'; import 'package:mom_kitchen/src/services/ui/theme_service.dart'; import 'package:mom_kitchen/src/services/ui/toast_service.dart'; -import 'package:mom_kitchen/src/services/data/storage_service.dart'; -import 'package:mom_kitchen/src/services/crash_guard_service.dart'; +import 'package:mom_kitchen/src/services/data/storage/storage_service.dart'; +import 'package:mom_kitchen/src/services/system/crash_guard_service.dart'; import 'package:mom_kitchen/src/app_binding.dart'; diff --git a/lib/src/app_binding.dart b/lib/src/app_binding.dart index b9377e6..d2e6c35 100644 --- a/lib/src/app_binding.dart +++ b/lib/src/app_binding.dart @@ -1,4 +1,4 @@ -// 2026-04-09 | AppBinding | 全局Binding | Web端跳过permission注册 +// 2026-04-09 | AppBinding | 全局Binding | Web端跳过permission注册 // 2026-04-10 | 移除 CartController 注册（收藏功能统一使用 FavoritesController） // 2026-04-10 | 新增 ShoppingListController 全局注册（首页需要使用） // 2026-04-11 | 统一控制器生命周期管理 | 新增ToolsController/HotController/WhatToEatController全局注册 | 移除路由级重复注册 @@ -7,15 +7,15 @@ import 'package:flutter/foundation.dart'; import 'package:get/get.dart'; import 'package:mom_kitchen/src/controllers/feed/action_controller.dart'; import 'package:mom_kitchen/src/controllers/feed/hot_controller.dart'; -import 'package:mom_kitchen/src/controllers/data/favorites_controller.dart'; +import 'package:mom_kitchen/src/controllers/user/favorites_controller.dart'; import 'package:mom_kitchen/src/controllers/feed/feed_controller.dart'; -import 'package:mom_kitchen/src/controllers/home/home_controller.dart'; +import 'package:mom_kitchen/src/controllers/browse/home_controller.dart'; import 'package:mom_kitchen/src/controllers/user/preference_controller.dart'; import 'package:mom_kitchen/src/controllers/user/profile_controller.dart'; import 'package:mom_kitchen/src/controllers/user/personalization_controller.dart'; -import 'package:mom_kitchen/src/controllers/home/main_navigation_controller.dart'; +import 'package:mom_kitchen/src/controllers/browse/main_navigation_controller.dart'; import 'package:mom_kitchen/src/controllers/data/meal_record_controller.dart'; -import 'package:mom_kitchen/src/controllers/recipe/search_controller.dart'; +import 'package:mom_kitchen/src/controllers/browse/search_controller.dart'; import 'package:mom_kitchen/src/controllers/data/shopping_list_controller.dart'; import 'package:mom_kitchen/src/controllers/data/cooking_note_controller.dart'; import 'package:mom_kitchen/src/controllers/data/browse_history_controller.dart'; @@ -26,9 +26,9 @@ import 'package:mom_kitchen/src/controllers/data/weekly_menu_controller.dart'; import 'package:mom_kitchen/src/controllers/tools/bedtime_reminder_controller.dart'; import 'package:mom_kitchen/src/services/core/app_service.dart'; import 'package:mom_kitchen/src/services/ui/theme_service.dart'; -import 'package:mom_kitchen/src/services/data/offline_service.dart'; -import 'package:mom_kitchen/src/services/data/data_export_service.dart'; -import 'package:mom_kitchen/src/services/user/taste_preference_service.dart'; +import 'package:mom_kitchen/src/services/data/storage/offline_service.dart'; +import 'package:mom_kitchen/src/services/data/business/data_export_service.dart'; +import 'package:mom_kitchen/src/services/core/taste_preference_service.dart'; /// 全局Binding - 应用启动时注册所有全局控制器和服务 /// 所有 permanent:true 的控制器在此统一管理，路由级Binding禁止重复注册 diff --git a/lib/src/config/app_routes.dart b/lib/src/config/app_routes.dart index a827055..0e176a3 100644 --- a/lib/src/config/app_routes.dart +++ b/lib/src/config/app_routes.dart @@ -1,4 +1,4 @@ -import 'package:get/get.dart'; +import 'package:get/get.dart'; import 'package:mom_kitchen/src/models/recipe/category_model.dart'; import 'package:mom_kitchen/src/pages/home/home_page.dart'; import 'package:mom_kitchen/src/pages/profile/settings/theme_demo_page.dart'; @@ -8,8 +8,8 @@ import 'package:mom_kitchen/src/pages/profile/profile_page.dart'; import 'package:mom_kitchen/src/pages/profile/settings/personalization_page.dart'; import 'package:mom_kitchen/src/pages/profile/social/chat_page.dart' show FeedbackPage; -import 'package:mom_kitchen/src/pages/profile/about_page.dart'; -import 'package:mom_kitchen/src/pages/profile/data_export_page.dart'; +import 'package:mom_kitchen/src/pages/profile/info/about_page.dart'; +import 'package:mom_kitchen/src/pages/profile/tools/data_export_page.dart'; import 'package:mom_kitchen/src/widgets/navigation_widgets.dart'; import 'package:mom_kitchen/src/standards/page_validator.dart'; import 'package:mom_kitchen/src/standards/route_middleware.dart'; @@ -18,19 +18,19 @@ import 'package:mom_kitchen/src/pages/discover/hot_page.dart'; import 'package:mom_kitchen/src/pages/profile/nutrition/nutrition_center_page.dart'; import 'package:mom_kitchen/src/pages/profile/nutrition/nutrition_report_page.dart'; import 'package:mom_kitchen/src/pages/profile/nutrition/goal_setting_page.dart'; -import 'package:mom_kitchen/src/pages/profile/shopping_list_page.dart'; +import 'package:mom_kitchen/src/pages/profile/tools/shopping_list_page.dart'; import 'package:mom_kitchen/src/pages/home/search_page.dart'; import 'package:mom_kitchen/src/pages/home/advanced_search_page.dart'; import 'package:mom_kitchen/src/pages/home/recipe_detail_page.dart'; import 'package:mom_kitchen/src/pages/home/tag_recipe_list_page.dart'; import 'package:mom_kitchen/src/pages/tools/cooking/cooking_timer_page.dart'; -import 'package:mom_kitchen/src/pages/tools/cooking/unit_converter_page.dart'; +import 'package:mom_kitchen/src/pages/tools/cooking/calculator/unit_converter_page.dart'; import 'package:mom_kitchen/src/pages/tools/health/bmi_calculator_page.dart'; -import 'package:mom_kitchen/src/pages/tools/cooking/serving_scaler_page.dart'; +import 'package:mom_kitchen/src/pages/tools/cooking/calculator/serving_scaler_page.dart'; import 'package:mom_kitchen/src/pages/tools/tools_center_page.dart'; import 'package:mom_kitchen/src/pages/tools/health/allergen_checker_page.dart'; import 'package:mom_kitchen/src/pages/tools/health/allergen_report_page.dart'; -import 'package:mom_kitchen/src/pages/tools/duplicate_check_page.dart'; +import 'package:mom_kitchen/src/pages/tools/ingredient/duplicate_check_page.dart'; import 'package:mom_kitchen/src/pages/profile/data/stats_dashboard_page.dart'; import 'package:mom_kitchen/src/pages/tools/health/meal_time_recommend_page.dart'; import 'package:mom_kitchen/src/pages/tools/planning/meal_planner_page.dart'; @@ -46,24 +46,24 @@ import 'package:mom_kitchen/src/pages/discover/mini_card/mini_card_page.dart'; import 'package:mom_kitchen/src/pages/tools/planning/eating_times_page.dart'; import 'package:mom_kitchen/src/pages/tools/planning/weekly_menu_planner_page.dart'; import 'package:mom_kitchen/src/pages/tools/planning/daily_menu_page.dart'; -import 'package:mom_kitchen/src/pages/profile/bedtime_reminder_page.dart'; -import 'package:mom_kitchen/src/pages/tools/cooking_tips_list_page.dart'; -import 'package:mom_kitchen/src/pages/profile/references_page.dart'; -import 'package:mom_kitchen/src/pages/profile/privacy_policy_page.dart'; -import 'package:mom_kitchen/src/pages/profile/guide_page.dart'; -import 'package:mom_kitchen/src/pages/profile/learn_us_page.dart'; -import 'package:mom_kitchen/src/pages/profile/rating_records_page.dart'; +import 'package:mom_kitchen/src/pages/profile/tools/bedtime_reminder_page.dart'; +import 'package:mom_kitchen/src/pages/tools/ingredient/cooking_tips_list_page.dart'; +import 'package:mom_kitchen/src/pages/profile/info/references_page.dart'; +import 'package:mom_kitchen/src/pages/profile/info/privacy_policy_page.dart'; +import 'package:mom_kitchen/src/pages/profile/info/guide_page.dart'; +import 'package:mom_kitchen/src/pages/profile/info/learn_us_page.dart'; +import 'package:mom_kitchen/src/pages/profile/tools/rating_records_page.dart'; import 'package:mom_kitchen/src/pages/profile/social/email_history_page.dart'; import 'package:mom_kitchen/src/pages/profile/social/share_records_page.dart'; -import 'package:mom_kitchen/src/pages/tools/cooking/date_calculator_page.dart'; -import 'package:mom_kitchen/src/pages/tools/cooking/food_copy_generator_page.dart'; +import 'package:mom_kitchen/src/pages/tools/cooking/calculator/date_calculator_page.dart'; +import 'package:mom_kitchen/src/pages/tools/cooking/calculator/food_copy_generator_page.dart'; import 'package:mom_kitchen/src/pages/tools/health/safe_period_calculator_page.dart'; import 'package:mom_kitchen/src/pages/tools/health/weight_manage_page.dart'; import 'package:mom_kitchen/src/pages/tools/health/weight_binding.dart'; import 'package:mom_kitchen/src/pages/tools/ranking/dish_ranking_page.dart'; -import 'package:mom_kitchen/src/pages/tools/ingredient_manage_page.dart'; +import 'package:mom_kitchen/src/pages/tools/ingredient/ingredient_manage_page.dart'; import 'package:mom_kitchen/src/pages/tools/tool_detail_page.dart'; -import 'package:mom_kitchen/src/pages/tools/cooking/order_assistant_page.dart'; +import 'package:mom_kitchen/src/pages/tools/cooking/calculator/order_assistant_page.dart'; import 'package:mom_kitchen/src/pages/tools/cooking/decision_maker_page.dart'; import 'package:mom_kitchen/src/pages/tools/farm/farm_game_page.dart'; import 'package:mom_kitchen/src/pages/tools/farm/farm_shop_page.dart'; diff --git a/lib/src/controllers/browse/home_controller.dart b/lib/src/controllers/browse/home_controller.dart index 917b026..c94b7c6 100644 --- a/lib/src/controllers/browse/home_controller.dart +++ b/lib/src/controllers/browse/home_controller.dart @@ -1,7 +1,7 @@ -// 2026-04-09 | HomeController | 首页控制器 | 改造：从mock数据切换到RecipeRepository真实API +// 2026-04-09 | HomeController | 首页控制器 | 改造：从mock数据切换到RecipeRepository真实API import 'package:flutter/foundation.dart'; import 'package:get/get.dart'; -import 'package:mom_kitchen/src/controllers/base_controller.dart'; +import 'package:mom_kitchen/src/controllers/browse/base_controller.dart'; import 'package:mom_kitchen/src/models/recipe/category_model.dart'; import 'package:mom_kitchen/src/models/recipe/recipe_model.dart'; import 'package:mom_kitchen/src/repositories/recipe_repository.dart'; diff --git a/lib/src/controllers/browse/recipe_detail_controller.dart b/lib/src/controllers/browse/recipe_detail_controller.dart index 7e85eb6..010f983 100644 --- a/lib/src/controllers/browse/recipe_detail_controller.dart +++ b/lib/src/controllers/browse/recipe_detail_controller.dart @@ -1,19 +1,19 @@ -// 2026-04-09 | RecipeDetailController | 菜谱详情控制器 | 管理菜谱详情数据 +// 2026-04-09 | RecipeDetailController | 菜谱详情控制器 | 管理菜谱详情数据 // 2026-04-12 | 新增浏览记录功能，记录用户浏览历史 // 2026-04-13 | 新增IP状态显示，评分前加载剩余次数 import 'package:flutter/foundation.dart'; import 'package:get/get.dart'; -import 'package:mom_kitchen/src/controllers/base_controller.dart'; +import 'package:mom_kitchen/src/controllers/browse/base_controller.dart'; import 'package:mom_kitchen/src/controllers/data/browse_history_controller.dart'; import 'package:mom_kitchen/src/controllers/data/share_record_controller.dart'; import 'package:mom_kitchen/src/controllers/feed/action_controller.dart'; -import 'package:mom_kitchen/src/controllers/data/favorites_controller.dart'; +import 'package:mom_kitchen/src/controllers/user/favorites_controller.dart'; import 'package:mom_kitchen/src/controllers/data/shopping_list_controller.dart'; -import 'package:mom_kitchen/src/models/data/browse_history_model.dart'; -import 'package:mom_kitchen/src/models/data/share_record_model.dart'; -import 'package:mom_kitchen/src/models/feed_item_model.dart'; +import 'package:mom_kitchen/src/models/data/record/browse_history_model.dart'; +import 'package:mom_kitchen/src/models/data/record/share_record_model.dart'; +import 'package:mom_kitchen/src/models/feed/feed_item_model.dart'; import 'package:mom_kitchen/src/models/recipe/recipe_model.dart'; -import 'package:mom_kitchen/src/models/data/shopping_item_model.dart'; +import 'package:mom_kitchen/src/models/data/plan/shopping_item_model.dart'; import 'package:mom_kitchen/src/repositories/recipe_repository.dart'; import 'package:mom_kitchen/src/repositories/action_repository.dart'; import 'package:mom_kitchen/src/services/ui/toast_service.dart'; diff --git a/lib/src/controllers/browse/search_controller.dart b/lib/src/controllers/browse/search_controller.dart index 07bcf11..f6ccd9b 100644 --- a/lib/src/controllers/browse/search_controller.dart +++ b/lib/src/controllers/browse/search_controller.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: search_controller.dart * 名称: 搜索控制器 * 作用: 全局搜索，支持菜谱/食材/口味/工艺多维度搜索 @@ -8,12 +8,12 @@ import 'package:flutter/widgets.dart'; import 'package:get/get.dart'; -import 'package:mom_kitchen/src/controllers/base_controller.dart'; +import 'package:mom_kitchen/src/controllers/browse/base_controller.dart'; import 'package:mom_kitchen/src/models/recipe/recipe_model.dart'; import 'package:mom_kitchen/src/models/recipe/tag_model.dart'; import 'package:mom_kitchen/src/config/api_config.dart'; import 'package:mom_kitchen/src/services/api/api_service.dart'; -import 'package:mom_kitchen/src/services/data/hive_service.dart'; +import 'package:mom_kitchen/src/services/data/storage/hive_service.dart'; import 'package:mom_kitchen/src/services/ui/toast_service.dart'; import 'package:mom_kitchen/src/repositories/recipe_repository.dart'; diff --git a/lib/src/controllers/data/meal_record_controller.dart b/lib/src/controllers/data/meal_record_controller.dart index 31ff4e2..dd74c7c 100644 --- a/lib/src/controllers/data/meal_record_controller.dart +++ b/lib/src/controllers/data/meal_record_controller.dart @@ -1,13 +1,13 @@ -// 2026-04-09 | MealRecordController | 饮食记录控制器 | 管理每日饮食记录的增删查改及营养汇总 +// 2026-04-09 | MealRecordController | 饮食记录控制器 | 管理每日饮食记录的增删查改及营养汇总 // 2026-04-09 | 增加周/月营养聚合方法，支持营养报告页 // 2026-04-18 | 新增导出功能：exportToJson/exportToCsv/exportToMarkdown import 'dart:convert'; import 'package:flutter/foundation.dart'; import 'package:get/get.dart'; -import 'package:mom_kitchen/src/controllers/base_controller.dart'; -import 'package:mom_kitchen/src/models/data/meal_record_model.dart'; +import 'package:mom_kitchen/src/controllers/browse/base_controller.dart'; +import 'package:mom_kitchen/src/models/data/record/meal_record_model.dart'; import 'package:mom_kitchen/src/models/user/user_goal_model.dart'; -import 'package:mom_kitchen/src/services/data/hive_service.dart'; +import 'package:mom_kitchen/src/services/data/storage/hive_service.dart'; import 'package:mom_kitchen/src/services/ui/toast_service.dart'; class MealRecordController extends BaseController { diff --git a/lib/src/controllers/data/rating_records_controller.dart b/lib/src/controllers/data/rating_records_controller.dart index 087b889..3bdce91 100644 --- a/lib/src/controllers/data/rating_records_controller.dart +++ b/lib/src/controllers/data/rating_records_controller.dart @@ -1,13 +1,13 @@ -// 2026-04-19 | RatingRecordsController | 评分记录控制器 | 管理用户评分记录，支持Hive持久化 +// 2026-04-19 | RatingRecordsController | 评分记录控制器 | 管理用户评分记录，支持Hive持久化 // 2026-04-19 | 初始创建：评分记录增删查改、排序、搜索、批量删除、统计 import 'dart:convert'; import 'package:flutter/foundation.dart'; import 'package:get/get.dart'; -import 'package:mom_kitchen/src/controllers/base_controller.dart'; +import 'package:mom_kitchen/src/controllers/browse/base_controller.dart'; import 'package:mom_kitchen/src/controllers/feed/action_controller.dart'; -import 'package:mom_kitchen/src/models/data/rating_record_model.dart'; -import 'package:mom_kitchen/src/services/data/hive_service.dart'; +import 'package:mom_kitchen/src/models/data/record/rating_record_model.dart'; +import 'package:mom_kitchen/src/services/data/storage/hive_service.dart'; import 'package:mom_kitchen/src/services/ui/toast_service.dart'; class RatingRecordsController extends BaseController { diff --git a/lib/src/controllers/data/shopping_list_controller.dart b/lib/src/controllers/data/shopping_list_controller.dart index 08a7ebe..f84373c 100644 --- a/lib/src/controllers/data/shopping_list_controller.dart +++ b/lib/src/controllers/data/shopping_list_controller.dart @@ -1,12 +1,12 @@ -// 2026-04-09 | ShoppingListController | 购物清单控制器 | 管理购物清单的增删改查及分类展示 +// 2026-04-09 | ShoppingListController | 购物清单控制器 | 管理购物清单的增删改查及分类展示 // 2026-04-09 | 初始创建，支持添加/删除/勾选/清空已购功能 // 2026-04-18 | 新增导出功能：exportToJson/exportToCsv/exportToMarkdown import 'dart:convert'; import 'package:flutter/foundation.dart'; import 'package:get/get.dart'; -import 'package:mom_kitchen/src/controllers/base_controller.dart'; -import 'package:mom_kitchen/src/models/data/shopping_item_model.dart'; -import 'package:mom_kitchen/src/services/data/hive_service.dart'; +import 'package:mom_kitchen/src/controllers/browse/base_controller.dart'; +import 'package:mom_kitchen/src/models/data/plan/shopping_item_model.dart'; +import 'package:mom_kitchen/src/services/data/storage/hive_service.dart'; import 'package:mom_kitchen/src/services/ui/toast_service.dart'; class ShoppingListController extends BaseController { diff --git a/lib/src/controllers/data/weekly_menu_controller.dart b/lib/src/controllers/data/weekly_menu_controller.dart index 0ac667c..8021329 100644 --- a/lib/src/controllers/data/weekly_menu_controller.dart +++ b/lib/src/controllers/data/weekly_menu_controller.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: weekly_menu_controller.dart * 名称: 每周菜单控制器 * 作用: 管理每周菜单规划数据 @@ -10,10 +10,10 @@ import 'dart:convert'; import 'package:flutter/foundation.dart'; import 'package:get/get.dart'; -import 'package:mom_kitchen/src/controllers/base_controller.dart'; +import 'package:mom_kitchen/src/controllers/browse/base_controller.dart'; import 'package:mom_kitchen/src/models/recipe/recipe_model.dart'; -import 'package:mom_kitchen/src/models/data/weekly_menu_model.dart'; -import 'package:mom_kitchen/src/services/data/hive_service.dart'; +import 'package:mom_kitchen/src/models/data/plan/weekly_menu_model.dart'; +import 'package:mom_kitchen/src/services/data/storage/hive_service.dart'; import 'package:mom_kitchen/src/services/ui/toast_service.dart'; class WeeklyMenuController extends BaseController { diff --git a/lib/src/controllers/farm/farm_achievement_controller.dart b/lib/src/controllers/farm/farm_achievement_controller.dart index d0cad3a..0bf38a2 100644 --- a/lib/src/controllers/farm/farm_achievement_controller.dart +++ b/lib/src/controllers/farm/farm_achievement_controller.dart @@ -1,8 +1,8 @@ -// 农场成就控制器 +// 农场成就控制器 // 管理成就显示和进度 import 'package:get/get.dart'; -import 'package:mom_kitchen/src/models/farm/achievement_config.dart'; -import 'package:mom_kitchen/src/models/farm/achievement_registry.dart'; +import 'package:mom_kitchen/src/models/farm/config/achievement_config.dart'; +import 'package:mom_kitchen/src/models/farm/config/achievement_registry.dart'; import 'package:mom_kitchen/src/controllers/farm/farm_game_controller.dart'; class FarmAchievementController extends GetxController { diff --git a/lib/src/controllers/farm/farm_game_controller.dart b/lib/src/controllers/farm/farm_game_controller.dart index 5903710..0f8f678 100644 --- a/lib/src/controllers/farm/farm_game_controller.dart +++ b/lib/src/controllers/farm/farm_game_controller.dart @@ -1,4 +1,4 @@ -// 农场游戏核心控制器 +// 农场游戏核心控制器 // 管理游戏逻辑：种植、生长、浇水、收获、升级、成就 // 2026-04-18 | 优化：生长计时器间隔改为30秒；添加应用前后台生命周期管理 // 2026-04-18 | 修复：消息限流（5秒2次/10秒3次/去重）；ActionSheet操作后消费对话框 @@ -7,12 +7,12 @@ import 'dart:collection'; import 'package:collection/collection.dart'; import 'package:flutter/widgets.dart'; import 'package:get/get.dart'; -import 'package:mom_kitchen/src/models/farm/farm_player.dart'; -import 'package:mom_kitchen/src/models/farm/farm_land.dart'; -import 'package:mom_kitchen/src/models/farm/inventory_item.dart'; -import 'package:mom_kitchen/src/models/farm/crop_registry.dart'; -import 'package:mom_kitchen/src/models/farm/achievement_registry.dart'; -import 'package:mom_kitchen/src/services/data/hive_service.dart'; +import 'package:mom_kitchen/src/models/farm/entity/farm_player.dart'; +import 'package:mom_kitchen/src/models/farm/entity/farm_land.dart'; +import 'package:mom_kitchen/src/models/farm/entity/inventory_item.dart'; +import 'package:mom_kitchen/src/models/farm/config/crop_registry.dart'; +import 'package:mom_kitchen/src/models/farm/config/achievement_registry.dart'; +import 'package:mom_kitchen/src/services/data/storage/hive_service.dart'; import 'package:mom_kitchen/src/config/farm_config.dart'; import 'package:mom_kitchen/src/services/log/logger_service.dart'; import 'package:mom_kitchen/src/services/ui/toast_service.dart'; diff --git a/lib/src/controllers/farm/farm_inventory_controller.dart b/lib/src/controllers/farm/farm_inventory_controller.dart index 5c8e68c..a4733d2 100644 --- a/lib/src/controllers/farm/farm_inventory_controller.dart +++ b/lib/src/controllers/farm/farm_inventory_controller.dart @@ -1,7 +1,7 @@ -// 农场背包控制器 +// 农场背包控制器 // 管理背包物品显示和分类 import 'package:get/get.dart'; -import 'package:mom_kitchen/src/models/farm/inventory_item.dart'; +import 'package:mom_kitchen/src/models/farm/entity/inventory_item.dart'; import 'package:mom_kitchen/src/controllers/farm/farm_game_controller.dart'; class FarmInventoryController extends GetxController { diff --git a/lib/src/controllers/farm/farm_shop_controller.dart b/lib/src/controllers/farm/farm_shop_controller.dart index 6d56e99..7b87cce 100644 --- a/lib/src/controllers/farm/farm_shop_controller.dart +++ b/lib/src/controllers/farm/farm_shop_controller.dart @@ -1,10 +1,10 @@ -// 农场商店控制器 +// 农场商店控制器 // 管理种子购买逻辑 import 'package:get/get.dart'; -import 'package:mom_kitchen/src/models/farm/crop_config.dart'; -import 'package:mom_kitchen/src/models/farm/crop_registry.dart'; -import 'package:mom_kitchen/src/models/farm/inventory_item.dart'; -import 'package:mom_kitchen/src/services/data/hive_service.dart'; +import 'package:mom_kitchen/src/models/farm/config/crop_config.dart'; +import 'package:mom_kitchen/src/models/farm/config/crop_registry.dart'; +import 'package:mom_kitchen/src/models/farm/entity/inventory_item.dart'; +import 'package:mom_kitchen/src/services/data/storage/hive_service.dart'; import 'package:mom_kitchen/src/controllers/farm/farm_game_controller.dart'; import 'package:mom_kitchen/src/services/log/logger_service.dart'; import 'package:mom_kitchen/src/services/ui/toast_service.dart'; diff --git a/lib/src/controllers/feed/action_controller.dart b/lib/src/controllers/feed/action_controller.dart index d73bb85..6ee1b2b 100644 --- a/lib/src/controllers/feed/action_controller.dart +++ b/lib/src/controllers/feed/action_controller.dart @@ -1,8 +1,8 @@ -// 2026-04-09 | ActionController | 互动操作控制器 | 管理点赞/评分/浏览量上报 +// 2026-04-09 | ActionController | 互动操作控制器 | 管理点赞/评分/浏览量上报 // 2026-04-12 | API v3.2.0: recommend改为rate评分接口(1-5分) import 'dart:async'; import 'package:get/get.dart'; -import 'package:mom_kitchen/src/controllers/base_controller.dart'; +import 'package:mom_kitchen/src/controllers/browse/base_controller.dart'; import 'package:mom_kitchen/src/repositories/action_repository.dart'; import 'package:mom_kitchen/src/services/ui/toast_service.dart'; diff --git a/lib/src/controllers/feed/feed_controller.dart b/lib/src/controllers/feed/feed_controller.dart index dc5ddf8..02bf277 100644 --- a/lib/src/controllers/feed/feed_controller.dart +++ b/lib/src/controllers/feed/feed_controller.dart @@ -1,9 +1,9 @@ -// 2026-04-09 | FeedController | 信息流控制器 | 管理3种信息流：推荐/最新/热门 +// 2026-04-09 | FeedController | 信息流控制器 | 管理3种信息流：推荐/最新/热门 // 2026-04-12 | API v3.2.0: 移除personal接口（已删除） import 'package:get/get.dart'; -import 'package:mom_kitchen/src/controllers/base_controller.dart'; -import 'package:mom_kitchen/src/models/api_response.dart'; -import 'package:mom_kitchen/src/models/feed_item_model.dart'; +import 'package:mom_kitchen/src/controllers/browse/base_controller.dart'; +import 'package:mom_kitchen/src/models/app/api_response.dart'; +import 'package:mom_kitchen/src/models/feed/feed_item_model.dart'; import 'package:mom_kitchen/src/repositories/feed_repository.dart' as repo; enum FeedType { recommend, latest, hot } diff --git a/lib/src/controllers/feed/hot_controller.dart b/lib/src/controllers/feed/hot_controller.dart index 9d3babb..9467689 100644 --- a/lib/src/controllers/feed/hot_controller.dart +++ b/lib/src/controllers/feed/hot_controller.dart @@ -1,8 +1,8 @@ -// 2026-04-10 | HotController | 热门排行控制器 | 完全重写，使用HotItem模型 +// 2026-04-10 | HotController | 热门排行控制器 | 完全重写，使用HotItem模型 // 2026-04-13 | 新增rate评分排序选项 import 'package:flutter/foundation.dart'; import 'package:get/get.dart'; -import 'package:mom_kitchen/src/controllers/base_controller.dart'; +import 'package:mom_kitchen/src/controllers/browse/base_controller.dart'; import 'package:mom_kitchen/src/repositories/hot_repository.dart' as repo; import 'package:mom_kitchen/src/services/ui/toast_service.dart'; diff --git a/lib/src/controllers/tools/bedtime_reminder_controller.dart b/lib/src/controllers/tools/bedtime_reminder_controller.dart index 9c92316..3b265d1 100644 --- a/lib/src/controllers/tools/bedtime_reminder_controller.dart +++ b/lib/src/controllers/tools/bedtime_reminder_controller.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: bedtime_reminder_controller.dart * 名称: 就寝提醒控制器 * 作用: 根据晚餐时间推荐就寝时间，睡前不宜进食提醒 @@ -8,8 +8,8 @@ import 'package:flutter/foundation.dart'; import 'package:get/get.dart'; -import 'package:mom_kitchen/src/controllers/base_controller.dart'; -import 'package:mom_kitchen/src/services/data/hive_service.dart'; +import 'package:mom_kitchen/src/controllers/browse/base_controller.dart'; +import 'package:mom_kitchen/src/services/data/storage/hive_service.dart'; import 'package:mom_kitchen/src/services/ui/toast_service.dart'; class BedtimeReminderController extends BaseController { diff --git a/lib/src/controllers/tools/ingredient_detail_controller.dart b/lib/src/controllers/tools/ingredient_detail_controller.dart index 308ad5e..634e8c8 100644 --- a/lib/src/controllers/tools/ingredient_detail_controller.dart +++ b/lib/src/controllers/tools/ingredient_detail_controller.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: ingredient_detail_controller.dart * 名称: 食材详情控制器 * 作用: 管理食材详情页的状态和数据加载逻辑 @@ -8,11 +8,11 @@ import 'package:flutter/foundation.dart'; import 'package:get/get.dart'; -import 'package:mom_kitchen/src/controllers/base_controller.dart'; +import 'package:mom_kitchen/src/controllers/browse/base_controller.dart'; import 'package:mom_kitchen/src/models/recipe/ingredient_model.dart'; import 'package:mom_kitchen/src/models/recipe/recipe_model.dart'; import 'package:mom_kitchen/src/repositories/recipe_repository.dart'; -import 'package:mom_kitchen/src/services/data/ingredient_cache_service.dart'; +import 'package:mom_kitchen/src/services/data/storage/ingredient_cache_service.dart'; import 'package:mom_kitchen/src/pages/tools/ingredient_detail/ingredient_detail_utils.dart'; class IngredientDetailController extends BaseController { diff --git a/lib/src/controllers/tools/ingredient_manage_controller.dart b/lib/src/controllers/tools/ingredient_manage_controller.dart index c8a5875..388e0cb 100644 --- a/lib/src/controllers/tools/ingredient_manage_controller.dart +++ b/lib/src/controllers/tools/ingredient_manage_controller.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: ingredient_manage_controller.dart * 名称: 用料管理控制器 * 作用: 管理用料瓶子的增删改查和持久化 @@ -9,7 +9,7 @@ import 'dart:convert'; import 'package:get/get.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import 'package:mom_kitchen/src/models/bottle_model.dart'; +import 'package:mom_kitchen/src/models/app/bottle_model.dart'; class IngredientManageController extends GetxController { static const String _storageKey = 'bottles_data'; diff --git a/lib/src/controllers/tools/order_assistant_controller.dart b/lib/src/controllers/tools/order_assistant_controller.dart index 29882e9..40eb072 100644 --- a/lib/src/controllers/tools/order_assistant_controller.dart +++ b/lib/src/controllers/tools/order_assistant_controller.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: order_assistant_controller.dart * 名称: 点餐助手控制器 * 作用: 管理点单状态、SharedPreferences持久化、记录条数统计 @@ -11,8 +11,8 @@ import 'package:get/get.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'dart:convert'; import 'package:uuid/uuid.dart'; -import 'package:mom_kitchen/src/models/tools/order_model.dart'; -import 'package:mom_kitchen/src/services/tools/order_api_service.dart'; +import 'package:mom_kitchen/src/models/app/order_model.dart'; +import 'package:mom_kitchen/src/services/api/order_api_service.dart'; class OrderAssistantController extends GetxController { static OrderAssistantController get to => Get.find(); diff --git a/lib/src/controllers/tools/tools_controller.dart b/lib/src/controllers/tools/tools_controller.dart index d66bb80..a8feaae 100644 --- a/lib/src/controllers/tools/tools_controller.dart +++ b/lib/src/controllers/tools/tools_controller.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: tools_controller.dart * 名称: 工具中心控制器 * 作用: 管理工具列表、使用频率统计、搜索过滤 @@ -10,8 +10,8 @@ import 'dart:convert'; import 'package:flutter/foundation.dart'; import 'package:get/get.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import 'package:mom_kitchen/src/controllers/base_controller.dart'; -import 'package:mom_kitchen/src/models/tool_item_model.dart'; +import 'package:mom_kitchen/src/controllers/browse/base_controller.dart'; +import 'package:mom_kitchen/src/models/app/tool_item_model.dart'; /// Isolate-safe function to parse JSON, preventing UI thread blockage. Map _parseUsageData(String data) { diff --git a/lib/src/controllers/tools/weight_controller.dart b/lib/src/controllers/tools/weight_controller.dart index 14b7ff3..11989c4 100644 --- a/lib/src/controllers/tools/weight_controller.dart +++ b/lib/src/controllers/tools/weight_controller.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: weight_controller.dart * 名称: 体重管理控制器 * 作用: 管理体重记录CRUD、目标设置、统计计算、单位切换 @@ -8,9 +8,9 @@ import 'dart:math'; import 'package:flutter/cupertino.dart'; import 'package:get/get.dart'; -import 'package:mom_kitchen/src/controllers/base_controller.dart'; -import 'package:mom_kitchen/src/models/weight_record_model.dart'; -import 'package:mom_kitchen/src/services/data/hive_service.dart'; +import 'package:mom_kitchen/src/controllers/browse/base_controller.dart'; +import 'package:mom_kitchen/src/models/user/weight_record_model.dart'; +import 'package:mom_kitchen/src/services/data/storage/hive_service.dart'; class WeightController extends BaseController { static const String _boxName = 'weightRecordBox'; diff --git a/lib/src/controllers/tools/what_to_eat_controller.dart b/lib/src/controllers/tools/what_to_eat_controller.dart index 5d2e9ee..3ee212f 100644 --- a/lib/src/controllers/tools/what_to_eat_controller.dart +++ b/lib/src/controllers/tools/what_to_eat_controller.dart @@ -1,9 +1,9 @@ -// 2026-04-10 | WhatToEatController | 今天吃什么控制器 | 重写：使用categories+tags+filter_apply实现动态筛选 +// 2026-04-10 | WhatToEatController | 今天吃什么控制器 | 重写：使用categories+tags+filter_apply实现动态筛选 // 2026-04-10 | 修复: act=random/smart不存在，改用filter_apply；分类/标签从api.php获取 // 2026-04-10 | 修复: 动态筛选卡死闪退+添加加载动画+超时保护+初始化安全 import 'package:flutter/foundation.dart'; import 'package:get/get.dart'; -import 'package:mom_kitchen/src/controllers/base_controller.dart'; +import 'package:mom_kitchen/src/controllers/browse/base_controller.dart'; import 'package:mom_kitchen/src/models/recipe/recipe_model.dart'; import 'package:mom_kitchen/src/models/recipe/category_model.dart'; import 'package:mom_kitchen/src/models/recipe/tag_model.dart'; diff --git a/lib/src/controllers/user/favorites_controller.dart b/lib/src/controllers/user/favorites_controller.dart index e144688..37f07a2 100644 --- a/lib/src/controllers/user/favorites_controller.dart +++ b/lib/src/controllers/user/favorites_controller.dart @@ -1,12 +1,12 @@ -// 2026-04-09 | FavoritesController | 收藏控制器 | 统一管理收藏状态，支持Hive持久化 +// 2026-04-09 | FavoritesController | 收藏控制器 | 统一管理收藏状态，支持Hive持久化 // 2026-04-09 | 新增排序、分类筛选、批量删除功能 // 2026-04-16 | 新增搜索功能、统计信息、导出功能 import 'dart:convert'; import 'package:flutter/foundation.dart'; import 'package:get/get.dart'; -import 'package:mom_kitchen/src/controllers/base_controller.dart'; -import 'package:mom_kitchen/src/models/feed_item_model.dart'; -import 'package:mom_kitchen/src/services/data/hive_service.dart'; +import 'package:mom_kitchen/src/controllers/browse/base_controller.dart'; +import 'package:mom_kitchen/src/models/feed/feed_item_model.dart'; +import 'package:mom_kitchen/src/services/data/storage/hive_service.dart'; import 'package:mom_kitchen/src/services/ui/toast_service.dart'; enum FavoritesSortMode { newest, oldest, nameAsc, nameDesc } diff --git a/lib/src/controllers/user/online_controller.dart b/lib/src/controllers/user/online_controller.dart index 67ab282..b07db01 100644 --- a/lib/src/controllers/user/online_controller.dart +++ b/lib/src/controllers/user/online_controller.dart @@ -1,8 +1,8 @@ -// 2026-04-09 | OnlineController | 在线统计控制器 | 管理心跳和在线数据 +// 2026-04-09 | OnlineController | 在线统计控制器 | 管理心跳和在线数据 // 2026-04-10 | API v2.0.0: OnlineRepository → StatsRepository，移除 timeline 方法 import 'dart:async'; import 'package:get/get.dart'; -import 'package:mom_kitchen/src/controllers/base_controller.dart'; +import 'package:mom_kitchen/src/controllers/browse/base_controller.dart'; import 'package:mom_kitchen/src/repositories/online_repository.dart' as repo; class OnlineController extends BaseController { diff --git a/lib/src/controllers/user/personalization_controller.dart b/lib/src/controllers/user/personalization_controller.dart index 03d38ae..abd2de5 100644 --- a/lib/src/controllers/user/personalization_controller.dart +++ b/lib/src/controllers/user/personalization_controller.dart @@ -1,6 +1,6 @@ -import 'package:flutter/material.dart'; +import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:mom_kitchen/src/controllers/base_controller.dart'; +import 'package:mom_kitchen/src/controllers/browse/base_controller.dart'; import 'package:mom_kitchen/src/services/core/app_service.dart'; import 'package:mom_kitchen/src/services/ui/theme_service.dart'; import 'package:mom_kitchen/src/services/ui/animation_service.dart'; diff --git a/lib/src/controllers/user/preference_controller.dart b/lib/src/controllers/user/preference_controller.dart index 6229661..81584fd 100644 --- a/lib/src/controllers/user/preference_controller.dart +++ b/lib/src/controllers/user/preference_controller.dart @@ -1,7 +1,7 @@ -// 2026-04-10 | PreferenceController | 用户偏好控制器 | 完全重写，自动初始化用户ID +// 2026-04-10 | PreferenceController | 用户偏好控制器 | 完全重写，自动初始化用户ID import 'package:flutter/foundation.dart'; import 'package:get/get.dart'; -import 'package:mom_kitchen/src/controllers/base_controller.dart'; +import 'package:mom_kitchen/src/controllers/browse/base_controller.dart'; import 'package:mom_kitchen/src/models/user/user_preference_model.dart'; import 'package:mom_kitchen/src/repositories/preference_repository.dart' as repo; diff --git a/lib/src/controllers/user/profile_controller.dart b/lib/src/controllers/user/profile_controller.dart index ef93fbd..3a328e4 100644 --- a/lib/src/controllers/user/profile_controller.dart +++ b/lib/src/controllers/user/profile_controller.dart @@ -1,5 +1,5 @@ -import 'package:get/get.dart'; -import 'package:mom_kitchen/src/controllers/base_controller.dart'; +import 'package:get/get.dart'; +import 'package:mom_kitchen/src/controllers/browse/base_controller.dart'; import 'package:mom_kitchen/src/services/core/app_service.dart'; class UserModel { diff --git a/lib/src/models/app/tool_item_model.dart b/lib/src/models/app/tool_item_model.dart index 7ed42a3..0dd1a30 100644 --- a/lib/src/models/app/tool_item_model.dart +++ b/lib/src/models/app/tool_item_model.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: tool_item_model.dart * 名称: 工具项数据模型 * 作用: 定义工具中心工具项的数据结构 @@ -11,7 +11,7 @@ * 更新: 2026-04-19 新增帮我做决定工具 */ -import 'package:mom_kitchen/src/models/waterfall_slot.dart'; +import 'package:mom_kitchen/src/models/feed/waterfall_slot.dart'; class ToolItem { final String id; diff --git a/lib/src/models/farm/config/achievement_registry.dart b/lib/src/models/farm/config/achievement_registry.dart index 35f07db..ad8536e 100644 --- a/lib/src/models/farm/config/achievement_registry.dart +++ b/lib/src/models/farm/config/achievement_registry.dart @@ -1,6 +1,6 @@ -// 成就注册表 +// 成就注册表 // 提供所有成就配置的查询和验证接口 -import 'package:mom_kitchen/src/models/farm/achievement_config.dart'; +import 'package:mom_kitchen/src/models/farm/config/achievement_config.dart'; class AchievementRegistry { AchievementRegistry._(); diff --git a/lib/src/models/farm/config/crop_registry.dart b/lib/src/models/farm/config/crop_registry.dart index dc65c60..09de4b8 100644 --- a/lib/src/models/farm/config/crop_registry.dart +++ b/lib/src/models/farm/config/crop_registry.dart @@ -1,6 +1,6 @@ -// 作物注册表 +// 作物注册表 // 提供所有作物配置的静态查询接口 -import 'package:mom_kitchen/src/models/farm/crop_config.dart'; +import 'package:mom_kitchen/src/models/farm/config/crop_config.dart'; class CropRegistry { CropRegistry._(); diff --git a/lib/src/models/farm/entity/farm_land.dart b/lib/src/models/farm/entity/farm_land.dart index 1dd89e0..874124d 100644 --- a/lib/src/models/farm/entity/farm_land.dart +++ b/lib/src/models/farm/entity/farm_land.dart @@ -1,9 +1,9 @@ -/// 农场土地数据模型 +/// 农场土地数据模型 /// 存储每块土地的种植状态、作物生长信息 library; import 'package:hive_ce/hive.dart'; -import 'package:mom_kitchen/src/models/farm/crop_registry.dart'; +import 'package:mom_kitchen/src/models/farm/config/crop_registry.dart'; part 'farm_land.g.dart'; diff --git a/lib/src/models/feed/waterfall_slot.dart b/lib/src/models/feed/waterfall_slot.dart index 1cad098..1157fd6 100644 --- a/lib/src/models/feed/waterfall_slot.dart +++ b/lib/src/models/feed/waterfall_slot.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: waterfall_slot.dart * 名称: 瀑布流插槽模型 * 作用: 统一管理瀑布流中插入的各类卡片（miniCard、toolCard等） @@ -6,8 +6,8 @@ * 更新时间: 2026-04-17 初始创建 */ -import 'package:mom_kitchen/src/models/tool_item_model.dart'; -import 'package:mom_kitchen/src/models/mini_card_model.dart'; +import 'package:mom_kitchen/src/models/app/tool_item_model.dart'; +import 'package:mom_kitchen/src/models/feed/mini_card_model.dart'; enum WaterfallSlotType { miniCard, toolCard } diff --git a/lib/src/pages/discover/components/tool_detail_sheet.dart b/lib/src/pages/discover/components/tool_detail_sheet.dart index f7882fe..10b262e 100644 --- a/lib/src/pages/discover/components/tool_detail_sheet.dart +++ b/lib/src/pages/discover/components/tool_detail_sheet.dart @@ -1,7 +1,7 @@ -import 'package:flutter/cupertino.dart'; +import 'package:flutter/cupertino.dart'; import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; -import 'package:mom_kitchen/src/models/tool_item_model.dart'; +import 'package:mom_kitchen/src/models/app/tool_item_model.dart'; class ToolDetailSheet extends StatelessWidget { final ToolItem tool; diff --git a/lib/src/pages/discover/components/tools_panel_widget.dart b/lib/src/pages/discover/components/tools_panel_widget.dart index 9ade274..ae6f81e 100644 --- a/lib/src/pages/discover/components/tools_panel_widget.dart +++ b/lib/src/pages/discover/components/tools_panel_widget.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: tools_panel_widget.dart * 名称: 工具中心面板组件 * 作用: 从顶部滑入的工具中心面板，支持下拉关闭、系统返回键 @@ -10,7 +10,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/services.dart'; import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; -import 'package:mom_kitchen/src/models/tool_item_model.dart'; +import 'package:mom_kitchen/src/models/app/tool_item_model.dart'; import 'package:mom_kitchen/src/controllers/tools/tools_controller.dart'; import 'tool_detail_sheet.dart'; import 'browse_history_section.dart'; diff --git a/lib/src/pages/discover/discover_page.dart b/lib/src/pages/discover/discover_page.dart index fa6ad64..f4a7cdb 100644 --- a/lib/src/pages/discover/discover_page.dart +++ b/lib/src/pages/discover/discover_page.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: discover_page.dart * 名称: 发现页面 * 作用: iOS 26 风格的发现页面，整合热门排行+今天吃什么+搜索，支持下拉进入工具中心 @@ -22,7 +22,7 @@ import 'package:mom_kitchen/src/widgets/glass/glass_search_bar.dart'; import 'package:mom_kitchen/src/widgets/glass/glass_segmented_control.dart'; import 'package:mom_kitchen/src/controllers/feed/hot_controller.dart'; import 'package:mom_kitchen/src/controllers/tools/tools_controller.dart'; -import 'package:mom_kitchen/src/models/tool_item_model.dart'; +import 'package:mom_kitchen/src/models/app/tool_item_model.dart'; import 'components/tools_panel_widget.dart'; import 'components/discover_sections_widget.dart'; diff --git a/lib/src/pages/discover/ingredient_recipe_list_page.dart b/lib/src/pages/discover/ingredient_recipe_list_page.dart index aef040e..4d3aa3a 100644 --- a/lib/src/pages/discover/ingredient_recipe_list_page.dart +++ b/lib/src/pages/discover/ingredient_recipe_list_page.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: ingredient_recipe_list_page.dart * 名称: 食材菜品列表页面 * 作用: 显示某食材相关的菜品列表，支持分页加载 @@ -10,7 +10,7 @@ import 'package:flutter/cupertino.dart'; import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/api_config.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; -import 'package:mom_kitchen/src/models/api_response.dart'; +import 'package:mom_kitchen/src/models/app/api_response.dart'; import 'package:mom_kitchen/src/models/recipe/recipe_model.dart'; import 'package:mom_kitchen/src/services/api/api_service.dart'; import 'package:mom_kitchen/src/widgets/recipe/recipe_image.dart'; diff --git a/lib/src/pages/discover/mini_card/mini_card_image_view.dart b/lib/src/pages/discover/mini_card/mini_card_image_view.dart index ff84a58..7fe7192 100644 --- a/lib/src/pages/discover/mini_card/mini_card_image_view.dart +++ b/lib/src/pages/discover/mini_card/mini_card_image_view.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: mini_card_image_view.dart * 名称: 迷你卡片图片组件 * 作用: 迷你卡片的图片展示组件，包含液态玻璃效果、分类标签、操作按钮 @@ -11,7 +11,7 @@ import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; -import 'package:mom_kitchen/src/models/mini_card_model.dart'; +import 'package:mom_kitchen/src/models/feed/mini_card_model.dart'; import 'package:mom_kitchen/src/widgets/glass/glass_container.dart'; class MiniCardImageView extends StatelessWidget { diff --git a/lib/src/pages/discover/mini_card/mini_card_page.dart b/lib/src/pages/discover/mini_card/mini_card_page.dart index dbeb353..7b3b564 100644 --- a/lib/src/pages/discover/mini_card/mini_card_page.dart +++ b/lib/src/pages/discover/mini_card/mini_card_page.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: mini_card_page.dart * 名称: 迷你卡片页面 * 作用: 交友软件风格左右滑动浏览菜品，支持分类筛选/搜索/收藏/全屏查看/分享 @@ -23,12 +23,12 @@ import 'package:shared_preferences/shared_preferences.dart'; import 'package:path_provider/path_provider.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; import 'package:mom_kitchen/src/config/app_routes.dart'; -import 'package:mom_kitchen/src/models/mini_card_model.dart'; -import 'package:mom_kitchen/src/controllers/data/favorites_controller.dart'; -import 'package:mom_kitchen/src/models/feed_item_model.dart'; +import 'package:mom_kitchen/src/models/feed/mini_card_model.dart'; +import 'package:mom_kitchen/src/controllers/user/favorites_controller.dart'; +import 'package:mom_kitchen/src/models/feed/feed_item_model.dart'; import 'package:mom_kitchen/src/services/api/api_service.dart'; import 'package:mom_kitchen/src/repositories/recipe_repository.dart'; -import 'package:mom_kitchen/src/models/api_response.dart'; +import 'package:mom_kitchen/src/models/app/api_response.dart'; import 'package:mom_kitchen/src/pages/discover/mini_card/mini_card_image_view.dart'; import 'package:mom_kitchen/src/pages/discover/mini_card/mini_card_viewer.dart'; diff --git a/lib/src/pages/discover/mini_card/mini_card_viewer.dart b/lib/src/pages/discover/mini_card/mini_card_viewer.dart index a799393..3263a73 100644 --- a/lib/src/pages/discover/mini_card/mini_card_viewer.dart +++ b/lib/src/pages/discover/mini_card/mini_card_viewer.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: mini_card_viewer.dart * 名称: 迷你卡片全屏查看器 * 作用: 迷你卡片的全屏图片查看，基于公共ImageViewerPage，增加液态玻璃信息层 @@ -11,9 +11,9 @@ import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; -import 'package:mom_kitchen/src/models/mini_card_model.dart'; +import 'package:mom_kitchen/src/models/feed/mini_card_model.dart'; import 'package:mom_kitchen/src/widgets/glass/glass_container.dart'; -import 'package:mom_kitchen/src/widgets/image_viewer/image_viewer_page.dart'; +import 'package:mom_kitchen/src/widgets/common/image_viewer_page.dart'; class MiniCardViewer { static Future open({ diff --git a/lib/src/pages/home/home_card_carousel.dart b/lib/src/pages/home/home_card_carousel.dart index 48908f9..4f3ec7c 100644 --- a/lib/src/pages/home/home_card_carousel.dart +++ b/lib/src/pages/home/home_card_carousel.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: home_card_carousel.dart * 说明: 首页卡片式横向滚动组件。支持左右滑动、过渡动画和卡片布局。 * 作用: 提供美观的卡片信息流浏览体验。 @@ -9,10 +9,10 @@ import 'package:flutter/cupertino.dart'; import 'package:get/get.dart'; -import 'package:mom_kitchen/src/controllers/home/home_controller.dart'; +import 'package:mom_kitchen/src/controllers/browse/home_controller.dart'; import 'package:mom_kitchen/src/controllers/data/shopping_list_controller.dart'; import 'package:mom_kitchen/src/models/recipe/recipe_model.dart'; -import 'package:mom_kitchen/src/models/data/shopping_item_model.dart'; +import 'package:mom_kitchen/src/models/data/plan/shopping_item_model.dart'; import 'package:mom_kitchen/src/services/ui/theme_service.dart'; import 'package:mom_kitchen/src/services/ui/toast_service.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; diff --git a/lib/src/pages/home/home_page.dart b/lib/src/pages/home/home_page.dart index 027a24f..d4ea93f 100644 --- a/lib/src/pages/home/home_page.dart +++ b/lib/src/pages/home/home_page.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: home_page.dart * 名称: 首页 * 作用: iOS风格首页，Discover瀑布流布局，Liquid Glass风格 @@ -17,17 +17,17 @@ import 'package:mom_kitchen/src/config/design_tokens.dart'; import 'package:mom_kitchen/src/repositories/recipe_repository.dart'; import 'package:mom_kitchen/src/repositories/discover_repository.dart'; import 'package:mom_kitchen/src/models/recipe/recipe_model.dart'; -import 'package:mom_kitchen/src/models/discover_model.dart'; -import 'package:mom_kitchen/src/services/data/cache_service.dart'; -import 'package:mom_kitchen/src/widgets/carousel/feature_carousel_card.dart'; +import 'package:mom_kitchen/src/models/feed/discover_model.dart'; +import 'package:mom_kitchen/src/services/data/storage/cache_service.dart'; +import 'package:mom_kitchen/src/widgets/common/feature_carousel_card.dart'; import 'package:mom_kitchen/src/widgets/base/skeleton_loader.dart'; import 'package:mom_kitchen/src/services/ui/toast_service.dart'; import 'package:mom_kitchen/src/controllers/data/meal_record_controller.dart'; import 'package:mom_kitchen/src/widgets/discover/discover_waterfall.dart'; import 'package:mom_kitchen/src/widgets/glass/nav/home_app_bar.dart'; -import 'package:mom_kitchen/src/models/mini_card_model.dart'; -import 'package:mom_kitchen/src/services/data/mini_card_service.dart'; -import 'package:mom_kitchen/src/models/tool_item_model.dart'; +import 'package:mom_kitchen/src/models/feed/mini_card_model.dart'; +import 'package:mom_kitchen/src/services/data/business/mini_card_service.dart'; +import 'package:mom_kitchen/src/models/app/tool_item_model.dart'; class HomePage extends StatefulWidget { const HomePage({super.key}); diff --git a/lib/src/pages/home/home_products.dart b/lib/src/pages/home/home_products.dart index 2c939ac..cdb0838 100644 --- a/lib/src/pages/home/home_products.dart +++ b/lib/src/pages/home/home_products.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: home_products.dart * 说明: 首页菜谱列表标签。展示搜索栏、分类过滤和菜谱网格。 * 作用: 提供首页的主要菜谱浏览功能。 @@ -9,7 +9,7 @@ import 'package:flutter/cupertino.dart'; import 'package:get/get.dart'; -import 'package:mom_kitchen/src/controllers/home/home_controller.dart'; +import 'package:mom_kitchen/src/controllers/browse/home_controller.dart'; import 'package:mom_kitchen/src/standards/page_standards.dart'; import 'package:mom_kitchen/src/widgets/product_card.dart'; import 'package:mom_kitchen/src/widgets/states/empty_state.dart'; diff --git a/lib/src/pages/home/home_recommended.dart b/lib/src/pages/home/home_recommended.dart index b42a193..3b17fd3 100644 --- a/lib/src/pages/home/home_recommended.dart +++ b/lib/src/pages/home/home_recommended.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: home_recommended.dart * 说明: 首页推荐标签。展示高评分或热卖菜谱。 * 作用: 提供首页的推荐和热卖内容。 @@ -9,7 +9,7 @@ import 'package:flutter/cupertino.dart'; import 'package:get/get.dart'; -import 'package:mom_kitchen/src/controllers/home/home_controller.dart'; +import 'package:mom_kitchen/src/controllers/browse/home_controller.dart'; import 'package:mom_kitchen/src/standards/page_standards.dart'; import 'package:mom_kitchen/src/widgets/product_card.dart'; import 'package:mom_kitchen/src/widgets/states/empty_state.dart'; diff --git a/lib/src/pages/home/recipe_detail_page.dart b/lib/src/pages/home/recipe_detail_page.dart index 784a5f7..60bd78c 100644 --- a/lib/src/pages/home/recipe_detail_page.dart +++ b/lib/src/pages/home/recipe_detail_page.dart @@ -1,4 +1,4 @@ -// 2026-04-09 | recipe_detail_page.dart | 菜谱详情页 | 展示菜谱详细信息 +// 2026-04-09 | recipe_detail_page.dart | 菜谱详情页 | 展示菜谱详细信息 // 2026-04-11 | 重构: 拆分为Controller+18个独立UI组件，提高可维护性 // 2026-04-13 | 新增rating数据传递到RecipeCoverImage和RecipeStatisticsBar // 2026-04-14 | 新增邮件分享按钮，支持发送菜谱详情到用户邮箱 @@ -6,7 +6,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; -import 'package:mom_kitchen/src/controllers/recipe/recipe_detail_controller.dart'; +import 'package:mom_kitchen/src/controllers/browse/recipe_detail_controller.dart'; import 'package:mom_kitchen/src/widgets/recipe_detail/interaction/recipe_action_bar.dart'; import 'package:mom_kitchen/src/widgets/recipe_detail/info/recipe_allergen_warning.dart'; import 'package:mom_kitchen/src/widgets/recipe_detail/header/recipe_author_card.dart'; @@ -18,7 +18,7 @@ import 'package:mom_kitchen/src/widgets/recipe_detail/content/recipe_indices_car import 'package:mom_kitchen/src/widgets/recipe_detail/header/recipe_meta_info_card.dart'; import 'package:mom_kitchen/src/widgets/recipe_detail/info/recipe_nutrition_section.dart'; import 'package:mom_kitchen/src/widgets/recipe_detail/content/recipe_picid_card.dart'; -import 'package:mom_kitchen/src/widgets/recipe_detail/recipe_skeleton_view.dart'; +import 'package:mom_kitchen/src/widgets/recipe_detail/content/recipe_skeleton_view.dart'; import 'package:mom_kitchen/src/services/ui/toast_service.dart'; import 'package:mom_kitchen/src/widgets/recipe_detail/interaction/recipe_statistics_bar.dart'; import 'package:mom_kitchen/src/widgets/recipe_detail/content/recipe_steps_section.dart'; diff --git a/lib/src/pages/profile/data/cache_manage_page.dart b/lib/src/pages/profile/data/cache_manage_page.dart index 4e9c6bb..8204501 100644 --- a/lib/src/pages/profile/data/cache_manage_page.dart +++ b/lib/src/pages/profile/data/cache_manage_page.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: cache_manage_page.dart * 说明: 缓存管理页面 * 作用: 管理首页Discover缓存、菜品详情缓存、食材缓存、API缓存与图片缓存 @@ -15,11 +15,11 @@ import 'package:get/get.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:mom_kitchen/src/config/app_routes.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; -import 'package:mom_kitchen/src/models/discover_model.dart'; +import 'package:mom_kitchen/src/models/feed/discover_model.dart'; import 'package:mom_kitchen/src/models/recipe/recipe_model.dart'; import 'package:mom_kitchen/src/repositories/recipe_repository.dart'; -import 'package:mom_kitchen/src/services/data/cache_service.dart'; -import 'package:mom_kitchen/src/services/data/ingredient_cache_service.dart'; +import 'package:mom_kitchen/src/services/data/storage/cache_service.dart'; +import 'package:mom_kitchen/src/services/data/storage/ingredient_cache_service.dart'; import 'package:mom_kitchen/src/services/ui/toast_service.dart'; class CacheManagePage extends StatefulWidget { diff --git a/lib/src/pages/profile/data/data_center_page.dart b/lib/src/pages/profile/data/data_center_page.dart index 5550d32..ab3fab8 100644 --- a/lib/src/pages/profile/data/data_center_page.dart +++ b/lib/src/pages/profile/data/data_center_page.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: data_center_page.dart * 名称: 数据管理中心页面 * 作用: 管理分类标签(口味/工艺/食材)和过敏原数据，支持API同步+本地持久化 @@ -8,7 +8,7 @@ import 'package:flutter/cupertino.dart'; import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; -import 'package:mom_kitchen/src/services/data/local_data_service.dart'; +import 'package:mom_kitchen/src/services/data/storage/local_data_service.dart'; import 'package:mom_kitchen/src/services/ui/toast_service.dart'; class DataCenterPage extends StatefulWidget { diff --git a/lib/src/pages/profile/info/about_page.dart b/lib/src/pages/profile/info/about_page.dart index 7f6fb51..5a5723e 100644 --- a/lib/src/pages/profile/info/about_page.dart +++ b/lib/src/pages/profile/info/about_page.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: about_page.dart * 名称: 关于页面 * 作用: 展示应用信息、版本号、用户反馈入口、开发者文档等 @@ -15,11 +15,11 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart' show Divider; import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; -import 'package:mom_kitchen/src/pages/profile/app_info_page.dart'; -import 'package:mom_kitchen/src/pages/profile/learn_us_page.dart'; -import 'package:mom_kitchen/src/pages/profile/privacy_policy_page.dart'; -import 'package:mom_kitchen/src/pages/profile/permission_page.dart'; -import 'package:mom_kitchen/src/pages/profile/references_page.dart'; +import 'package:mom_kitchen/src/pages/profile/info/app_info_page.dart'; +import 'package:mom_kitchen/src/pages/profile/info/learn_us_page.dart'; +import 'package:mom_kitchen/src/pages/profile/info/privacy_policy_page.dart'; +import 'package:mom_kitchen/src/pages/profile/tools/permission_page.dart'; +import 'package:mom_kitchen/src/pages/profile/info/references_page.dart'; import 'package:mom_kitchen/src/services/core/app_info_service.dart'; import 'package:url_launcher/url_launcher.dart'; diff --git a/lib/src/pages/profile/info/guide_page.dart b/lib/src/pages/profile/info/guide_page.dart index 0130dc2..26c9ad4 100644 --- a/lib/src/pages/profile/info/guide_page.dart +++ b/lib/src/pages/profile/info/guide_page.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: guide_page.dart * 名称: 首次引导页 * 作用: 首次启动应用时展示欢迎信息和协议，用户同意后方可使用 @@ -10,9 +10,9 @@ import 'dart:io'; import 'package:flutter/cupertino.dart'; import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; -import 'package:mom_kitchen/src/pages/profile/permission_page.dart'; -import 'package:mom_kitchen/src/pages/profile/privacy_policy_page.dart'; -import 'package:mom_kitchen/src/services/data/storage_service.dart'; +import 'package:mom_kitchen/src/pages/profile/tools/permission_page.dart'; +import 'package:mom_kitchen/src/pages/profile/info/privacy_policy_page.dart'; +import 'package:mom_kitchen/src/services/data/storage/storage_service.dart'; import 'package:mom_kitchen/src/config/app_routes.dart'; class GuidePage extends StatefulWidget { diff --git a/lib/src/pages/profile/nutrition/add_meal_sheet.dart b/lib/src/pages/profile/nutrition/add_meal_sheet.dart index 5b023dc..e9a5a35 100644 --- a/lib/src/pages/profile/nutrition/add_meal_sheet.dart +++ b/lib/src/pages/profile/nutrition/add_meal_sheet.dart @@ -1,7 +1,7 @@ -// 2026-04-09 | AddMealSheet | 添加饮食记录弹窗 | iOS26风格底部弹窗，支持手动输入营养数据 +// 2026-04-09 | AddMealSheet | 添加饮食记录弹窗 | iOS26风格底部弹窗，支持手动输入营养数据 import 'package:flutter/cupertino.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; -import 'package:mom_kitchen/src/models/data/meal_record_model.dart'; +import 'package:mom_kitchen/src/models/data/record/meal_record_model.dart'; class AddMealSheet extends StatefulWidget { final MealType mealType; diff --git a/lib/src/pages/profile/nutrition/nutrition_center_page.dart b/lib/src/pages/profile/nutrition/nutrition_center_page.dart index f745bca..9422b16 100644 --- a/lib/src/pages/profile/nutrition/nutrition_center_page.dart +++ b/lib/src/pages/profile/nutrition/nutrition_center_page.dart @@ -1,11 +1,11 @@ -// 2026-04-09 | NutritionCenterPage | 营养中心页面 | iOS26风格饮食日记+营养分析+目标管理 +// 2026-04-09 | NutritionCenterPage | 营养中心页面 | iOS26风格饮食日记+营养分析+目标管理 // 2026-04-10 | 修复报告按钮卡死：添加错误处理+空指针保护 // 2026-04-13 | 新增健身餐推荐+营养目标追踪快捷入口 import 'package:flutter/cupertino.dart'; import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; import 'package:mom_kitchen/src/controllers/data/meal_record_controller.dart'; -import 'package:mom_kitchen/src/models/data/meal_record_model.dart'; +import 'package:mom_kitchen/src/models/data/record/meal_record_model.dart'; import 'package:mom_kitchen/src/widgets/custom_widgets.dart'; import 'package:mom_kitchen/src/widgets/glass/glass_container.dart'; import 'package:mom_kitchen/src/pages/profile/nutrition/add_meal_sheet.dart'; diff --git a/lib/src/pages/profile/profile_settings.dart b/lib/src/pages/profile/profile_settings.dart index 62552bb..ba74c5e 100644 --- a/lib/src/pages/profile/profile_settings.dart +++ b/lib/src/pages/profile/profile_settings.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: profile_settings.dart * 名称: 个人中心设置标签 * 作用: iOS 26 风格的设置选项，使用 DesignTokens 和 GlassSettingsTile @@ -20,7 +20,7 @@ import 'package:mom_kitchen/src/pages/discover/hot_page.dart'; import 'package:mom_kitchen/src/pages/tools/cooking/cooking_note_page.dart'; import 'package:mom_kitchen/src/pages/profile/social/footprints_page.dart'; import 'package:mom_kitchen/src/pages/profile/data/cache_manage_page.dart'; -import 'package:mom_kitchen/src/pages/profile/data_export_page.dart'; +import 'package:mom_kitchen/src/pages/profile/tools/data_export_page.dart'; class ProfileSettingsTab extends StatelessWidget { const ProfileSettingsTab({super.key}); diff --git a/lib/src/pages/profile/settings/personalization_page.dart b/lib/src/pages/profile/settings/personalization_page.dart index 6e0dae6..5ff47ad 100644 --- a/lib/src/pages/profile/settings/personalization_page.dart +++ b/lib/src/pages/profile/settings/personalization_page.dart @@ -1,10 +1,10 @@ -import 'package:flutter/cupertino.dart'; +import 'package:flutter/cupertino.dart'; import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/app_routes.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; import 'package:mom_kitchen/src/controllers/user/personalization_controller.dart'; import 'package:mom_kitchen/src/services/core/app_service.dart'; -import 'package:mom_kitchen/src/services/data/storage_service.dart'; +import 'package:mom_kitchen/src/services/data/storage/storage_service.dart'; import 'package:mom_kitchen/src/services/ui/theme_service.dart'; import 'package:mom_kitchen/src/widgets/common/skeleton_widgets.dart'; import 'package:mom_kitchen/src/widgets/states/standard_dialog.dart'; diff --git a/lib/src/pages/profile/settings/preference_page.dart b/lib/src/pages/profile/settings/preference_page.dart index 6cba110..ac589c7 100644 --- a/lib/src/pages/profile/settings/preference_page.dart +++ b/lib/src/pages/profile/settings/preference_page.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: preference_page.dart * 名称: 偏好设置页面 * 作用: 管理用户口味偏好、饮食类型、烹饪水平、健康目标、过敏原屏蔽等 @@ -11,7 +11,7 @@ import 'package:get/get.dart'; import 'package:mom_kitchen/src/controllers/user/preference_controller.dart'; import 'package:mom_kitchen/src/models/user/user_preference_model.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; -import 'package:mom_kitchen/src/services/user/taste_preference_service.dart'; +import 'package:mom_kitchen/src/services/core/taste_preference_service.dart'; class PreferencePage extends StatefulWidget { const PreferencePage({super.key}); diff --git a/lib/src/pages/profile/social/email_history_page.dart b/lib/src/pages/profile/social/email_history_page.dart index 18c141e..cb775a4 100644 --- a/lib/src/pages/profile/social/email_history_page.dart +++ b/lib/src/pages/profile/social/email_history_page.dart @@ -1,12 +1,12 @@ -// 2026-04-15 | email_history_page.dart | 发件记录页面 | 展示邮件发送历史 +// 2026-04-15 | email_history_page.dart | 发件记录页面 | 展示邮件发送历史 // 2026-04-15 | 初始创建，展示邮件发送记录列表，支持删除/清空/查看详情 import 'package:flutter/cupertino.dart'; import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/app_routes.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; -import 'package:mom_kitchen/src/controllers/data/email_history_controller.dart'; -import 'package:mom_kitchen/src/models/data/email_record_model.dart'; +import 'package:mom_kitchen/src/controllers/user/email_history_controller.dart'; +import 'package:mom_kitchen/src/models/data/record/email_record_model.dart'; import 'package:mom_kitchen/src/services/ui/toast_service.dart'; class EmailHistoryPage extends StatelessWidget { diff --git a/lib/src/pages/profile/social/favorites_item_builders.dart b/lib/src/pages/profile/social/favorites_item_builders.dart index 1b60f56..ba1fe33 100644 --- a/lib/src/pages/profile/social/favorites_item_builders.dart +++ b/lib/src/pages/profile/social/favorites_item_builders.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: favorites_item_builders.dart * 名称: 收藏项构建器 Mixin * 作用: 收藏页面中各类收藏项的构建方法，拆分自 favorites_page.dart @@ -11,8 +11,8 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; -import 'package:mom_kitchen/src/controllers/data/favorites_controller.dart'; -import 'package:mom_kitchen/src/models/feed_item_model.dart'; +import 'package:mom_kitchen/src/controllers/user/favorites_controller.dart'; +import 'package:mom_kitchen/src/models/feed/feed_item_model.dart'; import 'package:mom_kitchen/src/config/app_routes.dart'; import 'package:mom_kitchen/src/widgets/recipe/recipe_image.dart'; diff --git a/lib/src/pages/profile/social/favorites_page.dart b/lib/src/pages/profile/social/favorites_page.dart index d270486..042e967 100644 --- a/lib/src/pages/profile/social/favorites_page.dart +++ b/lib/src/pages/profile/social/favorites_page.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: favorites_page.dart * 名称: 收藏页面 * 作用: iOS 26 Liquid Glass 风格的收藏页面，顶部显示快捷功能入口 @@ -17,9 +17,9 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:badges/badges.dart' as badges; import 'package:mom_kitchen/src/config/design_tokens.dart'; -import 'package:mom_kitchen/src/controllers/data/favorites_controller.dart'; +import 'package:mom_kitchen/src/controllers/user/favorites_controller.dart'; import 'package:mom_kitchen/src/controllers/data/shopping_list_controller.dart'; -import 'package:mom_kitchen/src/models/feed_item_model.dart'; +import 'package:mom_kitchen/src/models/feed/feed_item_model.dart'; import 'package:mom_kitchen/src/pages/profile/social/favorites_item_builders.dart'; import 'package:mom_kitchen/src/widgets/glass/glass_container.dart'; import 'package:mom_kitchen/src/services/ui/toast_service.dart'; diff --git a/lib/src/pages/profile/social/favorites_tools_panel.dart b/lib/src/pages/profile/social/favorites_tools_panel.dart index d4ccfc2..59955fc 100644 --- a/lib/src/pages/profile/social/favorites_tools_panel.dart +++ b/lib/src/pages/profile/social/favorites_tools_panel.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: favorites_tools_panel.dart * 名称: 收藏页面工具面板 Mixin * 作用: 收藏页面中工具面板和工具栏的构建方法，拆分自 favorites_page.dart @@ -11,7 +11,7 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; import 'package:mom_kitchen/src/controllers/tools/tools_controller.dart'; -import 'package:mom_kitchen/src/models/tool_item_model.dart'; +import 'package:mom_kitchen/src/models/app/tool_item_model.dart'; import 'package:mom_kitchen/src/pages/tools/tools_center_page.dart'; mixin FavoritesToolsPanel on State { diff --git a/lib/src/pages/profile/social/footprints_page.dart b/lib/src/pages/profile/social/footprints_page.dart index 436dda0..18faba3 100644 --- a/lib/src/pages/profile/social/footprints_page.dart +++ b/lib/src/pages/profile/social/footprints_page.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: footprints_page.dart * 说明: 浏览记录页面，展示用户浏览菜谱历史 * 作用: 展示用户足迹，支持管理、删除、清空 @@ -11,8 +11,8 @@ import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/app_routes.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; import 'package:mom_kitchen/src/controllers/data/browse_history_controller.dart'; -import 'package:mom_kitchen/src/controllers/data/email_history_controller.dart'; -import 'package:mom_kitchen/src/models/data/browse_history_model.dart'; +import 'package:mom_kitchen/src/controllers/user/email_history_controller.dart'; +import 'package:mom_kitchen/src/models/data/record/browse_history_model.dart'; import 'package:mom_kitchen/src/pages/profile/data/cache_manage_page.dart'; import 'package:mom_kitchen/src/services/ui/toast_service.dart'; import 'package:mom_kitchen/src/widgets/recipe/recipe_image.dart'; diff --git a/lib/src/pages/profile/social/share_records_page.dart b/lib/src/pages/profile/social/share_records_page.dart index 5f9b10e..460a4da 100644 --- a/lib/src/pages/profile/social/share_records_page.dart +++ b/lib/src/pages/profile/social/share_records_page.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: share_records_page.dart * 名称: 分享记录页面 * 作用: iOS 26 Liquid Glass 风格的分享记录管理页面 @@ -12,7 +12,7 @@ import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/app_routes.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; import 'package:mom_kitchen/src/controllers/data/share_record_controller.dart'; -import 'package:mom_kitchen/src/models/data/share_record_model.dart'; +import 'package:mom_kitchen/src/models/data/record/share_record_model.dart'; import 'package:mom_kitchen/src/services/ui/toast_service.dart'; import 'package:mom_kitchen/src/utils/app_utils.dart'; import 'package:mom_kitchen/src/widgets/glass/glass_container.dart'; diff --git a/lib/src/pages/profile/tools/data_export_page.dart b/lib/src/pages/profile/tools/data_export_page.dart index 01adcd6..0b98311 100644 --- a/lib/src/pages/profile/tools/data_export_page.dart +++ b/lib/src/pages/profile/tools/data_export_page.dart @@ -1,4 +1,4 @@ -// 2026-04-18 | DataExportPage | 数据导出/导入页面 | 支持6种数据源、3种格式导出、JSON导入、分享导入 +// 2026-04-18 | DataExportPage | 数据导出/导入页面 | 支持6种数据源、3种格式导出、JSON导入、分享导入 // 2026-04-18 | 初始创建：iOS风格UI，支持单源/全量导出 // 2026-04-18 | 新增数据导入功能：支持JSON文件选择导入和receive_sharing_intent分享导入 @@ -9,7 +9,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:receive_sharing_intent/receive_sharing_intent.dart'; -import 'package:mom_kitchen/src/services/data/data_export_service.dart'; +import 'package:mom_kitchen/src/services/data/business/data_export_service.dart'; import 'package:mom_kitchen/src/services/ui/toast_service.dart'; import 'package:mom_kitchen/src/utils/platform_utils.dart'; diff --git a/lib/src/pages/profile/tools/rating_records_page.dart b/lib/src/pages/profile/tools/rating_records_page.dart index b8c7a74..d3a0df6 100644 --- a/lib/src/pages/profile/tools/rating_records_page.dart +++ b/lib/src/pages/profile/tools/rating_records_page.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: rating_records_page.dart * 名称: 评分记录页面 * 作用: iOS 26 Liquid Glass 风格的评分记录管理页面 @@ -11,7 +11,7 @@ import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; import 'package:mom_kitchen/src/config/app_routes.dart'; import 'package:mom_kitchen/src/controllers/data/rating_records_controller.dart'; -import 'package:mom_kitchen/src/models/data/rating_record_model.dart'; +import 'package:mom_kitchen/src/models/data/record/rating_record_model.dart'; import 'package:mom_kitchen/src/widgets/glass/glass_container.dart'; import 'package:mom_kitchen/src/services/ui/toast_service.dart'; diff --git a/lib/src/pages/profile/tools/shopping_list_page.dart b/lib/src/pages/profile/tools/shopping_list_page.dart index 58db434..5765623 100644 --- a/lib/src/pages/profile/tools/shopping_list_page.dart +++ b/lib/src/pages/profile/tools/shopping_list_page.dart @@ -1,10 +1,10 @@ -// 2026-04-09 | ShoppingListPage | 购物清单页面 | iOS26风格分类展示+勾选+清空已购 +// 2026-04-09 | ShoppingListPage | 购物清单页面 | iOS26风格分类展示+勾选+清空已购 // 2026-04-09 | 初始创建，支持分类筛选/添加/删除/勾选/清空已购功能 import 'package:flutter/cupertino.dart'; import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; import 'package:mom_kitchen/src/controllers/data/shopping_list_controller.dart'; -import 'package:mom_kitchen/src/models/data/shopping_item_model.dart'; +import 'package:mom_kitchen/src/models/data/plan/shopping_item_model.dart'; import 'package:mom_kitchen/src/widgets/glass/glass_container.dart'; class ShoppingListPage extends StatefulWidget { diff --git a/lib/src/pages/tools/cooking/calculator/order_assistant_page.dart b/lib/src/pages/tools/cooking/calculator/order_assistant_page.dart index 9b9eb5b..530e21e 100644 --- a/lib/src/pages/tools/cooking/calculator/order_assistant_page.dart +++ b/lib/src/pages/tools/cooking/calculator/order_assistant_page.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: order_assistant_page.dart * 名称: 点餐助手主页面 * 作用: 点餐/推单主界面，支持菜品管理、账单生成、二维码分享、文本/图片分享 @@ -16,7 +16,7 @@ import 'package:share_plus/share_plus.dart'; import 'package:path_provider/path_provider.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; import 'package:mom_kitchen/src/controllers/tools/order_assistant_controller.dart'; -import 'package:mom_kitchen/src/models/tools/order_model.dart'; +import 'package:mom_kitchen/src/models/app/order_model.dart'; import 'package:mom_kitchen/src/pages/tools/cooking/widgets/order_item_card.dart'; import 'package:mom_kitchen/src/pages/tools/cooking/widgets/add_item_sheet.dart'; import 'package:mom_kitchen/src/pages/tools/cooking/widgets/qr_barcode_dialog.dart'; diff --git a/lib/src/pages/tools/cooking/cooking_note_page.dart b/lib/src/pages/tools/cooking/cooking_note_page.dart index e7c56bc..f63d5b3 100644 --- a/lib/src/pages/tools/cooking/cooking_note_page.dart +++ b/lib/src/pages/tools/cooking/cooking_note_page.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: cooking_note_page.dart * 名称: 烹饪笔记页面 * 作用: 按菜谱关联的个人笔记，支持增删改查、标签关键字、快捷输入 @@ -10,7 +10,7 @@ import 'package:flutter/cupertino.dart'; import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; import 'package:mom_kitchen/src/controllers/data/cooking_note_controller.dart'; -import 'package:mom_kitchen/src/models/data/cooking_note_model.dart'; +import 'package:mom_kitchen/src/models/data/record/cooking_note_model.dart'; import 'package:mom_kitchen/src/services/ui/toast_service.dart'; class CookingNotePage extends StatefulWidget { diff --git a/lib/src/pages/tools/cooking/widgets/add_item_sheet.dart b/lib/src/pages/tools/cooking/widgets/add_item_sheet.dart index b1b81f1..8bc6fcf 100644 --- a/lib/src/pages/tools/cooking/widgets/add_item_sheet.dart +++ b/lib/src/pages/tools/cooking/widgets/add_item_sheet.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: add_item_sheet.dart * 名称: 添加菜品弹窗 * 作用: 提供四种添加菜品方式的入口 @@ -7,7 +7,7 @@ */ import 'package:flutter/cupertino.dart'; -import 'package:mom_kitchen/src/models/tools/order_model.dart'; +import 'package:mom_kitchen/src/models/app/order_model.dart'; import 'package:mom_kitchen/src/pages/tools/cooking/widgets/browse_history_picker.dart'; import 'package:mom_kitchen/src/pages/tools/cooking/widgets/manual_input_sheet.dart'; diff --git a/lib/src/pages/tools/cooking/widgets/browse_history_picker.dart b/lib/src/pages/tools/cooking/widgets/browse_history_picker.dart index f185d35..8cf44dc 100644 --- a/lib/src/pages/tools/cooking/widgets/browse_history_picker.dart +++ b/lib/src/pages/tools/cooking/widgets/browse_history_picker.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: browse_history_picker.dart * 名称: 浏览记录选择器 * 作用: 展示本地浏览记录供用户选择菜品 @@ -9,8 +9,8 @@ import 'package:flutter/cupertino.dart'; import 'package:get/get.dart'; import 'package:uuid/uuid.dart'; -import 'package:mom_kitchen/src/models/tools/order_model.dart'; -import 'package:mom_kitchen/src/controllers/home/home_controller.dart'; +import 'package:mom_kitchen/src/models/app/order_model.dart'; +import 'package:mom_kitchen/src/controllers/browse/home_controller.dart'; class BrowseHistoryPicker extends StatelessWidget { final ValueChanged onSelected; diff --git a/lib/src/pages/tools/cooking/widgets/manual_input_sheet.dart b/lib/src/pages/tools/cooking/widgets/manual_input_sheet.dart index e65cd34..a5c5047 100644 --- a/lib/src/pages/tools/cooking/widgets/manual_input_sheet.dart +++ b/lib/src/pages/tools/cooking/widgets/manual_input_sheet.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: manual_input_sheet.dart * 名称: 手动填写菜品弹窗 * 作用: 支持手动输入菜品名称、食材、备注、价格 @@ -8,7 +8,7 @@ import 'package:flutter/cupertino.dart'; import 'package:uuid/uuid.dart'; -import 'package:mom_kitchen/src/models/tools/order_model.dart'; +import 'package:mom_kitchen/src/models/app/order_model.dart'; class ManualInputSheet extends StatefulWidget { final OrderItemSource source; diff --git a/lib/src/pages/tools/cooking/widgets/order_item_card.dart b/lib/src/pages/tools/cooking/widgets/order_item_card.dart index bf7dd68..cfc3041 100644 --- a/lib/src/pages/tools/cooking/widgets/order_item_card.dart +++ b/lib/src/pages/tools/cooking/widgets/order_item_card.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: order_item_card.dart * 名称: 菜品卡片组件 * 作用: 展示点单项信息，支持数量调整、价格编辑、删除 @@ -9,7 +9,7 @@ import 'dart:ui'; import 'package:flutter/cupertino.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; -import 'package:mom_kitchen/src/models/tools/order_model.dart'; +import 'package:mom_kitchen/src/models/app/order_model.dart'; class OrderItemCard extends StatelessWidget { final OrderItem item; diff --git a/lib/src/pages/tools/cooking/widgets/qr_barcode_dialog.dart b/lib/src/pages/tools/cooking/widgets/qr_barcode_dialog.dart index 51d2558..5efba5b 100644 --- a/lib/src/pages/tools/cooking/widgets/qr_barcode_dialog.dart +++ b/lib/src/pages/tools/cooking/widgets/qr_barcode_dialog.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: qr_barcode_dialog.dart * 名称: 二维码/条形码弹窗 * 作用: 展示点单二维码和条形码，支持分享 @@ -9,7 +9,7 @@ import 'package:flutter/cupertino.dart'; import 'package:qr/qr.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; -import 'package:mom_kitchen/src/models/tools/order_model.dart'; +import 'package:mom_kitchen/src/models/app/order_model.dart'; class QrBarcodeDialog extends StatelessWidget { final Order order; diff --git a/lib/src/pages/tools/farm/farm_achievement_page.dart b/lib/src/pages/tools/farm/farm_achievement_page.dart index b1abebc..4d4b71a 100644 --- a/lib/src/pages/tools/farm/farm_achievement_page.dart +++ b/lib/src/pages/tools/farm/farm_achievement_page.dart @@ -1,4 +1,4 @@ -// 农场成就页面 +// 农场成就页面 // 显示成就列表和进度 import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -6,7 +6,7 @@ import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; import 'package:mom_kitchen/src/controllers/farm/farm_achievement_controller.dart'; import 'package:mom_kitchen/src/controllers/farm/farm_game_controller.dart'; -import 'package:mom_kitchen/src/models/farm/achievement_config.dart'; +import 'package:mom_kitchen/src/models/farm/config/achievement_config.dart'; class FarmAchievementPage extends StatefulWidget { const FarmAchievementPage({super.key}); diff --git a/lib/src/pages/tools/farm/farm_inventory_page.dart b/lib/src/pages/tools/farm/farm_inventory_page.dart index 83d5629..b6be900 100644 --- a/lib/src/pages/tools/farm/farm_inventory_page.dart +++ b/lib/src/pages/tools/farm/farm_inventory_page.dart @@ -1,4 +1,4 @@ -// 农场背包页面 +// 农场背包页面 // 显示背包物品，支持分类查看 import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -6,7 +6,7 @@ import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; import 'package:mom_kitchen/src/controllers/farm/farm_inventory_controller.dart'; import 'package:mom_kitchen/src/controllers/farm/farm_game_controller.dart'; -import 'package:mom_kitchen/src/models/farm/inventory_item.dart'; +import 'package:mom_kitchen/src/models/farm/entity/inventory_item.dart'; class FarmInventoryPage extends StatefulWidget { const FarmInventoryPage({super.key}); diff --git a/lib/src/pages/tools/farm/farm_shop_page.dart b/lib/src/pages/tools/farm/farm_shop_page.dart index 87d1a05..3340415 100644 --- a/lib/src/pages/tools/farm/farm_shop_page.dart +++ b/lib/src/pages/tools/farm/farm_shop_page.dart @@ -1,11 +1,11 @@ -// 农场商店页面 +// 农场商店页面 // 显示可购买的种子列表，支持购买操作 import 'package:flutter/cupertino.dart'; import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; import 'package:mom_kitchen/src/controllers/farm/farm_shop_controller.dart'; import 'package:mom_kitchen/src/controllers/farm/farm_game_controller.dart'; -import 'package:mom_kitchen/src/models/farm/crop_config.dart'; +import 'package:mom_kitchen/src/models/farm/config/crop_config.dart'; class FarmShopPage extends StatefulWidget { const FarmShopPage({super.key}); diff --git a/lib/src/pages/tools/health/allergen_report_page.dart b/lib/src/pages/tools/health/allergen_report_page.dart index 90d6499..df9b592 100644 --- a/lib/src/pages/tools/health/allergen_report_page.dart +++ b/lib/src/pages/tools/health/allergen_report_page.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: allergen_report_page.dart * 名称: 过敏原报告页面 * 作用: 生成过敏原分析报告，汇总用户关注的过敏原信息 @@ -10,7 +10,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart' show RefreshIndicator; import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; -import 'package:mom_kitchen/src/services/allergen_checker.dart'; +import 'package:mom_kitchen/src/services/system/allergen_checker.dart'; import 'package:mom_kitchen/src/models/recipe/recipe_model.dart'; import 'package:mom_kitchen/src/repositories/recipe_repository.dart'; diff --git a/lib/src/pages/tools/health/weight_manage_page.dart b/lib/src/pages/tools/health/weight_manage_page.dart index 089f590..0abfa4c 100644 --- a/lib/src/pages/tools/health/weight_manage_page.dart +++ b/lib/src/pages/tools/health/weight_manage_page.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: weight_manage_page.dart * 名称: 体重管理页面 * 作用: 记录体重、折线图趋势、目标设定、周期统计、BMI跳转 @@ -9,7 +9,7 @@ import 'package:flutter/cupertino.dart'; import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; import 'package:mom_kitchen/src/controllers/tools/weight_controller.dart'; -import 'package:mom_kitchen/src/models/weight_record_model.dart'; +import 'package:mom_kitchen/src/models/user/weight_record_model.dart'; import 'package:mom_kitchen/src/widgets/charts_widgets.dart'; class WeightManagePage extends GetView { diff --git a/lib/src/pages/tools/ingredient/cooking_tip_detail_page.dart b/lib/src/pages/tools/ingredient/cooking_tip_detail_page.dart index a64c74d..80e2756 100644 --- a/lib/src/pages/tools/ingredient/cooking_tip_detail_page.dart +++ b/lib/src/pages/tools/ingredient/cooking_tip_detail_page.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: cooking_tip_detail_page.dart * 名称: 烹饪技巧详情页面 * 作用: 显示 Markdown 格式的烹饪技巧内容 @@ -11,7 +11,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_markdown_plus/flutter_markdown_plus.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; -import 'package:mom_kitchen/src/models/data/cooking_tip_model.dart'; +import 'package:mom_kitchen/src/models/data/plan/cooking_tip_model.dart'; class CookingTipDetailPage extends StatefulWidget { final CookingTipModel tip; diff --git a/lib/src/pages/tools/ingredient/cooking_tips_list_page.dart b/lib/src/pages/tools/ingredient/cooking_tips_list_page.dart index 772f127..7b74853 100644 --- a/lib/src/pages/tools/ingredient/cooking_tips_list_page.dart +++ b/lib/src/pages/tools/ingredient/cooking_tips_list_page.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: cooking_tips_list_page.dart * 名称: 烹饪技巧列表页面 * 作用: 显示烹饪技巧分类列表，支持点击查看详情 @@ -11,8 +11,8 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/services.dart'; import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; -import 'package:mom_kitchen/src/models/data/cooking_tip_model.dart'; -import 'package:mom_kitchen/src/pages/tools/cooking_tip_detail_page.dart'; +import 'package:mom_kitchen/src/models/data/plan/cooking_tip_model.dart'; +import 'package:mom_kitchen/src/pages/tools/ingredient/cooking_tip_detail_page.dart'; import 'package:mom_kitchen/src/widgets/glass/glass_container.dart'; class CookingTipsListPage extends StatefulWidget { diff --git a/lib/src/pages/tools/ingredient/ingredient_manage_page.dart b/lib/src/pages/tools/ingredient/ingredient_manage_page.dart index 3e7086d..694b75b 100644 --- a/lib/src/pages/tools/ingredient/ingredient_manage_page.dart +++ b/lib/src/pages/tools/ingredient/ingredient_manage_page.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: ingredient_manage_page.dart * 名称: 用料管理页面 * 作用: 管理厨房用料瓶子的增删改查，支持网格布局展示 @@ -10,8 +10,8 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; -import 'package:mom_kitchen/src/controllers/ingredient_manage_controller.dart'; -import 'package:mom_kitchen/src/models/bottle_model.dart'; +import 'package:mom_kitchen/src/controllers/tools/ingredient_manage_controller.dart'; +import 'package:mom_kitchen/src/models/app/bottle_model.dart'; class IngredientManagePage extends StatefulWidget { const IngredientManagePage({super.key}); diff --git a/lib/src/pages/tools/ingredient_detail/ingredient_detail_info_cards.dart b/lib/src/pages/tools/ingredient_detail/ingredient_detail_info_cards.dart index f61f2bf..4adc042 100644 --- a/lib/src/pages/tools/ingredient_detail/ingredient_detail_info_cards.dart +++ b/lib/src/pages/tools/ingredient_detail/ingredient_detail_info_cards.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: ingredient_detail_info_cards.dart * 名称: 食材详情-生活信息卡片组件 * 作用: 时令、选购技巧、储存方法、替代建议等卡片 @@ -8,7 +8,7 @@ import 'package:flutter/cupertino.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; -import 'package:mom_kitchen/src/services/data/ingredient_nutrition_db.dart'; +import 'package:mom_kitchen/src/services/data/business/ingredient_nutrition_db.dart'; import 'package:mom_kitchen/src/pages/tools/ingredient_detail/ingredient_detail_utils.dart'; class SeasonCard extends StatelessWidget { diff --git a/lib/src/pages/tools/ingredient_detail/ingredient_detail_nutrition_cards.dart b/lib/src/pages/tools/ingredient_detail/ingredient_detail_nutrition_cards.dart index 05ff168..6168ae9 100644 --- a/lib/src/pages/tools/ingredient_detail/ingredient_detail_nutrition_cards.dart +++ b/lib/src/pages/tools/ingredient_detail/ingredient_detail_nutrition_cards.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: ingredient_detail_nutrition_cards.dart * 名称: 食材详情-营养相关卡片组件 * 作用: 详情头部、营养概览、营养素占比条、关键营养素等卡片 @@ -8,7 +8,7 @@ import 'package:flutter/cupertino.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; -import 'package:mom_kitchen/src/services/data/ingredient_nutrition_db.dart'; +import 'package:mom_kitchen/src/services/data/business/ingredient_nutrition_db.dart'; import 'package:mom_kitchen/src/pages/tools/ingredient_detail/ingredient_detail_utils.dart'; class DetailHeaderCard extends StatelessWidget { diff --git a/lib/src/pages/tools/ingredient_detail/ingredient_detail_page.dart b/lib/src/pages/tools/ingredient_detail/ingredient_detail_page.dart index 20c6898..53f9aa0 100644 --- a/lib/src/pages/tools/ingredient_detail/ingredient_detail_page.dart +++ b/lib/src/pages/tools/ingredient_detail/ingredient_detail_page.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: ingredient_detail_page.dart * 名称: 食材详情查询页面 * 作用: 查询食材营养信息与选购指南 @@ -9,7 +9,7 @@ import 'package:flutter/cupertino.dart'; import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; -import 'package:mom_kitchen/src/services/data/ingredient_nutrition_db.dart'; +import 'package:mom_kitchen/src/services/data/business/ingredient_nutrition_db.dart'; import 'package:mom_kitchen/src/pages/tools/ingredient_detail/ingredient_detail_utils.dart'; import 'package:mom_kitchen/src/pages/tools/ingredient_detail/ingredient_detail_cards.dart'; import 'package:mom_kitchen/src/controllers/tools/ingredient_detail_controller.dart'; diff --git a/lib/src/pages/tools/planning/daily_menu_page.dart b/lib/src/pages/tools/planning/daily_menu_page.dart index 310ee11..8790a6d 100644 --- a/lib/src/pages/tools/planning/daily_menu_page.dart +++ b/lib/src/pages/tools/planning/daily_menu_page.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: daily_menu_page.dart * 名称: 每日菜单规划页面 * 作用: 一键生成三餐菜单推荐，支持手动调整和营养汇总 @@ -10,9 +10,9 @@ import 'dart:convert'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; -import 'package:mom_kitchen/src/models/data/daily_menu_model.dart'; +import 'package:mom_kitchen/src/models/data/plan/daily_menu_model.dart'; import 'package:mom_kitchen/src/repositories/recipe_repository.dart'; -import 'package:mom_kitchen/src/services/data/storage_service.dart'; +import 'package:mom_kitchen/src/services/data/storage/storage_service.dart'; import 'package:mom_kitchen/src/services/ui/toast_service.dart'; import 'package:mom_kitchen/src/widgets/glass/glass_container.dart'; diff --git a/lib/src/pages/tools/planning/meal_planner_page.dart b/lib/src/pages/tools/planning/meal_planner_page.dart index a66dcd2..856ee45 100644 --- a/lib/src/pages/tools/planning/meal_planner_page.dart +++ b/lib/src/pages/tools/planning/meal_planner_page.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: meal_planner_page.dart * 名称: 每周菜单规划页面 * 作用: 规划一周饮食菜单，支持早中晚三餐，数据持久化 @@ -10,8 +10,8 @@ import 'dart:convert'; import 'package:flutter/cupertino.dart'; import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; -import 'package:mom_kitchen/src/controllers/data/favorites_controller.dart'; -import 'package:mom_kitchen/src/services/data/storage_service.dart'; +import 'package:mom_kitchen/src/controllers/user/favorites_controller.dart'; +import 'package:mom_kitchen/src/services/data/storage/storage_service.dart'; class MealPlannerPage extends StatefulWidget { const MealPlannerPage({super.key}); diff --git a/lib/src/pages/tools/planning/weekly_menu_planner_page.dart b/lib/src/pages/tools/planning/weekly_menu_planner_page.dart index e092645..821d56b 100644 --- a/lib/src/pages/tools/planning/weekly_menu_planner_page.dart +++ b/lib/src/pages/tools/planning/weekly_menu_planner_page.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: weekly_menu_planner_page.dart * 名称: 每周菜单规划页面 * 作用: 日历视图选择日期，每日三餐分配菜谱，自动生成购物清单 @@ -11,7 +11,7 @@ import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; import 'package:mom_kitchen/src/controllers/data/weekly_menu_controller.dart'; import 'package:mom_kitchen/src/models/recipe/recipe_model.dart'; -import 'package:mom_kitchen/src/models/data/weekly_menu_model.dart'; +import 'package:mom_kitchen/src/models/data/plan/weekly_menu_model.dart'; import 'package:mom_kitchen/src/repositories/recipe_repository.dart'; class WeeklyMenuPlannerPage extends StatefulWidget { diff --git a/lib/src/pages/tools/ranking/dish_pick_sheet.dart b/lib/src/pages/tools/ranking/dish_pick_sheet.dart index 7c300e2..c43ecdc 100644 --- a/lib/src/pages/tools/ranking/dish_pick_sheet.dart +++ b/lib/src/pages/tools/ranking/dish_pick_sheet.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: dish_pick_sheet.dart * 名称: 菜品选择面板 * 作用: 底部弹出面板，支持从浏览记录/收藏/手动输入三种方式选择菜品加入Tier List @@ -10,10 +10,10 @@ import 'package:flutter/material.dart' as material; import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; import 'package:mom_kitchen/src/controllers/data/browse_history_controller.dart'; -import 'package:mom_kitchen/src/controllers/data/favorites_controller.dart'; -import 'package:mom_kitchen/src/models/data/browse_history_model.dart'; -import 'package:mom_kitchen/src/models/dish_rank_model.dart'; -import 'package:mom_kitchen/src/models/feed_item_model.dart'; +import 'package:mom_kitchen/src/controllers/user/favorites_controller.dart'; +import 'package:mom_kitchen/src/models/data/record/browse_history_model.dart'; +import 'package:mom_kitchen/src/models/feed/dish_rank_model.dart'; +import 'package:mom_kitchen/src/models/feed/feed_item_model.dart'; class DishPickSheet extends StatefulWidget { final int targetTierIndex; diff --git a/lib/src/pages/tools/ranking/dish_ranking_controller.dart b/lib/src/pages/tools/ranking/dish_ranking_controller.dart index 78a8db1..efe9042 100644 --- a/lib/src/pages/tools/ranking/dish_ranking_controller.dart +++ b/lib/src/pages/tools/ranking/dish_ranking_controller.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: dish_ranking_controller.dart * 名称: 菜品排名控制器 * 作用: 管理Tier List数据、拖拽排序、跨层级移动、本地持久化 @@ -9,8 +9,8 @@ import 'dart:convert'; import 'package:flutter/foundation.dart'; import 'package:get/get.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import 'package:mom_kitchen/src/controllers/base_controller.dart'; -import 'package:mom_kitchen/src/models/dish_rank_model.dart'; +import 'package:mom_kitchen/src/controllers/browse/base_controller.dart'; +import 'package:mom_kitchen/src/models/feed/dish_rank_model.dart'; class DishRankingController extends BaseController { static const String _storageKey = 'dish_ranking_data'; diff --git a/lib/src/pages/tools/ranking/dish_ranking_page.dart b/lib/src/pages/tools/ranking/dish_ranking_page.dart index 584d25e..4d6c6c2 100644 --- a/lib/src/pages/tools/ranking/dish_ranking_page.dart +++ b/lib/src/pages/tools/ranking/dish_ranking_page.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: dish_ranking_page.dart * 名称: 菜品排名页面 * 作用: Tier List主界面，展示5个层级的菜品排名，支持拖拽排序、跨层级移动、添加/删除 @@ -9,7 +9,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart' as material; import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; -import 'package:mom_kitchen/src/models/dish_rank_model.dart'; +import 'package:mom_kitchen/src/models/feed/dish_rank_model.dart'; import 'package:mom_kitchen/src/pages/tools/ranking/dish_pick_sheet.dart'; import 'package:mom_kitchen/src/pages/tools/ranking/dish_ranking_controller.dart'; diff --git a/lib/src/pages/tools/tool_detail_page.dart b/lib/src/pages/tools/tool_detail_page.dart index bace52d..5af35e4 100644 --- a/lib/src/pages/tools/tool_detail_page.dart +++ b/lib/src/pages/tools/tool_detail_page.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: tool_detail_page.dart * 名称: 工具详情页 * 作用: 从瀑布流工具卡片info图标进入，展示工具详细信息和功能说明 @@ -12,7 +12,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; -import 'package:mom_kitchen/src/models/discover_model.dart'; +import 'package:mom_kitchen/src/models/feed/discover_model.dart'; class ToolDetailPage extends StatelessWidget { const ToolDetailPage({super.key}); diff --git a/lib/src/pages/tools/tool_item_detail_page.dart b/lib/src/pages/tools/tool_item_detail_page.dart index afa9f33..fc96911 100644 --- a/lib/src/pages/tools/tool_item_detail_page.dart +++ b/lib/src/pages/tools/tool_item_detail_page.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: tool_item_detail_page.dart * 名称: 工具项详情页 * 作用: 从工具中心进入，展示 ToolItem 详细信息和功能说明 @@ -9,7 +9,7 @@ import 'package:flutter/cupertino.dart'; import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; -import 'package:mom_kitchen/src/models/tool_item_model.dart'; +import 'package:mom_kitchen/src/models/app/tool_item_model.dart'; class ToolItemDetailPage extends StatelessWidget { final ToolItem tool; diff --git a/lib/src/pages/tools/tools_category_widgets.dart b/lib/src/pages/tools/tools_category_widgets.dart index 9de513b..fe5d585 100644 --- a/lib/src/pages/tools/tools_category_widgets.dart +++ b/lib/src/pages/tools/tools_category_widgets.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: tools_category_widgets.dart * 名称: 工具中心分类组件 * 作用: 分类组、分类头部、工具卡片等组件 @@ -9,7 +9,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; -import 'package:mom_kitchen/src/models/tool_item_model.dart'; +import 'package:mom_kitchen/src/models/app/tool_item_model.dart'; class ToolsCategoryGroup extends StatelessWidget { final String category; diff --git a/lib/src/pages/tools/tools_center_page.dart b/lib/src/pages/tools/tools_center_page.dart index d92cade..f42037f 100644 --- a/lib/src/pages/tools/tools_center_page.dart +++ b/lib/src/pages/tools/tools_center_page.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: tools_center_page.dart * 名称: 工具中心页面 * 作用: 展示所有工具，支持分类筛选和搜索 @@ -11,7 +11,7 @@ import 'package:flutter/cupertino.dart'; import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; import 'package:mom_kitchen/src/controllers/tools/tools_controller.dart'; -import 'package:mom_kitchen/src/models/tool_item_model.dart'; +import 'package:mom_kitchen/src/models/app/tool_item_model.dart'; import 'package:mom_kitchen/src/pages/tools/tools_category_widgets.dart'; import 'package:mom_kitchen/src/pages/tools/tools_featured_section.dart'; import 'package:mom_kitchen/src/pages/tools/tool_item_detail_page.dart'; diff --git a/lib/src/pages/tools/tools_featured_section.dart b/lib/src/pages/tools/tools_featured_section.dart index e41b13c..e5e59ca 100644 --- a/lib/src/pages/tools/tools_featured_section.dart +++ b/lib/src/pages/tools/tools_featured_section.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: tools_featured_section.dart * 名称: 工具中心精选推荐与最近使用组件 * 作用: 展示精选推荐横向卡片和最近使用工具网格 @@ -8,7 +8,7 @@ import 'package:flutter/cupertino.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; -import 'package:mom_kitchen/src/models/tool_item_model.dart'; +import 'package:mom_kitchen/src/models/app/tool_item_model.dart'; class ToolsFeaturedSection extends StatelessWidget { final List allTools; diff --git a/lib/src/repositories/action_repository.dart b/lib/src/repositories/action_repository.dart index 125907c..8044631 100644 --- a/lib/src/repositories/action_repository.dart +++ b/lib/src/repositories/action_repository.dart @@ -1,10 +1,10 @@ -// 2026-04-16 | ActionRepository | 互动操作仓库 | 封装api_action.php调用 +// 2026-04-16 | ActionRepository | 互动操作仓库 | 封装api_action.php调用 // 2026-04-09 | 修改写操作使用POST方法，符合REST规范 // 2026-04-09 | 添加429限流错误友好提示 // 2026-04-12 | API v3.2.0: recommend接口改为rate评分接口(1-5分) // 2026-04-16 | 写操作改回POST(api_action.php v2.1.0已支持POST)，读操作保持GET import 'package:mom_kitchen/src/config/api_config.dart'; -import 'package:mom_kitchen/src/models/api_response.dart'; +import 'package:mom_kitchen/src/models/app/api_response.dart'; import 'package:mom_kitchen/src/services/api/api_service.dart'; import 'package:mom_kitchen/src/services/api/api_exception.dart'; import 'package:mom_kitchen/src/services/ui/toast_service.dart'; diff --git a/lib/src/repositories/discover_repository.dart b/lib/src/repositories/discover_repository.dart index a16162b..9be6cab 100644 --- a/lib/src/repositories/discover_repository.dart +++ b/lib/src/repositories/discover_repository.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: discover_repository.dart * 名称: 发现页数据仓库 * 作用: 封装 api_discover.php 接口调用，支持分页增量获取 @@ -8,8 +8,8 @@ import 'package:mom_kitchen/src/config/api_config.dart'; import 'package:mom_kitchen/src/services/api/api_service.dart'; -import 'package:mom_kitchen/src/models/api_response.dart'; -import 'package:mom_kitchen/src/models/discover_model.dart'; +import 'package:mom_kitchen/src/models/app/api_response.dart'; +import 'package:mom_kitchen/src/models/feed/discover_model.dart'; class DiscoverRepository { final ApiService _api = ApiService(); diff --git a/lib/src/repositories/feed_repository.dart b/lib/src/repositories/feed_repository.dart index 6b6df6b..e5f5a58 100644 --- a/lib/src/repositories/feed_repository.dart +++ b/lib/src/repositories/feed_repository.dart @@ -1,9 +1,9 @@ -// 2026-04-09 | FeedRepository | 信息流数据仓库 | 封装api_feed.php调用 +// 2026-04-09 | FeedRepository | 信息流数据仓库 | 封装api_feed.php调用 // 2026-04-09 | 新增excludeIds参数支持，避免重复内容 // 2026-04-12 | API v3.2.0: 移除personal接口（已删除） import 'package:mom_kitchen/src/config/api_config.dart'; -import 'package:mom_kitchen/src/models/api_response.dart'; -import 'package:mom_kitchen/src/models/feed_item_model.dart'; +import 'package:mom_kitchen/src/models/app/api_response.dart'; +import 'package:mom_kitchen/src/models/feed/feed_item_model.dart'; import 'package:mom_kitchen/src/services/api/api_service.dart'; enum FeedType { recommend, latest, hot } diff --git a/lib/src/repositories/online_repository.dart b/lib/src/repositories/online_repository.dart index 5c605e2..8efce5d 100644 --- a/lib/src/repositories/online_repository.dart +++ b/lib/src/repositories/online_repository.dart @@ -1,6 +1,6 @@ -// 2026-04-09 | StatsRepository | 统计数据仓库 | API v2.0.0: api_online+api_hot+api_request_stats → stats_full.php +// 2026-04-09 | StatsRepository | 统计数据仓库 | API v2.0.0: api_online+api_hot+api_request_stats → stats_full.php import 'package:mom_kitchen/src/config/api_config.dart'; -import 'package:mom_kitchen/src/models/api_response.dart'; +import 'package:mom_kitchen/src/models/app/api_response.dart'; import 'package:mom_kitchen/src/services/api/api_service.dart'; class StatsRepository { diff --git a/lib/src/repositories/recipe_repository.dart b/lib/src/repositories/recipe_repository.dart index b85e0f2..329620a 100644 --- a/lib/src/repositories/recipe_repository.dart +++ b/lib/src/repositories/recipe_repository.dart @@ -1,17 +1,17 @@ -// 2026-04-09 | RecipeRepository | 菜谱数据仓库 | 封装api.php + api_unified.php调用 +// 2026-04-09 | RecipeRepository | 菜谱数据仓库 | 封装api.php + api_unified.php调用 // 2026-04-13 | 新增 searchIngredientByName 方法 // 2026-04-14 | 彻底移除食材缓存相关代码，食材缓存独立实现 import 'package:flutter/foundation.dart'; import 'package:mom_kitchen/src/config/api_config.dart'; -import 'package:mom_kitchen/src/models/api_response.dart'; +import 'package:mom_kitchen/src/models/app/api_response.dart'; import 'package:mom_kitchen/src/models/recipe/category_model.dart'; import 'package:mom_kitchen/src/models/recipe/ingredient_model.dart'; import 'package:mom_kitchen/src/models/recipe/recipe_model.dart'; import 'package:mom_kitchen/src/models/recipe/tag_model.dart'; -import 'package:mom_kitchen/src/models/data/daily_menu_model.dart'; +import 'package:mom_kitchen/src/models/data/plan/daily_menu_model.dart'; import 'package:mom_kitchen/src/services/api/api_service.dart'; -import 'package:mom_kitchen/src/services/data/cache_service.dart'; +import 'package:mom_kitchen/src/services/data/storage/cache_service.dart'; class RecipeRepository { final ApiService _api = ApiService(); diff --git a/lib/src/services/api/order_api_service.dart b/lib/src/services/api/order_api_service.dart index 498a347..2ba908c 100644 --- a/lib/src/services/api/order_api_service.dart +++ b/lib/src/services/api/order_api_service.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: order_api_service.dart * 名称: 点餐助手API服务 * 作用: 提供点单CRUD接口，使用项目已有ApiService(dio)对接后端 @@ -7,7 +7,7 @@ */ import 'package:flutter/foundation.dart'; -import 'package:mom_kitchen/src/models/tools/order_model.dart'; +import 'package:mom_kitchen/src/models/app/order_model.dart'; import 'package:mom_kitchen/src/services/api/api_service.dart'; class OrderApiService { diff --git a/lib/src/services/core/app_service.dart b/lib/src/services/core/app_service.dart index 7081171..10dda0c 100644 --- a/lib/src/services/core/app_service.dart +++ b/lib/src/services/core/app_service.dart @@ -1,18 +1,18 @@ -// 2026-04-09 | AppService | 应用核心服务 | Web端跳过不兼容服务初始化 +// 2026-04-09 | AppService | 应用核心服务 | Web端跳过不兼容服务初始化 import 'package:flutter/foundation.dart'; import 'package:get/get.dart'; import 'package:mom_kitchen/src/services/api/api_service.dart'; -import 'package:mom_kitchen/src/services/data/storage_service.dart'; -import 'package:mom_kitchen/src/services/data/hive_service.dart'; -import 'package:mom_kitchen/src/services/orientation_service.dart'; +import 'package:mom_kitchen/src/services/data/storage/storage_service.dart'; +import 'package:mom_kitchen/src/services/data/storage/hive_service.dart'; +import 'package:mom_kitchen/src/services/system/orientation_service.dart'; import 'package:mom_kitchen/src/services/ui/theme_service.dart'; import 'package:mom_kitchen/src/services/core/app_info_service.dart'; import 'package:mom_kitchen/src/services/ui/toast_service.dart'; -import 'package:mom_kitchen/src/services/permission_service.dart'; +import 'package:mom_kitchen/src/services/system/permission_service.dart'; import 'package:mom_kitchen/src/services/ui/animation_service.dart'; import 'package:mom_kitchen/src/services/log/logger_service.dart'; import 'package:mom_kitchen/src/services/ui/screen_util_config.dart'; -import 'package:mom_kitchen/src/services/connectivity_service.dart'; +import 'package:mom_kitchen/src/services/system/connectivity_service.dart'; class AppService { static final AppService _instance = AppService._internal(); diff --git a/lib/src/services/data/business/data_export_service.dart b/lib/src/services/data/business/data_export_service.dart index 1f33fd7..fba4414 100644 --- a/lib/src/services/data/business/data_export_service.dart +++ b/lib/src/services/data/business/data_export_service.dart @@ -1,4 +1,4 @@ -// 2026-04-18 | DataExportService | 数据导出/导入服务 | 统一管理6种数据源导出导入，支持JSON/CSV/Markdown格式 +// 2026-04-18 | DataExportService | 数据导出/导入服务 | 统一管理6种数据源导出导入，支持JSON/CSV/Markdown格式 // 2026-04-18 | 初始创建：支持收藏/购物清单/饮食记录/烹饪笔记/每周菜单/浏览记录导出 // 2026-04-18 | 新增数据导入功能：支持JSON格式导入，与导出格式一致 import 'dart:convert'; @@ -7,7 +7,7 @@ import 'package:flutter/foundation.dart'; import 'package:get/get.dart'; import 'package:path_provider/path_provider.dart'; import 'package:share_plus/share_plus.dart'; -import 'package:mom_kitchen/src/controllers/data/favorites_controller.dart'; +import 'package:mom_kitchen/src/controllers/user/favorites_controller.dart'; import 'package:mom_kitchen/src/controllers/data/shopping_list_controller.dart'; import 'package:mom_kitchen/src/controllers/data/meal_record_controller.dart'; import 'package:mom_kitchen/src/controllers/data/cooking_note_controller.dart'; diff --git a/lib/src/services/data/business/email_service.dart b/lib/src/services/data/business/email_service.dart index ee39950..4c26493 100644 --- a/lib/src/services/data/business/email_service.dart +++ b/lib/src/services/data/business/email_service.dart @@ -1,4 +1,4 @@ -// 2026-04-14 | email_service.dart | 邮件发送服务 | 通过SMTP发送菜谱详情到用户邮箱 +// 2026-04-14 | email_service.dart | 邮件发送服务 | 通过SMTP发送菜谱详情到用户邮箱 // 2026-04-14 | 初始创建，基于mailer库实现SMTP邮件发送 // 2026-04-14 | 新增多线路支持：官方线路1(mboxhosting)/线路2(QQ邮箱)/自定义SMTP // 2026-04-15 | 发送成功/失败后自动记录到 EmailHistoryController @@ -8,8 +8,8 @@ import 'dart:io'; import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:get/get.dart'; import 'package:mom_kitchen/src/models/recipe/recipe_model.dart'; -import 'package:mom_kitchen/src/models/data/email_record_model.dart'; -import 'package:mom_kitchen/src/controllers/data/email_history_controller.dart'; +import 'package:mom_kitchen/src/models/data/record/email_record_model.dart'; +import 'package:mom_kitchen/src/controllers/user/email_history_controller.dart'; import 'package:mom_kitchen/src/services/log/logger_service.dart'; import 'package:mailer/mailer.dart'; import 'package:mailer/smtp_server.dart'; diff --git a/lib/src/services/data/business/mini_card_service.dart b/lib/src/services/data/business/mini_card_service.dart index 62db936..a858be3 100644 --- a/lib/src/services/data/business/mini_card_service.dart +++ b/lib/src/services/data/business/mini_card_service.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: mini_card_service.dart * 名称: 迷你卡片数据服务 * 作用: 加载迷你卡片数据，支持缓存优先策略，供多个页面复用 @@ -9,7 +9,7 @@ import 'dart:convert'; import 'package:flutter/cupertino.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import 'package:mom_kitchen/src/models/mini_card_model.dart'; +import 'package:mom_kitchen/src/models/feed/mini_card_model.dart'; import 'package:mom_kitchen/src/services/api/api_service.dart'; class MiniCardService { diff --git a/lib/src/services/data/storage/cache_service.dart b/lib/src/services/data/storage/cache_service.dart index 754c111..7fb6136 100644 --- a/lib/src/services/data/storage/cache_service.dart +++ b/lib/src/services/data/storage/cache_service.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: cache_service.dart * 名称: 离线缓存服务 * 作用: API数据本地持久化，支持离线访问和缓存过期 @@ -11,7 +11,7 @@ import 'dart:async'; import 'dart:convert'; import 'package:flutter/foundation.dart'; import 'package:hive_ce/hive.dart'; -import 'package:mom_kitchen/src/services/data/hive_service.dart'; +import 'package:mom_kitchen/src/services/data/storage/hive_service.dart'; import 'package:mom_kitchen/src/services/log/logger_service.dart'; class CacheEntry { diff --git a/lib/src/services/data/storage/hive_service.dart b/lib/src/services/data/storage/hive_service.dart index d00a4a3..ee5aa1d 100644 --- a/lib/src/services/data/storage/hive_service.dart +++ b/lib/src/services/data/storage/hive_service.dart @@ -1,16 +1,16 @@ -// 2026-04-09 | HiveService | Hive本地数据库服务 | Web端使用IndexedDB，未初始化时安全返回 +// 2026-04-09 | HiveService | Hive本地数据库服务 | Web端使用IndexedDB，未初始化时安全返回 // 2026-04-10 | 新增数据迁移机制，支持Box schema版本升级 // 2026-04-15 | 修复init()的rethrow导致连锁崩溃：改为安全降级，不抛异常 import 'package:flutter/foundation.dart'; import 'package:hive_ce/hive.dart'; import 'package:path_provider/path_provider.dart'; -import 'package:mom_kitchen/src/models/data/meal_record_model.dart'; -import 'package:mom_kitchen/src/models/data/shopping_item_model.dart'; +import 'package:mom_kitchen/src/models/data/record/meal_record_model.dart'; +import 'package:mom_kitchen/src/models/data/plan/shopping_item_model.dart'; import 'package:mom_kitchen/src/models/user/user_goal_model.dart'; -import 'package:mom_kitchen/src/models/data/cooking_note_model.dart'; -import 'package:mom_kitchen/src/models/farm/farm_player.dart'; -import 'package:mom_kitchen/src/models/farm/farm_land.dart'; -import 'package:mom_kitchen/src/models/farm/inventory_item.dart'; +import 'package:mom_kitchen/src/models/data/record/cooking_note_model.dart'; +import 'package:mom_kitchen/src/models/farm/entity/farm_player.dart'; +import 'package:mom_kitchen/src/models/farm/entity/farm_land.dart'; +import 'package:mom_kitchen/src/models/farm/entity/inventory_item.dart'; import 'package:mom_kitchen/src/services/log/logger_service.dart'; class HiveService { diff --git a/lib/src/services/data/storage/local_data_service.dart b/lib/src/services/data/storage/local_data_service.dart index 4347dc9..bcbe128 100644 --- a/lib/src/services/data/storage/local_data_service.dart +++ b/lib/src/services/data/storage/local_data_service.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: local_data_service.dart * 名称: 本地数据服务 * 作用: 管理分类标签、过敏原等本地数据，支持API同步+SharedPreferences持久化 @@ -9,7 +9,7 @@ import 'dart:convert'; import 'package:flutter/foundation.dart' show debugPrint; import 'package:http/http.dart' as http; import 'package:mom_kitchen/src/repositories/recipe_repository.dart'; -import 'package:mom_kitchen/src/services/data/storage_service.dart'; +import 'package:mom_kitchen/src/services/data/storage/storage_service.dart'; class LocalDataService { static final LocalDataService _instance = LocalDataService._internal(); diff --git a/lib/src/services/data/storage/offline_service.dart b/lib/src/services/data/storage/offline_service.dart index 91b7c18..65631a6 100644 --- a/lib/src/services/data/storage/offline_service.dart +++ b/lib/src/services/data/storage/offline_service.dart @@ -1,8 +1,8 @@ -// 2026-04-18 | OfflineService | 离线模式服务 | 统一管理离线状态、操作守卫、动作队列、网络恢复通知 +// 2026-04-18 | OfflineService | 离线模式服务 | 统一管理离线状态、操作守卫、动作队列、网络恢复通知 import 'package:flutter/cupertino.dart'; import 'package:get/get.dart'; -import 'package:mom_kitchen/src/services/connectivity_service.dart'; +import 'package:mom_kitchen/src/services/system/connectivity_service.dart'; import 'package:mom_kitchen/src/services/ui/toast_service.dart'; typedef OfflineAction = Future Function(); diff --git a/lib/src/services/system/recommendation_service.dart b/lib/src/services/system/recommendation_service.dart index 774dedb..3587c3f 100644 --- a/lib/src/services/system/recommendation_service.dart +++ b/lib/src/services/system/recommendation_service.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: recommendation_service.dart * 名称: 推荐服务 * 作用: 基于用户偏好、浏览历史、收藏记录的AI菜谱推荐服务 @@ -7,7 +7,7 @@ */ import 'package:flutter/foundation.dart'; -import 'package:mom_kitchen/src/controllers/data/favorites_controller.dart'; +import 'package:mom_kitchen/src/controllers/user/favorites_controller.dart'; import 'package:mom_kitchen/src/controllers/user/preference_controller.dart'; import 'package:mom_kitchen/src/models/recipe/recipe_model.dart'; import 'package:mom_kitchen/src/repositories/recipe_repository.dart'; diff --git a/lib/src/widgets/base/app_page_scaffold.dart b/lib/src/widgets/base/app_page_scaffold.dart index ab48768..8db6e95 100644 --- a/lib/src/widgets/base/app_page_scaffold.dart +++ b/lib/src/widgets/base/app_page_scaffold.dart @@ -1,9 +1,9 @@ -// 2026-04-09 | AppPageScaffold | 全局可复用页面骨架组件 | 统一iOS26风格页面结构 +// 2026-04-09 | AppPageScaffold | 全局可复用页面骨架组件 | 统一iOS26风格页面结构 // 2026-04-09 | 初始创建，提供导航栏/加载/空态/错误/内容五种状态 import 'package:flutter/cupertino.dart'; import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; -import 'package:mom_kitchen/src/controllers/base_controller.dart'; +import 'package:mom_kitchen/src/controllers/browse/base_controller.dart'; import 'package:mom_kitchen/src/widgets/states/empty_state.dart'; import 'package:mom_kitchen/src/widgets/states/error_state.dart'; diff --git a/lib/src/widgets/discover/category_discover_card.dart b/lib/src/widgets/discover/category_discover_card.dart index e203a9f..df48f2a 100644 --- a/lib/src/widgets/discover/category_discover_card.dart +++ b/lib/src/widgets/discover/category_discover_card.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: category_discover_card.dart * 名称: 分类发现卡片 * 作用: 瀑布流中的分类展示卡片，Liquid Glass风格 @@ -12,7 +12,7 @@ import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/app_routes.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; import 'package:mom_kitchen/src/widgets/glass/glass_container.dart'; -import 'package:mom_kitchen/src/models/discover_model.dart'; +import 'package:mom_kitchen/src/models/feed/discover_model.dart'; import 'package:mom_kitchen/src/models/recipe/recipe_model.dart'; import 'package:mom_kitchen/src/repositories/recipe_repository.dart'; import 'package:mom_kitchen/src/widgets/recipe/recipe_image.dart'; diff --git a/lib/src/widgets/discover/content/mini_card_discover_card.dart b/lib/src/widgets/discover/content/mini_card_discover_card.dart index 2fe6f7d..bb71f62 100644 --- a/lib/src/widgets/discover/content/mini_card_discover_card.dart +++ b/lib/src/widgets/discover/content/mini_card_discover_card.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: mini_card_discover_card.dart * 名称: 瀑布流迷你卡片 * 作用: 首页瀑布流中嵌入的迷你菜品卡片，跨2列显示，点击跳转迷你卡片页 @@ -13,7 +13,7 @@ import 'package:get/get.dart'; import 'package:cached_network_image/cached_network_image.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; import 'package:mom_kitchen/src/config/app_routes.dart'; -import 'package:mom_kitchen/src/models/mini_card_model.dart'; +import 'package:mom_kitchen/src/models/feed/mini_card_model.dart'; class MiniCardDiscoverCard extends StatelessWidget { final MiniCardRecipe recipe; diff --git a/lib/src/widgets/discover/content/nutrition_discover_card.dart b/lib/src/widgets/discover/content/nutrition_discover_card.dart index dfffe76..006c80a 100644 --- a/lib/src/widgets/discover/content/nutrition_discover_card.dart +++ b/lib/src/widgets/discover/content/nutrition_discover_card.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: nutrition_discover_card.dart * 名称: 营养成分发现卡片 * 作用: 瀑布流中的营养成分展示卡片，Liquid Glass风格，点击跳转含该营养成分的菜品列表 @@ -11,7 +11,7 @@ import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/app_routes.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; import 'package:mom_kitchen/src/widgets/glass/glass_container.dart'; -import 'package:mom_kitchen/src/models/discover_model.dart'; +import 'package:mom_kitchen/src/models/feed/discover_model.dart'; class NutritionDiscoverCard extends StatelessWidget { final DiscoverNutrition nutrition; diff --git a/lib/src/widgets/discover/content/recipe_discover_card.dart b/lib/src/widgets/discover/content/recipe_discover_card.dart index 8a52bce..5e77253 100644 --- a/lib/src/widgets/discover/content/recipe_discover_card.dart +++ b/lib/src/widgets/discover/content/recipe_discover_card.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: recipe_discover_card.dart * 名称: 菜品发现卡片 * 作用: 瀑布流中的菜品展示卡片，Liquid Glass风格，支持懒加载图片+长按关闭 @@ -13,7 +13,7 @@ import 'package:mom_kitchen/src/config/app_routes.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; import 'package:mom_kitchen/src/widgets/glass/glass_container.dart'; import 'package:mom_kitchen/src/widgets/recipe/recipe_image.dart'; -import 'package:mom_kitchen/src/models/discover_model.dart'; +import 'package:mom_kitchen/src/models/feed/discover_model.dart'; class RecipeDiscoverCard extends StatefulWidget { final DiscoverRecipe recipe; diff --git a/lib/src/widgets/discover/content/tag_discover_card.dart b/lib/src/widgets/discover/content/tag_discover_card.dart index 33ebbae..060dcf9 100644 --- a/lib/src/widgets/discover/content/tag_discover_card.dart +++ b/lib/src/widgets/discover/content/tag_discover_card.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: tag_discover_card.dart * 名称: 标签发现卡片（口味/工艺） * 作用: 瀑布流中的标签展示卡片，Liquid Glass风格，点击底部弹窗显示对应标签列表 @@ -12,7 +12,7 @@ import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/app_routes.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; import 'package:mom_kitchen/src/widgets/glass/glass_container.dart'; -import 'package:mom_kitchen/src/models/discover_model.dart'; +import 'package:mom_kitchen/src/models/feed/discover_model.dart'; import 'package:mom_kitchen/src/models/recipe/tag_model.dart'; import 'package:mom_kitchen/src/repositories/recipe_repository.dart'; diff --git a/lib/src/widgets/discover/content/tool_card_discover_card.dart b/lib/src/widgets/discover/content/tool_card_discover_card.dart index 3475fd9..2c20390 100644 --- a/lib/src/widgets/discover/content/tool_card_discover_card.dart +++ b/lib/src/widgets/discover/content/tool_card_discover_card.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: tool_card_discover_card.dart * 名称: 瀑布流工具卡片 * 作用: 首页瀑布流中嵌入的工具推荐卡片，毛玻璃中等卡片样式 @@ -12,7 +12,7 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; import 'package:mom_kitchen/src/config/app_routes.dart'; -import 'package:mom_kitchen/src/models/discover_model.dart'; +import 'package:mom_kitchen/src/models/feed/discover_model.dart'; class ToolCardDiscoverCard extends StatelessWidget { final ToolItemRef tool; diff --git a/lib/src/widgets/discover/discover_waterfall.dart b/lib/src/widgets/discover/discover_waterfall.dart index 6edfb9a..4ef7b25 100644 --- a/lib/src/widgets/discover/discover_waterfall.dart +++ b/lib/src/widgets/discover/discover_waterfall.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: discover_waterfall.dart * 名称: 发现页瀑布流容器 * 作用: 单一SliverMasonryGrid 2列瀑布流，插槽卡片以SliverToBoxAdapter间隔插入 @@ -18,18 +18,18 @@ import 'package:flutter/material.dart'; import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; import 'package:mom_kitchen/src/widgets/base/skeleton_loader.dart'; -import 'package:mom_kitchen/src/widgets/discover/recipe_discover_card.dart'; +import 'package:mom_kitchen/src/widgets/discover/content/recipe_discover_card.dart'; import 'package:mom_kitchen/src/widgets/discover/ingredient_discover_card.dart'; import 'package:mom_kitchen/src/widgets/discover/category_discover_card.dart'; -import 'package:mom_kitchen/src/widgets/discover/tag_discover_card.dart'; -import 'package:mom_kitchen/src/widgets/discover/nutrition_discover_card.dart'; +import 'package:mom_kitchen/src/widgets/discover/content/tag_discover_card.dart'; +import 'package:mom_kitchen/src/widgets/discover/content/nutrition_discover_card.dart'; import 'package:mom_kitchen/src/widgets/discover/meal_time_discover_card.dart'; -import 'package:mom_kitchen/src/widgets/discover/mini_card_discover_card.dart'; -import 'package:mom_kitchen/src/widgets/discover/tool_card_discover_card.dart'; -import 'package:mom_kitchen/src/models/discover_model.dart'; -import 'package:mom_kitchen/src/models/mini_card_model.dart'; -import 'package:mom_kitchen/src/models/tool_item_model.dart'; -import 'package:mom_kitchen/src/models/waterfall_slot.dart'; +import 'package:mom_kitchen/src/widgets/discover/content/mini_card_discover_card.dart'; +import 'package:mom_kitchen/src/widgets/discover/content/tool_card_discover_card.dart'; +import 'package:mom_kitchen/src/models/feed/discover_model.dart'; +import 'package:mom_kitchen/src/models/feed/mini_card_model.dart'; +import 'package:mom_kitchen/src/models/app/tool_item_model.dart'; +import 'package:mom_kitchen/src/models/feed/waterfall_slot.dart'; class DiscoverWaterfall extends StatefulWidget { final DiscoverData data; diff --git a/lib/src/widgets/discover/ingredient_discover_card.dart b/lib/src/widgets/discover/ingredient_discover_card.dart index 442d771..a849eea 100644 --- a/lib/src/widgets/discover/ingredient_discover_card.dart +++ b/lib/src/widgets/discover/ingredient_discover_card.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: ingredient_discover_card.dart * 名称: 食材发现卡片 * 作用: 瀑布流中的食材展示卡片，Liquid Glass风格，含过敏原警示 @@ -11,7 +11,7 @@ import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/app_routes.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; import 'package:mom_kitchen/src/widgets/glass/glass_container.dart'; -import 'package:mom_kitchen/src/models/discover_model.dart'; +import 'package:mom_kitchen/src/models/feed/discover_model.dart'; class IngredientDiscoverCard extends StatelessWidget { final DiscoverIngredient ingredient; diff --git a/lib/src/widgets/discover/meal_time_discover_card.dart b/lib/src/widgets/discover/meal_time_discover_card.dart index 8cf27d9..bc105d5 100644 --- a/lib/src/widgets/discover/meal_time_discover_card.dart +++ b/lib/src/widgets/discover/meal_time_discover_card.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: meal_time_discover_card.dart * 名称: 用餐时间发现卡片 * 作用: 瀑布流中的用餐时段展示卡片，Liquid Glass风格 @@ -11,7 +11,7 @@ import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/app_routes.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; import 'package:mom_kitchen/src/widgets/glass/glass_container.dart'; -import 'package:mom_kitchen/src/models/discover_model.dart'; +import 'package:mom_kitchen/src/models/feed/discover_model.dart'; class MealTimeDiscoverCard extends StatelessWidget { final DiscoverMealTime mealTime; diff --git a/lib/src/widgets/navigation_widgets.dart b/lib/src/widgets/navigation_widgets.dart index ba9b3a6..55cf65e 100644 --- a/lib/src/widgets/navigation_widgets.dart +++ b/lib/src/widgets/navigation_widgets.dart @@ -1,12 +1,12 @@ -import 'package:flutter/cupertino.dart'; +import 'package:flutter/cupertino.dart'; import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; import 'package:mom_kitchen/src/pages/home/home_page.dart'; import 'package:mom_kitchen/src/pages/profile/social/favorites_page.dart'; import 'package:mom_kitchen/src/pages/discover/discover_page.dart'; import 'package:mom_kitchen/src/pages/profile/profile_page.dart'; -import 'package:mom_kitchen/src/controllers/home/main_navigation_controller.dart'; -import 'package:mom_kitchen/src/controllers/data/favorites_controller.dart'; +import 'package:mom_kitchen/src/controllers/browse/main_navigation_controller.dart'; +import 'package:mom_kitchen/src/controllers/user/favorites_controller.dart'; import 'package:mom_kitchen/src/services/core/app_service.dart'; import 'package:mom_kitchen/src/services/ui/theme_service.dart'; import 'package:mom_kitchen/src/widgets/glass/nav/glass_nav_bar.dart'; diff --git a/lib/src/widgets/recipe_detail/info/recipe_allergen_warning.dart b/lib/src/widgets/recipe_detail/info/recipe_allergen_warning.dart index 306993d..e048a7a 100644 --- a/lib/src/widgets/recipe_detail/info/recipe_allergen_warning.dart +++ b/lib/src/widgets/recipe_detail/info/recipe_allergen_warning.dart @@ -1,7 +1,7 @@ -import 'package:flutter/cupertino.dart'; +import 'package:flutter/cupertino.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; import 'package:mom_kitchen/src/models/recipe/recipe_model.dart'; -import 'package:mom_kitchen/src/services/allergen_checker.dart'; +import 'package:mom_kitchen/src/services/system/allergen_checker.dart'; class RecipeAllergenWarning extends StatelessWidget { final RecipeModel recipe; diff --git a/lib/src/widgets/recipe_detail/info/recipe_meal_record_sheet.dart b/lib/src/widgets/recipe_detail/info/recipe_meal_record_sheet.dart index e7b38be..3e360f1 100644 --- a/lib/src/widgets/recipe_detail/info/recipe_meal_record_sheet.dart +++ b/lib/src/widgets/recipe_detail/info/recipe_meal_record_sheet.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: recipe_meal_record_sheet.dart * 名称: 菜品饮食记录弹窗 * 作用: 从菜品详情页快捷记录饮食，支持份量比例+自定义克数+用餐时段 @@ -9,7 +9,7 @@ import 'package:flutter/cupertino.dart'; import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; import 'package:mom_kitchen/src/models/recipe/recipe_model.dart'; -import 'package:mom_kitchen/src/models/data/meal_record_model.dart'; +import 'package:mom_kitchen/src/models/data/record/meal_record_model.dart'; import 'package:mom_kitchen/src/controllers/data/meal_record_controller.dart'; import 'package:mom_kitchen/src/services/ui/toast_service.dart'; diff --git a/lib/src/widgets/recipe_detail/info/recipe_taste_preference.dart b/lib/src/widgets/recipe_detail/info/recipe_taste_preference.dart index 16d296c..5fca26b 100644 --- a/lib/src/widgets/recipe_detail/info/recipe_taste_preference.dart +++ b/lib/src/widgets/recipe_detail/info/recipe_taste_preference.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: recipe_taste_preference.dart * 名称: 菜谱口味偏好标注组件 * 作用: 在菜品详情页标注用户口味偏好设置值，对比菜品信息与用户偏好 @@ -10,7 +10,7 @@ import 'package:flutter/cupertino.dart'; import 'package:get/get.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; import 'package:mom_kitchen/src/models/recipe/recipe_model.dart'; -import 'package:mom_kitchen/src/services/user/taste_preference_service.dart'; +import 'package:mom_kitchen/src/services/core/taste_preference_service.dart'; import 'package:mom_kitchen/src/controllers/user/preference_controller.dart'; class RecipeTastePreference extends StatelessWidget { diff --git a/lib/src/widgets/recipe_detail/interaction/recipe_email_button.dart b/lib/src/widgets/recipe_detail/interaction/recipe_email_button.dart index 6544d02..eef11d7 100644 --- a/lib/src/widgets/recipe_detail/interaction/recipe_email_button.dart +++ b/lib/src/widgets/recipe_detail/interaction/recipe_email_button.dart @@ -1,11 +1,11 @@ -// 2026-04-14 | recipe_email_button.dart | 菜谱邮件分享按钮 | 点击弹出输入邮箱对话框并发送菜谱详情 +// 2026-04-14 | recipe_email_button.dart | 菜谱邮件分享按钮 | 点击弹出输入邮箱对话框并发送菜谱详情 // 2026-04-14 | 初始创建，支持收件人邮箱输入+发送状态反馈 // 2026-04-14 | 新增多线路选择：官方线路1/线路2/自定义SMTP import 'package:flutter/cupertino.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; import 'package:mom_kitchen/src/models/recipe/recipe_model.dart'; -import 'package:mom_kitchen/src/services/data/email_service.dart'; +import 'package:mom_kitchen/src/services/data/business/email_service.dart'; import 'package:mom_kitchen/src/services/ui/toast_service.dart'; /// 发送线路枚举 diff --git a/lib/src/widgets/recipe_detail/interaction/recipe_qr_poster.dart b/lib/src/widgets/recipe_detail/interaction/recipe_qr_poster.dart index 83954ba..86b4d48 100644 --- a/lib/src/widgets/recipe_detail/interaction/recipe_qr_poster.dart +++ b/lib/src/widgets/recipe_detail/interaction/recipe_qr_poster.dart @@ -1,4 +1,4 @@ -/* +/* * 文件: recipe_qr_poster.dart * 名称: 菜谱二维码海报组件 * 作用: 生成菜谱二维码分享海报，含菜谱信息+二维码+分享链接 @@ -13,7 +13,7 @@ import 'package:qr/qr.dart'; import 'package:mom_kitchen/src/config/design_tokens.dart'; import 'package:mom_kitchen/src/config/api_config.dart'; import 'package:mom_kitchen/src/models/recipe/recipe_model.dart'; -import 'package:mom_kitchen/src/services/data/recipe_share_service.dart'; +import 'package:mom_kitchen/src/services/data/business/recipe_share_service.dart'; class RecipeQrPoster extends StatelessWidget { final String title; diff --git a/lib/src/widgets/states/offline_banner.dart b/lib/src/widgets/states/offline_banner.dart index ba711ce..10c5c36 100644 --- a/lib/src/widgets/states/offline_banner.dart +++ b/lib/src/widgets/states/offline_banner.dart @@ -1,10 +1,10 @@ -// 2026-04-09 | OfflineBanner | 离线状态横幅 | 增强版：优先使用OfflineService数据源 +// 2026-04-09 | OfflineBanner | 离线状态横幅 | 增强版：优先使用OfflineService数据源 // 2026-04-18 | 重构：优先使用OfflineService，降级使用ConnectivityService import 'package:flutter/cupertino.dart'; import 'package:flutter/foundation.dart'; import 'package:get/get.dart'; -import 'package:mom_kitchen/src/services/data/offline_service.dart'; -import 'package:mom_kitchen/src/services/connectivity_service.dart'; +import 'package:mom_kitchen/src/services/data/storage/offline_service.dart'; +import 'package:mom_kitchen/src/services/system/connectivity_service.dart'; class OfflineBanner extends StatelessWidget { const OfflineBanner({super.key}); diff --git a/lib/src/widgets/states/offline_indicator.dart b/lib/src/widgets/states/offline_indicator.dart index 86535af..210eb07 100644 --- a/lib/src/widgets/states/offline_indicator.dart +++ b/lib/src/widgets/states/offline_indicator.dart @@ -1,8 +1,8 @@ -// 2026-04-18 | OfflineIndicator | 增强版离线指示器 | 显示离线状态、持续时间、排队操作数、可用功能详情 +// 2026-04-18 | OfflineIndicator | 增强版离线指示器 | 显示离线状态、持续时间、排队操作数、可用功能详情 import 'package:flutter/cupertino.dart'; import 'package:get/get.dart'; -import 'package:mom_kitchen/src/services/data/offline_service.dart'; +import 'package:mom_kitchen/src/services/data/storage/offline_service.dart'; class OfflineIndicator extends StatelessWidget { const OfflineIndicator({super.key}); diff --git a/packages/badges b/packages/badges index 9531d41..89d521d 160000 --- a/packages/badges +++ b/packages/badges @@ -1 +1 @@ -Subproject commit 9531d41ed1757d3978d8180d0722be4d4cb4d9ca +Subproject commit 89d521df13052ae8970b59a2aacd9a847db2e350