tret2003/checker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
anonymouzz
2017-08-03 17:08:56 +07:00
parent 10c3c18df1
commit 3d5262f786
8 changed files with 62 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
android/app/src/main/java/com/dinect/checker/CameraActivity.java
View File

@@ -61,7 +61,7 @@ import org.json.*;
import android.app.Dialog;
import android.app.DialogFragment;
import android.app.AlertDialog;
import android.app.AlertDialog.Builder;
import android.app.AlertDialog.Builder;
import android.content.DialogInterface;
import android.view.LayoutInflater;
import com.dinect.checker.Utils;
@@ -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.
@@ -266,10 +270,10 @@ public class CameraActivity extends AppCompatActivity implements Camera.PreviewC
public void onBackPressed() {
setResult(RESULT_CANCELED);
finish();
}
}
private void requestUser(String code) {
mNetworkThread = new NetworkThread(this, code, mToken);
mNetworkThread = new NetworkThread(this, code, mURL, mAppToken, mToken);
mNetworkThread.start();
}
@@ -280,7 +284,7 @@ public class CameraActivity extends AppCompatActivity implements Camera.PreviewC
return;
}
Log.d("kifio", "status: " + response.code());
int code = response.code();
int code = response.code();
if (code == 200) {
try {
String s = response.body().string();
@@ -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 = "";
NetworkThread(final CameraActivity activity, final String code, String token) {
private String mUrl = "users/?auto=";
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();
@@ -371,7 +376,7 @@ public class CameraActivity extends AppCompatActivity implements Camera.PreviewC
mDialog.dismiss();
mDialog = null;
}
}
}
void logout() {
dismissDialog();
@@ -382,7 +387,7 @@ public class CameraActivity extends AppCompatActivity implements Camera.PreviewC
}
public static class LogoutDialogFragment extends DialogFragment {
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
@@ -409,4 +414,4 @@ public class CameraActivity extends AppCompatActivity implements Camera.PreviewC
return builder.create();
}
}
}
}

6
android/app/src/main/java/com/dinect/checker/MainActivity.java
View File

@@ -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;
@@ -164,4 +168,4 @@ public class MainActivity extends FlutterActivity {
}
}
}

4
android/app/src/main/res/values/strings.xml
View File

@@ -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>
@@ -8,4 +8,4 @@
<string name="logout_text">Вы действительно хотите выйти и ввести другой номер магазина?</string>
<string name="logout_yes">Да</string>
<string name="logout_no">Нет</string>
</resources>
</resources>