visa valid

android/app/build.gradle

@@ -91,15 +91,12 @@ dependencies {
     implementation deps.hardware.spirelib
     implementation deps.hardware.icmp.values()
     implementation deps.hardware.atol.values()
-//    if (buildType.buildType == 'NFC') {
+    if (buildType.buildType == 'NFC') {
-//        implementation deps.hardware.softpos.softpaylibrary
+        implementation deps.hardware.softpos.softpaylibrary
-//        implementation deps.hardware.softpos.softpay_dependencies
+        implementation deps.hardware.softpos.softpay_dependencies
-//    } else {
+    } else {
-//        implementation deps.hardware.aisino.a90.values()
+        implementation deps.hardware.aisino.a90.values()
-//    }
+    }
-    //implementation deps.hardware.softpos.softpaylibrary
-    //implementation deps.hardware.softpos.softpay_dependencies
-    implementation deps.hardware.aisino.a90.values()
 
     implementation deps.hardware.shtrih.values()
     implementation deps.hardware.redlib

android/app/src/main/AndroidManifest.xml

@@ -21,7 +21,7 @@
         android:roundIcon="@mipmap/ic_launcher_rounded"
         android:usesCleartextTraffic="true">
         <activity android:name=".bank.BankActivity" android:theme="@android:style/Theme.Black.NoTitleBar"></activity>
-        <activity android:name=".bank.M4BankActivity" android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar"></activity>
+        <activity android:name=".bank.M4BankActivity" android:theme="@android:style/Theme.Light.NoTitleBar"></activity>
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"

android/app/src/main/java/kz/com/aman/kassa/bank/CheckConnectionCallbackHandlerImpl.java

@@ -14,7 +14,8 @@ public class CheckConnectionCallbackHandlerImpl implements CheckConnectionCallba
 
     @Override
     public void onCompleted(CheckConnectionExternalResult result) {
-        activity.runOnUiThread(() -> Toast.makeText(activity, result.getResultType() + " " + (result.getDescription() == null ? "" : result.getDescription()) + " " + result.isOnlineRegistration(), Toast.LENGTH_SHORT).show());
+        activity.runOnUiThread(() ->
+                Toast.makeText(activity, result.getResultType() + " " + (result.getDescription() == null ? "" : result.getDescription()) + " " + result.isOnlineRegistration(), Toast.LENGTH_SHORT).show());
     }
 
     @Override

android/app/src/main/java/kz/com/aman/kassa/bank/M4BankActivity.java

@@ -408,6 +408,7 @@ public class M4BankActivity extends FlutterActivity {
         //////////// отправка данных для регистрации mpos - дополнительный функционал при активации//////////////
         findViewById(R.id.sendRegisterRequest).setOnClickListener(v -> {
             String url = "https://test.ponkratenko.ru";
+            //String savedServerUrl = PreferencesManager.loadStringField(this, PreferencesManager.Field.SERVER_URL, getString(R.string.default_server_address_mpos_5_0_test));
             clientInterface.getConfigurationManager()
                            .sendRegisterRequest(sendRegisterRequestCallbackHandler, getRegisterRequestData(), url);
         });

android/app/src/main/res/layout/activity_main.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    tools:context="com.example.aman_kassa_flutter.bank.M4BankActivity">
+    tools:context=".bank.M4BankActivity">
 
     <LinearLayout
         android:layout_width="match_parent"

android/app/src/main/res/values/strings.xml

@@ -15,7 +15,7 @@
     <string name="default_server_address2">http://10.45.49.31:29978</string>
     <string name="default_server_address_sber_test">http://sbertest.m4bank.ru:21017</string>
     <!--<string name="default_server_address_mpos_5_0_test">http://217.174.185.218:35997</string>-->
-    <string name="default_server_address_mpos_5_0_test">http://10.31.0.40:5000</string>
+    <string name="default_server_address_mpos_5_0_test">http://185.98.84.231:2000</string>
 
     <string name="check_access">Check access</string>
     <string name="get_available_operations">Get available operations</string>

android/build.gradle

@@ -11,7 +11,7 @@ buildscript {
     }
 
     ext.buildType = [
-            'buildType': ''
+            'buildType': 'NFC'
     ]
 
     ext.versions = [
@@ -91,7 +91,7 @@ buildscript {
                     "spirelib"      : "m4bank:spirelib:138",
                     "softpos"       : [
                             "softpaylibrary"      : "m4bank:softpaylibrary:41@aar",
-                            "softpay_dependencies": "m4bank:softpay_dependencies:1.1.1.53@aar",
+                            "softpay_dependencies": "m4bank:softpay_dependencies:1.1.1.52@aar",
                     ],
                     "sunmi"         : "m4bank:sunmiv1printerlibrary:5",
                     "redlib"        : "m4bank:redlib:1",