修复趋势页面数据不显示问题

CarGuo · Jun 12, 2019 · 281085a · 281085a
1 parent ef08bba
commit 281085a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/lib/bloc/trend_bloc.dart b/lib/bloc/trend_bloc.dart
@@ -41,9 +41,7 @@ class TrendBloc {
     if (res.next != null) {
       var resNext = await res.next;
       if (resNext != null && resNext.result) {
-        if (res != null && res.result) {
-          _subject.add(res.data);
-        }
+          _subject.add(resNext.data);
       }
     }
   }

diff --git a/lib/common/net/trending/github_trending.dart b/lib/common/net/trending/github_trending.dart
@@ -23,7 +23,7 @@ class GitHubTrending {
 }
 
 const TAGS = {
-  "meta": {"start": '<span class="d-inline-block float-sm-right">', "end": '</span>'},
+  "meta": {"start": '<span class="d-inline-block', "end": '</span>'},
   "starCount": {"start": '<a class="muted-link d-inline-block mr-3"', "flag": '/stargazers">', "end": '</a>'},
   "forkCount": {"start": '<a class="muted-link d-inline-block mr-3"', "flag": '/network', "end": '</a>'}
 };
@@ -34,15 +34,15 @@ class TrendingUtil {
       responseData = responseData.replaceAll(new RegExp('\n'), '');
     } catch (e) {}
     var repos = new List();
-    var splitWithH3 = responseData.split('<h3');
+    var splitWithH3 = responseData.split('<article');
     splitWithH3.removeAt(0);
     for (var i = 0; i < splitWithH3.length; i++) {
       var repo = TrendingRepoModel.empty();
       var html = splitWithH3[i];
 
       parseRepoBaseInfo(repo, html);
 
-      var metaNoteContent = parseContentWithNote(html, 'class="f6 text-gray mt-2">', '<\/li>');
+      var metaNoteContent = parseContentWithNote(html, 'class="f6 text-gray mt-2">', '<\/div>');
       repo.meta = parseRepoLabelWithTag(repo, metaNoteContent, TAGS["meta"]);
       repo.starCount = parseRepoLabelWithTag(repo, metaNoteContent, TAGS["starCount"]);
       repo.forkCount = parseRepoLabelWithTag(repo, metaNoteContent, TAGS["forkCount"]);
@@ -77,7 +77,7 @@ class TrendingUtil {
       repo.reposName = repo.fullName.split('/')[1];
     }
 
-    String description = parseContentWithNote(htmlBaseInfo, '<p class="col-9 d-inline-block text-gray m-0 pr-4">', '</p>');
+    String description = parseContentWithNote(htmlBaseInfo, '<p class="col-9 text-gray my-1 pr-4">', '</p>');
     if (description != null) {
       String reg = "<g-emoji.*?>.+?</g-emoji>";
       RegExp tag = new RegExp(reg);