### 2025-01-13 星期一更新
------ #### SuperDesign V3.0.2501.1301 - *.[新增]更新日志新增支持显示开发周期。 - *.[改进]上传项目到服务端判断本地根目录默认为输出目录,不存在才为毕方输出目录。 - *.[改进]更新日志右键菜单新增日志时自动按位置插入到指定行。 - *.[改进]当日志里包含[开发]时,就不会发布到Html日志里。
This commit is contained in:
parent
c000c7ef1b
commit
d240361f74
|
@ -1,67 +0,0 @@
|
|||
[Settings]
|
||||
|
||||
; game appid here
|
||||
AppID = 739630
|
||||
|
||||
; source steam_api.dll version
|
||||
API = 5.69.73.98
|
||||
|
||||
; player name
|
||||
PlayerName = VALVE
|
||||
|
||||
; game Language
|
||||
;english german french italian koreana
|
||||
;spanish schinese tchinese russian thai
|
||||
;japanese portuguese polish danish dutch
|
||||
;finnish norwegian swedish hungarian czech
|
||||
;romanian turkish
|
||||
|
||||
Language = schinese
|
||||
|
||||
;save types:
|
||||
; VALVE(game dir) 0
|
||||
; VALVE(my documents) 1
|
||||
; RELOADED 4
|
||||
; SKIDROW 5
|
||||
; FLT 6
|
||||
; CODEX(3.0.4+/my documents) 7
|
||||
; CODEX(1.0.0.0+/APPDATA) 8
|
||||
SaveType = 0
|
||||
|
||||
|
||||
|
||||
;Achievements Count limit
|
||||
;AchievementsCount=0
|
||||
|
||||
;game exe path
|
||||
;GameEXE=game.exe
|
||||
|
||||
;SteamUserID =12345678
|
||||
;SteamUserIDH =12345678
|
||||
|
||||
;IsLoggedOn=0
|
||||
|
||||
;Online=0
|
||||
|
||||
|
||||
;UnLockListedDLCOnly=1
|
||||
[DLC]
|
||||
;SET DLC USE "APPID=NAME"
|
||||
|
||||
|
||||
|
||||
|
||||
[Option]
|
||||
|
||||
|
||||
;Block Network.
|
||||
;FullBlockNetwork=1
|
||||
|
||||
;Redirect File Handle to ".valve"
|
||||
;FileRedirectCheck=1
|
||||
|
||||
;DECRYPT STEAM STUB
|
||||
;set 1 tells steam_api.dll / steam_api64.dll to decrypt the steam stub as soon as possible
|
||||
;set 2 tells SteamClient.dll / SteamClient64.dll to decrypt the steam stub as soon as possible
|
||||
;set 0 to disable it.
|
||||
;DECRYPT_STEAM_STUB=0
|
Binary file not shown.
Binary file not shown.
95
CHANGELOG.md
95
CHANGELOG.md
|
@ -1,8 +1,23 @@
|
|||
### 2025-01-08 星期三更新
|
||||
### 2025-01-13 星期一更新
|
||||
|
||||
------
|
||||
|
||||
#### SuperDesign V3.0.2501.1301
|
||||
|
||||
- *.[新增]更新日志新增支持显示开发周期。
|
||||
- *.[改进]上传项目到服务端判断本地根目录默认为输出目录,不存在才为毕方输出目录。
|
||||
- *.[改进]更新日志右键菜单新增日志时自动按位置插入到指定行。
|
||||
- *.[改进]当日志里包含[开发]时,就不会发布到Html日志里。
|
||||
|
||||
### 2025-01-08 星期三更新
|
||||
|
||||
------
|
||||
|
||||
#### RySmartEditor V1.0.2501.0801
|
||||
|
||||
- *.[改进]复制文件到其它站点同位置功能支持复制文件夹。
|
||||
#### SuperDesign V3.0.2501.0801
|
||||
|
||||
#### SuperDesign V3.0.2501.0801
|
||||
- *.[新增]支持直接设置主项目的功能。
|
||||
- *.[新增]新增支持设置在发布日志时是否更新版本号的功能。
|
||||
- *.[新增]更新日志右键菜单支持快速添加日志前缀。
|
||||
|
@ -11,8 +26,11 @@
|
|||
- *.[修复]修复打开Git时无法粘贴更新日志的BUG。
|
||||
|
||||
### 2024-12-21 星期六更新
|
||||
|
||||
------
|
||||
|
||||
#### SuperDesign V3.0.2412.2101
|
||||
|
||||
- *.[新增]新增支持多选更新日志列表,合并生成Html日志。
|
||||
- *.[改进]支持设置解决方案中的哪些项目日志不显示在Html日志列表里。
|
||||
- *.[改进]打开时默认选中主项目的更新日志Tab。
|
||||
|
@ -21,8 +39,11 @@
|
|||
- *.[修复]修复连续快速打开项目,会导致软件多开的BUG。
|
||||
|
||||
### 2024-12-20 星期五更新
|
||||
|
||||
------
|
||||
|
||||
#### SuperDesign V3.0.2412.2003
|
||||
|
||||
- *.[新增]新增支持更新日志发布时自动调用起TortoiseGit。
|
||||
- *.[新增]版本列表新增支持设置正式版本。
|
||||
- *.[改进]自定义对话框针对单选函数返回值,则使用if而不是switch语句。
|
||||
|
@ -30,8 +51,11 @@
|
|||
- *.[改进]更新版本列表的更新时间支持昨天、今天的简短显示。
|
||||
|
||||
### 2024-12-20 星期五更新
|
||||
|
||||
------
|
||||
|
||||
#### SuperDesign V3.0.2412.2002
|
||||
|
||||
- *.[新增]新增对.NET5以上项目文件的版本修改支持。
|
||||
- *.[新增]新增支持双击历史更新记录,查看具体更新日志。
|
||||
- *.[新增]更新日志新增对项目中文名称的设置和显示。
|
||||
|
@ -39,112 +63,171 @@
|
|||
- *.[改进]对于同个项目,只允许打开一个实例的开发辅助工具。
|
||||
|
||||
### 2024-12-20 星期五更新
|
||||
|
||||
------
|
||||
|
||||
#### SuperDesign V3.0.2412.2001
|
||||
|
||||
- *.[新增]新增程序更新日志设置和自动发布功能。
|
||||
- *.[修复]修复Post数据格式不正确时双击文本框会导致软件闪退的BUG。
|
||||
|
||||
### 2024-02-22更新
|
||||
|
||||
-------
|
||||
|
||||
#### RySmartEditor V3.0.2402.2201
|
||||
|
||||
- *.[修复]修复文件查找功能,双击找到的内容,定位内容时可能被滚动条遮挡的问题。
|
||||
- *.[修复]修复文件查找功能,已找到列表高亮显示不正确的BUG。
|
||||
- *.[修复]点开查找功能,有时不能搜索当前目录的BUG。
|
||||
- *.[修复]修复查找文件时,使用内置的文件类型不能搜索的BUG。
|
||||
#### SuperDesign V3.0.2402.2201
|
||||
|
||||
#### SuperDesign V3.0.2402.2201
|
||||
- *.[新增]全新的Json编辑器,支持在网页抓取工具中编辑Json的值。
|
||||
|
||||
### 2023-02-21更新
|
||||
|
||||
-------
|
||||
|
||||
#### SuperDesign V3.0.2302.2101
|
||||
|
||||
- *.[新增]全新文本编辑器,支持高亮、FTP查看和编辑、目录浏览,历史版本等众多功能。
|
||||
|
||||
### 2023-01-21更新
|
||||
|
||||
------
|
||||
|
||||
#### SuperDesign V2.0.2301.2101
|
||||
|
||||
- *.[新增]新增API编辑器,自动保存和快速插入修改参数。
|
||||
- *.[改进]使用新款高亮编辑器。
|
||||
|
||||
### 2021-09-03更新
|
||||
### 2021-09-03更新
|
||||
------
|
||||
|
||||
#### SuperDesign V2.0.2109.0301
|
||||
|
||||
- *.[改进]全新网页抓取工具,对历史记录支持编辑和收藏。
|
||||
- *.[改进]修复网页抓取工具报《未能为 SSL/TLS 安全通道建立信任关系》错的BUG。
|
||||
|
||||
### 2021-09-02更新
|
||||
|
||||
------
|
||||
|
||||
#### SuperDesign V2.0.2109.0202
|
||||
|
||||
- *.[改进]网页获取工具的地址下拉提示使用新版objectlistview控件。
|
||||
|
||||
### 2021-09-02更新
|
||||
|
||||
------
|
||||
|
||||
#### SuperDesign V2.0.2109.0201
|
||||
|
||||
- *.[改进]新增对新版公用库的支持,将RyWeb等合并到一个库里。
|
||||
|
||||
### 2021-05-17更新
|
||||
|
||||
------
|
||||
|
||||
#### SuperDesign V2.0.2105.1701
|
||||
|
||||
- *.[新增]新增对新版SQLite库文件的更新支持。
|
||||
- *.[新增]新增支持x64。
|
||||
|
||||
### 2021-02-28更新
|
||||
|
||||
------
|
||||
|
||||
#### SuperDesign V2.0.2102.2801
|
||||
|
||||
- *.[新增]支持毕方3.0标准。
|
||||
- *.[新增]支持查看和修改项目信息。
|
||||
- *.[新增]支持修改C#编译选项,按条件编译。
|
||||
- *.[新增]RyProject新增支持获取项目版本信息函数。
|
||||
|
||||
### 2021-02-22更新
|
||||
|
||||
------
|
||||
|
||||
#### SuperDesign V2.0.2102.2201
|
||||
|
||||
- *.[修复]修复打包时自定义路径里的文件无法更新的BUG。
|
||||
|
||||
### 2021-02-13更新
|
||||
|
||||
------
|
||||
|
||||
#### SuperDesign V2.0.2102.0101
|
||||
|
||||
*.[更换]更换高亮控件。
|
||||
|
||||
*.[新增]打包时可以依据项目来决定是否混淆。
|
||||
|
||||
### 2020-12-17更新
|
||||
|
||||
------
|
||||
|
||||
#### SuperDesign V2.0.2012.1701
|
||||
|
||||
- *.[改进]当以json模式post数据时,自动转码json中的中文。
|
||||
- *.[改进]修复json查看器括号折叠不正确的BUG。
|
||||
|
||||
### 2020-12-15更新
|
||||
|
||||
------
|
||||
|
||||
#### SuperDesign V2.0.2012.1501
|
||||
|
||||
- *.[修复]修复部分情况下打包时无法识别软件路径从而无法识别版本号的BUG。
|
||||
### 2020-12-10更新
|
||||
|
||||
### 2020-12-10更新
|
||||
|
||||
------
|
||||
|
||||
#### SuperDesign V2.0.2012.1001
|
||||
|
||||
- *.[新增]新增变量设置。
|
||||
- *.[新增]Publish.set的copy方法支持变量。
|
||||
### 2020-12-09更新
|
||||
|
||||
### 2020-12-09更新
|
||||
|
||||
------
|
||||
|
||||
##### SuperDesign V2.0.2012.0901
|
||||
|
||||
- *.[新增]网页抓取工具和Json工具里支持代码折叠功能。
|
||||
|
||||
### 2020-12-07更新
|
||||
|
||||
------
|
||||
|
||||
##### SuperDesign V2.0.2012.0701
|
||||
|
||||
- *.[修复]修复网页获取抓取工具Head设置不当会导致进度卡死的BUG。
|
||||
|
||||
### 2020-11-28更新
|
||||
|
||||
------
|
||||
|
||||
##### SuperDesign V2.0.2011.2801
|
||||
|
||||
- *.[改进]更新日志和自述文件名更符合git备份规范。
|
||||
|
||||
### 2019-12-13更新
|
||||
|
||||
------
|
||||
|
||||
##### SupperDesign V2.0.1911.2801
|
||||
|
||||
- 暂无
|
||||
|
||||
### 2019-09-19更新
|
||||
|
||||
------
|
||||
|
||||
##### SupperDesign V2.0.1909.1901
|
||||
|
||||
- *.[新增]支持多项目。
|
||||
- *.[新增]支持文件关联。
|
||||
- *.[新增]新版一键打包功能,支持一键复制打包好的文件到历史版本区域。
|
||||
|
|
|
@ -24,7 +24,7 @@ namespace SuperDesign.Manager
|
|||
for (int m = 0; m < logs.Length; m++)
|
||||
{
|
||||
if (logs[m].Length == 0) { continue; }
|
||||
var log_item = logs[m];
|
||||
var log_item = logs[m].Replace("[开发]","");
|
||||
if (log_item.StartsWith("- *."))
|
||||
{
|
||||
log_text += "\r\n" + log_item;
|
||||
|
@ -68,6 +68,7 @@ namespace SuperDesign.Manager
|
|||
{
|
||||
if (logs[m].Length == 0) { continue; }
|
||||
var log_item = logs[m];
|
||||
if (log_item.IndexOfEx("[开发]") >= 0) { continue; }
|
||||
if (log_item.StartsWith("- *."))
|
||||
{
|
||||
log_text += "\r\n<p>" +System.Web.HttpUtility.HtmlEncode(log_item.Substring(2))+"</p>";
|
||||
|
|
|
@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
|
|||
// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
|
||||
// 方法是按如下所示使用“*”: :
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("3.0.2501.0801")]
|
||||
[assembly: AssemblyFileVersion("3.0.2501.0801")]
|
||||
[assembly: AssemblyVersion("3.0.2501.1301")]
|
||||
[assembly: AssemblyFileVersion("3.0.2501.1301")]
|
35
Source/开发辅助工具/Tools/FrmProject.Designer.cs
generated
35
Source/开发辅助工具/Tools/FrmProject.Designer.cs
generated
|
@ -89,6 +89,7 @@
|
|||
this.设为正式版本ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.生成Html日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.BtnPublishLogs = new ryControls.ButtonEx();
|
||||
this.OlvTime = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn()));
|
||||
((System.ComponentModel.ISupportInitialize)(this.table1)).BeginInit();
|
||||
this.groupBox1.SuspendLayout();
|
||||
this.groupBox2.SuspendLayout();
|
||||
|
@ -412,12 +413,12 @@
|
|||
this.chromeTabControl1.Controls.Add(this.tabPage4);
|
||||
this.chromeTabControl1.Cursor = System.Windows.Forms.Cursors.Default;
|
||||
this.chromeTabControl1.ItemSize = new System.Drawing.Size(100, 25);
|
||||
this.chromeTabControl1.Location = new System.Drawing.Point(12, 205);
|
||||
this.chromeTabControl1.Location = new System.Drawing.Point(3, 205);
|
||||
this.chromeTabControl1.Name = "chromeTabControl1";
|
||||
this.chromeTabControl1.SelectedIndex = 0;
|
||||
this.chromeTabControl1.ShowAddButton = false;
|
||||
this.chromeTabControl1.ShowCloseButton = false;
|
||||
this.chromeTabControl1.Size = new System.Drawing.Size(905, 410);
|
||||
this.chromeTabControl1.Size = new System.Drawing.Size(923, 410);
|
||||
this.chromeTabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
|
||||
this.chromeTabControl1.TabContextMenuStrip = null;
|
||||
this.chromeTabControl1.TabIndex = 29;
|
||||
|
@ -729,7 +730,7 @@
|
|||
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(903, 380);
|
||||
this.tabPage4.Size = new System.Drawing.Size(921, 380);
|
||||
this.tabPage4.TabIndex = 3;
|
||||
this.tabPage4.Text = "更新日志";
|
||||
this.tabPage4.UseVisualStyleBackColor = true;
|
||||
|
@ -740,7 +741,7 @@
|
|||
this.ChkUpdateVerByPublish.AutoSize = true;
|
||||
this.ChkUpdateVerByPublish.Checked = true;
|
||||
this.ChkUpdateVerByPublish.CheckState = System.Windows.Forms.CheckState.Checked;
|
||||
this.ChkUpdateVerByPublish.Location = new System.Drawing.Point(591, 12);
|
||||
this.ChkUpdateVerByPublish.Location = new System.Drawing.Point(609, 12);
|
||||
this.ChkUpdateVerByPublish.Name = "ChkUpdateVerByPublish";
|
||||
this.ChkUpdateVerByPublish.Size = new System.Drawing.Size(144, 16);
|
||||
this.ChkUpdateVerByPublish.TabIndex = 14;
|
||||
|
@ -752,7 +753,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(741, 3);
|
||||
this.BtnSubmitGit.Location = new System.Drawing.Point(759, 3);
|
||||
this.BtnSubmitGit.Name = "BtnSubmitGit";
|
||||
this.BtnSubmitGit.Size = new System.Drawing.Size(75, 33);
|
||||
this.BtnSubmitGit.TabIndex = 13;
|
||||
|
@ -766,16 +767,16 @@
|
|||
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(342, 39);
|
||||
this.tabControl1.Location = new System.Drawing.Point(354, 39);
|
||||
this.tabControl1.Name = "tabControl1";
|
||||
this.tabControl1.SelectedIndex = 0;
|
||||
this.tabControl1.Size = new System.Drawing.Size(555, 335);
|
||||
this.tabControl1.Size = new System.Drawing.Size(561, 335);
|
||||
this.tabControl1.TabIndex = 12;
|
||||
//
|
||||
// BtnSaveLog
|
||||
//
|
||||
this.BtnSaveLog.BaseColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(76)))), ((int)(((byte)(95)))));
|
||||
this.BtnSaveLog.Location = new System.Drawing.Point(342, 3);
|
||||
this.BtnSaveLog.Location = new System.Drawing.Point(354, 3);
|
||||
this.BtnSaveLog.Name = "BtnSaveLog";
|
||||
this.BtnSaveLog.Size = new System.Drawing.Size(75, 33);
|
||||
this.BtnSaveLog.TabIndex = 11;
|
||||
|
@ -787,19 +788,21 @@
|
|||
//
|
||||
this.LvUpdateLogList.AllColumns.Add(this.OlvUpVer);
|
||||
this.LvUpdateLogList.AllColumns.Add(this.OlvUpdateDate);
|
||||
this.LvUpdateLogList.AllColumns.Add(this.OlvTime);
|
||||
this.LvUpdateLogList.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
||||
| System.Windows.Forms.AnchorStyles.Left)));
|
||||
this.LvUpdateLogList.CellEditUseWholeCell = false;
|
||||
this.LvUpdateLogList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
|
||||
this.OlvUpVer,
|
||||
this.OlvUpdateDate});
|
||||
this.OlvUpdateDate,
|
||||
this.OlvTime});
|
||||
this.LvUpdateLogList.ContextMenuStrip = this.contextMenuStrip1;
|
||||
this.LvUpdateLogList.Cursor = System.Windows.Forms.Cursors.Default;
|
||||
this.LvUpdateLogList.FullRowSelect = true;
|
||||
this.LvUpdateLogList.HideSelection = false;
|
||||
this.LvUpdateLogList.Location = new System.Drawing.Point(3, 6);
|
||||
this.LvUpdateLogList.Name = "LvUpdateLogList";
|
||||
this.LvUpdateLogList.Size = new System.Drawing.Size(333, 368);
|
||||
this.LvUpdateLogList.Size = new System.Drawing.Size(345, 368);
|
||||
this.LvUpdateLogList.TabIndex = 10;
|
||||
this.LvUpdateLogList.UseCompatibleStateImageBehavior = false;
|
||||
this.LvUpdateLogList.View = System.Windows.Forms.View.Details;
|
||||
|
@ -808,12 +811,12 @@
|
|||
// OlvUpVer
|
||||
//
|
||||
this.OlvUpVer.Text = "版本";
|
||||
this.OlvUpVer.Width = 150;
|
||||
this.OlvUpVer.Width = 110;
|
||||
//
|
||||
// OlvUpdateDate
|
||||
//
|
||||
this.OlvUpdateDate.Text = "更新时间";
|
||||
this.OlvUpdateDate.Width = 150;
|
||||
this.OlvUpdateDate.Width = 130;
|
||||
//
|
||||
// contextMenuStrip1
|
||||
//
|
||||
|
@ -843,7 +846,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(822, 3);
|
||||
this.BtnPublishLogs.Location = new System.Drawing.Point(840, 3);
|
||||
this.BtnPublishLogs.Name = "BtnPublishLogs";
|
||||
this.BtnPublishLogs.Size = new System.Drawing.Size(75, 33);
|
||||
this.BtnPublishLogs.TabIndex = 9;
|
||||
|
@ -852,6 +855,11 @@
|
|||
this.BtnPublishLogs.UseVisualStyleBackColor = true;
|
||||
this.BtnPublishLogs.Click += new System.EventHandler(this.BtnPublishLogs_Click);
|
||||
//
|
||||
// OlvTime
|
||||
//
|
||||
this.OlvTime.Text = "周期";
|
||||
this.OlvTime.Width = 100;
|
||||
//
|
||||
// FrmProject
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
|
||||
|
@ -954,5 +962,6 @@
|
|||
private System.Windows.Forms.ToolStripMenuItem 生成Html日志ToolStripMenuItem;
|
||||
private System.Windows.Forms.CheckBox ChkIsMain;
|
||||
private System.Windows.Forms.CheckBox ChkUpdateVerByPublish;
|
||||
private BrightIdeasSoftware.OLVColumn OlvTime;
|
||||
}
|
||||
}
|
|
@ -14,6 +14,7 @@ using System.Data;
|
|||
using System.Diagnostics;
|
||||
using System.Drawing;
|
||||
using System.Drawing.Drawing2D;
|
||||
using System.Linq;
|
||||
using System.Reflection;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
|
@ -99,9 +100,12 @@ namespace 开发辅助工具.Tools
|
|||
{
|
||||
return "昨天 " + dt.ToString("HH:mm:ss");
|
||||
}
|
||||
return dt.ToString();
|
||||
return dt.ToString("yyyy-MM-dd HH:mm:ss");
|
||||
};
|
||||
OlvUpVer.Renderer = new VerRenderer();
|
||||
OlvTime.AspectGetter = delegate (object x) {
|
||||
return ((UpLogItem)x).IntervalTimeStr;
|
||||
};
|
||||
}
|
||||
class VerRenderer : BaseRenderer
|
||||
{
|
||||
|
@ -129,6 +133,7 @@ namespace 开发辅助工具.Tools
|
|||
{
|
||||
var start_x = 2;
|
||||
if (item1.VerType=="main") { start_x += DrawImage2(g, r, start_x,SuperDesign.Properties.Resources.fav); }
|
||||
else { start_x += 4; }
|
||||
start_x += DrawText2(g, r, start_x, item1.Version);
|
||||
}
|
||||
}
|
||||
|
@ -771,13 +776,17 @@ namespace 开发辅助工具.Tools
|
|||
string ftp_setting_path = _path + "\\FTPUploadData.jryp";
|
||||
if(System.IO.File.Exists(ftp_setting_path))
|
||||
{
|
||||
ryCommon.Ini ini = new ryCommon.Ini(_path + "\\查看项目.ryp");
|
||||
var eng_name = ini.ReadIni("project", "engname");
|
||||
var com_mode = "Debug";
|
||||
var ouput_folder = _path + "\\Bin\\" + com_mode + "\\" + eng_name;
|
||||
if (!System.IO.Directory.Exists(ouput_folder))
|
||||
var ouput_folder = GetDebugPath();
|
||||
if (ouput_folder.Length ==0 || !System.IO.Directory.Exists(ouput_folder))
|
||||
{
|
||||
ouput_folder = _path + "\\Bin\\" + com_mode;
|
||||
ryCommon.Ini ini = new ryCommon.Ini(_path + "\\查看项目.ryp");
|
||||
var eng_name = ini.ReadIni("project", "engname");
|
||||
var com_mode = "Debug";
|
||||
ouput_folder = _path + "\\Bin\\" + com_mode + "\\" + eng_name;
|
||||
if (!System.IO.Directory.Exists(ouput_folder))
|
||||
{
|
||||
ouput_folder = _path + "\\Bin\\" + com_mode;
|
||||
}
|
||||
}
|
||||
IDbInterface db = Itrycn_Db.CreateDataProvider(Itrycn_Db.dataType);
|
||||
if (db.ConnDb(Itrycn_Db.User_SQLConn) == 1)
|
||||
|
@ -1269,6 +1278,11 @@ namespace 开发辅助工具.Tools
|
|||
for (int i = 0; i < ds_logs.RowCount(); i++)
|
||||
{
|
||||
var row = ds_logs.GetRow(i);
|
||||
var IntervalTime = 0L;
|
||||
if (i< ds_logs.RowCount()-1)
|
||||
{
|
||||
IntervalTime = row["addTime"].ToInt64() - ds_logs.GetRow(i + 1)["addTime"].ToInt64();
|
||||
}
|
||||
list.Add(new UpLogItem()
|
||||
{
|
||||
Id = row["id"].ToInt(),
|
||||
|
@ -1277,6 +1291,7 @@ namespace 开发辅助工具.Tools
|
|||
LogJson = row["LogJson"].ToString(),
|
||||
LogText = row["LogText"].ToString(),
|
||||
AddTime = row["addTime"].ToInt64(),
|
||||
IntervalTime= IntervalTime
|
||||
});
|
||||
}
|
||||
LvUpdateLogList.AddObjects(list);
|
||||
|
@ -1364,6 +1379,7 @@ namespace 开发辅助工具.Tools
|
|||
Size = new Size(tab.ClientSize.Width, tab.ClientSize.Height - (label_title.Top + label_title.Height + 8)),
|
||||
Anchor = AnchorStyles.Left | AnchorStyles.Top | AnchorStyles.Right | AnchorStyles.Bottom
|
||||
};
|
||||
rich.AddSeparatorMenu();
|
||||
rich.AddMenu("添加一个[新增日志]", "log_add").Click += delegate(object s1, EventArgs e1)
|
||||
{
|
||||
AddUpLog("新增");
|
||||
|
@ -1380,43 +1396,94 @@ namespace 开发辅助工具.Tools
|
|||
{
|
||||
AddUpLog("删除");
|
||||
};
|
||||
rich.AddMenu("设置为开发日志", "log_dev").Click += delegate (object s4, EventArgs e4)
|
||||
{
|
||||
var iPos= rich.GetFirstCharIndexOfCurrentLine();
|
||||
if(iPos>=0)
|
||||
{
|
||||
var txt = rich.Text;
|
||||
var iPos2 = txt.IndexOf("]", iPos);
|
||||
if((iPos2-5)>=iPos)
|
||||
{
|
||||
txt = txt.Substring(0, iPos)+ txt.Substring(iPos, iPos2- iPos+1)+"[开发]"+txt.Substring(iPos2+1);
|
||||
}
|
||||
rich.Text = txt;
|
||||
}
|
||||
};
|
||||
void AddUpLog(string name)
|
||||
{
|
||||
var lines = rich.Text.Replace("\r", "\n").Replace("\n\n", "\n").Split('\n');
|
||||
var txts = "";
|
||||
var lines = rich.Text.Replace("\r", "\n").Replace("\n\n", "\n").Split('\n').ToList<string>();
|
||||
var find_line = -1;
|
||||
var selected_index = -1;
|
||||
for (int i1 = 0; i1 < lines.Length; i1++)
|
||||
var match = false;
|
||||
Dictionary<string, int> dict_line = new Dictionary<string, int>();
|
||||
for (int i1 = 0; i1 < lines.Count; i1++)
|
||||
{
|
||||
var line = lines[i1];
|
||||
if (txts.Length > 0) { txts += "\n"; }
|
||||
var stype = line.GetStr("[","]");
|
||||
if (stype.Length > 0)
|
||||
{
|
||||
dict_line[stype] = i1;
|
||||
}
|
||||
if (line.IndexOfEx("["+ name + "]") >= 0)
|
||||
{
|
||||
find_line = i1;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (find_line >= 0 && selected_index==-1)
|
||||
if (find_line >= 0)
|
||||
{
|
||||
txts += "*.["+ name + "]";
|
||||
selected_index = txts.Length;
|
||||
txts += "\n";
|
||||
lines.Insert(find_line+1, "*.[" + name + "]");
|
||||
find_line++;
|
||||
match = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
txts += line;
|
||||
}
|
||||
if(selected_index==-1)
|
||||
if(find_line>=0 && !match)
|
||||
{
|
||||
if (txts.Length > 0) { txts += "\n"; }
|
||||
txts += "*.[" + name + "]";
|
||||
selected_index =txts.Length;
|
||||
lines.Add("*.[" + name + "]");
|
||||
find_line++;
|
||||
}
|
||||
rich.Text = txts;
|
||||
rich.Refresh();
|
||||
if (selected_index.IsInRange(0, txts.Length))
|
||||
if(find_line == -1)
|
||||
{
|
||||
rich.Select(selected_index,0);
|
||||
if (name == "新增")
|
||||
{
|
||||
lines.Insert(0, "*.[" + name + "]");
|
||||
find_line = 0;
|
||||
}
|
||||
else if (name == "改进")
|
||||
{
|
||||
if (dict_line.ContainsKey("新增"))
|
||||
{
|
||||
lines.Insert(dict_line["新增"]+1, "*.[" + name + "]");
|
||||
find_line = dict_line["新增"]+1;
|
||||
}
|
||||
else
|
||||
{
|
||||
lines.Insert(0, "*.[" + name + "]");
|
||||
find_line = 0;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
lines.Add("*.[" + name + "]");
|
||||
find_line = lines.Count - 1;
|
||||
}
|
||||
}
|
||||
var txt = "";
|
||||
var SelectionStart = -1;
|
||||
for (int t = 0; t < lines.Count; t++)
|
||||
{
|
||||
if (lines[t].Length == 0) { continue; }
|
||||
if (txt.Length > 0) { txt += "\n"; }
|
||||
txt += lines[t];
|
||||
if(find_line==t)
|
||||
{
|
||||
SelectionStart = txt.Length;
|
||||
}
|
||||
}
|
||||
rich.Text = txt;
|
||||
rich.SelectionStart= SelectionStart;
|
||||
rich.SelectionLength = 0;
|
||||
}
|
||||
var ds_now_up = db.ReadData("select * from ProjectNowLogs where Name='" + p_name + "'");
|
||||
|
@ -1505,6 +1572,7 @@ namespace 开发辅助工具.Tools
|
|||
{
|
||||
log_item=log_item.Substring(2);
|
||||
}
|
||||
if (log_item.IndexOf("[开发]") >= 0) { continue; }
|
||||
#region 更新日志
|
||||
var name = log_item.GetStr("[", "]");
|
||||
if (name == "新增")
|
||||
|
@ -1601,6 +1669,17 @@ namespace 开发辅助工具.Tools
|
|||
public string VerType { get; set; } = "";
|
||||
public string LogText { get; set; } = "";
|
||||
public string LogJson { get; set; } = "";
|
||||
/// <summary>
|
||||
/// 开发周期
|
||||
/// </summary>
|
||||
public long IntervalTime { get; set; } = 0;
|
||||
public string IntervalTimeStr {
|
||||
get
|
||||
{
|
||||
if (IntervalTime == 0) { return "无"; }
|
||||
return RyDate.DateDiff(DateTime.MinValue, DateTime.MinValue.AddSeconds(IntervalTime), seconds: false);
|
||||
}
|
||||
}
|
||||
public long AddTime { get; set; } = 0;
|
||||
public int CompareTo(UpLogItem other)
|
||||
{
|
||||
|
|
|
@ -126,6 +126,9 @@
|
|||
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>285, 17</value>
|
||||
</metadata>
|
||||
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>285, 17</value>
|
||||
</metadata>
|
||||
<metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>388, 17</value>
|
||||
</metadata>
|
||||
|
|
Loading…
Reference in New Issue
Block a user