优化

Common/system/BlackboardNew.cs

@@ -332,14 +332,14 @@ namespace Common.system
         StylusPointCollection stylusPoints = new StylusPointCollection();
         StylusPoint stylusPoint = new StylusPoint();
         Stroke stroke;
-        //bool isFirst = true;
+        bool isFirst = true;
         //public void changepages(double _x, double _y, bool _new, Color _color, int _size)
         //{
         //    if (_new)
         //    {
         //        if (stroke != null && stroke.StylusPoints.Count > 1)
         //        {
-        //             drawingAttributes = new DrawingAttributes();
+        //            drawingAttributes = new DrawingAttributes();
         //            //m_canvas.DefaultDrawingAttributes = drawingAttributes;
         //            drawingAttributes.Color = _color;
         //            drawingAttributes.Width = _size;
@@ -358,12 +358,12 @@ namespace Common.system
         //    }
         //    else
         //    {
-        //        if(isFirst)
+        //        if (isFirst)
         //        {
         //            stylusPoint.X = _x;
         //            stylusPoint.Y = _y;
         //            stylusPoints.Add(stylusPoint);
-        //            if (stylusPoints.Count>1)
+        //            if (stylusPoints.Count > 1)
         //            {
         //                stroke = new Stroke(stylusPoints);
         //                m_canvas.Strokes.Add(stroke);
@@ -372,6 +372,7 @@ namespace Common.system
         //        }
         //        else
         //        {
+        //            if(m_canvas.Strokes.Count)
         //            stylusPoint.X = _x;
         //            stylusPoint.Y = _y;
         //            stylusPoints.Add(stylusPoint);
@@ -405,8 +406,8 @@ namespace Common.system
                     drawingAttributes = new DrawingAttributes();
                     //m_canvas.DefaultDrawingAttributes = drawingAttributes;
                     drawingAttributes.Color = _color;
-                    drawingAttributes.Width = _size*5;
-                    drawingAttributes.Height = _size*5;
+                    drawingAttributes.Width = _size * 5;
+                    drawingAttributes.Height = _size * 5;
                     drawingAttributes.FitToCurve = true;
                     drawingAttributes.IgnorePressure = false;
 
@@ -430,6 +431,12 @@ namespace Common.system
                 stroke = new Stroke(stylusPoints);
             }
         }
+
+
+
+
+
+
         ////声明一个 DrawingAttributes 类型的变量  
         //DrawingAttributes drawingAttributes;
         //public void changepaget(double _x, double _y, bool _new,InkCanvas canvas) 

XHWK.WKTool/LoginWindow.xaml.cs

@@ -1,6 +1,7 @@
 using Common.system;
 using System;
 using System.Configuration;
+using System.IO;
 using System.Text;
 using System.Windows;
 using XHWK.WKTool.DAL;
@@ -23,11 +24,21 @@ namespace XHWK.WKTool
         }
         public void Initialize() 
         {
-            if (GetSettingString("isRemind").Equals("True"))
+
+            if (FileToolsCommon.IsExistFile(APP.DataPath + "accountNumber.txt"))
             {
-                ckSaveName.IsChecked = true;
-                txbAccountNumber.Text = GetSettingString("userName");
+                string accountNumber = System.IO.File.ReadAllText(APP.DataPath + "accountNumber.txt", Encoding.Default);
+                if(!string.IsNullOrWhiteSpace(accountNumber))
+                {
+                    txbAccountNumber.Text = accountNumber;
+                    ckSaveName.IsChecked = true;
+                }
             }
+            //if (GetSettingString("isRemind").Equals("True"))
+            //{
+            //    ckSaveName.IsChecked = true;
+            //    txbAccountNumber.Text = GetSettingString("userName");
+            //}
         }
         /// <summary>
         /// 关闭事件
@@ -76,11 +87,20 @@ namespace XHWK.WKTool
             {
                 FileToolsCommon.CreateDirectory(APP.DataPath);
                 string applicationData = APP.DataPath + "accountNumber.txt";
-                string accountNumbers = DateTime.Now.ToLongDateString().ToString();//当前时间 
-                System.IO.File.WriteAllText(applicationData, accountNumbers, Encoding.Default);//存放签名验证日期
+                if (ckSaveName.IsChecked==true)
+                {
+                    
+                    string accountNumbers = txbAccountNumber.Text;
+                    System.IO.File.WriteAllText(applicationData, accountNumbers, Encoding.Default);//存放账号
+                }
+                else
+                {
+                    string accountNumbers = "";
+                    System.IO.File.WriteAllText(applicationData, accountNumbers, Encoding.Default);//存放账号
+                }
 
 
-                UpdateSettingString("userName", txbAccountNumber.Text);
+                //UpdateSettingString("userName", txbAccountNumber.Text);
                 APP.IsLoginType = true;
                 txbAccountNumber.Text = string.Empty;
                 pobPassword.Password = string.Empty;
@@ -122,14 +142,14 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void CkSaveName_Click(object sender, RoutedEventArgs e)
         {
-            if (ckSaveName.IsChecked == false)
-            {
-                UpdateSettingString("isRemind", ckSaveName.IsChecked.ToString());
-            }
-            else
-            {
-                UpdateSettingString("isRemind", ckSaveName.IsChecked.ToString());
-            }
+            //if (ckSaveName.IsChecked == false)
+            //{
+            //    UpdateSettingString("isRemind", ckSaveName.IsChecked.ToString());
+            //}
+            //else
+            //{
+            //    UpdateSettingString("isRemind", ckSaveName.IsChecked.ToString());
+            //}
         }
         /// <summary>
         /// 读取客户设置

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -1379,16 +1379,6 @@ namespace XHWK.WKTool
                 Login();
                 return;
             }
-
-            //for(int i=0;i< APP.pageData.pagenum; i++)
-            //{
-
-            //}
-
-
-
-            ////string[] files = { @"C:\101\1.jpg", @"C:\101\2.jpg" };
-
             try
             {
                 iTextSharp.text.Document document = new iTextSharp.text.Document(iTextSharp.text.PageSize.A4, 25, 25, 25, 25);
@@ -1438,7 +1428,7 @@ namespace XHWK.WKTool
             if (APP.W_PrintWindow == null)
             {
                 APP.W_PrintWindow = new PrintWindow();
-                APP.W_PrintWindow.Topmost = true;
+                //APP.W_PrintWindow.Topmost = true;
                 APP.W_PrintWindow.Owner = this;
             }
             if (APP.PageDrawList.Count > 0 && !string.IsNullOrWhiteSpace(APP.PageDrawList[0].PdfImagePath))