up 7.12.7

https://github.com/2dust/v2rayN/issues/7387

v2rayN/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.12.6</Version>
+        <Version>7.12.7</Version>
     </PropertyGroup>
 
     <PropertyGroup>

v2rayN/ServiceLib/Handler/ConfigHandler.cs

@@ -1979,7 +1979,7 @@ public class ConfigHandler
             items = await AppHandler.Instance.RoutingItems();
         }
 
-        if (!blImportAdvancedRules && items.Where(t => t.Remarks.StartsWith(ver)).ToList().Count > 0)
+        if (!blImportAdvancedRules && items.Count > 0)
         {
             return 0;
         }

v2rayN/ServiceLib/Services/SpeedtestService.cs

@@ -196,6 +196,7 @@ public class SpeedtestService
             {
                 return false;
             }
+            await Task.Delay(1000);
 
             var downloadHandle = new DownloadService();
 
@@ -255,9 +256,13 @@ public class SpeedtestService
                 try
                 {
                     pid = await CoreHandler.Instance.LoadCoreConfigSpeedtest(it);
-                    if (pid > 0)
+                    if (pid < 0)
                     {
-                        await Task.Delay(500);
+                        UpdateFunc(it.IndexId, "", ResUI.FailedToRunCore);
+                    }
+                    else
+                    {
+                        await Task.Delay(1000);
                         var delay = await DoRealPing(downloadHandle, it);
                         if (blSpeedTest)
                         {
@@ -271,10 +276,6 @@ public class SpeedtestService
                             }
                         }
                     }
-                    else
-                    {
-                        UpdateFunc(it.IndexId, "", ResUI.FailedToRunCore);
-                    }
                 }
                 catch (Exception ex)
                 {

v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs

@@ -552,6 +552,7 @@ public class MainWindowViewModel : MyReactiveObject
         {
             await LoadCore();
             await SysProxyHandler.UpdateSysProxy(_config, false);
+            await Task.Delay(1000);
         });
         Locator.Current.GetService<StatusBarViewModel>()?.TestServerAvailability();
 

v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs

@@ -499,10 +499,18 @@ public class StatusBarViewModel : MyReactiveObject
     public void UpdateStatistics(ServerSpeedItem update)
     {
         try
+        {
+            if (_config.IsRunningCore(ECoreType.sing_box))
+            {
+                SpeedProxyDisplay = string.Format(ResUI.SpeedDisplayText, EInboundProtocol.mixed, Utils.HumanFy(update.ProxyUp), Utils.HumanFy(update.ProxyDown));
+                SpeedDirectDisplay = string.Empty;
+            }
+            else
             {
                 SpeedProxyDisplay = string.Format(ResUI.SpeedDisplayText, Global.ProxyTag, Utils.HumanFy(update.ProxyUp), Utils.HumanFy(update.ProxyDown));
                 SpeedDirectDisplay = string.Format(ResUI.SpeedDisplayText, Global.DirectTag, Utils.HumanFy(update.DirectUp), Utils.HumanFy(update.DirectDown));
             }
+        }
         catch
         {
         }

v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml

@@ -34,7 +34,7 @@
                 IsCancel="True" />
         </StackPanel>
 
-        <TabControl HorizontalContentAlignment="Left">
+        <TabControl HorizontalContentAlignment="Stretch">
             <TabItem Header="{x:Static resx:ResUI.TbSettingsCoreDns}">
                 <DockPanel Margin="{StaticResource Margin8}">
                     <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
@@ -90,16 +90,18 @@
                         </StackPanel>
                     </WrapPanel>
 
-                    <Grid Margin="{StaticResource Margin4}">
+                    <HeaderedContentControl
-                        <TextBox
-                            x:Name="txtnormalDNS"
                         Margin="{StaticResource Margin4}"
-                            VerticalAlignment="Stretch"
+                        BorderBrush="Gray"
                         BorderThickness="1"
+                        Header="HTTP/SOCKS">
+                        <TextBox
+                            Name="txtnormalDNS"
+                            VerticalAlignment="Stretch"
                             Classes="TextArea"
-                            TextWrapping="Wrap"
+                            MinLines="10"
-                            Watermark="HTTP/SOCKS" />
+                            TextWrapping="Wrap" />
-                    </Grid>
+                    </HeaderedContentControl>
                 </DockPanel>
             </TabItem>
 
@@ -144,31 +146,34 @@
 
                     <Grid Margin="{StaticResource Margin4}" ColumnDefinitions="*,10,*">
 
-                        <TextBox
+                        <HeaderedContentControl
-                            x:Name="txtnormalDNS2"
                             Grid.Column="0"
-                            Width="400"
+                            BorderBrush="Gray"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch"
                             BorderThickness="1"
+                            Header="HTTP/SOCKS">
+                            <TextBox
+                                Name="txtnormalDNS2"
+                                VerticalAlignment="Stretch"
                                 Classes="TextArea"
-                            Margin="{StaticResource Margin4}"
+                                MinLines="10"
-                            TextWrapping="Wrap"
+                                TextWrapping="Wrap" />
-                            Watermark="HTTP/SOCKS" />
+                        </HeaderedContentControl>
 
                         <GridSplitter Grid.Column="1" HorizontalAlignment="Stretch" />
 
-                        <TextBox
+                        <HeaderedContentControl
-                            x:Name="txttunDNS2"
                             Grid.Column="2"
-                            Width="400"
+                            BorderBrush="Gray"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch"
                             BorderThickness="1"
+                            Header="{x:Static resx:ResUI.TbSettingsTunMode}">
+                            <TextBox
+                                Name="txttunDNS2"
+                                VerticalAlignment="Stretch"
                                 Classes="TextArea"
-                            Margin="{StaticResource Margin4}"
+                                MinLines="10"
-                            TextWrapping="Wrap"
+                                TextWrapping="Wrap" />
-                            Watermark="{x:Static resx:ResUI.TbSettingsTunMode}" />
+                        </HeaderedContentControl>
+
                     </Grid>
                 </DockPanel>
             </TabItem>

v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs

@@ -215,7 +215,7 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
             await ViewModel.RefreshServersBiz();
         }
 
