云平台接口取消加密

登录支持Enter事件
配置文件优化 删除多余配置
代码优化

.editorconfig

@@ -1,3 +1,6 @@
+root = true
+# 如果要从更高级别的目录继承 .editorconfig 设置，请删除以下行
+
 [*]
 end_of_line = crlf
 charset = utf-8-bom
@@ -5,79 +8,160 @@ indent_size = 4
 insert_final_newline = true
 tab_width = 4
 trim_trailing_whitespace = true
-
 resharper_xaml_binding_without_context_not_resolved_highlighting = none
 resharper_xaml_binding_with_context_not_resolved_highlighting = none
 
 # ReSharper properties
-resharper_csharp_max_line_length = 400
-resharper_csharp_wrap_arguments_style = chop_if_long
-resharper_csharp_wrap_before_binary_opsign = true
-resharper_csharp_wrap_before_declaration_lpar = true
-resharper_csharp_wrap_before_invocation_lpar = true
-resharper_csharp_wrap_extends_list_style = chop_if_long
-resharper_csharp_wrap_parameters_style = chop_if_long
-resharper_indent_preprocessor_if = usual_indent
-resharper_indent_preprocessor_other = usual_indent
-resharper_keep_existing_declaration_block_arrangement = false
-resharper_keep_existing_linebreaks = false
-resharper_max_array_initializer_elements_on_line = 1
-resharper_max_attribute_length_for_same_line = 2
-resharper_max_enum_members_on_line = 1
-resharper_max_formal_parameters_on_line = 2
-resharper_max_initializer_elements_on_line = 1
-resharper_max_invocation_arguments_on_line = 2
-resharper_place_field_attribute_on_same_line = if_owner_is_single_line
-resharper_wrap_after_declaration_lpar = true
-resharper_wrap_after_invocation_lpar = true
-resharper_wrap_array_initializer_style = chop_if_long
-resharper_wrap_before_declaration_rpar = true
-resharper_wrap_before_first_type_parameter_constraint = true
-resharper_wrap_before_invocation_rpar = true
-resharper_wrap_before_linq_expression = true
-resharper_wrap_chained_binary_expressions = chop_if_long
-resharper_wrap_chained_binary_patterns = chop_if_long
-resharper_wrap_chained_method_calls = chop_if_long
-resharper_wrap_enum_declaration = chop_if_long
-resharper_wrap_for_stmt_header_style = chop_if_long
-resharper_wrap_list_pattern = chop_if_long
-resharper_wrap_multiple_declaration_style = chop_if_long
-resharper_wrap_switch_expression = chop_if_long
-
-# Microsoft .NET properties
-csharp_preserve_single_line_blocks = true
+resharper_apply_on_completion = true
+resharper_csharp_max_line_length = 300
+resharper_max_array_initializer_elements_on_line = 3
+resharper_max_attribute_length_for_same_line = 3
+resharper_max_enum_members_on_line = 3
+resharper_max_formal_parameters_on_line = 3
+resharper_max_initializer_elements_on_line = 3
+resharper_max_invocation_arguments_on_line = 3
 
-[*.xml]
+# c# 文件
+[*.cs]
+
+#### Core EditorConfig 选项 ####
+
+# 缩进和间距
+indent_size = 4
 indent_style = space
+tab_width = 4
 
-[*.cs]
+# 新行首选项
+end_of_line = crlf
+insert_final_newline = false
+
+#### .NET 编码约定 ####
+
+# 组织 Using
+dotnet_separate_import_directive_groups = true
 dotnet_sort_system_directives_first = true
-dotnet_style_coalesce_expression = true:suggestion
-dotnet_style_collection_initializer = true:suggestion
-dotnet_style_explicit_tuple_names = true:suggestion
-dotnet_style_null_propagation = true:suggestion
-dotnet_style_object_initializer = true:suggestion
-dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
-dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
-dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
-dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
-dotnet_style_predefined_type_for_locals_parameters_members = true:silent
-dotnet_style_predefined_type_for_member_access = true:silent
-dotnet_style_prefer_auto_properties = true:silent
+file_header_template = 
+
+# this. 和 Me. 首选项
+dotnet_style_qualification_for_event = false
+dotnet_style_qualification_for_field = false
+dotnet_style_qualification_for_method = false
+dotnet_style_qualification_for_property = false
+
+# 语言关键字与 bcl 类型首选项
+dotnet_style_predefined_type_for_locals_parameters_members = true
+dotnet_style_predefined_type_for_member_access = true
+
+# 括号首选项
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity
+
+# 修饰符首选项
+dotnet_style_require_accessibility_modifiers = for_non_interface_members
+
+# 表达式级首选项
+dotnet_style_coalesce_expression = true
+dotnet_style_collection_initializer = true
+dotnet_style_explicit_tuple_names = true
+dotnet_style_namespace_match_folder = true
+dotnet_style_null_propagation = true
+dotnet_style_object_initializer = true
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+dotnet_style_prefer_auto_properties = true
+dotnet_style_prefer_compound_assignment = true
 dotnet_style_prefer_conditional_expression_over_assignment = true
 dotnet_style_prefer_conditional_expression_over_return = true
-dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
-dotnet_style_prefer_inferred_tuple_names = true:suggestion
-dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
-dotnet_style_qualification_for_event = false:silent
-dotnet_style_qualification_for_field = false:silent
-dotnet_style_qualification_for_method = false:silent
-dotnet_style_qualification_for_property = false:silent
-dotnet_style_readonly_field = true:suggestion
-dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
-csharp_indent_case_contents = true
-csharp_indent_labels = flush_left
-csharp_indent_switch_labels = true
+dotnet_style_prefer_foreach_explicit_cast_in_source = when_strongly_typed
+dotnet_style_prefer_inferred_anonymous_type_member_names = true
+dotnet_style_prefer_inferred_tuple_names = true
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true
+dotnet_style_prefer_simplified_boolean_expressions = true
+dotnet_style_prefer_simplified_interpolation = true
+
+# 字段首选项
+dotnet_style_readonly_field = true:silent
+
+# 参数首选项
+dotnet_code_quality_unused_parameters = all
+
+# 禁止显示首选项
+dotnet_remove_unnecessary_suppression_exclusions = none
+
+# 新行首选项
+dotnet_style_allow_multiple_blank_lines_experimental = false:suggestion
+dotnet_style_allow_statement_immediately_after_block_experimental = true
+
+#### c# 编码约定 ####
+
+# var 首选项
+csharp_style_var_elsewhere = false
+csharp_style_var_for_built_in_types = false
+csharp_style_var_when_type_is_apparent = false
+
+# Expression-bodied 成员
+csharp_style_expression_bodied_accessors = true
+csharp_style_expression_bodied_constructors = false
+csharp_style_expression_bodied_indexers = true
+csharp_style_expression_bodied_lambdas = true
+csharp_style_expression_bodied_local_functions = false
+csharp_style_expression_bodied_methods = false
+csharp_style_expression_bodied_operators = false
+csharp_style_expression_bodied_properties = true
+
+# 模式匹配首选项
+csharp_style_pattern_matching_over_as_with_null_check = true
+csharp_style_pattern_matching_over_is_with_cast_check = true
+csharp_style_prefer_extended_property_pattern = true
+csharp_style_prefer_not_pattern = true
+csharp_style_prefer_pattern_matching = true
+csharp_style_prefer_switch_expression = true
+
+# Null 检查首选项
+csharp_style_conditional_delegate_call = false
+
+# 修饰符首选项
+csharp_prefer_static_local_function = true:silent
+csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async
+csharp_style_prefer_readonly_struct = true:silent
+csharp_style_prefer_readonly_struct_member = true
+
+# 代码块首选项
+csharp_prefer_braces = true
+csharp_prefer_simple_using_statement = true
+csharp_style_namespace_declarations = block_scoped
+csharp_style_prefer_method_group_conversion = true
+csharp_style_prefer_top_level_statements = true
+
+# 表达式级首选项
+csharp_prefer_simple_default_expression = true
+csharp_style_deconstructed_variable_declaration = true
+csharp_style_implicit_object_creation_when_type_is_apparent = true
+csharp_style_inlined_variable_declaration = true
+csharp_style_prefer_index_operator = true
+csharp_style_prefer_local_over_anonymous_function = true
+csharp_style_prefer_null_check_over_type_check = true
+csharp_style_prefer_range_operator = true
+csharp_style_prefer_tuple_swap = true
+csharp_style_prefer_utf8_string_literals = true
+csharp_style_throw_expression = false
+csharp_style_unused_value_assignment_preference = discard_variable
+csharp_style_unused_value_expression_statement_preference = discard_variable
+
+# "using" 指令首选项
+csharp_using_directive_placement = inside_namespace
+
+# 新行首选项
+csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = false
+csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true
+csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = true
+csharp_style_allow_blank_lines_between_consecutive_braces_experimental = false
+csharp_style_allow_embedded_statements_on_same_line_experimental = true
+
+#### C# 格式规则 ####
+
+# 新行首选项
 csharp_new_line_before_catch = true
 csharp_new_line_before_else = true
 csharp_new_line_before_finally = true
@@ -85,35 +169,81 @@ csharp_new_line_before_members_in_anonymous_types = true
 csharp_new_line_before_members_in_object_initializers = true
 csharp_new_line_before_open_brace = all
 csharp_new_line_between_query_expression_clauses = true
-csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
-csharp_prefer_braces = true:silent
-csharp_prefer_simple_default_expression = true:suggestion
-csharp_preserve_single_line_blocks = true
-csharp_preserve_single_line_statements = true
+
+# 缩进首选项
+csharp_indent_block_contents = true
+csharp_indent_braces = false
+csharp_indent_case_contents = true
+csharp_indent_case_contents_when_block = true
+csharp_indent_labels = no_change
+csharp_indent_switch_labels = true
+
+# 空格键首选项
 csharp_space_after_cast = false
 csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_after_comma = true
+csharp_space_after_dot = false
 csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_after_semicolon_in_for_statement = true
 csharp_space_around_binary_operators = before_and_after
+csharp_space_around_declaration_statements = false
 csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_before_comma = false
+csharp_space_before_dot = false
+csharp_space_before_open_square_brackets = false
+csharp_space_before_semicolon_in_for_statement = false
+csharp_space_between_empty_square_brackets = false
 csharp_space_between_method_call_empty_parameter_list_parentheses = false
 csharp_space_between_method_call_name_and_opening_parenthesis = false
 csharp_space_between_method_call_parameter_list_parentheses = false
 csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_declaration_name_and_open_parenthesis = false
 csharp_space_between_method_declaration_parameter_list_parentheses = false
 csharp_space_between_parentheses = false
-csharp_style_conditional_delegate_call = true:suggestion
-csharp_style_deconstructed_variable_declaration = true:suggestion
-csharp_style_expression_bodied_accessors = true:silent
-csharp_style_expression_bodied_constructors = false:silent
-csharp_style_expression_bodied_indexers = true:silent
-csharp_style_expression_bodied_methods = false:silent
-csharp_style_expression_bodied_operators = false:silent
-csharp_style_expression_bodied_properties = true:silent
-csharp_style_inlined_variable_declaration = true:suggestion
-csharp_style_pattern_local_over_anonymous_function = true:suggestion
-csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
-csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
-csharp_style_throw_expression = true:suggestion
-csharp_style_var_elsewhere = true:silent
-csharp_style_var_for_built_in_types = true:silent
-csharp_style_var_when_type_is_apparent = true:silent
+csharp_space_between_square_brackets = false
+
+# 包装首选项
+csharp_preserve_single_line_blocks = true
+csharp_preserve_single_line_statements = false
+
+#### 命名样式 ####
+
+# 命名规则
+
+dotnet_naming_rule.interface_should_be_begins_with_i.severity = warning
+dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
+dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
+
+dotnet_naming_rule.types_should_be_pascal_case.severity = warning
+dotnet_naming_rule.types_should_be_pascal_case.symbols = types
+dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
+
+dotnet_naming_rule.method_should_be_pascal_case.severity = warning
+dotnet_naming_rule.method_should_be_pascal_case.symbols = method
+dotnet_naming_rule.method_should_be_pascal_case.style = pascal_case
+
+# 符号规范
+
+dotnet_naming_symbols.interface.applicable_kinds = interface
+dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.interface.required_modifiers = 
+
+dotnet_naming_symbols.method.applicable_kinds = method
+dotnet_naming_symbols.method.applicable_accessibilities = *
+dotnet_naming_symbols.method.required_modifiers = 
+
+dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
+dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.types.required_modifiers = 
+
+# 命名样式
+
+dotnet_naming_style.pascal_case.required_prefix = 
+dotnet_naming_style.pascal_case.required_suffix = 
+dotnet_naming_style.pascal_case.word_separator = 
+dotnet_naming_style.pascal_case.capitalization = pascal_case
+
+dotnet_naming_style.begins_with_i.required_prefix = I
+dotnet_naming_style.begins_with_i.required_suffix = 
+dotnet_naming_style.begins_with_i.word_separator = 
+dotnet_naming_style.begins_with_i.capitalization = pascal_case

XHWK.Model/AppModel.cs

