修改标签页

Unwatch · Dec 12, 2018 · c459584 · c459584
1 parent bbf17a1
commit c459584
Show file tree

Hide file tree

Showing 26 changed files with 181 additions and 14 deletions.
diff --git a/AccessWeb/.vs/AccessWeb/v14/.suo b/AccessWeb/.vs/AccessWeb/v14/.suo
diff --git a/AccessWeb/bin/Debug/AccessWeb.exe b/AccessWeb/bin/Debug/AccessWeb.exe
diff --git a/AccessWeb/bin/Debug/AccessWeb.pdb b/AccessWeb/bin/Debug/AccessWeb.pdb
diff --git a/AccessWeb/obj/Debug/AccessWeb.csproj.FileListAbsolute.txt b/AccessWeb/obj/Debug/AccessWeb.csproj.FileListAbsolute.txt
@@ -71,3 +71,21 @@ D:\project\new\AccessWeb\obj\Debug\AccessWeb.Properties.Resources.resources
 D:\project\new\AccessWeb\obj\Debug\AccessWeb.csproj.GenerateResource.Cache
 D:\project\new\AccessWeb\obj\Debug\AccessWeb.exe
 D:\project\new\AccessWeb\obj\Debug\AccessWeb.pdb
+D:\project\webbrowser\20181209\webbrowser\AccessWeb\bin\Debug\AccessWeb.exe.config
+D:\project\webbrowser\20181209\webbrowser\AccessWeb\bin\Debug\AccessWeb.exe
+D:\project\webbrowser\20181209\webbrowser\AccessWeb\bin\Debug\AccessWeb.pdb
+D:\project\webbrowser\20181209\webbrowser\AccessWeb\bin\Debug\EntityFramework.dll
+D:\project\webbrowser\20181209\webbrowser\AccessWeb\bin\Debug\EntityFramework.SqlServer.dll
+D:\project\webbrowser\20181209\webbrowser\AccessWeb\bin\Debug\EntityFramework.xml
+D:\project\webbrowser\20181209\webbrowser\AccessWeb\bin\Debug\EntityFramework.SqlServer.xml
+D:\project\webbrowser\20181209\webbrowser\AccessWeb\obj\Debug\AccessWeb.csprojResolveAssemblyReference.cache
+D:\project\webbrowser\20181209\webbrowser\AccessWeb\obj\Debug\MainWindow.g.cs
+D:\project\webbrowser\20181209\webbrowser\AccessWeb\obj\Debug\App.g.cs
+D:\project\webbrowser\20181209\webbrowser\AccessWeb\obj\Debug\AccessWeb_MarkupCompile.cache
+D:\project\webbrowser\20181209\webbrowser\AccessWeb\obj\Debug\AccessWeb_MarkupCompile.lref
+D:\project\webbrowser\20181209\webbrowser\AccessWeb\obj\Debug\MainWindow.baml
+D:\project\webbrowser\20181209\webbrowser\AccessWeb\obj\Debug\AccessWeb.g.resources
+D:\project\webbrowser\20181209\webbrowser\AccessWeb\obj\Debug\AccessWeb.Properties.Resources.resources
+D:\project\webbrowser\20181209\webbrowser\AccessWeb\obj\Debug\AccessWeb.csproj.GenerateResource.Cache
+D:\project\webbrowser\20181209\webbrowser\AccessWeb\obj\Debug\AccessWeb.exe
+D:\project\webbrowser\20181209\webbrowser\AccessWeb\obj\Debug\AccessWeb.pdb
diff --git a/AccessWeb/obj/Debug/AccessWeb.csprojResolveAssemblyReference.cache b/AccessWeb/obj/Debug/AccessWeb.csprojResolveAssemblyReference.cache
diff --git a/AccessWeb/obj/Debug/AccessWeb.exe b/AccessWeb/obj/Debug/AccessWeb.exe
diff --git a/AccessWeb/obj/Debug/AccessWeb.pdb b/AccessWeb/obj/Debug/AccessWeb.pdb
diff --git a/AccessWeb/obj/Debug/AccessWeb_MarkupCompile.cache b/AccessWeb/obj/Debug/AccessWeb_MarkupCompile.cache
@@ -4,16 +4,16 @@
 winexe
 C#
 .cs
-D:\project\new\AccessWeb\obj\Debug\
+D:\project\webbrowser\20181209\webbrowser\AccessWeb\obj\Debug\
 AccessWeb
 none
 false
 DEBUG;TRACE
