修正文件目录

Podfile

@@ -6,7 +6,7 @@ target 'YuMi' do
   #pag动画
   pod 'libpag'
   pod 'Bugly'
-  pod 'Adjust'
+#  pod 'Adjust'
   pod 'Firebase/Analytics'
   pod 'FBSDKLoginKit'
   pod 'FBSDKCoreKit'
@@ -65,9 +65,7 @@ target 'YuMi' do
   
   pod 'UMCommon'
   pod 'UMDevice'
-#  pod 'lottie-ios'
   pod 'ZLCollectionViewFlowLayout'
-#  pod 'WMZDropDownMenu'
   pod 'TABAnimated'
   pod 'YuMi',:path=>'yum'
   pod 'QCloudCOSXML'	

YuMi.xcodeproj/project.pbxproj

@@ -438,7 +438,6 @@
 		23E9E9A42A80DEAF00B792F2 /* XPMineGuildPersonalBillRecordContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9E9A32A80DEAF00B792F2 /* XPMineGuildPersonalBillRecordContentView.m */; };
 		23E9E9A72A80F1C300B792F2 /* XPNewMineHallIncomeVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9E9A62A80F1C300B792F2 /* XPNewMineHallIncomeVC.m */; };
 		23E9E9AA2A80FDF100B792F2 /* XPNewMineHallIncomeCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9E9A92A80FDF100B792F2 /* XPNewMineHallIncomeCell.m */; };
-		23E9E9B52A81E8E900B792F2 /* XPAdjustEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9E9AF2A81E8E900B792F2 /* XPAdjustEvent.m */; };
 		23E9E9B72A82200500B792F2 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 23E9E9B62A82200500B792F2 /* GoogleService-Info.plist */; };
 		23E9E9BA2A82370800B792F2 /* XPEventHandle.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9E9B82A82370800B792F2 /* XPEventHandle.m */; };
 		23E9E9BD2A82370E00B792F2 /* XPFirebbaseEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9E9BC2A82370E00B792F2 /* XPFirebbaseEvent.m */; };