@@ -1,181 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace XHWK.Model
-{
-    public class AppModel : EntityBase
-    {
-        public AppModel()
-        {
-            _Current = this;
-        }
-
-        #region 属性 Current
-
-        private static AppModel _Current = null;
-
-        public static AppModel Current => _Current;
-
-        #endregion 属性 Current
-
-        #region 属性 MaskLeftWidth
-
-        private double _MaskLeftWidth = ScreenshotWindow.ScreenWidth;
-
-        public double MaskLeftWidth
-        {
-            get => _MaskLeftWidth;
-            set
-            {
-                _MaskLeftWidth = value;
-                ShowSizeLeft = value;
-                RaisePropertyChanged(() => MaskLeftWidth);
-            }
-        }
-
-        #endregion 属性 MaskLeftWidth
-
-        #region 属性 MaskRightWidth
-
-        private double _MaskRightWidth = 0;
-
-        public double MaskRightWidth
-        {
-            get => _MaskRightWidth;
-            set
-            {
-                _MaskRightWidth = value;
-                RaisePropertyChanged(() => MaskRightWidth);
-            }
-        }
-
-        #endregion 属性 MaskRightWidth
-
-        #region 属性 MaskTopWidth
-
-        private double _MaskTopWidth = 0;
-
-        public double MaskTopWidth
-        {
-            get => _MaskTopWidth;
-            set
-            {
-                _MaskTopWidth = value;
-                RaisePropertyChanged(() => MaskTopWidth);
-            }
-        }
-
-        #endregion 属性 MaskTopWidth
-
-        #region 属性 MaskTopHeight
-
-        private double _MaskTopHeight = 0;
-
-        public double MaskTopHeight
-        {
-            get => _MaskTopHeight;
-            set
-            {
-                _MaskTopHeight = value;
-                ShowSizeTop = MaskTopHeight < 40 ? MaskTopHeight : MaskTopHeight - 40;
-                RaisePropertyChanged(() => MaskTopHeight);
-            }
-        }
-
-        #endregion 属性 MaskTopHeight
-
-        #region 属性 MaskBottomHeight
-
-        private double _MaskBottomHeight = 0;
-
-        public double MaskBottomHeight
-        {
-            get => _MaskBottomHeight;
-            set
-            {
-                _MaskBottomHeight = value;
-                RaisePropertyChanged(() => MaskBottomHeight);
-            }
-        }
-
-        #endregion 属性 MaskBottomHeight
-
-        #region 属性 ShowSize
-
-        private string _ShowSize = "0 × 0";
-
-        public string ShowSize
-        {
-            get => _ShowSize;
-            set
-            {
-                _ShowSize = value;
-                RaisePropertyChanged(() => ShowSize);
-            }
-        }
-
-        private static StringBuilder sb = new StringBuilder();
-
-        public void ChangeShowSize()
-        {
-            sb = new StringBuilder();
-            sb.Append((int)(ScreenshotWindow.Current.MainImage.Width * ScreenshotWindow.ScreenScale));
-            sb.Append(" × ");
-            sb.Append((int)(ScreenshotWindow.Current.MainImage.Height * ScreenshotWindow.ScreenScale));
-            ShowSize = sb.ToString();
-        }
-
-        #endregion 属性 ShowSize
-
-        #region 属性 ShowSizeLeft
-
-        private double _ShowSizeLeft = 0;
-
-        public double ShowSizeLeft
-        {
-            get => _ShowSizeLeft;
-            set
-            {
-                _ShowSizeLeft = value;
-                RaisePropertyChanged(() => ShowSizeLeft);
-            }
-        }
-
-        #endregion 属性 ShowSizeLeft
-
-        #region 属性 ShowSizeTop
-
-        private double _ShowSizeTop = 0;
-
-        public double ShowSizeTop
-        {
-            get => _ShowSizeTop;
-            set
-            {
-                _ShowSizeTop = value;
-                RaisePropertyChanged(() => ShowSizeTop);
-            }
-        }
-
-        #endregion 属性 ShowSizeTop
-
-        #region 属性 ShowRGB
-
-        private string _ShowRGB = string.Empty;
-
-        public string ShowRGB
-        {
-            get => _ShowRGB;
-            set
-            {
-                _ShowRGB = value;
-                RaisePropertyChanged(() => ShowRGB);
-            }
-        }
-
-        #endregion 属性 ShowRGB
-    }
-}

XHWK.Model/EntityBase.cs

@@ -1,43 +0,0 @@
-using System;
-using System.Linq.Expressions;
-
-namespace XHWK.Model
-{
-    /// <summary>
-    /// singba:20120807
-    /// 这个基类只作为INotifyPropertyChanged的实现，不再是Entity的基类
-    /// </summary>
-    public class EntityBase : System.ComponentModel.INotifyPropertyChanged
-    {
-        #region INotifyPropertyChanged Members
-
-        public virtual event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
-
-        protected virtual void RaisePropertyChanged(string name)
-        {
-            if (PropertyChanged != null)
-            {
-                PropertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(name));
-            }
-        }
-
-        protected virtual void RaisePropertyChanged<TProperty>(Expression<Func<TProperty>> property)
-        {
-            LambdaExpression lambda = property;
-            MemberExpression memberExpression;
-            if (lambda.Body is UnaryExpression)
-            {
-                UnaryExpression unaryExpression = (UnaryExpression)lambda.Body;
-                memberExpression = (MemberExpression)unaryExpression.Operand;
-            }
-            else
-            {
-                memberExpression = (MemberExpression)lambda.Body;
-            }
-
-            RaisePropertyChanged(memberExpression.Member.Name);
-        }
-
-        #endregion INotifyPropertyChanged Members
-    }
-}

XHWK.Model/Model_TsubjectbookList.cs

@@ -1,46 +0,0 @@
-namespace XHWK.Model
-{
-    public class Model_TsubjectbookList
-    {
-        private string tbid;
-        private string lsbid;
-        private string selected;
-        private string subjectid;
-        private string subjectname;
-        private string lsbname;
-        private string coverpath;
-        private string versionname;
-        /// <summary>
-        /// 教师教材关系id
-        /// </summary>
-        public string Tbid { get => tbid; set => tbid = value; }
-        /// <summary>
-        /// 教材关联关系表id
-        /// </summary>
-        public string Lsbid { get => lsbid; set => lsbid = value; }
-        /// <summary>
-        /// 是否选中：0未选中1已选中
-        /// </summary>
-        public string Selected { get => selected; set => selected = value; }
-        /// <summary>
-        /// 科目id
-        /// </summary>
-        public string Subjectid { get => subjectid; set => subjectid = value; }
-        /// <summary>
-        /// 科目名称
-        /// </summary>
-        public string Subjectname { get => subjectname; set => subjectname = value; }
-        /// <summary>
-        /// 册别名称
-        /// </summary>
-        public string Lsbname { get => lsbname; set => lsbname = value; }
-        /// <summary>
-        /// 封面图地址
-        /// </summary>
-        public string Coverpath { get => coverpath; set => coverpath = value; }
-        /// <summary>
-        /// 版本名称
-        /// </summary>
-        public string Versionname { get => versionname; set => versionname = value; }
-    }
-}

XHWK.Model/Properties/AssemblyInfo.cs

@@ -1,35 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// 有关程序集的一般信息由以下
-// 控制。更改这些特性值可修改
-// 与程序集关联的信息。
-[assembly: AssemblyTitle("XHWK.Model")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("XHWK.Model")]
-[assembly: AssemblyCopyright("Copyright ©  2020")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// 将 ComVisible 设置为 false 会使此程序集中的类型
-//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
-//请将此类型的 ComVisible 特性设置为 true。
-[assembly: ComVisible(false)]
-
-// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
-[assembly: Guid("445a4527-849b-4fa9-aa97-8ed1098d211e")]
-
-// 程序集的版本信息由下列四个值组成: 
-//
-//      主版本
-//      次版本
-//      生成号
-//      修订号
-//
-//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
-//通过使用 "*"，如下所示:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.7.0")]
-[assembly: AssemblyFileVersion("1.1.7.0")]

XHWK.Model/XHWK.Model.csproj

@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{445A4527-849B-4FA9-AA97-8ED1098D211E}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>XHWK.Model</RootNamespace>
-    <AssemblyName>XHWK.Model</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <Deterministic>true</Deterministic>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <LangVersion>7.3</LangVersion>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <LangVersion>7.3</LangVersion>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Ink, Version=0.5.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Ink.0.5.0\lib\net451\Ink.dll</HintPath>
-    </Reference>
-    <Reference Include="NStandard, Version=0.4.15.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NStandard.0.4.15\lib\net451\NStandard.dll</HintPath>
-    </Reference>
-    <Reference Include="PresentationCore" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ComboBoxBean.cs" />
-    <Compile Include="Model_App.cs" />
-    <Compile Include="Model_Canvas.cs" />
-    <Compile Include="Model_DirectorList.cs" />
-    <Compile Include="Model_DrawData.cs" />
-    <Compile Include="Model_Page.cs" />
-    <Compile Include="Model_ResourceAddTwo.cs" />
-    <Compile Include="Model_ResourceAdd.cs" />
-    <Compile Include="Model_Screenshot.cs" />
-    <Compile Include="Model_ServiceAddress.cs" />
-    <Compile Include="Model_Signatures.cs" />
-    <Compile Include="Model_TmatrixCode.cs" />
-    <Compile Include="Model_TsubjectbookList.cs" />
-    <Compile Include="ModelUserInfo.cs" />
-    <Compile Include="Model_Video.cs" />
-    <Compile Include="Model_WKData.cs" />
-    <Compile Include="NotifyModel.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ResultVo.cs" />
-    <Compile Include="ViewModel.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>

XHWK.Model/packages.config

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Ink" version="0.5.0" targetFramework="net452" />
-  <package id="NStandard" version="0.4.15" targetFramework="net452" />
-</packages>

XHWK.WKTool/App.config

@@ -7,8 +7,8 @@
     <!--0正式 1测试-->
     <add key="IsDebug" value="1" />
     <!--版本号-->
-    <add key="VersionCode" value="127" />
-    <add key="VersionName" value="3.13.0" />
+    <add key="VersionCode" value="128" />
+    <add key="VersionName" value="3.13.1" />
     <!--皮肤样式 0白 1蓝 2黑色 -->
     <add key="SkinStyle" value="0" />
     <!--是否输出视频记录日志：0否-->
@@ -27,21 +27,12 @@
     <add key="isRemind" value="" />
     <!--是否为校外 1是 -->
     <add key="IsOutsideSchool" value="1" />
-    <!--API请求地址-->
-    <add key="APIRequestAddress" value="https://schoolapi.xhkjedu.com" />
-    <!--文件平台请求地址-->
-    <add key="FileRequestAddress" value="https://schoolfile.xhkjedu.com" />
-    <!--展示文件服务器请求地址-->
-    <add key="SchoolfileRequestAddress" value="https://schoolstatic.xhkjedu.com" />
-    <!--认证请求地址-->
-    <add key="CertapiRequestAddress" value="https://scapi.xhkjedu.com" />
     <!--摄像头位置 1.右上 2.左上 3.右下 4.左下-->
     <add key="CameraPosition" value="1" />
     <!--上传每片大小 Mb-->
     <add key="UploadSliceLen" value="1" />
     <!--是否隐藏录屏工具栏 1 隐藏 0不隐藏-->
     <add key="IsHideSRTool" value="1" />
-    <add key="ClientSettingsProvider.ServiceUri" value="" />
   </appSettings>
   <system.web>
     <membership defaultProvider="ClientAuthenticationMembershipProvider">

XHWK.WKTool/App.xaml.cs

@@ -42,27 +42,27 @@ namespace XHWK.WKTool
         /// <summary>
         /// 服务地址
         /// </summary>
-        public static Model_ServiceAddress ServiceAddress;
+        public static ModelServiceAddress ServiceAddress;
 
         /// <summary>
         /// 接口地址
         /// </summary>
-        public static string apiUrl = isDebug ? "http://schoolapitest.xhkjedu.com" : FileToolsCommon.GetConfigValue("APIRequestAddress");
+        public static string apiUrl = isDebug ? "http://schoolapitest.xhkjedu.com" : "http://schoolapi.xhkjedu.com";
 
         /// <summary>
         /// 图片地址
         /// </summary>
-        public static string uploadUrl = isDebug ? "http://schoolfiletest.xhkjedu.com/" : FileToolsCommon.GetConfigValue("FileRequestAddress");
+        public static string uploadUrl = isDebug ? "http://schoolfiletest.xhkjedu.com/" : "http://schoolfile.xhkjedu.com/";
 
         /// <summary>
         /// 展示文件
         /// </summary>
-        public static string showImageUrl = isDebug ? "http://schoolstatictest.xhkjedu.com/static/" : FileToolsCommon.GetConfigValue("SchoolfileRequestAddress") + "/static/";
+        public static string showImageUrl = isDebug ? "http://schoolstatictest.xhkjedu.com/static/" : "http://schoolstatic.xhkjedu.com/static/";
 
         /// <summary>
         /// 认证接口地址
         /// </summary>
-        public static string certapiUrl = isDebug ? "http://scapitest.xhkjedu.com" : FileToolsCommon.GetConfigValue("CertapiRequestAddress");
+        public static string certapiUrl = isDebug ? "http://scapitest.xhkjedu.com" : "http://scapi.xhkjedu.com";
 
         #endregion 接口地址
 
@@ -110,7 +110,7 @@ namespace XHWK.WKTool
         /// <summary>
         /// 全局页面数据变量
         /// </summary>
-        public static readonly Model_Page PageContextData = new Model.Model_Page();
+        public static readonly ModelPage PageContextData = new Model.ModelPage();
 
         /// <summary>
         /// 录屏工具
@@ -152,17 +152,17 @@ namespace XHWK.WKTool
         /// <summary>
         /// 教材列表
         /// </summary>
-        public static List<Model_TsubjectbookList> TsubjectbookList = null;
+        public static List<ModelTsubjectbookList> TsubjectbookList = null;
 
         /// <summary>
         /// 章节列表
         /// </summary>
-        public static List<Model_DirectorList> DirectorList = null;
+        public static List<ModelDirectorList> DirectorList = null;
 
         /// <summary>
         /// 上传个人空间 入参
         /// </summary>
-        public static Model_ResourceAddTwo ResourceAddTwo = null;
+        public static ModelResourceAddTwo ResourceAddTwo = null;
 
         /// <summary>
         /// 是否正在上传
@@ -176,22 +176,22 @@ namespace XHWK.WKTool
         /// <summary>
         /// 用户微课列表模型
         /// </summary>
-        public static List<Model_WKData> WKDataList;
+        public static List<ModelWkData> WKDataList;
 
         /// <summary>
         /// 微课模型
         /// </summary>
-        public static Model_WKData WKData;
+        public static ModelWkData WKData;
 
         /// <summary>
         /// 微课视频列表
         /// </summary>
-        public static List<Model_Video> VideoList;
+        public static List<ModelVideo> VideoList;
 
         /// <summary>
         /// 画板模型
         /// </summary>
-        public static List<Model_DrawData> PageDrawList = new List<Model_DrawData>();
+        public static List<ModelDrawData> PageDrawList = new List<ModelDrawData>();
 
         #endregion 微课数据记录
 
@@ -319,8 +319,8 @@ namespace XHWK.WKTool
             try
             {
                 UserInfo = new ModelUserInfo();
-                WKDataList = new List<Model_WKData>();
-                VideoList = new List<Model_Video>();
+                WKDataList = new List<ModelWkData>();
+                VideoList = new List<ModelVideo>();
 
                 #region 强制以管理员方式运行 修改人：赵耀 修改时间：2020年9月7日
 
@@ -371,7 +371,7 @@ namespace XHWK.WKTool
             catch (Exception ex)
             {
                 string errMessage = "【进程】(Main):进程意外关闭。 " + ex.Message;
-                LogHelper.WriteErrLog(errMessage, ex);
+                LogHelper.Logerror.Error(errMessage, ex);
             }
         }
 
@@ -455,8 +455,7 @@ namespace XHWK.WKTool
         {
             try
             {
-                var exception = e.ExceptionObject as Exception;
-                if (exception != null)
+                if (e.ExceptionObject is Exception exception)
                 {
                     HandleException(exception);
                 }
@@ -487,7 +486,7 @@ namespace XHWK.WKTool
         private static void HandleException(Exception ex)
         {
             //记录日志
-            LogHelper.WriteErrLog("未捕获异常：" + ex.Message, ex);
+            LogHelper.Logerror.Error("未捕获异常：" + ex.Message, ex);
             Current.Shutdown();
         }
 
@@ -508,19 +507,19 @@ namespace XHWK.WKTool
                 }
                 else
                 {
-                    WKDataList = new List<Model_WKData>();
+                    WKDataList = new List<ModelWkData>();
                 }
                 WKDataList.Add(WKData);
                 string wkDateXmlStr = XmlUtilHelper.XmlSerialize(WKDataList);
                 string savePath = FileToolsCommon.GetFileAbsolutePath("/Data/");
                 FileToolsCommon.CreateDirectory(savePath);
-                string saveName = savePath + "WkDate.d";
+                string saveName = savePath + "WkDate.xml";
                 FileToolsCommon.DeleteFile(saveName);
                 FileToolsCommon.WriteText(saveName, wkDateXmlStr);
             }
             catch (Exception ex)
             {
-                LogHelper.WriteErrLog("【微课数据保存】（SaveWkData）保存失败：" + ex.Message, ex);
+                LogHelper.Logerror.Error("【微课数据保存】（SaveWkData）保存失败：" + ex.Message, ex);
             }
         }
 
