Skip to content

V
VIZ.TVP.Golf
Commit 54553cdc by liulongfei
Options

bug修复

parent 680d247f
Showing with 842 additions and 21 deletions
VIZ.TVP.Golf.Domain/Model/TempModel/GroupTempModel.cs
...@@ -153,6 +153,20 @@ namespace VIZ.TVP.Golf.Domain ...@@ -153,6 +153,20 @@ namespace VIZ.TVP.Golf.Domain
#endregion #endregion
#region IsActive -- 是否聚焦
private bool isActive;
/// <summary>
/// 是否聚焦
/// </summary>
public bool IsActive
{
get { return isActive; }
set { isActive = value; this.RaisePropertyChanged(nameof(IsActive)); }
}
#endregion
#region GroupHoleTempModels -- 分组洞信息模型 #region GroupHoleTempModels -- 分组洞信息模型
private ObservableCollection<GroupHoleTempModel> groupHoleTempModels = new ObservableCollection<GroupHoleTempModel>(); private ObservableCollection<GroupHoleTempModel> groupHoleTempModels = new ObservableCollection<GroupHoleTempModel>();
......
VIZ.TVP.Golf.Domain/Model/TempModel/TeamTempModel.cs
...@@ -166,6 +166,20 @@ namespace VIZ.TVP.Golf.Domain ...@@ -166,6 +166,20 @@ namespace VIZ.TVP.Golf.Domain
#endregion #endregion
#region IsActive -- 是否聚焦
private bool isActive;
/// <summary>
/// 是否聚焦
/// </summary>
public bool IsActive
{
get { return isActive; }
set { isActive = value; this.RaisePropertyChanged(nameof(IsActive)); }
}
#endregion
/// <summary> /// <summary>
/// 从信息源初始化 /// 从信息源初始化
/// </summary> /// </summary>
......
VIZ.TVP.Golf.Module.Resource/VIZ.TVP.Golf.Module.Resource.csproj
...@@ -195,5 +195,20 @@ ...@@ -195,5 +195,20 @@
<ItemGroup> <ItemGroup>
<Resource Include="Icons\import_green_16x16.png" /> <Resource Include="Icons\import_green_16x16.png" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Resource Include="Icons\change_16x16.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Icons\arrow_down_16x16.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Icons\arrow_up_16x16.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Icons\change_red_16x16.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Icons\scoll_red_16x16.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project> </Project>
\ No newline at end of file
VIZ.TVP.Golf.Module/Package/BottomHoleInfo/View/BottomHoleInfoView.xaml
...@@ -79,12 +79,12 @@ ...@@ -79,12 +79,12 @@
<TextBlock Text="底部滑动洞信息版" FontSize="18" FontWeight="Bold"></TextBlock> <TextBlock Text="底部滑动洞信息版" FontSize="18" FontWeight="Bold"></TextBlock>
</GroupBox.Header> </GroupBox.Header>
<StackPanel> <StackPanel>
<Image Source="pack://SiteOfOrigin:,,,/images/hole_info.jpg" Height="300" /> <Image Source="pack://SiteOfOrigin:,,,/images/hole_info2.jpg" Height="300" />
<StackPanel Orientation="Horizontal" Margin="0,10,0,10"> <StackPanel Orientation="Horizontal" Margin="0,10,0,10">
<fcommon:IconButton Style="{StaticResource IconButton_Red}" Margin="10,0,0,0" <fcommon:IconButton Style="{StaticResource IconButton_Red}" Margin="10,0,0,0"
Icon="/VIZ.TVP.Golf.Module.Resource;component/Icons/up_16x16.png" Icon="/VIZ.TVP.Golf.Module.Resource;component/Icons/up_16x16.png"
Content="上版子" Content="上版子"
Command="{Binding StartCommand}"></fcommon:IconButton> Command="{Binding StartBottomCommand}"></fcommon:IconButton>
<fcommon:IconButton Style="{StaticResource IconButton_Red}" Margin="10,0,0,0" <fcommon:IconButton Style="{StaticResource IconButton_Red}" Margin="10,0,0,0"
Icon="/VIZ.TVP.Golf.Module.Resource;component/Icons/down_16x16.png" Icon="/VIZ.TVP.Golf.Module.Resource;component/Icons/down_16x16.png"
Content="下版子" Content="下版子"
......
VIZ.TVP.Golf.Module/Package/BottomHoleInfo/ViewModel/BottomHoleInfoViewModel.cs
...@@ -6,10 +6,12 @@ using System.Text; ...@@ -6,10 +6,12 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Documents; using System.Windows.Documents;
using System.Windows.Markup;
using VIZ.Framework.Core; using VIZ.Framework.Core;
using VIZ.TVP.Golf.Domain; using VIZ.TVP.Golf.Domain;
using VIZ.TVP.Golf.Service; using VIZ.TVP.Golf.Service;
using VIZ.TVP.Golf.Storage; using VIZ.TVP.Golf.Storage;
using static System.Collections.Specialized.BitVector32;
namespace VIZ.TVP.Golf.Module namespace VIZ.TVP.Golf.Module
{ {
...@@ -20,7 +22,16 @@ namespace VIZ.TVP.Golf.Module ...@@ -20,7 +22,16 @@ namespace VIZ.TVP.Golf.Module
{ {
public BottomHoleInfoViewModel() public BottomHoleInfoViewModel()
{ {
// 初始化命令
this.InitCommnad();
}
/// <summary>
/// 初始化命令
/// </summary>
private void InitCommnad()
{
this.StartBottomCommand = new VCommand(this.StartBottom);
} }
// =================================================================================== // ===================================================================================
...@@ -62,6 +73,8 @@ namespace VIZ.TVP.Golf.Module ...@@ -62,6 +73,8 @@ namespace VIZ.TVP.Golf.Module
Dictionary<string, IVizControlObjctsValue> dic = new Dictionary<string, IVizControlObjctsValue>(); Dictionary<string, IVizControlObjctsValue> dic = new Dictionary<string, IVizControlObjctsValue>();
// 洞号 // 洞号
dic["HOLENUMBER"] = new VizControlObjectsStringValue(this.HolePickerPanelModel.SelectedHoleInfo.HoleID.ToString()); dic["HOLENUMBER"] = new VizControlObjectsStringValue(this.HolePickerPanelModel.SelectedHoleInfo.HoleID.ToString());
// 图片
dic["DX"] = new VizControlObjectsStringValue("IMAGE*/MyTestProject/Scenes/map1-01");
VizControlObjctsCommand cmd = new VizControlObjctsCommand(dic); VizControlObjctsCommand cmd = new VizControlObjctsCommand(dic);
...@@ -70,6 +83,66 @@ namespace VIZ.TVP.Golf.Module ...@@ -70,6 +83,66 @@ namespace VIZ.TVP.Golf.Module
#endregion #endregion
#region StartBottomCommand -- 开始底部滑动命令
/// <summary>
/// 开始底部滑动命令
/// </summary>
public VCommand StartBottomCommand { get; set; }
/// <summary>
/// 开始底部命令
/// </summary>
/// <remarks>
/// value 从 -307 到 -1276 ,间隔：90； 索引从1到12个，12-18是同样的值。
/// sub setKeyframe(value as double,time as double)
/// </remarks>
private void StartBottom()
{
Dictionary<string, IVizControlObjctsValue> dic = new Dictionary<string, IVizControlObjctsValue>();
dic["DATA"] = this.GetHoleRowData();
VizControlObjctsCommand cmd = new VizControlObjctsCommand(dic);
ApplicationDomainEx.VizEngineModel.STAGE_START($"{TvpStaticResource.SCENE_PATH}17-QDZS", "OnSetData", cmd.ToString());
int value = 0;
int time = 0;
value = -307;
time = 10;
ApplicationDomainEx.VizEngineModel.Send(string.Format(VizEngineCommands.SCRIPT_INVOKE, "setKeyframe", $"{value} {time}"));
}
/// <summary>
/// 获取洞数据
/// </summary>
/// <returns>分组信息版行数据</returns>
private VizControlObjectsElementValue GetHoleRowData()
{
List<Dictionary<string, string>> md_itms = new List<Dictionary<string, string>>();
foreach (HoleInfoModel hole in ApplicationDomainEx.HoleInfos)
{
Dictionary<string, string> item = new Dictionary<string, string>();
item["HOLENUMBER"] = hole.HoleID.ToString();
item["MAP"] = "IMAGE*/MyTestProject/Scenes/map1-01";
item["PAR"] = $"PAR {hole.Par}";
item["HL.active"] = this.HolePickerPanelModel.SelectedHoleInfo.HoleID == hole.HoleID ? "1" : "0";
md_itms.Add(item);
}
return new VizControlObjectsElementValue(md_itms);
}
#endregion
#region LoadLocalDataCommand -- 加载本地数据命令 #region LoadLocalDataCommand -- 加载本地数据命令
/// <summary> /// <summary>
......
VIZ.TVP.Golf.Module/Package/GroupInfo/View/GroupInfoView.xaml
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
<TextBlock Text="分组信息" FontSize="18" FontWeight="Bold"></TextBlock> <TextBlock Text="分组信息" FontSize="18" FontWeight="Bold"></TextBlock>
</GroupBox.Header> </GroupBox.Header>
<StackPanel> <StackPanel>
<Image Source="pack://SiteOfOrigin:,,,/images/team_group_info.jpg" Height="300" /> <Image Source="pack://SiteOfOrigin:,,,/images/group_info3.jpg" Height="300" />
<StackPanel Orientation="Horizontal" Margin="0,10,0,10"> <StackPanel Orientation="Horizontal" Margin="0,10,0,10">
<fcommon:IconButton Style="{StaticResource IconButton_Red}" Margin="10,0,0,0" <fcommon:IconButton Style="{StaticResource IconButton_Red}" Margin="10,0,0,0"
Icon="/VIZ.TVP.Golf.Module.Resource;component/Icons/up_16x16.png" Icon="/VIZ.TVP.Golf.Module.Resource;component/Icons/up_16x16.png"
......
VIZ.TVP.Golf.Module/Package/GroupRanking/AfterMatchGroupRanking/View/AfterMatchGroupRankingView.xaml
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
<RowDefinition Height="300"></RowDefinition> <RowDefinition Height="300"></RowDefinition>
<RowDefinition Height="80"></RowDefinition> <RowDefinition Height="80"></RowDefinition>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Image Source="pack://SiteOfOrigin:,,,/images/AfterMatchGroupRanking.jpg" /> <Image Source="pack://SiteOfOrigin:,,,/images/group_ranking1.jpg" />
<StackPanel Orientation="Horizontal" Grid.Row="1"> <StackPanel Orientation="Horizontal" Grid.Row="1">
<fcommon:IconButton Style="{StaticResource IconButton_Red}" Margin="10,0,0,0" <fcommon:IconButton Style="{StaticResource IconButton_Red}" Margin="10,0,0,0"
Icon="/VIZ.TVP.Golf.Module.Resource;component/Icons/up_16x16.png" Icon="/VIZ.TVP.Golf.Module.Resource;component/Icons/up_16x16.png"
......
VIZ.TVP.Golf.Module/Package/GroupRanking/GroupRankingConstrrastViewModelBase.cs
...@@ -28,6 +28,8 @@ namespace VIZ.TVP.Golf.Module ...@@ -28,6 +28,8 @@ namespace VIZ.TVP.Golf.Module
{ {
this.LoadContrastDataCommand = new VCommand(this.LoadContrastData); this.LoadContrastDataCommand = new VCommand(this.LoadContrastData);
this.RefreshIndexChangedCommand = new VCommand(RefreshIndexChanged); this.RefreshIndexChangedCommand = new VCommand(RefreshIndexChanged);
this.SetRealDataToContrastDataCommand = new VCommand(this.SetRealDataToContrastData);
this.RefreshIndexChangedFromContrastDataToRealDataCommand = new VCommand(this.RefreshIndexChangedFromContrastDataToRealData);
} }
// =================================================================================== // ===================================================================================
...@@ -104,6 +106,41 @@ namespace VIZ.TVP.Golf.Module ...@@ -104,6 +106,41 @@ namespace VIZ.TVP.Golf.Module
#endregion #endregion
#region SetRealDataToContrastDataCommand -- 将实时数据作为对比数据
/// <summary>
/// 将实时数据作为对比数据命令
/// </summary>
public VCommand SetRealDataToContrastDataCommand { get; set; }
/// <summary>
/// 将实时数据作为对比数据
/// </summary>
private void SetRealDataToContrastData()
{
this.ConstrrastGroupTempModels = this.GroupTempModels;
this.GroupTempModels = null;
}
#endregion
#region RefreshIndexChangedFromContrastDataToRealDataCommand -- 刷新从对比数据到实时数据索引变化命令
/// <summary>
/// 刷新从对比数据到实时数据索引变化命令
/// </summary>
public VCommand RefreshIndexChangedFromContrastDataToRealDataCommand { get; set; }
/// <summary>
/// 刷新从对比数据到实时数据索引变化
/// </summary>
private void RefreshIndexChangedFromContrastDataToRealData()
{
this.realDataService.UpdateGroupPositionChanged(this.ConstrrastGroupTempModels, this.GroupTempModels);
}
#endregion
// =================================================================================== // ===================================================================================
// Private Function // Private Function
// =================================================================================== // ===================================================================================
......
VIZ.TVP.Golf.Module/Package/GroupRanking/LongGroupRanking/View/LongGroupRankingView.xaml
...@@ -48,6 +48,12 @@ ...@@ -48,6 +48,12 @@
<fcommon:IconButton Style="{StaticResource IconButton_Default}" <fcommon:IconButton Style="{StaticResource IconButton_Default}"
Icon="/VIZ.TVP.Golf.Module.Resource;component/Icons/refresh_green_16x16.png" Margin="5,0,0,0" Icon="/VIZ.TVP.Golf.Module.Resource;component/Icons/refresh_green_16x16.png" Margin="5,0,0,0"
Content="根据界面值刷新索引变化" Command="{Binding Path=RefreshIndexChangedCommand}"></fcommon:IconButton> Content="根据界面值刷新索引变化" Command="{Binding Path=RefreshIndexChangedCommand}"></fcommon:IconButton>
<fcommon:IconButton Style="{StaticResource IconButton_Default}" Margin="5,0,0,0"
Icon="/VIZ.TVP.Golf.Module.Resource;component/Icons/change_16x16.png"
Content="将实时数据作为对比数据" Command="{Binding Path=SetRealDataToContrastDataCommand}"></fcommon:IconButton>
<fcommon:IconButton Style="{StaticResource IconButton_Default}" Margin="5,0,0,0"
Icon="/VIZ.TVP.Golf.Module.Resource;component/Icons/contrast_16x16.png"
Content="计算实时数据与对比数据索引变化" Command="{Binding Path=RefreshIndexChangedFromContrastDataToRealDataCommand}"></fcommon:IconButton>
</StackPanel> </StackPanel>
</Border> </Border>
<!-- 版子信息 --> <!-- 版子信息 -->
...@@ -98,7 +104,7 @@ ...@@ -98,7 +104,7 @@
ItemsSource="{Binding Path=GroupTempModels}" ItemsSource="{Binding Path=GroupTempModels}"
SelectedValue="{Binding Path=SelectedGroupTempModel,Mode=TwoWay}"> SelectedValue="{Binding Path=SelectedGroupTempModel,Mode=TwoWay}">
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn Header="排名" Width="60" Binding="{Binding Path=Position}" IsReadOnly="True"></DataGridTextColumn> <DataGridTextColumn Header="排名" Width="60" Binding="{Binding Path=Position}"></DataGridTextColumn>
<DataGridTextColumn Header="成员" Width="160" Binding="{Binding Path=PlayersDisplayName}"></DataGridTextColumn> <DataGridTextColumn Header="成员" Width="160" Binding="{Binding Path=PlayersDisplayName}"></DataGridTextColumn>
<DataGridTextColumn Header="得分" Width="80" Binding="{Binding Path=PlayersScore}"></DataGridTextColumn> <DataGridTextColumn Header="得分" Width="80" Binding="{Binding Path=PlayersScore}"></DataGridTextColumn>
<DataGridTextColumn Header="之前索引" Width="60" Binding="{Binding Path=PositionOldIndex}"></DataGridTextColumn> <DataGridTextColumn Header="之前索引" Width="60" Binding="{Binding Path=PositionOldIndex}"></DataGridTextColumn>
...@@ -138,17 +144,41 @@ ...@@ -138,17 +144,41 @@
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="300"></RowDefinition> <RowDefinition Height="300"></RowDefinition>
<RowDefinition Height="80"></RowDefinition> <RowDefinition Height="180"></RowDefinition>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Image Source="pack://SiteOfOrigin:,,,/images/AfterMatchGroupRanking.jpg" /> <Image Source="pack://SiteOfOrigin:,,,/images/group_long_ranking.jpg" />
<StackPanel Orientation="Horizontal" Grid.Row="1"> <Grid Grid.Row="1">
<fcommon:IconButton Style="{StaticResource IconButton_Red}" Margin="10,0,0,0" <Grid.RowDefinitions>
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
</Grid.RowDefinitions>
<StackPanel HorizontalAlignment="Left" Orientation="Horizontal">
<fcommon:IconButton Style="{StaticResource IconButton_Red}" Margin="10,0,0,0"
Icon="/VIZ.TVP.Golf.Module.Resource;component/Icons/up_16x16.png" Icon="/VIZ.TVP.Golf.Module.Resource;component/Icons/up_16x16.png"
Content="上版子"></fcommon:IconButton> Content="上版子" Command="{Binding StartCommand}"></fcommon:IconButton>
<fcommon:IconButton Style="{StaticResource IconButton_Red}" Margin="10,0,0,0" <fcommon:IconButton Style="{StaticResource IconButton_Red}" Margin="10,0,0,0"
Icon="/VIZ.TVP.Golf.Module.Resource;component/Icons/down_16x16.png" Icon="/VIZ.TVP.Golf.Module.Resource;component/Icons/down_16x16.png"
Content="下版子"></fcommon:IconButton> Content="下版子" Command="{Binding StopCommand}"></fcommon:IconButton>
</StackPanel> </StackPanel>
<StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="1">
<fcommon:IconButton Style="{StaticResource IconButton_Red}" Margin="10,10,0,0"
Icon="/VIZ.TVP.Golf.Module.Resource;component/Icons/scoll_red_16x16.png"
Content="滚动" Command="{Binding ScrollCommand}"></fcommon:IconButton>
<fcommon:IconButton Style="{StaticResource IconButton_Red}" Margin="10,10,0,0"
Icon="/VIZ.TVP.Golf.Module.Resource;component/Icons/arrow_down_16x16.png"
Content="展开" Command="{Binding ExpandCommand}"></fcommon:IconButton>
<fcommon:IconButton Style="{StaticResource IconButton_Red}" Margin="10,10,0,0"
Icon="/VIZ.TVP.Golf.Module.Resource;component/Icons/arrow_up_16x16.png"
Content="关闭" Command="{Binding CollapseCommand}"></fcommon:IconButton>
</StackPanel>
<StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="2">
<fcommon:IconButton Style="{StaticResource IconButton_Red}" Margin="10,10,0,0"
Icon="/VIZ.TVP.Golf.Module.Resource;component/Icons/change_red_16x16.png"
Content="交换" Command="{Binding ChangeCommand}"></fcommon:IconButton>
</StackPanel>
</Grid>
</Grid> </Grid>
</Border> </Border>
</Grid> </Grid>
......
VIZ.TVP.Golf.Module/Package/GroupRanking/LongGroupRanking/ViewModel/LongGroupRankingViewModel.cs
...@@ -5,6 +5,7 @@ using System.Linq; ...@@ -5,6 +5,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Markup;
using System.Windows.Navigation; using System.Windows.Navigation;
using VIZ.Framework.Core; using VIZ.Framework.Core;
using VIZ.TVP.Golf.Domain; using VIZ.TVP.Golf.Domain;
...@@ -18,7 +19,20 @@ namespace VIZ.TVP.Golf.Module ...@@ -18,7 +19,20 @@ namespace VIZ.TVP.Golf.Module
{ {
public LongGroupRankingViewModel() public LongGroupRankingViewModel()
{ {
// 初始化命令
this.InitCommand();
}
/// <summary>
/// 初始化命令
/// </summary>
private void InitCommand()
{
this.StartRunCommand = new VCommand(this.StartRun);
this.ExpandCommand = new VCommand(this.Expand);
this.CollapseCommand = new VCommand(this.Collapse);
this.ScrollCommand = new VCommand(this.Scroll);
this.ChangeCommand = new VCommand(this.Change);
} }
// =================================================================================== // ===================================================================================
...@@ -71,6 +85,188 @@ namespace VIZ.TVP.Golf.Module ...@@ -71,6 +85,188 @@ namespace VIZ.TVP.Golf.Module
// Command // Command
// =================================================================================== // ===================================================================================
#region StartCommand -- 上版子命令
/// <summary>
/// 上板子
/// </summary>
protected override void Start()
{
Dictionary<string, IVizControlObjctsValue> dic = new Dictionary<string, IVizControlObjctsValue>();
dic["TLIST"] = this.GetGroupRowData();
VizControlObjctsCommand cmd = new VizControlObjctsCommand(dic);
ApplicationDomainEx.VizEngineModel.Send(string.Format(VizEngineCommands.STAGE_SET, $"{TvpStaticResource.SCENE_PATH}18-21-8"));
ApplicationDomainEx.VizEngineModel.Send(string.Format(VizEngineCommands.SCRIPT_INVOKE, "OnSetData", cmd.ToString()));
ApplicationDomainEx.VizEngineModel.Send($"RENDERER*STAGE*DIRECTOR*MAIN START");
ApplicationDomainEx.VizEngineModel.Send(string.Format(VizEngineCommands.SCRIPT_INVOKE, "reset", ""));
ApplicationDomainEx.VizEngineModel.Send(string.Format(VizEngineCommands.SCRIPT_INVOKE, "initList", ""));
}
/// <summary>
/// 获取分组信息版行数据
/// </summary>
/// <returns>分组信息版行数据</returns>
private VizControlObjectsElementValue GetGroupRowData()
{
List<Dictionary<string, string>> md_itms = new List<Dictionary<string, string>>();
for (int i = 0; i <= 54; i++)
{
Dictionary<string, string> item = new Dictionary<string, string>();
// 得分
item["SCORE"] = string.Empty;
// 球队logo
item["FLAG"] = string.Empty;
// 排名
item["NUMBER"] = string.Empty;
// 队员
item["PLAYERNAME"] = string.Empty;
if (this.GroupTempModels.Count > i)
{
var grpup = this.GroupTempModels[i];
// 得分
item["SCORE"] = grpup.PlayersScore;
// 球队logo
item["FLAG"] = this.resourceService.GetImageName(grpup.TeamLogo);
// 排名
item["NUMBER"] = grpup.Position;
// 队伍名称
item["PLAYERNAME"] = grpup.PlayersDisplayName;
}
md_itms.Add(item);
}
return new VizControlObjectsElementValue(md_itms);
}
#endregion
#region StartRunCommand -- 滚动版子命令
/// <summary>
/// 滚动版子命令
/// </summary>
public VCommand StartRunCommand { get; set; }
/// <summary>
/// 滚动版子
/// </summary>
private void StartRun()
{
}
#endregion
#region ExpandCommand -- 展开命令
/// <summary>
/// 展开命令
/// </summary>
public VCommand ExpandCommand { get; set; }
/// <summary>
/// 展开
/// </summary>
private void Expand()
{
int index = this.GroupTempModels.IndexOf(this.SelectedGroupTempModel);
ApplicationDomainEx.VizEngineModel.Send(string.Format(VizEngineCommands.SCRIPT_INVOKE, "bigIn", index));
}
#endregion
#region CollapseCommand -- 收拢命令
/// <summary>
/// 收拢命令
/// </summary>
public VCommand CollapseCommand { get; set; }
/// <summary>
/// 收拢
/// </summary>
private void Collapse()
{
ApplicationDomainEx.VizEngineModel.Send(string.Format(VizEngineCommands.SCRIPT_INVOKE, "bigOut", ""));
}
#endregion
#region ScrollCommand -- 滚动命令
/// <summary>
/// 滚动命令
/// </summary>
public VCommand ScrollCommand { get; set; }
/// <summary>
/// 滚动
/// </summary>
private void Scroll()
{
int index = this.GroupTempModels.IndexOf(this.SelectedGroupTempModel);
ApplicationDomainEx.VizEngineModel.Send(string.Format(VizEngineCommands.SCRIPT_INVOKE, "genScrollAnima", index));
}
#endregion
#region StopCommand -- 下版子
/// <summary>
/// 下版子
/// </summary>
protected override void Stop()
{
ApplicationDomainEx.VizEngineModel.Send(string.Format(VizEngineCommands.SCRIPT_INVOKE, "bigOut", ""));
ApplicationDomainEx.VizEngineModel.Send($"RENDERER*STAGE*DIRECTOR*MAIN CONTINUE");
}
#endregion
#region ChangeCommand -- 交换位置命令
/// <summary>
/// 交换位置命令
/// </summary>
public VCommand ChangeCommand { get; set; }
/// <summary>
/// 交换位置
/// </summary>
/// <remarks>
/// '设置更新后的排行榜,格式示意(显示的序号_排名_得分;显示的序号_排名_得分)： 1_0_100;2_1_90;3_2_88
/// sub setListAfter(info as string)
/// </remarks>
private void Change()
{
var query = this.GroupTempModels.ToList().OrderBy(p => p.PositionOldIndex).ToList();
StringBuilder sb = new StringBuilder();
for (int i = 0; i < query.Count; ++i)
{
GroupTempModel model = query[i];
sb.Append($"{model.Position}_{model.PositionNewIndex}_{model.PlayersScore}");
if (i != query.Count - 1)
{
sb.Append(";");
}
}
ApplicationDomainEx.VizEngineModel.Send(string.Format(VizEngineCommands.SCRIPT_INVOKE, "setListAfter", sb.ToString()));
}
#endregion
// ----------------------------------------------------
// =================================================================================== // ===================================================================================
// Private Function // Private Function
// =================================================================================== // ===================================================================================
......
VIZ.TVP.Golf.Module/Package/TeamRanking/ShortTeamRanking/View/ShortTeamRankingView.xaml
...@@ -73,6 +73,7 @@ ...@@ -73,6 +73,7 @@
<DataGrid AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" CanUserSortColumns="False" <DataGrid AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" CanUserSortColumns="False"
ItemsSource="{Binding Path=TeamTempModels}"> ItemsSource="{Binding Path=TeamTempModels}">
<DataGrid.Columns> <DataGrid.Columns>
<DataGridCheckBoxColumn Header="聚焦" Width="60" Binding="{Binding Path=IsActive}"></DataGridCheckBoxColumn>
<DataGridTextColumn Header="排名(*)" Width="60" Binding="{Binding Path=Position}"></DataGridTextColumn> <DataGridTextColumn Header="排名(*)" Width="60" Binding="{Binding Path=Position}"></DataGridTextColumn>
<DataGridTextColumn Header="队伍名称(*)" Width="200" Binding="{Binding Path=Name}"></DataGridTextColumn> <DataGridTextColumn Header="队伍名称(*)" Width="200" Binding="{Binding Path=Name}"></DataGridTextColumn>
<DataGridTextColumn Header="得分(*)" Width="80" Binding="{Binding Path=TotalScore}"></DataGridTextColumn> <DataGridTextColumn Header="得分(*)" Width="80" Binding="{Binding Path=TotalScore}"></DataGridTextColumn>
......
VIZ.TVP.Golf.Module/Package/TeamRanking/ShortTeamRanking/ViewModel/ShortTeamRankingViewModel.cs
...@@ -65,8 +65,8 @@ namespace VIZ.TVP.Golf.Module ...@@ -65,8 +65,8 @@ namespace VIZ.TVP.Golf.Module
item["SCORE"] = string.Empty; item["SCORE"] = string.Empty;
// 球队logo // 球队logo
item["1"] = string.Empty; item["1"] = string.Empty;
// ?? // 高亮
//item["HL.active"] = string.Empty; item["HL.active"] = "0";
// 排名 // 排名
item["NUMBER"] = string.Empty; item["NUMBER"] = string.Empty;
// 队伍名称 // 队伍名称
...@@ -80,8 +80,8 @@ namespace VIZ.TVP.Golf.Module ...@@ -80,8 +80,8 @@ namespace VIZ.TVP.Golf.Module
item["SCORE"] = team.TotalScore; item["SCORE"] = team.TotalScore;
// 球队logo // 球队logo
item["1"] = this.resourceService.GetImageName(team.Logo); item["1"] = this.resourceService.GetImageName(team.Logo);
// ?? // 高亮
//item["HL.active"] = string.Empty; item["HL.active"] = team.IsActive ? "1" : "0";
// 排名 // 排名
item["NUMBER"] = team.Position; item["NUMBER"] = team.Position;
// 队伍名称 // 队伍名称
......
VIZ.TVP.Golf/VIZ.TVP.Golf.csproj
...@@ -385,5 +385,25 @@ ...@@ -385,5 +385,25 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="images\group_ranking1.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<None Include="images\hole_info2.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<None Include="images\group_info3.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<None Include="images\group_long_ranking.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project> </Project>
\ No newline at end of file
xml_test.xml
...@@ -3,15 +3,433 @@ ...@@ -3,15 +3,433 @@
<element description=""> <element description="">
<entry name="data"> <entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry> <entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">53</entry> <entry name="NUMBER">833</entry>
<entry name="PLAYER">陈树新\林建武</entry> <entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry> </entry>
</element> </element>
<element description=""> <element description="">
<entry name="data"> <entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry> <entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">53</entry> <entry name="NUMBER">833</entry>
<entry name="PLAYER">陈树新\林建武</entry> <entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry>
</element>
<element description="">
<entry name="data">
<entry name="FLAG">IMAGE*/MyTestProject/Scenes/DBDX</entry>
<entry name="NUMBER">833</entry>
<entry name="PLAYERNAME">陈树新\林建武</entry>
<entry name="SCORE">-88</entry>
</entry> </entry>
</element> </element>
</entry> </entry>
\ No newline at end of file
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