diff --git a/lib/models/dynamics/result.dart b/lib/models/dynamics/result.dart index 49d4fa2c0..15aeefa4b 100644 --- a/lib/models/dynamics/result.dart +++ b/lib/models/dynamics/result.dart @@ -629,7 +629,7 @@ class Vote { Vote.fromJson(Map json) { joinNum = Utils.safeToInt(json['join_num']); voteId = Utils.safeToInt(json['vote_id']); - title = json['title']; + title = _parseString(json['title']) ?? _parseString(json['desc']); } } diff --git a/lib/pages/dynamics/widgets/additional_panel.dart b/lib/pages/dynamics/widgets/additional_panel.dart index bf78cd35f..1107882e5 100644 --- a/lib/pages/dynamics/widgets/additional_panel.dart +++ b/lib/pages/dynamics/widgets/additional_panel.dart @@ -435,11 +435,12 @@ Widget addWidget( child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text( - vote.title!, - maxLines: 1, - overflow: TextOverflow.ellipsis, - ), + if (vote.title case final title?) + Text( + title, + maxLines: 1, + overflow: TextOverflow.ellipsis, + ), Text( '${NumUtils.numFormat(vote.joinNum)}人参与', maxLines: 1, diff --git a/lib/pages/setting/models/extra_settings.dart b/lib/pages/setting/models/extra_settings.dart index 9ac85f158..7e6ae0648 100644 --- a/lib/pages/setting/models/extra_settings.dart +++ b/lib/pages/setting/models/extra_settings.dart @@ -640,16 +640,16 @@ List get extraSettings => [ setKey: SettingBoxKey.enableCommAntifraud, defaultVal: false, ), - const SwitchModel( - title: '使用「哔哩发评反诈」检查评论', - subtitle: '仅对Android生效', - leading: Icon( - FontAwesomeIcons.b, - size: 22, + if (Platform.isAndroid) + const SwitchModel( + title: '使用「哔哩发评反诈」检查评论', + leading: Icon( + FontAwesomeIcons.b, + size: 22, + ), + setKey: SettingBoxKey.biliSendCommAntifraud, + defaultVal: false, ), - setKey: SettingBoxKey.biliSendCommAntifraud, - defaultVal: false, - ), const SwitchModel( title: '发布/转发动态反诈', subtitle: '发布/转发动态后检查动态是否可见', diff --git a/lib/utils/storage_pref.dart b/lib/utils/storage_pref.dart index 403260b02..e65b03ce4 100644 --- a/lib/utils/storage_pref.dart +++ b/lib/utils/storage_pref.dart @@ -455,6 +455,7 @@ abstract final class Pref { _setting.get(SettingBoxKey.enableCommAntifraud, defaultValue: false); static bool get biliSendCommAntifraud => + Platform.isAndroid && _setting.get(SettingBoxKey.biliSendCommAntifraud, defaultValue: false); static bool get enableCreateDynAntifraud => @@ -658,7 +659,7 @@ abstract final class Pref { static bool get dynamicColor => !Platform.isIOS && - _setting.get(SettingBoxKey.dynamicColor, defaultValue: !Platform.isIOS); + _setting.get(SettingBoxKey.dynamicColor, defaultValue: true); static bool get autoClearCache => _setting.get(SettingBoxKey.autoClearCache, defaultValue: false);