Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #17

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Dev #17

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .idea/caches/build_file_checksums.ser
Binary file not shown.
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ dependencies {
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'
}
5 changes: 1 addition & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
# Project-wide Gradle settings.

# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.

# 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
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
Expand Down
1 change: 0 additions & 1 deletion zxinglibrary/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />


<!--suppress AndroidUnknownAttribute -->
<application>
<activity
android:name=".android.CaptureActivity"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@

/**
* Created by yzq on 2017/10/18.
*
* <p>
* 解析图片的回调
*/

public interface DecodeImgCallback {
public void onImageDecodeSuccess(Result result);
void onImageDecodeSuccess(Result result);

public void onImageDecodeFailed();
void onImageDecodeFailed();
}