lxmou666/JianGongYun
lxmou666
/
JianGongYun
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

删除无用页面和修改启动参数项

This commit is contained in:
wbin 2021-02-14 10:20:37 +08:00
parent ef11110b7f
commit 295be45a3a
17 changed files with 15 additions and 518 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
JianGongYun/App.xaml
View File

@ -3,13 +3,10 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
d1p1:Ignorable="d" d1p1:Ignorable="d"
xmlns:local="clr-namespace:JianGongYun"
xmlns:vm="clr-namespace:JianGongYun.ViewModel"
xmlns:d1p1="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d1p1="http://schemas.openxmlformats.org/markup-compatibility/2006"
StartupUri="/Views/Login.xaml"> StartupUri="/Views/Login.xaml">
<Application.Resources> <Application.Resources>
<ResourceDictionary> <ResourceDictionary>
<vm:ViewModelLocator x:Key="Locator" d:IsDataSource="True" />
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/sznykt;component/Style/ShowControl.xaml"/> <ResourceDictionary Source="pack://application:,,,/sznykt;component/Style/ShowControl.xaml"/>
<ResourceDictionary Source="pack://application:,,,/sznykt;component/Style/TRTCResource.xaml"/> <ResourceDictionary Source="pack://application:,,,/sznykt;component/Style/TRTCResource.xaml"/>

12
JianGongYun/JianGongYun.csproj
View File

@ -15,7 +15,6 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AduSkin" Version="1.1.1.8" /> <PackageReference Include="AduSkin" Version="1.1.1.8" />
<PackageReference Include="CommonServiceLocator" Version="2.0.5" /> <PackageReference Include="CommonServiceLocator" Version="2.0.5" />
<PackageReference Include="MvvmLightLibs" Version="5.4.1.1" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="OpenCvSharp4.runtime.win" Version="4.5.1.20201229" /> <PackageReference Include="OpenCvSharp4.runtime.win" Version="4.5.1.20201229" />
<PackageReference Include="OpenCvSharp4.WpfExtensions" Version="4.5.1.20201229" /> <PackageReference Include="OpenCvSharp4.WpfExtensions" Version="4.5.1.20201229" />
@ -24,11 +23,6 @@
<ItemGroup Condition="'$(TargetFramework)' != 'net45'"> <ItemGroup Condition="'$(TargetFramework)' != 'net45'">
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" /> <PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Compile Update="Views\Window2.xaml.cs">
<SubType>Code</SubType>
</Compile>
</ItemGroup>
<ItemGroup> <ItemGroup>
<None Update="App.config"> <None Update="App.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@ -37,12 +31,6 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup>
<Page Update="Views\Window2.xaml">
<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
<SubType>Designer</SubType>
</Page>
</ItemGroup>
<ItemGroup> <ItemGroup>
<Reference Include="ManageLiteAV" Condition="'$(Platform)' == 'x64'"> <Reference Include="ManageLiteAV" Condition="'$(Platform)' == 'x64'">
<HintPath>TRTC_SDK\Win64\lib\ManageLiteAV.dll</HintPath> <HintPath>TRTC_SDK\Win64\lib\ManageLiteAV.dll</HintPath>

38
JianGongYun/MainWindow.xaml
View File

@ -1,38 +0,0 @@
<Metro:MetroWindow
x:Class="JianGongYun.MainWindow"
xmlns:Metro="clr-namespace:AduSkin.Controls.Metro;assembly=AduSkin"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:JianGongYun"
mc:Ignorable="d"
Title="建工云课堂" MinWidth="600" MinHeight="350"
d:DesignHeight="1200" d:DesignWidth="1600"
BorderThickness="0" WindowStyle="None"
Background="#FFF"
DataContext="{Binding Source={StaticResource Locator},Path=Main}">
<Metro:MetroWindow.Menu>
<Metro:MetroTitleMenu Height="40">
<Metro:MetroTitleMenuItem Header="联系我们">
<Metro:MetroMenuItem Header="QQ" />
</Metro:MetroTitleMenuItem>
<Metro:MetroTitleMenuItem Header="关于">
<MenuItem Style="{StaticResource MenuItem_NonStyle}" Height="30">
<MenuItem.Header>
<Grid>
<TextBlock Text="主题色" Margin="33,0" VerticalAlignment="Center"/>
<Metro:MetroColorPicker x:Name="Theme" Width="20" Height="20" Background="{StaticResource DefaultBrush}" DefaultColor="{StaticResource DefaultBrush}" />
</Grid>
</MenuItem.Header>
</MenuItem>
</Metro:MetroTitleMenuItem>
</Metro:MetroTitleMenu>
</Metro:MetroWindow.Menu>
<Grid>
<ContentControl Content="{Binding TeachingInfo}"/>
</Grid>
</Metro:MetroWindow>

