Merge remote-tracking branch 'origin/master' into ZhangXueYang

Common/system/RegistryHelper.cs

@@ -131,6 +131,7 @@ namespace Common.system
         /// <param name="subKey">注册表项名称</param>  
         public virtual void CreateSubKey(string subKey)
         {
+
             ///判断注册表项名称是否为空，如果为空，返回false  
             if (subKey == string.Empty || subKey == null)
             {
@@ -620,7 +621,7 @@ namespace Common.system
             ///判断是否设置键值属性  
             if (_regeditkey == string.Empty || _regeditkey == null)
             {
-                return false;
+                _regeditkey = "";
             }
 
             ///判断注册表项是否存在，如果不存在，则直接创建  
@@ -670,7 +671,7 @@ namespace Common.system
             ///判断键值是否存在  
             if (name == string.Empty || name == null)
             {
-                return false;
+                name = "";
             }
 
             ///判断注册表项是否存在，如果不存在，则直接创建  
@@ -720,7 +721,7 @@ namespace Common.system
             ///判断键值是否存在  
             if (name == string.Empty || name == null)
             {
-                return false;
+                name = "";
             }
 
             ///判断注册表项是否存在，如果不存在，则直接创建  

XHZB.Desktop/App.cs

@@ -35,6 +35,10 @@ namespace XHZB.Desktop
         /// </summary>
         public static string AESPassWordStr = null;
         /// <summary>
+        /// 课堂节次
+        /// </summary>
+        public static string ClassroomAdd = null;
+        /// <summary>
         /// 接口地址
         /// </summary>
         public static string apiUrl = isDebug ? "http://schoolapitest.xhkjedu.com" : FileToolsCommon.GetConfigValue("APIRequestAddress");
@@ -269,15 +273,39 @@ namespace XHZB.Desktop
             StopSameProcess();
             Killffmpeg();
             UnZipFFmpeg();
+            //注册
+            WriteRegistry();
             try
             {
-                if (args != null&&args.Length>0)
+                if (args != null && args.Length > 0)
                 {
-                    AESAccountStr = args[0];
-                    AESPassWordStr = args[1];
+                    string Str = args[0];
+                    List<string> StrArg = new List<string>(Str.Substring(0, Str.Length - 1).Replace("xhzb://", "").Split('&'));
+                    //AESAccountStr = args[0];
+                    //AESPassWordStr = args[1];
+                    LogHelper.WriteInfoLog(Str);
+                    foreach (string str in StrArg)
+                    {
+                        if (str.Contains("account"))
+                        {
+                            AESAccountStr = str.Substring(str.LastIndexOf("=") + 1);
+                            //string Account= AESHelper.AESDecrypt(AESAccountStr);
+                            LogHelper.WriteInfoLog("账号=" + AESAccountStr);
+
+                        }
+                        if (str.Contains("password"))
+                        {
+                            AESPassWordStr = str.Substring(str.LastIndexOf("=") + 1);
+                            //string PassWord = AESHelper.AESDecrypt(AESPassWordStr);
+                            LogHelper.WriteInfoLog("密码=" + AESPassWordStr);
+                        }
+                        if (str.Contains("rid"))
+                        {
+                            ClassroomAdd = str.Substring(str.LastIndexOf("=") + 1);
+                            LogHelper.WriteInfoLog("课堂=" + ClassroomAdd);
+                        }
+                    }
                     ////解密
-                    //string Account= AESHelper.AESDecrypt(AESAccountStr);
-                    //string PassWord = AESHelper.AESDecrypt(AESPassWordStr);
                 }
             }
             catch (Exception ex)
@@ -637,19 +665,19 @@ namespace XHZB.Desktop
 
         public static void WriteRegistry()
         {
-            if(IsSubKeyExist())
+            if (IsSubKeyExist())
             {
                 //存在时对比位置
                 string regStr = ReadRegeditKey();
                 string pathStr = FileToolsCommon.GetFileAbsolutePath("/星火直播.exe").Replace("/","\\\\");
                 if(regStr!= pathStr)
                 {
-
+                    CreateRegeditKey();
                 }
             }
             else
             {
-
+                CreateRegeditKey();
             }
         }
         /// <summary>
@@ -679,18 +707,17 @@ namespace XHZB.Desktop
         {
             reg.CreateSubKey();
             string pathStr = FileToolsCommon.GetFileAbsolutePath("/星火直播.exe").Replace("/", "\\\\");
-            reg.WriteRegeditKey("@","星火直播");
+            reg.WriteRegeditKey("星火直播");
             reg.WriteRegeditKey("URL Protocol", pathStr);
 
-
             RegistryHelper reg1 = new RegistryHelper("XHZB\\DefaultIcon\\", RegDomain.ClassesRoot);
             reg1.CreateSubKey();
-            reg1.WriteRegeditKey("@", pathStr+",1");
+            reg1.WriteRegeditKey(pathStr +",1");
             //reg1.CreateSubKey("XHZB\\DefaultIcon\\");
 
             RegistryHelper reg2 = new RegistryHelper("XHZB\\shell\\open\\command\\", RegDomain.ClassesRoot);
             reg2.CreateSubKey();
-            reg2.WriteRegeditKey("@", "\""+pathStr + "\"\"%1\"");
+            reg2.WriteRegeditKey("\"" +pathStr + "\"\"%1\"");
             //reg.CreateSubKey("XHZB\\shell\\open\\command\\");
 
             //[HKEY_CLASSES_ROOT\XHZB]

XHZB.Desktop/LoginWindow.xaml.cs

@@ -70,17 +70,6 @@ namespace XHZB.Desktop
         public LoginWindow()
         {
             InitializeComponent();
-
-            //try
-            //{
-            //    MessageWindow.Show("值1：" + APP.AESAccountStr);
-            //    MessageWindow.Show("值2：" + APP.AESPassWordStr);
-            //}
-            //catch (Exception ex)
-            //{
-
-            //}
-
             if (!APP.CheckScreenCapturerRecorder())
             {
                 MessageWindow.Show("首次运行需安装环境,请在确定后依次点击“English-OK-Next>-Next>Install”完成安装！");
@@ -111,6 +100,18 @@ namespace XHZB.Desktop
             {
                 APP.fileStorageAddress = System.IO.File.ReadAllText(APP.dataPath + "fileStorageAddress.txt", Encoding.Default);
             }
+            //APP.AESAccountStr = "9001";
+            //APP.AESPassWordStr = "123456";
+            //免登录
+            if (!string.IsNullOrWhiteSpace(APP.AESAccountStr) && !string.IsNullOrWhiteSpace(APP.AESPassWordStr))
+            {
+                Dispatcher.Invoke(new Action(() =>
+                {
+                    txbAccountNumber.Text = APP.AESAccountStr;
+                    pobPassword.Password = APP.AESPassWordStr;
+                    btnLogin_Click(null, null);
+                }));
+            }
         }
         //#region 登陆页面验证本地激活码 1.验证成功 可登陆。 2.验证失败 弹出激活窗口。   关闭激活窗口，点击登陆时继续 弹出激活窗口
         ///// <summary>