CI
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
package com.king.zxing.app;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.hardware.Camera;
|
||||
import android.os.Bundle;
|
||||
import android.app.Activity;
|
||||
import android.support.v7.app.AppCompatActivity;
|
||||
import android.support.v4.app.Fragment;
|
||||
import android.support.v7.app.AppCompatActivity;
|
||||
import android.support.v7.widget.Toolbar;
|
||||
import android.view.MotionEvent;
|
||||
import android.view.SurfaceView;
|
||||
@@ -13,7 +13,6 @@ import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.king.zxing.CaptureHelper;
|
||||
import com.king.zxing.DecodeFormatManager;
|
||||
import com.king.zxing.OnCaptureCallback;
|
||||
import com.king.zxing.ViewfinderView;
|
||||
import com.king.zxing.app.util.StatusBarUtils;
|
||||
@@ -56,6 +55,7 @@ public class CustomActivity extends AppCompatActivity implements OnCaptureCallba
|
||||
isContinuousScan = getIntent().getBooleanExtra(MainActivity.KEY_IS_CONTINUOUS,false);
|
||||
|
||||
mCaptureHelper = new CaptureHelper(this,surfaceView,viewfinderView);
|
||||
mCaptureHelper.setOnCaptureCallback(this);
|
||||
mCaptureHelper.onCreate();
|
||||
mCaptureHelper.vibrate(true)
|
||||
.fullScreenScan(true)//全屏扫码
|
||||
|
||||
@@ -24,7 +24,6 @@ import android.widget.ImageView;
|
||||
import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.google.zxing.DecodeHintType;
|
||||
import com.king.zxing.CaptureActivity;
|
||||
import com.king.zxing.app.util.StatusBarUtils;
|
||||
import com.king.zxing.camera.CameraConfigurationUtils;
|
||||
@@ -87,7 +86,6 @@ public class CustomCaptureActivity extends CaptureActivity {
|
||||
return getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA_FLASH);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 扫码结果回调
|
||||
* @param result 扫码结果
|
||||
|
||||
@@ -19,7 +19,6 @@ import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.graphics.Color;
|
||||
import android.os.Build;
|
||||
import android.support.annotation.ColorInt;
|
||||
import android.support.annotation.FloatRange;
|
||||
import android.support.v7.widget.Toolbar;
|
||||
import android.view.View;
|
||||
@@ -33,8 +32,7 @@ import com.king.zxing.app.R;
|
||||
/**
|
||||
* @author Jenly <a href="mailto:jenly1314@gmail.com">Jenly</a>
|
||||
*/
|
||||
public enum StatusBarUtils {
|
||||
INSTANCE;
|
||||
public class StatusBarUtils {
|
||||
|
||||
public static void immersiveStatusBar(Activity activity,Toolbar toolbar) {
|
||||
immersiveStatusBar(activity,toolbar,0.0f);
|
||||
@@ -80,7 +78,7 @@ public enum StatusBarUtils {
|
||||
}
|
||||
|
||||
/** 获取状态栏高度 */
|
||||
public static int getStatusBarHeight(Context context) {
|
||||
private static int getStatusBarHeight(Context context) {
|
||||
return context.getResources().getDimensionPixelSize(R.dimen.status_bar_height);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user