更换图标

xplan-ios.xcodeproj/project.pbxproj

@@ -11633,7 +11633,7 @@
 				CODE_SIGN_ENTITLEMENTS = "xplan-ios/xplan-ios.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 48UCG35Q9W;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -11649,7 +11649,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.0;
+				MARKETING_VERSION = 2.0.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -11896,7 +11896,7 @@
 				CODE_SIGN_ENTITLEMENTS = "xplan-ios/xplan-iosRelease.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 48UCG35Q9W;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -11912,7 +11912,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.0;
+				MARKETING_VERSION = 2.0.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

xplan-ios/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1 +1,80 @@
-{"images":[{"size":"60x60","expected-size":"180","filename":"180.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"40x40","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"60x60","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"57x57","expected-size":"57","filename":"57.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"87","filename":"87.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"57x57","expected-size":"114","filename":"114.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"60","filename":"60.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"1024x1024","filename":"1024.png","expected-size":"1024","idiom":"ios-marketing","folder":"Assets.xcassets/AppIcon.appiconset/","scale":"1x"}]}
+{
+  "images" : [
+    {
+      "filename" : "40.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "60.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "29.png",
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "58.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "87.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "80.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "120 1.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "57.png",
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "size" : "57x57"
+    },
+    {
+      "filename" : "114.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "57x57"
+    },
+    {
+      "filename" : "120.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "180.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "1024.png",
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

xplan-ios/Assets.xcassets/Tabbar/tab_party_normal.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "tab_party_normal@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "tab_party_normal@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

xplan-ios/Assets.xcassets/Tabbar/tab_party_selected.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "tab_party_selected@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "tab_party_selected@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

xplan-ios/Main/Home/View/Mew/MewHomeApi/Api+MewHomeApi.h

@@ -48,6 +48,8 @@ NS_ASSUME_NONNULL_BEGIN
 +(void)mew_RequsetMainHomeGameFriend:(HttpRequestHelperCompletion)completion;
 ///大神推荐
 +(void)mew_RequestMainHomeFriendMahogany:(HttpRequestHelperCompletion)completion;
+///请求用户信息
++ (void)mew_RequestMainHomeUserInfo:(HttpRequestHelperCompletion)completion uid:(NSString *)uid;
 @end
 
 NS_ASSUME_NONNULL_END

xplan-ios/Main/Home/View/Mew/MewHomeApi/Api+MewHomeApi.m

@@ -84,4 +84,8 @@
     [self makeRequest:@"home/mahogany" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, nil];
     
 }
+///请求用户信息
++ (void)mew_RequestMainHomeUserInfo:(HttpRequestHelperCompletion)completion uid:(NSString *)uid {
+    [self makeRequest:@"user/get" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, uid, nil];
+}
 @end

xplan-ios/Main/Home/View/Mew/MewHomeManager/MewHomeManager.h

@@ -6,7 +6,7 @@
 //
 
 #import "BaseMvpPresenter.h"
-
+#import "UserInfoModel.h"
 NS_ASSUME_NONNULL_BEGIN
 
 @interface MewHomeManager : BaseMvpPresenter
@@ -29,6 +29,8 @@ NS_ASSUME_NONNULL_BEGIN
 -(void)mew_getMainHomeGameFriendList;
 ///大神推荐
 -(void)mew_RequestMainHomeFriendMahoganyList;
+///请求用户信息
+- (void)mew_getMainHomeUserInfo;
 @end
 
 NS_ASSUME_NONNULL_END

xplan-ios/Main/Home/View/Mew/MewHomeManager/MewHomeManager.m

@@ -114,8 +114,8 @@
         NSArray *list = [MewMainHomeHotRoomModel modelsWithArray:data.data[@"playRooms"]];
         [[self getView]mew_getMainHomeGameFriendListSuccess:list];
         } fail:^(NSInteger code, NSString * _Nullable msg) {
-            
-        } showLoading:YES errorToast:YES]];
+            [[self getView]mew_getMainHomeGameFriendListFail];
+        }  errorToast:YES]];
 }
 ///大神推荐
 -(void)mew_RequestMainHomeFriendMahoganyList{
@@ -126,4 +126,15 @@
             
         }]];
 }
+///请求用户信息
+- (void)mew_getMainHomeUserInfo{
+    NSString * uid = [[AccountInfoStorage instance] getUid];
+    if (!uid.length) {
+        return;
+    }
+    [Api getUserInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) {
+        UserInfoModel * infoModel = [UserInfoModel modelWithDictionary:data.data];
+        [[self getView] mew_RequestMainHomeUserInfoSuccess:infoModel];
+    }] uid:uid];
+}
 @end

