Skip to content

V
VIZ.TVP.CBA
Commit 4ec6d393 by wangonghui
Options

修改CBA界面bug

parent bb9ea6b5
Showing with 1109 additions and 77 deletions
VIZ.MIGU.CBA.Module/HeaderPage/Model/PlayersStats.cs
......@@ -19,19 +19,19 @@ namespace VIZ.TVP.CBA.Module
//得分
private string goal;
private double goal;
/// <summary>
///得分
/// </summary>
public string Goal
public double Goal
{
get { return goal; }
set { goal = value; this.RaisePropertyChanged(nameof(Goal)); }
}
//篮板
private string rebounds;
public string Rebounds
private double rebounds;
public double Rebounds
{
get { return rebounds; }
set { rebounds = value; this.RaisePropertyChanged(nameof(Rebounds)); }
......
VIZ.MIGU.CBA.Module/HeaderPage/View/DateHeaderView.xaml
......@@ -327,7 +327,7 @@
<dxg:GridColumn FieldName="ThreeArea" Header="三分区" Width="*" />
<dxg:GridColumn FieldName="FreeThrow" Header="罚球" Width="*" />
<dxg:GridColumn FieldName="ShootingGoalP" Header="投篮命中率" Width="*" />
<dxg:GridColumn FieldName="Steals" Header="抢断" Width="*" />
<dxg:GridColumn FieldName="Steals" Header="抢断" Width="*" />
<dxg:GridColumn FieldName="Blocks" Header="盖帽" Width="*" />
<dxg:GridColumn FieldName="TwoShootingGoalP" Header="两分命中率" Width="*" />
<dxg:GridColumn FieldName="ThreeShootingGoalP" Header="三分命中率" Width="*" />
......
VIZ.MIGU.CBA.Module/HeaderPage/ViewModel/DateHeaderViewModel.cs
......@@ -785,14 +785,14 @@ namespace VIZ.TVP.CBA.Module
player.PlayerName = playerStat.CNAlias;
scores += Convert.ToDouble(playerStat.Points);
player.Goal = playerStat.Points;
player.Goal = Convert.ToDouble(playerStat.Points);
rebounds += Convert.ToDouble(playerStat.Rebounds);
player.Rebounds = playerStat.Rebounds;
player.Rebounds = Convert.ToDouble(playerStat.Rebounds);
player.Assists = playerStat.Assists;
assists += Convert.ToDouble(playerStat.Assists);
player.Steals = playerStat.Steals;
blocks += Convert.ToDouble(playerStat.Blocked);
player.Blocks = playerStat.Blocked;
player.Blocks =playerStat.Blocked;
player.PlayTime = playerStat.Minutes;
player.ShootingGoalP = (playerStat.FieldGoalsPercentage*100).ToString("F1") + "%";
player.TwoShootingGoalP = (playerStat.TwoPointPercentage).ToString("F1") + "%";
......@@ -844,11 +844,11 @@ namespace VIZ.TVP.CBA.Module
player.PlayerName = playerStat.CNAlias;
scores += Convert.ToDouble(playerStat.Points);
player.Goal = playerStat.Points;
player.Goal = Convert.ToDouble(playerStat.Points);
rebounds += Convert.ToDouble(playerStat.Rebounds);
player.Rebounds = playerStat.Rebounds;
player.Rebounds = Convert.ToDouble(playerStat.Rebounds);
assists += Convert.ToDouble(playerStat.Assists);
player.Assists = playerStat.Assists;
player.Assists =playerStat.Assists;
player.Steals = playerStat.Steals;
blocks += Convert.ToDouble(playerStat.Blocked);
player.Blocks = playerStat.Blocked;
......
VIZ.MIGU.CBA.Module/TeamStats/ViewModel/NewTeamStatsViewModel.cs
......@@ -2625,7 +2625,5 @@ namespace VIZ.TVP.CBA.Module
#endregion
}
}
VIZ.MIGU.CBA/App.config
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<appSettings>
<add key="vizIpBack1" value=""/>
</appSettings>
<appSettings>
<add key="vizIpBack1" value="" />
<add key="ClientSettingsProvider.ServiceUri" value="" />
</appSettings>
<system.web>
<membership defaultProvider="ClientAuthenticationMembershipProvider">
<providers>
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
</providers>
</membership>
<roleManager defaultProvider="ClientRoleProvider" enabled="true">
<providers>
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
</providers>
</roleManager>
</system.web>
</configuration>
\ No newline at end of file
VIZ.MIGU.CBA/MainWindow.xaml
......@@ -4,9 +4,14 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
xmlns:module="clr-namespace:VIZ.TVP.CBA.Module;assembly=VIZ.TVP.CBA.Module"
Title="MainWindow" Height="800" Width="1000">
<Grid>
<module:MainView>
</module:MainView>
<!--<fmodule:MainView>
</fmodule:MainView>-->
</Grid>
</dx:ThemedWindow>
VIZ.MIGU.CBA/VIZ.MIGU.CBA.csproj
......@@ -68,6 +68,7 @@
<Reference Include="System.Configuration" />
<Reference Include="System.Data" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Core" />
......
VIZ.MIGU.FOOTBALL/App.config 0 → 100644
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
</configuration>
\ No newline at end of file
VIZ.MIGU.FOOTBALL/App.xaml 0 → 100644
<Application x:Class="VIZ.MIGU.FOOTBALL.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:VIZ.MIGU.FOOTBALL"
StartupUri="MainWindow.xaml">
<Application.Resources>
</Application.Resources>
</Application>
VIZ.MIGU.FOOTBALL/App.xaml.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
using System.Linq;
using System.Threading.Tasks;
using System.Windows;
namespace VIZ.MIGU.FOOTBALL
{
/// <summary>
/// App.xaml 的交互逻辑
/// </summary>
public partial class App : Application
{
}
}
VIZ.MIGU.FOOTBALL/MainWindow.xaml 0 → 100644
<Window x:Class="VIZ.MIGU.FOOTBALL.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:VIZ.MIGU.FOOTBALL"
xmlns:module="clr-namespace:VIZ.TVP.FTB.Module;assembly=VIZ.TVP.FTB.Module"
xmlns:cba="clr-namespace:VIZ.TVP.CBA.Module;assembly=VIZ.TVP.CBA.Module"
mc:Ignorable="d"
Title="MainWindow" Height="450" Width="800">
<Grid>
<module:MainView>
</module:MainView>
<!--<TabControl>
<TabItem Header="Q">
--><!--<module:FDayMatchView>
</module:FDayMatchView>--><!--
<module:FTeamStandingView>
</module:FTeamStandingView>
</TabItem>
</TabControl>-->
<!--<cba:MainView>
</cba:MainView>-->
</Grid>
</Window>
VIZ.MIGU.FOOTBALL/MainWindow.xaml.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace VIZ.MIGU.FOOTBALL
{
/// <summary>
/// MainWindow.xaml 的交互逻辑
/// </summary>
public partial class MainWindow : Window
{
public MainWindow()
{
InitializeComponent();
}
}
}
VIZ.MIGU.FOOTBALL/Properties/AssemblyInfo.cs 0 → 100644
using System.Reflection;
using System.Resources;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Windows;
// 有关程序集的一般信息由以下
// 控制。更改这些特性值可修改
// 与程序集关联的信息。
[assembly: AssemblyTitle("VIZ.MIGU.FOOTBALL")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("China")]
[assembly: AssemblyProduct("VIZ.MIGU.FOOTBALL")]
[assembly: AssemblyCopyright("Copyright © China 2023")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// 将 ComVisible 设置为 false 会使此程序集中的类型
//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
//请将此类型的 ComVisible 特性设置为 true。
[assembly: ComVisible(false)]
//若要开始生成可本地化的应用程序，请设置
//.csproj 文件中的 <UICulture>CultureYouAreCodingWith</UICulture>
//例如，如果您在源文件中使用的是美国英语，
//使用的是美国英语，请将 <UICulture> 设置为 en-US。 然后取消
//对以下 NeutralResourceLanguage 特性的注释。 更新
//以下行中的“en-US”以匹配项目文件中的 UICulture 设置。
//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
[assembly: ThemeInfo(
ResourceDictionaryLocation.None, //主题特定资源词典所处位置
//(未在页面中找到资源时使用，
//或应用程序资源字典中找到时使用)
ResourceDictionaryLocation.SourceAssembly //常规资源词典所处位置
//(未在页面中找到资源时使用，
//、应用程序或任何主题专用资源字典中找到时使用)
)]
// 程序集的版本信息由下列四个值组成:
//
// 主版本
// 次版本
// 生成号
// 修订号
//
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
VIZ.MIGU.FOOTBALL/Properties/Resources.Designer.cs 0 → 100644
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
// 运行时版本: 4.0.30319.42000
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </auto-generated>
//------------------------------------------------------------------------------
namespace VIZ.MIGU.FOOTBALL.Properties
{
/// <summary>
/// 强类型资源类，用于查找本地化字符串等。
/// </summary>
// 此类是由 StronglyTypedResourceBuilder
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources
{
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources()
{
}
/// <summary>
/// 返回此类使用的缓存 ResourceManager 实例。
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager
{
get
{
if ((resourceMan == null))
{
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("VIZ.MIGU.FOOTBALL.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
/// <summary>
/// 重写当前线程的 CurrentUICulture 属性，对
/// 使用此强类型资源类的所有资源查找执行重写。
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture
{
get
{
return resourceCulture;
}
set
{
resourceCulture = value;
}
}
}
}
VIZ.MIGU.FOOTBALL/Properties/Resources.resx 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
\ No newline at end of file
VIZ.MIGU.FOOTBALL/Properties/Settings.Designer.cs 0 → 100644
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace VIZ.MIGU.FOOTBALL.Properties
{
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
{
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
public static Settings Default
{
get
{
return defaultInstance;
}
}
}
}
VIZ.MIGU.FOOTBALL/Properties/Settings.settings 0 → 100644
<?xml version='1.0' encoding='utf-8'?>
<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
<Profiles>
<Profile Name="(Default)" />
</Profiles>
<Settings />
</SettingsFile>
\ No newline at end of file
VIZ.MIGU.FOOTBALL/VIZ.MIGU.FOOTBALL.csproj 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{72A5659A-9195-4EA6-856C-AE2A65BA1575}</ProjectGuid>
<OutputType>WinExe</OutputType>
<RootNamespace>VIZ.MIGU.FOOTBALL</RootNamespace>
<AssemblyName>VIZ.MIGU.FOOTBALL</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="DevExpress.Data.Desktop.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Data.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Drawing.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Mvvm.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Printing.v22.2.Core, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Core.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Themes.Office2019Colorful.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
</ItemGroup>
<ItemGroup>
<ApplicationDefinition Include="App.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
<Page Include="MainWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="MainWindow.xaml.cs">
<DependentUpon>MainWindow.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\VIZ.MIGU.CBA.Module\VIZ.TVP.CBA.Module.csproj">
<Project>{5725ef98-c905-486d-a851-50918115c5e3}</Project>
<Name>VIZ.TVP.CBA.Module</Name>
</ProjectReference>
<ProjectReference Include="..\VIZ.TVP.FTB.Module\VIZ.TVP.FTB.Module.csproj">
<Project>{8768cecb-a595-4c41-99e2-fba5096cb6a8}</Project>
<Name>VIZ.TVP.FTB.Module</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file
VIZ.TVP.CBA.sln
......@@ -75,6 +75,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VIZ.Package", "..\VIZ.Packa
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VIZ.TVP.FTB.Module", "VIZ.TVP.FTB.Module\VIZ.TVP.FTB.Module.csproj", "{8768CECB-A595-4C41-99E2-FBA5096CB6A8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VIZ.MIGU.FOOTBALL", "VIZ.MIGU.FOOTBALL\VIZ.MIGU.FOOTBALL.csproj", "{72A5659A-9195-4EA6-856C-AE2A65BA1575}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
......@@ -259,6 +261,14 @@ Global
{8768CECB-A595-4C41-99E2-FBA5096CB6A8}.Release|Any CPU.Build.0 = Release|Any CPU
{8768CECB-A595-4C41-99E2-FBA5096CB6A8}.Release|x64.ActiveCfg = Release|Any CPU
{8768CECB-A595-4C41-99E2-FBA5096CB6A8}.Release|x64.Build.0 = Release|Any CPU
{72A5659A-9195-4EA6-856C-AE2A65BA1575}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{72A5659A-9195-4EA6-856C-AE2A65BA1575}.Debug|Any CPU.Build.0 = Debug|Any CPU
{72A5659A-9195-4EA6-856C-AE2A65BA1575}.Debug|x64.ActiveCfg = Debug|x64
{72A5659A-9195-4EA6-856C-AE2A65BA1575}.Debug|x64.Build.0 = Debug|x64
{72A5659A-9195-4EA6-856C-AE2A65BA1575}.Release|Any CPU.ActiveCfg = Release|Any CPU
{72A5659A-9195-4EA6-856C-AE2A65BA1575}.Release|Any CPU.Build.0 = Release|Any CPU
{72A5659A-9195-4EA6-856C-AE2A65BA1575}.Release|x64.ActiveCfg = Release|Any CPU
{72A5659A-9195-4EA6-856C-AE2A65BA1575}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......@@ -286,6 +296,7 @@ Global
{E4912BCE-BC90-4457-9EE3-06435496D979} = {84456B23-B182-4B9D-84B1-3CACB1ADACF0}
{5E259876-8FA4-4AD1-9D91-07A76ABC2A16} = {6B4D3B9C-6988-432B-87BD-C3875FDAAE21}
{8768CECB-A595-4C41-99E2-FBA5096CB6A8} = {2A0D4CA6-9E99-402E-B096-AC403D8386F7}
{72A5659A-9195-4EA6-856C-AE2A65BA1575} = {FB580B2F-98B5-47B0-8C2B-E633BE0768F8}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {DE6BF34A-A1A4-4829-88A8-3A4229F89708}
......
VIZ.TVP.FTB.Module/FDayMatch/Model/Dayschedule.cs
......@@ -36,8 +36,7 @@ namespace VIZ.TVP.FTB.Module
public string matchId { get; set; }//赛程ID
public string competitionId { get; set; }// 赛事类型(德甲、意甲、英超等等)
public string competitionId { get; set; }// 赛事Id
public string competionIdName { get; set; } // 赛事类型(德甲、意甲、英超等等)
public string stadium { get; set; }//比赛场馆
......@@ -45,6 +44,7 @@ namespace VIZ.TVP.FTB.Module
public string status { get; set; }//赛程状态//1未开始，2进行中，4已结束，5延期
private HighLightEnum light = HighLightEnum.OffLight;
/// <summary>
......
VIZ.TVP.FTB.Module/FDayMatch/View/FDayMatchView.xaml
......@@ -15,11 +15,11 @@
d:DesignWidth="750"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch">
<UserControl.Resources>
<!--<UserControl.Resources>
<ResourceDictionary>
<core:Enum2EnumDescriptionConverter x:Key="Enum2EnumDescriptionConverter" EnumType="{x:Type storage:HighLightEnum}"></core:Enum2EnumDescriptionConverter>
</ResourceDictionary>
</UserControl.Resources>
</UserControl.Resources>-->
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="60"/>
......@@ -67,8 +67,9 @@
</Grid.ColumnDefinitions>
<Button Content="加载赛程" Command="{Binding BtnCmd}" HorizontalContentAlignment="Center"
Grid.Column="0" Width="100" Height="30" FontSize="14" IsEnabled="{Binding BtmEnable,Mode=TwoWay}" />
<dx:SimpleButton Grid.Row="1" Grid.Column="1" Glyph='/VIZ.TVP.FTB.Module;component/Image/PNG/Prompt2525.png' FontSize="16"
<dx:SimpleButton Grid.Row="1" Grid.Column="1" Glyph='/VIZ.TVP.FTB.Module;component/Image/FT/Prompt2525.png' FontSize="16"
Command="{Binding PromptCommand}" HorizontalContentAlignment="Center" Width="30" Height="30" />
</Grid>
</WrapPanel>
......
VIZ.TVP.FTB.Module/FDayMatch/View/FDayMatchView.xaml.cs
using System;
using log4net;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
......@@ -11,17 +12,174 @@ 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.FTB.Module
{
/// <summary>
/// Interaction logic for FDayMatchView.xaml
/// </summary>
public partial class FDayMatchView : UserControl
public partial class FDayMatchView : UserControl, IPluginView
{
FDayMatchViewModel vm = null;
/// <summary>
/// 日志
/// </summary>
private static ILog Log = LogManager.GetLogger(typeof(FDayMatchView));
public FDayMatchView()
{
InitializeComponent();
WPFHelper.BindingViewModel(this, new FDayMatchViewModel());
vm = this.DataContext as FDayMatchViewModel;
}
/// <summary>
/// 操作日志服务
/// </summary>
private RecordLogService recordLogService = new RecordLogService();
/// <summary>
/// 上版
/// </summary>
/// <param name="conns">连接</param>
public void TakIn(ConnModel conns)
{
//DayMatchViewModel vm = thi DayMatchViewModel
//ApplicationDomainEx.PreviewConn.EndpointManager.Send("");
this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, RecordLogConstants.OPERATE_TAKE_TAKE);
if (conns.IsConnected && vm.MatchData != null)
{
//SCRIPT_INVOKE
conns.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "Data", vm.CombineMatchData()));
}
}
/// <summary>
/// 继续
/// </summary>
/// <param name="conns">连接</param>
public void TakeContinue(ConnModel conns)
{
this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, RecordLogConstants.OPERATE_TAKE_CONTINUE);
if (conns.IsConnected && vm.MatchData != null)
{
conns.EndpointManager.Send(VizEngineCommands.STAGE_CONTINUE);
}
}
/// <summary>
/// 下版子
/// </summary>
/// <param name="conns">连接</param>
public void TakeOut(ConnModel conns)
{
}
/// <summary>
/// 更新
/// </summary>
/// <param name="conns">连接</param>
public void TakeUpdate(ConnModel conns)
{
this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, RecordLogConstants.OPERATE_TAKE_UPDATE);
if (conns.IsConnected && vm.MatchData != null)
{
//SCRIPT_INVOKE
conns.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "Data", vm.CombineMatchData()));
}
}
/// <summary>
/// 预览上版子
/// </summary>
/// <param name="conn">连接</param>
public void PreviewIn(ConnModel conn)
{
this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, RecordLogConstants.OPERATE_PREVIEW_PLAY);
if (conn.IsConnected && vm.MatchData != null)
{
//SCRIPT_INVOKE
conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "Data", vm.CombineMatchData()));
}
}
/// <summary>
/// 预览继续
/// </summary>
/// <param name="conn">连接</param>
public void PreviewContinue(ConnModel conn)
{
}
/// <summary>
/// 预览下版
/// </summary>
/// <param name="conn">连接</param>
public void PreviewOut(ConnModel conn)
{
//if(conn.IsConnected)
//{
// conn.EndpointManager.Send(VizEngineCommands.STAGE_CONTINUE);
//}
}
/// <summary>
/// 销毁
/// </summary>
public void Dispose()
{
}
/// <summary>
/// 任务模型
/// </summary>
public PackageTaskModel task;
/// <summary>
/// 注册服务
/// </summary>
IPackageTaskService service;
public void PageOpend(ConnModel conn, PageModel page)
{
if (conn.IsConnected && vm.MatchData != null)
{
//SCRIPT_INVOKE
conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "Data", vm.CombineMatchData()));
}
}
public void PreviewUpdate(ConnModel conn)
{
this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, RecordLogConstants.OPERATE_PREVIEW_UPDATE);
if (conn.IsConnected && vm.MatchData != null)
{
//SCRIPT_INVOKE
conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "Data", vm.CombineMatchData()));
}
}
}
}
VIZ.TVP.FTB.Module/FDayMatch/ViewModel/FDayMatchViewModel.cs
......@@ -218,6 +218,23 @@ namespace VIZ.TVP.FTB.Module
/// <summary>
/// 今日赛程信息
/// </summary>
private ObservableCollection<Dayschedule> matchData;
/// <summary>
/// 绑定数据列表
/// </summary>
public ObservableCollection<Dayschedule> MatchData
{
get { return matchData; }
set { matchData = value; this.RaisePropertyChanged(nameof(MatchData)); }
}
/// <summary>
/// 初始化方法
/// </summary>
private void Init()
......@@ -247,5 +264,146 @@ namespace VIZ.TVP.FTB.Module
BtmEnable = true; ;
}
/// <summary>
/// 组装往包装发送得数据
/// </summary>
/// <returns></returns>
public string CombineMatchData()
{
try
{
string data = "";
data += title + "&";
foreach (var tempMatchData in matchData)
{
//if (tempMatchData.SelectLight == "不高亮")
//{
// data += "0";
//}
//else
//{
// data += "1";
//}
data += "*";
if (string.IsNullOrEmpty(tempMatchData.dates))
{
data += "";
}
else
{
data += tempMatchData.dates.Replace(" ", "");
}
data += "*";
if (string.IsNullOrEmpty(tempMatchData.time))
{
data += "";
}
else
{
data += tempMatchData.time.Replace(" ", "");
}
data += "*";
//data += tempMatchData.homeTeamLogo.Replace(" ", "");
//data += "*";
if(string.IsNullOrEmpty(tempMatchData.homeTeamLogo))
{
data += "";
}
else
{
data += tempMatchData.homeTeamLogo.Replace(" ", "");
}
if (string.IsNullOrEmpty(tempMatchData.homeTeamName))
{
data += "";
}
else
{
data += tempMatchData.homeTeamName.Replace(" ", "");
}
data += "*";
if (string.IsNullOrEmpty(tempMatchData.homeTeamScore))
{
data += "";
}
else
{
data += tempMatchData.homeTeamScore.Replace(" ", "");
}
data += "*";
//客队得分
if (string.IsNullOrEmpty(tempMatchData.visitingTeamScore))
{
data += "";
}
else
{
data += tempMatchData.visitingTeamScore.Replace(" ", "");
}
data += "*";
//客队名称
if (string.IsNullOrEmpty(tempMatchData.visitingTeamName))
{
data += "";
}
else
{
data += tempMatchData.visitingTeamName.Replace(" ", "");
}
data += "*";
//客队国旗
if (string.IsNullOrEmpty(tempMatchData.visitingTeamLogo))
{
data += "";
}
else
{
data += tempMatchData.visitingTeamLogo.Replace(" ", "");
}
data += "*";
if (tempMatchData.SelectLight == "不高亮")
{
data += "0";
}
else
{
data += "1";
}
data += ";";
}
return data;
}
catch (Exception ex)
{
Log.Error(ex.ToString());
return "";
}
}
}
}
VIZ.TVP.FTB.Module/FTeamStandings/Model/Teamrank.cs
......@@ -38,5 +38,8 @@ namespace VIZ.TVP.FTB.Module
public string competionIdName { get; set; } //赛事类型(德甲、意甲、英超等等)
public string goalAndLoseNums { get; set; } //进球/失球总数
}
}
VIZ.TVP.FTB.Module/FTeamStandings/View/FTeamStandingView.xaml
......@@ -51,7 +51,7 @@
<Button Grid.Column="0" Content="加载数据" FontSize="14" Width="90" Height="30" Command="{Binding BtnCmd}" />
<dx:SimpleButton Grid.Row="0" Grid.Column="1" Glyph='/VIZ.TVP.FTB.Module;component/Image/PNG/Prompt2525.png' FontSize="16"
<dx:SimpleButton Grid.Row="0" Grid.Column="1" Glyph='/VIZ.TVP.FTB.Module;component/Image/FT/Prompt2525.png' FontSize="16"
Command="{Binding PromptCommand}" HorizontalContentAlignment="Center" Width="30" Height="30" />
</Grid>
</WrapPanel>
......@@ -73,16 +73,16 @@
</ScrollViewer>
<dxg:GridControl x:Name="grid" ShowBorder="False" ItemsSource="{Binding Path= TeamRanksModel,Mode=TwoWay}">
<dxg:GridColumn FieldName="" Header="排名" Width="112" />
<dxg:GridColumn FieldName="" Header="球队国旗" Width="112"/>
<dxg:GridColumn FieldName="" Header="球队名" Width="112" />
<dxg:GridColumn FieldName="" Header="场次" Width="180" />
<dxg:GridColumn FieldName="" Header="胜" Width="100" />
<dxg:GridColumn FieldName="" Header="平" Width="100"/>
<dxg:GridColumn FieldName="" Header="负" Width="100" />
<dxg:GridColumn FieldName="" Header="进/失" Width="180" />
<dxg:GridColumn FieldName="" Header="积分" Width="180" />
<dxg:GridColumn FieldName="rank" Header="排名" Width="112" />
<dxg:GridColumn FieldName="teamLogo" Header="球队国旗" Width="112"/>
<dxg:GridColumn FieldName="teamName" Header="球队名" Width="112" />
<dxg:GridColumn FieldName="matchNum" Header="场次" Width="180" />
<dxg:GridColumn FieldName="winNum" Header="胜" Width="100" />
<dxg:GridColumn FieldName="drawNum" Header="平" Width="100"/>
<dxg:GridColumn FieldName="loseNum" Header="负" Width="100" />
<dxg:GridColumn FieldName="goalAndLoseNums" Header="进/失" Width="180" />
<dxg:GridColumn FieldName="score" Header="积分" Width="180" />
<dxg:GridControl.View>
<dxg:TableView AutoWidth="True" ShowGroupPanel="False"
......
VIZ.TVP.FTB.Module/FTeamStandings/View/FTeamStandingView.xaml.cs
......@@ -11,17 +11,118 @@ 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.Service;
using VIZ.Package.Storage;
namespace VIZ.TVP.FTB.Module
{
/// <summary>
/// Interaction logic for FTeamStandingView.xaml
/// </summary>
public partial class FTeamStandingView : UserControl
public partial class FTeamStandingView : UserControl, IPluginView
{
FTeamStandingViewModel vm= null;
/// <summary>
/// 操作日志服务
/// </summary>
private RecordLogService recordLogService = new RecordLogService();
public FTeamStandingView()
{
InitializeComponent();
WPFHelper.BindingViewModel(this, new FTeamStandingViewModel());
vm = this.DataContext as FTeamStandingViewModel;
}
public void Dispose()
{
}
public void PageOpend(ConnModel conn, PageModel page)
{
if (conn.IsConnected && vm.TeamRanksModel != null)
{
conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "Data", vm.CombineTeamStandingData()));
}
}
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 && vm.TeamRanksModel != null)
{
conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "Data", vm.CombineTeamStandingData()));
}
}
public void PreviewOut(ConnModel conn)
{
}
public void PreviewUpdate(ConnModel conn)
{
this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, RecordLogConstants.OPERATE_PREVIEW_UPDATE);
if (conn.IsConnected && vm.TeamRanksModel != null)
{
conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "Data", vm.CombineTeamStandingData()));
}
}
public void TakeContinue(ConnModel conns)
{
this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, RecordLogConstants.OPERATE_TAKE_CONTINUE);
if (conns.IsConnected && vm.TeamRanksModel != null)
{
conns.EndpointManager.Send(VizEngineCommands.STAGE_CONTINUE);
}
}
public void TakeOut(ConnModel conns)
{
this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, RecordLogConstants.OPERATE_TAKE_OUT);
if (conns.IsConnected && vm.TeamRanksModel != null)
{
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 && vm.TeamRanksModel != null)
{
conns.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "Data", vm.CombineTeamStandingData()));
}
}
public void TakIn(ConnModel conns)
{
this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, RecordLogConstants.OPERATE_TAKE_TAKE);
if (conns.IsConnected && vm.TeamRanksModel != null)
{
conns.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "Data", vm.CombineTeamStandingData()));
}
}
}
}
VIZ.TVP.FTB.Module/FTeamStandings/ViewModel/FTeamStandingViewModel.cs
using log4net;
using System;
using System.Collections.ObjectModel;
using VIZ.Framework.Core;
namespace VIZ.TVP.FTB.Module
......@@ -18,13 +20,13 @@ namespace VIZ.TVP.FTB.Module
}
//private ObservableCollection<Teamrank> teamRanksModel;
//public ObservableCollection<Teamrank> TeamRanksModel
//{
// get { return teamRanksModel; }
private ObservableCollection<Teamrank> teamRanksModel;
public ObservableCollection<Teamrank> TeamRanksModel
{
get { return teamRanksModel; }
// set { teamRanksModel = value; this.RaisePropertyChanged(nameof(TeamRanksModel)); }
//}
set { teamRanksModel = value; this.RaisePropertyChanged(nameof(TeamRanksModel)); }
}
public VCommand BtnCmd { get; set; }
......@@ -59,58 +61,66 @@ namespace VIZ.TVP.FTB.Module
//public string CombineTeamStandingData()
//{
// try
// {
public string CombineTeamStandingData()
{
try
{
string data = "";
data += title;
// string data = "";
data += "&";
// data += title;
int i = 0;
// data += "&";
foreach (var tempTeamRankModel in TeamRanksModel)
{
i++;
data += tempTeamRankModel.rank.ToString().Replace(" ", "");
// foreach (var tempTeamRankModel in TeamRanksModel)
// {
// data += tempTeamRankModel.Id.ToString().Replace(" ", "");
data += "*";
data += tempTeamRankModel.teamLogo.Replace(" ", "");
// data += "*";
// data += tempTeamRankModel.TeamCNAlias.Replace(" ", "");
data += "*";
data += tempTeamRankModel.teamName.ToString().Replace(" ", "");
// data += "*";
// data += tempTeamRankModel.Wins.ToString().Replace(" ", "");
data += "*";
data += tempTeamRankModel.matchNum.ToString().Replace(" ", "");
// data += "*";
// data += tempTeamRankModel.Losses.ToString().Replace(" ", "");
data += "*";
data += tempTeamRankModel.winNum.ToString().Replace(" ", "");
// data += "*";
// data += tempTeamRankModel.WinningPercentageStr.ToString().Replace(" ", "");
data += "*";
data += tempTeamRankModel.drawNum.ToString().Replace(" ", "");
// data += "*";
// data += tempTeamRankModel.Integral.ToString().Replace(" ", "");
data += "*";
data += tempTeamRankModel.loseNum.ToString().Replace(" ", "");
// data += "*";
// data += tempTeamRankModel.StreakNumber.ToString().Replace(" ", "");
data += "*";
data += tempTeamRankModel.goalAndLoseNums.Replace(" ", "");
data += ";";
// data += "*";
// data += tempTeamRankModel.StreakName.Replace(" ", "");
// data += ";";
// }
if(i==10)
{
data += "#";
}
}
// return data;
// }
// catch (Exception ex)
// {
// Log.Error(ex.Message);
// return "";
// }
//}
return data;
}
catch (Exception ex)
{
Log.Error(ex.Message);
return "";
}
}
private string title = "球队积分排名";
......
VIZ.TVP.FTB.Module/Main/View/MainView.xaml 0 → 100644
<UserControl x:Class="VIZ.TVP.FTB.Module.MainView"
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:module="clr-namespace:VIZ.TVP.FTB.Module"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="300">
<Grid>
<TabControl>
<TabItem Header="足球赛程">
<module:FDayMatchView>
</module:FDayMatchView>
</TabItem>
<TabItem Header="足球积分排名">
<module:FTeamStandingView>
</module:FTeamStandingView>
</TabItem>
</TabControl>
</Grid>
</UserControl>
VIZ.TVP.FTB.Module/Main/View/MainView.xaml.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace VIZ.TVP.FTB.Module
{
/// <summary>
/// Interaction logic for MainView.xaml
/// </summary>
public partial class MainView : UserControl
{
public MainView()
{
InitializeComponent();
}
}
}
VIZ.TVP.FTB.Module/VIZ.TVP.FTB.Module.csproj
......@@ -35,7 +35,7 @@
<OutputPath>bin\x64\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
......@@ -99,6 +99,9 @@
<Compile Include="FTeamStandings\View\FTeamStandingView.xaml.cs">
<DependentUpon>FTeamStandingView.xaml</DependentUpon>
</Compile>
<Compile Include="Main\View\MainView.xaml.cs">
<DependentUpon>MainView.xaml</DependentUpon>
</Compile>
<Compile Include="Message\ViewModel\MessageLRDateViewModel.cs" />
<Compile Include="Message\View\MessageLastRecordDate.xaml.cs">
<DependentUpon>MessageLastRecordDate.xaml</DependentUpon>
......@@ -177,6 +180,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Main\View\MainView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Message\View\MessageLastRecordDate.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
......@@ -187,7 +194,7 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Content Include="Image\PNG\Prompt2525.png" />
<Resource Include="Image\FT\Prompt2525.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment