Merge branch 'main' into mod-add-time-in-rcmd-and-search

lib/pages/search_panel/widgets/article_panel.dart

@@ -25,16 +25,17 @@ Widget searchArticlePanel(BuildContext context, ctr, list) {
           padding: const EdgeInsets.fromLTRB(
               StyleString.safeSpace, 5, StyleString.safeSpace, 5),
           child: LayoutBuilder(builder: (context, boxConstraints) {
-            double width = (boxConstraints.maxWidth -
-                StyleString.cardSpace *
-                    6 /
-                    MediaQuery.textScalerOf(context).scale(2.0));
+            final double width = (boxConstraints.maxWidth -
+                    StyleString.cardSpace *
+                        6 /
+                        MediaQuery.textScalerOf(context).scale(1.0)) /
+                2;
             return Container(
               constraints: const BoxConstraints(minHeight: 88),
               height: width / StyleString.aspectRatio,
               child: Row(
                 crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
+                children: <Widget>[
                   if (list[index].imageUrls != null &&
                       list[index].imageUrls.isNotEmpty)
                     AspectRatio(

lib/pages/search_panel/widgets/video_panel.dart

@@ -90,7 +90,7 @@ class SearchVideoPanel extends StatelessWidget {
                   style: ButtonStyle(
                     padding: MaterialStateProperty.all(EdgeInsets.zero),
                   ),
-                  onPressed: () => controller.onShowFilterDialog(),
+                  onPressed: () => controller.onShowFilterDialog(ctr),
                   icon: Icon(
                     Icons.filter_list_outlined,
                     size: 18,
@@ -175,7 +175,7 @@ class VideoPanelController extends GetxController {
     super.onInit();
   }
 
-  onShowFilterDialog() {
+  onShowFilterDialog(searchPanelCtr) {
     SmartDialog.show(
       animationType: SmartAnimationType.centerFade_otherSlide,
       builder: (BuildContext context) {
@@ -199,7 +199,8 @@ class VideoPanelController extends GetxController {
                       SmartDialog.dismiss();
                       SmartDialog.showToast("「${i['label']}」的筛选结果");
                       SearchPanelController ctr =
-                          Get.find<SearchPanelController>(tag: 'video');
+                          Get.find<SearchPanelController>(
+                              tag: 'video${searchPanelCtr.keyword!}');
                       ctr.duration.value = i['value'];
                       SmartDialog.showLoading(msg: 'loading');
                       await ctr.onRefresh();