冲突

XHWK.Model/Model_UserInfo.cs

@@ -1,8 +1,23 @@
-namespace XHWK.Model
+using System.Collections.Generic;
+
+namespace XHWK.Model
 {
     public class Model_UserInfo
     {
-        string _wkName;
-        public string WkName { get => _wkName; set => _wkName = value; }
+        private string _userName;
+        private string _name;
+        private List<Model_WKData> _wkdata;
+        /// <summary>
+        /// 用户名
+        /// </summary>
+        public string UserName { get => _userName; set => _userName = value; }
+        /// <summary>
+        /// 姓名
+        /// </summary>
+        public string Name { get => _name; set => _name = value; }
+        /// <summary>
+        /// 微课列表信息
+        /// </summary>
+        public List<Model_WKData> Wkdata { get => _wkdata; set => _wkdata = value; }
     }
 }

XHWK.Model/Model_Video.cs

@@ -11,7 +11,6 @@
         private Enum_WKVidetype _wkType;
         private string _RSTime;
         private string _videoSize;
-        private string _drawDataPath;
         /// <summary>
         /// 视频路径
         /// </summary>
@@ -36,10 +35,6 @@
         /// 视频大小
         /// </summary>
         public string VideoSize { get => _videoSize; set => _videoSize = value; }
-        /// <summary>
-        /// 画板数据存储路径
-        /// </summary>
-        public string DrawDataPath { get => _drawDataPath; set => _drawDataPath = value; }
     }
     /// <summary>
     /// 视频格式类型

XHWK.Model/Model_WKData.cs

@@ -7,6 +7,8 @@ namespace XHWK.Model
         private string _wkName;
         private List<Model_Video> _videoList;
         private string _wkPath;
+        private string _wkDateTime;
+        private string _drawDataPath;
         /// <summary>
         /// 微课名
         /// </summary>
@@ -19,5 +21,13 @@ namespace XHWK.Model
         /// 微课路径
         /// </summary>
         public string WkPath { get => _wkPath; set => _wkPath = value; }
+        /// <summary>
+        /// 微课时间
+        /// </summary>
+        public string WkDateTime { get => _wkDateTime; set => _wkDateTime = value; }
+        /// <summary>
+        /// 画板数据存储路径
+        /// </summary>
+        public string DrawDataPath { get => _drawDataPath; set => _drawDataPath = value; }
     }
 }

XHWK.WKTool/CreateAMicroLessonWindow.xaml

@@ -22,7 +22,7 @@
             <Border Grid.Row="0" Background="#2D8CF0">
                 <Grid>
                     <TextBlock Text="创建微课" Foreground="#FFFFFF" FontSize="16" Padding="10,13,0,0"/>
-                    <Button  Cursor="Hand" Grid.Row="0" x:Name="btnDown" Content="×" Foreground="#FFFFFF" FontSize="25" Padding="10,0,10,0" HorizontalAlignment="Right" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="btnDown_Click"/>
+                    <Button  Cursor="Hand" Grid.Row="0" x:Name="btnDown" Content="×" Foreground="#FFFFFF" FontSize="25" Padding="10,0,10,0" HorizontalAlignment="Right" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnDown_Click"/>
                 </Grid>
             </Border>
             <!--第二行 讲解名称-->
@@ -43,7 +43,7 @@
                     <TextBox x:Name="txbStoragePath" Text="D:\" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="223" Height="42" BorderBrush="{x:Null}" BorderThickness="0"/>
                 </Border>
                 <!--浏览按钮-->
-                <Button  Cursor="Hand" x:Name="btnBrowse" Content="浏览" FontSize="18" Width="80" Height="43" Margin="18,0,0,0" Click="btnBrowse_Click">
+                <Button  Cursor="Hand" x:Name="btnBrowse" Content="浏览" FontSize="18" Width="80" Height="43" Margin="18,0,0,0" Click="BtnBrowse_Click">
                     <Button.Template>
                         <ControlTemplate TargetType="{x:Type Button}">
                             <Border
@@ -61,7 +61,7 @@
                 </Button>
             </StackPanel>
             <!--第四行 开始按钮-->
-            <Button  Cursor="Hand" Grid.Row="3" x:Name="btnStart" Content="开始" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="418" Height="43" Margin="10,0,10,0" Click="btnStart_Click">
+            <Button  Cursor="Hand" Grid.Row="3" x:Name="btnStart" Content="开始" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="418" Height="43" Margin="10,0,10,0" Click="BtnStart_Click">
                 <Button.Template>
                     <ControlTemplate TargetType="{x:Type Button}">
                         <Border

XHWK.WKTool/LoginWindow.xaml

@@ -23,7 +23,7 @@
             <Border Grid.Row="0" Background="#2D8CF0">
                 <Grid>
                     <TextBlock Text="登录星火微课系统" Foreground="#FFFFFF" FontSize="16" Padding="10,13,0,0"/>
-                    <Button  Cursor="Hand" Grid.Row="0" x:Name="btnDown" Content="×" Foreground="#FFFFFF" FontSize="25" Padding="10,0,10,0" HorizontalAlignment="Right" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="btnDown_Click"/>
+                    <Button  Cursor="Hand" Grid.Row="0" x:Name="btnDown" Content="×" Foreground="#FFFFFF" FontSize="25" Padding="10,0,10,0" HorizontalAlignment="Right" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnDown_Click"/>
                 </Grid>
             </Border>
             <!--第二行 登陆 账号-->
@@ -63,7 +63,7 @@
             </StackPanel>
             
             <!--第五行 开始按钮-->
-            <Button  Cursor="Hand" Grid.Row="4" x:Name="btnStart" Content="登录" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="418" Height="43" Margin="10,0,10,0" Click="btnStart_Click">
+            <Button  Cursor="Hand" Grid.Row="4" x:Name="btnStart" Content="登录" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="418" Height="43" Margin="10,0,10,0" Click="BtnStart_Click">
                 <Button.Template>
                     <ControlTemplate TargetType="{x:Type Button}">
                         <Border

XHWK.WKTool/LoginWindow.xaml.cs

@@ -16,7 +16,7 @@ namespace XHWK.WKTool
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void btnDown_Click(object sender, RoutedEventArgs e)
+        private void BtnDown_Click(object sender, RoutedEventArgs e)
         {
 
         }
@@ -25,7 +25,7 @@ namespace XHWK.WKTool
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void btnStart_Click(object sender, RoutedEventArgs e)
+        private void BtnStart_Click(object sender, RoutedEventArgs e)
         {
 
         }