修改类名 去掉拓思德点阵笔初始化

XHWK.WKTool/DAL/DAL_TmatrixCode.cs

@@ -1,274 +0,0 @@
-using Common.system;
-
-using Newtonsoft.Json.Linq;
-
-using System;
-using System.Collections.Specialized;
-using System.Threading;
-
-using XHWK.Model;
-
-namespace XHWK.WKTool.DAL
-{
-    /// <summary>
-    /// TQL在线铺码服务-改为SDK  暂无用
-    /// </summary>
-    public class DAL_TmatrixCode
-    {
-        /// <summary>
-        /// TQL铺码地址
-        /// </summary>
-        private string TmatrixCodeURL = APP.TmatrixCodeURL;
-        /// <summary>
-        /// TQL用户名
-        /// </summary>
-        string TQLUserName = "test122";
-        /// <summary>
-        /// TQL密码
-        /// </summary>
-        string TQLPassword = "123456";
-        /// <summary>
-        /// 用户登陆后的用户ID
-        /// </summary>
-        string UserID;
-        /// <summary>
-        /// 分配的铺码 ID
-        /// </summary>
-        string pageserial;
-        //1000 操作成功
-        //1001 打开数据库失败
-        //1002 用户名或密码错误
-        //1003 Key 信息错误（过期或已使用完）
-        //1004 上传 Pdf 文档无法打开
-        //1005 铺码初始化失败
-        //1006 铺码错误
-        //1007 Json 数据错误
-        //1008 接口错误
-        //1009 UserID 错误
-        //1010 未查到该历史数据
-        /// <summary>
-        /// TQL登陆
-        /// </summary>
-        /// <param name="Message"></param>
-        /// <returns></returns>
-        public bool TQLUserLogin(out string Message)
-        {
-            Exception ex = null;
-            Message = "";//请求重试5次 共5秒
-            for (int num = 0; num < 5; num++)
-            {
-                try
-                {
-                    JObject jo = HttpHelper.PostFunction(TmatrixCodeURL + @"/TmatrixCode/User/UserLogin", @"application/x-www-form-urlencoded", @"userName=" + TQLUserName + "&password=" + TQLPassword, "");
-                    if (jo == null)
-                    {
-                        Message = "无法访问铺码服务器，请检查网络或铺码服务器地址。";
-                        return false;
-                    }
-                    //"state":"1000",
-                    //"message":"File upload was succeed!",
-                    //" userID ":"1"
-                    //1000 操作成功
-                    if (jo["state"].ToString() == "1000")
-                    {
-                        Message = "";
-                        //登陆成功后用户ID
-                        UserID = jo["userID"].ToString();
-                        return true;
-                    }
-                    else
-                    {
-                        Message = jo["message"].ToString();
-                        return false;
-                    }
-                }
-                catch (Exception e)
-                {
-                    Message = "无法访问铺码服务器：" + e.Message;
-                    ex = e;
-                    Thread.Sleep(1000);
-                }
-            }
-            string ErrMessage = "【TQL登陆】(TQLUserLogin):请求失败。" + Message;
-            LogHelper.WriteErrLog(ErrMessage, ex);
-            return false;
-        }
-
-        /// <summary>
-        /// TQL上传文件
-        /// </summary>
-        /// <param name="filePath">文件路径</param>
-        /// <param name="fileName">文件名</param>
-        /// <param name="Message"></param>
-        /// <returns></returns>
-        public bool TQLStartTmatrix(string filePath, string fileName, out string Message)
-        {
-            Exception ex = null;
-            Message = "";//请求重试5次 共5秒
-            if (string.IsNullOrWhiteSpace(UserID))
-            {
-                if (!TQLUserLogin(out Message))
-                {
-                    return false;
-                }
-            }
-            for (int num = 0; num < 5; num++)
-            {
-                try
-                {
-                    //byte[] byteArray = FileToolsCommon.ReadBigFileSpecifyLength(VideoInfo.VideoPath, len, (int)VideoInfo.SliceLen);
-                    //userID Y 字符 登录之后分配的 ID
-                    //callBack Y 回调 API 该 API 由应用方提供，为 post 请求
-                    //createimage Y 字符 是否生成 png 图片（若生 成则会进行文件打包成 zip）0，不生成，1 生 成。
-                    //fileName Y 字符 文件名称数组
-                    //tmatrixType Y 字符 铺码类型（0.600DPI 打 印、1.1200DPI 打印、 2.印刷
-                    //fileData
-                    //参数
-                    NameValueCollection formFields = new NameValueCollection
-                            {
-                                { "userID", UserID },
-                                { "callBack", ""},
-                                { "createimage", "0" },
-                                { "fileName", fileName },
-                                { "tmatrixType", "1" }
-                            };
-                    string[] PathList = new string[] { filePath };
-                    JObject jo = HttpHelper.UploadFilesToRemoteUrl(TmatrixCodeURL + @"/TmatrixCode/User/startTmatrix", PathList, "", formFields);
-                    if (jo == null)
-                    {
-                        Message = "无法访问铺码服务器，请检查网络或铺码服务器地址。";
-                        return false;
-                    }
-                    Model_TmatrixCode resultObj = JsonHelper.JsonToObj<Model_TmatrixCode>(jo.ToString());
-
-                    //1000 操作成功
-                    if (resultObj.state == "1000")
-                    {
-                        Message = "";
-                        pageserial = resultObj.pageserial;
-                        return true;
-                    }
-                    else
-                    {
-                        Message = resultObj.message;
-                        return false;
-                    }
-                }
-                catch (Exception e)
-                {
-                    Message = "无法访问铺码服务器：" + e.Message;
-                    ex = e;
-                    Thread.Sleep(1000);
-                }
-            }
-            string ErrMessage = "【TQL上传】(TQLStartTmatrix):请求失败。" + Message;
-            LogHelper.WriteErrLog(ErrMessage, ex);
-            return false;
-        }
-
-        /// <summary>
-        /// 查询进度
-        /// </summary>
-        /// <param name="Message"></param>
-        /// <returns>-1失败 0：未铺码 1：正在铺码 2：铺码完成，3：未查到。</returns>
-        public int TQLSchedulequery(out string Message)
-        {
-            Exception ex = null;
-            Message = "";//请求重试5次 共5秒
-            for (int num = 0; num < 5; num++)
-            {
-                try
-                {
-                    string[] pageserialList = new string[] { pageserial };
-                    JObject jo = HttpHelper.PostFunction(TmatrixCodeURL + @"/TmatrixCode/User/schedulequery", @"application/x-www-form-urlencoded", @"userID=" + UserID + "&pageserialList=" + pageserialList, "");
-                    if (jo == null)
-                    {
-                        Message = "无法访问铺码服务器，请检查网络或铺码服务器地址。";
-                        return -1;
-                    }
-                    Model_ScheduleQuery resultObj = JsonHelper.JsonToObj<Model_ScheduleQuery>(jo.ToString());
-
-                    //1000 操作成功
-                    if (resultObj.state == "1000")
-                    {
-                        //state Y 字符 返回标志
-                        //message Y 字符 返回标志说明
-                        //list Y 字符 进度数组
-                        //schedule Y 字符 返回铺码进度:0 - 100
-                        //pageserial 铺码 ID 字符 铺码 ID
-                        //state Y 数字 0：未铺码 1：正在铺码 2：铺码完成，3：未查到。
-                        Message = "";
-                        return int.Parse(resultObj.list.Find(x => x.pageserial == pageserial).state);
-                    }
-                    else
-                    {
-                        Message = resultObj.message;
-                        return -1;
-                    }
-                }
-                catch (Exception e)
-                {
-                    Message = "无法访问铺码服务器：" + e.Message;
-                    ex = e;
-                    Thread.Sleep(1000);
-                }
-            }
-            string ErrMessage = "【TQL查询进度】(TQLSchedulequery):请求失败。" + Message;
-            LogHelper.WriteErrLog(ErrMessage, ex);
-            return -1;
-        }
-
-        /// <summary>
-        /// TQL历史查询
-        /// </summary>
-        /// <param name="Message"></param>
-        /// <returns></returns>
-        public string TQLHistoryQuery(string fileName, string startPage, string maxPage, out string Message)
-        {
-            Exception ex = null;
-            Message = "";//请求重试5次 共5秒
-            for (int num = 0; num < 5; num++)
-            {
-                try
-                {
-                    //userID Y 字符 登录之后分配的 ID
-                    //fileName N 字符 查询文件名称
-                    //pageserial N 字符 铺码 ID（铺码 ID 或文件名必须设置一个）
-                    //startPage Y int 开始查询页码，从 1 开 始
-                    //maxPage Y int 最大页码数
-                    JObject jo = HttpHelper.PostFunction(TmatrixCodeURL + @"/TmatrixCode/User/HistoryQuery", @"application/x-www-form-urlencoded", @"userID=" + UserID + "&fileName=" + fileName + "&pageserial=" + pageserial + "&startPage=" + startPage + "&maxPage=" + maxPage, "");
-                    if (jo == null)
-                    {
-                        Message = "无法访问铺码服务器，请检查网络或铺码服务器地址。";
-                        return "";
-                    }
-
-                    Model_HistoryQuery resultObj = JsonHelper.JsonToObj<Model_HistoryQuery>(jo.ToString());
-                    //1000 操作成功
-                    if (resultObj.state == "1000")
-                    {
-                        Message = "";
-                        Model_HistoryPageList model_HistoryPageList = resultObj.pageList[0];
-                        Model_HistoryListItem model_HistoryListItem = model_HistoryPageList.list.Find(x => x.pageserial == pageserial);
-
-                        return model_HistoryListItem.url;
-                    }
-                    else
-                    {
-                        Message = resultObj.message;
-                        return "";
-                    }
-                }
-                catch (Exception e)
-                {
-                    Message = "无法访问铺码服务器：" + e.Message;
-                    ex = e;
-                    Thread.Sleep(1000);
-                }
-            }
-            string ErrMessage = "【TQL查询历史记录】(TQLHistoryQuery):请求失败。" + Message;
-            LogHelper.WriteErrLog(ErrMessage, ex);
-            return "";
-        }
-    }
-}

