x1ongzhu 6 лет назад
Родитель
Сommit
26d907657c

BIN
.gradle/5.1.1/fileChanges/last-build.bin


BIN
.gradle/5.1.1/fileHashes/fileHashes.lock


+ 0 - 0
.gradle/5.1.1/gc.properties


+ 8 - 4
lib/pages/MatchPage.dart

@@ -270,13 +270,14 @@ class _MatchPageState extends State<MatchPage> with WidgetsBindingObserver {
                   width: 102,
                   padding: EdgeInsets.all(15),
                   child: LinearButton(
-                    btntext: '竞赛须知',
+                    btntext: '配置帮助',
                     textColor: Color(0xFF2E3049),
                     btnHeight: 26.0,
                     colorList: [Color(0xFFFFB726), Color(0xFFFFB726)],
                     textSize: 12.0,
                     onTapHomeMenu: () {
-                      showNotice();
+                      // showNotice();
+                      getPhoneInfo();
                     },
                   ),
                 )
@@ -565,9 +566,9 @@ class LoadingDialog extends Dialog {
                                           child: Text(phoneList[index].phone),
                                         ),
                                       ),
-                                      onTap: () {
+                                      onTap: () async {
                                         var list = phoneList[index].image.split(',');
-                                        Navigator.of(context).push(
+                                        final bool res = await Navigator.of(context).push(
                                           PageRouteBuilder(
                                             opaque: false,
                                             transitionDuration: Duration(milliseconds: 300),
@@ -583,6 +584,9 @@ class LoadingDialog extends Dialog {
                                             },
                                           ),
                                         );
+                                        if (res != null && res) {
+                                          Navigator.of(context).pop();
+                                        }
                                       },
                                     );
                                   })),

+ 26 - 4
lib/pages/PhotoView.dart

@@ -1,3 +1,4 @@
+import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:photo_view/photo_view.dart';
 import 'package:photo_view/photo_view_gallery.dart';
@@ -16,12 +17,15 @@ class _PhotoViewState extends State<PhotoView> with WidgetsBindingObserver {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
+      appBar: AppBar(
+        title: Text(''),
+      ),
       backgroundColor: Colors.black,
       body: PhotoViewGallery.builder(
         scrollPhysics: const BouncingScrollPhysics(),
         builder: (BuildContext context, int index) {
           return PhotoViewGalleryPageOptions(
-            imageProvider: NetworkImage(widget.imageList[index]),
+            imageProvider: CachedNetworkImageProvider(widget.imageList[index]),
           );
         },
         itemCount: widget.imageList.length,
@@ -37,9 +41,27 @@ class _PhotoViewState extends State<PhotoView> with WidgetsBindingObserver {
 
         // )
       ),
-      floatingActionButton: Container(
-        padding: EdgeInsets.all(30),
-        child: Text('${nowIndex}/${widget.imageList.length}', style: TextStyle(color: Colors.white)),
+      floatingActionButton: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: <Widget>[
+          Text('${nowIndex}/${widget.imageList.length}', style: TextStyle(color: Colors.white)),
+          Container(
+            width: 220,
+            height: 36,
+            margin: EdgeInsets.only(top: 10, bottom: 20),
+            child: RaisedButton(
+              color: Color(0xFFD4504B),
+              shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(4)),
+              child: Text(
+                '我已设置完毕',
+                style: TextStyle(color: Colors.white, fontSize: 14),
+              ),
+              onPressed: () {
+                Navigator.of(context).pop(true);
+              },
+            ),
+          )
+        ],
       ),
       floatingActionButtonLocation: FloatingActionButtonLocation.centerDocked,
     );