md

Author: iqosjay@gmail.com

.idea/caches/build_file_checksums.ser

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.3'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

.idea/codeStyles/Project.xml

@@ -7,7 +7,6 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx1536m
-android.enableAapt2=false
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

.idea/misc.xml

@@ -18,5 +18,6 @@ android {
 }
 
 dependencies {
+    implementation 'com.android.support:appcompat-v7:27.1.1'
     implementation 'com.google.zxing:core:3.3.0'
 }

.idea/vcs.xml

@@ -8,10 +8,11 @@
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.FLASHLIGHT" />
 
-    <application >
+    <application>
         <activity
             android:name=".app.QRScannerActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.AppCompat" />
     </application>
 </manifest>

build.gradle

@@ -1,21 +1,21 @@
 package com.iqos.qrscanner.app;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.content.res.AssetFileDescriptor;
 import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Vibrator;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
-import android.widget.ImageView;
-import android.widget.TextView;
 
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.Result;
@@ -29,22 +29,20 @@
 import java.util.Vector;
 
 
-public class QRScannerActivity extends Activity implements SurfaceHolder.Callback, View.OnClickListener {
+public class QRScannerActivity extends AppCompatActivity implements SurfaceHolder.Callback {
     private static final long VIBRATE_DURATION = 200L;
     private static final float BEEP_VOLUME = 0.10f;
     public static final int SCAN_RESULT_CODE = 15613;
     public static final String SCAN_RESULT = "scan_result";
     private ViewfinderView mScanView;
     private CaptureActivityHandler handler;
     private Vector<BarcodeFormat> decodeFormats;
+    private Toolbar mToolbar;
     private String characterSet;
     private InactivityTimer inactivityTimer;
     private MediaPlayer mediaPlayer;
-    private TextView mTvTitle;
-    private ImageView mIvBack;
     private boolean hasSurface;
     private boolean playBeep;
-
     private boolean vibrate;
 
     @Override
@@ -80,22 +78,31 @@ protected int getLayoutResources() {
      * 获取XML里面的控件
      */
     protected void findViews() {
-        mTvTitle = findViewById(R.id.app_tv_title);
-        mScanView = findViewById(R.id.viewfinder_view);
-        mIvBack = findViewById(R.id.app_iv_back);
+        this.mScanView = findViewById(R.id.viewfinder_view);
+        this.mToolbar = findViewById(R.id.app_scan_tool_bar);
     }
 
 
     /**
      * 初始化
      */
     protected void init() {
-        mTvTitle.setText(R.string.app_txt_scanner_title);
-        mIvBack.setOnClickListener(this);
         getWindow().setFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON, WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
         CameraManager.init(getApplication());
         hasSurface = false;
         inactivityTimer = new InactivityTimer(this);
+        setSupportActionBar(mToolbar);
+        ActionBar supportActionBar = getSupportActionBar();
+        if (null != supportActionBar) {
+            supportActionBar.setHomeButtonEnabled(true);
+            supportActionBar.setDisplayHomeAsUpEnabled(true);
+            mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    finish();
+                }
+            });
+        }
     }
 
     @Override
@@ -143,10 +150,6 @@ protected void onDestroy() {
      * @param result 扫描的结果
      */
     public void handleDecode(Result result) {
-        if (null == result) {
-            this.restartQRScanner();
-            return;
-        }
         inactivityTimer.onActivity();
         String resultStr = result.getText();
         Intent intent = new Intent();
@@ -246,17 +249,4 @@ public void onCompletion(MediaPlayer mediaPlayer) {
         }
     };
 
-    /**
-     * Called when a view has been clicked.
-     *
-     * @param v The view that was clicked.
-     */
-    @Override
-    public void onClick(View v) {
-        int id = v.getId();
-        if (R.id.app_iv_back == id) {
-            //返回
-            finish();
-        }
-    }
 }

gradle.properties

@@ -4,7 +4,10 @@
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
+import android.graphics.Paint;
 import android.graphics.PixelFormat;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffColorFilter;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.NinePatchDrawable;
@@ -52,6 +55,24 @@ public static Bitmap drawable2Bitmap(Drawable drawable) {
         }
     }
 
+    /**
+     * modify the bitmap's color.
+     *
+     * @param inBitmap  old bitmap.
+     * @param tintColor the color what you would like modify.
+     * @return bitmap after modified the color
+     */
+    public static Bitmap tintBitmap(Bitmap inBitmap, int tintColor) {
+        if (inBitmap == null) return null;
+        Bitmap outBitmap = Bitmap.createBitmap(inBitmap.getWidth(), inBitmap.getHeight(), inBitmap.getConfig());
+        Canvas canvas = new Canvas(outBitmap);
+        Paint paint = new Paint();
+        paint.setColorFilter(new PorterDuffColorFilter(tintColor, PorterDuff.Mode.SRC_IN));
+        canvas.drawBitmap(inBitmap, 0, 0, paint);
+        return outBitmap;
+    }
+
+
     /**
      * drawable to bitmap
      *