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

android/app/src/main/AndroidManifest.xml

@@ -9,7 +9,7 @@
     <application
         android:name="com.izouma.screen_stream_plugin.MyApplication"
         android:icon="@mipmap/ic_launcher"
-        android:label="我要电竞"
+        android:label="猿人电竞"
         android:usesCleartextTraffic="true">
         <activity
             android:name="com.yalantis.ucrop.UCropActivity"

ios/Runner/Info.plist

@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
-	<string>我要电竞</string>
+	<string>猿人电竞</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -13,7 +13,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>我要电竞</string>
+	<string>猿人电竞</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>

ios/ScreenRecorder/Info.plist

@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>我要电竞</string>
+	<string>猿人电竞</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -13,7 +13,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>我要电竞</string>
+	<string>猿人电竞</string>
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>

lib/main.dart

@@ -37,9 +37,9 @@ class MobileCyberGamesApp extends StatelessWidget {
         theme: ThemeData(
             cardColor: Color(0xFF2B2B42),
             backgroundColor: Color(0xFF222335),
-            primaryColor: Color(0xFFF4B011),
-            buttonColor: Color(0xFFF4B011),
-            accentColor: Color(0xFFF4B011),
+            primaryColor: Color(0xFFC2524D),
+            buttonColor: Color(0xFFC2524D),
+            accentColor: Color(0xFFC2524D),
             textSelectionColor: Colors.white,
             textTheme: TextTheme(
               subhead: TextStyle(color: Colors.white),
@@ -50,9 +50,9 @@ class MobileCyberGamesApp extends StatelessWidget {
             ),
             primaryIconTheme:IconThemeData(color: Colors.white),
             buttonTheme: ButtonThemeData(
-              buttonColor: Color(0xFFF4B011),
-              highlightColor: Color(0xFFF2A433),
-              splashColor: Color(0xFFF2A433),
+              buttonColor: Color(0xFFC2524D),
+              highlightColor: Color(0xFF8E3B36),
+              splashColor: Color(0xFF8E3B36),
               shape: RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(0))),
             )),
         home: store.state.userInfo != null ? HomePage() : LoginFirst(),

lib/model/CompetitionSeason.dart

@@ -1,12 +1,13 @@
 import 'package:json_annotation/json_annotation.dart';
 import 'GameInfo.dart';
+import 'PlayerInfo.dart';
 
 part 'CompetitionSeason.g.dart';
 
 @JsonSerializable()
 class CompetitionSeason {
   CompetitionSeason(this.id, this.season, this.shortName, this.beginTime, this.endTime,
-      this.bonus, this.statusFlag, this.gameId,this.gameInfo);
+      this.bonus, this.statusFlag, this.gameId,this.gameInfo,this.playerInfo);
   int id;
   String season;//名称
   String shortName;//简称
@@ -16,6 +17,7 @@ class CompetitionSeason {
   int statusFlag;//状态
   int gameId; //游戏ID
   GameInfo gameInfo;//游戏信息
+  PlayerInfo playerInfo;
   
   factory CompetitionSeason.fromJson(Map<String, dynamic> json) =>
       _$CompetitionSeasonFromJson(json);

lib/model/CompetitionSeason.g.dart

@@ -17,7 +17,8 @@ CompetitionSeason _$CompetitionSeasonFromJson(Map<String, dynamic> json) {
       json['statusFlag'] as int,
       json['gameId'] as int,
 
-      json['gameInfo']!=null?GameInfo.fromJson(json['gameInfo']):GameInfo.empty()
+      json['gameInfo']!=null?GameInfo.fromJson(json['gameInfo']):GameInfo.empty(),
+      json['playerInfo']!=null?PlayerInfo.fromJson(json['playerInfo']):PlayerInfo.empty()
       );
 }
 
@@ -39,5 +40,6 @@ Map<String, dynamic> _$CompetitionSeasonToJson(CompetitionSeason instance) =>
       'bonus': instance.bonus,
       'statusFlag': instance.statusFlag,
       'gameId': instance.gameId,
-      'gameInfo':instance.gameInfo
+      'gameInfo':instance.gameInfo,
+      'playerInfo':instance.playerInfo
     };

lib/model/HouseInfo.dart

@@ -26,7 +26,7 @@ class HouseInfo {
       this.createUser,
       this.beginTime,
       this.createTime,
-      this.scoreType);
+      this.scoreType,this.houseCode);
   int id;
   int gameId; //游戏ID
   int userId; //用户ID
