panhui há 6 anos atrás
pai
commit
dc46c11fa8

BIN
images/2x/bangding_img_01.png


BIN
images/2x/bangding_img_02.png


BIN
images/2x/fangjian_img_bg.png


BIN
images/2x/list_icon_del.png


BIN
images/2x/list_icon_del_slices.zip


BIN
images/2x/金币/小_白色.png


BIN
images/3x/bangding_img_01.png


BIN
images/3x/bangding_img_02.png


BIN
images/3x/fangjian_img_bg.png


BIN
images/3x/list_icon_del.png


BIN
images/3x/金币/小_白色.png


BIN
images/bangding_img_01.png


BIN
images/bangding_img_02.png


BIN
images/fangjian_img_bg.png


BIN
images/list_icon_del.png


BIN
images/金币/小_白色.png


+ 2 - 2
lib/net/HttpManager.dart

@@ -3,8 +3,8 @@ import 'Result.dart';
 import 'package:intl/intl.dart';
 
 class HttpManager {
-  static String baseUrl = 'http://123.58.240.138:9000/';
-  // static String baseUrl='http://192.168.50.226:8080/';
+  // static String baseUrl = 'http://123.58.240.138:9000/';
+  static String baseUrl='http://192.168.50.15:8080/';
   static String token;
   static bool debug;
 

+ 2 - 2
lib/pages/Appeal.dart

@@ -157,7 +157,7 @@ class AppealState extends State<Appeal> {
       child: img != null && img.isNotEmpty
           ? Container(
               height: 111,
-              decoration: BoxDecoration(border: Border.all(width: 1, color: Color(0x5C1990F8)), color: Color(0xFF293354)),
+              decoration: BoxDecoration(border: Border.all(width: 1, color: Color(0xFF92434A)), color: Color(0xFF293354)),
               child: CachedNetworkImage(
                 imageUrl: img,
                 height: 111,
@@ -166,7 +166,7 @@ class AppealState extends State<Appeal> {
             )
           : Container(
               height: 111,
-              decoration: BoxDecoration(border: Border.all(width: 1, color: Color(0x5C1990F8)), color: Color(0xFF293354)),
+              decoration: BoxDecoration(border: Border.all(width: 1, color: Color(0xFF92434A)), color: Color(0xFF293354)),
               child: Column(
                 mainAxisSize: MainAxisSize.max,
                 mainAxisAlignment: MainAxisAlignment.center,

+ 18 - 3
lib/pages/BindGame.dart

@@ -1,5 +1,6 @@
 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';
@@ -52,7 +53,7 @@ class BindGameState extends State<BindGame> {
 
   Future<void> bindEvent() async {
     if (bindName == '') {
-      Toast.show(context, '请输入绑定角色名称', 1500, 'info');
+      Toast.show(context, '请输入和平精英游戏编号', 1500, 'info');
       return;
     }
     Toast.show(context, '加载中', -1, 'loading');
@@ -88,7 +89,8 @@ class BindGameState extends State<BindGame> {
           centerTitle: true,
           elevation: 0,
         ),
-        body: Container(
+        body: SingleChildScrollView(
+          child: Container(
           color: BG_SUB_COLOR,
           padding: EdgeInsets.all(15),
           child: Column(
@@ -105,9 +107,22 @@ class BindGameState extends State<BindGame> {
                   mainAxisAlignment: MainAxisAlignment.end,
                   children: _bindWidegt(),
                 ),
-              )
+              ),
+              Container(
+                height: 20,
+              ),
+              Text('游戏编号位置',style:TextStyle(color:Colors.white,fontSize:14)),
+              Container(
+                height: 10,
+              ),
+              prefix0.Image.asset('images/bangding_img_01.png'),
+               Container(
+                height: 10,
+              ),
+              prefix0.Image.asset('images/bangding_img_02.png')
             ],
           ),
+        ),
         ));
   }
 

+ 18 - 7
lib/pages/MatchPage.dart

@@ -38,6 +38,7 @@ class _MatchPageState extends State<MatchPage> with WidgetsBindingObserver {
   List<GameInfo> gameList = [];
   String gameName = '全部游戏';
   bool isFirst = true;
+  FocusNode _focusNode=new FocusNode();
 
   void showPicker(BuildContext context) {
     List<String> _list = [];
@@ -180,7 +181,9 @@ class _MatchPageState extends State<MatchPage> with WidgetsBindingObserver {
   @override
   Widget build(BuildContext context) {
     return WillPopScope(
-      child: Scaffold(
+      child: GestureDetector(
+         behavior: HitTestBehavior.translucent,
+        child: Scaffold(
           appBar: AppBar(
             title: Text('赛事'),
             centerTitle: true,
@@ -284,18 +287,22 @@ class _MatchPageState extends State<MatchPage> with WidgetsBindingObserver {
                                     child: ITextField(
                                         hintText: '搜索竞赛房间',
                                         inputBorder: InputBorder.none,
-                                        hintStyle: TextStyle(
-                                          fontSize: 13,
-                                          color: Color(0xFFB1B5C0),
-                                          height:1.2
-                                        ),
+                                        hintStyle: TextStyle(fontSize: 13, color: Color(0xFFB1B5C0), height: 1.2),
                                         textStyle: TextStyle(color: Colors.black),
                                         contentPadding: EdgeInsets.symmetric(vertical: 4, horizontal: 4),
                                         fieldCallBack: (content) {
                                           search(content);
+                                          _focusNode.unfocus();
                                         },
+                                        focusNode: _focusNode,
                                         counterStyle: TextStyle(color: Color(0xFF9BA0AE), fontSize: 0),
-                                        textInputAction: TextInputAction.search),
+                                        textInputAction: TextInputAction.search,
+                                        fileOnTap: () {
+                                          print('选择input');
+                                          if (_controller.position.pixels < 200) {
+                                            _controller.animateTo(200, duration: Duration(milliseconds: 300), curve: Curves.ease);
+                                          }
+                                        }),
                                   ),
                                 ),
                                 Container(
@@ -358,6 +365,10 @@ class _MatchPageState extends State<MatchPage> with WidgetsBindingObserver {
               ),
             ),
           )),
+          onTap: (){
+            _focusNode.unfocus();
+          },
+      ),
       onWillPop: () {
         if (isFirst) {
           isFirst = false;

+ 2 - 2
lib/pages/MyCode.dart

@@ -101,8 +101,8 @@ class MyCodeState extends State<MyCode> {
                                 btntext: '立刻邀请',
                                 btnHeight: 44.0,
                                 colorList: [
-                                  Color(0xFFFFC30F),
-                                  Color(0xFFFFA54C)
+                                  Color(0xFFD4504B),
+                                  Color(0xFFD4504B)
                                 ],
                                 onTapHomeMenu: () async {
                                   MyDialog.showDialog(context, '手动截图立即分享二维码给小伙伴吧!');

+ 39 - 38
lib/pages/MyWallet.dart

@@ -10,7 +10,7 @@ import '../net/HttpManager.dart';
 import '../net/Result.dart';
 import 'dart:ui';
 import '../styles/totast.dart';
-import 'Recharge.dart';
+import 'ShoppingMall.dart';
 
 class MyWallet extends StatefulWidget {
   @override
@@ -99,7 +99,7 @@ class MyWalletState extends State<MyWallet> {
               getWalletPage();
             },
             child: Container(
-              color: BG_COLOR,
+              color: Color(0xFF2E3049),
               child: Stack(
                 children: <Widget>[
                   CustomScrollView(
@@ -149,7 +149,7 @@ class MyWalletState extends State<MyWallet> {
               //背景装饰
               gradient: LinearGradient(
             begin: Alignment.bottomRight,
-            colors: [Color(0xFFFFA6A2),Color(0xFFCE5C57), Theme.of(context).primaryColor],
+            colors: [Color(0xFFFEA5A1),Color(0xFFE17874), Theme.of(context).primaryColor],
           )),
           child: Stack(
             overflow: Overflow.visible,
@@ -178,13 +178,13 @@ class MyWalletState extends State<MyWallet> {
                       mainAxisAlignment: MainAxisAlignment.center,
                       children: <Widget>[
                         Image(
-                          image: AssetImage('images/icon_menpiao.png'),
+                          image: AssetImage('images/金币/小_白色.png'),
                           width: 20,
                         ),
                         Container(width: 5,),
-                        Text('我的门票',
+                        Text('我的参赛券',
                             style: TextStyle(
-                              color: Colors.white,
+                              color: Color(0xFFC2524D),
                               fontSize: 14,
                             ))
                       ],
@@ -192,28 +192,29 @@ class MyWalletState extends State<MyWallet> {
                   ],
                 ),
               ),
-              // Positioned(
-              //   bottom: -23,
-              //   left: -(ScreenUtil().setWidth(345) - 216) / 2,
-              //   child: Container(
-              //     width: ScreenUtil().setWidth(345),
-              //     height: 46,
-              //     color: PRIMARY_COLOR,
-              //     child: _newRouterTab(context),
-              //   ),
-              // )
+              Positioned(
+                bottom: -23,
+                left: -(ScreenUtil().setWidth(345) - 216) / 2,
+                child: Container(
+                  width: ScreenUtil().setWidth(345),
+                  height: 46,
+                  color: PRIMARY_COLOR,
+                  child: _newRouterTab(context),
+                ),
+              )
             ],
           ),
         ),
         Container(
           width: double.infinity,
+          // color: Color(0xFF2E3049),
           child: Text(
             '余额明细',
             style: TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.w500),
           ),
           padding: EdgeInsets.only(
             left: 15,
-            top: 15,
+            top: 55,
             bottom: 15,
           ),
         )
@@ -225,25 +226,25 @@ class MyWalletState extends State<MyWallet> {
   Widget _newRouterTab(BuildContext context) {
     return Row(
       children: <Widget>[
-        Expanded(
-          flex: 1,
-          child: GestureDetector(
-            child: Container(
-              padding: EdgeInsets.all(10),
-              child: Text(
-                '提现',
-                textAlign: TextAlign.center,
-                style: TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.w500),
-              ),
-            ),
-            onTap: () {},
-          ),
-        ),
-        Container(
-          width: 1,
-          height: 20,
-          color: Color(0x2E000000),
-        ),
+        // Expanded(
+        //   flex: 1,
+        //   child: GestureDetector(
+        //     child: Container(
+        //       padding: EdgeInsets.all(10),
+        //       child: Text(
+        //         '提现',
+        //         textAlign: TextAlign.center,
+        //         style: TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.w500),
+        //       ),
+        //     ),
+        //     onTap: () {},
+        //   ),
+        // ),
+        // Container(
+        //   width: 1,
+        //   height: 20,
+        //   color: Color(0x2E000000),
+        // ),
         Expanded(
           flex: 1,
           child: GestureDetector(
@@ -255,7 +256,7 @@ class MyWalletState extends State<MyWallet> {
                   style: TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.w500),
                 )),
             onTap: () {
-              Navigator.push(context, CupertinoPageRoute(builder: (context) => Rechrage()));
+                 Navigator.push(context, CupertinoPageRoute(builder: (context) => ShoppingMall()));
             },
           ),
         )
@@ -272,7 +273,7 @@ class MyWalletState extends State<MyWallet> {
             padding: EdgeInsets.all(15),
             decoration: BoxDecoration(
               border: BorderDirectional(top: BorderSide(width: 1, color: Color(0x2E000000), style: BorderStyle.solid)),
-              color: BG_COLOR,
+              color: Color(0xFF2E3049),
             ),
             child: Row(
               mainAxisAlignment: MainAxisAlignment.center,

+ 7 - 4
lib/pages/OpenRoom.dart

@@ -206,7 +206,7 @@ class OpenRoomState extends State<OpenRoom> {
     return WillPopScope(
       child: Scaffold(
         appBar: AppBar(
-          title: Text('发起' + (widget.roomFlag == '0' ? '普通' : '官方') + '赛事'),
+          title: Text('发起赛事'),
           centerTitle: true,
           elevation: 0,
           // actions: <Widget>[
@@ -241,8 +241,8 @@ class OpenRoomState extends State<OpenRoom> {
                           width: 160,
                           height: 38,
                           child: LinearButton(
-                            radius:38.0,
-                            colorList: [Color(0xFF3A3E61),Color(0xFF3A3E61)],
+                            radius: 38.0,
+                            colorList: [Color(0xFF3A3E61), Color(0xFF3A3E61)],
                             childWidget: Row(
                               mainAxisAlignment: MainAxisAlignment.center,
                               children: <Widget>[
@@ -729,8 +729,11 @@ class FloatTextContent extends StatelessWidget {
               top: dy + 9,
               child: Container(
                 padding: EdgeInsets.all(10),
+                decoration: BoxDecoration(
+                  borderRadius: BorderRadius.only(topRight: Radius.circular(8), bottomLeft: Radius.circular(8), bottomRight: Radius.circular(8)),
+                  color: Color(0xFF3A3E61),
+                ),
                 constraints: BoxConstraints(maxWidth: 241),
-                color: Color(0xFF3A3E61),
                 child: Text('房主可以选择不同人次的房卡进行开始比赛,同步消耗自己相应的参赛名额,比如选择50人次房卡,系统从我的账号上扣除50人次参赛名额,房间内最多可进入50人参加比赛',
                     style: TextStyle(color: Colors.white, fontSize: 12, fontWeight: FontWeight.w400, decoration: TextDecoration.none)),
               ),

+ 51 - 45
lib/pages/RankList.dart

@@ -177,12 +177,13 @@ class RankListState extends State<RankList> {
                             floating: true,
                             delegate: _SliverAppBarDelegate(
                                 minHeight: 66, //收起的高度
-                                maxHeight:66, //展开的最大高度
+                                maxHeight: 66, //展开的最大高度
                                 child: RankItem(
                                   myPlayInfo,
                                   myPlayInfo.rank,
                                   height: 66,
                                   color: 0xFF23253C,
+                                  border:false
                                 )),
                           ),
                     _sliverList()
@@ -462,62 +463,67 @@ class RankListState extends State<RankList> {
 }
 
 class RankItem extends StatelessWidget {
-  RankItem(this.playerInfo, this.index, {this.color = 0, this.height = 66.0});
+  RankItem(this.playerInfo, this.index, {this.color = 0, this.height = 66.0,this.border=true});
   final PlayerInfo playerInfo;
   final int index;
   final int color;
   final double height;
+  final bool border;
 
   List<String> rankImgList = ['images/icon_paihangbang_01.png', 'images/icon_paihangbang_02.png', 'images/icon_paihangbang_03.png'];
 
   @override
   Widget build(BuildContext context) {
     return Container(
-      height: height,
-      padding: EdgeInsets.symmetric(horizontal: 15),
-      decoration: BoxDecoration(
-          border: Border(bottom: BorderSide(width: 1, color: Colors.black26, style: BorderStyle.solid)),
-          color: color == 0 ? (playerInfo.rank < 4 ? Color(0xFF363759) : Color(0xFF2B2B42)) : Color(color)),
-      child: Row(
-        children: <Widget>[
-          playerInfo.rank < 100
-              ? (playerInfo.rank < 4
-                  ? Padding(
-                      padding: EdgeInsets.only(right: 15),
-                      child: Image.asset(rankImgList[playerInfo.rank - 1]),
-                    )
-                  : Container(
-                      width: 30,
-                      height: 30,
-                      margin: EdgeInsets.only(right: 15),
-                      decoration: BoxDecoration(image: DecorationImage(image: AssetImage('images/icon_paihangbang_04_huangse.png'), fit: BoxFit.cover)),
-                      child: Text(
-                        playerInfo.rank.toString(),
-                        style: TextStyle(color: Color(0xFF15151D), fontSize: 12, fontWeight: FontWeight.w500, height: 2),
-                        textAlign: TextAlign.center,
-                      ),
-                    ))
-              : Container(),
-          Container(
-            width: 36,
-            height: 36,
-            margin: EdgeInsets.only(right: 15),
-            child: CircleAvatar(
-              backgroundImage: NetworkImage(playerInfo.userInfo.icon),
-            ),
+        height: height,
+        padding: EdgeInsets.symmetric(horizontal: 15),
+        decoration: BoxDecoration(
+            // border: Border(bottom: BorderSide(width: 1, color: Colors.black26, style: BorderStyle.solid)),
+            color: color == 0 ? Color(0xFF2E3049) : Color(color)),
+        child: Container(
+          decoration: BoxDecoration(
+            border: Border(bottom: BorderSide(width: border?1:0, color: Colors.black26, style: BorderStyle.solid)),
           ),
-          Expanded(
-            flex: 1,
-            child: Text(playerInfo.userInfo.nickname,
-                style: TextStyle(color: Theme.of(context).primaryColor, fontSize: 14, height: 1.2), overflow: TextOverflow.ellipsis),
+          child: Row(
+            children: <Widget>[
+              playerInfo.rank < 100
+                  ? (playerInfo.rank < 4
+                      ? Padding(
+                          padding: EdgeInsets.only(right: 15),
+                          child: Image.asset(rankImgList[playerInfo.rank - 1]),
+                        )
+                      : Container(
+                          width: 30,
+                          height: 30,
+                          margin: EdgeInsets.only(right: 15),
+                          decoration: BoxDecoration(image: DecorationImage(image: AssetImage('images/icon_paihangbang_04_huangse.png'), fit: BoxFit.cover)),
+                          child: Text(
+                            playerInfo.rank.toString(),
+                            style: TextStyle(color: Color(0xFF15151D), fontSize: 12, fontWeight: FontWeight.w500, height: 2),
+                            textAlign: TextAlign.center,
+                          ),
+                        ))
+                  : Container(),
+              Container(
+                width: 36,
+                height: 36,
+                margin: EdgeInsets.only(right: 15),
+                child: CircleAvatar(
+                  backgroundImage: NetworkImage(playerInfo.userInfo.icon),
+                ),
+              ),
+              Expanded(
+                flex: 1,
+                child: Text(playerInfo.userInfo.nickname,
+                    style: TextStyle(color: Theme.of(context).primaryColor, fontSize: 14, height: 1.2), overflow: TextOverflow.ellipsis),
+              ),
+              Medal(playerInfo.getPlatinum(), '铂金'),
+              Medal(playerInfo.getGold(), '金牌'),
+              Medal(playerInfo.getSilver(), '银牌'),
+              Medal(playerInfo.getBronze(), '铜牌'),
+            ],
           ),
-          Medal(playerInfo.getPlatinum(), '铂金'),
-          Medal(playerInfo.getGold(), '金牌'),
-          Medal(playerInfo.getSilver(), '银牌'),
-          Medal(playerInfo.getBronze(), '铜牌'),
-        ],
-      ),
-    );
+        ));
   }
 }
 

+ 2 - 1
lib/pages/RoomInfo.dart

@@ -1101,7 +1101,8 @@ class Tips extends StatelessWidget {
         padding: EdgeInsets.all(15),
         margin: EdgeInsets.fromLTRB(15, 10, 15, 0),
         decoration: BoxDecoration(
-            gradient: LinearGradient(colors: [Color(0xFF464B6A), Color(0xFF35395E)], begin: Alignment.topCenter, end: Alignment.bottomCenter),
+            // gradient: LinearGradient(colors: [Color(0xFF464B6A), Color(0xFF35395E)], begin: Alignment.topCenter, end: Alignment.bottomCenter),
+            color: Color(0xFF3A3E61),
             borderRadius: BorderRadius.only(topRight: Radius.circular(8), bottomLeft: Radius.circular(8), bottomRight: Radius.circular(8))),
         child: Column(
           children: <Widget>[

+ 7 - 4
lib/pages/ShoppingMall.dart

@@ -158,10 +158,10 @@ class RechargeState extends State<Recharge> {
                 margin: EdgeInsets.only(top: 10),
                 height: 60,
                 child: FlatButton(
-                  color: Color(0xFF222335),
+                  color: Color(0xFF24263A),
                   padding: EdgeInsets.all(0),
-                  shape: Border.all(color: isChoose ? Theme.of(context).primaryColor : Colors.transparent, width: 1),
-                  disabledColor: Color(0xFF222335),
+                  shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(4.0),side: BorderSide(color: isChoose ? Theme.of(context).primaryColor : Colors.transparent, width: 1)),
+                  disabledColor: Color(0xFF24263A),
                   child: Container(
                     child: Stack(
                       children: <Widget>[
@@ -248,7 +248,10 @@ class ShoopingBtn extends StatelessWidget {
     return Container(
       height: 70,
       decoration: BoxDecoration(
-          gradient: LinearGradient(begin: Alignment.topCenter, end: Alignment.bottomCenter, stops: [0.0, 0.5], colors: [Color(0xFF464B6A), Color(0xFF35395E)])),
+          // gradient: LinearGradient(begin: Alignment.topCenter, end: Alignment.bottomCenter, stops: [0.0, 0.5], colors: [Color(0xFF464B6A), Color(0xFF35395E)])
+          color: Color(0xFF3A3E61),
+          borderRadius: BorderRadius.all(Radius.circular(4)),
+          ),
       child: Material(
           color: Colors.transparent,
           child: InkWell(

+ 4 - 4
lib/pages/TipInfo.dart

@@ -147,8 +147,9 @@ class TipInfoState extends State<TipInfo> {
                   ),
                 ),
                 playerInfo != null && playerInfo.dataError
-                    ? Padding(
-                        padding: EdgeInsets.symmetric(horizontal: 15, vertical: 20),
+                    ? Container(
+                      width: double.infinity,
+                        padding: EdgeInsets.fromLTRB(15, 5, 15, 20),
                         child: DefaultTextStyle(
                           style: TextStyle(
                             fontSize: 13,
@@ -363,9 +364,8 @@ class TipInfoState extends State<TipInfo> {
         img = jiangpaiImg[2];
       }
     }
-
     return Column(children: <Widget>[
-      (typeFlag != 4 && typeFlag != 5 && playerInfo != null && !playerInfo.dataError)
+      (typeFlag != 4 && typeFlag != 5 && playerInfo != null && !playerInfo.dataError && typeFlag!=0)
           ? Container(
               margin: EdgeInsets.fromLTRB(15, 10, 15, 0),
               padding: EdgeInsets.all(15),

+ 2 - 1
lib/pages/TipList.dart

@@ -213,7 +213,7 @@ class TipItem extends StatelessWidget {
         });
       }
     });
-    print(totalContent);
+  
 
     List<TextSpan> _widgetList=[];
     totalContent.forEach((item){
@@ -227,6 +227,7 @@ class TipItem extends StatelessWidget {
         _widgetList.add(TextSpan(text:item['content']));
       }
     });
+      // print(_widgetList);
 
     return _widgetList;
   }

+ 4 - 4
lib/pages/UserPage.dart

@@ -47,7 +47,7 @@ class _UserPageState extends State<UserPage> with WidgetsBindingObserver {
         builder: (context, userInfo) {
           return Scaffold(
             body: Container(
-              color: Color(0xFF3A3D5C),
+              color: Color(0xFF2E3049),
               height: double.infinity,
               width: double.infinity,
               child: SingleChildScrollView(
@@ -64,8 +64,8 @@ class _UserPageState extends State<UserPage> with WidgetsBindingObserver {
                               child: ClipOval(
                                   child: CachedNetworkImage(
                                 imageUrl: userInfo.icon,
-                                width: 86,
-                                height: 86,
+                                width: 76,
+                                height: 76,
                                 fit: BoxFit.cover,
                               )),
                               onTap: () {
@@ -186,7 +186,7 @@ class Divder extends StatelessWidget {
   Widget build(BuildContext context) {
     return Container(
       height: 1,
-      padding: EdgeInsets.fromLTRB(30, 0, 30, 0),
+      padding: EdgeInsets.fromLTRB(55, 0, 15, 0),
       child: Container(
         decoration: BoxDecoration(color: Color(0x2E000000)),
       ),

+ 1 - 1
lib/styles/colors.dart

@@ -7,7 +7,7 @@ const PRIMARY_COLOR = Color(0xFFC2524D);
 const SUB_COLOR = Color(0xFFA6554F);
 
 //背景色
-const BG_COLOR = Color(0xFF2B2B42);
+const BG_COLOR = Color(0xFF2E3049);
 
 //辅助背景色
 const BG_SUB_COLOR = Color(0xFF232437);

+ 12 - 4
lib/widget/ITextInput.dart

@@ -34,6 +34,7 @@ class ITextField extends StatefulWidget {
   final TextInputAction textInputAction;
   final EdgeInsetsGeometry contentPadding;
   final FocusNode focusNode;
+  final GestureTapCallback fileOnTap;
 
   ITextField(
       {Key key,
@@ -54,7 +55,8 @@ class ITextField extends StatefulWidget {
       this.autofocus = false,
       this.textInputAction,
       this.contentPadding,
-      this.focusNode})
+      this.focusNode,
+      this.fileOnTap})
       : assert(maxLines == null || maxLines > 0),
         assert(maxLength == null || maxLength > 0),
         keyboardType = maxLines == 1 ? keyboardType : ITextInputType.multiline,
@@ -154,15 +156,16 @@ class _ITextFieldState extends State<ITextField> {
         contentPadding: widget.contentPadding,
         suffixIcon: _hasdeleteIcon
             ? Container(
-                width: 20.0,
-                height: 20.0,
+                width: 18.0,
+                height: 18.0,
                 child: IconButton(
                   alignment: Alignment.center,
-                  padding: const EdgeInsets.all(0.0),
+                  padding: const EdgeInsets.all(2.0),
                   iconSize: 18.0,
                   icon: widget.deleteIcon != null
                       ? widget.deleteIcon
                       : Icon(Icons.cancel),
+                      color:Color(0xFf727785) ,
                   onPressed: () {
                     setState(() {
                       _inputText = '';
@@ -170,6 +173,8 @@ class _ITextFieldState extends State<ITextField> {
                       widget.fieldCallBack(_inputText);
                     });
                   },
+
+                  
                 ),
               )
             : Text(''),
@@ -192,6 +197,9 @@ class _ITextFieldState extends State<ITextField> {
       inputFormatters: _getTextInputFormatter(),
       style: widget.textStyle,
       obscureText: _isPassword,
+      onTap: (){
+       widget.fileOnTap();
+      },
     );
     return textField;
   }

+ 5 - 4
lib/widget/VideoWidget.dart

@@ -87,7 +87,7 @@ class VideoWidgetState extends State<VideoWidget> {
   Widget _playContainer() {
     return Container(
       color: Colors.black,
-      height: 210,
+      height: 200,
       width: double.infinity,
       child: Center(
         child: Stack(
@@ -99,9 +99,10 @@ class VideoWidgetState extends State<VideoWidget> {
                           aspectRatio: _controller.value.aspectRatio,
                           child: VideoPlayer(_controller),
                         )
-                      : Image.network(
-                          'http://images.liqucn.com/img/h22/h70/img_localize_8e824debdd9ee29522690f36680e2d8e_600x337.png',
-                          width: double.infinity),
+                      :Image.asset('images/fangjian_img_bg.png'),
+                      // Image.network(
+                      //     'http://images.liqucn.com/img/h22/h70/img_localize_8e824debdd9ee29522690f36680e2d8e_600x337.png',
+                      //     width: double.infinity),
                 ),
                 onTap: () => playVideo()),
             !isPlay