修改足球bug

VIZ.TVP.FTB.Module/Common/JsonModel.cs

@@ -128,11 +128,16 @@ namespace VIZ.TVP.FTB.Module
         ///球队积分数据服务器地址
         ///球队积分数据服务器地址
         /// </summary>
         /// </summary>
         /// <returns></returns>
         /// <returns></returns>
-        public static TeamRanks PostTeamScoreData_Path(string footballType,string seasonId)
+        public  async static  Task<TeamRanks> PostTeamScoreData_Path(string footballType,string seasonId)
         {
         {
             try
             try
             {
             {
                 GethttpUrl();
                 GethttpUrl();
+
+                TeamRanks teamRanks = new TeamRanks();
+
+                await Task.Run(() =>
+                {
                     string TeamScoreDataPath = strUrl + "team/getteamstats";
                     string TeamScoreDataPath = strUrl + "team/getteamstats";
 
 
 
 
@@ -145,7 +150,7 @@ namespace VIZ.TVP.FTB.Module
 
 
                     string result = JsonHelper.Post(TeamScoreDataPath, dict, newKey);
                     string result = JsonHelper.Post(TeamScoreDataPath, dict, newKey);
 
 
-                if(dataFromSource)
+                    if (dataFromSource)
                     {
                     {
                         Log.Info($"{DateHeaderViewModel.FoolballType}球队积分排行数据:主数据来源:{TeamScoreDataPath}==>:" + result);
                         Log.Info($"{DateHeaderViewModel.FoolballType}球队积分排行数据:主数据来源:{TeamScoreDataPath}==>:" + result);
                     }
                     }
@@ -157,13 +162,16 @@ namespace VIZ.TVP.FTB.Module
                     JsonSerializerSettings settings = new JsonSerializerSettings();
                     JsonSerializerSettings settings = new JsonSerializerSettings();
                     settings.NullValueHandling = NullValueHandling.Ignore;
                     settings.NullValueHandling = NullValueHandling.Ignore;
 
 
-                TeamRanks teamRanks = JsonConvert.DeserializeObject<TeamRanks>(result, settings);
-                if (teamRanks == null) return null;
-                var sortRanks = teamRanks.teamstats.OrderByDescending(a => a.score).ToList();
+                    teamRanks = JsonConvert.DeserializeObject<TeamRanks>(result, settings);
+                    if (teamRanks != null)
+                    {
+                        var sortRanks = teamRanks.teamstats.OrderBy(a => Convert.ToInt32(a.rank)).ToList();
                         teamRanks.teamstats = sortRanks;
                         teamRanks.teamstats = sortRanks;
-
+                    }
                     Console.WriteLine("球队积分排行数据============>:" + TeamScoreDataPath);
                     Console.WriteLine("球队积分排行数据============>:" + TeamScoreDataPath);
 
 
+                });
+
                 return teamRanks;
                 return teamRanks;
             }
             }
             catch (Exception ex)
             catch (Exception ex)

VIZ.TVP.FTB.Module/FTeamStandings/ViewModel/FTeamStandingViewModel.cs

@@ -48,7 +48,7 @@ namespace VIZ.TVP.FTB.Module
         /// <summary>
         /// <summary>
         /// 刷新球队积分排名
         /// 刷新球队积分排名
         /// </summary>
         /// </summary>
-        private void BtmCommand()
+        private async void BtmCommand()
         {
         {
             teamStands = new TeamRanks();
             teamStands = new TeamRanks();
 
 
@@ -78,19 +78,18 @@ namespace VIZ.TVP.FTB.Module
                 SeasonId = AppSetup_InitLiteDB.HttpUrlConfigEntity.SLPSeasonId;
                 SeasonId = AppSetup_InitLiteDB.HttpUrlConfigEntity.SLPSeasonId;
             }
             }
 
 
-            teamStands = JsonModel.PostTeamScoreData_Path(FoolballType, SeasonId);
+            teamStands =  await JsonModel.PostTeamScoreData_Path(FoolballType, SeasonId);
             if (teamStands == null) return;
             if (teamStands == null) return;
             TeamRanksModel = new ObservableCollection<Teamrank>();
             TeamRanksModel = new ObservableCollection<Teamrank>();
-            int i = 1;
+         
             foreach (var teamRank in teamStands.teamstats)
             foreach (var teamRank in teamStands.teamstats)
             {
             {
-                teamRank.rank = i.ToString();
             
             
                 teamRank.goalAndLoseNums = String.Format("{0}/{1}", teamRank.goalsNum,teamRank.loseGoalsNum);
                 teamRank.goalAndLoseNums = String.Format("{0}/{1}", teamRank.goalsNum,teamRank.loseGoalsNum);
                 teamRank.teamLogo = teamRank.teamName;
                 teamRank.teamLogo = teamRank.teamName;
 
 
                 TeamRanksModel.Add(teamRank);
                 TeamRanksModel.Add(teamRank);
-                i++;
+                
             }
             }
         }
         }
 
 

VIZ.TVP.FTB.Module/HeaderPage/ViewModel/DateHeaderViewModel.cs

@@ -397,7 +397,7 @@ namespace VIZ.TVP.FTB.Module
         /// <summary>
         /// <summary>
         /// 刷新球队积分排名
         /// 刷新球队积分排名
         /// </summary>
         /// </summary>
-        private void BtmCommand1()
+        private async void BtmCommand1()
         {
         {
             this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, "足球查看球队积分:" + SeasonId + " " + selectFootballType);
             this.recordLogService.AppendLog(ApplicationConstants.APPLICATION_GROUP_NAME, RecordLogOperate.Operate, RecordLogTrigger.Human, "足球查看球队积分:" + SeasonId + " " + selectFootballType);
 
 
@@ -429,19 +429,19 @@ namespace VIZ.TVP.FTB.Module
                 SeasonId = AppSetup_InitLiteDB.HttpUrlConfigEntity.SLPSeasonId;
                 SeasonId = AppSetup_InitLiteDB.HttpUrlConfigEntity.SLPSeasonId;
             }
             }
 
 
-            teamStands = JsonModel.PostTeamScoreData_Path(FoolballType, SeasonId);
+            teamStands = await JsonModel.PostTeamScoreData_Path(FoolballType, SeasonId);
             if (teamStands == null) return;
             if (teamStands == null) return;
             TeamRanksModel = new ObservableCollection<Teamrank>();
             TeamRanksModel = new ObservableCollection<Teamrank>();
-            int i = 1;
+            //int i = 1;
             foreach (var teamRank in teamStands.teamstats)
             foreach (var teamRank in teamStands.teamstats)
             {
             {
-                teamRank.rank = i.ToString();
+               // teamRank.rank = i.ToString();
 
 
                 teamRank.goalAndLoseNums = String.Format("{0}/{1}", teamRank.goalsNum, teamRank.loseGoalsNum);
                 teamRank.goalAndLoseNums = String.Format("{0}/{1}", teamRank.goalsNum, teamRank.loseGoalsNum);
                 teamRank.teamLogo = teamRank.teamName;
                 teamRank.teamLogo = teamRank.teamName;
 
 
                 TeamRanksModel.Add(teamRank);
                 TeamRanksModel.Add(teamRank);
-                i++;
+              // i++;
             }
             }
         }
         }