@@ -47,6 +47,7 @@ class HouseInfo {
   int beginTime; //开始时间
   int createTime;//创建时间
   int scoreType;//评分类型
+String houseCode;//房间号
   factory HouseInfo.fromJson(Map<String, dynamic> json) =>
       _$HouseInfoFromJson(json);
 

lib/model/HouseInfo.g.dart

@@ -29,7 +29,8 @@ HouseInfo _$HouseInfoFromJson(Map<String, dynamic> json) {
       json['createUser'] as String,
       json['beginTime'] as int,
       json['createTime'] as int,
-      json['scoreType'] as int );
+      json['scoreType'] as int,
+      json['houseCode'] as String);
 }
 
 //  int id;
@@ -66,7 +67,8 @@ Map<String, dynamic> _$HouseInfoToJson(HouseInfo instance) => <String, dynamic>{
       'gameHousePassword': instance.gameHousePassword,
       'statusFlag': instance.statusFlag,
       'createUser': instance.createUser,
-      'beginTime':instance.beginTime,
-      'createTime':instance.createTime,
-      'scoreType':instance.scoreType
+      'beginTime': instance.beginTime,
+      'createTime': instance.createTime,
+      'scoreType': instance.scoreType,
+      'houseCode': instance.houseCode
     };

lib/model/PlayerInfo.dart

@@ -8,7 +8,7 @@ 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.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);
   int id;
   int houseId; //房间id
   int userId; //用户id
@@ -20,6 +20,10 @@ class PlayerInfo {
   int rank;//名次
   int houseRank;//房间比赛名次
   String video;//视频地址
+  int platinum; //铂金
+  int gold;//金牌
+  int  silver;//银牌
+  int bronze;//铜牌
   
   factory PlayerInfo.fromJson(Map<String, dynamic> json) =>
       _$PlayerInfoFromJson(json);
@@ -27,6 +31,20 @@ class PlayerInfo {
   Map<String, dynamic> toJson() => _$PlayerInfoToJson(this);
   // 命名构造函数
   PlayerInfo.empty();
+
+  String getPlatinum() {
+    return this.platinum.toString();
+  }
+   String getGold() {
+    return this.gold.toString();
+  }
+   String getSilver() {
+    return this.silver.toString();
+  }
+   String getBronze() {
+    return this.bronze.toString();
+  }
+
   @override
   String toString() {
     return _$PlayerInfoToJson(this).toString();

lib/model/PlayerInfo.g.dart

@@ -18,7 +18,11 @@ PlayerInfo _$PlayerInfoFromJson(Map<String, dynamic> json) {
       json['houseInfo'] != null ? HouseInfo.fromJson(json['houseInfo']) : null,
       json['rank'] ?? null,
       json['houseRank'] ?? null,
-      json['video']??'');
+      json['video']??'',
+      json['platinum'] as int,
+      json['gold'] as int,
+      json['silver'] as int,
+      json['bronze'] as int,);
 }
 
 //  int id;
@@ -26,6 +30,10 @@ PlayerInfo _$PlayerInfoFromJson(Map<String, dynamic> json) {
 //   int userId;//用户id
 //   int statusFlag;//状态 0加入 1准备 2开始 3结束 6未比赛
 //   UserInfo userInfo;
+  // int platinum; //铂金
+  // int gold;//金牌
+  // int  silver;//银牌
+  // int bronze;//铜牌
 Map<String, dynamic> _$PlayerInfoToJson(PlayerInfo instance) =>
     <String, dynamic>{
       'id': instance.id,
@@ -38,5 +46,9 @@ Map<String, dynamic> _$PlayerInfoToJson(PlayerInfo instance) =>
       'houseInfo': instance.houseInfo,
       'rank': instance.rank,
       'houseRank': instance.houseRank,
-      'video':instance.video
+      'video':instance.video,
+      'platinum': instance.platinum,
+      'gold': instance.gold,
+      'silver': instance.silver,
+      'bronze':instance.bronze
     };

lib/model/UserInfo.dart

@@ -5,7 +5,7 @@ part 'UserInfo.g.dart';
 @JsonSerializable()
 class UserInfo {
   UserInfo(this.id, this.nickname, this.username, this.icon, this.phone,
-      this.sex, this.moneyCoin, this.moneyPoint,this.birthday,this.noticeFlag,this.remindFlag,this.createFlag,this.houseCard,this.recommender,this.levelId);
+      this.sex, this.moneyCoin, this.moneyPoint,this.birthday,this.noticeFlag,this.remindFlag,this.createFlag,this.houseCard,this.recommender,this.levelId,this.moneyTicket);
   int id;
   String nickname;
   String username;
@@ -21,6 +21,7 @@ class UserInfo {
    int houseCard;
    int recommender;//上级ID
    int levelId;//用户级别ID
+   int moneyTicket;//门票数量
   factory UserInfo.fromJson(Map<String, dynamic> json) =>
       _$UserInfoFromJson(json);