Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
73c79ca7bf | ||
|
|
978975ee2d | ||
|
|
d7dc0dff50 | ||
|
|
a3aa6c045f | ||
|
|
785ebc49fc | ||
|
|
fde1c98ddd |
@@ -16,7 +16,6 @@ namespace v2rayN.Base
|
||||
{
|
||||
private static HttpClientHelper httpClientHelper = null;
|
||||
private HttpClient httpClient;
|
||||
private int progressPercentage = -1;
|
||||
|
||||
/// <summary>
|
||||
/// </summary>
|
||||
@@ -120,7 +119,7 @@ namespace v2rayN.Base
|
||||
var totalRead = 0L;
|
||||
var buffer = new byte[1024 * 1024];
|
||||
var isMoreToRead = true;
|
||||
progressPercentage = -1;
|
||||
var progressPercentage = 0;
|
||||
|
||||
do
|
||||
{
|
||||
@@ -183,14 +182,24 @@ namespace v2rayN.Base
|
||||
using (var stream = await response.Content.ReadAsStreamAsync())
|
||||
{
|
||||
var totalRead = 0L;
|
||||
var buffer = new byte[1024 * 128];
|
||||
var buffer = new byte[1024 * 64];
|
||||
var isMoreToRead = true;
|
||||
progressPercentage = -1;
|
||||
var progressPercentage = 0;
|
||||
DateTime totalDatetime = DateTime.Now;
|
||||
|
||||
do
|
||||
{
|
||||
token.ThrowIfCancellationRequested();
|
||||
if (token.IsCancellationRequested)
|
||||
{
|
||||
if (totalRead > 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
token.ThrowIfCancellationRequested();
|
||||
}
|
||||
}
|
||||
|
||||
var read = await stream.ReadAsync(buffer, 0, buffer.Length, token);
|
||||
|
||||
@@ -211,7 +220,7 @@ namespace v2rayN.Base
|
||||
TimeSpan ts = (DateTime.Now - totalDatetime);
|
||||
var speed = totalRead * 1d / ts.TotalMilliseconds / 1000;
|
||||
var percent = Convert.ToInt32((totalRead * 1d) / (total * 1d) * 100);
|
||||
if (progressPercentage != percent && percent % 2 == 1)
|
||||
if (progressPercentage != percent)
|
||||
{
|
||||
progressPercentage = percent;
|
||||
progress.Report(speed);
|
||||
|
||||
21
v2rayN/v2rayN/Forms/GroupSettingControl.Designer.cs
generated
21
v2rayN/v2rayN/Forms/GroupSettingControl.Designer.cs
generated
@@ -33,15 +33,20 @@
|
||||
this.btnRemove = new System.Windows.Forms.Button();
|
||||
this.txtRemarks = new System.Windows.Forms.TextBox();
|
||||
this.label2 = new System.Windows.Forms.Label();
|
||||
this.numSort = new System.Windows.Forms.NumericUpDown();
|
||||
this.label1 = new System.Windows.Forms.Label();
|
||||
this.grbMain.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.numSort)).BeginInit();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// grbMain
|
||||
//
|
||||
resources.ApplyResources(this.grbMain, "grbMain");
|
||||
this.grbMain.Controls.Add(this.label1);
|
||||
this.grbMain.Controls.Add(this.numSort);
|
||||
this.grbMain.Controls.Add(this.btnRemove);
|
||||
this.grbMain.Controls.Add(this.txtRemarks);
|
||||
this.grbMain.Controls.Add(this.label2);
|
||||
resources.ApplyResources(this.grbMain, "grbMain");
|
||||
this.grbMain.Name = "grbMain";
|
||||
this.grbMain.TabStop = false;
|
||||
//
|
||||
@@ -63,6 +68,17 @@
|
||||
resources.ApplyResources(this.label2, "label2");
|
||||
this.label2.Name = "label2";
|
||||
//
|
||||
// numSort
|
||||
//
|
||||
resources.ApplyResources(this.numSort, "numSort");
|
||||
this.numSort.Name = "numSort";
|
||||
this.numSort.Leave += new System.EventHandler(this.txtRemarks_Leave);
|
||||
//
|
||||
// label1
|
||||
//
|
||||
resources.ApplyResources(this.label1, "label1");
|
||||
this.label1.Name = "label1";
|
||||
//
|
||||
// GroupSettingControl
|
||||
//
|
||||
resources.ApplyResources(this, "$this");
|
||||
@@ -72,6 +88,7 @@
|
||||
this.Load += new System.EventHandler(this.GroupSettingControl_Load);
|
||||
this.grbMain.ResumeLayout(false);
|
||||
this.grbMain.PerformLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.numSort)).EndInit();
|
||||
this.ResumeLayout(false);
|
||||
|
||||
}
|
||||
@@ -82,5 +99,7 @@
|
||||
private System.Windows.Forms.TextBox txtRemarks;
|
||||
private System.Windows.Forms.Label label2;
|
||||
private System.Windows.Forms.Button btnRemove;
|
||||
private System.Windows.Forms.Label label1;
|
||||
private System.Windows.Forms.NumericUpDown numSort;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -32,6 +32,7 @@ namespace v2rayN.Forms
|
||||
if (groupItem != null)
|
||||
{
|
||||
txtRemarks.Text = groupItem.remarks.ToString();
|
||||
numSort.Value = groupItem.sort;
|
||||
}
|
||||
}
|
||||
private void EndBindingSub()
|
||||
@@ -39,6 +40,7 @@ namespace v2rayN.Forms
|
||||
if (groupItem != null)
|
||||
{
|
||||
groupItem.remarks = txtRemarks.Text.TrimEx();
|
||||
groupItem.sort = Convert.ToInt32(numSort.Value);
|
||||
}
|
||||
}
|
||||
private void txtRemarks_Leave(object sender, EventArgs e)
|
||||
|
||||
@@ -118,126 +118,177 @@
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<data name="grbMain.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>10</value>
|
||||
<data name="label1.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<data name="label1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
|
||||
<value>6, 12</value>
|
||||
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>12, 61</value>
|
||||
</data>
|
||||
<data name=">>grbMain.ZOrder" xml:space="preserve">
|
||||
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>71, 12</value>
|
||||
</data>
|
||||
<data name="label1.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>26</value>
|
||||
</data>
|
||||
<data name="label1.Text" xml:space="preserve">
|
||||
<value>Sort number</value>
|
||||
</data>
|
||||
<data name=">>label1.Name" xml:space="preserve">
|
||||
<value>label1</value>
|
||||
</data>
|
||||
<data name=">>label1.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>label1.Parent" xml:space="preserve">
|
||||
<value>grbMain</value>
|
||||
</data>
|
||||
<data name=">>label1.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="txtRemarks.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>292, 21</value>
|
||||
<data name="numSort.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>127, 57</value>
|
||||
</data>
|
||||
<data name="numSort.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>120, 21</value>
|
||||
</data>
|
||||
<data name="numSort.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>25</value>
|
||||
</data>
|
||||
<data name=">>numSort.Name" xml:space="preserve">
|
||||
<value>numSort</value>
|
||||
</data>
|
||||
<data name=">>numSort.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>numSort.Parent" xml:space="preserve">
|
||||
<value>grbMain</value>
|
||||
</data>
|
||||
<data name=">>numSort.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="btnRemove.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="btnRemove.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>525, 21</value>
|
||||
</data>
|
||||
<data name="txtRemarks.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>127, 21</value>
|
||||
</data>
|
||||
<data name=">>btnRemove.Parent" xml:space="preserve">
|
||||
<value>grbMain</value>
|
||||
</data>
|
||||
<data name="label2.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>12, 25</value>
|
||||
<data name="btnRemove.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>75, 23</value>
|
||||
</data>
|
||||
<data name="btnRemove.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>24</value>
|
||||
</data>
|
||||
<data name=">>$this.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
<data name="btnRemove.Text" xml:space="preserve">
|
||||
<value>Remove</value>
|
||||
</data>
|
||||
<data name=">>$this.Name" xml:space="preserve">
|
||||
<value>GroupSettingControl</value>
|
||||
</data>
|
||||
<data name=">>label2.Parent" xml:space="preserve">
|
||||
<value>grbMain</value>
|
||||
<data name=">>btnRemove.Name" xml:space="preserve">
|
||||
<value>btnRemove</value>
|
||||
</data>
|
||||
<data name=">>btnRemove.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>grbMain.Name" xml:space="preserve">
|
||||
<data name=">>btnRemove.Parent" xml:space="preserve">
|
||||
<value>grbMain</value>
|
||||
</data>
|
||||
<data name=">>label2.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>label2.ZOrder" xml:space="preserve">
|
||||
<data name=">>btnRemove.ZOrder" xml:space="preserve">
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="txtRemarks.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>127, 21</value>
|
||||
</data>
|
||||
<data name="txtRemarks.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>292, 21</value>
|
||||
</data>
|
||||
<data name="txtRemarks.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name=">>txtRemarks.Name" xml:space="preserve">
|
||||
<value>txtRemarks</value>
|
||||
</data>
|
||||
<data name=">>txtRemarks.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>txtRemarks.Parent" xml:space="preserve">
|
||||
<value>grbMain</value>
|
||||
</data>
|
||||
<data name=">>txtRemarks.ZOrder" xml:space="preserve">
|
||||
<value>3</value>
|
||||
</data>
|
||||
<data name="label2.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
<data name="label2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="label2.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>12, 25</value>
|
||||
</data>
|
||||
<data name="label2.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>47, 12</value>
|
||||
</data>
|
||||
<data name="label2.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>10</value>
|
||||
</data>
|
||||
<data name="label2.Text" xml:space="preserve">
|
||||
<value>Remarks</value>
|
||||
</data>
|
||||
<data name=">>label2.Name" xml:space="preserve">
|
||||
<value>label2</value>
|
||||
</data>
|
||||
<data name="btnRemove.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>75, 23</value>
|
||||
<data name=">>label2.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>label2.Parent" xml:space="preserve">
|
||||
<value>grbMain</value>
|
||||
</data>
|
||||
<data name=">>label2.ZOrder" xml:space="preserve">
|
||||
<value>4</value>
|
||||
</data>
|
||||
<data name="grbMain.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<value>Fill</value>
|
||||
</data>
|
||||
<data name="grbMain.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>0, 0</value>
|
||||
</data>
|
||||
<data name="grbMain.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>619, 61</value>
|
||||
<value>619, 91</value>
|
||||
</data>
|
||||
<data name="label2.Text" xml:space="preserve">
|
||||
<value>Remarks</value>
|
||||
</data>
|
||||
<data name=">>txtRemarks.Parent" xml:space="preserve">
|
||||
<value>grbMain</value>
|
||||
<data name="grbMain.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>10</value>
|
||||
</data>
|
||||
<data name="grbMain.Text" xml:space="preserve">
|
||||
<value>Group details</value>
|
||||
</data>
|
||||
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<data name="label2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="txtRemarks.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name=">>txtRemarks.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name="label2.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>47, 12</value>
|
||||
</data>
|
||||
<data name=">>txtRemarks.Name" xml:space="preserve">
|
||||
<value>txtRemarks</value>
|
||||
</data>
|
||||
<data name=">>btnRemove.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name=">>btnRemove.Name" xml:space="preserve">
|
||||
<value>btnRemove</value>
|
||||
</data>
|
||||
<data name="grbMain.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<value>Fill</value>
|
||||
</data>
|
||||
<data name="label2.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>10</value>
|
||||
</data>
|
||||
<data name="label2.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
<data name="btnRemove.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
<data name=">>grbMain.Name" xml:space="preserve">
|
||||
<value>grbMain</value>
|
||||
</data>
|
||||
<data name=">>grbMain.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>txtRemarks.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name=">>grbMain.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>619, 61</value>
|
||||
</data>
|
||||
<data name="btnRemove.Text" xml:space="preserve">
|
||||
<value>Remove</value>
|
||||
<data name=">>grbMain.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
|
||||
<value>6, 12</value>
|
||||
</data>
|
||||
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>619, 91</value>
|
||||
</data>
|
||||
<data name=">>$this.Name" xml:space="preserve">
|
||||
<value>GroupSettingControl</value>
|
||||
</data>
|
||||
<data name=">>$this.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
</root>
|
||||
@@ -130,4 +130,7 @@
|
||||
<data name="grbMain.Text" xml:space="preserve">
|
||||
<value>分组详情</value>
|
||||
</data>
|
||||
<data name="label1.Text" xml:space="preserve">
|
||||
<value>排序编号</value>
|
||||
</data>
|
||||
</root>
|
||||
11
v2rayN/v2rayN/Forms/MainForm.Designer.cs
generated
11
v2rayN/v2rayN/Forms/MainForm.Designer.cs
generated
@@ -94,7 +94,6 @@
|
||||
this.menuKeepNothing = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.menuRoutings = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.menuServers = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.menuServers2 = new System.Windows.Forms.ToolStripComboBox();
|
||||
this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.menuAddServers2 = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.menuScanScreen2 = new System.Windows.Forms.ToolStripMenuItem();
|
||||
@@ -585,7 +584,6 @@
|
||||
this.menuSysAgentMode,
|
||||
this.menuRoutings,
|
||||
this.menuServers,
|
||||
this.menuServers2,
|
||||
this.toolStripSeparator13,
|
||||
this.menuAddServers2,
|
||||
this.menuScanScreen2,
|
||||
@@ -635,14 +633,6 @@
|
||||
this.menuServers.Name = "menuServers";
|
||||
resources.ApplyResources(this.menuServers, "menuServers");
|
||||
//
|
||||
// menuServers2
|
||||
//
|
||||
this.menuServers2.BackColor = System.Drawing.SystemColors.Window;
|
||||
this.menuServers2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
|
||||
this.menuServers2.DropDownWidth = 500;
|
||||
resources.ApplyResources(this.menuServers2, "menuServers2");
|
||||
this.menuServers2.Name = "menuServers2";
|
||||
//
|
||||
// toolStripSeparator13
|
||||
//
|
||||
this.toolStripSeparator13.Name = "toolStripSeparator13";
|
||||
@@ -1069,7 +1059,6 @@
|
||||
private System.Windows.Forms.ToolStripStatusLabel toolSslInboundInfo;
|
||||
private System.Windows.Forms.ToolStripStatusLabel toolSslRoutingRule;
|
||||
private System.Windows.Forms.ToolStripStatusLabel toolSslBlank2;
|
||||
private System.Windows.Forms.ToolStripComboBox menuServers2;
|
||||
private System.Windows.Forms.ToolStripMenuItem tsbSubUpdateViaProxy;
|
||||
private System.Windows.Forms.ToolStripMenuItem menuUpdateSubViaProxy;
|
||||
private System.Windows.Forms.ToolStripMenuItem menuMsgBoxClear;
|
||||
|
||||
@@ -83,12 +83,12 @@ namespace v2rayN.Forms
|
||||
RefreshRoutingsMenu();
|
||||
RestoreUI();
|
||||
|
||||
_ = LoadV2ray();
|
||||
|
||||
HideForm();
|
||||
|
||||
MainFormHandler.Instance.UpdateTask(config, UpdateTaskHandler);
|
||||
MainFormHandler.Instance.RegisterGlobalHotkey(config, OnHotkeyHandler, UpdateTaskHandler);
|
||||
|
||||
_ = LoadV2ray();
|
||||
}
|
||||
|
||||
private void MainForm_FormClosing(object sender, FormClosingEventArgs e)
|
||||
@@ -347,56 +347,32 @@ namespace v2rayN.Forms
|
||||
private void RefreshServersMenu()
|
||||
{
|
||||
menuServers.DropDownItems.Clear();
|
||||
menuServers2.SelectedIndexChanged -= MenuServers2_SelectedIndexChanged;
|
||||
menuServers2.Items.Clear();
|
||||
menuServers.Visible = false;
|
||||
menuServers2.Visible = false;
|
||||
|
||||
if (lstVmess.Count > 20)
|
||||
if (lstVmess.Count > 30)
|
||||
{
|
||||
for (int k = 0; k < lstVmess.Count; k++)
|
||||
{
|
||||
VmessItem item = lstVmess[k];
|
||||
string name = item.GetSummary();
|
||||
|
||||
if (config.IsActiveNode(item))
|
||||
{
|
||||
name = $"√ {name}";
|
||||
}
|
||||
menuServers2.Items.Add(name);
|
||||
|
||||
}
|
||||
menuServers2.SelectedIndex = lstVmess.FindIndex(it => it.indexId == config.indexId);
|
||||
menuServers2.SelectedIndexChanged += MenuServers2_SelectedIndexChanged;
|
||||
menuServers2.Visible = true;
|
||||
menuServers.DropDownItems.Add(new ToolStripMenuItem(ResUI.TooManyServersTip));
|
||||
return;
|
||||
}
|
||||
else
|
||||
|
||||
List<ToolStripMenuItem> lst = new List<ToolStripMenuItem>();
|
||||
for (int k = 0; k < lstVmess.Count; k++)
|
||||
{
|
||||
List<ToolStripMenuItem> lst = new List<ToolStripMenuItem>();
|
||||
for (int k = 0; k < lstVmess.Count; k++)
|
||||
VmessItem item = lstVmess[k];
|
||||
string name = item.GetSummary();
|
||||
|
||||
ToolStripMenuItem ts = new ToolStripMenuItem(name)
|
||||
{
|
||||
VmessItem item = lstVmess[k];
|
||||
string name = item.GetSummary();
|
||||
|
||||
ToolStripMenuItem ts = new ToolStripMenuItem(name)
|
||||
{
|
||||
Tag = k
|
||||
};
|
||||
if (config.IsActiveNode(item))
|
||||
{
|
||||
ts.Checked = true;
|
||||
}
|
||||
ts.Click += new EventHandler(ts_Click);
|
||||
lst.Add(ts);
|
||||
Tag = k
|
||||
};
|
||||
if (config.IsActiveNode(item))
|
||||
{
|
||||
ts.Checked = true;
|
||||
}
|
||||
menuServers.DropDownItems.AddRange(lst.ToArray());
|
||||
menuServers.Visible = true;
|
||||
ts.Click += new EventHandler(ts_Click);
|
||||
lst.Add(ts);
|
||||
}
|
||||
}
|
||||
|
||||
private void MenuServers2_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
SetDefaultServer(((ToolStripComboBox)sender).SelectedIndex);
|
||||
menuServers.DropDownItems.AddRange(lst.ToArray());
|
||||
menuServers.Visible = true;
|
||||
}
|
||||
|
||||
private void ts_Click(object sender, EventArgs e)
|
||||
@@ -472,7 +448,7 @@ namespace v2rayN.Forms
|
||||
tabPage.Name = "";
|
||||
tabGroup.TabPages.Add(tabPage);
|
||||
|
||||
foreach (var item in config.groupItem)
|
||||
foreach (var item in config.groupItem.OrderBy(t => t.sort))
|
||||
{
|
||||
var tabPage2 = new TabPage($" {item.remarks} ");
|
||||
tabPage2.Name = item.id;
|
||||
@@ -539,13 +515,15 @@ namespace v2rayN.Forms
|
||||
#endregion
|
||||
|
||||
#region v2ray 操作
|
||||
|
||||
/// <summary>
|
||||
/// 载入V2ray
|
||||
/// </summary>
|
||||
async Task LoadV2ray()
|
||||
{
|
||||
tsbReload.Enabled = false;
|
||||
this.BeginInvoke(new Action(() =>
|
||||
{
|
||||
tsbReload.Enabled = false;
|
||||
}));
|
||||
|
||||
if (Global.reloadV2ray)
|
||||
{
|
||||
@@ -562,7 +540,10 @@ namespace v2rayN.Forms
|
||||
|
||||
ChangePACButtonStatus(config.sysProxyType);
|
||||
|
||||
tsbReload.Enabled = true;
|
||||
this.BeginInvoke(new Action(() =>
|
||||
{
|
||||
tsbReload.Enabled = true;
|
||||
}));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -881,9 +862,9 @@ namespace v2rayN.Forms
|
||||
var fm = new GlobalHotkeySettingForm();
|
||||
if (fm.ShowDialog() == DialogResult.OK)
|
||||
{
|
||||
RefreshRoutingsMenu();
|
||||
RefreshServers();
|
||||
_ = LoadV2ray();
|
||||
//RefreshRoutingsMenu();
|
||||
//RefreshServers();
|
||||
//_ = LoadV2ray();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1259,13 +1240,13 @@ namespace v2rayN.Forms
|
||||
}
|
||||
}
|
||||
|
||||
private void UpdateTaskHandler(bool success, string msg)
|
||||
private async void UpdateTaskHandler(bool success, string msg)
|
||||
{
|
||||
AppendText(false, msg);
|
||||
if (success)
|
||||
{
|
||||
Global.reloadV2ray = true;
|
||||
_ = LoadV2ray();
|
||||
await LoadV2ray();
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
@@ -767,18 +767,6 @@
|
||||
<data name="menuServers.Text" xml:space="preserve">
|
||||
<value>Server</value>
|
||||
</data>
|
||||
<data name="menuServers2.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
|
||||
<value>Standard</value>
|
||||
</data>
|
||||
<data name="menuServers2.MaxDropDownItems" type="System.Int32, mscorlib">
|
||||
<value>50</value>
|
||||
</data>
|
||||
<data name="menuServers2.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>200, 25</value>
|
||||
</data>
|
||||
<data name="menuServers2.ToolTipText" xml:space="preserve">
|
||||
<value>Server</value>
|
||||
</data>
|
||||
<data name="toolStripSeparator13.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>274, 6</value>
|
||||
</data>
|
||||
@@ -816,7 +804,7 @@
|
||||
<value>Exit</value>
|
||||
</data>
|
||||
<data name="cmsMain.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>278, 221</value>
|
||||
<value>278, 192</value>
|
||||
</data>
|
||||
<data name=">>cmsMain.Name" xml:space="preserve">
|
||||
<value>cmsMain</value>
|
||||
@@ -1433,12 +1421,6 @@
|
||||
<data name=">>menuServers.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>menuServers2.Name" xml:space="preserve">
|
||||
<value>menuServers2</value>
|
||||
</data>
|
||||
<data name=">>menuServers2.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ToolStripComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>toolStripSeparator13.Name" xml:space="preserve">
|
||||
<value>toolStripSeparator13</value>
|
||||
</data>
|
||||
|
||||
@@ -39,7 +39,7 @@ namespace v2rayN.Handler
|
||||
try
|
||||
{
|
||||
Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().enableSecurityProtocolTls13);
|
||||
UpdateCompleted?.Invoke(this, new ResultEventArgs(false, ResUI.Downloading));
|
||||
UpdateCompleted?.Invoke(this, new ResultEventArgs(false, ResUI.Speedtesting));
|
||||
|
||||
var client = new HttpClient(new WebRequestHandler()
|
||||
{
|
||||
@@ -51,7 +51,7 @@ namespace v2rayN.Handler
|
||||
{
|
||||
if (UpdateCompleted != null)
|
||||
{
|
||||
string msg = string.Format("{0} M/s", value.ToString("#0.0"));
|
||||
string msg = string.Format("{0} M/s", value.ToString("#0.0")).PadLeft(9, ' ');
|
||||
UpdateCompleted(this, new ResultEventArgs(false, msg));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -187,7 +187,7 @@ namespace v2rayN.Handler
|
||||
};
|
||||
downloadHandle2.Error += (sender2, args) =>
|
||||
{
|
||||
_updateFunc("", args.GetException().Message);
|
||||
_updateFunc(testIndexId, args.GetException().Message);
|
||||
};
|
||||
|
||||
var timeout = 8;
|
||||
|
||||
@@ -957,7 +957,7 @@ namespace v2rayN.Handler
|
||||
case ECoreType.Xray:
|
||||
break;
|
||||
case ECoreType.clash:
|
||||
fileContent.Add($"port: {LazyConfig.Instance.GetConfig().GetLocalPort(Global.InboundHttp)}");
|
||||
fileContent.Add($"port: {LazyConfig.Instance.GetConfig().GetLocalPort(Global.InboundHttp2)}");
|
||||
fileContent.Add($"socks-port: {LazyConfig.Instance.GetConfig().GetLocalPort(Global.InboundSocks)}");
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -341,19 +341,31 @@ namespace v2rayN.Mode
|
||||
{
|
||||
return subRemarks;
|
||||
}
|
||||
foreach (SubItem sub in config.subItem)
|
||||
{
|
||||
if (sub.id.EndsWith(subid))
|
||||
{
|
||||
return sub.remarks;
|
||||
}
|
||||
}
|
||||
if (subid.Length <= 4)
|
||||
{
|
||||
return subid;
|
||||
}
|
||||
var sub = config.subItem.FirstOrDefault(t => t.id == subid);
|
||||
if (sub != null)
|
||||
{
|
||||
return sub.remarks;
|
||||
}
|
||||
return subid.Substring(0, 4);
|
||||
}
|
||||
public string GetGroupRemarks(Config config)
|
||||
{
|
||||
string subRemarks = string.Empty;
|
||||
if (Utils.IsNullOrEmpty(groupId))
|
||||
{
|
||||
return subRemarks;
|
||||
}
|
||||
var group = config.groupItem.FirstOrDefault(t => t.id == groupId);
|
||||
if (group != null)
|
||||
{
|
||||
return group.remarks;
|
||||
}
|
||||
return groupId.Substring(0, 4);
|
||||
}
|
||||
|
||||
public List<string> GetAlpn()
|
||||
{
|
||||
@@ -578,9 +590,9 @@ namespace v2rayN.Mode
|
||||
public bool sniffingEnabled { get; set; } = true;
|
||||
|
||||
public bool allowLANConn { get; set; }
|
||||
|
||||
|
||||
public string user { get; set; }
|
||||
|
||||
|
||||
public string pass { get; set; }
|
||||
|
||||
}
|
||||
@@ -763,6 +775,10 @@ namespace v2rayN.Mode
|
||||
{
|
||||
get; set;
|
||||
}
|
||||
public int sort
|
||||
{
|
||||
get; set;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -32,4 +32,4 @@ using System.Runtime.InteropServices;
|
||||
// 方法是按如下所示使用“*”:
|
||||
//[assembly: AssemblyVersion("1.0.*")]
|
||||
//[assembly: AssemblyVersion("1.0.0")]
|
||||
[assembly: AssemblyFileVersion("5.13")]
|
||||
[assembly: AssemblyFileVersion("5.14")]
|
||||
|
||||
18
v2rayN/v2rayN/Resx/ResUI.Designer.cs
generated
18
v2rayN/v2rayN/Resx/ResUI.Designer.cs
generated
@@ -879,6 +879,15 @@ namespace v2rayN.Resx {
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 查找类似 Speed Test... 的本地化字符串。
|
||||
/// </summary>
|
||||
internal static string Speedtesting {
|
||||
get {
|
||||
return ResourceManager.GetString("Speedtesting", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 查找类似 PAC failed to start. Run it with Admin right. 的本地化字符串。
|
||||
/// </summary>
|
||||
@@ -952,6 +961,15 @@ namespace v2rayN.Resx {
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 查找类似 Too many servers, please open the main interface 的本地化字符串。
|
||||
/// </summary>
|
||||
internal static string TooManyServersTip {
|
||||
get {
|
||||
return ResourceManager.GetString("TooManyServersTip", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 查找类似 *tcp camouflage type 的本地化字符串。
|
||||
/// </summary>
|
||||
|
||||
@@ -457,4 +457,10 @@
|
||||
<data name="SystemProxy" xml:space="preserve">
|
||||
<value>System proxy</value>
|
||||
</data>
|
||||
<data name="Speedtesting" xml:space="preserve">
|
||||
<value>Speed Test...</value>
|
||||
</data>
|
||||
<data name="TooManyServersTip" xml:space="preserve">
|
||||
<value>Too many servers, please open the main interface</value>
|
||||
</data>
|
||||
</root>
|
||||
@@ -457,4 +457,10 @@
|
||||
<data name="SystemProxy" xml:space="preserve">
|
||||
<value>系统代理</value>
|
||||
</data>
|
||||
<data name="Speedtesting" xml:space="preserve">
|
||||
<value>测速中...</value>
|
||||
</data>
|
||||
<data name="TooManyServersTip" xml:space="preserve">
|
||||
<value>服务器太多，请打开主界面操作</value>
|
||||
</data>
|
||||
</root>
|
||||
@@ -472,13 +472,13 @@
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Google.Protobuf">
|
||||
<Version>3.19.4</Version>
|
||||
<Version>3.20.0</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Grpc.Core">
|
||||
<Version>2.44.0</Version>
|
||||
<Version>2.45.0</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Grpc.Tools">
|
||||
<Version>2.44.0</Version>
|
||||
<Version>2.45.0</Version>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
</PackageReference>
|
||||
|
||||
Reference in New Issue
Block a user