From e743c5554148f237f9d28aa84f6b20025cd5c2e3 Mon Sep 17 00:00:00 2001 From: zhangmeng <494089941@qq.com> Date: Sun, 28 Mar 2021 18:23:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E5=B7=A1=E6=A3=80?= =?UTF-8?q?=E7=82=B9=E4=BF=A1=E6=81=AF=E5=A1=AB=E5=86=99=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=20=E5=B7=A1=E6=A3=80=E7=82=B9=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=8F=90=E4=BA=A4=E6=88=90=E5=8A=9F=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=20=E5=B7=A1=E6=A3=80=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=80=9A=E7=94=A8=E7=BB=84=E4=BB=B6=20=E6=B7=BB=E5=8A=A0=20?= =?UTF-8?q?=E7=85=A7=E7=89=87=E9=80=89=E6=8B=A9=E7=BB=84=E4=BB=B6=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E6=96=B9=E5=BD=A2=E5=8D=95=E9=80=89?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=BB=84=E4=BB=B6=20=E6=B7=BB=E5=8A=A0=20?= =?UTF-8?q?=E8=99=9A=E7=BA=BF=E8=BE=B9=E6=A1=86=E4=BE=9D=E8=B5=96=E5=BA=93?= =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=20=E9=83=A8=E5=88=86icon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/inspection/ic_date.png | Bin 0 -> 530 bytes assets/inspection/ic_inspection_name.png | Bin 0 -> 764 bytes assets/inspection/ic_station.png | Bin 0 -> 1078 bytes assets/inspection/ic_way.png | Bin 0 -> 663 bytes assets/manage/ic_image.png | Bin 0 -> 2132 bytes .../inspection_point_input_page.dart | 419 ++++++++++++++++++ .../inspection_point_submit_page.dart | 58 +++ .../inspection_manage/inspection_utils.dart | 24 + .../app_widgets/aku_pick_image_widget.dart | 53 +++ .../app_widgets/aku_single_check_button.dart | 41 ++ pubspec.lock | 21 + pubspec.yaml | 2 +- 12 files changed, 617 insertions(+), 1 deletion(-) create mode 100644 assets/inspection/ic_date.png create mode 100644 assets/inspection/ic_inspection_name.png create mode 100644 assets/inspection/ic_station.png create mode 100644 assets/inspection/ic_way.png create mode 100644 assets/manage/ic_image.png create mode 100644 lib/ui/manage_pages/inspection_manage/inspection_point_input_page.dart create mode 100644 lib/ui/manage_pages/inspection_manage/inspection_point_submit_page.dart create mode 100644 lib/ui/manage_pages/inspection_manage/inspection_utils.dart create mode 100644 lib/ui/widgets/app_widgets/aku_pick_image_widget.dart create mode 100644 lib/ui/widgets/app_widgets/aku_single_check_button.dart diff --git a/assets/inspection/ic_date.png b/assets/inspection/ic_date.png new file mode 100644 index 0000000000000000000000000000000000000000..c27d6290e95e44a8049d4596e265d00cbe88ab86 GIT binary patch literal 530 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 KMNUMnLSTYHs_V)C literal 0 HcmV?d00001 diff --git a/lib/ui/manage_pages/inspection_manage/inspection_point_input_page.dart b/lib/ui/manage_pages/inspection_manage/inspection_point_input_page.dart new file mode 100644 index 0000000..22d60da --- /dev/null +++ b/lib/ui/manage_pages/inspection_manage/inspection_point_input_page.dart @@ -0,0 +1,419 @@ +import 'dart:io'; + +import 'package:aku_community_manager/models/manager/inspection/inspection_detail_model.dart'; +import 'package:aku_community_manager/models/manager/inspection/inspection_point_model.dart'; +import 'package:aku_community_manager/style/app_style.dart'; +import 'package:aku_community_manager/ui/manage_pages/inspection_manage/inspection_utils.dart'; +import 'package:aku_community_manager/ui/widgets/app_widgets/aku_pick_image_widget.dart'; +import 'package:aku_community_manager/ui/widgets/app_widgets/aku_single_check_button.dart'; +import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; +import 'package:common_utils/common_utils.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:velocity_x/velocity_x.dart'; + +class InspectionPointInputPage extends StatefulWidget { + final bool hasScan; + final InspectionDetailModel detailModel; + final int inspectionStatus; + final InspectionPointModel pointModel; + InspectionPointInputPage( + {Key key, + this.hasScan, + this.detailModel, + this.inspectionStatus, + this.pointModel}) + : super(key: key); + + @override + _InspectionPointInputPageState createState() => + _InspectionPointInputPageState(); +} + +class _InspectionPointInputPageState extends State { + TextEditingController _cleaningExtraController; + TextEditingController _meterExtraController; + TextEditingController _meterCountContrlller; + int _cleaningStatus; + int _meterStatus; + File _selfPhoto; + File _scenePhoto; + @override + void initState() { + super.initState(); + _cleaningExtraController = TextEditingController(); + _meterExtraController = TextEditingController(); + _meterCountContrlller = TextEditingController(); + } + + @override + void dispose() { + _cleaningExtraController?.dispose(); + _meterExtraController?.dispose(); + _meterCountContrlller?.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + return AkuScaffold( + title: '巡检点', + body: ListView( + children: [ + 16.w.heightBox, + _inspectionHeadCard(), + 16.w.heightBox, + _cleaningCard(), + _meterCard(), + _selfPhotoCard(), + _scenePhotoCard(), + ], + ), + ); + } + + Widget _scenePhotoCard() { + return Column( + children: [ + Row( + children: [ + '3.巡更人员自拍人脸'.text.color(kTextPrimaryColor).size(32.sp).bold.make() + ], + ), + 32.w.heightBox, + AkuPickImageWidget( + onChanged: (file) { + _scenePhoto = file; + }, + ), + ], + ).box.color(Colors.white).make(); + } + + Widget _selfPhotoCard() { + return Column( + children: [ + Row( + children: [ + '3.巡更人员自拍人脸'.text.color(kTextPrimaryColor).size(32.sp).bold.make() + ], + ), + 32.w.heightBox, + AkuPickImageWidget( + onChanged: (file) { + _selfPhoto = file; + }, + ), + ], + ).box.color(Colors.white).make(); + } + + Widget _meterCard() { + return Column( + children: [ + Row( + children: [ + '2.检查小区南门抄表数据'.text.color(kTextPrimaryColor).size(32.sp).make() + ], + ), + 32.w.heightBox, + Row( + children: [ + AkuSingleCheckButton( + text: '正常', + value: 0, + gropValue: _meterStatus, + onPressed: () { + _cleaningStatus = 0; + }, + ), + 80.w.widthBox, + AkuSingleCheckButton( + text: '异常', + value: 0, + gropValue: _meterStatus, + onPressed: () { + _cleaningStatus = 1; + }, + ), + ], + ), + 36.w.heightBox, + Row( + children: [ + '抄表值'.text.color(kTextPrimaryColor).size(28.sp).make(), + Spacer(), + TextField( + controller: _meterCountContrlller, + textAlign: TextAlign.end, + inputFormatters: [ + FilteringTextInputFormatter.allow(RegExp('[0-9]*')) + ], + decoration: InputDecoration( + border: InputBorder.none, + hintText: '请输入抄表值', + hintStyle: TextStyle( + fontSize: 28.sp, + color: kTextSubColor, + ), + contentPadding: EdgeInsets.zero, + isDense: true, + ), + ) + ], + ), + 28.w.heightBox, + Divider(), + Container( + width: 686.w, + height: 120.w, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(8.w), + border: Border.all( + width: 2.w, + color: Color(0xFFE8E8E8), + ), + ), + child: TextField( + minLines: 5, + controller: _meterExtraController, + decoration: InputDecoration( + hintText: '请输入备注信息', + hintStyle: TextStyle( + fontSize: 28.sp, + color: kTextSubColor, + ), + contentPadding: EdgeInsets.zero, + border: InputBorder.none, + isDense: true, + ), + ), + ), + ], + ) + .box + .padding(EdgeInsets.symmetric(vertical: 24.w, horizontal: 32.w)) + .color(Colors.white) + .make(); + } + + Widget _cleaningCard() { + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + '1.${widget.pointModel.name}'.text.black.size(32.sp).bold.make() + ], + ), + 32.w.heightBox, + Row( + children: [ + AkuSingleCheckButton( + text: '正常', + value: 0, + gropValue: _cleaningStatus, + onPressed: () { + _cleaningStatus = 0; + }, + ), + 80.w.widthBox, + AkuSingleCheckButton( + text: '异常', + value: 0, + gropValue: _cleaningStatus, + onPressed: () { + _cleaningStatus = 1; + }, + ), + ], + ), + 32.w.heightBox, + Container( + width: 686.w, + height: 120.w, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(8.w), + border: Border.all( + width: 2.w, + color: Color(0xFFE8E8E8), + ), + ), + child: TextField( + minLines: 5, + controller: _cleaningExtraController, + decoration: InputDecoration( + hintText: '请输入备注信息', + hintStyle: TextStyle( + fontSize: 28.sp, + color: kTextSubColor, + ), + contentPadding: EdgeInsets.zero, + border: InputBorder.none, + isDense: true, + ), + ), + ), + ], + ) + .box + .color(Colors.white) + .padding(EdgeInsets.symmetric(vertical: 24.w, horizontal: 32.w)) + .make(); + } + + Widget _inspectionHeadCard() { + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + 16.w.heightBox, + Container( + alignment: Alignment.centerLeft, + padding: EdgeInsets.only(left: 24.w, right: 24.w, bottom: 40.w), + width: double.infinity, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(8.w), + color: Color(0xFFFFFFFF)), + child: Column(children: [ + Container( + height: 86.w, + width: double.infinity, + alignment: Alignment.centerLeft, + child: Row( + children: [ + Text( + '${widget.detailModel.name}', + style: TextStyle( + color: AppStyle.primaryTextColor, + fontSize: 36.sp, + fontWeight: FontWeight.bold), + ), + Spacer(), + InspectionUtils.status[widget.inspectionStatus].text + .color(InspectionUtils.color(widget.inspectionStatus)) + .bold + .size(28.sp) + .make() + ], + ), + ), + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Image.asset( + R.ASSETS_MANAGE_IC_RENWU_PNG, + width: 40.w, + height: 40.w, + ), + 4.w.widthBox, + Column( + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Text( + '巡检名称', + style: InspectionUtils.textstyle, + ), + ], + ), + 36.w.widthBox, + Text( + widget.detailModel.name, + maxLines: 2, + textAlign: TextAlign.right, + style: AppStyle().primaryStyle, + ).expand() + ], + ), + 12.w.heightBox, + Row( + children: [ + Image.asset( + R.ASSETS_MANAGE_IC_RENWU_PNG, + width: 40.w, + height: 40.w, + ), + 4.w.widthBox, + Text( + '巡检编号', + style: InspectionUtils.textstyle, + ), + Spacer(), + Text( + widget.detailModel.code, + style: AppStyle().primaryStyle, + ) + ], + ), + 12.w.heightBox, + Row( + children: [ + Image.asset( + R.ASSETS_INSPECTION_IC_XUNJIAN_PNG, + width: 40.w, + height: 40.w, + ), + 4.w.widthBox, + Text( + '规定巡检时间', + style: InspectionUtils.textstyle, + ), + Spacer(), + Text( + '${DateUtil.formatDateStr(widget.detailModel.beginDate, format: "yyyy-MM-dd HH:mm")}～${widget.detailModel?.endDate == null ? '' : DateUtil.formatDateStr(widget.detailModel.endDate, format: "HH:mm")}', + style: AppStyle().primaryStyle, + ), + ], + ), + 12.w.heightBox, + ...widget.detailModel?.actualBeginDate == null + ? [SizedBox()] + : [ + Row( + children: [ + Image.asset( + R.ASSETS_MANAGE_IC_TIME_PNG, + width: 40.w, + height: 40.w, + ), + 4.w.widthBox, + Text( + '开始巡检时间', + style: InspectionUtils.textstyle, + ), + Spacer(), + Text( + '${DateUtil.formatDateStr(widget.detailModel.actualBeginDate, format: "yyyy-MM-dd HH:mm")}', + style: AppStyle().primaryStyle, + ), + ], + ), + 12.w.heightBox, + ], + widget.detailModel?.actualEndDate == null + ? SizedBox() + : Row( + children: [ + Image.asset( + R.ASSETS_MESSAGE_IC_PEOPLE_PNG, + width: 40.w, + height: 40.w, + ), + 4.w.widthBox, + Text( + '结束巡检时间', + style: InspectionUtils.textstyle, + ), + Spacer(), + Text( + '${DateUtil.formatDateStr(widget.detailModel.actualEndDate, format: "yyyy-MM-dd HH:mm")}', + style: AppStyle().primaryStyle, + ), + ], + ) + ]), + ), + ], + ); + } +} diff --git a/lib/ui/manage_pages/inspection_manage/inspection_point_submit_page.dart b/lib/ui/manage_pages/inspection_manage/inspection_point_submit_page.dart new file mode 100644 index 0000000..3a07af1 --- /dev/null +++ b/lib/ui/manage_pages/inspection_manage/inspection_point_submit_page.dart @@ -0,0 +1,58 @@ +import 'package:aku_community_manager/style/app_style.dart'; +import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; +import 'package:aku_ui/aku_ui.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; +import 'package:velocity_x/velocity_x.dart'; + +class InspectionPointSubmitPage extends StatefulWidget { + InspectionPointSubmitPage({Key key}) : super(key: key); + + @override + _InspectionPointSubmitPageState createState() => + _InspectionPointSubmitPageState(); +} + +class _InspectionPointSubmitPageState extends State { + @override + Widget build(BuildContext context) { + return AkuScaffold( + title: '巡检点', + body: Center( + child: Container( + width: double.infinity, + child: Column( + children: [ + Image.asset(R.ASSETS_MANAGE_SUBMIT_SUCCESS_PNG, + width: 587.w, height: 350.w), + '提交成功'.text.black.size(40.sp).bold.make(), + 8.w.heightBox, + '感谢您的努力工作，为小区安全做出贡献' + .text + .color(kTextSubColor) + .size(26.sp) + .bold + .make(), + 80.w.heightBox, + AkuButton( + color: kPrimaryColor, + child: '继续巡更' + .text + .color(kTextPrimaryColor) + .size(32.sp) + .bold + .make(), + radius: 8.w, + padding: EdgeInsets.symmetric(vertical: 22.w, horizontal: 76.w), + onPressed: () { + Get.back(); + }, + ), + ], + ), + ), + ), + ); + } +} diff --git a/lib/ui/manage_pages/inspection_manage/inspection_utils.dart b/lib/ui/manage_pages/inspection_manage/inspection_utils.dart new file mode 100644 index 0000000..adc1aaa --- /dev/null +++ b/lib/ui/manage_pages/inspection_manage/inspection_utils.dart @@ -0,0 +1,24 @@ +import 'package:aku_community_manager/style/app_style.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; + +class InspectionUtils { + static TextStyle textstyle = + TextStyle(color: AppStyle.minorTextColor, fontSize: 28.sp); + static Map status = {1: '待巡检', 2: '已巡检', 3: '巡检中', 4: '未巡检'}; + static Color color(int status) { + switch (status) { + case 1: + return Color(0xFFFF4501); + break; + case 2: + return Color(0xFF999999); + case 3: + return Color(0xFFFF4501); + case 4: + return Color(0xFFFF4501); + default: + return Colors.blue; + } + } +} diff --git a/lib/ui/widgets/app_widgets/aku_pick_image_widget.dart b/lib/ui/widgets/app_widgets/aku_pick_image_widget.dart new file mode 100644 index 0000000..f6b1789 --- /dev/null +++ b/lib/ui/widgets/app_widgets/aku_pick_image_widget.dart @@ -0,0 +1,53 @@ +import 'dart:io'; + +import 'package:aku_community_manager/style/app_style.dart'; +import 'package:aku_community_manager/ui/widgets/inner/pick_image.dart'; +import 'package:dotted_border/dotted_border.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:aku_community_manager/const/resource.dart'; +import 'package:velocity_x/velocity_x.dart'; + +class AkuPickImageWidget extends StatefulWidget { + final double size; + final Function(File file) onChanged; + AkuPickImageWidget({Key key, this.size, this.onChanged}) : super(key: key); + + @override + _AkuPickImageWidgetState createState() => _AkuPickImageWidgetState(); +} + +class _AkuPickImageWidgetState extends State { + File _file; + @override + Widget build(BuildContext context) { + return GestureDetector( + onTap: () async { + await akuPickImage().then((value) => _file = File(value.path)); + widget.onChanged(_file); + }, + child: DottedBorder( + color: Color(0xFF999999), + strokeWidth: 2.w, + radius: Radius.circular(8.w), + child: Container( + width: widget.size ?? 160.w, + height: widget.size ?? 160.w, + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Image.asset( + R.ASSETS_MANAGE_IC_IMAGE_PNG, + width: 60.w, + height: 60.w, + ), + 4.w.heightBox, + '上传图片'.text.color(kTextSubColor).size(22.sp).bold.make(), + ], + ), + ), + ).material(color: Colors.transparent), + ); + } +} diff --git a/lib/ui/widgets/app_widgets/aku_single_check_button.dart b/lib/ui/widgets/app_widgets/aku_single_check_button.dart new file mode 100644 index 0000000..4d709a1 --- /dev/null +++ b/lib/ui/widgets/app_widgets/aku_single_check_button.dart @@ -0,0 +1,41 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:velocity_x/velocity_x.dart'; + +class AkuSingleCheckButton extends StatefulWidget { + final String text; + final T value; + final T gropValue; + final VoidCallback onPressed; + AkuSingleCheckButton( + {Key key, this.text, this.value, this.gropValue, this.onPressed}) + : super(key: key); + + @override + _AkuSingleCheckButtonState createState() => _AkuSingleCheckButtonState(); +} + +class _AkuSingleCheckButtonState extends State { + bool get isSelect => widget.value == widget.gropValue; + @override + Widget build(BuildContext context) { + return Container( + decoration: BoxDecoration( + color: isSelect ? Color(0xFFFFF8E0) : Colors.white, + border: Border.all( + color: isSelect ? Color(0xFFFFC40C) : Color(0xFF999999), + width: 3.w), + borderRadius: BorderRadius.circular(4.w)), + width: 180.w, + height: 72.w, + child: widget.text.text + .color(isSelect ? Color(0xFF999999) : Color(0xFF333333)) + .bold + .size(32.sp) + .make(), + ).onInkTap(() { + widget.onPressed(); + setState(() {}); + }); + } +} diff --git a/pubspec.lock b/pubspec.lock index 16942ec..bf06d93 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -220,6 +220,13 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "3.0.10" + dotted_border: + dependency: "direct main" + description: + name: dotted_border + url: "https://pub.flutter-io.cn" + source: hosted + version: "2.0.0-nullsafety.0" expandable: dependency: "direct main" description: @@ -494,6 +501,20 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "1.8.0" + path_drawing: + dependency: transitive + description: + name: path_drawing + url: "https://pub.flutter-io.cn" + source: hosted + version: "0.5.0-nullsafety.0" + path_parsing: + dependency: transitive + description: + name: path_parsing + url: "https://pub.flutter-io.cn" + source: hosted + version: "0.2.0-nullsafety.0" path_provider: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 05e9c95..3d5974b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -48,7 +48,7 @@ dependencies: permission_handler: ^5.0.1+1 velocity_x: ^2.6.0 - + dotted_border: ^2.0.0-nullsafety.0 dio: power_logger: ^0.1.3