From 74891e03846ac1c35f74fd570d59b6ba83d7a2af Mon Sep 17 00:00:00 2001 From: xufei <727302827@qq.com> Date: Fri, 18 Jul 2025 17:33:37 +0800 Subject: [PATCH] =?UTF-8?q?2025.7.18=20=E9=9A=90=E6=82=A3=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=AD=A3=E5=9C=A8=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/http/ApiService.dart | 133 +++-- lib/pages/home/work/danger_wait_deawer.dart | 484 ++++++++++++++++++ .../home/work/danger_wait_list_page.dart | 255 +++++++-- lib/pages/mine/mine_feedback_page.dart | 9 +- pubspec.lock | 232 ++++----- 5 files changed, 924 insertions(+), 189 deletions(-) create mode 100644 lib/pages/home/work/danger_wait_deawer.dart diff --git a/lib/http/ApiService.dart b/lib/http/ApiService.dart index 0d7b881..db14d4f 100644 --- a/lib/http/ApiService.dart +++ b/lib/http/ApiService.dart @@ -6,30 +6,23 @@ import 'package:qhd_prevention/tools/tools.dart'; import 'HttpManager.dart'; class ApiService { - // /// 人脸识别服务 - // static const String baseFacePath = - // "https://qaaqwh.qhdsafety.com/whb_stu_face/"; - // - // /// 登录及其他管理后台接口 - // static const String basePath = "https://qaaqwh.qhdsafety.com/integrated_whb"; - // - // /// 图片文件服务 - // static const String baseImgPath = "https://file.zcloudchina.com/YTHFile"; - // - // /// 管理后台统一路径 - // static const String adminPath = - // "https://qaaqwh.qhdsafety.com/integrated_whb/"; - // - // /// 项目管理系统 - // static const String projectManagerUrl = - // 'https://pm.qhdsafety.com/zy-projectManage'; + // static const String basePath = "http://192.168.0.25:28199/"; + // static const String basePath = "http://192.168.20.240:8500/integrated_whb"; + // static const String baseFacePath = "http://192.168.0.25:38199/"; + // 人脸识别服务 + // static const String baseFacePath = "https://qaaqwh.qhdsafety.com/whb_stu_face/"; + // static const String basePath = "https://qaaqwh.qhdsafety.com/integrated_whb/"; + // static const String baseImgPath = "https://file.zcloudchina.com/YTHFile"; + // static const String adminPath = "https://qaaqwh.qhdsafety.com/integrated_whb/"; + // static const String projectManagerUrl = 'https://pm.qhdsafety.com/zy-projectManage/'; + // static const String publicKey = 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDUoHAavCikaZxjlDM6Km8cX+ye78F4oF39AcEfnE1p2Yn9pJ9WFxYZ4Vkh6F8SKMi7k4nYsKceqB1RwG996SvHQ5C3pM3nbXCP4K15ad6QhN4a7lzlbLhiJcyIKszvvK8ncUDw8mVQ0j/2mwxv05yH6LN9OKU6Hzm1ninpWeE+awIDAQAB' /// 人脸识别服务 static const String baseFacePath = "https://qaaqwh.qhdsafety.com/whb_stu_face/"; /// 登录及其他管理后台接口 - static const String basePath = "http://192.168.20.240:8500/integrated_whb/"; + static const String basePath = "https://qaaqwh.qhdsafety.com/integrated_whb"; /// 图片文件服务 static const String baseImgPath = "https://file.zcloudchina.com/YTHFile"; @@ -42,6 +35,26 @@ class ApiService { static const String projectManagerUrl = 'https://pm.qhdsafety.com/zy-projectManage'; + + // /// 人脸识别服务 + // static const String baseFacePath = + // "https://qaaqwh.qhdsafety.com/whb_stu_face/"; + // + // /// 登录及其他管理后台接口 + // static const String basePath = "http://192.168.20.240:8500/integrated_whb/"; + // + // /// 图片文件服务 + // static const String baseImgPath = "https://file.zcloudchina.com/YTHFile"; + // + // /// 管理后台统一路径 + // static const String adminPath = + // "https://qaaqwh.qhdsafety.com/integrated_whb/"; + // + // /// 项目管理系统 + // static const String projectManagerUrl = + // 'https://pm.qhdsafety.com/zy-projectManage'; + + /// RSA 公钥 static const publicKey = ''' -----BEGIN PUBLIC KEY----- @@ -52,6 +65,9 @@ U6Hzm1ninpWeE+awIDAQAB -----END PUBLIC KEY----- '''; + + + /// 登录验证接口 static Future> loginCheck(String keydataVal) { return HttpManager().request( @@ -290,7 +306,7 @@ U6Hzm1ninpWeE+awIDAQAB }, ); } - static Future> fnSetUserFaceTime(String FACE_TIME) { + static Future> fnSetUserFaceTime(int FACE_TIME) { return HttpManager().request( baseFacePath, '/app/user/setUserFaceTime', @@ -332,7 +348,6 @@ U6Hzm1ninpWeE+awIDAQAB ); } - static Future> fnGetVideoPlayProgress(String VIDEOCOURSEWARE_ID, String CURRICULUM_ID, String CLASS_ID, String STUDENT_ID) { return HttpManager().request( basePath, @@ -356,7 +371,6 @@ U6Hzm1ninpWeE+awIDAQAB '/app/edu/coursestudyvideorecord/save', method: Method.post, data: { - 'USERNAME': SessionService.instance.username, 'VIDEOCOURSEWARE_ID': VIDEOCOURSEWARE_ID, 'CURRICULUM_ID': CURRICULUM_ID, 'CHAPTER_ID': CHAPTER_ID, @@ -366,6 +380,7 @@ U6Hzm1ninpWeE+awIDAQAB 'CLASSCURRICULUM_ID': CLASSCURRICULUM_ID, 'STUDENT_ID': STUDENT_ID, 'loading': false, + 'USER_NAME': SessionService.instance.username, 'CORPINFO_ID': SessionService.instance.corpinfoId, 'USER_ID': SessionService.instance.loginUserId, @@ -425,7 +440,7 @@ U6Hzm1ninpWeE+awIDAQAB static Future> setFeedBack(String backTitle,String backContent,String backType,String imgPaths) { return HttpManager().request( basePath, - '/app/feedback/upload', + '/app/feedback/add', method: Method.post, data: { "FEEDBACK_TITLE":backTitle, @@ -572,16 +587,16 @@ U6Hzm1ninpWeE+awIDAQAB final fileName = file.path.split(Platform.pathSeparator).last; return HttpManager().uploadFaceImage( - baseUrl: basePath, - path: '/app/user/editUserFaceV2', - fromData: { - 'CORPINFO_ID': SessionService.instance.corpinfoId, - 'USER_ID': SessionService.instance.loginUserId, - 'FFILE': await MultipartFile.fromFile( - file.path, - filename: fileName - ), - } + baseUrl: basePath, + path: '/app/user/editUserFaceV2', + fromData: { + 'CORPINFO_ID': SessionService.instance.corpinfoId, + 'USER_ID': SessionService.instance.loginUserId, + 'FFILE': await MultipartFile.fromFile( + file.path, + filename: fileName + ), + } ); } @@ -684,5 +699,59 @@ U6Hzm1ninpWeE+awIDAQAB } + + /// 获取隐患治理列表 + static Future> getHiddenTreatmentList(int type, int currentPage, + String startDate,String endDate,String level,String riskStandard,String state, + String departmentId,String correctiveDepartment,String isIndex,String keyWord) { + return HttpManager().request( + basePath, + '/app/hidden/listRiskStandard', + method: Method.post, + data: { + + //隐患记录 + "STARTTIME": startDate, + "ENDTIME": endDate, + "HIDDENLEVEL": level, + "HIDDEN_RISKSTANDARD": riskStandard, + "STATE": state, + "DEPARTMENT_ID": departmentId, + "RECTIFICATIONDEPT": correctiveDepartment, + + //已验收隐患 + "isIndex": isIndex, + + //通用 + "DISPOSESTATE": type, + "currentPage": currentPage, + "tm": DateTime.now().millisecondsSinceEpoch.toString(), + "showCount": "10", + "totalResult": "0", + + "USERDEPT": SessionService.instance.corpinfoId, + "SELFUSERID": SessionService.instance.loginUserId, + "HIDDENDESCR": keyWord, + "CORPINFO_ID": SessionService.instance.corpinfoId, + "USER_ID": SessionService.instance.loginUserId, + }, + ); + } + + /// 获取隐患治理列表 + static Future> getHiddenTreatmentListTree() { + return HttpManager().request( + basePath, + '/app/sys/listTree', + method: Method.post, + data: { + "DEPARTMENT_ID": SessionService.instance.corpinfoId, + "CORPINFO_ID": SessionService.instance.corpinfoId, + "USER_ID": SessionService.instance.loginUserId, + }, + ); + } + + } diff --git a/lib/pages/home/work/danger_wait_deawer.dart b/lib/pages/home/work/danger_wait_deawer.dart new file mode 100644 index 0000000..1cb19a6 --- /dev/null +++ b/lib/pages/home/work/danger_wait_deawer.dart @@ -0,0 +1,484 @@ +import 'dart:convert'; + +import 'package:flutter/material.dart'; +import 'package:intl/intl.dart'; +import 'package:qhd_prevention/customWidget/department_picker.dart'; +import '../../../customWidget/bottom_picker.dart'; +import '../../../tools/h_colors.dart'; +import '/customWidget/custom_button.dart'; +import '../../../tools/tools.dart'; + +/// 自定义抽屉 +class DangerWaitDrawer extends StatefulWidget { + const DangerWaitDrawer(this.treeJson, {super.key,required this.onClose}); + + final Function(String,String,String,String,String,String,String) onClose; // 回调函数 + final String treeJson; + + @override + _DangerWaitDrawerState createState() => _DangerWaitDrawerState(); +} + +class _DangerWaitDrawerState extends State { + + // 检查部门分类 id + String? _selectedCategoryId; + // 整改部门分类 id + String? _selectedDepartmentId; + + // 排查方式 + int _investigationMethodOption = -1; + int investigationMethodId=-1; + //隐患级别 + int _hazardLevelOption = -1; + // int hazardLevelId=-1; + List hazardLevelId = ["hiddenLevel0001", "hiddenLevel0002"]; + //风险等级 + int _dangerStatusOption = -1; + // int dangerStatusId=-1; + List dangerStatusId = ["1", "3", "4", "-1"]; + + // 新增：开始/结束时间 + DateTime? _startDate; + DateTime? _endDate; + String startTime=""; + String endTime=""; + + // 转换为List> + late List> departmentList ; + + @override + void initState() { + // TODO: implement initState + super.initState(); + // 解析JSON字符串 + List jsonList = json.decode(widget.treeJson); + + departmentList = List>.from(jsonList); + } + + + @override + Widget build(BuildContext context) { + + final List investigationMethod = ["风险排查隐患", "隐患排查隐患"]; + final List hazardLevel = [" 一般风险 ", " 重大风险 "]; + final List dangerStatus = ["未整改", "已整改", "已验收", "已过期"]; + + + + final List data = [ + Category( + id: '1', + title: '分类一1', + children: [ + Category(id: '1-1', title: '子项 1-1'), + Category(id: '1-2', title: '子项 1-2'), + ], + ), + Category(id: '2', title: '分类二'), + Category( + id: '3', + title: '分类三', + children: [ + Category(id: '3-1', title: '子项 3-1', children: [ + Category(id: '3-1-1', title: '子项 3-1-1'), + ]), + ], + ), + ]; + + + + + // 显示分类选择器 + void showCategoryPicker() { + showModalBottomSheet( + context: context, + isScrollControlled: true, + barrierColor: Colors.black54, + backgroundColor: Colors.transparent, + builder: (ctx) => DepartmentPicker( + data: data, + onSelected: (selectedId) { + setState(() { + _selectedCategoryId = selectedId; + }); + }, + ), + ); + } + + return SafeArea( + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 15), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: const [ + Text( + "高级查询", + style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold), + ), + ], + ), + const Divider(height: 12, color: Colors.grey), + + // 管控部门 + _buildDropdownBox( + "检查部门", + display: _selectedCategoryId ?? '请选择', + onTap: showCategoryPicker, + ), + const SizedBox(height: 6), + + // 风险点（单元） + _buildDropdownBox( + "整改部门", + display: '请选择', + onTap: () { + final choice = BottomPicker.show( + context, + items: ['未知'], + itemBuilder: (item) => Text(item, textAlign: TextAlign.center), + initialIndex: 0, + ); + if (choice != null) { + // 用户点击确定并选择了 choice + setState(() { + + }); + } + }, + ), + + const SizedBox(height: 12), + const Text( + "排查方式", + style: TextStyle(fontSize: 16, fontWeight: FontWeight.w500), + ), + const SizedBox(height: 6), + + // 风险等级：一行两个 + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: List.generate(investigationMethod.length, (idx) { + final bool selected = _investigationMethodOption == idx; + return GestureDetector( + onTap: (){ + setState(() { + _investigationMethodOption = idx; + + investigationMethodId=idx+1; + setResult(); + }); + } , + // => setState(() => _investigationMethodOption = idx), + child: Container( + margin: const EdgeInsets.only(bottom: 8), + padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 6), + decoration: BoxDecoration( + color: selected ? Colors.blue : Colors.transparent, + borderRadius: BorderRadius.circular(4), + border: Border.all(color: Colors.blue, width: 1), + ), + child: Text( + investigationMethod[idx], + style: TextStyle( + fontSize: 14, + color: selected ? Colors.white : Colors.blue, + ), + ), + ), + ); + }), + ), + + const SizedBox(height: 12), + const Text( + "隐患级别", + style: TextStyle(fontSize: 16, fontWeight: FontWeight.w500), + ), + const SizedBox(height: 6), + + // 风险等级：一行两个 + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: List.generate(hazardLevel.length, (idx) { + final bool selected = _hazardLevelOption == idx; + return GestureDetector( + onTap: (){ + setState(() { + _hazardLevelOption = idx; + + setResult(); + }); + } , + // onTap: () => setState(() => _hazardLevelOption = idx), + child: Container( + + margin: const EdgeInsets.only(bottom: 8), + padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 6), + decoration: BoxDecoration( + color: selected ? Colors.blue : Colors.transparent, + borderRadius: BorderRadius.circular(4), + border: Border.all(color: Colors.blue, width: 1), + ), + child: Text( + hazardLevel[idx], + style: TextStyle( + fontSize: 14, + color: selected ? Colors.white : Colors.blue, + ), + ), + ), + ); + }), + ), + + + const SizedBox(height: 12), + // 时间查询 + const Text( + "时间查询", + style: TextStyle(fontSize: 16, fontWeight: FontWeight.w500), + ), + const SizedBox(height: 6), + + // 开始时间 - 结束时间 —— // + Row( + children: [ + _buildDatePickerBox( + label: "开始时间", + date: _startDate, + onTap: _pickStartDate, + ), + const SizedBox(width: 5), + const Text("—", style: TextStyle(fontSize: 8)), + const SizedBox(width: 5), + _buildDatePickerBox( + label: "结束时间", + date: _endDate, + onTap: _pickEndDate, + ), + ], + ), + + + const SizedBox(height: 12), + const Text( + "风险等级", + style: TextStyle(fontSize: 16, fontWeight: FontWeight.w500), + ), + const SizedBox(height: 6), + + // 风险等级：一行一个 + Column( + children: List.generate(dangerStatus.length, (idx) { + final bool selected = _dangerStatusOption == idx; + return GestureDetector( + onTap: (){ + setState(() { + _dangerStatusOption = idx; + + setResult(); + }); + } , + // onTap: () => setState(() => _dangerStatusOption = idx), + child: Container( + width: double.infinity, + margin: const EdgeInsets.only(bottom: 8), + padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 6), + decoration: BoxDecoration( + color: selected ? Colors.blue : Colors.transparent, + borderRadius: BorderRadius.circular(4), + border: Border.all(color: Colors.blue, width: 1), + ), + child: Text( + dangerStatus[idx], + style: TextStyle( + fontSize: 14, + color: selected ? Colors.white : Colors.blue, + ), + ), + ), + ); + }), + ), + + const Spacer(), + Row( + children: [ + Expanded( + flex: 1, + child: CustomButton( + text: "重置", + backgroundColor: h_backGroundColor(), + textStyle: const TextStyle(color: Colors.black45), + onPressed: () { + setState(() { + + _selectedCategoryId = null; + _selectedDepartmentId=null; + + _investigationMethodOption = -1; + _hazardLevelOption = -1; + _dangerStatusOption = -1; + + _startDate = null; + _endDate = null; + + widget.onClose("","","","","","",""); + + }); + }, + ), + ), + const SizedBox(width: 12), + Expanded( + flex: 2, + child: CustomButton( + text: "完成", + backgroundColor: Colors.blue, + onPressed: () { + // TODO: 提交筛选条件 + Navigator.pop(context); // 关闭加载对话框 + }, + ), + ), + ], + ), + ], + ), + ), + ); + } + + Widget _buildDropdownBox(String title, + {required String display, required VoidCallback onTap}) { + return GestureDetector( + onTap: onTap, + child: Container( + height: 36, + padding: const EdgeInsets.symmetric(horizontal: 12), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(4), + border: Border.all(color: Colors.grey.shade400), + color: Colors.white, + ), + child: Row( + children: [ + Text(title, style: const TextStyle(fontSize: 14)), + const Spacer(), + Row( + children: [ + Text(display), + const Icon(Icons.arrow_drop_down, color: Colors.grey), + ], + ), + ], + ), + ), + ); + + } + + Future _pickStartDate() async { + final now = DateTime.now(); + final picked = await showDatePicker( + context: context, + initialDate: _startDate ?? now, + firstDate: DateTime(now.year - 5), + lastDate: DateTime(now.year + 5), + ); + if (picked != null) { + setState(() { + + _startDate = picked; + final dateFormat = DateFormat('yyyy-MM-dd'); + startTime=dateFormat.format(picked); + + // 保证开始 <= 结束 + if (_endDate != null && _endDate!.isBefore(picked)) { + _endDate = null; + } + + + setResult(); + + }); + } + } + + Future _pickEndDate() async { + final now = DateTime.now(); + final initial = _endDate ?? + (_startDate != null && _startDate!.isAfter(now) + ? _startDate! + : now); + final picked = await showDatePicker( + context: context, + initialDate: initial, + firstDate: _startDate ?? DateTime(now.year - 5), + lastDate: DateTime(now.year + 5), + ); + if (picked != null) { + setState(() { + _endDate = picked; + + final dateFormat = DateFormat('yyyy-MM-dd'); + endTime=dateFormat.format(picked); + + setResult(); + + }); + } + } + + Widget _buildDatePickerBox({ + required String label, + DateTime? date, + required VoidCallback onTap, + }) { + final display = date != null + ? "${date.year.toString().padLeft(4, '0')}-${date.month.toString().padLeft(2, '0')}-${date.day.toString().padLeft(2, '0')}" + : label; + return Expanded( + child: GestureDetector( + onTap: onTap, + child: Container( + height: 35, + padding: const EdgeInsets.symmetric(horizontal: 5), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(4), + border: Border.all(color: Colors.grey.shade400), + color: Colors.white, + ), + child: Row( + children: [ + const Icon(Icons.calendar_today, size: 18, color: Colors.grey), + const SizedBox(width: 6), + Text(display, style: const TextStyle(fontSize: 14, color: Colors.black38)), + ], + ), + ), + ), + ); + } + + void setResult(){ + widget.onClose( + _selectedCategoryId ?? "", + _selectedDepartmentId ?? "", + _investigationMethodOption!=-1?investigationMethodId.toString():"", + _hazardLevelOption!=-1?hazardLevelId[_hazardLevelOption]:"", + _dangerStatusOption!=-1?dangerStatusId[_dangerStatusOption]:"", + _startDate!=null?startTime:"", + _endDate!=null?endTime:"", + ); // 触发回调 + } + +} + + diff --git a/lib/pages/home/work/danger_wait_list_page.dart b/lib/pages/home/work/danger_wait_list_page.dart index 62054ae..d29b0bf 100644 --- a/lib/pages/home/work/danger_wait_list_page.dart +++ b/lib/pages/home/work/danger_wait_list_page.dart @@ -5,15 +5,18 @@ import 'package:qhd_prevention/pages/home/work/danger_repair_page.dart'; import 'package:qhd_prevention/pages/my_appbar.dart'; import 'package:qhd_prevention/tools/h_colors.dart'; import 'package:qhd_prevention/tools/tools.dart'; +import '../../../http/ApiService.dart'; import '../../app/application_page.dart'; import '/customWidget/search_bar_widget.dart'; +import 'danger_wait_deawer.dart'; enum DangerType { + + ristRecord("隐患记录", "隐患记录-详情"), wait("待整改隐患", "隐患整改"), expired("超期未整改", "超期未整改-详情"), waitAcceptance("隐患验收", "隐患验收"), acceptance("已验收隐患", "已验收隐患"), - ristRecord("隐患记录", "隐患记录-详情"), acceptanced("已验收隐患", "隐患记录-详情"); final String displayName; @@ -31,16 +34,16 @@ class DangerWaitListPage extends StatefulWidget { } class _DangerWaitListPageState extends State { - // 模拟数据 - final List> _dataInfos = List.generate(10, (i) { - bool read = i % 3 == 0; - return { - 'title': '测试数据标题标题 ${i + 1}', - 'label1': '2025-06-${10 + i} 12:3${i}', - 'label2': '2025-06-${1 + i} 2:1${i}', - 'level': getRandomWithNum(1, 2), - }; - }); + + int _page = 1; + String searchKey=""; + int _totalPage=1; + late List _list = []; + bool _isLoading = false; + bool _hasMore = true; + + String treeJson=""; + // 隐患等级颜色 final List _fxColors = [ @@ -57,27 +60,34 @@ class _DangerWaitListPageState extends State { void initState() { super.initState(); + getListData(widget.appItem,false,""); + _getListTree(); + + } + + void getListData(int type,bool addList,String keyWord){ switch(widget.appItem ){ - case 1: - + case 1://隐患记录 + _getDangerRecord(-1,_page,"","","","","","","","",keyWord,addList); break; - case 2: - + case 2://待整改隐患 + _getDangerRecord(2,_page,"","","","","","","","",keyWord,addList); break; - case 3: - + case 3://超期未整改 + _getDangerRecord(5,_page,"","","","","-1","","","",keyWord,addList); break; - case 4: - + case 4://隐患验收 + _getDangerRecord(3,_page,"","","","","","3","","",keyWord,addList); break; - case 5: - + case 5://已验收隐患 + _getDangerRecord(4,_page,"","","","","","4","","1",keyWord,addList); break; } - } + + @override Widget build(BuildContext context) { // 取屏幕宽度 @@ -86,11 +96,45 @@ class _DangerWaitListPageState extends State { return Scaffold( key: _scaffoldKey, // ② 绑定 key appBar: MyAppbar( - title: widget.dangerType.displayName + title: widget.dangerType.displayName, + actions: [ + TextButton( + onPressed: () { + // 查询 右侧弹窗页面 + _scaffoldKey.currentState?.openEndDrawer(); + }, + child: Text( + "查询", + style: TextStyle(color: Colors.white, fontSize: 16), + ), + ), + ], + ), + + //弹窗 + endDrawer: Drawer( + // 用 Container 限制宽度为屏幕的 3/5 + child: Container( + width: screenWidth * 3 / 5, + color: Colors.white, + child: DangerWaitDrawer( treeJson, + onClose: (String selectedCategoryId,String selectedDepartmentId,String investigationMethodOption, + String hazardLevelOption,String dangerStatusOption,String startDate,String endDate) { + + _getDangerRecord(-1,_page,startDate,endDate,hazardLevelOption,investigationMethodOption, + dangerStatusOption,"","","",searchKey,false); + + }, + ), + ), ), body: SafeArea( - child: _vcDetailWidget()), + child: NotificationListener( + onNotification: _onScroll, + child:_vcDetailWidget() + ) + ), backgroundColor: Colors.white, ); } @@ -104,6 +148,9 @@ class _DangerWaitListPageState extends State { controller: _searchController, onSearch: (keyboard) { // 输入请求接口 + _page=1; + searchKey=keyboard; + getListData(widget.appItem,false,keyboard); }, ), ), @@ -112,13 +159,15 @@ class _DangerWaitListPageState extends State { color: h_backGroundColor(), ), Expanded( - child: ListView.separated( - separatorBuilder: (_, __) => const Divider(height: 1), - itemCount: _dataInfos.length, - itemBuilder: (context, index) { - final item = _dataInfos[index]; - return _fxitemCell(item); - }, + child: _list.isEmpty + ? Center(child: Text('暂无数据')) + : ListView.separated( + separatorBuilder: (_, __) => const Divider(height: 1), + itemCount: _list.length, + itemBuilder: (context, index) { + final item = _list[index]; + return _fxitemCell(item); + }, ), ), ], @@ -126,9 +175,15 @@ class _DangerWaitListPageState extends State { } Widget _fxitemCell(final item) { - int level = item['level'] as int; - // 确保level在有效范围内 (1-4) - level = level.clamp(1, 4) - 1; + // int level = item['level'] as int; + // // 确保level在有效范围内 (1-4) + // level = level.clamp(1, 4) - 1; + int level =1; + if('hiddenLevel0001'==item['HIDDENLEVEL']){ + level =1; + }else{ + level =0; + } // 使用GestureDetector包裹整个列表项以添加点击事件 return GestureDetector( @@ -158,7 +213,7 @@ class _DangerWaitListPageState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - item['title'] ?? '', + item['HIDDENDESCR'] ?? '', style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold), maxLines: 1, overflow: TextOverflow.ellipsis, @@ -175,12 +230,13 @@ class _DangerWaitListPageState extends State { // ), SizedBox(height: 5), Text( - item['label2'] ?? '', + // item['label2'] ?? '', + _getSourceDangers(item), style: TextStyle(fontSize: 14, color: Colors.grey), ), SizedBox(height: 5), Text( - item['label2'] ?? '', + item['CREATORNAME'] ?? '', style: TextStyle(fontSize: 14, color: Colors.grey), ), ], @@ -222,7 +278,7 @@ class _DangerWaitListPageState extends State { ), SizedBox(height: 20), // 添加间距 Row(children: [ - Text("2025-1-2",style: TextStyle(fontSize: 12, color: Colors.grey), + Text(item['RECTIFICATIONTIME'] ?? '',style: TextStyle(fontSize: 12, color: Colors.grey), ) , SizedBox(width: 20,)],), ], @@ -234,7 +290,130 @@ class _DangerWaitListPageState extends State { ), ); } + + + Future _getDangerRecord(int type, int currentPage, + String startDate,String endDate,String level,String riskStandard,String state, + String departmentId,String correctiveDepartment, + String isIndex,String keyWord,bool loadMore) async { + try { + if (_isLoading) return; + _isLoading = true; + + + final result = await ApiService.getHiddenTreatmentList( type, currentPage, + startDate, endDate, level, riskStandard, state, + departmentId, correctiveDepartment, isIndex, keyWord); + + if (result['result'] == 'success') { + + _totalPage =result["page"]['totalPage'] ?? 1; + final List newList = result['varList'] ?? []; + // setState(() { + // _list.addAll(newList); + // }); + + setState(() { + if (loadMore) { + _list.addAll(newList); + } else { + _list = newList; + } + _hasMore = _page < _totalPage; + // if (_hasMore) _page++; + }); + + }else{ + _showMessage('加载数据失败'); + } + + } catch (e) { + // 出错时可以 Toast 或者在页面上显示错误状态 + print('加载数据失败：$e'); + } finally { + // if (!loadMore) LoadingDialogHelper.hide(context); + _isLoading = false; + } + } + + bool _onScroll(ScrollNotification n) { + if (n.metrics.pixels > n.metrics.maxScrollExtent - 100 && + _hasMore && !_isLoading) { + + _page++; + getListData(widget.appItem,true,""); + // switch(widget.appItem){ + // case 1://隐患记录 + // _getDangerRecord(-1,_page,"","","","","","","","","",true); + // break; + // case 2://待整改隐患 + // _getDangerRecord(2,_page,"","","","","","","","","",true); + // break; + // case 3://超期未整改 + // _getDangerRecord(5,_page,"","","","","","-1","","","",true); + // break; + // case 4://隐患验收 + // _getDangerRecord(3,_page,"","","","","","3","","","",true); + // break; + // case 5://已验收隐患 + // _getDangerRecord(4,_page,"","","","","","4","","1","",true); + // break; + + // } + + // _getStudyList(loadMore: true); + } + return false; + } + + + Future _getListTree() async { + try { + if (_isLoading) return; + _isLoading = true; + + + final result = await ApiService.getHiddenTreatmentListTree(); + + if (result['result'] == 'success') { + + setState(() { + treeJson= result['zTreeNodes']; + }); + + }else{ + _showMessage('加载数据失败'); + } + } catch (e) { + // 出错时可以 Toast 或者在页面上显示错误状态 + print('加载数据失败：$e'); + } + } + + String _getSourceDangers(final item) { + String type = item["SOURCE"]; + if("1"==type){ + return "隐患来源：隐患快报"; + }else if("2"==type){ + return "隐患来源：隐患排查清单检查"; + }else if("3"==type){ + return "隐患来源：标准排查清单检查"; + }else if("4"==type){ + return "隐患来源：专项检查"; + }else{ + return "隐患来源：安全检查"; + } + + } + + void _showMessage(String msg) { + ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(msg))); + } + + } + + diff --git a/lib/pages/mine/mine_feedback_page.dart b/lib/pages/mine/mine_feedback_page.dart index eaac566..d60e981 100644 --- a/lib/pages/mine/mine_feedback_page.dart +++ b/lib/pages/mine/mine_feedback_page.dart @@ -186,6 +186,10 @@ class _FeedbackPageState extends State { mediaType: MediaType.image, onChanged: (files) { // 上传 files 到服务器 + _images.clear(); + for(int i=0;i { } // 提交反馈 - void _submitFeedback() { + Future _submitFeedback() async { final title = _titleController.text.trim(); final text = _descriptionController.text.trim(); @@ -308,7 +312,7 @@ class _FeedbackPageState extends State { String imagePaths=""; for(int i=0;i<_images.length;i++){ - String imagePath=_reloadFeedBack(_images[i]) as String; + String imagePath=await _reloadFeedBack(_images[i]) ; if(0==i){ imagePaths=imagePath; @@ -369,7 +373,6 @@ class _FeedbackPageState extends State { final raw = await ApiService.setFeedBack(title,text,num,imagePaths); if (raw['result'] == 'success') { - Navigator.pop(context); // 关闭加载对话框 _showMessage('反馈提交成功'); diff --git a/pubspec.lock b/pubspec.lock index 4b546b2..5b00ffa 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -6,7 +6,7 @@ packages: description: name: args sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04 - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "2.7.0" asn1lib: @@ -21,16 +21,16 @@ packages: dependency: transitive description: name: async - sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" + url: "https://pub.flutter-io.cn" source: hosted - version: "2.12.0" + version: "2.13.0" boolean_selector: dependency: transitive description: name: boolean_selector sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.2" camera: @@ -78,7 +78,7 @@ packages: description: name: characters sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "1.4.0" clock: @@ -86,7 +86,7 @@ packages: description: name: clock sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.2" collection: @@ -94,7 +94,7 @@ packages: description: name: collection sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "1.19.1" connectivity_plus: @@ -102,7 +102,7 @@ packages: description: name: connectivity_plus sha256: "051849e2bd7c7b3bc5844ea0d096609ddc3a859890ec3a9ac4a65a2620cc1f99" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "6.1.4" connectivity_plus_platform_interface: @@ -110,7 +110,7 @@ packages: description: name: connectivity_plus_platform_interface sha256: "42657c1715d48b167930d5f34d00222ac100475f73d10162ddf43e714932f204" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.1" convert: @@ -126,7 +126,7 @@ packages: description: name: cross_file sha256: "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "0.3.4+2" crypto: @@ -134,7 +134,7 @@ packages: description: name: crypto sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "3.0.6" csslib: @@ -142,7 +142,7 @@ packages: description: name: csslib sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.2" cupertino_icons: @@ -150,7 +150,7 @@ packages: description: name: cupertino_icons sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6 - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.8" dbus: @@ -158,7 +158,7 @@ packages: description: name: dbus sha256: "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "0.7.11" dio: @@ -190,7 +190,7 @@ packages: description: name: extended_image sha256: f6cbb1d798f51262ed1a3d93b4f1f2aa0d76128df39af18ecb77fa740f88b2e0 - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "10.0.1" extended_image_library: @@ -198,23 +198,23 @@ packages: description: name: extended_image_library sha256: "1f9a24d3a00c2633891c6a7b5cab2807999eb2d5b597e5133b63f49d113811fe" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "5.0.1" fake_async: dependency: transitive description: name: fake_async - sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" + url: "https://pub.flutter-io.cn" source: hosted - version: "1.3.2" + version: "1.3.3" ffi: dependency: transitive description: name: ffi sha256: "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.4" file: @@ -222,7 +222,7 @@ packages: description: name: file sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "7.0.1" file_selector_linux: @@ -230,7 +230,7 @@ packages: description: name: file_selector_linux sha256: "54cbbd957e1156d29548c7d9b9ec0c0ebb6de0a90452198683a7d23aed617a33" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "0.9.3+2" file_selector_macos: @@ -238,7 +238,7 @@ packages: description: name: file_selector_macos sha256: "8c9250b2bd2d8d4268e39c82543bacbaca0fda7d29e0728c3c4bbb7c820fd711" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "0.9.4+3" file_selector_platform_interface: @@ -246,7 +246,7 @@ packages: description: name: file_selector_platform_interface sha256: a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "2.6.2" file_selector_windows: @@ -254,7 +254,7 @@ packages: description: name: file_selector_windows sha256: "320fcfb6f33caa90f0b58380489fc5ac05d99ee94b61aa96ec2bff0ba81d3c2b" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "0.9.3+4" flutter: @@ -267,7 +267,7 @@ packages: description: name: flutter_html sha256: "38a2fd702ffdf3243fb7441ab58aa1bc7e6922d95a50db76534de8260638558d" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "3.0.0" flutter_lints: @@ -275,7 +275,7 @@ packages: description: name: flutter_lints sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "5.0.0" flutter_plugin_android_lifecycle: @@ -283,7 +283,7 @@ packages: description: name: flutter_plugin_android_lifecycle sha256: f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.28" flutter_test: @@ -309,7 +309,7 @@ packages: description: name: html sha256: "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "0.15.6" http: @@ -317,7 +317,7 @@ packages: description: name: http sha256: "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "1.4.0" http_client_helper: @@ -325,7 +325,7 @@ packages: description: name: http_client_helper sha256: "8a9127650734da86b5c73760de2b404494c968a3fd55602045ffec789dac3cb1" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "3.0.0" http_parser: @@ -333,7 +333,7 @@ packages: description: name: http_parser sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "4.1.2" image_picker: @@ -341,23 +341,23 @@ packages: description: name: image_picker sha256: "021834d9c0c3de46bf0fe40341fa07168407f694d9b2bb18d532dc1261867f7a" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.2" image_picker_android: dependency: transitive description: name: image_picker_android - sha256: "317a5d961cec5b34e777b9252393f2afbd23084aa6e60fcf601dcf6341b9ebeb" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + sha256: "6fae381e6af2bbe0365a5e4ce1db3959462fa0c4d234facf070746024bb80c8d" + url: "https://pub.flutter-io.cn" source: hosted - version: "0.8.12+23" + version: "0.8.12+24" image_picker_for_web: dependency: transitive description: name: image_picker_for_web sha256: "717eb042ab08c40767684327be06a5d8dbb341fe791d514e4b92c7bbe1b7bb83" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "3.0.6" image_picker_ios: @@ -365,7 +365,7 @@ packages: description: name: image_picker_ios sha256: "05da758e67bc7839e886b3959848aa6b44ff123ab4b28f67891008afe8ef9100" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "0.8.12+2" image_picker_linux: @@ -373,7 +373,7 @@ packages: description: name: image_picker_linux sha256: "34a65f6740df08bbbeb0a1abd8e6d32107941fd4868f67a507b25601651022c9" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "0.2.1+2" image_picker_macos: @@ -381,7 +381,7 @@ packages: description: name: image_picker_macos sha256: "1b90ebbd9dcf98fb6c1d01427e49a55bd96b5d67b8c67cf955d60a5de74207c1" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "0.2.1+2" image_picker_platform_interface: @@ -389,7 +389,7 @@ packages: description: name: image_picker_platform_interface sha256: "886d57f0be73c4b140004e78b9f28a8914a09e50c2d816bdd0520051a71236a0" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "2.10.1" image_picker_windows: @@ -397,7 +397,7 @@ packages: description: name: image_picker_windows sha256: "6ad07afc4eb1bc25f3a01084d28520496c4a3bb0cb13685435838167c9dcedeb" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "0.2.1+1" intl: @@ -405,7 +405,7 @@ packages: description: name: intl sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "0.20.2" js: @@ -413,23 +413,23 @@ packages: description: name: js sha256: "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "0.7.2" leak_tracker: dependency: transitive description: name: leak_tracker - sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0" + url: "https://pub.flutter-io.cn" source: hosted - version: "10.0.8" + version: "10.0.9" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "3.0.9" leak_tracker_testing: @@ -437,7 +437,7 @@ packages: description: name: leak_tracker_testing sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "3.0.1" lints: @@ -445,7 +445,7 @@ packages: description: name: lints sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7 - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "5.1.1" list_counter: @@ -453,7 +453,7 @@ packages: description: name: list_counter sha256: c447ae3dfcd1c55f0152867090e67e219d42fe6d4f2807db4bbe8b8d69912237 - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.2" matcher: @@ -461,7 +461,7 @@ packages: description: name: matcher sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "0.12.17" material_color_utilities: @@ -469,7 +469,7 @@ packages: description: name: material_color_utilities sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "0.11.1" meta: @@ -477,7 +477,7 @@ packages: description: name: meta sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "1.16.0" mime: @@ -485,7 +485,7 @@ packages: description: name: mime sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.0" mobile_scanner: @@ -493,7 +493,7 @@ packages: description: name: mobile_scanner sha256: "54005bdea7052d792d35b4fef0f84ec5ddc3a844b250ecd48dc192fb9b4ebc95" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "7.0.1" nested: @@ -501,7 +501,7 @@ packages: description: name: nested sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.0" nm: @@ -509,7 +509,7 @@ packages: description: name: nm sha256: "2c9aae4127bdc8993206464fcc063611e0e36e72018696cd9631023a31b24254" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "0.5.0" package_info_plus: @@ -517,7 +517,7 @@ packages: description: name: package_info_plus sha256: "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "8.3.0" package_info_plus_platform_interface: @@ -525,7 +525,7 @@ packages: description: name: package_info_plus_platform_interface sha256: "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "3.2.0" path: @@ -533,7 +533,7 @@ packages: description: name: path sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "1.9.1" path_provider: @@ -541,7 +541,7 @@ packages: description: name: path_provider sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.5" path_provider_android: @@ -549,7 +549,7 @@ packages: description: name: path_provider_android sha256: d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9 - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "2.2.17" path_provider_foundation: @@ -557,7 +557,7 @@ packages: description: name: path_provider_foundation sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "2.4.1" path_provider_linux: @@ -565,7 +565,7 @@ packages: description: name: path_provider_linux sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "2.2.1" path_provider_platform_interface: @@ -573,7 +573,7 @@ packages: description: name: path_provider_platform_interface sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.2" path_provider_windows: @@ -581,7 +581,7 @@ packages: description: name: path_provider_windows sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "2.3.0" petitparser: @@ -589,7 +589,7 @@ packages: description: name: petitparser sha256: "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "6.1.0" photo_manager: @@ -597,7 +597,7 @@ packages: description: name: photo_manager sha256: a0d9a7a9bc35eda02d33766412bde6d883a8b0acb86bbe37dac5f691a0894e8a - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "3.7.1" photo_manager_image_provider: @@ -605,7 +605,7 @@ packages: description: name: photo_manager_image_provider sha256: b6015b67b32f345f57cf32c126f871bced2501236c405aafaefa885f7c821e4f - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "2.2.0" photo_view: @@ -613,7 +613,7 @@ packages: description: name: photo_view sha256: "1fc3d970a91295fbd1364296575f854c9863f225505c28c46e0a03e48960c75e" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "0.15.0" platform: @@ -621,7 +621,7 @@ packages: description: name: platform sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "3.1.6" plugin_platform_interface: @@ -629,7 +629,7 @@ packages: description: name: plugin_platform_interface sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.8" pointycastle: @@ -645,7 +645,7 @@ packages: description: name: provider sha256: "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "6.1.5" shared_preferences: @@ -653,7 +653,7 @@ packages: description: name: shared_preferences sha256: "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "2.5.3" shared_preferences_android: @@ -661,7 +661,7 @@ packages: description: name: shared_preferences_android sha256: "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "2.4.10" shared_preferences_foundation: @@ -669,7 +669,7 @@ packages: description: name: shared_preferences_foundation sha256: "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "2.5.4" shared_preferences_linux: @@ -677,7 +677,7 @@ packages: description: name: shared_preferences_linux sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "2.4.1" shared_preferences_platform_interface: @@ -685,7 +685,7 @@ packages: description: name: shared_preferences_platform_interface sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "2.4.1" shared_preferences_web: @@ -693,7 +693,7 @@ packages: description: name: shared_preferences_web sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019 - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "2.4.3" shared_preferences_windows: @@ -701,7 +701,7 @@ packages: description: name: shared_preferences_windows sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "2.4.1" simple_gesture_detector: @@ -709,7 +709,7 @@ packages: description: name: simple_gesture_detector sha256: ba2cd5af24ff20a0b8d609cec3f40e5b0744d2a71804a2616ae086b9c19d19a3 - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "0.2.1" sky_engine: @@ -722,7 +722,7 @@ packages: description: name: source_span sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "1.10.1" stack_trace: @@ -730,7 +730,7 @@ packages: description: name: stack_trace sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "1.12.1" stream_channel: @@ -738,7 +738,7 @@ packages: description: name: stream_channel sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.4" stream_transform: @@ -754,7 +754,7 @@ packages: description: name: string_scanner sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "1.4.1" table_calendar: @@ -762,7 +762,7 @@ packages: description: name: table_calendar sha256: "0c0c6219878b363a2d5f40c7afb159d845f253d061dc3c822aa0d5fe0f721982" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "3.2.0" term_glyph: @@ -770,7 +770,7 @@ packages: description: name: term_glyph sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "1.2.2" test_api: @@ -778,7 +778,7 @@ packages: description: name: test_api sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "0.7.4" typed_data: @@ -786,7 +786,7 @@ packages: description: name: typed_data sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "1.4.0" vector_math: @@ -794,7 +794,7 @@ packages: description: name: vector_math sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.4" video_player: @@ -802,7 +802,7 @@ packages: description: name: video_player sha256: "0d55b1f1a31e5ad4c4967bfaa8ade0240b07d20ee4af1dfef5f531056512961a" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "2.10.0" video_player_android: @@ -810,7 +810,7 @@ packages: description: name: video_player_android sha256: "4a5135754a62dbc827a64a42ef1f8ed72c962e191c97e2d48744225c2b9ebb73" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "2.8.7" video_player_avfoundation: @@ -818,7 +818,7 @@ packages: description: name: video_player_avfoundation sha256: "9fedd55023249f3a02738c195c906b4e530956191febf0838e37d0dac912f953" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "2.8.0" video_player_platform_interface: @@ -826,7 +826,7 @@ packages: description: name: video_player_platform_interface sha256: cf2a1d29a284db648fd66cbd18aacc157f9862d77d2cc790f6f9678a46c1db5a - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "6.4.0" video_player_web: @@ -834,7 +834,7 @@ packages: description: name: video_player_web sha256: "9f3c00be2ef9b76a95d94ac5119fb843dca6f2c69e6c9968f6f2b6c9e7afbdeb" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "2.4.0" visibility_detector: @@ -842,23 +842,23 @@ packages: description: name: visibility_detector sha256: dd5cc11e13494f432d15939c3aa8ae76844c42b723398643ce9addb88a5ed420 - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "0.4.0+2" vm_service: dependency: transitive description: name: vm_service - sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02 + url: "https://pub.flutter-io.cn" source: hosted - version: "14.3.1" + version: "15.0.0" web: dependency: transitive description: name: web sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.1" webview_flutter: @@ -866,23 +866,23 @@ packages: description: name: webview_flutter sha256: c3e4fe614b1c814950ad07186007eff2f2e5dd2935eba7b9a9a1af8e5885f1ba - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "4.13.0" webview_flutter_android: dependency: transitive description: name: webview_flutter_android - sha256: "769f34fc9855f7d7789b786b79b7c37a60e92ff08f71e3a429208d7f5b81d944" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + sha256: "9573ad97890d199ac3ab32399aa33a5412163b37feb573eb5b0a76b35e9ffe41" + url: "https://pub.flutter-io.cn" source: hosted - version: "4.8.0" + version: "4.8.2" webview_flutter_platform_interface: dependency: transitive description: name: webview_flutter_platform_interface sha256: f0dc2dc3a2b1e3a6abdd6801b9355ebfeb3b8f6cde6b9dc7c9235909c4a1f147 - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "2.13.1" webview_flutter_wkwebview: @@ -890,7 +890,7 @@ packages: description: name: webview_flutter_wkwebview sha256: "71523b9048cf510cfa1fd4e0a3fa5e476a66e0884d5df51d59d5023dba237107" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "3.22.1" wechat_assets_picker: @@ -898,7 +898,7 @@ packages: description: name: wechat_assets_picker sha256: cafe3d32564ed3cacf9822f251941f7b44fe9885c17c8de4fca7e939a459e1ef - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "9.5.1" wechat_picker_library: @@ -906,23 +906,23 @@ packages: description: name: wechat_picker_library sha256: a42e09cb85b15fc9410f6a69671371cc60aa99c4a1f7967f6593a7f665f6f47a - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.5" win32: dependency: transitive description: name: win32 - sha256: "329edf97fdd893e0f1e3b9e88d6a0e627128cc17cc316a8d67fda8f1451178ba" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + sha256: "66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03" + url: "https://pub.flutter-io.cn" source: hosted - version: "5.13.0" + version: "5.14.0" xdg_directories: dependency: transitive description: name: xdg_directories sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.0" xml: @@ -930,9 +930,9 @@ packages: description: name: xml sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226 - url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/" + url: "https://pub.flutter-io.cn" source: hosted version: "6.5.0" sdks: - dart: ">=3.7.0 <4.0.0" + dart: ">=3.8.0 <4.0.0" flutter: ">=3.29.0"