女足世界杯功能开发

VIZ.TVP.WMCUP.Module/Common/JsonModel.cs

@@ -291,8 +291,8 @@ namespace VIZ.TVP.WMCUP.Module
 
                     //dict.Add("competitionId", footballType);
                     //dict.Add("seasonId", seasonId);//"110000005454"
-                    //dict.Add("startOffset", startOffset);
-                    //dict.Add("endOffset", endOffset);
+                    dict.Add("startOffset", startOffset);
+                    dict.Add("endOffset", endOffset);
 
                     string newKey = Utils.GetKey(appID, appKey);
 
@@ -313,11 +313,11 @@ namespace VIZ.TVP.WMCUP.Module
 
                     shootPlayerRanks = JsonConvert.DeserializeObject<ShootPlayerRanks>(result, settings);
 
-                    if (shootPlayerRanks.aystatrank == null) return;
+                    if (shootPlayerRanks.playstatrank == null) return;
 
-                    var sortPlayerShoot = shootPlayerRanks.aystatrank.Take(4).ToList();
+                    //var sortPlayerShoot = shootPlayerRanks.aystatrank.Take(4).ToList();
 
-                    shootPlayerRanks.aystatrank = sortPlayerShoot;
+                    //shootPlayerRanks.aystatrank = sortPlayerShoot;
                 });
                 return shootPlayerRanks;
             }
@@ -332,6 +332,128 @@ namespace VIZ.TVP.WMCUP.Module
 
 
 
+
+
+        /// <summary>
+        ///女足球队队员全部信息
+        /// </summary>
+        /// <returns></returns>
+        public async static Task<SingleTeamPlayers> PostTeamPlayerData_Path(string teamId,string role)
+        {
+            try
+            {
+                GethttpUrl();
+
+                SingleTeamPlayers singleTeamPlayers = new SingleTeamPlayers();
+
+                if (string.IsNullOrEmpty(teamId))
+                {
+                    return null;
+                }
+
+                await Task.Run(() =>
+                {
+                    string TeamScoreDataPath = strUrl + "women/getPlaysByTeam";
+
+
+                    Dictionary<string, string> dict = new Dictionary<string, string>();
+
+                    dict.Add("teamId", teamId);
+
+                    if (!string.IsNullOrEmpty(role))
+                    {
+                        dict.Add("role", role);
+                    }
+
+                    string newKey = Utils.GetKey(appID, appKey);
+
+                    string result = JsonHelper.Post(TeamScoreDataPath, dict, newKey);
+
+                    if (dataFromSource)
+                    {
+                        Log.Info($"球队队伍球员:主数据来源:{TeamScoreDataPath}==>:" + result);
+                    }
+                    else
+                    {
+                        Log.Info($"球队队伍球员:备份数据来源:{TeamScoreDataPath}==>:" + result);
+                    }
+
+                    JsonSerializerSettings settings = new JsonSerializerSettings();
+                    settings.NullValueHandling = NullValueHandling.Ignore;
+
+                    singleTeamPlayers = JsonConvert.DeserializeObject<SingleTeamPlayers>(result, settings);
+
+                    Console.WriteLine("球队队伍球员============>:" + TeamScoreDataPath);
+
+                });
+
+                return singleTeamPlayers;
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex.Message);
+                return null;
+            }
+        }
+
+
+
+        /// <summary>
+        ///女足单数据统计
+        /// </summary>
+        /// <returns></returns>
+        public async static Task<SinglePlayers> PostSinglePlayerData_Path(string playerId)
+        {
+            try
+            {
+                GethttpUrl();
+
+                SinglePlayers singlePlayers = new SinglePlayers();
+
+                await Task.Run(() =>
+                {
+                    string TeamScoreDataPath = strUrl + "women/getPlayStatBySeason";
+
+
+                    Dictionary<string, string> dict = new Dictionary<string, string>();
+
+                    dict.Add("playerId", playerId);
+
+                    string newKey = Utils.GetKey(appID, appKey);
+
+                    string result = JsonHelper.Post(TeamScoreDataPath, dict, newKey);
+
+                    if (dataFromSource)
+                    {
+                        Log.Info($"单球员数据统计:主数据来源:{TeamScoreDataPath}==>:" + result);
+                    }
+                    else
+                    {
+                        Log.Info($"单球员数据统计:备份数据来源:{TeamScoreDataPath}==>:" + result);
+                    }
+
+                    JsonSerializerSettings settings = new JsonSerializerSettings();
+                    settings.NullValueHandling = NullValueHandling.Ignore;
+
+                    singlePlayers = JsonConvert.DeserializeObject<SinglePlayers>(result, settings);
+
+                    Console.WriteLine("单球员球员数据统计============>:" + TeamScoreDataPath);
+
+                });
+
+                return singlePlayers;
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex.Message);
+                return null;
+            }
+        }
+
+
+
+
+
         /// <summary>
         ///女足球队历史数据统计
         /// </summary>
@@ -344,6 +466,11 @@ namespace VIZ.TVP.WMCUP.Module
 
                 TeamStats teamStats = new TeamStats();
 
+                if(string.IsNullOrEmpty(teamId))
+                {
+                    return null;
+                }
+                    
                 await Task.Run(() =>
                 {
                     string TeamScoreDataPath = strUrl + "women/historyStat";

VIZ.TVP.WMCUP.Module/FComparePlayer/FComparePlayerPlugin.cs

+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
+{
+    public class FComparePlayerPlugin : IPluginLifeCycle
+    {
+        /// <summary>
+        /// 插件ID
+        /// </summary>
+        /// <remarks>
+        /// 插件ID不能包含点号
+        /// </remarks>
+        public const string PLUGIN_ID = "FComparePlayerView";
+
+        /// <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.Page;
+            info.ViewType = typeof(FComparePlayerView);
+
+            //info.SettingViewType = typeof(DayMatchUI);
+
+            return info;
+        }
+    }
+}

VIZ.TVP.WMCUP.Module/FComparePlayer/View/FComparePlayerView.xaml

+<UserControl x:Class="VIZ.TVP.WMCUP.Module.FComparePlayerView"
+             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:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
+             xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
+             xmlns:local="clr-namespace:VIZ.TVP.WMCUP.Module"
+             mc:Ignorable="d" 
+            >
+    <ScrollViewer HorizontalScrollBarVisibility="Disabled"
+                      VerticalScrollBarVisibility="Auto"
+                      Name="PART_Options"
+                      DockPanel.Dock="Right"
+                      dx:ScrollBarExtensions.ScrollBarMode="TouchOverlap"
+                      Focusable="False">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="197*"/>
+            </Grid.ColumnDefinitions>
+
+
+            <Grid.RowDefinitions>
+                <RowDefinition Height="290"/>
+                <RowDefinition Height="*"/>
+            </Grid.RowDefinitions>
+            <WrapPanel Grid.Row="0"  Width="765" HorizontalAlignment="Left" VerticalAlignment="Center"  >
+                <Grid >
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="40"/>
+                        <RowDefinition Height="0"/>
+                        <RowDefinition Height="40"/>
+                        <RowDefinition Height="40"/>
+                        <RowDefinition Height="110"/>
+                        <RowDefinition Height="40"/>
+                        <!--<RowDefinition Height="40"/>
+                        <RowDefinition Height="40"/>
+                        <RowDefinition Height="40"/>
+                        <RowDefinition Height="40"/>
+                        <RowDefinition Height="40"/>
+                        <RowDefinition Height="40"/>
+                         <RowDefinition Height="40"/>
+                         <RowDefinition Height="40"/>-->
+
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="3"/>
+                        <ColumnDefinition Width="67"/>
+                        <ColumnDefinition Width="175"/>
+                        <ColumnDefinition Width="130"/>
+                        <ColumnDefinition Width="130"/>
+                        <ColumnDefinition Width="127"/>
+                        <ColumnDefinition Width="130"/>
+                    </Grid.ColumnDefinitions>
+
+                    <TextBlock Grid.Column="1"  Text="标题"  FontSize="16"  HorizontalAlignment="Left" VerticalAlignment="Center" Margin="16,0,0,0"  />
+
+
+                    <WrapPanel Grid.Row="0" Grid.Column="6" HorizontalAlignment="Center" VerticalAlignment="Center">
+
+                        <Grid>
+
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="100"/>
+                                <ColumnDefinition Width="30"/>
+                            </Grid.ColumnDefinitions>
+
+                            <dx:SimpleButton  Grid.Column="0" Content="刷新"  Glyph='/VIZ.TVP.WMCUP.Module;component/Image/FT/refresh2525.png' FontSize="16" 
+                                          Command="{Binding BtnCommand}" HorizontalContentAlignment="Center"   Width="90" Height="30"  />
+
+                            <dx:SimpleButton  Grid.Column="1"  Glyph='/VIZ.TVP.WMCUP.Module;component/Image/FT/Prompt2525.png' FontSize="16" 
+                                          Command="{Binding PromptCommand}" HorizontalContentAlignment="Center"  Width="30" Height="30"  />
+                        </Grid>
+                    </WrapPanel>
+
+
+
+                 
+                    <dxe:TextEdit Grid.Column="2"   Width="170" 
+                         FontSize="16"   HorizontalContentAlignment="Left" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding Title,Mode=TwoWay }" />
+                    <dxe:ListBoxEdit  Margin="48,6,0,0" Grid.Row="2" Grid.RowSpan="3"  Grid.Column="2" x:Name="com_HPlayer" HorizontalAlignment="Left" VerticalAlignment="Top" Width="120" Height="178" FontSize="16" 
+                          ItemsSource="{Binding Path=HPlayers,Mode=TwoWay}"
+                          SelectedItem="{Binding Path=HPlayer,Mode=TwoWay}">
+                    </dxe:ListBoxEdit>
+
+
+                    <dxe:TextEdit Text="{Binding HName,Mode=TwoWay}"  Width="120"  FontSize="16" Grid.Column="3"  Grid.Row="2" VerticalAlignment="Center" Margin="5,0,5,0" />
+                    <dxe:TextEdit Text="{Binding AName,Mode=TwoWay}"  Grid.Row="2" Grid.Column="4" Width="120"  FontSize="16"  VerticalAlignment="Center" Margin="5,0,5,0" />
+
+
+                    <dxe:ListBoxEdit  Grid.Row="2" Grid.RowSpan="3" Grid.Column="5" x:Name="com_APlayer" HorizontalAlignment="Center" VerticalAlignment="Top" Width="120" Height="178" FontSize="16"
+                          ItemsSource="{Binding Path=APlayers,Mode=TwoWay}"
+                          SelectedItem="{Binding Path=APlayer,Mode=TwoWay}" Margin="0,6,0,0" >
+                    </dxe:ListBoxEdit>
+
+
+                    <WrapPanel Grid.Row="2" Grid.Column="6" VerticalAlignment="Center">
+
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="45"/>
+                                <ColumnDefinition Width="75"/>
+                            </Grid.ColumnDefinitions>
+
+                            <TextBlock  Grid.Column="0" TextBlock.TextAlignment="Center" Text="项数：" Width="45"  FontSize="16"   HorizontalAlignment="Right" VerticalAlignment="Center" />
+                            <dxe:ComboBoxEdit Grid.Column="1" x:Name="com_matchStatsId"  HorizontalAlignment="Left" VerticalAlignment="Center" Width="75" FontSize="16"
+                             ItemsSource="{Binding Path=MatchStatsIds,Mode=TwoWay}"
+                             SelectedItem="{Binding Path=MatchStatsId,Mode=TwoWay}" >
+                            </dxe:ComboBoxEdit>
+                        </Grid>
+
+                    </WrapPanel>
+
+                    <dxe:TextEdit Grid.Row="3" Text="{Binding HNums,Mode=TwoWay}"  Width="70" FontSize="16"  Grid.Column="3" 
+                         HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"/>
+
+                    <dxe:TextEdit Grid.Row="3" Text="{Binding ANums,Mode=TwoWay}" Width="70" FontSize="16"  Grid.Column="4"  
+                         HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"/>
+
+                    <dxe:ImageEdit Grid.Row="4" Grid.Column="3" Height="100" Width="120" x:Name="HPlayer_Logo" ShowMenu="False" EditValue="{Binding Path=HPlayerLogo}"  
+                               ShowLoadDialogOnClickMode="Never" Margin="5,5,5,5"/>
+
+                    <dxe:ImageEdit Grid.Row="4" Grid.Column="4" Height="100" Width="120" x:Name="APlayer_Logo" ShowMenu="False" EditValue="{Binding Path=APlayerLogo}" 
+                               ShowLoadDialogOnClickMode="Never" Margin="5,5,5,5" />
+
+
+                    <dxe:TextEdit Text="{Binding HomeImage,Mode=TwoWay}"  Width="120"  FontSize="16" Grid.Column="2"  Grid.Row="5" VerticalAlignment="Center" Margin="50,0,5,0" />
+                    <dx:SimpleButton Grid.Row="5"  Grid.Column="3" Content="选择图片"  FontSize="16" 
+                                          Command="{Binding BtmChooseHomeImage}" HorizontalContentAlignment="Center"   Width="90" Height="30"  />
+
+                    <dx:SimpleButton Grid.Row="5"  Grid.Column="4" Content="选择图片"  FontSize="16" 
+                                          Command="{Binding BtmChooseAwayImage}" HorizontalContentAlignment="Center"   Width="90" Height="30"  />
+
+                    <dxe:TextEdit Text="{Binding AwayImage,Mode=TwoWay}"  Width="120"  FontSize="16" Grid.Column="5"  Grid.Row="5" VerticalAlignment="Center" Margin="2,0,5,0" />
+
+
+
+                </Grid>
+            </WrapPanel>
+
+
+            <WrapPanel Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Center"  Width="650"  Margin="60,0,0,0">
+
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="34"/>
+                        <RowDefinition Height="34"/>
+                        <RowDefinition Height="34"/>
+                        <RowDefinition Height="34"/>
+                        <RowDefinition Height="34"/>
+                        <RowDefinition Height="34"/>
+                        <RowDefinition Height="34"/>
+                        <RowDefinition Height="34"/>
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="80"/>
+                        <ColumnDefinition Width="115"/>
+                        <ColumnDefinition Width="0"/>
+                        <ColumnDefinition Width="127"/>
+                        <ColumnDefinition Width="115"/>
+                        <ColumnDefinition Width="115"/>
+                    </Grid.ColumnDefinitions>
+
+                    <TextBlock Grid.Row="0" Grid.Column="1" Text="主队得分" FontSize="12" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+
+
+                    <TextBlock Grid.Row="0" Grid.Column="4" Text="客队得分" FontSize="12" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+
+
+                    <!--第一项-->
+
+                    <dxe:TextEdit Grid.Row="1" Grid.Column="1"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HomeScore,Mode=TwoWay }"  Visibility="{Binding HScoreVisible,Mode=TwoWay}"/>
+
+                    <dxe:ComboBoxEdit  Grid.Row="1" Grid.Column="3" x:Name="com_techStats" HorizontalAlignment="Center" VerticalAlignment="Center" Width="120" FontSize="16"
+                          ItemsSource="{Binding Path=TechStats,Mode=TwoWay}"
+                          SelectedItem="{Binding Path=SelectTechStats,Mode=TwoWay}" Visibility="{Binding TechStatsVisible,Mode=TwoWay}">
+                    </dxe:ComboBoxEdit>
+                    <dxe:TextEdit Grid.Row="1" Grid.Column="4"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding AwayScore,Mode=TwoWay }" Visibility="{Binding AScoreVisible,Mode=TwoWay}" />
+
+                    <!--第二项-->
+
+                    <dxe:TextEdit Grid.Row="2" Grid.Column="1"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HomeScore1,Mode=TwoWay }"  Visibility="{Binding HScoreVisible1,Mode=TwoWay}"/>
+                    <!--<dxe:TextEdit Grid.Row="2" Grid.Column="2"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HSeasonScore1,Mode=TwoWay }"  Visibility="{Binding HSeasonScoreVisible1,Mode=TwoWay}"/>-->
+                    <dxe:ComboBoxEdit  Grid.Row="2" Grid.Column="3" x:Name="com_techStats1" HorizontalAlignment="Center" VerticalAlignment="Center" Width="120" FontSize="16"
+                          ItemsSource="{Binding Path=TechStats1,Mode=TwoWay}"
+                          SelectedItem="{Binding Path=SelectTechStats1,Mode=TwoWay}" Visibility="{Binding TechStatsVisible,Mode=TwoWay}">
+                    </dxe:ComboBoxEdit>
+                    <dxe:TextEdit Grid.Row="2" Grid.Column="4"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding AwayScore1,Mode=TwoWay }" Visibility="{Binding AScoreVisible1,Mode=TwoWay}" />
+                    <!--<dxe:TextEdit Grid.Row="2" Grid.Column="5"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding ASeasonScore1,Mode=TwoWay }" Visibility="{Binding ASeasonScoreVisible1}" />-->
+
+
+                    <!--第三项-->
+
+
+                    <dxe:TextEdit Grid.Row="3" Grid.Column="1"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HomeScore2,Mode=TwoWay }"  Visibility="{Binding HScoreVisible2,Mode=TwoWay}"/>
+
+                    <!--<dxe:TextEdit Grid.Row="3" Grid.Column="2"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HSeasonScore2,Mode=TwoWay }"  Visibility="{Binding HSeasonScoreVisible12,Mode=TwoWay}"/>-->
+
+                    <dxe:ComboBoxEdit  Grid.Row="3" Grid.Column="3" x:Name="com_techStats2" HorizontalAlignment="Center" VerticalAlignment="Center" Width="120" FontSize="16"
+                          ItemsSource="{Binding Path=TechStats2,Mode=TwoWay}"
+                          SelectedItem="{Binding Path=SelectTechStats2,Mode=TwoWay}" Visibility="{Binding TechStatsVisible2,Mode=TwoWay}">
+                    </dxe:ComboBoxEdit>
+
+                    <dxe:TextEdit Grid.Row="3" Grid.Column="4"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding AwayScore2,Mode=TwoWay }" Visibility="{Binding AScoreVisible2,Mode=TwoWay}" />
+
+                    <!--<dxe:TextEdit Grid.Row="3" Grid.Column="5"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding ASeasonScore2,Mode=TwoWay }" Visibility="{Binding ASeasonScoreVisible2}" />-->
+
+
+
+
+                    <!--第四项-->
+
+
+                    <dxe:TextEdit Grid.Row="4" Grid.Column="1"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HomeScore3,Mode=TwoWay }"  Visibility="{Binding HScoreVisible3,Mode=TwoWay}"/>
+
+                    <!--<dxe:TextEdit Grid.Row="4" Grid.Column="2"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HSeasonScore3,Mode=TwoWay }"  Visibility="{Binding HSeasonScoreVisible13,Mode=TwoWay}"/>-->
+
+                    <dxe:ComboBoxEdit  Grid.Row="4" Grid.Column="3" x:Name="com_techStats3" HorizontalAlignment="Center" VerticalAlignment="Center" Width="120" FontSize="16"
+                          ItemsSource="{Binding Path=TechStats3,Mode=TwoWay}"
+                          SelectedItem="{Binding Path=SelectTechStats3,Mode=TwoWay}" Visibility="{Binding TechStatsVisible3,Mode=TwoWay}">
+                    </dxe:ComboBoxEdit>
+
+                    <dxe:TextEdit Grid.Row="4" Grid.Column="4"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding AwayScore3,Mode=TwoWay }" Visibility="{Binding AScoreVisible3,Mode=TwoWay}" />
+
+                    <!--<dxe:TextEdit Grid.Row="4" Grid.Column="5"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding ASeasonScore3,Mode=TwoWay }" Visibility="{Binding ASeasonScoreVisible3}" />-->
+
+
+
+                    <!--第五项-->
+
+
+                    <dxe:TextEdit Grid.Row="5" Grid.Column="1"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HomeScore4,Mode=TwoWay }"  Visibility="{Binding HScoreVisible4,Mode=TwoWay}"/>
+
+                    <!--<dxe:TextEdit Grid.Row="5" Grid.Column="2"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HSeasonScore4,Mode=TwoWay }"  Visibility="{Binding HSeasonScoreVisible14,Mode=TwoWay}"/>-->
+
+                    <dxe:ComboBoxEdit  Grid.Row="5" Grid.Column="3" x:Name="com_techStats4" HorizontalAlignment="Center" VerticalAlignment="Center" Width="120" FontSize="16"
+                          ItemsSource="{Binding Path=TechStats4,Mode=TwoWay}"
+                          SelectedItem="{Binding Path=SelectTechStats4,Mode=TwoWay}" Visibility="{Binding TechStatsVisible4,Mode=TwoWay}">
+                    </dxe:ComboBoxEdit>
+
+                    <dxe:TextEdit Grid.Row="5" Grid.Column="4"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding AwayScore4,Mode=TwoWay }" Visibility="{Binding AScoreVisible4,Mode=TwoWay}" />
+
+                    <!--<dxe:TextEdit Grid.Row="5" Grid.Column="5"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding ASeasonScore4,Mode=TwoWay }" Visibility="{Binding ASeasonScoreVisible4}" />-->
+
+
+
+                    <!--第六项-->
+
+
+                    <dxe:TextEdit Grid.Row="6" Grid.Column="1"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HomeScore5,Mode=TwoWay }"  Visibility="{Binding HScoreVisible5,Mode=TwoWay}"/>
+
+                    <!--<dxe:TextEdit Grid.Row="6" Grid.Column="2"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HSeasonScore5,Mode=TwoWay }"  Visibility="{Binding HSeasonScoreVisible5,Mode=TwoWay}"/>-->
+
+                    <dxe:ComboBoxEdit  Grid.Row="6" Grid.Column="3" x:Name="com_techStats5" HorizontalAlignment="Center" VerticalAlignment="Center" Width="120" FontSize="16"
+                          ItemsSource="{Binding Path=TechStats5,Mode=TwoWay}"
+                          SelectedItem="{Binding Path=SelectTechStats5,Mode=TwoWay}" Visibility="{Binding TechStatsVisible5,Mode=TwoWay}">
+                    </dxe:ComboBoxEdit>
+
+                    <dxe:TextEdit Grid.Row="6" Grid.Column="4"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding AwayScore5,Mode=TwoWay }" Visibility="{Binding AScoreVisible5,Mode=TwoWay}" />
+
+                    <!--<dxe:TextEdit Grid.Row="6" Grid.Column="5"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding ASeasonScore5,Mode=TwoWay }" Visibility="{Binding ASeasonScoreVisible5}" />-->
+
+
+                </Grid>
+
+            </WrapPanel>
+
+        </Grid>
+
+    </ScrollViewer>
+</UserControl>

