fix error commit

v2rayN/v2rayN/Handler/SpeedtestHandler.cs

@@ -68,13 +68,10 @@ namespace v2rayN.Handler
                         ProfileExHandler.Instance.SetTestDelay(it.indexId, "0");
                         ProfileExHandler.Instance.SetTestSpeed(it.indexId, "0");
                         break;
-<<<<<<< HEAD
                     case ESpeedActionType.QuickSelect:
                         UpdateFunc(it.indexId, ResUI.Speedtesting, "");
                         ProfileExHandler.Instance.SetTestDelay(it.indexId, "0");
                         break;
-=======
->>>>>>> bc957fea71fac743870efdaecacb22c70bef9488
                 }
             }
 
@@ -99,12 +96,9 @@ namespace v2rayN.Handler
                 case ESpeedActionType.Mixedtest:
                     Task.Run(RunMixedtestAsync);
                     break;
-<<<<<<< HEAD
                 case ESpeedActionType.QuickSelect:
                     Task.Run(RunQuickSelectAsync);
                     break;
-=======
->>>>>>> bc957fea71fac743870efdaecacb22c70bef9488
             }
         }
 
@@ -346,7 +340,6 @@ namespace v2rayN.Handler
             await RunSpeedTestMulti();
         }
 
-<<<<<<< HEAD
         private async Task RunQuickSelectAsync()
         {
             await RunRealPing();
@@ -355,8 +348,6 @@ namespace v2rayN.Handler
             UpdateFunc("#", "ok");
         }
 
-=======
->>>>>>> bc957fea71fac743870efdaecacb22c70bef9488
         public async Task<string> GetRealPingTime(DownloadHandle downloadHandle, IWebProxy webProxy)
         {
             int responseTime = await downloadHandle.GetRealPingTime(_config.speedTestItem.speedPingTestUrl, webProxy, 10);

v2rayN/v2rayN/Mode/ESpeedActionType.cs

@@ -6,11 +6,7 @@
         Tcping,
         Realping,
         Speedtest,
-<<<<<<< HEAD
         Mixedtest,
         QuickSelect
-=======
-        Mixedtest
->>>>>>> bc957fea71fac743870efdaecacb22c70bef9488
     }
 }

v2rayN/v2rayN/Resx/ResUI.Designer.cs

@@ -1627,7 +1627,6 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-<<<<<<< HEAD
         ///   查找类似 flash filtering 的本地化字符串。
         /// </summary>
         public static string quickSelect {
@@ -1637,8 +1636,6 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-=======
->>>>>>> bc957fea71fac743870efdaecacb22c70bef9488
         ///   查找类似 Global hotkey {0} registered failed, reason {1} 的本地化字符串。
         /// </summary>
         public static string RegisterGlobalHotkeyFailed {

v2rayN/v2rayN/Resx/ResUI.fa-Ir.resx

@@ -1009,7 +1009,6 @@
   <data name="TbSettingsEnableHWA" xml:space="preserve">
     <value>فعال‌سازی شتاب‌دهنده سخت‌افزاری (نیاز به راه‌اندازی مجدد)</value>
   </data>
-<<<<<<< HEAD
   <data name="flashSelect" xml:space="preserve">
     <value>Filtre en un clic</value>
   </data>
@@ -1018,6 +1017,4 @@
 一键筛选
 Filtre en un clic</value>
   </data>
-=======
->>>>>>> bc957fea71fac743870efdaecacb22c70bef9488
 </root>

v2rayN/v2rayN/Resx/ResUI.resx

@@ -1141,10 +1141,7 @@
   <data name="TbRoutingRuleDomain" xml:space="preserve">
     <value>Domain</value>
   </data>
-<<<<<<< HEAD
   <data name="quickSelect" xml:space="preserve">
     <value>flash filtering</value>
   </data>
-=======
->>>>>>> bc957fea71fac743870efdaecacb22c70bef9488
 </root>

v2rayN/v2rayN/Resx/ResUI.ru.resx

@@ -1054,13 +1054,10 @@
   <data name="TbSettingsEnableHWA" xml:space="preserve">
     <value>Включить аппаратное ускорение (требуется перезагрузка)</value>
   </data>
-<<<<<<< HEAD
   <data name="flashSelect" xml:space="preserve">
     <value>Фильтр одним нажатием клавиш</value>
   </data>
   <data name="quickSelect" xml:space="preserve">
     <value>Фильтр одним нажатием клавиш</value>
   </data>
-=======
->>>>>>> bc957fea71fac743870efdaecacb22c70bef9488
 </root>

v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx

@@ -1138,13 +1138,10 @@
   <data name="TbRoutingRuleIP" xml:space="preserve">
     <value>IP 或 IP CIDR</value>
   </data>
-<<<<<<< HEAD
   <data name="flashSelect" xml:space="preserve">
     <value>一键筛选</value>
   </data>
   <data name="quickSelect" xml:space="preserve">
     <value>一键筛选</value>
   </data>
-=======
->>>>>>> bc957fea71fac743870efdaecacb22c70bef9488
 </root>

v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs

@@ -30,10 +30,7 @@ namespace v2rayN.ViewModels
 
         private CoreHandler _coreHandler;
         private StatisticsHandler _statistics;
-<<<<<<< HEAD
         private QuickSelectHandler _quickSelectHandler;
-=======
->>>>>>> bc957fea71fac743870efdaecacb22c70bef9488
         private List<ProfileItem> _lstProfile;
         private string _subId = string.Empty;
         private string _serverFilter = string.Empty;
@@ -114,10 +111,7 @@ namespace v2rayN.ViewModels
         public ReactiveCommand<Unit, Unit> MoveBottomCmd { get; }
 
         //servers ping
-<<<<<<< HEAD
         public ReactiveCommand<Unit, Unit> QuickSelectCmd { get; }
-=======
->>>>>>> bc957fea71fac743870efdaecacb22c70bef9488
         public ReactiveCommand<Unit, Unit> MixedTestServerCmd { get; }
 
         public ReactiveCommand<Unit, Unit> PingServerCmd { get; }
@@ -263,10 +257,7 @@ namespace v2rayN.ViewModels
             Locator.CurrentMutable.RegisterLazySingleton(() => new NoticeHandler(snackbarMessageQueue), typeof(NoticeHandler));
             _noticeHandler = Locator.Current.GetService<NoticeHandler>();
             _config = LazyConfig.Instance.GetConfig();
-<<<<<<< HEAD
             _quickSelectHandler = new QuickSelectHandler();
-=======
->>>>>>> bc957fea71fac743870efdaecacb22c70bef9488
             //ThreadPool.RegisterWaitForSingleObject(App.ProgramStarted, OnProgramStarted, null, -1, false);
             Init();
 
@@ -405,14 +396,11 @@ namespace v2rayN.ViewModels
             }, canEditRemove);
 
             //servers ping
-<<<<<<< HEAD
             QuickSelectCmd = ReactiveCommand.Create(() =>
             {
                 QuickSelect();
             });
 
-=======
->>>>>>> bc957fea71fac743870efdaecacb22c70bef9488
             MixedTestServerCmd = ReactiveCommand.Create(() =>
             {
                 ServerSpeedtest(ESpeedActionType.Mixedtest);
@@ -686,7 +674,6 @@ namespace v2rayN.ViewModels
             }));
         }
 
-<<<<<<< HEAD
         private void UpdateSpeedtestAndSelectUselessResultHandler(string indexId, string delay, string speed)
         {
             Application.Current.Dispatcher.Invoke((Action)(() =>
@@ -727,7 +714,6 @@ namespace v2rayN.ViewModels
                             {
                                 ite.delay = it.E;
                                 ite.delayVal = $"{it.E.ToString()} {Global.DelayUnit}";
-                                ProfileExHandler.Instance.SetTestDelay(it.indexId, it.E.ToString());
                             }
                             _profileItems.Replace(ite, Utils.DeepCopy(ite));
                         }
@@ -741,13 +727,10 @@ namespace v2rayN.ViewModels
                             {
                                 ite.delay = int.Parse(it.getDelay(2));
                                 ite.delayVal = $"{it.getDelay(2)} {Global.DelayUnit}";
-                                ProfileExHandler.Instance.SetTestDelay(it.indexId, it.getDelay(2));
                             }
                             _profileItems.Replace(ite, Utils.DeepCopy(ite));
                         }
                     }
-                    SortServer(EServerColName.delayVal.ToString());
-                    SetDefaultServer(_profileItems.First().indexId);
                     _noticeHandler?.SendMessage(ResUI.OperationSuccess, true);
                     _noticeHandler?.Enqueue(ResUI.OperationSuccess);
                 }
