From 52e7d4ff7ec36c22cc6cb5ebfe0b36c638920cf3 Mon Sep 17 00:00:00 2001
From: liyuhua <15626451870@163.com>
Date: Thu, 30 Nov 2023 16:41:28 +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/project.pbxproj                |  4 +--
 .../xcshareddata/xcschemes/YuMi.xcscheme      |  2 +-
 YuMi/Global/YUMIMacroUitls.h                  |  2 +-
 .../Modules/YMRoom/View/StageView/StageView.m |  4 +--
 .../YMRoom/View/XPRoomViewController.m        | 32 +------------------
 YuMi/Network/HttpRequestHelper.m              | 11 ++++---
 6 files changed, 12 insertions(+), 43 deletions(-)

diff --git a/YuMi.xcodeproj/project.pbxproj b/YuMi.xcodeproj/project.pbxproj
index c9a3fc69..aadb4186 100644
--- a/YuMi.xcodeproj/project.pbxproj
+++ b/YuMi.xcodeproj/project.pbxproj
@@ -12197,7 +12197,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 20.20.2;
+				MARKETING_VERSION = 20.20.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -12232,7 +12232,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 20.20.2;
+				MARKETING_VERSION = 20.20.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme b/YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme
index d258e3d3..9e3921f5 100644
--- a/YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme
+++ b/YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme
@@ -31,7 +31,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
diff --git a/YuMi/Global/YUMIMacroUitls.h b/YuMi/Global/YUMIMacroUitls.h
index c961ffad..eef2a038 100644
--- a/YuMi/Global/YUMIMacroUitls.h
+++ b/YuMi/Global/YUMIMacroUitls.h
@@ -49,7 +49,7 @@ isPhoneXSeries = [[UIApplication sharedApplication] delegate].window.safeAreaIns
 
 
 ///内置版本号
-#define PI_App_Version @"2.3.0"
+#define PI_App_Version @"2.3.1"
 ///渠道
 #define PI_App_Source @"appstore"
 //#define PI_App_Source @"pi_tf"
diff --git a/YuMi/Modules/YMRoom/View/StageView/StageView.m b/YuMi/Modules/YMRoom/View/StageView/StageView.m
index bfbcfef0..e9683e31 100644
--- a/YuMi/Modules/YMRoom/View/StageView/StageView.m
+++ b/YuMi/Modules/YMRoom/View/StageView/StageView.m
@@ -498,10 +498,8 @@
             ///进入房间，如果自己在麦上，需要调下上麦，不然，网络不好，会导致人不在麦上，但有声音
             RoomInfoModel * roomInfo =self.hostDelegate.getRoomInfo;
             NSString * roomId = [NSString stringWithFormat:@"%ld", roomInfo.uid];
-            BOOL isInMic = NO;
             for (MicroQueueModel *sequence in self.micQueue.allValues) {
                 if ([AccountInfoStorage instance].getUid.integerValue == sequence.userInfo.uid) {
-                    isInMic = YES;
                     NIMChatroomQueueUpdateRequest *request = [[NIMChatroomQueueUpdateRequest alloc]init];
                     request.key = @(sequence.microState.position).stringValue;
                     request.value = [sequence.userInfo toJSONString];
@@ -509,7 +507,7 @@
                     request.transient = YES;
                     [[NIMSDK sharedSDK].chatroomManager updateChatroomQueueObject:request completion:^(NSError * _Nullable error) {
                     }];
-                   
+                    break;
                 }
             }
         }
diff --git a/YuMi/Modules/YMRoom/View/XPRoomViewController.m b/YuMi/Modules/YMRoom/View/XPRoomViewController.m
index 3c529d63..a4efafeb 100644
--- a/YuMi/Modules/YMRoom/View/XPRoomViewController.m
+++ b/YuMi/Modules/YMRoom/View/XPRoomViewController.m
@@ -937,7 +937,6 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出
         [[XPRoomMiniManager shareManager] configCurrentMusic:nil isPlaying:NO];
     }
 }
-
 ///展示个播上划引导
 - (void)showAnchorScrollTipView {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
@@ -948,35 +947,6 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出
         [window bringSubviewToFront:self.anchorScrollTipView];
     }
 }
