diff --git a/Podfile b/Podfile index 5d9efb90..bc332c7e 100644 --- a/Podfile +++ b/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' diff --git a/YuMi/Appdelegate/AppDelegate+ThirdConfig.m b/YuMi/Appdelegate/AppDelegate+ThirdConfig.m index 032ea708..a523bcd9 100644 --- a/YuMi/Appdelegate/AppDelegate+ThirdConfig.m +++ b/YuMi/Appdelegate/AppDelegate+ThirdConfig.m @@ -24,7 +24,6 @@ #import "XPRoomViewController.h" #import "XCCurrentVCStackManager.h" #import "ClientConfig.h" -#import #import #import @@ -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]; diff --git a/YuMi/Info.plist b/YuMi/Info.plist index b43a0e13..1342e9d5 100644 --- a/YuMi/Info.plist +++ b/YuMi/Info.plist @@ -89,6 +89,8 @@ 36b91eeac7469 MOBAppSecret 63ec0702513aca17e20615dd5dfdc03f + MOBNetLater + 2 NSAppTransportSecurity NSAllowsArbitraryLoads diff --git a/YuMi/Modules/YMLogin/Presenter/LoginPresenter.m b/YuMi/Modules/YMLogin/Presenter/LoginPresenter.m index 78b43e1d..054b3780 100644 --- a/YuMi/Modules/YMLogin/Presenter/LoginPresenter.m +++ b/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]; diff --git a/YuMi/Modules/YMLogin/View/LoginFullInfoViewController.m b/YuMi/Modules/YMLogin/View/LoginFullInfoViewController.m index 514020ca..a7fad652 100644 --- a/YuMi/Modules/YMLogin/View/LoginFullInfoViewController.m +++ b/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]; } diff --git a/YuMi/Modules/YMLogin/View/LoginVerifCodeViewController.m b/YuMi/Modules/YMLogin/View/LoginVerifCodeViewController.m index 09536c2d..9b257a61 100644 --- a/YuMi/Modules/YMLogin/View/LoginVerifCodeViewController.m +++ b/YuMi/Modules/YMLogin/View/LoginVerifCodeViewController.m @@ -223,7 +223,6 @@ [[CountDownHelper shareHelper] stopCountDown]; [self disMissVC]; self.loginButton.enabled = YES; - [XPAdjustEvent loginEvent]; } ///绑定手机号成功 diff --git a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginPwdViewController.m b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginPwdViewController.m index 91ebf04b..28da678f 100644 --- a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginPwdViewController.m +++ b/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]; } diff --git a/YuMi/Structure/PrefixHeader.pch b/YuMi/Structure/PrefixHeader.pch index 19612bfc..b3bebb35 100644 --- a/YuMi/Structure/PrefixHeader.pch +++ b/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 diff --git a/YuMi/Tools/Event/XPAdjustEvent.h b/YuMi/Tools/Event/XPAdjustEvent.h deleted file mode 100644 index 4792b49b..00000000 --- a/YuMi/Tools/Event/XPAdjustEvent.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// XPAdjustEvent.h -// xplan-ios -// -// Created by duoban on 2022/11/10. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPAdjustEvent : NSObject -+(void)registeringEvent; -+(void)loginEvent; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Tools/Event/XPAdjustEvent.m b/YuMi/Tools/Event/XPAdjustEvent.m deleted file mode 100644 index 0879d603..00000000 --- a/YuMi/Tools/Event/XPAdjustEvent.m +++ /dev/null @@ -1,24 +0,0 @@ -// -// XPAdjustEvent.m -// xplan-ios -// -// Created by duoban on 2022/11/10. -// - -#import "XPAdjustEvent.h" -#import -#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