From 9ac64247551d7fa8e4b35a0e1f5e72b521c350cb Mon Sep 17 00:00:00 2001
From: liyuhua <15626451870@163.com>
Date: Sat, 7 Oct 2023 11:08:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme |  2 +-
 .../View/Noble/View/XPNobleCenterViewController.m   | 13 ++++++++++---
 .../View/Recharge/XPIAPRechargeViewController.m     | 13 ++++++++++---
 .../View/Recharge/XPMineRechargeViewController.m    | 13 ++++++++++---
 .../Presenter/XPNewHomeRecommendPresenter.m         |  5 ++++-
 .../View/FirstRecharge/View/XPFirstRechargeView.m   | 13 ++++++++++---
 .../MenuContainerView/XPRoomMenuContainerView.m     |  4 +++-
 7 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme b/YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme
index 9e3921f5..d258e3d3 100644
--- a/YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme
+++ b/YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme
@@ -31,7 +31,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
diff --git a/YuMi/Modules/YMMine/View/Noble/View/XPNobleCenterViewController.m b/YuMi/Modules/YMMine/View/Noble/View/XPNobleCenterViewController.m
index a3f61c54..cd437d4b 100644
--- a/YuMi/Modules/YMMine/View/Noble/View/XPNobleCenterViewController.m
+++ b/YuMi/Modules/YMMine/View/Noble/View/XPNobleCenterViewController.m
@@ -479,9 +479,16 @@
     NSData *receipt = [NSData dataWithContentsOfURL:[[NSBundle mainBundle] appStoreReceiptURL]];
     NSString *encodeStr = [receipt base64EncodedStringWithOptions:NSDataBase64EncodingEndLineWithLineFeed];
     NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-    [dictionary setObject:transactionIdentifier forKey:@"transcationId"];
-    [dictionary setObject:encodeStr forKey:@"recipt"];
-    [dictionary setObject:self.orderId forKey:@"orderId"];
+    if(transactionIdentifier != nil){
+        [dictionary setObject:transactionIdentifier forKey:@"transcationId"];
+    }
+    if(encodeStr != nil){
+        [dictionary setObject:encodeStr forKey:@"recipt"];
+    }
+    if(self.orderId != nil){
+        [dictionary setObject:self.orderId forKey:@"orderId"];
+    }
+    if(dictionary.allKeys.count == 0)return;
     NSString *reciptJson = [dictionary toJSONString];
     NSString * uid = [AccountInfoStorage instance].getUid;
     BOOL saveSuccess = [RechargeStorage saveTranscationId:transactionIdentifier recipt:reciptJson uid:uid];
diff --git a/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeViewController.m b/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeViewController.m
index 84a0a69b..7c162480 100644
--- a/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeViewController.m
+++ b/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeViewController.m
@@ -285,9 +285,16 @@
     NSData *receipt = [NSData dataWithContentsOfURL:[[NSBundle mainBundle] appStoreReceiptURL]];
     NSString *encodeStr = [receipt base64EncodedStringWithOptions:NSDataBase64EncodingEndLineWithLineFeed];
     NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-    [dictionary setObject:transactionIdentifier forKey:@"transcationId"];
-    [dictionary setObject:encodeStr forKey:@"recipt"];
-    [dictionary setObject:self.orderId forKey:@"orderId"];
+    if(transactionIdentifier != nil){
+        [dictionary setObject:transactionIdentifier forKey:@"transcationId"];
+    }
+    if(encodeStr != nil){
+        [dictionary setObject:encodeStr forKey:@"recipt"];
+    }
+    if(self.orderId != nil){
+        [dictionary setObject:self.orderId forKey:@"orderId"];
+    }
+    if(dictionary.allKeys.count == 0)return;
     NSString *reciptJson = [dictionary toJSONString];
     NSString * uid = [AccountInfoStorage instance].getUid;
     BOOL saveSuccess = [RechargeStorage saveTranscationId:transactionIdentifier recipt:reciptJson uid:uid];
diff --git a/YuMi/Modules/YMMine/View/Recharge/XPMineRechargeViewController.m b/YuMi/Modules/YMMine/View/Recharge/XPMineRechargeViewController.m
index f027db3e..a7132e78 100644
--- a/YuMi/Modules/YMMine/View/Recharge/XPMineRechargeViewController.m
+++ b/YuMi/Modules/YMMine/View/Recharge/XPMineRechargeViewController.m
@@ -133,9 +133,16 @@
 	NSData *receipt = [NSData dataWithContentsOfURL:[[NSBundle mainBundle] appStoreReceiptURL]];
 	NSString *encodeStr = [receipt base64EncodedStringWithOptions:NSDataBase64EncodingEndLineWithLineFeed];
 	NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-	[dictionary setObject:transactionIdentifier forKey:@"transcationId"];
-	[dictionary setObject:encodeStr forKey:@"recipt"];
-	[dictionary setObject:self.orderId forKey:@"orderId"];
+    if(transactionIdentifier != nil){
+        [dictionary setObject:transactionIdentifier forKey:@"transcationId"];
+    }
+    if(encodeStr != nil){
+        [dictionary setObject:encodeStr forKey:@"recipt"];
+    }
+    if(self.orderId != nil){
+        [dictionary setObject:self.orderId forKey:@"orderId"];
+    }
+    if(dictionary.allKeys.count == 0)return;
 	NSString *reciptJson = [dictionary toJSONString];
 	NSString * uid = [AccountInfoStorage instance].getUid;
 	BOOL saveSuccess = [RechargeStorage saveTranscationId:transactionIdentifier recipt:reciptJson uid:uid];
diff --git a/YuMi/Modules/YMNewHome/Presenter/XPNewHomeRecommendPresenter.m b/YuMi/Modules/YMNewHome/Presenter/XPNewHomeRecommendPresenter.m
index ca3c5c75..7272c6c9 100644
--- a/YuMi/Modules/YMNewHome/Presenter/XPNewHomeRecommendPresenter.m
+++ b/YuMi/Modules/YMNewHome/Presenter/XPNewHomeRecommendPresenter.m
@@ -135,8 +135,11 @@
 }
 ///发现新朋友
 -(void)getFriendListWithGroup:(dispatch_group_t)group{
+    if([AccountInfoStorage instance].getUid.length == 0){
+        [[self getView]getFriendListFailWithGroup:group];
+        return;
+    }
     [Api requsetFriendListComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) {
-        if([AccountInfoStorage instance].getUid.length == 0)return;
         NSArray * array = [HomePlayRoomModel modelsWithArray:data.data];
         [[self getView]getFriendListSuccess:array withGroup:group];
     } fail:^(NSInteger code, NSString * _Nullable msg) {
diff --git a/YuMi/Modules/YMRoom/View/FirstRecharge/View/XPFirstRechargeView.m b/YuMi/Modules/YMRoom/View/FirstRecharge/View/XPFirstRechargeView.m
index e4dbc14c..49578835 100644
--- a/YuMi/Modules/YMRoom/View/FirstRecharge/View/XPFirstRechargeView.m
+++ b/YuMi/Modules/YMRoom/View/FirstRecharge/View/XPFirstRechargeView.m
@@ -385,9 +385,16 @@
     NSData *receipt = [NSData dataWithContentsOfURL:[[NSBundle mainBundle] appStoreReceiptURL]];
     NSString *encodeStr = [receipt base64EncodedStringWithOptions:NSDataBase64EncodingEndLineWithLineFeed];
     NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-    [dictionary setObject:transactionIdentifier forKey:@"transcationId"];
-    [dictionary setObject:encodeStr forKey:@"recipt"];
-    [dictionary setObject:self.orderId forKey:@"orderId"];
+    if(transactionIdentifier != nil){
+        [dictionary setObject:transactionIdentifier forKey:@"transcationId"];
+    }
+    if(encodeStr != nil){
+        [dictionary setObject:encodeStr forKey:@"recipt"];
+    }
+    if(self.orderId != nil){
+        [dictionary setObject:self.orderId forKey:@"orderId"];
+    }
+    if(dictionary.allKeys.count == 0)return;
     NSString *reciptJson = [dictionary toJSONString];
     NSString * uid = [AccountInfoStorage instance].getUid;
     BOOL saveSuccess = [RechargeStorage saveTranscationId:transactionIdentifier recipt:reciptJson uid:uid];
diff --git a/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.m b/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.m
index 31a9a3bf..f81474ea 100644
--- a/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.m
+++ b/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.m
@@ -347,7 +347,9 @@
     if (roomInfo.roomModeType == RoomModeType_Open_Blind || roomInfo.roomModeType == RoomModeType_Open_PK_Mode || roomInfo.roomModeType == RoomModeType_Open_Micro_Mode) {
         NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init];
         request.roomId = [NSString stringWithFormat:@"%ld", roomInfo.roomId];
-        request.userIds = @[[AccountInfoStorage instance].getUid];
+        if([AccountInfoStorage instance].getUid != nil){
+          request.userIds = @[[AccountInfoStorage instance].getUid];
+        }
         [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray<NIMChatroomMember *> * _Nullable members) {
             if (error == nil) {
                 NIMChatroomMember * member = members.firstObject;