From 099746292aa52a52fee8bbeaa34d8d77750c14a6 Mon Sep 17 00:00:00 2001
From: cebgcontract <99630598+cebgcontract@users.noreply.github.com>
Date: Tue, 8 Nov 2022 19:08:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=AB=E7=A0=81=E7=AD=89?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                |   3 +
 app/AndroidManifest.xml                       |   3 +
 app/build.gradle                              |   1 +
 .../com/fitchgc/jcwallet/MainActivity.java    |  57 ++++++++++++-----
 .../activity/CustomCaptureActivity.java       |  46 ++++++++++++++
 .../jcwallet/dialog/QRCodeActivity.java       |  10 +--
 app/src/com/jc/jcfw/JcSDK.java                |  19 +++++-
 .../res/layout/custom_capture_activity.xml    |  58 ++++++++++++++++++
 app/src/main/res/layout/qrcode_view.xml       |   5 +-
 res/drawable/flash_off.png                    | Bin 0 -> 1756 bytes
 res/drawable/flash_on.png                     | Bin 0 -> 1552 bytes
 res/drawable/flash_selected_selector.xml      |   5 ++
 res/drawable/qr_background.xml                |  10 +++
 res/values/strings.xml                        |   1 +
 res/values/styles.xml                         |   6 +-
 15 files changed, 197 insertions(+), 27 deletions(-)
 create mode 100644 app/src/com/fitchgc/jcwallet/activity/CustomCaptureActivity.java
 create mode 100644 app/src/main/res/layout/custom_capture_activity.xml
 create mode 100644 res/drawable/flash_off.png
 create mode 100644 res/drawable/flash_on.png
 create mode 100644 res/drawable/flash_selected_selector.xml
 create mode 100644 res/drawable/qr_background.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
index fee5c17..5df0807 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,9 +3,12 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
+        <entry key="../../../../.gradle/caches/transforms-2/files-2.1/1d876133b5a2bd3ea40b131cf9d28edb/jetified-zxing-lite-2.1.1/res/layout/zxl_capture.xml" value="0.14322916666666666" />
+        <entry key="app/src/main/res/layout/custom_capture_activity.xml" value="0.18840579710144928" />
         <entry key="app/src/main/res/layout/qr_vew.xml" value="0.125" />
         <entry key="app/src/main/res/layout/qrcode_view.xml" value="0.1421875" />
         <entry key="res/drawable/ic_launcher_background.xml" value="0.225" />
+        <entry key="res/drawable/qr_background.xml" value="0.153" />
         <entry key="res/layout/activity_main.xml" value="0.18840579710144928" />
       </map>
     </option>
diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml
index 5426f1b..113250b 100644
--- a/app/AndroidManifest.xml
+++ b/app/AndroidManifest.xml
@@ -29,6 +29,9 @@
         <activity
             android:name="com.king.zxing.CaptureActivity"
             android:theme="@style/CaptureTheme"/>
+        <activity
+            android:name=".activity.CustomCaptureActivity"
+            android:theme="@style/CaptureTheme"/>
         <!--
         This activity declaration is merged with the version from the library manifest.
         It demonstrates how an https redirect can be captured, in addition to or instead of
diff --git a/app/build.gradle b/app/build.gradle
index f4f350a..96ab256 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -138,4 +138,5 @@ dependencies {
     implementation "com.squareup.okio:okio:2.10.0"
     implementation 'com.android.volley:volley:1.2.1'
     implementation 'org.greenrobot:eventbus:3.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
 }
\ No newline at end of file
diff --git a/app/src/com/fitchgc/jcwallet/MainActivity.java b/app/src/com/fitchgc/jcwallet/MainActivity.java
index fda4fe0..1a478b9 100644
--- a/app/src/com/fitchgc/jcwallet/MainActivity.java
+++ b/app/src/com/fitchgc/jcwallet/MainActivity.java
@@ -16,6 +16,7 @@ import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.Window;
 
+import com.fitchgc.jcwallet.activity.CustomCaptureActivity;
 import com.fitchgc.jcwallet.dialog.QRCodeActivity;
 import com.google.android.gms.auth.api.signin.GoogleSignIn;
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
@@ -29,7 +30,6 @@ import com.jc.jcfw.JcSDK;
 import com.jc.jcfw.appauth.AuthStateManager;
 import com.jc.jcfw.appauth.JConfiguration;
 import com.king.zxing.CameraScan;
-import com.king.zxing.CaptureActivity;
 import com.king.zxing.util.CodeUtils;
 import com.king.zxing.util.LogUtils;
 import com.unity3d.player.UnityPlayer;