@@ -533,13 +532,13 @@ namespace XHWK.WKTool
             {
                 string savePath = FileToolsCommon.GetFileAbsolutePath("/Data/");
                 FileToolsCommon.CreateDirectory(savePath);
-                string saveName = savePath + "WkDate.d";
+                string saveName = savePath + "WkDate.xml";
                 //文件若存在则读取
                 if (FileToolsCommon.IsExistFile(saveName))
                 {
                     string wkDateXmlStr = FileToolsCommon.FileToString(saveName);
-                    WKDataList = XmlUtilHelper.DESerializer<List<Model_WKData>>(wkDateXmlStr);
-                    foreach (Model_WKData wklist in WKDataList)
+                    WKDataList = XmlUtilHelper.DESerializer<List<ModelWkData>>(wkDateXmlStr);
+                    foreach (ModelWkData wklist in WKDataList)
                     {
                         //移除找不到视频的微课数据
                         wklist.VideoList.RemoveAll(x => !FileToolsCommon.IsExistFile(x.VideoPath));
@@ -547,7 +546,7 @@ namespace XHWK.WKTool
                     if (WKDataList.Exists(x => x.WkPath == wkPath))
                     {
                         WKData = WKDataList.Find(x => x.WkPath == wkPath);
-                        VideoList = new List<Model_Video>();
+                        VideoList = new List<ModelVideo>();
                         WKData.VideoList = WKData.VideoList.Where((x, i) => WKData.VideoList.FindIndex(z => z.FileGuid == x.FileGuid) == i).ToList();
                         VideoList = WKData.VideoList;
                     }
@@ -555,7 +554,7 @@ namespace XHWK.WKTool
             }
             catch (Exception ex)
             {
-                LogHelper.WriteErrLog("【微课数据读取】（ReadWkData）读取失败：" + ex.Message, ex);
+                LogHelper.Logerror.Error("【微课数据读取】（ReadWkData）读取失败：" + ex.Message, ex);
             }
         }
 
@@ -582,7 +581,7 @@ namespace XHWK.WKTool
             }
             catch (Exception ex)
             {
-                LogHelper.WriteErrLog("【画板数据保存】（SaveDraw）保存失败：" + ex.Message, ex);
+                LogHelper.Logerror.Error("【画板数据保存】（SaveDraw）保存失败：" + ex.Message, ex);
             }
         }
 
@@ -593,21 +592,21 @@ namespace XHWK.WKTool
         {
             try
             {
-                PageDrawList = new List<Model_DrawData>();
+                PageDrawList = new List<ModelDrawData>();
                 string savePath = WKData.WkPath + "PageData.xml";
                 if (FileToolsCommon.IsExistFile(savePath))
                 {
                     string pageDataXmlStr = FileToolsCommon.FileToString(savePath);
-                    PageDrawList = XmlUtilHelper.DESerializer<List<Model_DrawData>>(pageDataXmlStr);
+                    PageDrawList = XmlUtilHelper.DESerializer<List<ModelDrawData>>(pageDataXmlStr);
                 }
                 else
                 {
-                    PageDrawList = new List<Model_DrawData>();
+                    PageDrawList = new List<ModelDrawData>();
                 }
             }
             catch (Exception ex)
             {
-                LogHelper.WriteErrLog("【画板数据读取】(ReadDraw)读取失败：" + ex.Message, ex);
+                LogHelper.Logerror.Error("【画板数据读取】(ReadDraw)读取失败：" + ex.Message, ex);
             }
         }
 
@@ -629,14 +628,14 @@ namespace XHWK.WKTool
                 string dateXmlStr = XmlUtilHelper.XmlSerialize(ServiceAddress);
                 string savePath = DataPath;
                 FileToolsCommon.CreateDirectory(savePath);
-                string saveName = savePath + (isDebug ? "ServiceAddress_debug.xml" : "ServiceAddress_release.xml");
+                string saveName = savePath + (isDebug ? "ServiceAddressDebug.xml" : "ServiceAddressRelease.xml");
                 Console.WriteLine(@"保存路径为:");
                 FileToolsCommon.DeleteFile(saveName);
                 FileToolsCommon.WriteText(saveName, dateXmlStr);
             }
             catch (Exception ex)
             {
-                LogHelper.WriteErrLog("【服务地址存储】（SaveServiceAddressData）保存失败：" + ex.Message, ex);
+                LogHelper.Logerror.Error("【服务地址存储】（SaveServiceAddressData）保存失败：" + ex.Message, ex);
             }
         }
 
@@ -649,18 +648,19 @@ namespace XHWK.WKTool
             {
                 string savePath = DataPath;
                 FileToolsCommon.CreateDirectory(savePath);
-                string saveName = savePath + (isDebug ? "ServiceAddress_debug.xml" : "ServiceAddress_release.xml");
+                string saveName = savePath + (isDebug ? "ServiceAddressDebug.xml" : "ServiceAddressRelease.xml");
+                Console.WriteLine(@"配置文件路径" + saveName);
                 //文件若存在则读取
                 if (FileToolsCommon.IsExistFile(saveName))
                 {
                     string dateXmlStr = FileToolsCommon.FileToString(saveName);
-                    ServiceAddress = XmlUtilHelper.DESerializer<Model_ServiceAddress>(dateXmlStr);
+                    ServiceAddress = XmlUtilHelper.DESerializer<ModelServiceAddress>(dateXmlStr);
                     SwitchAddress();
                 }
             }
             catch (Exception ex)
             {
-                LogHelper.WriteErrLog("【服务地址读取】（ReadServiceAddressData）读取失败：" + ex.Message, ex);
+                LogHelper.Logerror.Error("【服务地址读取】（ReadServiceAddressData）读取失败：" + ex.Message, ex);
             }
         }
 
@@ -677,7 +677,7 @@ namespace XHWK.WKTool
             }
             catch (Exception ex)
             {
-                LogHelper.WriteErrLog("【服务地址切换】（SwitchAddress）服务复制切换失败，请求地址为空！", ex);
+                LogHelper.Logerror.Error("【服务地址切换】（SwitchAddress）服务复制切换失败，请求地址为空！", ex);
             }
         }
 

XHWK.WKTool/AppUpdateWin.xaml.cs

@@ -16,7 +16,7 @@ namespace XHWK.WKTool
     {
         private readonly AppUpdatePageModel _pageData = new AppUpdatePageModel();
 
-        public AppUpdateWin(Model_App app)
+        public AppUpdateWin(ModelApp app)
         {
             InitializeComponent();
             _pageData.appModel = app;
@@ -30,7 +30,7 @@ namespace XHWK.WKTool
 
         public class AppUpdatePageModel : NotifyModel
         {
-            public Model_App appModel { get; set; }
+            public ModelApp appModel { get; set; }
         }
 
         private void Button_Click(object sender, RoutedEventArgs e)

XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs

@@ -249,12 +249,7 @@ namespace XHWK.WKTool
                     App.ReadWkData(wkpath);
                     if (App.WKData == null)
                     {
-                        App.WKData = new Model_WKData
-                        {
-                            WkPath = wkpath,
-                            WkName = wkName,
-                            WkCreateDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
-                        };
+                        App.WKData = new ModelWkData { WkPath = wkpath, WkName = wkName, WkCreateDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") };
                     }
 
                     try
@@ -266,7 +261,7 @@ namespace XHWK.WKTool
                     }
                     catch (Exception ex)
                     {
-                        LogHelper.WriteErrLog("【微课创建课程】文件夹创建删除失败：" + ex.Message, ex);
+                        LogHelper.Logerror.Error("【微课创建课程】文件夹创建删除失败：" + ex.Message, ex);
                     }
 
                     //存储文件
@@ -275,7 +270,7 @@ namespace XHWK.WKTool
                 }
                 catch (Exception ex)
                 {
-                    LogHelper.WriteErrLog("【微课创建课程】读取课堂数据失败：" + ex.Message, ex);
+                    LogHelper.Logerror.Error("【微课创建课程】读取课堂数据失败：" + ex.Message, ex);
                 }
             });
             if (App.W_XHMicroLessonSystemWindow == null)
@@ -318,7 +313,7 @@ namespace XHWK.WKTool
                 }
                 string url = App.apiUrl + "/sapi/apprecord/get_new";
                 string result = ZHttpUtil.PostStr(url, "{}");
-                var resultObj = JsonHelper.JsonToObj<ResultVo<Model_App>>(result);
+                var resultObj = JsonHelper.JsonToObj<ResultVo<ModelApp>>(result);
                 if (result != null && resultObj.code == 0)
                 {
                     if (resultObj.obj != null)
@@ -338,7 +333,7 @@ namespace XHWK.WKTool
                         }
                         catch (Exception ex)
                         {
-                            LogHelper.WriteErrLog("【检查更新】（getNewApp）版本号错误：" + ex.Message, ex);
+                            LogHelper.Logerror.Error("【检查更新】（getNewApp）版本号错误：" + ex.Message, ex);
                         }
                     }
                 }
@@ -350,7 +345,7 @@ namespace XHWK.WKTool
         /// </summary>
         /// <param name="app">
         /// </param>
-        private void AppUpdateShow(Model_App app)
+        private void AppUpdateShow(ModelApp app)
         {
             AppUpdateWin win = new AppUpdateWin(app)
             {

XHWK.WKTool/DAL/DAL_Upload.cs

@@ -57,9 +57,7 @@ namespace XHWK.WKTool.DAL
                     if (jo["code"]?.ToString() == "0")
                     {
                         message = "";
-
-                        Model.ResultVo<Model_ResourceAddTwo> resultObj =
-                            JsonHelper.JsonToObj<Model.ResultVo<Model_ResourceAddTwo>>(jo.ToString());
+                        Model.ResultVo<ModelResourceAddTwo> resultObj = JsonHelper.JsonToObj<Model.ResultVo<ModelResourceAddTwo>>(jo.ToString());
                         App.ResourceAddTwo = resultObj.obj;
                         //已存在 不允许上传
                         return false;
@@ -80,7 +78,7 @@ namespace XHWK.WKTool.DAL
             }
 
             string errMessage = "【文件是否存在】(IsUploaded):请求失败。" + message;
-            LogHelper.WriteErrLog(errMessage, ex);
+            LogHelper.Logerror.Error(errMessage, ex);
             return false;
         }
 
@@ -118,8 +116,8 @@ namespace XHWK.WKTool.DAL
                         message = "无法访问文件服务器，请检查网络或文件服务器地址。";
                         return false;
                     }
-                    Model.ResultVo<Model_ResourceAddTwo> resultObj = JsonHelper.JsonToObj<Model.ResultVo<Model_ResourceAddTwo>>(jo.ToString());
-                    App.ResourceAddTwo = new Model_ResourceAddTwo();
+                    Model.ResultVo<ModelResourceAddTwo> resultObj = JsonHelper.JsonToObj<Model.ResultVo<ModelResourceAddTwo>>(jo.ToString());
+                    App.ResourceAddTwo = new ModelResourceAddTwo();
                     //0成功，1失败
                     if (resultObj.code == 0 && resultObj.obj != null)
                     {
@@ -142,7 +140,7 @@ namespace XHWK.WKTool.DAL
             }
 
             string errMessage = "【上报合并文件】(ReportFileMerge):请求失败。" + message;
-            LogHelper.WriteErrLog(errMessage, ex);
+            LogHelper.Logerror.Error(errMessage, ex);
             return false;
         }
 
