From ba0a8eb654b8d6d0737ab2697ed96d9adc0e4a3c Mon Sep 17 00:00:00 2001 From: LingandRX Date: Tue, 29 Apr 2025 21:01:34 +0800 Subject: [PATCH] =?UTF-8?q?feat(provider):=20=E9=87=8D=E6=9E=84=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E4=BD=BF=E7=94=A8=20provider=20=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除 ItemScopedModel，改用 ItemProvider - 更新 addItem 屏幕，使用 ItemProvider 添加物品 - 修改物品列表屏幕，使用 ItemProvider 加载和刷新数据 - 更新 main 函数，添加 ItemProvider --- .../gradle/wrapper/gradle-wrapper.properties | 2 +- lib/main.dart | 13 ++- lib/models/item_model.dart | 28 +++--- lib/provider/item_provider.dart | 24 +++++ lib/scoped_models/item_scoped_model.dart | 38 -------- lib/screens/addItem/add_item_screen.dart | 52 +++++------ lib/screens/item_list_screen.dart | 56 +++++------- pubspec.lock | 90 +++++++++++-------- pubspec.yaml | 1 + 9 files changed, 151 insertions(+), 153 deletions(-) create mode 100644 lib/provider/item_provider.dart delete mode 100644 lib/scoped_models/item_scoped_model.dart diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 12aa904..68b9f42 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=file:///C:/Users/TxT/Downloads/gradle-8.3-all.zip +distributionUrl=file:///C:/Users/YLL/Downloads/gradle-8.3-all.zip diff --git a/lib/main.dart b/lib/main.dart index 7f8e465..eb915f1 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,12 +1,23 @@ import 'package:flutter/material.dart'; +import 'package:item_tracker/provider/item_provider.dart'; +import 'package:item_tracker/repository/item_repository.dart'; import 'package:item_tracker/screens/home_screen.dart'; +import 'package:provider/provider.dart'; import 'database/sqlite_helper.dart'; void main() async { + + final dbHelper = DatabaseHelper(); + final repository = ItemRepository(dbHelper: dbHelper); + WidgetsFlutterBinding.ensureInitialized(); await DatabaseHelper().database; print('数据库初始化完成'); - runApp(MyApp()); + runApp( + ChangeNotifierProvider( + create: (_) => ItemProvider(repository: repository), + child: MyApp(),), + ); } class MyApp extends StatelessWidget { diff --git a/lib/models/item_model.dart b/lib/models/item_model.dart index c34cb69..f8e8ba9 100644 --- a/lib/models/item_model.dart +++ b/lib/models/item_model.dart @@ -11,7 +11,7 @@ class Item { // 购买日期 final DateTime? purchaseDate; // 是否使用 - final bool isInUse; + final String isInUse; final DateTime? createdAt; final DateTime? updatedAt; @@ -22,7 +22,7 @@ class Item { this.locationId, this.description, this.purchaseDate, - this.isInUse = false, + this.isInUse = 'no', this.createdAt, this.updatedAt, }); @@ -31,13 +31,13 @@ class Item { return { 'id': id, 'name': name, - 'categoryId': categoryId, - 'locationId': locationId, + 'category_id': categoryId, + 'location_id': locationId, 'description': description, - 'purchaseDate': purchaseDate, - 'isInUse': isInUse, - 'createdAt': createdAt, - 'updatedAt': updatedAt, + 'purchase_date': purchaseDate, + 'is_in_use': isInUse, + 'created_at': createdAt, + 'updated_at': updatedAt, }; } @@ -45,13 +45,13 @@ class Item { return Item( id: map['id'], name: map['name'], - categoryId: map['categoryId'], - locationId: map['locationId'], + categoryId: map['category_id'], + locationId: map['location_id'], description: map['description'], - purchaseDate: map['purchaseDate'], - isInUse: map['isInUse'], - createdAt: map['createdAt'], - updatedAt: map['updatedAt'], + purchaseDate: map['purchase_date'], + isInUse: map['is_in_use'], + createdAt: map['created_at'], + updatedAt: map['updated_at'], ); } } \ No newline at end of file diff --git a/lib/provider/item_provider.dart b/lib/provider/item_provider.dart new file mode 100644 index 0000000..4e957ff --- /dev/null +++ b/lib/provider/item_provider.dart @@ -0,0 +1,24 @@ +import 'package:flutter/material.dart'; +import 'package:item_tracker/models/item_model.dart'; +import 'package:item_tracker/repository/item_repository.dart'; + +class ItemProvider extends ChangeNotifier { + List _items = []; + + List get items => _items; + + final ItemRepository repository; + + ItemProvider({required this.repository}); + + Future loadItems() async { + final data = await repository.getAllItems(); + _items = data.map((map) => Item.fromMap(map)).toList(); + notifyListeners(); + } + + Future addItem(Item item) async { + await repository.insertItem(item); + await loadItems(); // 插入后刷新 + } +} \ No newline at end of file diff --git a/lib/scoped_models/item_scoped_model.dart b/lib/scoped_models/item_scoped_model.dart deleted file mode 100644 index 1994930..0000000 --- a/lib/scoped_models/item_scoped_model.dart +++ /dev/null @@ -1,38 +0,0 @@ -import 'package:flutter/cupertino.dart'; -import 'package:item_tracker/models/item_model.dart'; -import 'package:item_tracker/repository/item_repository.dart'; - -class ItemScopedModel extends InheritedWidget { - final ItemRepository itemRepository; - final List> items; - - ItemScopedModel({ - required this.itemRepository, - required this.items, - required Widget child, - }) : super( - child: child, - ); - - static ItemScopedModel of(BuildContext context) { - return context.dependOnInheritedWidgetOfExactType()!; - } - - @override - bool updateShouldNotify(covariant InheritedWidget oldWidget) { - return true; - } - - Future>> loadItems() async { - final itemsFormDb = await itemRepository.getAllItems(); - items.clear(); - items.addAll(itemsFormDb); - return itemsFormDb; - } - - Future addItem(Item item) async { - await itemRepository.insertItem(item); - print("提交完成"); - await loadItems(); - } -} diff --git a/lib/screens/addItem/add_item_screen.dart b/lib/screens/addItem/add_item_screen.dart index 7cfaf4f..3cd2b2f 100644 --- a/lib/screens/addItem/add_item_screen.dart +++ b/lib/screens/addItem/add_item_screen.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; - -import '../../models/item_model.dart'; -import '../../scoped_models/item_scoped_model.dart'; +import 'package:provider/provider.dart'; +import 'package:item_tracker/models/item_model.dart'; +import 'package:item_tracker/provider/item_provider.dart'; DateTime? selectedDate; @@ -35,13 +35,6 @@ class _FromTestRouteSate extends State { }); } - late Future>> _itemsFuture; - - Future addItem(Item item) async { - final itemScopedModel = ItemScopedModel.of(context); - return await itemScopedModel.addItem(item); - } - @override Widget build(BuildContext context) { var date = selectedDate; @@ -80,7 +73,7 @@ class _FromTestRouteSate extends State { return null; }, ), - SizedBox(height: 16.0), // 添加间距 + SizedBox(height: 16.0), TextField( controller: _descriptionController, decoration: InputDecoration( @@ -91,7 +84,7 @@ class _FromTestRouteSate extends State { maxLines: 4, maxLength: 200, ), - SizedBox(height: 16.0), // 添加间距 + SizedBox(height: 16.0), DropdownButtonFormField( value: _selectedCategory, items: _categories.map((category) { @@ -108,7 +101,7 @@ class _FromTestRouteSate extends State { labelText: '请选择分类', ), ), - SizedBox(height: 16.0), // 添加间距 + SizedBox(height: 16.0), TextFormField( controller: _locationController, decoration: InputDecoration( @@ -117,13 +110,13 @@ class _FromTestRouteSate extends State { border: OutlineInputBorder(), ), ), - SizedBox(height: 16.0), // 添加间距 + SizedBox(height: 16.0), Text( date == null ? '请选择日期' : '已选择日期: ${date.year}年${date.month}月${date.day}日', ), - SizedBox(height: 16.0), // 添加间距 + SizedBox(height: 16.0), ElevatedButton.icon( icon: Icon(Icons.calendar_today, color: Colors.white), onPressed: () async { @@ -145,7 +138,7 @@ class _FromTestRouteSate extends State { ), ), ), - SizedBox(height: 16.0), // 添加间距 + SizedBox(height: 16.0), Wrap( crossAxisAlignment: WrapCrossAlignment.center, spacing: 12, // 每个元素之间水平间距 @@ -179,7 +172,7 @@ class _FromTestRouteSate extends State { ), ], ), - SizedBox(height: 16.0), // 添加间距 + SizedBox(height: 16.0), TextField( controller: _priceController, keyboardType: TextInputType.number, @@ -194,7 +187,7 @@ class _FromTestRouteSate extends State { border: OutlineInputBorder(), ), ), - SizedBox(height: 28.0), // 添加间距 + SizedBox(height: 28.0), ElevatedButton( child: Padding( padding: const EdgeInsets.all(16.0), @@ -202,24 +195,25 @@ class _FromTestRouteSate extends State { ), onPressed: () { if (_formKey.currentState!.validate()) { - print('物品名称：${_nameController.text}'); - print('物品描述：${_descriptionController.text}'); - print('物品分类：${_selectedCategory}'); - print('物品位置：${_locationController.text}'); - print('物品购买日期：${date}'); - print('物品是否使用：${_itemIsUse.toString()}'); - print('物品价格：${_priceController.text}'); + final newItem = Item( + name: _nameController.text, + description: _descriptionController.text, + purchaseDate: selectedDate, + ); - Item item = Item(name: _nameController.text); + print(newItem.toMap()); - addItem(item); + // 获取 ItemProvider 并添加物品 + Provider.of(context, listen: false) + .addItem(newItem); ScaffoldMessenger.of(context).showSnackBar(SnackBar( content: Text('提交成功'), duration: Duration(seconds: 1), )); + // 确保只有在表单验证成功后才调用 Navigator.pop - // Navigator.pop(context, true); + Navigator.pop(context, true); } }, style: ElevatedButton.styleFrom( @@ -235,4 +229,4 @@ class _FromTestRouteSate extends State { }), ); } -} \ No newline at end of file +} diff --git a/lib/screens/item_list_screen.dart b/lib/screens/item_list_screen.dart index efc77cc..45199ef 100644 --- a/lib/screens/item_list_screen.dart +++ b/lib/screens/item_list_screen.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; +import 'package:item_tracker/provider/item_provider.dart'; import 'package:item_tracker/screens/addItem/add_item_screen.dart'; - -import '../scoped_models/item_scoped_model.dart'; +import 'package:provider/provider.dart'; class ItemListScreen extends StatefulWidget { @override @@ -9,23 +9,19 @@ class ItemListScreen extends StatefulWidget { } class _ItemListScreenState extends State { - late Future>> _itemsFuture; + late ItemProvider _itemProvider; @override void initState() { super.initState(); - _itemsFuture = _loadItems(); // 初始化 Future - } - - Future>> _loadItems() async { - final itemScopedModel = ItemScopedModel.of(context); - return await itemScopedModel.loadItems(); + Future.microtask(() { + _itemProvider = Provider.of(context, listen: false); + _itemProvider.loadItems(); + }); } Future _refreshData() async { - setState(() { - _itemsFuture = _loadItems(); // 更新 Future，触发 FutureBuilder 重新加载数据 - }); + await _itemProvider.loadItems(); // 刷新数据 } @override @@ -34,31 +30,25 @@ class _ItemListScreenState extends State { appBar: AppBar( title: Text('物品列表'), ), - body: RefreshIndicator( - child: FutureBuilder>>( - future: _itemsFuture, // 绑定到可变的 Future 对象 - builder: (context, snapshot) { - if (snapshot.connectionState == ConnectionState.waiting) { - return Center(child: CircularProgressIndicator()); - } else if (snapshot.hasError) { - return Center(child: Text('Error: ${snapshot.error}')); - } else { - final items = snapshot.data ?? []; - return ListView.builder( + body: Consumer(builder: (context, provider, _) { + final items = provider.items; + + if (items.isEmpty) { + return Center(child: Text("暂无物品")); + } + + return RefreshIndicator( + onRefresh: _refreshData, + child: ListView.builder( itemCount: items.length, - itemBuilder: (context, index) { + itemBuilder: (_, index) { final item = items[index]; return ListTile( - title: Text(item['name']), - subtitle: Text(item['context']), + title: Text(item.name), + subtitle: Text(item.description ?? ""), ); - }, - ); - } - }, - ), - onRefresh: _refreshData, - ), + })); + }), floatingActionButton: FloatingActionButton( onPressed: () async { final shouldRefresh = await Navigator.push( diff --git a/pubspec.lock b/pubspec.lock index 8650e62..848bd6c 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,42 +5,42 @@ packages: dependency: transitive description: name: async - sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 url: "https://pub.dev" source: hosted - version: "2.11.0" + version: "2.12.0" boolean_selector: dependency: transitive description: name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" characters: dependency: transitive description: name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" clock: dependency: transitive description: name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" collection: dependency: transitive description: name: collection - sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" url: "https://pub.dev" source: hosted - version: "1.19.0" + version: "1.19.1" cupertino_icons: dependency: "direct main" description: @@ -53,10 +53,10 @@ packages: dependency: transitive description: name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc" url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.2" ffi: dependency: transitive description: @@ -79,18 +79,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06" + sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec url: "https://pub.dev" source: hosted - version: "10.0.7" + version: "10.0.8" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379" + sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 url: "https://pub.dev" source: hosted - version: "3.0.8" + version: "3.0.9" leak_tracker_testing: dependency: transitive description: @@ -103,10 +103,10 @@ packages: dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 url: "https://pub.dev" source: hosted - version: "0.12.16+1" + version: "0.12.17" material_color_utilities: dependency: transitive description: @@ -119,18 +119,26 @@ packages: dependency: transitive description: name: meta - sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.16.0" + nested: + dependency: transitive + description: + name: nested + sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20" + url: "https://pub.dev" + source: hosted + version: "1.0.0" path: dependency: "direct main" description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" path_provider: dependency: "direct main" description: @@ -195,6 +203,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.8" + provider: + dependency: "direct main" + description: + name: provider + sha256: "489024f942069c2920c844ee18bb3d467c69e48955a4f32d1677f71be103e310" + url: "https://pub.dev" + source: hosted + version: "6.1.4" sky_engine: dependency: transitive description: flutter @@ -204,10 +220,10 @@ packages: dependency: transitive description: name: source_span - sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.10.1" sqflite: dependency: "direct main" description: @@ -260,26 +276,26 @@ packages: dependency: transitive description: name: stack_trace - sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.12.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" string_scanner: dependency: transitive description: name: string_scanner - sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.1" synchronized: dependency: transitive description: @@ -292,18 +308,18 @@ packages: dependency: transitive description: name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" test_api: dependency: transitive description: name: test_api - sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" + sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd url: "https://pub.dev" source: hosted - version: "0.7.3" + version: "0.7.4" vector_math: dependency: transitive description: @@ -316,10 +332,10 @@ packages: dependency: transitive description: name: vm_service - sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b + sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14" url: "https://pub.dev" source: hosted - version: "14.3.0" + version: "14.3.1" xdg_directories: dependency: transitive description: @@ -329,5 +345,5 @@ packages: source: hosted version: "1.1.0" sdks: - dart: ">=3.6.0 <4.0.0" + dart: ">=3.7.0-0 <4.0.0" flutter: ">=3.27.0" diff --git a/pubspec.yaml b/pubspec.yaml index a057369..9026de3 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,6 +16,7 @@ dependencies: path: ^1.8.0 sqlite3_flutter_libs: ^0.5.32 path_provider: ^2.0.2 + provider: ^6.1.0 dev_dependencies: flutter_test: