Commit 6d9fc263 by wangonghui

提交修改调用平台数据中心

parent c970cc90
......@@ -105,9 +105,13 @@ namespace VIZ.TVP.CBA.Module
CompareItemToNumber.Add("罚球", teamLiveH.FreeThrows + "/"
+ teamLiveH.FreeThrowsAttempted);
CompareItemToNumber.Add("失误", teamLiveH.Turnovers);
CompareItemToNumber.Add("失误.g", teamLiveH.Turnovers);
if(!mainViewModel.MvpHomePlayerCompareNumDictionary.ContainsKey(teamLiveH.CNAlias))
{
mainViewModel.MvpHomePlayerCompareNumDictionary.Add(teamLiveH.CNAlias, CompareItemToNumber);
}
......@@ -155,7 +159,12 @@ namespace VIZ.TVP.CBA.Module
CompareItemToNumber.Add("罚球", teamLiveV.FreeThrows + "/"
+ teamLiveV.FreeThrowsAttempted);
CompareItemToNumber.Add("失误", teamLiveV.Turnovers);
if(!mainViewModel.MvpVisitPlayerCompareNumDictionary.ContainsKey(teamLiveV.CNAlias))
{
mainViewModel.MvpVisitPlayerCompareNumDictionary.Add(teamLiveV.CNAlias, CompareItemToNumber);
}
// }
}
......@@ -276,8 +285,8 @@ namespace VIZ.TVP.CBA.Module
mainViewModel.HomeTeamCompareOptionDictionary.Add("得分", mainViewModel.onAirDataModel.liveTeamStatH.Points);
mainViewModel.HomeTeamCompareOptionDictionary.Add("篮板", mainViewModel.onAirDataModel.liveTeamStatH.Rebounds);
mainViewModel.HomeTeamCompareOptionDictionary.Add("助攻", mainViewModel.onAirDataModel.liveTeamStatH.Assists);
mainViewModel.HomeTeamCompareOptionDictionary.Add("抢断", mainViewModel.onAirDataModel.liveTeamStatH.Blocked);
mainViewModel.HomeTeamCompareOptionDictionary.Add("盖帽", mainViewModel.onAirDataModel.liveTeamStatH.Steals);
mainViewModel.HomeTeamCompareOptionDictionary.Add("抢断", mainViewModel.onAirDataModel.liveTeamStatH.Steals);
mainViewModel.HomeTeamCompareOptionDictionary.Add("盖帽", mainViewModel.onAirDataModel.liveTeamStatH.Blocked);
mainViewModel.HomeTeamCompareOptionDictionary.Add("失误", mainViewModel.onAirDataModel.liveTeamStatH.Turnovers);
mainViewModel.HomeTeamCompareOptionDictionary.Add("犯规", mainViewModel.onAirDataModel.liveTeamStatH.PersonalFouls);
//HomeTeamCompareOptionDictionary.Add(TeamDataCompareOptionChinese[7], Json_OnAirData.liveTeamStatH.FlagrantFouls);
......
......@@ -62,6 +62,9 @@ namespace VIZ.TVP.CBA.Module
}
/// <summary>
/// 今日赛程信息
/// </summary>
private ObservableCollection<Dayschedule> matchData;
/// <summary>
......@@ -123,7 +126,7 @@ namespace VIZ.TVP.CBA.Module
string date = Convert.ToDateTime(matchDate).ToString("yyyy-MM-dd");
var dayschedules = await JsonModel.TomorrowMatch_Path(date);
var dayschedules = await JsonModel.PostTomorrowMatch_Path(date);
if (dayschedules == null) return;
......
......@@ -7,41 +7,41 @@ using VIZ.Package.Domain;
namespace VIZ.TVP.CBA.Module.HeaderPage
{
public class HeaderPagePlugin : IPluginLifeCycle
{
//public class HeaderPagePlugin : IPluginLifeCycle
//{
/// <summary>
/// 插件ID
/// </summary>
/// <remarks>
/// 插件ID不能包含点号
/// </remarks>
public const string PLUGIN_ID = "DateHeaderView";
// /// <summary>
// /// 插件ID
// /// </summary>
// /// <remarks>
// /// 插件ID不能包含点号
// /// </remarks>
// public const string PLUGIN_ID = "DateHeaderView";
/// <summary>
/// 插件显示名称
/// </summary>
public const string PLUGIN_NAME = "赛程";
public void Dispose()
{
// /// <summary>
// /// 插件显示名称
// /// </summary>
// public const string PLUGIN_NAME = "赛程";
// public void Dispose()
// {
}
// }
public void Initialize()
{
// public void Initialize()
// {
}
// }
public PluginInfo Register()
{
PluginInfo info = new PluginInfo();
//info.Group = PluginConstant.GroupName;
//info.ID = PLUGIN_ID;
//info.Name = PLUGIN_NAME;
//info.PluginType = PluginType.Module;
//info.ViewType = typeof(DateHeaderView);
////info.SettingViewType = typeof(DayMatchUI)
return info;
}
}
// public PluginInfo Register()
// {
// PluginInfo info = new PluginInfo();
// info.Group = PluginConstant.GroupName;
// info.ID = PLUGIN_ID;
// info.Name = PLUGIN_NAME;
// info.PluginType = PluginType.Module;
// info.ViewType = typeof(DateHeaderView);
// ////info.SettingViewType = typeof(DayMatchUI)
// return info;
// }
//}
}
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VIZ.Framework.Core;
namespace VIZ.TVP.CBA.Module
{
public class PlayersStats : ViewModelBase
{
//球员名称
private string playerName;
public string PlayerName
{
get { return playerName; }
set { playerName = value; this.RaisePropertyChanged(nameof(PlayerName)); }
}
//得分
private string goal;
/// <summary>
///得分
/// </summary>
public string Goal
{
get { return goal; }
set { goal = value; this.RaisePropertyChanged(nameof(Goal)); }
}
//篮板
private string rebounds;
public string Rebounds
{
get { return rebounds; }
set { rebounds = value; this.RaisePropertyChanged(nameof(Rebounds)); }
}
//助攻
private string assists;
public string Assists
{
get { return assists; }
set { assists = value; this.RaisePropertyChanged(nameof(Assists)); }
}
//盖帽
private string blocks;
public string Blocks
{
get { return blocks; }
set { blocks = value; this.RaisePropertyChanged(nameof(Blocks)); }
}
//抢断
private string steals;
public string Steals
{
get { return steals; }
set { steals = value; this.RaisePropertyChanged(nameof(Steals)); }
}
//失误
private string error;
public string Error
{
get { return error; }
set { error = value; this.RaisePropertyChanged(nameof(Error)); }
}
//犯规
private string foul;
public string Foul
{
get { return foul; }
set { foul = value; this.RaisePropertyChanged(nameof(Foul)); }
}
//罚球命中率
private string freeThrowP;
public string FreeThrowP
{
get { return freeThrowP; }
set { freeThrowP = value; this.RaisePropertyChanged(nameof(FreeThrowP)); }
}
//两分命中率
private string twoShootingGoalP;
public string TwoShootingGoalP
{
get { return twoShootingGoalP; }
set { twoShootingGoalP = value; this.RaisePropertyChanged(nameof(TwoShootingGoalP)); }
}
//三分命中率
private string threeShootingGoalP;
public string ThreeShootingGoalP
{
get { return threeShootingGoalP; }
set { threeShootingGoalP = value; this.RaisePropertyChanged(nameof(ThreeShootingGoalP)); }
}
//投篮命中率
private string shootingGoalP;
public string ShootingGoalP
{
get { return shootingGoalP; }
set { shootingGoalP = value; this.RaisePropertyChanged(nameof(ShootingGoalP)); }
}
//篮下投篮命中率
private string shootingUnderBaketP;
public string ShootingUnderBaketP
{
get { return shootingUnderBaketP; }
set { shootingUnderBaketP = value; this.RaisePropertyChanged(nameof(ShootingUnderBaketP)); }
}
//中距离投篮命中率
private string midShootingP;
public string MidShootingP
{
get { return midShootingP; }
set { midShootingP = value; this.RaisePropertyChanged(nameof(MidShootingP)); }
}
//三分
private string threeScore;
public string ThreeScore
{
get { return threeScore; }
set { threeScore = value; this.RaisePropertyChanged(nameof(ThreeScore)); }
}
//两分
private string twoScore;
public string TwoScore
{
get { return twoScore; }
set { twoScore = value; this.RaisePropertyChanged(nameof(TwoScore)); }
}
//两分区
private string twoArea;
public string TwoArea
{
get { return twoArea; }
set { twoArea = value; this.RaisePropertyChanged(nameof(TwoArea)); }
}
/// <summary>
/// 上场时间
/// </summary>
private string playTime;
public string PlayTime
{
get { return playTime; }
set { playTime = value;this.RaisePropertyChanged(nameof(PlayTime)); }
}
/// <summary>
/// 三分区
/// </summary>
private string threeArea;
public string ThreeArea
{
get { return threeArea; }
set { threeArea = value;this.RaisePropertyChanged(nameof(ThreeArea)); }
}
/// <summary>
/// 三秒区
/// </summary>
private string sedArea;
public string SedArea
{
get { return sedArea; }
set { sedArea = value;this.RaisePropertyChanged(nameof(SedArea)); }
}
/// <summary>
/// 罚球
/// </summary>
private string freeThrow;
public string FreeThrow
{
get { return freeThrow; }
set { freeThrow = value;this.RaisePropertyChanged(nameof(FreeThrow)); }
}
}
}
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VIZ.Framework.Core;
namespace VIZ.TVP.CBA.Module
{
/// <summary>
/// 查看球队统计
/// </summary>
public class ShowTeamStats :ViewModelBase
{
//球队
private string teamName;
public string TeamName
{
get { return teamName; }
set { teamName = value; this.RaisePropertyChanged(nameof(TeamName)); }
}
//得分
private string goal;
/// <summary>
///得分
/// </summary>
public string Goal
{
get { return goal; }
set { goal = value; this.RaisePropertyChanged(nameof(Goal)); }
}
//篮板
private string rebounds;
public string Rebounds
{
get { return rebounds; }
set { rebounds = value; this.RaisePropertyChanged(nameof(Rebounds)); }
}
//助攻
private string assists;
public string Assists
{
get { return assists; }
set { assists = value; this.RaisePropertyChanged(nameof(Assists)); }
}
//盖帽
private string blocks;
public string Blocks
{
get { return blocks; }
set { blocks = value; this.RaisePropertyChanged(nameof(Blocks)); }
}
//抢断
private string steals;
public string Steals
{
get { return steals; }
set { steals = value; this.RaisePropertyChanged(nameof(Steals)); }
}
//失误
private string error;
public string Error
{
get { return error; }
set { error = value; this.RaisePropertyChanged(nameof(Error)); }
}
//犯规
private string foul;
public string Foul
{
get { return foul; }
set { foul = value; this.RaisePropertyChanged(nameof(Foul)); }
}
//罚球命中率
private string freeThrowP;
public string FreeThrowP
{
get { return freeThrowP; }
set { freeThrowP = value; this.RaisePropertyChanged(nameof(FreeThrowP)); }
}
//两分命中率
private string twoShootingGoalP;
public string TwoShootingGoalP
{
get { return twoShootingGoalP; }
set { twoShootingGoalP = value; this.RaisePropertyChanged(nameof(TwoShootingGoalP)); }
}
//三分命中率
private string threeShootingGoalP;
public string ThreeShootingGoalP
{
get { return threeShootingGoalP; }
set { threeShootingGoalP = value; this.RaisePropertyChanged(nameof(ThreeShootingGoalP)); }
}
//投篮命中率
private string shootingGoalP;
public string ShootingGoalP
{
get { return shootingGoalP; }
set { shootingGoalP = value; this.RaisePropertyChanged(nameof(ShootingGoalP)); }
}
//篮下投篮命中率
private string shootingUnderBaketP;
public string ShootingUnderBaketP
{
get { return shootingUnderBaketP; }
set { shootingUnderBaketP = value; this.RaisePropertyChanged(nameof(ShootingUnderBaketP)); }
}
//中距离投篮命中率
private string midShootingP;
public string MidShootingP
{
get { return midShootingP; }
set { midShootingP = value; this.RaisePropertyChanged(nameof(MidShootingP)); }
}
//三分
private string threeScore;
public string ThreeScore
{
get { return threeScore; }
set { threeScore = value; this.RaisePropertyChanged(nameof(ThreeScore)); }
}
//两分
private string twoScore;
public string TwoScore
{
get { return twoScore; }
set { twoScore = value; this.RaisePropertyChanged(nameof(TwoScore)); }
}
//两分区
private string twoArea;
public string TwoArea
{
get { return twoArea; }
set { twoArea = value; this.RaisePropertyChanged(nameof(TwoArea)); }
}
//三分得分
private string threeGoals;
public string ThreeGoals
{
get { return threeGoals; }
set { threeGoals = value; this.RaisePropertyChanged(nameof(ThreeGoals)); }
}
}
}
......@@ -12,7 +12,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using VIZ.Framework.Core;
using VIZ.TVP.CBA.Module.HeaderPage.ViewModel;
namespace VIZ.TVP.CBA.Module
{
......
......@@ -198,6 +198,14 @@
</Grid>
</TabItem>
<TabItem Header="查看" FontSize="20">
<Grid>
<moduel:DateHeaderView>
</moduel:DateHeaderView>
</Grid>
</TabItem>
</TabControl>
......
......@@ -172,8 +172,11 @@ namespace VIZ.TVP.CBA.Module
CompareItemToNumber.Add("罚球", teamLive.FreeThrows + "/"
+ teamLive.FreeThrowsAttempted);
CompareItemToNumber.Add("失误", teamLive.Turnovers);
MvpHomePlayerCompareNumDictionary.Add(teamLive.CNAlias, CompareItemToNumber);
if (!MvpHomePlayerCompareNumDictionary.ContainsKey(teamLive.CNAlias))
{
MvpHomePlayerCompareNumDictionary.Add(teamLive.CNAlias, CompareItemToNumber);
}
}
......@@ -225,7 +228,12 @@ namespace VIZ.TVP.CBA.Module
CompareItemToNumber.Add("罚球", teamLive.FreeThrows + "/"
+ teamLive.FreeThrowsAttempted);
CompareItemToNumber.Add("失误", teamLive.Turnovers);
MvpVisitPlayerCompareNumDictionary.Add(teamLive.CNAlias, CompareItemToNumber);
if(!MvpVisitPlayerCompareNumDictionary.ContainsKey(teamLive.CNAlias))
{
MvpVisitPlayerCompareNumDictionary.Add(teamLive.CNAlias, CompareItemToNumber);
}
}
......@@ -836,7 +844,7 @@ namespace VIZ.TVP.CBA.Module
private void BtnCmd()
{
onAirDataModel = JsonModel.OnAirData_Path(ScheduleID);
onAirDataModel = JsonModel.PostOnAirData_Path(ScheduleID);
if (onAirDataModel == null) return;
SetPlayer(false);
SetAData();
......@@ -861,7 +869,7 @@ namespace VIZ.TVP.CBA.Module
MatchItems = new ObservableCollection<string>();
string date = Convert.ToDateTime(matchDate).ToString("yyyy-MM-dd");
var dayschedules = await JsonModel.TomorrowMatch_Path(date);
var dayschedules = await JsonModel.PostTomorrowMatch_Path(date);
if (dayschedules == null) return;
// matchData.AddRange(dayschedules.dayschedule);
......@@ -926,9 +934,9 @@ namespace VIZ.TVP.CBA.Module
try
{
PlayerSeasonData = await JsonModel.PlayerSeasonData_Path(Matchtypeid);
PlayerSeasonData = await JsonModel.PostPlayerSeasonData_Path(Matchtypeid);
TeamSeasonData = await JsonModel.TeamSeasonData_Path(Matchtypeid);
TeamSeasonData = await JsonModel.PostTeamSeasonData_Path(Matchtypeid);
CNAliasPlayerSportsDictionary.Clear();
......@@ -988,7 +996,7 @@ namespace VIZ.TVP.CBA.Module
{
if (SelectMatchItems == null) return;
ScheduleID = SetMatchDict[SelectMatchItems];
onAirDataModel = JsonModel.OnAirData_Path(ScheduleID);
onAirDataModel = JsonModel.PostOnAirData_Path(ScheduleID);
if (onAirDataModel == null) return;
if (onAirDataModel != null)
......
......@@ -209,7 +209,7 @@ namespace VIZ.TVP.CBA.Module
public void BtnCommand()
{
var roundSchedules = JsonModel.GetGameRound_Path(roundMatchItem.ToString());
var roundSchedules = JsonModel.PostGetGameRound_Path(roundMatchItem.ToString());
if (roundSchedules == null) return;
RoundMatchData = new ObservableCollection<RoundSchedule>();
......
......@@ -33,7 +33,7 @@
<TextBlock Text="地址:" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,10,0"></TextBlock>
<dxe:TextEdit Grid.Column="1" Height="30"
EditValue="{Binding Path=Url,Mode=TwoWay}"></dxe:TextEdit>
<!-- 艾果平台 -->
<TextBlock Text="应用Id:" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,10,0" Grid.Row="1"></TextBlock>
<dxe:TextEdit Grid.Column="1" Height="30" Grid.Row="1"
......
......@@ -917,7 +917,7 @@ namespace VIZ.TVP.CBA.Module
{
if (SelectMatchItems == null) return;
ScheduleID = SetMatchDict[SelectMatchItems];
onAirDataModel = JsonModel.OnAirData_Path(ScheduleID);
onAirDataModel = JsonModel.PostOnAirData_Path(ScheduleID);
if (onAirDataModel == null) return;
if (onAirDataModel != null)
{
......@@ -978,7 +978,7 @@ namespace VIZ.TVP.CBA.Module
MatchItems = new ObservableCollection<string>();
string date = Convert.ToDateTime(matchDate).ToString("yyyy-MM-dd");
var dayschedules = await JsonModel.TomorrowMatch_Path(date);
var dayschedules = await JsonModel.PostTomorrowMatch_Path(date);
if (dayschedules == null) return;
......@@ -1049,9 +1049,9 @@ namespace VIZ.TVP.CBA.Module
{
try
{
PlayerSeasonData = await JsonModel.PlayerSeasonData_Path(Matchtypeid);
PlayerSeasonData = await JsonModel.PostPlayerSeasonData_Path(Matchtypeid);
TeamSeasonData = await JsonModel.TeamSeasonData_Path(Matchtypeid);
TeamSeasonData = await JsonModel.PostTeamSeasonData_Path(Matchtypeid);
if (PlayerSeasonData == null) return;
CNAliasPlayerSportsDictionary.Clear();
......@@ -1159,7 +1159,7 @@ namespace VIZ.TVP.CBA.Module
/// </summary>
private void BtnCommand()
{
onAirDataModel = JsonModel.OnAirData_Path(ScheduleID);
onAirDataModel = JsonModel.PostOnAirData_Path(ScheduleID);
if (onAirDataModel == null) return;
MvpHomePlayerCompareNumDictionary.Clear();
MvpVisitPlayerCompareNumDictionary.Clear();
......
......@@ -21,17 +21,17 @@ namespace VIZ.TVP.CBA.Module
/// <summary>
/// 地址
/// </summary>
public string Url { get; set; } = "http://sportsdata.misports.cn/beitai/api/";
public string Url { 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 AppId { get; set; }
public string AppId { get; set; } = "100001";
/// <summary>
/// 应用程序Key
/// </summary>
public string AppKey { get; set; }
public string AppKey { get; set; } = "ffrw7ilc8i6r3pkzvl";
}
......
......@@ -145,7 +145,7 @@ namespace VIZ.TVP.CBA.Module
private void BtmCommand()
{
var teamStands = JsonModel.TeamScoreData_Path();
var teamStands = JsonModel.PostTeamScoreData_Path();
if (teamStands == null) return;
TeamRanksModel = new ObservableCollection<Teamrank>();
int i = 1;
......
......@@ -519,7 +519,7 @@ namespace VIZ.TVP.CBA.Module
private void BtnCmd()
{
onAirDataModel = JsonModel.OnAirData_Path(ScheduleID);
onAirDataModel = JsonModel.PostOnAirData_Path(ScheduleID);
if (onAirDataModel == null) return;
Utils.SetHomeTeamDictionary(this);
Utils.SetVisitTeamDictionary(this);
......@@ -533,7 +533,7 @@ namespace VIZ.TVP.CBA.Module
{
if (SelectMatchItems == null) return;
ScheduleID = SetMatchDict[SelectMatchItems];
onAirDataModel = JsonModel.OnAirData_Path(ScheduleID);
onAirDataModel = JsonModel.PostOnAirData_Path(ScheduleID);
if (onAirDataModel == null) return;
if (onAirDataModel != null)
......@@ -562,7 +562,7 @@ namespace VIZ.TVP.CBA.Module
AwayTeam = onAirDataModel.liveTeamInfo.VisitingTeamCNAlias;
TeamSeasonData = await JsonModel.TeamSeasonData_Path(Matchtypeid);
TeamSeasonData = await JsonModel.PostTeamSeasonData_Path(Matchtypeid);
SetTeamSeasonDictionary();
......@@ -625,7 +625,7 @@ namespace VIZ.TVP.CBA.Module
MatchItems = new ObservableCollection<string>();
string date = Convert.ToDateTime(matchDate).ToString("yyyy-MM-dd");
var dayschedules = await JsonModel.TomorrowMatch_Path(date);
var dayschedules = await JsonModel.PostTomorrowMatch_Path(date);
if (dayschedules == null) return;
// matchData.AddRange(dayschedules.dayschedule);
......
......@@ -127,6 +127,8 @@
<Compile Include="DayMatch\DayMatchPlugin.cs" />
<Compile Include="DayMatch\Model\Dayschedules.cs" />
<Compile Include="HeaderPage\HeaderPagePlugin.cs" />
<Compile Include="HeaderPage\Model\PlayersStats.cs" />
<Compile Include="HeaderPage\Model\ShowTeamStats.cs" />
<Compile Include="HeaderPage\ViewModel\DateHeaderViewModel.cs" />
<Compile Include="HeaderPage\View\DateHeaderView.xaml.cs">
<DependentUpon>DateHeaderView.xaml</DependentUpon>
......
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