删除废弃代码

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -112,11 +112,6 @@ namespace XHWK.WKTool
         /// </summary>
         internal FileDirectoryData pageData = new FileDirectoryData();
 
-        /// <summary>
-        /// 下标
-        /// </summary>
-        private int Subscript = 0;
-
         /// <summary>
         /// 是否是修改状态
         /// </summary>
@@ -172,7 +167,7 @@ namespace XHWK.WKTool
             txbStoragePath.Content = FileToolsCommon.GetConfigValue("VideoSavePath");
             Initialize();
             //拓思德
-            //InitPen();
+            //InitTSDPen();
             //罗博手写板
             InitlbPen();
             //腾千里
@@ -311,8 +306,6 @@ namespace XHWK.WKTool
         {
             //设置
             gridSetUp.Visibility = Visibility.Collapsed;
-            ////页码
-            //GridPage.Visibility = Visibility.Collapsed;
             //我的
             GridMyVideo.Visibility = Visibility.Collapsed;
             //首页
@@ -664,25 +657,6 @@ namespace XHWK.WKTool
             }
         }
 
-        /// <summary>
-        /// 最小化
-        /// </summary>
-        /// <param name="sender">
-        /// </param>
-        /// <param name="e">
-        /// </param>
-        private void BtnShrink_Click(object sender, RoutedEventArgs e)
-        {
-            if (WindowState == WindowState.Minimized)
-            {
-                WindowState = WindowState.Normal;
-            }
-            else
-            {
-                WindowState = WindowState.Minimized;
-            }
-        }
-
         #endregion 事件
 
         #region 设置
@@ -704,38 +678,6 @@ namespace XHWK.WKTool
 
                 #region 读取用户配置
 
-                #region 请求地址  废弃  --2021年7月9日赵耀
-
-                ////接口地址
-                //if (!File.Exists(APP.DataPath + "interfaceAddress.txt")) //若为空
-                //{
-                //    txbInterfaceAddress.Text = APP.apiUrl.Replace("http://", "").Trim();
-                //}
-                //else
-                //{
-                //    txbInterfaceAddress.Text = System.IO.File.ReadAllText(APP.DataPath + "interfaceAddress.txt", Encoding.Default).Replace("http://", "").Trim();
-                //}
-                ////上传地址
-                //if (!File.Exists(APP.DataPath + "imageUploadAddress.txt")) //若为空
-                //{
-                //    txbImageUploadAddress.Text = APP.uploadUrl.Replace("http://", "").Replace("/", "").Trim();
-                //}
-                //else
-                //{
-                //    txbImageUploadAddress.Text = System.IO.File.ReadAllText(APP.DataPath + "imageUploadAddress.txt", Encoding.Default).Replace("http://", "").Replace("/", "").Trim();
-                //}
-                ////下载地址
-                //if (!File.Exists(APP.DataPath + "pictureShowsAddress.txt")) //若为空
-                //{
-                //    txbPictureShowsAddress.Text = APP.showImageUrl.Replace("http://", "").Replace("/static", "").Replace("/", "").Trim();
-                //}
-                //else
-                //{
-                //    txbPictureShowsAddress.Text = System.IO.File.ReadAllText(APP.DataPath + "pictureShowsAddress.txt", Encoding.Default).Replace("http://", "").Replace("/static", "").Replace("/", "").Trim();
-                //}
-
-                #endregion 请求地址  废弃  --2021年7月9日赵耀
-
                 /// < !--摄像头位置 1.右上 2.左上 3.右下 4.左下-- >
                 if ("1".Equals(APP.CameraPosition))
                 {
@@ -796,11 +738,6 @@ namespace XHWK.WKTool
                 GridM.IsEnabled = true;
                 GridRecordingTitle.Visibility = Visibility.Visible;
                 gridSetUp.Visibility = Visibility.Collapsed;
-                //if (APP.pageData.pagenum > 0)
-                //{
-                //    GridPage.Visibility = Visibility.Visible;
-                //}
-                //DataContext = APP.pageData;
             }
         }
 
@@ -830,14 +767,6 @@ namespace XHWK.WKTool
                 {
                     FileToolsCommon.SetConfigValue("VideoType", "3");
                 }
