zilinsoft/SuperDesign
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

## :date:2025-07-16 星期三更新

Browse Source 
### RySmartEditor    V1.0.2507.1601
- *.[新增]新增文件内容索引搜索。
- *.[新增]新增打开文件自动定位到指定行的功能。
### SuperDesign    V3.0.2507.1601
#### 网页抓取工具
- *.[修复]修复历史记录无法记录的BUG。
#### 编码解码
- *.[新增]新增svg图片代码转Geometry代码的功能。
#### 项目功能->项目管理
- *.[新增]互斥运行标准改为以毕方文件夹为准,而不是以项目文件为准。
- *.[新增]支持同个毕方项目可以不用重启来快捷切换不同子项目。
- *.[新增]支持发布时和打包时自动编译功能。
- *.[修复]修复项目输出路径为相对路径时,更新引用dll可能不成功的BUG。
This commit is contained in:
zilinsoft committed 2025-07-16 09:08:09 +08:00
1 parent 30afab3ce9
commit 5a5faaf5dc
113 files changed
+832320 -898
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Source/开发辅助工具/Tools/FrmEncode.Designer.cs
Generated
+44 -4
View File
@@ -50,6 +50,9 @@
this.TxtResultCode = new ryControls.Controls.RichTextBox2();
this.RbBigToSmall = new System.Windows.Forms.RadioButton();
this.RbSmallToBig = new System.Windows.Forms.RadioButton();
this.RbSVG = new System.Windows.Forms.RadioButton();
this.BtnGetFromClip = new System.Windows.Forms.Button();
this.BtnCopyResult = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// RbChsToUnicode
@@ -232,10 +235,10 @@
this.TxtFromCode.EmptyText = "请填写待转换的内容";
this.TxtFromCode.Font = new System.Drawing.Font("Courier New", 10F);
this.TxtFromCode.ForeColor = System.Drawing.Color.Black;
this.TxtFromCode.Location = new System.Drawing.Point(12, 54);
this.TxtFromCode.Location = new System.Drawing.Point(12, 78);
this.TxtFromCode.Name = "TxtFromCode";
this.TxtFromCode.OnlyInputText = true;
this.TxtFromCode.Size = new System.Drawing.Size(926, 174);
this.TxtFromCode.Size = new System.Drawing.Size(926, 188);
this.TxtFromCode.TabIndex = 29;
this.TxtFromCode.Text = "";
this.TxtFromCode.TextChanged += new System.EventHandler(this.TxtFromCode_TextChanged);
@@ -262,11 +265,11 @@
this.TxtResultCode.EmptyText = "转换好后的内容";
this.TxtResultCode.Font = new System.Drawing.Font("Courier New", 10F);
this.TxtResultCode.ForeColor = System.Drawing.Color.Black;
this.TxtResultCode.Location = new System.Drawing.Point(12, 234);
this.TxtResultCode.Location = new System.Drawing.Point(12, 272);
this.TxtResultCode.Name = "TxtResultCode";
this.TxtResultCode.OnlyInputText = true;
this.TxtResultCode.ReadOnly = true;
this.TxtResultCode.Size = new System.Drawing.Size(926, 273);
this.TxtResultCode.Size = new System.Drawing.Size(926, 235);
this.TxtResultCode.TabIndex = 31;
this.TxtResultCode.Text = "";
//
@@ -292,11 +295,45 @@
this.RbSmallToBig.UseVisualStyleBackColor = true;
this.RbSmallToBig.CheckedChanged += new System.EventHandler(this.RbSmallToBig_CheckedChanged);
//
// RbSVG
//
this.RbSVG.AutoSize = true;
this.RbSVG.Location = new System.Drawing.Point(624, 32);
this.RbSVG.Name = "RbSVG";
this.RbSVG.Size = new System.Drawing.Size(101, 16);
this.RbSVG.TabIndex = 34;
this.RbSVG.Text = "SVG转Geometry";
this.RbSVG.UseVisualStyleBackColor = true;
this.RbSVG.CheckedChanged += new System.EventHandler(this.RbSVG_CheckedChanged);
//
// BtnGetFromClip
//
this.BtnGetFromClip.Location = new System.Drawing.Point(12, 49);
this.BtnGetFromClip.Name = "BtnGetFromClip";
this.BtnGetFromClip.Size = new System.Drawing.Size(66, 28);
this.BtnGetFromClip.TabIndex = 35;
this.BtnGetFromClip.Text = "粘贴内容";
this.BtnGetFromClip.UseVisualStyleBackColor = true;
this.BtnGetFromClip.Click += new System.EventHandler(this.BtnGetFromClip_Click);
//
// BtnCopyResult
//
this.BtnCopyResult.Location = new System.Drawing.Point(84, 49);
this.BtnCopyResult.Name = "BtnCopyResult";
this.BtnCopyResult.Size = new System.Drawing.Size(66, 28);
this.BtnCopyResult.TabIndex = 36;
this.BtnCopyResult.Text = "复制结果";
this.BtnCopyResult.UseVisualStyleBackColor = true;
this.BtnCopyResult.Click += new System.EventHandler(this.BtnCopyResult_Click);
//
// FrmEncode
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(950, 519);
this.Controls.Add(this.BtnCopyResult);
this.Controls.Add(this.BtnGetFromClip);
this.Controls.Add(this.RbSVG);
this.Controls.Add(this.RbSmallToBig);
this.Controls.Add(this.RbBigToSmall);
this.Controls.Add(this.TxtResultCode);
@@ -348,5 +385,8 @@
private ryControls.Controls.RichTextBox2 TxtResultCode;
private System.Windows.Forms.RadioButton RbBigToSmall;
private System.Windows.Forms.RadioButton RbSmallToBig;
private System.Windows.Forms.RadioButton RbSVG;
private System.Windows.Forms.Button BtnCopyResult;
private System.Windows.Forms.Button BtnGetFromClip;
}
}
Source/开发辅助工具/Tools/FrmEncode.cs
+55 -3
View File
@@ -1,4 +1,5 @@
using Newtonsoft.Json;
using ryCommon;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -115,7 +116,7 @@ namespace 开发辅助工具.Tools
#region UTF8转字符串
try
{
TxtResultCode.Text = RyWeb.WebDecode.Unescape(from_text.Replace("&#x","%u").Replace(";", ""));
TxtResultCode.Text = RyWeb.WebDecode.Unescape(from_text.Replace("&#x", "%u").Replace(";", ""));
}
catch { TxtResultCode.Text = ""; }
#endregion
@@ -135,7 +136,7 @@ namespace 开发辅助工具.Tools
#region 大写转小写
try
{
TxtResultCode.Text =from_text.ToLower();
TxtResultCode.Text = from_text.ToLower();
}
catch { TxtResultCode.Text = ""; }
#endregion
@@ -214,9 +215,40 @@ namespace 开发辅助工具.Tools
System.Xml.XmlDocument doc1 = JsonConvert.DeserializeXmlNode(json1);
TxtResultCode.Text = formatXml(doc1);
}
catch { TxtResultCode.Text = ""; }
catch { TxtResultCode.Text = ""; }
#endregion
}
else if (RbSVG.Checked)
{
if (!TxtFromCode.Text.StartsWith("<svg", StringComparison.OrdinalIgnoreCase))
{
TxtResultCode.Text = "错误的SVG源码";
}
else
{
try
{
var txt = "";
XmlDocument xmlDoc = new XmlDocument();
xmlDoc.LoadXml(TxtFromCode.Text);
XmlNamespaceManager nsmgr = new XmlNamespaceManager(new NameTable());
nsmgr.AddNamespace("ns", xmlDoc.FirstChild.NamespaceURI);
var nodes = xmlDoc.SelectNodes("//ns:path", nsmgr);
if (nodes != null && nodes.Count > 0)
{
txt = "";
foreach (XmlElement node in nodes)
{
if (txt.Length > 0) { txt += " "; }
txt += node.GetAttribute("d");
}
txt = "<Geometry x:Key=\"名字\">" + txt + "</Geometry>";
}
TxtResultCode.Text = txt;
}
catch { TxtResultCode.Text = "错误的SVG源码"; }
}
}
}
private static string formatXml(object xml)
{
@@ -356,5 +388,25 @@ namespace 开发辅助工具.Tools
private void FrmEncode_Load(object sender, EventArgs e)
{
}
private void RbSVG_CheckedChanged(object sender, EventArgs e)
{
RadioButton chk = (RadioButton)sender;
if (chk.Checked)
{
CbbEncodingCode.Enabled = false;
}
AutoCode();
}
private void BtnGetFromClip_Click(object sender, EventArgs e)
{
TxtFromCode.Text = Clipboard.GetText();
}
private void BtnCopyResult_Click(object sender, EventArgs e)
{
RyFiles.CopyToClip(TxtResultCode.Text);
}
}
}
Source/开发辅助工具/Tools/FrmImageToIcon.Designer.cs
Generated
+18
View File
@@ -28,6 +28,7 @@
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmImageToIcon));
this.TxtImagePath = new ryControls.TextBoxEx2();
this.BtnConvert = new ryControls.ButtonEx();
@@ -38,6 +39,7 @@
this.RbSize32 = new System.Windows.Forms.RadioButton();
this.RbSize128 = new System.Windows.Forms.RadioButton();
this.RbSize256 = new System.Windows.Forms.RadioButton();
this.ChkOpenFolder = new System.Windows.Forms.CheckBox();
((System.ComponentModel.ISupportInitialize)(this.superPictureBox1)).BeginInit();
this.SuspendLayout();
//
@@ -46,7 +48,9 @@
this.TxtImagePath.BackColor = System.Drawing.Color.White;
this.TxtImagePath.EmptyText = "";
this.TxtImagePath.Location = new System.Drawing.Point(45, 117);
this.TxtImagePath.LongTime = 2000;
this.TxtImagePath.MaxLength = 999999999;
this.TxtImagePath.MaxUndoRedoSteps = 50;
this.TxtImagePath.Multiline = false;
this.TxtImagePath.Name = "TxtImagePath";
this.TxtImagePath.OnlyNumeric = false;
@@ -140,11 +144,24 @@
this.RbSize256.Text = "256*256";
this.RbSize256.UseVisualStyleBackColor = true;
//
// ChkOpenFolder
//
this.ChkOpenFolder.AutoSize = true;
this.ChkOpenFolder.Checked = true;
this.ChkOpenFolder.CheckState = System.Windows.Forms.CheckState.Checked;
this.ChkOpenFolder.Location = new System.Drawing.Point(45, 195);
this.ChkOpenFolder.Name = "ChkOpenFolder";
this.ChkOpenFolder.Size = new System.Drawing.Size(144, 16);
this.ChkOpenFolder.TabIndex = 8;
this.ChkOpenFolder.Text = "转换完成后打开文件夹";
this.ChkOpenFolder.UseVisualStyleBackColor = true;
//
// FrmImageToIcon
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(744, 533);
this.Controls.Add(this.ChkOpenFolder);
this.Controls.Add(this.RbSize256);
this.Controls.Add(this.RbSize128);
this.Controls.Add(this.RbSize32);
@@ -173,5 +190,6 @@
private System.Windows.Forms.RadioButton RbSize32;
private System.Windows.Forms.RadioButton RbSize128;
private System.Windows.Forms.RadioButton RbSize256;
private System.Windows.Forms.CheckBox ChkOpenFolder;
}
}
Source/开发辅助工具/Tools/FrmImageToIcon.cs
+4 -1
View File
@@ -121,7 +121,10 @@ namespace 开发辅助工具.Tools
FileStream fileStream = new FileStream(icon_path, FileMode.Create);
icon.Save(fileStream);
fileStream.Close();
RyFiles.OpenFolderGotoFile(icon_path);
if (ChkOpenFolder.Checked)
{
RyFiles.OpenFolderGotoFile(icon_path);
}
}
catch
{
Source/开发辅助工具/Tools/FrmProject.Designer.cs
Generated
+90 -20
View File
@@ -80,6 +80,7 @@
this.BtnSave2 = new ryControls.ButtonEx();
this.panel1 = new System.Windows.Forms.Panel();
this.tabPage4 = new System.Windows.Forms.TabPage();
this.ChkBuildOn = new System.Windows.Forms.CheckBox();
this.LblUseTime = new System.Windows.Forms.Label();
this.ChkUpdateVerByPublish = new System.Windows.Forms.CheckBox();
this.BtnSubmitGit = new ryControls.ButtonEx();
@@ -95,6 +96,10 @@
this.生成Html日志并上传到服务器ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.BtnPublishLogs = new ryControls.ButtonEx();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.label7 = new System.Windows.Forms.Label();
this.LvProjectBuild = new BrightIdeasSoftware.ObjectListView();
this.olvProjectName = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn()));
this.olvPlatform = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn()));
((System.ComponentModel.ISupportInitialize)(this.table1)).BeginInit();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
@@ -106,6 +111,7 @@
this.tabPage4.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.LvUpdateLogList)).BeginInit();
this.contextMenuStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.LvProjectBuild)).BeginInit();
this.SuspendLayout();
//
// BtnCustomMessageBox
@@ -122,7 +128,7 @@
// BtnCopyCMD
//
this.BtnCopyCMD.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.BtnCopyCMD.Location = new System.Drawing.Point(775, 12);
this.BtnCopyCMD.Location = new System.Drawing.Point(893, 12);
this.BtnCopyCMD.Name = "BtnCopyCMD";
this.BtnCopyCMD.Size = new System.Drawing.Size(142, 38);
this.BtnCopyCMD.TabIndex = 11;
@@ -163,7 +169,7 @@
this.table1.Location = new System.Drawing.Point(3, 3);
this.table1.Name = "table1";
this.table1.NoItemsText = "当前列表没有任何项";
this.table1.Size = new System.Drawing.Size(915, 461);
this.table1.Size = new System.Drawing.Size(1033, 461);
this.table1.TabIndex = 20;
this.table1.TableModel = this.tableModel1;
this.table1.Text = "table1";
@@ -403,7 +409,7 @@
this.groupBox1.Controls.Add(this.BtnClean);
this.groupBox1.Location = new System.Drawing.Point(12, 120);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(905, 62);
this.groupBox1.Size = new System.Drawing.Size(1023, 62);
this.groupBox1.TabIndex = 27;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "项目管理";
@@ -428,7 +434,7 @@
this.groupBox2.Controls.Add(this.BtnCustomMessageBox);
this.groupBox2.Location = new System.Drawing.Point(12, 56);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(905, 60);
this.groupBox2.Size = new System.Drawing.Size(1023, 60);
this.groupBox2.TabIndex = 28;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "快速代码";
@@ -451,7 +457,7 @@
this.chromeTabControl1.SelectedIndex = 0;
this.chromeTabControl1.ShowAddButton = false;
this.chromeTabControl1.ShowCloseButton = false;
this.chromeTabControl1.Size = new System.Drawing.Size(923, 500);
this.chromeTabControl1.Size = new System.Drawing.Size(1041, 500);
this.chromeTabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
this.chromeTabControl1.TabContextMenuStrip = null;
this.chromeTabControl1.TabIndex = 29;
@@ -463,7 +469,7 @@
this.tabPage2.Location = new System.Drawing.Point(1, 29);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(921, 470);
this.tabPage2.Size = new System.Drawing.Size(1039, 470);
this.tabPage2.TabIndex = 0;
this.tabPage2.Text = "文件夹";
this.tabPage2.UseVisualStyleBackColor = true;
@@ -491,7 +497,7 @@
this.tabPage1.Location = new System.Drawing.Point(1, 29);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(921, 470);
this.tabPage1.Size = new System.Drawing.Size(1039, 470);
this.tabPage1.TabIndex = 1;
this.tabPage1.Text = "项目信息";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -574,7 +580,7 @@
this.BtnSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.BtnSave.BaseColor = System.Drawing.Color.Green;
this.BtnSave.ColorGradient = true;
this.BtnSave.Location = new System.Drawing.Point(814, 430);
this.BtnSave.Location = new System.Drawing.Point(932, 430);
this.BtnSave.Name = "BtnSave";
this.BtnSave.Size = new System.Drawing.Size(99, 34);
this.BtnSave.TabIndex = 27;
@@ -719,13 +725,15 @@
//
// tabPage3
//
this.tabPage3.Controls.Add(this.label7);
this.tabPage3.Controls.Add(this.LvProjectBuild);
this.tabPage3.Controls.Add(this.BtnSave2);
this.tabPage3.Controls.Add(this.panel1);
this.tabPage3.Controls.Add(this.ChkTestOn);
this.tabPage3.Location = new System.Drawing.Point(1, 29);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
this.tabPage3.Size = new System.Drawing.Size(921, 470);
this.tabPage3.Size = new System.Drawing.Size(1039, 470);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "C#编译选项";
this.tabPage3.UseVisualStyleBackColor = true;
@@ -735,7 +743,7 @@
this.BtnSave2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.BtnSave2.BaseColor = System.Drawing.Color.Green;
this.BtnSave2.ColorGradient = true;
this.BtnSave2.Location = new System.Drawing.Point(798, 430);
this.BtnSave2.Location = new System.Drawing.Point(932, 430);
this.BtnSave2.Name = "BtnSave2";
this.BtnSave2.Size = new System.Drawing.Size(99, 34);
this.BtnSave2.TabIndex = 28;
@@ -756,6 +764,7 @@
//
// tabPage4
//
this.tabPage4.Controls.Add(this.ChkBuildOn);
this.tabPage4.Controls.Add(this.LblUseTime);
this.tabPage4.Controls.Add(this.ChkUpdateVerByPublish);
this.tabPage4.Controls.Add(this.BtnSubmitGit);
@@ -766,11 +775,24 @@
this.tabPage4.Location = new System.Drawing.Point(1, 29);
this.tabPage4.Name = "tabPage4";
this.tabPage4.Padding = new System.Windows.Forms.Padding(3);
this.tabPage4.Size = new System.Drawing.Size(921, 470);
this.tabPage4.Size = new System.Drawing.Size(1039, 470);
this.tabPage4.TabIndex = 3;
this.tabPage4.Text = "更新日志";
this.tabPage4.UseVisualStyleBackColor = true;
//
// ChkBuildOn
//
this.ChkBuildOn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.ChkBuildOn.AutoSize = true;
this.ChkBuildOn.Checked = true;
this.ChkBuildOn.CheckState = System.Windows.Forms.CheckState.Checked;
this.ChkBuildOn.Location = new System.Drawing.Point(622, 12);
this.ChkBuildOn.Name = "ChkBuildOn";
this.ChkBuildOn.Size = new System.Drawing.Size(84, 16);
this.ChkBuildOn.TabIndex = 16;
this.ChkBuildOn.Text = "发布前编译";
this.ChkBuildOn.UseVisualStyleBackColor = true;
//
// LblUseTime
//
this.LblUseTime.AutoSize = true;
@@ -787,7 +809,7 @@
this.ChkUpdateVerByPublish.AutoSize = true;
this.ChkUpdateVerByPublish.Checked = true;
this.ChkUpdateVerByPublish.CheckState = System.Windows.Forms.CheckState.Checked;
this.ChkUpdateVerByPublish.Location = new System.Drawing.Point(609, 12);
this.ChkUpdateVerByPublish.Location = new System.Drawing.Point(727, 12);
this.ChkUpdateVerByPublish.Name = "ChkUpdateVerByPublish";
this.ChkUpdateVerByPublish.Size = new System.Drawing.Size(144, 16);
this.ChkUpdateVerByPublish.TabIndex = 14;
@@ -799,7 +821,7 @@
this.BtnSubmitGit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.BtnSubmitGit.BaseColor = System.Drawing.Color.Green;
this.BtnSubmitGit.ColorGradient = true;
this.BtnSubmitGit.Location = new System.Drawing.Point(759, 3);
this.BtnSubmitGit.Location = new System.Drawing.Point(877, 3);
this.BtnSubmitGit.Name = "BtnSubmitGit";
this.BtnSubmitGit.Size = new System.Drawing.Size(75, 33);
this.BtnSubmitGit.TabIndex = 13;
@@ -813,10 +835,10 @@
this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.tabControl1.Location = new System.Drawing.Point(354, 39);
this.tabControl1.Location = new System.Drawing.Point(400, 39);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(561, 425);
this.tabControl1.Size = new System.Drawing.Size(633, 425);
this.tabControl1.TabIndex = 12;
//
// BtnSaveLog
@@ -849,7 +871,7 @@
this.LvUpdateLogList.HideSelection = false;
this.LvUpdateLogList.Location = new System.Drawing.Point(3, 39);
this.LvUpdateLogList.Name = "LvUpdateLogList";
this.LvUpdateLogList.Size = new System.Drawing.Size(345, 425);
this.LvUpdateLogList.Size = new System.Drawing.Size(391, 425);
this.LvUpdateLogList.TabIndex = 10;
this.LvUpdateLogList.UseCompatibleStateImageBehavior = false;
this.LvUpdateLogList.View = System.Windows.Forms.View.Details;
@@ -858,7 +880,7 @@
// OlvUpVer
//
this.OlvUpVer.Text = "版本";
this.OlvUpVer.Width = 110;
this.OlvUpVer.Width = 120;
//
// OlvUpdateDate
//
@@ -868,7 +890,7 @@
// OlvTime
//
this.OlvTime.Text = "周期";
this.OlvTime.Width = 100;
this.OlvTime.Width = 120;
//
// contextMenuStrip1
//
@@ -906,7 +928,7 @@
this.BtnPublishLogs.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.BtnPublishLogs.BaseColor = System.Drawing.Color.Green;
this.BtnPublishLogs.ColorGradient = true;
this.BtnPublishLogs.Location = new System.Drawing.Point(840, 3);
this.BtnPublishLogs.Location = new System.Drawing.Point(958, 3);
this.BtnPublishLogs.Name = "BtnPublishLogs";
this.BtnPublishLogs.Size = new System.Drawing.Size(75, 33);
this.BtnPublishLogs.TabIndex = 9;
@@ -921,11 +943,53 @@
this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// label7
//
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(11, 61);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(65, 12);
this.label7.TabIndex = 39;
this.label7.Text = "打包前编译";
//
// LvProjectBuild
//
this.LvProjectBuild.AllColumns.Add(this.olvProjectName);
this.LvProjectBuild.AllColumns.Add(this.olvPlatform);
this.LvProjectBuild.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.LvProjectBuild.CellEditUseWholeCell = false;
this.LvProjectBuild.CheckBoxes = true;
this.LvProjectBuild.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.olvProjectName,
this.olvPlatform});
this.LvProjectBuild.Cursor = System.Windows.Forms.Cursors.Default;
this.LvProjectBuild.FullRowSelect = true;
this.LvProjectBuild.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
this.LvProjectBuild.HideSelection = false;
this.LvProjectBuild.Location = new System.Drawing.Point(12, 76);
this.LvProjectBuild.Name = "LvProjectBuild";
this.LvProjectBuild.Size = new System.Drawing.Size(391, 344);
this.LvProjectBuild.TabIndex = 38;
this.LvProjectBuild.UseCompatibleStateImageBehavior = false;
this.LvProjectBuild.View = System.Windows.Forms.View.Details;
this.LvProjectBuild.ItemChecked += new System.Windows.Forms.ItemCheckedEventHandler(this.LvProjectBuild_ItemChecked);
//
// olvProjectName
//
this.olvProjectName.Text = "项目";
this.olvProjectName.Width = 180;
//
// olvPlatform
//
this.olvPlatform.Text = "平台";
this.olvPlatform.Width = 130;
//
// FrmProject
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(929, 706);
this.ClientSize = new System.Drawing.Size(1047, 706);
this.CloseButton = false;
this.CloseButtonVisible = false;
this.Controls.Add(this.chromeTabControl1);
@@ -956,6 +1020,7 @@
this.tabPage4.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.LvUpdateLogList)).EndInit();
this.contextMenuStrip1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.LvProjectBuild)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -1029,5 +1094,10 @@
private ryControls.ButtonEx BtnFtpFiles;
private ryControls.ButtonEx BtnPackFileList;
private System.Windows.Forms.ToolStripMenuItem 生成Html日志并上传到服务器ToolStripMenuItem;
private System.Windows.Forms.CheckBox ChkBuildOn;
private System.Windows.Forms.Label label7;
private BrightIdeasSoftware.ObjectListView LvProjectBuild;
private BrightIdeasSoftware.OLVColumn olvProjectName;
private BrightIdeasSoftware.OLVColumn olvPlatform;
}
}
Source/开发辅助工具/Tools/FrmProject.cs
+568 -428
View File
File diff suppressed because it is too large. Load diff
Source/开发辅助工具/Tools/UpLog/FrmBuilding.Designer.cs
Generated
+64
View File
@@ -0,0 +1,64 @@
namespace SuperDesign.Tools.UpLog
{
partial class FrmBuilding
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.richTextBox1 = new System.Windows.Forms.RichTextBox();
this.SuspendLayout();
//
// richTextBox1
//
this.richTextBox1.BackColor = System.Drawing.Color.White;
this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.richTextBox1.Location = new System.Drawing.Point(0, 0);
this.richTextBox1.Name = "richTextBox1";
this.richTextBox1.ReadOnly = true;
this.richTextBox1.Size = new System.Drawing.Size(913, 604);
this.richTextBox1.TabIndex = 0;
this.richTextBox1.Text = "";
//
// FrmBuilding
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(913, 604);
this.Controls.Add(this.richTextBox1);
this.Name = "FrmBuilding";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "编译中...";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmBuilding_FormClosing);
this.Shown += new System.EventHandler(this.FrmBuilding_Shown);
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.RichTextBox richTextBox1;
}
}
Source/开发辅助工具/Tools/UpLog/FrmBuilding.cs
+133
View File
@@ -0,0 +1,133 @@
using ryCommon;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Diagnostics;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace SuperDesign.Tools.UpLog
{
public partial class FrmBuilding : Form
{
public FrmBuilding()
{
InitializeComponent();
}
public List<BuildComand> BuildingList { get; set; }=new List<BuildComand>();
private void FrmBuilding_Shown(object sender, EventArgs e)
{
Task.Run(() =>
{
var err_count = 0;
var success_count = 0;
var index = 0;
foreach (var item in BuildingList)
{
index++;
this.Invoke(new Action(() =>
{
Text = "[" + item.Name + "]编译中["+index+"/"+ BuildingList.Count+ "]...";
}));
Process p = new Process
{
StartInfo = new System.Diagnostics.ProcessStartInfo
{
FileName = "D:\\Program Files\\Microsoft Visual Studio\\2022\\Professional\\Common7\\IDE\\devenv.com",//设定程序名
Arguments = item.Comand,
UseShellExecute = false, //关闭shell的使用
RedirectStandardInput = true, //重定向标准输入
RedirectStandardOutput = true, //重定向标准输出
RedirectStandardError = false, //重定向错误输出
WorkingDirectory = "",
StandardOutputEncoding = Encoding.Default,
CreateNoWindow = true//设置不显示窗口
}
};
p.Start();
while (!p.StandardOutput.EndOfStream)
{
string line = p.StandardOutput.ReadLine();
if (line.StartsWith("版权所有"))
{
continue;
}
var color=Color.Black;
//ryProcessManager=>========== 生成: 0 成功，0 失败，3 最新，0 已跳过
if (line.IndexOfEx("生成:")>=0 && line.IndexOfEx("成功") >= 0 && line.IndexOfEx("失败") >= 0 && line.IndexOfEx("已跳过") >= 0)
{
if (line.IndexOfEx("，0 失败")<0)
{
err_count++;
color = Color.Red;
}
else{
success_count++;
color = Color.Blue;
}
}
this.Invoke(new Action(() =>
{
if (richTextBox1.Text.Length == 0)
{
richTextBox1.Text =item.Name+"=>"+line;
if(color!=Color.Black)
{
richTextBox1.SelectionStart = 0;
richTextBox1.SelectionLength = richTextBox1.Text.Length;
richTextBox1.SelectionColor = color;
richTextBox1.SelectionFont = new Font(richTextBox1.Font, FontStyle.Bold);
}
}
else
{
var start=richTextBox1.Text.Length;
richTextBox1.AppendText("\n" + item.Name + "=>" + line);
if (color != Color.Black)
{
richTextBox1.SelectionStart = start;
richTextBox1.SelectionLength = richTextBox1.Text.Length- start;
richTextBox1.SelectionColor = color;
richTextBox1.SelectionFont = new Font(richTextBox1.Font, FontStyle.Bold);
}
}
richTextBox1.SelectionStart = richTextBox1.Text.Length;
richTextBox1.SelectionLength = 0;
richTextBox1.SelectionColor = Color.Black;
richTextBox1.SelectionFont = richTextBox1.Font;
}));
}
}
this.Invoke(new Action(() =>
{
Text = "编译完成";
if(err_count>0)
{
canexit = true;
MessageBox.Show("部分生成失败,成功:"+success_count+"个,失败"+err_count+"个", "部分生成失败", MessageBoxButtons.OK, MessageBoxIcon.Information);
return;
}
DialogResult = DialogResult.OK;
}));
});
}
bool canexit = false;
private void FrmBuilding_FormClosing(object sender, FormClosingEventArgs e)
{
if(DialogResult != DialogResult.OK && !canexit)
{
e.Cancel = true;
}
}
}
public class BuildComand
{
public string Comand { get; set; } = "";
public string Name { get; set; } = "";
}
}
Source/开发辅助工具/Tools/UpLog/FrmBuilding.resx
+120
View File
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>