Skip to content

V
VIZ.TVP.CBA
Commit b41c642d by wangonghui
Options

修改bug和CBA界面的改造

parent b45c9ce6
Showing with 369 additions and 28 deletions
VIZ.MIGU.CBA.Module/Common/JsonModel.cs
...@@ -33,7 +33,7 @@ namespace VIZ.TVP.CBA.Module ...@@ -33,7 +33,7 @@ namespace VIZ.TVP.CBA.Module
private static string httpStr = "http://sportsdata.misports.cn/beitai/api/"; private static string httpStr = "http://sportsdata.misports.cn/beitai/api/";
//新的URL //新的URL
private static string strUrl= AppSetup_InitCBALiteDB.HttpUrlConfigEntity.Url; public static string strUrl= AppSetup_InitCBALiteDB.HttpUrlConfigEntity.Url;
//ApplicationDomainEx.HttpUrlConfig.Url; //ApplicationDomainEx.HttpUrlConfig.Url;
//ApplicationDomainEx.HttpUrlConfig.Url; //ApplicationDomainEx.HttpUrlConfig.Url;
//sd?.Settings["url"].Value.ToString(); //sd?.Settings["url"].Value.ToString();
...@@ -41,9 +41,9 @@ namespace VIZ.TVP.CBA.Module ...@@ -41,9 +41,9 @@ namespace VIZ.TVP.CBA.Module
/// <summary> /// <summary>
/// 读取艾果的数据平台的配置项 /// 读取艾果的数据平台的配置项
/// </summary> /// </summary>
private static string appID = AppSetup_InitCBALiteDB.HttpUrlConfigEntity.AppId; public static string appID = AppSetup_InitCBALiteDB.HttpUrlConfigEntity.AppId;
//sd.Settings["AppID"].Value.ToString(); //sd.Settings["AppID"].Value.ToString();
private static string appKey = AppSetup_InitCBALiteDB.HttpUrlConfigEntity.AppKey; public static string appKey = AppSetup_InitCBALiteDB.HttpUrlConfigEntity.AppKey;
//sd.Settings["AppKey"].Value.ToString(); //sd.Settings["AppKey"].Value.ToString();
// private static string strUrl = sd.Settings["newUrl"].Value.ToString(); // private static string strUrl = sd.Settings["newUrl"].Value.ToString();
......
VIZ.MIGU.CBA.Module/HeaderPage/View/DateHeaderView.xaml
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
xmlns:core="clr-namespace:VIZ.Framework.Core;assembly=VIZ.Framework.Core" xmlns:core="clr-namespace:VIZ.Framework.Core;assembly=VIZ.Framework.Core"
xmlns:storage="clr-namespace:VIZ.TVP.CBA.Module" xmlns:storage="clr-namespace:VIZ.TVP.CBA.Module"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="800" d:DesignWidth="650" > d:DesignHeight="800" d:DesignWidth="770" >
<UserControl.Resources> <UserControl.Resources>
<!--<local:DemoDataProvider x:Key="DemoDataProvider" />--> <!--<local:DemoDataProvider x:Key="DemoDataProvider" />-->
...@@ -49,16 +49,48 @@ ...@@ -49,16 +49,48 @@
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="120"/> <ColumnDefinition Width="120"/>
<ColumnDefinition Width="110"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="120"/>
<ColumnDefinition Width="280"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="比赛日期:" Grid.Column="0" FontSize="16" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="比赛日期:" Grid.Column="0" FontSize="14" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<dxe:DateEdit Grid.Column="1" HorizontalAlignment="Center" Name="Date_MatchDateInfo" Width="120" <dxe:DateEdit Grid.Column="1" HorizontalAlignment="Center" Name="Date_MatchDateInfo" Width="120"
EditValue="{Binding MatchDate,Mode=TwoWay}" FontSize="16" ShowToday="False" ShowClearButton="False" EditValue="{Binding MatchDate,Mode=TwoWay}" FontSize="16" ShowToday="False" ShowClearButton="False"
VerticalAlignment="Center" MaskUseAsDisplayFormat="True" > VerticalAlignment="Center" MaskUseAsDisplayFormat="True" >
</dxe:DateEdit> </dxe:DateEdit>
<Button Grid.Column="2" Content="上一天" FontSize="14" Width="70" Height="30" Command="{Binding UpDateCmd}" />
<Button Grid.Column="3" Content="下一天" FontSize="14" Width="70" Height="30" Command="{Binding DownDateCmd}" />
<WrapPanel Grid.Column="4" VerticalAlignment="Center">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="50"/>
<ColumnDefinition Width="35"/>
<ColumnDefinition Width="35"/>
</Grid.ColumnDefinitions>
<TextBlock Text="数据源" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="14" />
<RadioButton Content="主" FontSize="14" Grid.Column="1" IsChecked="{Binding MainDataConnection,Mode=TwoWay}"/>
<RadioButton Content="备" FontSize="14" Grid.Column="2" IsChecked="{Binding BackDataConnection,Mode=TwoWay}"/>
</Grid>
</WrapPanel>
<WrapPanel Grid.Column="5" VerticalAlignment="Center" HorizontalAlignment="Right">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="40"/>
<ColumnDefinition Width="90"/>
<ColumnDefinition Width="30"/>
<ColumnDefinition Width="90"/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="场次" FontSize="14" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Grid.Column="1" Text="{Binding TeamHName,Mode=TwoWay}" FontSize="14" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Grid.Column="2" Text="VS" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="14"/>
<TextBlock Grid.Column="3" Text="{Binding TeamAName,Mode=TwoWay}" FontSize="14" HorizontalAlignment="Center" VerticalAlignment="Center"/>
</Grid>
</WrapPanel>
</Grid> </Grid>
</WrapPanel> </WrapPanel>
......
VIZ.MIGU.CBA.Module/HeaderPage/ViewModel/DateHeaderViewModel.cs
using DevExpress.Emf; using DevExpress.Emf;
using DevExpress.Xpf.Editors.Helpers; using DevExpress.Xpf.Editors.Helpers;
using DevExpress.Xpo.DB;
using log4net; using log4net;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
...@@ -35,6 +36,9 @@ namespace VIZ.TVP.CBA.Module ...@@ -35,6 +36,9 @@ namespace VIZ.TVP.CBA.Module
PlayerHCommand = new VCommand(SetHPlayerStats); PlayerHCommand = new VCommand(SetHPlayerStats);
PlayerACommand = new VCommand(SetAPlayerStats); PlayerACommand = new VCommand(SetAPlayerStats);
RefreshPlayerCommand = new VCommand(RefreshPlayer); RefreshPlayerCommand = new VCommand(RefreshPlayer);
UpDateCmd = new VCommand(UpDate);
DownDateCmd = new VCommand(DownDate);
} }
...@@ -119,6 +123,50 @@ namespace VIZ.TVP.CBA.Module ...@@ -119,6 +123,50 @@ namespace VIZ.TVP.CBA.Module
} }
/// <summary>
/// 主数据库连接
/// </summary>
private bool mainDataConnection=true;
public bool MainDataConnection
{
get { return mainDataConnection; }
set
{
mainDataConnection = value;
this.RaisePropertyChanged(nameof(MainDataConnection));
if(mainDataConnection)
{
JsonModel.strUrl = AppSetup_InitCBALiteDB.HttpUrlConfigEntity.Url;
JsonModel.appKey = AppSetup_InitCBALiteDB.HttpUrlConfigEntity.AppKey;
JsonModel.appID = AppSetup_InitCBALiteDB.HttpUrlConfigEntity.AppId;
}
}
}
/// <summary>
/// 备份数据连接
/// </summary>
private bool backDataConnection;
public bool BackDataConnection
{
get { return backDataConnection; }
set
{
backDataConnection = value;
this.RaisePropertyChanged(nameof(BackDataConnection));
if(backDataConnection)
{
JsonModel.strUrl = AppSetup_InitCBALiteDB.HttpUrlConfigEntity.BUrl;
JsonModel.appKey = AppSetup_InitCBALiteDB.HttpUrlConfigEntity.BAppKey;
JsonModel.appID = AppSetup_InitCBALiteDB.HttpUrlConfigEntity.BAppId;
}
}
}
/// <summary> /// <summary>
...@@ -395,8 +443,6 @@ namespace VIZ.TVP.CBA.Module ...@@ -395,8 +443,6 @@ namespace VIZ.TVP.CBA.Module
} }
#endregion #endregion
#region 球队数据 #region 球队数据
...@@ -618,11 +664,48 @@ namespace VIZ.TVP.CBA.Module ...@@ -618,11 +664,48 @@ namespace VIZ.TVP.CBA.Module
/// <summary>
/// 主队球员命令
/// </summary>
public VCommand PlayerHCommand { get; set; } public VCommand PlayerHCommand { get; set; }
/// <summary>
/// 客队球员命令
/// </summary>
public VCommand PlayerACommand { get; set; } public VCommand PlayerACommand { get; set; }
/// <summary>
/// 上一天
/// </summary>
public VCommand UpDateCmd { get; set; }
/// <summary>
/// 下一天
/// </summary>
public VCommand DownDateCmd { get; set; }
/// <summary>
/// 上一天
/// </summary>
private void UpDate()
{
MatchDate = Convert.ToDateTime(MatchDate).AddDays(-1).ToShortDateString();
GetSchedule();
}
/// <summary>
/// 下一天
/// </summary>
private void DownDate()
{
MatchDate = Convert.ToDateTime(MatchDate).AddDays(1).ToShortDateString();
GetSchedule();
}
/// <summary> /// <summary>
/// 设置主队员数据统计 /// 设置主队员数据统计
...@@ -710,10 +793,10 @@ namespace VIZ.TVP.CBA.Module ...@@ -710,10 +793,10 @@ namespace VIZ.TVP.CBA.Module
blocks += Convert.ToDouble(playerStat.Blocked); blocks += Convert.ToDouble(playerStat.Blocked);
player.Blocks = playerStat.Blocked; player.Blocks = playerStat.Blocked;
player.PlayTime = playerStat.Minutes; player.PlayTime = playerStat.Minutes;
player.ShootingGoalP = (playerStat.FieldGoalsPercentage).ToString("F1") + "%"; player.ShootingGoalP = (playerStat.FieldGoalsPercentage*100).ToString("F1") + "%";
player.TwoShootingGoalP = (playerStat.TwoPointPercentage).ToString("F1") + "%"; player.TwoShootingGoalP = (playerStat.TwoPointPercentage).ToString("F1") + "%";
player.ThreeShootingGoalP = (playerStat.ThreePointPercentage).ToString("F1") + "%"; player.ThreeShootingGoalP = (playerStat.ThreePointPercentage*100).ToString("F1") + "%";
player.FreeThrowP = (playerStat.FreeThrowsPercentage).ToString("F1") + "%"; player.FreeThrowP = (playerStat.FreeThrowsPercentage*100).ToString("F1") + "%";
player.ShootingUnderBaketP = (playerStat.FieldGoalsAtRimPercentage * 100).ToString("F1") + "%"; player.ShootingUnderBaketP = (playerStat.FieldGoalsAtRimPercentage * 100).ToString("F1") + "%";
player.MidShootingP = (playerStat.FieldGoalsMidRangePercentage * 100).ToString("F1") + "%"; player.MidShootingP = (playerStat.FieldGoalsMidRangePercentage * 100).ToString("F1") + "%";
......
VIZ.MIGU.CBA.Module/PlayerCompare/ViewModel/NewPlayerComPareViewModel.cs
...@@ -12,6 +12,7 @@ using System.Windows; ...@@ -12,6 +12,7 @@ using System.Windows;
using VIZ.Framework.Core; using VIZ.Framework.Core;
using System.Windows.Media; using System.Windows.Media;
using DevExpress.Data; using DevExpress.Data;
using System.IO;
namespace VIZ.TVP.CBA.Module namespace VIZ.TVP.CBA.Module
{ {
...@@ -334,13 +335,21 @@ namespace VIZ.TVP.CBA.Module ...@@ -334,13 +335,21 @@ namespace VIZ.TVP.CBA.Module
if (AName == "北京控股666") if (AName == "北京控股666")
{ {
if(File.Exists(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股")))
{
APlayerLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股"))); APlayerLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股")));
} }
}
else else
{ {
if(File.Exists(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, AName)))
{
APlayerLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, AName))); APlayerLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, AName)));
} }
}
if (VNameNums.ContainsKey(APlayer)) if (VNameNums.ContainsKey(APlayer))
{ {
ANums = VNameNums[APlayer]; ANums = VNameNums[APlayer];
...@@ -372,13 +381,21 @@ namespace VIZ.TVP.CBA.Module ...@@ -372,13 +381,21 @@ namespace VIZ.TVP.CBA.Module
if (HPlayer == null) return; if (HPlayer == null) return;
if (HName == "北京控股666") 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, "北京控股"))); HPlayerLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股")));
} }
}
else 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))); HPlayerLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, HName)));
} }
}
if (HNameNums.ContainsKey(HPlayer)) if (HNameNums.ContainsKey(HPlayer))
{ {
HNums = HNameNums[HPlayer]; HNums = HNameNums[HPlayer];
......
VIZ.MIGU.CBA.Module/PlayerCompare/ViewModel/PlayerCompareViewModel.cs
...@@ -13,6 +13,7 @@ using System.ComponentModel; ...@@ -13,6 +13,7 @@ using System.ComponentModel;
using log4net; using log4net;
using System.Windows.Media.Imaging; using System.Windows.Media.Imaging;
using System.Windows.Media; using System.Windows.Media;
using System.IO;
namespace VIZ.TVP.CBA.Module namespace VIZ.TVP.CBA.Module
{ {
...@@ -536,13 +537,21 @@ namespace VIZ.TVP.CBA.Module ...@@ -536,13 +537,21 @@ namespace VIZ.TVP.CBA.Module
if(AName== "北京控股666") if(AName== "北京控股666")
{ {
if(File.Exists(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股")))
{
APlayerLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股"))); APlayerLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股")));
} }
}
else else
{ {
if(File.Exists(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, AName)))
{
APlayerLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, AName))); APlayerLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, AName)));
} }
}
if (VNameNums.ContainsKey(APlayer)) if (VNameNums.ContainsKey(APlayer))
{ {
ANums = VNameNums[APlayer]; ANums = VNameNums[APlayer];
...@@ -574,13 +583,21 @@ namespace VIZ.TVP.CBA.Module ...@@ -574,13 +583,21 @@ namespace VIZ.TVP.CBA.Module
if (HPlayer == null) return; if (HPlayer == null) return;
if (HName == "北京控股666") 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, "北京控股"))); HPlayerLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股")));
} }
}
else 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))); HPlayerLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, HName)));
} }
}
if (HNameNums.ContainsKey(HPlayer)) if (HNameNums.ContainsKey(HPlayer))
{ {
HNums = HNameNums[HPlayer]; HNums = HNameNums[HPlayer];
......
VIZ.MIGU.CBA.Module/Setting/HttpUrl/View/HttpUrlConfigView.xaml
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<Grid> <Grid>
<!-- 数据访问设置 --> <!-- 数据访问设置 -->
<GroupBox Header="数据访问配置" Margin="10" Padding="10"> <GroupBox Header="主数据访问配置" Margin="10" Padding="10">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="120"></ColumnDefinition> <ColumnDefinition Width="120"></ColumnDefinition>
...@@ -28,24 +28,56 @@ ...@@ -28,24 +28,56 @@
<RowDefinition Height="50"></RowDefinition> <RowDefinition Height="50"></RowDefinition>
<RowDefinition Height="50"></RowDefinition> <RowDefinition Height="50"></RowDefinition>
<RowDefinition Height="50"></RowDefinition> <RowDefinition Height="50"></RowDefinition>
<RowDefinition Height="50"></RowDefinition>
<RowDefinition Height="50"></RowDefinition>
<RowDefinition Height="50"></RowDefinition>
<RowDefinition Height="50"></RowDefinition>
<RowDefinition Height="50"></RowDefinition>
<RowDefinition Height="50"></RowDefinition>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<!-- 地址 --> <!-- 地址 -->
<TextBlock Text="地址:" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,10,0"></TextBlock> <TextBlock Text="主数据连接：" VerticalAlignment="Center" HorizontalAlignment="Center" />
<dxe:TextEdit Grid.Column="1" Height="30" <TextBlock Text="地址:" Grid.Column="0" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,10,0"></TextBlock>
<dxe:TextEdit Grid.Column="1" Grid.Row="1" Height="30"
EditValue="{Binding Path=Url,Mode=TwoWay}"></dxe:TextEdit> EditValue="{Binding Path=Url,Mode=TwoWay}"></dxe:TextEdit>
<!-- 艾果平台 --> <!-- 艾果平台 -->
<TextBlock Text="应用Id:" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,10,0" Grid.Row="1"></TextBlock> <TextBlock Text="应用Id:" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,10,0" Grid.Row="2"></TextBlock>
<dxe:TextEdit Grid.Column="1" Height="30" Grid.Row="1"
EditValue="{Binding Path=AppID,Mode=TwoWay}"></dxe:TextEdit>
<!-- 地址 -->
<TextBlock Text="应用Key:" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,10,0" Grid.Row="2"></TextBlock>
<dxe:TextEdit Grid.Column="1" Height="30" Grid.Row="2" <dxe:TextEdit Grid.Column="1" Height="30" Grid.Row="2"
EditValue="{Binding Path=AppId,Mode=TwoWay}"></dxe:TextEdit>
<!-- 地址 -->
<TextBlock Text="应用Key:" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,10,0" Grid.Row="3"></TextBlock>
<dxe:TextEdit Grid.Column="1" Height="30" Grid.Row="3"
EditValue="{Binding Path=AppKey,Mode=TwoWay}"></dxe:TextEdit> EditValue="{Binding Path=AppKey,Mode=TwoWay}"></dxe:TextEdit>
<TextBlock Text="备数据连接：" Grid.Row="4" VerticalAlignment="Center" HorizontalAlignment="Center" />
<!--地址-->
<TextBlock Text="地址:" Grid.Column="0" Grid.Row="5" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,10,0"></TextBlock>
<dxe:TextEdit Grid.Column="1" Grid.Row="5" Height="30"
EditValue="{Binding Path=BUrl,Mode=TwoWay}"></dxe:TextEdit>
<!-- 艾果平台 -->
<TextBlock Text="应用Id:" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,10,0" Grid.Row="6"></TextBlock>
<dxe:TextEdit Grid.Column="1" Height="30" Grid.Row="6"
EditValue="{Binding Path=BAppId,Mode=TwoWay}"></dxe:TextEdit>
<!-- 地址 -->
<TextBlock Text="应用Key:" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,10,0" Grid.Row="7"></TextBlock>
<dxe:TextEdit Grid.Column="1" Height="30" Grid.Row="7"
EditValue="{Binding Path=BAppKey,Mode=TwoWay}"></dxe:TextEdit>
</Grid> </Grid>
</GroupBox> </GroupBox>
</Grid> </Grid>
</UserControl> </UserControl>
VIZ.MIGU.CBA.Module/Setting/HttpUrl/ViewModel/HttpUrlConfigViewModel.cs
...@@ -47,10 +47,13 @@ namespace VIZ.TVP.CBA.Module ...@@ -47,10 +47,13 @@ namespace VIZ.TVP.CBA.Module
} }
// ========================================================================= // =========================================================================
// Property // Property
// ========================================================================= // =========================================================================
#region 主数据来源
#region Url -- 地址 #region Url -- 地址
private string url; private string url;
...@@ -95,6 +98,57 @@ namespace VIZ.TVP.CBA.Module ...@@ -95,6 +98,57 @@ namespace VIZ.TVP.CBA.Module
#endregion #endregion
#endregion
#region 备份数据来源
#region Url -- 地址
private string burl;
/// <summary>
/// 地址
/// </summary>
public string BUrl
{
get { return burl; }
set { burl = value; this.RaisePropertyChanged(nameof(BUrl)); }
}
#endregion
#region 应用Id
/// <summary>
/// 艾果平台应用Id
/// </summary>
private string bappId;
public string BAppId
{
get { return bappId; }
set { bappId = value; this.RaisePropertyChanged(nameof(BAppId)); }
}
#endregion
#region 平台Key
/// <summary>
/// 艾果应用平台Key
/// </summary>
private string bappKey;
public string BAppKey
{
get { return bappKey; }
set { bappKey = value; this.RaisePropertyChanged(nameof(BAppKey)); }
}
#endregion
#endregion
// ========================================================================= // =========================================================================
// Command // Command
// ========================================================================= // =========================================================================
...@@ -118,6 +172,15 @@ namespace VIZ.TVP.CBA.Module ...@@ -118,6 +172,15 @@ namespace VIZ.TVP.CBA.Module
this.AppKey = AppSetup_InitCBALiteDB.HttpUrlConfigEntity.AppKey; this.AppKey = AppSetup_InitCBALiteDB.HttpUrlConfigEntity.AppKey;
this.BUrl = AppSetup_InitCBALiteDB.HttpUrlConfigEntity.BUrl;
this.BAppId = AppSetup_InitCBALiteDB.HttpUrlConfigEntity.BAppId;
this.BAppKey = AppSetup_InitCBALiteDB.HttpUrlConfigEntity.BAppKey;
} }
#endregion #endregion
......
VIZ.MIGU.CBA.Module/SinglePlayer/ViewModel/NewSinglePlayerViewModel.cs
...@@ -10,6 +10,7 @@ using System.Windows.Media.Imaging; ...@@ -10,6 +10,7 @@ using System.Windows.Media.Imaging;
using System.Windows; using System.Windows;
using VIZ.Framework.Core; using VIZ.Framework.Core;
using System.Windows.Media; using System.Windows.Media;
using System.IO;
namespace VIZ.TVP.CBA.Module namespace VIZ.TVP.CBA.Module
{ {
...@@ -137,14 +138,22 @@ namespace VIZ.TVP.CBA.Module ...@@ -137,14 +138,22 @@ namespace VIZ.TVP.CBA.Module
if (TeamItems[selectedIndex] == "北京控股666") if (TeamItems[selectedIndex] == "北京控股666")
{ {
if(File.Exists(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股")))
{
PlayerLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股"))); PlayerLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股")));
} }
}
else else
{ {
if(File.Exists(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, TeamItems[selectedIndex])))
{
PlayerLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, TeamItems[selectedIndex]))); PlayerLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, TeamItems[selectedIndex])));
} }
} }
}
} }
else else
{ {
...@@ -154,14 +163,22 @@ namespace VIZ.TVP.CBA.Module ...@@ -154,14 +163,22 @@ namespace VIZ.TVP.CBA.Module
if (TeamItems[selectedIndex] == "北京控股666") if (TeamItems[selectedIndex] == "北京控股666")
{ {
if(File.Exists(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股")))
{
PlayerLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股"))); PlayerLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股")));
}
} }
else else
{ {
if(File.Exists(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, TeamItems[selectedIndex])))
{
PlayerLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, TeamItems[selectedIndex]))); PlayerLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, TeamItems[selectedIndex])));
} }
} }
}
} }
SetData(0); SetData(0);
......
VIZ.MIGU.CBA.Module/SinglePlayer/ViewModel/SinglePlayerViewModel.cs
...@@ -11,6 +11,7 @@ using log4net; ...@@ -11,6 +11,7 @@ using log4net;
using System.Windows.Media.Imaging; using System.Windows.Media.Imaging;
using System.Windows.Media; using System.Windows.Media;
using VIZ.Package.Domain; using VIZ.Package.Domain;
using System.IO;
namespace VIZ.TVP.CBA.Module namespace VIZ.TVP.CBA.Module
{ {
...@@ -250,14 +251,22 @@ namespace VIZ.TVP.CBA.Module ...@@ -250,14 +251,22 @@ namespace VIZ.TVP.CBA.Module
if (TeamItems[selectedIndex] == "北京控股666") if (TeamItems[selectedIndex] == "北京控股666")
{ {
if(File.Exists(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股")))
{
PlayerLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股"))); PlayerLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股")));
} }
}
else else
{ {
if(File.Exists(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, TeamItems[selectedIndex])))
{
PlayerLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, TeamItems[selectedIndex]))); PlayerLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, TeamItems[selectedIndex])));
} }
} }
}
} }
else else
{ {
...@@ -267,14 +276,22 @@ namespace VIZ.TVP.CBA.Module ...@@ -267,14 +276,22 @@ namespace VIZ.TVP.CBA.Module
if (TeamItems[selectedIndex] == "北京控股666") if (TeamItems[selectedIndex] == "北京控股666")
{ {
if(File.Exists(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股")))
{
PlayerLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股"))); PlayerLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股")));
} }
}
else else
{ {
if(File.Exists(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, TeamItems[selectedIndex])))
{
PlayerLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, TeamItems[selectedIndex]))); PlayerLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, TeamItems[selectedIndex])));
} }
} }
}
} }
SetData(); SetData();
......
VIZ.MIGU.CBA.Module/Storge/HttpUrlConfigEntity.cs
...@@ -18,6 +18,8 @@ namespace VIZ.TVP.CBA.Module ...@@ -18,6 +18,8 @@ namespace VIZ.TVP.CBA.Module
[BsonId(true)] [BsonId(true)]
public int Id { get; set; } public int Id { get; set; }
#region 主数据连接地址
/// <summary> /// <summary>
/// 地址 /// 地址
/// </summary> /// </summary>
...@@ -33,6 +35,37 @@ namespace VIZ.TVP.CBA.Module ...@@ -33,6 +35,37 @@ namespace VIZ.TVP.CBA.Module
/// </summary> /// </summary>
public string AppKey { get; set; } = "ffrw7ilc8i6r3pkzvl"; public string AppKey { get; set; } = "ffrw7ilc8i6r3pkzvl";
#endregion
#region 备份数据连接地址
/// <summary>
/// 地址
/// </summary>
public string BUrl { get; set; } = "http://180.184.78.246:18080/miku/api/open_api/proxy_api/miku/api/system_base/migu/cba/";
/// <summary>
/// 应用程序Id
/// </summary>
public string BAppId { get; set; } = "100001";
/// <summary>
/// 应用程序Key
/// </summary>
public string BAppKey { get; set; } = "ffrw7ilc8i6r3pkzvl";
#endregion
} }
} }
VIZ.MIGU.CBA.Module/TeamStats/ViewModel/NewTeamStatsViewModel.cs
...@@ -3,6 +3,7 @@ using System; ...@@ -3,6 +3,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.ComponentModel; using System.ComponentModel;
using System.IO;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
...@@ -1277,28 +1278,43 @@ namespace VIZ.TVP.CBA.Module ...@@ -1277,28 +1278,43 @@ namespace VIZ.TVP.CBA.Module
{ {
if (HomeTeam == "北京控股666") if (HomeTeam == "北京控股666")
{ {
if(File.Exists(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股")))
{
HomeTeamLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股"))); HomeTeamLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股")));
} }
}
else else
{ {
if(File.Exists(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, HomeTeam)))
{
HomeTeamLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, HomeTeam))); HomeTeamLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, HomeTeam)));
} }
} }
}
AwayTeam = onAirDataModel.liveTeamInfo.VisitingTeamCNAlias; AwayTeam = onAirDataModel.liveTeamInfo.VisitingTeamCNAlias;
if (!string.IsNullOrEmpty(AwayTeam)) if (!string.IsNullOrEmpty(AwayTeam))
{ {
if (AwayTeam == "北京控股666") if (AwayTeam == "北京控股666")
{ {
if(File.Exists(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股")))
{
AwayTeamLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股"))); AwayTeamLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股")));
} }
}
else else
{ {
if(File.Exists(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, AwayTeam)))
{
AwayTeamLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, AwayTeam))); AwayTeamLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, AwayTeam)));
} }
} }
}
TeamSeasonData = await JsonModel.PostTeamSeasonData_Path(Matchtypeid); TeamSeasonData = await JsonModel.PostTeamSeasonData_Path(Matchtypeid);
......
VIZ.MIGU.CBA.Module/TeamStats/ViewModel/TeamStatsViewModel.cs
using System; using log4net;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VIZ.Framework.Core;
using System.ComponentModel; using System.ComponentModel;
using log4net; using System.IO;
using System.Linq;
using System.Windows.Media; using System.Windows.Media;
using System.Windows.Media.Imaging; using System.Windows.Media.Imaging;
using VIZ.Framework.Core;
namespace VIZ.TVP.CBA.Module namespace VIZ.TVP.CBA.Module
{ {
...@@ -613,27 +611,43 @@ namespace VIZ.TVP.CBA.Module ...@@ -613,27 +611,43 @@ namespace VIZ.TVP.CBA.Module
{ {
if (HomeTeam == "北京控股666") if (HomeTeam == "北京控股666")
{ {
if(File.Exists(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股")))
{
HomeTeamLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股"))); HomeTeamLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股")));
} }
}
else else
{ {
if(File.Exists(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, HomeTeam)))
{
HomeTeamLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, HomeTeam))); HomeTeamLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, HomeTeam)));
} }
} }
}
AwayTeam = onAirDataModel.liveTeamInfo.VisitingTeamCNAlias; AwayTeam = onAirDataModel.liveTeamInfo.VisitingTeamCNAlias;
if (!string.IsNullOrEmpty(AwayTeam)) if (!string.IsNullOrEmpty(AwayTeam))
{ {
if (AwayTeam == "北京控股666") if (AwayTeam == "北京控股666")
{ {
if(File.Exists(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股")))
{
AwayTeamLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股"))); AwayTeamLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股")));
} }
}
else else
{ {
if(File.Exists(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, AwayTeam)))
{
AwayTeamLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, AwayTeam))); AwayTeamLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, AwayTeam)));
} }
}
} }
TeamSeasonData = await JsonModel.PostTeamSeasonData_Path(Matchtypeid); TeamSeasonData = await JsonModel.PostTeamSeasonData_Path(Matchtypeid);
......
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