@@ -773,8 +756,6 @@ namespace v2rayN.ViewModels
             }
         }
 
-=======
->>>>>>> bc957fea71fac743870efdaecacb22c70bef9488
         private void SetTestResult(string indexId, string delay, string speed)
         {
             if (Utils.IsNullOrEmpty(indexId))
@@ -1128,7 +1109,6 @@ namespace v2rayN.ViewModels
             }
         }
 
-<<<<<<< HEAD
         public void RemoveServerByItems(List<ProfileItem> lst)
         {
             var exists = lst.Exists(t => t.indexId == _config.indexId);
@@ -1140,8 +1120,6 @@ namespace v2rayN.ViewModels
             }
         }
 
-=======
->>>>>>> bc957fea71fac743870efdaecacb22c70bef9488
         public void RemoveServer()
         {
             if (GetProfileItems(out List<ProfileItem> lstSelecteds, true) < 0)
@@ -1349,7 +1327,6 @@ namespace v2rayN.ViewModels
                 }
             }
         }
-<<<<<<< HEAD
         public void QuickSelect()
         {
             SelectedProfiles = _profileItems;
@@ -1360,8 +1337,6 @@ namespace v2rayN.ViewModels
             _quickSelectHandler.clear();
             new SpeedtestHandler(_config, _coreHandler, lstSelecteds, ESpeedActionType.QuickSelect, UpdateSpeedtestAndSelectUselessResultHandler);
         }
-=======
->>>>>>> bc957fea71fac743870efdaecacb22c70bef9488
 
         public void ServerSpeedtest(ESpeedActionType actionType)
         {

v2rayN/v2rayN/Views/MainWindow.xaml

@@ -13,15 +13,9 @@
     xmlns:tb="clr-namespace:H.NotifyIcon;assembly=H.NotifyIcon.Wpf"
     xmlns:vms="clr-namespace:v2rayN.ViewModels"
     Title="v2rayN"
-<<<<<<< HEAD
     Width="950"
     Height="700"
     MinWidth="950"
-=======
-    Width="900"
-    Height="700"
-    MinWidth="900"
->>>>>>> bc957fea71fac743870efdaecacb22c70bef9488
     MinHeight="700"
     x:TypeArguments="vms:MainWindowViewModel"
     Background="{DynamicResource MaterialDesignPaper}"
@@ -387,7 +381,6 @@
                                 </Grid>
                             </StackPanel>
                         </materialDesign:PopupBox>
-<<<<<<< HEAD
                         <Separator/>
                         <Button x:Name="btnQuickOp"
                             >
@@ -399,8 +392,6 @@
                                 <TextBlock Text="{x:Static resx:ResUI.quickSelect}" />
                             </StackPanel>
                         </Button>
-=======
->>>>>>> bc957fea71fac743870efdaecacb22c70bef9488
                     </ToolBar>
                 </ToolBarTray>
                 <WrapPanel Margin="2" DockPanel.Dock="Top">

v2rayN/v2rayN/Views/MainWindow.xaml.cs

@@ -1,9 +1,6 @@
 using ReactiveUI;
 using Splat;
-<<<<<<< HEAD
 using System;
-=======
->>>>>>> bc957fea71fac743870efdaecacb22c70bef9488
 using System.ComponentModel;
 using System.Reactive.Disposables;
 using System.Runtime.InteropServices;
@@ -99,10 +96,7 @@ namespace v2rayN.Views
                 this.BindCommand(ViewModel, vm => vm.MoveBottomCmd, v => v.menuMoveBottom).DisposeWith(disposables);
 
                 //servers ping
-<<<<<<< HEAD
                 this.BindCommand(ViewModel, vm => vm.QuickSelectCmd, v => v.btnQuickOp).DisposeWith(disposables);
-=======
->>>>>>> bc957fea71fac743870efdaecacb22c70bef9488
                 this.BindCommand(ViewModel, vm => vm.MixedTestServerCmd, v => v.menuMixedTestServer).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.PingServerCmd, v => v.menuPingServer).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.TcpingServerCmd, v => v.menuTcpingServer).DisposeWith(disposables);
@@ -638,9 +632,6 @@ namespace v2rayN.Views
         }
 
         #endregion Drag and Drop
-<<<<<<< HEAD
 
-=======
->>>>>>> bc957fea71fac743870efdaecacb22c70bef9488
     }
 }