VIZ.TVP.WMCUP.Module/FComparePlayer/View/FComparePlayerView.xaml.cs

+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>
+    /// FComparePlayerView.xaml 的交互逻辑
+    /// </summary>
+    public partial class FComparePlayerView : UserControl, IPluginView
+    {
+
+
+        FComparePlayerViewModel vm = new FComparePlayerViewModel();
+
+        private static ILog Log = LogManager.GetLogger(typeof(FSinglePlayerViewModel));
+
+
+
+        /// <summary>
+        /// 操作日志服务
+        /// </summary>
+        private RecordLogService recordLogService = new RecordLogService();
+
+
+        public FComparePlayerView()
+        {
+            InitializeComponent();
+
+            WPFHelper.BindingViewModel(this, vm);
+            FComparePlayerViewModel.PlayerCompareViewModelInstance.Add(vm);
+
+
+            this.Loaded += NewSinglePlayerView_Loaded;
+            this.IsVisibleChanged += NewSinglePlayerView_IsVisibleChanged;
+        }
+
+
+
+        private void NewSinglePlayerView_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
+        {
+            if (!string.IsNullOrEmpty(vm.homeTeamId) && !string.IsNullOrEmpty(vm.visitTeamId))
+            {
+                vm.SetTeamData();
+            }
+        }
+
+        private void NewSinglePlayerView_Loaded(object sender, RoutedEventArgs e)
+        {
+            var service = ApplicationDomainEx.ServiceManager.GetService<IPluginService>(ViewServiceKeys.PLUGIN_SERVICE);
+            if (service == null)
+                return;
+            vm.page = service.GetPageModelFromView(this);
+
+        }
+
+        public void Dispose()
+        {
+
+        }
+
+        public void PreviewContinue(ConnModel conn)
+        {
+
+        }
+
+        public void PreviewIn(ConnModel conn)
+        {
+            this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, RecordLogConstants.OPERATE_PREVIEW_PLAY);
+            if (conn.IsConnected)
+            {
+                conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "Data", vm.CombineTeamComData()));
+                Log.Info("已经发送命令===>" + vm.CombineTeamComData());
+
+            }
+        }
+
+        public void PreviewOut(ConnModel conn)
+        {
+            //if(conn.IsConnected)
+            // {
+            //     conn.EndpointManager.Send(VizEngineCommands.STAGE_CONTINUE);
+            // }
+        }
+
+        public void TakeContinue(ConnModel conns)
+        {
+
+        }
+
+        public void TakeOut(ConnModel conns)
+        {
+            this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, RecordLogConstants.OPERATE_TAKE_OUT);
+            if (conns.IsConnected)
+            {
+                conns.EndpointManager.Send(VizEngineCommands.STAGE_CONTINUE);
+            }
+        }
+
+        public void TakeUpdate(ConnModel conns)
+        {
+            this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, RecordLogConstants.OPERATE_TAKE_UPDATE);
+            if (conns.IsConnected)
+            {
+                conns.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "Data", vm.CombineTeamComData()));
+            }
+        }
+
+        public void TakIn(ConnModel conns)
+        {
+            this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, RecordLogConstants.OPERATE_TAKE_TAKE);
+            if (conns.IsConnected)
+            {
+                conns.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "Data", vm.CombineTeamComData()));
+            }
+        }
+
+
+
+
+
+        public void PageOpend(ConnModel conn, PageModel page)
+        {
+            if (conn.IsConnected)
+            {
+                conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "Data", vm.CombineTeamComData()));
+            }
+        }
+
+        public void PreviewUpdate(ConnModel conn)
+        {
+            this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, RecordLogConstants.OPERATE_PREVIEW_UPDATE);
+            if (conn.IsConnected)
+            {
+                conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "Data", vm.CombineTeamComData()));
+            }
+        }
+
+
+
+
+
+    }
+}

VIZ.TVP.WMCUP.Module/FComparePlayer/ViewModel/FComparePlayerViewModel.cs

