Merge branch 'Dev-Branch'

wxr

2023-06-06 592974441a4df95fffd9167c90192da1a390b1c2

 HDL-ON_Android/Scan.cs

@@ -36,15 +36,6 @@
        public void OpenScan(Action<string> action)
        {
            resultAction = action;
            //string cancel = "取消";
            //string flashText = "";
            //string titleText = "二维码扫描";
            //if (Language.CurrentLanguage != "Chinese")
            //{
            //    cancel = "Cancel";
            //    flashText = "";
            //    titleText = "Scan";
            //}

            ((BaseActivity)Shared.Application.Activity).SetCamera(async (obj) =>
            {
@@ -122,6 +113,8 @@

        public static byte[] BytesFromText(string text, int width = 300, int height = 300)
        {
            if (text == "") return null;

            var barcodeWriter = new ZXing.Mobile.BarcodeWriter
            {
                Format = ZXing.BarcodeFormat.QR_CODE,