[fea]更新校历

twtstudio · Aug 14, 2024 · 8957939 · 8957939
1 parent 3fa2145
commit 8957939
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git a/assets/images/calender/first.jpg b/assets/images/calender/first.jpg
diff --git a/assets/images/calender/first.png b/assets/images/calender/first.png
diff --git a/assets/images/calender/second.jpg b/assets/images/calender/second.jpg
diff --git a/assets/images/calender/second.png b/assets/images/calender/second.png
diff --git a/lib/home/view/map_calendar_page.dart b/lib/home/view/map_calendar_page.dart
@@ -192,8 +192,8 @@ class MapAndCalenderState extends State<MapAndCalender> {
                   context,
                   FeedbackRouter.localImageView,
                   arguments: LocalImageViewPageArgs([], [
-                    'assets/images/calender/first.jpg',
-                    'assets/images/calender/second.jpg'
+                    'assets/images/calender/first.png',
+                    'assets/images/calender/second.png'
                   ], 2, 0),
                 );
               },
@@ -212,14 +212,14 @@ class MapAndCalenderState extends State<MapAndCalender> {
                                       WpyColorKey.primaryLightestActionColor),
                                   BlendMode.screen),
                               image: AssetImage(
-                                  'assets/images/calender/first.jpg')))),
+                                  'assets/images/calender/first.png')))),
                   Positioned(
                     top: 20.h,
                     left: 14.h,
                     child: Opacity(
                       opacity: 0.34,
                       child: Text(
-                        '23-24第一学期',
+                        '24-25第一学期',
                         style: TextUtil.base.PingFangSC
                             .infoText(context)
                             .w900
@@ -236,8 +236,8 @@ class MapAndCalenderState extends State<MapAndCalender> {
                   context,
                   FeedbackRouter.localImageView,
                   arguments: LocalImageViewPageArgs([], [
-                    'assets/images/calender/first.jpg',
-                    'assets/images/calender/second.jpg'
+                    'assets/images/calender/first.png',
+                    'assets/images/calender/second.png'
                   ], 2, 1),
                 );
               },
@@ -255,15 +255,15 @@ class MapAndCalenderState extends State<MapAndCalender> {
                             WpyTheme.of(context)
                                 .get(WpyColorKey.primaryLightestActionColor),
                             BlendMode.screen),
-                        image: AssetImage('assets/images/calender/second.jpg'),
+                        image: AssetImage('assets/images/calender/second.png'),
                       ))),
                   Positioned(
                     top: 20.h,
                     left: 14.h,
                     child: Opacity(
                       opacity: 0.34,
                       child: Text(
-                        '23-24第二学期',
+                        '24-25第二学期',
                         style: TextUtil.base.PingFangSC
                             .infoText(context)
                             .w900

diff --git a/lib/main.dart b/lib/main.dart
@@ -391,7 +391,16 @@ class WePeiYangAppState extends State<WePeiYangApp>
                           FlutterSmartDialog.observer
                         ],
                         home: child,
-                        builder: FlutterSmartDialog.init(builder: _builder),
+                        builder: (context, child) => Overlay(
+                          initialEntries: [
+                            if (child != null) ...[
+                              OverlayEntry(
+                                builder: (context) => child,
+                              ),
+                            ],
+                          ],
+                        ),
+                        // builder: FlutterSmartDialog.init(builder: _builder),
                         // builder: FToastBuilder(),
                       );
                     })),