diff --git a/demo/src/SliderDemo.ts b/demo/src/SliderDemo.ts index a1f6a35c..65767eaa 100644 --- a/demo/src/SliderDemo.ts +++ b/demo/src/SliderDemo.ts @@ -6,6 +6,8 @@ const imageUrls = [ 'http://f.hiphotos.baidu.com/image/pic/item/0e2442a7d933c8956c0e8eeadb1373f08202002a.jpg', 'http://f.hiphotos.baidu.com/image/pic/item/b151f8198618367aa7f3cc7424738bd4b31ce525.jpg', 'http://b.hiphotos.baidu.com/image/pic/item/0eb30f2442a7d9337119f7dba74bd11372f001e0.jpg', + 'http://a.hiphotos.baidu.com/image/h%3D300/sign=b38f3fc35b0fd9f9bf175369152cd42b/9a504fc2d5628535bdaac29e9aef76c6a6ef63c2.jpg', + 'http://h.hiphotos.baidu.com/image/pic/item/810a19d8bc3eb1354c94a704ac1ea8d3fd1f4439.jpg', 'http://calonye.com/wp-content/uploads/2015/08/0-wx_fmtgiftpwebpwxfrom5wx_lazy1-9.gif', 'http://hbimg.b0.upaiyun.com/ca29ea125b7f2d580f573e48eb594b1ef509757f34a08-m0hK45_fw658', 'https://misc.aotu.io/ONE-SUNDAY/SteamEngine.png', @@ -31,7 +33,7 @@ class SliderPanel extends Panel { renderPage: (idx) => { return slideItem(image({ imageUrl: imageUrls[idx % imageUrls.length], - layoutConfig: layoutConfig().wrap().a(gravity().center()), + layoutConfig: layoutConfig().w(LayoutSpec.WRAP_CONTENT).h(LayoutSpec.WRAP_CONTENT).a(gravity().center()), })).also(it => { let start = idx it.onClick = () => { diff --git a/iOS/Example/Example.xcodeproj/project.pbxproj b/iOS/Example/Example.xcodeproj/project.pbxproj index 13db7cbe..66134c6b 100644 --- a/iOS/Example/Example.xcodeproj/project.pbxproj +++ b/iOS/Example/Example.xcodeproj/project.pbxproj @@ -153,8 +153,8 @@ E2334AF222E9D2060098A085 /* ViewController.m */, E2334AF422E9D2060098A085 /* Main.storyboard */, E2334AF722E9D2070098A085 /* Assets.xcassets */, - E2334AF922E9D2070098A085 /* LaunchScreen.storyboard */, E2334AFC22E9D2070098A085 /* Info.plist */, + E2334AF922E9D2070098A085 /* LaunchScreen.storyboard */, E2334AFD22E9D2070098A085 /* main.m */, D751D19E97EF4EDD7588FEBE /* DemoVC.m */, D751DDEC114E037231257E64 /* DemoVC.h */, diff --git a/iOS/Example/Example/Info.plist b/iOS/Example/Example/Info.plist index 16be3b68..f3caaf95 100644 --- a/iOS/Example/Example/Info.plist +++ b/iOS/Example/Example/Info.plist @@ -34,6 +34,13 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight + NSAppTransportSecurity + + NSAllowsArbitraryLoads + + + LSApplicationCategoryType + UISupportedInterfaceOrientations~ipad UIInterfaceOrientationPortrait diff --git a/iOS/Pod/Classes/Shader/DoricSlideItemNode.m b/iOS/Pod/Classes/Shader/DoricSlideItemNode.m index ff840a5c..a65cb62e 100644 --- a/iOS/Pod/Classes/Shader/DoricSlideItemNode.m +++ b/iOS/Pod/Classes/Shader/DoricSlideItemNode.m @@ -39,6 +39,7 @@ - (instancetype)initWithContext:(DoricContext *)doricContext { - (void)initWithSuperNode:(DoricSuperNode *)superNode { [super initWithSuperNode:superNode]; self.reusable = YES; + self.view.clipsToBounds = YES; } - (DoricStackView *)build { diff --git a/iOS/Pod/Classes/Shader/DoricSuperNode.m b/iOS/Pod/Classes/Shader/DoricSuperNode.m index 4f4b73d8..ffcd08ea 100644 --- a/iOS/Pod/Classes/Shader/DoricSuperNode.m +++ b/iOS/Pod/Classes/Shader/DoricSuperNode.m @@ -152,4 +152,7 @@ - (void)clearSubModel { - (DoricViewNode *)subNodeWithViewId:(NSString *)viewId { return nil; } +- (void)requestLayout { + [self.view setNeedsLayout]; +} @end \ No newline at end of file