From e06d192dcb9af5f22fd2ad46234d921325a54c1b Mon Sep 17 00:00:00 2001 From: "Serik.Uvaissov" Date: Sun, 23 Aug 2020 16:48:56 +0600 Subject: [PATCH] Toast.makeText CardPaymentCallbackHandler currency method BankNfcPlugins --- .../kassa/handler/CardPaymentHandlerImpl.java | 2 +- .../aman/kassa/plugins/BankNfcPlugins.java | 42 +++++++++++++++++++ lib/core/services/BankService.dart | 12 ++++++ lib/views/bank_setting/bank_setting_view.dart | 9 ++-- lib/views/home/components/popup_menu.dart | 4 +- lib/views/payment_nfc/payment_nfc_view.dart | 15 ++++++- 6 files changed, 74 insertions(+), 10 deletions(-) diff --git a/android/app/src/main/java/kz/com/aman/kassa/handler/CardPaymentHandlerImpl.java b/android/app/src/main/java/kz/com/aman/kassa/handler/CardPaymentHandlerImpl.java index 8dd2d39..ee8b5c2 100644 --- a/android/app/src/main/java/kz/com/aman/kassa/handler/CardPaymentHandlerImpl.java +++ b/android/app/src/main/java/kz/com/aman/kassa/handler/CardPaymentHandlerImpl.java @@ -242,7 +242,7 @@ public class CardPaymentHandlerImpl implements CardPaymentCallbackHandler currencies = dataHolder.getCurrencyList(); + boolean changed = false; + for(Currency currency : currencies ){ + System.out.println(currency.getName()); + System.out.println(currency.getLetterCode()); + System.out.println(currency.getCurrency3DigitCode()); + if("398".equalsIgnoreCase(currency.getCurrency3DigitCode())){ + dataHolder.setCurrency(currency); + changed = true; + break; + } + } + AmanDao dao = new AmanDao<>(); + dao.setSuccess(changed); + dao.setMsg("current currency " + (currentCurrency!=null ? currentCurrency.getLetterCode() : "NULL")); + result.success(gson.toJson(dao)); + } else { + AmanDao dao = new AmanDao<>(); + dao.setSuccess(true); + dao.setMsg("exist"); + result.success(gson.toJson(dao)); + } + } + + private void authentication(MethodCall call, Result result) { String login = call.argument("login"); diff --git a/lib/core/services/BankService.dart b/lib/core/services/BankService.dart index ef9b277..ea772f6 100644 --- a/lib/core/services/BankService.dart +++ b/lib/core/services/BankService.dart @@ -58,6 +58,18 @@ class BankService extends BaseService { } } + Future currency() async { + try { + String response = await _channel.invokeMethod("currency"); + AmanDao dao = AmanDao.fromJson(json.decode(response)); + log.i('${dao.success} - ${dao.msg}'); + return dao.success; + } catch (e, stack) { + log.e("BankService", e, stack); + return false; + } + } + Future permissions() async { try { String response = await _channel.invokeMethod("permissions"); diff --git a/lib/views/bank_setting/bank_setting_view.dart b/lib/views/bank_setting/bank_setting_view.dart index ea2ecf3..fc83b71 100644 --- a/lib/views/bank_setting/bank_setting_view.dart +++ b/lib/views/bank_setting/bank_setting_view.dart @@ -23,8 +23,6 @@ class _BankSettingViewState extends State { TextEditingController _passwordController; final BankService _bankService = locator(); final DialogService _dialogService = locator(); - String _platformImei = 'Unknown'; - String _bankImei = 'Unknown'; @override void initState() { @@ -32,10 +30,10 @@ class _BankSettingViewState extends State { BankState state = Redux.store.state.bankState; _emailController = new TextEditingController(text: state.login); _passwordController = new TextEditingController(text: state.password); - initBankImeiState(); + permissions(); } - Future initBankImeiState() async { + Future permissions() async { try { await _bankService.permissions(); } on PlatformException { @@ -74,8 +72,6 @@ class _BankSettingViewState extends State { style: TextStyle(fontSize: 15.0), textAlign: TextAlign.center, ), - Text('Ваш IMEI-код:$_platformImei'), - Text('Ваш IMEI-код:$_bankImei'), verticalSpaceTiny, TextField( controller: _emailController, @@ -85,6 +81,7 @@ class _BankSettingViewState extends State { ), TextField( controller: _passwordController, + obscureText: true, decoration: InputDecoration( labelText: 'Пароль', hintText: "Введите пароль"), ), diff --git a/lib/views/home/components/popup_menu.dart b/lib/views/home/components/popup_menu.dart index 61269bd..f7dfb94 100644 --- a/lib/views/home/components/popup_menu.dart +++ b/lib/views/home/components/popup_menu.dart @@ -30,8 +30,8 @@ class _PopupMenuState extends State { List _choices = [ const Choice(title: 'Информация о ККМ', icon: Icons.info_outline, command: 'infokkm'), - if (version >= 24 ) - const Choice(title: 'Bank', icon: Icons.text_fields, command: 'bank'), + //if (version >= 24 ) + // const Choice(title: 'Bank', icon: Icons.text_fields, command: 'bank'), if (version >= 24 ) const Choice(title: 'Настройка Tap2Phone', icon: MdiIcons.nfc, command: 'tap2phone'), const Choice(title: 'Выйти', icon: Icons.exit_to_app, command: 'exit') diff --git a/lib/views/payment_nfc/payment_nfc_view.dart b/lib/views/payment_nfc/payment_nfc_view.dart index ba7fb88..68f1b9a 100644 --- a/lib/views/payment_nfc/payment_nfc_view.dart +++ b/lib/views/payment_nfc/payment_nfc_view.dart @@ -64,7 +64,7 @@ class _PaymentNfcViewState extends State { } void start() async { - //Инициализация + //права доступа bool success = await _bankService.permissions(); log.i(success); if (!success) { @@ -82,6 +82,9 @@ class _PaymentNfcViewState extends State { }); return; } + + + //Проверка связи bool connected = await _bankService.connect(); log.i(connected); @@ -107,6 +110,16 @@ class _PaymentNfcViewState extends State { return; } +// //валюта +// bool currency = await _bankService.currency(); +// log.i(currency); +// if (!currency) { +// setState(() { +// status = 4; +// }); +// return; +// } + pay(); }