diff --git a/lib/http/dynamics.dart b/lib/http/dynamics.dart index 3d0d2506..da18cfa4 100644 --- a/lib/http/dynamics.dart +++ b/lib/http/dynamics.dart @@ -28,6 +28,7 @@ class DynamicsHttp { 'data': DynamicsDataModel.fromJson(res.data['data']), }; } catch (err) { + print(err); return { 'status': false, 'data': [], diff --git a/lib/models/dynamics/result.dart b/lib/models/dynamics/result.dart index 05c5245e..d8aff7b5 100644 --- a/lib/models/dynamics/result.dart +++ b/lib/models/dynamics/result.dart @@ -244,7 +244,9 @@ class Vote { choiceCnt = json['choice_cnt']; share = json['share']; defaultShare = json['default_share']; - endTime = json['end_time']; + endTime = json['end_time'] is int + ? json['end_time'] + : int.parse(json['end_time']); joinNum = json['join_num']; status = json['status']; type = json['type']; diff --git a/lib/pages/dynamics/widgets/rich_node_panel.dart b/lib/pages/dynamics/widgets/rich_node_panel.dart index 27820b27..0f4702d6 100644 --- a/lib/pages/dynamics/widgets/rich_node_panel.dart +++ b/lib/pages/dynamics/widgets/rich_node_panel.dart @@ -27,8 +27,9 @@ InlineSpan richNode(item, context) { } else { for (var i in richTextNodes) { /// fix 渲染专栏时内容会重复 - if (item.modules.moduleDynamic.major.opus.title == null && - i.type == 'RICH_TEXT_NODE_TYPE_TEXT') { + // if (item.modules.moduleDynamic.major.opus.title == null && + // i.type == 'RICH_TEXT_NODE_TYPE_TEXT') { + if (i.type == 'RICH_TEXT_NODE_TYPE_TEXT') { spanChilds.add( TextSpan(text: i.origText, style: const TextStyle(height: 1.65))); } @@ -109,16 +110,18 @@ InlineSpan richNode(item, context) { alignment: PlaceholderAlignment.middle, child: GestureDetector( onTap: () { - String dynamicId = item.basic['comment_id_str']; - Get.toNamed( - '/webview', - parameters: { - 'url': - 'https://t.bilibili.com/vote/h5/index/#/result?vote_id=${i.rid}&dynamic_id=$dynamicId&isWeb=1', - 'type': 'vote', - 'pageTitle': '投票' - }, - ); + try { + String dynamicId = item.basic['comment_id_str']; + Get.toNamed( + '/webview', + parameters: { + 'url': + 'https://t.bilibili.com/vote/h5/index/#/result?vote_id=${i.rid}&dynamic_id=$dynamicId&isWeb=1', + 'type': 'vote', + 'pageTitle': '投票' + }, + ); + } catch (_) {} }, child: Text( '投票:${i.text}',