+using log4net;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Web.UI.HtmlControls;
+using System.Windows;
+using System.Windows.Documents;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using VIZ.Framework.Core;
+using VIZ.Package.Domain;
+using VIZ.Package.Service;
+using VIZ.Package.Storage;
+
+namespace VIZ.TVP.WMCUP.Module
+{
+    public class FComparePlayerViewModel : ViewModelBase
+    {
+        private static ILog Log = LogManager.GetLogger(typeof(FComparePlayerViewModel));
+
+        /// <summary>
+        /// 操作日志服务
+        /// </summary>
+        private RecordLogService recordLogService = new RecordLogService();
+
+
+        //private static PlayerCompareViewModel _createInstance = null;
+
+        public static List<FComparePlayerViewModel> PlayerCompareViewModelInstance = new List<FComparePlayerViewModel>();
+
+
+        public string homeTeamId;
+
+        public string visitTeamId;
+
+        public string homeNationTeam;
+
+        public string awayNationTeam;
+
+        public FComparePlayerViewModel()
+        {
+            BtnCommand = new VCommand(BtnCmd);
+
+            //选择主队图片
+            BtmChooseHomeImage = new VCommand(ChooseHoemImage);
+
+            //选择客队图片
+            BtmChooseAwayImage = new VCommand(ChooseAwayImage);
+  
+            matchStatsIds = new ObservableCollection<int>()
+            {
+                3,
+                4,
+                5,
+                6
+            };
+
+            PromptCommand = new VCommand(this.PromptCmd);
+            //ScheduleID = DateHeaderViewModel.ScheduleID;
+            //Matchtypeid = DateHeaderViewModel.Matchtypeid;
+
+            homeTeamId = DateHeaderViewModel.HomeTeamId;
+            visitTeamId = DateHeaderViewModel.VisitTeamId;
+            homeNationTeam = DateHeaderViewModel.HomeNationName;
+            awayNationTeam = DateHeaderViewModel.VisitingTeamName;
+
+            HName = DateHeaderViewModel.HomeTeamName;
+            AName = DateHeaderViewModel.VisitingTeamName;
+
+            SetTeamData();
+        }
+
+
+
+
+        /// <summary>
+        /// 技术统计项
+        /// </summary>
+        private int matchStatsId = 6;
+
+        public int MatchStatsId
+        {
+            get { return matchStatsId; }
+
+            set
+            {
+
+                matchStatsId = value;
+                this.RaisePropertyChanged(nameof(MatchStatsId));
+
+
+                if (matchStatsId == 3)
+                {
+
+                    IsCheckVisible3 = Visibility.Hidden;
+                    HScoreVisible3 = Visibility.Hidden;
+                    HSeasonScoreVisible3 = Visibility.Hidden;
+                    TechStatsVisible3 = Visibility.Hidden;
+                    AScoreVisible3 = Visibility.Hidden;
+                    ASeasonScoreVisible3 = Visibility.Hidden;
+
+
+                    IsCheckVisible4 = Visibility.Hidden;
+                    HScoreVisible4 = Visibility.Hidden;
+                    HSeasonScoreVisible4 = Visibility.Hidden;
+                    TechStatsVisible4 = Visibility.Hidden;
+                    AScoreVisible4 = Visibility.Hidden;
+                    ASeasonScoreVisible4 = Visibility.Hidden;
+
+
+                    IsCheckVisible5 = Visibility.Hidden;
+                    HScoreVisible5 = Visibility.Hidden;
+                    HSeasonScoreVisible5 = Visibility.Hidden;
+                    TechStatsVisible5 = Visibility.Hidden;
+                    AScoreVisible5 = Visibility.Hidden;
+                    ASeasonScoreVisible5 = Visibility.Hidden;
+
+                }
+
+
+                if (matchStatsId == 4)
+                {
+
+                    IsCheckVisible3 = Visibility.Visible;
+                    HScoreVisible3 = Visibility.Visible;
+                    HSeasonScoreVisible3 = Visibility.Visible;
+                    TechStatsVisible3 = Visibility.Visible;
+                    AScoreVisible3 = Visibility.Visible;
+                    ASeasonScoreVisible3 = Visibility.Visible;
+
+
+
+                    IsCheckVisible4 = Visibility.Hidden;
+                    HScoreVisible4 = Visibility.Hidden;
+                    HSeasonScoreVisible4 = Visibility.Hidden;
+                    TechStatsVisible4 = Visibility.Hidden;
+                    AScoreVisible4 = Visibility.Hidden;
+                    ASeasonScoreVisible4 = Visibility.Hidden;
+
+
+                    IsCheckVisible5 = Visibility.Hidden;
+                    HScoreVisible5 = Visibility.Hidden;
+                    HSeasonScoreVisible5 = Visibility.Hidden;
+                    TechStatsVisible5 = Visibility.Hidden;
+                    AScoreVisible5 = Visibility.Hidden;
+                    ASeasonScoreVisible5 = Visibility.Hidden;
+
+                    //IsCheckVisible6 = Visibility.Hidden;
+                    //HScoreVisible6 = Visibility.Hidden;
+                    //HSeasonScoreVisible6 = Visibility.Hidden;
+                    //TechStatsVisible6 = Visibility.Hidden;
+                    //AScoreVisible6 = Visibility.Hidden;
+                    //ASeasonScoreVisible6 = Visibility.Hidden;
+
+
+                }
+                else if (matchStatsId == 5)
+                {
+
+                    IsCheckVisible3 = Visibility.Visible;
+                    HScoreVisible3 = Visibility.Visible;
+                    HSeasonScoreVisible3 = Visibility.Visible;
+                    TechStatsVisible3 = Visibility.Visible;
+                    AScoreVisible3 = Visibility.Visible;
+                    ASeasonScoreVisible3 = Visibility.Visible;
+
+                    IsCheckVisible4 = Visibility.Visible;
+                    HScoreVisible4 = Visibility.Visible;
+                    HSeasonScoreVisible4 = Visibility.Visible;
+                    TechStatsVisible4 = Visibility.Visible;
+                    AScoreVisible4 = Visibility.Visible;
+                    ASeasonScoreVisible4 = Visibility.Visible;
+
+
+                    IsCheckVisible5 = Visibility.Hidden;
+                    HScoreVisible5 = Visibility.Hidden;
+                    HSeasonScoreVisible5 = Visibility.Hidden;
+                    TechStatsVisible5 = Visibility.Hidden;
+                    AScoreVisible5 = Visibility.Hidden;
+                    ASeasonScoreVisible5 = Visibility.Hidden;
+
+                    //IsCheckVisible6 = Visibility.Hidden;
+                    //HScoreVisible6 = Visibility.Hidden;
+                    //HSeasonScoreVisible6 = Visibility.Hidden;
+                    //TechStatsVisible6 = Visibility.Hidden;
+                    //AScoreVisible6 = Visibility.Hidden;
+                    //ASeasonScoreVisible6 = Visibility.Hidden;
+
+                }
+                else if (matchStatsId == 6)
+                {
+
+
+                    IsCheckVisible3 = Visibility.Visible;
+                    HScoreVisible3 = Visibility.Visible;
+                    HSeasonScoreVisible3 = Visibility.Visible;
+                    TechStatsVisible3 = Visibility.Visible;
+                    AScoreVisible3 = Visibility.Visible;
+                    ASeasonScoreVisible3 = Visibility.Visible;
+
+
+                    IsCheckVisible4 = Visibility.Visible;
+                    HScoreVisible4 = Visibility.Visible;
+                    HSeasonScoreVisible4 = Visibility.Visible;
+                    TechStatsVisible4 = Visibility.Visible;
+                    AScoreVisible4 = Visibility.Visible;
+                    ASeasonScoreVisible4 = Visibility.Visible;
+
+
+
+
+                    IsCheckVisible5 = Visibility.Visible;
+                    HScoreVisible5 = Visibility.Visible;
+                    HSeasonScoreVisible5 = Visibility.Visible;
+                    TechStatsVisible5 = Visibility.Visible;
+                    AScoreVisible5 = Visibility.Visible;
+                    ASeasonScoreVisible5 = Visibility.Visible;
+
+                    //IsCheckVisible6 = Visibility.Visible;
+                    //HScoreVisible6 = Visibility.Visible;
+                    //HSeasonScoreVisible6 = Visibility.Visible;
+                    //TechStatsVisible6 = Visibility.Visible;
+                    //AScoreVisible6 = Visibility.Visible;
+                    //ASeasonScoreVisible6 = Visibility.Visible;
+                }
+
+                NewSetHData(0);
+                NewSetAData(0);
+
+            }
+        }
+
+
+        private ObservableCollection<int> matchStatsIds;
+
+        public ObservableCollection<int> MatchStatsIds
+        {
+            get { return matchStatsIds; }
+
+            set { matchStatsIds = value; this.RaisePropertyChanged(nameof(MatchStatsIds)); }
+        }
+
+
+        private ObservableCollection<string> hPlayers;
+
+        /// <summary>
+        /// 主队球员信息
+        /// </summary>
+        public ObservableCollection<string> HPlayers
+        {
+            get { return hPlayers; }
+
+            set { hPlayers = value; this.RaisePropertyChanged(nameof(HPlayers)); }
+        }
+
+        private ObservableCollection<string> aPlayers;
+
+        /// <summary>
+        /// 客队球员信息
+        /// </summary>
+        public ObservableCollection<string> APlayers
+        {
+            get { return aPlayers; }
+            set { aPlayers = value; this.RaisePropertyChanged(nameof(APlayers)); }
+        }
+
+
+        /// <summary>
+        /// 主队球员图片
+        /// </summary>
+        private ImageSource hPlayerLogo;
+
+        public ImageSource HPlayerLogo
+        {
+            get { return hPlayerLogo; }
+            set { hPlayerLogo = value; this.RaisePropertyChanged(nameof(HPlayerLogo)); }
+        }
+
+
+        /// <summary>
+        /// 按钮刷新
+        /// </summary>
+        public VCommand BtnCommand { get; set; }
+
+        private void BtnCmd()
+        {
+            NewSetHData(0);
+
+            NewSetAData(0);
+
+            //SetTeamData();
+        }
+
+
+
+        // string baesePath = AppDomain.CurrentDomain.BaseDirectory;
+
+        private string aPlayer;
+
+        public string APlayer
+        {
+            get { return aPlayer; }
+            set
+            {
+                aPlayer = value;
+                this.RaisePropertyChanged(nameof(APlayer));
+
+                if (APlayer == null) return;
+
+
+                //}
+
+                string playPath = string.Format("{0}\\{1}\\{2}.png", AppSetup_InitLiteDB.HttpUrlConfigEntity.PlayersLogo, awayNationTeam, APlayer);
+                if (File.Exists(playPath))
+                {
+                    APlayerLogo = new BitmapImage(new Uri(playPath));
+                }
+                else
+                {
+                    APlayerLogo = null;
+                }
+
+                AwayImage = aPlayer;
+
+                if (APlayerData.ContainsKey(APlayer))
+                {
+                    ANums = APlayerData[APlayer].Item2;
+                }
+                NewSetAData(0);
+            }
+        }
+
+        /// <summary>
+        /// 客队球员图片
+        /// </summary>
+        private ImageSource aPlayerLogo;
+        public ImageSource APlayerLogo
+        {
+            get { return aPlayerLogo; }
+            set { aPlayerLogo = value; this.RaisePropertyChanged(nameof(APlayerLogo)); }
+        }
+
+
+        private string hPlayer;
+
+        public string HPlayer
+        {
+            get { return hPlayer; }
+            set
+            {
+                hPlayer = value;
+                this.RaisePropertyChanged(nameof(HPlayer));
+                if (HPlayer == null) return;
+                //if (HName == "北京控股666")
+                //{
+                //    if(File.Exists(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股")))
+                //    {
+                //        HPlayerLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股")));
+                //    }
+
+                //}
+                //else
+                //{
+                //    if(File.Exists(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, HName)))
+                //    {
+                //        HPlayerLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, HName)));
+                //    }
+
+                //}
+
+                string playPath = string.Format("{0}\\{1}\\{2}.png", AppSetup_InitLiteDB.HttpUrlConfigEntity.PlayersLogo, homeNationTeam, hPlayer);
+
+                if (File.Exists(playPath))
+                {
+                    HPlayerLogo = new BitmapImage(new Uri(playPath));
+                }
+                else
+                {
+                    HPlayerLogo = null;
+                }
+
+
+                HomeImage = hPlayer;
+
+                if (HPlayerData.ContainsKey(HPlayer))
+                {
+                    HNums = HPlayerData[HPlayer].Item2;
+
+                    //  HNums = HPlayerData[HPlayer].Item2;
+                }
+                NewSetHData(0);
+            }
+        }
+
+        private string hName;
+
+        public string HName
+        {
+            get { return hName; }
+            set
+            {
+                hName = value;
+                this.RaisePropertyChanged(nameof(HName));
+
+
+            }
+        }
+
+
+        private string aName;
+
+        public string AName
+        {
+            get { return aName; }
+            set { aName = value; this.RaisePropertyChanged(nameof(AName)); }
+        }
+
+
+        private string hNums;
+
+        public string HNums
+        {
+            get { return hNums; }
+
+            set { hNums = value; this.RaisePropertyChanged(nameof(HNums)); }
+        }
+
+
+        private string aNums;
+
+        public string ANums
+        {
+            get { return aNums; }
+
+            set { aNums = value; this.RaisePropertyChanged(nameof(ANums)); }
+        }
+
+        private string title = "数据对比";
+
+        public string Title
+        {
+            get { return title; }
+
+            set { title = value; this.RaisePropertyChanged(nameof(Title)); }
+        }
+
+
+
+        /// <summary>
+        /// 主队球员信息全部
+        /// </summary>
+        // public TeamStats teamHomeStats = new TeamStats();
+
+        public SingleTeamPlayers homeTeamPlayer = new SingleTeamPlayers();
+
+        /// <summary>
+        /// 客队队伍统计得分
+        /// </summary>
+        //public TeamStats teamVisitStats = new TeamStats();
+
+
+        // 客队球员信息全部
+        public SingleTeamPlayers visitTeamPlayer = new SingleTeamPlayers();
+
+
+
+        #region 打开更新数据时间日志
+        /// <summary>
+        /// 打开数据更新日志
+        /// </summary>
+        public VCommand PromptCommand { get; set; }
+
+
+        MessageLastRecordDate messageLastRecordDate = new MessageLastRecordDate();
+        private void PromptCmd()
+        {
+            this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, "单球员数据统计：" + PluginConstant.Operate_Message);
+            MessageLRDateViewModel vm = messageLastRecordDate.DataContext as MessageLRDateViewModel;
+   
+           
+            if (homeTeamPlayer != null)
+            {
+                string teamSeasonLastDate = $"单球员统计接口更新时间:{homeTeamPlayer.LastPushDataDateTime}";
+                vm.OnErrorLogMessage(teamSeasonLastDate);
+            }
+
+
+            if (visitTeamPlayer != null)
+            {
+                string teamSeasonLastDate = $"单球员统计接口更新时间:{visitTeamPlayer.LastPushDataDateTime}";
+                vm.OnErrorLogMessage(teamSeasonLastDate);
+            }
+
+            messageLastRecordDate.Visibility = System.Windows.Visibility.Visible;
+            messageLastRecordDate.WindowState = System.Windows.WindowState.Normal;
+
+            // messageLastRecordDate.ShowDialog();
+        }
+
+
+
+
+        #endregion
+
+
+        #region 选择图片
+
+
+
+        private string homeImage;
+
+        public string HomeImage
+        {
+            get { return homeImage; }
+            set { homeImage = value; this.RaisePropertyChanged(nameof(HomeImage)); }
+        }
+
+
+        /// <summary>
+        /// 选择主队图片
+        /// </summary>
+        public VCommand BtmChooseHomeImage { get; set; }
+
+
+        private void ChooseHoemImage()
+        {
+            System.Windows.Forms.OpenFileDialog ofd = new System.Windows.Forms.OpenFileDialog();
+            ofd.Filter = "Image|*.png;";//*.jpg;*.jpeg;*.bmp;
+            ofd.Multiselect = false;
+            if (ofd.ShowDialog() != System.Windows.Forms.DialogResult.OK)
+                return;
+
+            HPlayerLogo = new BitmapImage(new Uri((ofd.FileName)));
+            //this.PlayerName = ofd.FileName.Replace(@"\", @"\\");
+
+            //string name = System.IO.Path.GetFileName(ofd.FileName);
+            HomeImage = Path.GetFileNameWithoutExtension(ofd.FileName);
+        }
+
+
+
+        /// <summary>
+        /// 客队中图片
+        /// </summary>
+
+        private string awayImage;
+
+        public string AwayImage
+        {
+            get { return awayImage; }
+            set { awayImage = value; this.RaisePropertyChanged(nameof(AwayImage)); }
+        }
+
+
+        /// <summary>
+        /// 选择客队图片
+        /// </summary>
+        public VCommand BtmChooseAwayImage { get; set; }
+
+        private void ChooseAwayImage()
+        {
+            System.Windows.Forms.OpenFileDialog ofd = new System.Windows.Forms.OpenFileDialog();
+            ofd.Filter = "Image|*.png;";//*.jpg;*.jpeg;*.bmp;
+            ofd.Multiselect = false;
+            if (ofd.ShowDialog() != System.Windows.Forms.DialogResult.OK)
+                return;
+
+            APlayerLogo = new BitmapImage(new Uri((ofd.FileName)));
+            //this.PlayerName = ofd.FileName.Replace(@"\", @"\\");
+
+            //string name = System.IO.Path.GetFileName(ofd.FileName);
+            AwayImage = Path.GetFileNameWithoutExtension(ofd.FileName);
+        }
+
+        #endregion
+
+
+
+
+        public Dictionary<string, string> VisitScoreDictionary = new Dictionary<string, string>();
+
+
+        //private void SetVisitHomeDictionary()
+        //{
+
+        //    VisitScoreDictionary.Clear();
+        //    if (teamVisitStats == null || teamVisitStats.teamStat == null) return;
+        //    foreach (var teamSeasonData in teamVisitStats.teamStat.FirstOrDefault().statistics)
+        //    {
+        //        if (!VisitScoreDictionary.ContainsKey(teamSeasonData.name))
+        //        {
+        //            VisitScoreDictionary.Add(teamSeasonData.name, teamSeasonData.value);
+        //        }
+
+        //    }
+        //}
+
+
+
+        public Dictionary<string, string> HomeScoreDictionary = new Dictionary<string, string>();
+
+
+
+
+        public PageModel page = null;
+
+        static ObservableCollection<string> listTechStats = new ObservableCollection<string>() { "进球助攻", "射门", "传球成功", "传球正确率", "关键传球", "拦截" };//"罚球",
+
+
+
+
+        public Dictionary<string, Tuple<string, string>> HPlayerData = new Dictionary<string, Tuple<string, string>>();
+
+        public Dictionary<string, Tuple<string, string>> APlayerData = new Dictionary<string, Tuple<string, string>>();
+
+        public async void SetTeamData()
+        {
+            if (HPlayers != null) HPlayers.Clear();
+            if (APlayers != null) APlayers.Clear();
+
+            HPlayerData.Clear();
+            APlayerData.Clear();
+
+             homeTeamPlayer = await JsonModel.PostTeamPlayerData_Path(homeTeamId, "");
+            if (homeTeamPlayer == null) return;
+
+
+            foreach (var hPlayer in homeTeamPlayer.matchTeamPlayers)
+            {
+                if (!HPlayerData.ContainsKey(hPlayer.figureName) && !string.IsNullOrEmpty(hPlayer.figureName))
+                {
+                    HPlayerData.Add(hPlayer.figureName, new Tuple<string, string>(hPlayer.figureId, hPlayer.playerNum));
+                }
+            }
+
+            visitTeamPlayer = await JsonModel.PostTeamPlayerData_Path(visitTeamId, "");
+            if (visitTeamPlayer == null) return;
+
+
+            foreach (var aPlayer in visitTeamPlayer.matchTeamPlayers)
+            {
+                if (!APlayerData.ContainsKey(aPlayer.figureName) && !string.IsNullOrEmpty(aPlayer.figureName))
+                {
+                    APlayerData.Add(aPlayer.figureName, new Tuple<string, string>(aPlayer.figureId, aPlayer.playerNum));
+                }
+            }
+
+
+            HPlayers = new ObservableCollection<string>();
+
+            APlayers = new ObservableCollection<string>();
+
+            HPlayers = HPlayerData.Keys.ToObservableCollection();
+
+            APlayers = APlayerData.Keys.ToObservableCollection();
+
+            //SetPlayerStatic();
+
+            NewSetHData(0);
+
+            NewSetAData(0);
+        }
+
+
+
+        public string CombineTeamComData()
+        {
+            try
+            {
+                string data = "";
+
+                //if (matchStatsId != 0)
+                //{
+                //    data += matchStatsId.ToString().Replace(" ", "") + "*";
+                //}
+                //else
+                //{
+                //    data += "7*";
+                //}
+                data += title.ToString().Replace(" ", "") + "&";
+
+                if (!string.IsNullOrEmpty(homeNationTeam))
+                {
+                    data += homeNationTeam.Replace(" ", "") + "#";
+                }
+                else
+                {
+                    data += "" + "#";
+                }
+
+
+                //if (!string.IsNullOrEmpty(HName))
+                //{
+                //    data += HName.Replace(" ", "") + "#";
+                //}
+                //else
+                //{
+                //    data += "" + "#";
+                //}
+
+                //if (!string.IsNullOrEmpty(ANums))
+                //{
+                //    data += ANums.Replace(" ", "") + "#";
+                //}
+                //else
+                //{
+                //    data += "" + "#";
+                //}
+
+
+                if (!string.IsNullOrEmpty(HPlayer))
+                {
+                    data += HPlayer.Replace(" ", "") + "#";
+                }
+                else
+                {
+                    data += "" + "#";
+                }
+
+
+                if (!string.IsNullOrEmpty(HomeImage))
+                {
+                    data += HomeImage.Replace(" ", "") + "#";
+                }
+                else
+                {
+                    data += "" + "#";
+                }
+
+
+
+
+                if (!string.IsNullOrEmpty(awayNationTeam))
+                {
+                    data += awayNationTeam.Replace(" ", "") + "#";
+                }
+                else
+                {
+                    data += "" + "#";
+                }
+
+
+                if (!string.IsNullOrEmpty(APlayer))
+                {
+                    data += APlayer.Replace(" ", "") + "#";
+                }
+                else
+                {
+                    data += "" + "#";
+                }
+
+
+                if (!string.IsNullOrEmpty(AwayImage))
+                {
+                    data += AwayImage.Replace(" ", "") + "#";
+                }
+                else
+                {
+                    data += "" + "#";
+                }
+
+                if (matchStatsId == 6)
+                {
+
+                    if (!string.IsNullOrEmpty(HomeScore))
+                    {
+                        data += HomeScore.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    data += selectTechStats.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore))
+                    {
+                        data += AwayScore.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+
+                    //第二项
+
+
+                    if (!string.IsNullOrEmpty(HomeScore1))
+                    {
+                        data += HomeScore1.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    data += selectTechStats1.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore1))
+                    {
+                        data += AwayScore1.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+                    //第三项
+
+
+                    if (!string.IsNullOrEmpty(HomeScore2))
+                    {
+                        data += HomeScore2.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+
+                    data += selectTechStats2.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore2))
+                    {
+                        data += AwayScore2.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+                    //第四项
+
+
+                    if (!string.IsNullOrEmpty(HomeScore3))
+                    {
+                        data += HomeScore3.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+
+                    data += selectTechStats3.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore3))
+                    {
+                        data += AwayScore3.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+
+
+
+                    //第五项
+
+                    if (!string.IsNullOrEmpty(HomeScore4))
+                    {
+                        data += HomeScore4.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+
+
+                    data += selectTechStats4.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore4))
+                    {
+                        data += AwayScore4.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+
+
+
+                    //第六项
+
+                    if (!string.IsNullOrEmpty(HomeScore5))
+                    {
+                        data += HomeScore5.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+
+                    data += selectTechStats5.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore5))
+                    {
+                        data += AwayScore5.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+
+
+                }
+                else if (matchStatsId == 5)
+                {
+                    //第一项
+
+                    if (!string.IsNullOrEmpty(HomeScore))
+                    {
+                        data += HomeScore.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+
+
+                    data += selectTechStats.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore))
+                    {
+                        data += AwayScore.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+
+
+                    //第二项
+
+                    if (!string.IsNullOrEmpty(HomeScore1))
+                    {
+                        data += HomeScore1.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+
+                    data += selectTechStats1.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore1))
+                    {
+                        data += AwayScore1.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+
+
+
+                    //第三项
+
+
+                    if (!string.IsNullOrEmpty(HomeScore2))
+                    {
+                        data += HomeScore2.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+
+                    data += selectTechStats2.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore2))
+                    {
+                        data += AwayScore2.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+
+
+                    //第四项
+
+
+                    if (!string.IsNullOrEmpty(HomeScore3))
+                    {
+                        data += HomeScore3.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+
+                    data += selectTechStats3.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore3))
+                    {
+                        data += AwayScore3.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+
+
+
+                    //第五项
+
+                    if (!string.IsNullOrEmpty(HomeScore4))
+                    {
+                        data += HomeScore4.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+                    data += selectTechStats4.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore4))
+                    {
+                        data += AwayScore4.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+                }
+
+                else if (matchStatsId == 4)
+                {
+                    //第一项
+
+                    if (!string.IsNullOrEmpty(HomeScore))
+                    {
+                        data += HomeScore.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+
+
+                    data += selectTechStats.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore))
+                    {
+                        data += AwayScore.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+
+
+                    //第二项
+
+                    if (!string.IsNullOrEmpty(HomeScore1))
+                    {
+                        data += HomeScore1.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+
+                    data += selectTechStats1.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore1))
+                    {
+                        data += AwayScore1.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+
+
+
+                    //第三项
+
+
+                    if (!string.IsNullOrEmpty(HomeScore2))
+                    {
+                        data += HomeScore2.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+
+                    data += selectTechStats2.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore2))
+                    {
+                        data += AwayScore2.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+
+
+                    //第四项
+
+
+                    if (!string.IsNullOrEmpty(HomeScore3))
+                    {
+                        data += HomeScore3.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+
+                    data += selectTechStats3.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore3))
+                    {
+                        data += AwayScore3.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+
+
+                }
+                else if (matchStatsId == 3)
+                {
+                    //第一项
+
+                    if (!string.IsNullOrEmpty(HomeScore))
+                    {
+                        data += HomeScore.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+
+
+                    data += selectTechStats.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore))
+                    {
+                        data += AwayScore.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+
+
+                    //第二项
+
+                    if (!string.IsNullOrEmpty(HomeScore1))
+                    {
+                        data += HomeScore1.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+
+                    data += selectTechStats1.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore1))
+                    {
+                        data += AwayScore1.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+                    //第三项
+
+
+                    if (!string.IsNullOrEmpty(HomeScore2))
+                    {
+                        data += HomeScore2.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+
+                    data += selectTechStats2.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore2))
+                    {
+                        data += AwayScore2.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+                }
+
+                Log.Info("发送脚本命令====>："+data);
+
+                return data;
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex.Message);
+                return "";
+            }
+        }
+
+
+
+        /// <summary>
+        /// 设置主场数据
+        /// </summary>
+        /// <param name="index"></param>
+
+        public async void NewSetHData(int index)
+        {
+
+
+            // 主队技术统计得分
+            string HfigureId = "";
+
+            if (HPlayer == null) return;
+            if (HPlayerData.ContainsKey(HPlayer))
+            {
+
+                HfigureId = HPlayerData[HPlayer].Item1;
+            }
+
+            if (!string.IsNullOrEmpty(HfigureId))
+            {
+
+                HomeScoreDictionary.Clear();
+                var singlePlayers = await JsonModel.PostSinglePlayerData_Path(HfigureId);
+
+                if (singlePlayers == null || singlePlayers.playerStat == null) return;
+
+                //homeNationTeam = singlePlayers.playerStat.nationName;
+
+                foreach (var player in singlePlayers.playerStat.statistics)
+                {
+                    if (!HomeScoreDictionary.ContainsKey(player.name))
+                    {
+                        HomeScoreDictionary.Add(player.name, player.value);
+                    }
+                }
+            }
+
+
+            if (HomeScoreDictionary.Count == 0) return;
+
+            if (index == 1)
+            {
+                //第一项
+
+                if (SelectTechStats!=null&& HomeScoreDictionary.ContainsKey(SelectTechStats))
+                {
+                    HomeScore = HomeScoreDictionary[SelectTechStats];
+                }
+                else
+                {
+                    HomeScore = "0";
+                }
+
+            }
+            else if (index == 2)
+            {
+
+
+                //第二项
+
+                if (SelectTechStats1!=null&&HomeScoreDictionary.ContainsKey(SelectTechStats1))
+                {
+                    HomeScore1 = HomeScoreDictionary[SelectTechStats1];
+                }
+                else
+                {
+                    HomeScore1 = "0";
+                }
+
+
+            }
+            else if (index == 3)
+            {
+                //第三项
+
+                if (SelectTechStats2!=null&&HomeScoreDictionary.ContainsKey(SelectTechStats2))
+                {
+                    HomeScore2 = HomeScoreDictionary[SelectTechStats2];
+                }
+                else
+                {
+                    HomeScore2 = "0";
+                }
+
+
+            }
+            else if (index == 4)
+            {
+                //第四项
+
+                if (SelectTechStats3 != null &&HomeScoreDictionary.ContainsKey(SelectTechStats3))
+                {
+                    HomeScore3 = HomeScoreDictionary[SelectTechStats3];
+                }
+                else
+                {
+                    HomeScore3 = "0";
+                }
+
+
+            }
+            else if (index == 5)
+            {
+
+                //第五项
+
+                if (SelectTechStats4 != null &&HomeScoreDictionary.ContainsKey(SelectTechStats4))
+                {
+                    HomeScore4 = HomeScoreDictionary[SelectTechStats4];
+                }
+                else
+                {
+                    HomeScore4 = "0";
+                }
+
+
+            }
+            else if (index == 6)
+            {
+
+                //第六项
+
+                if (SelectTechStats5 != null && HomeScoreDictionary.ContainsKey(SelectTechStats5))
+                {
+                    HomeScore5 = HomeScoreDictionary[SelectTechStats5];
+                }
+                else
+                {
+                    HomeScore5 = "0";
+                }
+
+
+            }
+
+            else
+            {
+
+
+                //第一项
+
+                if (SelectTechStats != null && HomeScoreDictionary.ContainsKey(SelectTechStats))
+                {
+                    HomeScore = HomeScoreDictionary[SelectTechStats];
+                }
+                else
+                {
+                    HomeScore = "0";
+                }
+
+
+
+                //第二项
+
+                if (SelectTechStats1 != null && HomeScoreDictionary.ContainsKey(SelectTechStats1))
+                {
+                    HomeScore1 = HomeScoreDictionary[SelectTechStats1];
+                }
+                else
+                {
+                    HomeScore1 = "0";
+                }
+
+
+
+                //第三项
+
+                if (SelectTechStats2 != null && HomeScoreDictionary.ContainsKey(SelectTechStats2))
+                {
+                    HomeScore2 = HomeScoreDictionary[SelectTechStats2];
+                }
+                else
+                {
+                    HomeScore2 = "0";
+                }
+
+
+
+                //第四项
+
+                if (SelectTechStats3 != null && HomeScoreDictionary.ContainsKey(SelectTechStats3))
+                {
+                    HomeScore3 = HomeScoreDictionary[SelectTechStats3];
+                }
+                else
+                {
+                    HomeScore3 = "0";
+                }
+
+
+
+                //第五项
+
+                if (SelectTechStats4 != null && HomeScoreDictionary.ContainsKey(SelectTechStats4))
+                {
+                    HomeScore4 = HomeScoreDictionary[SelectTechStats4];
+                }
+                else
+                {
+                    HomeScore4 = "0";
+                }
+
+
+
+                //第六项
+
+                if (SelectTechStats5 != null && HomeScoreDictionary.ContainsKey(SelectTechStats5))
+                {
+                    HomeScore5 = HomeScoreDictionary[SelectTechStats5];
+                }
+                else
+                {
+                    HomeScore5 = "0";
+                }
+
+            }
+
+
+        }
+
+
+
+        /// <summary>
+        /// 设置客场信息
+        /// </summary>
+        /// <param name="teamStatsViewModel"></param>
+        public async void NewSetAData(int index)
+        {
+
+
+            //客队技术统计
+            string AfigureId = "";
+
+            if (APlayer == null) return;
+            if (APlayerData.ContainsKey(APlayer))
+            {
+                // ANums = APlayerData[APlayer].Item2;
+                AfigureId = APlayerData[APlayer].Item1;
+            }
+
+
+
+            if (!string.IsNullOrEmpty(AfigureId))
+            {
+
+                VisitScoreDictionary.Clear();
+
+                var singlePlayers = await JsonModel.PostSinglePlayerData_Path(AfigureId);
+
+                if (singlePlayers == null || singlePlayers.playerStat == null) return;
+
+                //homeNationTeam = singlePlayers.playerStat.nationName;
+
+                foreach (var player in singlePlayers.playerStat.statistics)
+                {
+                    if (!VisitScoreDictionary.ContainsKey(player.name))
+                    {
+                        VisitScoreDictionary.Add(player.name, player.value);
+                    }
+                }
+            }
+
+
+            if (VisitScoreDictionary.Count == 0) return;
+
+            if (index == 1)
+            {
+                //第一项
+                if (SelectTechStats!=null&&VisitScoreDictionary.ContainsKey(SelectTechStats))
+                {
+                    AwayScore = VisitScoreDictionary[SelectTechStats];
+                }
+                else
+                {
+                    AwayScore = "0";
+                }
+
+
+            }
+            else if (index == 2)
+            {
+                //第二项
+                if (SelectTechStats1!=null&&VisitScoreDictionary.ContainsKey(SelectTechStats1))
+                {
+                    AwayScore1 = VisitScoreDictionary[SelectTechStats1];
+                }
+                else
+                {
+                    AwayScore1 = "0";
+                }
+
+
+            }
+            else if (index == 3)
+            {
+
+                //第三项
+                if (SelectTechStats2!=null&&VisitScoreDictionary.ContainsKey(SelectTechStats2))
+                {
+                    AwayScore2 = VisitScoreDictionary[SelectTechStats2];
+                }
+                else
+                {
+                    AwayScore2 = "0";
+                }
+
+
+
+            }
+            else if (index == 4)
+            {
+                //第四项
+                if (SelectTechStats3!=null&&VisitScoreDictionary.ContainsKey(SelectTechStats3))
+                {
+                    AwayScore3 = VisitScoreDictionary[SelectTechStats3];
+                }
+                else
+                {
+                    AwayScore3 = "0";
+                }
+
+
+
+            }
+
+            else if (index == 5)
+            {
+                //第五项
+                if (SelectTechStats4!=null&&VisitScoreDictionary.ContainsKey(SelectTechStats4))
+                {
+                    AwayScore4 = VisitScoreDictionary[SelectTechStats4];
+                }
+                else
+                {
+                    AwayScore4 = "0";
+                }
+
+
+
+            }
+            else if (index == 6)
+            {
+
+
+                //第六项
+                if (SelectTechStats5!=null&&VisitScoreDictionary.ContainsKey(SelectTechStats5))
+                {
+                    //VisitScoreDictionary  VisitTeamCompareOptionDictionary
+                    AwayScore5 = VisitScoreDictionary[SelectTechStats5];
+                }
+                else
+                {
+                    AwayScore5 = "0";
+                }
+
+
+            }
+
+            else
+            {
+
+                //第一项
+                if (SelectTechStats!=null&&VisitScoreDictionary.ContainsKey(SelectTechStats))
+                {
+                    AwayScore = VisitScoreDictionary[SelectTechStats];
+                }
+                else
+                {
+                    AwayScore = "0";
+                }
+
+
+                //第二项
+                if (SelectTechStats1!=null&&VisitScoreDictionary.ContainsKey(SelectTechStats1))
+                {
+                    AwayScore1 = VisitScoreDictionary[SelectTechStats1];
+                }
+                else
+                {
+                    AwayScore1 = "0";
+                }
+
+
+
+                //第三项
+                if (SelectTechStats2!=null&&VisitScoreDictionary.ContainsKey(SelectTechStats2))
+                {
+                    AwayScore2 = VisitScoreDictionary[SelectTechStats2];
+                }
+                else
+                {
+                    AwayScore2 = "0";
+                }
+
+
+
+                //第四项
+                if (SelectTechStats3!=null&&VisitScoreDictionary.ContainsKey(SelectTechStats3))
+                {
+                    AwayScore3 = VisitScoreDictionary[SelectTechStats3];
+                }
+                else
+                {
+                    AwayScore3 = "0";
+                }
+
+
+
+                //第五项
+                if (SelectTechStats4!=null&&VisitScoreDictionary.ContainsKey(SelectTechStats4))
+                {
+                    AwayScore4 = VisitScoreDictionary[SelectTechStats4];
+                }
+                else
+                {
+                    AwayScore4 = "0";
+                }
+
+
+
+                //第六项
+                if (SelectTechStats5!=null&&VisitScoreDictionary.ContainsKey(SelectTechStats5))
+                {
+                    AwayScore5 = VisitScoreDictionary[SelectTechStats5];
+                }
+                else
+                {
+                    AwayScore5 = "0";
+                }
+
+
+
+
+
+
+            }
+        }
+
+
+
+        #region 第一项数据
+
+        /// <summary>
+        /// 是否高亮
+        /// </summary>
+
+        private bool isHeight;
+
+        public bool IsHeight
+        {
+            get { return isHeight; }
+            set { isHeight = value; this.RaisePropertyChanged(nameof(IsHeight)); }
+        }
+
+        /// <summary>
+        /// 是否显示
+        /// </summary>
+        private Visibility isCheckVisible;
+        public Visibility IsCheckVisible
+        {
+            get { return isCheckVisible; }
+            set { isCheckVisible = value; this.RaisePropertyChanged(nameof(IsCheckVisible)); }
+        }
+
+
+
+        /// <summary>
+        ///主队本场得分
+        /// </summary>
+        private string homeScore;
+
+        public string HomeScore
+        {
+            get { return homeScore; }
+            set { homeScore = value; this.RaisePropertyChanged(nameof(HomeScore)); }
+        }
+
+
+        /// <summary>
+        /// 主队本场得分是否可见
+        /// </summary>
+
+        public Visibility hScoreVisible;
+
+        public Visibility HScoreVisible
+        {
+            get { return hScoreVisible; }
+            set { hScoreVisible = value; this.RaisePropertyChanged(nameof(hScoreVisible)); }
+        }
+
+
+        /// <summary>
+        /// 赛季球员得分
+        /// </summary>
+
+        public string hSeasonScore;
+
+        public string HSeasonScore
+        {
+            get { return hSeasonScore; }
+            set { hSeasonScore = value; this.RaisePropertyChanged(nameof(HSeasonScore)); }
+        }
+
+
+        /// <summary>
+        /// 赛季球员是否可见
+        /// </summary>
+        private Visibility hSeasonScoreVisible;
+        public Visibility HSeasonScoreVisible
+        {
+            get { return hSeasonScoreVisible; }
+            set { hSeasonScoreVisible = value; this.RaisePropertyChanged(nameof(HSeasonScoreVisible)); }
+        }
+
+
+        /// <summary>
+        /// 技术统计
+        /// </summary>
+        private ObservableCollection<string> techStats = listTechStats;
+
+        public ObservableCollection<string> TechStats
+        {
+            get { return techStats; }
+            set { techStats = value; this.RaisePropertyChanged(nameof(TechStats)); }
+        }
+
+
+
+        /// <summary>
+        /// 选中的值
+        /// </summary>
+        private string selectTechStats = "进球助攻";
+
+        public string SelectTechStats
+        {
+            get { return selectTechStats; }
+            set
+            {
+                selectTechStats = value;
+                this.RaisePropertyChanged(nameof(SelectTechStats));
+
+                NewSetHData(1);
+                NewSetAData(1);
+            }
+        }
+
+
+        /// <summary>
+        /// 技术统计是否可见
+        /// </summary>
+        private Visibility techStatsVisible;
+
+
+        public Visibility TechStatsVisible
+        {
+            get { return techStatsVisible; }
+            set { techStatsVisible = value; this.RaisePropertyChanged(nameof(TechStatsVisible)); }
+        }
+
+
+        /// <summary>
+        /// 客队得分
+        /// </summary>
+
+        private string awayScore;
+
+        public string AwayScore
+        {
+            get { return awayScore; }
+            set { awayScore = value; this.RaisePropertyChanged(nameof(AwayScore)); }
+        }
+
+
+        /// <summary>
+        /// 客队得分是否可见
+        /// </summary>
+        private Visibility aScoreVisible;
+
+        public Visibility AScoreVisible
+        {
+            get { return aScoreVisible; }
+
+            set { aScoreVisible = value; this.RaisePropertyChanged(nameof(AScoreVisible)); }
+        }
+
+
+        /// <summary>
+        /// 客队赛季得分
+        /// </summary>
+        private string aSeasonScore;
+
+        public string ASeasonScore
+        {
+            get { return aSeasonScore; }
+
+            set { aSeasonScore = value; this.RaisePropertyChanged(nameof(ASeasonScore)); }
+        }
+
+
+        /// <summary>
+        /// 客队赛季得分是否可见
+        /// </summary>
+        private Visibility aSeasonScoreVisible;
+
+        public Visibility ASeasonScoreVisible
+        {
+            get { return aSeasonScoreVisible; }
+            set { aSeasonScoreVisible = value; this.RaisePropertyChanged(nameof(ASeasonScoreVisible)); }
+        }
+
+        #endregion
+
+
+        #region 第二项数据
+
+        /// <summary>
+        /// 是否高亮
+        /// </summary>
+
+        private bool isHeight1;
+
+        public bool IsHeight1
+        {
+            get { return isHeight1; }
+            set { isHeight1 = value; this.RaisePropertyChanged(nameof(IsHeight1)); }
+        }
+
+        /// <summary>
+        /// 是否显示
+        /// </summary>
+        private Visibility isCheckVisible1;
+        public Visibility IsCheckVisible1
+        {
+            get { return isCheckVisible1; }
+            set { isCheckVisible1 = value; this.RaisePropertyChanged(nameof(IsCheckVisible1)); }
+        }
+
+
+
+        /// <summary>
+        ///主队本场得分
+        /// </summary>
+        private string homeScore1;
+
+        public string HomeScore1
+        {
+            get { return homeScore1; }
+            set { homeScore1 = value; this.RaisePropertyChanged(nameof(HomeScore1)); }
+        }
+
+
+        /// <summary>
+        /// 主队本场得分是否可见
+        /// </summary>
+
+        public Visibility hScoreVisible1;
+
+        public Visibility HScoreVisible1
+        {
+            get { return hScoreVisible1; }
+            set { hScoreVisible1 = value; this.RaisePropertyChanged(nameof(hScoreVisible1)); }
+        }
+
+
+        /// <summary>
+        /// 赛季球员得分
+        /// </summary>
+
+        public string hSeasonScore1;
+
+        public string HSeasonScore1
+        {
+            get { return hSeasonScore1; }
+            set { hSeasonScore1 = value; this.RaisePropertyChanged(nameof(HSeasonScore1)); }
+        }
+
+
+        /// <summary>
+        /// 赛季球员是否可见
+        /// </summary>
+        private Visibility hSeasonScoreVisible1;
+        public Visibility HSeasonScoreVisible1
+        {
+            get { return hSeasonScoreVisible1; }
+            set { hSeasonScoreVisible1 = value; this.RaisePropertyChanged(nameof(HSeasonScoreVisible1)); }
+        }
+
+
+        /// <summary>
+        /// 技术统计
+        /// </summary>
+        private ObservableCollection<string> techStats1 = listTechStats;
+
+        public ObservableCollection<string> TechStats1
+        {
+            get { return techStats1; }
+            set { techStats1 = value; this.RaisePropertyChanged(nameof(TechStats1)); }
+        }
+
+
+
+        /// <summary>
+        /// 选中的值
+        /// </summary>
+        private string selectTechStats1 = "射门";
+
+        public string SelectTechStats1
+        {
+            get { return selectTechStats1; }
+            set
+            {
+                selectTechStats1 = value;
+                this.RaisePropertyChanged(nameof(SelectTechStats1));
+
+                NewSetHData(2);
+                NewSetAData(2);
+            }
+        }
+
+
+        /// <summary>
+        /// 技术统计是否可见
+        /// </summary>
+        private Visibility techStatsVisible1;
+
+
+        public Visibility TechStatsVisible1
+        {
+            get { return techStatsVisible1; }
+            set { techStatsVisible1 = value; this.RaisePropertyChanged(nameof(TechStatsVisible1)); }
+        }
+
+
+        /// <summary>
+        /// 客队得分
+        /// </summary>
+
+        private string awayScore1;
+
+        public string AwayScore1
+        {
+            get { return awayScore1; }
+            set { awayScore1 = value; this.RaisePropertyChanged(nameof(AwayScore1)); }
+        }
+
+
+        /// <summary>
+        /// 客队得分是否可见
+        /// </summary>
+        private Visibility aScoreVisible1;
+
+        public Visibility AScoreVisible1
+        {
+            get { return aScoreVisible1; }
+
+            set { aScoreVisible1 = value; this.RaisePropertyChanged(nameof(AScoreVisible1)); }
+        }
+
+
+        /// <summary>
+        /// 客队赛季得分
+        /// </summary>
+        private string aSeasonScore1;
+
+        public string ASeasonScore1
+        {
+            get { return aSeasonScore1; }
+
+            set { aSeasonScore1 = value; this.RaisePropertyChanged(nameof(ASeasonScore1)); }
+        }
+
+
+        /// <summary>
+        /// 客队赛季得分是否可见
+        /// </summary>
+        private Visibility aSeasonScoreVisible1;
+
+        public Visibility ASeasonScoreVisible1
+        {
+            get { return aSeasonScoreVisible1; }
+            set { aSeasonScoreVisible1 = value; this.RaisePropertyChanged(nameof(ASeasonScoreVisible1)); }
+        }
+
+        #endregion
+
+
+        #region 第三项数据
+
+        /// <summary>
+        /// 是否高亮
+        /// </summary>
+
+        private bool isHeight2;
+
+        public bool IsHeight2
+        {
+            get { return isHeight2; }
+            set { isHeight2 = value; this.RaisePropertyChanged(nameof(IsHeight2)); }
+        }
+
+        /// <summary>
+        /// 是否显示
+        /// </summary>
+        private Visibility isCheckVisible2;
+        public Visibility IsCheckVisible2
+        {
+            get { return isCheckVisible2; }
+            set { isCheckVisible2 = value; this.RaisePropertyChanged(nameof(IsCheckVisible2)); }
+        }
+
+
+
+        /// <summary>
+        ///主队本场得分
+        /// </summary>
+        private string homeScore2;
+
+        public string HomeScore2
+        {
+            get { return homeScore2; }
+            set { homeScore2 = value; this.RaisePropertyChanged(nameof(HomeScore2)); }
+        }
+
+
+        /// <summary>
+        /// 主队本场得分是否可见
+        /// </summary>
+
+        public Visibility hScoreVisible2;
+
+        public Visibility HScoreVisible2
+        {
+            get { return hScoreVisible2; }
+            set { hScoreVisible2 = value; this.RaisePropertyChanged(nameof(hScoreVisible2)); }
+        }
+
+
+        /// <summary>
+        /// 赛季球员得分
+        /// </summary>
+
+        public string hSeasonScore2;
+
+        public string HSeasonScore2
+        {
+            get { return hSeasonScore2; }
+            set { hSeasonScore2 = value; this.RaisePropertyChanged(nameof(HSeasonScore2)); }
+        }
+
+
+        /// <summary>
+        /// 赛季球员是否可见
+        /// </summary>
+        private Visibility hSeasonScoreVisible2;
+        public Visibility HSeasonScoreVisible2
+        {
+            get { return hSeasonScoreVisible2; }
+            set { hSeasonScoreVisible2 = value; this.RaisePropertyChanged(nameof(HSeasonScoreVisible2)); }
+        }
+
+
+        /// <summary>
+        /// 技术统计
+        /// </summary>
+        private ObservableCollection<string> techStats2 = listTechStats;
+
+        public ObservableCollection<string> TechStats2
+        {
+            get { return techStats2; }
+            set { techStats2 = value; this.RaisePropertyChanged(nameof(TechStats2)); }
+        }
+
+
+
+        /// <summary>
+        /// 选中的值
+        /// </summary>
+        private string selectTechStats2 = "传球成功";
+
+        public string SelectTechStats2
+        {
+            get { return selectTechStats2; }
+            set
+            {
+                selectTechStats2 = value;
+                this.RaisePropertyChanged(nameof(SelectTechStats2));
+
+                NewSetHData(3);
+                NewSetAData(3);
+            }
+        }
+
+
+        /// <summary>
+        /// 技术统计是否可见
+        /// </summary>
+        private Visibility techStatsVisible2;
+
+
+        public Visibility TechStatsVisible2
+        {
+            get { return techStatsVisible2; }
+            set { techStatsVisible2 = value; this.RaisePropertyChanged(nameof(TechStatsVisible2)); }
+        }
+
+
+        /// <summary>
+        /// 客队得分
+        /// </summary>
+
+        private string awayScore2;
+
+        public string AwayScore2
+        {
+            get { return awayScore2; }
+            set { awayScore2 = value; this.RaisePropertyChanged(nameof(AwayScore2)); }
+        }
+
+
+        /// <summary>
+        /// 客队得分是否可见
+        /// </summary>
+        private Visibility aScoreVisible2;
+
+        public Visibility AScoreVisible2
+        {
+            get { return aScoreVisible2; }
+
+            set { aScoreVisible2 = value; this.RaisePropertyChanged(nameof(AScoreVisible2)); }
+        }
+
+
+        /// <summary>
+        /// 客队赛季得分
+        /// </summary>
+        private string aSeasonScore2;
+
+        public string ASeasonScore2
+        {
+            get { return aSeasonScore2; }
+
+            set { aSeasonScore2 = value; this.RaisePropertyChanged(nameof(ASeasonScore2)); }
+        }
+
+
+        /// <summary>
+        /// 客队赛季得分是否可见
+        /// </summary>
+        private Visibility aSeasonScoreVisible2;
+
+        public Visibility ASeasonScoreVisible2
+        {
+            get { return aSeasonScoreVisible2; }
+            set { aSeasonScoreVisible2 = value; this.RaisePropertyChanged(nameof(ASeasonScoreVisible2)); }
+        }
+
+        #endregion
+
+
+        #region 第四项数据
+
+        /// <summary>
+        /// 是否高亮
+        /// </summary>
+
+        private bool isHeight3;
+
+        public bool IsHeight3
+        {
+            get { return isHeight3; }
+            set { isHeight3 = value; this.RaisePropertyChanged(nameof(IsHeight3)); }
+        }
+
+        /// <summary>
+        /// 是否显示
+        /// </summary>
+        private Visibility isCheckVisible3;
+        public Visibility IsCheckVisible3
+        {
+            get { return isCheckVisible3; }
+            set { isCheckVisible3 = value; this.RaisePropertyChanged(nameof(IsCheckVisible3)); }
+        }
+
+
+
+        /// <summary>
+        ///主队本场得分
+        /// </summary>
+        private string homeScore3;
+
+        public string HomeScore3
+        {
+            get { return homeScore3; }
+            set { homeScore3 = value; this.RaisePropertyChanged(nameof(HomeScore3)); }
+        }
+
+
+        /// <summary>
+        /// 主队本场得分是否可见
+        /// </summary>
+
+        public Visibility hScoreVisible3;
+
+        public Visibility HScoreVisible3
+        {
+            get { return hScoreVisible3; }
+            set { hScoreVisible3 = value; this.RaisePropertyChanged(nameof(hScoreVisible3)); }
+        }
+
+
+        /// <summary>
+        /// 赛季球员得分
+        /// </summary>
+
+        public string hSeasonScore3;
+
+        public string HSeasonScore3
+        {
+            get { return hSeasonScore3; }
+            set { hSeasonScore3 = value; this.RaisePropertyChanged(nameof(HSeasonScore3)); }
+        }
+
+
+        /// <summary>
+        /// 赛季球员是否可见
+        /// </summary>
+        private Visibility hSeasonScoreVisible3;
+        public Visibility HSeasonScoreVisible3
+        {
+            get { return hSeasonScoreVisible3; }
+            set { hSeasonScoreVisible3 = value; this.RaisePropertyChanged(nameof(HSeasonScoreVisible3)); }
+        }
+
+
+        /// <summary>
+        /// 技术统计
+        /// </summary>
+        private ObservableCollection<string> techStats3 = listTechStats;
+
+        public ObservableCollection<string> TechStats3
+        {
+            get { return techStats3; }
+            set { techStats3 = value; this.RaisePropertyChanged(nameof(TechStats3)); }
+        }
+
+
+
+        /// <summary>
+        /// 选中的值
+        /// </summary>
+        private string selectTechStats3 = "传球正确率";
+
+        public string SelectTechStats3
+        {
+            get { return selectTechStats3; }
+            set
+            {
+                selectTechStats3 = value;
+                this.RaisePropertyChanged(nameof(SelectTechStats3));
+
+                NewSetHData(4);
+                NewSetAData(4);
+            }
+        }
+
+
+        /// <summary>
+        /// 技术统计是否可见
+        /// </summary>
+        private Visibility techStatsVisible3;
+
+
+        public Visibility TechStatsVisible3
+        {
+            get { return techStatsVisible3; }
+            set { techStatsVisible3 = value; this.RaisePropertyChanged(nameof(TechStatsVisible3)); }
+        }
+
+
+        /// <summary>
+        /// 客队得分
+        /// </summary>
+
+        private string awayScore3;
+
+        public string AwayScore3
+        {
+            get { return awayScore3; }
+            set { awayScore3 = value; this.RaisePropertyChanged(nameof(AwayScore3)); }
+        }
+
+
+        /// <summary>
+        /// 客队得分是否可见
+        /// </summary>
+        private Visibility aScoreVisible3;
+
+        public Visibility AScoreVisible3
+        {
+            get { return aScoreVisible3; }
+
+            set { aScoreVisible3 = value; this.RaisePropertyChanged(nameof(AScoreVisible3)); }
+        }
+
+
+        /// <summary>
+        /// 客队赛季得分
+        /// </summary>
+        private string aSeasonScore3;
+
+        public string ASeasonScore3
+        {
+            get { return aSeasonScore3; }
+
+            set { aSeasonScore3 = value; this.RaisePropertyChanged(nameof(ASeasonScore3)); }
+        }
+
+
+        /// <summary>
+        /// 客队赛季得分是否可见
+        /// </summary>
+        private Visibility aSeasonScoreVisible3;
+
+        public Visibility ASeasonScoreVisible3
+        {
+            get { return aSeasonScoreVisible3; }
+            set { aSeasonScoreVisible3 = value; this.RaisePropertyChanged(nameof(ASeasonScoreVisible3)); }
+        }
+
+        #endregion
+
+
+        #region 第五项数据
+
+        /// <summary>
+        /// 是否高亮
+        /// </summary>
+
+        private bool isHeight4;
+
+        public bool IsHeight4
+        {
+            get { return isHeight4; }
+            set { isHeight4 = value; this.RaisePropertyChanged(nameof(IsHeight4)); }
+        }
+
+        /// <summary>
+        /// 是否显示
+        /// </summary>
+        private Visibility isCheckVisible4;
+        public Visibility IsCheckVisible4
+        {
+            get { return isCheckVisible4; }
+            set { isCheckVisible4 = value; this.RaisePropertyChanged(nameof(IsCheckVisible4)); }
+        }
+
+
+
+        /// <summary>
+        ///主队本场得分
+        /// </summary>
+        private string homeScore4;
+
+        public string HomeScore4
+        {
+            get { return homeScore4; }
+            set { homeScore4 = value; this.RaisePropertyChanged(nameof(HomeScore4)); }
+        }
+
+
+        /// <summary>
+        /// 主队本场得分是否可见
+        /// </summary>
+
+        public Visibility hScoreVisible4;
+
+        public Visibility HScoreVisible4
+        {
+            get { return hScoreVisible4; }
+            set { hScoreVisible4 = value; this.RaisePropertyChanged(nameof(hScoreVisible4)); }
+        }
+
+
+        /// <summary>
+        /// 赛季球员得分
+        /// </summary>
+
+        public string hSeasonScore4;
+
+        public string HSeasonScore4
+        {
+            get { return hSeasonScore4; }
+            set { hSeasonScore4 = value; this.RaisePropertyChanged(nameof(HSeasonScore4)); }
+        }
+
+
+        /// <summary>
+        /// 赛季球员是否可见
+        /// </summary>
+        private Visibility hSeasonScoreVisible4;
+        public Visibility HSeasonScoreVisible4
+        {
+            get { return hSeasonScoreVisible4; }
+            set { hSeasonScoreVisible4 = value; this.RaisePropertyChanged(nameof(HSeasonScoreVisible4)); }
+        }
+
+
+        /// <summary>
+        /// 技术统计
+        /// </summary>
+        private ObservableCollection<string> techStats4 = listTechStats;
+
+        public ObservableCollection<string> TechStats4
+        {
+            get { return techStats4; }
+            set { techStats4 = value; this.RaisePropertyChanged(nameof(TechStats4)); }
+        }
+
+
+
+        /// <summary>
+        /// 选中的值
+        /// </summary>
+        private string selectTechStats4 = "关键传球";
+
+        public string SelectTechStats4
+        {
+            get { return selectTechStats4; }
+            set
+            {
+                selectTechStats4 = value;
+                this.RaisePropertyChanged(nameof(SelectTechStats4));
+
+                NewSetHData(5);
+                NewSetAData(5);
+            }
+        }
+
+
+        /// <summary>
+        /// 技术统计是否可见
+        /// </summary>
+        private Visibility techStatsVisible4;
+
+
+        public Visibility TechStatsVisible4
+        {
+            get { return techStatsVisible4; }
+            set { techStatsVisible4 = value; this.RaisePropertyChanged(nameof(TechStatsVisible4)); }
+        }
+
+
+        /// <summary>
+        /// 客队得分
+        /// </summary>
+
+        private string awayScore4;
+
+        public string AwayScore4
+        {
+            get { return awayScore4; }
+            set { awayScore4 = value; this.RaisePropertyChanged(nameof(AwayScore4)); }
+        }
+
+
+        /// <summary>
+        /// 客队得分是否可见
+        /// </summary>
+        private Visibility aScoreVisible4;
+
+        public Visibility AScoreVisible4
+        {
+            get { return aScoreVisible4; }
+
+            set { aScoreVisible4 = value; this.RaisePropertyChanged(nameof(AScoreVisible4)); }
+        }
+
+
+        /// <summary>
+        /// 客队赛季得分
+        /// </summary>
+        private string aSeasonScore4;
+
+        public string ASeasonScore4
+        {
+            get { return aSeasonScore4; }
+
+            set { aSeasonScore4 = value; this.RaisePropertyChanged(nameof(ASeasonScore4)); }
+        }
+
+
+        /// <summary>
+        /// 客队赛季得分是否可见
+        /// </summary>
+        private Visibility aSeasonScoreVisible4;
+
+        public Visibility ASeasonScoreVisible4
+        {
+            get { return aSeasonScoreVisible4; }
+            set { aSeasonScoreVisible4 = value; this.RaisePropertyChanged(nameof(ASeasonScoreVisible4)); }
+        }
+
+        #endregion
+
+
+        #region 第六项数据
+
+        /// <summary>
+        /// 是否高亮
+        /// </summary>
+
+        private bool isHeight5;
+
+        public bool IsHeight5
+        {
+            get { return isHeight5; }
+            set { isHeight5 = value; this.RaisePropertyChanged(nameof(IsHeight5)); }
+        }
+
+        /// <summary>
+        /// 是否显示
+        /// </summary>
+        private Visibility isCheckVisible5;
+        public Visibility IsCheckVisible5
+        {
+            get { return isCheckVisible5; }
+            set { isCheckVisible5 = value; this.RaisePropertyChanged(nameof(IsCheckVisible5)); }
+        }
+
+
+
+        /// <summary>
+        ///主队本场得分
+        /// </summary>
+        private string homeScore5;
+
+        public string HomeScore5
+        {
+            get { return homeScore5; }
+            set { homeScore5 = value; this.RaisePropertyChanged(nameof(HomeScore5)); }
+        }
+
+
+        /// <summary>
+        /// 主队本场得分是否可见
+        /// </summary>
+
+        public Visibility hScoreVisible5;
+
+        public Visibility HScoreVisible5
+        {
+            get { return hScoreVisible5; }
+            set { hScoreVisible5 = value; this.RaisePropertyChanged(nameof(hScoreVisible5)); }
+        }
+
+
+        /// <summary>
+        /// 赛季球员得分
+        /// </summary>
+
+        public string hSeasonScore5;
+
+        public string HSeasonScore5
+        {
+            get { return hSeasonScore5; }
+            set { hSeasonScore5 = value; this.RaisePropertyChanged(nameof(HSeasonScore5)); }
+        }
+
+
+        /// <summary>
+        /// 赛季球员是否可见
+        /// </summary>
+        private Visibility hSeasonScoreVisible5;
+        public Visibility HSeasonScoreVisible5
+        {
+            get { return hSeasonScoreVisible5; }
+            set { hSeasonScoreVisible5 = value; this.RaisePropertyChanged(nameof(HSeasonScoreVisible5)); }
+        }
+
+
+        /// <summary>
+        /// 技术统计
+        /// </summary>
+        private ObservableCollection<string> techStats5 = listTechStats;
+
+        public ObservableCollection<string> TechStats5
+        {
+            get { return techStats5; }
+            set { techStats5 = value; this.RaisePropertyChanged(nameof(TechStats5)); }
+        }
+
+
+
+        /// <summary>
+        /// 选中的值
+        /// </summary>
+        private string selectTechStats5 = "拦截";
+
+        public string SelectTechStats5
+        {
+            get { return selectTechStats5; }
+            set
+            {
+                selectTechStats5 = value;
+                this.RaisePropertyChanged(nameof(SelectTechStats5));
+
+                NewSetHData(6);
+                NewSetAData(6);
+            }
+        }
+
+
+        /// <summary>
+        /// 技术统计是否可见
+        /// </summary>
+        private Visibility techStatsVisible5;
+
+
+        public Visibility TechStatsVisible5
+        {
+            get { return techStatsVisible5; }
+            set { techStatsVisible5 = value; this.RaisePropertyChanged(nameof(TechStatsVisible5)); }
+        }
+
+
+        /// <summary>
+        /// 客队得分
+        /// </summary>
+
+        private string awayScore5;
+
+        public string AwayScore5
+        {
+            get { return awayScore5; }
+            set { awayScore5 = value; this.RaisePropertyChanged(nameof(AwayScore5)); }
+        }
+
+
+        /// <summary>
+        /// 客队得分是否可见
+        /// </summary>
+        private Visibility aScoreVisible5;
+
+        public Visibility AScoreVisible5
+        {
+            get { return aScoreVisible5; }
+
+            set { aScoreVisible5 = value; this.RaisePropertyChanged(nameof(AScoreVisible5)); }
+        }
+
+
+        /// <summary>
+        /// 客队赛季得分
+        /// </summary>
+        private string aSeasonScore5;
+
+        public string ASeasonScore5
+        {
+            get { return aSeasonScore5; }
+
+            set { aSeasonScore5 = value; this.RaisePropertyChanged(nameof(ASeasonScore5)); }
+        }
+
+
+        /// <summary>
+        /// 客队赛季得分是否可见
+        /// </summary>
+        private Visibility aSeasonScoreVisible5;
+
+        public Visibility ASeasonScoreVisible5
+        {
+            get { return aSeasonScoreVisible5; }
+            set { aSeasonScoreVisible5 = value; this.RaisePropertyChanged(nameof(ASeasonScoreVisible5)); }
+        }
+
+        #endregion
+
+
+
+    }
+}

