小游戏优化

YuMi.xcodeproj/project.pbxproj

@@ -12201,7 +12201,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 20.20.4;
+				MARKETING_VERSION = 20.20.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -12236,7 +12236,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 20.20.4;
+				MARKETING_VERSION = 20.20.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

YuMi/Global/YUMIMacroUitls.h

@@ -49,7 +49,7 @@ isPhoneXSeries = [[UIApplication sharedApplication] delegate].window.safeAreaIns
 
 
 ///内置版本号
-#define PI_App_Version @"2.4.0"
+#define PI_App_Version @"2.4.6"
 ///渠道
 #define PI_App_Source @"appstore"
 //#define PI_App_Source @"pi_tf"

YuMi/Info.plist

@@ -54,7 +54,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9</string>
+	<string>1</string>
 	<key>FacebookAppID</key>
 	<string>1266232494209868</string>
 	<key>FacebookClientToken</key>

YuMi/Modules/YMLogin/View/LoginForgetPasswordViewController.m

@@ -47,7 +47,8 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    self.pi_phoneAreaCode = @"852";
+    NSString *code = [NSString getCountryCode];
+     self.pi_phoneAreaCode = [code stringByReplacingOccurrencesOfString:@"+" withString:@""];
 	[self initSubViews];
 	[self initSubViewConstraints];
 	[self initEvents];

YuMi/Modules/YMLogin/View/NewLogin/XPForgetPwdViewController.m