-        if (lstProfiles.SelectedIndex > 0)
+        if (lstProfiles.SelectedIndex >= 0)
         {
             lstProfiles.ScrollIntoView(lstProfiles.SelectedItem, null);
         }
@@ -347,6 +347,24 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
     {
         try
         {
+            //First scroll horizontally to the initial position to avoid the control crash bug
+            if (lstProfiles.SelectedIndex >= 0)
+            {
+                lstProfiles.ScrollIntoView(lstProfiles.SelectedItem, lstProfiles.Columns[0]);
+            }
+            else
+            {
+                var model = lstProfiles.ItemsSource.Cast<ProfileItemModel>();
+                if (model.Any())
+                {
+                    lstProfiles.ScrollIntoView(model.First(), lstProfiles.Columns[0]);
+                }
+                else
+                {
+                    return;
+                }
+            }
+
             foreach (var it in lstProfiles.Columns)
             {
                 it.Width = new DataGridLength(1, DataGridLengthUnitType.Auto);

v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml

@@ -24,28 +24,11 @@
                 <MenuItem x:Name="menuRoutingAdvancedAdd2" Header="{x:Static resx:ResUI.menuRoutingAdvancedAdd}" />
                 <MenuItem x:Name="menuRoutingAdvancedImportRules2" Header="{x:Static resx:ResUI.menuRoutingAdvancedImportRules}" />
             </Menu>
-
-            <TextBlock VerticalAlignment="Center">
-                <HyperlinkButton Classes="WithIcon" Click="linkdomainStrategy_Click">
-                    <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy}" />
-                </HyperlinkButton>
-            </TextBlock>
-            <ComboBox x:Name="cmbdomainStrategy" Width="110" />
-            <Separator />
-            <TextBlock VerticalAlignment="Center" Text="{x:Static resx:ResUI.TbdomainMatcher}" />
-            <ComboBox x:Name="cmbdomainMatcher" Width="60" />
-            <Separator />
-            <TextBlock VerticalAlignment="Center">
-                <HyperlinkButton Classes="WithIcon" Click="linkdomainStrategy4Singbox_Click">
-                    <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy4Singbox}" />
-                </HyperlinkButton>
-            </TextBlock>
-            <ComboBox x:Name="cmbdomainStrategy4Singbox" Width="100" />
         </StackPanel>
 
         <StackPanel
-            HorizontalAlignment="Right"
             Margin="{StaticResource Margin4}"
+            HorizontalAlignment="Right"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
             <StackPanel
@@ -69,7 +52,62 @@
                 IsCancel="True" />
         </StackPanel>
 
-        <DockPanel>
+        <Grid
+            Margin="{StaticResource Margin4}"
+            ColumnDefinitions="Auto,Auto"
+            DockPanel.Dock="Top"
+            RowDefinitions="Auto,Auto,Auto">
+
+            <TextBlock
+                Grid.Row="0"
+                Grid.Column="0"
+                Margin="{StaticResource Margin4}"
+                VerticalAlignment="Center">
+                <HyperlinkButton Classes="WithIcon" Click="linkdomainStrategy_Click">
+                    <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy}" />
+                </HyperlinkButton>
+            </TextBlock>
+            <ComboBox
+                x:Name="cmbdomainStrategy"
+                Grid.Row="0"
+                Grid.Column="1"
+                Width="300"
+                Margin="{StaticResource Margin4}"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Center" />
+
+            <TextBlock
+                Grid.Row="1"
+                Grid.Column="0"
+                Margin="{StaticResource Margin4}"
+                VerticalAlignment="Center"
+                Text="{x:Static resx:ResUI.TbdomainMatcher}" />
+            <ComboBox
+                x:Name="cmbdomainMatcher"
+                Grid.Row="1"
+                Grid.Column="1"
+                Width="300"
+                Margin="{StaticResource Margin4}" />
+
+            <TextBlock
+                Grid.Row="2"
+                Grid.Column="0"
+                Margin="{StaticResource Margin4}"
+                VerticalAlignment="Center">
+                <HyperlinkButton Classes="WithIcon" Click="linkdomainStrategy4Singbox_Click">
+                    <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy4Singbox}" />
+                </HyperlinkButton>
+            </TextBlock>
+            <ComboBox
+                x:Name="cmbdomainStrategy4Singbox"
+                Grid.Row="2"
+                Grid.Column="1"
+                Width="300"
+                Margin="{StaticResource Margin4}"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Center" />
+        </Grid>
+
         <TabControl x:Name="tabAdvanced">
             <TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.TbRoutingTabRuleList}">
                 <DataGrid