xplan-ios/Main/Home/View/Mew/MewHomeProtocol/MewMainHomeProtocol.h

@@ -6,7 +6,7 @@
 //
 
 #import <Foundation/Foundation.h>
-
+@class UserInfoModel;
 NS_ASSUME_NONNULL_BEGIN
 
 @protocol MewMainHomeProtocol <NSObject>
@@ -37,10 +37,14 @@ NS_ASSUME_NONNULL_BEGIN
 -(void)mew_getMainHomeLittleGameListSuccess:(NSArray *)list;
 ///获取游戏列表用户成功
 -(void)mew_getMainHomeGameFriendListSuccess:(NSArray *)list;
+///获取游戏列表失败
+-(void)mew_getMainHomeGameFriendListFail;
 ///获取大神推荐成功
 -(void)mew_RequestMainHomeFriendMahoganyListSuccess:(NSArray *)list;
 ///得到轮播图
 -(void)mew_getMainHomeBannerListSuccess:(NSArray *)list;
+///请求用户信息成功
+-(void)mew_RequestMainHomeUserInfoSuccess:(UserInfoModel *)userInfo;
 @end
 
 NS_ASSUME_NONNULL_END

xplan-ios/Main/Home/View/Mew/MewHomeView/MewMainHomeMoreGameVC.m

@@ -38,14 +38,19 @@
     [super viewDidLoad];
     [self installUI];
     [self installConstraints];
-    [self mew_headerRefresh];
+    [self initHeaderAndFooterRrfresh];
 }
 -(void)installUI{
     [self.view addSubview:self.mewBgImageView];
     [self.view addSubview:self.mewBackBtn];
     [self.view addSubview:self.mewCollectionView];
 }
+- (void)initHeaderAndFooterRrfresh {
+    MewRefreshSvgaHeader *header = [MewRefreshSvgaHeader headerWithRefreshingTarget:self refreshingAction:@selector(mew_headerRefresh)];
+    self.mewCollectionView.mj_header = header;
+    [self.mewCollectionView.mj_header beginRefreshing];
 
+}
 -(void)mew_headerRefresh{
     [self.presenter mew_getMainHomeLittleGameList];
     [self.presenter mew_getMainHomeGameFriendList];
@@ -76,9 +81,13 @@
 }
 ///获取游戏列表用户成功
 -(void)mew_getMainHomeGameFriendListSuccess:(NSArray *)list{
+    [self.mewCollectionView.mj_header endRefreshing];
     self.mewRoomList = [NSMutableArray arrayWithArray:list];
     [self.mewCollectionView reloadData];
 }