@@ -156,14 +154,14 @@ namespace XHWK.WKTool.DAL
             errMessage = "";
             try
             {
-                Model_Video videoInfo = null;
-                foreach (Model_WKData vdata in App.WKDataList)
+                ModelVideo videoInfo = null;
+                foreach (ModelWkData vdata in App.WKDataList)
                 {
                     if (vdata.VideoList == null)
                     {
                         continue;
                     }
-                    foreach (Model_Video videoinfo in vdata.VideoList)
+                    foreach (ModelVideo videoinfo in vdata.VideoList)
                     {
                         if (videoinfo.FileGuid == videoGuid)
                         {
@@ -195,7 +193,7 @@ namespace XHWK.WKTool.DAL
             }
             catch (Exception ex)
             {
-                LogHelper.WriteErrLog("【视频上传】（UploadVideo）视频上传失败：" + ex.Message, ex);
+                LogHelper.Logerror.Error("【视频上传】（UploadVideo）视频上传失败：" + ex.Message, ex);
             }
             return false;
         }
@@ -210,14 +208,14 @@ namespace XHWK.WKTool.DAL
             errMessage = "";
             try
             {
-                Model_Video videoInfo = null;
-                foreach (Model_WKData vdata in App.WKDataList)
+                ModelVideo videoInfo = null;
+                foreach (ModelWkData vdata in App.WKDataList)
                 {
                     if (vdata.VideoList == null)
                     {
                         continue;
                     }
-                    foreach (Model_Video videoinfo in vdata.VideoList)
+                    foreach (ModelVideo videoinfo in vdata.VideoList)
                     {
                         if (videoinfo.FileGuid == videoGuid)
                         {
@@ -384,7 +382,7 @@ namespace XHWK.WKTool.DAL
             }
             catch (Exception ex)
             {
-                LogHelper.WriteErrLog("【视频上传】（UploadVideo）视频上传失败：" + ex.Message, ex);
+                LogHelper.Logerror.Error("【视频上传】（UploadVideo）视频上传失败：" + ex.Message, ex);
             }
             return false;
         }

XHWK.WKTool/DAL/XHApi.cs

@@ -12,7 +12,6 @@ using XHWK.Model;
 namespace XHWK.WKTool.DAL
 {
     using system;
-    using VisioForge.Tools.TagLib;
 
     public class XhApi
     {
@@ -21,56 +20,42 @@ namespace XHWK.WKTool.DAL
         /// </summary>
         /// <returns>
         /// </returns>
-        public int ActivationAdd
-        (
-            string mac,
-            string device,
-            string projectcode
-        )
+        public int ActivationAdd(string mac, string device, string projectcode)
         {
             try
             {
                 string url = App.certapiUrl + "/activation/add"; //地址
-                Dictionary<string, object> dic = new Dictionary<string, object>
-                {
-                    { "mac", mac },
-                    { "device", device },
-                    { "projectcode", projectcode }
-                };
+                Dictionary<string, object> dic = new Dictionary<string, object> { { "mac", mac }, { "device", device }, { "projectcode", projectcode } };
                 string body = JsonHelper.ToJson(dic);
-                string xmlDoc = ZHttpUtil.PostStr(url, body);
+                string xmlDoc = ZHttpUtil.PostStr(url, body, false);
                 if (string.IsNullOrEmpty(xmlDoc))
                 {
                     App.ServerMsg = "网络异常！";
                     return 1;
                 }
                 JObject obj = JObject.Parse(xmlDoc);
-                if (obj["code"].ToString().Equals("0"))
+                if (obj["code"] != null)
                 {
-                    App.Signature = obj["obj"]?.ToString();
-                    if (!Directory.Exists(App.DataPath))
+                    if (obj["code"].ToString().Equals("0"))
                     {
-                        Directory.CreateDirectory(App.DataPath);
+                        App.Signature = obj["obj"]?.ToString();
+                        if (!Directory.Exists(App.DataPath))
+                        {
+                            Directory.CreateDirectory(App.DataPath);
+                        }
+                        string applicationData = App.DataPath + "signature.txt";
+                        System.IO.File.WriteAllText(applicationData, App.Signature, Encoding.Default); //存放签名
+                        return 0;
                     }
-                    string applicationData = App.DataPath + "signature.txt";
-                    System.IO.File.WriteAllText
-                    (
-                        applicationData,
-                        App.Signature,
-                        Encoding.Default
-                    ); //存放签名
-                    return 0;
-                }
-                else
-                {
                     App.ServerMsg = obj["msg"]?.ToString();
                     return Convert.ToInt32(obj["code"].ToString());
                 }
+                return 1;
             }
             catch (Exception ex)
             {
                 App.ServerMsg = "网络异常！";
-                LogHelper.WriteErrLog("【调用接口（RegisterController）】错误日志：" + ex.Message, ex);
+                LogHelper.Logerror.Error("【调用接口（RegisterController）】错误日志：" + ex.Message, ex);
                 return 1;
             }
         }
@@ -87,7 +72,7 @@ namespace XHWK.WKTool.DAL
                 string url = App.certapiUrl + "/activation/add_history";
                 Dictionary<string, object> dic = new Dictionary<string, object> { { "sign", App.Signature } };
                 string body = JsonHelper.ToJson(dic);
-                string xmlDoc = ZHttpUtil.PostStr(url, body);
+                string xmlDoc = ZHttpUtil.PostStr(url, body, false);
                 if (string.IsNullOrEmpty(xmlDoc))
                 {
                     return 1;
@@ -102,7 +87,7 @@ namespace XHWK.WKTool.DAL
             }
             catch (Exception ex)
             {
-                LogHelper.WriteErrLog("【调用接口（RegisterController）】错误日志：" + ex.Message, ex);
+                LogHelper.Logerror.Error("【调用接口（RegisterController）】错误日志：" + ex.Message, ex);
                 return 1;
             }
         }
@@ -114,7 +99,6 @@ namespace XHWK.WKTool.DAL
         /// </returns>
         public int Login(string loginname, string loginpwd)
         {
-            Console.WriteLine(FileToolsCommon.GetConfigValue("APIRequestAddress"));
             string url = App.apiUrl + "/suser/user/login"; //地址
 
             //1.193.37.200
@@ -161,12 +145,7 @@ namespace XHWK.WKTool.DAL
         public bool DownloadAvatar(string headPortrait, string savePath)
         {
             string url = App.showImageUrl + headPortrait;
-            bool result = ZHttpUtil.GetDataGetHtml
-            (
-                url,
-                savePath,
-                ""
-            );
+            bool result = ZHttpUtil.GetDataGetHtml(url, savePath, "");
             return result;
         }
 
@@ -177,13 +156,13 @@ namespace XHWK.WKTool.DAL
         /// </returns>
         public int TsubjectbookList()
         {
-            App.TsubjectbookList = new List<Model_TsubjectbookList>();
+            App.TsubjectbookList = new List<ModelTsubjectbookList>();
             try
             {
                 string url = App.apiUrl + "/sstudy/tsubjectbook/list"; //地址
                 Dictionary<string, int> dic = new Dictionary<string, int> { { "teacherid", App.UserInfo.Userid } };
                 string body = JsonHelper.ToJson(dic);
-                ResultVo<List<Model_TsubjectbookList>> result = ZHttpUtil.PostSignle<ResultVo<List<Model_TsubjectbookList>>>(url, postData: body);
+                ResultVo<List<ModelTsubjectbookList>> result = ZHttpUtil.PostSignle<ResultVo<List<ModelTsubjectbookList>>>(url, postData: body);
                 if (result != null)
                 {
                     App.ServerMsg = result.msg;
@@ -198,7 +177,7 @@ namespace XHWK.WKTool.DAL
             }
             catch (Exception ex)
             {
-                LogHelper.WriteErrLog("【调用接口（RegisterController）】错误日志：" + ex.Message, ex);
+                LogHelper.Logerror.Error("【调用接口（RegisterController）】错误日志：" + ex.Message, ex);
                 return 1;
             }
         }
@@ -208,25 +187,15 @@ namespace XHWK.WKTool.DAL
         /// </summary>
         /// <returns>
         /// </returns>
-        public int DirectorList
-        (
-            string lsbid,
-            int belong,
-            int createid
-        )
+        public int DirectorList(string lsbid, int belong, int createid)
         {
-            App.DirectorList = new List<Model_DirectorList>();
+            App.DirectorList = new List<ModelDirectorList>();
             try
             {
                 string url = App.apiUrl + "/sstudy/director/list"; //地址
-                Dictionary<string, string> dic = new Dictionary<string, string>
-                {
-                    { "lsbid", lsbid },
-                    { "belong", belong.ToString() },
-                    { "createid", createid.ToString() }
-                };
+                Dictionary<string, string> dic = new Dictionary<string, string> { { "lsbid", lsbid }, { "belong", belong.ToString() }, { "createid", createid.ToString() } };
                 string body = JsonHelper.ToJson(dic);
-                ResultVo<List<Model_DirectorList>> result = ZHttpUtil.PostSignle<ResultVo<List<Model_DirectorList>>>(url, postData: body);
+                ResultVo<List<ModelDirectorList>> result = ZHttpUtil.PostSignle<ResultVo<List<ModelDirectorList>>>(url, postData: body);
                 if (result != null)
                 {
                     App.ServerMsg = result.msg;
@@ -241,7 +210,7 @@ namespace XHWK.WKTool.DAL
             }
             catch (Exception ex)
             {
-                LogHelper.WriteErrLog("【调用接口（RegisterController）】错误日志：" + ex.Message, ex);
+                LogHelper.Logerror.Error("【调用接口（RegisterController）】错误日志：" + ex.Message, ex);
                 return 1;
             }
         }
@@ -251,9 +220,9 @@ namespace XHWK.WKTool.DAL
         /// </summary>
         /// <returns>
         /// </returns>
-        public int ResourceAdd(Model_ResourceAdd model)
+        public int ResourceAdd(ModelResourceAdd model)
         {
-            App.DirectorList = new List<Model_DirectorList>();
+            App.DirectorList = new List<ModelDirectorList>();
             try
             {
                 string url = App.apiUrl + "/sstudy/resource/add"; //地址
@@ -277,10 +246,9 @@ namespace XHWK.WKTool.DAL
                     //schoolid: 12
                     //suffix: "mp4"
                     //uid: 80
-                    { "converted", model.converted },
-                    { "createid", model.createid }
+                    { "converted", model.converted }, { "createid", model.createid }
                 };
-                if (model.directorid != "999999")//章节上传可以不选
+                if (model.directorid != "999999") //章节上传可以不选
                 {
                     dic.Add("directorid", model.directorid);
                 }
@@ -300,7 +268,6 @@ namespace XHWK.WKTool.DAL
                 dic.Add("schoolid", model.schoolid);
                 dic.Add("suffix", model.suffix);
                 //dic.Add("uid", model.uid);
-
                 string body = JsonHelper.ToJson(dic);
                 string xmlDoc = ZHttpUtil.PostStr(url, body);
                 JObject obj = JObject.Parse(xmlDoc);
@@ -310,7 +277,7 @@ namespace XHWK.WKTool.DAL
             catch (Exception ex)
             {
                 App.ServerMsg = "网络异常！";
-                LogHelper.WriteErrLog("【调用接口（RegisterController）】错误日志：" + ex.Message, ex);
+                LogHelper.Logerror.Error("【调用接口（RegisterController）】错误日志：" + ex.Message, ex);
                 return 1;
             }
         }
@@ -328,7 +295,7 @@ namespace XHWK.WKTool.DAL
             string url = App.certapiUrl + "/school/find_code"; //地址
             Dictionary<string, object> dic = new Dictionary<string, object> { { "schoolcode", schoolcode } };
             string body = JsonHelper.ToJson(dic);
-            ResultVo<Model_ServiceAddress> result = ZHttpUtil.PostSignle<ResultVo<Model_ServiceAddress>>(url, postData: body);
+            ResultVo<ModelServiceAddress> result = ZHttpUtil.PostSignle<ResultVo<ModelServiceAddress>>(url, body, false);
             if (result != null)
             {
                 if (result.code == 0)
@@ -340,11 +307,8 @@ namespace XHWK.WKTool.DAL
                         App.SaveServiceAddressData();
                         return true;
                     }
-                    else
-                    {
-                        message = "服务地址错误，请输入正确的地址！";
-                        return false;
-                    }
+                    message = "服务地址错误，请输入正确的地址！";
+                    return false;
                 }
                 else
                 {
@@ -359,4 +323,4 @@ namespace XHWK.WKTool.DAL
             }
         }
     }
-}
+}

XHWK.WKTool/DeviceWindow.xaml.cs

@@ -129,7 +129,7 @@ namespace XHWK.WKTool
             }
             catch (Exception ex)
             {
-                LogHelper.WriteErrLog("【摄像头检测】（DeviceWindow）摄像头不可用：" + ex.Message, ex);
+                LogHelper.Logerror.Error("【摄像头检测】（DeviceWindow）摄像头不可用：" + ex.Message, ex);
             }
         }
 

XHWK.WKTool/JieTuWindow.xaml.cs

@@ -264,7 +264,7 @@ namespace ComeCapture
             App.ImgPath = string.Empty;
             string imagePath = Path.Combine(tempPath, time + ".jpg");
             App.ImgPath = imagePath;
-            //LogHelper.WriteInfoLog(imagePath);
+            //LogHelper.Loginfo.Info(imagePath);
             //this.Close();
             //string imagePath = ImageHelper.GetImagePath(out string serverSavePath);
 

XHWK.WKTool/LoginWindow.xaml

@@ -213,8 +213,7 @@
                             Content="关闭"
                             Cursor="Hand"
                             FontSize="18"
-                            Foreground="#FFFFFF"
-                            IsDefault="True" />
+                            Foreground="#FFFFFF" />
 
                         <Button
                             x:Name="BtnServiceAddress"
@@ -351,8 +350,7 @@
                             Cursor="Hand"
                             FontSize="18"
                             FontWeight="Bold"
-                            Foreground="#FFFFFF"
-                            IsDefault="True">
+                            Foreground="#FFFFFF">
                             <Button.Template>
                                 <ControlTemplate TargetType="{x:Type Button}">
                                     <Border
@@ -384,8 +382,7 @@
                             Cursor="Hand"
                             FontSize="18"
                             FontWeight="Bold"
-                            Foreground="#FFFFFF"
-                            IsDefault="True">
+                            Foreground="#FFFFFF">
                             <Button.Template>
                                 <ControlTemplate TargetType="{x:Type Button}">
                                     <Border

XHWK.WKTool/MainWindow.xaml.cs

@@ -64,7 +64,7 @@ namespace XHWK.WKTool
 
         private System.Windows.Forms.DialogResult _result;
         private System.Windows.Forms.DialogResult _result2;
-        private Model_Video _videoInfo;
+        private ModelVideo _videoInfo;
 
         //定义委托
         public delegate void ChangeTextHandler(string text);
@@ -77,7 +77,7 @@ namespace XHWK.WKTool
         /// <summary>
         /// 视频模型
         /// </summary>
-        private List<Model_Video> _modelVideoList;
+        private List<ModelVideo> _modelVideoList;
 
         #endregion 上传
 
@@ -114,8 +114,8 @@ namespace XHWK.WKTool
             DataContext = App.PageContextData;
 
             //APP.SaveDraw();//画板模型第一页初始化
-            App.PageDrawList = new List<Model_DrawData>();
-            Model_DrawData modelDrawData = new Model_DrawData { PageNum = App.PageContextData.currpage };
+            App.PageDrawList = new List<ModelDrawData>();
+            ModelDrawData modelDrawData = new ModelDrawData { PageNum = App.PageContextData.currpage };
             App.PageDrawList.Add(modelDrawData);
             Txbv.Text = (App.isDebug ? "测试版" : "正式版") + " v" + FileToolsCommon.GetConfigValue("VersionName");
             TxbStoragePath.Content = FileToolsCommon.GetConfigValue("VideoType");
@@ -492,7 +492,7 @@ namespace XHWK.WKTool
             }
             catch (Exception ex)
             {
-                LogHelper.WriteErrLog("XHMicroLessonSystemWindow(设置保存事件报错：)" + ex.Message, ex);
+                LogHelper.Logerror.Error("XHMicroLessonSystemWindow(设置保存事件报错：)" + ex.Message, ex);
             }
         }
 
@@ -696,10 +696,10 @@ namespace XHWK.WKTool
             ImgPpt.Source = null;
             if (App.PageContextData.pagenum == 1)
             {
-                App.PageDrawList = new List<Model_DrawData>();
+                App.PageDrawList = new List<ModelDrawData>();
             }
             //画板模型增加一页
-            Model_DrawData modelDrawData = new Model_DrawData { PageNum = App.PageContextData.currpage };
+            ModelDrawData modelDrawData = new ModelDrawData { PageNum = App.PageContextData.currpage };
             App.PageDrawList.Add(modelDrawData);
             if (_recordType == 0)
             {
@@ -739,7 +739,7 @@ namespace XHWK.WKTool
                         }
                         catch (Exception ex)
                         {
-                            LogHelper.WriteErrLog("获取进程失败，" + ex.Message, ex);
+                            LogHelper.Logerror.Error("获取进程失败，" + ex.Message, ex);
                         }
                         App.SaveWkData();
                         App.SaveDraw();
@@ -749,7 +749,7 @@ namespace XHWK.WKTool
                 }
                 catch (Exception ex)
                 {
-                    LogHelper.WriteErrLog("关闭微课失败，" + ex.Message, ex);
+                    LogHelper.Logerror.Error("关闭微课失败，" + ex.Message, ex);
                     Close();
                     Application.Current.Shutdown();
                     _tmc.TmatrixUninitialize();
@@ -1327,7 +1327,7 @@ namespace XHWK.WKTool
             }
             catch (Exception ex)
             {
-                LogHelper.WriteErrLog("【导入（BtnImport_Click）" + ex.Message, ex);
+                LogHelper.Logerror.Error("【导入（BtnImport_Click）" + ex.Message, ex);
             }
         }
 
