zhao：增加是否录制麦克风和录音配置，检测重可以设置是否录制麦克风；取消设置重API设置，改为设置服务地址；添加打包脚本

Common/system/FFMpeg.cs

@@ -49,10 +49,12 @@ namespace Common.system
         /// </summary>
         /// <param name="FilePath">文件存储路径</param>
         /// <param name="size">大小</param>
+        /// <param name="RecordingSound">录制音频</param>
+        /// <param name="RecordingMicrophone">录制麦克风</param>
         /// <param name="ErrMessage">错误信息</param>
         /// <param name="MicrophoneName">麦克风名</param>
         /// <returns></returns>
-        public bool StartRecordingVideo(string FilePath, Size size, out string ErrMessage, string MicrophoneName = null)
+        public bool StartRecordingVideo(string FilePath, Size size, bool RecordingSound, bool RecordingMicrophone, out string ErrMessage, string MicrophoneName = null)
         {
             while (myProcess != null)
             {
@@ -90,36 +92,44 @@ namespace Common.system
             {
 
             }
-            if (StartRecordSpeakerAudio(audioSpeakerPath))
+            //是否录制音频
+            if (RecordingSound)
             {
-                IsRecordSpeaker = true;
-            }
-            else
-            {
-                //无法录制扬声器音频
-                IsRecordSpeaker = false;
-            }
-            StopRecordAudio(2);
-            Thread.Sleep(100);
-            if (StartRecordAudio(audioMicrophonePath))
-            {
-                IsRecordMicrophone = true;
+                if (StartRecordSpeakerAudio(audioSpeakerPath))
+                {
+                    IsRecordSpeaker = true;
+                }
+                else
+                {
+                    //无法录制扬声器音频
+                    IsRecordSpeaker = false;
+                }
+                StopRecordAudio(2);
+                Thread.Sleep(100);
             }
-            else
+            //是否录制麦克风
+            if (RecordingMicrophone)
             {
-                //无法录制麦克风
-                IsRecordMicrophone = false;
+                if (StartRecordAudio(audioMicrophonePath))
+                {
+                    IsRecordMicrophone = true;
+                }
+                else
+                {
+                    //无法录制麦克风
+                    IsRecordMicrophone = false;
+                }
+                StopRecordAudio(1);
             }
-            StopRecordAudio(1);
             #endregion
             myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
             string SpeakerStr = "";
             string MicrophoneStr = "";
-            if (IsRecordSpeaker)
+            if (IsRecordSpeaker && RecordingSound)
             {
                 SpeakerStr = "-f dshow -i audio=\"virtual-audio-capturer\" ";
             }
-            if (IsRecordMicrophone)
+            if (IsRecordMicrophone && RecordingMicrophone)
             {
                 if (!string.IsNullOrWhiteSpace(MicrophoneName))
                 {
@@ -196,8 +206,10 @@ namespace Common.system
         /// </summary>
         /// <param name="Mp3Path">MP3音频位置</param>
         /// <param name="ErrMessage">错误信息</param>
+        /// <param name="RecordingSound">录制音频</param>
+        /// <param name="RecordingMicrophone">录制麦克风</param>
         /// <param name="MicrophoneName">麦克风名</param>
-        public bool StartRecordingAudio(string Mp3Path, out string ErrMessage, string MicrophoneName = null)
+        public bool StartRecordingAudio(string Mp3Path, out string ErrMessage, bool RecordingSound, bool RecordingMicrophone, string MicrophoneName = null)
         {
             ErrMessage = null;
             while (myProcess != null)
@@ -231,46 +243,58 @@ namespace Common.system
             {
 
             }
-            if (StartRecordSpeakerAudio(audioSpeakerPath))
+            if (RecordingSound)
             {
-                IsRecordSpeaker = true;
-            }
-            else
-            {
-                //无法录制扬声器音频
-                IsRecordSpeaker = false;
-            }
-            StopRecordAudio(2);
-            Thread.Sleep(100);
-            if (StartRecordAudio(audioMicrophonePath))
-            {
-                IsRecordMicrophone = true;
-            }
-            else
-            {
-                //无法录制麦克风
-                IsRecordMicrophone = false;
+                if (StartRecordSpeakerAudio(audioSpeakerPath))
+                {
+                    IsRecordSpeaker = true;
+                }
+                else
+                {
+                    //无法录制扬声器音频
+                    IsRecordSpeaker = false;
+                }
+                StopRecordAudio(2);
+                Thread.Sleep(100);
+                if (!IsRecordSpeaker)
+                {
+                    ErrMessage = "无法录制声音，请关闭杀毒软件，确保扬声器处于可用状态!";
+                    return false;
+                }
             }
-            StopRecordAudio(1);
-            if (!IsRecordSpeaker && !IsRecordMicrophone)
+            if (RecordingMicrophone)
             {
-                ErrMessage = "无法录制声音，请关闭杀毒软件，确保声卡和麦克风处于可用状态!";
-                return false;
+                if (StartRecordAudio(audioMicrophonePath))
+                {
+                    IsRecordMicrophone = true;
+                }
+                else
+                {
+                    //无法录制麦克风
+                    IsRecordMicrophone = false;
+                }
+                StopRecordAudio(1);
+                if (IsRecordMicrophone)
+                {
+                    ErrMessage = "无法录制麦克风，请关闭杀毒软件，确保麦克风处于可用状态!";
+                    return false;
+
+                }
             }
             #endregion
             myProcess = new Process();
             LogPath = CreateffmpegLog();
             myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
-            if (IsRecordSpeaker && IsRecordMicrophone)
+            if (IsRecordSpeaker && IsRecordMicrophone && RecordingSound && RecordingMicrophone)
             {
                 myProcess.StartInfo.Arguments = "-f dshow -i audio=\"virtual-audio-capturer\" -f dshow -i audio=\"" +
                         MicrophoneName + "\" -filter_complex amix=inputs=2:duration=first:dropout_transition=2 " + PathName;
             }
-            else if (IsRecordSpeaker)
+            else if (IsRecordSpeaker && RecordingSound)
             {
                 myProcess.StartInfo.Arguments = "-f dshow -i audio=\"virtual-audio-capturer\" " + PathName;
             }
-            else if (IsRecordMicrophone)
+            else if (IsRecordMicrophone && RecordingMicrophone)
             {
                 //录制麦克风
                 if (!string.IsNullOrWhiteSpace(MicrophoneName))
@@ -349,12 +373,19 @@ namespace Common.system
         /// <param name="FilePath">文件存储路径 必须与开始时的路径完全一致</param>
         public bool StopFFmpeg(string FilePath)
         {
-            //文件完整路径
-            if (myProcess != null)
+            try
             {
-                myProcess.StandardInput.WriteLine("q");//在这个进程的控制台中模拟输入q,用于暂停录制
-                myProcess.Close();//关闭进程
-                myProcess.Dispose();//释放资源
+                //文件完整路径
+                if (myProcess != null)
+                {
+                    myProcess.StandardInput.WriteLine("q");//在这个进程的控制台中模拟输入q,用于暂停录制
+                    myProcess.Close();//关闭进程
+                    myProcess.Dispose();//释放资源
+                }
+            }
+            catch (Exception)
+            {
+                myProcess = null;
             }
             #region 进程是否已经释放
             bool IsRunning = true;
@@ -369,10 +400,18 @@ namespace Common.system
                 }
             }
             #endregion
-            myProcess = null;
-            Thread t1 = new Thread(MergeVideoOrAudio);
-            t1.Start(FilePath);
-            return true;
+            try
+            {
+                myProcess = null;
+                Thread t1 = new Thread(MergeVideoOrAudio);
+                t1.Start(FilePath);
+                return true;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteErrLog("【合成文件】：" + FilePath + "合成失败," + ex.Message, ex);
+                return false;
+            }
             //文件合成
         }
 

XHWK.Model/Model_ServiceAddress.cs

@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace XHWK.Model
+{
+    /// <summary>
+    /// 服务地址模型
+    /// </summary>
+    public class Model_ServiceAddress
+    {
+        public string id;
+        public string createname;
+        public string page;
+        public string pageSize;
+        public string caid;
+        public string cloudid;
+
+        public string createtime;
+        public string cloudname;
+        public string cloudcode;
+        public string cloudstate;
+
+        /// <summary>
+        /// 外网接口地址
+        /// </summary>
+        public string wapi;
+        /// <summary>
+        /// 外网文件上传地址
+        /// </summary>
+        public string wfile;
+        /// <summary>
+        /// 外网文件下载地址
+        /// </summary>
+        public string wdown;
+        /// <summary>
+        /// 外网直播回放地址
+        /// </summary>
+        public string wlive;
+
+        /// <summary>
+        /// 内网接口地址
+        /// </summary>
+        public string napi;
+        /// <summary>
+        ///内网文件上传地址
+        /// </summary>
+        public string nfile;
+        /// <summary>
+        ///内网文件下载地址
+        /// </summary>
+        public string ndown;
+        /// <summary>
+        ///内网直播回放地址
+        /// </summary>
+        public string nlive;
+    }
+}

XHWK.Model/XHWK.Model.csproj

@@ -59,6 +59,7 @@
     <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" />

XHWK.WKTool/App.config

@@ -9,8 +9,8 @@
 		<!--参数是否加密 0不加密 1加密-->
 		<add key="IsParameterEncryption" value="0" />
 		<!--版本号-->
-		<add key="VersionCode" value="74" />
-		<add key="VersionName" value="2.5.24" />
+		<add key="VersionCode" value="77" />
+		<add key="VersionName" value="2.5.27" />
 		<!--皮肤样式 0白 1蓝 2黑色 -->
 		<add key="SkinStyle" value="0" />
 		<!--是否输出视频记录日志：0否-->
@@ -21,14 +21,21 @@
 		<add key="VideoSavePath" value="D:\星火微课" />
 		<!--视频格式 1、MP4 2、FlV 3、AVI-->
 		<add key="VideoType" value="1" />
-		<!--声音 true 有 false 无-->
-		<add key="IsSound" value="true" />
+		<!--是否录制扬声器 1 有 0 否-->
+		<add key="IsRecordingSound" value="1" />
+		<!--是否录制麦克风 1 有 0 否-->
+		<add key="IsRecordingMicrophone" value="1" />
 		<!--图片压缩质量 0最差 100最佳-->
 		<add key="ImageCompressionLevel" value="70" />
 		<!--用户名-->
 		<add key="userName" value="" />
 		<!--记住密码-->
 		<add key="isRemind" value="" />
+		<!--是否为校外 1是 -->
+		<add key="IsOutsideSchool" value="1" />
+		<!--服务地址请求地址-->
+		<add key="ServiceAddressAPI" value="http://scapitest.xhkjedu.com" />
+		<!--<add key="ServiceAddressAPI" value="https://certapi.xhkjedu.com" />-->
 		<!--API请求地址-->
 		<add key="APIRequestAddress" value="http://schoolapi.xhkjedu.com" />
 		<!--文件平台请求地址-->

XHWK.WKTool/App.cs

@@ -24,6 +24,7 @@ namespace XHWK.WKTool
     public partial class APP : Application
     {
         #region 全局变量
+        #region 更新需改动
         /// <summary>
         /// 是否为测试版
         /// </summary>
@@ -32,18 +33,21 @@ namespace XHWK.WKTool
         /// 参数是否加密
         /// </summary>
         public static bool IsParameterEncryption = FileToolsCommon.GetConfigValue("IsParameterEncryption") != "0";
+        #endregion
+
+        #region 接口地址
         /// <summary>
-        /// 是否输出测试记录日志
+        /// 是否为校外接口
         /// </summary>
-        public static bool IsOutputInfoLog = FileToolsCommon.GetConfigValue("IsOutputInfoLog") != "0";
+        public static bool IsOutsideSchool = FileToolsCommon.GetConfigValue("IsOutsideSchool") == "1";
         /// <summary>
-        /// 是否隐藏录屏工具栏
+        /// 服务地址
         /// </summary>
-        public static bool IsHideSRTool = FileToolsCommon.GetConfigValue("IsHideSRTool") != "0";
+        public static Model_ServiceAddress ServiceAddress = null;
         /// <summary>
-        /// 皮肤样式 0白 1蓝 2黑色
+        /// 服务地址API
         /// </summary>
-        public static string SkinStyle = FileToolsCommon.GetConfigValue("SkinStyle");
+        public static string ServiceAddressAPI = isDebug ? "http://scapitest.xhkjedu.com" : FileToolsCommon.GetConfigValue("ServiceAddressAPI");
         /// <summary>
         /// 接口地址
         /// </summary>
@@ -64,74 +68,73 @@ namespace XHWK.WKTool
         /// TQL铺码服务地址
         /// </summary>
         public static string TmatrixCodeURL = FileToolsCommon.GetConfigValue("TmatrixCode");
+        #endregion
+
+        #region 配置项
         /// <summary>
-        /// 数据存放目录
-        /// </summary>
-        public static string dataPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\XHMicroLesson\\";
-        /// <summary>
-        /// 后台线程帮助类
+        /// 是否输出测试记录日志
         /// </summary>
-        public static BackgroundWorkerHelper BackgroundWorkerHelper => BackgroundWorkerHelper.GetInstance();
+        public static bool IsOutputInfoLog = FileToolsCommon.GetConfigValue("IsOutputInfoLog") != "0";
         /// <summary>
-        /// 签名
+        /// 是否隐藏录屏工具栏
         /// </summary>
-        public static string Signature = "";
-        public static string secretKey = "nanhuakaizhangjianwangni";
+        public static bool IsHideSRTool = FileToolsCommon.GetConfigValue("IsHideSRTool") != "0";
         /// <summary>
-        /// 用户信息
+        /// 皮肤样式 0白 1蓝 2黑色
         /// </summary>
-        public static Model_UserInfo UserInfo = null;
+        public static string SkinStyle = FileToolsCommon.GetConfigValue("SkinStyle");
         /// <summary>
-        /// 接口返回消息
+        /// 数据存放目录
         /// </summary>
-        public static string ServerMsg = string.Empty;
+        public static string DataPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\XHMicroLesson\\";
         /// <summary>
-        /// 用户微课列表模型
+        /// 摄像头位置
         /// </summary>
-        public static List<Model_WKData> WKDataList = null;
+        public static string CameraPosition = string.Empty;
         /// <summary>
-        /// 微课模型
+        /// 摄像头名
         /// </summary>
-        public static Model_WKData WKData = null;
+        public static string CameraName = "";
         /// <summary>
-        /// 微课视频列表
+        /// 麦克风名
         /// </summary>
-        public static List<Model_Video> VideoList = null;
+        public static string MicrophoneName = "";
+        #endregion
+
+        #region 记录数据
         /// <summary>
-        /// 画板模型
+        /// 全局页面数据变量
         /// </summary>
-        public static List<Model_DrawData> PageDrawList = null;
+        public static readonly Model_Page PageContextData = new Model.Model_Page();
         /// <summary>
         /// 录屏工具
         /// </summary>
         public static FFMpeg FFmpeg = new FFMpeg();
         /// <summary>
-        /// 登录状态 false 未登录 true已登录
+        /// 后台线程帮助类
         /// </summary>
-        public static bool IsLoginType = false;
-        public static readonly Model_Page pageData = new Model.Model_Page();
+        public static BackgroundWorkerHelper BackgroundWorkerHelper => BackgroundWorkerHelper.GetInstance();
         /// <summary>
-        /// 防止图片地址重复
+        /// 签名
         /// </summary>
-        public static long num = 9999;
+        public static string Signature = "";
+        public static string secretKey = "nanhuakaizhangjianwangni";
         /// <summary>
-        /// 导入图片路径
+        /// 用户信息
         /// </summary>
-        public static string[] Paths = new string[] { };
+        public static Model_UserInfo UserInfo = null;
         /// <summary>
-        /// 截图图片路径
+        /// 接口返回消息
         /// </summary>
-        public static string[] JPaths = new string[999];
-        public static string ImgPath = string.Empty;
+        public static string ServerMsg = string.Empty;
         /// <summary>
-        /// 页码IP
+        /// 登录状态 false 未登录 true已登录
         /// </summary>
-        public static string[] OutPut = new string[] { };
-        public static string CameraPosition = string.Empty;
+        public static bool IsLoginType = false;
         /// <summary>
-        /// 数据存放目录
+        /// 截图地址
         /// </summary>
-        public static string DataPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\XHMicroLesson\\";
+        public static string ImgPath = string.Empty;
         /// <summary>
         /// 教材列表
         /// </summary>
@@ -148,14 +151,28 @@ namespace XHWK.WKTool
         /// 是否正在上传
         /// </summary>
         public static bool IsUpLoad = false;
+        #endregion
+
+        #region 微课数据记录
         /// <summary>
-        /// 摄像头名
+        /// 用户微课列表模型
         /// </summary>
-        public static string CameraName = "";
+        public static List<Model_WKData> WKDataList = null;
         /// <summary>
-        /// 麦克风名
+        /// 微课模型
         /// </summary>
-        public static string MicrophoneName = "";
+        public static Model_WKData WKData = null;
+        /// <summary>
+        /// 微课视频列表
+        /// </summary>
+        public static List<Model_Video> VideoList = null;
+        /// <summary>
+        /// 画板模型
+        /// </summary>
+        public static List<Model_DrawData> PageDrawList = null;
+
+        #endregion
+
         #region 点阵笔
         /// <summary>
         /// 点阵笔
@@ -174,6 +191,7 @@ namespace XHWK.WKTool
         /// </summary>
         public static bool BoardStatus = false;
         #endregion
+
         #region 腾千里手写笔
         ///// <summary>
         ///// 铺码服务请求
@@ -202,6 +220,7 @@ namespace XHWK.WKTool
         #endregion
 
         #endregion
+
         #region 页面
         /// <summary>
         /// 主页面
@@ -329,7 +348,7 @@ namespace XHWK.WKTool
 
                 //如果本地文件为空，弹出弹窗 输密匙
                 //本地文件不为空， 解析
-                if (!File.Exists(APP.dataPath + "signature.txt"))//上次登录时间为空 或者签名为空 或者上次登录时间不是今天   都需要输入密匙验证 ，否则只验证本地的签名
+                if (!File.Exists(APP.DataPath + "signature.txt"))//上次登录时间为空 或者签名为空 或者上次登录时间不是今天   都需要输入密匙验证 ，否则只验证本地的签名
                 {
                     if (principal.IsInRole(WindowsBuiltInRole.Administrator))
                     {
@@ -576,6 +595,71 @@ namespace XHWK.WKTool
         }
         #endregion
 
+        #region 服务地址数据
+        /// <summary>
+        /// 服务地址存储到本地
+        /// </summary>
+        public static void SaveServiceAddressData()
+        {
+            try
+            {
+                if (ServiceAddress == null)
+                {
+                    return;
+                }
+                string DateXmlStr = XmlUtilHelper.XmlSerialize(ServiceAddress);
+                string SavePath = DataPath;
+                FileToolsCommon.CreateDirectory(SavePath);
+                string SaveName = SavePath + "ServiceAddress.d";
+                FileToolsCommon.DeleteFile(SaveName);
+                FileToolsCommon.WriteText(SaveName, DateXmlStr);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteErrLog("【服务地址存储】（SaveServiceAddressData）保存失败：" + ex.Message, ex);
+            }
+        }
+        /// <summary>
+        /// 从本地读取服务地址
+        /// </summary>
+        public static void ReadServiceAddressData()
+        {
+            try
+            {
+                string SavePath = DataPath;
+                FileToolsCommon.CreateDirectory(SavePath);
+                string SaveName = SavePath + "ServiceAddress.d";
+                //文件若存在则读取
+                if (FileToolsCommon.IsExistFile(SaveName))
+                {
+                    string DateXmlStr = FileToolsCommon.FileToString(SaveName);
+                    ServiceAddress = XmlUtilHelper.DESerializer<Model_ServiceAddress>(DateXmlStr);
+                    SwitchAddress();
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteErrLog("【服务地址读取】（ReadServiceAddressData）读取失败：" + ex.Message, ex);
+            }
+        }
+        /// <summary>
+        /// 切换校内外网
+        /// </summary>
+        public static void SwitchAddress()
+        {
+            try
+            {
+                apiUrl = IsOutsideSchool ? ServiceAddress.wapi : ServiceAddress.napi;
+                uploadUrl = (IsOutsideSchool ? ServiceAddress.wfile : ServiceAddress.nfile) + "/static/";
+                showImageUrl = IsOutsideSchool ? ServiceAddress.wdown : ServiceAddress.ndown;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteErrLog("【服务地址切换】（SwitchAddress）服务复制切换失败，请求地址为空！", ex);
+            }
+        }
+        #endregion
+
         #region 检测安装Screen Capturer Recorder
         /// <summary>
         /// 检测是否安装了Screen Capturer Recorder

XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs

@@ -326,6 +326,8 @@ namespace XHWK.WKTool
         {
             new Thread(o =>
             {
+                //读取本地
+                APP.ReadServiceAddressData();
                 int versionThis = int.Parse(FileToolsCommon.GetConfigValue("VersionCode"));
                 if (versionThis < 0)
                 {

XHWK.WKTool/DAL/Interface.cs

@@ -49,11 +49,11 @@ namespace XHWK.WKTool.DAL
                         if (obj["code"].ToString().Equals("0"))
                         {
                             APP.Signature = obj["obj"].ToString();
-                            if (!Directory.Exists(APP.dataPath))
+                            if (!Directory.Exists(APP.DataPath))
                             {
-                                Directory.CreateDirectory(APP.dataPath);
+                                Directory.CreateDirectory(APP.DataPath);
                             }
-                            string ApplicationData = APP.dataPath + "signature.txt";
+                            string ApplicationData = APP.DataPath + "signature.txt";
 
                             System.IO.File.WriteAllText(ApplicationData, APP.Signature, Encoding.Default);//存放签名
                             return 0;
@@ -320,5 +320,50 @@ namespace XHWK.WKTool.DAL
                 return 1;
             }
         }
+
+        /// <summary>
+        /// 请求服务地址
+        /// </summary>
+        /// <param name="Schoolcode"></param>
+        /// <returns></returns>
+        public bool GetServiceAddress(string Schoolcode, out string Message)
+        {
+            string url = APP.ServiceAddressAPI + "/school/find_code";//地址
+
+            Dictionary<string, object> dic = new Dictionary<string, object>
+            {
+                { "schoolcode", Schoolcode}
+            };
+            string body = JsonHelper.ToJson(dic);
+            ResultVo<Model_ServiceAddress> result = HttpHelper.PostAndRespSignle<ResultVo<Model_ServiceAddress>>(url, postData: body);
+            if (result != null)
+            {
+                if (result.code == 0)
+                {
+                    if (result.obj != null)
+                    {
+                        Message = result.msg;
+                        APP.ServiceAddress = result.obj;
+                        APP.SaveServiceAddressData();
+                        return true;
+                    }
+                    else
+                    {
+                        Message = "服务地址错误，请输入正确的地址！";
+                        return false;
+                    }
+                }
+                else
+                {
+                    Message = result.msg;
+                    return false;
+                }
+            }
+            else
+            {
+                Message = "无法与服务器建立连接，请检查网络状态。";
+                return false;
+            }
+        }
     }
 }

XHWK.WKTool/DeviceWindow.xaml

@@ -127,7 +127,7 @@
                     </StackPanel>
                 </Border>
             </Grid>
-            <Grid x:Name="GridDetection" Grid.Column="1" Margin="25,15" Visibility="Collapsed">
+            <Grid x:Name="GridDetection" Grid.Column="1" Margin="25,15" Visibility="Visible">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="50*"/>
                     <ColumnDefinition Width="50*"/>
@@ -184,7 +184,7 @@
                     </Button>
                 </Grid>
             </Grid>
-            <Grid x:Name="GridCamera" Grid.Column="1" Visibility="Visible">
+            <Grid x:Name="GridCamera" Grid.Column="1" Visibility="Collapsed">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="66*"/>
                     <RowDefinition Height="250*"/>
@@ -329,10 +329,14 @@
                     </Button>
                     <MediaElement x:Name="MediaAudioMicPlay" Stretch="Fill" LoadedBehavior="Manual" Width="0" Volume="1" MediaEnded="MediaAudioMicPlay_MediaEnded" Visibility="Hidden"/>
                 </StackPanel>
-                <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="30,0,0,0">
+                <Grid Grid.Row="3">
+                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="30,0,0,0">
                     <TextBlock Text="麦克风采集：" FontSize="17"  Foreground="#FF000000" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,5,0,0" ></TextBlock>
                     <TextBlock x:Name="TbxMicrophoneDetection" Text="待检测" FontSize="17"  Foreground="#FF000000" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,5,0,0" ></TextBlock>
                 </StackPanel>
+                    <CheckBox x:Name="CbxRecordingMicrophone" Content="录制麦克风" HorizontalAlignment="Left" FontSize="16" Margin="30,40,0,0" VerticalAlignment="Top" Padding="5,0,0,0" VerticalContentAlignment="Center" IsChecked="True" Click="CbxRecordingMicrophone_Click"/>
+
+                </Grid>
                 <!--<StackPanel Grid.Row="4" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="30,0,0,0">
                 </StackPanel>-->
                 <Grid Grid.Row="2">

XHWK.WKTool/DeviceWindow.xaml.cs

@@ -32,6 +32,15 @@ namespace XHWK.WKTool
             BtnDetection.Content = "开始检测";
             HidePage();
             GridDetection.Visibility = Visibility.Visible;
+            bool IsRecordingMicrophone = FileToolsCommon.GetConfigValue("IsRecordingMicrophone") == "1";
+            if(IsRecordingMicrophone)
+            {
+                CbxRecordingMicrophone.IsChecked = true;
+            }
+            else
+            {
+                CbxRecordingMicrophone.IsChecked = false;
+            }
         }
         /// <summary>
         /// 窗体移动
@@ -191,6 +200,8 @@ namespace XHWK.WKTool
                         Dispatcher.Invoke(() =>
                         {
                             TxbMicrophone.Text = "不可用";
+                            CbxRecordingMicrophone.IsChecked = false;
+                            FileToolsCommon.SetConfigValue("IsRecordingMicrophone", "0");
                         });
                     }
                     APP.FFmpeg.StopRecordAudio(1);
@@ -487,13 +498,28 @@ namespace XHWK.WKTool
                 }
                 if (Record)
                 {
-                    Dispatcher.Invoke(() =>
+                    if (FileToolsCommon.IsExistFile(audioMicrophonePath))
                     {
-                        TbxMicrophoneDetection.Text = "录制成功";
-                        BtnMicrophoneDetectionPlay.Visibility = Visibility.Visible;
-                        //GridMicImg.Visibility = Visibility.Visible;
-                        MediaAudioMicPlay.Source = new Uri(audioMicrophonePath);
-                    });
+                        Dispatcher.Invoke(() =>
+                        {
+                            TbxMicrophoneDetection.Text = "录制成功";
+                            BtnMicrophoneDetectionPlay.Visibility = Visibility.Visible;
+                            //GridMicImg.Visibility = Visibility.Visible;
+                            MediaAudioMicPlay.Source = new Uri(audioMicrophonePath);
+                        });
+                    }
+                    else
+                    {
+                        //无法录制麦克风
+                        Dispatcher.Invoke(() =>
+                        {
+                            TbxMicrophoneDetection.Text = "不可用";
+                            BtnMicrophoneDetectionPlay.Visibility = Visibility.Hidden;
+                            CbxRecordingMicrophone.IsChecked = false;
+                            FileToolsCommon.SetConfigValue("IsRecordingMicrophone", "0");
+                            //GridMicImg.Visibility = Visibility.Hidden;
+                        });
+                    }
                 }
                 else
                 {
@@ -502,6 +528,8 @@ namespace XHWK.WKTool
                     {
                         TbxMicrophoneDetection.Text = "不可用";
                         BtnMicrophoneDetectionPlay.Visibility = Visibility.Hidden;
+                        CbxRecordingMicrophone.IsChecked = false;
+                        FileToolsCommon.SetConfigValue("IsRecordingMicrophone", "0");
                         //GridMicImg.Visibility = Visibility.Hidden;
                     });
                 }
@@ -539,6 +567,23 @@ namespace XHWK.WKTool
             BtnMicrophoneDetectionPlay.IsEnabled = true;
             ImgMicAcousticWave.Visibility = Visibility.Hidden;
         }
+
+        /// <summary>
+        /// 修改录制麦克风
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void CbxRecordingMicrophone_Click(object sender, RoutedEventArgs e)
+        {
+            if ((bool)CbxRecordingMicrophone.IsChecked)
+            {
+                FileToolsCommon.SetConfigValue("IsRecordingMicrophone", "1");
+            }
+            else
+            {
+                FileToolsCommon.SetConfigValue("IsRecordingMicrophone", "0");
+            }
+        }
         #endregion
 
         #region 页面切换
@@ -668,8 +713,8 @@ namespace XHWK.WKTool
             {
             }
         }
-        #endregion
 
+        #endregion
 
     }
 }

XHWK.WKTool/JieTuWindow.xaml.cs

@@ -251,6 +251,7 @@ namespace ComeCapture
 
         #region 获取截图
 
+
         private void GetCapture()
         {
 

XHWK.WKTool/KeyVerification.xaml.cs

@@ -96,11 +96,11 @@ namespace XHWK.WKTool
         /// <returns></returns>
         public void InvokeActivationAddHistoryServerCompate(object obj)
         {
-            if (!Directory.Exists(APP.dataPath))
+            if (!Directory.Exists(APP.DataPath))
             {
-                Directory.CreateDirectory(APP.dataPath);
+                Directory.CreateDirectory(APP.DataPath);
             }
-            string ApplicationData = APP.dataPath + "signatureTime.txt";
+            string ApplicationData = APP.DataPath + "signatureTime.txt";
             string currentTime = DateTime.Now.ToLongDateString().ToString();//当前时间
             System.IO.File.WriteAllText(ApplicationData, currentTime, Encoding.Default);//存放签名验证日期
         }

XHWK.WKTool/LatticeXML/S0_O000_B0000_P000-255.tmx

@@ -1 +1 @@
-S0,O000,B0000,P000-255,D2021/6/30;CC8FB26BWW8K0LR0COOSWE4KSOKA4K4VQ
+S0,O000,B0000,P000-255,D2023/7/2;CCCR7ZH0O68K0LUF6OOO0IS8S6O642UO

XHWK.WKTool/LoginWindow.xaml

@@ -77,7 +77,7 @@
             <Grid>
                 <Image Source="/SkinImages/ImgCarousel/CM_RightDown.png" HorizontalAlignment="Right" VerticalAlignment="Top" Width="80" />
                 <!--创建内页 375-->
-                <Grid Margin="20,0">
+                <Grid x:Name="GridLoginPage" Margin="20,0" Visibility="Collapsed">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="100*"/>
                         <RowDefinition Height="70*"/>
@@ -91,7 +91,7 @@
                             <Label Content="星火微课系统" FontSize="14" Foreground="#FF000000" VerticalAlignment="Top" HorizontalAlignment="Left" />
                         </StackPanel>
                     </Grid>
-                    <!--讲解名称-->
+                    <!--账号-->
                     <Grid Grid.Row="1">
                         <StackPanel VerticalAlignment="Center">
                             <Label Content="账号:" FontSize="12" Foreground="#FF666666"/>
@@ -99,7 +99,7 @@
                             <Label Background="#FF317EEC" Height="1.5"/>
                         </StackPanel>
                     </Grid>
-                    <!--存放路径-->
+                    <!--密码-->
                     <Grid Grid.Row="2">
                         <StackPanel VerticalAlignment="Center">
                             <Label Content="密码:" FontSize="12" Foreground="#FF666666"/>
@@ -122,7 +122,7 @@
                                 Background="#F7F7F7" Margin="11,0,0,0"/>
                             </StackPanel>-->
                     </Grid>
-                    <!--按钮-->
+                    <!--记住密码 切换网络-->
                     <Grid Grid.Row="3">
                         <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
                             <Viewbox VerticalAlignment="Center" Margin="0,0,5,0">
@@ -133,8 +133,100 @@
 
                         <Label x:Name="LblCreate" Content="创建微课中..." FontSize="12" Foreground="#FF999999" HorizontalAlignment="Right" Visibility="Hidden" Margin="0"/>
                     </Grid>
+                    <!--按钮-->
+                    <Grid Grid.Row="4">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="35*"/>
+                            <RowDefinition Height="35*"/>
+                            <RowDefinition Height="5*"/>
+                            <RowDefinition Height="35*"/>
+                            <RowDefinition Height="15*"/>
+                            <RowDefinition Height="25*"/>
+                            <RowDefinition Height="5*"/>
+                        </Grid.RowDefinitions>
+                        <Button Grid.Row="1" Cursor="Hand" x:Name="btnStart" IsDefault="True" Content="登录" FontSize="18" FontWeight="Bold" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"  Click="BtnStart_Click" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center">
+                            <Button.Template>
+                                <ControlTemplate TargetType="{x:Type Button}">
+                                    <Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="20">
+                                        <Border.Background>#FF1D64DA</Border.Background>
+                                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" Content="{TemplateBinding ContentControl.Content}" Margin="0,5" />
+                                    </Border>
+                                </ControlTemplate>
+                            </Button.Template>
+                        </Button>
+                        <Button Grid.Row="3" Cursor="Hand" x:Name="BtnStop" IsDefault="True" Content="关闭" FontSize="18" FontWeight="Bold" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0" Click="BtnDown_Click" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" HorizontalContentAlignment="Center" Padding="2" VerticalContentAlignment="Center">
+                            <Button.Template>
+                                <ControlTemplate TargetType="{x:Type Button}">
+                                    <Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="20">
+                                        <Border.Background>#FFC3C3C3</Border.Background>
+                                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" Content="{TemplateBinding ContentControl.Content}" Margin="0,5" />
+                                    </Border>
+                                </ControlTemplate>
+                            </Button.Template>
+                        </Button>
+
+                        <Button Grid.Row="5" FontSize="{Binding WordSize12}" Cursor="Hand" x:Name="BtnServiceAddress" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnServiceAddress_Click" HorizontalAlignment="Right" Margin="0" VerticalAlignment="Stretch" >
+                            <Button.Template>
+                                <ControlTemplate TargetType="{x:Type Button}">
+                                    <Grid>
+                                        <Label Grid.Column="1" x:Name="Word" Content="服务地址设置" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FFC3C3C3"/>
+                                    </Grid>
+                                    <ControlTemplate.Triggers>
+                                        <Trigger Property="IsMouseOver" Value="True">
+                                            <Setter TargetName="Word" Property="Foreground" Value="#FF3F6FFF"/>
+                                        </Trigger>
+                                    </ControlTemplate.Triggers>
+                                </ControlTemplate>
+                            </Button.Template>
+                        </Button>
+                    </Grid>
+                </Grid>
+                <Grid x:Name="GridServiceAddress" Margin="20,0" Visibility="Visible">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="100*"/>
+                        <RowDefinition Height="80*"/>
+                        <RowDefinition Height="70*"/>
+                        <RowDefinition Height="15*"/>
+                        <RowDefinition Height="120*"/>
+                    </Grid.RowDefinitions>
+                    <Grid Grid.Row="0">
+                        <StackPanel Margin="0,30,0,0">
+                            <Label Content="服务地址" FontSize="28" Foreground="#FF4B62EA" VerticalAlignment="Top" HorizontalAlignment="Left"  />
+                            <Label Content="设置" FontSize="14" Foreground="#FF000000" VerticalAlignment="Top" HorizontalAlignment="Left" />
+                        </StackPanel>
+                    </Grid>
+
+                    <!--服务地址-->
+                    <Grid Grid.Row="1">
+                        <StackPanel VerticalAlignment="Center">
+                            <Label Content="服务地址:" FontSize="12" Foreground="#FF666666"/>
+                            <TextBox x:Name="TbxServiceAddress" InputMethod.IsInputMethodEnabled="False" Text="" FontSize="14" Foreground="#FF999999" BorderBrush="{x:Null}" BorderThickness="0" Margin="5,5"/>
+                            <Label Background="#FF317EEC" Height="1.5"/>
+                        </StackPanel>
+                    </Grid>
+
+                    <!--切换网络-->
+                    <Grid Grid.Row="2">
+                        <StackPanel VerticalAlignment="Center">
+                            <Label Content="切换网络:" FontSize="12" Foreground="#FF666666"/>
+                            <StackPanel Orientation="Horizontal" Grid.Row="6" HorizontalAlignment="Left" Margin="0,10,0,0">
+                                <RadioButton x:Name="RbnIsOutsideSchool" Content="校外" FontSize="14" HorizontalAlignment="Left" Foreground="#FF333333"  Margin="20,0,0,0" IsChecked="True" Checked="RbnIsOutsideSchool_Checked" VerticalContentAlignment="Center"/>
+                                <RadioButton x:Name="RbnSchool" Content="校内" FontSize="14" HorizontalAlignment="Left" Foreground="#FF333333" Margin="20,0,0,0" Checked="RbnSchool_Checked" VerticalContentAlignment="Center"/>
+                            </StackPanel>
+                        </StackPanel>
+                    </Grid>
+                    <!--按钮-->
                     <Grid Grid.Row="4">
-                        <Button  Cursor="Hand" x:Name="btnStart" IsDefault="True" Content="登录" FontSize="18" FontWeight="Bold" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,0,50" Click="BtnStart_Click" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" VerticalAlignment="Center" HorizontalContentAlignment="Center" VerticalContentAlignment="Center">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="35*"/>
+                            <RowDefinition Height="35*"/>
+                            <RowDefinition Height="5*"/>
+                            <RowDefinition Height="35*"/>
+                            <RowDefinition Height="15*"/>
+                            <RowDefinition Height="25*"/>
+                            <RowDefinition Height="5*"/>
+                        </Grid.RowDefinitions>
+                        <Button Grid.Row="1" Cursor="Hand" x:Name="BtnSetServiceAddress" IsDefault="True" Content="设置" FontSize="18" FontWeight="Bold" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Click="BtnSetServiceAddress_Click">
                             <Button.Template>
                                 <ControlTemplate TargetType="{x:Type Button}">
                                     <Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="20">
@@ -144,7 +236,7 @@
                                 </ControlTemplate>
                             </Button.Template>
                         </Button>
-                        <Button Cursor="Hand" x:Name="BtnStop" IsDefault="True" Content="关闭" FontSize="18" FontWeight="Bold" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,40,0,0" Click="BtnDown_Click" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" VerticalAlignment="Center" HorizontalContentAlignment="Center" Padding="2" VerticalContentAlignment="Center">
+                        <Button Grid.Row="3" Cursor="Hand" x:Name="BtnCancel" IsDefault="True" Content="取消" FontSize="18" FontWeight="Bold" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" HorizontalContentAlignment="Center" Padding="2" VerticalContentAlignment="Center" Click="BtnCancel_Click">
                             <Button.Template>
                                 <ControlTemplate TargetType="{x:Type Button}">
                                     <Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="20">
@@ -154,6 +246,7 @@
                                 </ControlTemplate>
                             </Button.Template>
                         </Button>
+
                     </Grid>
                 </Grid>
             </Grid>

XHWK.WKTool/LoginWindow.xaml.cs

@@ -24,6 +24,14 @@ namespace XHWK.WKTool
         public LoginWindow()
         {
             InitializeComponent();
+
+            #region 获取服务接口地址 --2021年7月9日赵耀
+            if (APP.ServiceAddress == null)
+            {
+                MessageWindow.Show("首次使用需设置服务地址。");
+                BtnServiceAddress_Click(null, null);
+            }
+            #endregion
             //if (APP.SkinStyle == "1")
             //{
             //    GridTitle.Visibility = Visibility.Visible;
@@ -43,7 +51,6 @@ namespace XHWK.WKTool
         }
         public void Initialize()
         {
-
             if (FileToolsCommon.IsExistFile(APP.DataPath + "accountNumber.txt"))
             {
                 string accountNumber = System.IO.File.ReadAllText(APP.DataPath + "accountNumber.txt", Encoding.Default);
@@ -53,6 +60,7 @@ namespace XHWK.WKTool
                     ckSaveName.IsChecked = true;
                 }
             }
+            DataContext = APP.PageContextData;
             //if (GetSettingString("isRemind").Equals("True"))
             //{
             //    ckSaveName.IsChecked = true;
@@ -77,6 +85,14 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnStart_Click(object sender, RoutedEventArgs e)
         {
+            #region 获取服务接口地址 --2021年7月9日赵耀
+            if (APP.ServiceAddress == null)
+            {
+                MessageWindow.Show("首次使用需设置服务地址。");
+                BtnServiceAddress_Click(null, null);
+                return;
+            }
+            #endregion
             if (string.IsNullOrEmpty(txbAccountNumber.Text))
             {
                 MessageWindow.Show("账号未输入");
@@ -259,5 +275,85 @@ namespace XHWK.WKTool
         {
             DragMove();
         }
+
+        #region 服务地址
+        /// <summary>
+        /// 打开服务地址
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnServiceAddress_Click(object sender, RoutedEventArgs e)
+        {
+            GridLoginPage.Visibility = Visibility.Collapsed;
+            GridServiceAddress.Visibility = Visibility.Visible;
+        }
+        /// <summary>
+        /// 取消
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnCancel_Click(object sender, RoutedEventArgs e)
+        {
+            GridLoginPage.Visibility = Visibility.Visible;
+            GridServiceAddress.Visibility = Visibility.Collapsed;
+        }
+        /// <summary>
+        /// 服务地址设置
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnSetServiceAddress_Click(object sender, RoutedEventArgs e)
+        {
+            #region 获取服务地址 -- 2021年7月8日赵耀
+            if (!string.IsNullOrWhiteSpace(TbxServiceAddress.Text))
+            {
+                if (@interface.GetServiceAddress(TbxServiceAddress.Text, out string Message))
+                {
+                    APP.SaveServiceAddressData();
+                    APP.SwitchAddress();
+
+                    MessageWindow.Show("设置成功！");
+                    BtnCancel_Click(null, null);
+                }
+                else
+                {
+                    MessageWindow.Show(Message);
+                    return;
+                }
+            }
+            #endregion
+        }
+
+        #region 切换校内外
+        /// <summary>
+        /// 校外
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void RbnIsOutsideSchool_Checked(object sender, RoutedEventArgs e)
+        {
+            APP.IsOutsideSchool = true;
+            FileToolsCommon.SetConfigValue("IsOutsideSchool", "1");
+            if (APP.ServiceAddress != null)
+            {
+                APP.SwitchAddress();
+            }
+        }
+        /// <summary>
+        /// 校内
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void RbnSchool_Checked(object sender, RoutedEventArgs e)
+        {
+            APP.IsOutsideSchool = false;
+            FileToolsCommon.SetConfigValue("IsOutsideSchool", "0");
+            if (APP.ServiceAddress != null)
+            {
+                APP.SwitchAddress();
+            }
+        }
+        #endregion
+        #endregion
     }
 }

XHWK.WKTool/ProductVerification.xaml.cs

@@ -48,16 +48,16 @@ namespace XHWK.WKTool
             //解析
             try
             {
-                APP.Signature = System.IO.File.ReadAllText(APP.dataPath + "signature.txt", Encoding.Default);
+                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);
                 long currentTimeTimestamp = DataProvider.TimestampTotalSeconds(); //当前时间 时间戳
                 if (msgBean.endtime > currentTimeTimestamp)//条件成立  解析成功 code 在有效期内
                 {
-                    if (File.Exists(APP.dataPath + "signatureTime.txt"))
+                    if (File.Exists(APP.DataPath + "signatureTime.txt"))
                     {
-                        string signatureTime = System.IO.File.ReadAllText(APP.dataPath + "signatureTime.txt", Encoding.Default);
+                        string signatureTime = System.IO.File.ReadAllText(APP.DataPath + "signatureTime.txt", Encoding.Default);
                         string currentTime = DateTime.Now.ToLongDateString().ToString();//当前时间  
                         if (signatureTime != currentTime)
                         {
@@ -118,11 +118,11 @@ namespace XHWK.WKTool
         /// <returns></returns>
         public void InvokeActivationAddHistoryServerCompate(object obj)
         {
-            if (!Directory.Exists(APP.dataPath))
+            if (!Directory.Exists(APP.DataPath))
             {
-                Directory.CreateDirectory(APP.dataPath);
+                Directory.CreateDirectory(APP.DataPath);
             }
-            string ApplicationData = APP.dataPath + "signatureTime.txt";
+            string ApplicationData = APP.DataPath + "signatureTime.txt";
             string currentTime = DateTime.Now.ToLongDateString().ToString();//当前时间
             System.IO.File.WriteAllText(ApplicationData, currentTime, Encoding.Default);//存放签名验证日期
         }

XHWK.WKTool/Properties/AssemblyInfo.cs

@@ -49,5 +49,5 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.5.24.0")]
-[assembly: AssemblyFileVersion("2.5.24.0")]
+[assembly: AssemblyVersion("2.5.27.0")]
+[assembly: AssemblyFileVersion("2.5.27.0")]

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -74,7 +74,6 @@ namespace XHWK.WKTool
         {
             InitializeComponent();
             ResizeMode = ResizeMode.NoResize;
-
         }
         /// <summary>
         /// 初始化
@@ -458,7 +457,9 @@ namespace XHWK.WKTool
                             Thread.Sleep(100);
                         }
                         System.Drawing.Size DesktopSize = PrimaryScreen.DESKTOP;
-                        bool SynRes = APP.FFmpeg.StartRecordingVideo(VideoSavePathName, DesktopSize, out string ErrMessage, APP.MicrophoneName);
+                        bool IsRecordingSound = FileToolsCommon.GetConfigValue("IsRecordingSound") == "1"; 
+                        bool IsRecordingMicrophone = FileToolsCommon.GetConfigValue("IsRecordingMicrophone") == "1";
+                        bool SynRes = APP.FFmpeg.StartRecordingVideo(VideoSavePathName, DesktopSize, IsRecordingSound, IsRecordingMicrophone, out string ErrMessage, APP.MicrophoneName);
 
                         Thread.Sleep(1300);
                         Dispatcher.Invoke(() =>

XHWK.WKTool/UControl/Uc_VideoItem.xaml.cs

@@ -56,7 +56,7 @@ namespace XHWK.WKTool.UControl
             InitializeComponent();
             APP.IsUpLoad = false;
             VideoModel = model_Video;
-            DataContext = APP.pageData;
+            DataContext = APP.PageContextData;
             if (FileToolsCommon.IsExistFile(VideoModel.ThumbnailPath))
             {
                 ImgVideo.Source = ImageHelper.ReadBitmapImageFile(VideoModel.ThumbnailPath);// new BitmapImage(new Uri(VideoModel.ThumbnailPath));

XHWK.WKTool/VideoClipWindow.xaml.cs

@@ -46,7 +46,7 @@ namespace XHWK.WKTool
                     QS_Movie.Height = GridMovie.ActualWidth * Prop;
                     QS_Movie.Width = GridMovie.ActualWidth;
                 }
-                DataContext = APP.pageData;
+                DataContext = APP.PageContextData;
             }
             else
             {

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -706,9 +706,10 @@
                                     <Grid.RowDefinitions>
                                         <RowDefinition Height="200*"/>
                                         <RowDefinition Height="160*"/>
-                                        <RowDefinition Height="305*"/>
+                                        <RowDefinition Height="100*"/>
                                         <RowDefinition Height="200*"/>
                                         <RowDefinition Height="90*"/>
+                                        <RowDefinition Height="205*"/>
                                     </Grid.RowDefinitions>
                                     <!--更换皮肤 h200-->
                                     <Grid Grid.Row="0" Margin="100,0">
@@ -860,58 +861,57 @@
                                             <Grid.RowDefinitions>
                                                 <RowDefinition Height="20*"/>
                                                 <RowDefinition Height="60*"/>
-                                                <RowDefinition Height="60*"/>
-                                                <RowDefinition Height="60*"/>
-                                                <RowDefinition Height="60*"/>
                                                 <RowDefinition Height="20*"/>
                                             </Grid.RowDefinitions>
-                                            <Grid Grid.Row="1" Grid.Column="0">
-                                                <!--接口地址-->
-                                                <TextBlock Text="接口地址" FontSize="{Binding WordSize18}" Foreground="#333333" HorizontalAlignment="Right" Padding="0,0,0,0" VerticalAlignment="Center"/>
-                                            </Grid>
-                                            <Grid Grid.Row="1" Grid.Column="1">
-                                                <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="90*"/>
-                                                    <ColumnDefinition Width="341*"/>
-                                                </Grid.ColumnDefinitions>
-                                                <TextBlock Grid.Column="0" Text="http://" FontSize="{Binding WordSize18}" VerticalAlignment="Center" Margin="15,0,0,0" HorizontalAlignment="Left"/>
-                                                <TextBox Grid.Column="1" x:Name="txbInterfaceAddress" FontSize="{Binding WordSize18}" Margin="0,20"  VerticalContentAlignment="Center" Padding="5,0,0,0"/>
-                                            </Grid>
-                                            <Grid Grid.Row="2" Grid.Column="0">
-                                                <!--上传地址-->
-                                                <TextBlock Text="上传地址" FontSize="{Binding WordSize18}" Foreground="#333333" HorizontalAlignment="Right" Padding="0,0,0,0" VerticalAlignment="Center"/>
-                                            </Grid>
-                                            <Grid Grid.Row="2" Grid.Column="1">
-                                                <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="90*"/>
-                                                    <ColumnDefinition Width="341*"/>
-                                                </Grid.ColumnDefinitions>
-                                                <TextBlock Grid.Column="0" Text="http://" FontSize="{Binding WordSize18}" VerticalAlignment="Center" Margin="15,0,0,0" HorizontalAlignment="Left"/>
-                                                <TextBox Grid.Column="1" x:Name="txbImageUploadAddress" FontSize="{Binding WordSize18}" Margin="0,20"  VerticalContentAlignment="Center" Padding="5,0,0,0"/>
-                                            </Grid>
-                                            <Grid Grid.Row="3" Grid.Column="0">
-                                                <!--下载地址-->
-                                                <TextBlock Text="下载地址" FontSize="{Binding WordSize18}" Foreground="#333333" HorizontalAlignment="Right" Padding="0,0,0,0" VerticalAlignment="Center"/>
-                                            </Grid>
-                                            <Grid Grid.Row="3" Grid.Column="1">
-                                                <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="90*"/>
-                                                    <ColumnDefinition Width="341*"/>
-                                                </Grid.ColumnDefinitions>
-                                                <TextBlock Grid.Column="0" Text="http://" FontSize="{Binding WordSize18}"  VerticalAlignment="Center" Margin="15,0,0,0" HorizontalAlignment="Left"/>
-                                                <TextBox Grid.Column="1" x:Name="txbPictureShowsAddress" FontSize="{Binding WordSize18}" Margin="0,20"  VerticalContentAlignment="Center" Padding="5,0,0,0"/>
+                                            <!--地址 废弃2021年7月9日赵耀-->
+                                            <Grid Visibility="Collapsed">
+                                                <!--
+                                                <Grid Grid.Row="1" Grid.Column="0">
+                                                    <TextBlock Text="接口地址" FontSize="{Binding WordSize18}" Foreground="#333333" HorizontalAlignment="Right" Padding="0,0,0,0" VerticalAlignment="Center"/>
+                                                </Grid>
+                                                <Grid Grid.Row="1" Grid.Column="1">
+                                                    <Grid.ColumnDefinitions>
+                                                        <ColumnDefinition Width="90*"/>
+                                                        <ColumnDefinition Width="341*"/>
+                                                    </Grid.ColumnDefinitions>
+                                                    <TextBlock Grid.Column="0" Text="http://" FontSize="{Binding WordSize18}" VerticalAlignment="Center" Margin="15,0,0,0" HorizontalAlignment="Left"/>
+                                                    <TextBox Grid.Column="1" x:Name="txbInterfaceAddress" FontSize="{Binding WordSize18}" Margin="0,20"  VerticalContentAlignment="Center" Padding="5,0,0,0"/>
+                                                </Grid>
+                                                <Grid Grid.Row="2" Grid.Column="0">
+                                                    <TextBlock Text="上传地址" FontSize="{Binding WordSize18}" Foreground="#333333" HorizontalAlignment="Right" Padding="0,0,0,0" VerticalAlignment="Center"/>
+                                                </Grid>
+                                                <Grid Grid.Row="2" Grid.Column="1">
+                                                    <Grid.ColumnDefinitions>
+                                                        <ColumnDefinition Width="90*"/>
+                                                        <ColumnDefinition Width="341*"/>
+                                                    </Grid.ColumnDefinitions>
+                                                    <TextBlock Grid.Column="0" Text="http://" FontSize="{Binding WordSize18}" VerticalAlignment="Center" Margin="15,0,0,0" HorizontalAlignment="Left"/>
+                                                    <TextBox Grid.Column="1" x:Name="txbImageUploadAddress" FontSize="{Binding WordSize18}" Margin="0,20"  VerticalContentAlignment="Center" Padding="5,0,0,0"/>
+                                                </Grid>
+                                                <Grid Grid.Row="3" Grid.Column="0">
+                                                    <TextBlock Text="下载地址" FontSize="{Binding WordSize18}" Foreground="#333333" HorizontalAlignment="Right" Padding="0,0,0,0" VerticalAlignment="Center"/>
+                                                </Grid>
+                                                <Grid Grid.Row="3" Grid.Column="1">
+                                                    <Grid.ColumnDefinitions>
+                                                        <ColumnDefinition Width="90*"/>
+                                                        <ColumnDefinition Width="341*"/>
+                                                    </Grid.ColumnDefinitions>
+                                                    <TextBlock Grid.Column="0" Text="http://" FontSize="{Binding WordSize18}"  VerticalAlignment="Center" Margin="15,0,0,0" HorizontalAlignment="Left"/>
+                                                    <TextBox Grid.Column="1" x:Name="txbPictureShowsAddress" FontSize="{Binding WordSize18}" Margin="0,20"  VerticalContentAlignment="Center" Padding="5,0,0,0"/>
+                                                </Grid>
+                                                -->
                                             </Grid>
-                                            <Grid Grid.Row="4" Grid.Column="0">
+                                            <Grid Grid.Row="1" Grid.Column="0">
                                                 <TextBlock Text="文件路径"  FontSize="{Binding WordSize18}" Foreground="#333333" HorizontalAlignment="Right" Padding="0,0,0,0" VerticalAlignment="Center"/>
                                             </Grid>
-                                            <Grid Grid.Row="4" Grid.Column="1">
+                                            <Grid Grid.Row="1" Grid.Column="1">
                                                 <Grid Margin="20,17,10,17">
                                                     <Border CornerRadius="1" BorderThickness="1" BorderBrush="#FFE3E3E3" >
                                                         <Label x:Name="txbStoragePath" Background="#FFFFFF" Margin="10,0" Content="D:\" FontSize="{Binding WordSize14}" Foreground="#333333" BorderBrush="{x:Null}" BorderThickness="0"/>
                                                     </Border>
                                                 </Grid>
                                             </Grid>
-                                            <Grid Grid.Row="4" Grid.Column="2">
+                                            <Grid Grid.Row="1" Grid.Column="2">
                                                 <Grid.ColumnDefinitions>
                                                     <ColumnDefinition Width="100*"/>
                                                     <ColumnDefinition Width="100*"/>

打包脚本/Inno Setup智慧校园.iss

@@ -0,0 +1,51 @@
+; 脚本由 Inno Setup 脚本向导 生成！
+; 有关创建 Inno Setup 脚本文件的详细资料请查阅帮助文档！
+
+#define MyAppName "星火智慧校园"
+#define MyAppVerName "星火智慧校园 v2.5.43"
+#define MyAppPublisher "星火燎原"
+#define MyAppURL "http://www.xhkjedu.com/"
+#define MyAppExeName "xhschool.exe"
+
+[Setup]
+; 注: AppId的值为单独标识该应用程序。
+; 不要为其他安装程序使用相同的AppId值。
+; (生成新的GUID，点击 工具|在IDE中生成GUID。)
+AppId={{4B39765F-5B1F-4368-8675-2A22904B835A}
+AppName={#MyAppName}
+AppVerName={#MyAppVerName}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName=D:\xhschool
+DefaultGroupName={#MyAppName}
+AllowNoIcons=yes
+OutputDir=E:\安装包
+OutputBaseFilename=星火智慧校园V2.5.43T
+SetupIconFile=E:\project\schoolclient\bin\x86\Debug\favicon256.ico
+Compression=lzma
+SolidCompression=yes
+
+[Languages]
+Name: "chinesesimp"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: checkablealone
+Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: checkablealone
+
+[Files]
+Source: "E:\project\schoolclient\bin\x86\Debug\xhschool.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "E:\project\schoolclient\bin\x86\Debug\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+; 注意: 不要在任何共享系统文件上使用“Flags: ignoreversion”
+
+[Icons]
+Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}"
+Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
+Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: quicklaunchicon
+
+[Run]
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, "&", "&&")}}"; Flags: nowait postinstall skipifsilent
+

打包脚本/微课发包注意项.txt

@@ -0,0 +1,7 @@
+删除Data、ffmpeg、Log、Temp文件夹
+
+latticeXML为授权文件
+OIDPublishImageGenerator 腾千里？
+PrintTool 点阵打印文件
+Resources 资源文件
+SSCR 插件安装包