Rename QRCodeWindowsUtils

2dust · 2dust · commit 38b2a7d2ca1d · 2025-10-31T17:50:28.000+08:00
diff --git a/v2rayN/v2rayN/Common/QRCodeWindowsUtils.cs b/v2rayN/v2rayN/Common/QRCodeWindowsUtils.cs
@@ -2,9 +2,9 @@
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
-namespace v2rayN;
+namespace v2rayN.Common;
 
-public class QRCodeUtils
+public class QRCodeWindowsUtils
 {
     public static ImageSource? GetQRCode(string? strContent)
     {
@@ -14,7 +14,7 @@ public class QRCodeUtils
         }
         try
         {
-            var qrCodeImage = ServiceLib.Common.QRCodeUtils.GenQRCode(strContent);
+            var qrCodeImage = QRCodeUtils.GenQRCode(strContent);
             return qrCodeImage is null ? null : ByteToImage(qrCodeImage);
         }
         catch (Exception ex)
diff --git a/v2rayN/v2rayN/GlobalUsings.cs b/v2rayN/v2rayN/GlobalUsings.cs
@@ -31,3 +31,4 @@
 global using ServiceLib.Models;
 global using ServiceLib.Resx;
 global using ServiceLib.ViewModels;
+global using v2rayN.Common;
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml.cs b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
@@ -328,7 +328,7 @@ private async Task ScanScreenTaskAsync()
 
         if (Application.Current?.MainWindow is Window window)
         {
-            var bytes = QRCodeUtils.CaptureScreen(window);
+            var bytes = QRCodeWindowsUtils.CaptureScreen(window);
             await ViewModel?.ScanScreenResult(bytes);
         }
 
diff --git a/v2rayN/v2rayN/Views/ProfilesView.xaml.cs b/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
@@ -170,7 +170,7 @@ private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
 
     public async void ShareServer(string url)
     {
-        var img = QRCodeUtils.GetQRCode(url);
+        var img = QRCodeWindowsUtils.GetQRCode(url);
         var dialog = new QrcodeView()
         {
             imgQrcode = { Source = img },
diff --git a/v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs b/v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs
@@ -64,7 +64,7 @@ private async void ShareSub(string url)
         {
             return;
         }
-        var img = QRCodeUtils.GetQRCode(url);
+        var img = QRCodeWindowsUtils.GetQRCode(url);
         var dialog = new QrcodeView()
         {
             imgQrcode = { Source = img },

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`	`using System.Windows.Media;`
`3`	`3`	`using System.Windows.Media.Imaging;`
`4`	`4`
`5`		`-namespace v2rayN;`
	`5`	`+namespace v2rayN.Common;`
`6`	`6`
`7`		`-public class QRCodeUtils`
	`7`	`+public class QRCodeWindowsUtils`
`8`	`8`	`{`
`9`	`9`	`public static ImageSource? GetQRCode(string? strContent)`
`10`	`10`	`{`
`@@ -14,7 +14,7 @@ public class QRCodeUtils`
`14`	`14`	`}`
`15`	`15`	`try`
`16`	`16`	`{`
`17`		`- var qrCodeImage = ServiceLib.Common.QRCodeUtils.GenQRCode(strContent);`
	`17`	`+ var qrCodeImage = QRCodeUtils.GenQRCode(strContent);`
`18`	`18`	`return qrCodeImage is null ? null : ByteToImage(qrCodeImage);`
`19`	`19`	`}`
`20`	`20`	`catch (Exception ex)`
Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,7 @@ private async Task ScanScreenTaskAsync()`
`328`	`328`
`329`	`329`	`if (Application.Current?.MainWindow is Window window)`
`330`	`330`	`{`
`331`		`- var bytes = QRCodeUtils.CaptureScreen(window);`
	`331`	`+ var bytes = QRCodeWindowsUtils.CaptureScreen(window);`
`332`	`332`	`await ViewModel?.ScanScreenResult(bytes);`
`333`	`333`	`}`
`334`	`334`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)`
`170`	`170`
`171`	`171`	`public async void ShareServer(string url)`
`172`	`172`	`{`
`173`		`- var img = QRCodeUtils.GetQRCode(url);`
	`173`	`+ var img = QRCodeWindowsUtils.GetQRCode(url);`
`174`	`174`	`var dialog = new QrcodeView()`
`175`	`175`	`{`
`176`	`176`	`imgQrcode = { Source = img },`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ private async void ShareSub(string url)`
`64`	`64`	`{`
`65`	`65`	`return;`
`66`	`66`	`}`
`67`		`- var img = QRCodeUtils.GetQRCode(url);`
	`67`	`+ var img = QRCodeWindowsUtils.GetQRCode(url);`
`68`	`68`	`var dialog = new QrcodeView()`
`69`	`69`	`{`
`70`	`70`	`imgQrcode = { Source = img },`