From 592974441a4df95fffd9167c90192da1a390b1c2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 06 六月 2023 11:51:12 +0800
Subject: [PATCH] Merge branch 'Dev-Branch'
---
HDL-ON_Android/Scan.cs | 11 ++---------
1 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/HDL-ON_Android/Scan.cs b/HDL-ON_Android/Scan.cs
index f4f5de5..ea1bf16 100644
--- a/HDL-ON_Android/Scan.cs
+++ b/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,
--
Gitblit v1.8.0