admin/GeekDesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #68 from BookerLiu/2.5.13

Browse Source 
2.5.13
This commit is contained in:
Booker
2022-09-02 16:55:04 +08:00
committed by GitHub
parent ab5529f1e8 ee47443c34
commit 546985f132
1 changed files with 92 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

190
Control/UserControls/PannelCard/RightCardControl.xaml.cs
View File

@@ -175,130 +175,124 @@ namespace GeekDesk.Control.UserControls.PannelCard
private void StartIconApp(IconInfo icon, IconStartType type, bool useRelativePath = false) private void StartIconApp(IconInfo icon, IconStartType type, bool useRelativePath = false)
{ {
try try
{ {
Process p = new Process(); using (Process p = new Process())
//using ()
//{
p.StartInfo.UseShellExecute = false;
p.StartInfo.RedirectStandardInput = true;
p.StartInfo.RedirectStandardOutput = true;
p.StartInfo.RedirectStandardError = true;
p.StartInfo.CreateNoWindow = true;
string startArg = icon.StartArg;
if (startArg != null && Constants.SYSTEM_ICONS.ContainsKey(startArg))
{ {
StartSystemApp(startArg, type); string startArg = icon.StartArg;
}
else if (startArg != null && Constants.SYSTEM_ICONS.ContainsKey(startArg))
{
string path;
if (useRelativePath)
{ {
string fullPath = Path.Combine(Constants.APP_DIR, icon.RelativePath); StartSystemApp(startArg, type);
path = Path.GetFullPath(fullPath);
} }
else else
{ {
path = icon.Path; string path;
} if (useRelativePath)
p.StartInfo.FileName = path;
if (!StringUtil.IsEmpty(startArg))
{
p.StartInfo.Arguments = startArg;
}
if (icon.IconType == IconType.OTHER)
{
if (!File.Exists(path) && !Directory.Exists(path))
{ {
//如果没有使用相对路径 那么使用相对路径启动一次 string fullPath = Path.Combine(Constants.APP_DIR, icon.RelativePath);
if (!useRelativePath) path = Path.GetFullPath(fullPath);
{
StartIconApp(icon, type, true);
return;
}
else
{
HandyControl.Controls.Growl.WarningGlobal("程序启动失败(文件路径不存在或已删除)!");
return;
}
} }
p.StartInfo.WorkingDirectory = path.Substring(0, path.LastIndexOf("\\")); else
switch (type)
{ {
case IconStartType.ADMIN_STARTUP: path = icon.Path;
p.StartInfo.Verb = "runas"; }
if (appData.AppConfig.AppHideType == AppHideType.START_EXE && !RunTimeStatus.LOCK_APP_PANEL) p.StartInfo.FileName = path;
if (!StringUtil.IsEmpty(startArg))
{
p.StartInfo.Arguments = startArg;
}
if (icon.IconType == IconType.OTHER)
{
if (!File.Exists(path) && !Directory.Exists(path))
{
//如果没有使用相对路径 那么使用相对路径启动一次
if (!useRelativePath)
{ {
//如果开启了贴边隐藏 则窗体不贴边才隐藏窗口 StartIconApp(icon, type, true);
if (appData.AppConfig.MarginHide) return;
}
else
{
HandyControl.Controls.Growl.WarningGlobal("程序启动失败(文件路径不存在或已删除)!");
return;
}
}
p.StartInfo.WorkingDirectory = path.Substring(0, path.LastIndexOf("\\"));
switch (type)
{
case IconStartType.ADMIN_STARTUP:
//p.StartInfo.Arguments = "1";//启动参数
p.StartInfo.Verb = "runas";
//p.StartInfo.CreateNoWindow = false; //设置显示窗口
p.StartInfo.UseShellExecute = true;//不使用操作系统外壳程序启动进程
//p.StartInfo.ErrorDialog = false;
if (appData.AppConfig.AppHideType == AppHideType.START_EXE && !RunTimeStatus.LOCK_APP_PANEL)
{ {
if (!MarginHide.IsMargin()) //如果开启了贴边隐藏 则窗体不贴边才隐藏窗口
if (appData.AppConfig.MarginHide)
{
if (!MarginHide.IsMargin())
{
MainWindow.HideApp();
}
}
else
{
MainWindow.HideApp();
}
}
break;// c#好像不能case穿透
case IconStartType.DEFAULT_STARTUP:
if (appData.AppConfig.AppHideType == AppHideType.START_EXE && !RunTimeStatus.LOCK_APP_PANEL)
{
//如果开启了贴边隐藏 则窗体不贴边才隐藏窗口
if (appData.AppConfig.MarginHide)
{
if (!MarginHide.IsMargin())
{
MainWindow.HideApp();
}
}
else
{ {
MainWindow.HideApp(); MainWindow.HideApp();
} }
} }
else break;
{ case IconStartType.SHOW_IN_EXPLORE:
MainWindow.HideApp(); p.StartInfo.FileName = "Explorer.exe";
} p.StartInfo.Arguments = "/e,/select," + icon.Path;
break;
} }
break;// c#好像不能case穿透
case IconStartType.DEFAULT_STARTUP:
if (appData.AppConfig.AppHideType == AppHideType.START_EXE && !RunTimeStatus.LOCK_APP_PANEL)
{
//如果开启了贴边隐藏 则窗体不贴边才隐藏窗口
if (appData.AppConfig.MarginHide)
{
if (!MarginHide.IsMargin())
{
MainWindow.HideApp();
}
}
else
{
MainWindow.HideApp();
}
}
break;
case IconStartType.SHOW_IN_EXPLORE:
p.StartInfo.FileName = "Explorer.exe";
p.StartInfo.Arguments = "/e,/select," + icon.Path;
break;
} }
} else
else
{
if (appData.AppConfig.AppHideType == AppHideType.START_EXE && !RunTimeStatus.LOCK_APP_PANEL)
{ {
//如果开启了贴边隐藏 则窗体不贴边才隐藏窗口 if (appData.AppConfig.AppHideType == AppHideType.START_EXE && !RunTimeStatus.LOCK_APP_PANEL)
if (appData.AppConfig.MarginHide)
{ {
if (!MarginHide.IS_HIDE) //如果开启了贴边隐藏 则窗体不贴边才隐藏窗口
if (appData.AppConfig.MarginHide)
{
if (!MarginHide.IS_HIDE)
{
MainWindow.HideApp();
}
}
else
{ {
MainWindow.HideApp(); MainWindow.HideApp();
} }
} }
else }
{ p.Start();
MainWindow.HideApp(); if (useRelativePath)
} {
//如果使用相对路径启动成功 那么重新设置程序绝对路径
icon.Path = path;
} }
} }
p.Start();
p.Close();
p.Dispose();
if (useRelativePath)
{
//如果使用相对路径启动成功 那么重新设置程序绝对路径
icon.Path = path;
}
} }
//}
icon.Count++; icon.Count++;
//隐藏搜索框 //隐藏搜索框