Skip to content

V
VIZ.TVP.CBA
Commit d741ee02 by wangonghui
Options

提交修改足球界面的bug

parent e041bbf4
Showing with 125 additions and 91 deletions
VIZ.MIGU.CBA.Module/Common/Model/Season.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.TVP.CBA.Module
{
public class Season
{
/// <summary>
/// 赛季Id
/// </summary>
public string seasonId { get; set; }
/// <summary>
/// 赛季名称
/// </summary>
public string seasonName { get; set; }
/// <summary>
/// 赛季名称简写
/// </summary>
public string shortName { get; set; }
}
}
VIZ.MIGU.CBA.Module/Common/Model/Seasons.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.TVP.CBA.Module.Common.Model
{
public class Seasons
{
/// <summary>
/// 更新的时间
/// </summary>
public string LastPushDataDateTime { get; set; }
/// <summary>
/// 赛季数据
/// </summary>
public List<Season> matchseason { get; set; }
}
}
VIZ.MIGU.CBA.Module/VIZ.TVP.CBA.Module.csproj
...@@ -118,6 +118,8 @@ ...@@ -118,6 +118,8 @@
<Compile Include="Common\DecimalToConverter.cs" /> <Compile Include="Common\DecimalToConverter.cs" />
<Compile Include="Common\JsonHelper.cs" /> <Compile Include="Common\JsonHelper.cs" />
<Compile Include="Common\JsonModel.cs" /> <Compile Include="Common\JsonModel.cs" />
<Compile Include="Common\Model\Season.cs" />
<Compile Include="Common\Model\Seasons.cs" />
<Compile Include="Common\PluginConstant.cs" /> <Compile Include="Common\PluginConstant.cs" />
<Compile Include="Common\Utils.cs" /> <Compile Include="Common\Utils.cs" />
<Compile Include="ConfigHelper\ConfigManage.cs" /> <Compile Include="ConfigHelper\ConfigManage.cs" />
......
VIZ.TVP.CBA.sln
...@@ -155,16 +155,16 @@ Global ...@@ -155,16 +155,16 @@ Global
{FFF7E65A-CCFB-4E99-AD15-3F769E1BD566}.Debug|x64.Build.0 = Debug|x64 {FFF7E65A-CCFB-4E99-AD15-3F769E1BD566}.Debug|x64.Build.0 = Debug|x64
{FFF7E65A-CCFB-4E99-AD15-3F769E1BD566}.Release|Any CPU.ActiveCfg = Release|Any CPU {FFF7E65A-CCFB-4E99-AD15-3F769E1BD566}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FFF7E65A-CCFB-4E99-AD15-3F769E1BD566}.Release|Any CPU.Build.0 = Release|Any CPU {FFF7E65A-CCFB-4E99-AD15-3F769E1BD566}.Release|Any CPU.Build.0 = Release|Any CPU
{FFF7E65A-CCFB-4E99-AD15-3F769E1BD566}.Release|x64.ActiveCfg = Release|Any CPU {FFF7E65A-CCFB-4E99-AD15-3F769E1BD566}.Release|x64.ActiveCfg = Release|x64
{FFF7E65A-CCFB-4E99-AD15-3F769E1BD566}.Release|x64.Build.0 = Release|Any CPU {FFF7E65A-CCFB-4E99-AD15-3F769E1BD566}.Release|x64.Build.0 = Release|x64
{A045BE85-98F9-458C-BE0D-05D92019B508}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A045BE85-98F9-458C-BE0D-05D92019B508}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A045BE85-98F9-458C-BE0D-05D92019B508}.Debug|Any CPU.Build.0 = Debug|Any CPU {A045BE85-98F9-458C-BE0D-05D92019B508}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A045BE85-98F9-458C-BE0D-05D92019B508}.Debug|x64.ActiveCfg = Debug|x64 {A045BE85-98F9-458C-BE0D-05D92019B508}.Debug|x64.ActiveCfg = Debug|x64
{A045BE85-98F9-458C-BE0D-05D92019B508}.Debug|x64.Build.0 = Debug|x64 {A045BE85-98F9-458C-BE0D-05D92019B508}.Debug|x64.Build.0 = Debug|x64
{A045BE85-98F9-458C-BE0D-05D92019B508}.Release|Any CPU.ActiveCfg = Release|Any CPU {A045BE85-98F9-458C-BE0D-05D92019B508}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A045BE85-98F9-458C-BE0D-05D92019B508}.Release|Any CPU.Build.0 = Release|Any CPU {A045BE85-98F9-458C-BE0D-05D92019B508}.Release|Any CPU.Build.0 = Release|Any CPU
{A045BE85-98F9-458C-BE0D-05D92019B508}.Release|x64.ActiveCfg = Release|Any CPU {A045BE85-98F9-458C-BE0D-05D92019B508}.Release|x64.ActiveCfg = Release|x64
{A045BE85-98F9-458C-BE0D-05D92019B508}.Release|x64.Build.0 = Release|Any CPU {A045BE85-98F9-458C-BE0D-05D92019B508}.Release|x64.Build.0 = Release|x64
{144670CB-6396-488C-A76D-2E03A3B69E78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {144670CB-6396-488C-A76D-2E03A3B69E78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{144670CB-6396-488C-A76D-2E03A3B69E78}.Debug|Any CPU.Build.0 = Debug|Any CPU {144670CB-6396-488C-A76D-2E03A3B69E78}.Debug|Any CPU.Build.0 = Debug|Any CPU
{144670CB-6396-488C-A76D-2E03A3B69E78}.Debug|x64.ActiveCfg = Debug|x64 {144670CB-6396-488C-A76D-2E03A3B69E78}.Debug|x64.ActiveCfg = Debug|x64
...@@ -259,8 +259,8 @@ Global ...@@ -259,8 +259,8 @@ Global
{8768CECB-A595-4C41-99E2-FBA5096CB6A8}.Debug|x64.Build.0 = Debug|x64 {8768CECB-A595-4C41-99E2-FBA5096CB6A8}.Debug|x64.Build.0 = Debug|x64
{8768CECB-A595-4C41-99E2-FBA5096CB6A8}.Release|Any CPU.ActiveCfg = Release|Any CPU {8768CECB-A595-4C41-99E2-FBA5096CB6A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8768CECB-A595-4C41-99E2-FBA5096CB6A8}.Release|Any CPU.Build.0 = Release|Any CPU {8768CECB-A595-4C41-99E2-FBA5096CB6A8}.Release|Any CPU.Build.0 = Release|Any CPU
{8768CECB-A595-4C41-99E2-FBA5096CB6A8}.Release|x64.ActiveCfg = Release|Any CPU {8768CECB-A595-4C41-99E2-FBA5096CB6A8}.Release|x64.ActiveCfg = Release|x64
{8768CECB-A595-4C41-99E2-FBA5096CB6A8}.Release|x64.Build.0 = Release|Any CPU {8768CECB-A595-4C41-99E2-FBA5096CB6A8}.Release|x64.Build.0 = Release|x64
{72A5659A-9195-4EA6-856C-AE2A65BA1575}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {72A5659A-9195-4EA6-856C-AE2A65BA1575}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{72A5659A-9195-4EA6-856C-AE2A65BA1575}.Debug|Any CPU.Build.0 = Debug|Any CPU {72A5659A-9195-4EA6-856C-AE2A65BA1575}.Debug|Any CPU.Build.0 = Debug|Any CPU
{72A5659A-9195-4EA6-856C-AE2A65BA1575}.Debug|x64.ActiveCfg = Debug|x64 {72A5659A-9195-4EA6-856C-AE2A65BA1575}.Debug|x64.ActiveCfg = Debug|x64
......
VIZ.TVP.FTB.Module/FDayMatch/View/FDayMatchView.xaml
...@@ -15,11 +15,20 @@ ...@@ -15,11 +15,20 @@
d:DesignWidth="750" d:DesignWidth="750"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"> VerticalAlignment="Stretch">
<!--<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
<core:Enum2EnumDescriptionConverter x:Key="Enum2EnumDescriptionConverter" EnumType="{x:Type storage:HighLightEnum}"></core:Enum2EnumDescriptionConverter> <Style x:Name="gridCenter" TargetType = "{x:Type dxg:GridColumn}" >
<!--列头居中-->
<Setter Property = "HorizontalHeaderContentAlignment" Value = "Center" />
<!--列值居中-->
<Setter Property = "EditSettings" >
<Setter.Value >
<dxe:TextEditSettings HorizontalContentAlignment = "Center" />
</Setter.Value >
</Setter >
</Style >
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources>--> </UserControl.Resources>
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="60"/> <RowDefinition Height="60"/>
......
VIZ.TVP.FTB.Module/FDayMatch/ViewModel/FDayMatchViewModel.cs
...@@ -26,7 +26,7 @@ namespace VIZ.TVP.FTB.Module ...@@ -26,7 +26,7 @@ namespace VIZ.TVP.FTB.Module
private string title = "今日赛程"; private string title = "意甲联赛第1轮";
/// <summary> /// <summary>
/// 标题 /// 标题
...@@ -38,58 +38,21 @@ namespace VIZ.TVP.FTB.Module ...@@ -38,58 +38,21 @@ namespace VIZ.TVP.FTB.Module
} }
/// <summary>
//private string selectChooseMatchItem = "日期"; /// 选中轮次
/// </summary>
//public string SelectChooseMatchItem
//{
// get { return selectChooseMatchItem; }
// set
// {
// selectChooseMatchItem = value;
// this.RaisePropertyChanged(nameof(SelectChooseMatchItem));
// if (selectChooseMatchItem == "日期")
// {
// RoundBtnEnable = false;
// RoundComEnable = false;
// MateDateEnable = true;
// BtmEnable = true;
// }
// else if (selectChooseMatchItem == "轮次")
// {
// RoundBtnEnable = true;
// RoundComEnable = true;
// MateDateEnable = false;
// BtmEnable = false;
// }
// }
// }
/// <summary>
/// 赛程和轮次
/// </summary>
//private ObservableCollection<string> chooseMatchItems;
//public ObservableCollection<string> ChooseMatchItems
//{
// get { return chooseMatchItems; }
// set { chooseMatchItems = value; this.RaisePropertyChanged(nameof(chooseMatchItems)); }
//}
private int roundMatchItem; private int roundMatchItem;
public int RoundMatchItem public int RoundMatchItem
{ {
get { return roundMatchItem; } get { return roundMatchItem; }
set { roundMatchItem = value; this.RaisePropertyChanged(nameof(RoundMatchItem)); } set
{
roundMatchItem = value;
this.RaisePropertyChanged(nameof(RoundMatchItem));
Title = $"意甲联赛第{roundMatchItem}轮";
}
} }
...@@ -111,7 +74,7 @@ namespace VIZ.TVP.FTB.Module ...@@ -111,7 +74,7 @@ namespace VIZ.TVP.FTB.Module
Dayschedules RoundMatchData = null;
/// <summary> /// <summary>
/// 添加轮次刷新 /// 添加轮次刷新
/// </summary> /// </summary>
...@@ -120,7 +83,7 @@ namespace VIZ.TVP.FTB.Module ...@@ -120,7 +83,7 @@ namespace VIZ.TVP.FTB.Module
// SetRoundMatchData(); // SetRoundMatchData();
var RoundMatchData = await JsonModel.PostTomorrowMatch_Path(roundMatchItem.ToString()); RoundMatchData = await JsonModel.PostTomorrowMatch_Path(roundMatchItem.ToString());
if (RoundMatchData == null) return; if (RoundMatchData == null) return;
...@@ -191,23 +154,13 @@ namespace VIZ.TVP.FTB.Module ...@@ -191,23 +154,13 @@ namespace VIZ.TVP.FTB.Module
{ {
MessageLRDateViewModel vm = messageLastRecordDate.DataContext as MessageLRDateViewModel; MessageLRDateViewModel vm = messageLastRecordDate.DataContext as MessageLRDateViewModel;
//if (dayschedules != null)
//{
// string onAirLastDate = $"赛程接口更新时间：{dayschedules.LastPushDataDateTime}"; if (RoundMatchData != null)
// vm.OnErrorLogMessage(onAirLastDate); {
//} string teamSeasonLastDate = $"足球轮次接口更新时间:{RoundMatchData.LastPushDataDateTime}";
vm.OnErrorLogMessage(teamSeasonLastDate);
//if (roundSchedules != null) }
//{
// string playerSeasonLastDate = $"轮次接口更新时间：{roundSchedules.LastPushDataDateTime}";
// vm.OnErrorLogMessage(playerSeasonLastDate);
//}
//if (TeamSeasonData != null)
//{
// string teamSeasonLastDate = $"球队赛季接口更新时间:{TeamSeasonData.LastPushDataDateTime}";
// vm.OnErrorLogMessage(teamSeasonLastDate);
//}
messageLastRecordDate.Visibility = System.Windows.Visibility.Visible; messageLastRecordDate.Visibility = System.Windows.Visibility.Visible;
messageLastRecordDate.WindowState = System.Windows.WindowState.Normal; messageLastRecordDate.WindowState = System.Windows.WindowState.Normal;
......
VIZ.TVP.FTB.Module/FTeamStandings/View/FTeamStandingView.xaml
...@@ -12,7 +12,22 @@ ...@@ -12,7 +12,22 @@
xmlns:storage="clr-namespace:VIZ.TVP.FTB.Module" xmlns:storage="clr-namespace:VIZ.TVP.FTB.Module"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="800" d:DesignWidth="650"> d:DesignHeight="800" d:DesignWidth="650">
<UserControl.Resources>
<ResourceDictionary>
<Style x:Name="gridCenter" TargetType = "{x:Type dxg:GridColumn}" >
<!--列头居中-->
<Setter Property = "HorizontalHeaderContentAlignment" Value = "Center" />
<!--列值居中-->
<Setter Property = "EditSettings" >
<Setter.Value >
<dxe:TextEditSettings HorizontalContentAlignment = "Center" />
</Setter.Value >
</Setter >
</Style >
</ResourceDictionary>
</UserControl.Resources>
<Grid > <Grid >
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="197*"/> <ColumnDefinition Width="197*"/>
...@@ -26,21 +41,18 @@ ...@@ -26,21 +41,18 @@
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="70"/> <ColumnDefinition Width="70"/>
<ColumnDefinition Width="175"/> <ColumnDefinition Width="285"/>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="0"/>
<ColumnDefinition Width="180"/> <ColumnDefinition Width="150"/>
<ColumnDefinition Width="140"/> <ColumnDefinition Width="140"/>
<!--<ColumnDefinition Width="120"/>--> <!--<ColumnDefinition Width="120"/>-->
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="标题：" FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Grid.Column="0" Text="标题：" FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<dxe:TextEdit Grid.Column="1" Width="170" FontSize="16" HorizontalContentAlignment="Left" <dxe:TextEdit Grid.Column="1" Width="280" FontSize="16" HorizontalContentAlignment="Left"
HorizontalAlignment="Left" VerticalAlignment="Center" Text="{Binding Title,Mode=TwoWay }"></dxe:TextEdit> HorizontalAlignment="Left" VerticalAlignment="Center" Text="{Binding Title,Mode=TwoWay }"></dxe:TextEdit>
<WrapPanel Grid.Row="0" Grid.Column="4" HorizontalAlignment="Center" VerticalAlignment="Center"> <WrapPanel Grid.Row="0" Grid.Column="4" HorizontalAlignment="Center" VerticalAlignment="Center">
<Grid> <Grid>
......
VIZ.TVP.FTB.Module/FTeamStandings/ViewModel/FTeamStandingViewModel.cs
...@@ -17,9 +17,13 @@ namespace VIZ.TVP.FTB.Module ...@@ -17,9 +17,13 @@ namespace VIZ.TVP.FTB.Module
private static ILog Log = LogManager.GetLogger(typeof(FTeamStandingViewModel)); private static ILog Log = LogManager.GetLogger(typeof(FTeamStandingViewModel));
public FTeamStandingViewModel() public FTeamStandingViewModel()
{ {
//初始化方法
Init(); Init();
} }
/// <summary>
/// 球队绑定数据集合
/// </summary>
private ObservableCollection<Teamrank> teamRanksModel; private ObservableCollection<Teamrank> teamRanksModel;
public ObservableCollection<Teamrank> TeamRanksModel public ObservableCollection<Teamrank> TeamRanksModel
{ {
...@@ -34,7 +38,9 @@ namespace VIZ.TVP.FTB.Module ...@@ -34,7 +38,9 @@ namespace VIZ.TVP.FTB.Module
TeamRanks teamStands = null; TeamRanks teamStands = null;
//TeamRanks teamStands = null; /// <summary>
/// 刷新球队积分排名
/// </summary>
private void BtmCommand() private void BtmCommand()
{ {
teamStands = new TeamRanks(); teamStands = new TeamRanks();
...@@ -54,7 +60,10 @@ namespace VIZ.TVP.FTB.Module ...@@ -54,7 +60,10 @@ namespace VIZ.TVP.FTB.Module
} }
} }
/// <summary>
/// 组装积分排名数据上传
/// </summary>
/// <returns></returns>
public string CombineTeamStandingData() public string CombineTeamStandingData()
{ {
try try
...@@ -121,7 +130,7 @@ namespace VIZ.TVP.FTB.Module ...@@ -121,7 +130,7 @@ namespace VIZ.TVP.FTB.Module
} }
private string title = "球队积分排名"; private string title = "22/23赛季意大利足球超级联赛积分榜";
public string Title public string Title
{ {
...@@ -129,6 +138,10 @@ namespace VIZ.TVP.FTB.Module ...@@ -129,6 +138,10 @@ namespace VIZ.TVP.FTB.Module
set { title = value; this.RaisePropertyChanged(nameof(Title)); } set { title = value; this.RaisePropertyChanged(nameof(Title)); }
} }
/// <summary>
/// 初始话
/// </summary>
private void Init() private void Init()
{ {
BtnCmd = new VCommand(BtmCommand); BtnCmd = new VCommand(BtmCommand);
...@@ -150,15 +163,13 @@ namespace VIZ.TVP.FTB.Module ...@@ -150,15 +163,13 @@ namespace VIZ.TVP.FTB.Module
MessageLRDateViewModel vm = messageLastRecordDate.DataContext as MessageLRDateViewModel; MessageLRDateViewModel vm = messageLastRecordDate.DataContext as MessageLRDateViewModel;
if (teamStands != null) if (teamStands != null)
{ {
string onAirLastDate = $"积分接口更新时间：{teamStands.LastPushDataDateTime}"; string LastDate = $"足球积分接口更新时间：{teamStands.LastPushDataDateTime}";
vm.OnErrorLogMessage(onAirLastDate); vm.OnErrorLogMessage(LastDate);
} }
messageLastRecordDate.Visibility = System.Windows.Visibility.Visible; messageLastRecordDate.Visibility = System.Windows.Visibility.Visible;
messageLastRecordDate.WindowState = System.Windows.WindowState.Normal; messageLastRecordDate.WindowState = System.Windows.WindowState.Normal;
// messageLastRecordDate.ShowDialog();
} }
#endregion #endregion
......
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