update aar

Author: kalu-github

app/build.gradle

@@ -48,7 +48,7 @@ dependencies {
     implementation "androidx.camera:camera-extensions:1.0.0-alpha24"
 
     // 二维码
-     implementation(name: 'lib_zxing_r3.4.1_release_20210601', ext: 'aar')
+     implementation(name: 'lib_zxing_r3.4.1_release_20210602', ext: 'aar')
 //    implementation project(':lib_zxing_ui')
 }
 

app/libs/lib_zxing_r3.4.1_release_20210601.aar app/libs/lib_zxing_r3.4.1_release_20210602.aar

@@ -79,10 +79,8 @@ public final Result decode(@NonNull BinaryBitmap image, @Nullable Map<DecodeHint
             result.putMetadata(ResultMetadataType.ERROR_CORRECTION_LEVEL, ecLevel);
         }
         if (decoderResult.hasStructuredAppend()) {
-            result.putMetadata(ResultMetadataType.STRUCTURED_APPEND_SEQUENCE,
-                    decoderResult.getStructuredAppendSequenceNumber());
-            result.putMetadata(ResultMetadataType.STRUCTURED_APPEND_PARITY,
-                    decoderResult.getStructuredAppendParity());
+            result.putMetadata(ResultMetadataType.STRUCTURED_APPEND_SEQUENCE, decoderResult.getStructuredAppendSequenceNumber());
+            result.putMetadata(ResultMetadataType.STRUCTURED_APPEND_PARITY, decoderResult.getStructuredAppendParity());
         }
         return result;
     }

lib_zxing_source_qrcode/src/main/java/com/google/zxing/qrcode/QRCodeReader.java

@@ -25,7 +25,7 @@
 
         <provider
             android:name="lib.kalu.zxing.contentprovider.ContextProviderZxing"
-            android:authorities="${applicationId}.mediaplayer.contextprovider"
+            android:authorities="${applicationId}.zxing.contextprovider"
             android:exported="false"
             android:process=":zxing" />
 
@@ -35,6 +35,6 @@
             android:launchMode="singleTop"
             android:process=":zxing"
             android:screenOrientation="portrait"
-            android:theme="@style/QrcodeTheme" />
+            android:theme="@style/ThemeZxing" />
     </application>
 </manifest>

lib_zxing_ui/src/main/AndroidManifest.xml

@@ -124,37 +124,4 @@ default byte[] crop(@NonNull byte[] original, @NonNull int originalWidth, @NonNu
         }
         return crop;
     }
-
-    /**
-     * 直接对相机的原始数据裁剪, 裁剪后的byte[]扔给zxing直接处理
-     * 1. 裁剪区域
-     *
-     * @param original    相机原始帧数据：byte[]
-     * @param dataWidth   相机原始帧数据：width
-     * @param dataHeight  相机原始帧数据：height
-     * @param outWidth    裁剪输出帧数据：width
-     * @param outHeight   裁剪输出帧数据：height
-     * @param left        裁剪原始帧数据坐标：left
-     * @param top         裁剪原始帧数据坐标：top
-     * @param orientation 横屏竖屏
-     * @return
-     */
-    default byte[] cropOnly(@NonNull byte[] original, @NonNull int originalWidth, @NonNull int originalHeight, int cropWidth, int cropHeight, int cropLeft, int cropTop, int orientation) {
-        LogUtil.log("crop => orientation = " + (orientation == Configuration.ORIENTATION_PORTRAIT ? "竖屏" : "横屏") + ", originalWidth = " + originalWidth + ", originalHeight = " + originalHeight);
-
-        int yMin = cropTop;
-        int yMax = yMin + cropHeight;
-        int xMin = cropLeft;
-        int xMax = cropLeft + cropWidth;
-
-        byte[] crop = new byte[cropWidth * cropHeight];
-
-        for (int y = yMin; y < yMax; y++) {
-            for (int x = xMin; x < xMax; x++) {
-                // planA: 仅裁剪
-                crop[(x - xMin) + (y - cropTop) * cropWidth] = original[x + y * originalWidth];
-            }
-        }
-        return crop;
-    }
 }

lib_zxing_ui/src/main/java/lib/kalu/zxing/analyze/AnalyzerBaseImpl.java

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="QrcodeAnimation">
+    <style name="AnimationZxing">
         <item name="android:activityOpenEnterAnimation">@null</item>
         <item name="android:activityOpenExitAnimation">@null</item>
         <item name="android:activityCloseEnterAnimation">@null</item>
@@ -16,7 +16,7 @@
         <item name="android:taskToBackExitAnimation">@null</item>
     </style>
 
-    <style name="QrcodeTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="ThemeZxing" parent="Theme.AppCompat.DayNight.NoActionBar">
 
         // Dialog的windowFrame框为无
         <item name="android:windowFrame">@null</item>
@@ -31,7 +31,7 @@
         // 背景是否模糊显示
         <item name="android:backgroundDimEnabled">false</item>
         // 样式
-        <item name="android:windowAnimationStyle">@style/QrcodeAnimation</item>
+        <item name="android:windowAnimationStyle">@style/AnimationZxing</item>
         <item name="android:windowFullscreen">false</item>
     </style>
 

lib_zxing_ui/src/main/res/values/styles.xml

@@ -1,4 +1,4 @@
 include ':app'
-//include ':lib_zxing_ui'
-//include ':lib_zxing_source_all'
-//include ':lib_zxing_source_qrcode'
+include ':lib_zxing_ui'
+//include ':lib_zxing_source_qrcode'
+//include ':lib_zxing_source_all'