Merge branch 'fix-replyReqError'

lib/http/reply.dart

@@ -4,7 +4,7 @@ import 'init.dart';
 
 class ReplyHttp {
   static Future replyList({
-    required dynamic oid,
+    required int oid,
     required int pageNum,
     required int type,
     int? ps,
@@ -76,7 +76,7 @@ class ReplyHttp {
   // 评论点赞
   static Future likeReply({
     required int type,
-    required dynamic oid,
+    required int oid,
     required int rpid,
     required int action,
   }) async {

lib/http/video.dart

@@ -331,7 +331,7 @@ class VideoHttp {
   // plat	num	发送平台标识	非必要	1：web端 2：安卓客户端  3：ios客户端  4：wp客户端
   static Future replyAdd({
     required ReplyType type,
-    required dynamic oid,
+    required int oid,
     required String message,
     int? root,
     int? parent,

lib/pages/bangumi/introduction/controller.dart

@@ -266,7 +266,7 @@ class BangumiIntroController extends GetxController {
       /// 未渲染回复组件时可能异常
       VideoReplyController videoReplyCtr =
           Get.find<VideoReplyController>(tag: Get.arguments['heroTag']);
-      videoReplyCtr.oid = bvid;
+      videoReplyCtr.aid = aid;
       videoReplyCtr.queryReplyList(type: 'init');
     } catch (_) {}
   }

lib/pages/dynamics/detail/view.dart

@@ -385,8 +385,8 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
                       isScrollControlled: true,
                       builder: (BuildContext context) {
                         return VideoReplyNewDialog(
-                          oid: _dynamicDetailController.oid?.toString() ??
+                          oid: _dynamicDetailController.oid ??
-                              Get.parameters['bvid'],
+                              IdUtils.bv2av(Get.parameters['bvid']!),
                           root: 0,
                           parent: 0,
                           replyType: ReplyType.values[replyType],

lib/pages/html/view.dart

@@ -13,7 +13,6 @@ import 'package:pilipala/pages/video/detail/reply/widgets/reply_item.dart';
 import 'package:pilipala/pages/video/detail/reply_new/index.dart';
 import 'package:pilipala/pages/video/detail/reply_reply/index.dart';
 import 'package:pilipala/utils/feed_back.dart';
-import 'package:pilipala/utils/id_utils.dart';
 
 import 'controller.dart';
 
@@ -428,7 +427,7 @@ class _HtmlRenderPageState extends State<HtmlRenderPage>
                     isScrollControlled: true,
                     builder: (BuildContext context) {
                       return VideoReplyNewDialog(
-                        oid: IdUtils.av2bv(_htmlRenderCtr.oid.value),
+                        oid: _htmlRenderCtr.oid.value,
                         root: 0,
                         parent: 0,
                         replyType: ReplyType.values[type],

lib/pages/video/detail/introduction/controller.dart

@@ -478,7 +478,7 @@ class VideoIntroController extends GetxController {
       /// 未渲染回复组件时可能异常
       final VideoReplyController videoReplyCtr =
           Get.find<VideoReplyController>(tag: heroTag);
-      videoReplyCtr.oid = bvid;
+      videoReplyCtr.aid = aid;
       videoReplyCtr.queryReplyList(type: 'init');
     } catch (_) {}
     this.bvid = bvid;

lib/pages/video/detail/reply/controller.dart

@@ -11,13 +11,13 @@ import 'package:pilipala/utils/storage.dart';
 
 class VideoReplyController extends GetxController {
   VideoReplyController(
-    this.oid,
+    this.aid,
     this.rpid,
     this.replyLevel,
   );
   final ScrollController scrollController = ScrollController();
   // 视频aid 请求时使用的oid
-  String? oid;
+  int? aid;
   // 层级 2为楼中楼
   String? replyLevel;
   // rpid 请求楼中楼回复
@@ -57,7 +57,7 @@ class VideoReplyController extends GetxController {
       return;
     }
     final res = await ReplyHttp.replyList(
-      oid: oid!,
+      oid: aid!,
       pageNum: currentPage + 1,
       ps: ps,
       type: ReplyType.video.index,

lib/pages/video/detail/reply/view.dart

@@ -40,7 +40,6 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
   bool _isFabVisible = true;
   String replyLevel = '1';
   late String heroTag;
-  late String oid;
 
   // 添加页面缓存
   @override
@@ -49,7 +48,7 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
   @override
   void initState() {
     super.initState();
-    oid = widget.bvid != null ? widget.bvid! : '0';
+    int oid = widget.bvid != null ? IdUtils.bv2av(widget.bvid!) : 0;
     heroTag = Get.arguments['heroTag'];
     replyLevel = widget.replyLevel ?? '1';
     if (replyLevel == '2') {
@@ -298,8 +297,8 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
                     isScrollControlled: true,
                     builder: (BuildContext context) {
                       return VideoReplyNewDialog(
-                        oid:
+                        oid: _videoReplyController.aid ??
-                            _videoReplyController.oid ?? Get.parameters['bvid'],
+                            IdUtils.bv2av(Get.parameters['bvid']!),
                         root: 0,
                         parent: 0,
                         replyType: ReplyType.video,

lib/pages/video/detail/reply/widgets/reply_item.dart

@@ -353,7 +353,7 @@ class ReplyItem extends StatelessWidget {
                 isScrollControlled: true,
                 builder: (builder) {
                   return VideoReplyNewDialog(
-                    oid: IdUtils.av2bv(replyItem!.oid!),
+                    oid: replyItem!.oid,
                     root: replyItem!.rpid,
                     parent: replyItem!.rpid,
                     replyType: replyType,

lib/pages/video/detail/reply_new/view.dart

@@ -8,7 +8,7 @@ import 'package:pilipala/models/video/reply/item.dart';
 import 'package:pilipala/utils/feed_back.dart';
 
 class VideoReplyNewDialog extends StatefulWidget {
-  final String? oid;
+  final int? oid;
   final int? root;
   final int? parent;
   final ReplyType? replyType;

lib/utils/id_utils.dart

@@ -1,51 +1,52 @@
-// ignore_for_file: constant_identifier_names
+// ignore_for_file: constant_identifier_names, non_constant_identifier_names
 
 import 'dart:convert';
-import 'dart:math';
-
-import 'package:flutter/material.dart';
 
 class IdUtils {
-  static const String TABLE =
+  static final XOR_CODE = BigInt.parse('23442827791579');
-      'fZodR9XQDSUm21yCkr6zBqiveYah8bt4xsWpHnJE7jL5VG3guMTKNPAwcF';
+  static final MASK_CODE = BigInt.parse('2251799813685247');
-  static const List<int> S = [11, 10, 3, 8, 4, 6]; // 位置编码表
+  static final MAX_AID = BigInt.one << (BigInt.from(51)).toInt();
-  static const int XOR = 177451812; // 固定异或值
+  static final BASE = BigInt.from(58);
-  static const int ADD = 8728348608; // 固定加法值
+
-  static const List<String> r = [
+  static const data =
-    'B',
+      'FcwAPNKTMug3GV5Lj7EJnHpWsx4tb8haYeviqBz6rkCy12mUSDQX9RdoZf';
-    'V',
-    '1',
-    '',
-    '',
-    '4',
-    '',
-    '1',
-    '',
-    '7',
-    '',
-    ''
-  ];
 
   /// av转bv
-  static String av2bv(int av) {
+  static String av2bv(int aid) {
-    int x_ = (av ^ XOR) + ADD;
+    List<String> bytes = List.filled(12, '0', growable: false);
-    List<String> newR = [];
+    int bvIndex = bytes.length - 1;
-    newR.addAll(r);
+    BigInt tmp = (MAX_AID | BigInt.from(aid)) ^ XOR_CODE;
-    for (int i = 0; i < S.length; i++) {
+    while (tmp > BigInt.zero) {
-      newR[S[i]] =
+      bytes[bvIndex] = data[(tmp % BASE).toInt()];
-          TABLE.characters.elementAt((x_ / pow(58, i).toInt() % 58).toInt());
+      tmp = tmp ~/ BASE;
+      bvIndex -= 1;
     }
-    return newR.join();
+    final tmpValue = bytes[3];
+    bytes[3] = bytes[9];
+    bytes[9] = tmpValue;
+
+    final tmpValue2 = bytes[4];
+    bytes[4] = bytes[7];
+    bytes[7] = tmpValue2;
+
+    return bytes.join();
   }
 
-  /// bv转bv
+  /// bv转av
-  static int bv2av(String bv) {
+  static int bv2av(String bvid) {
-    int r = 0;
+    List<String> bvidArr = bvid.split('');
-    for (int i = 0; i < S.length; i++) {
+    final tmpValue = bvidArr[3];
-      r += (TABLE.indexOf(bv.characters.elementAt(S[i])).toInt()) *
+    bvidArr[3] = bvidArr[9];
-          pow(58, i).toInt();
+    bvidArr[9] = tmpValue;
-    }
+
-    return (r - ADD) ^ XOR;
+    final tmpValue2 = bvidArr[4];
+    bvidArr[4] = bvidArr[7];
+    bvidArr[7] = tmpValue2;
+
+    bvidArr.removeRange(0, 3);
+    BigInt tmp = bvidArr.fold(BigInt.zero,
+        (pre, bvidChar) => pre * BASE + BigInt.from(data.indexOf(bvidChar)));
+    return ((tmp & MASK_CODE) ^ XOR_CODE).toInt();
   }
 
   // 匹配