From bde7c7342494bd3f70caa4b2a225e626274da674 Mon Sep 17 00:00:00 2001 From: bggRGjQaUbCoE Date: Sat, 30 Nov 2024 10:58:31 +0800 Subject: [PATCH] opt: reply err msg Signed-off-by: bggRGjQaUbCoE --- lib/grpc/grpc_repo.dart | 2 ++ lib/http/reply.dart | 3 ++- lib/pages/fav_detail/widget/fav_video_card.dart | 4 +--- lib/pages/video/detail/reply/view.dart | 3 +-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/grpc/grpc_repo.dart b/lib/grpc/grpc_repo.dart index 109e570c..61dbd7de 100644 --- a/lib/grpc/grpc_repo.dart +++ b/lib/grpc/grpc_repo.dart @@ -112,6 +112,8 @@ class GrpcRepo { e.details?.firstOrNull?.getFieldOrNull(2), allowMalformed: true, ); + msg = msg.replaceAll( + RegExp(r"[^a-zA-Z0-9\u4e00-\u9fa5,.;!?,。;!?]"), ''); if (msg.isNotEmpty) { return {'status': false, 'msg': msg}; } else { diff --git a/lib/http/reply.dart b/lib/http/reply.dart index 7e37442d..bbbac34f 100644 --- a/lib/http/reply.dart +++ b/lib/http/reply.dart @@ -64,7 +64,8 @@ class ReplyHttp { if (res['status']) { return LoadingState.success(res['data']); } else { - return LoadingState.error(res['msg']); + return LoadingState.error( + '${res['msg'].startsWith('gRPC Error') ? '如无法加载评论:\n关闭代理\n或设置中关闭使用gRPC加载评论\n\n' : ''}${res['msg']}'); } } diff --git a/lib/pages/fav_detail/widget/fav_video_card.dart b/lib/pages/fav_detail/widget/fav_video_card.dart index 574b2544..7114ea90 100644 --- a/lib/pages/fav_detail/widget/fav_video_card.dart +++ b/lib/pages/fav_detail/widget/fav_video_card.dart @@ -40,13 +40,12 @@ class FavVideoCardH extends StatelessWidget { onTap!(); return; } - int? seasonId; String? epId; if (videoItem.ogv != null && (videoItem.ogv['type_name'] == '番剧' || videoItem.ogv['type_name'] == '国创')) { videoItem.cid = await SearchHttp.ab2c(bvid: bvid); - seasonId = videoItem.ogv['season_id']; + dynamic seasonId = videoItem.ogv['season_id']; epId = videoItem.epId; Utils.viewBangumi(seasonId: seasonId, epId: epId); return; @@ -63,7 +62,6 @@ class FavVideoCardH extends StatelessWidget { 'bvid': bvid, 'cid': videoItem.cid.toString(), 'epId': epId ?? '', - if (seasonId != null) 'seasonId': seasonId.toString(), }; // if (seasonId != null) { // parameters['seasonId'] = seasonId.toString(); diff --git a/lib/pages/video/detail/reply/view.dart b/lib/pages/video/detail/reply/view.dart index dec63411..c3d57746 100644 --- a/lib/pages/video/detail/reply/view.dart +++ b/lib/pages/video/detail/reply/view.dart @@ -277,8 +277,7 @@ class _VideoReplyPanelState extends State callback: _videoReplyController.onReload, ), Error() => HttpError( - errMsg: - '如无法加载评论:\n1.关闭代理\n2.设置中关闭使用gRPC加载评论\n\n${loadingState.errMsg}', + errMsg: loadingState.errMsg, callback: _videoReplyController.onReload, ), LoadingState() => throw UnimplementedError(),