@@ -1439,11 +1439,7 @@ namespace XHWK.WKTool
                     }
                     else
                     {
-                        Model_DrawData modelDrawData = new Model_DrawData
-                        {
-                            PageImagePath = App.ImgPath,
-                            PdfImagePath = App.ImgPath
-                        };
+                        ModelDrawData modelDrawData = new ModelDrawData { PageImagePath = App.ImgPath, PdfImagePath = App.ImgPath };
                         App.PageDrawList.Add(modelDrawData);
                     }
                     if (App.PageDrawList.Count >= App.PageContextData.currpage && !string.IsNullOrWhiteSpace(App.PageDrawList[App.PageContextData.currpage - 1].PageImagePath))
@@ -1597,7 +1593,7 @@ namespace XHWK.WKTool
                                             }
                                             else
                                             {
-                                                Model_DrawData modelDrawData = new Model_DrawData
+                                                ModelDrawData modelDrawData = new ModelDrawData
                                                 {
                                                     PageImagePath = page[i - App.PageContextData.pagenum],
                                                     PdfImagePath = page[i - App.PageContextData.pagenum],
@@ -1662,7 +1658,7 @@ namespace XHWK.WKTool
                                         MessageWindow.Show("无法访问文件，请检查文件是否有效或解除文件占用！");
                                     }
                                 );
-                                LogHelper.WriteErrLog("【打开ppt】(OpenDialog PPT)" + ex.Message, ex);
+                                LogHelper.Logerror.Error("【打开ppt】(OpenDialog PPT)" + ex.Message, ex);
                             }
                         }
                         else if (type.Contains("typepdf"))
@@ -1735,7 +1731,7 @@ namespace XHWK.WKTool
                                             }
                                             else
                                             {
-                                                Model_DrawData modelDrawData = new Model_DrawData
+                                                ModelDrawData modelDrawData = new ModelDrawData
                                                 {
                                                     PageImagePath = page[i - App.PageContextData.pagenum],
                                                     PdfImagePath = page[i - App.PageContextData.pagenum],
@@ -1787,7 +1783,7 @@ namespace XHWK.WKTool
                                         MessageWindow.Show(ex.Message);
                                     }
                                 );
-                                LogHelper.WriteErrLog("【打开pdf】(OpenDialog pdf)" + ex.Message, ex);
+                                LogHelper.Logerror.Error("【打开pdf】(OpenDialog pdf)" + ex.Message, ex);
                             }
                         }
                         else if (imagelist.Contains(filesuff)) //导入图片
@@ -1841,11 +1837,7 @@ namespace XHWK.WKTool
                                     }
                                     else
                                     {
-                                        Model_DrawData modelDrawData = new Model_DrawData
-                                        {
-                                            PageImagePath = App.ImgPath,
-                                            PdfImagePath = App.ImgPath
-                                        };
+                                        ModelDrawData modelDrawData = new ModelDrawData { PageImagePath = App.ImgPath, PdfImagePath = App.ImgPath };
                                         App.PageDrawList.Add(modelDrawData);
                                     }
                                     if (App.PageDrawList.Count >= App.PageContextData.currpage && !string.IsNullOrWhiteSpace(App.PageDrawList[App.PageContextData.currpage - 1].PageImagePath))
@@ -1912,7 +1904,7 @@ namespace XHWK.WKTool
                                             }
                                             else
                                             {
-                                                Model_DrawData modelDrawData = new Model_DrawData
+                                                ModelDrawData modelDrawData = new ModelDrawData
                                                 {
                                                     PageImagePath = page[i - App.PageContextData.pagenum],
                                                     PdfImagePath = page[i - App.PageContextData.pagenum],
@@ -1964,7 +1956,7 @@ namespace XHWK.WKTool
                                         MessageWindow.Show("无法访问文件，请检查文件是否有效或解除文件占用！");
                                     }
                                 );
-                                LogHelper.WriteErrLog("【XHMicroLessonSystemWindow】(OpenDialog 导入文档)" + ex.Message, ex);
+                                LogHelper.Logerror.Error("【XHMicroLessonSystemWindow】(OpenDialog 导入文档)" + ex.Message, ex);
                             }
                         }
                     }
@@ -2053,8 +2045,8 @@ namespace XHWK.WKTool
         {
             try
             {
-                _modelVideoList = new List<Model_Video>();
-                foreach (Model_WKData vdata in App.WKDataList)
+                _modelVideoList = new List<ModelVideo>();
+                foreach (ModelWkData vdata in App.WKDataList)
                 {
                     #region 计时器初始化
 
@@ -2062,7 +2054,7 @@ namespace XHWK.WKTool
                     {
                         continue;
                     }
-                    foreach (Model_Video videoinfo in vdata.VideoList)
+                    foreach (ModelVideo videoinfo in vdata.VideoList)
                     {
                         try
                         {
@@ -2079,7 +2071,7 @@ namespace XHWK.WKTool
                         }
                         catch (Exception ex)
                         {
-                            LogHelper.WriteErrLog("【加载视频列表】（LoadingVideoList）" + ex.Message, ex);
+                            LogHelper.Logerror.Error("【加载视频列表】（LoadingVideoList）" + ex.Message, ex);
                         }
                     }
 
@@ -2093,7 +2085,7 @@ namespace XHWK.WKTool
             }
             catch (Exception ex)
             {
-                LogHelper.WriteErrLog("【加载视频列表】（LoadingVideoList）" + ex.Message, ex);
+                LogHelper.Logerror.Error("【加载视频列表】（LoadingVideoList）" + ex.Message, ex);
             }
         }
 
@@ -2771,7 +2763,7 @@ namespace XHWK.WKTool
                         }
                         catch (Exception ex)
                         {
-                            LogHelper.WriteErrLog("录制生成缩略图", ex);
+                            LogHelper.Logerror.Error("录制生成缩略图", ex);
                         }
                         if (!App.VideoList.Exists(x => x.FileGuid == _videoInfo.FileGuid) || !App.VideoList.Exists(x => x.VideoPath == _videoInfo.VideoPath))
                         {
@@ -2786,7 +2778,7 @@ namespace XHWK.WKTool
                         }
                         catch (Exception ex)
                         {
-                            LogHelper.WriteErrLog("删除录制临时文件", ex);
+                            LogHelper.Logerror.Error("删除录制临时文件", ex);
                         }
                     }
                     catch (Exception ex)
@@ -2842,7 +2834,7 @@ namespace XHWK.WKTool
             }
             catch (Exception ex)
             {
-                LogHelper.WriteErrLog("【录制】(Timer_Elapsed)生成图片错误:" + ex.Message, ex);
+                LogHelper.Logerror.Error("【录制】(Timer_Elapsed)生成图片错误:" + ex.Message, ex);
             }
         }
 
@@ -2858,11 +2850,7 @@ namespace XHWK.WKTool
                 {
                     //电子版切换笔模式
                     _luoBoPenUtil.lb_device_hand();
-                    _videoInfo = new Model_Video
-                    {
-                        VideoType = (Enum_VideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType")),
-                        WkType = Enum_WKVidetype.RecordingLessons
-                    };
+                    _videoInfo = new ModelVideo { VideoType = (EnumVideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType")), WkType = EnumWkVidetype.RecordingLessons };
                     FileToolsCommon.DeleteDirectory(App.WKData.WkPath + "temp/");
                     FileToolsCommon.CreateDirectory(App.WKData.WkPath);
                     _videoSavePathName = App.WKData.WkPath + App.WKData.WkName + "_录制." + _videoInfo.VideoType.ToString();
@@ -3542,13 +3530,13 @@ namespace XHWK.WKTool
                 if (keyCheckResult.Substring(0, 1) == "1")
                 {
                     MessageWindow.Show("打印服务授权过期，请联系厂家更换授权！");
-                    LogHelper.WriteErrLog("打印服务授权过期：" + keyCheckResult, null);
+                    LogHelper.Logerror.Error("打印服务授权过期：" + keyCheckResult, null);
                     _gbInitDone = false;
                 }
             }
             catch (Exception ex)
             {
-                LogHelper.WriteErrLog("打印服务授权失败：" + ex.Message, ex);
+                LogHelper.Logerror.Error("打印服务授权失败：" + ex.Message, ex);
                 MessageWindow.Show("打印服务授权失败，请联系厂家！");
                 _gbInitDone = false;
             }
@@ -3688,7 +3676,7 @@ namespace XHWK.WKTool
             }
             catch (Exception ex)
             {
-                LogHelper.WriteErrLog("【截图合成】（MergerImg）图片合成失败：" + ex.Message, ex);
+                LogHelper.Logerror.Error("【截图合成】（MergerImg）图片合成失败：" + ex.Message, ex);
                 return false;
             }
         }
@@ -3829,7 +3817,7 @@ namespace XHWK.WKTool
                         MessageWindow.Show(ex.Message);
                     }
                 );
-                LogHelper.WriteErrLog("打印转换PDF失败，原因：" + ex.Message, ex);
+                LogHelper.Logerror.Error("打印转换PDF失败，原因：" + ex.Message, ex);
             }
             //PDF位置
             string sourcePath = printModel.filepath;

XHWK.Model/Model_App.cs → XHWK.WKTool/Models/ModelApp.cs