@@ -2420,8 +2419,6 @@
 		23E9E9A82A80FDF100B792F2 /* XPNewMineHallIncomeCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPNewMineHallIncomeCell.h; sourceTree = "<group>"; };
 		23E9E9A92A80FDF100B792F2 /* XPNewMineHallIncomeCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPNewMineHallIncomeCell.m; sourceTree = "<group>"; };
 		23E9E9AD2A81E8E900B792F2 /* XPEventHead.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPEventHead.h; sourceTree = "<group>"; };
-		23E9E9AF2A81E8E900B792F2 /* XPAdjustEvent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPAdjustEvent.m; sourceTree = "<group>"; };
-		23E9E9B12A81E8E900B792F2 /* XPAdjustEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPAdjustEvent.h; sourceTree = "<group>"; };
 		23E9E9B62A82200500B792F2 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
 		23E9E9B82A82370800B792F2 /* XPEventHandle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPEventHandle.m; sourceTree = "<group>"; };
 		23E9E9B92A82370800B792F2 /* XPEventHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPEventHandle.h; sourceTree = "<group>"; };
@@ -6385,8 +6382,6 @@
 		23E9E9AB2A81E8E900B792F2 /* Event */ = {
 			isa = PBXGroup;
 			children = (
-				23E9E9B12A81E8E900B792F2 /* XPAdjustEvent.h */,
-				23E9E9AF2A81E8E900B792F2 /* XPAdjustEvent.m */,
 				23E9E9AD2A81E8E900B792F2 /* XPEventHead.h */,
 				23E9E9B92A82370800B792F2 /* XPEventHandle.h */,
 				23E9E9B82A82370800B792F2 /* XPEventHandle.m */,
@@ -12101,7 +12096,6 @@
 				E80EC80D28ACD84000D133C5 /* QInputBarView.m in Sources */,
 				23E9EA852A84B6FD00B792F2 /* XPSoundCardModel.m in Sources */,
 				E8D48250278D68BA003C1D08 /* XPAcrossRoomPKPanelView.m in Sources */,
-				23E9E9B52A81E8E900B792F2 /* XPAdjustEvent.m in Sources */,
 				18F404C3276098F100A6C548 /* Api+Message.m in Sources */,
 				9B85B6D7279FDABA00A0A1AC /* XPUserCardSkillCardView.m in Sources */,
 				9B33E3CB27D85379003B0E62 /* UploadFile.m in Sources */,

YuMi/Appdelegate/AppDelegate+ThirdConfig.m

@@ -24,7 +24,6 @@
 #import "XPRoomViewController.h"
 #import "XCCurrentVCStackManager.h"
 #import "ClientConfig.h"
-#import <Adjust/Adjust.h>
 #import <UserNotifications/UserNotifications.h>
 
 #import <Bugly/Bugly.h>
@@ -41,7 +40,6 @@ UIKIT_EXTERN NSString * adImageName;
     [self setLanguage];
 	[self configShareSDK];
 	[self configNIMSDK];
-    [self configAdjust];
     [self configBugly];
     [self registerNot];
     [self initEmojiData];
@@ -123,26 +121,6 @@ UIKIT_EXTERN NSString * adImageName;
 #endif
 }
 
--(void)configAdjust{
-    NSString *appToken = @"p5sndfu9udq8";
-    NSString *environment;
-   #ifdef DEBUG
-       environment = ADJEnvironmentSandbox;
-   #else
-       environment = ADJEnvironmentProduction;
-   #endif
-    
-       ADJConfig*adjustConfig = [ADJConfig configWithAppToken:appToken
-                                     environment:environment];
-       
-   #ifdef DEBUG
-       [adjustConfig setLogLevel:ADJLogLevelVerbose];
-   #else
-     
-   #endif
-   [Adjust appDidLaunch:adjustConfig];
-}
-
 - (void)configShareSDK {
 
     [PILineLoginManager registerLine];

YuMi/Info.plist

@@ -89,6 +89,8 @@
 	<string>36b91eeac7469</string>
 	<key>MOBAppSecret</key>
 	<string>63ec0702513aca17e20615dd5dfdc03f</string>
+	<key>MOBNetLater</key>
+	<string>2</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>

YuMi/Modules/YMLogin/Presenter/LoginPresenter.m

@@ -154,7 +154,6 @@
         AccountModel * model =  [AccountModel modelWithDictionary:data.data];
         if (model != nil) {
             [[AccountInfoStorage instance] saveAccountInfo:model];
-            [XPAdjustEvent loginEvent];
             [XNDJTDDLoadingTool hideOnlyView:kWindow];
             [[NSUserDefaults standardUserDefaults]setValue:@(type) forKey:@"kLoginSuccessType"];
             [[NSUserDefaults standardUserDefaults]synchronize];
@@ -268,7 +267,6 @@
         AccountModel * model =  [AccountModel modelWithDictionary:data.data];
         if (model != nil) {
             [[AccountInfoStorage instance] saveAccountInfo:model];
-            [XPAdjustEvent loginEvent];
             [[NSUserDefaults standardUserDefaults]setValue:@(ThirdLoginType_Gmail) forKey:@"kLoginSuccessType"];
             [[NSUserDefaults standardUserDefaults]synchronize];
             [[self getView] loginThirdPartSuccess];

YuMi/Modules/YMLogin/View/LoginFullInfoViewController.m

@@ -270,7 +270,6 @@
 	///需要重新加载一次 ticket  刷新tabbar的item
 	[[AccountInfoStorage instance] saveTicket:nil];
 	
-    [XPAdjustEvent registeringEvent];
 	NSString * inviteCode = self.codeTextField.text.length > 0 ? self.codeTextField.text : @"";
     [PILoginManager jumpToHomeVCWithInviteCode:inviteCode];
 }

YuMi/Modules/YMLogin/View/LoginVerifCodeViewController.m

@@ -223,7 +223,6 @@
 	[[CountDownHelper shareHelper] stopCountDown];
 	[self disMissVC];
 	self.loginButton.enabled = YES;
-    [XPAdjustEvent loginEvent];
 }
 
 ///绑定手机号成功

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

@@ -116,7 +116,6 @@
     while (vc.presentingViewController) {
         vc = vc.presentingViewController;
     }
-    [XPAdjustEvent loginEvent];
     [vc dismissViewControllerAnimated:YES completion:nil];
     [self.navigationController popToRootViewControllerAnimated:NO];
 }

YuMi/Modules/YMRoom/View/SendGiftView/GiftComboManager.h

@@ -35,6 +35,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)registerActions:(void(^ _Nullable)(ComboActionType type))action;
 
