diff --git a/.gitignore b/.gitignore index 79c113f..6911a8c 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ app.*.map.json /android/app/debug /android/app/profile /android/app/release +/android/app/.cxx 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/models/item_model.dart b/lib/models/item_model.dart index c6ecb00..8fb835b 100644 --- a/lib/models/item_model.dart +++ b/lib/models/item_model.dart @@ -1,11 +1,29 @@ class Item { + int? id; + // 名称 String name; - String description; - String? imagePath; + // 分类 + int? categoryId; + // 位置 + int? locationId; + // 描述 + String? description; + // 购买日期 + String? purchaseDate; + // 是否使用 + int? isInUse; + String? createdAt; + String? updatedAt; Item({ + this.id, required this.name, - required this.description, - this.imagePath, + this.categoryId, + this.locationId, + this.description, + this.purchaseDate, + this.isInUse, + this.createdAt, + this.updatedAt, }); } \ No newline at end of file diff --git a/lib/screens/addItem/add_item_screen.dart b/lib/screens/addItem/add_item_screen.dart index 28db1be..db32aff 100644 --- a/lib/screens/addItem/add_item_screen.dart +++ b/lib/screens/addItem/add_item_screen.dart @@ -1,6 +1,14 @@ import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:item_tracker/database/sqlite_operation.dart'; +DateTime? selectedDate; + +enum ItemIsUse { + yes, + no, +} + class AddItemScreen extends StatefulWidget { @override _FromTestRouteSate createState() => _FromTestRouteSate(); @@ -8,20 +16,43 @@ class AddItemScreen extends StatefulWidget { class _FromTestRouteSate extends State { TextEditingController _nameController = TextEditingController(); - TextEditingController _contentController = TextEditingController(); + TextEditingController _descriptionController = TextEditingController(); + String? _selectedCategory; // 当前选中的分类 + TextEditingController _locationController = TextEditingController(); + ItemIsUse? _itemIsUse = ItemIsUse.yes; + TextEditingController _priceController = TextEditingController(); GlobalKey _formKey = GlobalKey(); + // 添加自定义分类列表 + List _categories = ['A', 'B', 'C', 'D']; // 自定义分类 + + // 更新选中的分类 + void _updateSelectedCategory(String? category) { + setState(() { + _selectedCategory = category; + }); + } + @override Widget build(BuildContext context) { + var date = selectedDate; + + void setGroupValue(ItemIsUse? itemIsUse) { + setState(() { + _itemIsUse = itemIsUse; + }); + } + return Scaffold( appBar: AppBar( title: Text('新增物品'), ), body: Builder(builder: (context) { return Form( - key: _formKey, // 设置 globalKey,用于后面获取 FormState + key: _formKey, autovalidateMode: AutovalidateMode.onUserInteraction, - child: Column( + child: ListView( + padding: EdgeInsets.symmetric(vertical: 8.0, horizontal: 16.0), children: [ TextFormField( autofocus: true, @@ -29,10 +60,9 @@ class _FromTestRouteSate extends State { decoration: InputDecoration( labelText: "名称", hintText: "请输入物品名称", - icon: Icon(Icons.person), + border: OutlineInputBorder(), ), maxLength: 20, - // 校验用户名 validator: (v) { if (v == null || v.trim().isEmpty) { print('名称不能为空'); @@ -41,51 +71,157 @@ class _FromTestRouteSate extends State { return null; }, ), - TextFormField( - controller: _contentController, + SizedBox(height: 16.0), // 添加间距 + TextField( + controller: _descriptionController, decoration: InputDecoration( labelText: "物品描述", hintText: "请输入物品描述", - icon: Icon(Icons.lock), + border: OutlineInputBorder(), ), + maxLines: 4, maxLength: 200, ), - // 登录按钮 - Padding( - padding: const EdgeInsets.only(top: 28.0), - child: Row( - children: [ - Expanded( - child: ElevatedButton( - child: Padding( - padding: const EdgeInsets.all(16.0), - child: Text("提交"), - ), - onPressed: () { - if (_formKey.currentState!.validate()) { - // 验证通过提交数据 - print('物品名称:${_nameController.text}'); - print('物品描述:${_contentController.text}'); - - insertItem(_nameController.text, _contentController.text); - // 显示操作成功的提示 - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: Text('提交成功'), - duration: Duration(seconds: 1), - )); - // 返回上一页 - Navigator.pop(context, true); - } - }, - ), - ), - ], + SizedBox(height: 16.0), // 添加间距 + DropdownButtonFormField( + value: _selectedCategory, + items: _categories.map((category) { + return DropdownMenuItem( + value: category, + child: Text(category), + ); + }).toList(), + onChanged: _updateSelectedCategory, + decoration: InputDecoration( + border: OutlineInputBorder(), + filled: true, + fillColor: Colors.grey[100], + labelText: '请选择分类', ), - ) + ), + SizedBox(height: 16.0), // 添加间距 + TextFormField( + controller: _locationController, + decoration: InputDecoration( + labelText: "物品位置", + hintText: "请输入物品位置", + border: OutlineInputBorder(), + ), + ), + SizedBox(height: 16.0), // 添加间距 + Text( + date == null + ? '请选择日期' + : '已选择日期: ${date.year}年${date.month}月${date.day}日', + ), + SizedBox(height: 16.0), // 添加间距 + ElevatedButton.icon( + icon: Icon(Icons.calendar_today, color: Colors.white), + onPressed: () async { + var pickedDate = await showDatePicker( + context: context, + initialEntryMode: DatePickerEntryMode.calendarOnly, + initialDate: DateTime.now(), + firstDate: DateTime(2015, 8), + lastDate: DateTime(2101), + ); + setState(() { + selectedDate = pickedDate; + }); + }, + label: Text('选择日期', style: TextStyle(color: Colors.white)), + style: ElevatedButton.styleFrom( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(8.0), + ), + ), + ), + SizedBox(height: 16.0), // 添加间距 + Wrap( + crossAxisAlignment: WrapCrossAlignment.center, + spacing: 12, // 每个元素之间水平间距 + runSpacing: 8, // 换行后垂直间距 + children: [ + Text( + '请选择是否使用:', + style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold), + ), + Row( + mainAxisSize: MainAxisSize.min, + children: [ + Radio( + value: ItemIsUse.yes, + groupValue: _itemIsUse, + onChanged: setGroupValue, + ), + Text('是'), + ], + ), + Row( + mainAxisSize: MainAxisSize.min, + children: [ + Radio( + value: ItemIsUse.no, + groupValue: _itemIsUse, + onChanged: setGroupValue, + ), + Text('否'), + ], + ), + ], + ), + SizedBox(height: 16.0), // 添加间距 + TextField( + controller: _priceController, + keyboardType: TextInputType.number, + inputFormatters: [ + FilteringTextInputFormatter.allow( + RegExp(r'^\d*\.?\d{0,2}$'), + ), + ], + decoration: InputDecoration( + labelText: "物品价格", + hintText: "请输入物品价格", + border: OutlineInputBorder(), + ), + ), + SizedBox(height: 28.0), // 添加间距 + ElevatedButton( + child: Padding( + padding: const EdgeInsets.all(16.0), + child: Text("提交"), + ), + onPressed: () { + if (_formKey.currentState!.validate()) { + print('物品名称:${_nameController.text}'); + print('物品描述:${_descriptionController.text}'); + print('物品分类:${_selectedCategory}'); + print('物品位置:${_locationController.text}'); + print('物品购买日期:${date}'); + print('物品是否使用:${_itemIsUse.toString()}'); + print('物品价格:${_priceController.text}'); + + insertItem(_nameController.text, + _descriptionController.text); + ScaffoldMessenger.of(context).showSnackBar(SnackBar( + content: Text('提交成功'), + duration: Duration(seconds: 1), + )); + // 确保只有在表单验证成功后才调用 Navigator.pop + // Navigator.pop(context, true); + } + }, + style: ElevatedButton.styleFrom( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(8.0), + ), + elevation: 4.0, + ), + ), ], ), ); }), ); } -} +} \ No newline at end of file diff --git a/pubspec.lock b/pubspec.lock index aafb81c..356ea2e 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,18 +53,18 @@ 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: name: ffi - sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6" + sha256: "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418" url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "2.1.4" flutter: dependency: "direct main" description: flutter @@ -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,18 @@ packages: dependency: transitive description: name: meta - sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.16.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: @@ -204,50 +204,50 @@ 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: name: sqflite - sha256: "2d7299468485dca85efeeadf5d38986909c5eb0cd71fd3db2c2f000e6c9454bb" + sha256: e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03 url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.4.2" sqflite_android: dependency: transitive description: name: sqflite_android - sha256: "78f489aab276260cdd26676d2169446c7ecd3484bbd5fead4ca14f3ed4dd9ee3" + sha256: "2b3070c5fa881839f8b402ee4a39c1b4d561704d4ebbbcfb808a119bc2a1701b" url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.4.1" sqflite_common: dependency: transitive description: name: sqflite_common - sha256: "761b9740ecbd4d3e66b8916d784e581861fd3c3553eda85e167bc49fdb68f709" + sha256: "84731e8bfd8303a3389903e01fb2141b6e59b5973cacbb0929021df08dddbe8b" url: "https://pub.dev" source: hosted - version: "2.5.4+6" + version: "2.5.5" sqflite_common_ffi: dependency: "direct main" description: name: sqflite_common_ffi - sha256: "883dd810b2b49e6e8c3b980df1829ef550a94e3f87deab5d864917d27ca6bf36" + sha256: "1f3ef3888d3bfbb47785cc1dda0dc7dd7ebd8c1955d32a9e8e9dae1e38d1c4c1" url: "https://pub.dev" source: hosted - version: "2.3.4+4" + version: "2.3.5" sqflite_darwin: dependency: transitive description: name: sqflite_darwin - sha256: "22adfd9a2c7d634041e96d6241e6e1c8138ca6817018afc5d443fef91dcefa9c" + sha256: "279832e5cde3fe99e8571879498c9211f3ca6391b0d818df4e17d9fff5c6ccb3" url: "https://pub.dev" source: hosted - version: "2.4.1+1" + version: "2.4.2" sqflite_platform_interface: dependency: transitive description: @@ -276,50 +276,50 @@ 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: name: synchronized - sha256: "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225" + sha256: "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6" url: "https://pub.dev" source: hosted - version: "3.3.0+3" + version: "3.3.1" term_glyph: 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" typed_data: dependency: transitive description: @@ -340,10 +340,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" web: dependency: transitive description: @@ -361,5 +361,5 @@ packages: source: hosted version: "1.1.0" sdks: - dart: ">=3.6.0 <4.0.0" + dart: ">=3.7.0 <4.0.0" flutter: ">=3.27.0"