Skip to content

V
VIZ.TVP.CBA
Commit 41c60bd5 by wangonghui
Options

女足世界杯添加修改

parent eb05f900
Showing with 340 additions and 28 deletions
VIZ.TVP.CBA.sln
......@@ -269,16 +269,16 @@ Global
{72A5659A-9195-4EA6-856C-AE2A65BA1575}.Debug|x64.Build.0 = Debug|x64
{72A5659A-9195-4EA6-856C-AE2A65BA1575}.Release|Any CPU.ActiveCfg = Release|Any CPU
{72A5659A-9195-4EA6-856C-AE2A65BA1575}.Release|Any CPU.Build.0 = Release|Any CPU
{72A5659A-9195-4EA6-856C-AE2A65BA1575}.Release|x64.ActiveCfg = Release|Any CPU
{72A5659A-9195-4EA6-856C-AE2A65BA1575}.Release|x64.Build.0 = Release|Any CPU
{72A5659A-9195-4EA6-856C-AE2A65BA1575}.Release|x64.ActiveCfg = Release|x64
{72A5659A-9195-4EA6-856C-AE2A65BA1575}.Release|x64.Build.0 = Release|x64
{39898428-1D3D-430B-8B33-085878C0699D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{39898428-1D3D-430B-8B33-085878C0699D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{39898428-1D3D-430B-8B33-085878C0699D}.Debug|x64.ActiveCfg = Debug|x64
{39898428-1D3D-430B-8B33-085878C0699D}.Debug|x64.Build.0 = Debug|x64
{39898428-1D3D-430B-8B33-085878C0699D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{39898428-1D3D-430B-8B33-085878C0699D}.Release|Any CPU.Build.0 = Release|Any CPU
{39898428-1D3D-430B-8B33-085878C0699D}.Release|x64.ActiveCfg = Release|Any CPU
{39898428-1D3D-430B-8B33-085878C0699D}.Release|x64.Build.0 = Release|Any CPU
{39898428-1D3D-430B-8B33-085878C0699D}.Release|x64.ActiveCfg = Release|x64
{39898428-1D3D-430B-8B33-085878C0699D}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......
VIZ.TVP.WMCUP.Module/FDayMatch/FDayMatchViewPlugin.cs
......@@ -20,7 +20,7 @@ namespace VIZ.TVP.WMCUP.Module
/// <summary>
/// 插件显示名称
/// </summary>
public const string PLUGIN_NAME = "足球赛程";
public const string PLUGIN_NAME = "赛程预告";
public void Dispose()
{
......
VIZ.TVP.WMCUP.Module/FDayMatch/View/FDayMatchView.xaml
<UserControl x:Class="VIZ.TVP.WMCUP.Module.FDayMatchView"
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:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
......@@ -183,8 +183,8 @@
<dxg:GridColumn FieldName="time" Header="时间" Width="112" />
<dxg:GridColumn FieldName="homeTeamLogo" Header="主队国旗" Width="180" />
<dxg:GridColumn FieldName="homeNationName" Header="主队" Width="180" />
<dxg:GridColumn FieldName="HomeTeamScore" Header="主队得分" Width="180" />
<dxg:GridColumn FieldName="VisitingTeamScore" Header="客队得分" Width="180" />
<!--<dxg:GridColumn FieldName="HomeTeamScore" Header="主队得分" Width="180" />
<dxg:GridColumn FieldName="VisitingTeamScore" Header="客队得分" Width="180" />-->
<dxg:GridColumn FieldName="visitingNationName" Header="客队" Width="180" />
<dxg:GridColumn FieldName="visitingTeamLogo" Header="客队国旗" Width="180" />
......
VIZ.TVP.WMCUP.Module/FDayMatch/ViewModel/FDayMatchViewModel.cs
......@@ -135,7 +135,7 @@ namespace VIZ.TVP.WMCUP.Module
private string title = "赛果展示";
private string title = "赛果预告";
/// <summary>
/// 标题
......@@ -350,16 +350,16 @@ namespace VIZ.TVP.WMCUP.Module
data += "*";
if (string.IsNullOrEmpty(tempMatchData.homeTeamScore) &&string.IsNullOrEmpty(tempMatchData.visitingTeamScore))
{
//if (string.IsNullOrEmpty(tempMatchData.homeTeamScore) &&string.IsNullOrEmpty(tempMatchData.visitingTeamScore))
//{
data += "vs";
}
else
{
//}
//else
//{
data += string.Format("{0}:{1}",tempMatchData.homeTeamScore,tempMatchData.visitingTeamScore);
}
// data += string.Format("{0}:{1}",tempMatchData.homeTeamScore,tempMatchData.visitingTeamScore);
//}
data += "*";
......
VIZ.TVP.WMCUP.Module/FDayMatchResult/FDayMatchResultViewPlugin.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VIZ.Package.Domain;
namespace VIZ.TVP.WMCUP.Module.FDayMatchResult
{
public class FDayMatchResultViewPlugin:IPluginLifeCycle
{
/// <summary>
/// 插件ID
/// </summary>
/// <remarks>
/// 插件ID不能包含点号
/// </remarks>
public const string PLUGIN_ID = "FDayMatchResultView";
/// <summary>
/// 插件显示名称
/// </summary>
public const string PLUGIN_NAME = "赛果展示";
public void Dispose()
{
}
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(FDayMatchResultView);
//info.SettingViewType = typeof(DayMatchUI);
return info;
}
}
}
VIZ.TVP.WMCUP.Module/FDayMatchResult/View/FDayMatchResultView.xaml.cs 0 → 100644
using log4net;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using VIZ.Framework.Core;
using VIZ.Package.Domain;
using VIZ.Package.Module;
using VIZ.Package.Service;
using VIZ.Package.Storage;
namespace VIZ.TVP.WMCUP.Module
{
/// <summary>
/// FDayMatchResultView.xaml 的交互逻辑
/// </summary>
public partial class FDayMatchResultView : UserControl, IPluginView
{
public FDayMatchResultViewModel vm = new FDayMatchResultViewModel();
/// <summary>
/// 日志
/// </summary>
private static ILog Log = LogManager.GetLogger(typeof(FDayMatchView));
public FDayMatchResultView()
{
InitializeComponent();
WPFHelper.BindingViewModel(this, vm);
FDayMatchResultViewModel.FDayMatchResultViewModelInstance = vm;
}
/// <summary>
/// 操作日志服务
/// </summary>
private RecordLogService recordLogService = new RecordLogService();
/// <summary>
/// 上版
/// </summary>
/// <param name="conns">连接</param>
public void TakIn(ConnModel conns)
{
//DayMatchViewModel vm = thi DayMatchViewModel
//ApplicationDomainEx.PreviewConn.EndpointManager.Send("");
this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, RecordLogConstants.OPERATE_TAKE_TAKE);
if (conns.IsConnected && vm.MatchData != null)
{
//SCRIPT_INVOKE
conns.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "Data", vm.CombineMatchData()));
}
}
/// <summary>
/// 继续
/// </summary>
/// <param name="conns">连接</param>
public void TakeContinue(ConnModel conns)
{
this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, RecordLogConstants.OPERATE_TAKE_CONTINUE);
if (conns.IsConnected && vm.MatchData != null)
{
conns.EndpointManager.Send(VizEngineCommands.STAGE_CONTINUE);
}
}
/// <summary>
/// 下版子
/// </summary>
/// <param name="conns">连接</param>
public void TakeOut(ConnModel conns)
{
}
/// <summary>
/// 更新
/// </summary>
/// <param name="conns">连接</param>
public void TakeUpdate(ConnModel conns)
{
this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, RecordLogConstants.OPERATE_TAKE_UPDATE);
if (conns.IsConnected && vm.MatchData != null)
{
//SCRIPT_INVOKE
conns.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "Data", vm.CombineMatchData()));
}
}
/// <summary>
/// 预览上版子
/// </summary>
/// <param name="conn">连接</param>
public void PreviewIn(ConnModel conn)
{
this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, RecordLogConstants.OPERATE_PREVIEW_PLAY);
if (conn.IsConnected && vm.MatchData != null)
{
//SCRIPT_INVOKE
conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "Data", vm.CombineMatchData()));
}
}
/// <summary>
/// 预览继续
/// </summary>
/// <param name="conn">连接</param>
public void PreviewContinue(ConnModel conn)
{
}
/// <summary>
/// 预览下版
/// </summary>
/// <param name="conn">连接</param>
public void PreviewOut(ConnModel conn)
{
//if(conn.IsConnected)
//{
// conn.EndpointManager.Send(VizEngineCommands.STAGE_CONTINUE);
//}
}
/// <summary>
/// 销毁
/// </summary>
public void Dispose()
{
}
/// <summary>
/// 任务模型
/// </summary>
public PackageTaskModel task;
/// <summary>
/// 注册服务
/// </summary>
IPackageTaskService service;
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()));
}
}
public void PreviewUpdate(ConnModel conn)
{
this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, RecordLogConstants.OPERATE_PREVIEW_UPDATE);
if (conn.IsConnected && vm.MatchData != null)
{
//SCRIPT_INVOKE
conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "Data", vm.CombineMatchData()));
}
}
}
}
VIZ.TVP.WMCUP.Module/FFormation/View/FFormationView.xaml 0 → 100644
<UserControl x:Class="VIZ.TVP.WMCUP.Module.FFormationView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:VIZ.TVP.WMCUP.Module"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>
</Grid>
</UserControl>
VIZ.TVP.WMCUP.Module/FFormation/View/FFormationView.xaml.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace VIZ.TVP.WMCUP.Module
{
/// <summary>
/// FFormationView.xaml 的交互逻辑
/// </summary>
public partial class FFormationView : UserControl
{
public FFormationView()
{
InitializeComponent();
}
}
}
VIZ.TVP.WMCUP.Module/FFormation/ViewModel/FFormationViewModel.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.TVP.WMCUP.Module
{
public class FFormationViewModel
{
}
}
VIZ.TVP.WMCUP.Module/FGTeamStanding/ViewModel/FGTeamStandingViewModel.cs
......@@ -391,6 +391,7 @@ namespace VIZ.TVP.WMCUP.Module
data += tempTeamRankModel.score;
}
Log.Info("全量小组积分发送数据====>" + data);
return data;
}
catch (Exception ex)
......
VIZ.TVP.WMCUP.Module/FTeamStandings/Mdoel/Teamrank.cs
......@@ -17,6 +17,8 @@ namespace VIZ.TVP.WMCUP.Module
public string teamName { get; set; } //球队名称
public string nationName { get; set; }//不带国旗的名称
public string matchNum { get; set; } //场次
......@@ -43,7 +45,7 @@ namespace VIZ.TVP.WMCUP.Module
public string shortTeamName { get; set; } //球队名称简称
public string goaldifference { get; set; }// 净胜球
public string goaldifference { get; set; } = "0";// 净胜球
}
}
VIZ.TVP.WMCUP.Module/FTeamStandings/View/FTeamStandingView.xaml
......@@ -92,7 +92,7 @@
<dxg:GridControl x:Name="grid" ShowBorder="False" ItemsSource="{Binding Path= TeamRanksModel,Mode=TwoWay}">
<dxg:GridColumn FieldName="rank" Header="排名" Width="112" />
<dxg:GridColumn FieldName="teamLogo" Header="球队国旗" Width="112"/>
<dxg:GridColumn FieldName="nationName" Header="球队国旗" Width="112"/>
<dxg:GridColumn FieldName="teamName" Header="球队名" Width="112" />
<dxg:GridColumn FieldName="matchNum" Header="场次" Width="180" />
<dxg:GridColumn FieldName="winNum" Header="胜" Width="100" />
......
VIZ.TVP.WMCUP.Module/FTeamStandings/ViewModel/FTeamStandingViewModel.cs
......@@ -92,7 +92,7 @@ namespace VIZ.TVP.WMCUP.Module
//i++;
//data += tempTeamRankModel.rank.ToString().Replace(" ", "");
data += tempTeamRankModel.teamLogo.Replace(" ", "");
data += tempTeamRankModel.nationName.Replace(" ", "");
data += "*";
data += tempTeamRankModel.teamName.ToString().Replace(" ", "");
......@@ -136,6 +136,9 @@ namespace VIZ.TVP.WMCUP.Module
{
data += tempTeamRankModel.score.Replace(" ", "");
}
data += "*";
data += tempTeamRankModel.rank.ToString().Replace(" ", "");
data += ";";
}
......@@ -174,7 +177,7 @@ namespace VIZ.TVP.WMCUP.Module
/// <summary>
/// 选中的分组
/// </summary>
private string selectGroupItem;
private string selectGroupItem="A组";
public string SelectGroupItem
{
......
VIZ.TVP.WMCUP.Module/HeaderPage/ViewModel/DateHeaderViewModel.cs
......@@ -193,7 +193,7 @@ namespace VIZ.TVP.WMCUP.Module
{
this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, "CBA查看赛程上一天：" + PluginConstant.Operate_Load);
MatchDate = Convert.ToDateTime(MatchDate).AddDays(-1).ToShortDateString();
// GetSchedule();
GetSchedule();
}
......@@ -204,7 +204,7 @@ namespace VIZ.TVP.WMCUP.Module
{
this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, "CBA查看赛程下一天：" + PluginConstant.Operate_Load);
MatchDate = Convert.ToDateTime(MatchDate).AddDays(1).ToShortDateString();
// GetSchedule();
GetSchedule();
}
......
VIZ.TVP.WMCUP.Module/ShootPlayerRank/Model/ShootPlayerRank.cs
......@@ -51,6 +51,11 @@ namespace VIZ.TVP.WMCUP.Module
/// <summary>
/// 国家名称
/// </summary>
public string nationName { get; set; }
/// <summary>
/// 点球数量
/// </summary>
public string penaltyGoals { get; set; } = "0";
......
VIZ.TVP.WMCUP.Module/ShootPlayerRank/View/ShootPlayerRankView.xaml
......@@ -116,7 +116,7 @@
<dxg:GridColumn FieldName="rank" Header="排名" Width="112" />
<dxg:GridColumn FieldName="figureName" Header="球员名称" Width="112" />
<dxg:GridColumn FieldName="teamLogo" Header="球队国旗" Width="112"/>
<dxg:GridColumn FieldName="nationName" Header="球队国旗" Width="112"/>
<dxg:GridColumn FieldName="shortTeamName" Header="球队名称" Width="112"/>
<dxg:GridColumn FieldName="games" Header="场次" Width="180" />
<dxg:GridColumn FieldName="goals" Header="进球数" Width="180" />
......
VIZ.TVP.WMCUP.Module/ShootPlayerRank/ViewModel/ShootPlayerRankViewModel.cs
......@@ -178,13 +178,13 @@ namespace VIZ.TVP.WMCUP.Module
data += "*";
if (string.IsNullOrEmpty(tempTeamRankModel.teamLogo))
if (string.IsNullOrEmpty(tempTeamRankModel.nationName))
{
data += "";
}
else
{
data += tempTeamRankModel.teamLogo.Replace(" ", "");
data += tempTeamRankModel.nationName.Replace(" ", "");
}
......@@ -243,8 +243,8 @@ namespace VIZ.TVP.WMCUP.Module
//data += "*";
//data += tempTeamRankModel.penaltyGoals.ToString().Replace(" ", "");
data += "*";
data += tempTeamRankModel.rank.ToString().Replace(" ", "");
data += ";";
......
VIZ.TVP.WMCUP.Module/VIZ.TVP.WMCUP.Module.csproj
......@@ -93,6 +93,11 @@
<Compile Include="Common\Model\Seasons.cs" />
<Compile Include="Common\PluginConstant.cs" />
<Compile Include="Common\Utils.cs" />
<Compile Include="FDayMatchResult\FDayMatchResultViewPlugin.cs" />
<Compile Include="FDayMatchResult\ViewModel\FDayMatchResultViewModel.cs" />
<Compile Include="FDayMatchResult\View\FDayMatchResultView.xaml.cs">
<DependentUpon>FDayMatchResultView.xaml</DependentUpon>
</Compile>
<Compile Include="FDayMatch\FDayMatchViewPlugin.cs" />
<Compile Include="FDayMatch\Model\Dayschedule.cs" />
<Compile Include="FDayMatch\Model\Dayschedules.cs" />
......@@ -100,6 +105,10 @@
<Compile Include="FDayMatch\View\FDayMatchView.xaml.cs">
<DependentUpon>FDayMatchView.xaml</DependentUpon>
</Compile>
<Compile Include="FFormation\ViewModel\FFormationViewModel.cs" />
<Compile Include="FFormation\View\FFormationView.xaml.cs">
<DependentUpon>FFormationView.xaml</DependentUpon>
</Compile>
<Compile Include="FGTeamStanding\FGTeamStandingViewPlugin.cs" />
<Compile Include="FGTeamStanding\ViewModel\FGTeamStandingViewModel.cs" />
<Compile Include="FGTeamStanding\View\FGTeamStandingView.xaml.cs">
......@@ -204,10 +213,18 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Page Include="FDayMatchResult\View\FDayMatchResultView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="FDayMatch\View\FDayMatchView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="FFormation\View\FFormationView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="FGTeamStanding\View\FGTeamStandingView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
......@@ -236,6 +253,8 @@
<ItemGroup>
<Resource Include="Image\FT\Prompt2525.png" />
</ItemGroup>
<ItemGroup />
<ItemGroup>
<Folder Include="FFormation\Model\" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ 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