+- (void)enableToCombo:(BOOL)enable;
+
 - (void)saveSendGiftTo:(NSArray *)UIDs;
 - (void)saveGiftSourceType:(GiftSourceType)type;
 - (void)saveSendGiftInfo:(GiftInfoModel *)model;
@@ -48,6 +50,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)resetCombo;
 - (void)sendGift;
 - (void)forceRemove;
+- (BOOL)loadEnable;
 
 // 第一个 combo 由 send gift view 发起，需要手动 combo + 1
 - (NSInteger)loadComboCountFromSendGiftView;

YuMi/Modules/YMRoom/View/SendGiftView/GiftComboManager.m

@@ -20,6 +20,8 @@
 
 @interface GiftComboManager ()
 
+@property (nonatomic, assign) BOOL enableCombo;
+
 // 用来存储 GiftReceiveInfoModel 和 NSDictionary 的元数据队列
 @property (nonatomic, strong) NSMutableArray *giftComboQueue;
 
@@ -96,11 +98,10 @@
 - (void)resetCombo {
     _combo = 1;
     _errorMessage = @"";
-    if (self.actionCallback) {
+    if (self.actionCallback && self.enableCombo) {
         self.actionCallback(ComboAction_ShowPanel);
+        self.isCombing = YES;
     }
-
-    self.isCombing = YES;
 }
 
 - (void)registerActions:(void (^)(ComboActionType))action {
@@ -115,6 +116,11 @@
 }
 
 - (NSInteger)loadComboCountFromSendGiftView {
+
+    if (!self.enableCombo) {
+        return 0;
+    }
+
     NSInteger temp = self.combo;
     self.combo += 1;
     return temp;
@@ -322,6 +328,15 @@
 }
 
 #pragma mark - Gift meta data
+
+- (void)enableToCombo:(BOOL)enable {
+    self.enableCombo = enable;
+}
+
+- (BOOL)loadEnable {
+    return self.enableCombo;
+}
+
 - (void)saveSendGiftTo:(NSArray *)UIDs
 {
     _sendGiftToUIDs = UIDs;
@@ -435,9 +450,12 @@
             attachment.first = CustomMessageType_Gift;
             attachment.second = Custom_Message_Sub_Gift_Send;
             NSDictionary *targetUsers = ((NSArray *)[data objectForKey:@"targetUsers"]).firstObject;
+            NSString *avatar = [targetUsers valueForKeyPath:@"avatar"];
             [data setObject:[targetUsers valueForKeyPath:@"uid"] forKey:@"targetUid"];
             [data setObject:[targetUsers valueForKeyPath:@"nick"] forKey:@"targetNick"];
-            [data setObject:[targetUsers valueForKeyPath:@"avatar"] forKey:@"targetAvatar"];
+            if (avatar.length > 0) {
+                [data setObject:avatar forKey:@"targetAvatar"];
+            }
             attachment.data = data;
         }
             break;

YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftInfoModel.h

@@ -22,8 +22,9 @@ typedef NS_ENUM(NSUInteger, GiftType) {
 	GiftType_Anchor = 11,  //个播礼物
     GiftType_Punish = 12, //惩罚礼物
 	GiftType_Twelve_Star = 13, //星座礼物
-    GiftType_super = 16, //超级礼物
+    GiftType_super = 16, //幸运礼物
     GiftType_Country = 17, //国家礼物
+    GiftType_Lucky24 = 18, //幸运24
 };
 
 //礼物类型

YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftInfoSegmentedView.m

@@ -188,7 +188,8 @@
             }
         }
             break;
-        case GiftType_super:{
+        case GiftType_super:
+        case GiftType_Lucky24:{
             return self.superLuckyVC;
         }
             break;
@@ -211,7 +212,7 @@
             return i;
         } else if (tabGiftType == GiftType_Lucky && self.segmentType == GiftSegmentType_Lucky) {
             return i;
-        } else if (tabGiftType == GiftType_super && self.segmentType == GiftSegmentType_SuperLucky) {
+        } else if ((tabGiftType == GiftType_super || tabGiftType == GiftType_Lucky24) && self.segmentType == GiftSegmentType_SuperLucky) {
             return i;
         } else if (tabGiftType == GiftType_WeekStar && self.segmentType == GiftSegmentType_WeekStar) {
             return i;

YuMi/Modules/YMRoom/View/SendGiftView/View/XPSendGiftView.m

@@ -467,15 +467,21 @@ UIKIT_EXTERN NSString * kShowFirstRechargeView;
 }
 
 /// 初始化/重置 连击礼物功能状态
