diff --git a/app/build.gradle b/app/build.gradle index ed9f558..99b06c7 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.0-beta6") { + compile project(':qnscalesdk') + /* compile("com.github.YolandaQingniu:qnscalesdk:2.3.0-beta6") { exclude module: "support-v4"//防止和module引用的v4资源版本不同 - } + }*/ } diff --git a/qnscalesdk/build.gradle b/qnscalesdk/build.gradle index 2e1db66..8c034b3 100644 --- a/qnscalesdk/build.gradle +++ b/qnscalesdk/build.gradle @@ -30,5 +30,5 @@ dependencies { }) testCompile 'junit:junit:4.12' compile "com.android.support:support-v4:$ANDROID_SUPPORT_VERSION" - compile files('libs/qnsdk-2.2.2.jar') + compile files('libs/qnsdk-2.3.0-beta7.jar') } diff --git a/qnscalesdk/libs/qnsdk-2.2.2.jar b/qnscalesdk/libs/qnsdk-2.3.0-beta7.jar similarity index 66% rename from qnscalesdk/libs/qnsdk-2.2.2.jar rename to qnscalesdk/libs/qnsdk-2.3.0-beta7.jar index b967a8f..a56d369 100644 Binary files a/qnscalesdk/libs/qnsdk-2.2.2.jar and b/qnscalesdk/libs/qnsdk-2.3.0-beta7.jar differ