From b19c69283b821193dc79d93147d485e6462b6efc Mon Sep 17 00:00:00 2001 From: "DESKTOP-8NTIU8N\\YZQ" <1149635502@qq.com> Date: Wed, 4 Apr 2018 20:23:30 +0800 Subject: [PATCH 1/5] no message --- .idea/codeStyles/Project.xml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .idea/codeStyles/Project.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..30aa626 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + \ No newline at end of file From 70cb4aebeed8568f0f9482cff479f590b383206a Mon Sep 17 00:00:00 2001 From: yzq <1149635502@qq.com> Date: Mon, 9 Apr 2018 14:20:06 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=85=B3=E9=97=ADandroid.enableAapt2=3Dtru?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/caches/build_file_checksums.ser | Bin 589 -> 589 bytes .idea/misc.xml | 2 +- app/build.gradle | 4 ++-- gradle.properties | 2 +- .../yzq/zxinglibrary/decode/DecodeHandler.java | 2 +- .../zxinglibrary/decode/DecodeImgCallback.java | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index d3fd85f706781cc5165bd5dc12d42b05454ca1aa..1d3ce67d0993cd76676c679203f2dd5baf7439c5 100644 GIT binary patch delta 103 zcmV-t0GR*H1kD7Hm;|W^$j_0ScMxI<(vYoLhO~`tB`{)_jMI}N0XPGBdU2Cp0VEI_ zy<~2pda4os;MIbk(IZfkk^x2#-874`wY_4CE&L<*#WsPcljs3d5ms^ze8(eO)&R$t JKJfC-rF_(Fb@k^x2#^w!}o&gXs2mYU^{qjJ_=ljs3d5eiiIHjyIX=KctL JikDL#Qh12LFhc+U diff --git a/.idea/misc.xml b/.idea/misc.xml index 99202cc..ac59544 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -25,7 +25,7 @@ - + diff --git a/app/build.gradle b/app/build.gradle index 9e6187f..b716516 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,8 +25,8 @@ dependencies { implementation "com.android.support:design:$support_version" implementation "com.android.support:support-vector-drawable:$support_version" implementation 'com.yanzhenjie:permission:2.0.0-rc4' - //implementation project(':zxinglibrary') - implementation 'com.github.yuzhiqiang1993:zxing:2.1.6' + implementation project(':zxinglibrary') + // implementation 'com.github.yuzhiqiang1993:zxing:2.1.6' } diff --git a/gradle.properties b/gradle.properties index 1b647f9..7afb94c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. org.gradle.jvmargs=-Xmx1536m -android.enableAapt2=true +#android.enableAapt2=true # 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 diff --git a/zxinglibrary/src/main/java/com/yzq/zxinglibrary/decode/DecodeHandler.java b/zxinglibrary/src/main/java/com/yzq/zxinglibrary/decode/DecodeHandler.java index 7f97534..8fd2868 100644 --- a/zxinglibrary/src/main/java/com/yzq/zxinglibrary/decode/DecodeHandler.java +++ b/zxinglibrary/src/main/java/com/yzq/zxinglibrary/decode/DecodeHandler.java @@ -76,7 +76,7 @@ private void decode(byte[] data, int width, int height) { for (int x = 0; x < width; x++) rotatedData[x * height + height - y - 1] = data[x + y * width]; } - int tmp = width; // Here we are swapping, that's the difference to #11 + int tmp = width; width = height; height = tmp; data = rotatedData; diff --git a/zxinglibrary/src/main/java/com/yzq/zxinglibrary/decode/DecodeImgCallback.java b/zxinglibrary/src/main/java/com/yzq/zxinglibrary/decode/DecodeImgCallback.java index 6323fbf..a2151e8 100644 --- a/zxinglibrary/src/main/java/com/yzq/zxinglibrary/decode/DecodeImgCallback.java +++ b/zxinglibrary/src/main/java/com/yzq/zxinglibrary/decode/DecodeImgCallback.java @@ -4,12 +4,12 @@ /** * Created by yzq on 2017/10/18. - * + *

* 解析图片的回调 */ public interface DecodeImgCallback { - public void onImageDecodeSuccess(Result result); + void onImageDecodeSuccess(Result result); - public void onImageDecodeFailed(); + void onImageDecodeFailed(); } From 064cd284056dd19e533fcbd981a854651a575dac Mon Sep 17 00:00:00 2001 From: yzq <1149635502@qq.com> Date: Mon, 9 Apr 2018 14:47:31 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/caches/build_file_checksums.ser | Bin 589 -> 589 bytes app/build.gradle | 4 ++-- build.gradle | 4 ++-- gradle.properties | 5 +---- zxinglibrary/src/main/AndroidManifest.xml | 1 - 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 1d3ce67d0993cd76676c679203f2dd5baf7439c5..86fd12193b22f5d899f9efda7fbb6aa1a0122cf6 100644 GIT binary patch delta 73 zcmV-P0Ji_l1kD7HnFA)VJCU4s5Gqbbwhy3g109sEoUWhRkdq?;h!7+D)!qm&r@0r| fA^b;<4`7qK0f7;H=NDSy8!%z3+ki+_CF-Jhch?{F delta 73 zcmV-P0Ji_l1kD7HnF9#O&yk#W5Mm0_kgZvUw2f{hFk+XC(~~0sh!C0Q+-h}B62`z{ f|H=f40J)R90f7-#at?gQBU{!0$Cy6!e2P+d% - Date: Mon, 9 Apr 2018 15:13:50 +0800 Subject: [PATCH 4/5] no message --- .idea/misc.xml | 2 +- app/build.gradle | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index ac59544..199f869 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -25,7 +25,7 @@ - + diff --git a/app/build.gradle b/app/build.gradle index 3f122f4..3b1a3ec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,8 +25,5 @@ dependencies { implementation "com.android.support:design:$support_version" implementation "com.android.support:support-vector-drawable:$support_version" implementation 'com.yanzhenjie:permission:2.0.0-rc4' - implementation project(':zxinglibrary') // implementation 'com.github.yuzhiqiang1993:zxing:2.1.6' - - } From c141917ae841e28e1ded474d70e172069b8ca74c Mon Sep 17 00:00:00 2001 From: yzq <1149635502@qq.com> Date: Mon, 9 Apr 2018 16:44:52 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E7=9A=84=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/caches/build_file_checksums.ser | Bin 589 -> 589 bytes .idea/misc.xml | 4 ---- app/build.gradle | 6 +----- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 86fd12193b22f5d899f9efda7fbb6aa1a0122cf6..0b201d81a939223593c30870280e7ea6e30ae4b2 100644 GIT binary patch delta 94 zcmV-k0HOcQ1kD7HnFEFV7LlBH5N%R4>Qy@`6!lC*gD?dTG?OC%h!8%kzpRLd=`9}6 zxEgY+_?wfv0aFnAvXLa}%4CKZXbk5e3LLPL9s(W_O(T~^aZ9(t^UZSkkK#RKctbxZ AvH$=8 delta 94 zcmV-k0HOcQ1kD7HnFA)VJCU4s5Gqbbwhy3g109sEoUWhRkdq?;h!7+D)!qm&r@0r| zA^b;<4`7qK0aFk=SC+*$68+g?G*i1M7Z7ce9s(W_ediZi;u|nwtJ{D`RVC`8ct1fW A6aWAK diff --git a/.idea/misc.xml b/.idea/misc.xml index 0921dc3..ac59544 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -25,11 +25,7 @@ -<<<<<<< HEAD - -======= ->>>>>>> master diff --git a/app/build.gradle b/app/build.gradle index d85f187..2e6fd68 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,11 +25,7 @@ dependencies { implementation "com.android.support:design:$support_version" implementation "com.android.support:support-vector-drawable:$support_version" implementation 'com.yanzhenjie:permission:2.0.0-rc4' -<<<<<<< HEAD - // implementation 'com.github.yuzhiqiang1993:zxing:2.1.6' -======= implementation project(':zxinglibrary') + - //implementation 'com.github.yuzhiqiang1993:zxing:2.1.6' ->>>>>>> master }