zhao：1修改文字，2修改摄像头

XHZB.Desktop/App.config

@@ -9,8 +9,8 @@
     <!--是否输出信息日志0否-->
     <add key="OutputVideoLog" value="0" />
     <!--版本号-->
-    <add key="VersionCode" value="2" />
-    <add key="VersionName" value="1.0.2" />
+    <add key="VersionCode" value="3" />
+    <add key="VersionName" value="1.0.3" />
     <!--图片压缩质量 0最差 100最佳-->
     <add key="ImageCompressionLevel" value="100" />
     <add key="userName" value="" />

XHZB.Desktop/CameraWindow.xaml

@@ -5,12 +5,11 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:XHZB.Desktop" xmlns:wfi="http://schemas.microsoft.com/netfx/2007/xaml/presentation"
 xmlns:aforge ="clr-namespace:AForge.Controls;assembly=AForge.Controls"
-        mc:Ignorable="d"
-        Title="摄像头" Height="200" Width="250" ResizeMode="NoResize"
+        mc:Ignorable="d" Height="180" Width="320" ResizeMode="NoResize" WindowStyle="None" 
     >
     <Grid>
-        <wfi:WindowsFormsHost Grid.Row="0" Grid.Column="1" x:Name="wfhCamera" Margin="0">
-            <aforge:VideoSourcePlayer x:Name="player" Height="124" Width="172"  />
+        <wfi:WindowsFormsHost Grid.Row="0" Grid.Column="1" x:Name="wfhCamera" Margin="0" Cursor="SizeAll" >
+            <aforge:VideoSourcePlayer x:Name="player" Height="180" Width="320" MouseDown="player_MouseDown" MouseMove="player_MouseMove"/>
         </wfi:WindowsFormsHost>
     </Grid>
 </Window>

XHZB.Desktop/CameraWindow.xaml.cs

@@ -32,5 +32,96 @@ namespace XHZB.Desktop
                 player.Start();
             }
         }
+
+        #region 窗体移动
+        /// <summary>
+        /// 记录初始点
+        /// </summary>
+        Point mPoint = new Point(0,0);
+        bool IsStretching = false;
+        int Position = 0;
+        private void player_MouseDown(object sender, System.Windows.Forms.MouseEventArgs e)
+        {
+            mPoint = new Point(e.X, e.Y);
+        }
+
+        private void player_MouseMove(object sender, System.Windows.Forms.MouseEventArgs e)
+        {
+            if (e.Button == System.Windows.Forms.MouseButtons.Left)
+            {
+                if (IsStretching)
+                {
+                    switch (Position)
+                    {
+                        case 1:
+                            this.Left = this.Left - (mPoint.X - e.X);
+                            this.Top = this.Top - (mPoint.Y - e.Y);
+                            this.Width = this.Width + (mPoint.X - e.X);
+                            this.Height = this.Height + (mPoint.Y - e.Y);
+                            break;
+                        case 2:
+                            this.Left = this.Left - (mPoint.X - e.X);
+                            this.Width = this.Width + (mPoint.X - e.X);
+                            this.Height = this.Height - (mPoint.Y - e.Y);
+                            mPoint = new Point(mPoint.X, e.Y);
+                            break;
+                        case 3:
+                            this.Top = this.Top - (mPoint.Y - e.Y);
+                            this.Width = this.Width - (mPoint.X - e.X);
+                            this.Height = this.Height + (mPoint.Y - e.Y);
+                            mPoint = new Point(e.X, mPoint.Y);
+                            break;
+                        case 4:
+                            this.Width = this.Width - (mPoint.X - e.X);
+                            this.Height = this.Height - (mPoint.Y - e.Y);
+                            mPoint = new Point(e.X, e.Y);
+                            break;
+                        default:
+                            break;
+                    }
+                }
+                else
+                {
+                    this.Left = this.Left - (mPoint.X - e.X);
+                    this.Top = this.Top - (mPoint.Y - e.Y);
+                }
+            }
+            if (e.Button == System.Windows.Forms.MouseButtons.None)
+            {
+                if (e.X <= 5 && e.Y <= 5)//左上
+                {
+                    IsStretching = true;
+                    Position = 1;
+                    wfhCamera.Cursor = Cursors.SizeNWSE;
+                }
+                else if (e.X <= 5 && e.Y >= wfhCamera.ActualHeight - 5)//左下
+                {
+                    IsStretching = true;
+                    Position = 2;
+                    wfhCamera.Cursor = Cursors.SizeNESW;
+                }
+                else if (e.X >= wfhCamera.ActualWidth - 5 && e.Y <= 5)//右上
+                {
+                    IsStretching = true;
+                    Position = 3;
+                    wfhCamera.Cursor = Cursors.SizeNESW;
+                }
+                else if (e.X >= wfhCamera.ActualWidth - 5 && e.Y >= wfhCamera.ActualHeight - 5)//右下
+                {
+                    IsStretching = true;
+                    Position = 4;
+                    wfhCamera.Cursor = Cursors.SizeNWSE;
+                }
+                else
+                {
+                    IsStretching = false;
+                    wfhCamera.Cursor = Cursors.SizeAll;
+                }
+
+            }
+
+        }
+        #endregion
+
     }
 }

