Revert "* [ios] clear toast queue when instance disappear" This reverts commit c8c73cd01fe94a2a0b5068808cc3776e6d6ecb00.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/317b99d1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/317b99d1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/317b99d1 Branch: refs/heads/0.16-dev Commit: 317b99d1aaf626eac618a5210a24614fbaff4caa Parents: c8c73cd Author: acton393 <zhangxing610...@gmail.com> Authored: Thu Sep 14 18:28:49 2017 +0800 Committer: acton393 <zhangxing610...@gmail.com> Committed: Thu Sep 14 18:28:49 2017 +0800 ---------------------------------------------------------------------- ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 4 +--- ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.h | 6 ------ ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.m | 6 +++++- 3 files changed, 6 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/317b99d1/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m ---------------------------------------------------------------------- diff --git a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m index 2a87df8..39645ca 100644 --- a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m +++ b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m @@ -45,7 +45,6 @@ #import "WXTracingManager.h" #import "WXJSExceptionProtocol.h" #import "WXTracingManager.h" -#import "WXModalUIModule.h" NSString *const bundleUrlOptionKey = @"bundleUrl"; @@ -379,8 +378,7 @@ typedef enum : NSUInteger { if(url.length > 0){ [WXPrerenderManager addGlobalTask:url callback:nil]; } - NSMutableArray * toastQueue = [[WXToastManager sharedManager] valueForKey:@"toastQueue"]; - [toastQueue removeAllObjects]; + } - (void)forceGarbageCollection http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/317b99d1/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.h ---------------------------------------------------------------------- diff --git a/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.h b/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.h index c1af965..41582f2 100644 --- a/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.h +++ b/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.h @@ -23,9 +23,3 @@ @interface WXModalUIModule : NSObject <WXModuleProtocol> @end - -@interface WXToastManager : NSObject - -+ (WXToastManager *)sharedManager; - -@end http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/317b99d1/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.m ---------------------------------------------------------------------- diff --git a/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.m b/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.m index c597f71..0f8445a 100644 --- a/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.m +++ b/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.m @@ -43,9 +43,13 @@ typedef enum : NSUInteger { @end -@interface WXToastManager() +@interface WXToastManager : NSObject + @property (strong, nonatomic) NSMutableArray<WXToastInfo *> *toastQueue; @property (strong, nonatomic) UIView *toastingView; + ++ (WXToastManager *)sharedManager; + @end @implementation WXToastManager
