08/09

android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Jun 23 08:50:38 CEST 2017
+#Wed Aug 07 17:54:10 CST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

lib/model/HouseInfo.dart

@@ -47,7 +47,7 @@ class HouseInfo {
   String createUser; //创建人
   int beginTime; //开始时间
   int createTime;//创建时间
-  int scoreType;//评分类型
+  int scoreType;//评分类型 0.评分 1.吃鸡
 String houseCode;//房间号
   factory HouseInfo.fromJson(Map<String, dynamic> json) =>
       _$HouseInfoFromJson(json);

lib/model/PlayerInfo.dart

@@ -8,11 +8,11 @@ part 'PlayerInfo.g.dart';
 @JsonSerializable()
 class PlayerInfo {
   PlayerInfo(
-      this.id, this.houseId, this.userId, this.statusFlag, this.userInfo,this.bonus,this.gameInfo,this.houseInfo,this.rank,this.houseRank,this.video,this.platinum,this.gold,this.silver,this.bronze,this.medal,this.liveTime,this.score,this.ranking,this.beginTime,this.endTime);
+      this.id, this.houseId, this.userId, this.statusFlag, this.userInfo,this.bonus,this.gameInfo,this.houseInfo,this.rank,this.houseRank,this.video,this.platinum,this.gold,this.silver,this.bronze,this.medal,this.liveTime,this.score,this.ranking,this.beginTime,this.endTime,this.dataError);
   int id;
   int houseId; //房间id
   int userId; //用户id
-  int statusFlag; //状态 0加入 1准备 2开始 3结束 6未比赛
+  int statusFlag; //状态 0加入 1准备 2开始 3结束 4结算 6未比赛 9.解析失败 7.超时 
   UserInfo userInfo;
   int bonus;//奖金
   GameInfo gameInfo;
@@ -30,6 +30,7 @@ class PlayerInfo {
   int ranking;//是否吃鸡 1吃鸡
   int beginTime;//开始比赛时间
   int endTime;//结束比赛时间
+  bool dataError;//数据异常
   
   factory PlayerInfo.fromJson(Map<String, dynamic> json) =>
       _$PlayerInfoFromJson(json);

lib/model/PlayerInfo.g.dart

@@ -28,7 +28,8 @@ PlayerInfo _$PlayerInfoFromJson(Map<String, dynamic> json) {
       json['score'] == null ? 0 : (json['score'] as num),
       json['ranking'] == null ? 0 : (json['ranking'] as int),
       json['beginTime'] as int,
-      json['endTime'] as int);
+      json['endTime'] as int,
+      json['dataError'] as bool);
 }
 
 Map<String, dynamic> _$PlayerInfoToJson(PlayerInfo instance) => <String, dynamic>{
@@ -49,5 +50,6 @@ Map<String, dynamic> _$PlayerInfoToJson(PlayerInfo instance) => <String, dynamic
       'bronze': instance.bronze,
       'medal': instance.medal,
       'beginTime': instance.beginTime,
-      'endTime': instance.endTime
+      'endTime': instance.endTime,
+      'dataError':instance.dataError
     };

lib/pages/CompetitionInformation.dart

@@ -79,7 +79,7 @@ class InfoBox extends StatelessWidget {
             padding: EdgeInsets.only(top: 25),
             child: Column(
               children: <Widget>[
-                Text('竞赛须知 ' + typeIndex.toString() + '/4', style: TextStyle(color: Color(0xFFFDC372), fontSize: 20, fontWeight: FontWeight.w600)),
+                Text('竞赛须知 ' + typeIndex.toString() + '/4', style: TextStyle(color: Color(0xFFC2524D), fontSize: 20, fontWeight: FontWeight.w600)),
                 _centerContent(typeIndex, context)
               ],
             ),
@@ -126,7 +126,10 @@ class InfoBox extends StatelessWidget {
                   onPressed: () {
                     end();
                   },
-                ):Container()
+                ):Container(
+                  width: 10,
+                  height: 43,
+                )
               ],
             ),
           )
@@ -181,7 +184,7 @@ class InfoBox extends StatelessWidget {
                     style: TextStyle(color: Color(0xFFFFB726), fontSize: 14, fontWeight: FontWeight.w500),
                   ),
                   TextSpan(
-                    text: '，否则视为放弃此次竞赛，已支付金币概不退换',
+                    text: '，否则视为放弃此次竞赛，已支付参赛券概不退换',
                     style: _text,
                   )
                 ]),