VIZ.TVP.WMCUP.Module/FDayMatchResult/ViewModel/FDayMatchResultViewModel.cs

@@ -365,25 +365,29 @@ namespace VIZ.TVP.WMCUP.Module
 
                     data += "*";
 
-                    //if (string.IsNullOrEmpty(tempMatchData.homeTeamScore) && string.IsNullOrEmpty(tempMatchData.visitingTeamScore))
-                    //{
-
-                    //    data += "vs";
-                    //}
-                    //else
-                    //{
-
-                    if(string.IsNullOrEmpty(tempMatchData.homeTeamScore))
+                    if (string.IsNullOrEmpty(tempMatchData.homeTeamScore) && string.IsNullOrEmpty(tempMatchData.visitingTeamScore))
                     {
-                        tempMatchData.homeTeamScore = "0";
-                    }
 
-                    if(string.IsNullOrEmpty(tempMatchData.visitingTeamScore))
+                        data += "vs";
+                    }
+                    else
                     {
-                        tempMatchData.visitingTeamScore = "0";
+
+                        //if (string.IsNullOrEmpty(tempMatchData.homeTeamScore))
+                        //{
+                        //    tempMatchData.homeTeamScore = "0";
+                        //}
+
+                        //if (string.IsNullOrEmpty(tempMatchData.visitingTeamScore))
+                        //{
+                        //    tempMatchData.visitingTeamScore = "0";
+                        //}
+
+                        data += string.Format("{0}:{1}", tempMatchData.homeTeamScore, tempMatchData.visitingTeamScore);
+
                     }
 
