修改bug

VIZ.MIGU.CBA.Module/Common/JsonModel.cs

@@ -639,5 +639,40 @@ namespace VIZ.TVP.CBA.Module
         }
         }
 
 
 
 
+        /// <summary>
+        /// 获取CBA赛季数据接口
+        /// </summary>
+        /// <returns></returns>
+        public static Seasons Post_MatchSeasonData_Path(string selectFootballType)
+        {
+            try
+            {
+                string MatchDataPath = strUrl + "matchSeason";
+                Dictionary<string, string> dict = new Dictionary<string, string>();
+
+                dict.Add("competitionId", selectFootballType);
+
+                string newKey = Utils.GetKey(appID, appKey);
+                string result = JsonHelper.Post(MatchDataPath, dict, newKey);
+
+                Log.Info("足球赛季数据==>" + result);
+                JsonSerializerSettings settings = new JsonSerializerSettings();
+                settings.NullValueHandling = NullValueHandling.Ignore;
+
+                Seasons seasons = JsonConvert.DeserializeObject<Seasons>(result, settings);
+                var sortSeason = seasons.matchseason.OrderByDescending(a => a.seasonName).ToList();
+                seasons.matchseason = sortSeason;
+                Console.WriteLine("足球赛季数据=========>" + MatchDataPath);
+                return seasons;
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex.Message);
+                return null;
+            }
+
+
+        }
+
     }
     }
 }
 }

VIZ.MIGU.CBA.Module/Common/Model/Season.cs