@@ -161,8 +161,7 @@ public class MainActivity extends Activity
         case REQUEST_CODE_SCAN:
           String result = CameraScan.parseScanResult(data);
           Log.i(TAG, "scan qrcode with funId: " +funId+ " result: " + result);
-          String jsonStr = String.format("{errcode: 0, data: '%s'}", result);
-          JcSDK.csCallback(funId, jsonStr);
+          JcSDK.scanQrCb(funId, null, result);
           funId = "";
           break;
         case REQUEST_CODE_PHOTO:
@@ -191,8 +190,21 @@ public class MainActivity extends Activity
           break;
       }
     } else {
-//      JcSDK.csCallback(funId, "{errcode: 0, errmsg: 'cancel'}");
-      funId = "";
+      boolean next = false;
+      if (requestCode == REQUEST_CODE_SCAN && data != null) {
+        if (data.getBooleanExtra("localImg", false)) {
+          startPhotoCode(this.funId);
+          next = true;
+        }
+      }
+      if (!next) {
+//        JcSDK.csCallback(funId, "{errcode: 0, errmsg: 'cancel'}");
+        if (requestCode == REQUEST_CODE_SCAN) {
+          JcSDK.scanQrCb(funId, "activity result with code: " + resultCode, null);
+        }
+        funId = "";
+      }
+
     }
   }
 