@@ -239,7 +242,7 @@ class InfoBox extends StatelessWidget {
             Text.rich(
                 TextSpan(children: [
                   TextSpan(
-                    text: '在游戏中吃鸡后，',
+                    text: '在游戏比赛结束后，',
                     style: _text,
                   ),
                   TextSpan(
@@ -247,7 +250,7 @@ class InfoBox extends StatelessWidget {
                     style: TextStyle(color:Color(0xFFFFB726), fontSize: 14, fontWeight: FontWeight.w600),
                   ),
                   TextSpan(
-                    text: '，返回游戏主页，最后再切换到我们竞赛app中，点击完成比赛，方可成功上传本次成绩，赢取大奖',
+                    text: '，返回游戏主页，最后再切换到我们竞赛app中，点击完成比赛，方可成功长传本次成绩，赢取大奖',
                     style: _text,
                   )
                 ]),

lib/pages/MatchPage.dart

@@ -285,8 +285,9 @@ class _MatchPageState extends State<MatchPage> with WidgetsBindingObserver {
                                         hintText: '搜索竞赛房间',
                                         inputBorder: InputBorder.none,
                                         hintStyle: TextStyle(
-                                          fontSize: 18,
+                                          fontSize: 13,
                                           color: Color(0xFFB1B5C0),
+                                          height:1.2
                                         ),
                                         textStyle: TextStyle(color: Colors.black),
                                         contentPadding: EdgeInsets.symmetric(vertical: 4, horizontal: 4),

lib/pages/RoomInfo.dart

@@ -24,7 +24,6 @@ import 'SecondRoomInfo.dart';
 import 'VideoPlayer.dart';
 import '../model/UserInfo.dart';
 import '../widget/LinearButton.dart';
-import '../widget/ScoreType.dart';
 import 'Appeal.dart';
 
 class RoomInfo extends StatefulWidget {
@@ -663,7 +662,7 @@ class RoomInfoState extends State<RoomInfo> with SingleTickerProviderStateMixin
                                   child: playerInfo != null
                                       ? Column(
                                           children: <Widget>[
-                                            Container(
+                                          ( playerInfo.statusFlag!=7&&playerInfo.statusFlag!=9&&!playerInfo.dataError)? Container(
                                               margin: EdgeInsets.symmetric(vertical: 10, horizontal: 15),
                                               padding: EdgeInsets.all(15),
                                               height: 80,
@@ -701,7 +700,7 @@ class RoomInfoState extends State<RoomInfo> with SingleTickerProviderStateMixin
                                                   )
                                                 ],
                                               ),
-                                            ),
+                                            ):Container(),
                                             Container(
                                               margin: EdgeInsets.symmetric(vertical: 10, horizontal: 15),
                                               padding: EdgeInsets.all(15),
@@ -970,7 +969,7 @@ class RoomInfoState extends State<RoomInfo> with SingleTickerProviderStateMixin
         child: LinearButton(btntext: '预计还有 ' + getSecondsMIn(_time) + ' 结算', colorList: [Color(0xFFAF4946), Color(0xFFAF4946)], textColor: Color(0xFF252532)),
       );
     } else if (statusFlag == 4 && tabIndex == 0) {
-      if (isJoin && canAppeal && appealState == 0) {
+      if (isJoin && canAppeal && appealState == 0 &&playerInfo!=null&&(playerInfo.statusFlag==9||playerInfo.statusFlag==7||playerInfo.dataError)) {
         return Container(
             width: double.infinity,
             padding: EdgeInsets.symmetric(horizontal: 15, vertical: 20),

lib/pages/TipInfo.dart

@@ -56,8 +56,7 @@ class TipInfoState extends State<TipInfo> {
       });
     }
 
-    Result res3 =
-        await HttpManager.get('playerInfo/getOne', data: {'userId': StoreProvider.of<AppState>(context).state.userInfo.id, 'houseId': tipInfo.houseId});
+    Result res3 = await HttpManager.get('playerInfo/getOne', data: {'userId': StoreProvider.of<AppState>(context).state.userInfo.id, 'houseId': tipInfo.houseId});
     if (res3.success) {
       playerInfo = PlayerInfo.fromJson(res3.data);
       print(res3.data);
@@ -143,13 +142,11 @@ class TipInfoState extends State<TipInfo> {
                         height: 1,
                         color: Colors.black26,
                       ),
-                      Padding(
-                          padding: EdgeInsets.only(top: 10, bottom: 0),
-                          child: Text.rich(TextSpan(style: TextStyle(color: Colors.white, fontSize: 14), children: _tipContent(tipInfo.content, context)))),
+                      Padding(padding: EdgeInsets.only(top: 10, bottom: 0), child: Text.rich(TextSpan(style: TextStyle(color: Colors.white, fontSize: 14), children: _tipContent(tipInfo.content, context)))),
                     ],
                   ),
                 ),
-                tipInfo.typeFlag == 4
+                playerInfo != null && playerInfo.dataError
                     ? Padding(
                         padding: EdgeInsets.symmetric(horizontal: 15, vertical: 20),
                         child: DefaultTextStyle(
@@ -161,37 +158,60 @@ class TipInfoState extends State<TipInfo> {
                             crossAxisAlignment: CrossAxisAlignment.start,
                             children: <Widget>[
                               Text('造成此情况等原因可能是：'),
-                              Text('1、确认开始游戏后没有授权系统进行录屏'),
-                              Text('2、视频没有录制到最后的分数名次结算页面就回到APP点击完成比赛了 '),
-                              Text('3、在游戏过程中，猿人点击APP后台进程被退出 '),
-                              Text('4、没有实际进行游戏比赛 '),
-                              Text('5、使用作弊手段录制视频'),
+                              Text('1、没有实际进行游戏比赛 '),
+                              Text('2、使用作弊手段进行游戏'),
                             ],
                           ),
                         ),
                       )
-                    : Container(),
-                tipInfo.typeFlag == 5
-                    ? Padding(
-                        padding: EdgeInsets.symmetric(horizontal: 15, vertical: 20),
-                        child: DefaultTextStyle(
-                          style: TextStyle(
-                            fontSize: 13,
-                            color: Colors.white54,
-                          ),
-                          child: Column(
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            children: <Widget>[
-                              Text('造成此情况等原因可能是：'),
-                              Text('1、游戏结束后没有在规定时间内返回APP点击完成比赛按钮'),
-                            ],
-                          ),
-                        ),
-                      )
-                    : Container(),
+                    : Container(
+                        height: 30,
+                      ),
+                // tipInfo.typeFlag == 4
+                //     ? Padding(
+                //         padding: EdgeInsets.symmetric(horizontal: 15, vertical: 20),
+                //         child: DefaultTextStyle(
+                //           style: TextStyle(
+                //             fontSize: 13,
+                //             color: Colors.white54,
+                //           ),
+                //           child: Column(
+                //             crossAxisAlignment: CrossAxisAlignment.start,
+                //             children: <Widget>[
+                //               Text('造成此情况等原因可能是：'),
+                //               Text('1、确认开始游戏后没有授权系统进行录屏'),
+                //               Text('2、视频没有录制到最后的分数名次结算页面就回到APP点击完成比赛了 '),
+                //               Text('3、在游戏过程中，猿人点击APP后台进程被退出 '),
+                //               Text('4、没有实际进行游戏比赛 '),
+                //               Text('5、使用作弊手段录制视频'),
+                //             ],
+                //           ),
+                //         ),
+                //       )
+                //     : Container(),
+                // tipInfo.typeFlag == 5
+                //     ? Padding(
+                //         padding: EdgeInsets.symmetric(horizontal: 15, vertical: 20),
+                //         child: DefaultTextStyle(
+                //           style: TextStyle(
+                //             fontSize: 13,
+                //             color: Colors.white54,
+                //           ),
+                //           child: Column(
+                //             crossAxisAlignment: CrossAxisAlignment.start,
+                //             children: <Widget>[
+                //               Text('造成此情况等原因可能是：'),
+                //               Text('1、游戏结束后没有在规定时间内返回APP点击完成比赛按钮'),
+                //             ],
+                //           ),
+                //         ),
+                //       )
+                //     : Container(
+                //         height: 30,
+                //       ),
                 // houseInfo != null && tipInfo.typeFlag != 4 && tipInfo.typeFlag != 5 ? RankContent(roomId: houseInfo.id.toString()) : Container(),
                 houseInfo != null && type != 3 ? HouseItem(houseInfo, gameInfo) : Container(),
-                houseInfo != null && playerInfo != null && type != 3 ? _resultContent(houseInfo, playerInfo) : Container(),
+                houseInfo != null && playerInfo != null && type != 3 ? _resultContent(houseInfo, playerInfo, tipInfo.typeFlag) : Container(),
                 (type == 2 || type == 3)
                     ? Container(
                         width: double.infinity,
@@ -202,9 +222,7 @@ class TipInfoState extends State<TipInfo> {
                                 btntext: '立即领取',
                                 onTapHomeMenu: () async {
                                   Toast.show(context, '加载中', -1, 'loading');
-                                  Result res = type == 2
-                                      ? await HttpManager.post('playerInfo/receive', data: {'id': tipInfo.playerId})
-                                      : await HttpManager.post('systemNotice/receive', data: {'id': widget.tipId});
+                                  Result res = type == 2 ? await HttpManager.post('playerInfo/receive', data: {'id': tipInfo.playerId}) : await HttpManager.post('systemNotice/receive', data: {'id': widget.tipId});
                                   Toast.hide();
                                   if (res.success) {
                                     if (tipInfo.playerInfo != null) {
@@ -269,7 +287,7 @@ class TipInfoState extends State<TipInfo> {
   }
 
   Widget _btnContent() {
-    if (tipInfo.typeFlag != 3 && canAppeal && appealState == 0) {
+    if ((tipInfo.typeFlag == 4 || tipInfo.typeFlag == 5 || (playerInfo != null && playerInfo.dataError)) && canAppeal && appealState == 0) {
       return Container(
           width: double.infinity,
           padding: EdgeInsets.symmetric(horizontal: 15, vertical: 20),
@@ -289,11 +307,7 @@ class TipInfoState extends State<TipInfo> {
             },
           ));
     } else if (tipInfo.typeFlag != 3 && canAppeal && appealState == 1) {
-      return Container(
-          width: double.infinity,
-          padding: EdgeInsets.symmetric(horizontal: 15, vertical: 20),
-          height: 88,
-          child: LinearButton(btntext: '已提交申诉', colorList: [Color(0xFFAF4946), Color(0xFFAF4946)], textColor: Color(0xFF252532)));
+      return Container(width: double.infinity, padding: EdgeInsets.symmetric(horizontal: 15, vertical: 20), height: 88, child: LinearButton(btntext: '已提交申诉', colorList: [Color(0xFFAF4946), Color(0xFFAF4946)], textColor: Color(0xFF252532)));
     } else {
       return Container();
     }
@@ -334,7 +348,7 @@ class TipInfoState extends State<TipInfo> {
     return _widgetList;
   }
 
-  Widget _resultContent(HouseInfo houseInfo, PlayerInfo playerInfo) {
+  Widget _resultContent(HouseInfo houseInfo, PlayerInfo playerInfo, int typeFlag) {
     List jiangpaiImg = ['images/jiangpai_huangjin.png', 'images/jiangpai_baiyin.png', 'images/jiangpai_qingtong.png', 'images/jiangpai_bojin.png'];
 
     String img = '';
@@ -349,52 +363,79 @@ class TipInfoState extends State<TipInfo> {
         img = jiangpaiImg[2];
       }
     }
-    return Container(
-      margin: EdgeInsets.symmetric(vertical: 10, horizontal: 15),
-      padding: EdgeInsets.all(15),
-      height: 140,
-      decoration: BoxDecoration(
-          color: Color(0xFF3A3E61),
-          borderRadius: BorderRadius.only(topRight: Radius.circular(8), bottomLeft: Radius.circular(8), bottomRight: Radius.circular(8))),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        children: <Widget>[
-          Text('比赛结果', style: TextStyle(color: Colors.white54, fontSize: 13)),
-          Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: <Widget>[
-              Text("参数成员 ", style: TextStyle(color: Colors.white, fontSize: 14)),
-              Text("${houseInfo.playerNumber}人 ", style: TextStyle(color: Color(0xFFFFB726), fontWeight: FontWeight.w500, fontSize: 14))
-            ],
-          ),
-          Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: <Widget>[
-              Text("是否吃鸡 ", style: TextStyle(color: Colors.white, fontSize: 14)),
-              Text(playerInfo.ranking == 1 ? '是' : '否', style: TextStyle(color: Color(0xFFFFB726), fontWeight: FontWeight.w500, fontSize: 14))
-            ],
-          ),
-          Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: <Widget>[
-              Text("获得奖牌 ", style: TextStyle(color: Colors.white, fontSize: 14)),
-              img != ''
-                  ? Row(
-                      children: <Widget>[
-                        Image.asset(
-                          img,
-                          width: 20,
-                        ),
-                        Text("+1", style: TextStyle(color: Color(0xFFFFB726), fontWeight: FontWeight.w500, fontSize: 14))
-                      ],
-                    )
-                  : Text("无", style: TextStyle(color: Color(0xFFFFB726), fontWeight: FontWeight.w500, fontSize: 14))
-            ],
-          )
-        ],
-      ),
-    );
+
+    return Column(children: <Widget>[
+      (typeFlag != 4 && typeFlag != 5 && playerInfo != null && !playerInfo.dataError)
+          ? Container(
+              margin: EdgeInsets.fromLTRB(15, 10, 15, 0),
+              padding: EdgeInsets.all(15),
+              height: 80,
+              decoration: BoxDecoration(color: Color(0xFF3A3E61), borderRadius: BorderRadius.all(Radius.circular(4))),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                children: <Widget>[
+                  Text('和平精英游戏结果', style: TextStyle(color: Colors.white54, fontSize: 13)),
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: <Widget>[
+                      Text.rich(TextSpan(children: [
+                        TextSpan(text: "名次 ", style: TextStyle(color: Colors.white, fontSize: 14)),
+                        TextSpan(text: '${playerInfo.ranking}', style: TextStyle(color: Color(0xFFFFB726), fontWeight: FontWeight.w500, fontSize: 14)),
+                      ])),
+                      Text.rich(TextSpan(children: [
+                        TextSpan(text: "时长 ", style: TextStyle(color: Colors.white, fontSize: 14)),
+                        TextSpan(text: playerInfo.liveTime != null ? '${playerInfo.liveTime}' : '0', style: TextStyle(color: Color(0xFFFFB726), fontWeight: FontWeight.w500, fontSize: 14)),
+                      ])),
+                      Text.rich(TextSpan(children: [
+                        TextSpan(text: "评分 ", style: TextStyle(color: Colors.white, fontSize: 14)),
+                        TextSpan(text: '${playerInfo.score}', style: TextStyle(color: Color(0xFFFFB726), fontWeight: FontWeight.w500, fontSize: 14)),
+                      ])),
+                    ],
+                  )
+                ],
+              ),
+            )
+          : Container(),
+      Container(
+        margin: EdgeInsets.symmetric(vertical: 5, horizontal: 15),
+        padding: EdgeInsets.all(15),
+        height: 140,
+        decoration: BoxDecoration(color: Color(0xFF3A3E61), borderRadius: BorderRadius.all(Radius.circular(4))),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: <Widget>[
+            Text('比赛结果', style: TextStyle(color: Colors.white54, fontSize: 13)),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: <Widget>[Text("参数成员 ", style: TextStyle(color: Colors.white, fontSize: 14)), Text("${houseInfo.playerNumber}人 ", style: TextStyle(color: Color(0xFFFFB726), fontWeight: FontWeight.w500, fontSize: 14))],
+            ),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: <Widget>[Text("是否吃鸡 ", style: TextStyle(color: Colors.white, fontSize: 14)), Text(playerInfo.ranking == 1 ? '是' : '否', style: TextStyle(color: Color(0xFFFFB726), fontWeight: FontWeight.w500, fontSize: 14))],
+            ),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: <Widget>[
+                Text("获得奖牌 ", style: TextStyle(color: Colors.white, fontSize: 14)),
+                img != ''
+                    ? Row(
+                        children: <Widget>[
+                          Image.asset(
+                            img,
+                            width: 20,
+                          ),
+                          Text("+1", style: TextStyle(color: Color(0xFFFFB726), fontWeight: FontWeight.w500, fontSize: 14))
+                        ],
+                      )
+                    : Text("无", style: TextStyle(color: Color(0xFFFFB726), fontWeight: FontWeight.w500, fontSize: 14))
+              ],
+            )
+          ],
+        ),
+      )
+    ]);
   }
 }
 

lib/pages/TipList.dart

@@ -219,7 +219,7 @@ class TipItem extends StatelessWidget {
     totalContent.forEach((item){
       if(item['isImport']){
         _widgetList.add(TextSpan(text:' '+item['content']+' ',style:TextStyle(
-          color: Theme.of(context).primaryColor,
+          color: Color(0xFFFFB726),
           fontWeight:FontWeight.w600
         )));
       }

lib/widget/BottomTabs.dart

@@ -53,7 +53,7 @@ class MyTab extends StatelessWidget {
     this.icon,
     this.child,
   }) : assert(text != null || child != null || icon != null),
-       assert(!(text != null && null != child)), // TODO(goderbauer): https://github.com/dart-lang/sdk/issues/34180
+       assert(!(text != null && null != child)),
        super(key: key);
 
   /// The text to display as the tab's label.