09/26

lib/pages/RoomInfo.dart

@@ -477,12 +477,9 @@ class RoomInfoState extends State<RoomInfo> with SingleTickerProviderStateMixin
     Future.delayed(Duration.zero, () async {
       Result res2 = await HttpManager.get('systemVariable/get', data: {'name': "ticketPrice"});
       if (res2.success) {
-        print( res2.data);
+        print(res2.data);
         setState(() {
-          race =double.parse( res2.data);
-           
-
-         
+          race = double.parse(res2.data);
         });
       }
       // showSucessInfo(3);
@@ -719,66 +716,74 @@ class RoomInfoState extends State<RoomInfo> with SingleTickerProviderStateMixin
                           ),
 
                           Container(
-                            padding: EdgeInsets.symmetric(horizontal: 20, vertical: 10),
-                            margin: EdgeInsets.fromLTRB(15, 7, 15, 0),
-                            decoration: BoxDecoration(color: Color(0xFF23253C), borderRadius: BorderRadius.all(Radius.circular(4))),
-                            child: Row(
-                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                              children: <Widget>[
-                                Column(
-                                  children: <Widget>[
-                                    Row(
-                                      children: <Widget>[
-                                        Image.asset('images/icon_jifen.png'),
-                                        Text(
-                                          'x${houseInfo.bonus * houseInfo.houseLevel.firstRatio / 100}/${houseInfo.maxNumber * race * houseInfo.houseLevel.entryCoin * houseInfo.houseLevel.firstRatio / 100}',
-                                          style: TextStyle(color: Colors.white, fontSize: 14, fontWeight: FontWeight.w500),
-                                        )
-                                      ],
-                                    ),
-                                    Container(
-                                      height: 3,
-                                    ),
-                                    Text('第一名奖励', style: TextStyle(fontSize: 12, color: Color(0xFFB1B2C0)))
-                                  ],
-                                ),
-                                Column(
-                                  children: <Widget>[
-                                    Row(
-                                      children: <Widget>[
-                                        Image.asset('images/icon_jifen.png'),
-                                        Text(
-                                          'x${houseInfo.bonus * houseInfo.houseLevel.secondRatio / 100}/${houseInfo.maxNumber * race * houseInfo.houseLevel.entryCoin * houseInfo.houseLevel.secondRatio / 100}',
-                                          style: TextStyle(color: Colors.white, fontSize: 14, fontWeight: FontWeight.w500),
-                                        )
-                                      ],
-                                    ),
-                                    Container(
-                                      height: 3,
-                                    ),
-                                    Text('第二名奖励', style: TextStyle(fontSize: 12, color: Color(0xFFB1B2C0)))
-                                  ],
-                                ),
-                                Column(
-                                  children: <Widget>[
-                                    Row(
-                                      children: <Widget>[
-                                        Image.asset('images/icon_jifen.png'),
-                                        Text(
-                                          'x${houseInfo.bonus * houseInfo.houseLevel.thirdRatio / 100}/${houseInfo.maxNumber * race * houseInfo.houseLevel.entryCoin * houseInfo.houseLevel.thirdRatio / 100}',
-                                          style: TextStyle(color:Colors.white, fontSize: 14, fontWeight: FontWeight.w500),
-                                        )
-                                      ],
-                                    ),
-                                    Container(
-                                      height: 3,
-                                    ),
-                                    Text('第三名奖励', style: TextStyle(fontSize: 12, color: Color(0xFFB1B2C0)))
-                                  ],
-                                )
-                              ],
-                            ),
-                          ),
+                              padding: EdgeInsets.symmetric(horizontal: 20, vertical: 10),
+                              margin: EdgeInsets.fromLTRB(15, 7, 15, 0),
+                              decoration: BoxDecoration(color: Color(0xFF23253C), borderRadius: BorderRadius.all(Radius.circular(4))),
+                              child: Column(
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                children: <Widget>[
+                                  Row(
+                                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                                    children: <Widget>[
+                                      Column(
+                                        children: <Widget>[
+                                          Row(
+                                            children: <Widget>[
+                                              Image.asset('images/icon_jifen.png'),
+                                              Text(
+                                                'x${houseInfo.bonus * houseInfo.houseLevel.firstRatio / 100}/${houseInfo.maxNumber * race * houseInfo.houseLevel.entryCoin * houseInfo.houseLevel.firstRatio / 100}',
+                                                style: TextStyle(color: Colors.white, fontSize: 14, fontWeight: FontWeight.w500),
+                                              )
+                                            ],
+                                          ),
+                                          Container(
+                                            height: 3,
+                                          ),
+                                          Text('第一名', style: TextStyle(fontSize: 12, color: Color(0xFFB1B2C0)))
+                                        ],
+                                      ),
+                                      Column(
+                                        children: <Widget>[
+                                          Row(
+                                            children: <Widget>[
+                                              Image.asset('images/icon_jifen.png'),
+                                              Text(
+                                                'x${houseInfo.bonus * houseInfo.houseLevel.secondRatio / 100}/${houseInfo.maxNumber * race * houseInfo.houseLevel.entryCoin * houseInfo.houseLevel.secondRatio / 100}',
+                                                style: TextStyle(color: Colors.white, fontSize: 14, fontWeight: FontWeight.w500),
+                                              )
+                                            ],
+                                          ),
+                                          Container(
+                                            height: 3,
+                                          ),
+                                          Text('第二名', style: TextStyle(fontSize: 12, color: Color(0xFFB1B2C0)))
+                                        ],
+                                      ),
+                                      Column(
+                                        children: <Widget>[
+                                          Row(
+                                            children: <Widget>[
+                                              Image.asset('images/icon_jifen.png'),
+                                              Text(
+                                                'x${houseInfo.bonus * houseInfo.houseLevel.thirdRatio / 100}/${houseInfo.maxNumber * race * houseInfo.houseLevel.entryCoin * houseInfo.houseLevel.thirdRatio / 100}',
+                                                style: TextStyle(color: Colors.white, fontSize: 14, fontWeight: FontWeight.w500),
+                                              )
+                                            ],
+                                          ),
+                                          Container(
+                                            height: 3,
+                                          ),
+                                          Text('第三名', style: TextStyle(fontSize: 12, color: Color(0xFFB1B2C0)))
+                                        ],
+                                      )
+                                    ],
+                                  ),
+                                  Container(
+                                    height: 10,
+                                  ),
+                                  Text('注：上方显示数值为前三名的“当前奖励/最高奖励”',style: TextStyle(color: Colors.white30,fontSize: 12),)
+                                ],
+                              )),
 
                           timeStr != ''
                               ? Container(
@@ -847,7 +852,7 @@ class RoomInfoState extends State<RoomInfo> with SingleTickerProviderStateMixin
                                         Text.rich(TextSpan(children: [
                                           TextSpan(text: '完成本房间任务目标后，'),
                                           TextSpan(
-                                            text: Platform.isIOS?'切记立刻返回应用':'切记立刻点击悬浮窗',
+                                            text: Platform.isIOS ? '切记立刻返回应用' : '切记立刻点击悬浮窗',
                                             style: TextStyle(fontWeight: FontWeight.w600, color: Color(0xFFFFB726)),
                                           ),
                                           TextSpan(text: '回到房间')

pubspec.lock

@@ -1,13 +1,6 @@
 # Generated by pub
-# See https://www.dartlang.org/tools/pub/glossary#lockfile
+# See https://dart.dev/tools/pub/glossary#lockfile
 packages:
-  after_layout:
-    dependency: transitive
-    description:
-      name: after_layout
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.7+2"
   analyzer:
     dependency: transitive
     description:
@@ -28,7 +21,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.3.0"
   battery:
     dependency: "direct main"
     description:
@@ -42,21 +35,21 @@ packages:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
   build:
     dependency: transitive
     description:
       name: build
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.6"
+    version: "1.2.0"
   build_config:
     dependency: transitive
     description:
       name: build_config
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.1"
+    version: "0.4.1+1"
   build_daemon:
     dependency: transitive
     description:
@@ -70,21 +63,21 @@ packages:
       name: build_resolvers
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.7"
+    version: "1.0.8"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.9"
+    version: "1.7.1"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.1.1"
+    version: "4.1.0"
   built_collection:
     dependency: transitive
     description:
@@ -119,7 +112,7 @@ packages:
       name: checked_yaml
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.1"
+    version: "1.0.2"
   code_builder:
     dependency: transitive
     description:
@@ -175,7 +168,7 @@ packages:
       name: dart_style
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.7"
+    version: "1.2.9"
   dio:
     dependency: "direct main"
     description:
@@ -402,7 +395,7 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.6"
+    version: "1.1.7"
   mime:
     dependency: transitive
     description:
@@ -437,7 +430,7 @@ packages:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.2"
+    version: "1.6.4"
   path_provider:
     dependency: "direct main"
     description:
@@ -451,7 +444,7 @@ packages:
       name: pedantic
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.0"
+    version: "1.8.0+1"
   permission_handler:
     dependency: "direct main"
     description:
@@ -465,7 +458,7 @@ packages:
       name: photo_view
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.3"
+    version: "0.5.0"
   platform:
     dependency: transitive
     description:
@@ -521,7 +514,7 @@ packages:
       name: quiver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.2"
+    version: "2.0.5"
   redux:
     dependency: "direct main"
     description:
@@ -631,7 +624,7 @@ packages:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
   synchronized:
     dependency: transitive
     description:
@@ -652,7 +645,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.4"
+    version: "0.2.5"
   timing:
     dependency: transitive
     description:
@@ -724,5 +717,5 @@ packages:
     source: hosted
     version: "2.2.0"
 sdks:
-  dart: ">=2.3.0-dev.0.1 <3.0.0"
-  flutter: ">=1.5.0 <2.0.0"
+  dart: ">=2.3.0 <3.0.0"
+  flutter: ">=1.5.9-pre.94 <2.0.0"