Commit d862ac85 by wangonghui

CBA界面改造

parent 5ab0a699
......@@ -12,7 +12,7 @@
xmlns:storage="clr-namespace:VIZ.TVP.CBA.Module"
mc:Ignorable="d"
d:DesignHeight="400"
d:DesignWidth="650"
d:DesignWidth="710"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch">
<UserControl.Resources>
......@@ -27,35 +27,74 @@
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="60"/>
<RowDefinition Height="40"/>
<RowDefinition Height="*"/>
</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.ColumnDefinitions>
<ColumnDefinition Width="70"/>
<ColumnDefinition Width="175"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="120"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="130"/>
<ColumnDefinition Width="120"/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="标题:" FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<dxe:TextEdit Grid.Column="1" Width="170" FontSize="16" HorizontalContentAlignment="Left"
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}" />
<dxe:DateEdit Grid.Column="3" HorizontalAlignment="Center" FontSize="16" EditValue="{Binding MatchDate,Mode=TwoWay}"
<TextBlock TextBlock.TextAlignment="Center" Text="日期:" Width="60" Grid.Column="4" FontSize="16" VerticalAlignment="Center"/>
<dxe:DateEdit Grid.Column="5" HorizontalAlignment="Center" FontSize="16" EditValue="{Binding MatchDate,Mode=TwoWay}"
ShowToday="False" ShowClearButton="False"
VerticalAlignment="Center" MaskUseAsDisplayFormat="True"
Width="120"
>
Width="120" IsEnabled="{Binding MateDateEnable,Mode=TwoWay}">
</dxe:DateEdit>
<Button Content="加载数据" Command="{Binding BtnCmd}" HorizontalContentAlignment="Center"
Grid.Column="4" Width="100" Height="30" FontSize="14" />
<Button Content="加载赛程" Command="{Binding BtnCmd}" HorizontalContentAlignment="Center"
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>
......
......@@ -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)
//{
......
......@@ -23,8 +23,25 @@ namespace VIZ.TVP.CBA.Module
BtnCmd = new VCommand(BtnCommand);
BtnMatchDayUp = new VCommand(BtnMatchDayUpData);
BtnRoundCmd = new VCommand(BtmRoundCommand);
matchDate = DateTime.Today.ToShortDateString();
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;
......@@ -44,6 +61,9 @@ namespace VIZ.TVP.CBA.Module
public VCommand BtnMatchDayUp { get; set; }
public VCommand BtnRoundCmd { get; set; }
/// <summary>
/// 获取今日赛程
/// </summary>
......@@ -54,6 +74,15 @@ namespace VIZ.TVP.CBA.Module
/// <summary>
/// 添加轮次刷新
/// </summary>
private void BtmRoundCommand()
{
SetRoundMatchData();
}
/// <summary>
/// 构造指定日期赛程的数据
/// </summary>
private void BtnMatchDayUpData()
......@@ -105,6 +134,10 @@ namespace VIZ.TVP.CBA.Module
//}
private string title = "今日赛程";
/// <summary>
......@@ -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);
}
}
......
......@@ -222,5 +222,13 @@ namespace VIZ.TVP.CBA.Module
task_continue.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()));
}
}
}
}
......@@ -78,7 +78,7 @@ namespace VIZ.TVP.CBA.Module
public void PreviewIn(ConnModel conn)
{
if (conn.IsConnected )
if (conn.IsConnected)
{
conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "dqyData", vm.CombinePlayerCommand()));
}
......@@ -225,6 +225,12 @@ namespace VIZ.TVP.CBA.Module
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()));
}
}
}
}
......@@ -189,5 +189,13 @@ namespace VIZ.TVP.CBA.Module
task_continue.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()));
}
}
}
}
......@@ -7,44 +7,44 @@ using VIZ.Package.Domain;
namespace VIZ.TVP.CBA.Module
{
public class RoundMatchPlugin : IPluginLifeCycle
{
/// <summary>
/// 插件ID
/// </summary>
/// <remarks>
/// 插件ID不能包含点号
/// </remarks>
public const string PLUGIN_ID = "RoundMatchView";
/// <summary>
/// 插件显示名称
/// </summary>
public const string PLUGIN_NAME = "本轮赛程";
public void Dispose()
{
}
public void Initialize()
{
}
public PluginInfo Register()
{
PluginInfo info = new PluginInfo();
info.Group = PluginConstant.GroupName;
info.ID = PLUGIN_ID;
info.Name = PLUGIN_NAME;
info.PluginType = PluginType.Page;
info.ViewType = typeof(RoundMatchView);
//info.SettingViewType = typeof(DayMatchUI);
return info;
}
}
//public class RoundMatchPlugin : IPluginLifeCycle
//{
// /// <summary>
// /// 插件ID
// /// </summary>
// /// <remarks>
// /// 插件ID不能包含点号
// /// </remarks>
// public const string PLUGIN_ID = "RoundMatchView";
// /// <summary>
// /// 插件显示名称
// /// </summary>
// public const string PLUGIN_NAME = "本轮赛程";
// public void Dispose()
// {
// }
// public void Initialize()
// {
// }
// public PluginInfo Register()
// {
// PluginInfo info = new PluginInfo();
// info.Group = PluginConstant.GroupName;
// info.ID = PLUGIN_ID;
// info.Name = PLUGIN_NAME;
// info.PluginType = PluginType.Page;
// info.ViewType = typeof(RoundMatchView);
// //info.SettingViewType = typeof(DayMatchUI);
// return info;
// }
//}
}
......@@ -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)
{
......
......@@ -222,5 +222,13 @@ namespace VIZ.TVP.CBA.Module
task_continue.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()));
}
}
}
}
......@@ -192,5 +192,13 @@ namespace VIZ.TVP.CBA.Module
task_continue.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()));
}
}
}
}
......@@ -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)
{
//if(conn.IsConnected)
......
......@@ -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()));
}
}
}
}
......@@ -193,5 +193,13 @@ namespace VIZ.TVP.CBA.Module
task_continue.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