-                //if (rbnY.IsChecked == true)
-                //{
-                //    FileToolsCommon.SetConfigValue("IsSound", "true");
-                //}
-                //else
-                //{
-                //    FileToolsCommon.SetConfigValue("IsSound", "false");
-                //}
 
                 UpdateHideSRToolConfig();
 
@@ -1395,23 +1324,8 @@ namespace XHWK.WKTool
                     DereferenceLinks = true
                 };
 
-                //APP.myloading.Show();
                 APP.BackgroundWorkerHelper.RunWorkerAsync(InvokeServering, InvokeServerCompate);
 
-                //new Thread(
-                //    o =>
-                //    {
-                //        Thread.Sleep(400);
-
-                //        Dispatcher.Invoke(new Action(() =>
-                //        {
-                //            OpenDialog();
-                //        }
-                //            ));
-                //    })
-                //{
-                //    IsBackground = true
-                //}.Start();
             }
             catch (Exception ex)
             {
@@ -3611,31 +3525,27 @@ namespace XHWK.WKTool
 
         #endregion 值初始化
 
-        public void InitPen()
+        public void InitTSDPen()
         {
             //stroke = new List<System.Drawing.Point>();
             //获取点阵笔实例，并绑定点阵笔事件
             //将授权文件内容传入，获取点阵笔对象实例
             APP.digitalPen = DigitalPenHID.GetInstance(certificates.MyLicense.Bytes);
             //绑定笔连接事件
-            APP.digitalPen.PenConnected += OnPenConnect;
+            APP.digitalPen.PenConnected += OnTSDPenConnect;
             //绑定笔断开事件
-            APP.digitalPen.PenDisconnect += OnPenDisconnect;
+            APP.digitalPen.PenDisconnect += OnTSDPenDisconnect;
             //绑定笔书写输出坐标事件
-            APP.digitalPen.PenCoordinate += OnPenCoordinate;
+            APP.digitalPen.PenCoordinate += OnTSDPenCoordinate;
             //绑定抬笔事件
-            APP.digitalPen.PenUp += OnPenUp;
+            APP.digitalPen.PenUp += OnTSDPenUp;
             //绑定落笔事件
-            APP.digitalPen.PenDown += OnPenDown;
-            APP.digitalPen.PenBatteryCapacity += OnBatteryCapacity;
-            APP.digitalPen.PenMemoryFillLevel += OnMemoryFillLevel;
+            APP.digitalPen.PenDown += OnTSDPenDown;
+            APP.digitalPen.PenBatteryCapacity += OnTSDBatteryCapacity;
+            APP.digitalPen.PenMemoryFillLevel += OnTSDMemoryFillLevel;
             //完成初始化点阵笔，开始与点阵笔通信
             ERROR_CODE ER = APP.digitalPen.Start();
 
-            ////绑定笔在新的点阵地址页面书写事件
-            //APP.digitalPen.PenNewPage += APP.digitalPen_OnPenNewPage;
-            ////绑定笔信息事件
-            //APP.digitalPen.PenInfo += APP.digitalPen_OnPenInfo;
             //启动接收笔数据，完成初始化工作
             ERROR_CODE rc = APP.digitalPen.Start();
             //判断是否成功
@@ -3657,11 +3567,11 @@ namespace XHWK.WKTool
         /// <param name="penType">
         /// 点阵笔型号编号
         /// </param>
-        private void OnPenDown(ulong time, string penSerial, int penType)
+        private void OnTSDPenDown(ulong time, string penSerial, int penType)
         {
             if (CheckAccess())
             {
-                Action<ulong, string, int> action = new Action<ulong, string, int>(OnPenDown);
+                Action<ulong, string, int> action = new Action<ulong, string, int>(OnTSDPenDown);
                 Dispatcher.Invoke(action, new object[] { time, penSerial, penType });
             }
             else
@@ -3670,7 +3580,6 @@ namespace XHWK.WKTool
                 isPenDown = true;
 
             }
-            //myblackboard.changepages(0, 0, true);
         }
 
         /// <summary>
@@ -3685,27 +3594,18 @@ namespace XHWK.WKTool
         /// <param name="penType">
         /// 点阵笔型号编号
         /// </param>
-        private void OnPenUp(ulong time, string penSerial, int penType)
+        private void OnTSDPenUp(ulong time, string penSerial, int penType)
         {
             if (CheckAccess())
             {
-                Action<ulong, string, int> action = new Action<ulong, string, int>(OnPenUp);
+                Action<ulong, string, int> action = new Action<ulong, string, int>(OnTSDPenUp);
                 Dispatcher.Invoke(action, new object[] { time, penSerial, penType });
             }
             else
             {
                 isPenDown = false;
                 APP.PenSerial = penSerial;
-                //int leftPoints = stroke.Count % 3;
-                //if (0 != leftPoints)
-                //{
-                //    int from = stroke.Count - leftPoints - 1;
-                //    if (from < 0)
-                //        from = 0;
-                //    int to = stroke.Count - 1;
-                //    DrawCoordinates(from, to);
-                //}
-                //stroke.Clear();
+  
             }
             if (APP.PageContextData.currpage > 0)
             {
@@ -3728,11 +3628,11 @@ namespace XHWK.WKTool
         /// <param name="penType">
         /// 点阵笔型号编号
         /// </param>
-        private void OnPenDisconnect(ulong time, string penSerial, int penType)
+        private void OnTSDPenDisconnect(ulong time, string penSerial, int penType)
         {
             if (CheckAccess())
             {
-                Action<ulong, string, int> action = new Action<ulong, string, int>(OnPenDisconnect);
+                Action<ulong, string, int> action = new Action<ulong, string, int>(OnTSDPenDisconnect);
                 Dispatcher.Invoke(action, new object[] { time, penSerial, penType });
             }
             else
@@ -3740,11 +3640,6 @@ namespace XHWK.WKTool
                 APP.PenSerial = penSerial;
                 APP.PenStatus = false;
                 UpdateDevStatus();
-                //Dispatcher.Invoke(new Action(() =>
-                //{
-                //    txbNotConnected.Text = "未连接";
-                //    txbNotConnecteds.Text = "未连接";
-                //}));
             }
         }
 
@@ -3760,11 +3655,11 @@ namespace XHWK.WKTool
         /// <param name="penType">
         /// 点阵笔型号编号
         /// </param>
-        private void OnPenConnect(ulong time, string penSerial, int penType)
+        private void OnTSDPenConnect(ulong time, string penSerial, int penType)
         {
             if (CheckAccess())
             {
-                Action<ulong, string, int> action = new Action<ulong, string, int>(OnPenConnect);
+                Action<ulong, string, int> action = new Action<ulong, string, int>(OnTSDPenConnect);
                 Dispatcher.Invoke(action, new object[] { time, penSerial, penType });
             }
             else
@@ -3792,11 +3687,11 @@ namespace XHWK.WKTool
         /// </param>
         /// <param name="capacity">
         /// </param>
-        private void OnBatteryCapacity(ulong time, string penSerial, int penType, byte capacity)
+        private void OnTSDBatteryCapacity(ulong time, string penSerial, int penType, byte capacity)
         {
             if (CheckAccess())
             {
-                Action<ulong, string, int, byte> action = new Action<ulong, string, int, byte>(OnBatteryCapacity);
+                Action<ulong, string, int, byte> action = new Action<ulong, string, int, byte>(OnTSDBatteryCapacity);
                 Dispatcher.Invoke(action, new object[] { time, penSerial, penType, capacity });
             }
             else
@@ -3816,11 +3711,11 @@ namespace XHWK.WKTool
         /// </param>
         /// <param name="fillLevel">
         /// </param>
-        private void OnMemoryFillLevel(ulong time, string penSerial, int penType, byte fillLevel)
+        private void OnTSDMemoryFillLevel(ulong time, string penSerial, int penType, byte fillLevel)
         {
             if (CheckAccess())
             {
-                Action<ulong, string, int, byte> action = new Action<ulong, string, int, byte>(OnMemoryFillLevel);
+                Action<ulong, string, int, byte> action = new Action<ulong, string, int, byte>(OnTSDMemoryFillLevel);
                 Dispatcher.Invoke(action, new object[] { time, penSerial, penType, fillLevel });
             }
             else
@@ -3852,11 +3747,11 @@ namespace XHWK.WKTool
         /// <param name="force">
         /// 压力值
         /// </param>
-        private void OnPenCoordinate(ulong time, string penSerial, int penType, string pageSerial, int cx, int cy, byte force)
+        private void OnTSDPenCoordinate(ulong time, string penSerial, int penType, string pageSerial, int cx, int cy, byte force)
         {
             if (CheckAccess())
             {
-                Action<ulong, string, int, string, int, int, byte> ac = new Action<ulong, string, int, string, int, int, byte>(OnPenCoordinate);
+                Action<ulong, string, int, string, int, int, byte> ac = new Action<ulong, string, int, string, int, int, byte>(OnTSDPenCoordinate);
                 Dispatcher.Invoke(ac, new object[] { time, pageSerial, penType, pageSerial, cx, cy, force });
             }
             else
@@ -3923,12 +3818,6 @@ namespace XHWK.WKTool
 
                         #endregion 设置滚动条位置
 
-                        //gridM.Height //A4高度
-                        //ScroMain.VerticalOffset;//获取滚动条位置
-                        //ScroMain.ActualHeight//A4纸显示高度
-                        //ScroMain.ScrollToHorizontalOffset()//设置滚动条位置
-
-                        //Mouse.GetPosition(this)
                         if (tempX > 0 && tempY > 0)
                         {
                             //System.Windows.Point getP = blackboard_canvas.PointToScreen(new System.Windows.Point(testX, testY));
@@ -3937,28 +3826,9 @@ namespace XHWK.WKTool
                         }
                     }));
                 }
-
-                ////每3个点画一条曲线
-                //if (stroke.Count % 3 == 0)
-                //{
-                //    int from = stroke.Count - 3 - 1;
-                //    if (from < 0)
-                //        from = 0;
-                //    int to = stroke.Count - 1;
-                //    DrawCoordinates(from, to);
-                //}
             }
         }
 