52
JianGongYun/MainWindow.xaml.cs
View File

@ -1,52 +0,0 @@
using AduSkin.Controls.Metro;
using AduSkin.Themes;
using JianGongYun.TRTC;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace JianGongYun
{
/// <summary>
/// Interaction logic for MainWindow.xaml
/// </summary>
public partial class MainWindow : MetroWindow
{
public MainWindow()
{
InitializeComponent();
this.Closed += delegate { Environment.Exit(0); };
Theme.ColorChange += delegate
{
// 不要通过XAML来绑定颜色，无法获取到通知
BorderBrush = Theme.CurrentColor.OpaqueSolidColorBrush;
};
BorderBrush = new SolidColorBrush(color: Color.FromRgb(42, 43, 48));
this.Hide();
//LiveClassroom.EnterTheClassroom(Window.GetWindow(this),
// new TRTC.Models.ClassroomEntity
// {
// ClassHead = "课程1",
// ClassSubHead = "章节1",
// TeacherId = "53245345",
// TeacherName = "王大锤"
// });
//TRTC集成测试
//ManageLiteAV.ITRTCCloud lTRTCCloud = ManageLiteAV.ITRTCCloud.getTRTCShareInstance();
//MessageBox.Show(lTRTCCloud.getSDKVersion());
//ManageLiteAV.ITRTCCloud.destroyTRTCShareInstance();
}
}
}

2
JianGongYun/Properties/launchSettings.json
View File

@ -2,7 +2,7 @@
"profiles": { "profiles": {
"JianGongYun": { "JianGongYun": {
"commandName": "Project", "commandName": "Project",
"commandLineArgs": "--classhead 测试课程1 --classsubhead 测试章节1 --teacherid 12345678 --teachername 王大锤", "commandLineArgs": "sznykt://--classhead|测试课程1|--classsubhead|测试章节1|--teacherid|12345678|--teachername|王大锤",
"nativeDebugging": false "nativeDebugging": false
} }
} }

28
JianGongYun/ViewModel/MainViewModel.cs
View File

@ -1,28 +0,0 @@
using GalaSoft.MvvmLight;
using JianGongYun.Views;
using System;
using System.Collections.Generic;
using System.Text;
using System.Windows.Controls;
namespace JianGongYun.ViewModel
{
public class MainViewModel : ViewModelBase
{
public MainViewModel()
{
}
/// <summary>
/// 实用案例
/// </summary>
private UserControl _TeachingInfo = new TeachingInfo();
public UserControl TeachingInfo
{
get { return _TeachingInfo; }
set { Set(ref _TeachingInfo, value); }
}
}
}

91
JianGongYun/ViewModel/ModuleViewModel/PracticalCaseViewModel.cs
View File

@ -1,91 +0,0 @@
using GalaSoft.MvvmLight;
using JianGongYun.Models;
using JianGongYun.Views;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Windows.Controls;
using System.Windows.Data;
namespace JianGongYun.ViewModel.ModuleViewModel
{
public class PracticalCaseViewModel : ViewModelBase
{
public PracticalCaseViewModel()
{
#region 控件
_ControlList = new List<ControlModel>()
{
new ControlModel("Win10菜单", typeof(Window1)),
new ControlModel("Win10菜单cccc", typeof(Window2)),
new ControlModel("教学计划", typeof(TeachingPlan))
};
_AllControl.Source = _ControlList;
_AllControl.View.Culture = new System.Globalization.CultureInfo("zh-CN");
#endregion
}
#region 控件
private IEnumerable<ControlModel> _ControlList;
/// <summary>
/// 所有控件
/// </summary>
public IEnumerable<ControlModel> AllControl
{
get { return _ControlList; }
set { Set(ref _ControlList, value); }
}
private CollectionViewSource _AllControl=new CollectionViewSource();
/// <summary>
/// 所有控件
/// </summary>
public CollectionViewSource AllControlViewSource
{
get { return _AllControl; }
set
{
Set(ref _AllControl, value);
}
}
#endregion
private ControlModel _CurrentShowControl = null;
/// <summary>
/// 当前显示控件
/// </summary>
public ControlModel CurrentShowControl
{
get
{
return _CurrentShowControl;
}
set
{
Set(ref _CurrentShowControl, value);
RaisePropertyChanged("Content");
}
}
/// <summary>
/// 控件显示
/// </summary>
private UserControl _content;
public UserControl Content
{
get
{
if (CurrentShowControl == null)
return null;
return (UserControl)Activator.CreateInstance(CurrentShowControl.Content);
}
set
{
Set(ref _content, value);
}
}
}
}

