字典做房崩溃处理

xplan-ios.xcodeproj/project.pbxproj

@@ -1213,6 +1213,8 @@
 		E8F1558D28124D5200EE8C06 /* MessageConentAudioView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8F1558C28124D5200EE8C06 /* MessageConentAudioView.m */; };
 		E8F1559028125E2D00EE8C06 /* MessageAudioCenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8F1558F28125E2D00EE8C06 /* MessageAudioCenter.m */; };
 		E8F1559328129EBA00EE8C06 /* ContentSecretaryModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8F1559228129EBA00EE8C06 /* ContentSecretaryModel.m */; };
+		E8F6135C291E26BD00E12650 /* NSMutableDictionary+Saft.m in Sources */ = {isa = PBXBuildFile; fileRef = E8F6135B291E26BD00E12650 /* NSMutableDictionary+Saft.m */; };
+		E8F6135F291E274E00E12650 /* NSArray+Safe.m in Sources */ = {isa = PBXBuildFile; fileRef = E8F6135E291E274E00E12650 /* NSArray+Safe.m */; };
 		E8F65C1F286998C9009BB5B9 /* XPMineShareViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8F65C1E286998C9009BB5B9 /* XPMineShareViewController.m */; };
 		E8F65C222869A36F009BB5B9 /* ContentShareMonentsModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8F65C212869A36F009BB5B9 /* ContentShareMonentsModel.m */; };
 		E8F9168427EC913C00F10D8F /* XPHomeLittleGameViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8F9168327EC913C00F10D8F /* XPHomeLittleGameViewController.m */; };
