Skip to content

V
VIZ.TVP.CBA
Commit 40ed7b7b by wangonghui
Options

暂时

parent 6e7f879a
Showing with 128 additions and 5 deletions
VIZ.MIGU.CBA.Module/TeamStats/View/TeamStatsView.xaml
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="0"/> <RowDefinition Height="0"/>
<RowDefinition Height="40"/> <RowDefinition Height="40"/>
<RowDefinition Height="150"/>
<RowDefinition Height="40"/> <RowDefinition Height="40"/>
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
...@@ -101,7 +102,22 @@ ...@@ -101,7 +102,22 @@
</Grid> </Grid>
</WrapPanel> </WrapPanel>
<WrapPanel Grid.Row="2" VerticalAlignment="Center" > <WrapPanel Grid.Row="2" Margin="190,0,0,0">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="150"/>
<ColumnDefinition Width="200"/>
</Grid.ColumnDefinitions>
<dxe:ImageEdit Grid.Column="0" Height="150" Width="120" x:Name="Home_TeamLogo" ShowMenu="False" EditValue="{Binding Path=HomeTeamLogo}"
ShowLoadDialogOnClickMode="Never"/>
<dxe:ImageEdit Grid.Column="1" Height="150" Width="120" x:Name="Away_TeamLogo" ShowMenu="False" EditValue="{Binding Path=AwayTeamLogo}"
ShowLoadDialogOnClickMode="Never" Margin="-25,0,0,0"/>
</Grid>
</WrapPanel>
<WrapPanel Grid.Row="3" VerticalAlignment="Center" HorizontalAlignment="Left" >
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
...@@ -164,7 +180,7 @@ ...@@ -164,7 +180,7 @@
<DockPanel Grid.Row="3"> <DockPanel Grid.Row="4">
<ScrollViewer HorizontalScrollBarVisibility="Disabled" <ScrollViewer HorizontalScrollBarVisibility="Disabled"
VerticalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"
Name="PART_Options" Name="PART_Options"
......
VIZ.MIGU.CBA.Module/TeamStats/ViewModel/TeamStatsViewModel.cs
...@@ -8,6 +8,9 @@ using VIZ.Framework.Core; ...@@ -8,6 +8,9 @@ using VIZ.Framework.Core;
using System.ComponentModel; using System.ComponentModel;
using log4net; using log4net;
using System.Windows.Media;
using System.Windows.Media.Imaging;
namespace VIZ.TVP.CBA.Module namespace VIZ.TVP.CBA.Module
{ {
public class TeamStatsViewModel : ViewModelBase public class TeamStatsViewModel : ViewModelBase
...@@ -201,10 +204,31 @@ namespace VIZ.TVP.CBA.Module ...@@ -201,10 +204,31 @@ namespace VIZ.TVP.CBA.Module
} }
} }
/// <summary>
/// 主队队伍图标
/// </summary>
private ImageSource homeTeamLogo;
public ImageSource HomeTeamLogo
{
get { return homeTeamLogo; }
set { homeTeamLogo = value;this.RaisePropertyChanged(nameof(HomeTeamLogo)); }
}
/// <summary>
/// 客队队伍图标
/// </summary>
private ImageSource awayTeamLogo;
public ImageSource AwayTeamLogo
{
get { return awayTeamLogo; }
set { awayTeamLogo = value; this.RaisePropertyChanged(nameof(AwayTeamLogo)); }
}
//球员赛季数据 //球员赛季数据
public string Matchtypeid = ""; public string Matchtypeid = "";
//比赛赛程Id //比赛赛程Id
...@@ -575,11 +599,17 @@ namespace VIZ.TVP.CBA.Module ...@@ -575,11 +599,17 @@ namespace VIZ.TVP.CBA.Module
HomeTeam = onAirDataModel.liveTeamInfo.HomeTeamCNAlias; HomeTeam = onAirDataModel.liveTeamInfo.HomeTeamCNAlias;
Log.Error(HomeTeam); if(!string.IsNullOrEmpty(HomeTeam))
{
HomeTeamLogo = new BitmapImage(new Uri(""));
}
AwayTeam = onAirDataModel.liveTeamInfo.VisitingTeamCNAlias; AwayTeam = onAirDataModel.liveTeamInfo.VisitingTeamCNAlias;
Log.Error(AwayTeam); if (!string.IsNullOrEmpty(AwayTeam))
{
}
TeamSeasonData = await JsonModel.PostTeamSeasonData_Path(Matchtypeid); TeamSeasonData = await JsonModel.PostTeamSeasonData_Path(Matchtypeid);
......
VIZ.MIGU.CBA.Module/VIZ.TVP.CBA.Module.csproj
...@@ -349,7 +349,71 @@ ...@@ -349,7 +349,71 @@
<Install>false</Install> <Install>false</Install>
</BootstrapperPackage> </BootstrapperPackage>
</ItemGroup> </ItemGroup>
<ItemGroup /> <ItemGroup>
<Resource Include="Image\Teamlogo\上海久事.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Image\Teamlogo\九台农商银行.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Image\Teamlogo\北京控股.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Image\Teamlogo\北京首钢.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Image\Teamlogo\南京同曦宙光.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Image\Teamlogo\四川金荣实业.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Image\Teamlogo\天津先行者.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Image\Teamlogo\宁波町渥.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Image\Teamlogo\山东高速.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Image\Teamlogo\山西汾酒股份.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Image\Teamlogo\广东东莞大益.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Image\Teamlogo\广州龙狮.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Image\Teamlogo\新疆伊力王酒.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Image\Teamlogo\浙江东阳光.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Image\Teamlogo\浙江稠州金租.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Image\Teamlogo\深圳马可波罗.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Image\Teamlogo\福建浔兴股份.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Image\Teamlogo\苏州肯帝亚.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Image\Teamlogo\辽宁本钢.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Image\Teamlogo\青岛国信水产.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
</ItemGroup>
<ItemGroup>
<Folder Include="Image\PlayerLogo\" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.
......
VIZ.TVP.CBA.sln
...@@ -69,6 +69,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VIZ.Package.Module.Resource ...@@ -69,6 +69,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VIZ.Package.Module.Resource
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VIZ.Package.Common", "..\VIZ.Package\VIZ.Package.Common\VIZ.Package.Common.csproj", "{E4912BCE-BC90-4457-9EE3-06435496D979}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VIZ.Package.Common", "..\VIZ.Package\VIZ.Package.Common\VIZ.Package.Common.csproj", "{E4912BCE-BC90-4457-9EE3-06435496D979}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "70-Product", "70-Product", "{6B4D3B9C-6988-432B-87BD-C3875FDAAE21}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VIZ.Package", "..\VIZ.Package\VIZ.Package\VIZ.Package.csproj", "{5E259876-8FA4-4AD1-9D91-07A76ABC2A16}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
...@@ -237,6 +241,14 @@ Global ...@@ -237,6 +241,14 @@ Global
{E4912BCE-BC90-4457-9EE3-06435496D979}.Release|Any CPU.Build.0 = Release|Any CPU {E4912BCE-BC90-4457-9EE3-06435496D979}.Release|Any CPU.Build.0 = Release|Any CPU
{E4912BCE-BC90-4457-9EE3-06435496D979}.Release|x64.ActiveCfg = Release|x64 {E4912BCE-BC90-4457-9EE3-06435496D979}.Release|x64.ActiveCfg = Release|x64
{E4912BCE-BC90-4457-9EE3-06435496D979}.Release|x64.Build.0 = Release|x64 {E4912BCE-BC90-4457-9EE3-06435496D979}.Release|x64.Build.0 = Release|x64
{5E259876-8FA4-4AD1-9D91-07A76ABC2A16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5E259876-8FA4-4AD1-9D91-07A76ABC2A16}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5E259876-8FA4-4AD1-9D91-07A76ABC2A16}.Debug|x64.ActiveCfg = Debug|x64
{5E259876-8FA4-4AD1-9D91-07A76ABC2A16}.Debug|x64.Build.0 = Debug|x64
{5E259876-8FA4-4AD1-9D91-07A76ABC2A16}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5E259876-8FA4-4AD1-9D91-07A76ABC2A16}.Release|Any CPU.Build.0 = Release|Any CPU
{5E259876-8FA4-4AD1-9D91-07A76ABC2A16}.Release|x64.ActiveCfg = Release|x64
{5E259876-8FA4-4AD1-9D91-07A76ABC2A16}.Release|x64.Build.0 = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
...@@ -262,6 +274,7 @@ Global ...@@ -262,6 +274,7 @@ Global
{6FD4C0F0-8A00-4DB8-924B-A3CD9A45297F} = {2A0D4CA6-9E99-402E-B096-AC403D8386F7} {6FD4C0F0-8A00-4DB8-924B-A3CD9A45297F} = {2A0D4CA6-9E99-402E-B096-AC403D8386F7}
{327EA1F4-F23C-418A-A2EF-DA4F1039B333} = {2A0D4CA6-9E99-402E-B096-AC403D8386F7} {327EA1F4-F23C-418A-A2EF-DA4F1039B333} = {2A0D4CA6-9E99-402E-B096-AC403D8386F7}
{E4912BCE-BC90-4457-9EE3-06435496D979} = {84456B23-B182-4B9D-84B1-3CACB1ADACF0} {E4912BCE-BC90-4457-9EE3-06435496D979} = {84456B23-B182-4B9D-84B1-3CACB1ADACF0}
{5E259876-8FA4-4AD1-9D91-07A76ABC2A16} = {6B4D3B9C-6988-432B-87BD-C3875FDAAE21}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {DE6BF34A-A1A4-4829-88A8-3A4229F89708} SolutionGuid = {DE6BF34A-A1A4-4829-88A8-3A4229F89708}
......
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