Optimize and improve QR code display

v2rayN/ServiceLib/Common/QRCodeUtils.cs

@@ -1,4 +1,5 @@
 using QRCoder;
+using QRCoder.Exceptions;
 using SkiaSharp;
 using ZXing.SkiaSharp;
 
@@ -8,10 +9,45 @@ public class QRCodeUtils
 {
     public static byte[]? GenQRCode(string? url)
     {
+        if (url.IsNullOrEmpty())
+        {
+            return null;
+        }
         using QRCodeGenerator qrGenerator = new();
-        using var qrCodeData = qrGenerator.CreateQrCode(url ?? string.Empty, QRCodeGenerator.ECCLevel.Q);
-        using PngByteQRCode qrCode = new(qrCodeData);
-        return qrCode.GetGraphic(20);
+        DataTooLongException? lastDtle = null;
+
+        var levels = new[]
+        {
+            QRCodeGenerator.ECCLevel.H,
+            QRCodeGenerator.ECCLevel.Q,
+            QRCodeGenerator.ECCLevel.M,
+            QRCodeGenerator.ECCLevel.L
+        };
+        foreach (var level in levels)
+        {
+            try
+            {
+                using var qrCodeData = qrGenerator.CreateQrCode(url, level);
+                using PngByteQRCode qrCode = new(qrCodeData);
+                return qrCode.GetGraphic(20);
+            }
+            catch (DataTooLongException ex)
+            {
+                lastDtle = ex;
+                continue;
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+        if (lastDtle != null)
+        {
+            throw lastDtle;
+        }
+
+        return null;
     }
 
     public static string? ParseBarcode(string? fileName)

v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml

@@ -4,19 +4,25 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    d:DesignHeight="480"
-    d:DesignWidth="400"
+    xmlns:sys="clr-namespace:System;assembly=netstandard"
+    d:DesignHeight="600"
+    d:DesignWidth="600"
     mc:Ignorable="d">
+
+    <UserControl.Resources>
+        <sys:Double x:Key="QrcodeWidth">500</sys:Double>
+    </UserControl.Resources>
+
     <Grid Margin="32" RowDefinitions="Auto,Auto">
         <Image
             Name="imgQrcode"
-            Width="300"
-            Height="300" />
+            Width="{StaticResource QrcodeWidth}"
+            Height="{StaticResource QrcodeWidth}" />
 
         <TextBox
             x:Name="txtContent"
             Grid.Row="1"
-            Width="300"
+            Width="{StaticResource QrcodeWidth}"
             MaxHeight="100"
             Margin="{StaticResource MarginTb8}"
             VerticalAlignment="Center"

v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml.cs

@@ -23,8 +23,16 @@ public partial class QrcodeView : UserControl
 
     private Bitmap? GetQRCode(string? url)
     {
-        var bytes = QRCodeUtils.GenQRCode(url);
-        return ByteToBitmap(bytes);
+        try
+        {
+            var bytes = QRCodeUtils.GenQRCode(url);
+            return ByteToBitmap(bytes);
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog("GetQRCode", ex);
+            return null;
+        }
     }
 
     private Bitmap? ByteToBitmap(byte[]? bytes)

v2rayN/v2rayN/Common/QRCodeUtils.cs

@@ -20,8 +20,9 @@ public class QRCodeUtils
             var qrCodeImage = ServiceLib.Common.QRCodeUtils.GenQRCode(strContent);
             return qrCodeImage is null ? null : ByteToImage(qrCodeImage);
         }
-        catch
+        catch (Exception ex)
         {
+            Logging.SaveLog("GetQRCode", ex);
             return null;
         }
     }

v2rayN/v2rayN/Views/QrcodeView.xaml

@@ -1,4 +1,4 @@
-<UserControl
+<UserControl
     x:Class="v2rayN.Views.QrcodeView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -6,28 +6,33 @@
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
-    d:DesignHeight="300"
-    d:DesignWidth="300"
+    xmlns:sys="clr-namespace:System;assembly=mscorlib"
+    d:DesignHeight="600"
+    d:DesignWidth="600"
     Style="{StaticResource ViewGlobal}"
     mc:Ignorable="d">
+    <UserControl.Resources>
+        <sys:Double x:Key="QrcodeWidth">500</sys:Double>
+    </UserControl.Resources>
+
     <Grid Margin="32">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
-            <RowDefinition Height="60" />
+            <RowDefinition Height="80" />
         </Grid.RowDefinitions>
 
         <Image
             x:Name="imgQrcode"
             Grid.Row="0"
-            Width="300"
-            Height="300"
+            Width="{StaticResource QrcodeWidth}"
+            Height="{StaticResource QrcodeWidth}"
             Stretch="UniformToFill" />
 
         <TextBox
             x:Name="txtContent"
             Grid.Row="1"
-            Width="300"
+            Width="{StaticResource QrcodeWidth}"
             Margin="0,8"
             VerticalAlignment="Center"
             IsReadOnly="True"
@@ -46,4 +51,4 @@
             IsDefault="True"
             Style="{StaticResource DefButton}" />
     </Grid>
-</UserControl>
+</UserControl>