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

reformat code (auto ident), optimize imports, refs #9991

Browse Source
This commit is contained in:
anonymouzz
2017-08-04 09:15:54 +07:00
parent 40f757f287
commit 2a40d033dc
7 changed files with 150 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
android/app/src/main/AndroidManifest.xml
View File

@@ -4,14 +4,16 @@
android:versionCode="1" android:versionCode="1"
android:versionName="0.4"> android:versionName="0.4">
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="21" /> <uses-sdk
android:minSdkVersion="16"
android:targetSdkVersion="21" />
<!-- The INTERNET permission is required for development. Specifically, <!-- The INTERNET permission is required for development. Specifically,
flutter needs it to communicate with the running application flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc. to allow setting breakpoints, to provide hot reload, etc.
--> -->
<uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.CAMERA"/> <uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<!-- io.flutter.app.FlutterApplication is an android.app.Application that <!-- io.flutter.app.FlutterApplication is an android.app.Application that
@@ -19,23 +21,28 @@
In most cases you can leave this as-is, but you if you want to provide In most cases you can leave this as-is, but you if you want to provide
additional functionality it is fine to subclass or reimplement additional functionality it is fine to subclass or reimplement
FlutterApplication and put your custom class here. --> FlutterApplication and put your custom class here. -->
<application android:name="io.flutter.app.FlutterApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher"> <application
<activity android:name="com.dinect.checker.MainActivity" android:name="io.flutter.app.FlutterApplication"
android:launchMode="singleTop" android:icon="@mipmap/ic_launcher"
android:screenOrientation="portrait" android:label="@string/app_name">
android:theme="@android:style/Theme.Black.NoTitleBar" <activity
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection" android:name="com.dinect.checker.MainActivity"
android:hardwareAccelerated="true" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection"
android:windowSoftInputMode="adjustResize"> android:hardwareAccelerated="true"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@android:style/Theme.Black.NoTitleBar"
android:windowSoftInputMode="adjustResize">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER"/> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name="com.dinect.checker.CameraActivity" <activity
android:screenOrientation="portrait" android:name="com.dinect.checker.CameraActivity"
android:theme="@style/AppTheme"/> android:screenOrientation="portrait"
android:theme="@style/AppTheme" />
<activity <activity
android:name=".zxing.ScannerActivity" android:name=".zxing.ScannerActivity"

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