XHZB.Desktop/LoginWindow.xaml

@@ -466,6 +466,7 @@
                 VerticalAlignment="Bottom"/>
                 </StackPanel>
             </Button>
+            <!--<Button Content="Button" HorizontalAlignment="Left" Margin="380,79,0,0" VerticalAlignment="Top" Width="75" Click="Button_Click"/>-->
         </Grid>
     </Viewbox>
 </Window>

XHZB.Desktop/LoginWindow.xaml.cs

@@ -990,6 +990,21 @@ namespace XHZB.Desktop
         {
             MessageWindow.Show(msg);
         }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+
+
+        double pwidth = SystemParameters.PrimaryScreenWidth;
+            if (APP.W_CameraWindow == null)
+            {
+                APP.W_CameraWindow = new CameraWindow();
+                APP.W_CameraWindow.Topmost = true;
+                APP.W_CameraWindow.Left = pwidth - 320;
+                APP.W_CameraWindow.Top = 0;
+            }
+            APP.W_CameraWindow.Show();
+        }
     }
 
     public class LoginPageData : NotifyModel

XHZB.Desktop/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.2.0")]
-[assembly: AssemblyFileVersion("1.0.2.0")]
+[assembly: AssemblyVersion("1.0.3.0")]
+[assembly: AssemblyFileVersion("1.0.3.0")]

XHZB.Desktop/ToolbarWindow.xaml.cs

@@ -80,7 +80,7 @@ namespace XHZB.Desktop
             });
             pageData.menuList.Add(new ToolbarMenu()
             {
-                Name = "直播",
+                Name = "开始直播",
                 Pic = "../Images/ToolBar/直播@2x.png"
             });
             pageData.menuList.Add(new ToolbarMenu()
@@ -100,7 +100,7 @@ namespace XHZB.Desktop
             });
             pageData.menuList.Add(new ToolbarMenu()
             {
-                Name = "结束课堂",
+                Name = "结束直播",
                 Pic = "../Images/ToolBar/下课@2x.png"
             });
 
@@ -173,29 +173,32 @@ namespace XHZB.Desktop
             }
             else if (clickindex == 1)//直播
             {
-                HideLevel2();
-                pageData.tongping = !pageData.tongping;
-                if (pageData.tongping&& isTool)
+                if (!pageData.tongping)
                 {
-                    isTool = false;
-                    if (StartLive(out string ErrMessage))
+                    HideLevel2();
+                    pageData.tongping = !pageData.tongping;
+                    if (pageData.tongping && isTool)
                     {
-                        pageData.menuList[1].Pic = "../Images/ToolBar/img_shared_1.gif";
-                        pageData.menuList[1].Name = "正在直播";
-
-                        if (APP.W_CameraWindow == null)
+                        isTool = false;
+                        if (StartLive(out string ErrMessage))
                         {
-                            APP.W_CameraWindow = new CameraWindow();
-                            APP.W_CameraWindow.Topmost = true;
-                            APP.W_CameraWindow.Left = pwidth - 300;
-                            APP.W_CameraWindow.Top = 0;
+                            pageData.menuList[1].Pic = "../Images/ToolBar/img_shared_1.gif";
+                            pageData.menuList[1].Name = "正在直播";
+
+                            if (APP.W_CameraWindow == null)
+                            {
+                                APP.W_CameraWindow = new CameraWindow();
+                                APP.W_CameraWindow.Topmost = true;
+                                APP.W_CameraWindow.Left = pwidth - 320;
+                                APP.W_CameraWindow.Top = 0;
+                            }
+                            APP.W_CameraWindow.Show();
+                        }
+                        else
+                        {
+                            pageData.tongping = !pageData.tongping;
+                            MessageWindow.Show(ErrMessage);
                         }
-                        APP.W_CameraWindow.Show();
-                    }
-                    else
-                    {
-                        pageData.tongping = !pageData.tongping;
-                        MessageWindow.Show(ErrMessage);
                     }
                 }
             }
@@ -269,7 +272,7 @@ namespace XHZB.Desktop
             }
             else if (clickindex == 5)//结束课堂。
             {
-                if (MessageWindow.Show("是否结束课堂?", "提示", MessageBoxButton.OKCancel) == MessageBoxResult.OK)
+                if (MessageWindow.Show("是否结束直播?", "提示", MessageBoxButton.OKCancel) == MessageBoxResult.OK)
                 {
                     closeAction();
                 }