增加扫描本地二维码图片

Author: open-android

.idea/vcs.xml

@@ -8,6 +8,8 @@
 
 ![](screenshot2.gif)
 
+![](screenshot3.gif)
+
 ## 使用步骤
 
 ### 1. 在project的build.gradle添加如下代码(如下图)

README.MD

@@ -26,5 +26,6 @@ dependencies {
     })
     compile 'com.android.support:appcompat-v7:25.0.0'
     testCompile 'junit:junit:4.12'
-    compile 'com.github.open-android:Zxing:v1.0.2'
+    //    compile 'com.github.open-android:Zxing:v1.0.2'
+    compile project(':zxinglib')
 }

app/build.gradle

@@ -1,5 +1,6 @@
 package com.itheima.zxingdemo;
 
+import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.os.Bundle;
@@ -8,6 +9,8 @@
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
 
 import com.google.zxing.WriterException;
 import com.google.zxing.activity.CaptureActivity;
@@ -19,12 +22,17 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
     private EditText mEt;
     private Button mBtn2;
     private ImageView mImage;
+    private final static int REQ_CODE = 1028;
+    private Context mContext;
+    private TextView mTvResult;
+    private ImageView mImageCallback;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
         initView();
+        mContext = this;
     }
 
     private void initView() {
@@ -36,19 +44,31 @@ private void initView() {
         mBtn2.setOnClickListener(this);
         mImage = (ImageView) findViewById(R.id.image);
         mImage.setOnClickListener(this);
+        mTvResult = (TextView) findViewById(R.id.tv_result);
+        mTvResult.setOnClickListener(this);
+        mImageCallback = (ImageView) findViewById(R.id.image_callback);
+        mImageCallback.setOnClickListener(this);
     }
 
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.btn1:
-                startActivity(new Intent(MainActivity.this, CaptureActivity.class));
+//                startActivity(new Intent(MainActivity.this, CaptureActivity.class));
+                Intent intent = new Intent(mContext, CaptureActivity.class);
+                startActivityForResult(intent, REQ_CODE);
                 break;
             case R.id.btn2:
+                mImage.setVisibility(View.VISIBLE);
+                //隐藏扫码结果view
+                mImageCallback.setVisibility(View.GONE);
+                mTvResult.setVisibility(View.GONE);
+
                 String content = mEt.getText().toString().trim();
                 Bitmap bitmap = null;
                 try {
-                    bitmap = BitmapUtils.create2DCode(content);
+                    bitmap = BitmapUtils.create2DCode(content);//根据内容生成二维码
+                    mTvResult.setVisibility(View.GONE);
                     mImage.setImageBitmap(bitmap);
                 } catch (WriterException e) {
                     e.printStackTrace();
@@ -57,5 +77,28 @@ public void onClick(View v) {
         }
     }
 
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == REQ_CODE) {
+            mImage.setVisibility(View.GONE);
+            mTvResult.setVisibility(View.VISIBLE);
+            mImageCallback.setVisibility(View.VISIBLE);
+
+            String result = data.getStringExtra(CaptureActivity.SCAN_QRCODE_RESULT);
+            Bitmap bitmap = data.getParcelableExtra(CaptureActivity.SCAN_QRCODE_BITMAP);
+
+            mTvResult.setText("扫码结果："+result);
+            showToast("扫码结果：" + result);
+            if(bitmap != null){
+                mImageCallback.setImageBitmap(bitmap);//现实扫码图片
+            }
+        }
 
+
+    }
+
+    private void showToast(String msg) {
+        Toast.makeText(mContext, "" + msg, Toast.LENGTH_SHORT).show();
+    }
 }

app/src/main/java/com/itheima/zxingdemo/MainActivity.java

@@ -7,9 +7,9 @@
     <EditText
         android:id="@+id/et"
         android:layout_width="match_parent"
-        android:text="http://baidu.com"
         android:layout_height="wrap_content"
-        android:hint="输入内容，生成二维码" />
+        android:hint="输入内容，生成二维码"
+        android:text="http://baidu.com" />
 
     <Button
         android:id="@+id/btn2"
@@ -25,9 +25,27 @@
 
     <ImageView
         android:id="@+id/image"
-        android:layout_gravity="center_horizontal"
         android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal" />
+
+
+    <TextView
+        android:id="@+id/tv_result"
+        android:text="扫描返回bitmap"
+        android:gravity="center"
+        android:textSize="18sp"
+        android:textColor="#FF0000"
+        android:layout_marginTop="30dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
+    <ImageView
+        android:id="@+id/image_callback"
+        android:layout_marginTop="10dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal" />
+
 
 </LinearLayout>

app/src/main/res/layout/activity_main.xml

@@ -3,15 +3,22 @@
 # IDE (e.g. Android Studio) users:
 # Gradle settings configured through the IDE *will override*
 # any settings specified in this file.
+org.gradle.daemon=true
 
 # For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
 # 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
-# org.gradle.parallel=true
+org.gradle.parallel=true
+
+# Enables new incubating mode that makes Gradle selective when configuring projects.
+# Only relevant projects are configured which results in faster builds for large multi-projects.
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:configuration_on_demand
+org.gradle.configureondemand=true

gradle.properties

@@ -25,9 +25,5 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
     compile 'com.android.support:appcompat-v7:25.0.0'
-    testCompile 'junit:junit:4.12'
 }