diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index dacccea..b547109 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -6,7 +6,7 @@ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index 08c3c12..5a7111d 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 464d667..10229c0 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 24c3dc9..8c486d6 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 6f828e9..6402b7b 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 94b435f..70692e0 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/lib/controller/mine/user_controller.dart b/lib/controller/mine/user_controller.dart index 74e00fd..2b89f2c 100644 --- a/lib/controller/mine/user_controller.dart +++ b/lib/controller/mine/user_controller.dart @@ -93,6 +93,9 @@ class UserController extends GetxController { if(result.data.data == null){ var information = UserData(); information.matchmakerFlag = baseInfo.matchmakerFlag; + if(information.matchmakerFlag!){ + information.matchmakerType = baseInfo.matchmakerType; + } information.realName = baseInfo.realName; information.phone = baseInfo.phone; GlobalData().userData = information; @@ -107,6 +110,9 @@ class UserController extends GetxController { } final information = result.data.data!; information.matchmakerFlag = baseInfo.matchmakerFlag; + if(information.matchmakerFlag!){ + information.matchmakerType = baseInfo.matchmakerType; + } information.realName = baseInfo.realName; information.phone = baseInfo.phone; GlobalData().userData = information; diff --git a/lib/model/mine/user_base_data.dart b/lib/model/mine/user_base_data.dart index d6b1508..d0baf36 100644 --- a/lib/model/mine/user_base_data.dart +++ b/lib/model/mine/user_base_data.dart @@ -6,6 +6,7 @@ class UserBaseData { final String phone; final String realName; final String userId; + final int matchmakerType; UserBaseData({ required this.matchmakerFlag, @@ -14,12 +15,14 @@ class UserBaseData { required this.phone, required this.realName, required this.userId, + required this.matchmakerType, }); // 从JSON映射创建实例 factory UserBaseData.fromJson(Map json) { return UserBaseData( matchmakerFlag: json['matchmakerFlag'] ?? false, + matchmakerType: json['matchmakerType'] ?? 0, matchmakingCornerFlag: json['matchmakingCornerFlag'] ?? false, nickName: json['nickName'] ?? '', phone: json['phone'] ?? '', @@ -32,6 +35,7 @@ class UserBaseData { Map toJson() { return { 'matchmakerFlag': matchmakerFlag, + 'matchmakerType': matchmakerType, 'matchmakingCornerFlag': matchmakingCornerFlag, 'nickName': nickName, 'phone': phone,