Merge 18ccabd193 into c2c13ad318

v2rayN/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.14.12</Version>
+        <Version>7.14.11</Version>
     </PropertyGroup>
 
     <PropertyGroup>

v2rayN/Directory.Packages.props

@@ -18,8 +18,8 @@
     <PackageVersion Include="ReactiveUI" Version="20.4.1" />
     <PackageVersion Include="ReactiveUI.Fody" Version="19.5.41" />
     <PackageVersion Include="ReactiveUI.WPF" Version="20.4.1" />
-    <PackageVersion Include="Semi.Avalonia" Version="11.2.1.10" />
+    <PackageVersion Include="Semi.Avalonia" Version="11.2.1.9" />
-    <PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.2.1.10" />
+    <PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.2.1.9" />
     <PackageVersion Include="Splat.NLog" Version="16.2.1" />
     <PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
     <PackageVersion Include="TaskScheduler" Version="2.12.2" />

v2rayN/ServiceLib/Common/QRCodeUtils.cs

@@ -1,5 +1,4 @@
 using QRCoder;
-using QRCoder.Exceptions;
 using SkiaSharp;
 using ZXing.SkiaSharp;
 
@@ -9,46 +8,11 @@ public class QRCodeUtils
 {
     public static byte[]? GenQRCode(string? url)
     {
-        if (url.IsNullOrEmpty())
-        {
-            return null;
-        }
         using QRCodeGenerator qrGenerator = new();
-        DataTooLongException? lastDtle = null;
+        using var qrCodeData = qrGenerator.CreateQrCode(url ?? string.Empty, QRCodeGenerator.ECCLevel.Q);
-
-        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,25 +4,19 @@
     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"
-    xmlns:sys="clr-namespace:System;assembly=netstandard"
+    d:DesignHeight="480"
-    d:DesignHeight="600"
+    d:DesignWidth="400"
-    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="{StaticResource QrcodeWidth}"
+            Width="300"
-            Height="{StaticResource QrcodeWidth}" />
+            Height="300" />
 
         <TextBox
             x:Name="txtContent"
             Grid.Row="1"
-            Width="{StaticResource QrcodeWidth}"
+            Width="300"
             MaxHeight="100"
             Margin="{StaticResource MarginTb8}"
             VerticalAlignment="Center"

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

@@ -22,18 +22,10 @@ public partial class QrcodeView : UserControl
     }
 
     private Bitmap? GetQRCode(string? url)
-    {
-        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,9 +20,8 @@ public class QRCodeUtils
             var qrCodeImage = ServiceLib.Common.QRCodeUtils.GenQRCode(strContent);
             return qrCodeImage is null ? null : ByteToImage(qrCodeImage);
         }
-        catch (Exception ex)
+        catch
         {
-            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,33 +6,28 @@
     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"
-    xmlns:sys="clr-namespace:System;assembly=mscorlib"
+    d:DesignHeight="300"
-    d:DesignHeight="600"
+    d:DesignWidth="300"
-    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="80" />
+            <RowDefinition Height="60" />
         </Grid.RowDefinitions>
 
         <Image
             x:Name="imgQrcode"
             Grid.Row="0"
-            Width="{StaticResource QrcodeWidth}"
+            Width="300"
-            Height="{StaticResource QrcodeWidth}"
+            Height="300"
             Stretch="UniformToFill" />
 
         <TextBox
             x:Name="txtContent"
             Grid.Row="1"
-            Width="{StaticResource QrcodeWidth}"
+            Width="300"
             Margin="0,8"
             VerticalAlignment="Center"
             IsReadOnly="True"