update travis ci
diff --git a/ios/Podfile b/ios/Podfile
index ae54cb7..cc83427 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -8,7 +8,7 @@
if File.file?('../../.gitmodules') && File.readlines('../../.gitmodules').grep(/submodule \"weex-playground\"/).size > 0
pod 'WeexSDK', :path => '../../'
else
- pod 'WeexSDK'
+ pod 'WeexSDK', :git => 'https://github.com/apache/incubator-weex.git'
end
pod 'WXDevtool','0.20.0'
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
new file mode 100644
index 0000000..5eb3930
--- /dev/null
+++ b/ios/Podfile.lock
@@ -0,0 +1,84 @@
+PODS:
+ - ATSDK-Weex (0.0.1)
+ - BindingX (1.0.3):
+ - WeexPluginLoader
+ - WeexSDK
+ - libwebp (1.0.2):
+ - libwebp/core (= 1.0.2)
+ - libwebp/dec (= 1.0.2)
+ - libwebp/demux (= 1.0.2)
+ - libwebp/dsp (= 1.0.2)
+ - libwebp/enc (= 1.0.2)
+ - libwebp/mux (= 1.0.2)
+ - libwebp/utils (= 1.0.2)
+ - libwebp/webp (= 1.0.2)
+ - libwebp/core (1.0.2):
+ - libwebp/webp
+ - libwebp/dec (1.0.2):
+ - libwebp/core
+ - libwebp/demux (1.0.2):
+ - libwebp/core
+ - libwebp/dsp (1.0.2):
+ - libwebp/core
+ - libwebp/enc (1.0.2):
+ - libwebp/core
+ - libwebp/mux (1.0.2):
+ - libwebp/core
+ - libwebp/utils (1.0.2):
+ - libwebp/core
+ - libwebp/webp (1.0.2)
+ - SDWebImage (3.7.5):
+ - SDWebImage/Core (= 3.7.5)
+ - SDWebImage/Core (3.7.5)
+ - SDWebImage/WebP (3.7.5):
+ - libwebp
+ - SDWebImage/Core
+ - SocketRocket (0.4.2)
+ - WeexPluginLoader (0.0.1.9.1):
+ - WeexSDK
+ - WeexSDK (0.26.0)
+ - WXDevtool (0.20.0):
+ - SocketRocket
+ - WeexSDK
+
+DEPENDENCIES:
+ - ATSDK-Weex (= 0.0.1)
+ - BindingX (= 1.0.3)
+ - SDWebImage (= 3.7.5)
+ - SDWebImage/WebP
+ - SocketRocket (= 0.4.2)
+ - WeexSDK (from `https://github.com/apache/incubator-weex.git`)
+ - WXDevtool (= 0.20.0)
+
+SPEC REPOS:
+ https://github.com/cocoapods/specs.git:
+ - ATSDK-Weex
+ - BindingX
+ - libwebp
+ - SDWebImage
+ - SocketRocket
+ - WeexPluginLoader
+ - WXDevtool
+
+EXTERNAL SOURCES:
+ WeexSDK:
+ :git: https://github.com/apache/incubator-weex.git
+
+CHECKOUT OPTIONS:
+ WeexSDK:
+ :commit: 72c51f0763e24c9753d2935009da768e63ecf1ca
+ :git: https://github.com/apache/incubator-weex.git
+
+SPEC CHECKSUMS:
+ ATSDK-Weex: 1b27558f4336d77fb97704d34fc6ad1fd468592c
+ BindingX: b3c6c1c5dcd8e50277cfc5daad09d7010c227524
+ libwebp: b068a3bd7c45f7460f6715be7bed1a18fd5d6b48
+ SDWebImage: 69c6303e3348fba97e03f65d65d4fbc26740f461
+ SocketRocket: ffe08119b00ef982f6c37052a4705a057c8494ad
+ WeexPluginLoader: 85c1304f8ba29864e58531614a0acfeceef1b85c
+ WeexSDK: 5ef01c4ea4e94eba8be48b92c825b5668b30cfa0
+ WXDevtool: 833dd3e835df1f5f278fc8865c865d48196bfdab
+
+PODFILE CHECKSUM: 443561ccc3fb5ed92bd187a9a211ab82b55bfda8
+
+COCOAPODS: 1.7.4
diff --git a/ios/WeexDemo.xcworkspace/xcuserdata/wangrenmin.xcuserdatad/UserInterfaceState.xcuserstate b/ios/WeexDemo.xcworkspace/xcuserdata/wangrenmin.xcuserdatad/UserInterfaceState.xcuserstate
index c434548..9d9fb2a 100644
--- a/ios/WeexDemo.xcworkspace/xcuserdata/wangrenmin.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/ios/WeexDemo.xcworkspace/xcuserdata/wangrenmin.xcuserdatad/UserInterfaceState.xcuserstate
Binary files differ
diff --git a/ios/WeexDemo/WXDemoViewController.m b/ios/WeexDemo/WXDemoViewController.m
index a412113..01ef8e8 100644
--- a/ios/WeexDemo/WXDemoViewController.m
+++ b/ios/WeexDemo/WXDemoViewController.m
@@ -91,7 +91,7 @@
- (void)viewDidDisappear:(BOOL)animated
{
[super viewDidDisappear:animated];
-// [_instance didDisappear];
+ [_instance didDisappear];
[self updateInstanceState:WeexInstanceDisappear];
}
@@ -107,7 +107,7 @@
- (void)viewWillAppear:(BOOL)animated
{
[super viewWillAppear:animated];
-// [_instance willAppear];
+ [_instance willAppear];
[self setupNaviBar];
[self setupRightBarItem];
[self.navigationController setNavigationBarHidden:_showNavigationBar];
@@ -147,16 +147,16 @@
- (void)render
{
CGFloat width = self.view.frame.size.width;
-// if ([_url.absoluteString isEqualToString:HOME_URL]) {
-// [self.navigationController setNavigationBarHidden:YES];
-// }
+ if ([_url.absoluteString isEqualToString:HOME_URL]) {
+ [self.navigationController setNavigationBarHidden:YES];
+ }
[_instance destroyInstance];
_instance = [[WXSDKInstance alloc] init];
if([WXPrerenderManager isTaskExist:[self.url absoluteString]]){
_instance = [WXPrerenderManager instanceFromUrl:self.url.absoluteString];
}
-// _instance.isMainContainerStack = YES;
+ _instance.isMainContainerStack = YES;
_instance.viewController = self;
UIEdgeInsets safeArea = UIEdgeInsetsZero;