-                    data += string.Format("{0}:{1}", tempMatchData.homeTeamScore, tempMatchData.visitingTeamScore);
+                    //data += string.Format("{0}:{1}", tempMatchData.homeTeamScore, tempMatchData.visitingTeamScore);
          
 
 

VIZ.TVP.WMCUP.Module/FSinglePlayer/FSinglePlayerViewPlugin.cs

+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
+{
+    public class FSinglePlayerViewPlugin : IPluginLifeCycle
+    {
+        /// <summary>
+        /// 插件ID
+        /// </summary>
+        /// <remarks>
+        /// 插件ID不能包含点号
+        /// </remarks>
+        public const string PLUGIN_ID = "FSinglePlayerView";
+
+        /// <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.Page;
+            info.ViewType = typeof(FSinglePlayerView);
+
+            //info.SettingViewType = typeof(DayMatchUI);
+
+            return info;
+        }
+    }
+}

VIZ.TVP.WMCUP.Module/FSinglePlayer/Model/MatchTeamPlayer.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VIZ.TVP.WMCUP.Module 
+{
+    public class MatchTeamPlayer
+    {
+
+       /// <summary>
+       /// 球员figureId
+       /// </summary>
+        public string figureId { get; set; }
+
+        /// <summary>
+        /// 队伍teamId
+        /// </summary>
+        public string teamId { get; set; }
+
+        /// <summary>
+        /// 球员名称
+        /// </summary>
+        public string figureName { get; set; }
+
+        /// <summary>
+        /// 球员球衣号
+        /// </summary>
+        public string playerNum { get; set; }
+
+        /// <summary>
+        /// 最后更新时间
+        /// </summary>
+        public string LastPushDataDateTime { get; set; }
+
+        /// <summary>
+        /// 人物角色 1 首发 2 替补 3 教练 
+        /// </summary>
+        public string role { get; set; }
+    }
+}