-        /// <summary>
-        /// 停止笔
-        /// </summary>
-        public void StopDigitalPen()
-        {
-            //停止，释放资源
-            APP.digitalPen.Stop();
-        }
-
         /// <summary>
         /// 清空笔内存储
         /// </summary>
@@ -4846,7 +4716,7 @@ namespace XHWK.WKTool
             HideAngleBorder();
         }
 
-        private void imgCanvas_MouseMove(object sender, System.Windows.Input.MouseEventArgs e)
+        private void imgCanvas_MouseMove(object sender, MouseEventArgs e)
         {
             if (e.LeftButton == MouseButtonState.Pressed && mouseDown)
             {
@@ -4875,7 +4745,7 @@ namespace XHWK.WKTool
             }
         }
 
-        private System.Drawing.PointF imgRightDown;
+        private PointF imgRightDown;
 
         /// <summary>
         /// 设置控件最上层
@@ -5259,15 +5129,7 @@ namespace XHWK.WKTool
         private void BtnJumpPage_Click(object sender, RoutedEventArgs e)
         {
             int JumpPage = 0;
-            //try
-            //{
-            //    JumpPage = int.Parse(txtJump.Text);
-            //}
-            //catch (Exception ex)
-            //{
-            //    MessageWindow.Show("操作有误！请输入有效的页码!");
-            //    return;
-            //}
+  
             if (JumpPage < 1)
             {
                 JumpPage = 1;
@@ -5283,10 +5145,6 @@ namespace XHWK.WKTool
             JumpPageClick();
 
             #endregion 跳转
-
-            //txbCurrpage.Visibility = Visibility.Visible;
-            //txtJump.Visibility = Visibility.Hidden;
-            //BtnJumpPage.Visibility = Visibility.Hidden;
         }
 
         /// <summary>
@@ -5339,8 +5197,6 @@ namespace XHWK.WKTool
             ///初始化
             if (TMC.TmatrixInitialize() == false)
             {
-                //MessageBox.Show(this, "点阵码初始化失败!", "生成点阵码", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                //Close();
             }
             else
             {