From 8e654c5ab13df01e1c339ad95470b3c896bdd2bb Mon Sep 17 00:00:00 2001 From: suvaysov Date: Fri, 12 Aug 2022 16:13:54 +0600 Subject: [PATCH] xReport fix? url is nullable --- lib/core/services/ApiService.dart | 4 ++++ lib/views/home/tabs/AdditionalTab.dart | 8 +++++--- lib/views/login/login_view.dart | 4 +--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/core/services/ApiService.dart b/lib/core/services/ApiService.dart index 2ea5f2a..5473706 100644 --- a/lib/core/services/ApiService.dart +++ b/lib/core/services/ApiService.dart @@ -179,9 +179,13 @@ class ApiService extends BaseService { String body; if(bodyEntry) { + http.Response res = await http.post(uri, body: jsonEncode(requestBody), headers: headers ); body = res.body; } else { + // log.i(uri); + // log.i(jsonEncode(headers)); + // log.i(requestBody); var request = http.MultipartRequest('POST', uri) ..headers.addAll(headers) ..fields.addAll(requestBody); diff --git a/lib/views/home/tabs/AdditionalTab.dart b/lib/views/home/tabs/AdditionalTab.dart index bf01191..f86a1b1 100644 --- a/lib/views/home/tabs/AdditionalTab.dart +++ b/lib/views/home/tabs/AdditionalTab.dart @@ -114,7 +114,9 @@ class _AdditionalTabState extends State { _navigator.push(ImageShowRoute, arguments: ImageShowModel(data: CheckImageModal(base64Data: check, textData: checkText !=null ? jsonEncode(checkText) : null ), title: 'X Отчет')); - String url = response.body['link']; + + String? url = response.body['link']; + log.i(url); _dataService.insertVoucher( user: user, name: 'X Отчет', @@ -124,8 +126,8 @@ class _AdditionalTabState extends State { } else { _dialog.showDialog(description: response.body['message']); } - } catch (e) { - print(e); + } catch (e, stack) { + log.e('message', e, stack); } finally { setState(() { xReportBusy = false; diff --git a/lib/views/login/login_view.dart b/lib/views/login/login_view.dart index 15da58e..5ccfcb3 100644 --- a/lib/views/login/login_view.dart +++ b/lib/views/login/login_view.dart @@ -12,7 +12,6 @@ import 'package:aman_kassa_flutter/shared/ui_helpers.dart'; import 'package:aman_kassa_flutter/widgets/fields/busy_button.dart'; import 'package:aman_kassa_flutter/widgets/fields/input_field.dart'; import 'package:barcode_scan2/gen/protos/protos.pb.dart'; -import 'package:barcode_scan2/gen/protos/protos.pbenum.dart'; import 'package:barcode_scan2/model/scan_options.dart'; import 'package:barcode_scan2/platform_wrapper.dart'; import 'package:flutter/services.dart'; @@ -151,8 +150,7 @@ class _LoginViewState extends State { } _pressBtnEnter() async { - if (emailController.text != null && - emailController.text.toLowerCase().trim().startsWith('test')) { + if (emailController.text.toLowerCase().trim().startsWith('test')) { _apiService.test = true; } else { _apiService.test = false;