Skip to content

V
VIZ.TVP.CBA
Commit e6ac644f by wangonghui
Options

提交修改CBAbug

parent 3b0be8eb
Showing with 527 additions and 35 deletions
VIZ.MIGU.CBA.Module/HeaderPage/ViewModel/DateHeaderViewModel.cs
...@@ -323,6 +323,7 @@ namespace VIZ.TVP.CBA.Module ...@@ -323,6 +323,7 @@ namespace VIZ.TVP.CBA.Module
if (value==null) if (value==null)
{ {
ClearData();
return; return;
} }
this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, "CBA查看选择赛程：" + value.HomeTeamName + "VS" + value.VisitingTeamName); this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, "CBA查看选择赛程：" + value.HomeTeamName + "VS" + value.VisitingTeamName);
...@@ -470,6 +471,92 @@ namespace VIZ.TVP.CBA.Module ...@@ -470,6 +471,92 @@ namespace VIZ.TVP.CBA.Module
} }
} }
private void ClearData()
{
#region 球员统计信息
if (NewTeamStatsViewModel.TeamStatsViewModelInstance.Count > 0)
{
foreach (var tempTeamStatsViewModel in NewTeamStatsViewModel.TeamStatsViewModelInstance)
{
tempTeamStatsViewModel.ScheduleID = "";
tempTeamStatsViewModel.Matchtypeid = "";
if (tempTeamStatsViewModel.page != null && ApplicationDomainEx.CurrentPage == tempTeamStatsViewModel.page)
{
tempTeamStatsViewModel.SetTeamData();
}
}
}
#endregion
#region 单个球员信息
if (NewSinglePlayerViewModel.SinglePlayerViewModelInstance.Count > 0)
{
foreach (var tempSinglePlayerViewModel in NewSinglePlayerViewModel.SinglePlayerViewModelInstance)
{
tempSinglePlayerViewModel.ScheduleID = "";
tempSinglePlayerViewModel.Matchtypeid = "";
if (tempSinglePlayerViewModel.page != null && ApplicationDomainEx.CurrentPage == tempSinglePlayerViewModel.page)
{
tempSinglePlayerViewModel.SetSingleData();
}
}
}
#endregion
#region Mvp球员信息
if (MvpPlayerViewModel.MvpPlayerViewModelInstance.Count > 0)
{
foreach (var tempSinglePlayerViewModel in MvpPlayerViewModel.MvpPlayerViewModelInstance)
{
tempSinglePlayerViewModel.ScheduleID = "";
tempSinglePlayerViewModel.Matchtypeid = "";
if (tempSinglePlayerViewModel.page != null && ApplicationDomainEx.CurrentPage == tempSinglePlayerViewModel.page)
{
tempSinglePlayerViewModel.SetSingleData();
}
}
}
#endregion
#region 球员对比信息
if (NewPlayerComPareViewModel.PlayerCompareViewModelInstance.Count > 0)
{
foreach (var playerCompareViewModel in NewPlayerComPareViewModel.PlayerCompareViewModelInstance)
{
playerCompareViewModel.ScheduleID = "";
playerCompareViewModel.Matchtypeid = "";
//PlayerCompareViewModel playerCompareViewModel = PlayerCompareViewModel.CreateInstance;
if (playerCompareViewModel.page != null && ApplicationDomainEx.CurrentPage == playerCompareViewModel.page)
{
playerCompareViewModel.SetCompareData();
}
}
}
#endregion
}
/// <summary> /// <summary>
/// 今日赛程日期 /// 今日赛程日期
......
VIZ.MIGU.CBA.Module/Setting/HttpUrl/HttpUrlPluginLifeCycle.cs
...@@ -24,7 +24,7 @@ namespace VIZ.TVP.CBA.Module ...@@ -24,7 +24,7 @@ namespace VIZ.TVP.CBA.Module
/// <summary> /// <summary>
/// 插件名称 /// 插件名称
/// </summary> /// </summary>
public const string PLUGIN_NAME = "CBA赛事配置"; public const string PLUGIN_NAME = "篮球数据访问配置";
/// <summary> /// <summary>
/// 注册 /// 注册
......
VIZ.MIGU.CBA.Module/Setting/HttpUrl/View/HttpUrlConfigView.xaml
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<Grid> <Grid>
<!-- 数据访问设置 --> <!-- 数据访问设置 -->
<GroupBox Header="CBA赛事配置" Margin="10" Padding="10"> <GroupBox Header="篮球赛事配置" Margin="10" Padding="10">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="120"></ColumnDefinition> <ColumnDefinition Width="120"></ColumnDefinition>
......
VIZ.TVP.FTB.Module/Common/JsonModel.cs
...@@ -41,7 +41,7 @@ namespace VIZ.TVP.FTB.Module ...@@ -41,7 +41,7 @@ namespace VIZ.TVP.FTB.Module
/// 艾果平台的明日赛程数据服务器接口 /// 艾果平台的明日赛程数据服务器接口
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public async static Task<Dayschedules> PostTomorrowMatch_Path(string round) public async static Task<Dayschedules> PostTomorrowMatch_Path(string round,string selectFootballType)
{ {
...@@ -56,7 +56,7 @@ namespace VIZ.TVP.FTB.Module ...@@ -56,7 +56,7 @@ namespace VIZ.TVP.FTB.Module
Dictionary<string, string> dict = new Dictionary<string, string>(); Dictionary<string, string> dict = new Dictionary<string, string>();
//dict.Add("leagueid", "401"); //dict.Add("leagueid", "401");
dict.Add("round", round); dict.Add("round", round);
dict.Add("competitionId", AppSetup_InitLiteDB.HttpUrlConfigEntity.SelectFootballType); dict.Add("competitionId", selectFootballType);
string newKey = Utils.GetKey(appID, appKey); string newKey = Utils.GetKey(appID, appKey);
...@@ -88,7 +88,7 @@ namespace VIZ.TVP.FTB.Module ...@@ -88,7 +88,7 @@ namespace VIZ.TVP.FTB.Module
///球队积分数据服务器地址 ///球队积分数据服务器地址
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public static TeamRanks PostTeamScoreData_Path() public static TeamRanks PostTeamScoreData_Path(string footballType,string seasonId)
{ {
try try
{ {
...@@ -97,8 +97,8 @@ namespace VIZ.TVP.FTB.Module ...@@ -97,8 +97,8 @@ namespace VIZ.TVP.FTB.Module
Dictionary<string, string> dict = new Dictionary<string, string>(); Dictionary<string, string> dict = new Dictionary<string, string>();
dict.Add("competitionId", AppSetup_InitLiteDB.HttpUrlConfigEntity.SelectFootballType); dict.Add("competitionId", footballType);
dict.Add("seasonId", AppSetup_InitLiteDB.HttpUrlConfigEntity.SeasonId);//"110000005454" dict.Add("seasonId", seasonId);//"110000005454"
string newKey = Utils.GetKey(appID, appKey); string newKey = Utils.GetKey(appID, appKey);
...@@ -157,9 +157,50 @@ namespace VIZ.TVP.FTB.Module ...@@ -157,9 +157,50 @@ namespace VIZ.TVP.FTB.Module
return null; return null;
} }
}
/// <summary>
/// 获取球队射手榜数据
/// </summary>
/// <param name="footballType"></param>
/// <param name="seasonId"></param>
/// <returns></returns>
public static ShootPlayerRanks Post_ShootPlayerRankData(string footballType, string seasonId)
{
try
{
string shootPath = strUrl + "player/getplayerstats";
Dictionary<string, string> dict = new Dictionary<string, string>();
dict.Add("competitionId", footballType);
dict.Add("seasonId", seasonId);//"110000005454"
string newKey = Utils.GetKey(appID, appKey);
string result = JsonHelper.Post(shootPath, dict, newKey);
Log.Info("足球球员射手排行==>" + result);
JsonSerializerSettings settings = new JsonSerializerSettings();
settings.NullValueHandling = NullValueHandling.Ignore;
ShootPlayerRanks shootPlayerRanks = JsonConvert.DeserializeObject<ShootPlayerRanks>(result, settings);
var sortPlayerShoot = shootPlayerRanks.playerstats.OrderBy(a => a.rank).Take(5).ToList();
shootPlayerRanks.playerstats = sortPlayerShoot;
return shootPlayerRanks;
}
catch(Exception ex)
{
Log.Error(ex.Message);
return null;
} }
}
} }
......
VIZ.TVP.FTB.Module/FDayMatch/View/FDayMatchView.xaml.cs
...@@ -26,7 +26,7 @@ namespace VIZ.TVP.FTB.Module ...@@ -26,7 +26,7 @@ namespace VIZ.TVP.FTB.Module
public partial class FDayMatchView : UserControl, IPluginView public partial class FDayMatchView : UserControl, IPluginView
{ {
FDayMatchViewModel vm = null; public FDayMatchViewModel vm = new FDayMatchViewModel();
/// <summary> /// <summary>
/// 日志 /// 日志
...@@ -36,9 +36,9 @@ namespace VIZ.TVP.FTB.Module ...@@ -36,9 +36,9 @@ namespace VIZ.TVP.FTB.Module
{ {
InitializeComponent(); InitializeComponent();
WPFHelper.BindingViewModel(this, new FDayMatchViewModel()); WPFHelper.BindingViewModel(this, vm);
vm = this.DataContext as FDayMatchViewModel; FDayMatchViewModel.FDayMatchViewModelInstance = vm;
} }
......
VIZ.TVP.FTB.Module/FDayMatch/ViewModel/FDayMatchViewModel.cs
...@@ -17,6 +17,9 @@ namespace VIZ.TVP.FTB.Module ...@@ -17,6 +17,9 @@ namespace VIZ.TVP.FTB.Module
/// </summary> /// </summary>
private static ILog Log = LogManager.GetLogger(typeof(FDayMatchViewModel)); private static ILog Log = LogManager.GetLogger(typeof(FDayMatchViewModel));
public static FDayMatchViewModel FDayMatchViewModelInstance=new FDayMatchViewModel();
public FDayMatchViewModel() public FDayMatchViewModel()
{ {
//初始化方法 //初始化方法
...@@ -65,6 +68,15 @@ namespace VIZ.TVP.FTB.Module ...@@ -65,6 +68,15 @@ namespace VIZ.TVP.FTB.Module
} }
/// <summary>
/// 足球赛事类型
/// </summary>
public string FoolballType = "";
/// <summary>
/// 赛季ID
/// </summary>
public string SeasonId = "";
/// <summary> /// <summary>
...@@ -83,7 +95,7 @@ namespace VIZ.TVP.FTB.Module ...@@ -83,7 +95,7 @@ namespace VIZ.TVP.FTB.Module
// SetRoundMatchData(); // SetRoundMatchData();
RoundMatchData = await JsonModel.PostTomorrowMatch_Path(roundMatchItem.ToString()); RoundMatchData = await JsonModel.PostTomorrowMatch_Path(roundMatchItem.ToString(), FoolballType);
if (RoundMatchData == null) return; if (RoundMatchData == null) return;
...@@ -204,6 +216,8 @@ namespace VIZ.TVP.FTB.Module ...@@ -204,6 +216,8 @@ namespace VIZ.TVP.FTB.Module
} }
roundMatchItem = 1; roundMatchItem = 1;
FoolballType = DateHeaderViewModel.FoolballType;
SeasonId = DateHeaderViewModel.SeasonId;
} }
......
VIZ.TVP.FTB.Module/FTeamStandings/View/FTeamStandingView.xaml.cs
...@@ -23,7 +23,7 @@ namespace VIZ.TVP.FTB.Module ...@@ -23,7 +23,7 @@ namespace VIZ.TVP.FTB.Module
/// </summary> /// </summary>
public partial class FTeamStandingView : UserControl, IPluginView public partial class FTeamStandingView : UserControl, IPluginView
{ {
FTeamStandingViewModel vm= null; FTeamStandingViewModel vm= new FTeamStandingViewModel();
/// <summary> /// <summary>
/// 操作日志服务 /// 操作日志服务
...@@ -34,9 +34,11 @@ namespace VIZ.TVP.FTB.Module ...@@ -34,9 +34,11 @@ namespace VIZ.TVP.FTB.Module
InitializeComponent(); InitializeComponent();
WPFHelper.BindingViewModel(this, new FTeamStandingViewModel()); WPFHelper.BindingViewModel(this, vm);
vm = this.DataContext as FTeamStandingViewModel; //vm = this.DataContext as FTeamStandingViewModel;
FTeamStandingViewModel.FTeamStandingViewModelInstance = vm;
} }
......
VIZ.TVP.FTB.Module/FTeamStandings/ViewModel/FTeamStandingViewModel.cs
...@@ -15,6 +15,11 @@ namespace VIZ.TVP.FTB.Module ...@@ -15,6 +15,11 @@ namespace VIZ.TVP.FTB.Module
/// 日志 /// 日志
/// </summary> /// </summary>
private static ILog Log = LogManager.GetLogger(typeof(FTeamStandingViewModel)); private static ILog Log = LogManager.GetLogger(typeof(FTeamStandingViewModel));
/// <summary>
///
/// </summary>
public static FTeamStandingViewModel FTeamStandingViewModelInstance = new FTeamStandingViewModel();
public FTeamStandingViewModel() public FTeamStandingViewModel()
{ {
//初始化方法 //初始化方法
...@@ -44,7 +49,34 @@ namespace VIZ.TVP.FTB.Module ...@@ -44,7 +49,34 @@ namespace VIZ.TVP.FTB.Module
private void BtmCommand() private void BtmCommand()
{ {
teamStands = new TeamRanks(); teamStands = new TeamRanks();
teamStands = JsonModel.PostTeamScoreData_Path();
if (FoolballType == "英超")
{
SeasonId = AppSetup_InitLiteDB.HttpUrlConfigEntity.EPCSeasonId;
}
else if (FoolballType == "法甲")
{
SeasonId = AppSetup_InitLiteDB.HttpUrlConfigEntity.FL1SeasonId;
}
else if (FoolballType == "意甲")
{
SeasonId = AppSetup_InitLiteDB.HttpUrlConfigEntity.ISASeasonId;
}
else if (FoolballType == "德甲")
{
SeasonId = AppSetup_InitLiteDB.HttpUrlConfigEntity.LIGASeasonId;
}
else if (FoolballType == "西甲")
{
SeasonId = AppSetup_InitLiteDB.HttpUrlConfigEntity.SLPSeasonId;
}
teamStands = JsonModel.PostTeamScoreData_Path(FoolballType, SeasonId);
if (teamStands == null) return; if (teamStands == null) return;
TeamRanksModel = new ObservableCollection<Teamrank>(); TeamRanksModel = new ObservableCollection<Teamrank>();
int i = 1; int i = 1;
...@@ -139,6 +171,18 @@ namespace VIZ.TVP.FTB.Module ...@@ -139,6 +171,18 @@ namespace VIZ.TVP.FTB.Module
} }
/// <summary>
/// 足球赛事类型
/// </summary>
public string FoolballType = "";
/// <summary>
/// 赛季ID
/// </summary>
public string SeasonId = "";
/// <summary> /// <summary>
/// 初始话 /// 初始话
/// </summary> /// </summary>
...@@ -147,6 +191,9 @@ namespace VIZ.TVP.FTB.Module ...@@ -147,6 +191,9 @@ namespace VIZ.TVP.FTB.Module
BtnCmd = new VCommand(BtmCommand); BtnCmd = new VCommand(BtmCommand);
PromptCommand = new VCommand(PromptCmd); PromptCommand = new VCommand(PromptCmd);
FoolballType = DateHeaderViewModel.FoolballType;
SeasonId = DateHeaderViewModel.SeasonId;
} }
#region 打开更新数据时间日志 #region 打开更新数据时间日志
......
VIZ.TVP.FTB.Module/HeaderPage/View/DateHeaderView.xaml
...@@ -24,14 +24,21 @@ ...@@ -24,14 +24,21 @@
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="120"/> <ColumnDefinition Width="110"/>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="90"/>
<ColumnDefinition Width="40"/> <ColumnDefinition Width="40"/>
<ColumnDefinition Width="150"/> <ColumnDefinition Width="150"/>
<ColumnDefinition Width="280"/> <ColumnDefinition Width="280"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="赛事：" Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center" ></TextBlock>
<dxe:ComboBoxEdit Grid.Column="1" Height="30" Grid.Row="8" Width="100"
ItemsSource="{Binding Path=FootballTypes,Mode=TwoWay}" SelectedItem="{Binding Path=SelectFootballType,Mode=TwoWay}"></dxe:ComboBoxEdit>
<WrapPanel Grid.Column="4" VerticalAlignment="Center"> <WrapPanel Grid.Column="4" VerticalAlignment="Center">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
......
VIZ.TVP.FTB.Module/HeaderPage/ViewModel/DateHeaderViewModel.cs
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
...@@ -17,6 +18,17 @@ namespace VIZ.TVP.FTB.Module ...@@ -17,6 +18,17 @@ namespace VIZ.TVP.FTB.Module
public class DateHeaderViewModel : ViewModelBase public class DateHeaderViewModel : ViewModelBase
{ {
public DateHeaderViewModel()
{
FootballTypes = new ObservableCollection<string>()
{
"英超","法甲","意甲","德甲","西甲"
};
SelectFootballType = "英超";
}
private static AppSetup_InitLiteDB appSetup_InitCBALiteDB = AppSetup_InitLiteDB.CreateInstance;
/// <summary> /// <summary>
/// 操作日志服务 /// 操作日志服务
/// </summary> /// </summary>
...@@ -69,5 +81,94 @@ namespace VIZ.TVP.FTB.Module ...@@ -69,5 +81,94 @@ namespace VIZ.TVP.FTB.Module
} }
/// <summary>
/// 足球赛事类型
/// </summary>
public static string FoolballType= "";
/// <summary>
/// 赛季ID
/// </summary>
public static string SeasonId ="";
/// <summary>
/// 足球类型选择
/// </summary>
private ObservableCollection<string> footballTypes;
public ObservableCollection<string> FootballTypes
{
get { return footballTypes; }
set { footballTypes = value; this.RaisePropertyChanged(nameof(FootballTypes)); }
}
/// <summary>
/// 选择的足球比赛
/// </summary>
private string selectFootballType;
public string SelectFootballType
{
get { return selectFootballType; }
set
{
selectFootballType = value;
this.RaisePropertyChanged(nameof(SelectFootballType));
//if(string.IsNullOrEmpty(selectFootballType))
//{
// FDayMatchViewModel.FDayMatchViewModelInstance.FoolballType = "";
// FTeamStandingViewModel.FTeamStandingViewModelInstance.FoolballType = "";
// SeasonId = "";
// FoolballType = "";
// return;
//}
FDayMatchViewModel.FDayMatchViewModelInstance.FoolballType = selectFootballType;
FTeamStandingViewModel.FTeamStandingViewModelInstance.FoolballType = selectFootballType;
FoolballType = selectFootballType;
//if (selectFootballType=="英超")
//{
// FDayMatchViewModel.FDayMatchViewModelInstance.SeasonId = AppSetup_InitLiteDB.HttpUrlConfigEntity.EPCSeasonId;
// FTeamStandingViewModel.FTeamStandingViewModelInstance.SeasonId = AppSetup_InitLiteDB.HttpUrlConfigEntity.EPCSeasonId;
// SeasonId= AppSetup_InitLiteDB.HttpUrlConfigEntity.EPCSeasonId;
//}
//else if(selectFootballType == "法甲")
//{
// FDayMatchViewModel.FDayMatchViewModelInstance.SeasonId = AppSetup_InitLiteDB.HttpUrlConfigEntity.FL1SeasonId;
// FTeamStandingViewModel.FTeamStandingViewModelInstance.SeasonId = AppSetup_InitLiteDB.HttpUrlConfigEntity.FL1SeasonId;
// SeasonId = AppSetup_InitLiteDB.HttpUrlConfigEntity.FL1SeasonId;
//}
//else if(selectFootballType == "意甲")
//{
// FDayMatchViewModel.FDayMatchViewModelInstance.SeasonId = AppSetup_InitLiteDB.HttpUrlConfigEntity.ISASeasonId;
// FTeamStandingViewModel.FTeamStandingViewModelInstance.SeasonId = AppSetup_InitLiteDB.HttpUrlConfigEntity.ISASeasonId;
// SeasonId= AppSetup_InitLiteDB.HttpUrlConfigEntity.ISASeasonId;
//}
//else if(selectFootballType == "德甲")
//{
// FDayMatchViewModel.FDayMatchViewModelInstance.SeasonId = AppSetup_InitLiteDB.HttpUrlConfigEntity.LIGASeasonId;
// FTeamStandingViewModel.FTeamStandingViewModelInstance.SeasonId = AppSetup_InitLiteDB.HttpUrlConfigEntity.LIGASeasonId;
// SeasonId= AppSetup_InitLiteDB.HttpUrlConfigEntity.LIGASeasonId;
//}
//else if(selectFootballType == "西甲")
//{
// FDayMatchViewModel.FDayMatchViewModelInstance.SeasonId = AppSetup_InitLiteDB.HttpUrlConfigEntity.SLPSeasonId;
// FTeamStandingViewModel.FTeamStandingViewModelInstance.SeasonId = AppSetup_InitLiteDB.HttpUrlConfigEntity.SLPSeasonId;
// SeasonId = AppSetup_InitLiteDB.HttpUrlConfigEntity.SLPSeasonId;
//}
}
}
} }
} }
VIZ.TVP.FTB.Module/Setting/httpUrl/View/HttpUrlConfigView.xaml
...@@ -16,25 +16,34 @@ ...@@ -16,25 +16,34 @@
<Grid> <Grid>
<!-- 数据访问设置 --> <!-- 数据访问设置 -->
<GroupBox Header="主数据访问配置" Margin="10" Padding="10"> <GroupBox Header="足球赛事配置" Margin="10" Padding="10">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="120"></ColumnDefinition> <ColumnDefinition Width="120"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition> <ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="40"></RowDefinition>
<RowDefinition Height="50"></RowDefinition> <RowDefinition Height="50"></RowDefinition>
<RowDefinition Height="50"></RowDefinition> <RowDefinition Height="50"></RowDefinition>
<RowDefinition Height="50"></RowDefinition> <RowDefinition Height="50"></RowDefinition>
<RowDefinition Height="50"></RowDefinition> <RowDefinition Height="40"></RowDefinition>
<RowDefinition Height="50"></RowDefinition>
<RowDefinition Height="40"></RowDefinition>
<RowDefinition Height="50"></RowDefinition> <RowDefinition Height="50"></RowDefinition>
<RowDefinition Height="50"></RowDefinition> <RowDefinition Height="50"></RowDefinition>
<RowDefinition Height="50"></RowDefinition> <RowDefinition Height="40"></RowDefinition>
<RowDefinition Height="50"></RowDefinition>
<RowDefinition Height="50"></RowDefinition> <RowDefinition Height="40"></RowDefinition>
<RowDefinition Height="40"></RowDefinition>
<RowDefinition Height="40"></RowDefinition>
<RowDefinition Height="40"></RowDefinition>
<RowDefinition Height="40"></RowDefinition>
<RowDefinition Height="40"></RowDefinition>
...@@ -74,10 +83,54 @@ ...@@ -74,10 +83,54 @@
<!-- 地址 --> <!-- 地址 -->
<TextBlock Text="比赛类型:" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,10,0" Grid.Row="8" ></TextBlock> <TextBlock Text="赛季配置:" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Row="8" ></TextBlock>
<WrapPanel Grid.Column="1" Grid.Row="9" HorizontalAlignment="Left" VerticalAlignment="Center">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="200"/>
</Grid.ColumnDefinitions>
<TextBlock Text="英超：" Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center" ></TextBlock>
<TextBlock Text="赛季：" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" ></TextBlock>
<dxe:ComboBoxEdit Grid.Column="2" Height="30" Grid.Row="8" Width="190"
ItemsSource="{Binding Path=EPCSeasons,Mode=TwoWay}" SelectedItem="{Binding Path=EPCSelectSeason,Mode=TwoWay}"></dxe:ComboBoxEdit>
</Grid>
</WrapPanel>
<WrapPanel Grid.Column="1" Grid.Row="10" HorizontalAlignment="Left" VerticalAlignment="Center">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="200"/>
</Grid.ColumnDefinitions>
<TextBlock Text="法甲：" Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center" ></TextBlock>
<TextBlock Text="赛季：" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" ></TextBlock>
<dxe:ComboBoxEdit Grid.Column="2" Height="30" Grid.Row="8" Width="190"
ItemsSource="{Binding Path=FL1Seasons,Mode=TwoWay}" SelectedItem="{Binding Path=FL1SelectSeason,Mode=TwoWay}"></dxe:ComboBoxEdit>
</Grid>
</WrapPanel>
<WrapPanel Grid.Column="1" Grid.Row="8" HorizontalAlignment="Left" VerticalAlignment="Center"> <WrapPanel Grid.Column="1" Grid.Row="11" HorizontalAlignment="Left" VerticalAlignment="Center">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
...@@ -86,14 +139,34 @@ ...@@ -86,14 +139,34 @@
<ColumnDefinition Width="200"/> <ColumnDefinition Width="200"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<dxe:ComboBoxEdit Grid.Column="0" Height="30" Grid.Row="8" Width="100" <TextBlock Text="意甲：" Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center" ></TextBlock>
ItemsSource="{Binding Path= FootballTypes,Mode=TwoWay}" SelectedItem="{Binding Path=SelectFootballType,Mode=TwoWay}"></dxe:ComboBoxEdit>
<TextBlock Text="赛季：" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" ></TextBlock> <TextBlock Text="赛季：" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" ></TextBlock>
<dxe:ComboBoxEdit Grid.Column="2" Height="30" Grid.Row="8" Width="190"
ItemsSource="{Binding Path=ISASeasons,Mode=TwoWay}" SelectedItem="{Binding Path=ISASelectSeason,Mode=TwoWay}"></dxe:ComboBoxEdit>
</Grid>
</WrapPanel>
<WrapPanel Grid.Column="1" Grid.Row="12" HorizontalAlignment="Left" VerticalAlignment="Center">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="200"/>
</Grid.ColumnDefinitions>
<TextBlock Text="德甲：" Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center" ></TextBlock>
<TextBlock Text="赛季：" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" ></TextBlock>
<dxe:ComboBoxEdit Grid.Column="2" Height="30" Grid.Row="8" Width="190" <dxe:ComboBoxEdit Grid.Column="2" Height="30" Grid.Row="8" Width="190"
ItemsSource="{Binding Path=Seasons,Mode=TwoWay}" SelectedItem="{Binding Path=SelectSeason,Mode=TwoWay}"></dxe:ComboBoxEdit> ItemsSource="{Binding Path=LIGASeasons,Mode=TwoWay}" SelectedItem="{Binding Path=LIGASelectSeason,Mode=TwoWay}"></dxe:ComboBoxEdit>
...@@ -101,12 +174,28 @@ ...@@ -101,12 +174,28 @@
</WrapPanel> </WrapPanel>
<WrapPanel Grid.Column="1" Grid.Row="13" HorizontalAlignment="Left" VerticalAlignment="Center">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="200"/>
</Grid.ColumnDefinitions>
<TextBlock Text="西甲：" Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center" ></TextBlock>
<TextBlock Text="赛季：" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" ></TextBlock>
<dxe:ComboBoxEdit Grid.Column="2" Height="30" Grid.Row="8" Width="190"
ItemsSource="{Binding Path=SLPSeasons,Mode=TwoWay}" SelectedItem="{Binding Path=SLPSelectSeason,Mode=TwoWay}"></dxe:ComboBoxEdit>
</Grid>
</WrapPanel>
</Grid> </Grid>
</GroupBox> </GroupBox>
......
VIZ.TVP.FTB.Module/ShootPlayerRank/Model/ShootPlayerRank.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.TVP.FTB.Module
{
public class ShootPlayerRank
{
/// <summary>
/// 球队名称
/// </summary>
public string teamName { get; set; }
/// <summary>
/// 球员图片
/// </summary>
public string playerLogo { get; set; }
/// <summary>
/// 球队国旗
/// </summary>
public string teamLogo { get; set; }
/// <summary>
/// 进球数量
/// </summary>
public string goals { get; set; }
/// <summary>
/// 球员名称
/// </summary>
public string figureName { get; set; }
/// <summary>
/// 球员Id
/// </summary>
public string PlayerID { get; set; }
/// <summary>
/// 排名
/// </summary>
public string rank { get; set; }
}
}
\ No newline at end of file
VIZ.TVP.FTB.Module/ShootPlayerRank/Model/ShootPlayerRanks.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.TVP.FTB.Module
{
public class ShootPlayerRanks
{
/// <summary>
/// 最后推送时间
/// </summary>
public string LastPushDataDateTime { get; set; }
/// <summary>
/// 球员统计
/// </summary>
public List<ShootPlayerRank> playerstats { get; set; }
}
}
VIZ.TVP.FTB.Module/Storge/HttpUrlConfigEntity.cs
...@@ -56,17 +56,46 @@ namespace VIZ.TVP.FTB.Module ...@@ -56,17 +56,46 @@ namespace VIZ.TVP.FTB.Module
/// <summary> /// <summary>
/// 五大联赛 /// 五大联赛
/// </summary> /// </summary>
public string SelectFootballType { get; set; } = "德甲"; // public string SelectFootballType { get; set; } = "德甲";
/// <summary> /// <summary>
/// 选择赛季 /// 选择赛季
/// </summary> /// </summary>
public string SelectSeason { get; set; } // public string SelectSeason { get; set; }
/// <summary>
/// 赛季Id
/// </summary> //英超赛季Id
public string SeasonId { get; set; }
public string EPCSeasonId { get; set; }
//英超选中赛季
public string SelectEPCSeasonId { get; set; }
//法甲赛季Id
public string FL1SeasonId { get; set; }
// 法甲选中赛季
public string SelectFL1SeasonId { get; set; }
//意甲赛季Id
public string ISASeasonId { get; set; }
//意甲选中赛季
public string SelectISASeasonId { get; set; }
//德甲赛季Id
public string LIGASeasonId { get; set; }
//德甲选中赛季
public string SelectLIGASeasonId { get; set; }
//西甲赛季Id
public string SLPSeasonId { get; set; }
//西甲选中赛季
public string SelectSLPSeasonId { get; set; }
#endregion #endregion
......
VIZ.TVP.FTB.Module/VIZ.TVP.FTB.Module.csproj
...@@ -128,6 +128,8 @@ ...@@ -128,6 +128,8 @@
<Compile Include="Setting\httpUrl\View\HttpUrlConfigView.xaml.cs"> <Compile Include="Setting\httpUrl\View\HttpUrlConfigView.xaml.cs">
<DependentUpon>HttpUrlConfigView.xaml</DependentUpon> <DependentUpon>HttpUrlConfigView.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="ShootPlayerRank\Model\ShootPlayerRank.cs" />
<Compile Include="ShootPlayerRank\Model\ShootPlayerRanks.cs" />
<Compile Include="Storge\AppSetup_InitLiteDB.cs" /> <Compile Include="Storge\AppSetup_InitLiteDB.cs" />
<Compile Include="Storge\HttpUrlConfigEntity.cs" /> <Compile Include="Storge\HttpUrlConfigEntity.cs" />
<Compile Include="Storge\LocalDbContext.cs" /> <Compile Include="Storge\LocalDbContext.cs" />
...@@ -194,7 +196,10 @@ ...@@ -194,7 +196,10 @@
<Name>VIZ.Package.Storage</Name> <Name>VIZ.Package.Storage</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup /> <ItemGroup>
<Folder Include="ShootPlayerRank\ViewModel\" />
<Folder Include="ShootPlayerRank\View\" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<Page Include="FDayMatch\View\FDayMatchView.xaml"> <Page Include="FDayMatch\View\FDayMatchView.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
......
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