Merge remote-tracking branch 'origin/wjc' into release0123

wxr

2022-07-04 cc7eb0553e93844be984045bca3e335d4ae0dede

 HDL-ON_Android/ZXingOverlayView.cs

@@ -7,7 +7,7 @@

namespace GateWay.Droid
{
    public class ZXingOverlayView: View
    public class ZXingOverlayView : View
    {
        float screenRate;
        float lineWidth;
@@ -50,7 +50,7 @@
            lineWidth = 2 * context.Resources.DisplayMetrics.Density;
            textSize = 16 * context.Resources.DisplayMetrics.Density;

    

        }

        //添加屏幕半透明填充色