-- (void)readyForCombo:(XPGiftCountModel *)giftCount {
-    if (self.segmentType == GiftSegmentType_Pack ||
-        self.segmentType == GiftSegmentType_Lucky) {
+- (void)readyForCombo:(XPGiftCountModel *)giftCount
+                 gift:(GiftInfoModel *)giftInfo {
+    if (self.segmentType == GiftSegmentType_Pack) {
+        [[GiftComboManager sharedManager] enableToCombo:NO];
         return;
     }
 
-    NSString *sessionID = self.usingplaceType == SendGiftType_User ? [NSString stringWithFormat:@"%ld", self.userArray.firstObject.uid] : [NSString stringWithFormat:@"%ld", [self.delegate getRoomInfo].roomId];
+    if (giftInfo.giftType != GiftType_Game && giftInfo.giftType != GiftType_super && giftInfo.giftType != GiftType_Lucky24) {
+        [[GiftComboManager sharedManager] enableToCombo:NO];
+        return;
+    }
 
-    GiftInfoModel *giftInfo = self.giftInfoView.lastSelectGift;
+    [[GiftComboManager sharedManager] enableToCombo:YES];
+
+    NSString *sessionID = self.usingplaceType == SendGiftType_User ? [NSString stringWithFormat:@"%ld", self.userArray.firstObject.uid] : [NSString stringWithFormat:@"%ld", [self.delegate getRoomInfo].roomId];
     [[GiftComboManager sharedManager] saveSendGiftTo:[self.userView getSelectUserList]];
     [[GiftComboManager sharedManager] saveGiftSourceType:giftInfo.sourceType];
     [[GiftComboManager sharedManager] saveSendGiftInfo:giftInfo];
@@ -491,11 +497,13 @@ UIKIT_EXTERN NSString * kShowFirstRechargeView;
 - (void)xPGiftBarView:(XPGiftBarView *)view didClickSendGift:(XPGiftCountModel *)giftCount {
 ///总礼物 三要素 送礼物的人 送的什么礼物 送多少个礼物
 	NSArray * uids = [self.userView getSelectUserList];
-	GiftInfoModel * giftInfo = self.giftInfoView.lastSelectGift;
+	GiftInfoModel *giftInfo = self.giftInfoView.lastSelectGift;
 	if (self.usingplaceType == SendGiftType_Room) {
 		if (uids.count > 0) {
 
-            [self readyForCombo:giftCount];
+
+            [self readyForCombo:giftCount
+                           gift:giftInfo];
 
 			///送礼物的人
 			NSString * uidString = [self dealSendGiftUids:uids];

YuMi/Structure/PrefixHeader.pch

@@ -43,7 +43,6 @@ isEnterprise = [bundleID isEqualToString:@"com.hflighting.yumi"];\
 #import "NSDate+DateUtils.h"
 #import "NSMutableDictionary+Saft.h"
 #import "NetImageView.h"
-#import "XPAdjustEvent.h"
 #import "AccountInfoStorage.h"
 #import "YYUtility.h"
 #import <MJExtension/MJExtension.h>

YuMi/Tools/Event/XPAdjustEvent.h

@@ -1,18 +0,0 @@
-//
-//  XPAdjustEvent.h
-//  xplan-ios
-//
-//  Created by duoban on 2022/11/10.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface XPAdjustEvent : NSObject
-+(void)registeringEvent;
-+(void)loginEvent;
-
-@end
-
-NS_ASSUME_NONNULL_END

YuMi/Tools/Event/XPAdjustEvent.m

@@ -1,24 +0,0 @@
-//
-//  XPAdjustEvent.m
-//  xplan-ios
-//
-//  Created by duoban on 2022/11/10.
-//
-
-#import "XPAdjustEvent.h"
-#import <Adjust/Adjust.h>
-#import "XPEventHead.h"
-
-
-
-@implementation XPAdjustEvent
-+(void)registeringEvent{
-    ADJEvent *event = [ADJEvent eventWithEventToken:RegisterEvent];
-    [Adjust trackEvent:event];
-    
-}
-+(void)loginEvent{
-    ADJEvent *event = [ADJEvent eventWithEventToken:LoginEvent];
-    [Adjust trackEvent:event];
-}
-@end