@@ -122,5 +160,4 @@
             </TabItem>
         </TabControl>
     </DockPanel>
-    </DockPanel>
 </Window>

v2rayN/v2rayN/Views/RoutingSettingWindow.xaml

@@ -1,4 +1,4 @@
-<reactiveui:ReactiveWindow
+<reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.RoutingSettingWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -29,68 +29,25 @@
                 VerticalAlignment="Center"
                 ClipToBounds="True"
                 Style="{StaticResource MaterialDesignToolBar}">
-                <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
+                <Button x:Name="menuRoutingAdvancedAdd2">
-                    <MenuItem x:Name="menuRoutingAdvanced" Padding="8,0">
-                        <MenuItem.Header>
                     <StackPanel Orientation="Horizontal">
                         <materialDesign:PackIcon
                             Margin="{StaticResource MarginRight8}"
                             VerticalAlignment="Center"
-                                    Kind="Routes" />
+                            Kind="Plus" />
-                                <TextBlock Text="{x:Static resx:ResUI.menuRoutingAdvanced}" />
+                        <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.menuRoutingAdvancedAdd}" />
                     </StackPanel>
-                        </MenuItem.Header>
+                </Button>
-                        <MenuItem
-                            x:Name="menuRoutingAdvancedAdd2"
-                            Height="{StaticResource MenuItemHeight}"
-                            Header="{x:Static resx:ResUI.menuRoutingAdvancedAdd}" />
-                        <MenuItem
-                            x:Name="menuRoutingAdvancedImportRules2"
-                            Height="{StaticResource MenuItemHeight}"
-                            Header="{x:Static resx:ResUI.menuRoutingAdvancedImportRules}" />
-                    </MenuItem>
-                </Menu>
                 <Separator />
-                <TextBlock
+                <Button x:Name="menuRoutingAdvancedImportRules2">
-                    Margin="{StaticResource MarginLeft8}"
+                    <StackPanel Orientation="Horizontal">
+                        <materialDesign:PackIcon
+                            Margin="{StaticResource MarginRight8}"
                             VerticalAlignment="Center"