@@ -44,7 +44,8 @@
 }
 
 - (void)viewDidLoad {
-	self.pi_phoneAreaCode = @"852";
+    NSString *code = [NSString getCountryCode];
+     self.pi_phoneAreaCode = [code stringByReplacingOccurrencesOfString:@"+" withString:@""];
 
     [super viewDidLoad];
     [self createUI];

YuMi/Modules/YMLogin/View/NewLogin/XPLoginPhoneViewController.m

@@ -67,7 +67,8 @@
 
 - (void)viewDidLoad {
     self.selectType = 0;
-	self.pi_phoneAreaCode = @"852";
+    NSString *code = [NSString getCountryCode];
+     self.pi_phoneAreaCode = [code stringByReplacingOccurrencesOfString:@"+" withString:@""];
     [super viewDidLoad];
     [self createUI];
     [self racBind];

YuMi/Modules/YMLogin/View/XPLoginVerifBindPhoneViewController.m

@@ -54,7 +54,8 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    self.pi_phoneAreaCode = @"852";
+    NSString *code = [NSString getCountryCode];
+     self.pi_phoneAreaCode = [code stringByReplacingOccurrencesOfString:@"+" withString:@""];
     [self initSubViews];
     [self initSubViewConstraints];
     [self setConfigs];

YuMi/Modules/YMNewHome/Model/HomePlayRoomModel.h

@@ -46,7 +46,6 @@ NS_ASSUME_NONNULL_BEGIN
 //是否为周榜top1
 @property(nonatomic,assign) BOOL isWeekTop1;
 @property(nonatomic,copy) NSString *inRoomUid;
-
 //是否在麦位
 @property(nonatomic,assign) BOOL inMic;
 ///是否在线

YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTableViewCell.h

@@ -24,7 +24,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface XPNewHomePartyTableViewCell : UITableViewCell
 
 @property (nonatomic,strong) HomePlayRoomModel *roomInfo;
-@property (nonatomic,strong) HomeRecommendRoomModel *roomInfo1;
+
 @property(nonatomic,weak) id<XPNewHomePartyTableViewCellDelegate>delegate;
 ///声音卡时，svga是否播放动画
 -(void)setPlaySoundStatus:(BOOL)isPlay;

YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTableViewCell.m

@@ -243,14 +243,7 @@
 -(void)setPlaySoundTime:(NSInteger)time{
     _audioView.voiceDura = @(time).stringValue;
 }
-- (void)setRoomInfo1:(HomeRecommendRoomModel *)roomInfo1 {
-	_roomInfo1 = roomInfo1;
-	if (_roomInfo1) {
-		
-		
-		
-	}
-}
+
 
 -(void)didSelectItemAction{
  

YuMi/Modules/YMNewHome/View/XPHomeRecommendViewController.m

@@ -431,6 +431,7 @@ UIKIT_EXTERN NSString * const kShieldingNotification;
 -(void)xPNewHomePartyTableViewCell:(XPNewHomePartyTableViewCell *_Nullable)cell didSelectChat:(HomePlayRoomModel *_Nonnull)roomModel{
     if(roomModel.inMic == YES){
         [XPRoomViewController openRoom:roomModel.inRoomUid fromNick:roomModel.nick fromType:UserEnterRoomFromType_Follow_User fromUid:roomModel.uid viewController:self];
+
         return;
     }
     

YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTeamViewController.m

@@ -273,18 +273,24 @@
         self.nameLabel.text = self.model.anchorNick;
         self.countLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPAnchorFansTeamViewController0"), self.model.teamNum];
         
-        XPAnchorFansPrivilegeModel *nameplateModel = self.model.privilegeConfigVos[0];
-        self.nameplateImageView.imageUrl = nameplateModel.icon;
-        self.nameplateLabel.text = nameplateModel.name;
-        self.nameplateDescLabel.text = nameplateModel.desc;
-        XPAnchorFansPrivilegeModel *giftModel = self.model.privilegeConfigVos[1];
-        self.giftImageView.imageUrl = giftModel.icon;
-        self.giftLabel.text = giftModel.name;
-        self.giftDescLabel.text = giftModel.desc;
+        for (XPAnchorFansPrivilegeModel *obj in self.model.privilegeConfigVos) {
+            if(obj.type == 1){
+                XPAnchorFansPrivilegeModel *nameplateModel = obj;
+                self.nameplateImageView.imageUrl = nameplateModel.icon;
+                self.nameplateLabel.text = nameplateModel.name;
+                self.nameplateDescLabel.text = nameplateModel.desc;
+            }else if(obj.type == 2){
+                XPAnchorFansPrivilegeModel *giftModel = obj;
+                self.giftImageView.imageUrl = giftModel.icon;
+                self.giftLabel.text = giftModel.name;
+                self.giftDescLabel.text = giftModel.desc;
+            }else if(obj.type == 3){
+                XPAnchorFansPrivilegeModel *joinModel = obj;
+                self.joinLabel.text = joinModel.name;
+                self.iconImageView.imageUrl = joinModel.icon;
+            }
+        }
         
-        XPAnchorFansPrivilegeModel *joinModel = self.model.privilegeConfigVos[2];
-        self.joinLabel.text = joinModel.name;
-        self.iconImageView.imageUrl = joinModel.icon;
         
         CGFloat margin = 8;
         for (int i = 0; i < 3; i++) {
@@ -323,7 +329,14 @@
 
 - (void)joinButtonAction:(UIButton *)button {
     button.userInteractionEnabled = NO;
-    XPAnchorFansPrivilegeModel *joinModel = self.model.privilegeConfigVos[2];
+    XPAnchorFansPrivilegeModel *joinModel;
+    for (XPAnchorFansPrivilegeModel *obj in self.model.privilegeConfigVos) {
+        if(obj.type == 3){
+            joinModel = obj;
+        }
+    }
+    if(joinModel == nil)return;
+
     [Api requestSendAnchorFansGift:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
         if (code == 200) {
             [self showSuccessToast:YMLocalizedString(@"XPAnchorFansTeamViewController1")];

YuMi/Modules/YMRoom/View/LittleGame/View/XPRoomLittleGameContainerView.m

@@ -104,9 +104,6 @@
 #else
 	isTestEnv = NO;
 #endif
-    if(isEnterprise == NO){
-    [[SudMGP getCfg]setBackgroundMode:NO];
-    }
 	[SudMGP initSDK:KeyWithType(KeyType_SudGameAppID) appKey:KeyWithType(KeyType_SudGameAppKey) isTestEnv:isTestEnv listener:^(int retCode, const NSString *retMsg) {
 		if (retCode == 0) {
 			if (!self.currentmgId) {

YuMi/Modules/YMRoom/View/StageView/StageView.m

@@ -196,7 +196,44 @@
     [[NIMSDK sharedSDK].chatroomManager updateChatroomQueueObject:request completion:^(NSError * _Nullable error) {
     }];
 }
-
+-(void)updateNIMMicroQueues{
+    RoomInfoModel* roomInfo = self.hostDelegate.getRoomInfo;
+    // 获取麦位的状态，并初始化 self.micQueue 。
+    [[NIMSDK sharedSDK].chatroomManager fetchChatroomInfo:[NSString stringWithFormat:@"%ld", (long)roomInfo.roomId] completion:^(NSError * _Nullable error, NIMChatroom * _Nullable chatroom) {
+        if (error) {
+            return;
+        }
+        NSDictionary *info = (NSDictionary *)[chatroom.ext toJSONObject];
+        NSDictionary *micState = [info[@"micQueue"] toJSONObject];
+        for (NSString *position in micState.allKeys) {
+            MicroStateModel *state = [MicroStateModel modelWithJSON:micState[position]];
+            MicroQueueModel *sequence = [self.micQueue objectForKey:position];
+            sequence.microState = state;
+        }
+        [self microQueueUpdated: NO];
+    }];
+    self.hadGetQueueInfoSuccess = NO;
+    // 获取麦位的用户，并初始化 self.micQueue 。
+    [[NIMSDK sharedSDK].chatroomManager fetchChatroomQueue:[NSString stringWithFormat:@"%ld", (long)roomInfo.roomId] completion:^(NSError * _Nullable error, NSArray<NSDictionary<NSString *,NSString *> *> * _Nullable info) {
+        if (error) return;
+        BOOL ownerRTCChange = NO;
+ 
+        for (NSDictionary *item in info) {
+            UserInfoModel *userInfo = [UserInfoModel modelWithJSON:item.allValues.firstObject];
+            NSString *position = item.allKeys.firstObject;
+            MicroQueueModel *sequence = [self.micQueue objectForKey:position];
+            sequence.userInfo = userInfo;
+            if (userInfo.uid == [AccountInfoStorage instance].getUid.integerValue) {
+                ownerRTCChange = YES;
+            }
+        }
+        [self microQueueUpdated:ownerRTCChange];
+        [self.hostDelegate onMicroQueueUpdate:self.micQueue];
+        self.hadGetQueueInfoSuccess = YES;
+       
+    }];
+    
+}
 - (void)initGiftValue{
 	RoomInfoModel* roomInfo = self.hostDelegate.getRoomInfo;
 	// 获取礼物值
@@ -502,8 +539,10 @@
                 for (MicroQueueModel *sequence in self.micQueue.allValues) {
                     if ([AccountInfoStorage instance].getUid.integerValue == sequence.userInfo.uid) {
                         NIMChatroomQueueUpdateRequest *request = [[NIMChatroomQueueUpdateRequest alloc]init];
+                        NSMutableDictionary *userInfo = [[NSMutableDictionary alloc]initWithDictionary:[sequence.userInfo toJSONObject]];
+                        [userInfo setValue:@(YES) forKey:@"isNoProhibitMic"];
                         request.key = @(sequence.microState.position).stringValue;
-                        request.value = [sequence.userInfo toJSONString];
+                        request.value = [userInfo toJSONString];
                         request.roomId = roomId;
                         request.transient = YES;
                         [[NIMSDK sharedSDK].chatroomManager updateChatroomQueueObject:request completion:^(NSError * _Nullable error) {
@@ -513,7 +552,7 @@
                 }
             }
             if (content.source.userId.integerValue == [AccountInfoStorage instance].getUid.integerValue){
-                [self initNIMMicroQueues];
+                [self updateNIMMicroQueues];
             }
          
         }