Skip to content

V
VIZ.TVP.CBA
Commit 736079a0 by wangonghui
Options

修改bug

parent dedf11ed
Showing with 18 additions and 105 deletions
VIZ.MIGU.CBA.Module/Common/JsonModel.cs
...@@ -155,6 +155,8 @@ namespace VIZ.TVP.CBA.Module ...@@ -155,6 +155,8 @@ namespace VIZ.TVP.CBA.Module
settings.NullValueHandling = NullValueHandling.Ignore; settings.NullValueHandling = NullValueHandling.Ignore;
dayschedules = JsonConvert.DeserializeObject<Dayschedules>(str, settings); dayschedules = JsonConvert.DeserializeObject<Dayschedules>(str, settings);
dayschedules.dayschedule= dayschedules.dayschedule.OrderBy(a=>a.time).ToList();
}); });
return dayschedules; return dayschedules;
......
VIZ.MIGU.CBA.Module/DayMatch/ViewModel/DayMatchViewModel.cs
...@@ -166,6 +166,8 @@ namespace VIZ.TVP.CBA.Module ...@@ -166,6 +166,8 @@ namespace VIZ.TVP.CBA.Module
MatchData.Add(dayschedule); MatchData.Add(dayschedule);
} }
flag = true; flag = true;
} }
catch(Exception ex) catch(Exception ex)
......
VIZ.MIGU.CBA.Module/PlayerCompare/ViewModel/PlayerCompareViewModel.cs
...@@ -277,45 +277,6 @@ namespace VIZ.TVP.CBA.Module ...@@ -277,45 +277,6 @@ namespace VIZ.TVP.CBA.Module
if (Convert.ToInt32(MatchStatsId) == 7) if (Convert.ToInt32(MatchStatsId) == 7)
{ {
PlayerComModels = new ObservableCollection<PlayerComModel>(); PlayerComModels = new ObservableCollection<PlayerComModel>();
//{
// new PlayerComModel()
// {
// //TechStats=TechStats.Goal
// TechStatsName="得分"
// },
// new PlayerComModel()
// {
// // TechStats=TechStats.Rebounds
// TechStatsName="篮板"
// },
// new PlayerComModel()
// {
// // TechStats=TechStats.Assists
// TechStatsName="助攻"
// },
// new PlayerComModel()
// {
// //TechStats=TechStats.Blocks
// TechStatsName="盖帽"
// },
// new PlayerComModel()
// {
// //TechStats=TechStats.Steals
// TechStatsName="抢断"
// },
// new PlayerComModel()
// {
// //TechStats=TechStats.ShootingGoalP
// TechStatsName="投篮命中率"
// },
// new PlayerComModel()
// {
// //TechStats=TechStats.ThreeShootingGoalP
// TechStatsName="三分命中率"
// }
//};
PlayerComModel PlayGoal = new PlayerComModel(); PlayerComModel PlayGoal = new PlayerComModel();
PlayGoal.TechStatsName = "得分"; PlayGoal.TechStatsName = "得分";
...@@ -351,6 +312,9 @@ namespace VIZ.TVP.CBA.Module ...@@ -351,6 +312,9 @@ namespace VIZ.TVP.CBA.Module
ThreeShootingGoalP.TechStatsName = "三分命中率"; ThreeShootingGoalP.TechStatsName = "三分命中率";
ThreeShootingGoalP.PropertyChanged += OnModelChanged; ThreeShootingGoalP.PropertyChanged += OnModelChanged;
playerComModels.Add(ThreeShootingGoalP); playerComModels.Add(ThreeShootingGoalP);
} }
else if (Convert.ToInt32(MatchStatsId) == 6) else if (Convert.ToInt32(MatchStatsId) == 6)
...@@ -385,40 +349,6 @@ namespace VIZ.TVP.CBA.Module ...@@ -385,40 +349,6 @@ namespace VIZ.TVP.CBA.Module
ShootingGoalP.TechStatsName = "投篮命中率"; ShootingGoalP.TechStatsName = "投篮命中率";
ShootingGoalP.PropertyChanged += OnModelChanged; ShootingGoalP.PropertyChanged += OnModelChanged;
playerComModels.Add(ShootingGoalP); playerComModels.Add(ShootingGoalP);
//{
// new PlayerComModel()
// {
// //TechStats=TechStats.Goal
// TechStatsName="得分"
// },
// new PlayerComModel()
// {
// // TechStats=TechStats.Rebounds
// TechStatsName="篮板"
// },
// new PlayerComModel()
// {
// // TechStats=TechStats.Assists
// TechStatsName="助攻"
// },
// new PlayerComModel()
// {
// //TechStats=TechStats.Blocks
// TechStatsName="盖帽"
// },
// new PlayerComModel()
// {
// //TechStats=TechStats.Steals
// TechStatsName="抢断"
// },
// new PlayerComModel()
// {
// //TechStats=TechStats.ShootingGoalP
// TechStatsName="投篮命中率"
// }
//};
} }
else if (Convert.ToInt32(MatchStatsId) == 5) else if (Convert.ToInt32(MatchStatsId) == 5)
...@@ -451,35 +381,6 @@ namespace VIZ.TVP.CBA.Module ...@@ -451,35 +381,6 @@ namespace VIZ.TVP.CBA.Module
Steals.PropertyChanged += OnModelChanged; Steals.PropertyChanged += OnModelChanged;
playerComModels.Add(Steals); playerComModels.Add(Steals);
//{
// new PlayerComModel()
// {
// //TechStats=TechStats.Goal
// TechStatsName="得分"
// },
// new PlayerComModel()
// {
// // TechStats=TechStats.Rebounds
// TechStatsName="篮板"
// },
// new PlayerComModel()
// {
// // TechStats=TechStats.Assists
// TechStatsName="助攻"
// },
// new PlayerComModel()
// {
// //TechStats=TechStats.Blocks
// TechStatsName="盖帽"
// },
// new PlayerComModel()
// {
// //TechStats=TechStats.Steals
// TechStatsName="抢断"
// }
//};
} }
...@@ -633,7 +534,15 @@ namespace VIZ.TVP.CBA.Module ...@@ -633,7 +534,15 @@ namespace VIZ.TVP.CBA.Module
if (APlayer == null) return; if (APlayer == null) return;
APlayerLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, AName))); if(AName== "北京控股666")
{
APlayerLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, "北京控股")));
}
else
{
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];
...@@ -663,13 +572,13 @@ namespace VIZ.TVP.CBA.Module ...@@ -663,13 +572,13 @@ namespace VIZ.TVP.CBA.Module
hPlayer = value; hPlayer = value;
this.RaisePropertyChanged(nameof(HPlayer)); this.RaisePropertyChanged(nameof(HPlayer));
if (HPlayer == null) return; if (HPlayer == null) return;
if (AName == "北京控股666") if (HName == "北京控股666")
{ {
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
{ {
HPlayerLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, AName))); HPlayerLogo = new BitmapImage(new Uri(string.Format("{0}Image\\Teamlogo\\{1}.png", baesePath, HName)));
} }
if (HNameNums.ContainsKey(HPlayer)) if (HNameNums.ContainsKey(HPlayer))
......
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