Skip to content

D
Dolan SelfService Topup
Commit b9d71bf4 authored by Izol's avatar Izol
Browse files
Options

update version 1.1.9

parent 2cb61044
Show whitespace changes
Inline Side-by-side
Showing with 38 additions and 28 deletions
android/local.properties
View file @ b9d71bf4
sdk.dir=/Users/macbookpro/Library/Android/sdk sdk.dir=/Users/macbookpro/Library/Android/sdk
flutter.sdk=/Users/macbookpro/Developer/flutter flutter.sdk=/Users/macbookpro/Developer/flutter
flutter.buildMode=debug flutter.buildMode=debug
flutter.versionName=SS.8.WWW flutter.versionName=SS.9.WWW
flutter.versionCode=1 flutter.versionCode=1.1.9
\ No newline at end of file \ No newline at end of file
lib/ui/pages/home_page.dart
View file @ b9d71bf4
...@@ -559,20 +559,23 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback { ...@@ -559,20 +559,23 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
return result; return result;
} }
_getInfoBeforeTopup(var info) { _getInfoBeforeTopup(var info) {
setState(() { setState(() {
if (info.toString().toLowerCase().contains('failed')) { if (info.toString().toLowerCase().contains('failed')) {
print('ini pesan salah'); print('ini pesan salah');
message = "Silakan Tempel Wristband Anda Di Reader"; message = "Silakan Tempel Wristband Anda Di Reader";
tapBalance(); tapBalance();
} else { }
else {
countMax += 1; countMax += 1;
infoCard = info; infoCard = info;
var infoMap = jsonDecode(info); var infoMap = jsonDecode(info);
String newCardNumber = infoMap["cardNumber"]; String newCardNumber = infoMap["cardNumber"];
if (newCardNumber == cardNumber) { if (newCardNumber == cardNumber) {
topUpBalance(approvalCode); topUpBalance(approvalCode);
} else { }
else {
AwesomeDialog( AwesomeDialog(
context: context, context: context,
dismissOnTouchOutside: false, dismissOnTouchOutside: false,
...@@ -585,8 +588,6 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback { ...@@ -585,8 +588,6 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
btnOkOnPress: () async { btnOkOnPress: () async {
if (timer != null) timer?.cancel(); if (timer != null) timer?.cancel();
if (countMax < 3) { if (countMax < 3) {
// var isTap = await StartService.getCard();
// _getInfoBeforeTopup(isTap);
tapBalance(); tapBalance();
} else { } else {
AwesomeDialog( AwesomeDialog(
...@@ -600,13 +601,6 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback { ...@@ -600,13 +601,6 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
desc: desc:
"Your transaction failed ! because didn't attach the previous card!", "Your transaction failed ! because didn't attach the previous card!",
btnOkOnPress: () { btnOkOnPress: () {
// countMax = 0;
// setState(() {
// isShowingDialog = false;
// });
// if (timer != null) timer?.cancel();
// tapIdle();
String companyName, companyPhone, metodeBayar; String companyName, companyPhone, metodeBayar;
companyName = companyName =
PreferencesHelper.getString('outletname'); PreferencesHelper.getString('outletname');
...@@ -635,7 +629,7 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback { ...@@ -635,7 +629,7 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
int.parse(sc)) int.parse(sc))
.toString(), .toString(),
'0', '0',
metodeBayar, PreferencesHelper.getString("provider"),
'Gagal', 'Gagal',
); );
AwesomeDialog( AwesomeDialog(
...@@ -837,8 +831,8 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback { ...@@ -837,8 +831,8 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
// set timer dengan durasi 1 detik // set timer dengan durasi 1 detik
duration -= 1; duration -= 1;
idleDuration.value = duration; // set nilai baru untuk idleDuration idleDuration.value = duration; // set nilai baru untuk idleDuration
print("ini pesan waktu idle : $idleDuration"); // print("ini pesan waktu idle : $idleDuration");
print("isShowingdialog : $isShowingDialog"); // print("isShowingdialog : $isShowingDialog");
if (duration == 0 && !isShowingDialog) { if (duration == 0 && !isShowingDialog) {
// jika idleDuration sudah habis dan dialog tidak sedang ditampilkan // jika idleDuration sudah habis dan dialog tidak sedang ditampilkan
isShowingDialog = true; isShowingDialog = true;
...@@ -876,6 +870,19 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback { ...@@ -876,6 +870,19 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
}); });
} }
// void tapBalance() async {
// Future.delayed(const Duration(milliseconds: 500), () async {
// var isTap = await StartService.getCard();
// try {
// var infoMap = jsonDecode(isTap);
// _getInfoBeforeTopup(isTap);
// } catch (e) {
// print("Error $isTap");
// tapBalance();
// }
// });
// }
void tapBalance() async { void tapBalance() async {
Future.delayed(const Duration(milliseconds: 500), () async { Future.delayed(const Duration(milliseconds: 500), () async {
var isTap = await StartService.getCard(); var isTap = await StartService.getCard();
...@@ -884,11 +891,23 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback { ...@@ -884,11 +891,23 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
_getInfoBeforeTopup(isTap); _getInfoBeforeTopup(isTap);
} catch (e) { } catch (e) {
print("Error $isTap"); print("Error $isTap");
AwesomeDialog(
context: context,
dialogType: DialogType.info,
animType: AnimType.rightSlide,
headerAnimationLoop: true,
title: 'Pastikan Wristband Anda Tertempel Di Reader !',
desc: "Make sure your wristband is attached to the reader !",
btnOkOnPress: () {
tapBalance(); tapBalance();
},
btnOkColor: Colors.blue)
.show();
} }
}); });
} }
Future<void> _showTap() { Future<void> _showTap() {
return showDialog<void>( return showDialog<void>(
context: context, context: context,
...@@ -1344,7 +1363,7 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback { ...@@ -1344,7 +1363,7 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
child: ListBody( child: ListBody(
children: <Widget>[ children: <Widget>[
Container( Container(
margin: EdgeInsets.only(top: 30), margin: EdgeInsets.only(top: 0),
padding: EdgeInsets.symmetric(horizontal: 17), padding: EdgeInsets.symmetric(horizontal: 17),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
...@@ -1418,16 +1437,7 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback { ...@@ -1418,16 +1437,7 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Center( SizedBox(height: 15,),
child: Text(
'topup balance',
style: greyTextStyle.copyWith(
fontSize: 15,
fontStyle: FontStyle.italic,
fontWeight: light,
),
),
),
Text( Text(
'Pilih nominal isi ulang', 'Pilih nominal isi ulang',
style: blackTextStyle.copyWith( style: blackTextStyle.copyWith(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment