Merge commit '9cfec83ce011f1c6ac5f4c15934fdb6a34e2c9ca' into dev_2.0.0

MiMoLive/MiMoLive.xcodeproj/project.pbxproj

@@ -68,7 +68,6 @@
 		3AD8747E2E0C29CB001DEF8F /* MOVipModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 3AD8747D2E0C29CB001DEF8F /* MOVipModel.m */; };
 		3AD883192D389A7C00D46254 /* NSBundle+language.m in Sources */ = {isa = PBXBuildFile; fileRef = 3AD883182D389A7C00D46254 /* NSBundle+language.m */; };
 		3ADC766F2DF2F5CC001DD63C /* MOLoginManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 3ADC766E2DF2F5CC001DD63C /* MOLoginManager.m */; };
-		3ADF6B112DFDC47600972027 /* MOGuideManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 3ADF6B102DFDC47600972027 /* MOGuideManager.m */; };
 		3AE9AC222D3A30FF00D3A953 /* MOBeautySettingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3AE9AC212D3A30FF00D3A953 /* MOBeautySettingView.m */; };
 		3AE9AC252D3A4B7D00D3A953 /* MOBeautyFilterView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3AE9AC242D3A4B7D00D3A953 /* MOBeautyFilterView.m */; };
 		3AE9AC282D3A667D00D3A953 /* MOBeautyFacialSkinView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3AE9AC272D3A667D00D3A953 /* MOBeautyFacialSkinView.m */; };
@@ -1741,8 +1740,6 @@
 		3AD883182D389A7C00D46254 /* NSBundle+language.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSBundle+language.m"; sourceTree = "<group>"; };
 		3ADC766D2DF2F5CC001DD63C /* MOLoginManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MOLoginManager.h; sourceTree = "<group>"; };
 		3ADC766E2DF2F5CC001DD63C /* MOLoginManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MOLoginManager.m; sourceTree = "<group>"; };
-		3ADF6B0F2DFDC47600972027 /* MOGuideManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MOGuideManager.h; sourceTree = "<group>"; };
-		3ADF6B102DFDC47600972027 /* MOGuideManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MOGuideManager.m; sourceTree = "<group>"; };
 		3AE9AC202D3A30FF00D3A953 /* MOBeautySettingView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MOBeautySettingView.h; sourceTree = "<group>"; };
 		3AE9AC212D3A30FF00D3A953 /* MOBeautySettingView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MOBeautySettingView.m; sourceTree = "<group>"; };
 		3AE9AC232D3A4B7D00D3A953 /* MOBeautyFilterView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MOBeautyFilterView.h; sourceTree = "<group>"; };
@@ -4676,15 +4673,6 @@
 			path = Manager;
 			sourceTree = "<group>";
 		};
-		3ADF6B0E2DFDC46300972027 /* Manager */ = {
-			isa = PBXGroup;
-			children = (
-				3ADF6B0F2DFDC47600972027 /* MOGuideManager.h */,
-				3ADF6B102DFDC47600972027 /* MOGuideManager.m */,
-			);
-			path = Manager;
-			sourceTree = "<group>";
-		};
 		3AF310682D99488F00533212 /* CBAutoScrollLabel */ = {
 			isa = PBXGroup;
 			children = (
@@ -7048,7 +7036,6 @@
 			isa = PBXGroup;
 			children = (
 				3AB7060F2DFFBCB80005A7D1 /* Model */,
-				3ADF6B0E2DFDC46300972027 /* Manager */,
 				A6723BF52BD7F87400665479 /* MOClickActiveGuideView.h */,
 				A6723BF62BD7F87400665479 /* MOClickActiveGuideView.m */,
 				A6723BF82BD7F87F00665479 /* MOClickActiveGuideView.xib */,
@@ -11897,7 +11884,6 @@
 				A6EDCA0C2B35902B002CAC3C /* MOPkRankListView.m in Sources */,
 				A6AAFDDB2CEDECA9004C4D59 /* MOMinePlayCell.m in Sources */,
 				A6A3FDE62AFCC2CD0069D768 /* MOLocationHelper.m in Sources */,
-				3ADF6B112DFDC47600972027 /* MOGuideManager.m in Sources */,
 				A60963D72B5E954A009C9D4D /* MOFamilyTaskCell.m in Sources */,
 				A6F0F5A12CD8A46A0047B965 /* EaseImageAWebPCoder.m in Sources */,
 				3AFBC85D2D6C451300385CC0 /* MOThemeModel.m in Sources */,

MiMoLive/MiMoLive/Classes/Base/Guide/Manager/MOGuideManager.h

@@ -1,22 +0,0 @@
-//
-//  MOGuideManager.h
-//  MiMoLive
-//
-//  Created by MiMo on 2025/6/14.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface MOGuideManager : NSObject
-
-
-@property (nonatomic, assign) BOOL showSendGiftGuide;
-
-///单例
-+ (MOGuideManager *)shareManager;
-
-@end
-
-NS_ASSUME_NONNULL_END

MiMoLive/MiMoLive/Classes/Base/Guide/Manager/MOGuideManager.m

@@ -1,26 +0,0 @@
-//
-//  MOGuideManager.m
-//  MiMoLive
-//
-//  Created by MiMo on 2025/6/14.
-//
-
-#import "MOGuideManager.h"
-
-static MOGuideManager *_manager;
-
-
-@implementation MOGuideManager
-
-///单例
-+ (MOGuideManager *)shareManager {
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^
-    {
-        _manager = [[MOGuideManager alloc] init];
-    });
-    
-    return _manager;
-}
-
-@end

MiMoLive/MiMoLive/Classes/Live/View/LiveingView/GiftListView/MOGiftCollectionView.m

@@ -9,6 +9,7 @@
 #define kPageSize 60
 
 #import "MOGiftCollectionView.h"
+#import "MOShowBubbleTool.h"
 
 @interface MOGiftCollectionView ()<UICollectionViewDelegate,UICollectionViewDataSource>
 
@@ -167,6 +168,11 @@
 }
 
 - (void)toChangeTheFirstChooseWith:(NSArray *)dataArr{
+    if (![MOShowBubbleTool hadShowSendGiftGuideView]) {
+        return;
+    }
+    
+    
     if(dataArr.count == 0){
         return;
     }

MiMoLive/MiMoLive/Classes/Live/View/LiveingView/GiftListView/MOGiftListView.m

@@ -1470,7 +1470,7 @@
 }
 
 - (void)showSendGiftGuideView {
-    NSIndexPath *targetIndexPath = [NSIndexPath indexPathForItem:2 inSection:0];
+    NSIndexPath *targetIndexPath = [NSIndexPath indexPathForItem:0 inSection:0];
     MOGiftItemCell *targetCell = [self.firstTabView.collectionView cellForItemAtIndexPath:targetIndexPath];
     if (targetCell) {
         CGRect cellFrameInWindow = [targetCell convertRect:targetCell.bounds toView:self.superview];

MiMoLive/MiMoLive/Classes/Live/View/LiveingView/MOShowRoomLiveView.m

@@ -44,7 +44,6 @@
 #import "FLAnimatedImage.h"
 #import "MOWelcomeNewUserView.h"
 #import "MOGuideMaskView.h"
-#import "MOGuideManager.h"
 #import "MOFollowShowView.h"
 #import "MOFollowRecordTool.h"
 #import "MOShowBubbleTool.h"
@@ -509,7 +508,6 @@
     [guideView addHoleWithRect:holeRect cornerRadius:16];
     WEAKSELF
     guideView.hideBlock = ^{
-        [MOGuideManager shareManager].showSendGiftGuide = YES;
         [weakSelf giftBtnClick];
     };
     [guideView showInView:self];