move apiURL, appToken to libs/consts.dart, refs #9990

android/app/src/main/java/com/dinect/checker/CameraActivity.java

@@ -75,6 +75,8 @@ public class CameraActivity extends AppCompatActivity implements Camera.PreviewC
     public static final String ERROR_INFO = "ERROR_INFO";
 
     private int mOffset;
+    private String mURL;
+    private String mAppToken;
     private String mToken;
     private LogoutDialogFragment mDialog;
     private NetworkThread mNetworkThread;
@@ -100,6 +102,8 @@ public class CameraActivity extends AppCompatActivity implements Camera.PreviewC
         }
 
         mOffset = (int) (56 * getResources().getDisplayMetrics().density);
+        mURL = getIntent().getStringExtra(MainActivity.PREF_API_URL);
+        mAppToken = getIntent().getStringExtra(MainActivity.PREF_APP_TOKEN);
         mToken = getIntent().getStringExtra(MainActivity.PREF_POS_TOKEN);
 
         // Hide the window title.
@@ -269,7 +273,7 @@ public class CameraActivity extends AppCompatActivity implements Camera.PreviewC
     }
 
     private void requestUser(String code) {
-        mNetworkThread = new NetworkThread(this, code, mToken);
+        mNetworkThread = new NetworkThread(this, code, mURL, mAppToken, mToken);
         mNetworkThread.start();
     }
 
@@ -320,11 +324,12 @@ public class CameraActivity extends AppCompatActivity implements Camera.PreviewC
 
         private CameraActivity mActivity;
         private String mCode = "";
-        private String mUrl = "http://pos-api-autoclub.dinect.com/20130701/users?auto=";
         private String mCard = "";
+        private String mAppToken = "";
         private String mToken = "";
+        private String mUrl = "users/?auto=";
 
-        NetworkThread(final CameraActivity activity, final String code, String token) {
+        NetworkThread(final CameraActivity activity, final String code, final String url, final String appToken, String token) {
             if (code == null) {
                 activity.runOnUiThread(new Runnable() {
                     public void run() {
@@ -334,16 +339,16 @@ public class CameraActivity extends AppCompatActivity implements Camera.PreviewC
             } else {
                 mActivity = activity;
                 mCard = code;
-                mUrl += code;
+                mUrl = url + mUrl + code;
+                mAppToken = appToken;
                 mToken = token;
             }
         }
 
         @Override
         public void run() {
-
             Request request = new Request.Builder()
-                .addHeader("DM-Authorization", "dmapptoken bdea0f3ba9034b688019a7cac753d1209e2b227f")
+                .addHeader("DM-Authorization", "dmapptoken " + mAppToken)
                 .addHeader("Authorization", "dmtoken " + mToken)
                 .url(mUrl)
                 .build();

android/app/src/main/java/com/dinect/checker/MainActivity.java

@@ -23,6 +23,8 @@ public class MainActivity extends FlutterActivity {
     private static final String PREF_POS_MERCHANT_ID = "pref_pos_merchant_id";
     private static final String PREF_DOC_ID = "pref_doc_id";
     private static final String PREF_POS_ID = "pref_pos_id";
+    static final String PREF_API_URL = "prefs_api_token";
+    static final String PREF_APP_TOKEN = "pres_app_token";
     static final String PREF_POS_TOKEN = "pref_pos_token";
 
     private MethodChannel mChannel;
@@ -58,6 +60,8 @@ public class MainActivity extends FlutterActivity {
                         case "startScanner":
                             Map arguments = call.arguments();
                             Intent cameraIntent = new Intent(MainActivity.this, CameraActivity.class);
+                            cameraIntent.putExtra(PREF_API_URL, (String) arguments.get("url"));
+                            cameraIntent.putExtra(PREF_APP_TOKEN, (String) arguments.get("appToken"));
                             cameraIntent.putExtra(PREF_POS_TOKEN, (String) arguments.get("token"));
                             startActivityForResult(cameraIntent, START_SCANNER_REQUEST_CODE);
                             break;

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

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">AUTOBONUS</string>
+    <string name="app_name">Checker</string>
     <string name="scanner_title">Сканнер карты</string>
     <string name="scan">Сканировать</string>
     <string name="faq">FAQ</string>

lib/common.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/services.dart';
 import 'package:flutter/material.dart';
 
+import 'consts.dart';
 import 'network.dart';
 import 'registration.dart';
 import 'purchase.dart';
@@ -74,7 +75,7 @@ startScanner(BuildContext context) async {
       if (call.method == 'logout') {
         forceLogout(context);
       } else if (call.method == 'faq') {
-      	faq(context, true);
+        faq(context, true);
       } else {
         String userString = call.arguments[0];
         print('user: ${userString}');
@@ -84,7 +85,11 @@ startScanner(BuildContext context) async {
         Navigator.of(context).pushReplacement(route);
       }
     });
-    await platform.invokeMethod('startScanner', {'token' : token});
+    await platform.invokeMethod('startScanner', {
+      'token' : token,
+      'url': url,
+      'appToken': appToken,
+    });
   }
 }
 

lib/consts.dart

@@ -1,8 +1,10 @@
 import 'package:flutter/material.dart';
 
 // Serious constants
-const String url = 'http://pos-api-autoclub.dinect.com/20130701/';
+const String appName = "Dinect";
-const String appToken = 'bdea0f3ba9034b688019a7cac753d1209e2b227f';
+
+const String url = 'https://pos-api-ote.dinect.com/20130701/';
+const String appToken = '9fec83cdca38c357e6b65dbb17514cdd36bf2a08';
 
 // Texts
 const String merchantIDHint = 'ID магазина';

lib/main.dart

@@ -9,7 +9,7 @@ void main() {
 
 class Checker extends StatelessWidget {
   @override Widget build(BuildContext context) {
-    return new MaterialApp(title: "AutoClub", 
+    return new MaterialApp(title: appName,
       home: new SplashScreen(),
       theme: new ThemeData(
         primaryColor: primaryColor,

lib/purchase.dart

@@ -95,7 +95,7 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
   }
 
   @override getTextWidget() {
-    return new TextField(keyboardType: TextInputType.text, decoration: new InputDecoration.collapsed(hintText: getHint(),
+    return new TextField(keyboardType: TextInputType.number, decoration: new InputDecoration.collapsed(hintText: getHint(),
       hintStyle: new TextStyle(color: greyTextColor, fontSize: 16.0)),
       controller: controller,
       onChanged: (text) => handleUserInput(text));