更新app图标

Author: ailiwean

app/src/main/AndroidManifest.xml

@@ -7,9 +7,9 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@drawable/frame_foreground"
+        android:icon="@drawable/app_icon"
         android:label="@string/app_name"
-        android:roundIcon="@drawable/frame_foreground"
+        android:roundIcon="@drawable/app_icon"
         android:supportsRtl="true"
         android:theme="@style/Theme.AppCompat.NoActionBar"
         tools:ignore="GoogleAppIndexingWarning">

app/src/main/frame-playstore.png

@@ -17,7 +17,7 @@ import kotlinx.android.synthetic.main.floorview_layout.view.*
  * @Author:         SWY
  * @CreateDate:     2020/4/30 4:06 PM
  */
-class CusScanView @JvmOverloads constructor(context: Context, attributeSet: AttributeSet? = null, def: Int = 0) : FreeZxingView(context, attributeSet, def) {
+class CusScanView @JvmOverloads constructor(context: Context, attributeSet: AttributeSet? = null, def: Int = 0) : NBZxingView(context, attributeSet, def) {
 
     init {
         setAspectRatio(AspectRatio.of(16, 9))
@@ -48,27 +48,4 @@ class CusScanView @JvmOverloads constructor(context: Context, attributeSet: Attr
             Toast.makeText(context, "未扫描到内容", Toast.LENGTH_SHORT).show()
         else Toast.makeText(context, content, Toast.LENGTH_SHORT).show()
     }
-
-    override fun provideFloorView(): Int {
-        return R.layout.floorview_layout
-    }
-
-
-    override fun provideParseRectView(): View? {
-        return scanRectView
-    }
-
-    override fun provideScanBarView(): ScanBarCallBack? {
-        return scanBarView
-    }
-
-    override fun provideLightView(): ScanLightViewCallBack? {
-        return lightView
-    }
-
-    override fun provideLocView(): ScanLocViewCallBack? {
-        return locView
-    }
-
-
 }

app/src/main/java/com/android/NBZxing/CusScanView.kt

@@ -34,7 +34,7 @@
         android:layout_margin="5dp"
         android:background="@drawable/frame_foreground" />
 
-    <com.ailiwean.core.view.CameraZxingMaskView
+    <com.ailiwean.core.view.MaskView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:camera_clearById="@id/scanRectView"

app/src/main/res/drawable/app_icon.png

@@ -22,7 +22,7 @@
  * @Author: SWY
  * @CreateDate: 2020/9/2 9:48 AM
  */
-public class CameraZxingMaskView extends View {
+public class MaskView extends View {
 
     private Paint paint;
     private Rect clearRect;
@@ -34,24 +34,24 @@ public class CameraZxingMaskView extends View {
     private int id;
     private int bgColor;
 
-    public CameraZxingMaskView(Context context) {
+    public MaskView(Context context) {
         this(context, null);
     }
 
-    public CameraZxingMaskView(Context context, @Nullable AttributeSet attrs) {
+    public MaskView(Context context, @Nullable AttributeSet attrs) {
         this(context, attrs, 0);
     }
 
-    public CameraZxingMaskView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+    public MaskView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
         initPaint();
-        TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.CameraZxingMaskView);
-        id = typedArray.getResourceId(R.styleable.CameraZxingMaskView_camera_clearById, 0);
-        margin_left = typedArray.getDimension(R.styleable.CameraZxingMaskView_camera_clear_margin_left, 0f);
-        margin_top = typedArray.getDimension(R.styleable.CameraZxingMaskView_camera_clear_margin_top, 0f);
-        margin_right = typedArray.getDimension(R.styleable.CameraZxingMaskView_camera_clear_margin_right, 0f);
-        margin_bottom = typedArray.getDimension(R.styleable.CameraZxingMaskView_camera_clear_margin_bottom, 0f);
-        bgColor = typedArray.getColor(R.styleable.CameraZxingMaskView_camera_maskBgColor, Color.parseColor("#1f000000"));
+        TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.MaskView);
+        id = typedArray.getResourceId(R.styleable.MaskView_camera_clearById, 0);
+        margin_left = typedArray.getDimension(R.styleable.MaskView_camera_clear_margin_left, 0f);
+        margin_top = typedArray.getDimension(R.styleable.MaskView_camera_clear_margin_top, 0f);
+        margin_right = typedArray.getDimension(R.styleable.MaskView_camera_clear_margin_right, 0f);
+        margin_bottom = typedArray.getDimension(R.styleable.MaskView_camera_clear_margin_bottom, 0f);
+        bgColor = typedArray.getColor(R.styleable.MaskView_camera_maskBgColor, Color.parseColor("#1f000000"));
         paint.setColor(bgColor);
         typedArray.recycle();
     }

app/src/main/res/layout/floorview_layout.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/base_floor"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -27,9 +28,15 @@
 
     <View
         android:id="@+id/scanRectView"
-        android:layout_width="150dp"
-        android:layout_height="150dp"
-        android:layout_gravity="center"
-        android:background="#1f000000" />
+        android:layout_width="200dp"
+        android:layout_height="200dp"
+        android:layout_gravity="center" />
+
+
+    <com.ailiwean.core.view.MaskView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:camera_clearById="@id/scanRectView"
+        app:camera_maskBgColor="#5f000000" />
 
 </FrameLayout>

module_camera/src/main/java/com/ailiwean/core/view/CameraZxingMaskView.java renamed to module_camera/src/main/java/com/ailiwean/core/view/MaskView.java

@@ -10,7 +10,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <declare-styleable name="CameraView">
         <!--
           Set this to true if you want the CameraView to adjust its bounds to preserve the aspect
@@ -55,7 +55,7 @@
         </attr>
     </declare-styleable>
 
-    <declare-styleable name="CameraZxingMaskView">
+    <declare-styleable name="MaskView" tools:ignore="ResourceName">
 
         <attr name="camera_clearById" format="reference" />
         <attr name="camera_maskBgColor" format="color" />