@@ -3494,6 +3496,10 @@
 		E8F1558F28125E2D00EE8C06 /* MessageAudioCenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageAudioCenter.m; sourceTree = "<group>"; };
 		E8F1559128129EBA00EE8C06 /* ContentSecretaryModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ContentSecretaryModel.h; sourceTree = "<group>"; };
 		E8F1559228129EBA00EE8C06 /* ContentSecretaryModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ContentSecretaryModel.m; sourceTree = "<group>"; };
+		E8F6135A291E26BD00E12650 /* NSMutableDictionary+Saft.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSMutableDictionary+Saft.h"; sourceTree = "<group>"; };
+		E8F6135B291E26BD00E12650 /* NSMutableDictionary+Saft.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSMutableDictionary+Saft.m"; sourceTree = "<group>"; };
+		E8F6135D291E274E00E12650 /* NSArray+Safe.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSArray+Safe.h"; sourceTree = "<group>"; };
+		E8F6135E291E274E00E12650 /* NSArray+Safe.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSArray+Safe.m"; sourceTree = "<group>"; };
 		E8F65C1D286998C9009BB5B9 /* XPMineShareViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineShareViewController.h; sourceTree = "<group>"; };
 		E8F65C1E286998C9009BB5B9 /* XPMineShareViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineShareViewController.m; sourceTree = "<group>"; };
 		E8F65C202869A36F009BB5B9 /* ContentShareMonentsModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ContentShareMonentsModel.h; sourceTree = "<group>"; };
@@ -3962,6 +3968,7 @@
 		189DD5A726DFA09700AB55B1 /* Tool */ = {
 			isa = PBXGroup;
 			children = (
+				E8F61356291E269700E12650 /* Safe */,
 				E8E8598328264C2200EE4857 /* CocoaHttpServer */,
 				9B09979F27F19D1C00EB8F14 /* QGVAPlayer */,
 				9B33E3C827D85379003B0E62 /* File */,
@@ -8889,6 +8896,17 @@
 			path = MineInfo;
 			sourceTree = "<group>";
 		};
+		E8F61356291E269700E12650 /* Safe */ = {
+			isa = PBXGroup;
+			children = (
+				E8F6135A291E26BD00E12650 /* NSMutableDictionary+Saft.h */,
+				E8F6135B291E26BD00E12650 /* NSMutableDictionary+Saft.m */,
+				E8F6135D291E274E00E12650 /* NSArray+Safe.h */,
+				E8F6135E291E274E00E12650 /* NSArray+Safe.m */,
+			);
+			path = Safe;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -9630,6 +9648,7 @@
 				E8C6FFD027548256004DC9F0 /* XPHomeListCollectionViewCell.m in Sources */,
 				E8A1F794290642500099C952 /* XPRoomMorePlayViewController.m in Sources */,
 				E84BF7DD277C765400EF8877 /* XPRoomRoleEmptyTableViewCell.m in Sources */,
+				E8F6135C291E26BD00E12650 /* NSMutableDictionary+Saft.m in Sources */,
 				E8E859C428264C2300EE4857 /* HTTPDynamicFileResponse.m in Sources */,
 				E8E859D028264C2300EE4857 /* DDData.m in Sources */,
 				E800162F2803FF6200D6D17A /* GuildPersonIncomeRecordModel.m in Sources */,
@@ -9898,6 +9917,7 @@
 				E8EEB90F26FC6AB8007C6EBA /* XPMineUserInfoEditPresenter.m in Sources */,
 				E873EB09280960990071030D /* XPMineUserInfoVoiceCardView.m in Sources */,
 				E8AC723A26F49AAE007D6E91 /* XPMineNotifyStatus.m in Sources */,
+				E8F6135F291E274E00E12650 /* NSArray+Safe.m in Sources */,
 				18E7B33226F317A20064BC9B /* XPWebViewController.m in Sources */,
 				E8AEAEF927141CA30017FCE0 /* RoomHeaderView.m in Sources */,
 				9B53D57A28E2CF18005187A3 /* XPTeenagerHomeView.m in Sources */,
@@ -10328,7 +10348,7 @@
 				CODE_SIGN_ENTITLEMENTS = "xplan-ios/xplan-ios.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 202205051140;
+				CURRENT_PROJECT_VERSION = 2022111001;
 				DEVELOPMENT_TEAM = 48UCG35Q9W;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -10360,7 +10380,7 @@
 				CODE_SIGN_ENTITLEMENTS = "xplan-ios/xplan-iosRelease.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 202205051140;
+				CURRENT_PROJECT_VERSION = 2022111001;
 				DEVELOPMENT_TEAM = 48UCG35Q9W;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (

xplan-ios/Base/Tool/Safe/NSArray+Safe.h

@@ -0,0 +1,16 @@
+//
+//  NSArray+Safe.h
+//  xplan-ios
+//
+//  Created by 冯硕 on 2022/11/11.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface NSArray (Safe)
+-(id)safeObjectAtIndex1:(NSUInteger)index;
+@end
+
+NS_ASSUME_NONNULL_END

xplan-ios/Base/Tool/Safe/NSArray+Safe.m

@@ -0,0 +1,23 @@
+//
+//  NSArray+Safe.m
+//  xplan-ios
+//
+//  Created by 冯硕 on 2022/11/11.
+//
+
+#import "NSArray+Safe.h"
+
+@implementation NSArray (Safe)
+
+-(id)safeObjectAtIndex1:(NSUInteger)index{
+	if ([self isKindOfClass:[NSArray class]]){
+		if (self.count){
+			if (self.count>index){
+				return self[index];
+			}
+		}
+	}
+	return nil;
+}
+
+@end

xplan-ios/Base/Tool/Safe/NSMutableDictionary+Saft.h

@@ -0,0 +1,16 @@
+//
+//  NSMutableDictionary+Saft.h
+//  xplan-ios
+//
+//  Created by 冯硕 on 2022/11/11.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface NSMutableDictionary (Saft)
+- (void)safeSetObject:(id)anObject forKey:(id <NSCopying>)aKey;
+@end
+
+NS_ASSUME_NONNULL_END

xplan-ios/Base/Tool/Safe/NSMutableDictionary+Saft.m

@@ -0,0 +1,17 @@
+//
+//  NSMutableDictionary+Saft.m
+//  xplan-ios
+//
+//  Created by 冯硕 on 2022/11/11.
+//
+
+#import "NSMutableDictionary+Saft.h"
+
+@implementation NSMutableDictionary (Saft)
+
+- (void)safeSetObject:(id)anObject forKey:(id <NSCopying>)aKey{
+	if (anObject == nil || aKey == nil)return;
+	[self setObject:anObject forKey:aKey];
+}
+
+@end

xplan-ios/Info.plist

@@ -38,7 +38,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2022031701</string>
+	<string>2022111001</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>pubgmhd1106467070</string>

xplan-ios/Main/Home/Api/Api+Home.m

@@ -6,6 +6,7 @@
 //
 
 #import "Api+Home.h"
+#import "NSMutableDictionary+Saft.h"
 
 @implementation Api (Home)
 
@@ -113,8 +114,10 @@
 /// @param uid 用户的uid
 /// @param rid 进入的类型的id
 + (void)homePickResource:(HttpRequestHelperCompletion)completion uid:(NSString *)uid rid:(NSString *)rid {
-	NSDictionary * dic = @{@"uid":uid, @"id":rid};
+	NSMutableDictionary * pararms = [NSMutableDictionary dictionary];
-	[HttpRequestHelper request:@"home/pickResource" method:HttpRequestHelperMethodGET params:dic completion:completion];
+	[pararms safeSetObject:uid forKey:@"uid"];
+	[pararms safeSetObject:rid forKey:@"rid"];
+	[HttpRequestHelper request:@"home/pickResource" method:HttpRequestHelperMethodGET params:pararms completion:completion];
 }
 
 

xplan-ios/Main/Home/View/SubViews/XPHomeLiveHeadView.m

@@ -14,6 +14,7 @@
 ///View
 #import "XPHomeLiveRecordCell.h"
 #import "StatisticsServiceHelper.h"
+#import "NSMutableDictionary+Saft.h"
 
 @interface XPHomeLiveHeadView()<UICollectionViewDelegate, UICollectionViewDataSource, UICollectionViewDelegateFlowLayout>
 
@@ -94,7 +95,9 @@
     if (self.roomList.count > 0) {
         HomeRecommendRoomModel * liveModel = [self.roomList objectAtIndex:indexPath.item];
         if (self.delegate && [self.delegate respondsToSelector:@selector(xPHomeLiveHeadViewDidClickItem:)]) {
-            [StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventRecent_card_click eventAttributes:@{@"roomUid" : liveModel.uid}];
+			NSMutableDictionary * dic = [NSMutableDictionary dictionary];
+			[dic safeSetObject:liveModel.uid forKey:@"roomUid"];
+            [StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventRecent_card_click eventAttributes:dic];
             [self.delegate xPHomeLiveHeadViewDidClickItem:liveModel];
         }
     }

xplan-ios/Main/Home/View/XPHomeLivesViewController.m

@@ -19,6 +19,7 @@
 #import "XPHtmlUrl.h"
 #import "StatisticsServiceHelper.h"
 #import "XPWeakTimer.h"
+#import "NSMutableDictionary+Saft.h"
 ///Model
 #import "HomeLiveTagModel.h"
 #import "HomeLiveLookRecordModel.h"
@@ -210,7 +211,9 @@
 
 - (void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index {
     HomeLiveTagModel *tag = self.tagList[index];
-    [StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventGebo_tab_click eventAttributes:@{@"geboTagName" : tag.sortName}];
+	NSMutableDictionary * dic = [NSMutableDictionary dictionary];
+	[dic safeSetObject: tag.sortName forKey:@"geboTagName"];
+    [StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventGebo_tab_click eventAttributes:dic];
 }
 
 #pragma mark - JXPagerMainTableViewGestureDelegate

xplan-ios/Main/Message/View/FindNew/Api/Api+FindNew.m

@@ -6,13 +6,15 @@
 //
 
 #import "Api+FindNew.h"
-
+#import "NSMutableDictionary+Saft.h"
 @implementation Api (FindNew)
 
 ///发现萌新
 + (void)findNewUser:(HttpRequestHelperCompletion)completion {
-	NSDictionary * dic = @{@"page":@"1", @"pageSize":@"20"};
+	NSMutableDictionary * pararms = [NSMutableDictionary dictionary];
-	[HttpRequestHelper request:@"newbie/poolList" method:HttpRequestHelperMethodGET params:dic completion:completion];
+	[pararms safeSetObject:@"1" forKey:@"page"];
+	[pararms safeSetObject:@"20" forKey:@"pageSize"];
+	[HttpRequestHelper request:@"newbie/poolList" method:HttpRequestHelperMethodGET params:pararms completion:completion];
 }
 
 

xplan-ios/Main/Room/View/AnchorView/Model/XPAnchorAttentSendInfo.m

@@ -6,19 +6,20 @@
 //
 
 #import "XPAnchorAttentSendInfo.h"
-
+#import "NSMutableDictionary+Saft.h"
 @implementation XPAnchorAttentSendInfo
 
 - (NSDictionary *)encodeAttachemt {
 
-    NSDictionary *dict = @{@"uid" :@(self.uid),
+	NSMutableDictionary * info = [NSMutableDictionary dictionary];
-                           @"data":@{
+	[info safeSetObject:self.nick forKey:@"nick"];
-                                   @"nick":self.nick == nil ? @"" : self.nick,
+	[info safeSetObject:@(self.targetUid) forKey:@"targetUid"];
-                                     @"targetUid":@(self.targetUid),
+	[info safeSetObject:self.targetNick forKey:@"targetNick"];
-                                     @"targetNick":self.targetNick == nil ? @"" : self.targetNick,
+
-                             }
+	NSMutableDictionary * dic = [NSMutableDictionary dictionary];
-                           };
+	[dic safeSetObject:@(self.uid) forKey:@"uid"];
-    return dict;
+	[dic safeSetObject:info forKey:@"data"];
+    return info;
 }
 
 @end