Merge branch 'b_c' of http://git.izouma.com/panhui/mobileCyberGamesApp into b_c

lib/pages/BindGame.dart

@@ -1,6 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:cached_network_image/cached_network_image.dart';
-import 'package:flutter/material.dart' as prefix0;
 import '../styles/colors.dart';
 import 'dart:ui';
 import '../styles/totast.dart';
@@ -115,11 +113,11 @@ class BindGameState extends State<BindGame> {
               Container(
                 height: 10,
               ),
-              prefix0.Image.asset('images/bangding_img_01.png'),
+              Image.asset('images/bangding_img_01.png'),
                Container(
                 height: 10,
               ),
-              prefix0.Image.asset('images/bangding_img_02.png')
+              Image.asset('images/bangding_img_02.png')
             ],
           ),
         ),

lib/pages/SelectRoom.dart

@@ -1,7 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart' as prefix0;
-import '../styles/totast.dart';
 import '../net/HttpManager.dart';
 import '../net/Result.dart';
 import 'package:flutter_redux/flutter_redux.dart';

lib/pages/Setting.dart

@@ -1,4 +1,3 @@
-import 'package:flutter/cupertino.dart' as prefix0;
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';

lib/widget/HouseItem.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart' as prefix0;
 import 'package:wanna_battle/model/PlayerInfo.dart';
 import '../model/HouseInfo.dart';
 import '../model/GameInfo.dart';
@@ -103,13 +102,13 @@ class HouseItem extends StatelessWidget {
       if (houseInfo.statusFlag == 0) {
         return Image.asset('images/join.png');
       } else if (houseInfo.statusFlag == 2) {
-        return Text('进行中', style: prefix0.TextStyle(color: Color(0xFF5C5C5C), fontSize: 14, fontWeight: FontWeight.w600));
+        return Text('进行中', style: TextStyle(color: Color(0xFF5C5C5C), fontSize: 14, fontWeight: FontWeight.w600));
       } else if (houseInfo.statusFlag == 3) {
-        return Text('解析中', style: prefix0.TextStyle(color: Color(0xFF5C5C5C), fontSize: 14, fontWeight: FontWeight.w600));
+        return Text('解析中', style: TextStyle(color: Color(0xFF5C5C5C), fontSize: 14, fontWeight: FontWeight.w600));
       } else if (houseInfo.statusFlag == 8) {
-        return Text('结算中', style: prefix0.TextStyle(color: Color(0xFF5C5C5C), fontSize: 14, fontWeight: FontWeight.w600));
+        return Text('结算中', style: TextStyle(color: Color(0xFF5C5C5C), fontSize: 14, fontWeight: FontWeight.w600));
       } else {
-        return Text('已结束', style: prefix0.TextStyle(color: Color(0xFF5C5C5C), fontSize: 14, fontWeight: FontWeight.w600));
+        return Text('已结束', style: TextStyle(color: Color(0xFF5C5C5C), fontSize: 14, fontWeight: FontWeight.w600));
       }
     } else {
       if (houseInfo.statusFlag == 2 || houseInfo.statusFlag == 3) {