VIZ.TVP.WMCUP.Module/FSinglePlayer/Model/SinglePlayer.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VIZ.TVP.WMCUP.Module
+{
+    public class SinglePlayer
+    {
+
+        /// <summary>
+        /// 球员名称
+        /// </summary>
+        public string figureName { get; set; }
+
+        /// <summary>
+        /// 队伍Id
+        /// </summary>
+        public string teamId { get; set; }
+
+        /// <summary>
+        /// 队伍名称
+        /// </summary>
+        public string teamName { get; set; }
+
+        /// <summary>
+        /// 国家名称即是国旗
+        /// </summary>
+        public string nationName { get; set; }
+        /// <summary>
+        /// 数据统计
+        /// </summary>
+        public List<statistic> statistics { get; set; }
+    }
+}

VIZ.TVP.WMCUP.Module/FSinglePlayer/Model/SinglePlayers.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VIZ.TVP.WMCUP.Module
+{
+    public class SinglePlayers
+    {
+        public string LastPushDataDateTime { get; set; }
+
+        /// <summary>
+        /// 球员统计信息
+        /// </summary>
+        public SinglePlayer playerStat { get; set; }
+    }
+}

VIZ.TVP.WMCUP.Module/FSinglePlayer/Model/SingleTeamPlayers.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VIZ.TVP.WMCUP.Module
+{
+    public class SingleTeamPlayers
+    {
+        /// <summary>
+        /// 最后更新时间
+        /// </summary>
+        public string LastPushDataDateTime { get; set; }
+
+        /// <summary>
+        /// 球员相关信息
+        /// </summary>
+        public List<MatchTeamPlayer> matchTeamPlayers { get; set; }
+    }
+}

VIZ.TVP.WMCUP.Module/FSinglePlayer/View/FSinglePlayerView.xaml

+<UserControl x:Class="VIZ.TVP.WMCUP.Module.FSinglePlayerView"
+             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:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
+             xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
+             xmlns:local="clr-namespace:VIZ.TVP.WMCUP.Module"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+        <ScrollViewer HorizontalScrollBarVisibility="Disabled"
+                      VerticalScrollBarVisibility="Auto"
+                      Name="PART_Options"
+                      DockPanel.Dock="Right"
+                      dx:ScrollBarExtensions.ScrollBarMode="TouchOverlap"
+                      Focusable="False">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="197*"/>
+                </Grid.ColumnDefinitions>
+
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="60"/>
+                    <RowDefinition Height="40"/>
+                    <RowDefinition Height="*"/>
+                </Grid.RowDefinitions>
+
+                <WrapPanel Grid.Row="1"   VerticalAlignment="Center" HorizontalAlignment="Left" Width="760" >
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="75"/>
+                            <ColumnDefinition Width="140"/>
+                            <ColumnDefinition Width="50"/>
+                            <ColumnDefinition Width="140"/>
+                            <ColumnDefinition Width="50"/>
+                            <ColumnDefinition Width="60"/>
+                            <ColumnDefinition Width="100"/>
+                            
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock Grid.Column="0" Text="球队："  FontSize="16"  VerticalAlignment="Center" HorizontalAlignment="Right"/>
+
+                        <dxe:ComboBoxEdit  Grid.Column="1"  Name="com_TeamItem" Width="135"  HorizontalAlignment="Left" VerticalAlignment="Center" 
+                          ItemsSource="{Binding Path=TeamItems,Mode=TwoWay}" SelectedItem="{Binding Path=SelectTeamItem,Mode=TwoWay}" SelectedIndex="{Binding SelectedIndex}"
+                          FontSize="16">
+                        </dxe:ComboBoxEdit>
+
+                        <TextBlock Text="球员：" Grid.Column="2"  VerticalAlignment="Center" HorizontalAlignment="Right"  FontSize="16" />
+
+                        <dxe:ComboBoxEdit  Grid.Column="3" x:Name="com_players" 
+                          HorizontalAlignment="Left" VerticalAlignment="Center" Width="135"
+                          ItemsSource="{Binding Path=PlayerItems,Mode=TwoWay}"
+                          SelectedItem="{Binding Path=SelectPlayer,Mode=TwoWay}"  FontSize="16" />
+
+                        <!--<TextBlock Text="球衣号：" Grid.Column="4"  VerticalAlignment="Center" HorizontalAlignment="Right"  FontSize="16" />
+
+                        <dxe:TextEdit Text="{Binding PlayNum,Mode=TwoWay}" Grid.Column="5"  VerticalAlignment="Center" HorizontalAlignment="Right"  FontSize="16" Width="50" ></dxe:TextEdit>-->
+
+
+                        <!--<TextBlock Grid.Column="0" Text="球队："  FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                        --><!--<dxe:TextEdit  Grid.Column="1" Width="120"  FontSize="16"   HorizontalContentAlignment="Center" 
+                          VerticalAlignment="Center"  Text="{Binding Title,Mode=TwoWay }"   />--><!--
+
+                        <dxe:TextEdit Text="{Binding HomeTeam}" Grid.Column="2" Width="120" HorizontalAlignment="Center" VerticalAlignment="Center"  FontSize="16"/>-->
+
+                        <!--<TextBlock  TextBlock.TextAlignment="Center" Text="VS" Width="60" Grid.Column="3"  FontSize="16"  HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        <dxe:TextEdit Text="{Binding AwayTeam}"  Grid.Column="4" Width="120"  FontSize="16"  HorizontalAlignment="Center" VerticalAlignment="Center"/>-->
+
+
+                        <TextBlock  Grid.Column="5" TextBlock.TextAlignment="Center" Text="项数:" Width="45"  FontSize="16"   HorizontalAlignment="Right" VerticalAlignment="Center" />
+                        <dxe:ComboBoxEdit  Grid.Column="6" x:Name="com_matchStatsId"  HorizontalAlignment="Center" VerticalAlignment="Center" Width="80" FontSize="16" 
+                          ItemsSource="{Binding Path=MatchStatsIds,Mode=TwoWay}"
+                          SelectedItem="{Binding Path=MatchStatsId,Mode=TwoWay}" >
+                        </dxe:ComboBoxEdit>
+
+                    </Grid>
+                </WrapPanel>
+
+                <WrapPanel   VerticalAlignment="Center" HorizontalAlignment="Left"  Width="760" Grid.ColumnSpan="2">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="75"/>
+                            <ColumnDefinition Width="175"/>
+                            <ColumnDefinition Width="130"/>
+                            <ColumnDefinition Width="130"/>
+                            <ColumnDefinition Width="110"/>
+                            <ColumnDefinition Width="130"/>
+
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock Grid.Column="0" Text="标题："  FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                        <dxe:TextEdit  Grid.Column="1" Width="170"  FontSize="16"  HorizontalAlignment="Left"  HorizontalContentAlignment="Left" 
+                          VerticalAlignment="Center"  Text="{Binding Title,Mode=TwoWay }"   />
+
+                        <!--<Button Content="刷新" Command="{Binding BtnCommand}" HorizontalContentAlignment="Center"  
+                              Grid.Column="5" Width="95" Height="30"  FontSize="14"/>-->
+
+
+
+
+                        <WrapPanel Grid.Row="0" Grid.Column="5" HorizontalAlignment="Center" VerticalAlignment="Center">
+
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="100"/>
+                                    <ColumnDefinition Width="30"/>
+                                </Grid.ColumnDefinitions>
+
+                                <dx:SimpleButton  Grid.Row="0" Grid.Column="0" Content="刷新"  Glyph='/VIZ.TVP.WMCUP.Module;component/Image/FT/refresh2525.png' FontSize="16" 
+                                          Command="{Binding BtnCommand}" HorizontalContentAlignment="Center" Width="90" Height="30" />
+
+                                <dx:SimpleButton  Grid.Row="0" Grid.Column="1" Glyph='/VIZ.TVP.WMCUP.Module;component/Image/FT/Prompt2525.png' FontSize="16" 
+                                          Command="{Binding PromptCommand}" HorizontalContentAlignment="Center"  Width="30" Height="30"  />
+                            </Grid>
+                        </WrapPanel>
+
+
+                    </Grid>
+                </WrapPanel>
+
+                <WrapPanel Grid.Row="2" HorizontalAlignment="Left" VerticalAlignment="Center"  Width="760" Grid.ColumnSpan="2">
+
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="34"/>
+                            <RowDefinition Height="34"/>
+                            <RowDefinition Height="34"/>
+                            <RowDefinition Height="34"/>
+                            <RowDefinition Height="34"/>
+                            <RowDefinition Height="34"/>
+                            <RowDefinition Height="34"/>
+                            <RowDefinition Height="34"/>
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="100"/>
+                            <ColumnDefinition Width="120"/>
+                            <ColumnDefinition Width="100"/>
+                            <ColumnDefinition Width="127"/>
+                            <ColumnDefinition Width="115"/>
+                            <ColumnDefinition Width="115"/>
+                        </Grid.ColumnDefinitions>
+
+                        <!--<TextBlock Grid.Row="0" Grid.Column="1" Text="主队得分" FontSize="12" HorizontalAlignment="Center" VerticalAlignment="Center"/>-->
+
+
+
+                        <dxe:ImageEdit  Grid.Row="1"  Grid.ColumnSpan="3" Grid.RowSpan="5" Height="160" Width="120" x:Name="HPlayer_Logo" ShowMenu="False" EditValue="{Binding Path=PlayerLogo}"  
+                               ShowLoadDialogOnClickMode="Never" Margin="5,5,5,5"/>
+
+
+                        <TextBlock Grid.Row="0" Grid.Column="4" Text="客队得分" FontSize="12" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+
+
+                        <!--第一项-->
+
+                        <!--<dxe:TextEdit Grid.Row="1" Grid.Column="1"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HomeScore,Mode=TwoWay }"  Visibility="{Binding HScoreVisible,Mode=TwoWay}"/>-->
+
+                        <dxe:ComboBoxEdit  Grid.Row="1" Grid.Column="3" x:Name="com_techStats" HorizontalAlignment="Center" VerticalAlignment="Center" Width="120" FontSize="16"
+                          ItemsSource="{Binding Path=TechStats,Mode=TwoWay}"
+                          SelectedItem="{Binding Path=SelectTechStats,Mode=TwoWay}" Visibility="{Binding TechStatsVisible,Mode=TwoWay}">
+                        </dxe:ComboBoxEdit>
+                        <dxe:TextEdit Grid.Row="1" Grid.Column="4"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding AwayScore,Mode=TwoWay }" Visibility="{Binding AScoreVisible,Mode=TwoWay}" />
+
+                        <!--第二项-->
+
+                        <!--<dxe:TextEdit Grid.Row="2" Grid.Column="1"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HomeScore1,Mode=TwoWay }"  Visibility="{Binding HScoreVisible1,Mode=TwoWay}"/>-->
+                        <!--<dxe:TextEdit Grid.Row="2" Grid.Column="2"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HSeasonScore1,Mode=TwoWay }"  Visibility="{Binding HSeasonScoreVisible1,Mode=TwoWay}"/>-->
+                        <dxe:ComboBoxEdit  Grid.Row="2" Grid.Column="3" x:Name="com_techStats1" HorizontalAlignment="Center" VerticalAlignment="Center" Width="120" FontSize="16"
+                          ItemsSource="{Binding Path=TechStats1,Mode=TwoWay}"
+                          SelectedItem="{Binding Path=SelectTechStats1,Mode=TwoWay}" Visibility="{Binding TechStatsVisible,Mode=TwoWay}">
+                        </dxe:ComboBoxEdit>
+                        <dxe:TextEdit Grid.Row="2" Grid.Column="4"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding AwayScore1,Mode=TwoWay }" Visibility="{Binding AScoreVisible1,Mode=TwoWay}" />
+                        <!--<dxe:TextEdit Grid.Row="2" Grid.Column="5"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding ASeasonScore1,Mode=TwoWay }" Visibility="{Binding ASeasonScoreVisible1}" />-->
+
+
+                        <!--第三项-->
+
+
+                        <!--<dxe:TextEdit Grid.Row="3" Grid.Column="1"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HomeScore2,Mode=TwoWay }"  Visibility="{Binding HScoreVisible2,Mode=TwoWay}"/>-->
+
+                        <!--<dxe:TextEdit Grid.Row="3" Grid.Column="2"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HSeasonScore2,Mode=TwoWay }"  Visibility="{Binding HSeasonScoreVisible12,Mode=TwoWay}"/>-->
+
+                        <dxe:ComboBoxEdit  Grid.Row="3" Grid.Column="3" x:Name="com_techStats2" HorizontalAlignment="Center" VerticalAlignment="Center" Width="120" FontSize="16"
+                          ItemsSource="{Binding Path=TechStats2,Mode=TwoWay}"
+                          SelectedItem="{Binding Path=SelectTechStats2,Mode=TwoWay}" Visibility="{Binding TechStatsVisible2,Mode=TwoWay}">
+                        </dxe:ComboBoxEdit>
+
+                        <dxe:TextEdit Grid.Row="3" Grid.Column="4"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding AwayScore2,Mode=TwoWay }" Visibility="{Binding AScoreVisible2,Mode=TwoWay}" />
+
+                        <!--<dxe:TextEdit Grid.Row="3" Grid.Column="5"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding ASeasonScore2,Mode=TwoWay }" Visibility="{Binding ASeasonScoreVisible2}" />-->
+
+
+
+
+                        <!--第四项-->
+
+
+                        <!--<dxe:TextEdit Grid.Row="4" Grid.Column="1"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HomeScore3,Mode=TwoWay }"  Visibility="{Binding HScoreVisible3,Mode=TwoWay}"/>-->
+
+                        <!--<dxe:TextEdit Grid.Row="4" Grid.Column="2"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HSeasonScore3,Mode=TwoWay }"  Visibility="{Binding HSeasonScoreVisible13,Mode=TwoWay}"/>-->
+
+                        <dxe:ComboBoxEdit  Grid.Row="4" Grid.Column="3" x:Name="com_techStats3" HorizontalAlignment="Center" VerticalAlignment="Center" Width="120" FontSize="16"
+                          ItemsSource="{Binding Path=TechStats3,Mode=TwoWay}"
+                          SelectedItem="{Binding Path=SelectTechStats3,Mode=TwoWay}" Visibility="{Binding TechStatsVisible3,Mode=TwoWay}">
+                        </dxe:ComboBoxEdit>
+
+                        <dxe:TextEdit Grid.Row="4" Grid.Column="4"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding AwayScore3,Mode=TwoWay }" Visibility="{Binding AScoreVisible3,Mode=TwoWay}" />
+
+                        <!--<dxe:TextEdit Grid.Row="4" Grid.Column="5"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding ASeasonScore3,Mode=TwoWay }" Visibility="{Binding ASeasonScoreVisible3}" />-->
+
+
+
+                        <!--第五项-->
+
+
+                        <!--<dxe:TextEdit Grid.Row="5" Grid.Column="1"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HomeScore4,Mode=TwoWay }"  Visibility="{Binding HScoreVisible4,Mode=TwoWay}"/>-->
+
+                        <!--<dxe:TextEdit Grid.Row="5" Grid.Column="2"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HSeasonScore4,Mode=TwoWay }"  Visibility="{Binding HSeasonScoreVisible14,Mode=TwoWay}"/>-->
+
+                        <dxe:ComboBoxEdit  Grid.Row="5" Grid.Column="3" x:Name="com_techStats4" HorizontalAlignment="Center" VerticalAlignment="Center" Width="120" FontSize="16"
+                          ItemsSource="{Binding Path=TechStats4,Mode=TwoWay}"
+                          SelectedItem="{Binding Path=SelectTechStats4,Mode=TwoWay}" Visibility="{Binding TechStatsVisible4,Mode=TwoWay}">
+                        </dxe:ComboBoxEdit>
+
+                        <dxe:TextEdit Grid.Row="5" Grid.Column="4"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding AwayScore4,Mode=TwoWay }" Visibility="{Binding AScoreVisible4,Mode=TwoWay}" />
+
+                        <!--<dxe:TextEdit Grid.Row="5" Grid.Column="5"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding ASeasonScore4,Mode=TwoWay }" Visibility="{Binding ASeasonScoreVisible4}" />-->
+
+
+
+                        <!--第六项-->
+
+
+                        <!--<dxe:TextEdit Grid.Row="6" Grid.Column="1"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HomeScore5,Mode=TwoWay }"  Visibility="{Binding HScoreVisible5,Mode=TwoWay}"/>-->
+
+                        <!--<dxe:TextEdit Grid.Row="6" Grid.Column="2"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding HSeasonScore5,Mode=TwoWay }"  Visibility="{Binding HSeasonScoreVisible5,Mode=TwoWay}"/>-->
+
+                        <dxe:ComboBoxEdit  Grid.Row="6" Grid.Column="3" x:Name="com_techStats5" HorizontalAlignment="Center" VerticalAlignment="Center" Width="120" FontSize="16"
+                          ItemsSource="{Binding Path=TechStats5,Mode=TwoWay}"
+                          SelectedItem="{Binding Path=SelectTechStats5,Mode=TwoWay}" Visibility="{Binding TechStatsVisible5,Mode=TwoWay}">
+                        </dxe:ComboBoxEdit>
+
+                        <dxe:TextEdit Grid.Row="6" Grid.Column="4"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding AwayScore5,Mode=TwoWay }" Visibility="{Binding AScoreVisible5,Mode=TwoWay}" />
+
+                        <TextBlock Text="球号" Grid.Row="6" Width="30" HorizontalAlignment="Left" VerticalAlignment="Center"/>
+                        <dxe:TextEdit Grid.Row="6" Text="{Binding PlayerNum,Mode=TwoWay}" Width="50" HorizontalAlignment="Right"/>
+
+                        <dxe:TextEdit Grid.Row="6" Grid.Column="1" Text="{Binding PlayerName,Mode=TwoWay}" Width="100" HorizontalAlignment="Center"/>
+
+
+                        <dx:SimpleButton  Grid.Row="6" Grid.Column="2" Content="选择图片"  FontSize="16" 
+                                          Command="{Binding ChooseImageCmd}" HorizontalContentAlignment="Center" Width="90" Height="30" />
+
+
+
+                        <!--<dxe:TextEdit Grid.Row="6" Grid.Column="5"   Width="110" 
+                         FontSize="16"   HorizontalContentAlignment="Center" 
+                         HorizontalAlignment="Center" VerticalAlignment="Center"  Text="{Binding ASeasonScore5,Mode=TwoWay }" Visibility="{Binding ASeasonScoreVisible5}" />-->
+
+
+                    </Grid>
+
+                </WrapPanel>
+            </Grid>
+        </ScrollViewer>
+
+    </Grid>
+</UserControl>
\ No newline at end of file

