Skip to content

V
VIZ.TVP.CBA
Commit d862ac85 by wangonghui
Options

CBA界面改造

parent 5ab0a699
Showing with 361 additions and 51 deletions
VIZ.MIGU.CBA.Module/DayMatch/View/DayMatchView.xaml
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
xmlns:storage="clr-namespace:VIZ.TVP.CBA.Module" 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="710"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"> VerticalAlignment="Stretch">
<UserControl.Resources> <UserControl.Resources>
...@@ -27,36 +27,75 @@ ...@@ -27,36 +27,75 @@
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="60"/> <RowDefinition Height="60"/>
<RowDefinition Height="40"/>
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<WrapPanel Width="650" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="-2,0,0,0" > <WrapPanel Grid.Row="0" Width="710" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="-2,0,0,0" >
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="70"/> <ColumnDefinition Width="70"/>
<ColumnDefinition Width="175"/> <ColumnDefinition Width="175"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="120"/> <ColumnDefinition Width="100"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="130"/> <ColumnDefinition Width="130"/>
<ColumnDefinition Width="120"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="标题：" FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Grid.Column="0" Text="标题：" FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<dxe:TextEdit Grid.Column="1" Width="170" FontSize="16" HorizontalContentAlignment="Left" <dxe:TextEdit Grid.Column="1" Width="170" FontSize="16" HorizontalContentAlignment="Left"
HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding Title,Mode=TwoWay }"></dxe:TextEdit> HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding Title,Mode=TwoWay }"></dxe:TextEdit>
<TextBlock TextBlock.TextAlignment="Center" Text="日期:" Width="60" Grid.Column="2" FontSize="16" VerticalAlignment="Center"/>
<TextBlock Grid.Column="2" TextBlock.TextAlignment="Center" Text=" 赛/轮：" FontSize="16" VerticalAlignment="Center" Width="60" />
<dxe:ComboBoxEdit Grid.Column="3" Width="60" FontSize="14" ItemsSource="{Binding Path=ChooseMatchItems,Mode=TwoWay}"
SelectedItem="{Binding Path=SelectChooseMatchItem,Mode=TwoWay}" />
<TextBlock TextBlock.TextAlignment="Center" Text="日期：" Width="60" Grid.Column="4" FontSize="16" VerticalAlignment="Center"/>
<dxe:DateEdit Grid.Column="3" HorizontalAlignment="Center" FontSize="16" EditValue="{Binding MatchDate,Mode=TwoWay}"
<dxe:DateEdit Grid.Column="5" HorizontalAlignment="Center" FontSize="16" EditValue="{Binding MatchDate,Mode=TwoWay}"
ShowToday="False" ShowClearButton="False" ShowToday="False" ShowClearButton="False"
VerticalAlignment="Center" MaskUseAsDisplayFormat="True" VerticalAlignment="Center" MaskUseAsDisplayFormat="True"
Width="120" Width="120" IsEnabled="{Binding MateDateEnable,Mode=TwoWay}">
>
</dxe:DateEdit> </dxe:DateEdit>
<Button Content="加载数据" Command="{Binding BtnCmd}" HorizontalContentAlignment="Center" <Button Content="加载赛程" Command="{Binding BtnCmd}" HorizontalContentAlignment="Center"
Grid.Column="4" Width="100" Height="30" FontSize="14" /> Grid.Column="6" Width="100" Height="30" FontSize="14" IsEnabled="{Binding BtmEnable,Mode=TwoWay}" />
</Grid>
</WrapPanel>
<WrapPanel Grid.Row="1" Width="710" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="-2,0,0,0" >
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="70"/>
<ColumnDefinition Width="175"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="130"/>
<ColumnDefinition Width="120"/>
</Grid.ColumnDefinitions>
<TextBlock TextBlock.TextAlignment="Center" Text="轮次：" Width="60" Grid.Column="4" FontSize="16" VerticalAlignment="Center"/>
<dxe:ComboBoxEdit Grid.Column="5" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"
Width="120" ItemsSource="{Binding Path=RoundMatchs,Mode=TwoWay}"
SelectedItem="{Binding Path=RoundMatchItem,Mode=TwoWay}" IsEnabled="{Binding RoundComEnable,Mode=TwoWay}">
</dxe:ComboBoxEdit>
<Button Grid.Row="0" Grid.Column="6" Content="加载轮次" FontSize="16"
Command="{Binding BtnRoundCmd}" HorizontalContentAlignment="Center"
Width="100" Height="30" IsEnabled="{Binding RoundBtnEnable,Mode=TwoWay}" />
</Grid> </Grid>
</WrapPanel> </WrapPanel>
......
VIZ.MIGU.CBA.Module/DayMatch/View/DayMatchView.xaml.cs
...@@ -203,6 +203,15 @@ namespace VIZ.TVP.CBA.Module ...@@ -203,6 +203,15 @@ namespace VIZ.TVP.CBA.Module
} }
} }
public void PageOpend(ConnModel conn, PageModel page)
{
if (conn.IsConnected && vm.MatchData != null)
{
//SCRIPT_INVOKE
conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "Data", vm.CombineMatchData()));
}
}
//private void task_Start_Click(object sender, RoutedEventArgs e) //private void task_Start_Click(object sender, RoutedEventArgs e)
//{ //{
...@@ -227,7 +236,7 @@ namespace VIZ.TVP.CBA.Module ...@@ -227,7 +236,7 @@ namespace VIZ.TVP.CBA.Module
// //} // //}
// //task_Start.IsEnabled = false; // //task_Start.IsEnabled = false;
// //task_Stop.IsEnabled = true; // //task_Stop.IsEnabled = true;
//} //}
//private void task_Stop_Click(object sender, RoutedEventArgs e) //private void task_Stop_Click(object sender, RoutedEventArgs e)
......
VIZ.MIGU.CBA.Module/DayMatch/ViewModel/DayMatchViewModel.cs
...@@ -23,8 +23,25 @@ namespace VIZ.TVP.CBA.Module ...@@ -23,8 +23,25 @@ namespace VIZ.TVP.CBA.Module
BtnCmd = new VCommand(BtnCommand); BtnCmd = new VCommand(BtnCommand);
BtnMatchDayUp = new VCommand(BtnMatchDayUpData); BtnMatchDayUp = new VCommand(BtnMatchDayUpData);
BtnRoundCmd = new VCommand(BtmRoundCommand);
matchDate = DateTime.Today.ToShortDateString(); matchDate = DateTime.Today.ToShortDateString();
GetSchedule(); GetSchedule();
RoundMatchs = new ObservableCollection<int>();
for (int i = 1; i < 43; i++)
{
RoundMatchs.Add(i);
}
roundMatchItem = 1;
chooseMatchItems = new ObservableCollection<string>() { "赛程","轮次"};
RoundComEnable = false;
RoundBtnEnable = false;
MateDateEnable = true;
BtmEnable = true;
} }
private string matchDate; private string matchDate;
...@@ -44,6 +61,9 @@ namespace VIZ.TVP.CBA.Module ...@@ -44,6 +61,9 @@ namespace VIZ.TVP.CBA.Module
public VCommand BtnMatchDayUp { get; set; } public VCommand BtnMatchDayUp { get; set; }
public VCommand BtnRoundCmd { get; set; }
/// <summary> /// <summary>
/// 获取今日赛程 /// 获取今日赛程
/// </summary> /// </summary>
...@@ -54,6 +74,15 @@ namespace VIZ.TVP.CBA.Module ...@@ -54,6 +74,15 @@ namespace VIZ.TVP.CBA.Module
/// <summary> /// <summary>
/// 添加轮次刷新
/// </summary>
private void BtmRoundCommand()
{
SetRoundMatchData();
}
/// <summary>
/// 构造指定日期赛程的数据 /// 构造指定日期赛程的数据
/// </summary> /// </summary>
private void BtnMatchDayUpData() private void BtnMatchDayUpData()
...@@ -105,6 +134,10 @@ namespace VIZ.TVP.CBA.Module ...@@ -105,6 +134,10 @@ namespace VIZ.TVP.CBA.Module
//} //}
private string title = "今日赛程"; private string title = "今日赛程";
/// <summary> /// <summary>
...@@ -178,6 +211,165 @@ namespace VIZ.TVP.CBA.Module ...@@ -178,6 +211,165 @@ namespace VIZ.TVP.CBA.Module
} }
private string selectChooseMatchItem= "赛程";
public string SelectChooseMatchItem
{
get { return selectChooseMatchItem; }
set
{
selectChooseMatchItem=value;
this.RaisePropertyChanged(nameof(SelectChooseMatchItem));
if(selectChooseMatchItem == "赛程")
{
RoundBtnEnable = false;
RoundComEnable = false;
MateDateEnable = true;
BtmEnable = true;
Title = "今日赛程";
}
else if(selectChooseMatchItem == "轮次")
{
RoundBtnEnable = true;
RoundComEnable = true;
MateDateEnable = false;
BtmEnable = false;
Title = "本轮赛程";
}
}
}
/// <summary>
/// 赛程和轮次
/// </summary>
private ObservableCollection<string> chooseMatchItems;
public ObservableCollection<string> ChooseMatchItems
{
get { return chooseMatchItems; }
set { chooseMatchItems=value;this.RaisePropertyChanged(nameof(chooseMatchItems)); }
}
private int roundMatchItem;
public int RoundMatchItem
{
get { return roundMatchItem; }
set { roundMatchItem = value; this.RaisePropertyChanged(nameof(RoundMatchItem)); }
}
private ObservableCollection<int> roundMatch;
public ObservableCollection<int> RoundMatchs
{
get { return roundMatch; }
set { roundMatch = value; this.RaisePropertyChanged(nameof(RoundMatchs)); }
}
/// <summary>
/// 日期的可用性
/// </summary>
private bool mateDateEnable=true;
public bool MateDateEnable
{
get { return mateDateEnable; }
set { mateDateEnable = value; this.RaisePropertyChanged(nameof(MateDateEnable)); }
}
/// <summary>
/// 加载赛程可用性
/// </summary>
private bool btmEnable=true;
public bool BtmEnable
{
get { return btmEnable; }
set { btmEnable = value;this.RaisePropertyChanged(nameof(BtmEnable)); }
}
/// <summary>
/// 轮次选择可用性
/// </summary>
private bool roundComEnable = false;
public bool RoundComEnable
{
get { return roundComEnable; }
set { roundComEnable = value; this.RaisePropertyChanged(nameof(RoundComEnable)); }
}
private bool roundBtnEnable=false;
public bool RoundBtnEnable
{
get { return roundBtnEnable; }
set { roundBtnEnable = value; this.RaisePropertyChanged(nameof(RoundBtnEnable)); }
}
/// <summary>
/// 轮次方法
/// </summary>
public void SetRoundMatchData()
{
var roundSchedules = JsonModel.PostGetGameRound_Path(roundMatchItem.ToString());
if (roundSchedules == null) return;
roundSchedules.schedulelist = roundSchedules.schedulelist.OrderBy(a=>a.MatchGTM8Time).ToList();
MatchData = new ObservableCollection<Dayschedule>();
foreach (var rudData in roundSchedules.schedulelist)
{
Dayschedule d = new Dayschedule();
if (rudData.Status == "1")
{
rudData.Status = "未开赛";
}
else if (rudData.Status == "2")
{
rudData.Status = "进行中";
}
else if (rudData.Status == "3")
{
rudData.Status = "进行中";
}
else if (rudData.Status == "4")
{
rudData.Status = "已结束";
}
else if (rudData.Status == "5")
{
rudData.Status = "延期";
}
d.dates = rudData.dates;
d.time = rudData.time;
d.HomeTeamName = rudData.HomeTeamName;
d.HomeTeamScore = rudData.HomeTeamScore;
d.VisitingTeamName = rudData.VisitingTeamName;
d.VisitingTeamScore = rudData.VisitingTeamScore;
d.Status = rudData.Status;
MatchData.Add(d);
}
}
......
VIZ.MIGU.CBA.Module/MVPPlayer/View/MvpPlayerView.xaml.cs
...@@ -222,5 +222,13 @@ namespace VIZ.TVP.CBA.Module ...@@ -222,5 +222,13 @@ namespace VIZ.TVP.CBA.Module
task_continue.IsEnabled = false; task_continue.IsEnabled = false;
task_Stop.IsEnabled = false; task_Stop.IsEnabled = false;
} }
public void PageOpend(ConnModel conn, PageModel page)
{
if (conn.IsConnected)
{
conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "mvpData", vm.CombineSingleData()));
}
}
} }
} }
VIZ.MIGU.CBA.Module/PlayerCompare/View/NewPlayerComPareView.xaml.cs
...@@ -78,7 +78,7 @@ namespace VIZ.TVP.CBA.Module ...@@ -78,7 +78,7 @@ namespace VIZ.TVP.CBA.Module
public void PreviewIn(ConnModel conn) public void PreviewIn(ConnModel conn)
{ {
if (conn.IsConnected ) if (conn.IsConnected)
{ {
conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "dqyData", vm.CombinePlayerCommand())); conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "dqyData", vm.CombinePlayerCommand()));
} }
...@@ -225,6 +225,12 @@ namespace VIZ.TVP.CBA.Module ...@@ -225,6 +225,12 @@ namespace VIZ.TVP.CBA.Module
task_Stop.IsEnabled = false; task_Stop.IsEnabled = false;
} }
public void PageOpend(ConnModel conn, PageModel page)
{
if (conn.IsConnected)
{
conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "dqyData", vm.CombinePlayerCommand()));
}
}
} }
} }
VIZ.MIGU.CBA.Module/PlayerCompare/View/PlayerComPareView.xaml.cs
...@@ -189,5 +189,13 @@ namespace VIZ.TVP.CBA.Module ...@@ -189,5 +189,13 @@ namespace VIZ.TVP.CBA.Module
task_continue.IsEnabled = false; task_continue.IsEnabled = false;
task_Stop.IsEnabled = false; task_Stop.IsEnabled = false;
} }
public void PageOpend(ConnModel conn, PageModel page)
{
if (conn.IsConnected && vm.PlayerComModels != null)
{
conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "dqyData", vm.CombinePlayerCommand()));
}
}
} }
} }
VIZ.MIGU.CBA.Module/RoundMatch/RoundMatchPlugin.cs
...@@ -7,44 +7,44 @@ using VIZ.Package.Domain; ...@@ -7,44 +7,44 @@ using VIZ.Package.Domain;
namespace VIZ.TVP.CBA.Module namespace VIZ.TVP.CBA.Module
{ {
public class RoundMatchPlugin : IPluginLifeCycle //public class RoundMatchPlugin : IPluginLifeCycle
{ //{
/// <summary> // /// <summary>
/// 插件ID // /// 插件ID
/// </summary> // /// </summary>
/// <remarks> // /// <remarks>
/// 插件ID不能包含点号 // /// 插件ID不能包含点号
/// </remarks> // /// </remarks>
public const string PLUGIN_ID = "RoundMatchView"; // public const string PLUGIN_ID = "RoundMatchView";
/// <summary> // /// <summary>
/// 插件显示名称 // /// 插件显示名称
/// </summary> // /// </summary>
public const string PLUGIN_NAME = "本轮赛程"; // public const string PLUGIN_NAME = "本轮赛程";
public void Dispose() // public void Dispose()
{ // {
} // }
public void Initialize() // public void Initialize()
{ // {
} // }
public PluginInfo Register() // public PluginInfo Register()
{ // {
PluginInfo info = new PluginInfo(); // PluginInfo info = new PluginInfo();
info.Group = PluginConstant.GroupName; // info.Group = PluginConstant.GroupName;
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(RoundMatchView); // info.ViewType = typeof(RoundMatchView);
//info.SettingViewType = typeof(DayMatchUI); // //info.SettingViewType = typeof(DayMatchUI);
return info; // return info;
} // }
} //}
} }
VIZ.MIGU.CBA.Module/RoundMatch/View/RoundMatchView.xaml.cs
...@@ -37,6 +37,14 @@ namespace VIZ.TVP.CBA.Module ...@@ -37,6 +37,14 @@ namespace VIZ.TVP.CBA.Module
} }
public void PageOpend(ConnModel conn, PageModel page)
{
if (conn.IsConnected && vm.RoundMatchData != null)
{
conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "Data", vm.CombineMatchData()));
}
}
public void PreviewContinue(ConnModel conn) public void PreviewContinue(ConnModel conn)
{ {
......
VIZ.MIGU.CBA.Module/SinglePlayer/View/NewSinglePlayerView.xaml.cs
...@@ -222,5 +222,13 @@ namespace VIZ.TVP.CBA.Module ...@@ -222,5 +222,13 @@ namespace VIZ.TVP.CBA.Module
task_continue.IsEnabled = false; task_continue.IsEnabled = false;
task_Stop.IsEnabled = false; task_Stop.IsEnabled = false;
} }
public void PageOpend(ConnModel conn, PageModel page)
{
if (conn.IsConnected)
{
conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "dqyData", vm.CombineSingleData()));
}
}
} }
} }
VIZ.MIGU.CBA.Module/SinglePlayer/View/SinglePlayerView.xaml.cs
...@@ -192,5 +192,13 @@ namespace VIZ.TVP.CBA.Module ...@@ -192,5 +192,13 @@ namespace VIZ.TVP.CBA.Module
task_continue.IsEnabled = false; task_continue.IsEnabled = false;
task_Stop.IsEnabled = false; task_Stop.IsEnabled = false;
} }
public void PageOpend(ConnModel conn, PageModel page)
{
if (conn.IsConnected && vm.SinglePlayerData != null)
{
conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "dqyData", vm.CombineSingleData()));
}
}
} }
} }
VIZ.MIGU.CBA.Module/TeamStandings/View/TeamStandingView.xaml.cs
...@@ -35,6 +35,14 @@ namespace VIZ.TVP.CBA.Module ...@@ -35,6 +35,14 @@ namespace VIZ.TVP.CBA.Module
} }
public void PageOpend(ConnModel conn, PageModel page)
{
if (conn.IsConnected && vm.TeamRanksModel != null)
{
conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "Data", vm.CombineTeamStandingData()));
}
}
public void PreviewContinue(ConnModel conn) public void PreviewContinue(ConnModel conn)
{ {
//if(conn.IsConnected) //if(conn.IsConnected)
......
VIZ.MIGU.CBA.Module/TeamStats/View/NewTeamStatsView.xaml.cs
...@@ -235,5 +235,13 @@ namespace VIZ.TVP.CBA.Module ...@@ -235,5 +235,13 @@ namespace VIZ.TVP.CBA.Module
} }
public void PageOpend(ConnModel conn, PageModel page)
{
if (conn.IsConnected)
{
conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "dqyData", vm.CombineTeamComData()));
}
}
} }
} }
VIZ.MIGU.CBA.Module/TeamStats/View/TeamStatsView.xaml.cs
...@@ -193,5 +193,13 @@ namespace VIZ.TVP.CBA.Module ...@@ -193,5 +193,13 @@ namespace VIZ.TVP.CBA.Module
task_continue.IsEnabled = false; task_continue.IsEnabled = false;
task_Stop.IsEnabled = false; task_Stop.IsEnabled = false;
} }
public void PageOpend(ConnModel conn, PageModel page)
{
if (conn.IsConnected && vm.MatchStatsNumbers != null)
{
conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "dqyData", vm.CombineTeamComData()));
}
}
} }
} }
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