Commit 3638c385 authored by Izol's avatar Izol

push adjustv3

parent a4e322ba
...@@ -61,14 +61,14 @@ android { ...@@ -61,14 +61,14 @@ android {
versionName flutterVersionName versionName flutterVersionName
// Sun miT2S // Sun miT2S
// ndk {
// abiFilters 'armeabi', 'armeabi-v7a'
// }
// Sun miT2Mini
ndk { ndk {
abiFilters 'arm64-v8a', 'armeabi', 'armeabi-v7a' abiFilters 'armeabi', 'armeabi-v7a'
} }
// Sun miT2Mini
// ndk {
// abiFilters 'arm64-v8a', 'armeabi', 'armeabi-v7a'
// }
} }
buildTypes { buildTypes {
...@@ -96,7 +96,8 @@ dependencies { ...@@ -96,7 +96,8 @@ dependencies {
implementation 'androidx.annotation:annotation:1.5.0' implementation 'androidx.annotation:annotation:1.5.0'
// library mdd // library mdd
implementation(group: 'com.mdd.topup', name: 'mifare_mdd_lib', version: '0.0.11', ext: 'aar') // change 11
implementation(group: 'com.mdd.topup', name: 'mifare_mdd_lib', version: '0.0.40', ext: 'aar')
implementation(group: 'com.mdd.payment', name: 'aar-deviceid-release', version: '2.0.6', ext: 'aar') implementation(group: 'com.mdd.payment', name: 'aar-deviceid-release', version: '2.0.6', ext: 'aar')
implementation(group: 'com.mdd.library', name: 'android-escpos-receipt', version: '1.0.1', ext: 'aar') implementation(group: 'com.mdd.library', name: 'android-escpos-receipt', version: '1.0.1', ext: 'aar')
implementation(group: 'com.mdd.payment', name: 'nativecripto-release', version: '2.0.1', ext: 'aar') implementation(group: 'com.mdd.payment', name: 'nativecripto-release', version: '2.0.1', ext: 'aar')
......
// ignore_for_file: prefer_typing_uninitialized_variables, avoid_print // ignore_for_file: prefer_typing_uninitialized_variables, avoid_print
import 'package:flutter/cupertino.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:self_service_3/shared/preference_constant.dart'; import 'package:self_service_3/shared/preference_constant.dart';
...@@ -54,6 +55,18 @@ class StartService { ...@@ -54,6 +55,18 @@ class StartService {
String status, String status,
) async { ) async {
var result; var result;
debugPrint('=============PARAMETER PRINT===========');
debugPrint('ticketJson: $ticketJson');
debugPrint('companyName: $companyName');
debugPrint('companyAddress: $companyAddress');
debugPrint('companyPhone: $companyPhone');
debugPrint('approvalCode: $approvalCode');
debugPrint('prevBalance: $prevBalance');
debugPrint('serviceCharge: $serviceCharge');
debugPrint('serviceChargeAmount: $serviceChargeAmount');
debugPrint('denom: $denom');
debugPrint('metodeBayar: $metodeBayar');
debugPrint('status: $status');
try { try {
result = await platform.invokeMethod("print_topup", <String, dynamic>{ result = await platform.invokeMethod("print_topup", <String, dynamic>{
"ticket_json": ticketJson, "ticket_json": ticketJson,
...@@ -81,7 +94,8 @@ class StartService { ...@@ -81,7 +94,8 @@ class StartService {
String samReport, String samReport,
String approvalCode, String approvalCode,
String paymentMethod, String paymentMethod,
String paymentProvider) async { String paymentProvider,
) async {
var result; var result;
try { try {
result = await platform.invokeMethod("topup_confirm", <String, dynamic>{ result = await platform.invokeMethod("topup_confirm", <String, dynamic>{
...@@ -121,7 +135,8 @@ class StartService { ...@@ -121,7 +135,8 @@ class StartService {
return await platform.invokeMethod('bypass_activation'); return await platform.invokeMethod('bypass_activation');
} }
static Future<bool> activateLibrary() async { static Future<bool>
activateLibrary() async {
return await platform.invokeMethod('activate_library'); return await platform.invokeMethod('activate_library');
} }
......
This diff is collapsed.
...@@ -86,35 +86,50 @@ class _SplashPageState extends State<SplashPage> with TickerProviderStateMixin{ ...@@ -86,35 +86,50 @@ class _SplashPageState extends State<SplashPage> with TickerProviderStateMixin{
} }
void permissionState() async { void permissionState() async {
// Request multiple permissions at once if (await Permission.storage.request().isGranted &&
Map<Permission, PermissionStatus> status = await [Permission.storage, Permission.phone].request(); await Permission.phone.request().isGranted) {
StartService.initLibrary().then((value) {
// Check if all permissions were granted
bool allGranted = true;
status.forEach((permission, permissionStatus) {
if (permissionStatus != PermissionStatus.granted) {
allGranted = false;
}
});
if (allGranted) {
// All permissions were granted
// Initialize library and check activation
StartService.initLibrary().then((value){
Future.delayed(Duration(seconds: 3), () { Future.delayed(Duration(seconds: 3), () {
if (mounted){
checkAktivation(); checkAktivation();
}
}); });
}); });
} else {
// Handle denied permissions Future.delayed(Duration(seconds: 10), () {
status.forEach((permission, permissionStatus) { showDialog(
if (permissionStatus == PermissionStatus.denied) { context: context,
print('$permission permission was denied'); builder: (BuildContext context) {
} return AlertDialog(
title: Text("Error"),
content: Text("The app is taking too long to start. Please try again."),
actions: <Widget>[
TextButton(
child: Text("Try Again"),
onPressed: () {
Navigator.of(context).pop();
permissionState();
},
),
TextButton(
child: Text("Cancel"),
onPressed: () {
Navigator.of(context).pop();
},
),
],
);
},
);
}); });
} }
// You can request multiple permissions at once.
Map<Permission, PermissionStatus> statuses = await [
Permission.phone,
Permission.storage,
].request();
print("phone : ${statuses[Permission.phone]}");
print("storage : ${statuses[Permission.storage]}");
} }
void checkAktivation() { void checkAktivation() {
...@@ -157,7 +172,15 @@ class _SplashPageState extends State<SplashPage> with TickerProviderStateMixin{ ...@@ -157,7 +172,15 @@ class _SplashPageState extends State<SplashPage> with TickerProviderStateMixin{
), ),
), ),
), ),
// child: Text(
// 'UNDER MAINTENANCE',
// style: blackTextStyle.copyWith(
// fontSize: 30,
// fontWeight: semiBold,
// ),
// ),
), ),
), ),
), ),
] ]
......
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