diff --git a/Podfile b/Podfile index 8949a883..2dbaeb3e 100644 --- a/Podfile +++ b/Podfile @@ -65,7 +65,6 @@ target 'YuMi' do pod 'UMCommon' pod 'UMDevice' pod 'lottie-ios' - pod 'WeexSDK' pod 'ZLCollectionViewFlowLayout' pod 'WMZDropDownMenu' pod 'TABAnimated' diff --git a/YuMi.xcodeproj/project.pbxproj b/YuMi.xcodeproj/project.pbxproj index 71fa61f5..09653908 100644 --- a/YuMi.xcodeproj/project.pbxproj +++ b/YuMi.xcodeproj/project.pbxproj @@ -8,7 +8,6 @@ /* Begin PBXBuildFile section */ 140A7F52299CC69000841594 /* XPTabBar.m in Sources */ = {isa = PBXBuildFile; fileRef = 140A7F51299CC69000841594 /* XPTabBar.m */; }; - 140A818D299CFF1C00841594 /* XPVendorCallViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 140A818C299CFF1C00841594 /* XPVendorCallViewController.m */; }; 1427212529A7566100C7C423 /* ZegoAudioRoom.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1427212329A7563A00C7C423 /* ZegoAudioRoom.framework */; }; 1427212629A7566100C7C423 /* ZegoAudioRoom.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 1427212329A7563A00C7C423 /* ZegoAudioRoom.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 1427212C29A757EC00C7C423 /* MonentsListInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427212A29A757EC00C7C423 /* MonentsListInfoModel.m */; }; @@ -1553,8 +1552,6 @@ /* Begin PBXFileReference section */ 140A7F50299CC69000841594 /* XPTabBar.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPTabBar.h; sourceTree = ""; }; 140A7F51299CC69000841594 /* XPTabBar.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPTabBar.m; sourceTree = ""; }; - 140A818B299CFF1C00841594 /* XPVendorCallViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPVendorCallViewController.h; sourceTree = ""; }; - 140A818C299CFF1C00841594 /* XPVendorCallViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPVendorCallViewController.m; sourceTree = ""; }; 1427212329A7563A00C7C423 /* ZegoAudioRoom.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ZegoAudioRoom.framework; sourceTree = ""; }; 1427212A29A757EC00C7C423 /* MonentsListInfoModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MonentsListInfoModel.m; sourceTree = ""; }; 1427212B29A757EC00C7C423 /* MonentsListInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MonentsListInfoModel.h; sourceTree = ""; }; @@ -10616,8 +10613,6 @@ E8E20BE1281695800033B688 /* XPMineLoginPasswordViewController.m */, E8E20BEA2816A5B90033B688 /* XPMineBlackListViewController.h */, E8E20BEB2816A5B90033B688 /* XPMineBlackListViewController.m */, - 140A818B299CFF1C00841594 /* XPVendorCallViewController.h */, - 140A818C299CFF1C00841594 /* XPVendorCallViewController.m */, 2305F3402AD94D5200AD403C /* XPMaskManagerVC.h */, 2305F33F2AD94D5200AD403C /* XPMaskManagerVC.m */, ); @@ -11660,7 +11655,6 @@ E8D34D6028082BA5009C4835 /* XPMineUserDataPresenter.m in Sources */, E84CBCE4284372D800D43221 /* XPRoomHalfMessageView.m in Sources */, 238B37A52AC55A2C00BFC9D5 /* TreasureFailyKeyInfoModel.m in Sources */, - 140A818D299CFF1C00841594 /* XPVendorCallViewController.m in Sources */, E8EEB8F226FC2050007C6EBA /* SDPhotoBrowser.m in Sources */, 23CEFC4F2AFB8FC100576D89 /* BSSDLayoutUtil.m in Sources */, E81C27AB26EF2D920031E639 /* ThirdUserInfo.m in Sources */, @@ -12770,7 +12764,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 20.20.23; + MARKETING_VERSION = 20.20.25; PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -12808,7 +12802,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 20.20.23; + MARKETING_VERSION = 20.20.25; 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..1d06cb71 100644 --- a/YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme +++ b/YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme @@ -72,7 +72,7 @@ buildConfiguration = "Debug"> diff --git a/YuMi/Appdelegate/AppDelegate+ThirdConfig.m b/YuMi/Appdelegate/AppDelegate+ThirdConfig.m index 71d9c8c3..e6fd28d9 100644 --- a/YuMi/Appdelegate/AppDelegate+ThirdConfig.m +++ b/YuMi/Appdelegate/AppDelegate+ThirdConfig.m @@ -31,12 +31,9 @@ #import "YuMi-swift.h" - UIKIT_EXTERN NSString * kYouMiNumberCountKey; UIKIT_EXTERN NSString * adImageName; - - @implementation AppDelegate (ThirdConfig) diff --git a/YuMi/Appdelegate/AppDelegate.m b/YuMi/Appdelegate/AppDelegate.m index c3ae6da9..04fbfe05 100644 --- a/YuMi/Appdelegate/AppDelegate.m +++ b/YuMi/Appdelegate/AppDelegate.m @@ -34,8 +34,7 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification; @implementation AppDelegate - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - - + self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds]; AccountModel *accountModel = [[AccountInfoStorage instance] getCurrentAccountInfo]; @@ -63,33 +62,30 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification; [[FBSDKApplicationDelegate sharedInstance] application:application didFinishLaunchingWithOptions:launchOptions]; [FIRApp configure]; [MobLink setDelegate:self]; - - + return YES; } -- (void) IMLSDKWillRestoreScene:(MLSDKScene *)scene Restore:(void (^)(BOOL, RestoreStyle))restoreHandler -{ +- (void)IMLSDKWillRestoreScene:(MLSDKScene *)scene + Restore:(void (^)(BOOL, RestoreStyle))restoreHandler { NSString *inviteCode = scene.params[@"inviteCode"]; if (inviteCode != nil && [[AccountInfoStorage instance]getUid].length == 0){ ClientConfig *config = [ClientConfig shareConfig]; config.inviteCode = inviteCode; } - restoreHandler(YES, MLDefault); - } - - - (void)applicationDidEnterBackground:(UIApplication *)application { NSInteger count = [NIMSDK sharedSDK].conversationManager.allUnreadCount; [[UIApplication sharedApplication] setApplicationIconBadgeNumber:count]; } + - (void)applicationDidBecomeActive:(UIApplication *)application { [self getAdvertisingTrackingAuthority]; [[NSNotificationCenter defaultCenter]postNotificationName:@"kAppDidBecomeActive" object:nil]; } + - (void)getAdvertisingTrackingAuthority { dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ if (@available(iOS 14, *)) { @@ -146,17 +142,14 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification; config.pushChatId = userId; } }); - - - } ///URL Scheme跳转 -(BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary *)options{ NSString *bundleID = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleIdentifier"]; if ([url.scheme isEqualToString:[NSString stringWithFormat:@"line3rdp.%@",bundleID]]) { - return [PILineLoginManager applicationOpenurl:app open:url]; - } + return [PILineLoginManager applicationOpenurl:app open:url]; + } NSString *text = [url query]; if(text.length){ @@ -202,8 +195,6 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification; } return [GIDSignIn.sharedInstance handleURL:url]; - - } diff --git a/YuMi/Global/YUMIMacroUitls.h b/YuMi/Global/YUMIMacroUitls.h index 03917285..0735d2f5 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 @"1.0.8" +#define PI_App_Version @"1.0.11" ///渠道 #define PI_App_Source @"appstore" #define PI_Test_Flight @"TestFlight" diff --git a/YuMi/Modules/YMMine/View/Setting/XPMineAboutUsViewController.m b/YuMi/Modules/YMMine/View/Setting/XPMineAboutUsViewController.m index 4bdf0307..668aa623 100644 --- a/YuMi/Modules/YMMine/View/Setting/XPMineAboutUsViewController.m +++ b/YuMi/Modules/YMMine/View/Setting/XPMineAboutUsViewController.m @@ -13,9 +13,6 @@ #import "YYUtility.h" #import "YUMIMacroUitls.h" -#import "XPVendorCallViewController.h" - - @interface XPMineAboutUsViewController () @property (nonatomic, strong) UIImageView *iconImageView;//图标 @property (strong, nonatomic) UILabel *versionLabel;//版本 @@ -29,11 +26,6 @@ self.title = [NSString stringWithFormat:@"%@%@",YMLocalizedString(@"XPMineSettingPresent19"),AppName]; [self initSubViews]; [self makeConstriants]; - - // 调用一下三方库 - XPVendorCallViewController *callVC = [[XPVendorCallViewController alloc] init]; - [callVC vendorCall]; - } - (void)initSubViews { diff --git a/YuMi/Modules/YMMine/View/Setting/XPVendorCallViewController.h b/YuMi/Modules/YMMine/View/Setting/XPVendorCallViewController.h deleted file mode 100644 index edd3eb34..00000000 --- a/YuMi/Modules/YMMine/View/Setting/XPVendorCallViewController.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// YMVendorCallViewController.h -// YUMI -// -// Created by XY on 2023/2/15. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPVendorCallViewController : MvpViewController - -- (void)vendorCall; - -@end - -NS_ASSUME_NONNULL_END - diff --git a/YuMi/Modules/YMMine/View/Setting/XPVendorCallViewController.m b/YuMi/Modules/YMMine/View/Setting/XPVendorCallViewController.m deleted file mode 100644 index c2b1f7a1..00000000 --- a/YuMi/Modules/YMMine/View/Setting/XPVendorCallViewController.m +++ /dev/null @@ -1,50 +0,0 @@ -// -// YMVendorCallViewController.m -// YUMI -// -// Created by XY on 2023/2/15. -// - -#import "XPVendorCallViewController.h" -#import -#import -#import -#import -#import - - -@interface XPVendorCallViewController () - -@end - -@implementation XPVendorCallViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - -} - -- (void)vendorCall { - WMZDropMenuParam *param =MenuParam().wMainRadiusSet(0); - WMZDropDownMenu *menu = [[WMZDropDownMenu alloc] initWithFrame:CGRectMake(0, Menu_NavigationBar, Menu_Width, 40) withParam:param]; - [self.view addSubview:menu]; - - ZLCollectionViewHorzontalLayout *layout = [[ZLCollectionViewHorzontalLayout alloc] init]; - layout.scrollDirection = UICollectionViewScrollDirectionVertical; - - [[TABAnimated sharedAnimated] initWithOnlySkeleton]; - [TABAnimated sharedAnimated].openLog = NO; - - [LottieAnimationView animateWithDuration:1 animations:^{ - - }]; - - - WXSDKInstance *instance = [[WXSDKInstance alloc] init]; - instance.isMainContainerStack = NO; - -} - - - -@end