-
-///判断是否被踢出房间
-- (BOOL)isKictOutLatest:(NSString *)key mainKey:(NSString *)mainKey{
-    NSMutableDictionary *kickedList = [[NSUserDefaults standardUserDefaults]valueForKey:mainKey];
-    if([kickedList isKindOfClass:[NSString class]]){
-        kickedList = nil;
-    }
-    if(kickedList == nil){
-        kickedList = [NSMutableDictionary dictionary];
-    }else{
-        kickedList = [[NSMutableDictionary alloc]initWithDictionary:kickedList];
-    }
-    NSString *kictOutTime = [kickedList valueForKey:key];
-    if (kictOutTime) {
-        NSDate* date = [NSDate dateWithTimeIntervalSinceNow:0];
-        NSTimeInterval time = [date timeIntervalSince1970];
-        NSString *currentTime = [NSString stringWithFormat:@"%.0f", time];
-        //是否超过5分钟
-        if ([currentTime intValue] - [kictOutTime intValue] > 5 * 60) {
-            [[NSUserDefaults standardUserDefaults] removeObjectForKey:key];
-            [[NSUserDefaults standardUserDefaults] synchronize];
-            return NO;
-        } else {
-            return YES;
-        }
-    } else {
-        return NO;
-    }
-}
 -(void)requesstShieldingAction{
     [self.presenter requesstShieldingWtihType:@"1" objId:[NSString stringWithFormat:@"%ld",self.roomInfo.uid]];
 }
@@ -1006,8 +976,8 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出
     NSString *uid = [[AccountInfoStorage instance]getUid];
     for (id obj in list) {
         if([obj integerValue] == [uid integerValue]){
+            [self exitRoom];
             [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPRoomViewController0")];
-            [self dismissViewControllerAnimated:YES completion:nil];
             break;
         }
     }
diff --git a/YuMi/Network/HttpRequestHelper.m b/YuMi/Network/HttpRequestHelper.m
index c8708d35..55447471 100644
--- a/YuMi/Network/HttpRequestHelper.m
+++ b/YuMi/Network/HttpRequestHelper.m
@@ -66,7 +66,7 @@
     NSLog(@"\nmethod:\n%@\nparameter:\n%@", method, params);
 #endif
 #ifdef DEBUG
-    NSString *url = API_HOST_URL;
+    NSString *url = [self getHostUrl];
     NSString *urlPath = [NSString stringWithFormat:@"%@/%@", url ,method];
     dispatch_async(dispatch_get_global_queue(0, 0), ^{
         [BSNetListenModel addHttpReq:urlPath header:manager.requestSerializer.HTTPRequestHeaders param:[params copy] time:[NSDate getCurrentTimeWithFormat:@"yyyy-MM-dd HH:mm:ss"]];
@@ -112,7 +112,7 @@
 #ifdef DEBUG
     NSLog(@"\nmethod:\n%@\nparameter:\n%@", method, params);
     
-    NSString *url = API_HOST_URL;
+    NSString *url = [self getHostUrl];
     NSString *urlPath = [NSString stringWithFormat:@"%@/%@", url ,method];
     dispatch_async(dispatch_get_global_queue(0, 0), ^{
         [BSNetListenModel addHttpReq:urlPath header:manager.requestSerializer.HTTPRequestHeaders param:[params copy] time:[NSDate getCurrentTimeWithFormat:@"yyyy-MM-dd HH:mm:ss"]];
@@ -155,7 +155,7 @@
     AFHTTPSessionManager *manager = [HttpRequestHelper requestManager];
 #ifdef DEBUG
     NSLog(@"\nmethod:\n%@\nparameter:\n%@", method, params);
-    NSString *url = API_HOST_URL;
+    NSString *url = [self getHostUrl];
     NSString *urlPath = [NSString stringWithFormat:@"%@/%@", url ,method];
     dispatch_async(dispatch_get_global_queue(0, 0), ^{
         [BSNetListenModel addHttpReq:urlPath header:manager.requestSerializer.HTTPRequestHeaders param:[params copy] time:[NSDate getCurrentTimeWithFormat:@"yyyy-MM-dd HH:mm:ss"]];
@@ -323,7 +323,7 @@
     [self configHeaders];
     NSDictionary *baseParams = [self configBaseParmars:nil];
     AFHTTPSessionManager *manager = [HttpRequestHelper requestManager];
-    NSString *url = API_HOST_URL;
+    NSString *url = [self getHostUrl];
     NSString *urlPath = [NSString stringWithFormat:@"%@/%@", url ,path];
 #ifdef DEBUG
     NSLog(@"\nmethod:\n%@\nparameter:\n%@", path, params);
@@ -340,7 +340,8 @@
     }];
     
     urlPath = [NSString stringWithFormat:@"%@?%@", urlPath, requestUrl];
-    
+    urlPath = [urlPath stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
+
     NSMutableURLRequest *request = [[AFJSONRequestSerializer serializer] requestWithMethod:@"POST" URLString:urlPath parameters:baseParams error:nil];
     request.timeoutInterval= [[[NSUserDefaults standardUserDefaults] valueForKey:@"timeoutInterval"] longValue];