diff --git a/.gitignore b/.gitignore index 98761ca..8f520ff 100644 --- a/.gitignore +++ b/.gitignore @@ -296,3 +296,5 @@ __pycache__/ # my rules local + +Nacollector/GlobalConstant.cs diff --git a/Nacollector/Browser/Handler/MenuHandler.cs b/Nacollector/Browser/Handler/MenuHandler.cs index ca6428c..b3ba6ef 100644 --- a/Nacollector/Browser/Handler/MenuHandler.cs +++ b/Nacollector/Browser/Handler/MenuHandler.cs @@ -24,6 +24,8 @@ public MenuHandler(bool showReload = false) private const int SaveLink = 26504; private const int CopyLink = 26505; private const int LinkOpenDefaultBrowser = 26506; + private const int LinkToZneiatProject = 26507; + private const int FeedbackProject = 26508; void IContextMenuHandler.OnBeforeContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model) { @@ -77,7 +79,9 @@ void IContextMenuHandler.OnBeforeContextMenu(IWebBrowser browserControl, IBrowse { if (_showReload) model.AddItem(CefMenuCommand.ReloadNoCache, "刷新 (ReloadNoCache)"); - model.AddItem((CefMenuCommand)ShowDevTools, "检查 (ShowDevTools)"); + model.AddItem((CefMenuCommand)FeedbackProject, "反馈问题"); + model.AddItem((CefMenuCommand)LinkToZneiatProject, "开源项目"); + // model.AddItem((CefMenuCommand)ShowDevTools, "检查 (ShowDevTools)"); } } @@ -108,6 +112,12 @@ bool IContextMenuHandler.OnContextMenuCommand(IWebBrowser browserControl, IBrows case LinkOpenDefaultBrowser: System.Diagnostics.Process.Start("explorer.exe", parameters.UnfilteredLinkUrl); break; + case LinkToZneiatProject: + System.Diagnostics.Process.Start("https://github.com/Zneiat/Nacollector"); + break; + case FeedbackProject: + System.Diagnostics.Process.Start("https://github.com/Zneiat/Nacollector/issues"); + break; } return false; diff --git a/Nacollector/GlobalConstant.cs b/Nacollector/GlobalConstant.cs deleted file mode 100644 index 2cd93ac..0000000 --- a/Nacollector/GlobalConstant.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Nacollector -{ - public static class GlobalConstant - { - public const string HttpReqUserAgent = "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.133 Safari/537.36"; - } -} \ No newline at end of file diff --git a/Nacollector/MainForm.cs b/Nacollector/MainForm.cs index 0253eec..8828131 100644 --- a/Nacollector/MainForm.cs +++ b/Nacollector/MainForm.cs @@ -48,8 +48,8 @@ private void InitSkin() private void MainForm_Load(object sender, EventArgs e) { - // 设置窗体透明 - SetOpacity(0); + // 程序启动画面 + SetIsStarting(true); } private void InitBrowser() @@ -67,14 +67,14 @@ private void InitBrowser() crBrowser.GetBrowser().FrameLoadEnd += new EventHandler(Browser_FrameLoadEnd); // 浏览器初始化完毕时执行 crDownloads = new CrDownloads(crBrowser); - + ContentPanel.Controls.Add(crBrowser.GetBrowser()); } - + private void Browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e) { - // 取消设置窗体透明 - SetOpacity(1); + // 关闭程序启动画面 + SetIsStarting(false); } /// @@ -85,9 +85,15 @@ public class AppActionForJs // 获取程序版本 public string getVersion() { + crBrowser.RunJS($"AppConfig.updateCheckUrl=\"{GlobalConstant.UpdateCheckUrl}\";AppConfig.updateCheckToken=\"{GlobalConstant.UpdateCheckToken}\""); return System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString(); } + public void showDevTools() + { + crBrowser.GetBrowser().ShowDevTools(); + } + // 采集是否使用IE代理请求 public void _utilsReqIeProxy(bool isEnable) { @@ -210,16 +216,40 @@ public void StartTask(object obj) Utils.ReleaseMemory(true); } + + private Form startingForm; + /// - /// 设置窗体透明度 + /// 设置程序启动画面 /// - public void SetOpacity(int value) + public void SetIsStarting(bool isStarting) { - if (this.InvokeRequired) { this.Invoke(new SetOpacityDelegate(SetOpacity), new object[] { value }); return; } + if (this.InvokeRequired) { this.Invoke(new SetIsStartingDelegate(SetIsStarting), new object[] { isStarting }); return; } - this.Opacity = value; + if (isStarting) + { + startingForm = new Form + { + Size = new Size(640, 400), + TopMost = true, + ControlBox = false, + ShowInTaskbar = false, + AutoSizeMode = AutoSizeMode.GrowAndShrink, + FormBorderStyle = FormBorderStyle.None, + StartPosition = FormStartPosition.CenterScreen, + BackgroundImageLayout = ImageLayout.Zoom, + BackgroundImage = Properties.Resources.StartingImg + }; + startingForm.Show(); + this.Opacity = 0; + } else + { + startingForm.Hide(); + this.Opacity = 1; + } + } - public delegate void SetOpacityDelegate(int value); + public delegate void SetIsStartingDelegate(bool isStarting); private void MainForm_FormClosing(object sender, FormClosingEventArgs e) { diff --git a/Nacollector/Nacollector.csproj b/Nacollector/Nacollector.csproj index cde8ec7..326beee 100644 --- a/Nacollector/Nacollector.csproj +++ b/Nacollector/Nacollector.csproj @@ -247,6 +247,7 @@ Always + MainForm.cs diff --git a/Nacollector/Properties/AssemblyInfo.cs b/Nacollector/Properties/AssemblyInfo.cs index b29d4ac..61e99c6 100644 --- a/Nacollector/Properties/AssemblyInfo.cs +++ b/Nacollector/Properties/AssemblyInfo.cs @@ -33,7 +33,7 @@ // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号 // 方法是按如下所示使用“*”: : // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.1.0.0")] -[assembly: AssemblyFileVersion("1.1.0.0")] +[assembly: AssemblyVersion("1.2.0.0")] +[assembly: AssemblyFileVersion("1.2.0.0")] [assembly: NeutralResourcesLanguage("zh-Hans")] diff --git a/Nacollector/Properties/Resources.Designer.cs b/Nacollector/Properties/Resources.Designer.cs index 6027075..373529d 100644 --- a/Nacollector/Properties/Resources.Designer.cs +++ b/Nacollector/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace Nacollector.Properties { // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen // (以 /str 作为命令选项)，或重新生成 VS 项目。 - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -69,5 +69,15 @@ internal static System.Drawing.Icon app_ico { return ((System.Drawing.Icon)(obj)); } } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap StartingImg { + get { + object obj = ResourceManager.GetObject("StartingImg", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } diff --git a/Nacollector/Properties/Resources.resx b/Nacollector/Properties/Resources.resx index a8b1997..e884c9b 100644 --- a/Nacollector/Properties/Resources.resx +++ b/Nacollector/Properties/Resources.resx @@ -5485,6 +5485,242 @@ slqmo6CNqKiozbm7uwNpZ2UAbmtpAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhomMAImM kAC2tbUAoaGhOaOjoyVpaWkAjYuKAIOCgAC//wAAn/8AAM//AADH/wAA4/8AAPH/AADw/wAA+BEAAPwR AAD4EQAA+DMAAP+TAAD/gwAA/8MAAP/DAAD/5wAA + + + + + iVBORw0KGgoAAAANSUhEUgAAAoAAAAGQCAIAAACxkUZyAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAA120lEQVR4Xu3dB7fc1PX38f/L + eVJoIQYCmI5NM5jeTScQOqElhAQIvfcSqumh915C74Rqiimm2AYDNs3GNjb3+TFb97C9Jc1o5l77DM73 + rM+6S3O0daTR1Wir6//+329/DwAAFjESMAAAGZCAAQDIgAQMAEAGJGAAADIgAQMAkAEJGACADEjAAABk + QAIGACADEjAAABmQgAEAyIAEDABABiRgAAAyIAEDAJABCRgAgAxIwAAAZEACBgAgAxIwAAAZkIABAMiA + BAwAQAYkYAAAMiABAwCQAQkYAIAMSMAAAGRAAgYAIAMSMAAAGZCAAQDIgAQMAEAGJGAAADIgAQMAkAEJ + GACADEjAAABkQAIGACADEjAAABmQgAEAyIAEDABABiRgAAAyIAEDAJABCRgAgAxIwAAAZEACBgAgAxIw + AAAZkIABAMiABAwAQAYkYAAAMiABAwCQAQkYAIAMSMAAAGRAAgYAIAMSMAAAGZCAAQDIgAQMAEAGJGAA + ADIgAQMAkAEJGACADEjAAABkQAIGACADEjAAABmQgAEAyIAEDABABiRgAAAyIAEDAJABCRgAgAxIwAAA + ZEACBgAgAxIwAAAZkIABAMiABAwAQAYkYAAAMiABAwCQAQkYAIAMSMAAAGRAAgYAIAMSMAAAGZCAAQDI + gAQMAEAGJGAAADIgAQMAkAEJGACADEjAAABkQAIGACADEjAAABmQgAEAyIAEDABABiRgAAAyIAEDAJAB + CRgAgAxIwAAAZEACBgAgAxIwAAAZkIABAMiABAwAQAYkYAAAMiABAwCQAQkYAIAMSMAAAGRAAgYAIAMS + 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 + MWfOnIcfeYzsuzghAQNA/1p/o81nzZr12WfTlH2HeNsC+g0JGAD617PPvfDOxHcffOgRsu/ihwQMAH3q + wIP/OmHCW3fcdc/wvrEDfYIEDAD9aNnlV3n5lVfvvOtesu/iigQMAP3o4kuv+PcNN5N9F2MkYADoO2M3 + 3fqy8VdVvs8biw0SMAD0nSOOPIbsu9gjAQMAkAEJGACADEjAAABkQAIGACADEjAAABmQgAEAyIAEDABA + BiRgAAAyIAEDAJABCRgAgAxIwAAAZEACBgAgAxIwAAAZkIABAMiABAwAQAYkYAAAMiABAwCQAQkYAIAM + SMAAAGRAAgYAIAMSMAAAGZCAAQDIgAQMAEAGJGAAADIgAQMAkAEJGACADEjAAABkQAIGACADEjAAABmQ + gAEAyIAEDABABiRgAAAyIAEDAJABCRgAgAxIwAAAZEACBgAgAxIwAAAZkIABAMiABAwAQAYkYAAAMiAB + AwCQAQkYAIAMSMAAAGRAAgYAIAMSMAAAGZCAAQDIgAQMAEAGJGAAADIgAQMAkAEJGACADEjAAABkQAIG + ACADEjAAABmQgAEAyIAEDABABiRgAAAyIAEDAJABCRgAgAxIwAAAZEACBgAgAxIwAAAZkIABAMiABAwA + QAYkYAAAMiABAwCQAQkYAIAMSMAAAGRAAgYAIAMSMAAAGZCAAQDIgAQMAEAGJGAAADIgAQMAkAEJGACA + DEjAAABkQAIGACADEjAAABmQgAEAyIAEDABABiRgAAAyIAEDAJABCRgAgAxIwAAAZEACBgAgAxIwAAAZ + kIABAMiABAwAQAYkYAAAMiABAwCQAQkYAIAMSMAAAGRAAgYAIAMSMAAAGZCAAQDIgAQMAEAGJGAAADIg + AQMAkAEJGACADEjAAABkQAIGACADEjAAABmQgAEAyIAEDABABiRgAAAyIAEDAJABCRgAgAxIwAAAZEAC + BgAgAxIwAAAZkIABAMiABAwAQAYkYAAAMiABAwCQAQkYAIAMSMAAAGRAAgYAIAMSMAAAGZCAAQDIgAQM + AEAGJGAAADIgAQMAkAEJGACADEjAAABkQAIGACADEjAAABmQgAEAyOD/1hqzHQAAWMRIwAAAZEACBgAg + AxIwAAAZkIABAMiABAwAQAYkYAAAMiABAwCQAQkYAIAMSMAAAGRAAgYAIAMS8DDYcMvdxNdsteO+/mMP + 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 \ No newline at end of file diff --git a/Nacollector/Resources/StartingImg.png b/Nacollector/Resources/StartingImg.png new file mode 100644 index 0000000..88addee Binary files /dev/null and b/Nacollector/Resources/StartingImg.png differ diff --git a/Nacollector/Resources/html_res/app.html b/Nacollector/Resources/html_res/app.html index dc48b01..0a650fd 100644 --- a/Nacollector/Resources/html_res/app.html +++ b/Nacollector/Resources/html_res/app.html @@ -10,6 +10,12 @@ + diff --git a/Nacollector/Resources/html_res/assets/app.js b/Nacollector/Resources/html_res/assets/app.js index ccf0b8e..dd13f78 100644 --- a/Nacollector/Resources/html_res/assets/app.js +++ b/Nacollector/Resources/html_res/assets/app.js @@ -1,5 +1,6 @@ /** * Created by Zneiat on 2017/7/15. + * https://github.com/Zneiat/Nacollector */ /** @@ -30,6 +31,12 @@ $(document).ready(function () { // 检测更新 AppUpdate.check(true); }); + // 开发者工具显示方式 + $(document).keydown(function (e) { + if (e.altKey && event.keyCode === 123) { + AppAction.showDevTools(); + } + }); }); /** @@ -1631,7 +1638,7 @@ window.setting = { itemAt(groupAbout).infoShow('联系', '1149527164@qq.com'); itemAt(groupAbout).infoShow('博客', 'http://www.qwqaq.com'); itemAt(groupAbout).infoShow('GitHub', 'Zneiat/Nacollector'); - itemAt(groupAbout).infoShow('', '未经允许程序和衍生品不得用于商业用途，侵权必究'); + itemAt(groupAbout).infoShow('', '未经允许程序和衍生品不得用于商业用途，侵权必究'); itemAt(groupAbout).infoShow('', 'Nacollector Copyright (C) 2018 Zneiat'); } }; @@ -1642,9 +1649,9 @@ window.AppUpdate = { atDocumentReady = atDocumentReady || false; var ajaxOpt = { type: 'GET', - url: 'http://tools.qwqaq.com/nacollector-updare-query.php', + url: AppConfig.updateCheckUrl, dataType: 'json', - data: {'token': 'TmFjb2xsZWN0b3JCeVpuZWlhdEluMjAxNzA4UUQ='}, + data: {'token': AppConfig.updateCheckToken}, beforeSend: function() {} }; ajaxOpt.success = function (json) {