+-(void)mew_getMainHomeGameFriendListFail{
+    [self.mewCollectionView.mj_header endRefreshing];
+}
 #pragma mark - MewMainHomeMoreGameHeadViewDelegate
 - (void)mew_selectGameAction:(MewMainHomeLittleGameInfoModel *)gameInfo{
     [StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventRecent_homepage_moregame_tab_click eventAttributes:@{@"name":gameInfo.name}];

xplan-ios/Main/Home/View/Mew/MewHomeView/MewMainHomeViewController.m

@@ -19,7 +19,8 @@
 #import "XPLittleGameRoomOpenView.h"
 #import "XPTeenagerHomeView.h"
 #import "XPWeakTimer.h"
-
+#import "MewHomeManager.h"
+#import "UserInfoModel.h"
 @interface MewMainHomeViewController ()<MewMainHomePartyVCDelegate,MewMainHomeMakeFriendVCDelegate,MewMainHomeNavViewDelegate,JXCategoryViewDelegate,JXPagerViewDelegate,JXPagerMainTableViewGestureDelegate>
 {
     NSTimer * _mewTimer;
@@ -39,12 +40,15 @@
 @property(nonatomic,strong) MewMainHomeMakeFriendVC *mewMakeFriendVC;
 ///青少年空白view
 @property (nonatomic, strong) XPTeenagerHomeView *mewTeenagerView;
+@property(nonatomic,strong) UserInfoModel *mewInfoModel;
 @end
 
 @implementation MewMainHomeViewController
 
 @synthesize parentMode = _parentMode;
-
+- (MewHomeManager *)createPresenter {
+    return [[MewHomeManager alloc] init];
+}
 - (void)setParentMode:(BOOL)parentMode {
     _parentMode = parentMode;
     if (parentMode) {
@@ -135,8 +139,13 @@
     MewRefreshSvgaHeader *header = [MewRefreshSvgaHeader headerWithRefreshingTarget:self refreshingAction:@selector(mew_headerRefresh)];
     self.mewPagingView.mainTableView.mj_header = header;
     
+    [self.presenter mew_getMainHomeUserInfo];
 
 }
+///请求用户信息成功
+-(void)mew_RequestMainHomeUserInfoSuccess:(UserInfoModel *)userInfo{
+    self.mewInfoModel = userInfo;
+}
 -(void)mew_headerRefresh{
     if(self.mewTopTitleView.selectedIndex == 1){
         [self.mewMakeFriendVC mew_refresHeaderData];
@@ -232,6 +241,12 @@
                 [XPRoomViewController openRoom:roomUid viewController:self];
             }
         } else {
+            if(code == 10108 && self.mewInfoModel){
+                if(self.mewInfoModel.isCertified == NO){
+                    [self showRealNameAuthenticationTipsAlertView];
+                }
+                return;
+            }
             [self showErrorToast:msg];
         }
     } uid:roomUid intoUid:roomUid];

xplan-ios/Main/Mine/View/Noble/View/SubViews/XPNobleRechargeView.m

@@ -212,7 +212,7 @@
 						NSString * signedStr = [infoData objectForKey:@"orderData"];
 						NSString * scheme = @"daeplayapp";
 						[[AlipaySDK defaultService] payOrder:signedStr fromScheme:scheme callback:^(NSDictionary *resultDic) {
-
+                            NSLog(@"%@",resultDic);
 						}];
 					}
 				}
@@ -221,7 +221,7 @@
 					NSString * scheme = @"daeplayapp";
 					NSString * signedStr = [infoData objectForKey:@"orderData"];
 					[[AlipaySDK defaultService] payOrder:signedStr fromScheme:scheme callback:^(NSDictionary *resultDic) {
-
+                        NSLog(@"%@",resultDic);
 					}];
 				}
 			}else if ([payChannel isEqualToString:@"wx"]){

xplan-ios/Main/Monents/Presenter/XPMonentsRecommendPresenter.m

@@ -26,7 +26,7 @@
 		[[self getView] getMonentsRecommendListSuccess:array state:state];
 	} fail:^(NSInteger code, NSString * _Nullable msg) {
 		[[self getView] getMonentsRecommendListFail:msg state:state];
-	} showLoading:YES] page:pageStr pageSize:pageSizeStr types:@"0,2"];
+	} showLoading:NO] page:pageStr pageSize:pageSizeStr types:@"0,2"];
 }
 
 

xplan-ios/Main/Monents/View/XPMonentsAttentionPresenter.m

@@ -26,7 +26,7 @@
 		[[self getView] getMonentsAttentionListSuccess:listInfo state:state];
 	} fail:^(NSInteger code, NSString * _Nullable msg) {
 		[[self getView] getMonentsAttentionListFail:msg state:state];
-	} showLoading:YES] dynamicId:dynamicId pageSize:pageSizeStr types:@"0,2"];
+	} showLoading:NO] dynamicId:dynamicId pageSize:pageSizeStr types:@"0,2"];
 }
 
 /// 动态点赞

xplan-ios/Main/Monents/View/XPMonentsLatestPresenter.m

@@ -26,7 +26,7 @@
 		[[self getView] getMonentsLatestListSuccess:listInfo state:state];
 	} fail:^(NSInteger code, NSString * _Nullable msg) {
 		[[self getView] getMonentsLatestListFail:msg state:state];
-	} showLoading:YES] dynamicId:dynamicId pageSize:pageSizeStr types:@"0,2"];
+	} showLoading:NO] dynamicId:dynamicId pageSize:pageSizeStr types:@"0,2"];
 }
 
 /// 动态点赞

xplan-ios/Main/Room/View/LittleGame/View/XPRoomLittleGameContainerView.m

@@ -870,6 +870,7 @@
 - (void)handleNIMTextMessage:(NIMMessage *)message {
 	if (self.hostDelegate.getRoomInfo.type != RoomType_MiniGame) {return;}
 	if (message.from.integerValue == [AccountInfoStorage instance].getUid.integerValue && [self isInSudGame]) {
+        if(![message.text isKindOfClass:[NSString class]])return;
 		[self notifyChangeTextHitState:message.text];
 	}
 }