Добавлена проверка статуса токена, обработка статуса токена
This commit is contained in:
@@ -25,7 +25,7 @@ android {
|
||||
defaultConfig {
|
||||
targetSdkVersion 21
|
||||
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
||||
applicationId "com.dinnect.checker"
|
||||
applicationId "com.dinect.checker"
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.dinnect.checker"
|
||||
package="com.dinect.checker"
|
||||
android:versionCode="1"
|
||||
android:versionName="0.0.1">
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
additional functionality it is fine to subclass or reimplement
|
||||
FlutterApplication and put your custom class here. -->
|
||||
<application android:name="io.flutter.app.FlutterApplication" android:label="checker" android:icon="@mipmap/ic_launcher">
|
||||
<activity android:name="com.dinnect.checker.activity.MainActivity"
|
||||
<activity android:name="com.dinect.checker.activity.MainActivity"
|
||||
android:launchMode="singleTop"
|
||||
android:theme="@android:style/Theme.Black.NoTitleBar"
|
||||
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection"
|
||||
@@ -30,11 +30,11 @@
|
||||
</intent-filter>
|
||||
</activity>
|
||||
|
||||
<activity android:name="com.dinnect.checker.activity.CameraActivity"
|
||||
<activity android:name="com.dinect.checker.activity.CameraActivity"
|
||||
android:theme="@android:style/Theme.Black.NoTitleBar"/>
|
||||
|
||||
<service
|
||||
android:name="com.dinnect.checker.service.RegistrationIntentService"
|
||||
android:name="com.dinect.checker.service.RegistrationIntentService"
|
||||
android:exported="false"/>
|
||||
|
||||
</application>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dinnect.checker.activity;
|
||||
package com.dinect.checker.activity;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.pm.ActivityInfo;
|
||||
@@ -29,8 +29,8 @@ import net.sourceforge.zbar.Symbol;
|
||||
import net.sourceforge.zbar.SymbolSet;
|
||||
import net.sourceforge.zbar.Config;
|
||||
|
||||
import com.dinnect.checker.R;
|
||||
import com.dinnect.checker.view.CameraPreview;
|
||||
import com.dinect.checker.R;
|
||||
import com.dinect.checker.view.CameraPreview;
|
||||
|
||||
public class CameraActivity extends Activity {
|
||||
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
package com.dinnect.checker.activity;
|
||||
package com.dinect.checker.activity;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.util.Log;
|
||||
import com.dinnect.checker.activity.CameraActivity;
|
||||
import com.dinnect.checker.service.RegistrationIntentService;
|
||||
import android.content.SharedPreferences;
|
||||
import com.dinect.checker.activity.CameraActivity;
|
||||
import com.dinect.checker.service.RegistrationIntentService;
|
||||
|
||||
import io.flutter.app.FlutterActivity;
|
||||
import io.flutter.plugins.GeneratedPluginRegistrant;
|
||||
@@ -16,32 +18,56 @@ import io.flutter.plugin.common.MethodChannel.Result;
|
||||
|
||||
import com.google.android.gms.iid.InstanceID;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
public class MainActivity extends FlutterActivity {
|
||||
|
||||
private static final String INSTANCE_ID_CHANNEL = "com.dinnect.checker/instance_id";
|
||||
private static final String INSTANCE_ID_CHANNEL = "com.dinect.checker/instance_id";
|
||||
private static final String PREF_POS_TOKEN = "pref_pos_token";
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
GeneratedPluginRegistrant.registerWith(this);
|
||||
|
||||
final SharedPreferences preferences = getPreferences(Context.MODE_PRIVATE);
|
||||
|
||||
new MethodChannel(getFlutterView(), INSTANCE_ID_CHANNEL).setMethodCallHandler(
|
||||
new MethodCallHandler() {
|
||||
@Override
|
||||
public void onMethodCall(MethodCall call, Result result) {
|
||||
if (call.method.equals("getInstanceID")) {
|
||||
switch (call.method) {
|
||||
|
||||
InstanceID instanceID = InstanceID.getInstance(MainActivity.this);
|
||||
String id = instanceID.getId();
|
||||
case "getInstanceID":
|
||||
|
||||
if (id != null) {
|
||||
result.success(id);
|
||||
} else {
|
||||
result.error("UNAVAILABLE", "Can't get instanceID.", null);
|
||||
}
|
||||
InstanceID instanceID = InstanceID.getInstance(MainActivity.this);
|
||||
String id = instanceID.getId();
|
||||
|
||||
} else {
|
||||
result.notImplemented();
|
||||
if (id != null) {
|
||||
result.success(id);
|
||||
} else {
|
||||
result.error("UNAVAILABLE", "Can't get instanceID.", null);
|
||||
}
|
||||
break;
|
||||
|
||||
case "saveToken":
|
||||
Map arguments = call.arguments();
|
||||
String token = (String) arguments.get("token");
|
||||
Log.d("kifio", token);
|
||||
preferences.edit().putString(PREF_POS_TOKEN, token).apply();
|
||||
break;
|
||||
|
||||
case "getToken":
|
||||
result.success(preferences.getString(PREF_POS_TOKEN, null));
|
||||
break;
|
||||
|
||||
case "startScanner":
|
||||
startActivity(new Intent(MainActivity.this, CameraActivity.class));
|
||||
break;
|
||||
|
||||
default:
|
||||
result.notImplemented();
|
||||
break;
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -55,4 +81,12 @@ public class MainActivity extends FlutterActivity {
|
||||
|
||||
}
|
||||
|
||||
public void saveToken() {
|
||||
|
||||
}
|
||||
|
||||
public void getToken() {
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dinnect.checker.service;
|
||||
package com.dinect.checker.service;
|
||||
|
||||
import android.app.IntentService;
|
||||
import android.content.Intent;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.dinnect.checker.view;
|
||||
package com.dinect.checker.view;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user