Merge branch 'main' into fix

lib/common/widgets/html_render.dart

@@ -59,7 +59,7 @@ class HtmlRender extends StatelessWidget {
                 imgUrl = imgUrl.replaceAll('http://', 'https://');
               }
               imgUrl = imgUrl.contains('@') ? imgUrl.split('@').first : imgUrl;
-              final bool isEmote = imgUrl.contains('/emote/');
+              // final bool isEmote = imgUrl.contains('/emote/');
               final bool isMall = imgUrl.contains('/mall/');
               if (isMall) {
                 return const SizedBox();

lib/pages/bangumi/introduction/view.dart

@@ -22,10 +22,10 @@ import 'controller.dart';
 import 'widgets/intro_detail.dart';
 
 class BangumiIntroPanel extends StatefulWidget {
-  final int? cid;
+  final int cid;
   const BangumiIntroPanel({
     Key? key,
-    this.cid,
+    required this.cid,
   }) : super(key: key);
 
   @override
@@ -49,7 +49,7 @@ class _BangumiIntroPanelState extends State<BangumiIntroPanel>
   void initState() {
     super.initState();
     heroTag = Get.arguments['heroTag'];
-    cid = widget.cid!;
+    cid = widget.cid;
     bangumiIntroController = Get.put(BangumiIntroController(), tag: heroTag);
     videoDetailCtr = Get.find<VideoDetailController>(tag: heroTag);
     _futureBuilderFuture = bangumiIntroController.queryBangumiIntro();
@@ -103,11 +103,11 @@ class BangumiInfo extends StatefulWidget {
   const BangumiInfo({
     super.key,
     this.bangumiDetail,
-    this.cid,
+    required this.cid,
   });
 
   final BangumiInfoModel? bangumiDetail;
-  final int? cid;
+  final int cid;
 
   @override
   State<BangumiInfo> createState() => _BangumiInfoState();
@@ -119,7 +119,7 @@ class _BangumiInfoState extends State<BangumiInfo> {
   late final VideoDetailController videoDetailCtr;
   Box localCache = GStorage.localCache;
   late double sheetHeight;
-  int? cid;
+  late int cid;
   bool isProcessing = false;
   void Function()? handleState(Future Function() action) {
     return isProcessing
@@ -137,7 +137,7 @@ class _BangumiInfoState extends State<BangumiInfo> {
     bangumiIntroController = Get.put(BangumiIntroController(), tag: heroTag);
     videoDetailCtr = Get.find<VideoDetailController>(tag: heroTag);
     sheetHeight = localCache.get('sheetHeight');
-    cid = widget.cid!;
+    cid = widget.cid;
     videoDetailCtr.cid.listen((p0) {
       cid = p0;
       if (!mounted) {
@@ -313,7 +313,7 @@ class _BangumiInfoState extends State<BangumiInfo> {
           if (widget.bangumiDetail!.episodes!.isNotEmpty) ...[
             BangumiPanel(
               pages: widget.bangumiDetail!.episodes!,
-              cid: cid! ?? widget.bangumiDetail!.episodes!.first.cid!,
+              cid: cid,
               sheetHeight: sheetHeight,
               changeFuc: (bvid, cid, aid, cover) => bangumiIntroController
                   .changeSeasonOrbangu(bvid, cid, aid, cover),

lib/pages/follow/widgets/follow_item.dart

@@ -47,7 +47,7 @@ class FollowItem extends StatelessWidget {
               height: 34,
               child: TextButton(
                 onPressed: () async {
-                  int followStatus = await FollowUtils(
+                  await FollowUtils(
                     context: context,
                     followStatus: 2,
                     mid: item.mid!,

lib/pages/member_dynamics/view.dart

@@ -1,6 +1,7 @@
 import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
+import 'package:pilipala/common/widgets/no_data.dart';
 import 'package:pilipala/pages/member_dynamics/index.dart';
 import 'package:pilipala/utils/utils.dart';
 
@@ -82,7 +83,7 @@ class _MemberDynamicsPageState extends State<MemberDynamicsPage> {
                                 childCount: list.length,
                               ),
                             )
-                          : const SliverToBoxAdapter(),
+                          : const NoData(),
                     );
                   } else {
                     return HttpError(

lib/pages/message/like/view.dart

@@ -197,13 +197,13 @@ class LikeItem extends StatelessWidget {
                   ),
                 ),
                 const SizedBox(width: 25),
-                if (type == 'reply' || type == 'danmu')
+                if (type == 'reply' || type == 'danmu' || type == 'dynamic')
                   Container(
                     width: 60,
                     height: 60,
                     padding: const EdgeInsets.all(4),
                     child: Text(
-                      item.item!.title!,
+                      item.item?.title ?? '',
                       maxLines: 4,
                       style: const TextStyle(fontSize: 12, letterSpacing: 0.3),
                       overflow: TextOverflow.ellipsis,

lib/pages/rcmd/view.dart

@@ -78,8 +78,8 @@ class _RcmdPageState extends State<RcmdPage>
                 future: _futureBuilderFuture,
                 builder: (context, snapshot) {
                   if (snapshot.connectionState == ConnectionState.done) {
-                    Map data = snapshot.data as Map;
+                    Map? data = snapshot.data;
-                    if (data['status']) {
+                    if (data != null && data['status']) {
                       return Obx(
                         () {
                           if (_rcmdController.isLoadingMore &&
@@ -94,7 +94,7 @@ class _RcmdPageState extends State<RcmdPage>
                       );
                     } else {
                       return HttpError(
-                        errMsg: data['msg'],
+                        errMsg: data?['msg'] ?? '请求异常',
                         fn: () {
                           setState(() {
                             _rcmdController.isLoadingMore = true;

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

@@ -18,7 +18,6 @@ import 'package:pilipala/models/video_detail_res.dart';
 import 'package:pilipala/pages/video/detail/introduction/controller.dart';
 import 'package:pilipala/pages/video/detail/widgets/ai_detail.dart';
 import 'package:pilipala/utils/feed_back.dart';
-import 'package:pilipala/utils/follow.dart';
 import 'package:pilipala/utils/global_data_cache.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:pilipala/utils/utils.dart';

lib/pages/video/detail/view.dart

@@ -32,7 +32,6 @@ import 'package:status_bar_control/status_bar_control.dart';
 import '../../../plugin/pl_player/models/bottom_control_type.dart';
 import '../../../services/shutdown_timer_service.dart';
 import 'widgets/app_bar.dart';
-import 'widgets/header_control.dart';
 
 class VideoDetailPage extends StatefulWidget {
   const VideoDetailPage({Key? key}) : super(key: key);

lib/pages/whisper_detail/widget/chat_item.dart

@@ -59,11 +59,11 @@ class ChatItem extends StatelessWidget {
     bool isOwner = item.senderUid == GStorage.userInfo.get('userInfoCache').mid;
 
     bool isPic = item.msgType == MsgType.pic.value; // 图片
-    bool isText = item.msgType == MsgType.text.value; // 文本
+    // bool isText = item.msgType == MsgType.text.value; // 文本
     // bool isArchive = item.msgType == 11; // 投稿
     // bool isArticle = item.msgType == 12; // 专栏
     bool isRevoke = item.msgType == MsgType.revoke.value; // 撤回消息
-    bool isShareV2 = item.msgType == MsgType.share_v2.value;
+    // bool isShareV2 = item.msgType == MsgType.share_v2.value;
     bool isSystem = item.msgType == MsgType.notify_text.value ||
         item.msgType == MsgType.notify_msg.value ||
         item.msgType == MsgType.pic_card.value ||

lib/utils/follow.dart

@@ -3,7 +3,6 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:pilipala/common/widgets/drag_handle.dart';
 import 'package:pilipala/common/widgets/group_panel.dart';
 import 'package:pilipala/http/video.dart';
-import 'package:pilipala/utils/global_data_cache.dart';
 
 class FollowUtils {
   final BuildContext context;
@@ -196,7 +195,7 @@ class FollowUtils {
           snapSizes: [initialChildSize],
           builder: (BuildContext context, ScrollController scrollController) {
             return GroupPanel(
-              mid: GlobalDataCache.userInfo!.mid!,
+              mid: mid,
               scrollController: scrollController,
             );
           },

lib/utils/recommend_filter.dart

@@ -1,5 +1,3 @@
-import 'dart:math';
-
 import 'storage.dart';
 
 class RecommendFilter {