-D:\project\new\AccessWeb\App.xaml
+D:\project\webbrowser\20181209\webbrowser\AccessWeb\App.xaml
 11151548125
 
 6-1423231730
-161491201535
+16-288884744
 MainWindow.xaml;
 
 False

diff --git a/AccessWeb/obj/Debug/AccessWeb_MarkupCompile.lref b/AccessWeb/obj/Debug/AccessWeb_MarkupCompile.lref
@@ -1,4 +1,4 @@
 
 
-FD:\project\new\AccessWeb\MainWindow.xaml;;
+FD:\project\webbrowser\20181209\webbrowser\AccessWeb\MainWindow.xaml;;
 
diff --git a/AccessWeb/obj/Debug/App.g.cs b/AccessWeb/obj/Debug/App.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\App.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "0801A6FA298AC45BE0B7C826A8136026"
+#pragma checksum "..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "94021652F407155E8F4873CCD3006D816EF08DF7"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

diff --git a/AccessWeb/obj/Debug/MainWindow.g.cs b/AccessWeb/obj/Debug/MainWindow.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\MainWindow.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "AFDB5D3B6F28E59464EFAD689F5F0FC6"
+#pragma checksum "..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "7B0D47536DBDC19D778FCA1498C218413BB8FAAE"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

diff --git a/RankHelper/App/define.cs b/RankHelper/App/define.cs
@@ -310,7 +310,7 @@ public tagTask()
             nCountPageTotal = 0;
             nPageTime = 3;
             tViewPageLastTime = new DateTime();
-            tCreateTime = new DateTime();
+            tCreateTime = DateTime.Now;
             tagtempleTime = new tagTempleTime();
             tagtempleTime.nID = nID;
             templeTime = eTempleTime.Rand;

diff --git a/RankHelper/bin/x86/Debug/Logs/2018-12-11.log b/RankHelper/bin/x86/Debug/Logs/2018-12-11.log
@@ -74,3 +74,143 @@ INFO  2018-12-11 09:50:48:118
 INFO  2018-12-11 09:51:00:262
 消息：2018/12/11 9:51:00, 修改1条记录,1
 位置：RankHelper.Appinfo.ChangeTask(D:\project\webbrowser\20181209\webbrowser\RankHelper\App\Appinfo.cs:184)