@@ -345,7 +357,6 @@ public class MainActivity extends Activity
   @Override
   public void onPermissionsDenied(int requestCode, List<String> list) {
     // Some permissions have been denied
-    // ...
     if (requestCode ==RC_CAMERA && null != funId && !"".equals(funId)) {
       JcSDK.csCallback(funId, "{errcode: 1, errmsg: 'no camera permission'}");
       funId = "";
@@ -356,7 +367,7 @@ public class MainActivity extends Activity
 
   // begin of qrcode
   /**
-   * 检测拍摄权限
+   * check if had permission for camera
    */
   @AfterPermissionGranted(RC_CAMERA)
   private void checkCameraPermissions(){
@@ -375,11 +386,14 @@ public class MainActivity extends Activity
    */
   private void startScan(String title){
     ActivityOptionsCompat optionsCompat = ActivityOptionsCompat.makeCustomAnimation(this,R.anim.in,R.anim.out);
-    Intent intent = new Intent(this, CaptureActivity.class);
+    Intent intent = new Intent(this, CustomCaptureActivity.class);
+//    Intent intent = new Intent(this, CaptureActivity.class);
     intent.putExtra(KEY_TITLE, title);
     intent.putExtra(KEY_IS_CONTINUOUS, false);
-    this.startActivityForResult(intent, REQUEST_CODE_SCAN, optionsCompat.toBundle());
-//    ActivityCompat.startActivityForResult(this, intent, REQUEST_CODE_SCAN, optionsCompat.toBundle());
+    runOnUiThread(() -> {
+      this.startActivityForResult(intent, REQUEST_CODE_SCAN, optionsCompat.toBundle());
+    });
+
   }
 
   private void asyncThread(Runnable runnable){
@@ -390,16 +404,19 @@ public class MainActivity extends Activity
     try {
       Bitmap bitmap = MediaStore.Images.Media.getBitmap(getContentResolver(),data.getData());
       asyncThread(() -> {
-        final String result = CodeUtils.parseCode(bitmap);
-        LogUtils.d("result:" + result);
-        String jsonStr = String.format("{errcode: 0, data: '%s'}", result);
-        JcSDK.csCallback(funId, jsonStr);
+        final String result = CodeUtils.parseQRCode(bitmap);
+        if (null == result || "".equals(result)) {
+          JcSDK.scanQrCb(funId, "no qrdeata", null);
+        } else {
+          LogUtils.d("result:" + result);
+          JcSDK.scanQrCb(funId, null, result);
+        }
         funId = "";
       });
 
     } catch (Exception e) {
       e.printStackTrace();
-      JcSDK.csCallback(funId, String.format("{errcode: 1, errmsg: '%s'}", e.toString()));
+      JcSDK.scanQrCb(funId, e.toString(), null);
       funId = "";
     }
 
@@ -411,6 +428,16 @@ public class MainActivity extends Activity
     checkCameraPermissions();
   }
 
+  /**
+   * start image scan
+   */
+  public void startPhotoCode(String funId){
+    Intent pickIntent = new Intent(Intent.ACTION_PICK,
+        MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
+    pickIntent.setDataAndType(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, "image/*");
+    startActivityForResult(pickIntent, REQUEST_CODE_PHOTO);
+  }
+
   // end of qrcode
 
   public void signWithGoogle(String funId) {
diff --git a/app/src/com/fitchgc/jcwallet/activity/CustomCaptureActivity.java b/app/src/com/fitchgc/jcwallet/activity/CustomCaptureActivity.java
new file mode 100644
index 0000000..e327a5b
--- /dev/null
+++ b/app/src/com/fitchgc/jcwallet/activity/CustomCaptureActivity.java
@@ -0,0 +1,46 @@
+package com.fitchgc.jcwallet.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.fitchgc.jcwallet.R;
+import com.king.zxing.CaptureActivity;
+
+import static com.fitchgc.jcwallet.MainActivity.KEY_TITLE;
+
+public class CustomCaptureActivity extends CaptureActivity {
+  private static final String TAG = CustomCaptureActivity.class.getSimpleName();
+
+  @Override
+  public int getLayoutId() {
+    return R.layout.custom_capture_activity;
+  }
+  @Override
+  public void onCreate(Bundle icicle) {
+    super.onCreate(icicle);
+    Intent in = getIntent();
+    String title = in.getStringExtra(KEY_TITLE);
+    Button localBtn = findViewById(R.id.qrLocalBtn);
+    localBtn.setOnClickListener(v -> onClickLocalImg());
+    TextView titleLabel = findViewById(R.id.scanQrTitleLabel);
+    titleLabel.setText(title);
+  }
+
+  @Override
+  public void initCameraScan() {
+    super.initCameraScan();
+    getCameraScan()
+        .setPlayBeep(true)
+        .setVibrate(true);
+  }
+
+  protected void onClickLocalImg(){
+    Intent ins=new Intent();
+    ins.putExtra("localImg", true);
+    setResult(1, ins);
+    finish();
+  }
+
+}
diff --git a/app/src/com/fitchgc/jcwallet/dialog/QRCodeActivity.java b/app/src/com/fitchgc/jcwallet/dialog/QRCodeActivity.java
index 54fed38..394617b 100644
--- a/app/src/com/fitchgc/jcwallet/dialog/QRCodeActivity.java
+++ b/app/src/com/fitchgc/jcwallet/dialog/QRCodeActivity.java
@@ -1,8 +1,8 @@
 package com.fitchgc.jcwallet.dialog;
 
+import android.app.Dialog;
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.os.Bundle;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -11,7 +11,7 @@ import com.fitchgc.jcwallet.MainActivity;
 import com.fitchgc.jcwallet.R;
 import com.king.zxing.util.CodeUtils;
 
-public class QRCodeActivity extends BaseDialog{
+public class QRCodeActivity extends Dialog {
 
   private final Context baseContent;
   private TextView titleLabel;
@@ -19,7 +19,7 @@ public class QRCodeActivity extends BaseDialog{
 
 
   public QRCodeActivity(Context context) {
-    super(context);
+    super(context, R.style.DialogStyle);
     baseContent = context;
   }
 
@@ -33,8 +33,8 @@ public class QRCodeActivity extends BaseDialog{
 
   public void showQRCode(String content, String title){
     new Thread(() -> {
-      Bitmap logo = BitmapFactory.decodeResource(baseContent.getResources(),R.drawable.zxl_flashlight_on);
-      Bitmap bitmap =  CodeUtils.createQRCode(content,600, logo);
+//      Bitmap logo = BitmapFactory.decodeResource(baseContent.getResources(),R.drawable.zxl_flashlight_on);
+      Bitmap bitmap =  CodeUtils.createQRCode(content,600, null);
       MainActivity.app.runOnUiThread(()->{
         titleLabel.setText(title);
         ivCode.setImageBitmap(bitmap);
diff --git a/app/src/com/jc/jcfw/JcSDK.java b/app/src/com/jc/jcfw/JcSDK.java
index 31b1f7f..81841dd 100644
--- a/app/src/com/jc/jcfw/JcSDK.java
+++ b/app/src/com/jc/jcfw/JcSDK.java
@@ -83,7 +83,6 @@ public class JcSDK {
   public static void googleOauthCb(String funId, String error, String idToken) {
     JSONObject result = new JSONObject();
     try {
-
       if (error != "" && null != error) {
         result.put("errocde", 1);
         result.put("errmessage", error);
@@ -98,4 +97,22 @@ public class JcSDK {
     String methodName = "jniCallback";
     JcSDK.runJS(funId, methodName, result.toString());
   }
+
+  public static void scanQrCb(String funId, String error, String data) {
+    JSONObject result = new JSONObject();
+    try {
+      if (error != "" && null != error) {
+        result.put("errocde", 1);
+        result.put("errmessage", error);
+      } else {
+        result.put("errocde", 0);
+        result.put("data", data);
+      }
+    } catch (JSONException e) {
+      e.printStackTrace();
+    }
+
+    String methodName = "jniCallback";
+    JcSDK.runJS(funId, methodName, result.toString());
+  }
 }
diff --git a/app/src/main/res/layout/custom_capture_activity.xml b/app/src/main/res/layout/custom_capture_activity.xml
new file mode 100644
index 0000000..8ac3595
--- /dev/null
+++ b/app/src/main/res/layout/custom_capture_activity.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+
+    <androidx.camera.view.PreviewView
+        android:id="@+id/previewView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+    <com.king.zxing.ViewfinderView
+        android:id="@+id/viewfinderView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:labelText="@string/tips_scan_code"
+        app:laserColor="@color/colorAccent"
+        app:frameColor="@color/colorPrimary"
+        app:cornerColor="@color/colorPrimary"
+        app:labelTextLocation="bottom"
+        app:laserStyle="grid" />
+    <ImageView
+        android:id="@+id/ivFlashlight"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/flash_selected_selector"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginTop="160dp" />
+    <TextView
+        android:id="@+id/scanQrTitleLabel"
+        android:text="sample label"
+        android:gravity="center_horizontal"
+        android:layout_marginTop="210dp"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        />
+    <Button
+        android:id="@+id/qrLocalBtn"
+        android:text="Select Image Local"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginTop="300dp"
+        android:textColor="@color/white"
+        />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/qrcode_view.xml b/app/src/main/res/layout/qrcode_view.xml
index 918496b..74acac6 100644
--- a/app/src/main/res/layout/qrcode_view.xml
+++ b/app/src/main/res/layout/qrcode_view.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
+    android:background="@drawable/qr_background"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -15,7 +14,7 @@
         />
     <TextView
         android:id="@+id/qrTitleLabel"
-        android:text="假装是 APP 主页"
+        android:text="sample label"
         android:gravity="center"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
diff --git a/res/drawable/flash_off.png b/res/drawable/flash_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..0aa92fe4a11c0b88f1fb2b3a5a9eadb931b7c65e
GIT binary patch
literal 1756
zcmaJ=c~BEq99}>um&iF558N({qJ>->F_BP05+F(-MlA6pAz4hsWRuMz0YMN?P((mH
zK&N%EAj}|Dt8#b%b`Z2E8bv@+Q4vuvMG-4h(+vvtkJ2}@`;Pg(?{~cKW%46Jr&`aj
z1^{3xH;gU7=OE)}X@URC<?4s{<ce{G*fJyzOBACpz?34fFvwMi*TDi<EKO23!vO$b
z_MJRRhzWV&bP1v$h>aM6R-wY#01)tlRwb6i!x$I~uaheokiPaZ1j?lhDB6!l;;C4$
zOdghu!po8)q9n=j5}FkHArK7E(s2O=jEO<5VuMmc*D|0nT{^xt9upyO41&copwCGO
zd3=zCpfKo1@b{LGeJLQ7Mj-o>XcS*BkU}C;i6knK?Bh)$(@Fkx9~$^&KzKA%8b=qf
zL%zhqcMM2|VJbS2n3$MINc15f=sF^qMxzl)6e5M<jU&7@NlHwt^;T-!#}(MHMuN&!
zm>f}pMn!Qfl7KNFJk!r5C{z=&O3jxx;SD2d#VR71Kr)sz4&?FvAF5DHpf#8P{+jQ9
z3TvX0R4`EhYmfv~f?r&myD^lC&O%`^hM-XhvSGZ7d>Miv8X2MjSuD^qTCS8LiJJLi
za2}7&RcbJ?QUY_?3<wt>$mLQxg}jjI&m^-+RB8yB%waNpsH6}-8i&N8`35f}`Hyqi
zh$KM)E3t8|^edM$Dc9%(g$j?%hEe%OSQ>&N3UI7qx_t6nf+yAc!j(>*3u{s?5l@C_
zyw`u-^Y{^N9^-PtwfJVj_plN-JBqvd{lLCI@yD{1%VtJtJNpZHGAE|<)!HJSZbMj;
zvXvF!++WW^w!5)&pYS4~T_<FxAg%o4i@QZy`+%hN+hv*A8S|J!()n&vBF!C`%xTa$
zKG%QFT#v@Czvgt*@$LP)I&!KI(V><&pGA7AfvRs&9$#BYb?kw1*ca>p(;&bSFad!n
zU=2r&=6Y~h@+0|P2b~`eHK5h2(;c7hs4KCHyR`p$4}m5)?{xULl@%$ax(|WjK1E?3
zZ_3M+R%#P$$gHJTtWLcXyP%-cu>?40`J_hpi{S79ILYgewp9n-nZGeS#~d)*$7$K7
z*V1QSJG*kgqm#SO&c!8MF!O2h-VOt)Rd1m(=^*V%NC|L^n-;{Vd^IBJP6|4^k}(T?
zYUng8Mw0Wazt4K(!1ErezUXy%@ON_|(|O^}xPsC3W{<ors+xKR2E&GXc})hOaY&cX
zu|Ikc==QS9xnEksKT}x3urUQr>-;ipmYx#!2S3u@+_-g6`!}Sw{&{tfwDqIEo0HnS
z(XFR(5G-mrnRID(M5*q6)u1WSR_AN8c}9-R*KVsGZA4<jsVSS>fadA9E<B4kTDRxO
zV6(oXW_d>a{Iw&hn}rDQsoQ!<c8H|%9$>$>_tvZ@uWL`w?5nj9)ixv$1k#$W*I8E^
zBSEu^S6pv4s#=z}V{au@4J_M?(lpyov{wZ~r`iIx)JtX!Rd+3pX?Hp%rO<ZQ`&D<f
zUyM6*_`T?E%(i;ngEDAOS~p#d-rrJQ-p_1a{?Mg!VA%cE?a<5TllqER*yqu*UQAi^
ztEt}FE6|-=?G-jc$q%#(<t&cz1a7!=J}A>cBNg{vjV6W}$}IbAz7f?1ckE0xY&up{
zn!9WIXGd7Rl;7~Y?!uqvZUvMLEC}vQy_49^d7bGD3?H!C@zYDBH@7c4lxK2#@3WAs
zBQ|_z+(PNVxSw`;0#2h_eoTuOt!UeL901?xI}lAw@s0SxVLwk`F`wF&km}k(sW35e
z(!t%WoP8hH6fA19y>duBo5<75F}QZWjXqRdx9X17sMdPxn)jmH4Wml_(*3Jsn>U?k
zpZd(UGS~*pZ%)aBKY&YARpF6rvB40NG3cYJIN3xtIEa96=L+-gZKFp6_~3FP*e8QU
G8UFxZV5}|x

literal 0
HcmV?d00001

diff --git a/res/drawable/flash_on.png b/res/drawable/flash_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc321fed4b6a5ce27cf31bf90b66c206502b674c
GIT binary patch
literal 1552
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
CVb=fv

literal 0
HcmV?d00001

diff --git a/res/drawable/flash_selected_selector.xml b/res/drawable/flash_selected_selector.xml
new file mode 100644
index 0000000..b20586c
--- /dev/null
+++ b/res/drawable/flash_selected_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true" android:drawable="@drawable/flash_on"/>
+    <item android:state_selected="false" android:drawable="@drawable/flash_off"/>
+</selector>
\ No newline at end of file
diff --git a/res/drawable/qr_background.xml b/res/drawable/qr_background.xml
new file mode 100644
index 0000000..4cb221e
--- /dev/null
+++ b/res/drawable/qr_background.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <solid android:color="#FFFFFF" />
+
+    <stroke
+        android:width="0.01dp"
+        android:color="#BFBFBF" />
+
+</shape>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 90f9743..2641f78 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4,4 +4,5 @@
     <string name="permission_camera">Scan QRCode need camera permission</string>
     <string name="qr_code_title">QRCode</string>
     <string name="default_web_client_id">165555585193-j22geb66hjku5ns5lq5voaj4v7811cl7.apps.googleusercontent.com</string>
+    <string name="tips_scan_code"></string>
 </resources>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index b4c76b7..3ef02a0 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -11,10 +11,10 @@
 </style>
 <style name="DialogStyle" parent="@android:style/Theme.Dialog">
     <item name="android:windowFrame">@null</item>
-    <item name="android:windowBackground">@color/transparent</item>
+    <item name="android:windowBackground">@color/white</item>
     <item name="android:windowNoTitle">true</item>
-    <item name="android:windowIsFloating">true</item>
-    <item name="android:windowContentOverlay">@null</item>
+    <item name="android:windowIsFloating">false</item>
+    <item name="android:windowContentOverlay">@color/white</item>
 </style>
 <style name="Dialog_bottom_enter_ani">
     <item name="android:windowEnterAnimation">@anim/dlg_enter</item>