diff --git a/.vs/AIProofread/v17/.suo b/.vs/AIProofread/v17/.suo
index 3df37da..bdf9623 100644
Binary files a/.vs/AIProofread/v17/.suo and b/.vs/AIProofread/v17/.suo differ
diff --git a/AIProofread.sln b/AIProofread.sln
index b9084f0..523a3e3 100644
--- a/AIProofread.sln
+++ b/AIProofread.sln
@@ -20,12 +20,12 @@ Global
Test|Any CPU = Test|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {6CE536CB-6154-4FDF-9FFE-23A73B4E84AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {6CE536CB-6154-4FDF-9FFE-23A73B4E84AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6CE536CB-6154-4FDF-9FFE-23A73B4E84AB}.Debug|Any CPU.ActiveCfg = Release_Anno|Any CPU
+ {6CE536CB-6154-4FDF-9FFE-23A73B4E84AB}.Debug|Any CPU.Build.0 = Release_Anno|Any CPU
{6CE536CB-6154-4FDF-9FFE-23A73B4E84AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6CE536CB-6154-4FDF-9FFE-23A73B4E84AB}.Release|Any CPU.Build.0 = Release|Any CPU
- {6CE536CB-6154-4FDF-9FFE-23A73B4E84AB}.Test|Any CPU.ActiveCfg = Test|Any CPU
- {6CE536CB-6154-4FDF-9FFE-23A73B4E84AB}.Test|Any CPU.Build.0 = Test|Any CPU
+ {6CE536CB-6154-4FDF-9FFE-23A73B4E84AB}.Test|Any CPU.ActiveCfg = Release_Anno|Any CPU
+ {6CE536CB-6154-4FDF-9FFE-23A73B4E84AB}.Test|Any CPU.Build.0 = Release_Anno|Any CPU
{455E23BE-F34F-4F6F-A9EA-381D66170B1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{455E23BE-F34F-4F6F-A9EA-381D66170B1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{455E23BE-F34F-4F6F-A9EA-381D66170B1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/AIProofread/AIProofread.csproj b/AIProofread/AIProofread.csproj
index d5552f0..f9a22cf 100644
--- a/AIProofread/AIProofread.csproj
+++ b/AIProofread/AIProofread.csproj
@@ -577,7 +577,7 @@
62DF6B414BD2608A130540A801F32D12E0199A99
-
+
bin\Test\
VSTO40;TRACE
true
@@ -585,7 +585,7 @@
AnyCPU
7.3
-
+
bin\Win32\Test\
VSTO40
AnyCPU
diff --git a/AIProofread/Logger.cs b/AIProofread/Logger.cs
index 3ee9048..0cb4d3c 100644
--- a/AIProofread/Logger.cs
+++ b/AIProofread/Logger.cs
@@ -32,10 +32,7 @@ namespace AIProofread
try
{
StreamWriter streamWriter = File.AppendText(path);
- streamWriter.WriteLine("***************************[" + tag + "]***************************");
- streamWriter.WriteLine("消息：" + message);
- streamWriter.WriteLine("时间：" + time);
- streamWriter.WriteLine();
+ streamWriter.WriteLine($"{time} [{tag}]：" + message);
streamWriter.Flush();
streamWriter.Close();
streamWriter.Dispose();
diff --git a/AIProofread/Model/DocumentInfo.cs b/AIProofread/Model/DocumentInfo.cs
index 882686c..65176a7 100644
--- a/AIProofread/Model/DocumentInfo.cs
+++ b/AIProofread/Model/DocumentInfo.cs
@@ -102,6 +102,7 @@ namespace AIProofread.Model
///
public void ShowPane()
{
+ CheckPanel();
if (null != TaskPane)
{
TaskPane.Visible = PaneVisible = true;
@@ -110,6 +111,7 @@ namespace AIProofread.Model
public void RunInMainThread(Action action)
{
+ CheckPanel();
if (null != TaskPane)
{
TaskPane.Control.BeginInvoke(action);
@@ -914,6 +916,7 @@ namespace AIProofread.Model
public void ExportResult(string modelType)
{
+ CheckPanel();
TaskPane.Control.BeginInvoke(new Action(() =>
{
DocumentUtil.ExportProofreadResult(modelType);
@@ -922,6 +925,7 @@ namespace AIProofread.Model
public void ShowUpgrade(string data, bool force)
{
+ CheckPanel();
TaskPane.Control.BeginInvoke(new Action(() =>
{
var upgradeData = JsonConvert.DeserializeObject(data);
@@ -974,7 +978,7 @@ namespace AIProofread.Model
public void ShowSetting()
{
-
+ CheckPanel();
TaskPane.Control.BeginInvoke(new Action(() =>
{
FormSetting frm = new FormSetting();
@@ -983,6 +987,7 @@ namespace AIProofread.Model
}
public void ShowWebView(string url, int width, int height, bool dialog)
{
+ CheckPanel();
TaskPane.Control.BeginInvoke(new Action(() =>
{
FormWebView view = new FormWebView(url, width, height);
@@ -1019,7 +1024,7 @@ namespace AIProofread.Model
return dic;
}
- internal void CheckPanel()
+ public void CheckPanel()
{
Logger.Log(CurrentDocument.FullName + $" TaskPane visible {PaneVisible} has " + (TaskPane == null ? "null" : "exists"));
if (TaskPane == null) CreateTaskPane();
diff --git a/AIProofread/Model/DocumentList.cs b/AIProofread/Model/DocumentList.cs
index 926b27f..4a8354c 100644
--- a/AIProofread/Model/DocumentList.cs
+++ b/AIProofread/Model/DocumentList.cs
@@ -103,6 +103,19 @@ namespace AIProofread.Model
return documentList.IndexOf(item);
}
+ public DocumentInfo InitDocument(Document originDocument)
+ {
+ var document = Get(originDocument);
+
+ // 如果不存在，则添加
+ if (document == null)
+ {
+ document = new DocumentInfo(originDocument);
+ Add(document);
+ }
+ return document;
+ }
+
///
/// 设置当前激活的文档
///
@@ -110,14 +123,8 @@ namespace AIProofread.Model
public DocumentInfo SetActiveDocument(Document originDocument)
{
if (originDocument == null) return null;
- var document = Get(originDocument);
+ var document = InitDocument(originDocument);
- // 如果不存在，则添加
- if (document == null)
- {
- document = new DocumentInfo(originDocument);
- Add(document);
- }
if (ActiveDocument == document) return document;
else if (Globals.ThisAddIn.IsWPS)
{
diff --git a/AIProofread/ThisAddIn.cs b/AIProofread/ThisAddIn.cs
index 7495735..378c05f 100644
--- a/AIProofread/ThisAddIn.cs
+++ b/AIProofread/ThisAddIn.cs
@@ -285,6 +285,7 @@ namespace AIProofread
private void AppInitialize()
{
+ Logger.Log("AppInitialize start... ");
CurrentWordApplication = Application;
// 初始化配置
InitAppByConfig();
@@ -308,6 +309,25 @@ namespace AIProofread
Logger.Log("Init WPS Error " + ex.Message);
}
}
+ // 如果启用直接有文档打开
+ // 初始化面板
+ try
+ {
+ var docList = CurrentWordApplication.Documents;
+ if(docList.Count > 0)
+ {
+ foreach (Document item in docList)
+ {
+ Logger.Log("Init Documentinfo ==> " + item.Name);
+ var info = documentList.InitDocument(item);
+ info.CheckPanel();
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ Logger.Log("Init Documentinfo Error " + ex.Message);
+ }
string verTextFile = Config.APP_BASE_DIR + Path.GetFileName("app_version.txt");
try
{
@@ -317,6 +337,7 @@ namespace AIProofread
{
Logger.Log("Write App Version Error " + ex.Message);
}
+
}
private void InitAppByConfig()