From eaca464f9cab7596f4bf2c74c286e2fb84f12144 Mon Sep 17 00:00:00 2001
From: proxysu <proxysu698@gamil.com>
Date: Sat, 27 Nov 2021 11:47:31 +0800
Subject: [PATCH] update...

---
 ProxySuper.Core/Services/XrayService.cs       |  3 +--
 .../Views/V2ray/V2rayConfigView.xaml          |  1 +
 .../Views/V2ray/V2rayConfigView.xaml.cs       | 16 ++++++++++++++++
 ProxySuper.WPF/Views/Xray/XrayConfigView.xaml |  1 +
 .../Views/Xray/XrayConfigView.xaml.cs         | 19 +++++++++++++++++--
 5 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/ProxySuper.Core/Services/XrayService.cs b/ProxySuper.Core/Services/XrayService.cs
index dce2df3..4c62dc9 100644
--- a/ProxySuper.Core/Services/XrayService.cs
+++ b/ProxySuper.Core/Services/XrayService.cs
@@ -268,7 +268,7 @@ namespace ProxySuper.Core.Services
         }
 
 
-        #region 似有方法
+        #region 私有方法
 
         private void DoUploadCert(object sender, CancelEventArgs e)
         {
@@ -424,7 +424,6 @@ namespace ProxySuper.Core.Services
             WriteToFile(configJson, "/etc/caddy/Caddyfile");
         }
 
-
         private void UninstallXray()
         {
             Progress.Desc = "关闭Xray服务";
diff --git a/ProxySuper.WPF/Views/V2ray/V2rayConfigView.xaml b/ProxySuper.WPF/Views/V2ray/V2rayConfigView.xaml
index 1bd3a07..728e2ab 100644
--- a/ProxySuper.WPF/Views/V2ray/V2rayConfigView.xaml
+++ b/ProxySuper.WPF/Views/V2ray/V2rayConfigView.xaml
@@ -22,6 +22,7 @@
                     BorderThickness="1,0,1,0" 
                     BorderBrush="#DDD" 
                     TabStripPlacement="Left"
+                    x:Name="TabCtrl"
                     SelectionChanged="BuildQrCode">
             <TabItem Width="200" Height="40"
                      Tag="{x:Static models:RayType.VLESS_TCP}"
diff --git a/ProxySuper.WPF/Views/V2ray/V2rayConfigView.xaml.cs b/ProxySuper.WPF/Views/V2ray/V2rayConfigView.xaml.cs
index 98b1c97..0a4b3e1 100644
--- a/ProxySuper.WPF/Views/V2ray/V2rayConfigView.xaml.cs
+++ b/ProxySuper.WPF/Views/V2ray/V2rayConfigView.xaml.cs
@@ -31,6 +31,22 @@ namespace ProxySuper.WPF.Views.V2ray
             InitializeComponent();
         }
 
+        protected override void OnRender(DrawingContext drawingContext)
+        {
+            base.OnRender(drawingContext);
+
+            for (int i = 0; i < TabCtrl.Items.Count; i++)
+            {
+                var tabItem = TabCtrl.Items[i] as TabItem;
+
+                if (Settings.Types.Contains((RayType)tabItem.Tag))
+                {
+                    TabCtrl.SelectedIndex = i;
+                    break;
+                }
+            }
+        }
+
         public V2raySettings Settings
         {
             get
diff --git a/ProxySuper.WPF/Views/Xray/XrayConfigView.xaml b/ProxySuper.WPF/Views/Xray/XrayConfigView.xaml
index 2a7df6a..eeca787 100644
--- a/ProxySuper.WPF/Views/Xray/XrayConfigView.xaml
+++ b/ProxySuper.WPF/Views/Xray/XrayConfigView.xaml
@@ -21,6 +21,7 @@
                     Padding="10"
                     BorderThickness="1,0,1,0" 
                     BorderBrush="#DDD" 
+                    x:Name="TabCtrl"
                     TabStripPlacement="Left"
                     SelectionChanged="BuildQrCode">
             <TabItem Width="200" Height="40"
diff --git a/ProxySuper.WPF/Views/Xray/XrayConfigView.xaml.cs b/ProxySuper.WPF/Views/Xray/XrayConfigView.xaml.cs
index 33932f9..0386632 100644
--- a/ProxySuper.WPF/Views/Xray/XrayConfigView.xaml.cs
+++ b/ProxySuper.WPF/Views/Xray/XrayConfigView.xaml.cs
@@ -7,6 +7,7 @@ using System.Drawing;
 using System.IO;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
 namespace ProxySuper.WPF.Views
@@ -21,6 +22,22 @@ namespace ProxySuper.WPF.Views
             InitializeComponent();
         }
 
+        protected override void OnRender(DrawingContext drawingContext)
+        {
+            base.OnRender(drawingContext);
+
+            for (int i = 0; i < TabCtrl.Items.Count; i++)
+            {
+                var tabItem = TabCtrl.Items[i] as TabItem;
+
+                if (Settings.Types.Contains((RayType)tabItem.Tag))
+                {
+                    TabCtrl.SelectedIndex = i;
+                    break;
+                }
+            }
+        }
+
         public XraySettings Settings
         {
             get
@@ -29,8 +46,6 @@ namespace ProxySuper.WPF.Views
             }
         }
 
-
-
         private void BuildQrCode(object sender, SelectionChangedEventArgs e)
         {
             var tabControl = e.Source as TabControl;