You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ac...@apache.org on 2017/09/14 11:28:59 UTC
[4/8] incubator-weex git commit: * [ios] clear toast queue when
instance disappear
* [ios] clear toast queue when instance disappear
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c8c73cd0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c8c73cd0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c8c73cd0
Branch: refs/heads/0.16-dev
Commit: c8c73cd01fe94a2a0b5068808cc3776e6d6ecb00
Parents: d82509d
Author: acton393 <zh...@gmail.com>
Authored: Wed Sep 13 16:16:23 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Wed Sep 13 16:16:23 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, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c8c73cd0/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 39645ca..2a87df8 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
+++ b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
@@ -45,6 +45,7 @@
#import "WXTracingManager.h"
#import "WXJSExceptionProtocol.h"
#import "WXTracingManager.h"
+#import "WXModalUIModule.h"
NSString *const bundleUrlOptionKey = @"bundleUrl";
@@ -378,7 +379,8 @@ 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/c8c73cd0/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 41582f2..c1af965 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.h
+++ b/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.h
@@ -23,3 +23,9 @@
@interface WXModalUIModule : NSObject <WXModuleProtocol>
@end
+
+@interface WXToastManager : NSObject
+
++ (WXToastManager *)sharedManager;
+
+@end
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c8c73cd0/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 0f8445a..c597f71 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.m
+++ b/ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.m
@@ -43,13 +43,9 @@ typedef enum : NSUInteger {
@end
-@interface WXToastManager : NSObject
-
+@interface WXToastManager()
@property (strong, nonatomic) NSMutableArray<WXToastInfo *> *toastQueue;
@property (strong, nonatomic) UIView *toastingView;
-
-+ (WXToastManager *)sharedManager;
-
@end
@implementation WXToastManager