+
+INFO  2018-12-11 09:52:10:579
+消息：2018/12/11 9:52:10, 更新设置
+位置：RankHelper.Appinfo.UpdateSetting(D:\project\webbrowser\20181209\webbrowser\RankHelper\App\Appinfo.cs:330)
+
+INFO  2018-12-11 09:52:10:651
+消息：2018/12/11 9:52:10, 更新设置
+位置：RankHelper.Appinfo.UpdateSetting(D:\project\webbrowser\20181209\webbrowser\RankHelper\App\Appinfo.cs:330)
+
+INFO  2018-12-11 09:52:10:691
+消息：2018/12/11 9:52:10, 更新设置
+位置：RankHelper.Appinfo.UpdateSetting(D:\project\webbrowser\20181209\webbrowser\RankHelper\App\Appinfo.cs:330)
+
+INFO  2018-12-11 09:52:10:767
+消息：当前IP地址：192.168.1.248
+位置：RankHelper.MainForm.ShowIP(D:\project\webbrowser\20181209\webbrowser\RankHelper\窗口\MainForm.cs:292)
+
+INFO  2018-12-11 09:52:45:084
+消息：2018/12/11 9:52:45, 更新设置
+位置：RankHelper.Appinfo.UpdateSetting(D:\project\webbrowser\20181209\webbrowser\RankHelper\App\Appinfo.cs:330)
+
+INFO  2018-12-11 09:52:45:129
+消息：2018/12/11 9:52:45, 更新设置
+位置：RankHelper.Appinfo.UpdateSetting(D:\project\webbrowser\20181209\webbrowser\RankHelper\App\Appinfo.cs:330)
+
+INFO  2018-12-11 09:52:45:154
+消息：2018/12/11 9:52:45, 更新设置
+位置：RankHelper.Appinfo.UpdateSetting(D:\project\webbrowser\20181209\webbrowser\RankHelper\App\Appinfo.cs:330)
+
+INFO  2018-12-11 09:52:45:197
+消息：当前IP地址：192.168.1.248
+位置：RankHelper.MainForm.ShowIP(D:\project\webbrowser\20181209\webbrowser\RankHelper\窗口\MainForm.cs:292)
+
+INFO  2018-12-11 09:52:51:786
+消息：2018/12/11 9:52:51, 更新设置
+位置：RankHelper.Appinfo.UpdateSetting(D:\project\webbrowser\20181209\webbrowser\RankHelper\App\Appinfo.cs:330)
+
+INFO  2018-12-11 09:52:53:839
+消息：2018/12/11 9:52:53, 更新设置
+位置：RankHelper.Appinfo.UpdateSetting(D:\project\webbrowser\20181209\webbrowser\RankHelper\App\Appinfo.cs:330)
+
+INFO  2018-12-11 09:52:54:898
+消息：2018/12/11 9:52:54, 更新设置
+位置：RankHelper.Appinfo.UpdateSetting(D:\project\webbrowser\20181209\webbrowser\RankHelper\App\Appinfo.cs:330)
+
+INFO  2018-12-11 09:52:56:460
+消息：2018/12/11 9:52:56, 更新设置
+位置：RankHelper.Appinfo.UpdateSetting(D:\project\webbrowser\20181209\webbrowser\RankHelper\App\Appinfo.cs:330)
+
+INFO  2018-12-11 09:52:58:063
+消息：2018/12/11 9:52:58, 更新设置
+位置：RankHelper.Appinfo.UpdateSetting(D:\project\webbrowser\20181209\webbrowser\RankHelper\App\Appinfo.cs:330)
+
+INFO  2018-12-11 09:53:34:442
+消息：2018/12/11 9:53:34, 修改1条记录,1
+位置：RankHelper.Appinfo.ChangeTask(D:\project\webbrowser\20181209\webbrowser\RankHelper\App\Appinfo.cs:184)
+
+INFO  2018-12-11 09:55:55:353
+消息：2018/12/11 9:55:55, 修改1条记录,1
+位置：RankHelper.Appinfo.ChangeTask(D:\project\webbrowser\20181209\webbrowser\RankHelper\App\Appinfo.cs:184)
+
+INFO  2018-12-11 09:56:20:294
+消息：2018/12/11 9:56:20, 修改1条记录,1
+位置：RankHelper.Appinfo.ChangeTask(D:\project\webbrowser\20181209\webbrowser\RankHelper\App\Appinfo.cs:184)
+
+INFO  2018-12-11 09:56:25:879
+消息：2018/12/11 9:56:25, 修改1条记录,1
+位置：RankHelper.Appinfo.ChangeTask(D:\project\webbrowser\20181209\webbrowser\RankHelper\App\Appinfo.cs:184)
+
+INFO  2018-12-11 09:56:38:199
+消息：2018/12/11 9:56:38, 修改1条记录,1
+位置：RankHelper.Appinfo.ChangeTask(D:\project\webbrowser\20181209\webbrowser\RankHelper\App\Appinfo.cs:184)
+
+INFO  2018-12-11 10:09:25:131
+消息：2018/12/11 10:09:25, 更新设置
+位置：RankHelper.Appinfo.UpdateSetting(D:\project\webbrowser\20181209\webbrowser\RankHelper\App\Appinfo.cs:330)
+
+INFO  2018-12-11 10:09:25:206
+消息：2018/12/11 10:09:25, 更新设置
+位置：RankHelper.Appinfo.UpdateSetting(D:\project\webbrowser\20181209\webbrowser\RankHelper\App\Appinfo.cs:330)
+
+INFO  2018-12-11 10:09:25:237
+消息：2018/12/11 10:09:25, 更新设置
+位置：RankHelper.Appinfo.UpdateSetting(D:\project\webbrowser\20181209\webbrowser\RankHelper\App\Appinfo.cs:330)
+
+INFO  2018-12-11 10:09:25:294
+消息：当前IP地址：192.168.1.248
+位置：RankHelper.MainForm.ShowIP(D:\project\webbrowser\20181209\webbrowser\RankHelper\窗口\MainForm.cs:292)
+
+INFO  2018-12-11 10:10:36:759
+消息：2018/12/11 10:10:36, 修改1条记录,1
+位置：RankHelper.Appinfo.ChangeTask(D:\project\webbrowser\20181209\webbrowser\RankHelper\App\Appinfo.cs:184)
+
+INFO  2018-12-11 10:16:07:008
+消息：2018/12/11 10:16:06, 更新设置
+位置：RankHelper.Appinfo.UpdateSetting(D:\project\webbrowser\20181209\webbrowser\RankHelper\App\Appinfo.cs:330)
+
+INFO  2018-12-11 10:16:07:093
+消息：2018/12/11 10:16:07, 更新设置
+位置：RankHelper.Appinfo.UpdateSetting(D:\project\webbrowser\20181209\webbrowser\RankHelper\App\Appinfo.cs:330)
+
+INFO  2018-12-11 10:16:07:113
+消息：2018/12/11 10:16:07, 更新设置
+位置：RankHelper.Appinfo.UpdateSetting(D:\project\webbrowser\20181209\webbrowser\RankHelper\App\Appinfo.cs:330)
+
+INFO  2018-12-11 10:16:07:201
+消息：当前IP地址：192.168.1.248
+位置：RankHelper.MainForm.ShowIP(D:\project\webbrowser\20181209\webbrowser\RankHelper\窗口\MainForm.cs:292)
+
+INFO  2018-12-11 10:18:44:826
+消息：2018/12/11 10:18:44, 更新设置
+位置：RankHelper.Appinfo.UpdateSetting(D:\project\webbrowser\20181209\webbrowser\RankHelper\App\Appinfo.cs:330)
+
+INFO  2018-12-11 10:18:44:887
+消息：2018/12/11 10:18:44, 更新设置
+位置：RankHelper.Appinfo.UpdateSetting(D:\project\webbrowser\20181209\webbrowser\RankHelper\App\Appinfo.cs:330)
+
+INFO  2018-12-11 10:18:44:912
+消息：2018/12/11 10:18:44, 更新设置
+位置：RankHelper.Appinfo.UpdateSetting(D:\project\webbrowser\20181209\webbrowser\RankHelper\App\Appinfo.cs:330)
+
+INFO  2018-12-11 10:18:44:969
+消息：当前IP地址：192.168.1.248
+位置：RankHelper.MainForm.ShowIP(D:\project\webbrowser\20181209\webbrowser\RankHelper\窗口\MainForm.cs:292)
+
+INFO  2018-12-11 10:21:15:344
+消息：2018/12/11 10:21:15, 更新设置
+位置：RankHelper.Appinfo.UpdateSetting(D:\project\webbrowser\20181209\webbrowser\RankHelper\App\Appinfo.cs:330)
+
+INFO  2018-12-11 10:21:15:392
+消息：2018/12/11 10:21:15, 更新设置
+位置：RankHelper.Appinfo.UpdateSetting(D:\project\webbrowser\20181209\webbrowser\RankHelper\App\Appinfo.cs:330)
+
+INFO  2018-12-11 10:21:15:417
+消息：2018/12/11 10:21:15, 更新设置
+位置：RankHelper.Appinfo.UpdateSetting(D:\project\webbrowser\20181209\webbrowser\RankHelper\App\Appinfo.cs:330)
+
+INFO  2018-12-11 10:21:15:468
+消息：当前IP地址：192.168.1.248
+位置：RankHelper.MainForm.ShowIP(D:\project\webbrowser\20181209\webbrowser\RankHelper\窗口\MainForm.cs:292)
diff --git a/RankHelper/bin/x86/Debug/RankHelper.exe b/RankHelper/bin/x86/Debug/RankHelper.exe
diff --git a/RankHelper/bin/x86/Debug/RankHelper.pdb b/RankHelper/bin/x86/Debug/RankHelper.pdb
diff --git a/RankHelper/bin/x86/Debug/RankHelperService.exe b/RankHelper/bin/x86/Debug/RankHelperService.exe
diff --git a/RankHelper/bin/x86/Debug/RankHelperService.pdb b/RankHelper/bin/x86/Debug/RankHelperService.pdb
diff --git a/RankHelper/bin/x86/Debug/Tasks.db b/RankHelper/bin/x86/Debug/Tasks.db
diff --git a/RankHelper/obj/x86/Debug/RankHelper.csproj.GenerateResource.Cache b/RankHelper/obj/x86/Debug/RankHelper.csproj.GenerateResource.Cache
diff --git a/RankHelper/obj/x86/Debug/RankHelper.exe b/RankHelper/obj/x86/Debug/RankHelper.exe
diff --git a/RankHelper/obj/x86/Debug/RankHelper.pdb b/RankHelper/obj/x86/Debug/RankHelper.pdb
diff --git a/RankHelper/窗口/StatisticsForm.cs b/RankHelper/窗口/StatisticsForm.cs
@@ -61,8 +61,8 @@ void Init()
             this.listView_statistics.Columns.Add("网站标题", 110);//3
             this.listView_statistics.Columns.Add("网站链接", 110);//4
             this.listView_statistics.Columns.Add("搜索引擎", 110);//5
