From 3eb69b1ff239b973ded101925214ce8817e5239a Mon Sep 17 00:00:00 2001 From: "Serik.Uvaissov" Date: Wed, 22 Jul 2020 01:36:45 +0600 Subject: [PATCH] try - 1 --- android/app/build.gradle | 44 ++++++++++--------- android/app/proguard-rules.pro | 26 +++++++++++ android/app/src/main/AndroidManifest.xml | 4 +- .../bank/CloseDayCallbackHandlerImpl.java | 2 +- .../main/res/xml/network_security_config.xml | 5 +++ android/build.gradle | 1 + 6 files changed, 60 insertions(+), 22 deletions(-) create mode 100644 android/app/proguard-rules.pro create mode 100644 android/app/src/main/res/xml/network_security_config.xml diff --git a/android/app/build.gradle b/android/app/build.gradle index 6753653..5d5d793 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -67,14 +67,16 @@ android { buildConfigField ("String[]", "SUPPORTED_DEVICES", collectSupportedDevicesToArray()) } release { - minifyEnabled false - shrinkResources false + //useProguard true + //minifyEnabled false + //shrinkResources false + // proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" signingConfig signingConfigs.release } } compileOptions { - //coreLibraryDesugaringEnabled true + coreLibraryDesugaringEnabled true sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } @@ -82,6 +84,7 @@ android { kotlinOptions { jvmTarget = JavaVersion.VERSION_1_8.toString() } + } flutter { @@ -89,7 +92,7 @@ flutter { } dependencies { - //coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.9' + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.9' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' @@ -99,26 +102,28 @@ dependencies { androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' //m4bank dependencies + implementation fileTree(include: ['*.jar'], dir: 'libs') implementation deps.zlibrary - implementation deps.hardware.terminalCommon.values() - implementation deps.hardware.aisino.aisino_common - implementation deps.hardware.aisino.vm20.values() - implementation deps.hardware.wangpos.values() - implementation deps.hardware.roam.values() - implementation deps.hardware.spirelib - implementation deps.hardware.icmp.values() + +// implementation deps.hardware.aisino.aisino_common +// implementation deps.hardware.aisino.vm20.values() +// implementation deps.hardware.wangpos.values() +// implementation deps.hardware.roam.values() +// implementation deps.hardware.spirelib +// implementation deps.hardware.icmp.values() implementation deps.hardware.atol.values() - if (buildType.buildType == 'NFC') { + implementation deps.hardware.terminalCommon.values() + //if (buildType.buildType == 'NFC') { implementation deps.hardware.softpos.softpaylibrary implementation deps.hardware.softpos.softpay_dependencies - } else { - implementation deps.hardware.aisino.a90.values() - } + //} else { + // implementation deps.hardware.aisino.a90.values() + //} - implementation deps.hardware.shtrih.values() - implementation deps.hardware.redlib - implementation deps.hardware.sunmi - implementation deps.hardware.d200lib +// implementation deps.hardware.shtrih.values() +// implementation deps.hardware.redlib +// implementation deps.hardware.sunmi +// implementation deps.hardware.d200lib //Implementation okhhtp library implementation deps.okhttp.values() @@ -135,7 +140,6 @@ dependencies { implementation deps.timber implementation deps.paperdb implementation deps.greendao - implementation deps.retro_stream implementation deps.websockets // Only for useWebsockets parameter diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro new file mode 100644 index 0000000..88e52af --- /dev/null +++ b/android/app/proguard-rules.pro @@ -0,0 +1,26 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in C:\android_sdk\sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} +#Flutter Wrapper +-keep class io.flutter.app.** { *; } +-keep class io.flutter.plugin.** { *; } +-keep class io.flutter.util.** { *; } +-keep class io.flutter.view.** { *; } +-keep class io.flutter.** { *; } +-keep class io.flutter.plugins.** { *; } +#M4Bank Wrapper +-keep class java9.util.stream.** { *; } diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 5608520..d20f883 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -19,7 +19,9 @@ android:icon="@mipmap/ic_launcher" android:label="Аман Касса" android:roundIcon="@mipmap/ic_launcher_rounded" - android:usesCleartextTraffic="true"> + android:usesCleartextTraffic="true" + android:networkSecurityConfig="@xml/network_security_config" + > + + + + \ No newline at end of file diff --git a/android/build.gradle b/android/build.gradle index 332031e..1a9b1e6 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -7,6 +7,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'org.greenrobot:greendao-gradle-plugin:3.2.2' // add plugin classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" }