diff --git a/App.config b/App.config index f131543..94de954 100644 --- a/App.config +++ b/App.config @@ -9,6 +9,10 @@ + + + + diff --git a/Form1.Designer.cs b/Form1.Designer.cs index 6355178..d0ee522 100644 --- a/Form1.Designer.cs +++ b/Form1.Designer.cs @@ -41,6 +41,10 @@ private void InitializeComponent() this.ReleaseControl = new System.Windows.Forms.Button(); this.EnableScreenshot = new System.Windows.Forms.Button(); this.panel1 = new System.Windows.Forms.Panel(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.button2 = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button(); this.ABOUT = new System.Windows.Forms.Button(); this.DataGroupBox = new System.Windows.Forms.GroupBox(); @@ -64,18 +68,14 @@ private void InitializeComponent() this.ClassBegin = new System.Windows.Forms.Button(); this.DisableFirewall = new System.Windows.Forms.Button(); this.EnableFirewall = new System.Windows.Forms.Button(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.button2 = new System.Windows.Forms.Button(); - this.textBox1 = new System.Windows.Forms.TextBox(); - this.textBox2 = new System.Windows.Forms.TextBox(); this.ConnectionsGroupBox.SuspendLayout(); this.DeviceGroupBox.SuspendLayout(); this.panel1.SuspendLayout(); + this.groupBox1.SuspendLayout(); this.DataGroupBox.SuspendLayout(); this.LinspirerGroupBox.SuspendLayout(); this.AppGroupBox.SuspendLayout(); this.OthersGroupBox.SuspendLayout(); - this.groupBox1.SuspendLayout(); this.SuspendLayout(); // // CheckADB @@ -207,11 +207,49 @@ private void InitializeComponent() this.panel1.Controls.Add(this.CheckADB); this.panel1.Controls.Add(this.DeviceGroupBox); this.panel1.Controls.Add(this.ConnectionsGroupBox); - this.panel1.Location = new System.Drawing.Point(9, 0); + this.panel1.Location = new System.Drawing.Point(12, 12); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(599, 642); + this.panel1.Size = new System.Drawing.Size(601, 642); this.panel1.TabIndex = 3; // + // groupBox1 + // + this.groupBox1.Controls.Add(this.textBox2); + this.groupBox1.Controls.Add(this.textBox1); + this.groupBox1.Controls.Add(this.button2); + this.groupBox1.Location = new System.Drawing.Point(6, 551); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(576, 70); + this.groupBox1.TabIndex = 4; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "动态密码"; + // + // textBox2 + // + this.textBox2.Location = new System.Drawing.Point(291, 24); + this.textBox2.Multiline = true; + this.textBox2.Name = "textBox2"; + this.textBox2.Size = new System.Drawing.Size(277, 38); + this.textBox2.TabIndex = 5; + // + // textBox1 + // + this.textBox1.Location = new System.Drawing.Point(6, 33); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(136, 25); + this.textBox1.TabIndex = 4; + this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // button2 + // + this.button2.Location = new System.Drawing.Point(149, 24); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(136, 38); + this.button2.TabIndex = 3; + this.button2.Text = "计算"; + this.button2.UseVisualStyleBackColor = true; + this.button2.Click += new System.EventHandler(this.button2_Click_1); + // // button1 // this.button1.ForeColor = System.Drawing.SystemColors.ControlText; @@ -454,51 +492,13 @@ private void InitializeComponent() this.EnableFirewall.UseVisualStyleBackColor = true; this.EnableFirewall.Click += new System.EventHandler(this.button12_Click); // - // groupBox1 - // - this.groupBox1.Controls.Add(this.textBox2); - this.groupBox1.Controls.Add(this.textBox1); - this.groupBox1.Controls.Add(this.button2); - this.groupBox1.Location = new System.Drawing.Point(6, 551); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(576, 70); - this.groupBox1.TabIndex = 4; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "动态密码"; - // - // button2 - // - this.button2.Location = new System.Drawing.Point(149, 24); - this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(136, 38); - this.button2.TabIndex = 3; - this.button2.Text = "计算"; - this.button2.UseVisualStyleBackColor = true; - this.button2.Click += new System.EventHandler(this.button2_Click_1); - // - // textBox1 - // - this.textBox1.Location = new System.Drawing.Point(6, 33); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(136, 25); - this.textBox1.TabIndex = 4; - this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // textBox2 - // - this.textBox2.Location = new System.Drawing.Point(291, 24); - this.textBox2.Multiline = true; - this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(277, 38); - this.textBox2.TabIndex = 5; - // // Form1 // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScroll = true; this.BackColor = System.Drawing.SystemColors.Menu; - this.ClientSize = new System.Drawing.Size(641, 397); + this.ClientSize = new System.Drawing.Size(646, 397); this.Controls.Add(this.panel1); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; @@ -507,13 +507,13 @@ private void InitializeComponent() this.ConnectionsGroupBox.ResumeLayout(false); this.DeviceGroupBox.ResumeLayout(false); this.panel1.ResumeLayout(false); + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); this.DataGroupBox.ResumeLayout(false); this.LinspirerGroupBox.ResumeLayout(false); this.AppGroupBox.ResumeLayout(false); this.AppGroupBox.PerformLayout(); this.OthersGroupBox.ResumeLayout(false); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); this.ResumeLayout(false); } diff --git a/Form1.cs b/Form1.cs index b042f88..fa35509 100644 --- a/Form1.cs +++ b/Form1.cs @@ -1,13 +1,6 @@ -using NPOI.POIFS.Crypt; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; +using System; using System.Security.Cryptography; using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; namespace abdUI @@ -203,13 +196,8 @@ public static string calc(string str, string key) } public static string m3759b(string str) { - sbyte[] bytes = str.GetBytes(); - MessageDigest instance = MessageDigest.getInstance("md5"); - instance.reset(); - instance.update(bytes); - sbyte[] digest = instance.digest(); StringBuilder sb = new StringBuilder(); - foreach (sbyte b in digest) + foreach (sbyte b in str) { string hexString = (b & 255).ToString("x"); if (hexString.Length == 1) diff --git a/abdUI.csproj b/abdUI.csproj index ac933cb..096967b 100644 --- a/abdUI.csproj +++ b/abdUI.csproj @@ -85,8 +85,8 @@ - - packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + + packages\System.Memory.4.5.5\lib\net461\System.Memory.dll diff --git a/packages.config b/packages.config index dc035ef..37620b2 100644 --- a/packages.config +++ b/packages.config @@ -3,7 +3,7 @@ - + diff --git a/packages/System.Memory.4.5.4/System.Memory.4.5.4.nupkg b/packages/System.Memory.4.5.4/System.Memory.4.5.4.nupkg deleted file mode 100644 index 6844e92..0000000 Binary files a/packages/System.Memory.4.5.4/System.Memory.4.5.4.nupkg and /dev/null differ diff --git a/packages/System.Memory.4.5.4/version.txt b/packages/System.Memory.4.5.4/version.txt deleted file mode 100644 index 8d6cdd6..0000000 --- a/packages/System.Memory.4.5.4/version.txt +++ /dev/null @@ -1 +0,0 @@ -7601f4f6225089ffb291dc7d58293c7bbf5c5d4f diff --git a/packages/System.Memory.4.5.4/.signature.p7s b/packages/System.Memory.4.5.5/.signature.p7s similarity index 75% rename from packages/System.Memory.4.5.4/.signature.p7s rename to packages/System.Memory.4.5.5/.signature.p7s index abb2a57..40dcb3e 100644 Binary files a/packages/System.Memory.4.5.4/.signature.p7s and b/packages/System.Memory.4.5.5/.signature.p7s differ diff --git a/packages/System.Memory.4.5.4/LICENSE.TXT b/packages/System.Memory.4.5.5/LICENSE.TXT similarity index 100% rename from packages/System.Memory.4.5.4/LICENSE.TXT rename to packages/System.Memory.4.5.5/LICENSE.TXT diff --git a/packages/System.Memory.4.5.5/System.Memory.4.5.5.nupkg b/packages/System.Memory.4.5.5/System.Memory.4.5.5.nupkg new file mode 100644 index 0000000..9d654e2 Binary files /dev/null and b/packages/System.Memory.4.5.5/System.Memory.4.5.5.nupkg differ diff --git a/packages/System.Memory.4.5.4/THIRD-PARTY-NOTICES.TXT b/packages/System.Memory.4.5.5/THIRD-PARTY-NOTICES.TXT similarity index 100% rename from packages/System.Memory.4.5.4/THIRD-PARTY-NOTICES.TXT rename to packages/System.Memory.4.5.5/THIRD-PARTY-NOTICES.TXT diff --git a/packages/System.Memory.4.5.4/lib/net461/System.Memory.dll b/packages/System.Memory.4.5.5/lib/net461/System.Memory.dll similarity index 90% rename from packages/System.Memory.4.5.4/lib/net461/System.Memory.dll rename to packages/System.Memory.4.5.5/lib/net461/System.Memory.dll index 5d19470..4617199 100644 Binary files a/packages/System.Memory.4.5.4/lib/net461/System.Memory.dll and b/packages/System.Memory.4.5.5/lib/net461/System.Memory.dll differ diff --git a/packages/System.Memory.4.5.4/lib/net461/System.Memory.xml b/packages/System.Memory.4.5.5/lib/net461/System.Memory.xml similarity index 100% rename from packages/System.Memory.4.5.4/lib/net461/System.Memory.xml rename to packages/System.Memory.4.5.5/lib/net461/System.Memory.xml diff --git a/packages/System.Memory.4.5.4/lib/netcoreapp2.1/_._ b/packages/System.Memory.4.5.5/lib/netcoreapp2.1/_._ similarity index 100% rename from packages/System.Memory.4.5.4/lib/netcoreapp2.1/_._ rename to packages/System.Memory.4.5.5/lib/netcoreapp2.1/_._ diff --git a/packages/System.Memory.4.5.4/lib/netstandard1.1/System.Memory.dll b/packages/System.Memory.4.5.5/lib/netstandard1.1/System.Memory.dll similarity index 87% rename from packages/System.Memory.4.5.4/lib/netstandard1.1/System.Memory.dll rename to packages/System.Memory.4.5.5/lib/netstandard1.1/System.Memory.dll index 98f1c5d..31486d6 100644 Binary files a/packages/System.Memory.4.5.4/lib/netstandard1.1/System.Memory.dll and b/packages/System.Memory.4.5.5/lib/netstandard1.1/System.Memory.dll differ diff --git a/packages/System.Memory.4.5.4/lib/netstandard1.1/System.Memory.xml b/packages/System.Memory.4.5.5/lib/netstandard1.1/System.Memory.xml similarity index 100% rename from packages/System.Memory.4.5.4/lib/netstandard1.1/System.Memory.xml rename to packages/System.Memory.4.5.5/lib/netstandard1.1/System.Memory.xml diff --git a/packages/System.Memory.4.5.4/lib/netstandard2.0/System.Memory.dll b/packages/System.Memory.4.5.5/lib/netstandard2.0/System.Memory.dll similarity index 91% rename from packages/System.Memory.4.5.4/lib/netstandard2.0/System.Memory.dll rename to packages/System.Memory.4.5.5/lib/netstandard2.0/System.Memory.dll index 953a9d2..1e6aef8 100644 Binary files a/packages/System.Memory.4.5.4/lib/netstandard2.0/System.Memory.dll and b/packages/System.Memory.4.5.5/lib/netstandard2.0/System.Memory.dll differ diff --git a/packages/System.Memory.4.5.4/lib/netstandard2.0/System.Memory.xml b/packages/System.Memory.4.5.5/lib/netstandard2.0/System.Memory.xml similarity index 100% rename from packages/System.Memory.4.5.4/lib/netstandard2.0/System.Memory.xml rename to packages/System.Memory.4.5.5/lib/netstandard2.0/System.Memory.xml diff --git a/packages/System.Memory.4.5.4/ref/netcoreapp2.1/_._ b/packages/System.Memory.4.5.5/ref/netcoreapp2.1/_._ similarity index 100% rename from packages/System.Memory.4.5.4/ref/netcoreapp2.1/_._ rename to packages/System.Memory.4.5.5/ref/netcoreapp2.1/_._ diff --git a/packages/System.Memory.4.5.4/useSharedDesignerContext.txt b/packages/System.Memory.4.5.5/useSharedDesignerContext.txt similarity index 100% rename from packages/System.Memory.4.5.4/useSharedDesignerContext.txt rename to packages/System.Memory.4.5.5/useSharedDesignerContext.txt diff --git a/packages/System.Memory.4.5.5/version.txt b/packages/System.Memory.4.5.5/version.txt new file mode 100644 index 0000000..b46e477 --- /dev/null +++ b/packages/System.Memory.4.5.5/version.txt @@ -0,0 +1 @@ +32b491939fbd125f304031c35038b1e14b4e3958