VIZ.TVP.WMCUP.Module/FSinglePlayer/View/FSinglePlayerView.xaml.cs

+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>
+    /// FSinglePlayerView.xaml 的交互逻辑
+    /// </summary>
+    public partial class FSinglePlayerView : UserControl, IPluginView
+    {
+
+        FSinglePlayerViewModel vm = new FSinglePlayerViewModel();
+
+        private static ILog Log = LogManager.GetLogger(typeof(FSinglePlayerViewModel));
+
+
+
+        /// <summary>
+        /// 操作日志服务
+        /// </summary>
+        private RecordLogService recordLogService = new RecordLogService();
+
+        public FSinglePlayerView()
+        {
+            InitializeComponent();
+
+            WPFHelper.BindingViewModel(this, vm);
+            FSinglePlayerViewModel.FSinglePlayerInstance.Add(vm);
+
+
+            this.Loaded += NewSinglePlayerView_Loaded;
+            this.IsVisibleChanged += NewSinglePlayerView_IsVisibleChanged;
+
+
+        }
+
+
+        private void NewSinglePlayerView_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
+        {
+            if (!string.IsNullOrEmpty(vm.homeTeamId) && !string.IsNullOrEmpty(vm.visitTeamId))
+            {
+                vm.SetTeamData();
+            }
+        }
+
+        private void NewSinglePlayerView_Loaded(object sender, RoutedEventArgs e)
+        {
+            var service = ApplicationDomainEx.ServiceManager.GetService<IPluginService>(ViewServiceKeys.PLUGIN_SERVICE);
+            if (service == null)
+                return;
+            vm.page = service.GetPageModelFromView(this);
+
+        }
+
+        public void Dispose()
+        {
+
+        }
+
+        public void PreviewContinue(ConnModel conn)
+        {
+
+        }
+
+        public void PreviewIn(ConnModel conn)
+        {
+            this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, RecordLogConstants.OPERATE_PREVIEW_PLAY);
+            if (conn.IsConnected)
+            {
+                conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "Data", vm.CombineTeamComData()));
+                Log.Info("已经发送命令===>" + vm.CombineTeamComData());
+                
+            }
+        }
+
+        public void PreviewOut(ConnModel conn)
+        {
+            //if(conn.IsConnected)
+            // {
+            //     conn.EndpointManager.Send(VizEngineCommands.STAGE_CONTINUE);
+            // }
+        }
+
+        public void TakeContinue(ConnModel conns)
+        {
+
+        }
+
+        public void TakeOut(ConnModel conns)
+        {
+            this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, RecordLogConstants.OPERATE_TAKE_OUT);
+            if (conns.IsConnected)
+            {
+                conns.EndpointManager.Send(VizEngineCommands.STAGE_CONTINUE);
+            }
+        }
+
+        public void TakeUpdate(ConnModel conns)
+        {
+            this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, RecordLogConstants.OPERATE_TAKE_UPDATE);
+            if (conns.IsConnected)
+            {
+                conns.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "Data", vm.CombineTeamComData()));
+            }
+        }
+
+        public void TakIn(ConnModel conns)
+        {
+            this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, RecordLogConstants.OPERATE_TAKE_TAKE);
+            if (conns.IsConnected)
+            {
+                conns.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "Data", vm.CombineTeamComData()));
+            }
+        }
+
+
+      
+     
+
+        public void PageOpend(ConnModel conn, PageModel page)
+        {
+            if (conn.IsConnected)
+            {
+                conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "Data", vm.CombineTeamComData()));
+            }
+        }
+
+        public void PreviewUpdate(ConnModel conn)
+        {
+            this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, RecordLogConstants.OPERATE_PREVIEW_UPDATE);
+            if (conn.IsConnected)
+            {
+                conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "Data", vm.CombineTeamComData()));
+            }
+        }
+
+
+
+
+
+
+    }
+}

VIZ.TVP.WMCUP.Module/FTeamHistoryCompare/View/FTeamHistoryCompareView.xaml.cs

@@ -22,7 +22,7 @@ namespace VIZ.TVP.WMCUP.Module
     /// <summary>
     /// FTeamHistoryCompareView.xaml 的交互逻辑
     /// </summary>
-    public partial class FTeamHistoryCompareView : UserControl
+    public partial class FTeamHistoryCompareView : UserControl, IPluginView
     {
 
         public FTeamHistoryCompareViewModel vm = new FTeamHistoryCompareViewModel();
@@ -53,6 +53,7 @@ namespace VIZ.TVP.WMCUP.Module
         {
             if (conn.IsConnected && vm.teamHomeStats != null)
             {
+                vm.SetTeamData();
                 conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "Data", vm.CombineTeamComData()));
             }
         }
@@ -66,7 +67,7 @@ namespace VIZ.TVP.WMCUP.Module
         {
             this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, RecordLogConstants.OPERATE_PREVIEW_PLAY);
 
-            if (conn.IsConnected && vm.teamHomeStats != null)
+            if (conn.IsConnected && vm.teamHomeStats != null)//
             {
                 conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "Data", vm.CombineTeamComData()));
             }
@@ -81,7 +82,7 @@ namespace VIZ.TVP.WMCUP.Module
         public void PreviewUpdate(ConnModel conn)
         {
             this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, RecordLogConstants.OPERATE_PREVIEW_UPDATE);
-            if (conn.IsConnected && vm.teamHomeStats != null)
+            if (conn.IsConnected && vm.teamHomeStats != null)//
             {
                 conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "Data", vm.CombineTeamComData()));
             }

VIZ.TVP.WMCUP.Module/FTeamHistoryCompare/ViewModel/FTeamHistoryCompareViewModel.cs

@@ -47,6 +47,9 @@ namespace VIZ.TVP.WMCUP.Module
             //ScheduleID = DateHeaderViewModel.ScheduleID;
             //Matchtypeid = DateHeaderViewModel.Matchtypeid;
 
+            homeTeamId = DateHeaderViewModel.HomeTeamId;
+            visitTeamId = DateHeaderViewModel.VisitTeamId;
+
 
             SetTeamData();
         }
@@ -66,9 +69,9 @@ namespace VIZ.TVP.WMCUP.Module
         public string visitTeamId = "";
 
         //创建【球队】数据对比时的字典---主队球员数据与对比项的一一对应【主队-例如:得分--读取接口得分数据】
-        public Dictionary<string, string> HomeTeamCompareOptionDictionary = new Dictionary<string, string>();
+      //  public Dictionary<string, string> HomeTeamCompareOptionDictionary = new Dictionary<string, string>();
         //创建【球队】数据对比时的字典---客队球员数据与对比项的一一对应【客队队-例如:得分--读取接口得分数据】
-        public Dictionary<string, string> VisitTeamCompareOptionDictionary = new Dictionary<string, string>();
+       // public Dictionary<string, string> VisitTeamCompareOptionDictionary = new Dictionary<string, string>();
 
         //        public Dictionary<string, Dictionary<string, string>> CNAliasVisitSportsDictionary
         //= new Dictionary<string, Dictionary<string, string>>();
@@ -712,6 +715,204 @@ namespace VIZ.TVP.WMCUP.Module
              
                 }
 
+                else if(matchStatsId == 4)
+                {
+                    //第一项
+
+                    if (!string.IsNullOrEmpty(HomeScore))
+                    {
+                        data += HomeScore.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+
+
+                    data += selectTechStats.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore))
+                    {
+                        data += AwayScore.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+
+
+                    //第二项
+
+                    if (!string.IsNullOrEmpty(HomeScore1))
+                    {
+                        data += HomeScore1.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+
+                    data += selectTechStats1.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore1))
+                    {
+                        data += AwayScore1.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+
+
+
+                    //第三项
+
+
+                    if (!string.IsNullOrEmpty(HomeScore2))
+                    {
+                        data += HomeScore2.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+
+                    data += selectTechStats2.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore2))
+                    {
+                        data += AwayScore2.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+
+
+                    //第四项
+
+
+                    if (!string.IsNullOrEmpty(HomeScore3))
+                    {
+                        data += HomeScore3.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+
+                    data += selectTechStats3.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore3))
+                    {
+                        data += AwayScore3.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+
+
+                }
+                else if(matchStatsId==3)
+                {
+                    //第一项
+
+                    if (!string.IsNullOrEmpty(HomeScore))
+                    {
+                        data += HomeScore.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+
+
+                    data += selectTechStats.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore))
+                    {
+                        data += AwayScore.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+
+
+                    //第二项
+
+                    if (!string.IsNullOrEmpty(HomeScore1))
+                    {
+                        data += HomeScore1.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+
+                    data += selectTechStats1.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore1))
+                    {
+                        data += AwayScore1.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+                    //第三项
+
+
+                    if (!string.IsNullOrEmpty(HomeScore2))
+                    {
+                        data += HomeScore2.Replace(" ", "") + "*";
+                    }
+                    else
+                    {
+                        data += "" + "*";
+                    }
+
+
+
+                    data += selectTechStats2.Replace(" ", "") + "*";
+
+                    if (!string.IsNullOrEmpty(AwayScore2))
+                    {
+                        data += AwayScore2.Replace(" ", "") + ";";
+                    }
+                    else
+                    {
+                        data += "" + ";";
+                    }
+
+
+                }
+
 
                 return data;
             }
