Merge commit '65bf2fb35af45c50822c16544a01a999e9df74e6' into ZhangXueYang

XHZB.Desktop/App.cs

@@ -271,7 +271,7 @@ namespace XHZB.Desktop
             UnZipFFmpeg();
             try
             {
-                if (args != null&&args.Length>1)
+                if (args != null&&args.Length>0)
                 {
                     AESAccountStr = args[0];
                     AESPassWordStr = args[1];
@@ -283,7 +283,6 @@ namespace XHZB.Desktop
             catch (Exception ex)
             {
                 LogHelper.WriteErrLog("参数接收失败：" + ex.Message, ex);
-                throw;
             }
             try
             {
@@ -629,5 +628,81 @@ namespace XHZB.Desktop
             return filepath;
         }
         #endregion
+
+        #region 写入注册表
+        /// <summary>
+        /// 注册表
+        /// </summary>
+        public static RegistryHelper reg = new RegistryHelper("XHZB\\", RegDomain.ClassesRoot);
+
+        public static void WriteRegistry()
+        {
+            if(IsSubKeyExist())
+            {
+                //存在时对比位置
+                string regStr = ReadRegeditKey();
+                string pathStr = FileToolsCommon.GetFileAbsolutePath("/星火直播.exe").Replace("/","\\\\");
+                if(regStr!= pathStr)
+                {
+
+                }
+            }
+            else
+            {
+
+            }
+        }
+        /// <summary>
+        /// 判断注册表是否存在
+        /// </summary>
+        public static bool IsSubKeyExist()
+        {
+            return reg.IsSubKeyExist();
+        }
+        /// <summary>
+        /// 读取注册表键值
+        /// </summary>
+        /// <returns></returns>
+        public static string ReadRegeditKey()
+        {
+            if(reg.IsRegeditKeyExist("URL Protocol"))
+            {
+                return reg.ReadRegeditKey("URL Protocol").ToString();
+            }
+            else
+            {
+                return "";
+            }
+        }
+
+        public static void CreateRegeditKey()
+        {
+            reg.CreateSubKey();
+            string pathStr = FileToolsCommon.GetFileAbsolutePath("/星火直播.exe").Replace("/", "\\\\");
+            reg.WriteRegeditKey("@","星火直播");
+            reg.WriteRegeditKey("URL Protocol", pathStr);
+
+
+            RegistryHelper reg1 = new RegistryHelper("XHZB\\DefaultIcon\\", RegDomain.ClassesRoot);
+            reg1.CreateSubKey();
+            reg1.WriteRegeditKey("@", pathStr+",1");
+            //reg1.CreateSubKey("XHZB\\DefaultIcon\\");
+
+            RegistryHelper reg2 = new RegistryHelper("XHZB\\shell\\open\\command\\", RegDomain.ClassesRoot);
+            reg2.CreateSubKey();
+            reg2.WriteRegeditKey("@", "\""+pathStr + "\"\"%1\"");
+            //reg.CreateSubKey("XHZB\\shell\\open\\command\\");
+
+            //[HKEY_CLASSES_ROOT\XHZB]
+            //"URL Protocol" = "E:\\项目\\星火直播\\XHZB\\XHZB.Desktop\\bin\\Debug\\星火直播.exe"
+            //@= "XHZBProtocol"
+            //[HKEY_CLASSES_ROOT\XHZB\DefaultIcon]
+            //@= "E:\\项目\\星火直播\\XHZB\\XHZB.Desktop\\bin\\Debug\\星火直播.exe,1"
+            //[HKEY_CLASSES_ROOT\XHZB\shell]
+            //[HKEY_CLASSES_ROOT\XHZB\shell\open]
+            //[HKEY_CLASSES_ROOT\XHZB\shell\open\command]
+            //@= "\"E:\\项目\\星火直播\\XHZB\\XHZB.Desktop\\bin\\Debug\\星火直播.exe\"\"%1\""
+        }
+        #endregion
     }
 }

XHZB.Desktop/LoginWindow.xaml.cs

@@ -71,6 +71,22 @@ namespace XHZB.Desktop
         {
             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”完成安装！");
+                APP.InstallScreenCapturerRecorder();
+            }
+
             WindowStartupLocation = WindowStartupLocation.CenterScreen;
 
             string typestr = APP.isDebug ? "测试版" : "正式版";

XHZB.Desktop/Properties/AssemblyInfo.cs

@@ -7,11 +7,11 @@ using System.Windows;
 // 有关程序集的一般信息由以下
 // 控制。更改这些特性值可修改
 // 与程序集关联的信息。
-[assembly: AssemblyTitle("XHZB.Desktop")]
+[assembly: AssemblyTitle("星火直播")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("XHZB.Desktop")]
+[assembly: AssemblyCompany("河南星火燎原软件科技有限公司")]
+[assembly: AssemblyProduct("星火直播")]
 [assembly: AssemblyCopyright("Copyright ©  2021")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

XHZB.Desktop/ToolbarWindow.xaml.cs

@@ -50,13 +50,6 @@ namespace XHZB.Desktop
         public ToolbarWindow()
         {
             InitializeComponent();
-
-            if (!APP.CheckScreenCapturerRecorder())
-            {
-                MessageWindow.Show("首次运行需安装环境,请在确定后依次点击“English-OK-Next>-Next>Install”完成安装！");
-                APP.InstallScreenCapturerRecorder();
-            }
-
             txbName.Text = APP.LoginUser.username;
 
             heiban_btn.Click += Heiban_btn_Click;