XHWK.WKTool/DAL/Interface.cs → XHWK.WKTool/DAL/XHApi.cs

@@ -11,7 +11,7 @@ using XHWK.Model;
 
 namespace XHWK.WKTool.DAL
 {
-    public class Interface
+    public class XHApi
     {
         /// <summary>
         /// 激活信息--添加

XHWK.WKTool/KeyVerification.xaml.cs

@@ -18,7 +18,7 @@ namespace XHWK.WKTool
          */
     public partial class KeyVerification : Window
     {
-        private readonly Interface registerController = new Interface();
+        private readonly XHApi registerController = new XHApi();
         private int serverReturnCode = 0;
 
         public KeyVerification()

XHWK.WKTool/LoginWindow.xaml.cs

@@ -21,7 +21,7 @@ namespace XHWK.WKTool
         /// <summary>
         /// 调用接口
         /// </summary>
-        private readonly Interface @interface = new Interface();
+        private readonly XHApi xhapi = new XHApi();
 
         public LoginWindow()
         {
@@ -47,8 +47,10 @@ namespace XHWK.WKTool
         /// <summary>
         /// 关闭事件
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
+        /// <param name="sender">
+        /// </param>
+        /// <param name="e">
+        /// </param>
         private void BtnDown_Click(object sender, RoutedEventArgs e)
         {
             txbAccountNumber.Text = string.Empty;
@@ -59,8 +61,10 @@ namespace XHWK.WKTool
         /// <summary>
         /// 登录事件
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
+        /// <param name="sender">
+        /// </param>
+        /// <param name="e">
+        /// </param>
         private void BtnStart_Click(object sender, RoutedEventArgs e)
         {
             #region 获取服务接口地址 --2021年7月9日赵耀
@@ -108,7 +112,7 @@ namespace XHWK.WKTool
             accountNumber = txbAccountNumber.Text.Replace(" ", "").Trim();
             password = pobPassword.Password.Replace(" ", "").Trim();
 
-            int code = @interface.Login(accountNumber, password);
+            int code = xhapi.Login(accountNumber, password);
             if (code == 0)
             {
                 FileToolsCommon.CreateDirectory(APP.DataPath);
@@ -136,7 +140,7 @@ namespace XHWK.WKTool
                 if (!string.IsNullOrWhiteSpace(APP.UserInfo.Headpic))
                 {
                     //FileToolsCommon.
-                    @interface.DownloadAvatar(APP.UserInfo.Headpic, HeadpicPath);
+                    xhapi.DownloadAvatar(APP.UserInfo.Headpic, HeadpicPath);
                 }
 
                 #endregion 下载头像
@@ -154,8 +158,10 @@ namespace XHWK.WKTool
         /// <summary>
         /// 记住账号
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
+        /// <param name="sender">
+        /// </param>
+        /// <param name="e">
+        /// </param>
         private void CkSaveName_Click(object sender, RoutedEventArgs e)
         {
         }
@@ -163,8 +169,10 @@ namespace XHWK.WKTool
         /// <summary>
         /// 读取客户设置
         /// </summary>
-        /// <param name="settingName"></param>
-        /// <returns></returns>
+        /// <param name="settingName">
+        /// </param>
+        /// <returns>
+        /// </returns>
         public static string GetSettingString(string settingName)
         {
             try
@@ -181,8 +189,10 @@ namespace XHWK.WKTool
         /// <summary>
         /// 更新设置
         /// </summary>
-        /// <param name="settingName"></param>
-        /// <param name="valueName"></param>
+        /// <param name="settingName">
+        /// </param>
+        /// <param name="valueName">
+        /// </param>
         public static void UpdateSettingString(string settingName, string valueName)
         {
             Configuration config = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
@@ -199,8 +209,10 @@ namespace XHWK.WKTool
         /// <summary>
         /// 限制输入特殊字符
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
+        /// <param name="sender">
+        /// </param>
+        /// <param name="e">
+        /// </param>
         private void txbAccountNumber_PreviewTextInput(object sender, TextCompositionEventArgs e)
         {
             try
@@ -235,8 +247,10 @@ namespace XHWK.WKTool
         /// <summary>
         /// 打开服务地址
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
+        /// <param name="sender">
+        /// </param>
+        /// <param name="e">
+        /// </param>
         private void BtnServiceAddress_Click(object sender, RoutedEventArgs e)
         {
             GridLoginPage.Visibility = Visibility.Collapsed;
@@ -246,8 +260,10 @@ namespace XHWK.WKTool
         /// <summary>
         /// 取消
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
+        /// <param name="sender">
+        /// </param>
+        /// <param name="e">
+        /// </param>
         private void BtnCancel_Click(object sender, RoutedEventArgs e)
         {
             GridLoginPage.Visibility = Visibility.Visible;
@@ -257,15 +273,17 @@ namespace XHWK.WKTool
         /// <summary>
         /// 服务地址设置
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
+        /// <param name="sender">
+        /// </param>
+        /// <param name="e">
+        /// </param>
         private void BtnSetServiceAddress_Click(object sender, RoutedEventArgs e)
         {
             #region 获取服务地址 -- 2021年7月8日赵耀
 
             if (!string.IsNullOrWhiteSpace(TbxServiceAddress.Text))
             {
-                if (@interface.GetServiceAddress(TbxServiceAddress.Text, out string Message))
+                if (xhapi.GetServiceAddress(TbxServiceAddress.Text, out string Message))
                 {
                     APP.SaveServiceAddressData();
                     APP.SwitchAddress();
@@ -288,8 +306,10 @@ namespace XHWK.WKTool
         /// <summary>
         /// 校外
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
+        /// <param name="sender">
+        /// </param>
+        /// <param name="e">
+        /// </param>
         private void RbnIsOutsideSchool_Checked(object sender, RoutedEventArgs e)
         {
             APP.IsOutsideSchool = true;
@@ -303,8 +323,10 @@ namespace XHWK.WKTool
         /// <summary>
         /// 校内
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
+        /// <param name="sender">
+        /// </param>
+        /// <param name="e">
+        /// </param>
         private void RbnSchool_Checked(object sender, RoutedEventArgs e)
         {
             APP.IsOutsideSchool = false;

XHWK.WKTool/ProductVerification.xaml.cs

@@ -20,7 +20,7 @@ namespace XHWK.WKTool
          */
     public partial class ProductVerification : Window
     {
-        private readonly Interface registerController = new Interface();
+        private readonly XHApi registerController = new XHApi();
         private int serverReturnCode = 0;
 
         public ProductVerification()

XHWK.WKTool/UploadWindow.xaml.cs

@@ -1,8 +1,8 @@
 using Common.system;
 
 using System;
-using System.Collections.ObjectModel;
 using System.Threading;
+using System.Collections.ObjectModel;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
@@ -22,39 +22,48 @@ namespace XHWK.WKTool
         /// <summary>
         /// 调用接口
         /// </summary>
-        private readonly Interface @interface = new Interface();
+        private readonly XHApi xhapi = new XHApi();
+
         /// <summary>
         /// 前台数据
         /// </summary>
         internal LoginPageData pageData = new LoginPageData();
+
         /// <summary>
         /// 文件名
         /// </summary>
         private string Resourcename = string.Empty;
+
         /// <summary>
         /// 文件大小
         /// </summary>
         private long Resourcesize = 0;
+
         /// <summary>
         /// 文件类型
         /// </summary>
         private string Suffix = string.Empty;
+
         /// <summary>
         /// 唯一编号
         /// </summary>
         private string Guid = string.Empty;
+
         //定义事件
         public event ChangeTextHandlers ChangeTextEvents;
+
         /// <summary>
         /// 当前视频的下标
         /// </summary>
         private int i = 0;
+
         private System.Timers.Timer times;
+
         public UploadWindow()
         {
             InitializeComponent();
-
         }
+
         /// <summary>
         /// 初始化
         /// </summary>
@@ -68,13 +77,15 @@ namespace XHWK.WKTool
             tip_outer.Visibility = Visibility.Collapsed;
             Tsubjectbook();
         }
+
         /// <summary>
         /// 教材接口调用
         /// </summary>
-        /// <returns></returns>
+        /// <returns>
+        /// </returns>
         private void Tsubjectbook()
         {
-            int code = @interface.TsubjectbookList();
+            int code = xhapi.TsubjectbookList();
             if (code == 0)
             {
                 for (int i = 0; i < APP.TsubjectbookList.Count; i++)
@@ -95,6 +106,7 @@ namespace XHWK.WKTool
                 MessageWindow.Show(APP.ServerMsg);
             }
         }
+
         /// <summary>
         /// 章节接口调用
         /// </summary>
@@ -105,7 +117,7 @@ namespace XHWK.WKTool
             {
                 selectIndex = 0;
             }
-            int code = @interface.DirectorList(APP.TsubjectbookList[selectIndex].Lsbid, 4, APP.UserInfo.Userid);
+            int code = xhapi.DirectorList(APP.TsubjectbookList[selectIndex].Lsbid, 4, APP.UserInfo.Userid);
             if (code == 0)
             {
                 pageData.zhangjieList.Clear();
@@ -133,10 +145,12 @@ namespace XHWK.WKTool
                 MessageWindow.Show(APP.ServerMsg);
             }
         }
+
         /// <summary>
         /// 子章节递归
         /// </summary>
-        /// <param name="directorList"></param>
+        /// <param name="directorList">
+        /// </param>
         private void addChild(Model_DirectorList directorList)
         {
             if (directorList.children != null && directorList.children.Count > 0)
@@ -156,11 +170,14 @@ namespace XHWK.WKTool
                 }
             }
         }
+
         /// <summary>
         /// 章节是否加空格符
         /// </summary>
-        /// <param name="num"></param>
-        /// <returns></returns>
+        /// <param name="num">
+        /// </param>
+        /// <returns>
+        /// </returns>
         private string getSpace(int num)
         {
             string str = "";
@@ -170,20 +187,22 @@ namespace XHWK.WKTool
             }
             return str;
         }
+
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
-
         }
 
         private void Window_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
-
         }
+
         /// <summary>
         /// 教材下拉框改变事件
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
+        /// <param name="sender">
+        /// </param>
+        /// <param name="e">
+        /// </param>
         private void toolbar_list_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             Director();
@@ -194,11 +213,14 @@ namespace XHWK.WKTool
             APP.IsUpLoad = false;
             Hide();
         }
+
         /// <summary>
         /// 上传到个人空间
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
+        /// <param name="sender">
+        /// </param>
+        /// <param name="e">
+        /// </param>
         private void BtnStart_Click(object sender, RoutedEventArgs e)
         {
             if (string.IsNullOrWhiteSpace(book_list.Text))
@@ -229,6 +251,7 @@ namespace XHWK.WKTool
             times.Elapsed += Times_ElapsedClick;
             times.Start();
         }
+
         private void StartUpload()
         {
             try
@@ -236,8 +259,6 @@ namespace XHWK.WKTool
                 DAL_Upload dAL_Upload = new DAL_Upload();
                 if (dAL_Upload.UploadVideoTwo(Guid, out string ErrMessage))
                 {
-
-
                     //        converted: 0
                     //createid: 80
                     //directorid: 1009
@@ -296,7 +317,7 @@ namespace XHWK.WKTool
 
                     model_ResourceAdd.suffix = Suffix;
                     //model_ResourceAdd.uid = 0;//zxy
-                    int code = @interface.ResourceAdd(model_ResourceAdd);
+                    int code = xhapi.ResourceAdd(model_ResourceAdd);
                     if (code == 0)
                     {
                         Dispatcher.Invoke(() =>
@@ -318,7 +339,6 @@ namespace XHWK.WKTool
                                 }
                             }
 
-
                             btnStart.IsEnabled = true;
                             book_list.IsEnabled = true;
                             cmbTeachingMaterial.IsEnabled = true;
@@ -376,11 +396,14 @@ namespace XHWK.WKTool
         }
 
         private int num = 0;
+
         /// <summary>
         /// 计时器
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
+        /// <param name="sender">
+        /// </param>
+        /// <param name="e">
+        /// </param>
         private void Times_ElapsedClick(object sender, System.Timers.ElapsedEventArgs e)
         {
             Dispatcher.Invoke(() =>
@@ -399,6 +422,7 @@ namespace XHWK.WKTool
             });
         }
     }
+
     public class LoginPageData : NotifyModel
     {
         public ObservableCollection<ComboBoxBean> bookList { get; set; }
@@ -411,4 +435,4 @@ namespace XHWK.WKTool
             zhangjieList = new ObservableCollection<ComboBoxBean>();
         }
     }
-}
+}

XHWK.WKTool/XHWK.WKTool.csproj

@@ -241,7 +241,7 @@
       <DependentUpon>CountdownWindow.xaml</DependentUpon>
     </Compile>
     <Compile Include="DAL\DAL_Upload.cs" />
-    <Compile Include="DAL\Interface.cs" />
+    <Compile Include="DAL\XHApi.cs" />
     <Compile Include="DAL\ResultVo.cs" />
     <Compile Include="DeviceWindow.xaml.cs">
       <DependentUpon>DeviceWindow.xaml</DependentUpon>

XHWK.WKTool/system/LogHelper.cs

@@ -22,6 +22,7 @@ namespace Common.system
             if (loginfo.IsInfoEnabled)
             {
                 loginfo.Info(info);
+                Console.WriteLine(info);
             }
         }