-                    Style="{StaticResource ToolbarTextBlock}">
+                            Kind="Import" />
-                    <Hyperlink Click="linkdomainStrategy_Click">
+                        <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.menuRoutingAdvancedImportRules}" />
-                        <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy}" />
+                    </StackPanel>
-                        <materialDesign:PackIcon Kind="Link" />
+                </Button>
-                    </Hyperlink>
-                </TextBlock>
-                <ComboBox
-                    x:Name="cmbdomainStrategy"
-                    Width="110"
-                    Margin="{StaticResource MarginLeft8}"
-                    Style="{StaticResource DefComboBox}" />
-                <Separator />
-                <TextBlock
-                    Margin="{StaticResource MarginLeft8}"
-                    VerticalAlignment="Center"
-                    Style="{StaticResource ToolbarTextBlock}"
-                    Text="{x:Static resx:ResUI.TbdomainMatcher}" />
-                <ComboBox
-                    x:Name="cmbdomainMatcher"
-                    Width="60"
-                    Margin="{StaticResource MarginLeft8}"
-                    Style="{StaticResource DefComboBox}" />
-                <Separator />
-                <TextBlock
-                    Margin="{StaticResource MarginLeft8}"
-                    VerticalAlignment="Center"
-                    Style="{StaticResource ToolbarTextBlock}">
-                    <Hyperlink Click="linkdomainStrategy4Singbox_Click">
-                        <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy4Singbox}" />
-                        <materialDesign:PackIcon Kind="Link" />
-                    </Hyperlink>
-                </TextBlock>
-                <ComboBox
-                    x:Name="cmbdomainStrategy4Singbox"
-                    Width="100"
-                    Margin="{StaticResource MarginLeft8}"
-                    Style="{StaticResource DefComboBox}" />
             </ToolBar>
         </ToolBarTray>
 
@@ -122,7 +79,71 @@
                 Style="{StaticResource DefButton}" />
         </StackPanel>
 
-        <DockPanel>
+        <Grid Margin="{StaticResource Margin8}" DockPanel.Dock="Top">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+
+            <TextBlock
+                Grid.Row="0"
+                Grid.Column="0"
+                Margin="{StaticResource Margin4}"
+                VerticalAlignment="Center"
+                Style="{StaticResource ToolbarTextBlock}">
+                <Hyperlink Click="linkdomainStrategy_Click">
+                    <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy}" />
+                    <materialDesign:PackIcon Kind="Link" />
+                </Hyperlink>
+            </TextBlock>
+            <ComboBox
+                x:Name="cmbdomainStrategy"
+                Grid.Row="0"
+                Grid.Column="1"
+                Width="300"
+                Margin="{StaticResource Margin4}"
+                Style="{StaticResource DefComboBox}" />
+
+            <TextBlock
+                Grid.Row="1"
+                Grid.Column="0"
+                Margin="{StaticResource Margin4}"
+                VerticalAlignment="Center"
+                Style="{StaticResource ToolbarTextBlock}"
+                Text="{x:Static resx:ResUI.TbdomainMatcher}" />
+            <ComboBox
+                x:Name="cmbdomainMatcher"
+                Grid.Row="1"
+                Grid.Column="1"
+                Width="300"
+                Margin="{StaticResource Margin4}"
+                Style="{StaticResource DefComboBox}" />
+
+            <TextBlock
+                Grid.Row="2"
+                Grid.Column="0"
+                Margin="{StaticResource Margin4}"
+                VerticalAlignment="Center"
+                Style="{StaticResource ToolbarTextBlock}">
+                <Hyperlink Click="linkdomainStrategy4Singbox_Click">
+                    <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy4Singbox}" />
+                    <materialDesign:PackIcon Kind="Link" />
+                </Hyperlink>
+            </TextBlock>
+            <ComboBox
+                x:Name="cmbdomainStrategy4Singbox"
+                Grid.Row="2"
+                Grid.Column="1"
+                Width="300"
+                Margin="{StaticResource Margin4}"
+                Style="{StaticResource DefComboBox}" />
+        </Grid>
+
         <TabControl x:Name="tabAdvanced">
             <TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.TbRoutingTabRuleList}">
                 <DataGrid
@@ -199,5 +220,4 @@
             </TabItem>
         </TabControl>
     </DockPanel>
-    </DockPanel>
 </reactiveui:ReactiveWindow>