1.0.0

XHPZ.Desktop/APP.cs

@@ -58,6 +58,7 @@ namespace XHPZ.Desktop
         public static bool TQLPenStatus = false;
         #endregion
         #region 页面
+        public static MainWindow W_mainWindow = null;
         ///// <summary>
         ///// 批注
         ///// </summary>
@@ -124,10 +125,10 @@ namespace XHPZ.Desktop
                 if (principal.IsInRole(WindowsBuiltInRole.Administrator))
                 {
                     //如果是管理员，则直接运行
-                    MainWindow mainWindow = new MainWindow();
+                    W_mainWindow = new MainWindow();
                     // 定义Application对象作为整个应用程序入口
                     Application app = new Application();
-                    app.Run(mainWindow);
+                    app.Run(W_mainWindow);
                 }
                 else
                 {

XHPZ.Desktop/MainWindow.xaml

@@ -5,17 +5,14 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:XHPZ.Desktop"
         mc:Ignorable="d"
-<<<<<<< HEAD
-        Title="智慧批注" Height="300" Width="300">
-=======
-        Title="MainWindow" 
+        Title="智慧批注" 
+
     WindowStyle="None" AllowsTransparency="True"    WindowState="Normal"
-    ShowInTaskbar="False"  Topmost="True" ResizeMode="NoResize" 
+    ShowInTaskbar="True"  Topmost="True" ResizeMode="NoResize" 
         d:DesignHeight="250" Width="500" Height="250"  MouseMove="Window_MouseMove"  BorderThickness="7">
     <Window.Effect>
         <DropShadowEffect BlurRadius="10" Color="#bababa" Direction="80" ShadowDepth="0"/>
     </Window.Effect>
->>>>>>> c3ffa44dd9c0e70fe134cf74c328dc36897b6b64
     <Grid>
         <TextBlock Text="欢迎使用星火批注！" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="20" Margin="0,0,0,35"/>
         <TextBlock Text="使用点阵笔时自动批注，右键退出批注。" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="20" Margin="0,35,0,0"/>

XHPZ.Desktop/MainWindow.xaml.cs

@@ -36,7 +36,7 @@ namespace XHPZ.Desktop
 
 
 
-           if(APP.W_PracticeWindow==null)
+            if (APP.W_PracticeWindow == null)
             {
                 APP.W_PracticeWindow = new PracticeWindow
                 {
@@ -68,7 +68,23 @@ namespace XHPZ.Desktop
                 System.Environment.Exit(0);
             }
         }
-
+        public void UpdateDevStatus()
+        {
+            if (APP.PenStatus || APP.TQLPenStatus)
+            {
+                Dispatcher.Invoke(new Action(() =>
+                {
+                    txbType.Text = "已连接";
+                }));
+            }
+            else
+            {
+                Dispatcher.Invoke(new Action(() =>
+                {
+                    txbType.Text = "未连接";
+                }));
+            }
+        }
         private void BtnMin_Click(object sender, RoutedEventArgs e)
         {
             if (WindowState == WindowState.Minimized)
@@ -81,8 +97,4 @@ namespace XHPZ.Desktop
             }
         }
     }
-
-
-
-
 }

XHPZ.Desktop/PracticeWindow.xaml.cs

@@ -136,7 +136,7 @@ namespace XHPZ.Desktop
 
                 //开始接收笔数据
                 APP.digitalPen.GetPenData(penSerial);
-                //UpdateDevStatus();
+                APP.W_mainWindow.UpdateDevStatus();
                 ////Dispatcher.Invoke(new Action(() =>
                 ////{
                 ////    txbNotConnected.Text = "已连接";
@@ -162,6 +162,7 @@ namespace XHPZ.Desktop
             {
                 APP.PenSerial = penSerial;
                 APP.PenStatus = false;
+                APP.W_mainWindow.UpdateDevStatus();
                 //UpdateDevStatus();
                 ////Dispatcher.Invoke(new Action(() =>
                 ////{

XHPZ.Desktop/TQLPen/PenEvents.cs

@@ -82,14 +82,14 @@ namespace XHPZ.Desktop
                 {
                     APP.TQLPenStatus = true;
                     //form.AddLog("智能笔已连接！");
-                    //APP.W_XHMicroLessonSystemWindow.UpdateDevStatus();
+                    APP.W_mainWindow.UpdateDevStatus();
                 }
                 else
                 {
                     APP.TQLPenStatus = false;
                     //form.DisConnect();
                     //form.AddLog("智能笔已断开连接！");
-                    //APP.W_XHMicroLessonSystemWindow.UpdateDevStatus();
+                    APP.W_mainWindow.UpdateDevStatus();
                 }
             }
             catch (Exception)