-            this.listView_statistics.Columns.Add("停留时间", 110);//6
-            this.listView_statistics.Columns.Add("站内外", 110);//7
+            this.listView_statistics.Columns.Add("搜索引擎停留时间", 110);//6
+            this.listView_statistics.Columns.Add("站内地址", 110);//7
             this.listView_statistics.Columns.Add("搜索页码", 110);//8
             this.listView_statistics.Columns.Add("浏览器", 110);//9
 
@@ -71,7 +71,7 @@ void Init()
             this.listView_statistics.Columns.Add("总流量", 110);//12
             this.listView_statistics.Columns.Add("今天执行次数", 110);//13
             this.listView_statistics.Columns.Add("日限制", 110);//14
-            this.listView_statistics.Columns.Add("停留时间", 110);//15
+            this.listView_statistics.Columns.Add("首页停留时间", 110);//15
             this.listView_statistics.Columns.Add("上次访问时间", 110);//16
 
             this.listView_statistics.Columns.Add("今天内页有效流量", 110);//17
@@ -163,7 +163,7 @@ void AddTask(tagTask task)
                 task.strTitle,//3
                 task.strSiteUrl,//4
                 define.GetEnumName(task.engine),//5
-                "",//6
+                task.nEngineTime.ToString(),//6
                 define.GetEnumName(task.pageAccessType),//7
                 task.nCountPage.ToString(),//8
                 define.GetEnumName(task.webBrowser),//9
