From 8423cfdfe67dfdc1f23af1d38a5edda3055ca43c Mon Sep 17 00:00:00 2001
From: wbin <737436093@qq.com>
Date: Tue, 16 Feb 2021 16:48:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AA=97=E4=BD=93=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 JianGongYun/TRTC/Windows/LiveWindow.xaml.cs    | 1 +
 JianGongYun/TRTC/Windows/SettingWindow.xaml    | 2 +-
 JianGongYun/TRTC/Windows/SettingWindow.xaml.cs | 1 +
 JianGongYun/Views/Login.xaml                   | 2 +-
 JianGongYun/Views/Login.xaml.cs                | 1 +
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/JianGongYun/TRTC/Windows/LiveWindow.xaml.cs b/JianGongYun/TRTC/Windows/LiveWindow.xaml.cs
index c645166..1e276ee 100644
--- a/JianGongYun/TRTC/Windows/LiveWindow.xaml.cs
+++ b/JianGongYun/TRTC/Windows/LiveWindow.xaml.cs
@@ -32,6 +32,7 @@ namespace JianGongYun.TRTC.Windows
         public LiveWindow()
         {
             InitializeComponent();
+            this.Icon = new BitmapImage(new Uri("logo.ico", UriKind.RelativeOrAbsolute));
             NoticeManager.Initialize();
             //AttachConsole(-1);//把进程挂在控制台，通过命令行启动程序可以看到控制台输出
             LiveWindowViewModel = new ViewModels.LiveWindowViewModel();
diff --git a/JianGongYun/TRTC/Windows/SettingWindow.xaml b/JianGongYun/TRTC/Windows/SettingWindow.xaml
index d0351e7..956e0d3 100644
--- a/JianGongYun/TRTC/Windows/SettingWindow.xaml
+++ b/JianGongYun/TRTC/Windows/SettingWindow.xaml
@@ -7,7 +7,7 @@
         xmlns:local="clr-namespace:JianGongYun.TRTC.Windows"
         mc:Ignorable="d"
         ResizeMode="NoResize"          
-        Title="设置" Height="380" Width="650">
+        Title="设置" Height="380" Width="650" >
     <Metro:MetroWindow.Resources>
 
         <DataTemplate x:Key="CusHeaderTitle1">
diff --git a/JianGongYun/TRTC/Windows/SettingWindow.xaml.cs b/JianGongYun/TRTC/Windows/SettingWindow.xaml.cs
index b0e2d4d..2e47dc7 100644
--- a/JianGongYun/TRTC/Windows/SettingWindow.xaml.cs
+++ b/JianGongYun/TRTC/Windows/SettingWindow.xaml.cs
@@ -29,6 +29,7 @@ namespace JianGongYun.TRTC.Windows
             {
                 _Instance = new SettingWindow();
             }
+            _Instance.Icon= new BitmapImage(new Uri("logo.ico", UriKind.Relative));
             return _Instance;
         }
 
diff --git a/JianGongYun/Views/Login.xaml b/JianGongYun/Views/Login.xaml
index 0550434..6e502fc 100644
--- a/JianGongYun/Views/Login.xaml
+++ b/JianGongYun/Views/Login.xaml
@@ -6,7 +6,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:JianGongYun.Views"
         mc:Ignorable="d"
-        Title="Login" Height="450" Width="800">
+        Title="Login" Height="450" Width="800" >
     <Grid>
 
     </Grid>
diff --git a/JianGongYun/Views/Login.xaml.cs b/JianGongYun/Views/Login.xaml.cs
index a9f6f9b..82b001a 100644
--- a/JianGongYun/Views/Login.xaml.cs
+++ b/JianGongYun/Views/Login.xaml.cs
@@ -30,6 +30,7 @@ namespace JianGongYun.Views
         public Login()
         {
             InitializeComponent();
+            this.Icon = new BitmapImage(new Uri("logo.ico", UriKind.Relative));
             string errMsg = "", classHead = default, classSubHead = default, teacherId = default, teacherName = default;
             var urltemps = Environment.GetCommandLineArgs();
             if (urltemps.Length < 2)