可执行文件改名
This commit is contained in:
parent
32d79cd4d0
commit
5d3b4b3e82
|
|
@ -11,8 +11,8 @@
|
||||||
<ResourceDictionary>
|
<ResourceDictionary>
|
||||||
<vm:ViewModelLocator x:Key="Locator" d:IsDataSource="True" />
|
<vm:ViewModelLocator x:Key="Locator" d:IsDataSource="True" />
|
||||||
<ResourceDictionary.MergedDictionaries>
|
<ResourceDictionary.MergedDictionaries>
|
||||||
<ResourceDictionary Source="pack://application:,,,/JianGongYun;component/Style/ShowControl.xaml"/>
|
<ResourceDictionary Source="pack://application:,,,/sznykt;component/Style/ShowControl.xaml"/>
|
||||||
<ResourceDictionary Source="pack://application:,,,/JianGongYun;component/Style/TRTCResource.xaml"/>
|
<ResourceDictionary Source="pack://application:,,,/sznykt;component/Style/TRTCResource.xaml"/>
|
||||||
</ResourceDictionary.MergedDictionaries>
|
</ResourceDictionary.MergedDictionaries>
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
</Application.Resources>
|
</Application.Resources>
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@
|
||||||
<OutputType>WinExe</OutputType>
|
<OutputType>WinExe</OutputType>
|
||||||
<StartupObject></StartupObject>
|
<StartupObject></StartupObject>
|
||||||
<Platforms>AnyCPU;x64;x86</Platforms>
|
<Platforms>AnyCPU;x64;x86</Platforms>
|
||||||
|
<AssemblyName>sznykt</AssemblyName>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="AduSkin" Version="1.1.1.8" />
|
<PackageReference Include="AduSkin" Version="1.1.1.8" />
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@ namespace JianGongYun
|
||||||
public MainWindow()
|
public MainWindow()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
this.Closed += delegate { Application.Current.Shutdown(); };
|
this.Closed += delegate { Environment.Exit(0); };
|
||||||
Theme.ColorChange += delegate
|
Theme.ColorChange += delegate
|
||||||
{
|
{
|
||||||
// 不要通过XAML来绑定颜色,无法获取到通知
|
// 不要通过XAML来绑定颜色,无法获取到通知
|
||||||
|
|
|
||||||
|
|
@ -730,11 +730,12 @@ namespace JianGongYun.TRTC
|
||||||
//if (CallerWindow == null)
|
//if (CallerWindow == null)
|
||||||
//{
|
//{
|
||||||
// //关闭程序
|
// //关闭程序
|
||||||
// Application.Current.Shutdown();
|
// Environment.Exit(0);
|
||||||
// return;
|
// return;
|
||||||
//}
|
//}
|
||||||
//CallerWindow.Close();//直接关闭
|
//CallerWindow.Close();//直接关闭
|
||||||
Application.Current.Shutdown();
|
Environment.Exit(0);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -67,7 +67,7 @@ namespace JianGongYun.Views
|
||||||
if (!string.IsNullOrWhiteSpace(errMsg))
|
if (!string.IsNullOrWhiteSpace(errMsg))
|
||||||
{
|
{
|
||||||
MessageBox.Show(errMsg, "错误", MessageBoxButton.OKCancel, MessageBoxImage.Error);
|
MessageBox.Show(errMsg, "错误", MessageBoxButton.OKCancel, MessageBoxImage.Error);
|
||||||
Application.Current.Shutdown();
|
Environment.Exit(0);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
LiveClassroom.EnterTheClassroom(Window.GetWindow(this),
|
LiveClassroom.EnterTheClassroom(Window.GetWindow(this),
|
||||||
|
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 9.4 KiB After Width: | Height: | Size: 264 KiB |
Loading…
Reference in New Issue