diff --git a/app/build.gradle b/app/build.gradle index 97b5660..a1671dc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -64,8 +64,8 @@ dependencies { annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1' testCompile 'junit:junit:4.12' compile 'cn.bingoogolapple:bga-qrcode-zxing:1.3.6' - //compile project(':qnscalesdk') - compile("com.github.YolandaQingniu:qnscalesdk:2.3.6") { + compile project(':qnscalesdk') + /* compile("com.github.YolandaQingniu:qnscalesdk:2.3.6") { exclude module: "support-v4"//防止和module引用的v4资源版本不同 - } + }*/ } diff --git a/qnscalesdk/build.gradle b/qnscalesdk/build.gradle index 3df73fd..beae939 100644 --- a/qnscalesdk/build.gradle +++ b/qnscalesdk/build.gradle @@ -7,7 +7,7 @@ android { minSdkVersion 15//MIN_SDK_VERSION as int targetSdkVersion TARGET_SDK_VERSION as int versionCode 1 - versionName "qnsdk-2.3.6" + versionName "qnsdk-2.3.7" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } @@ -30,6 +30,6 @@ dependencies { }) testCompile 'junit:junit:4.12' compile "com.android.support:support-v4:$ANDROID_SUPPORT_VERSION" - compile files('libs/qnsdk-2.3.6.jar') + compile files('libs/qnsdk-2.3.7.jar') } diff --git a/qnscalesdk/libs/qnsdk-2.3.6.jar b/qnscalesdk/libs/qnsdk-2.3.7.jar similarity index 81% rename from qnscalesdk/libs/qnsdk-2.3.6.jar rename to qnscalesdk/libs/qnsdk-2.3.7.jar index 87af8ec..6cfc780 100644 Binary files a/qnscalesdk/libs/qnsdk-2.3.6.jar and b/qnscalesdk/libs/qnsdk-2.3.7.jar differ diff --git a/qnscalesdk/src/main/jniLibs/arm64-v8a/libyolanda_calc.so b/qnscalesdk/src/main/jniLibs/arm64-v8a/libyolanda_calc.so index 18ea758..02084bb 100755 Binary files a/qnscalesdk/src/main/jniLibs/arm64-v8a/libyolanda_calc.so and b/qnscalesdk/src/main/jniLibs/arm64-v8a/libyolanda_calc.so differ diff --git a/qnscalesdk/src/main/jniLibs/armeabi-v7a/libyolanda_calc.so b/qnscalesdk/src/main/jniLibs/armeabi-v7a/libyolanda_calc.so index 726f676..aaca8e2 100755 Binary files a/qnscalesdk/src/main/jniLibs/armeabi-v7a/libyolanda_calc.so and b/qnscalesdk/src/main/jniLibs/armeabi-v7a/libyolanda_calc.so differ diff --git a/qnscalesdk/src/main/jniLibs/armeabi/libyolanda_calc.so b/qnscalesdk/src/main/jniLibs/armeabi/libyolanda_calc.so index c2d5773..e8a54f7 100755 Binary files a/qnscalesdk/src/main/jniLibs/armeabi/libyolanda_calc.so and b/qnscalesdk/src/main/jniLibs/armeabi/libyolanda_calc.so differ diff --git a/qnscalesdk/src/main/jniLibs/mips/libyolanda_calc.so b/qnscalesdk/src/main/jniLibs/mips/libyolanda_calc.so index cfe024a..72a039a 100755 Binary files a/qnscalesdk/src/main/jniLibs/mips/libyolanda_calc.so and b/qnscalesdk/src/main/jniLibs/mips/libyolanda_calc.so differ diff --git a/qnscalesdk/src/main/jniLibs/mips64/libyolanda_calc.so b/qnscalesdk/src/main/jniLibs/mips64/libyolanda_calc.so index 7e8e7f0..5657170 100755 Binary files a/qnscalesdk/src/main/jniLibs/mips64/libyolanda_calc.so and b/qnscalesdk/src/main/jniLibs/mips64/libyolanda_calc.so differ diff --git a/qnscalesdk/src/main/jniLibs/x86/libyolanda_calc.so b/qnscalesdk/src/main/jniLibs/x86/libyolanda_calc.so index 8c006b7..59872d6 100755 Binary files a/qnscalesdk/src/main/jniLibs/x86/libyolanda_calc.so and b/qnscalesdk/src/main/jniLibs/x86/libyolanda_calc.so differ diff --git a/qnscalesdk/src/main/jniLibs/x86_64/libyolanda_calc.so b/qnscalesdk/src/main/jniLibs/x86_64/libyolanda_calc.so index 32eab79..a661c6f 100755 Binary files a/qnscalesdk/src/main/jniLibs/x86_64/libyolanda_calc.so and b/qnscalesdk/src/main/jniLibs/x86_64/libyolanda_calc.so differ