Skip to content

V
VIZ.TVP.CBA
Commit b427b58d by wangonghui
Options

插件CBA合并插件

parent 0a9d5f53
Showing with 561 additions and 922 deletions
VIZ.MIGU.CBA.Module/Common/AppConfigUtil.cs
...@@ -5,7 +5,7 @@ using System.Linq; ...@@ -5,7 +5,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace VIZ.TVP.CBA.Module.Common namespace VIZ.TVP.CBA.Module
{ {
public static class AppConfigUtil public static class AppConfigUtil
{ {
......
VIZ.MIGU.CBA.Module/Common/JsonHelper.cs
...@@ -11,7 +11,7 @@ using System.Security.Policy; ...@@ -11,7 +11,7 @@ using System.Security.Policy;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace VIZ.TVP.CBA.Module.Common namespace VIZ.TVP.CBA.Module
{ {
public static class JsonHelper public static class JsonHelper
{ {
......
VIZ.MIGU.CBA.Module/Common/JsonModel.cs
...@@ -9,13 +9,9 @@ using System.Security.Policy; ...@@ -9,13 +9,9 @@ using System.Security.Policy;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Input; using System.Windows.Input;
using VIZ.TVP.CBA.Module.DayMatch.Model;
using VIZ.TVP.CBA.Module.OnAirData;
using VIZ.TVP.CBA.Module.RoundMatch.Model;
using VIZ.TVP.CBA.Module.SeasonData;
using VIZ.TVP.CBA.Module.TeamStandings.Model;
namespace VIZ.TVP.CBA.Module.Common
namespace VIZ.TVP.CBA.Module
{ {
public static class JsonModel public static class JsonModel
{ {
......
VIZ.MIGU.CBA.Module/Common/Utils.cs
...@@ -4,13 +4,9 @@ using System.Linq; ...@@ -4,13 +4,9 @@ using System.Linq;
using System.Security.Cryptography; using System.Security.Cryptography;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using VIZ.TVP.CBA.Module.Main.ViewModel;
using VIZ.TVP.CBA.Module.OnAirData;
using VIZ.TVP.CBA.Module.SinglePlayer.ViewModel;
using VIZ.TVP.CBA.Module.TeamStats.Model;
using VIZ.TVP.CBA.Module.TeamStats.ViewModel;
namespace VIZ.TVP.CBA.Module.Common
namespace VIZ.TVP.CBA.Module
{ {
public static class Utils public static class Utils
{ {
......
VIZ.MIGU.CBA.Module/DayMatch/DayMatchPlugin.cs
...@@ -3,14 +3,15 @@ using System.Collections.Generic; ...@@ -3,14 +3,15 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using VIZ.TVP.CBA.Module.DayMatch.View;
using VIZ.TVP.CBA.Module.DayMatch.ViewModel;
using VIZ.Package.Plugin; using VIZ.Package.Plugin;
using VIZ.Package.Domain; using VIZ.Package.Domain;
using VIZ.Package.Module; using VIZ.Package.Module;
namespace VIZ.TVP.CBA.Module.DayMatch namespace VIZ.TVP.CBA.Module.DayMatch
{ {
/// <summary>
/// 比赛日期插件
/// </summary>
public class DayMatchPlugin : IPluginLifeCycle public class DayMatchPlugin : IPluginLifeCycle
{ {
/// <summary> /// <summary>
...@@ -19,12 +20,12 @@ namespace VIZ.TVP.CBA.Module.DayMatch ...@@ -19,12 +20,12 @@ namespace VIZ.TVP.CBA.Module.DayMatch
/// <remarks> /// <remarks>
/// 插件ID不能包含点号 /// 插件ID不能包含点号
/// </remarks> /// </remarks>
public const string PLUGIN_ID = "DayMatchUI"; public const string PLUGIN_ID = "DayMatchView";
/// <summary> /// <summary>
/// 插件显示名称 /// 插件显示名称
/// </summary> /// </summary>
public const string PLUGIN_NAME = "比赛日程"; public const string PLUGIN_NAME = "今日赛程";
public void Dispose() public void Dispose()
{ {
...@@ -37,9 +38,9 @@ namespace VIZ.TVP.CBA.Module.DayMatch ...@@ -37,9 +38,9 @@ namespace VIZ.TVP.CBA.Module.DayMatch
info.ID = PLUGIN_ID; info.ID = PLUGIN_ID;
info.Name = PLUGIN_NAME; info.Name = PLUGIN_NAME;
info.PluginType = PluginType.Page; info.PluginType = PluginType.Page;
info.ViewType = typeof(DayMatchUI); info.ViewType = typeof(DayMatchView);
//info.SettingViewType = typeof(DayMatchUI);
//info.SettingViewType = typeof(DayMatchUI);
return info; return info;
} }
} }
......
VIZ.MIGU.CBA.Module/DayMatch/Model/Dayschedule.cs
...@@ -6,9 +6,8 @@ using System.Linq; ...@@ -6,9 +6,8 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using VIZ.Framework.Core; using VIZ.Framework.Core;
using VIZ.TVP.CBA.Module.TempEnum;
namespace VIZ.TVP.CBA.Module.DayMatch.Model namespace VIZ.TVP.CBA.Module
{ {
public class Dayschedule: ViewModelBase public class Dayschedule: ViewModelBase
{ {
......
VIZ.MIGU.CBA.Module/DayMatch/Model/Dayschedules.cs
...@@ -4,7 +4,7 @@ using System.Linq; ...@@ -4,7 +4,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace VIZ.TVP.CBA.Module.DayMatch.Model namespace VIZ.TVP.CBA.Module
{ {
public class Dayschedules public class Dayschedules
{ {
......
VIZ.MIGU.CBA.Module/DayMatch/Model/LightHigts.cs
...@@ -4,7 +4,7 @@ using System.Linq; ...@@ -4,7 +4,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace VIZ.TVP.CBA.Module.DayMatch.Model namespace VIZ.TVP.CBA.Module
{ {
public class LightHigts public class LightHigts
{ {
......
VIZ.MIGU.CBA.Module/DayMatch/View/DayMatchUI.xaml → VIZ.MIGU.CBA.Module/DayMatch/View/DayMatchView.xaml
<UserControl x:Class="VIZ.TVP.CBA.Module.DayMatch.View.DayMatchUI" <UserControl x:Class="VIZ.TVP.CBA.Module.DayMatchView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core" xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:core="clr-namespace:VIZ.Framework.Core;assembly=VIZ.Framework.Core" xmlns:core="clr-namespace:VIZ.Framework.Core;assembly=VIZ.Framework.Core"
xmlns:storage="clr-namespace:VIZ.TVP.CBA.Module.TempEnum" xmlns:storage="clr-namespace:VIZ.TVP.CBA.Module"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="400" d:DesignHeight="400"
d:DesignWidth="650" d:DesignWidth="650"
......
VIZ.MIGU.CBA.Module/DayMatch/View/DayMatchUI.xaml.cs → VIZ.MIGU.CBA.Module/DayMatch/View/DayMatchView.xaml.cs
using System; using DevExpress.Xpf.Core;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
...@@ -13,29 +14,31 @@ using System.Windows.Navigation; ...@@ -13,29 +14,31 @@ using System.Windows.Navigation;
using System.Windows.Shapes; using System.Windows.Shapes;
using VIZ.Framework.Core; using VIZ.Framework.Core;
using VIZ.Package.Domain; using VIZ.Package.Domain;
using VIZ.TVP.CBA.Module.DayMatch.ViewModel; namespace VIZ.TVP.CBA.Module
namespace VIZ.TVP.CBA.Module.DayMatch.View
{ {
/// <summary> /// <summary>
/// Interaction logic for DayMatchUI.xaml /// Interaction logic for DayMatchUI.xaml
/// </summary> /// </summary>
public partial class DayMatchUI : UserControl, IPluginView public partial class DayMatchView : UserControl, IPluginView
{ {
public DayMatchUI() DayMatchViewModel vm = null;
public DayMatchView()
{ {
InitializeComponent(); InitializeComponent();
WPFHelper.BindingViewModel(this, new DayMatchViewModel()); WPFHelper.BindingViewModel(this, new DayMatchViewModel());
vm=this.DataContext as DayMatchViewModel;
} }
/// <summary> /// <summary>
/// 上版 /// 上版
/// </summary> /// </summary>
/// <param name="conns">连接</param> /// <param name="conns">连接</param>
public void TakIn(IList<ConnModel> conns) public void TakIn(IList<ConnModel> conns)
{ {
DayMatchViewModel vm = this.DataContext as DayMatchViewModel; //DayMatchViewModel vm = thi DayMatchViewModel
//ApplicationDomainEx.PreviewConn.EndpointManager.Send(""); //ApplicationDomainEx.PreviewConn.EndpointManager.Send("");
} }
...@@ -72,7 +75,11 @@ namespace VIZ.TVP.CBA.Module.DayMatch.View ...@@ -72,7 +75,11 @@ namespace VIZ.TVP.CBA.Module.DayMatch.View
/// <param name="conn">连接</param> /// <param name="conn">连接</param>
public void PreviewIn(ConnModel conn) public void PreviewIn(ConnModel conn)
{ {
if(conn.IsConnected)
{
//SCRIPT_INVOKE
ApplicationDomainEx.PreviewConn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE,"Data",vm.CombineMatchData()));
}
} }
/// <summary> /// <summary>
...@@ -100,5 +107,25 @@ namespace VIZ.TVP.CBA.Module.DayMatch.View ...@@ -100,5 +107,25 @@ namespace VIZ.TVP.CBA.Module.DayMatch.View
{ {
} }
public void TakIn(ConnModel conn)
{
throw new NotImplementedException();
}
public void TakeContinue(ConnModel conn)
{
throw new NotImplementedException();
}
public void TakeOut(ConnModel conn)
{
throw new NotImplementedException();
}
public void TakeUpdate(ConnModel conn)
{
throw new NotImplementedException();
}
} }
} }
VIZ.MIGU.CBA.Module/DayMatch/ViewModel/DayMatchViewModel.cs
...@@ -5,13 +5,9 @@ using System.Linq; ...@@ -5,13 +5,9 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using VIZ.Framework.Core; using VIZ.Framework.Core;
using VIZ.TVP.CBA.Module.Common;
using VIZ.TVP.CBA.Module.DayMatch.Model;
using VIZ.TVP.CBA.Module.TempEnum;
using VIZ.TVP.CBA.Domain;
using log4net; using log4net;
namespace VIZ.TVP.CBA.Module.DayMatch.ViewModel namespace VIZ.TVP.CBA.Module
{ {
public class DayMatchViewModel : ViewModelBase public class DayMatchViewModel : ViewModelBase
{ {
...@@ -62,7 +58,7 @@ namespace VIZ.TVP.CBA.Module.DayMatch.ViewModel ...@@ -62,7 +58,7 @@ namespace VIZ.TVP.CBA.Module.DayMatch.ViewModel
private void BtnMatchDayUpData() private void BtnMatchDayUpData()
{ {
Log.Info("比赛日期上版和数据:"+ CombineMatchData()); Log.Info("比赛日期上版和数据:"+ CombineMatchData());
ApplicationDomainEx.VizEngineModel.STAGE_START("Default/JRSCBEN", "Data", CombineMatchData()); //ApplicationDomainEx.VizEngineModel.STAGE_START("Default/JRSCBEN", "Data", CombineMatchData());
} }
...@@ -172,7 +168,7 @@ namespace VIZ.TVP.CBA.Module.DayMatch.ViewModel ...@@ -172,7 +168,7 @@ namespace VIZ.TVP.CBA.Module.DayMatch.ViewModel
/// 组装往包装发送得数据 /// 组装往包装发送得数据
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
private string CombineMatchData() public string CombineMatchData()
{ {
string data=""; string data="";
data += title+"&"; data += title+"&";
......
VIZ.MIGU.CBA.Module/Main/MainView.xaml
...@@ -4,13 +4,8 @@ ...@@ -4,13 +4,8 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core" xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
xmlns:my="clr-namespace:VIZ.TVP.CBA.Module.DayMatch.View"
xmlns:team="clr-namespace:VIZ.TVP.CBA.Module.TeamStandings.View"
xmlns:round="clr-namespace:VIZ.TVP.CBA.Module.RoundMatch.View"
xmlns:teamStats="clr-namespace:VIZ.TVP.CBA.Module.TeamStats.View"
xmlns:single="clr-namespace:VIZ.TVP.CBA.Module.SinglePlayer.View"
xmlns:playCom="clr-namespace:VIZ.TVP.CBA.Module.PlayerCompare.View"
x:Class="VIZ.TVP.CBA.Module.MainView" x:Class="VIZ.TVP.CBA.Module.MainView"
xmlns:moduel="clr-namespace:VIZ.TVP.CBA.Module"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="800" d:DesignWidth="1300"> d:DesignHeight="800" d:DesignWidth="1300">
...@@ -138,40 +133,40 @@ ...@@ -138,40 +133,40 @@
<TabControl Grid.Row="1" > <TabControl Grid.Row="1" >
<TabItem Header="今日赛程" FontSize="20"> <TabItem Header="今日赛程" FontSize="20">
<Grid > <Grid >
<my:DayMatchUI> <moduel:DayMatchView>
</my:DayMatchUI> </moduel:DayMatchView>
</Grid> </Grid>
</TabItem> </TabItem>
<TabItem Header="球队排行榜" FontSize="20"> <TabItem Header="球队排行榜" FontSize="20">
<Grid > <Grid >
<team:TeamStandingUI> <moduel:TeamStandingView>
</team:TeamStandingUI> </moduel:TeamStandingView>
</Grid> </Grid>
</TabItem> </TabItem>
<TabItem Header="本轮和下轮对阵" FontSize="20"> <TabItem Header="本轮和下轮对阵" FontSize="20">
<Grid> <Grid>
<round:RoundMatchUI> <moduel:RoundMatchView>
</round:RoundMatchUI> </moduel:RoundMatchView>
</Grid> </Grid>
</TabItem> </TabItem>
<TabItem Header="球队数据对比" FontSize="20"> <TabItem Header="球队数据对比" FontSize="20">
<Grid> <Grid>
<teamStats:TeamStatsUI> <moduel:TeamStatsView>
</teamStats:TeamStatsUI> </moduel:TeamStatsView>
</Grid> </Grid>
</TabItem> </TabItem>
<TabItem Header="单人球员" FontSize="20"> <TabItem Header="单人球员" FontSize="20">
<Grid> <Grid>
<single:SinglePlayerUI Grid.ColumnSpan="3"> <moduel:SinglePlayerView>
</single:SinglePlayerUI> </moduel:SinglePlayerView>
</Grid> </Grid>
</TabItem> </TabItem>
...@@ -179,9 +174,9 @@ ...@@ -179,9 +174,9 @@
<TabItem Header="球员数据对比" FontSize="20"> <TabItem Header="球员数据对比" FontSize="20">
<Grid> <Grid>
<playCom:PlayerComPareUI> <moduel:PlayerComPareView>
</playCom:PlayerComPareUI> </moduel:PlayerComPareView>
</Grid> </Grid>
</TabItem> </TabItem>
......
VIZ.MIGU.CBA.Module/Main/MainView.xaml.cs
...@@ -12,14 +12,6 @@ using System.Windows.Media.Imaging; ...@@ -12,14 +12,6 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation; using System.Windows.Navigation;
using System.Windows.Shapes; using System.Windows.Shapes;
using VIZ.Framework.Core; using VIZ.Framework.Core;
using VIZ.TVP.CBA.Module.Common;
using VIZ.TVP.CBA.Module.DayMatch.ViewModel;
using VIZ.TVP.CBA.Module.Main.ViewModel;
using VIZ.TVP.CBA.Module.OnAirData;
using VIZ.TVP.CBA.Module.PlayerCompare.ViewModel;
using VIZ.TVP.CBA.Module.SinglePlayer.Model;
using VIZ.TVP.CBA.Module.SinglePlayer.ViewModel;
using VIZ.TVP.CBA.Module.TeamStats.ViewModel;
namespace VIZ.TVP.CBA.Module namespace VIZ.TVP.CBA.Module
{ {
......
VIZ.MIGU.CBA.Module/Main/ViewModel/MainViewModel.cs
...@@ -6,14 +6,9 @@ using System.Text; ...@@ -6,14 +6,9 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows; using System.Windows;
using VIZ.Framework.Core; using VIZ.Framework.Core;
using VIZ.TVP.CBA.Module.Common;
using VIZ.TVP.CBA.Module.DayMatch.Model;
using VIZ.TVP.CBA.Module.OnAirData;
using VIZ.TVP.CBA.Module.SeasonData;
using VIZ.TVP.CBA.Domain;
using log4net; using log4net;
namespace VIZ.TVP.CBA.Module.Main.ViewModel namespace VIZ.TVP.CBA.Module
{ {
public class MainViewModel : ViewModelBase public class MainViewModel : ViewModelBase
{ {
...@@ -40,7 +35,7 @@ namespace VIZ.TVP.CBA.Module.Main.ViewModel ...@@ -40,7 +35,7 @@ namespace VIZ.TVP.CBA.Module.Main.ViewModel
public MainViewModel() public MainViewModel()
{ {
//matchDate = DateTime.Today.ToShortDateString(); //matchDate = DateTime.Today.ToShortDateString();
ApplicationDomainEx.VizEngineModel = new VizEngineModel(); // ApplicationDomainEx.VizEngineModel = new VizEngineModel();
// GetSchedule(); // GetSchedule();
// InitCommand(); // InitCommand();
InitProperty(); InitProperty();
...@@ -280,7 +275,8 @@ namespace VIZ.TVP.CBA.Module.Main.ViewModel ...@@ -280,7 +275,8 @@ namespace VIZ.TVP.CBA.Module.Main.ViewModel
#region VizEngineModel -- VIZ引擎模型 #region VizEngineModel -- VIZ引擎模型
private VizEngineModel vizEngineModel = ApplicationDomainEx.VizEngineModel; private VizEngineModel vizEngineModel = null;
//ApplicationDomainEx.VizEngineModel;
/// <summary> /// <summary>
/// VIZ引擎模型 /// VIZ引擎模型
/// </summary> /// </summary>
...@@ -324,13 +320,13 @@ namespace VIZ.TVP.CBA.Module.Main.ViewModel ...@@ -324,13 +320,13 @@ namespace VIZ.TVP.CBA.Module.Main.ViewModel
Task.Run(() => Task.Run(() =>
{ {
bool result = ApplicationDomainEx.VizEngineModel.Connection(this.SelectedVizConnection.IP, this.SelectedVizConnection.Port); // bool result = ApplicationDomainEx.VizEngineModel.Connection(this.SelectedVizConnection.IP, this.SelectedVizConnection.Port);
IsConnected = ApplicationDomainEx.VizEngineModel.IsConnected; // IsConnected = ApplicationDomainEx.VizEngineModel.IsConnected;
if (!result) // if (!result)
{ // {
MessageBox.Show($"连接 {this.SelectedVizConnection?.IP}:{this.SelectedVizConnection?.Port} 失败"); // MessageBox.Show($"连接 {this.SelectedVizConnection?.IP}:{this.SelectedVizConnection?.Port} 失败");
} // }
this.IsConnectButtonEnabled = true; this.IsConnectButtonEnabled = true;
}); });
...@@ -350,8 +346,8 @@ namespace VIZ.TVP.CBA.Module.Main.ViewModel ...@@ -350,8 +346,8 @@ namespace VIZ.TVP.CBA.Module.Main.ViewModel
/// </summary> /// </summary>
private void Disconnect() private void Disconnect()
{ {
ApplicationDomainEx.VizEngineModel.Disconnect(); //ApplicationDomainEx.VizEngineModel.Disconnect();
IsConnected = ApplicationDomainEx.VizEngineModel.IsConnected; //IsConnected = ApplicationDomainEx.VizEngineModel.IsConnected;
} }
#endregion #endregion
......
VIZ.MIGU.CBA.Module/OnAirData/Events.cs
...@@ -4,7 +4,7 @@ using System.Linq; ...@@ -4,7 +4,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace VIZ.TVP.CBA.Module.OnAirData namespace VIZ.TVP.CBA.Module
{ {
public class Events public class Events
{ {
......
VIZ.MIGU.CBA.Module/OnAirData/LivePlayerStatH.cs
...@@ -4,7 +4,7 @@ using System.Linq; ...@@ -4,7 +4,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace VIZ.TVP.CBA.Module.OnAirData namespace VIZ.TVP.CBA.Module
{ {
/// <summary> /// <summary>
/// 主队队员 /// 主队队员
......
VIZ.MIGU.CBA.Module/OnAirData/LivePlayerStatV.cs
...@@ -4,7 +4,7 @@ using System.Linq; ...@@ -4,7 +4,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace VIZ.TVP.CBA.Module.OnAirData namespace VIZ.TVP.CBA.Module
{ {
/// <summary> /// <summary>
/// 客队队员 /// 客队队员
......
VIZ.MIGU.CBA.Module/OnAirData/LiveTeamInfo.cs
...@@ -4,7 +4,7 @@ using System.Linq; ...@@ -4,7 +4,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace VIZ.TVP.CBA.Module.OnAirData namespace VIZ.TVP.CBA.Module
{ {
public class LiveTeamInfo public class LiveTeamInfo
{ {
......
VIZ.MIGU.CBA.Module/OnAirData/LiveTeamStatH.cs
...@@ -4,7 +4,7 @@ using System.Linq; ...@@ -4,7 +4,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace VIZ.TVP.CBA.Module.OnAirData namespace VIZ.TVP.CBA.Module
{ {
/// <summary> /// <summary>
......
VIZ.MIGU.CBA.Module/OnAirData/LiveTeamStatV.cs
...@@ -4,7 +4,7 @@ using System.Linq; ...@@ -4,7 +4,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace VIZ.TVP.CBA.Module.OnAirData namespace VIZ.TVP.CBA.Module
{ {
/// <summary> /// <summary>
/// 客队球队 /// 客队球队
......
VIZ.MIGU.CBA.Module/OnAirData/OnAirDataModel.cs
...@@ -4,7 +4,7 @@ using System.Linq; ...@@ -4,7 +4,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace VIZ.TVP.CBA.Module.OnAirData namespace VIZ.TVP.CBA.Module
{ {
public class OnAirDataModel public class OnAirDataModel
{ {
......
VIZ.MIGU.CBA.Module/PlayerCompare/Model/PlayerComModel.cs
...@@ -6,10 +6,8 @@ using System.Linq; ...@@ -6,10 +6,8 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using VIZ.Framework.Core; using VIZ.Framework.Core;
using VIZ.TVP.CBA.Module.PlayerCompare.ViewModel;
using VIZ.TVP.CBA.Module.TempEnum;
namespace VIZ.TVP.CBA.Module.PlayerCompare.Model namespace VIZ.TVP.CBA.Module
{ {
public class PlayerComModel: ViewModelBase public class PlayerComModel: ViewModelBase
{ {
......
VIZ.MIGU.CBA.Module/PlayerCompare/PlayerComparePlugin.cs
...@@ -3,16 +3,14 @@ using System.Collections.Generic; ...@@ -3,16 +3,14 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using VIZ.Framework.Plugin; using VIZ.Package.Domain;
using VIZ.TVP.CBA.Module.DayMatch.View;
using VIZ.TVP.CBA.Module.DayMatch.ViewModel; namespace VIZ.TVP.CBA.Module
using VIZ.TVP.CBA.Module.PlayerCompare.View;
using VIZ.TVP.CBA.Module.PlayerCompare.ViewModel;
using VIZ.TVP.Plugin;
namespace VIZ.TVP.CBA.Module.PlayerCompare
{ {
public class PlayerComparePlugin : ITemplatePluginLifeCycle /// <summary>
/// 球员对比数据
/// </summary>
public class PlayerComparePlugin : IPluginLifeCycle
{ {
/// <summary> /// <summary>
...@@ -21,12 +19,12 @@ namespace VIZ.TVP.CBA.Module.PlayerCompare ...@@ -21,12 +19,12 @@ namespace VIZ.TVP.CBA.Module.PlayerCompare
/// <remarks> /// <remarks>
/// 插件ID不能包含点号 /// 插件ID不能包含点号
/// </remarks> /// </remarks>
public const string PLUGIN_ID = "PlayerComPareUI"; public const string PLUGIN_ID = "PlayerComPareView";
/// <summary> /// <summary>
/// 插件显示名称 /// 插件显示名称
/// </summary> /// </summary>
public const string PLUGIN_DISPLAY_NAME = "PlayerComPareUI"; public const string PLUGIN_NAME = "球员对比数据";
public void Dispose() public void Dispose()
{ {
...@@ -41,10 +39,12 @@ namespace VIZ.TVP.CBA.Module.PlayerCompare ...@@ -41,10 +39,12 @@ namespace VIZ.TVP.CBA.Module.PlayerCompare
{ {
PluginInfo info = new PluginInfo(); PluginInfo info = new PluginInfo();
info.ID = PLUGIN_ID; info.ID = PLUGIN_ID;
info.DisplayName = PLUGIN_DISPLAY_NAME; info.Name = PLUGIN_NAME;
info.HasView = true; info.PluginType = PluginType.Page;
info.HasSettingView = false; info.ViewType = typeof(PlayerComPareView);
info.ViewInfo = new PluginViewInfo(typeof(PlayerComPareUI), typeof(PlayerCompareViewModel));
//info.SettingViewType = typeof(DayMatchUI);
return info; return info;
} }
} }
......
VIZ.MIGU.CBA.Module/PlayerCompare/View/PlayerComPareUI.xaml.cs deleted 100644 → 0
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
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;
using VIZ.Framework.Core;
using VIZ.TVP.CBA.Module.Main.ViewModel;
using VIZ.TVP.CBA.Module.PlayerCompare.Model;
using VIZ.TVP.CBA.Module.PlayerCompare.ViewModel;
using VIZ.TVP.CBA.Module.TempEnum;
namespace VIZ.TVP.CBA.Module.PlayerCompare.View
{
/// <summary>
/// Interaction logic for PlayerComPareUI.xaml
/// </summary>
public partial class PlayerComPareUI : UserControl
{
public PlayerCompareViewModel vm = PlayerCompareViewModel.CreateInstance;
public MainViewModel mainViewModel = MainViewModel.CreateInstance;
public PlayerComPareUI()
{
InitializeComponent();
WPFHelper.BindingViewModel(this, vm);
}
//private void ComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
//{
// if (Convert.ToInt32(vm.MatchStatsId) == 7)
// {
// vm.PlayerComModels = new ObservableCollection<PlayerComModel>()
// {
// new PlayerComModel()
// {
// TechStats=TechStats.Goal
// },
// new PlayerComModel()
// {
// TechStats=TechStats.Rebounds
// },
// new PlayerComModel()
// {
// TechStats=TechStats.Assists
// },
// new PlayerComModel()
// {
// TechStats=TechStats.Blocks
// },
// new PlayerComModel()
// {
// TechStats=TechStats.Steals
// },
// new PlayerComModel()
// {
// TechStats=TechStats.ShootingGoalP
// },
// new PlayerComModel()
// {
// TechStats=TechStats.ThreeShootingGoalP
// }
// };
// }
// else if (Convert.ToInt32(vm.MatchStatsId) == 6)
// {
// vm.PlayerComModels = new ObservableCollection<PlayerComModel>()
// {
// new PlayerComModel()
// {
// TechStats=TechStats.Goal
// },
// new PlayerComModel()
// {
// TechStats=TechStats.Rebounds
// },
// new PlayerComModel()
// {
// TechStats=TechStats.Assists
// },
// new PlayerComModel()
// {
// TechStats=TechStats.Blocks
// },
// new PlayerComModel()
// {
// TechStats=TechStats.Steals
// },
// new PlayerComModel()
// {
// TechStats=TechStats.ShootingGoalP
// }
// };
// }
// else if (Convert.ToInt32(vm.MatchStatsId) == 5)
// {
// vm.PlayerComModels = new ObservableCollection<PlayerComModel>()
// {
// new PlayerComModel()
// {
// TechStats=TechStats.Goal
// },
// new PlayerComModel()
// {
// TechStats=TechStats.Rebounds
// },
// new PlayerComModel()
// {
// TechStats=TechStats.Assists
// },
// new PlayerComModel()
// {
// TechStats=TechStats.Blocks
// },
// new PlayerComModel()
// {
// TechStats=TechStats.Steals
// }
// };
// }
// SetHData();
// SetAData();
//}
//private void com_HPlayer_SelectionChanged(object sender, SelectionChangedEventArgs e)
//{
// if (vm.HNameNums.ContainsKey(vm.HPlayer))
// {
// vm.HNums = vm.HNameNums[vm.HPlayer];
// }
// SetHData();
//}
//private void com_APlayer_SelectionChanged(object sender, SelectionChangedEventArgs e)
//{
// if (vm.VNameNums.ContainsKey(vm.APlayer))
// {
// vm.ANums = vm.VNameNums[vm.APlayer];
// }
// SetAData();
//}
//private void SetHData()
//{
// if (mainViewModel.MvpHomePlayerCompareNumDictionary.ContainsKey(vm?.HPlayer))
// {
// var playSeaSonData = mainViewModel.MvpHomePlayerCompareNumDictionary[vm.HPlayer];
// foreach (var teamPlayer in vm.PlayerComModels)
// {
// if (playSeaSonData.ContainsKey(teamPlayer.TechStats.ToString()))
// {
// teamPlayer.HScore = playSeaSonData[teamPlayer.TechStats.ToString()];
// }
// }
// }
// if (vm != null)
// {
// //var singlePlayerData = mainViewModel.PlayerSeasonData.PlayerstatsList.Where(a => a.CNAlias == vm.SelectPlayer).FirstOrDefault();
// if (mainViewModel.CNAliasPlayerSportsDictionary.ContainsKey(vm?.HPlayer))
// {
// var playSeaSonData = mainViewModel.CNAliasPlayerSportsDictionary[vm.HPlayer];
// foreach (var teamPlayer in vm.PlayerComModels)
// {
// if (playSeaSonData.ContainsKey(teamPlayer.TechStats.ToString()))
// {
// teamPlayer.HSeasonScore = playSeaSonData[teamPlayer.TechStats.ToString()];
// }
// }
// }
// }
//}
//private void SetAData()
//{
// if (mainViewModel.MvpVisitPlayerCompareNumDictionary.ContainsKey(vm?.APlayer))
// {
// var playSeaSonData = mainViewModel.MvpVisitPlayerCompareNumDictionary[vm.APlayer];
// foreach (var teamPlayer in vm.PlayerComModels)
// {
// if (playSeaSonData.ContainsKey(teamPlayer.TechStats.ToString()))
// {
// teamPlayer.AScore = playSeaSonData[teamPlayer.TechStats.ToString()];
// }
// }
// }
// if (vm != null)
// {
// //var singlePlayerData = mainViewModel.PlayerSeasonData.PlayerstatsList.Where(a => a.CNAlias == vm.SelectPlayer).FirstOrDefault();
// if (mainViewModel.CNAliasPlayerSportsDictionary.ContainsKey(vm?.APlayer))
// {
// var playSeaSonData = mainViewModel.CNAliasPlayerSportsDictionary[vm.APlayer];
// foreach (var teamPlayer in vm.PlayerComModels)
// {
// if (playSeaSonData.ContainsKey(teamPlayer.TechStats.ToString()))
// {
// teamPlayer.ASeasonScore = playSeaSonData[teamPlayer.TechStats.ToString()];
// }
// }
// }
// }
//}
//private void ComboBox_SelectionChanged_1(object sender, SelectionChangedEventArgs e)
//{
// SetAData();
// SetHData();
//}
}
}
VIZ.MIGU.CBA.Module/PlayerCompare/View/PlayerComPareUI.xaml → VIZ.MIGU.CBA.Module/PlayerCompare/View/PlayerComPareView.xaml
<UserControl x:Class="VIZ.TVP.CBA.Module.PlayerCompare.View.PlayerComPareUI" <UserControl x:Class="VIZ.TVP.CBA.Module.PlayerComPareView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core" xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:core="clr-namespace:VIZ.Framework.Core;assembly=VIZ.Framework.Core" xmlns:core="clr-namespace:VIZ.Framework.Core;assembly=VIZ.Framework.Core"
xmlns:storage="clr-namespace:VIZ.TVP.CBA.Module.TempEnum" xmlns:storage="clr-namespace:VIZ.TVP.CBA.Module"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="800" d:DesignWidth="650" > d:DesignHeight="800" d:DesignWidth="650" >
<UserControl.Resources> <UserControl.Resources>
......
VIZ.MIGU.CBA.Module/PlayerCompare/View/PlayerComPareView.xaml.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
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;
using VIZ.Framework.Core;
using VIZ.Package.Domain;
namespace VIZ.TVP.CBA.Module
{
/// <summary>
/// Interaction logic for PlayerComPareUI.xaml
/// </summary>
public partial class PlayerComPareView : UserControl, IPluginView
{
public PlayerCompareViewModel vm = PlayerCompareViewModel.CreateInstance;
public PlayerComPareView()
{
InitializeComponent();
WPFHelper.BindingViewModel(this, vm);
}
public void Dispose()
{
}
public void PreviewContinue(ConnModel conn)
{
}
public void PreviewIn(ConnModel conn)
{
if(conn.IsConnected)
{
ApplicationDomainEx.PreviewConn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "dqyData", vm.CombinePlayerCommand()));
}
}
public void PreviewOut(ConnModel conn)
{
}
public void TakeContinue(IList<ConnModel> conns)
{
}
public void TakeOut(IList<ConnModel> conns)
{
}
public void TakeUpdate(IList<ConnModel> conns)
{
}
public void TakIn(IList<ConnModel> conns)
{
}
}
}
VIZ.MIGU.CBA.Module/PlayerCompare/ViewModel/PlayerCompareViewModel.cs
...@@ -8,20 +8,11 @@ using System.Windows; ...@@ -8,20 +8,11 @@ using System.Windows;
using System.Windows.Input; using System.Windows.Input;
using System.Windows.Shapes; using System.Windows.Shapes;
using VIZ.Framework.Core; using VIZ.Framework.Core;
using VIZ.TVP.CBA.Module.Common;
using VIZ.TVP.CBA.Module.Main.ViewModel;
using VIZ.TVP.CBA.Module.PlayerCompare.Model;
using VIZ.TVP.CBA.Module.SinglePlayer.Model;
using VIZ.TVP.CBA.Module.SinglePlayer.ViewModel;
using VIZ.TVP.CBA.Module.TempEnum;
using VIZ.TVP.CBA.Domain;
using VIZ.TVP.CBA.Module.OnAirData;
using VIZ.TVP.CBA.Module.SeasonData;
using DevExpress.Mvvm.POCO; using DevExpress.Mvvm.POCO;
using System.ComponentModel; using System.ComponentModel;
using log4net; using log4net;
namespace VIZ.TVP.CBA.Module.PlayerCompare.ViewModel namespace VIZ.TVP.CBA.Module
{ {
public class PlayerCompareViewModel : ViewModelBase public class PlayerCompareViewModel : ViewModelBase
{ {
...@@ -754,7 +745,7 @@ namespace VIZ.TVP.CBA.Module.PlayerCompare.ViewModel ...@@ -754,7 +745,7 @@ namespace VIZ.TVP.CBA.Module.PlayerCompare.ViewModel
else else
{ {
Log.Info("球员对比上版和数据："+ CombinePlayerCommand()); Log.Info("球员对比上版和数据："+ CombinePlayerCommand());
ApplicationDomainEx.VizEngineModel.STAGE_START("Default/SQY", "dqyData", CombinePlayerCommand()); // ApplicationDomainEx.VizEngineModel.STAGE_START("Default/SQY", "dqyData", CombinePlayerCommand());
// CombinePlayerCommand(); // CombinePlayerCommand();
} }
} }
...@@ -764,7 +755,7 @@ namespace VIZ.TVP.CBA.Module.PlayerCompare.ViewModel ...@@ -764,7 +755,7 @@ namespace VIZ.TVP.CBA.Module.PlayerCompare.ViewModel
/// 组装包装发送的球员信息 /// 组装包装发送的球员信息
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
private string CombinePlayerCommand() public string CombinePlayerCommand()
{ {
string data = ""; string data = "";
......
VIZ.MIGU.CBA.Module/RoundMatch/Model/RoundSchedule.cs
...@@ -4,9 +4,8 @@ using System.Linq; ...@@ -4,9 +4,8 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using VIZ.Framework.Core; using VIZ.Framework.Core;
using VIZ.TVP.CBA.Module.TempEnum;
namespace VIZ.TVP.CBA.Module.RoundMatch.Model namespace VIZ.TVP.CBA.Module
{ {
public class RoundSchedule: ViewModelBase public class RoundSchedule: ViewModelBase
{ {
......
VIZ.MIGU.CBA.Module/RoundMatch/Model/RoundSchedules.cs
...@@ -4,7 +4,7 @@ using System.Linq; ...@@ -4,7 +4,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace VIZ.TVP.CBA.Module.RoundMatch.Model namespace VIZ.TVP.CBA.Module
{ {
public class RoundSchedules public class RoundSchedules
{ {
......
VIZ.MIGU.CBA.Module/RoundMatch/RoundMatchPlugin.cs
...@@ -3,16 +3,11 @@ using System.Collections.Generic; ...@@ -3,16 +3,11 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using VIZ.Framework.Plugin; using VIZ.Package.Domain;
using VIZ.TVP.CBA.Module.DayMatch.View;
using VIZ.TVP.CBA.Module.DayMatch.ViewModel; namespace VIZ.TVP.CBA.Module
using VIZ.TVP.CBA.Module.RoundMatch.View;
using VIZ.TVP.CBA.Module.RoundMatch.ViewModel;
using VIZ.TVP.Plugin;
namespace VIZ.TVP.CBA.Module.RoundMatch
{ {
public class RoundMatchPlugin : ITemplatePluginLifeCycle public class RoundMatchPlugin : IPluginLifeCycle
{ {
/// <summary> /// <summary>
...@@ -21,12 +16,12 @@ namespace VIZ.TVP.CBA.Module.RoundMatch ...@@ -21,12 +16,12 @@ namespace VIZ.TVP.CBA.Module.RoundMatch
/// <remarks> /// <remarks>
/// 插件ID不能包含点号 /// 插件ID不能包含点号
/// </remarks> /// </remarks>
public const string PLUGIN_ID = "RoundMatchUI"; public const string PLUGIN_ID = "RoundMatchView";
/// <summary> /// <summary>
/// 插件显示名称 /// 插件显示名称
/// </summary> /// </summary>
public const string PLUGIN_DISPLAY_NAME = "RoundMatchUI"; public const string PLUGIN_NAME = "本轮赛程";
public void Dispose() public void Dispose()
{ {
...@@ -42,10 +37,12 @@ namespace VIZ.TVP.CBA.Module.RoundMatch ...@@ -42,10 +37,12 @@ namespace VIZ.TVP.CBA.Module.RoundMatch
{ {
PluginInfo info = new PluginInfo(); PluginInfo info = new PluginInfo();
info.ID = PLUGIN_ID; info.ID = PLUGIN_ID;
info.DisplayName = PLUGIN_DISPLAY_NAME; info.Name = PLUGIN_NAME;
info.HasView = true; info.PluginType = PluginType.Page;
info.HasSettingView = false; info.ViewType = typeof(RoundMatchView);
info.ViewInfo = new PluginViewInfo(typeof(RoundMatchUI), typeof(RoundMatchViewModel));
//info.SettingViewType = typeof(DayMatchUI);
return info; return info;
} }
} }
......
VIZ.MIGU.CBA.Module/RoundMatch/View/RoundMatchUI.xaml → VIZ.MIGU.CBA.Module/RoundMatch/View/RoundMatchView.xaml
<UserControl x:Class=" VIZ.TVP.CBA.Module.RoundMatch.View.RoundMatchUI" <UserControl x:Class=" VIZ.TVP.CBA.Module.RoundMatchView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core" xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:core="clr-namespace:VIZ.Framework.Core;assembly=VIZ.Framework.Core" xmlns:core="clr-namespace:VIZ.Framework.Core;assembly=VIZ.Framework.Core"
xmlns:storage="clr-namespace:VIZ.TVP.CBA.Module.TempEnum" xmlns:storage="clr-namespace:VIZ.TVP.CBA.Module"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="800" d:DesignWidth="650"> d:DesignHeight="800" d:DesignWidth="650">
<UserControl.Resources> <UserControl.Resources>
......
VIZ.MIGU.CBA.Module/RoundMatch/View/RoundMatchUI.xaml.cs → VIZ.MIGU.CBA.Module/RoundMatch/View/RoundMatchView.xaml.cs
...@@ -12,20 +12,65 @@ using System.Windows.Media.Imaging; ...@@ -12,20 +12,65 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation; using System.Windows.Navigation;
using System.Windows.Shapes; using System.Windows.Shapes;
using VIZ.Framework.Core; using VIZ.Framework.Core;
using VIZ.TVP.CBA.Module.RoundMatch.ViewModel; using VIZ.Package.Domain;
namespace VIZ.TVP.CBA.Module.RoundMatch.View namespace VIZ.TVP.CBA.Module
{ {
/// <summary> /// <summary>
/// Interaction logic for RoundMatchUI.xaml /// Interaction logic for RoundMatchUI.xaml
/// </summary> /// </summary>
public partial class RoundMatchUI : UserControl public partial class RoundMatchView : UserControl, IPluginView
{ {
public RoundMatchUI() RoundMatchViewModel vm = null;
public RoundMatchView()
{ {
InitializeComponent(); InitializeComponent();
WPFHelper.BindingViewModel(this,new RoundMatchViewModel()); WPFHelper.BindingViewModel(this,new RoundMatchViewModel());
vm = this.DataContext as RoundMatchViewModel;
}
public void Dispose()
{
}
public void PreviewContinue(ConnModel conn)
{
}
public void PreviewIn(ConnModel conn)
{
if(conn.IsConnected)
{
ApplicationDomainEx.PreviewConn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "Data", vm.CombineMatchData()));
}
}
public void PreviewOut(ConnModel conn)
{
}
public void TakeContinue(IList<ConnModel> conns)
{
}
public void TakeOut(IList<ConnModel> conns)
{
}
public void TakeUpdate(IList<ConnModel> conns)
{
}
public void TakIn(IList<ConnModel> conns)
{
} }
} }
} }
VIZ.MIGU.CBA.Module/RoundMatch/ViewModel/RoundMatchViewModel.cs
...@@ -5,14 +5,9 @@ using System.Linq; ...@@ -5,14 +5,9 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using VIZ.Framework.Core; using VIZ.Framework.Core;
using VIZ.TVP.CBA.Module.Common;
using VIZ.TVP.CBA.Module.DayMatch.Model;
using VIZ.TVP.CBA.Module.RoundMatch.Model;
using VIZ.TVP.CBA.Module.TempEnum;
using VIZ.TVP.CBA.Domain;
using log4net; using log4net;
namespace VIZ.TVP.CBA.Module.RoundMatch.ViewModel namespace VIZ.TVP.CBA.Module
{ {
public class RoundMatchViewModel: ViewModelBase public class RoundMatchViewModel: ViewModelBase
{ {
...@@ -160,12 +155,12 @@ namespace VIZ.TVP.CBA.Module.RoundMatch.ViewModel ...@@ -160,12 +155,12 @@ namespace VIZ.TVP.CBA.Module.RoundMatch.ViewModel
private void BtnCmdDataUp() private void BtnCmdDataUp()
{ {
Log.Info("轮次比赛上版信息和数据:" + CombineMatchData()); Log.Info("轮次比赛上版信息和数据:" + CombineMatchData());
ApplicationDomainEx.VizEngineModel.STAGE_START("Default/JRSCBEN", "Data", CombineMatchData()); //ApplicationDomainEx.VizEngineModel.STAGE_START("Default/JRSCBEN", "Data", CombineMatchData());
} }
private string CombineMatchData() public string CombineMatchData()
{ {
string data = ""; string data = "";
data += title; data += title;
......
VIZ.MIGU.CBA.Module/SeasonData/PlayerSeasonData.cs
...@@ -4,7 +4,7 @@ using System.Linq; ...@@ -4,7 +4,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace VIZ.TVP.CBA.Module.SeasonData namespace VIZ.TVP.CBA.Module
{ {
public class PlayerSeasonData public class PlayerSeasonData
{ {
......
VIZ.MIGU.CBA.Module/SeasonData/Playerstats.cs
...@@ -4,7 +4,7 @@ using System.Linq; ...@@ -4,7 +4,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace VIZ.TVP.CBA.Module.SeasonData namespace VIZ.TVP.CBA.Module
{ {
/// <summary> /// <summary>
/// 球员信息 /// 球员信息
......
VIZ.MIGU.CBA.Module/SeasonData/SportsLiveTeamInfo.cs
...@@ -4,7 +4,7 @@ using System.Linq; ...@@ -4,7 +4,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace VIZ.TVP.CBA.Module.SeasonData namespace VIZ.TVP.CBA.Module
{ {
public class SportsLiveTeamInfo public class SportsLiveTeamInfo
{ {
......
VIZ.MIGU.CBA.Module/SeasonData/TeamSeasonData.cs
...@@ -4,7 +4,7 @@ using System.Linq; ...@@ -4,7 +4,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace VIZ.TVP.CBA.Module.SeasonData namespace VIZ.TVP.CBA.Module
{ {
public class TeamSeasonData public class TeamSeasonData
{ {
......
VIZ.MIGU.CBA.Module/SinglePlayer/Model/SinglePlayerModel.cs
...@@ -5,10 +5,8 @@ using System.Linq; ...@@ -5,10 +5,8 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using VIZ.Framework.Core; using VIZ.Framework.Core;
using VIZ.TVP.CBA.Module.Main.ViewModel;
using VIZ.TVP.CBA.Module.TempEnum;
namespace VIZ.TVP.CBA.Module.SinglePlayer.Model namespace VIZ.TVP.CBA.Module
{ {
public class SinglePlayerModel: ViewModelBase public class SinglePlayerModel: ViewModelBase
{ {
......
VIZ.MIGU.CBA.Module/SinglePlayer/SinglePlayerPlugin.cs
...@@ -3,16 +3,11 @@ using System.Collections.Generic; ...@@ -3,16 +3,11 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using VIZ.Framework.Plugin; using VIZ.Package.Domain;
using VIZ.TVP.CBA.Module.RoundMatch.View;
using VIZ.TVP.CBA.Module.RoundMatch.ViewModel; namespace VIZ.TVP.CBA.Module
using VIZ.TVP.CBA.Module.SinglePlayer.View;
using VIZ.TVP.CBA.Module.SinglePlayer.ViewModel;
using VIZ.TVP.Plugin;
namespace VIZ.TVP.CBA.Module.SinglePlayer
{ {
public class SinglePlayerPlugin : ITemplatePluginLifeCycle public class SinglePlayerPlugin : IPluginLifeCycle
{ {
/// <summary> /// <summary>
...@@ -21,12 +16,12 @@ namespace VIZ.TVP.CBA.Module.SinglePlayer ...@@ -21,12 +16,12 @@ namespace VIZ.TVP.CBA.Module.SinglePlayer
/// <remarks> /// <remarks>
/// 插件ID不能包含点号 /// 插件ID不能包含点号
/// </remarks> /// </remarks>
public const string PLUGIN_ID = "SinglePlayerUI"; public const string PLUGIN_ID = "SinglePlayerView";
/// <summary> /// <summary>
/// 插件显示名称 /// 插件显示名称
/// </summary> /// </summary>
public const string PLUGIN_DISPLAY_NAME = "SinglePlayerUI"; public const string PLUGIN_NAME = "单个球员";
public void Dispose() public void Dispose()
{ {
...@@ -42,10 +37,12 @@ namespace VIZ.TVP.CBA.Module.SinglePlayer ...@@ -42,10 +37,12 @@ namespace VIZ.TVP.CBA.Module.SinglePlayer
{ {
PluginInfo info = new PluginInfo(); PluginInfo info = new PluginInfo();
info.ID = PLUGIN_ID; info.ID = PLUGIN_ID;
info.DisplayName = PLUGIN_DISPLAY_NAME; info.Name = PLUGIN_NAME;
info.HasView = true; info.PluginType = PluginType.Page;
info.HasSettingView = false; info.ViewType = typeof(SinglePlayerView);
info.ViewInfo = new PluginViewInfo(typeof(SinglePlayerUI), typeof(SinglePlayerViewModel));
//info.SettingViewType = typeof(DayMatchUI);
return info; return info;
} }
} }
......
VIZ.MIGU.CBA.Module/SinglePlayer/View/SinglePlayerUI.xaml → VIZ.MIGU.CBA.Module/SinglePlayer/View/SinglePlayerView.xaml
<UserControl x:Class="VIZ.TVP.CBA.Module.SinglePlayer.View.SinglePlayerUI" <UserControl x:Class="VIZ.TVP.CBA.Module.SinglePlayerView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core" xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:core="clr-namespace:VIZ.Framework.Core;assembly=VIZ.Framework.Core" xmlns:core="clr-namespace:VIZ.Framework.Core;assembly=VIZ.Framework.Core"
xmlns:storage="clr-namespace:VIZ.TVP.CBA.Module.TempEnum" xmlns:storage="clr-namespace:VIZ.TVP.CBA.Module"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="800" d:DesignWidth="650" > d:DesignHeight="800" d:DesignWidth="650" >
<UserControl.Resources> <UserControl.Resources>
......
VIZ.MIGU.CBA.Module/SinglePlayer/View/SinglePlayerView.xaml.cs 0 → 100644
using DevExpress.Office.Crypto;
using System;
using System.Collections.Generic;
using System.Linq;
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;
using VIZ.Framework.Core;
using VIZ.Package.Domain;
namespace VIZ.TVP.CBA.Module
{
/// <summary>
/// Interaction logic for SinglePlayerUI.xaml
/// </summary>
public partial class SinglePlayerView : UserControl, IPluginView
{
SinglePlayerViewModel vm = SinglePlayerViewModel.CreateInstance;
public SinglePlayerView()
{
InitializeComponent();
//vm = new SinglePlayerViewModel(); dqyData
WPFHelper.BindingViewModel(this, vm);
}
public void Dispose()
{
}
public void PreviewContinue(ConnModel conn)
{
}
public void PreviewIn(ConnModel conn)
{
if (conn.IsConnected)
{
ApplicationDomainEx.PreviewConn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "dqyData", vm.CombineSingleData()));
}
}
public void PreviewOut(ConnModel conn)
{
}
public void TakeContinue(IList<ConnModel> conns)
{
}
public void TakeOut(IList<ConnModel> conns)
{
}
public void TakeUpdate(IList<ConnModel> conns)
{
}
public void TakIn(IList<ConnModel> conns)
{
}
}
}
VIZ.MIGU.CBA.Module/SinglePlayer/ViewModel/SinglePlayerViewModel.cs
...@@ -6,20 +6,10 @@ using System.Text; ...@@ -6,20 +6,10 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows; using System.Windows;
using VIZ.Framework.Core; using VIZ.Framework.Core;
using VIZ.TVP.CBA.Module.Common;
using VIZ.TVP.CBA.Module.Main.ViewModel;
using VIZ.TVP.CBA.Module.SinglePlayer.Model;
using VIZ.TVP.CBA.Module.TempEnum;
using VIZ.TVP.CBA.Domain;
using VIZ.TVP.CBA.Module.PlayerCompare.ViewModel;
using VIZ.TVP.CBA.Module.TeamStats.ViewModel;
using VIZ.TVP.CBA.Module.SeasonData;
using VIZ.TVP.CBA.Module.OnAirData;
using VIZ.TVP.CBA.Module.PlayerCompare.Model;
using System.ComponentModel; using System.ComponentModel;
using log4net; using log4net;
namespace VIZ.TVP.CBA.Module.SinglePlayer.ViewModel namespace VIZ.TVP.CBA.Module
{ {
public class SinglePlayerViewModel: ViewModelBase public class SinglePlayerViewModel: ViewModelBase
{ {
...@@ -408,7 +398,7 @@ namespace VIZ.TVP.CBA.Module.SinglePlayer.ViewModel ...@@ -408,7 +398,7 @@ namespace VIZ.TVP.CBA.Module.SinglePlayer.ViewModel
// mainViewModel.MvpHomePlayerCompareNumDictionary.Add(teamLive.CNAlias, CompareItemToNumber); // mainViewModel.MvpHomePlayerCompareNumDictionary.Add(teamLive.CNAlias, CompareItemToNumber);
Common.Utils.SetTechStatsInfo(this, index, teamLive, null); Utils.SetTechStatsInfo(this, index, teamLive, null);
...@@ -429,7 +419,7 @@ namespace VIZ.TVP.CBA.Module.SinglePlayer.ViewModel ...@@ -429,7 +419,7 @@ namespace VIZ.TVP.CBA.Module.SinglePlayer.ViewModel
VNameNums.Add(teamLive.CNAlias, teamLive.Number); VNameNums.Add(teamLive.CNAlias, teamLive.Number);
} }
Common.Utils.SetTechStatsInfo(this, index, null, teamLive); Utils.SetTechStatsInfo(this, index, null, teamLive);
// Dictionary<string, string> CompareItemToNumber = new Dictionary<string, string>(); // Dictionary<string, string> CompareItemToNumber = new Dictionary<string, string>();
...@@ -824,7 +814,7 @@ namespace VIZ.TVP.CBA.Module.SinglePlayer.ViewModel ...@@ -824,7 +814,7 @@ namespace VIZ.TVP.CBA.Module.SinglePlayer.ViewModel
else else
{ {
Log.Info("单人球员数据："+ CombineSingleData()); Log.Info("单人球员数据："+ CombineSingleData());
ApplicationDomainEx.VizEngineModel.STAGE_START("Default/DQY", "dqyData", CombineSingleData()); //ApplicationDomainEx.VizEngineModel.STAGE_START("Default/DQY", "dqyData", CombineSingleData());
} }
} }
...@@ -846,7 +836,7 @@ namespace VIZ.TVP.CBA.Module.SinglePlayer.ViewModel ...@@ -846,7 +836,7 @@ namespace VIZ.TVP.CBA.Module.SinglePlayer.ViewModel
else else
{ {
Log.Info("MVP球员数据："+ CombineSingleData()); Log.Info("MVP球员数据："+ CombineSingleData());
ApplicationDomainEx.VizEngineModel.STAGE_START("Default/DQY", "dqyData", CombineSingleData()); //ApplicationDomainEx.VizEngineModel.STAGE_START("Default/DQY", "dqyData", CombineSingleData());
} }
} }
...@@ -1118,7 +1108,7 @@ namespace VIZ.TVP.CBA.Module.SinglePlayer.ViewModel ...@@ -1118,7 +1108,7 @@ namespace VIZ.TVP.CBA.Module.SinglePlayer.ViewModel
/// 组装数据 /// 组装数据
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
private string CombineSingleData() public string CombineSingleData()
{ {
string data = ""; string data = "";
...@@ -1214,7 +1204,7 @@ namespace VIZ.TVP.CBA.Module.SinglePlayer.ViewModel ...@@ -1214,7 +1204,7 @@ namespace VIZ.TVP.CBA.Module.SinglePlayer.ViewModel
// mainViewModel.MvpHomePlayerCompareNumDictionary.Add(teamLive.CNAlias, CompareItemToNumber); // mainViewModel.MvpHomePlayerCompareNumDictionary.Add(teamLive.CNAlias, CompareItemToNumber);
Common.Utils.SetTechStatsInfo(this, SelectedIndex, teamLive, null); Utils.SetTechStatsInfo(this, SelectedIndex, teamLive, null);
...@@ -1235,7 +1225,7 @@ namespace VIZ.TVP.CBA.Module.SinglePlayer.ViewModel ...@@ -1235,7 +1225,7 @@ namespace VIZ.TVP.CBA.Module.SinglePlayer.ViewModel
// VNameNums.Add(teamLive.CNAlias, teamLive.Number); // VNameNums.Add(teamLive.CNAlias, teamLive.Number);
//} //}
Common.Utils.SetTechStatsInfo(this, SelectedIndex, null, teamLive); Utils.SetTechStatsInfo(this, SelectedIndex, null, teamLive);
// Dictionary<string, string> CompareItemToNumber = new Dictionary<string, string>(); // Dictionary<string, string> CompareItemToNumber = new Dictionary<string, string>();
......
VIZ.MIGU.CBA.Module/TeamStandings/Model/TeamRanks.cs
...@@ -4,7 +4,7 @@ using System.Linq; ...@@ -4,7 +4,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace VIZ.TVP.CBA.Module.TeamStandings.Model namespace VIZ.TVP.CBA.Module
{ {
public class TeamRanks public class TeamRanks
{ {
......
VIZ.MIGU.CBA.Module/TeamStandings/Model/Teamrank.cs
...@@ -4,7 +4,7 @@ using System.Linq; ...@@ -4,7 +4,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace VIZ.TVP.CBA.Module.TeamStandings.Model namespace VIZ.TVP.CBA.Module
{ {
public class Teamrank public class Teamrank
{ {
......
VIZ.MIGU.CBA.Module/TeamStandings/TeamStandingPlugin.cs
...@@ -3,16 +3,11 @@ using System.Collections.Generic; ...@@ -3,16 +3,11 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using VIZ.Framework.Plugin; using VIZ.Package.Domain;
using VIZ.TVP.CBA.Module.RoundMatch.View;
using VIZ.TVP.CBA.Module.RoundMatch.ViewModel; namespace VIZ.TVP.CBA.Module
using VIZ.TVP.CBA.Module.TeamStandings.View;
using VIZ.TVP.CBA.Module.TeamStandings.ViewModel;
using VIZ.TVP.Plugin;
namespace VIZ.TVP.CBA.Module.TeamStandings
{ {
public class TeamStandingPlugin : ITemplatePluginLifeCycle public class TeamStandingPlugin : IPluginLifeCycle
{ {
/// <summary> /// <summary>
...@@ -21,12 +16,12 @@ namespace VIZ.TVP.CBA.Module.TeamStandings ...@@ -21,12 +16,12 @@ namespace VIZ.TVP.CBA.Module.TeamStandings
/// <remarks> /// <remarks>
/// 插件ID不能包含点号 /// 插件ID不能包含点号
/// </remarks> /// </remarks>
public const string PLUGIN_ID = "TeamStandingUI"; public const string PLUGIN_ID = "TeamStandingView";
/// <summary> /// <summary>
/// 插件显示名称 /// 插件显示名称
/// </summary> /// </summary>
public const string PLUGIN_DISPLAY_NAME = "TeamStandingUI"; public const string PLUGIN_NAME = "球队积分排名";
public void Dispose() public void Dispose()
{ {
...@@ -42,10 +37,12 @@ namespace VIZ.TVP.CBA.Module.TeamStandings ...@@ -42,10 +37,12 @@ namespace VIZ.TVP.CBA.Module.TeamStandings
{ {
PluginInfo info = new PluginInfo(); PluginInfo info = new PluginInfo();
info.ID = PLUGIN_ID; info.ID = PLUGIN_ID;
info.DisplayName = PLUGIN_DISPLAY_NAME; info.Name = PLUGIN_NAME;
info.HasView = true; info.PluginType = PluginType.Page;
info.HasSettingView = false; info.ViewType = typeof(TeamStandingView);
info.ViewInfo = new PluginViewInfo(typeof(TeamStandingUI), typeof(TeamStandingViewModel));
//info.SettingViewType = typeof(DayMatchUI);
return info; return info;
} }
} }
......
VIZ.MIGU.CBA.Module/TeamStandings/View/TeamStandingUI.xaml → VIZ.MIGU.CBA.Module/TeamStandings/View/TeamStandingView.xaml
<UserControl x:Class="VIZ.TVP.CBA.Module.TeamStandings.View.TeamStandingUI" <UserControl x:Class="VIZ.TVP.CBA.Module.TeamStandingView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core" xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:core="clr-namespace:VIZ.Framework.Core;assembly=VIZ.Framework.Core" xmlns:core="clr-namespace:VIZ.Framework.Core;assembly=VIZ.Framework.Core"
xmlns:storage="clr-namespace:VIZ.TVP.CBA.Module.TempEnum" xmlns:storage="clr-namespace:VIZ.TVP.CBA.Module"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="800" d:DesignWidth="650"> d:DesignHeight="800" d:DesignWidth="650">
<UserControl.Resources> <UserControl.Resources>
......
VIZ.MIGU.CBA.Module/TeamStandings/View/TeamStandingUI.xaml.cs → VIZ.MIGU.CBA.Module/TeamStandings/View/TeamStandingView.xaml.cs
...@@ -12,20 +12,67 @@ using System.Windows.Media.Imaging; ...@@ -12,20 +12,67 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation; using System.Windows.Navigation;
using System.Windows.Shapes; using System.Windows.Shapes;
using VIZ.Framework.Core; using VIZ.Framework.Core;
using VIZ.TVP.CBA.Module.TeamStandings.ViewModel; using VIZ.Package.Domain;
namespace VIZ.TVP.CBA.Module.TeamStandings.View namespace VIZ.TVP.CBA.Module
{ {
/// <summary> /// <summary>
/// Interaction logic for TeamStandingUI.xaml /// Interaction logic for TeamStandingUI.xaml
/// </summary> /// </summary>
public partial class TeamStandingUI : UserControl public partial class TeamStandingView : UserControl, IPluginView
{ {
public TeamStandingUI() TeamStandingViewModel vm = null;
public TeamStandingView()
{ {
InitializeComponent(); InitializeComponent();
WPFHelper.BindingViewModel(this,new TeamStandingViewModel()); WPFHelper.BindingViewModel(this,new TeamStandingViewModel());
vm = this.DataContext as TeamStandingViewModel;
}
public void Dispose()
{
}
public void PreviewContinue(ConnModel conn)
{
}
public void PreviewIn(ConnModel conn)
{
//Data
if (conn.IsConnected)
{
ApplicationDomainEx.PreviewConn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "Data", vm.CombineTeamStandingData()));
}
}
public void PreviewOut(ConnModel conn)
{
}
public void TakeContinue(IList<ConnModel> conns)
{
}
public void TakeOut(IList<ConnModel> conns)
{
}
public void TakeUpdate(IList<ConnModel> conns)
{
}
public void TakIn(IList<ConnModel> conns)
{
} }
} }
} }
VIZ.MIGU.CBA.Module/TeamStandings/ViewModel/TeamStandingViewModel.cs
...@@ -5,13 +5,9 @@ using System.Linq; ...@@ -5,13 +5,9 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using VIZ.Framework.Core; using VIZ.Framework.Core;
using VIZ.TVP.CBA.Module.Common;
using VIZ.TVP.CBA.Module.DayMatch.Model;
using VIZ.TVP.CBA.Module.TeamStandings.Model;
using VIZ.TVP.CBA.Domain;
using log4net; using log4net;
namespace VIZ.TVP.CBA.Module.TeamStandings.ViewModel namespace VIZ.TVP.CBA.Module
{ {
public class TeamStandingViewModel: ViewModelBase public class TeamStandingViewModel: ViewModelBase
{ {
...@@ -136,8 +132,8 @@ namespace VIZ.TVP.CBA.Module.TeamStandings.ViewModel ...@@ -136,8 +132,8 @@ namespace VIZ.TVP.CBA.Module.TeamStandings.ViewModel
} }
private ObservableCollection<Model.Teamrank> teamRanksModel; private ObservableCollection<Teamrank> teamRanksModel;
public ObservableCollection<Model.Teamrank> TeamRanksModel public ObservableCollection<Teamrank> TeamRanksModel
{ {
get { return teamRanksModel; } get { return teamRanksModel; }
...@@ -182,7 +178,7 @@ namespace VIZ.TVP.CBA.Module.TeamStandings.ViewModel ...@@ -182,7 +178,7 @@ namespace VIZ.TVP.CBA.Module.TeamStandings.ViewModel
if(TeamRanksModel!=null) if(TeamRanksModel!=null)
{ {
Log.Info("球队排名上版信息和数据："+ CombineTeamStandingData()); Log.Info("球队排名上版信息和数据："+ CombineTeamStandingData());
ApplicationDomainEx.VizEngineModel.STAGE_START("Default/JFB", "Data", CombineTeamStandingData()); //ApplicationDomainEx.VizEngineModel.STAGE_START("Default/JFB", "Data", CombineTeamStandingData());
} }
} }
...@@ -196,7 +192,7 @@ namespace VIZ.TVP.CBA.Module.TeamStandings.ViewModel ...@@ -196,7 +192,7 @@ namespace VIZ.TVP.CBA.Module.TeamStandings.ViewModel
// ApplicationDomainEx.VizEngineModel.CONTINUE(); // ApplicationDomainEx.VizEngineModel.CONTINUE();
} }
private string CombineTeamStandingData() public string CombineTeamStandingData()
{ {
string data = ""; string data = "";
......
VIZ.MIGU.CBA.Module/TeamStats/Model/MatchStatsNumbers.cs
...@@ -6,9 +6,8 @@ using System.Collections.ObjectModel; ...@@ -6,9 +6,8 @@ using System.Collections.ObjectModel;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using VIZ.TVP.CBA.Module.TempEnum;
namespace VIZ.TVP.CBA.Module.TeamStats.Model namespace VIZ.TVP.CBA.Module
{ {
/// <summary> /// <summary>
/// 技术统计类 /// 技术统计类
......
VIZ.MIGU.CBA.Module/TeamStats/TeamStatsPlugin.cs
...@@ -3,16 +3,11 @@ using System.Collections.Generic; ...@@ -3,16 +3,11 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using VIZ.Framework.Plugin; using VIZ.Package.Domain;
using VIZ.TVP.CBA.Module.RoundMatch.View;
using VIZ.TVP.CBA.Module.RoundMatch.ViewModel; namespace VIZ.TVP.CBA.Module
using VIZ.TVP.CBA.Module.TeamStats.View;
using VIZ.TVP.CBA.Module.TeamStats.ViewModel;
using VIZ.TVP.Plugin;
namespace VIZ.TVP.CBA.Module.TeamStats
{ {
public class TeamStatsPlugin : ITemplatePluginLifeCycle public class TeamStatsPlugin : IPluginLifeCycle
{ {
/// <summary> /// <summary>
/// 插件ID /// 插件ID
...@@ -20,12 +15,12 @@ namespace VIZ.TVP.CBA.Module.TeamStats ...@@ -20,12 +15,12 @@ namespace VIZ.TVP.CBA.Module.TeamStats
/// <remarks> /// <remarks>
/// 插件ID不能包含点号 /// 插件ID不能包含点号
/// </remarks> /// </remarks>
public const string PLUGIN_ID = "TeamStatsUI"; public const string PLUGIN_ID = "TeamStatsView";
/// <summary> /// <summary>
/// 插件显示名称 /// 插件显示名称
/// </summary> /// </summary>
public const string PLUGIN_DISPLAY_NAME = "TeamStatsUI"; public const string PLUGIN_NAME = "TeamStatsUI";
public void Dispose() public void Dispose()
{ {
...@@ -41,10 +36,12 @@ namespace VIZ.TVP.CBA.Module.TeamStats ...@@ -41,10 +36,12 @@ namespace VIZ.TVP.CBA.Module.TeamStats
{ {
PluginInfo info = new PluginInfo(); PluginInfo info = new PluginInfo();
info.ID = PLUGIN_ID; info.ID = PLUGIN_ID;
info.DisplayName = PLUGIN_DISPLAY_NAME; info.Name = PLUGIN_NAME;
info.HasView = true; info.PluginType = PluginType.Page;
info.HasSettingView = false; info.ViewType = typeof(TeamStatsView);
info.ViewInfo = new PluginViewInfo(typeof(TeamStatsUI), typeof(TeamStatsViewModel));
//info.SettingViewType = typeof(DayMatchUI);
return info; return info;
} }
} }
......
VIZ.MIGU.CBA.Module/TeamStats/View/TeamStatsUI.xaml.cs deleted 100644 → 0
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
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;
using VIZ.Framework.Core;
using VIZ.TVP.CBA.Module.Main.ViewModel;
using VIZ.TVP.CBA.Module.TeamStats.Model;
using VIZ.TVP.CBA.Module.TeamStats.ViewModel;
using VIZ.TVP.CBA.Module.TempEnum;
namespace VIZ.TVP.CBA.Module.TeamStats.View
{
/// <summary>
/// Interaction logic for TeamStatsUI.xaml
/// </summary>
public partial class TeamStatsUI : UserControl
{
public TeamStatsViewModel vm = TeamStatsViewModel.CreateInstance;
//public MainViewModel mianViewModel=MainViewModel.CreateInstance;
public TeamStatsUI()
{
InitializeComponent();
WPFHelper.BindingViewModel(this, vm);
}
//private void ComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
//{
// if(Convert.ToInt32(vm.MatchStatsId)==7)
// {
// vm. MatchStatsNumbers = new ObservableCollection<MatchStatsNumbers>()
// {
// new MatchStatsNumbers()
// {
// TechStats=TechStats.Goal
// },
// new MatchStatsNumbers()
// {
// TechStats=TechStats.Rebounds,
// },
// new MatchStatsNumbers()
// {
// TechStats=TechStats.Assists
// },
// new MatchStatsNumbers()
// {
// TechStats=TechStats.Blocks
// },
// new MatchStatsNumbers()
// {
// TechStats=TechStats.Steals
// },
// new MatchStatsNumbers()
// {
// TechStats=TechStats.ShootingGoalP
// },
// new MatchStatsNumbers()
// {
// TechStats=TechStats.ThreeShootingGoalP
// }
// };
// }
// else if(Convert.ToInt32(vm.MatchStatsId) == 6)
// {
// vm. MatchStatsNumbers = new ObservableCollection<MatchStatsNumbers>()
// {
// new MatchStatsNumbers()
// {
// TechStats=TechStats.Goal
// },
// new MatchStatsNumbers()
// {
// TechStats=TechStats.Rebounds,
// },
// new MatchStatsNumbers()
// {
// TechStats=TechStats.Assists
// },
// new MatchStatsNumbers()
// {
// TechStats=TechStats.Blocks
// },
// new MatchStatsNumbers()
// {
// TechStats=TechStats.Steals
// },
// new MatchStatsNumbers()
// {
// TechStats=TechStats.ShootingGoalP
// }
// };
// }
// else if(Convert.ToInt32(vm.MatchStatsId) == 5)
// {
// vm. MatchStatsNumbers = new ObservableCollection<MatchStatsNumbers>()
// {
// new MatchStatsNumbers()
// {
// TechStats=TechStats.Goal
// },
// new MatchStatsNumbers()
// {
// TechStats=TechStats.Rebounds,
// },
// new MatchStatsNumbers()
// {
// TechStats=TechStats.Assists
// },
// new MatchStatsNumbers()
// {
// TechStats=TechStats.Blocks
// },
// new MatchStatsNumbers()
// {
// TechStats=TechStats.Steals
// }
// };
// }
// SetHData();
// SetAData();
//}
//private void SetHData()
//{
// foreach (var teamStats in vm.MatchStatsNumbers)
// {
// if (mianViewModel.HomeTeamCompareOptionDictionary.ContainsKey(teamStats.TechStats.ToString()))
// {
// teamStats.HomeScore = mianViewModel.HomeTeamCompareOptionDictionary[teamStats.TechStats.ToString()];
// }
// }
// if (vm != null)
// {
// //var singlePlayerData = mainViewModel.PlayerSeasonData.PlayerstatsList.Where(a => a.CNAlias == vm.SelectPlayer).FirstOrDefault();
// if (vm?.HomeTeam !=null&& mianViewModel.CNAliasVisitSportsDictionary.ContainsKey(vm?.HomeTeam))
// {
// var teamSeasonData = mianViewModel.CNAliasVisitSportsDictionary[vm?.HomeTeam];
// foreach (var teamStats in vm.MatchStatsNumbers)
// {
// if (teamSeasonData.ContainsKey(teamStats.TechStats.ToString()))
// {
// teamStats.HSeasonScore = teamSeasonData[teamStats.TechStats.ToString()];
// }
// }
// }
// }
//}
//private void SetAData()
//{
// foreach (var teamStats in vm.MatchStatsNumbers)
// {
// if (mianViewModel.VisitTeamCompareOptionDictionary.ContainsKey(teamStats.TechStats.ToString()))
// {
// teamStats.AwayScore = mianViewModel.VisitTeamCompareOptionDictionary[teamStats.TechStats.ToString()];
// }
// }
// if (vm != null)
// {
// //var singlePlayerData = mainViewModel.PlayerSeasonData.PlayerstatsList.Where(a => a.CNAlias == vm.SelectPlayer).FirstOrDefault();
// if (vm?.AwayTeam !=null&& mianViewModel.CNAliasVisitSportsDictionary.ContainsKey(vm?.AwayTeam))
// {
// var teamSeasonData = mianViewModel.CNAliasVisitSportsDictionary[vm?.AwayTeam];
// foreach (var teamStats in vm.MatchStatsNumbers)
// {
// if (teamSeasonData.ContainsKey(teamStats.TechStats.ToString()))
// {
// teamStats.ASeasonScore = teamSeasonData[teamStats.TechStats.ToString()];
// }
// }
// }
// }
//}
//private void ComboBox_SelectionChanged_1(object sender, SelectionChangedEventArgs e)
//{
// SetHData();
// SetAData();
//}
}
}
VIZ.MIGU.CBA.Module/TeamStats/View/TeamStatsUI.xaml → VIZ.MIGU.CBA.Module/TeamStats/View/TeamStatsView.xaml
<UserControl x:Class="VIZ.TVP.CBA.Module.TeamStats.View.TeamStatsUI" <UserControl x:Class="VIZ.TVP.CBA.Module.TeamStatsView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core" xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:core="clr-namespace:VIZ.Framework.Core;assembly=VIZ.Framework.Core" xmlns:core="clr-namespace:VIZ.Framework.Core;assembly=VIZ.Framework.Core"
xmlns:storage="clr-namespace:VIZ.TVP.CBA.Module.TempEnum" xmlns:storage="clr-namespace:VIZ.TVP.CBA.Module"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="800" d:DesignWidth="650" > d:DesignHeight="800" d:DesignWidth="650" >
<UserControl.Resources> <UserControl.Resources>
......
VIZ.MIGU.CBA.Module/TeamStats/View/TeamStatsView.xaml.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
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;
using VIZ.Framework.Core;
using VIZ.Package.Domain;
namespace VIZ.TVP.CBA.Module
{
/// <summary>
/// Interaction logic for TeamStatsUI.xaml
/// </summary>
public partial class TeamStatsView : UserControl, IPluginView
{
public TeamStatsViewModel vm = TeamStatsViewModel.CreateInstance;
public TeamStatsView()
{
InitializeComponent();
WPFHelper.BindingViewModel(this, vm);
}
public void Dispose()
{
}
public void PreviewContinue(ConnModel conn)
{
}
public void PreviewIn(ConnModel conn)
{
if (conn.IsConnected)
{
ApplicationDomainEx.PreviewConn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "dqyData", vm.CombineTeamComData()));
}
}
public void PreviewOut(ConnModel conn)
{
}
public void TakeContinue(IList<ConnModel> conns)
{
}
public void TakeOut(IList<ConnModel> conns)
{
}
public void TakeUpdate(IList<ConnModel> conns)
{
}
public void TakIn(IList<ConnModel> conns)
{
}
}
}
VIZ.MIGU.CBA.Module/TeamStats/ViewModel/ComboBoxWithCommand.cs deleted 100644 → 0
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.Input;
namespace VIZ.MIGU.CBA.Module.TeamStats.ViewModel
{
public class ComboBoxWithCommand:ComboBox, ICommandSource
{
private static EventHandler canExecuteChangedHandler;
public static readonly DependencyProperty CommandProperty = DependencyProperty.Register("Command",
typeof(ICommand),
typeof(ComboBoxWithCommand),
new PropertyMetadata((ICommand)null,
new PropertyChangedCallback(CommandChanged)));
public ICommand Command
{
get
{
return (ICommand)GetValue(CommandProperty);
}
set
{
SetValue(CommandProperty, value);
}
}
public static readonly DependencyProperty CommandTargetProperty = DependencyProperty.Register("CommandTarget",
typeof(IInputElement),
typeof(ComboBoxWithCommand),
new PropertyMetadata((IInputElement)null));
public IInputElement CommandTarget
{
get
{
return (IInputElement)GetValue(CommandTargetProperty);
}
set
{
SetValue(CommandTargetProperty, value);
}
}
public static readonly DependencyProperty CommandParameterProperty = DependencyProperty.Register("CommandParameter",
typeof(object),
typeof(ComboBoxWithCommand),
new PropertyMetadata((object)null));
public object CommandParameter
{
get
{
return (object)GetValue(CommandParameterProperty);
}
set
{
SetValue(CommandParameterProperty, value);
}
}
public ComboBoxWithCommand() : base() { }
private static void CommandChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
{
ComboBoxWithCommand cb = (ComboBoxWithCommand)d;
cb.HookUpCommand((ICommand)e.OldValue, (ICommand)e.NewValue);
}
private void HookUpCommand(ICommand oldCommand, ICommand newCommand)
{
if (oldCommand != null)
{
RemoveCommand(oldCommand, newCommand);
}
AddCommand(oldCommand, newCommand);
}
private void RemoveCommand(ICommand oldCommand, ICommand newCommand)
{
EventHandler handler = CanExecuteChanged;
oldCommand.CanExecuteChanged -= handler;
}
private void AddCommand(ICommand oldCommand, ICommand newCommand)
{
EventHandler handler = new EventHandler(CanExecuteChanged);
canExecuteChangedHandler = handler;
if (newCommand != null)
{
newCommand.CanExecuteChanged += canExecuteChangedHandler;
}
}
private void CanExecuteChanged(object sender, EventArgs e)
{
if (this.Command != null)
{
RoutedCommand command = this.Command as RoutedCommand;
// If a RoutedCommand.
if (command != null)
{
if (command.CanExecute(this.CommandParameter, this.CommandTarget))
{
this.IsEnabled = true;
}
else
{
this.IsEnabled = false;
}
}
// If a not RoutedCommand.
else
{
if (Command.CanExecute(CommandParameter))
{
this.IsEnabled = true;
}
else
{
this.IsEnabled = false;
}
}
}
}
protected override void OnSelectionChanged(SelectionChangedEventArgs e)
{
base.OnSelectionChanged(e);
if (this.Command != null)
{
RoutedCommand command = this.Command as RoutedCommand;
if (command != null)
{
command.Execute(this.CommandParameter, this.CommandTarget);
}
else
{
((ICommand)Command).Execute(CommandParameter);
}
}
}
}
}
VIZ.MIGU.CBA.Module/TeamStats/ViewModel/TeamStatsViewModel.cs
...@@ -5,19 +5,10 @@ using System.Linq; ...@@ -5,19 +5,10 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using VIZ.Framework.Core; using VIZ.Framework.Core;
using VIZ.TVP.CBA.Module.Common;
using VIZ.TVP.CBA.Module.Main.ViewModel;
using VIZ.TVP.CBA.Module.SinglePlayer.Model;
using VIZ.TVP.CBA.Module.SinglePlayer.ViewModel;
using VIZ.TVP.CBA.Module.TeamStats.Model;
using VIZ.TVP.CBA.Module.TempEnum;
using VIZ.TVP.CBA.Domain;
using VIZ.TVP.CBA.Module.SeasonData;
using VIZ.TVP.CBA.Module.OnAirData;
using System.ComponentModel; using System.ComponentModel;
using log4net; using log4net;
namespace VIZ.TVP.CBA.Module.TeamStats.ViewModel namespace VIZ.TVP.CBA.Module
{ {
public class TeamStatsViewModel : ViewModelBase public class TeamStatsViewModel : ViewModelBase
{ {
...@@ -453,11 +444,11 @@ namespace VIZ.TVP.CBA.Module.TeamStats.ViewModel ...@@ -453,11 +444,11 @@ namespace VIZ.TVP.CBA.Module.TeamStats.ViewModel
Log.Info("球队对比数据："+CombineTeamComData()); Log.Info("球队对比数据："+CombineTeamComData());
ApplicationDomainEx.VizEngineModel.STAGE_START("Default/SQD", "dqyData", CombineTeamComData()); //ApplicationDomainEx.VizEngineModel.STAGE_START("Default/SQD", "dqyData", CombineTeamComData());
} }
private string CombineTeamComData() public string CombineTeamComData()
{ {
string data = ""; string data = "";
......
VIZ.MIGU.CBA.Module/TempEnum/EnumHelper.cs
...@@ -6,7 +6,7 @@ using System.Reflection; ...@@ -6,7 +6,7 @@ using System.Reflection;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace VIZ.TVP.CBA.Module.TempEnum namespace VIZ.TVP.CBA.Module
{ {
/// <summary> /// <summary>
/// 枚举辅助类 /// 枚举辅助类
......
VIZ.MIGU.CBA.Module/TempEnum/EnumModel.cs
...@@ -6,7 +6,7 @@ using System.Text; ...@@ -6,7 +6,7 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using VIZ.Framework.Core; using VIZ.Framework.Core;
namespace VIZ.TVP.CBA.Module.TempEnum namespace VIZ.TVP.CBA.Module
{ {
public class EnumModel : ModelBase public class EnumModel : ModelBase
{ {
......
VIZ.MIGU.CBA.Module/TempEnum/HighLightEnum.cs
...@@ -5,7 +5,7 @@ using System.Linq; ...@@ -5,7 +5,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace VIZ.TVP.CBA.Module.TempEnum namespace VIZ.TVP.CBA.Module
{ {
public enum HighLightEnum public enum HighLightEnum
{ {
......
VIZ.MIGU.CBA.Module/TempEnum/StaticEnumInfos.cs
...@@ -4,7 +4,7 @@ using System.Linq; ...@@ -4,7 +4,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace VIZ.TVP.CBA.Module.TempEnum namespace VIZ.TVP.CBA.Module
{ {
public static class StaticEnumInfos public static class StaticEnumInfos
{ {
......
VIZ.MIGU.CBA.Module/TempEnum/TechStats.cs
...@@ -5,7 +5,7 @@ using System.Linq; ...@@ -5,7 +5,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace VIZ.TVP.CBA.Module.TempEnum namespace VIZ.TVP.CBA.Module
{ {
public enum TechStats public enum TechStats
{ {
......
VIZ.MIGU.CBA.Module/VIZ.TVP.CBA.Module.csproj
...@@ -129,15 +129,15 @@ ...@@ -129,15 +129,15 @@
<Compile Include="PlayerCompare\Model\PlayerComModel.cs" /> <Compile Include="PlayerCompare\Model\PlayerComModel.cs" />
<Compile Include="PlayerCompare\PlayerComparePlugin.cs" /> <Compile Include="PlayerCompare\PlayerComparePlugin.cs" />
<Compile Include="PlayerCompare\ViewModel\PlayerCompareViewModel.cs" /> <Compile Include="PlayerCompare\ViewModel\PlayerCompareViewModel.cs" />
<Compile Include="PlayerCompare\View\PlayerComPareUI.xaml.cs"> <Compile Include="PlayerCompare\View\PlayerComPareView.xaml.cs">
<DependentUpon>PlayerComPareUI.xaml</DependentUpon> <DependentUpon>PlayerComPareView.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="RoundMatch\Model\RoundSchedule.cs" /> <Compile Include="RoundMatch\Model\RoundSchedule.cs" />
<Compile Include="RoundMatch\Model\RoundSchedules.cs" /> <Compile Include="RoundMatch\Model\RoundSchedules.cs" />
<Compile Include="RoundMatch\RoundMatchPlugin.cs" /> <Compile Include="RoundMatch\RoundMatchPlugin.cs" />
<Compile Include="RoundMatch\ViewModel\RoundMatchViewModel.cs" /> <Compile Include="RoundMatch\ViewModel\RoundMatchViewModel.cs" />
<Compile Include="RoundMatch\View\RoundMatchUI.xaml.cs"> <Compile Include="RoundMatch\View\RoundMatchView.xaml.cs">
<DependentUpon>RoundMatchUI.xaml</DependentUpon> <DependentUpon>RoundMatchView.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="SeasonData\PlayerSeasonData.cs" /> <Compile Include="SeasonData\PlayerSeasonData.cs" />
<Compile Include="SeasonData\Playerstats.cs" /> <Compile Include="SeasonData\Playerstats.cs" />
...@@ -146,22 +146,21 @@ ...@@ -146,22 +146,21 @@
<Compile Include="SinglePlayer\Model\SinglePlayerModel.cs" /> <Compile Include="SinglePlayer\Model\SinglePlayerModel.cs" />
<Compile Include="SinglePlayer\SinglePlayerPlugin.cs" /> <Compile Include="SinglePlayer\SinglePlayerPlugin.cs" />
<Compile Include="SinglePlayer\ViewModel\SinglePlayerViewModel.cs" /> <Compile Include="SinglePlayer\ViewModel\SinglePlayerViewModel.cs" />
<Compile Include="SinglePlayer\View\SinglePlayerUI.xaml.cs"> <Compile Include="SinglePlayer\View\SinglePlayerView.xaml.cs">
<DependentUpon>SinglePlayerUI.xaml</DependentUpon> <DependentUpon>SinglePlayerView.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="TeamStandings\Model\Teamrank.cs" /> <Compile Include="TeamStandings\Model\Teamrank.cs" />
<Compile Include="TeamStandings\Model\TeamRanks.cs" /> <Compile Include="TeamStandings\Model\TeamRanks.cs" />
<Compile Include="TeamStandings\TeamStandingPlugin.cs" /> <Compile Include="TeamStandings\TeamStandingPlugin.cs" />
<Compile Include="TeamStandings\ViewModel\TeamStandingViewModel.cs" /> <Compile Include="TeamStandings\ViewModel\TeamStandingViewModel.cs" />
<Compile Include="TeamStandings\View\TeamStandingUI.xaml.cs"> <Compile Include="TeamStandings\View\TeamStandingView.xaml.cs">
<DependentUpon>TeamStandingUI.xaml</DependentUpon> <DependentUpon>TeamStandingView.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="TeamStats\Model\MatchStatsNumbers.cs" /> <Compile Include="TeamStats\Model\MatchStatsNumbers.cs" />
<Compile Include="TeamStats\TeamStatsPlugin.cs" /> <Compile Include="TeamStats\TeamStatsPlugin.cs" />
<Compile Include="TeamStats\ViewModel\ComboBoxWithCommand.cs" />
<Compile Include="TeamStats\ViewModel\TeamStatsViewModel.cs" /> <Compile Include="TeamStats\ViewModel\TeamStatsViewModel.cs" />
<Compile Include="TeamStats\View\TeamStatsUI.xaml.cs"> <Compile Include="TeamStats\View\TeamStatsView.xaml.cs">
<DependentUpon>TeamStatsUI.xaml</DependentUpon> <DependentUpon>TeamStatsView.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="TempEnum\EnumHelper.cs" /> <Compile Include="TempEnum\EnumHelper.cs" />
<Compile Include="TempEnum\EnumModel.cs" /> <Compile Include="TempEnum\EnumModel.cs" />
...@@ -173,8 +172,8 @@ ...@@ -173,8 +172,8 @@
<Compile Include="DayMatch\Model\Dayschedule.cs" /> <Compile Include="DayMatch\Model\Dayschedule.cs" />
<Compile Include="DayMatch\Model\LightHigts.cs" /> <Compile Include="DayMatch\Model\LightHigts.cs" />
<Compile Include="DayMatch\ViewModel\DayMatchViewModel.cs" /> <Compile Include="DayMatch\ViewModel\DayMatchViewModel.cs" />
<Compile Include="DayMatch\View\DayMatchUI.xaml.cs"> <Compile Include="DayMatch\View\DayMatchView.xaml.cs">
<DependentUpon>DayMatchUI.xaml</DependentUpon> <DependentUpon>DayMatchView.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Main\MainView.xaml.cs"> <Compile Include="Main\MainView.xaml.cs">
<DependentUpon>MainView.xaml</DependentUpon> <DependentUpon>MainView.xaml</DependentUpon>
...@@ -266,7 +265,7 @@ ...@@ -266,7 +265,7 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Page Include="DayMatch\View\DayMatchUI.xaml"> <Page Include="DayMatch\View\DayMatchView.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
...@@ -274,15 +273,15 @@ ...@@ -274,15 +273,15 @@
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="PlayerCompare\View\PlayerComPareUI.xaml"> <Page Include="PlayerCompare\View\PlayerComPareView.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="RoundMatch\View\RoundMatchUI.xaml"> <Page Include="RoundMatch\View\RoundMatchView.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="SinglePlayer\View\SinglePlayerUI.xaml"> <Page Include="SinglePlayer\View\SinglePlayerView.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
...@@ -294,11 +293,11 @@ ...@@ -294,11 +293,11 @@
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="TeamStandings\View\TeamStandingUI.xaml"> <Page Include="TeamStandings\View\TeamStandingView.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="TeamStats\View\TeamStatsUI.xaml"> <Page Include="TeamStats\View\TeamStatsView.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
......
VIZ.TVP.CBA.sln
...@@ -67,6 +67,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VIZ.Package.Module", "..\VI ...@@ -67,6 +67,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VIZ.Package.Module", "..\VI
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VIZ.Package.Module.Resource", "..\VIZ.Package\VIZ.Package.Module.Resource\VIZ.Package.Module.Resource.csproj", "{327EA1F4-F23C-418A-A2EF-DA4F1039B333}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VIZ.Package.Module.Resource", "..\VIZ.Package\VIZ.Package.Module.Resource\VIZ.Package.Module.Resource.csproj", "{327EA1F4-F23C-418A-A2EF-DA4F1039B333}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VIZ.Package.Common", "..\VIZ.Package\VIZ.Package.Common\VIZ.Package.Common.csproj", "{E4912BCE-BC90-4457-9EE3-06435496D979}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
...@@ -227,6 +229,14 @@ Global ...@@ -227,6 +229,14 @@ Global
{327EA1F4-F23C-418A-A2EF-DA4F1039B333}.Release|Any CPU.Build.0 = Release|Any CPU {327EA1F4-F23C-418A-A2EF-DA4F1039B333}.Release|Any CPU.Build.0 = Release|Any CPU
{327EA1F4-F23C-418A-A2EF-DA4F1039B333}.Release|x64.ActiveCfg = Release|x64 {327EA1F4-F23C-418A-A2EF-DA4F1039B333}.Release|x64.ActiveCfg = Release|x64
{327EA1F4-F23C-418A-A2EF-DA4F1039B333}.Release|x64.Build.0 = Release|x64 {327EA1F4-F23C-418A-A2EF-DA4F1039B333}.Release|x64.Build.0 = Release|x64
{E4912BCE-BC90-4457-9EE3-06435496D979}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E4912BCE-BC90-4457-9EE3-06435496D979}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E4912BCE-BC90-4457-9EE3-06435496D979}.Debug|x64.ActiveCfg = Debug|x64
{E4912BCE-BC90-4457-9EE3-06435496D979}.Debug|x64.Build.0 = Debug|x64
{E4912BCE-BC90-4457-9EE3-06435496D979}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E4912BCE-BC90-4457-9EE3-06435496D979}.Release|Any CPU.Build.0 = Release|Any CPU
{E4912BCE-BC90-4457-9EE3-06435496D979}.Release|x64.ActiveCfg = Release|x64
{E4912BCE-BC90-4457-9EE3-06435496D979}.Release|x64.Build.0 = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
...@@ -251,6 +261,7 @@ Global ...@@ -251,6 +261,7 @@ Global
{BF693C2D-3DE8-463B-8394-A0667DCA7B42} = {7E017B1E-FBB4-476B-92E5-57807E52039C} {BF693C2D-3DE8-463B-8394-A0667DCA7B42} = {7E017B1E-FBB4-476B-92E5-57807E52039C}
{6FD4C0F0-8A00-4DB8-924B-A3CD9A45297F} = {2A0D4CA6-9E99-402E-B096-AC403D8386F7} {6FD4C0F0-8A00-4DB8-924B-A3CD9A45297F} = {2A0D4CA6-9E99-402E-B096-AC403D8386F7}
{327EA1F4-F23C-418A-A2EF-DA4F1039B333} = {2A0D4CA6-9E99-402E-B096-AC403D8386F7} {327EA1F4-F23C-418A-A2EF-DA4F1039B333} = {2A0D4CA6-9E99-402E-B096-AC403D8386F7}
{E4912BCE-BC90-4457-9EE3-06435496D979} = {84456B23-B182-4B9D-84B1-3CACB1ADACF0}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {DE6BF34A-A1A4-4829-88A8-3A4229F89708} SolutionGuid = {DE6BF34A-A1A4-4829-88A8-3A4229F89708}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment