修改足球bug

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

@@ -128,41 +128,49 @@ namespace VIZ.TVP.FTB.Module
         ///球队积分数据服务器地址
         /// </summary>
         /// <returns></returns>
-        public static TeamRanks PostTeamScoreData_Path(string footballType,string seasonId)
+        public  async static  Task<TeamRanks> PostTeamScoreData_Path(string footballType,string seasonId)
         {
             try
             {
                 GethttpUrl();
-                string TeamScoreDataPath = strUrl + "team/getteamstats";
 
+                TeamRanks teamRanks = new TeamRanks();
 
-                Dictionary<string, string> dict = new Dictionary<string, string>();
+                await Task.Run(() =>
+                {
+                    string TeamScoreDataPath = strUrl + "team/getteamstats";
 
-                dict.Add("competitionId", footballType);
-                dict.Add("seasonId", seasonId);//"110000005454"
 
-                string newKey = Utils.GetKey(appID, appKey);
+                    Dictionary<string, string> dict = new Dictionary<string, string>();
 
-                string result = JsonHelper.Post(TeamScoreDataPath, dict, newKey);
+                    dict.Add("competitionId", footballType);
+                    dict.Add("seasonId", seasonId);//"110000005454"
 
-                if(dataFromSource)
-                {
-                    Log.Info($"{DateHeaderViewModel.FoolballType}球队积分排行数据:主数据来源:{TeamScoreDataPath}==>:" + result);
-                }
-                else
-                {
-                    Log.Info($"{DateHeaderViewModel.FoolballType}球队积分排行数据:备份数据来源:{TeamScoreDataPath}==>:" + result);
-                }
-                
-                JsonSerializerSettings settings = new JsonSerializerSettings();
-                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.teamstats = sortRanks;
-
-                Console.WriteLine("球队积分排行数据============>:" + TeamScoreDataPath);
+                    string newKey = Utils.GetKey(appID, appKey);
+
+                    string result = JsonHelper.Post(TeamScoreDataPath, dict, newKey);
+
+                    if (dataFromSource)
+                    {
+                        Log.Info($"{DateHeaderViewModel.FoolballType}球队积分排行数据:主数据来源:{TeamScoreDataPath}==>:" + result);
+                    }
+                    else
+                    {
+                        Log.Info($"{DateHeaderViewModel.FoolballType}球队积分排行数据:备份数据来源:{TeamScoreDataPath}==>:" + result);
+                    }
+
+                    JsonSerializerSettings settings = new JsonSerializerSettings();
+                    settings.NullValueHandling = NullValueHandling.Ignore;
+
+                    teamRanks = JsonConvert.DeserializeObject<TeamRanks>(result, settings);
+                    if (teamRanks != null)
+                    {
+                        var sortRanks = teamRanks.teamstats.OrderBy(a => Convert.ToInt32(a.rank)).ToList();
+                        teamRanks.teamstats = sortRanks;
+                    }
+                    Console.WriteLine("球队积分排行数据============>:" + TeamScoreDataPath);
+
+                });
 
                 return teamRanks;
             }

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

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

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

@@ -397,7 +397,7 @@ namespace VIZ.TVP.FTB.Module
         /// <summary>
         /// 刷新球队积分排名
         /// </summary>
-        private void BtmCommand1()
+        private async void BtmCommand1()
         {
             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;
             }
 
-            teamStands = JsonModel.PostTeamScoreData_Path(FoolballType, SeasonId);
+            teamStands = await JsonModel.PostTeamScoreData_Path(FoolballType, SeasonId);
             if (teamStands == null) return;
             TeamRanksModel = new ObservableCollection<Teamrank>();
-            int i = 1;
+            //int i = 1;
             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.teamLogo = teamRank.teamName;
 
                 TeamRanksModel.Add(teamRank);
-                i++;
+              // i++;
             }
         }