@@ -873,7 +1074,7 @@ namespace VIZ.TVP.WMCUP.Module
             {
                 //第一项
 
-                if (HomeScoreDictionary.ContainsKey(SelectTechStats))
+                if (SelectTechStats!=null&&HomeScoreDictionary.ContainsKey(SelectTechStats))
                 {
                     HomeScore = HomeScoreDictionary[SelectTechStats];
                 }
@@ -905,7 +1106,7 @@ namespace VIZ.TVP.WMCUP.Module
 
                 //第二项
 
-                if (HomeScoreDictionary.ContainsKey(SelectTechStats1))
+                if (SelectTechStats1!=null&&HomeScoreDictionary.ContainsKey(SelectTechStats1))
                 {
                     HomeScore1 = HomeScoreDictionary[SelectTechStats1];
                 }
@@ -936,7 +1137,7 @@ namespace VIZ.TVP.WMCUP.Module
             {
                 //第三项
 
-                if (HomeScoreDictionary.ContainsKey(SelectTechStats2))
+                if (SelectTechStats2!=null&&HomeScoreDictionary.ContainsKey(SelectTechStats2))
                 {
                     HomeScore2 = HomeScoreDictionary[SelectTechStats2];
                 }
@@ -967,7 +1168,7 @@ namespace VIZ.TVP.WMCUP.Module
             {
                 //第四项
 
-                if (HomeScoreDictionary.ContainsKey(SelectTechStats3))
+                if (SelectTechStats3!=null&&HomeScoreDictionary.ContainsKey(SelectTechStats3))
                 {
                     HomeScore3 = HomeScoreDictionary[SelectTechStats3];
                 }
@@ -999,7 +1200,7 @@ namespace VIZ.TVP.WMCUP.Module
 
                 //第五项
 
-                if (HomeScoreDictionary.ContainsKey(SelectTechStats3))
+                if (SelectTechStats4!=null&&HomeScoreDictionary.ContainsKey(SelectTechStats4))
                 {
                     HomeScore4 = HomeScoreDictionary[SelectTechStats4];
                 }
@@ -1031,7 +1232,7 @@ namespace VIZ.TVP.WMCUP.Module
 
                 //第六项
 
-                if (HomeScoreDictionary.ContainsKey(SelectTechStats5))
+                if (SelectTechStats5!=null&&HomeScoreDictionary.ContainsKey(SelectTechStats5))
                 {
                     HomeScore5 = HomeScoreDictionary[SelectTechStats5];
                 }
@@ -1094,7 +1295,7 @@ namespace VIZ.TVP.WMCUP.Module
 
                 //第一项
 
-                if (HomeScoreDictionary.ContainsKey(SelectTechStats))
+                if (SelectTechStats!=null&&HomeScoreDictionary.ContainsKey(SelectTechStats))
                 {
                     HomeScore = HomeScoreDictionary[SelectTechStats];
                 }
@@ -1124,7 +1325,7 @@ namespace VIZ.TVP.WMCUP.Module
 
                 //第二项
 
-                if (HomeScoreDictionary.ContainsKey(SelectTechStats1))
+                if (SelectTechStats1!=null&&HomeScoreDictionary.ContainsKey(SelectTechStats1))
                 {
                     HomeScore1 = HomeScoreDictionary[SelectTechStats1];
                 }
@@ -1153,7 +1354,7 @@ namespace VIZ.TVP.WMCUP.Module
 
                 //第三项
 
-                if (HomeScoreDictionary.ContainsKey(SelectTechStats2))
+                if (SelectTechStats2!=null&&HomeScoreDictionary.ContainsKey(SelectTechStats2))
                 {
                     HomeScore2 = HomeScoreDictionary[SelectTechStats2];
                 }
@@ -1182,7 +1383,7 @@ namespace VIZ.TVP.WMCUP.Module
 
                 //第四项
 
-                if (HomeScoreDictionary.ContainsKey(SelectTechStats3))
+                if (SelectTechStats3!=null&&HomeScoreDictionary.ContainsKey(SelectTechStats3))
                 {
                     HomeScore3 = HomeScoreDictionary[SelectTechStats3];
                 }
@@ -1212,7 +1413,7 @@ namespace VIZ.TVP.WMCUP.Module
 
                 //第五项
 
-                if (HomeScoreDictionary.ContainsKey(SelectTechStats3))
+                if (SelectTechStats4!=null&&HomeScoreDictionary.ContainsKey(SelectTechStats4))
                 {
                     HomeScore4 = HomeScoreDictionary[SelectTechStats4];
                 }
@@ -1241,7 +1442,7 @@ namespace VIZ.TVP.WMCUP.Module
 
                 //第六项
 
-                if (HomeScoreDictionary.ContainsKey(SelectTechStats5))
+                if (SelectTechStats5!=null&&HomeScoreDictionary.ContainsKey(SelectTechStats5))
                 {
                     HomeScore5 = HomeScoreDictionary[SelectTechStats5];
                 }
@@ -1485,7 +1686,7 @@ namespace VIZ.TVP.WMCUP.Module
                 //第六项
                 if (VisitScoreDictionary.ContainsKey(SelectTechStats5))
                 {
-                    AwayScore5 = VisitTeamCompareOptionDictionary[SelectTechStats5];
+                    AwayScore5 = VisitScoreDictionary[SelectTechStats5];
                 }
                 else
                 {
@@ -1889,7 +2090,7 @@ namespace VIZ.TVP.WMCUP.Module
 
         public PageModel page = null;
 
-        static ObservableCollection<string> listTechStats = new ObservableCollection<string>() { "控球率", "射门", "犯规 ", "黄牌数", "红牌数", "越位", "角球"};//"罚球",
+        static ObservableCollection<string> listTechStats = new ObservableCollection<string>() { "控球率", "射门", "犯规", "黄牌", "红牌数", "越位", "角球次数" };//"罚球",
 
         #region 第一项数据
 
@@ -2501,7 +2702,7 @@ namespace VIZ.TVP.WMCUP.Module
         /// <summary>
         /// 选中的值
         /// </summary>
-        private string selectTechStats3 = "黄牌数";
+        private string selectTechStats3 = "黄牌";
 
         public string SelectTechStats3
         {

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

@@ -52,6 +52,20 @@ namespace VIZ.TVP.WMCUP.Module
         /// </summary>
         private RecordLogService recordLogService = new RecordLogService();
 
+        public static string HomeTeamId;
+
+        public static string VisitTeamId;
+
+
+        public static string HomeNationName;
+
+        public static string VisitingNationName;
+
+
+        public static string HomeTeamName;
+
+        public static string VisitingTeamName;
+
         /// <summary>
         /// 主数据库连接
         /// </summary>
@@ -116,6 +130,10 @@ namespace VIZ.TVP.WMCUP.Module
                 #region 球队统计信息
 
 
+
+                HomeTeamId = selectMatchData.homeTeamId;
+                VisitTeamId= selectMatchData.visitTeamId;
+
                 if (FTeamHistoryCompareViewModel.TeamStatsHistoryInstance.Count > 0)
                 {
                     // Log.Error(string.Format("TeamStatsViewModel.CreateInstance Count:{0}", TeamStatsViewModel.TeamStatsViewModelInstance.Count));
@@ -130,6 +148,8 @@ namespace VIZ.TVP.WMCUP.Module
                         tempTeamStatsViewModel.visitTeamId = selectMatchData.visitTeamId;
 
 
+                   
+
                         // Log.Error(string.Format("DateHeader_ScheduleId:{0}", selectMatchData.ScheduleID));
                         //Log.Error(string.Format("DateHeader_ScheduleTypeId:{0}", selectMatchData.ScheduleTypeID));
                         tempTeamStatsViewModel.SetTeamData();
@@ -214,20 +234,50 @@ namespace VIZ.TVP.WMCUP.Module
                 //}
 
 
-                //if (NewSinglePlayerViewModel.SinglePlayerViewModelInstance.Count > 0)
-                //{
-                //    foreach (var tempSinglePlayerViewModel in NewSinglePlayerViewModel.SinglePlayerViewModelInstance)
-                //    {
-                //        tempSinglePlayerViewModel.ScheduleID = selectMatchData.ScheduleID;
-                //        tempSinglePlayerViewModel.Matchtypeid = selectMatchData.ScheduleTypeID;
-                //        if (tempSinglePlayerViewModel.page != null && ApplicationDomainEx.CurrentPage == tempSinglePlayerViewModel.page)
-                //        {
+                HomeNationName= selectMatchData.homeNationName;
+                VisitingTeamName= selectMatchData.visitingNationName;
 
-                //            tempSinglePlayerViewModel.SetSingleData();
-                //        }
+                HomeTeamName = selectMatchData.homeTeamName;
+                VisitingTeamName = selectMatchData.visitingTeamName;    
 
-                //    }
-                //}
+
+                if (FSinglePlayerViewModel.FSinglePlayerInstance.Count > 0)
+                {
+                    foreach (var tempSinglePlayerViewModel in FSinglePlayerViewModel.FSinglePlayerInstance)
+                    {
+                        // tempSinglePlayerViewModel.ScheduleID = selectMatchData.ScheduleID;
+                        // tempSinglePlayerViewModel.Matchtypeid = selectMatchData.ScheduleTypeID;
+
+
+                        tempSinglePlayerViewModel.homeTeamId = selectMatchData.homeTeamId;
+                        tempSinglePlayerViewModel.visitTeamId = selectMatchData.visitTeamId;
+
+                        //主队国家名称
+                        tempSinglePlayerViewModel.homeNationTeam = selectMatchData.homeNationName;
+                        //客队国家名称
+                        tempSinglePlayerViewModel.awayNationTeam = selectMatchData.visitingNationName;
+
+
+                        if(tempSinglePlayerViewModel.TeamItems!=null)
+                        {
+                            tempSinglePlayerViewModel.TeamItems.Clear();
+                        }
+                        tempSinglePlayerViewModel.TeamItems = new ObservableCollection<string>();
+
+
+                        tempSinglePlayerViewModel.TeamItems.Add(selectMatchData.homeTeamName);
+                        tempSinglePlayerViewModel.TeamItems.Add(selectMatchData.visitingTeamName);
+
+
+
+                        if (tempSinglePlayerViewModel.page != null && ApplicationDomainEx.CurrentPage == tempSinglePlayerViewModel.page)
+                        {
+
+                            tempSinglePlayerViewModel.SetTeamData();
+                        }
+
+                    }
+                }
 
 
 
@@ -254,6 +304,36 @@ namespace VIZ.TVP.WMCUP.Module
 
                 #region 球员对比信息
 
+
+                if(FComparePlayerViewModel.PlayerCompareViewModelInstance.Count>0)
+                {
+                    foreach (var tempSinglePlayerViewModel in FComparePlayerViewModel.PlayerCompareViewModelInstance)
+                    {
+                        // tempSinglePlayerViewModel.ScheduleID = selectMatchData.ScheduleID;
+                        // tempSinglePlayerViewModel.Matchtypeid = selectMatchData.ScheduleTypeID;
+
+
+                        tempSinglePlayerViewModel.homeTeamId = selectMatchData.homeTeamId;
+                        tempSinglePlayerViewModel.visitTeamId = selectMatchData.visitTeamId;
+
+                        //主队国家名称
+                        tempSinglePlayerViewModel.homeNationTeam = selectMatchData.homeNationName;
+                        //客队国家名称
+                        tempSinglePlayerViewModel.awayNationTeam = selectMatchData.visitingNationName;
+
+                        //主队客数据对比
+                        tempSinglePlayerViewModel.HName = selectMatchData.homeTeamName;
+                        tempSinglePlayerViewModel.AName = selectMatchData.visitingTeamName;
+
+                        if (tempSinglePlayerViewModel.page != null && ApplicationDomainEx.CurrentPage == tempSinglePlayerViewModel.page)
+                        {
+
+                            tempSinglePlayerViewModel.SetTeamData();
+                        }
+
+                    }
+                }
+
                 //if(PlayerCompareViewModel.PlayerCompareViewModelInstance.Count>0)
                 //{
                 //    foreach(var playerCompareViewModel in PlayerCompareViewModel.PlayerCompareViewModelInstance)
@@ -305,8 +385,8 @@ namespace VIZ.TVP.WMCUP.Module
                 #endregion 双球员---任务
 
                 //设置球队赛季数据
-               // GetTeamSeasonData();
-               // #endregion
+                // GetTeamSeasonData();
+                // #endregion
             }
         }
 

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

@@ -193,6 +193,19 @@
                 </WrapPanel>-->
 
 
+                <TextBlock Text="图片地址：" Grid.Row="8" VerticalAlignment="Center" HorizontalAlignment="Center" />
+
+                <!-- 球队地址 -->
+                <!--<TextBlock Text="球队图片地址:" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,10,0" Grid.Row="9"></TextBlock>
+                <dxe:TextEdit Grid.Column="1" Height="30" Grid.Row="9"
+                              EditValue="{Binding Path=TeamsLogo,Mode=TwoWay}"></dxe:TextEdit>-->
+
+
+                <TextBlock Text="球员图片地址:" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,10,0" Grid.Row="10"></TextBlock>
+                <dxe:TextEdit Grid.Column="1" Height="30" Grid.Row="10"
+                              EditValue="{Binding Path=PlayersLogo,Mode=TwoWay}"></dxe:TextEdit>
+
+
             </Grid>
         </GroupBox>
 

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

@@ -149,6 +149,21 @@ namespace VIZ.TVP.WMCUP.Module
         #endregion
 
 
+
+
+        /// <summary>
+        /// 球员图片地址
+        /// </summary>
+        private string playersLogo;
+
+        public string PlayersLogo
+        {
+            get { return playersLogo; }
+            set { playersLogo = value; this.RaisePropertyChanged(nameof(PlayersLogo)); }
+        }
+
+
+
         #endregion
 
         // =========================================================================
@@ -180,6 +195,8 @@ namespace VIZ.TVP.WMCUP.Module
 
             this.BAppKey = AppSetup_InitLiteDB.HttpUrlConfigEntity.BAppKey;
 
+            this.PlayersLogo = AppSetup_InitLiteDB.HttpUrlConfigEntity.PlayersLogo;
+
             // this.SelectFootballType = AppSetup_InitLiteDB.HttpUrlConfigEntity.SelectFootballType;
 
             // this.SelectSeason = AppSetup_InitLiteDB.HttpUrlConfigEntity.SelectSeason;
@@ -207,6 +224,8 @@ namespace VIZ.TVP.WMCUP.Module
             config.BUrl = this.BUrl;
             config.BAppId = this.BAppId;
             config.BAppKey = this.BAppKey;
+
+            config.PlayersLogo = this.PlayersLogo;
             //config.SelectFootballType = this.SelectFootballType;
 
             // 选择赛事和赛事Id

VIZ.TVP.WMCUP.Module/ShootPlayerRank/Model/ShootPlayerRank.cs

@@ -27,7 +27,7 @@ namespace VIZ.TVP.WMCUP.Module
         /// <summary>
         /// 出场次数
         /// </summary>
-        public string games { get; set; }
+        public string appearances { get; set; }
 
         /// <summary>
         /// 进球数量

VIZ.TVP.WMCUP.Module/ShootPlayerRank/Model/ShootPlayerRanks.cs

@@ -16,7 +16,7 @@ namespace VIZ.TVP.WMCUP.Module
         /// <summary>
         /// 球员统计
         /// </summary>
-        public List<ShootPlayerRank> aystatrank { get; set; }
+        public List<ShootPlayerRank> playstatrank { get; set; }
 
     }
 }

VIZ.TVP.WMCUP.Module/ShootPlayerRank/View/ShootPlayerRankView.xaml

@@ -117,8 +117,8 @@
                 <dxg:GridColumn FieldName="rank"  Header="排名" Width="112"  />
                 <dxg:GridColumn FieldName="figureName"  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="teamName" Header="球队名称" Width="112"/>
+                <dxg:GridColumn FieldName="appearances"  Header="场次" Width="180"  />
                 <dxg:GridColumn FieldName="goals"  Header="进球数" Width="180"  />
                 
                 <!--<dxg:GridColumn FieldName="penaltyGoals" Header="点球" Width="100" />-->

VIZ.TVP.WMCUP.Module/ShootPlayerRank/ViewModel/ShootPlayerRankViewModel.cs

@@ -62,10 +62,10 @@ namespace VIZ.TVP.WMCUP.Module
 
 
             shootPlayerRanks = await JsonModel.Post_ShootPlayerRankData(SeasonId, StartOffset, EndOffset);
-            if (shootPlayerRanks == null) return;
+            if (shootPlayerRanks == null||shootPlayerRanks.playstatrank==null) return;
 
 
-            //ShootPlayerModel = new ObservableCollection<ShootPlayerRank>();
+            ShootPlayerModel = new ObservableCollection<ShootPlayerRank>();
 
             ////shootPlayerModel
 
@@ -120,19 +120,19 @@ namespace VIZ.TVP.WMCUP.Module
             //    figureName="中国",
             //}) ;
 
-            foreach (var playerRank in shootPlayerRanks.aystatrank)
+            foreach (var playerRank in shootPlayerRanks.playstatrank)
             {
                 playerRank.playerLogo = playerRank.figureName; 
                 playerRank.teamLogo = playerRank.teamName;
-                if (playerRank.goals != "0")
+                if (playerRank.goals != "0"&&playerRank.goals!=null)
                 {
                     playerRank.goals = playerRank.goals.TrimEnd('0').TrimEnd('.');
                 }
 
-                if (playerRank.penaltyGoals != "0")
-                {
-                    playerRank.penaltyGoals = playerRank.penaltyGoals.TrimEnd('0').TrimEnd('.');
-                }
+                //if (playerRank.penaltyGoals != "0")
+                //{
+                //    playerRank.penaltyGoals = playerRank.penaltyGoals.TrimEnd('0').TrimEnd('.');
+                //}
 
                 ShootPlayerModel.Add(playerRank);
 
@@ -192,13 +192,13 @@ namespace VIZ.TVP.WMCUP.Module
 
                     data += "*";
 
-                    if (string.IsNullOrEmpty(tempTeamRankModel.shortTeamName))
+                    if (string.IsNullOrEmpty(tempTeamRankModel.teamName))
                     {
                         data += "";
                     }
                     else
                     {
-                        data += tempTeamRankModel.shortTeamName.Replace(" ", "");
+                        data += tempTeamRankModel.teamName.Replace(" ", "");
                     }
 
 
@@ -206,13 +206,13 @@ namespace VIZ.TVP.WMCUP.Module
 
                     data += "*";
 
-                    if (string.IsNullOrEmpty(tempTeamRankModel.games))
+                    if (string.IsNullOrEmpty(tempTeamRankModel.appearances))
                     {
                         data += "";
                     }
                     else
                     {
-                        data += tempTeamRankModel.games.Replace(" ", "");
+                        data += tempTeamRankModel.appearances.Replace(" ", "");
                     }
 
 
@@ -244,7 +244,15 @@ namespace VIZ.TVP.WMCUP.Module
                     //data += tempTeamRankModel.penaltyGoals.ToString().Replace(" ", "");
 
                     data += "*";
-                    data += tempTeamRankModel.rank.ToString().Replace(" ", "");
+
+                    if (string.IsNullOrEmpty(tempTeamRankModel.rank))
+                    {
+                        data += "";
+                    }
+                    else
+                    {
+                        data += tempTeamRankModel.rank.ToString().Replace(" ", "");
+                    }
 
                     data += ";";
 

VIZ.TVP.WMCUP.Module/Storge/HttpUrlConfigEntity.cs

@@ -97,6 +97,9 @@ namespace VIZ.TVP.WMCUP.Module
         ////西甲选中赛季
         //public string SelectSLPSeasonId { get; set; }
 
+        //Z:\2022_migu_picture\\PlayerHeadLogo\\
+        public string PlayersLogo { get; set; } = "X:\\VZIRT\\playerphoto\\";
+
 
         #endregion
 

VIZ.TVP.WMCUP.Module/VIZ.TVP.WMCUP.Module.csproj

@@ -77,6 +77,7 @@
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Web" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -85,6 +86,7 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
     <Reference Include="WindowsBase" />
+    <Reference Include="WindowsFormsIntegration" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Common\JsonHelper.cs" />
@@ -93,6 +95,11 @@
     <Compile Include="Common\Model\Seasons.cs" />
     <Compile Include="Common\PluginConstant.cs" />
     <Compile Include="Common\Utils.cs" />
+    <Compile Include="FComparePlayer\FComparePlayerPlugin.cs" />
+    <Compile Include="FComparePlayer\ViewModel\FComparePlayerViewModel.cs" />
+    <Compile Include="FComparePlayer\View\FComparePlayerView.xaml.cs">
+      <DependentUpon>FComparePlayerView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="FDayMatchResult\FDayMatchResultViewPlugin.cs" />
     <Compile Include="FDayMatchResult\ViewModel\FDayMatchResultViewModel.cs" />
     <Compile Include="FDayMatchResult\View\FDayMatchResultView.xaml.cs">
@@ -114,6 +121,15 @@
     <Compile Include="FGTeamStanding\View\FGTeamStandingView.xaml.cs">
       <DependentUpon>FGTeamStandingView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="FSinglePlayer\FSinglePlayerViewPlugin.cs" />
+    <Compile Include="FSinglePlayer\Model\MatchTeamPlayer.cs" />
+    <Compile Include="FSinglePlayer\Model\SinglePlayer.cs" />
+    <Compile Include="FSinglePlayer\Model\SinglePlayers.cs" />
+    <Compile Include="FSinglePlayer\Model\SingleTeamPlayers.cs" />
+    <Compile Include="FSinglePlayer\ViewModel\FSinglePlayerViewModel.cs" />
+    <Compile Include="FSinglePlayer\View\FSinglePlayerView.xaml.cs">
+      <DependentUpon>FSinglePlayerView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="FTeamHistoryCompare\FTeamHistoryComparePlugin.cs" />
     <Compile Include="FTeamHistoryCompare\Model\statistic.cs" />
     <Compile Include="FTeamHistoryCompare\Model\TeamStat.cs" />
@@ -221,6 +237,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Page Include="FComparePlayer\View\FComparePlayerView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="FDayMatchResult\View\FDayMatchResultView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -237,6 +257,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="FSinglePlayer\View\FSinglePlayerView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="FTeamHistoryCompare\View\FTeamHistoryCompareView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -266,6 +290,7 @@
     <Resource Include="Image\FT\Prompt2525.png" />
   </ItemGroup>
   <ItemGroup>
+    <Folder Include="FComparePlayer\Model\" />
     <Folder Include="FFormation\Model\" />
   </ItemGroup>
   <ItemGroup>