v2rayN/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.15.7</Version>
+        <Version>7.15.6</Version>
     </PropertyGroup>
 
     <PropertyGroup>

v2rayN/v2rayN/Common/QRCodeUtils.cs

@@ -2,9 +2,9 @@ using System.Drawing;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
-namespace v2rayN.Common;
+namespace v2rayN;
 
-public class QRCodeWindowsUtils
+public class QRCodeUtils
 {
     public static ImageSource? GetQRCode(string? strContent)
     {
@@ -14,7 +14,7 @@ public class QRCodeWindowsUtils
         }
         try
         {
-            var qrCodeImage = QRCodeUtils.GenQRCode(strContent);
+            var qrCodeImage = ServiceLib.Common.QRCodeUtils.GenQRCode(strContent);
             return qrCodeImage is null ? null : ByteToImage(qrCodeImage);
         }
         catch (Exception ex)

v2rayN/v2rayN/GlobalUsings.cs

@@ -31,4 +31,3 @@ global using ServiceLib.Manager;
 global using ServiceLib.Models;
 global using ServiceLib.Resx;
 global using ServiceLib.ViewModels;
-global using v2rayN.Common;

v2rayN/v2rayN/Views/MainWindow.xaml.cs

@@ -328,7 +328,7 @@ public partial class MainWindow
 
         if (Application.Current?.MainWindow is Window window)
         {
-            var bytes = QRCodeWindowsUtils.CaptureScreen(window);
+            var bytes = QRCodeUtils.CaptureScreen(window);
             await ViewModel?.ScanScreenResult(bytes);
         }
 

v2rayN/v2rayN/Views/ProfilesView.xaml.cs

@@ -170,7 +170,7 @@ public partial class ProfilesView
 
     public async void ShareServer(string url)
     {
-        var img = QRCodeWindowsUtils.GetQRCode(url);
+        var img = QRCodeUtils.GetQRCode(url);
         var dialog = new QrcodeView()
         {
             imgQrcode = { Source = img },

v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs

@@ -64,7 +64,7 @@ public partial class SubSettingWindow
         {
             return;
         }
-        var img = QRCodeWindowsUtils.GetQRCode(url);
+        var img = QRCodeUtils.GetQRCode(url);
         var dialog = new QrcodeView()
         {
             imgQrcode = { Source = img },