@@ -6,6 +6,9 @@ using System.Threading.Tasks;
 
 
 namespace VIZ.TVP.CBA.Module
 namespace VIZ.TVP.CBA.Module
 {
 {
+    /// <summary>
+    /// 赛季数据实体类
+    /// </summary>
     public class Season
     public class Season
     {
     {
         /// <summary>
         /// <summary>

VIZ.MIGU.CBA.Module/Common/Model/Seasons.cs

@@ -4,8 +4,11 @@ using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
-namespace VIZ.TVP.CBA.Module.Common.Model
+namespace VIZ.TVP.CBA.Module
 {
 {
+    /// <summary>
+    /// 赛季数据类
+    /// </summary>
     public class Seasons
     public class Seasons
     {
     {
         /// <summary>
         /// <summary>

VIZ.MIGU.CBA.Module/HeaderPage/Model/ShowPlayerStatsSeason.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VIZ.TVP.CBA.Module
+{
+    public class ShowPlayerStatsSeason
+    {
+        /// <summary>
+        /// 球员名称
+        /// </summary>
+        public string CNAlias { get; set; }
+        /// <summary>
+        /// 得分
+        /// </summary>
+        public double PointsAverage { get; set; }
+
+        /// <summary>
+        /// 篮板
+        /// </summary>
+        public double ReboundsAverage { get; set; }
+
+        /// <summary>
+        /// 助攻
+        /// </summary>
+        public string AssistsAverage { get; set; }
+
+        /// <summary>
+        /// 抢断
+        /// </summary>
+        public string StealsAverage { get; set; }
+
+        /// <summary>
+        /// 盖帽
+        /// </summary>
+        public string BlockedAverage { get; set; }
+
+        /// <summary>
+        /// 上场时间
+        /// </summary>
+        public string MinutesAverage { get; set; }
+
+        /// <summary>
+        /// 投篮命中率
+        /// </summary>
+        public string FieldGoalsPercentageAverage { get; set; }
+
+        /// <summary>
+        /// 两分命中率
+        /// </summary>
+        public string TwoPointPercentageAverage { get; set; }
+
+        /// <summary>
+        /// 三分命中率
+        /// </summary>
+        public string ThreePointPercentageAverage { get; set; }
+
+       /// <summary>
+       /// 罚球命中率
+       /// </summary>
+        public string FreeThrowsPercentageAverage { get; set; }
+
+        /// <summary>
+        /// 篮下投篮命中率
+        /// </summary>
+        public string FieldGoalsAtRimPercentageAverage { get; set; }
+
+        /// <summary>
+        /// 中距离投篮命中率
+        /// </summary>
+        public string FieldGoalsMidRangePercentageAverage { get; set; }
+
+        /// <summary>
+        /// 三分
+        /// </summary>
+        public string ThreePointGoalsAverage { get; set; }
+
+        /// <summary>
+        /// 两分
+        /// </summary>
+        public string TwoPointGoalsAverage { get; set; }
+
+        /// <summary>
+        /// 两分区
+        /// </summary>
+        public string TwoPointGoalsAverageArea { get; set; }
+
+        /// <summary>
+        /// 三分区
+        /// </summary>
+        public string ThreePointGoalsAverageArea { get; set; }
+
+        /// <summary>
+        /// 罚球
+        /// </summary>
+        public string FreeThrowsAverage { get; set; }
+
+        /// <summary>
+        /// 失误
+        /// </summary>
+        public string TurnoversAverage { get; set; }
+    }
+
+
+}

VIZ.MIGU.CBA.Module/HeaderPage/Model/ShowTeamStatsSeason.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Markup;
+using VIZ.Framework.Core;
+
+namespace VIZ.TVP.CBA.Module
+{
+    public class ShowTeamStatsSeason : ViewModelBase
+    {
+        /// <summary>
+        /// 球队名称
+        /// </summary>
+        private string teamCNAlias;
+        public string TeamCNAlias
+        {
+            get { return teamCNAlias; }
+            set { teamCNAlias = value; this.RaisePropertyChanged(nameof(TeamCNAlias)); }
+        }
+
+        /// <summary>
+        /// 球队得分
+        /// </summary>
+        private string pointsAverage;
+
+        public string PointsAverage
+        {
+            get { return pointsAverage; }
+            set { pointsAverage = value; this.RaisePropertyChanged(nameof(PointsAverage)); }  
+        }
+
+        /// <summary>
+        /// 篮板得分
+        /// </summary>
+        private string reboundsAverage;
+
+        public string ReboundsAverage
+        {
+            get { return reboundsAverage; }
+            set { reboundsAverage = value; this.RaisePropertyChanged(nameof(ReboundsAverage)); }
+        }
+
+        /// <summary>
+        /// 助攻
+        /// </summary>
+        private string assistsAverage;
+
+        public string AssistsAverage
+        {
+            get { return assistsAverage; } 
+            set { assistsAverage = value; this.RaisePropertyChanged(nameof(AssistsAverage)); }
+        }
+
+
+        /// <summary>
+        /// 抢断
+        /// </summary>
+        private string stealsAverage;
+
+        public string StealsAverage
+        {
+            get { return stealsAverage; }
+            set { stealsAverage = value; this.RaisePropertyChanged(nameof(StealsAverage)); }  
+        }
+
+        /// <summary>
+        /// 盖帽
+        /// </summary>
+        private string blockedAverage;
+
+        public string BlockedAverage
+        {
+            get { return blockedAverage; }
+            set { blockedAverage = value; this.RaisePropertyChanged(nameof(BlockedAverage)); }
+        }
+
+        /// <summary>
+        /// 失误
+        /// </summary>
+        private string turnoversAverage;
+
+        public string TurnoversAverage
+        {
+            get { return turnoversAverage; }
+            set { turnoversAverage = value; this.RaisePropertyChanged(nameof(TurnoversAverage)); }    
+        }
+
+
+        /// <summary>
+        /// 犯规
+        /// </summary>
+        private string personalFoulsAverage;
+
+        public string PersonalFoulsAverage
+        {
+            get { return personalFoulsAverage; }
+            set { personalFoulsAverage = value; this.RaisePropertyChanged(nameof(PersonalFoulsAverage));}
+        }
+
+        /// <summary>
+        /// 罚球命中率
+        /// </summary>
+        private string freeThrowsPercentageAverage;
+
+        public string FreeThrowsPercentageAverage
+        {
+            get { return freeThrowsPercentageAverage; }
+            set { freeThrowsPercentageAverage = value; this.RaisePropertyChanged(nameof(FreeThrowsPercentageAverage)); }    
+        }
+
+
+        /// <summary>
+        /// 两分命中率
+        /// </summary>
+        private string twoPointPercentageAverage;
+
+        public string TwoPointPercentageAverage
+        {
+            get { return twoPointPercentageAverage; }
+            set { twoPointPercentageAverage = value; this.RaisePropertyChanged(nameof(TwoPointPercentageAverage)); }    
+        }
+
+        /// <summary>
+        /// 三分命中率
+        /// </summary>
+
+        private string threePointPercentageAverage;
+
+
+        public string ThreePointPercentageAverage
+        {
+            get { return threePointPercentageAverage; }
+            set { threePointPercentageAverage = value; this.RaisePropertyChanged(nameof(ThreePointPercentageAverage)); }    
+        }
+
+        /// <summary>
+        /// 投篮命中率
+        /// </summary>
+
+        private string fieldGoalsPercentageAverage;
+
+        public string FieldGoalsPercentageAverage
+        {
+            get { return fieldGoalsPercentageAverage; }
+            set { fieldGoalsPercentageAverage = value; this.RaisePropertyChanged(nameof(FieldGoalsPercentageAverage)); }
+        }
+
+
+    }
+}

VIZ.MIGU.CBA.Module/MVPPlayer/ViewModel/MvpPlayerViewModel.cs

@@ -430,10 +430,12 @@ namespace VIZ.TVP.CBA.Module
         /// </summary>
         /// </summary>
         public void SetSingleData()
         public void SetSingleData()
         {
         {
-            ClearData();
-            GetSeasonData();
             onAirDataModel = JsonModel.PostOnAirData_Path(ScheduleID);
             onAirDataModel = JsonModel.PostOnAirData_Path(ScheduleID);
+            ClearData();
             if (onAirDataModel == null) return;
             if (onAirDataModel == null) return;
+            GetSeasonData();
+
+
             TeamItems = new System.Collections.ObjectModel.ObservableCollection<string>();
             TeamItems = new System.Collections.ObjectModel.ObservableCollection<string>();
             TeamItems.Add(onAirDataModel.liveTeamInfo.HomeTeamCNAlias);
             TeamItems.Add(onAirDataModel.liveTeamInfo.HomeTeamCNAlias);
             TeamItems.Add(onAirDataModel.liveTeamInfo.VisitingTeamCNAlias);
             TeamItems.Add(onAirDataModel.liveTeamInfo.VisitingTeamCNAlias);
@@ -443,7 +445,9 @@ namespace VIZ.TVP.CBA.Module
 
 
         private void ClearData()
         private void ClearData()
         {
         {
-            if(TeamItems!=null)
+
+            if (onAirDataModel != null) return;
+            if (TeamItems!=null)
             {
             {
                 TeamItems.Clear();
                 TeamItems.Clear();
             }
             }

VIZ.MIGU.CBA.Module/PlayerCompare/ViewModel/NewPlayerComPareViewModel.cs

@@ -1629,14 +1629,13 @@ namespace VIZ.TVP.CBA.Module
 
 
         public void SetCompareData()
         public void SetCompareData()
         {
         {
-            //if (SelectMatchItems == null) return;
-            //ScheduleID = SetMatchDict[SelectMatchItems];
-            ClearData();
-            GetSeasonData();
+
             onAirDataModel = JsonModel.PostOnAirData_Path(ScheduleID);
             onAirDataModel = JsonModel.PostOnAirData_Path(ScheduleID);
+            ClearData();
+            if (onAirDataModel == null) return;
 
 
+            GetSeasonData();
 
 
-            if (onAirDataModel == null) return;
             if (onAirDataModel != null)
             if (onAirDataModel != null)
             {
             {
 
 
@@ -1664,6 +1663,9 @@ namespace VIZ.TVP.CBA.Module
 
 
         private void ClearData()
         private void ClearData()
         {
         {
+
+            if (onAirDataModel != null) return;
+
             HName = "";
             HName = "";
             AName = "";
             AName = "";
 
 
@@ -1677,6 +1679,9 @@ namespace VIZ.TVP.CBA.Module
                 APlayers.Clear();
                 APlayers.Clear();
             }
             }
 
 
+            HPlayer = "";
+            APlayer = "";
+
             HNums = "";
             HNums = "";
             ANums = "";
             ANums = "";
             APlayerLogo = null;
             APlayerLogo = null;

VIZ.MIGU.CBA.Module/SinglePlayer/ViewModel/NewSinglePlayerViewModel.cs

@@ -504,10 +504,12 @@ namespace VIZ.TVP.CBA.Module
         /// </summary>
         /// </summary>
         public void SetSingleData()
         public void SetSingleData()
         {
         {
-            ClearData();
-            GetSeasonData();
             onAirDataModel = JsonModel.PostOnAirData_Path(ScheduleID);
             onAirDataModel = JsonModel.PostOnAirData_Path(ScheduleID);
+            ClearData();
             if (onAirDataModel == null) return;
             if (onAirDataModel == null) return;
+
+            GetSeasonData();
+
             TeamItems = new System.Collections.ObjectModel.ObservableCollection<string>();
             TeamItems = new System.Collections.ObjectModel.ObservableCollection<string>();
             TeamItems.Add(onAirDataModel.liveTeamInfo.HomeTeamCNAlias);
             TeamItems.Add(onAirDataModel.liveTeamInfo.HomeTeamCNAlias);
             TeamItems.Add(onAirDataModel.liveTeamInfo.VisitingTeamCNAlias);
             TeamItems.Add(onAirDataModel.liveTeamInfo.VisitingTeamCNAlias);
@@ -517,7 +519,8 @@ namespace VIZ.TVP.CBA.Module
 
 
         private void ClearData()
         private void ClearData()
         {
         {
-            if(TeamItems!=null)
+            if (onAirDataModel != null) return;
+            if (TeamItems!=null)
             {
             {
                 TeamItems.Clear();
                 TeamItems.Clear();
             }
             }

VIZ.MIGU.CBA.Module/TeamStats/ViewModel/NewTeamStatsViewModel.cs

@@ -1288,10 +1288,10 @@ namespace VIZ.TVP.CBA.Module
         {
         {
             //if (SelectMatchItems == null) return;
             //if (SelectMatchItems == null) return;
             //ScheduleID = SetMatchDict[SelectMatchItems];
             //ScheduleID = SetMatchDict[SelectMatchItems];
-            ClearData();
+        
             Log.Error(string.Format("teamStatsViewModel:{0}", ScheduleID));
             Log.Error(string.Format("teamStatsViewModel:{0}", ScheduleID));
             onAirDataModel = JsonModel.PostOnAirData_Path(ScheduleID);
             onAirDataModel = JsonModel.PostOnAirData_Path(ScheduleID);
-
+            ClearData();
             if (onAirDataModel == null) return;
             if (onAirDataModel == null) return;
             if (onAirDataModel != null)
             if (onAirDataModel != null)
             {
             {
@@ -1375,6 +1375,8 @@ namespace VIZ.TVP.CBA.Module
 
 
         private void ClearData()
         private void ClearData()
         {
         {
+
+            if (onAirDataModel != null) return;
             HomeTeam = "";
             HomeTeam = "";
             AwayTeam = "";
             AwayTeam = "";
 
 

VIZ.MIGU.CBA.Module/VIZ.TVP.CBA.Module.csproj

@@ -127,7 +127,9 @@
     <Compile Include="DayMatch\Model\Dayschedules.cs" />
     <Compile Include="DayMatch\Model\Dayschedules.cs" />
     <Compile Include="HeaderPage\HeaderPagePlugin.cs" />
     <Compile Include="HeaderPage\HeaderPagePlugin.cs" />
     <Compile Include="HeaderPage\Model\PlayersStats.cs" />
     <Compile Include="HeaderPage\Model\PlayersStats.cs" />
+    <Compile Include="HeaderPage\Model\ShowPlayerStatsSeason.cs" />
     <Compile Include="HeaderPage\Model\ShowTeamStats.cs" />
     <Compile Include="HeaderPage\Model\ShowTeamStats.cs" />
+    <Compile Include="HeaderPage\Model\ShowTeamStatsSeason.cs" />
     <Compile Include="HeaderPage\ViewModel\DateHeaderViewModel.cs" />
     <Compile Include="HeaderPage\ViewModel\DateHeaderViewModel.cs" />
     <Compile Include="HeaderPage\View\DateHeaderView.xaml.cs">
     <Compile Include="HeaderPage\View\DateHeaderView.xaml.cs">
       <DependentUpon>DateHeaderView.xaml</DependentUpon>
       <DependentUpon>DateHeaderView.xaml</DependentUpon>

VIZ.TVP.FTB.Module/HeaderPage/HeaderPagePlugin.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using VIZ.Package.Domain;
+
+namespace VIZ.TVP.FTB.Module.HeaderPage
+{
+
+    public class HeaderPagePlugin : IPluginLifeCycle
+    {
+        /// <summary>
+        /// 插件ID
+        /// </summary>
+        /// <remarks>
+        /// 插件ID不能包含点号
+        /// </remarks>
+        public const string PLUGIN_ID = "FDateHeaderView";
+
+        /// <summary>
+        /// 插件显示名称
+        /// </summary>
+        public const string PLUGIN_NAME = "足球赛事";
+        public void Dispose()
+        {
+
+        }
+
+        public void Initialize()
+        {
+
+        }
+
+        public PluginInfo Register()
+        {
+            PluginInfo info = new PluginInfo();
+            info.Group = PluginConstant.GroupName;
+            info.ID = PLUGIN_ID;
+            info.Name = PLUGIN_NAME;
+            info.PluginType = PluginType.Module;
+            info.ViewType = typeof(DateHeaderView);
+
+            return info;
+        }
+    }
+}

VIZ.TVP.FTB.Module/HeaderPage/View/DateHeaderView.xaml

+<UserControl x:Class="VIZ.TVP.FTB.Module.DateHeaderView"
+                      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"
+                      xmlns:dxmvvm="http://schemas.devexpress.com/winfx/2008/xaml/mvvm"
+                      xmlns:dxrudex="http://schemas.devexpress.com/winfx/2008/xaml/reports/userdesignerextensions"
+                      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             
+                      xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                      xmlns:core="clr-namespace:VIZ.Framework.Core;assembly=VIZ.Framework.Core"
+                      xmlns:storage="clr-namespace:VIZ.TVP.FTB.Module"
+             mc:Ignorable="d"
+             d:DesignHeight="40" d:DesignWidth="800" >
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="40"/>
+            <!--<RowDefinition Height="*"/>-->
+        </Grid.RowDefinitions>
+
+        <WrapPanel  Grid.Row="0" VerticalAlignment="Center">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="80"/>
+                    <ColumnDefinition Width="120"/>
+                    <ColumnDefinition Width="80"/>
+                    <ColumnDefinition Width="40"/>
+                    <ColumnDefinition Width="150"/>
+                    <ColumnDefinition Width="280"/>
+                </Grid.ColumnDefinitions>
+
+               
+                <WrapPanel Grid.Column="4" VerticalAlignment="Center">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="80"/>
+                            <ColumnDefinition Width="35"/>
+                            <ColumnDefinition Width="35"/>
+                        </Grid.ColumnDefinitions>
+                        <TextBlock Text="数据源：" HorizontalAlignment="Right" VerticalAlignment="Center" FontSize="14" />
+                        <RadioButton Content="主" FontSize="14" Grid.Column="1" IsChecked="{Binding MainDataConnection,Mode=TwoWay}"/>
+                        <RadioButton Content="备" FontSize="14" Grid.Column="2" IsChecked="{Binding BackDataConnection,Mode=TwoWay}"/>
+                    </Grid>
+                </WrapPanel>
+
+              
+            </Grid>
+        </WrapPanel>
+
+    </Grid>
+</UserControl>

VIZ.TVP.FTB.Module/HeaderPage/View/DateHeaderView.xaml.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+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;
+
+namespace VIZ.TVP.FTB.Module
+{
+    /// <summary>
+    /// Interaction logic for DateHeaderView.xaml
+    /// </summary>
+    public partial class DateHeaderView : UserControl
+    {
+        public DateHeaderView()
+        {
+            InitializeComponent();
+            //数据的绑定
+            WPFHelper.BindingViewModel(this, new DateHeaderViewModel());
+        }
+    }
+}

VIZ.TVP.FTB.Module/HeaderPage/ViewModel/DateHeaderViewModel.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using VIZ.Framework.Core;
+using VIZ.Package.Domain;
+using VIZ.Package.Service;
+using VIZ.Package.Storage;
+
+namespace VIZ.TVP.FTB.Module
+{
+
+    /// <summary>
+    /// 足球查看界面配置
+    /// </summary>
+    public class DateHeaderViewModel : ViewModelBase
+    {
+
+        /// <summary>
+        /// 操作日志服务
+        /// </summary>
+        private RecordLogService recordLogService = new RecordLogService();
+
+        /// <summary>
+        /// 主数据库连接
+        /// </summary>
+        private bool mainDataConnection = true;
+        public bool MainDataConnection
+        {
+            get { return mainDataConnection; }
+            set
+            {
+                this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, "CBA查看主数据连接");
+
+                mainDataConnection = value;
+                this.RaisePropertyChanged(nameof(MainDataConnection));
+
+                if (mainDataConnection)
+                {
+                    JsonModel.strUrl = AppSetup_InitLiteDB.HttpUrlConfigEntity.Url;
+                    JsonModel.appKey = AppSetup_InitLiteDB.HttpUrlConfigEntity.AppKey;
+                    JsonModel.appID = AppSetup_InitLiteDB.HttpUrlConfigEntity.AppId;
+                }
+            }
+        }
+
+
+        /// <summary>
+        /// 备份数据连接
+        /// </summary>
+        private bool backDataConnection;
+
+        public bool BackDataConnection
+        {
+            get { return backDataConnection; }
+            set
+            {
+                this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, "CBA查看备数据连接");
+                backDataConnection = value;
+                this.RaisePropertyChanged(nameof(BackDataConnection));
+                if (backDataConnection)
+                {
+                    JsonModel.strUrl = AppSetup_InitLiteDB.HttpUrlConfigEntity.BUrl;
+                    JsonModel.appKey = AppSetup_InitLiteDB.HttpUrlConfigEntity.BAppKey;
+                    JsonModel.appID = AppSetup_InitLiteDB.HttpUrlConfigEntity.BAppId;
+                }
+            }
+        }
+
+
+    }
+}

VIZ.TVP.FTB.Module/Setting/httpUrl/View/HttpUrlConfigView.xaml

@@ -83,7 +83,7 @@
                         <Grid.ColumnDefinitions>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="100"/>
                             <ColumnDefinition Width="100"/>
                             <ColumnDefinition Width="100"/>
                             <ColumnDefinition Width="100"/>
-                            <ColumnDefinition Width="150"/>
+                            <ColumnDefinition Width="200"/>
                         </Grid.ColumnDefinitions>
                         </Grid.ColumnDefinitions>
                         
                         
                         <dxe:ComboBoxEdit Grid.Column="0" Height="30" Grid.Row="8" Width="100"
                         <dxe:ComboBoxEdit Grid.Column="0" Height="30" Grid.Row="8" Width="100"
@@ -92,7 +92,7 @@
                         <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="140"
+                        <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=Seasons,Mode=TwoWay}"  SelectedItem="{Binding Path=SelectSeason,Mode=TwoWay}"></dxe:ComboBoxEdit>
 
 
 
 

VIZ.TVP.FTB.Module/Setting/httpUrl/ViewModel/HttpUrlConfigViewModel.cs

@@ -328,9 +328,10 @@ namespace VIZ.TVP.FTB.Module
 
 
             foreach(var dict in dictSeasons.matchseason)
             foreach(var dict in dictSeasons.matchseason)
             {
             {
-                if(!SeasonDict.ContainsKey(dict.seasonName))
+                string seasonNameKey = $"{dict.seasonName}_{dict.seasonId}";
+                if(!SeasonDict.ContainsKey(seasonNameKey))
                 {
                 {
-                    SeasonDict.Add(dict.seasonName,dict.seasonId);
+                    SeasonDict.Add(seasonNameKey, dict.seasonId);
                 }
                 }
             }
             }
 
 

VIZ.TVP.FTB.Module/VIZ.TVP.FTB.Module.csproj

@@ -110,6 +110,11 @@
     <Compile Include="FTeamStandings\View\FTeamStandingView.xaml.cs">
     <Compile Include="FTeamStandings\View\FTeamStandingView.xaml.cs">
       <DependentUpon>FTeamStandingView.xaml</DependentUpon>
       <DependentUpon>FTeamStandingView.xaml</DependentUpon>
     </Compile>
     </Compile>
+    <Compile Include="HeaderPage\HeaderPagePlugin.cs" />
+    <Compile Include="HeaderPage\ViewModel\DateHeaderViewModel.cs" />
+    <Compile Include="HeaderPage\View\DateHeaderView.xaml.cs">
+      <DependentUpon>DateHeaderView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Main\View\MainView.xaml.cs">
     <Compile Include="Main\View\MainView.xaml.cs">
       <DependentUpon>MainView.xaml</DependentUpon>
       <DependentUpon>MainView.xaml</DependentUpon>
     </Compile>
     </Compile>
@@ -199,6 +204,10 @@
       <SubType>Designer</SubType>
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
       <Generator>MSBuild:Compile</Generator>
     </Page>
     </Page>
+    <Page Include="HeaderPage\View\DateHeaderView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Main\View\MainView.xaml">
     <Page Include="Main\View\MainView.xaml">
       <SubType>Designer</SubType>
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
       <Generator>MSBuild:Compile</Generator>