@@ -1,71 +1,41 @@
package com.dinect.checker; package com.dinect.checker;
import android.support.v7.app.AppCompatActivity; import android.app.AlertDialog;
import android.content.pm.ActivityInfo; import android.app.Dialog;
import android.app.DialogFragment;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager;
import android.hardware.Camera;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.util.Log; import android.support.v7.app.ActionBar;
import android.graphics.*; import android.support.v7.app.AppCompatActivity;
import android.util.DisplayMetrics; import android.support.v7.widget.Toolbar;
import android.content.res.Resources;
import android.content.pm.PackageManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.Window; import android.util.Log;
import android.view.WindowManager; import android.view.LayoutInflater;
import android.view.View;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import android.view.Window; import android.view.Window;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.Button;
import android.graphics.Rect;
import android.support.v7.widget.Toolbar;
import android.hardware.Camera;
import android.hardware.Camera.CameraInfo;
import android.hardware.Camera.PreviewCallback;
import android.hardware.Camera.AutoFocusCallback;
import android.hardware.Camera.Parameters;
import android.hardware.Camera.Size;
import android.support.v7.app.ActionBar;
import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import android.view.SurfaceView;
import android.view.SurfaceHolder; import net.sourceforge.zbar.Config;
import android.graphics.ImageFormat;
import java.io.ByteArrayOutputStream;
import java.util.HashMap;
import net.sourceforge.zbar.ImageScanner;
import net.sourceforge.zbar.Image; import net.sourceforge.zbar.Image;
import net.sourceforge.zbar.ImageScanner;
import net.sourceforge.zbar.Symbol; import net.sourceforge.zbar.Symbol;
import net.sourceforge.zbar.SymbolSet; import net.sourceforge.zbar.SymbolSet;
import net.sourceforge.zbar.Config;
import android.graphics.YuvImage; import org.json.JSONArray;
import android.view.MenuItem; import org.json.JSONException;
import android.view.Display;
import android.view.Surface;
import android.view.SurfaceHolder;
import android.view.SurfaceView;
import java.io.IOException; import java.io.IOException;
import java.lang.Exception;
import java.lang.Thread;
import java.util.List;
import io.flutter.plugin.common.MethodCall;
import io.flutter.plugin.common.MethodChannel;
import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
import io.flutter.plugin.common.MethodChannel.Result;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
import okhttp3.Request; import okhttp3.Request;
import okhttp3.Response; import okhttp3.Response;
import org.json.*;
import android.app.Dialog;
import android.app.DialogFragment;
import android.app.AlertDialog;
import android.app.AlertDialog.Builder;
import android.content.DialogInterface;
import android.view.LayoutInflater;
import com.dinect.checker.Utils;
import com.dinect.checker.R;
public class CameraActivity extends AppCompatActivity implements Camera.PreviewCallback { public class CameraActivity extends AppCompatActivity implements Camera.PreviewCallback {
@@ -95,7 +65,7 @@ public class CameraActivity extends AppCompatActivity implements Camera.PreviewC
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
if(!isCameraAvailable()) { if (!isCameraAvailable()) {
// Cancel request if there is no rear-facing camera. // Cancel request if there is no rear-facing camera.
cancelRequest(); cancelRequest();
return; return;
@@ -154,7 +124,7 @@ public class CameraActivity extends AppCompatActivity implements Camera.PreviewC
// Open the default i.e. the first rear facing camera. // Open the default i.e. the first rear facing camera.
mCamera = Camera.open(); mCamera = Camera.open();
if(mCamera == null) { if (mCamera == null) {
// Cancel request if mCamera is null. // Cancel request if mCamera is null.
cancelRequest(); cancelRequest();
return; return;
@@ -231,7 +201,7 @@ public class CameraActivity extends AppCompatActivity implements Camera.PreviewC
private Runnable doAutoFocus = new Runnable() { private Runnable doAutoFocus = new Runnable() {
public void run() { public void run() {
if(mCamera != null && mPreviewing) { if (mCamera != null && mPreviewing) {
mCamera.autoFocus(autoFocusCB); mCamera.autoFocus(autoFocusCB);
} }
} }
@@ -303,7 +273,7 @@ public class CameraActivity extends AppCompatActivity implements Camera.PreviewC
} catch (IOException | JSONException e) { } catch (IOException | JSONException e) {
e.printStackTrace(); e.printStackTrace();
} }
} else if(code == 204) { } else if (code == 204) {
mPreviewing = true; mPreviewing = true;
Toast.makeText(this, "Пользователь с таким id не найден", Toast.LENGTH_SHORT).show(); Toast.makeText(this, "Пользователь с таким id не найден", Toast.LENGTH_SHORT).show();
} else { } else {
@@ -348,10 +318,10 @@ public class CameraActivity extends AppCompatActivity implements Camera.PreviewC
@Override @Override
public void run() { public void run() {
Request request = new Request.Builder() Request request = new Request.Builder()
.addHeader("DM-Authorization", "dmapptoken " + mAppToken) .addHeader("DM-Authorization", "dmapptoken " + mAppToken)
.addHeader("Authorization", "dmtoken " + mToken) .addHeader("Authorization", "dmtoken " + mToken)
.url(mUrl) .url(mUrl)
.build(); .build();
try { try {
OkHttpClient client = new OkHttpClient(); OkHttpClient client = new OkHttpClient();

57
android/app/src/main/java/com/dinect/checker/CameraPreview.java
View File

@@ -1,10 +1,10 @@
package com.dinect.checker; package com.dinect.checker;
import android.content.Context;
import android.app.Activity; import android.app.Activity;
import android.content.Context;
import android.hardware.Camera; import android.hardware.Camera;
import android.hardware.Camera.CameraInfo;
import android.hardware.Camera.AutoFocusCallback; import android.hardware.Camera.AutoFocusCallback;
import android.hardware.Camera.CameraInfo;
import android.hardware.Camera.PreviewCallback; import android.hardware.Camera.PreviewCallback;
import android.hardware.Camera.Size; import android.hardware.Camera.Size;
import android.util.Log; import android.util.Log;
@@ -13,6 +13,7 @@ import android.view.SurfaceHolder;
import android.view.SurfaceView; import android.view.SurfaceView;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
@@ -78,8 +79,8 @@ class CameraPreview extends ViewGroup implements SurfaceHolder.Callback {
previewWidth = mPreviewSize.width; previewWidth = mPreviewSize.width;
previewHeight = mPreviewSize.height; previewHeight = mPreviewSize.height;
} }
child.layout(0, 0,width, height); child.layout(0, 0, width, height);
} }
} }
@@ -146,9 +147,9 @@ class CameraPreview extends ViewGroup implements SurfaceHolder.Callback {
} }
public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) { public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {
if (holder.getSurface() == null){ if (holder.getSurface() == null) {
// preview surface does not exist // preview surface does not exist
return; return;
} }
if (mCamera != null) { if (mCamera != null) {
@@ -171,35 +172,35 @@ class CameraPreview extends ViewGroup implements SurfaceHolder.Callback {
int rotation = ((Activity) getContext()).getWindowManager().getDefaultDisplay().getRotation(); int rotation = ((Activity) getContext()).getWindowManager().getDefaultDisplay().getRotation();
int degrees = 0; int degrees = 0;
switch (rotation) { switch (rotation) {
case Surface.ROTATION_0: case Surface.ROTATION_0:
degrees = 0; degrees = 0;
break; break;
case Surface.ROTATION_90: case Surface.ROTATION_90:
degrees = 90; degrees = 90;
break; break;
case Surface.ROTATION_180: case Surface.ROTATION_180:
degrees = 180; degrees = 180;
break; break;
case Surface.ROTATION_270: case Surface.ROTATION_270:
degrees = 270; degrees = 270;
break; break;
} }
int result = 0; int result = 0;
// получаем инфо по камере cameraId // получаем инфо по камере cameraId
CameraInfo info = new CameraInfo(); CameraInfo info = new CameraInfo();
Camera.getCameraInfo(cameraId, info); Camera.getCameraInfo(cameraId, info);
// задняя камера // задняя камера
if (info.facing == CameraInfo.CAMERA_FACING_BACK) { if (info.facing == CameraInfo.CAMERA_FACING_BACK) {
result = ((360 - degrees) + info.orientation); result = ((360 - degrees) + info.orientation);
} else } else
// передняя камера // передняя камера
if (info.facing == CameraInfo.CAMERA_FACING_FRONT) { if (info.facing == CameraInfo.CAMERA_FACING_FRONT) {
result = ((360 - degrees) - info.orientation); result = ((360 - degrees) - info.orientation);
result += 360; result += 360;
} }
result = result % 360; result = result % 360;
mCamera.setDisplayOrientation(result); mCamera.setDisplayOrientation(result);
} }

15
android/app/src/main/java/com/dinect/checker/Utils.java
View File

@@ -1,16 +1,17 @@
package com.dinect.checker; package com.dinect.checker;
import android.content.Context; import android.content.Context;
import android.net.NetworkInfo;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.NetworkInfo;
public class Utils { public class Utils {
private Utils() {} private Utils() {
}
public static boolean isOnline(Context context) { public static boolean isOnline(Context context) {
ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo netInfo = cm.getActiveNetworkInfo(); NetworkInfo netInfo = cm.getActiveNetworkInfo();
return netInfo != null && netInfo.isConnected(); return netInfo != null && netInfo.isConnected();
} }
} }

84
android/app/src/main/res/layout/a_scanner.xml
View File

@@ -1,52 +1,58 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/rootLayout" android:id="@+id/rootLayout"
android:background="@android:color/white" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="match_parent"
android:layout_height="match_parent"> android:background="@android:color/white">
<LinearLayout android:orientation="vertical" <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:orientation="vertical">
<View android:layout_height="0dp" <View
android:layout_weight="0.5" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="0dp"
android:background="#с0000000" android:layout_marginBottom="56dp"
android:layout_marginBottom="56dp"/> android:layout_weight="0.5"
android:background="#с0000000" />
<View
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="56dp"
android:layout_weight="0.5"
android:background="#с0000000" />
<View android:layout_height="0dp"
android:layout_weight="0.5"
android:layout_width="match_parent"
android:background="#с0000000"
android:layout_marginTop="56dp"/>
</LinearLayout> </LinearLayout>
<View android:layout_width="match_parent" <View
android:layout_height="1dp" android:layout_width="match_parent"
android:layout_gravity="center" android:layout_height="1dp"
android:background="#00ff00" android:layout_gravity="center"
android:layout_marginBottom="56dp"/> android:layout_marginBottom="56dp"
android:background="#00ff00" />
<View android:layout_width="match_parent" <View
android:layout_height="1dp" android:layout_width="match_parent"
android:layout_gravity="center" android:layout_height="1dp"
android:background="#00ff00" android:layout_gravity="center"
android:layout_marginTop="56dp"/> android:layout_marginTop="56dp"
android:background="#00ff00" />
<android.support.v7.widget.Toolbar <android.support.v7.widget.Toolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
android:background="#eb0004" android:background="#eb0004"
app:titleTextColor="@android:color/white"/> app:titleTextColor="@android:color/white" />
<View android:id="@+id/toolbarShadow" <View
android:layout_width="match_parent" android:id="@+id/toolbarShadow"
android:layout_height="4dp" android:layout_width="match_parent"
android:layout_marginTop="?attr/actionBarSize" android:layout_height="4dp"
android:background="@drawable/shadow_bottom"/> android:layout_marginTop="?attr/actionBarSize"
android:background="@drawable/shadow_bottom" />
</FrameLayout> </FrameLayout>

32
android/app/src/main/res/layout/f_logout_dialog.xml
View File

@@ -1,32 +1,32 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@android:color/white"> android:background="@android:color/white"
android:orientation="vertical">
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical|left"
android:textColor="@android:color/black"
android:layout_marginTop="16dp"
android:layout_marginLeft="24dp" android:layout_marginLeft="24dp"
android:layout_marginRight="24dp" android:layout_marginRight="24dp"
android:layout_marginTop="16dp"
android:fontFamily="sans-serif-medium" android:fontFamily="sans-serif-medium"
android:textSize="18sp" android:gravity="center_vertical|left"
android:text="@string/logout_title" /> android:text="@string/logout_title"
android:textColor="@android:color/black"
android:textSize="18sp" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginLeft="24dp" android:layout_marginLeft="24dp"
android:layout_marginRight="24dp" android:layout_marginRight="24dp"
android:layout_marginTop="16dp"
android:fontFamily="sans-serif-light" android:fontFamily="sans-serif-light"
android:scaleType="center" android:scaleType="center"
android:textSize="18sp" android:text="@string/logout_text"
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:text="@string/logout_text" /> android:textSize="18sp" />
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -37,23 +37,23 @@
android:id="@+id/positiveButton" android:id="@+id/positiveButton"
android:layout_width="56dp" android:layout_width="56dp"
android:layout_height="42dp" android:layout_height="42dp"
android:scaleType="center"
android:layout_gravity="right|end" android:layout_gravity="right|end"
android:fontFamily="sans-serif-medium" android:fontFamily="sans-serif-medium"
android:scaleType="center"
android:text="@string/logout_yes"
android:textColor="#eb0004" android:textColor="#eb0004"
android:textSize="14sp" android:textSize="14sp" />
android:text="@string/logout_yes" />
<TextView <TextView
android:id="@+id/negativeButton" android:id="@+id/negativeButton"
android:layout_width="56dp" android:layout_width="56dp"
android:layout_height="42dp" android:layout_height="42dp"
android:layout_marginRight="64dp"
android:layout_gravity="right|end" android:layout_gravity="right|end"
android:layout_marginRight="64dp"
android:fontFamily="sans-serif-medium" android:fontFamily="sans-serif-medium"
android:text="@string/logout_no"
android:textColor="#eb0004" android:textColor="#eb0004"
android:textSize="14sp" android:textSize="14sp" />
android:text="@string/logout_no" />
</FrameLayout> </FrameLayout>

2
android/build.gradle
View File

@@ -5,7 +5,7 @@ buildscript {
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.2.3' classpath 'com.android.tools.build:gradle:2.2.3'
} }
} }
allprojects { allprojects {