From 72ee3b675adc8878d0a1ccb90ce6f04bb93440dd Mon Sep 17 00:00:00 2001 From: laiiihz Date: Tue, 16 Mar 2021 13:32:52 +0800 Subject: [PATCH] [migrate] migrate gsdialog to retoast on home page & live report view --- lib/pages/home/home_page.dart | 5 ++- .../live/live_stream/live_report_view.dart | 45 ++++++++++--------- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/lib/pages/home/home_page.dart b/lib/pages/home/home_page.dart index 6f489df..1342e83 100644 --- a/lib/pages/home/home_page.dart +++ b/lib/pages/home/home_page.dart @@ -61,6 +61,7 @@ import 'package:recook/widgets/banner.dart'; import 'package:recook/widgets/custom_image_button.dart'; import 'package:recook/widgets/goods_item.dart'; import 'package:recook/widgets/home_gif_header.dart'; +import 'package:recook/widgets/progress/re_toast.dart'; import 'package:recook/widgets/refresh_widget.dart'; import 'package:recook/widgets/toast.dart'; import 'package:recook/widgets/weather_page/weather_city_model.dart'; @@ -1182,9 +1183,9 @@ class _HomePageState extends BaseStoreState shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)), materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, onPressed: () async { - GSDialog.of(context).showLoadingDialog(context, ''); + final loadingCancel = ReToast.loading(); await HomeDao.getCategories(success: (data, code, msg) { - GSDialog.of(context).dismiss(context); + loadingCancel(); CRoute.push( context, ClassifyPage( diff --git a/lib/pages/live/live_stream/live_report_view.dart b/lib/pages/live/live_stream/live_report_view.dart index d368e38..bd93139 100644 --- a/lib/pages/live/live_stream/live_report_view.dart +++ b/lib/pages/live/live_stream/live_report_view.dart @@ -5,9 +5,11 @@ import 'package:oktoast/oktoast.dart'; import 'package:recook/constants/api.dart'; import 'package:recook/constants/header.dart'; import 'package:recook/manager/http_manager.dart'; +import 'package:recook/models/media_model.dart'; import 'package:recook/pages/live/models/live_report_model.dart'; import 'package:recook/widgets/custom_image_button.dart'; import 'package:image_picker/image_picker.dart'; +import 'package:recook/widgets/progress/re_toast.dart'; class LiveReportView extends StatefulWidget { LiveReportView({Key key}) : super(key: key); @@ -54,13 +56,14 @@ class _LiveReportViewState extends State { children: [ Expanded( child: ListView( + padding: EdgeInsets.all(10), controller: controller, children: [ Text( '请选择举报类型', style: TextStyle( color: Colors.white, - fontSize: rSP(13), + fontSize: rSP(20), ), ), models == null @@ -125,29 +128,27 @@ class _LiveReportViewState extends State { ), ), MaterialButton( - onPressed: () { - if (_imageFile == null) + onPressed: () async { + if (_imageFile == null) { showToast('图片不能为空'); - else { - GSDialog.of(context).showLoadingDialog(context, '上传图片中'); - HttpManager.uploadFile( - url: CommonApi.upload, - file: _imageFile, - key: "photo", - ).then((result) { - GSDialog.of(context).dismiss(context); - GSDialog.of(context).showLoadingDialog(context, '举报中'); - HttpManager.post(LiveAPI.report, { - "type": type, - 'content': _textController.text, - 'imgUrl': result.url, - }).then((_) { - GSDialog.of(context).dismiss(context); - showToast('举报成功'); - Navigator.pop(context); - }); - }); + return; } + final loadingCancel = ReToast.loading(text: '上传图片中'); + UploadResult uploadResult = await HttpManager.uploadFile( + url: CommonApi.upload, + file: _imageFile, + key: "photo", + ); + loadingCancel(); + final reportLoadingCancel = ReToast.loading(text: '举报中'); + ResultData resultData = await HttpManager.post(LiveAPI.report, { + "type": type, + 'content': _textController.text, + 'imgUrl': uploadResult.url, + }); + reportLoadingCancel(); + showToast(resultData.data['msg']); + Navigator.pop(context); }, color: Colors.red, child: Text('举报'),