@@ -1,6 +1,6 @@
 namespace XHWK.Model
 {
-    public class Model_App
+    public class ModelApp
     {
         public int versionid { get; set; }
 

XHWK.Model/Model_Canvas.cs → XHWK.WKTool/Models/ModelCanvas.cs

@@ -1,6 +1,6 @@
 namespace XHWK.Model
 {
-    public class Model_Canvas : NotifyModel
+    public class ModelCanvas : NotifyModel
     {
         private string _name;
 

XHWK.Model/Model_DirectorList.cs → XHWK.WKTool/Models/ModelDirectorList.cs

@@ -2,7 +2,7 @@
 
 namespace XHWK.Model
 {
-    public class Model_DirectorList
+    public class ModelDirectorList
     {
         /// <summary>
         /// id
@@ -77,7 +77,7 @@ namespace XHWK.Model
         /// <summary>
         /// 子章节
         /// </summary>
-        public List<Model_DirectorList> children { get; set; }
+        public List<ModelDirectorList> children { get; set; }
 
         /// <summary>
         /// 章节归属级别

XHWK.Model/Model_DrawData.cs → XHWK.WKTool/Models/ModelDrawData.cs

@@ -5,25 +5,31 @@ namespace XHWK.Model
     /// <summary>
     /// 画板模型
     /// </summary>
-    public class Model_DrawData
+    public class ModelDrawData
     {
-        private int _PageNum;
+        private int _pageNum;
         private string _pageCode;
         private string _pageImagePath;
-        private TranslateTransform _ImageLocation = new TranslateTransform(0, 0);
+
+        private TranslateTransform _imageLocation = new TranslateTransform(0, 0);
+
         //private ScaleTransform _ImageSize = new ScaleTransform(0, 0);
-        private ScaleTransform _ImageSizes = new ScaleTransform(0, 0);
-        private bool _IsImageLocation;
+        private ScaleTransform _imageSizes = new ScaleTransform(0, 0);
+
+        private bool _isImageLocation;
+
         //private string _PenColor;
         //private int _PenWigth;
         //private List<PointF> _Handwriting;
         private string _pdfImagePath;
         private bool _imgDocumentation;
         private string _type;
+
         /// <summary>
         /// 页码
         /// </summary>
-        public int PageNum { get => _PageNum; set => _PageNum = value; }
+        public int PageNum { get => _pageNum; set => _pageNum = value; }
+
         /// <summary>
         /// 页编号
         /// </summary>
@@ -32,10 +38,12 @@ namespace XHWK.Model
         /// 页面图片路径
         /// </summary>
         public string PageImagePath { get => _pageImagePath; set => _pageImagePath = value; }
+
         /// <summary>
         /// 图片坐标
         /// </summary>
-        public TranslateTransform ImageLocation { get => _ImageLocation; set => _ImageLocation = value; }
+        public TranslateTransform ImageLocation { get => _imageLocation; set => _imageLocation = value; }
+
         ///// <summary>
         ///// 图片大小
         ///// </summary>
@@ -44,15 +52,19 @@ namespace XHWK.Model
         /// PDF 图片路径
         /// </summary>
         public string PdfImagePath { get => _pdfImagePath; set => _pdfImagePath = value; }
+
         /// <summary>
         /// 坐标是否固定
         /// </summary>
-        public bool IsImageLocation { get => _IsImageLocation; set => _IsImageLocation = value; }
+        public bool IsImageLocation { get => _isImageLocation; set => _isImageLocation = value; }
+
         /// <summary>
         /// true 文档图片  folse 截图图片
         /// </summary>
         public bool ImgDocumentation { get => _imgDocumentation; set => _imgDocumentation = value; }
-        public ScaleTransform ImageSizes { get => _ImageSizes; set => _ImageSizes = value; }
+
+        public ScaleTransform ImageSizes { get => _imageSizes; set => _imageSizes = value; }
+
         /// <summary>
         /// ppt word
         /// </summary>

XHWK.Model/Model_Page.cs → XHWK.WKTool/Models/ModelPage.cs

@@ -2,14 +2,14 @@
 
 namespace XHWK.Model
 {
-    public class Model_Page : NotifyModel
+    public class ModelPage : NotifyModel
     {
-        public ObservableCollection<Model_Canvas> menuList { get; set; }
+        public ObservableCollection<ModelCanvas> menuList { get; set; }
 
         /// <summary>
         /// 总页码
         /// </summary>
-        private int _pagenum = 0;
+        private int _pagenum;
 
         /// <summary>
         /// 总页码
@@ -23,7 +23,7 @@ namespace XHWK.Model
         /// <summary>
         /// 当前页 从1开始
         /// </summary>
-        private int _currpage = 0;// 从1开始
+        private int _currpage; // 从1开始
 
         /// <summary>
         /// 当前页 从1开始
@@ -34,9 +34,9 @@ namespace XHWK.Model
             set { _currpage = value; OnPropertyChanged("currpage"); }
         }
 
-        public Model_Page()
+        public ModelPage()
         {
-            menuList = new ObservableCollection<Model_Canvas>();
+            menuList = new ObservableCollection<ModelCanvas>();
         }
 
         /// <summary>

XHWK.Model/Model_ResourceAdd.cs → XHWK.WKTool/Models/ModelResourceAdd.cs

@@ -1,6 +1,6 @@
 namespace XHWK.Model
 {
-    public class Model_ResourceAdd
+    public class ModelResourceAdd
     {
         //        converted: 0
         //createid: 80

XHWK.Model/Model_ResourceAddTwo.cs → XHWK.WKTool/Models/ModelResourceAddTwo.cs

@@ -1,6 +1,6 @@
 namespace XHWK.Model
 {
-    public class Model_ResourceAddTwo
+    public class ModelResourceAddTwo
     {
         public string videopath { get; set; }
         public string coverpath { get; set; }

XHWK.Model/Model_Screenshot.cs → XHWK.WKTool/Models/ModelScreenshot.cs

@@ -1,6 +1,6 @@
 namespace XHWK.Model
 {
-    public class Model_Screenshot
+    public class ModelScreenshot
     {
         private string _imgPath;
         private int _subscript;

XHWK.Model/Model_ServiceAddress.cs → XHWK.WKTool/Models/ModelServiceAddress.cs

@@ -1,15 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace XHWK.Model
+namespace XHWK.Model
 {
     /// <summary>
     /// 服务地址模型
     /// </summary>
-    public class Model_ServiceAddress
+    public class ModelServiceAddress
     {
         public string id;
         public string createname;

XHWK.Model/Model_Signatures.cs → XHWK.WKTool/Models/ModelSignatures.cs

@@ -1,6 +1,6 @@
 namespace XHWK.Model
 {
-    public class Model_Signatures
+    public class ModelSignatures
     {
 
         /// <summary>

XHWK.Model/Model_TmatrixCode.cs → XHWK.WKTool/Models/ModelTmatrixCode.cs

@@ -3,10 +3,11 @@
 namespace XHWK.Model
 {
     #region 铺码模型
+
     /// <summary>
     /// TQL铺码模型
     /// </summary>
-    public class Model_TmatrixCode
+    public class ModelTmatrixCode
     {
         /// <summary>
         /// 返回标志
@@ -44,16 +45,17 @@ namespace XHWK.Model
         /// 铺码文件使用的 bookId
         /// </summary>
         public string bookId { get; set; }
+
         /// <summary>
         /// 铺码文件的 page 信息
         /// </summary>
-        public List<Model_PageInfoItem> pageInfo { get; set; }
-
+        public List<ModelPageInfoItem> pageInfo { get; set; }
     }
+
     /// <summary>
     /// PDF页码对应铺码ID
     /// </summary>
-    public class Model_PageInfoItem
+    public class ModelPageInfoItem
     {
         /// <summary>
         /// Pdf 文件页码
@@ -68,10 +70,11 @@ namespace XHWK.Model
     #endregion
 
     #region 查询进度
+
     /// <summary>
     /// 进度查询
     /// </summary>
-    public class Model_ScheduleQuery
+    public class ModelScheduleQuery
     {
         /// <summary>
         /// 结果
@@ -81,15 +84,17 @@ namespace XHWK.Model
         /// 消息
         /// </summary>
         public string message { get; set; }
+
         /// <summary>
         /// 进度列表
         /// </summary>
-        public List<Model_ScheduleQueryState> list { get; set; }
+        public List<ModelScheduleQueryState> list { get; set; }
     }
+
     /// <summary>
     /// 查询状态
     /// </summary>
-    public class Model_ScheduleQueryState
+    public class ModelScheduleQueryState
     {
         /// <summary>
         /// 铺码 ID
@@ -107,10 +112,11 @@ namespace XHWK.Model
     #endregion
 
     #region 历史查询
+
     /// <summary>
     /// 历史查询模型
     /// </summary>
-    public class Model_HistoryQuery
+    public class ModelHistoryQuery
     {
         /// <summary>
         /// 返回标志
@@ -120,29 +126,33 @@ namespace XHWK.Model
         /// 返回标志说明
         /// </summary>
         public string message { get; set; }
+
         /// <summary>
         /// 历史数据列表数组
         /// </summary>
-        public List<Model_HistoryPageList> pageList { get; set; }
+        public List<ModelHistoryPageList> pageList { get; set; }
     }
+
     /// <summary>
     /// 历史数据列表
     /// </summary>
-    public class Model_HistoryPageList
+    public class ModelHistoryPageList
     {
         /// <summary>
         /// 页码 ID
         /// </summary>
         public string pageIndex { get; set; }
+
         /// <summary>
         /// 历史数据 pdf 文档详情数组
         /// </summary>
-        public List<Model_HistoryListItem> list { get; set; }
+        public List<ModelHistoryListItem> list { get; set; }
     }
+
     /// <summary>
     /// 历史信息
     /// </summary>
-    public class Model_HistoryListItem
+    public class ModelHistoryListItem
     {
         /// <summary>
         /// 铺码 ID
@@ -178,7 +188,8 @@ namespace XHWK.Model
         public string url { get; set; }
     }
     #endregion
-    public enum Enum_StatetType
+
+    public enum EnumStatetType
     {
         //1000 操作成功
         //1001 打开数据库失败
@@ -191,6 +202,5 @@ namespace XHWK.Model
         //1008 接口错误
         //1009 UserID 错误
         //1010 未查到该历史数据
-
     }
 }

XHWK.WKTool/Models/ModelTsubjectbookList.cs

@@ -0,0 +1,54 @@
+namespace XHWK.Model
+{
+    public class ModelTsubjectbookList
+    {
+        private string _tbid;
+        private string _lsbid;
+        private string _selected;
+        private string _subjectid;
+        private string _subjectname;
+        private string _lsbname;
+        private string _coverpath;
+        private string _versionname;
+
+        /// <summary>
+        /// 教师教材关系id
+        /// </summary>
+        public string Tbid { get => _tbid; set => _tbid = value; }
+
+        /// <summary>
+        /// 教材关联关系表id
+        /// </summary>
+        public string Lsbid { get => _lsbid; set => _lsbid = value; }
+
+        /// <summary>
+        /// 是否选中：0未选中1已选中
+        /// </summary>
+        public string Selected { get => _selected; set => _selected = value; }
+
+        /// <summary>
+        /// 科目id
+        /// </summary>
+        public string Subjectid { get => _subjectid; set => _subjectid = value; }
+
+        /// <summary>
+        /// 科目名称
+        /// </summary>
+        public string Subjectname { get => _subjectname; set => _subjectname = value; }
+
+        /// <summary>
+        /// 册别名称
+        /// </summary>
+        public string Lsbname { get => _lsbname; set => _lsbname = value; }
+
+        /// <summary>
+        /// 封面图地址
+        /// </summary>
+        public string Coverpath { get => _coverpath; set => _coverpath = value; }
+
+        /// <summary>
+        /// 版本名称
+        /// </summary>
+        public string Versionname { get => _versionname; set => _versionname = value; }
+    }
+}

XHWK.Model/ModelUserInfo.cs → XHWK.WKTool/Models/ModelUserInfo.cs

@@ -72,7 +72,8 @@ namespace XHWK.Model
         /// 学校阶段1小学2初中3高中4大学
         /// </summary>
         private int _schoollevel;
-        private List<Model_WKData> _wkdata;
+
+        private List<ModelWkData> _wkdata;
         private string _cloudcode;
 
         public int Userid { get => _userid; set => _userid = value; }
@@ -95,10 +96,12 @@ namespace XHWK.Model
         public string Schoolname { get => _schoolname; set => _schoolname = value; }
         public int Schoolstate { get => _schoolstate; set => _schoolstate = value; }
         public int Schoollevel { get => _schoollevel; set => _schoollevel = value; }
+
         /// <summary>
         /// 微课列表信息
         /// </summary>
-        public List<Model_WKData> Wkdata { get => _wkdata; set => _wkdata = value; }
+        public List<ModelWkData> Wkdata { get => _wkdata; set => _wkdata = value; }
+
         public string cloudcode { get => _cloudcode; set => _cloudcode = value; }
     }
 }

XHWK.Model/Model_Video.cs → XHWK.WKTool/Models/ModelVideo.cs

@@ -3,22 +3,23 @@
     /// <summary>
     /// 视频模型
     /// </summary>
-    public class Model_Video
+    public class ModelVideo
     {
         private string _videoPath;
         private string _thumbnailPath;
-        private Enum_VideoType _videoType;
-        private Enum_WKVidetype _wkType;
-        private string _RSTime;
+        private EnumVideoType _videoType;
+        private EnumWkVidetype _wkType;
+        private string _rsTime;
         private string _videoSize;
         private long _videoSizebyte;
-        private bool _IsUpload = false;
-        private string _FileGuid;//= System.Guid.NewGuid().ToString()
-        private string _FileMD5;
-        private string _Savefolder;
-        private int _Block;
-        private int _Uploaded;
-        private long _SliceLen;
+        private bool _isUpload;
+        private string _fileGuid; //= System.Guid.NewGuid().ToString()
+        private string _fileMd5;
+        private string _savefolder;
+        private int _block;
+        private int _uploaded;
+        private long _sliceLen;
+
         /// <summary>
         /// 视频路径
         /// </summary>
@@ -27,18 +28,22 @@
         /// 缩略图路径
         /// </summary>
         public string ThumbnailPath { get => _thumbnailPath; set => _thumbnailPath = value; }
+
         /// <summary>
         /// 视频类型
         /// </summary>
-        public Enum_VideoType VideoType { get => _videoType; set => _videoType = value; }
+        public EnumVideoType VideoType { get => _videoType; set => _videoType = value; }
+
         /// <summary>
         /// 微课类型
         /// </summary>
-        public Enum_WKVidetype WkType { get => _wkType; set => _wkType = value; }
+        public EnumWkVidetype WkType { get => _wkType; set => _wkType = value; }
+
         /// <summary>
         /// 录制时间
         /// </summary>
-        public string RSTime { get => _RSTime; set => _RSTime = value; }
+        public string RSTime { get => _rsTime; set => _rsTime = value; }
+
         /// <summary>
         /// 视频大小MB
         /// </summary>
@@ -47,55 +52,63 @@
         /// 视频大小字节
         /// </summary>
         public long VideoSizebyte { get => _videoSizebyte; set => _videoSizebyte = value; }
+
         /// <summary>
         /// 是否已上传
         /// </summary>
-        public bool IsUpload { get => _IsUpload; set => _IsUpload = value; }
+        public bool IsUpload { get => _isUpload; set => _isUpload = value; }
+
         /// <summary>
         /// 文件唯一标示
         /// </summary>
-        public string FileGuid { get => _FileGuid; set => _FileGuid = value; }
+        public string FileGuid { get => _fileGuid; set => _fileGuid = value; }
+
         /// <summary>
         /// 文件MD5
         /// </summary>
-        public string FileMD5 { get => _FileMD5; set => _FileMD5 = value; }
+        public string FileMD5 { get => _fileMd5; set => _fileMd5 = value; }
+
         /// <summary>
         /// 文件保存地址 学校id/resource
         /// </summary>
-        public string Savefolder { get => _Savefolder; set => _Savefolder = value; }
+        public string Savefolder { get => _savefolder; set => _savefolder = value; }
+
         /// <summary>
         /// 分块 每块最大5M
         /// </summary>
-        public int Block { get => _Block; set => _Block = value; }
+        public int Block { get => _block; set => _block = value; }
+
         /// <summary>
         /// 当前已上传到第几块
         /// </summary>
-        public int Uploaded { get => _Uploaded; set => _Uploaded = value; }
+        public int Uploaded { get => _uploaded; set => _uploaded = value; }
+
         /// <summary>
         /// 视频每片长度
         /// </summary>
-        public long SliceLen { get => _SliceLen; set => _SliceLen = value; }
+        public long SliceLen { get => _sliceLen; set => _sliceLen = value; }
     }
 
     /// <summary>
     /// 视频格式类型
     /// </summary>
-    public enum Enum_VideoType
+    public enum EnumVideoType
     {
-        MP4 = 1,
-        FLV = 2,
-        AVI = 3
+        Mp4 = 1,
+        Flv = 2,
+        Avi = 3
     }
 
     /// <summary>
     /// 录制视频类型
     /// </summary>
-    public enum Enum_WKVidetype
+    public enum EnumWkVidetype
     {
         /// <summary>
         /// 录屏
         /// </summary>
         RecordingScreen = 1,
+
         /// <summary>
         /// 录课
         /// </summary>

XHWK.Model/Model_WKData.cs → XHWK.WKTool/Models/ModelWKData.cs

@@ -2,10 +2,10 @@
 
 namespace XHWK.Model
 {
-    public class Model_WKData
+    public class ModelWkData
     {
         private string _wkName;
-        private List<Model_Video> _videoList;
+        private List<ModelVideo> _videoList;
         private string _wkPath;
         private string _wkCreateDateTime;
         private string _drawDataPath;
@@ -13,10 +13,12 @@ namespace XHWK.Model
         /// 微课名
         /// </summary>
         public string WkName { get => _wkName; set => _wkName = value; }
+
         /// <summary>
         /// 视频列表
         /// </summary>
-        public List<Model_Video> VideoList { get => _videoList; set => _videoList = value; }
+        public List<ModelVideo> VideoList { get => _videoList; set => _videoList = value; }
+
         /// <summary>
         /// 微课路径
         /// </summary>

XHWK.WKTool/ProductVerification.xaml.cs

@@ -51,7 +51,7 @@ namespace XHWK.WKTool
                 App.Signature = System.IO.File.ReadAllText(App.DataPath + "signature.txt", Encoding.Default);
                 string decrypt = DataProvider.TripleDESDecrypt(App.Signature, App.secretKey);
                 decrypt = decrypt.Replace("\u0001", "").Replace("\u0007", "").Trim();
-                Model_Signatures msgBean = JsonHelper.JsonToObj<Model_Signatures>(decrypt);
+                ModelSignatures msgBean = JsonHelper.JsonToObj<ModelSignatures>(decrypt);
                 long currentTimeTimestamp = DataProvider.TimestampTotalSeconds(); //当前时间 时间戳
                 if (msgBean.endtime > currentTimeTimestamp)//条件成立  解析成功 code 在有效期内
                 {
@@ -88,7 +88,7 @@ namespace XHWK.WKTool
             }
             catch (Exception ex) //解析失败 输code  
             {
-                LogHelper.WriteErrLog("ProductVerification(解析失败)" + ex.Message, ex);
+                LogHelper.Logerror.Error("ProductVerification(解析失败)" + ex.Message, ex);
                 Dispatcher.Invoke(new Action(() =>
                 {
                     Hide();

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -48,7 +48,7 @@ namespace XHWK.WKTool
         /// <summary>
         /// 视频信息
         /// </summary>
-        private Model_Video _videoInfo;
+        private ModelVideo _videoInfo;
 
         //声明一个 DrawingAttributes 类型的变量
 
@@ -187,7 +187,7 @@ namespace XHWK.WKTool
         /// </summary>
         private void SetSavePath()
         {
-            string fileType = ((Enum_VideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType"))).ToString();
+            string fileType = ((EnumVideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType"))).ToString();
             FileToolsCommon.CreateDirectory(App.WKData.WkPath);
             FileToolsCommon.DeleteDirectory(_temppath);
             FileToolsCommon.CreateDirectory(_temppath);
@@ -275,11 +275,7 @@ namespace XHWK.WKTool
                     );
                 }
                 _state = State.Loading;
-                _videoInfo = new Model_Video
-                {
-                    VideoType = (Enum_VideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType")),
-                    WkType = Enum_WKVidetype.RecordingScreen
-                };
+                _videoInfo = new ModelVideo { VideoType = (EnumVideoType)int.Parse(FileToolsCommon.GetConfigValue("VideoType")), WkType = EnumWkVidetype.RecordingScreen };
                 SetSavePath();
                 if (App.W_CountdownWindow == null)
                 {
@@ -503,7 +499,7 @@ namespace XHWK.WKTool
                         }
                         catch (Exception ex)
                         {
-                            LogHelper.WriteErrLog("录屏保存" + ex.Message, ex);
+                            LogHelper.Logerror.Error("录屏保存" + ex.Message, ex);
                         }
                         FileToolsCommon.DeleteDirectory(_temppath);
                     }
@@ -597,7 +593,7 @@ namespace XHWK.WKTool
                 }
                 catch (Exception ex)
                 {
-                    LogHelper.WriteErrLog("【批注（PracticeWindow）" + ex.Message, ex);
+                    LogHelper.Logerror.Error("【批注（PracticeWindow）" + ex.Message, ex);
                 }
             }
         }
@@ -710,7 +706,7 @@ namespace XHWK.WKTool
             }
             catch (Exception ex)
             {
-                LogHelper.WriteErrLog("【批注（PracticeWindow）" + ex.Message, ex);
+                LogHelper.Logerror.Error("【批注（PracticeWindow）" + ex.Message, ex);
             }
 
             //imgCanvas.Source = new BitmapImage(new Uri(imagePath));
@@ -864,7 +860,7 @@ namespace XHWK.WKTool
             }
             catch (Exception ex)
             {
-                LogHelper.WriteErrLog("【批注（PracticeWindow）" + ex.Message, ex);
+                LogHelper.Logerror.Error("【批注（PracticeWindow）" + ex.Message, ex);
             }
         }
 

XHWK.WKTool/UControl/Uc_VideoItem.xaml.cs

@@ -24,7 +24,7 @@ namespace XHWK.WKTool.UControl
         /// <summary>
         /// 视频模型
         /// </summary>
-        private Model_Video VideoModel = new Model_Video();
+        private ModelVideo VideoModel = new ModelVideo();
 
         /// <summary>
         /// 刷新视频列表
@@ -59,7 +59,7 @@ namespace XHWK.WKTool.UControl
         /// 视频信息
         /// </summary>
         /// <param name="model_Video"></param>
-        public Uc_VideoItem(Model_Video model_Video)
+        public Uc_VideoItem(ModelVideo model_Video)
         {
             InitializeComponent();
             App.IsUpLoad = false;
@@ -171,11 +171,11 @@ namespace XHWK.WKTool.UControl
         private bool ModifyPathName(string FileGuid, string NewName, out string Errmessage)
         {
             Errmessage = "";
-            foreach (Model_WKData WKData in App.WKDataList)
+            foreach (ModelWkData WKData in App.WKDataList)
             {
                 if (WKData.VideoList.Exists(x => x.FileGuid == FileGuid))
                 {
-                    Model_Video model_Video = WKData.VideoList.Find(x => x.FileGuid == FileGuid);
+                    ModelVideo model_Video = WKData.VideoList.Find(x => x.FileGuid == FileGuid);
                     string filePathName = model_Video.VideoPath;
                     string filePath = FileToolsCommon.GetDirectoryName(filePathName);
                     string newFilePathName = filePath + NewName;
@@ -225,7 +225,7 @@ namespace XHWK.WKTool.UControl
             MessageBoxResult dr = MessageWindow.Show("确定删除该视频？", "提示", MessageBoxButton.OKCancel);
             if (dr == MessageBoxResult.OK)
             {
-                foreach (Model_WKData wKData in App.WKDataList)
+                foreach (ModelWkData wKData in App.WKDataList)
                 {
                     if (wKData.VideoList == null)
                     {
@@ -273,7 +273,7 @@ namespace XHWK.WKTool.UControl
             }
             catch (Exception ex)
             {
-                LogHelper.WriteErrLog("【视频播放】(BtnVideoPlay_Click)" + ex.Message, ex);
+                LogHelper.Logerror.Error("【视频播放】(BtnVideoPlay_Click)" + ex.Message, ex);
                 System.Windows.MessageBox.Show(ex.Message);
                 return;
             }
@@ -297,7 +297,7 @@ namespace XHWK.WKTool.UControl
             }
             catch (Exception ex)
             {
-                LogHelper.WriteErrLog("【视频播放】(BtnVideoPlay_Click)" + ex.Message, ex);
+                LogHelper.Logerror.Error("【视频播放】(BtnVideoPlay_Click)" + ex.Message, ex);
                 System.Windows.MessageBox.Show(ex.Message);
                 return;
             }

XHWK.WKTool/UploadWindow.xaml.cs

@@ -159,7 +159,7 @@ namespace XHWK.WKTool
                     );
                     for (int i = 0; i < App.DirectorList.Count; i++)
                     {
-                        Model_DirectorList item = App.DirectorList[i];
+                        ModelDirectorList item = App.DirectorList[i];
                         pageData.zhangjieList.Add
                         (
                             new ComboBoxBean()
@@ -185,21 +185,13 @@ namespace XHWK.WKTool
         /// </summary>
         /// <param name="directorList">
         /// </param>
-        private void AddChild(Model_DirectorList directorList)
+        private void AddChild(ModelDirectorList directorList)
         {
             if (directorList.children != null && directorList.children.Count > 0)
             {
-                foreach (Model_DirectorList child in directorList.children)
+                foreach (ModelDirectorList child in directorList.children)
                 {
-                    pageData.zhangjieList.Add
-                    (
-                        new ComboBoxBean()
-                        {
-                            Key = child.directorid,
-                            Value = GetSpace(child.directorlevel) + child.directorname,
-                            leaf = child.leaf
-                        }
-                    );
+                    pageData.zhangjieList.Add(new ComboBoxBean() { Key = child.directorid, Value = GetSpace(child.directorlevel) + child.directorname, leaf = child.leaf });
                     if (child.children != null && child.children.Count > 0)
                     {
                         AddChild(child);
@@ -327,12 +319,12 @@ namespace XHWK.WKTool
                     //schoolid: 12
                     //suffix: "mp4"
                     //uid: 80
-                    Model_ResourceAdd modelResourceAdd = new Model_ResourceAdd();
+                    ModelResourceAdd modelResourceAdd = new ModelResourceAdd();
                     Dispatcher.Invoke
                     (
                         () =>
                         {
-                            modelResourceAdd = new Model_ResourceAdd
+                            modelResourceAdd = new ModelResourceAdd
                             {
                                 converted = 0,
                                 createid = App.UserInfo.Userid,
@@ -375,13 +367,13 @@ namespace XHWK.WKTool
                         (
                             () =>
                             {
-                                foreach (Model_WKData vdata in App.WKDataList)
+                                foreach (ModelWkData vdata in App.WKDataList)
                                 {
                                     if (vdata.VideoList == null)
                                     {
                                         continue;
                                     }
-                                    foreach (Model_Video videoinfo in vdata.VideoList)
+                                    foreach (ModelVideo videoinfo in vdata.VideoList)
                                     {
                                         if (videoinfo.FileGuid == _guid)
                                         {
@@ -451,7 +443,7 @@ namespace XHWK.WKTool
                     MessageWindow.Show("无法上传视频，请检查与服务器链接状态！");
                     App.IsUpLoad = false;
                     Hide();
-                    LogHelper.WriteErrLog("【UploadWindow】(BtnStart_Click)" + ex.Message, ex);
+                    LogHelper.Logerror.Error("【UploadWindow】(BtnStart_Click)" + ex.Message, ex);
                 });
             }
         }

XHWK.WKTool/Utils/ZAsposeUtil.cs

@@ -67,7 +67,7 @@ namespace XHWK.WKTool.Utils
             catch (Exception ex)
             {
                 MessageWindow.Show("该文件无法使用！");
-                LogHelper.WriteErrLog("【导入方法（ConvertWordToImage）】错误日志：" + ex.Message, ex);
+                LogHelper.Logerror.Error("【导入方法（ConvertWordToImage）】错误日志：" + ex.Message, ex);
             }
             return images;
         }

XHWK.WKTool/Utils/ZPrintUtils.cs

@@ -33,7 +33,7 @@ namespace XHWK.WKTool.Utils
             }
             catch (System.Exception ex)
             {
-                LogHelper.WriteErrLog("添加默认打印机" + ex.Message, ex);
+                LogHelper.Logerror.Error("添加默认打印机" + ex.Message, ex);
             }
 
             try
@@ -48,7 +48,7 @@ namespace XHWK.WKTool.Utils
             }
             catch (System.Exception ex)
             {
-                LogHelper.WriteErrLog("添加其它打印机" + ex.Message, ex);
+                LogHelper.Logerror.Error("添加其它打印机" + ex.Message, ex);
             }
             return fPrinters;
         }

XHWK.WKTool/Utils/pen/luobo/LuoBoPenUtil.cs

@@ -84,11 +84,11 @@ namespace XHWK.WKTool.Utils.luobo
             {
                 if (modeType == 1)
                 {
-                    LogHelper.WriteInfoLog("当前为笔模式");
+                    LogHelper.Loginfo.Info("当前为笔模式");
                 }
                 else
                 {
-                    LogHelper.WriteInfoLog("当前为鼠标模式");
+                    LogHelper.Loginfo.Info("当前为鼠标模式");
                 }
             }
         }
@@ -186,7 +186,7 @@ namespace XHWK.WKTool.Utils.luobo
             {
                 if (App.IsOutputInfoLog)
                 {
-                    LogHelper.WriteInfoLog("当前为笔模式");
+                    LogHelper.Loginfo.Info("当前为笔模式");
                 }
                 if (!IsPen)
                 {
@@ -197,7 +197,7 @@ namespace XHWK.WKTool.Utils.luobo
             {
                 if (App.IsOutputInfoLog)
                 {
-                    LogHelper.WriteInfoLog("当前为鼠标模式");
+                    LogHelper.Loginfo.Info("当前为鼠标模式");
                 }
                 if (IsPen)
                 {
@@ -225,7 +225,7 @@ namespace XHWK.WKTool.Utils.luobo
             }
             catch (Exception ex)
             {
-                LogHelper.WriteErrLog("设备初始化失败：" + ex.Message, ex);
+                LogHelper.Logerror.Error("设备初始化失败：" + ex.Message, ex);
             }
         }
 
@@ -244,7 +244,7 @@ namespace XHWK.WKTool.Utils.luobo
             {
                 if (App.IsOutputInfoLog)
                 {
-                    LogHelper.WriteInfoLog
+                    LogHelper.Loginfo.Info
                     (
                         string.Format
                         (
@@ -297,7 +297,7 @@ namespace XHWK.WKTool.Utils.luobo
             int nDeviceCount = robotpenController.GetInstance()._GetDeviceCount();
             if (App.IsOutputInfoLog)
             {
-                LogHelper.WriteInfoLog(string.Format("当前有 {0} 个设备", nDeviceCount));
+                LogHelper.Loginfo.Info(string.Format("当前有 {0} 个设备", nDeviceCount));
             }
             if (nDeviceCount > 0)
             {
@@ -317,8 +317,8 @@ namespace XHWK.WKTool.Utils.luobo
                             int nRes = robotpenController.GetInstance()._ConnectOpen();
                             if (nRes != 0)
                             {
-                                //LogHelper.WriteInfoLog(string.Format(@"x={0},y={1},s={2},p={3}", bx, by, bPenStatus, bPress));
-                                LogHelper.WriteErrLog("设备自动连接失败，请重新插拔设备或尝试手动连接!", null);
+                                //LogHelper.Loginfo.Info(string.Format(@"x={0},y={1},s={2},p={3}", bx, by, bPenStatus, bPress));
+                                LogHelper.Logerror.Error("设备自动连接失败，请重新插拔设备或尝试手动连接!", null);
                                 usbIsConnected = false;
                                 break;
                             }
@@ -344,7 +344,7 @@ namespace XHWK.WKTool.Utils.luobo
                                 }
                                 if (App.IsOutputInfoLog)
                                 {
-                                    LogHelper.WriteInfoLog
+                                    LogHelper.Loginfo.Info
                                     (
                                         string.Format
                                         (
@@ -357,12 +357,12 @@ namespace XHWK.WKTool.Utils.luobo
                             }
                             catch (Exception ex)
                             {
-                                LogHelper.WriteErrLog("手写板大小获取失败：" + ex.Message, ex);
+                                LogHelper.Logerror.Error("手写板大小获取失败：" + ex.Message, ex);
                             }
                             UpdateDevStatus();
                             if (App.IsOutputInfoLog)
                             {
-                                LogHelper.WriteInfoLog(string.Format("设备类型：{0}", deviceType.ToString()));
+                                LogHelper.Loginfo.Info(string.Format("设备类型：{0}", deviceType.ToString()));
                             }
 
                             new Thread(new ThreadStart(new Action(() =>

XHWK.WKTool/XHWK.WKTool.csproj

@@ -149,6 +149,9 @@
     <Reference Include="NReco.VideoConverter, Version=1.1.4.0, Culture=neutral, PublicKeyToken=395ccb334978a0cd, processorArchitecture=MSIL">
       <HintPath>..\packages\NReco.VideoConverter.1.1.4\lib\net40\NReco.VideoConverter.dll</HintPath>
     </Reference>
+    <Reference Include="NStandard, Version=0.4.15.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\NStandard.0.4.15\lib\net451\NStandard.dll</HintPath>
+    </Reference>
     <Reference Include="O2S.Components.PDFRender4NET">
       <HintPath>..\DLL\O2S.Components.PDFRender4NET.dll</HintPath>
     </Reference>
@@ -266,15 +269,34 @@
       <DependentUpon>MinToolbar.xaml</DependentUpon>
     </Compile>
     <Compile Include="Models\AppModel.cs" />
+    <Compile Include="Models\ComboBoxBean.cs" />
     <Compile Include="Models\Direction.cs" />
     <Compile Include="Models\EntityBase.cs" />
     <Compile Include="Models\FileDirectoryData.cs" />
     <Compile Include="Models\FileDirectoryModel.cs" />
     <Compile Include="Models\Limit.cs" />
+    <Compile Include="Models\ModelUserInfo.cs" />
+    <Compile Include="Models\ModelApp.cs" />
+    <Compile Include="Models\ModelCanvas.cs" />
+    <Compile Include="Models\ModelDirectorList.cs" />
+    <Compile Include="Models\ModelDrawData.cs" />
+    <Compile Include="Models\ModelPage.cs" />
+    <Compile Include="Models\ModelResourceAdd.cs" />
+    <Compile Include="Models\ModelResourceAddTwo.cs" />
+    <Compile Include="Models\ModelScreenshot.cs" />
+    <Compile Include="Models\ModelServiceAddress.cs" />
+    <Compile Include="Models\ModelSignatures.cs" />
+    <Compile Include="Models\ModelTmatrixCode.cs" />
+    <Compile Include="Models\ModelTsubjectbookList.cs" />
+    <Compile Include="Models\ModelVideo.cs" />
+    <Compile Include="Models\ModelWKData.cs" />
+    <Compile Include="Models\NotifyModel.cs" />
     <Compile Include="Models\PrintModel.cs" />
+    <Compile Include="Models\ResultVo.cs" />
     <Compile Include="Models\Tool.cs" />
     <Compile Include="license\MyLicense.cs" />
     <Compile Include="Models\DownloadInfoModel.cs" />
+    <Compile Include="Models\ViewModel.cs" />
     <Compile Include="PracticeWindow.xaml.cs">
       <DependentUpon>PracticeWindow.xaml</DependentUpon>
     </Compile>
@@ -502,12 +524,6 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\XHWK.Model\XHWK.Model.csproj">
-      <Project>{445a4527-849b-4fa9-aa97-8ed1098d211e}</Project>
-      <Name>XHWK.Model</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <Resource Include="Images\microLessonSystem_0.png" />
     <Resource Include="Images\microLessonSystem_1.png" />

XHWK.WKTool/packages.config

@@ -21,6 +21,7 @@
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />
   <package id="NReco" version="2.0.3.0" targetFramework="net452" />
   <package id="NReco.VideoConverter" version="1.1.4" targetFramework="net452" />
+  <package id="NStandard" version="0.4.15" targetFramework="net452" />
   <package id="System.Management" version="4.7.0" targetFramework="net452" />
   <package id="VisioForge.DotNet.Core.TRIAL" version="12.0.56" targetFramework="net452" />
   <package id="WpfAnimatedGif" version="2.0.0" targetFramework="net452" />

XHWK.WKTool/system/AutoStartHelper.cs

@@ -37,7 +37,7 @@ namespace Common.system
             catch (Exception ex)
             {
                 Message = "设置失败，操作被拒绝：" + ex.Message;
-                LogHelper.WriteErrLog(Message, ex);
+                LogHelper.Logerror.Error(Message, ex);
                 return false;
             }
 
@@ -74,7 +74,7 @@ namespace Common.system
             catch (Exception ex)
             {
                 Message = "设置失败，操作被拒绝：" + ex.Message;
-                LogHelper.WriteErrLog(Message, ex);
+                LogHelper.Logerror.Error(Message, ex);
                 return false;
             }
             //if (MessageBox.Show("设置完毕") == DialogResult.OK)
@@ -103,7 +103,7 @@ namespace Common.system
             catch (Exception ex)
             {
                 Message = "设置失败，操作被拒绝：" + ex.Message;
-                LogHelper.WriteErrLog(Message, ex);
+                LogHelper.Logerror.Error(Message, ex);
                 return false;
             }
 

XHWK.WKTool/system/BlackboardNew.cs

@@ -164,7 +164,7 @@ namespace Common.system
                             strokes_page_all.Add(pagetemp);
                         }
                     }
-                    LogHelper.WriteErrLog("【画板】（Canvas_MouseUp）添加失败，strokes_page_all为0，" + ex.Message, ex);
+                    LogHelper.Logerror.Error("【画板】（Canvas_MouseUp）添加失败，strokes_page_all为0，" + ex.Message, ex);
                 }
             }
         }
@@ -387,7 +387,7 @@ namespace Common.system
                                 strokes_page_all.Add(pagetemp);
                             }
                         }
-                        LogHelper.WriteErrLog("【画板】（changepages）添加失败，strokes_page_all为0，" + ex.Message, ex);
+                        LogHelper.Logerror.Error("【画板】（changepages）添加失败，strokes_page_all为0，" + ex.Message, ex);
                     }
                 }
                 stylusPoints = new StylusPointCollection();
@@ -504,7 +504,7 @@ namespace Common.system
         //    }
         //    catch (Exception ex)
         //    {
-        //        LogHelper.WriteErrLog("【XHMicroLessonSystemWindow】（changepages）点阵比书写报错：" + ex.Message, ex);
+        //        LogHelper.Logerror.Error("【XHMicroLessonSystemWindow】（changepages）点阵比书写报错：" + ex.Message, ex);
         //    }
         //}
     }

XHWK.WKTool/system/DownloadManager.cs

@@ -157,7 +157,7 @@ namespace Common.system
                     catch (Exception ex)
                     {
                         string ErrMessage = "【下载】(DownloadManager):" + ex.Message;
-                        LogHelper.WriteErrLog(ErrMessage, ex);
+                        LogHelper.Logerror.Error(ErrMessage, ex);
                         OnDisconnectHandler();
                         return;
                     }
@@ -247,7 +247,7 @@ namespace Common.system
                     catch (Exception ex)
                     {
                         string ErrMessage = "【下载】(DownloadManager):" + ex.Message;
-                        LogHelper.WriteErrLog(ErrMessage, ex);
+                        LogHelper.Logerror.Error(ErrMessage, ex);
                     }
                 }
             }

XHWK.WKTool/system/DownloadService.cs

@@ -125,7 +125,7 @@ namespace Common.system
                     catch (Exception ex)
                     {
                         string ErrMessage = "【下载】(DownloadService):" + ex.Message;
-                        LogHelper.WriteErrLog(ErrMessage, ex);
+                        LogHelper.Logerror.Error(ErrMessage, ex);
                         OnDisconnectHandler();
                         return;
                     }

XHWK.WKTool/system/FFMpeg.cs

@@ -165,7 +165,7 @@
             }
             if (OutputVideoLog)
             {
-                LogHelper.WriteInfoLog("【录屏】：" + myProcess.StartInfo.Arguments);
+                LogHelper.Loginfo.Info("【录屏】：" + myProcess.StartInfo.Arguments);
             }
             FileToolsCommon.AppendText(_logPath, "【录屏】：" + myProcess.StartInfo.Arguments + "\r\n");
             myProcess.StartInfo.UseShellExecute = false; //不使用操作系统外壳程序启动
@@ -188,7 +188,7 @@
                 {
                     errMessage = ex.Message + " 请关闭杀毒软件或信任此软件后重试！";
                 }
-                LogHelper.WriteErrLog("【录音】（StartRecordingAudio）" + errMessage, ex);
+                LogHelper.Logerror.Error("【录音】（StartRecordingAudio）" + errMessage, ex);
                 myProcess.Dispose();
                 myProcess = null;
                 return false;
@@ -536,7 +536,7 @@
             }
             catch (Exception ex)
             {
-                LogHelper.WriteErrLog("【麦克风】麦克风不可用:" + ex.Message, ex);
+                LogHelper.Logerror.Error("【麦克风】麦克风不可用:" + ex.Message, ex);
                 return false;
             }
         }
@@ -611,7 +611,7 @@
             }
             catch (Exception ex)
             {
-                LogHelper.WriteErrLog("【麦克风】麦克风不可用:" + ex.Message, ex);
+                LogHelper.Logerror.Error("【麦克风】麦克风不可用:" + ex.Message, ex);
                 return false;
             }
         }
@@ -655,7 +655,7 @@
             }
             catch (Exception ex)
             {
-                LogHelper.WriteErrLog("【麦克风】麦克风不可用:" + ex.Message, ex);
+                LogHelper.Logerror.Error("【麦克风】麦克风不可用:" + ex.Message, ex);
             }
         }
 
@@ -704,7 +704,7 @@
             }
             catch (Exception ex)
             {
-                LogHelper.WriteErrLog("【扬声器】扬声器不可用:" + ex.Message, ex);
+                LogHelper.Logerror.Error("【扬声器】扬声器不可用:" + ex.Message, ex);
                 return false;
             }
         }

XHWK.WKTool/system/FileToolsCommon.cs

@@ -606,6 +606,7 @@
                 byte[] buffer = new byte[stream.Length];
 
                 //读取流  
+                // ReSharper disable once MustUseReturnValue
                 stream.Read
                 (
                     buffer,
@@ -649,6 +650,7 @@
             try
             {
                 //将文件流读入缓冲区  
+                // ReSharper disable once MustUseReturnValue
                 fs.Read
                 (
                     buffer,
@@ -678,7 +680,7 @@
         {
             FileStream stream = new FileStream(filePath, FileMode.Open);
             byte[] buffer = new byte[length];
-            //stream.Position = startIndex;
+            // ReSharper disable once MustUseReturnValue
             stream.Read
             (
                 buffer,
@@ -711,6 +713,7 @@
             }
             byte[] buffer = new byte[length];
             stream.Position = startIndex;
+            // ReSharper disable once MustUseReturnValue
             stream.Read
             (
                 buffer,

XHWK.WKTool/system/ImageHelper.cs

@@ -132,7 +132,7 @@ namespace Common.system
             }
             catch (Exception ex)
             {
-                LogHelper.WriteErrLog("ImageHelper(GetRGB)" + ex.Message, ex);
+                LogHelper.Logerror.Error("ImageHelper(GetRGB)" + ex.Message, ex);
             }
 
             return sb.ToString();
@@ -187,7 +187,7 @@ namespace Common.system
             }
             catch (Exception ex)
             {
-                LogHelper.WriteErrLog("【截图】(GetBitmapSource)截图失败，" + ex.Message, ex);
+                LogHelper.Logerror.Error("【截图】(GetBitmapSource)截图失败，" + ex.Message, ex);
                 return false;
             }
         }
@@ -242,7 +242,7 @@ namespace Common.system
             }
             catch (Exception ex)
             {
-                LogHelper.WriteErrLog("【截图】(GetBitmapSource)截图失败，" + ex.Message, ex);
+                LogHelper.Logerror.Error("【截图】(GetBitmapSource)截图失败，" + ex.Message, ex);
                 return false;
             }
         }

XHWK.WKTool/system/LogHelper.cs

@@ -9,31 +9,14 @@ namespace Common.system
 
     public class LogHelper
     {
-        public static readonly log4net.ILog loginfo = log4net.LogManager.GetLogger("loginfo");
-        public static readonly log4net.ILog logerror = log4net.LogManager.GetLogger("logerror");
+        public static readonly log4net.ILog Loginfo = log4net.LogManager.GetLogger("loginfo");
+        public static readonly log4net.ILog Logerror = log4net.LogManager.GetLogger("logerror");
 
         public static void InitLog4Net()
         {
             var logCfg = new FileInfo(AppDomain.CurrentDomain.BaseDirectory + "log4net.config");
             XmlConfigurator.ConfigureAndWatch(logCfg);
-            loginfo.Info("日志初始化");
-        }
-
-        public static void WriteInfoLog(string info)
-        {
-            if (loginfo.IsInfoEnabled)
-            {
-                loginfo.Info(info);
-                Console.WriteLine(info);
-            }
-        }
-
-        public static void WriteErrLog(string info, Exception ex)
-        {
-            if (logerror.IsErrorEnabled)
-            {
-                logerror.Error("[V " + FileToolsCommon.GetConfigValue("VersionName") + "]" + info, ex);
-            }
+            Loginfo.Info("日志初始化");
         }
     }
 }

XHWK.WKTool/system/PdfTrunImage.cs

@@ -78,7 +78,7 @@ namespace Common.system
             }
             catch (System.Exception ex)
             {
-                LogHelper.WriteErrLog("PDF转图片" +
+                LogHelper.Logerror.Error("PDF转图片" +
                     "【PdfTrunImage】" + ex.Message, ex);
                 images = new List<string>();
                 return images;

XHWK.WKTool/system/ZHttpUtil.cs

@@ -126,7 +126,7 @@
         /// 调用Post接口
         ///  </summary>
         ///  <returns></returns>
-        public static string PostStr(string url, string postData)
+        public static string PostStr(string url, string postData, bool jm = true)
         {
             Stream responseStream = null;
             try
@@ -137,11 +137,14 @@
                 webRequest.Accept = "text/html,application/xhtml+xml,*/*";
                 webRequest.ContentType = "application/json";
                 string aesPostData = postData;
-                if (isSt)
+                if (jm)
                 {
-                    aesPostData = AesHelper.AesEncrypt(postData, "XINGHUOLIAOYUAN7");
+                    if (isSt)
+                    {
+                        aesPostData = AesHelper.AesEncrypt(postData, "XINGHUOLIAOYUAN7");
+                    }
+                    AddHeader(webRequest);
                 }
-                AddHeader(webRequest);
                 byte[] buffer = encoding.GetBytes(aesPostData);
                 webRequest.ContentLength = buffer.Length;
                 webRequest.GetRequestStream()
@@ -178,6 +181,7 @@
         /// </summary>
         /// <param name="url">请求地址</param>
         /// <param name="postData">传输数据</param>
+        /// <param name="jm">加密</param>
         /// <param name="timeout">超时时间</param>
         /// <param name="contentType">媒体格式</param>
         /// <param name="encode">编码</param>
@@ -185,8 +189,9 @@
         public static T PostSignle<T>
         (
             string url,
-            int timeout = 5000,
             string postData = "",
+            bool jm = true,
+            int timeout = 5000,
             string contentType = "application/json;",
             string encode = "UTF-8"
         ) where T : class
@@ -195,7 +200,7 @@
             {
                 try
                 {
-                    string respstr = PostStr(url, postData);
+                    string respstr = PostStr(url, postData, jm);
                     return JsonHelper.JsonToObj<T>(respstr);
                 }
                 catch (Exception)
@@ -267,7 +272,7 @@
             }
             catch (Exception ex)
             {
-                LogHelper.WriteErrLog("请求失败（若网络无问题，请重置winsock，解决方法：以管理员方式打开cmd执行 netsh winsock reset 后重启）", ex);
+                LogHelper.Logerror.Error("请求失败（若网络无问题，请重置winsock，解决方法：以管理员方式打开cmd执行 netsh winsock reset 后重启）", ex);
                 return null;
             }
         }
@@ -443,7 +448,7 @@
             }
             catch (Exception ex)
             {
-                LogHelper.WriteErrLog("【文件上传】" + ex.Message, ex);
+                LogHelper.Logerror.Error("【文件上传】" + ex.Message, ex);
                 return null;
             }
         }

XHWK.sln

@@ -1,10 +1,8 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30406.217
+# Visual Studio Version 17
+VisualStudioVersion = 17.6.33829.357
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XHWK.Model", "XHWK.Model\XHWK.Model.csproj", "{445A4527-849B-4FA9-AA97-8ED1098D211E}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XHWK.WKTool", "XHWK.WKTool\XHWK.WKTool.csproj", "{57591E23-644E-416D-B1CA-BB04C550130F}"
 EndProject
 Global
@@ -13,10 +11,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{445A4527-849B-4FA9-AA97-8ED1098D211E}.Debug|x86.ActiveCfg = Debug|x86
-		{445A4527-849B-4FA9-AA97-8ED1098D211E}.Debug|x86.Build.0 = Debug|x86
-		{445A4527-849B-4FA9-AA97-8ED1098D211E}.Release|x86.ActiveCfg = Release|x86
-		{445A4527-849B-4FA9-AA97-8ED1098D211E}.Release|x86.Build.0 = Release|x86
 		{57591E23-644E-416D-B1CA-BB04C550130F}.Debug|x86.ActiveCfg = Debug|x86
 		{57591E23-644E-416D-B1CA-BB04C550130F}.Debug|x86.Build.0 = Debug|x86
 		{57591E23-644E-416D-B1CA-BB04C550130F}.Release|x86.ActiveCfg = Release|x86

星火微课/星火微课-测试.iss

@@ -3,7 +3,7 @@
 
 #define MyAppName "星火微课测试版"  
 #define MyAppDir "xhwk_test"
-#define MyAppVersion "3.13.0"
+#define MyAppVersion "3.13.1"
 #define MyAppPublisher "河南星火燎原软件科技有限公司"
 #define MyAppURL "http://www.xhkjedu.com/"
 #define MySourcePath "D:\Project\CSharp\xh-wkclient\XHWK.WKTool\bin\x86\Debug\"