@@ -172,12 +172,12 @@ void AddTask(tagTask task)
                 task.nCountTotal.ToString(),//12
                 task.nCountExcuteToday.ToString(),//13
                 task.nCountLimit.ToString(),//14
-                "15",//15
-                "16",//16
+                task.nSiteTime.ToString(),//15
+                task.tViewSiteLastTime.ToString(),//16
                 task.nCountPageVaildToday.ToString(),//17
                 task.nCountInvaildToday.ToString(),//18
                 task.nCountPageTotal.ToString(),//19
-                "20",//20
+                task.nPageTime.ToString(),//20
                 "21",//21
                 "22"//22
             };

diff --git a/RankHelperService/obj/Debug/RankHelperService.csproj.FileListAbsolute.txt b/RankHelperService/obj/Debug/RankHelperService.csproj.FileListAbsolute.txt
@@ -191,3 +191,12 @@ D:\project\new\RankHelperService\obj\Debug\RankHelperService.Properties.Resource
 D:\project\new\RankHelperService\obj\Debug\RankHelperService.csproj.GenerateResource.Cache
 D:\project\new\RankHelperService\obj\Debug\RankHelperService.exe
 D:\project\new\RankHelperService\obj\Debug\RankHelperService.pdb
+D:\project\webbrowser\20181209\webbrowser\RankHelper\bin\x86\Debug\RankHelperService.exe.config
+D:\project\webbrowser\20181209\webbrowser\RankHelper\bin\x86\Debug\RankHelperService.exe
+D:\project\webbrowser\20181209\webbrowser\RankHelper\bin\x86\Debug\RankHelperService.pdb
+D:\project\webbrowser\20181209\webbrowser\RankHelperService\obj\Debug\RankHelperService.csprojResolveAssemblyReference.cache
+D:\project\webbrowser\20181209\webbrowser\RankHelperService\obj\Debug\RankHelperService.MainForm.resources
+D:\project\webbrowser\20181209\webbrowser\RankHelperService\obj\Debug\RankHelperService.Properties.Resources.resources
+D:\project\webbrowser\20181209\webbrowser\RankHelperService\obj\Debug\RankHelperService.csproj.GenerateResource.Cache
+D:\project\webbrowser\20181209\webbrowser\RankHelperService\obj\Debug\RankHelperService.exe
+D:\project\webbrowser\20181209\webbrowser\RankHelperService\obj\Debug\RankHelperService.pdb
diff --git a/RankHelperService/obj/Debug/RankHelperService.csprojResolveAssemblyReference.cache b/RankHelperService/obj/Debug/RankHelperService.csprojResolveAssemblyReference.cache
diff --git a/RankHelperService/obj/Debug/RankHelperService.exe b/RankHelperService/obj/Debug/RankHelperService.exe
diff --git a/RankHelperService/obj/Debug/RankHelperService.pdb b/RankHelperService/obj/Debug/RankHelperService.pdb