50
JianGongYun/ViewModel/ViewModelLocator.cs
View File

@ -1,50 +0,0 @@
using CommonServiceLocator;
using GalaSoft.MvvmLight.Ioc;
using System;
using System.Collections.Generic;
using System.Text;
namespace JianGongYun.ViewModel
{
/// <summary>
/// This class contains static references to all the view models in the
/// application and provides an entry point for the bindings.
/// </summary>
public class ViewModelLocator
{
/// <summary>
/// Initializes a new instance of the ViewModelLocator class.
/// </summary>
public ViewModelLocator()
{
ServiceLocator.SetLocatorProvider(() => SimpleIoc.Default);
////if (ViewModelBase.IsInDesignModeStatic)
////{
//// // Create design time view services and models
//// SimpleIoc.Default.Register<IDataService, DesignDataService>();
////}
////else
////{
//// // Create run time view services and models
//// SimpleIoc.Default.Register<IDataService, DataService>();
////}
SimpleIoc.Default.Register<MainViewModel>();
}
public MainViewModel Main
{
get
{
return ServiceLocator.Current.GetInstance<MainViewModel>();
}
}
public static void Cleanup()
{
// TODO Clear the ViewModels
}
}
}

15
JianGongYun/Views/Login.xaml.cs
View File

@ -14,6 +14,7 @@ using System.Windows.Media;
using System.Windows.Media.Imaging; using System.Windows.Media.Imaging;
using System.Windows.Shapes; using System.Windows.Shapes;
using System.Linq; using System.Linq;
using System.Web;
namespace JianGongYun.Views namespace JianGongYun.Views
{ {
@ -29,8 +30,20 @@ namespace JianGongYun.Views
public Login() public Login()
{ {
InitializeComponent(); InitializeComponent();
var args = Environment.GetCommandLineArgs();
string errMsg = "", classHead = default, classSubHead = default, teacherId = default, teacherName = default; string errMsg = "", classHead = default, classSubHead = default, teacherId = default, teacherName = default;
var urltemps = Environment.GetCommandLineArgs();
if (urltemps.Length < 2)
{
errMsg = $"Startup Parameter Null";
goto Skip;
}
var first = urltemps[1];
if (!first.StartsWith("sznykt"))
{
errMsg = "Startup Parameter Error";
goto Skip;
}
var args= HttpUtility.UrlDecode(first, Encoding.UTF8).Replace("://","|").Split("|");
int indexTemp = Array.IndexOf(args, CLASS_HEAD); int indexTemp = Array.IndexOf(args, CLASS_HEAD);
if (indexTemp < 0) if (indexTemp < 0)
{ {

76
JianGongYun/Views/TeachingInfo.xaml
View File

@ -1,76 +0,0 @@
<UserControl x:Class="JianGongYun.Views.TeachingInfo"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:viewmodel="clr-namespace:JianGongYun.ViewModel.ModuleViewModel"
xmlns:Metro="clr-namespace:AduSkin.Controls.Metro;assembly=AduSkin"
xmlns:local="clr-namespace:JianGongYun.Views"
mc:Ignorable="d"
d:DesignHeight="700" d:DesignWidth="900">
<UserControl.DataContext>
<viewmodel:PracticalCaseViewModel/>
</UserControl.DataContext>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="250"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Border Background="#FFF" BorderThickness="0,0,1,0" >
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="*"></RowDefinition>
</Grid.RowDefinitions>
<Canvas x:Name="CanvasContent">
<ListBox Height="{Binding ElementName=CanvasContent,Path=ActualHeight}" ItemsSource="{Binding AllControlViewSource.View}" BorderThickness="0" Background="#2F3035" SelectedItem="{Binding CurrentShowControl}">
<ListBox.Resources>
<Style TargetType="ListBoxItem">
<Setter Property="Background" Value="Transparent" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="Padding" Value="0" />
<Setter Property="Cursor" Value="Hand"/>
</Style>
</ListBox.Resources>
<ListBox.ItemTemplate>
<DataTemplate>
<Border MinHeight="40" Width="245" Background="#00000000" x:Name="Bd" BorderBrush="#2F3035" BorderThickness="0 1 0 0">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding Title}" Foreground="White" Margin="20,0" VerticalAlignment="Center" HorizontalAlignment="Left"/>
</Grid>
</Border>
<DataTemplate.Triggers>
<DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ListBoxItem}}, Path=IsSelected}" Value="True">
<Setter TargetName="Bd" Property="Background" Value="#3E7FFF" />
</DataTrigger>
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="IsMouseOver" Value="True" />
</MultiTrigger.Conditions>
<Setter TargetName="Bd" Property="Background" Value="WhiteSmoke" />
</MultiTrigger>
</DataTemplate.Triggers>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
<!--测试按钮-->
<Metro:AduFlatButton Content="直播窗口测试弹出" Click="LiveTest_Click" Canvas.Bottom="100" Canvas.Left="77"></Metro:AduFlatButton>
<!--测试按钮结束-->
</Canvas>
</Grid>
</Border>
<Grid Grid.Column="1">
<Border Margin="0" Height="Auto" Width="Auto" CornerRadius="6" >
<Grid>
<Grid.RowDefinitions >
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<ContentPresenter Grid.Row="0" Height="Auto" Content="{Binding Content}"/>
</Grid>
</Border>
</Grid>
</Grid>
</UserControl>

52
JianGongYun/Views/TeachingInfo.xaml.cs
View File

@ -1,52 +0,0 @@
using AduSkin.Controls;
using AduSkin.Controls.Metro;
using JianGongYun.TRTC;
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Text;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
namespace JianGongYun.Views
{
/// <summary>
/// TeachingInfo.xaml 的交互逻辑
/// </summary>
public partial class TeachingInfo : UserControl
{
public TeachingInfo()
{
InitializeComponent();
}
private void LiveTest_Click(object sender, RoutedEventArgs e)
{
var roomId = ConfigurationManager.AppSettings["RoomId"];
if (string.IsNullOrWhiteSpace(roomId))
{
NoticeManager.NotifiactionShow.AddNotifiaction(new NotifiactionModel()
{
Title = "提醒",
Content = $"未配置房间号",
NotifiactionType= EnumPromptType.Error
});
return;
}
LiveClassroom.EnterTheClassroom(Window.GetWindow(this),
new TRTC.Models.ClassroomEntity
{
ClassHead = "课程1",
ClassSubHead = "章节1",
TeacherId = roomId,
TeacherName = "王大锤"
});
}
}
}

12
JianGongYun/Views/TeachingPlan.xaml
View File

@ -1,12 +0,0 @@
<UserControl x:Class="JianGongYun.Views.TeachingPlan"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:JianGongYun.Views"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>
</Grid>
</UserControl>

26
JianGongYun/Views/TeachingPlan.xaml.cs
View File

@ -1,26 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace JianGongYun.Views
{
/// <summary>
/// TeachingPlan.xaml 的交互逻辑
/// </summary>
public partial class TeachingPlan : UserControl
{
public TeachingPlan()
{
InitializeComponent();
}
}
}

14
JianGongYun/Views/Window1.xaml
View File

@ -1,14 +0,0 @@
<UserControl x:Class="JianGongYun.Views.Window1"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:JianGongYun.Views"
mc:Ignorable="d">
<Grid Background="Aqua">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"></RowDefinition>
</Grid.RowDefinitions>
<TextBox Grid.Row="0" Text="5r4354545"></TextBox>
</Grid>
</UserControl>

25
JianGongYun/Views/Window1.xaml.cs
View File

@ -1,25 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
namespace JianGongYun.Views
{
/// <summary>
/// Window1.xaml 的交互逻辑
/// </summary>
public partial class Window1 : UserControl
{
public Window1()
{
InitializeComponent();
}
}
}

12
JianGongYun/Views/Window2.xaml
View File

@ -1,12 +0,0 @@
<UserControl x:Class="JianGongYun.Views.Window2"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:JianGongYun.Views"
mc:Ignorable="d"
>
<Grid>
<TextBox Text="fdfdfdfdfdfdf"></TextBox>
</Grid>
</UserControl>

25
JianGongYun/Views/Window2.xaml.cs
View File

@ -1,25 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
namespace JianGongYun.Views
{
/// <summary>
/// Window1.xaml 的交互逻辑
/// </summary>
public partial class Window2 : UserControl
{
public Window2()
{
InitializeComponent();
}
}
}