升级到api 28

zwc456baby · May 17, 2024 · d3f4510 · d3f4510
1 parent f24c4d3
commit d3f4510
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.0"
+    compileSdkVersion 28
+    // buildToolsVersion "26.0.0"
     defaultConfig {
         applicationId "com.vone.qrcode"
         minSdkVersion 19

diff --git a/app/src/main/java/com/google/zxing/encoding/EncodingHandler.java b/app/src/main/java/com/google/zxing/encoding/EncodingHandler.java
@@ -121,7 +121,7 @@ private static Bitmap addLogo(Bitmap src, Bitmap logo) {
 			canvas.drawBitmap(src, 0, 0, null);
 			canvas.scale(scaleFactor, scaleFactor, srcWidth / 2, srcHeight / 2);
 			canvas.drawBitmap(logo, (srcWidth - logoWidth) / 2, (srcHeight - logoHeight) / 2, null);
-			canvas.save(Canvas.ALL_SAVE_FLAG);
+			canvas.save();
 			canvas.restore();
 		} catch (Exception e) {
 			bitmap = null;

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists