You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by cx...@apache.org on 2017/03/08 09:56:11 UTC
[1/8] incubator-weex git commit: + [ios] fix bug box-shadow
Repository: incubator-weex
Updated Branches:
refs/heads/0.11-dev a29123297 -> 72c7ee1eb
+ [ios] fix bug box-shadow
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a61a248a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a61a248a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a61a248a
Branch: refs/heads/0.11-dev
Commit: a61a248a53299bd00b1fdb8325c508ad8d3d78e6
Parents: cf92b99
Author: kfeagle <su...@163.com>
Authored: Wed Mar 8 01:34:01 2017 +0800
Committer: kfeagle <su...@163.com>
Committed: Wed Mar 8 01:34:01 2017 +0800
----------------------------------------------------------------------
.../Sources/Display/WXComponent+BoxShadow.h | 5 +----
.../Sources/Display/WXComponent+BoxShadow.m | 22 ++++++++++----------
.../WeexSDK/Sources/Layout/WXComponent+Layout.m | 4 ++--
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 2 +-
.../Sources/View/WXComponent+ViewManagement.m | 2 ++
5 files changed, 17 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a61a248a/ios/sdk/WeexSDK/Sources/Display/WXComponent+BoxShadow.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Display/WXComponent+BoxShadow.h b/ios/sdk/WeexSDK/Sources/Display/WXComponent+BoxShadow.h
index c2ed840..2c1a645 100644
--- a/ios/sdk/WeexSDK/Sources/Display/WXComponent+BoxShadow.h
+++ b/ios/sdk/WeexSDK/Sources/Display/WXComponent+BoxShadow.h
@@ -28,10 +28,7 @@
*
* @param boxShadow the boxshadow will be set
*
- * @param lastboxshadow the boxshadow set last time
- *
- * @param originalBoxShadow the view original boxshadow
*
*/
-- (void)configViewLayer:(UIView *_Nullable)view boxShadow:(WXBoxShadow *_Nullable)boxShadow;
+- (void)configBoxShadow:(WXBoxShadow *_Nullable)boxShadow;
@end
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a61a248a/ios/sdk/WeexSDK/Sources/Display/WXComponent+BoxShadow.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Display/WXComponent+BoxShadow.m b/ios/sdk/WeexSDK/Sources/Display/WXComponent+BoxShadow.m
index feb456f..ba9927b 100644
--- a/ios/sdk/WeexSDK/Sources/Display/WXComponent+BoxShadow.m
+++ b/ios/sdk/WeexSDK/Sources/Display/WXComponent+BoxShadow.m
@@ -58,10 +58,10 @@
}
-- (void)configViewLayer:(UIView *_Nullable)view boxShadow:(WXBoxShadow *_Nullable)boxShadow
+- (void)configBoxShadow:(WXBoxShadow *_Nullable)boxShadow
{
if (!_originalBoxShadow) {
- _originalBoxShadow = [self getViewBoxShadow:view];
+ _originalBoxShadow = [self getViewBoxShadow:self.view];
}
if (!boxShadow && !_lastBoxShadow) {
return;
@@ -72,19 +72,19 @@
}
if (boxShadow.isInset) {
if (boxShadow.innerLayer) {
- boxShadow.innerLayer.frame = view.bounds;
+ boxShadow.innerLayer.frame = self.view.bounds;
if (![boxShadow.innerLayer superlayer] ){
- [view.layer addSublayer:boxShadow.innerLayer];
+ [self.view.layer addSublayer:boxShadow.innerLayer];
}
}
} else {
- UIBezierPath *shadowPath = [UIBezierPath bezierPathWithRect:view.bounds];
- view.layer.masksToBounds = NO;
- view.layer.shadowColor = boxShadow.shadowColor;
- view.layer.shadowOffset = boxShadow.shadowOffset;
- view.layer.shadowRadius = boxShadow.shadowRadius;
- view.layer.shadowOpacity = boxShadow.shadowOpacity;
- view.layer.shadowPath = shadowPath.CGPath;
+ UIBezierPath *shadowPath = [UIBezierPath bezierPathWithRect:self.view.bounds];
+ self.view.layer.masksToBounds = NO;
+ self.view.layer.shadowColor = boxShadow.shadowColor;
+ self.view.layer.shadowOffset = boxShadow.shadowOffset;
+ self.view.layer.shadowRadius = boxShadow.shadowRadius;
+ self.view.layer.shadowOpacity = boxShadow.shadowOpacity;
+ self.view.layer.shadowPath = shadowPath.CGPath;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a61a248a/ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m b/ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m
index 059f79d..3cdadc2 100644
--- a/ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m
+++ b/ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m
@@ -118,8 +118,8 @@
}
strongSelf.view.frame = strongSelf.calculatedFrame;
- if (![self EqualBoxShadow:_boxShadow withBoxShadow:_lastBoxShadow]) {
- [self configViewLayer:strongSelf.view boxShadow:_boxShadow];
+ if (![strongSelf EqualBoxShadow:_boxShadow withBoxShadow:_lastBoxShadow]) {
+ [strongSelf configBoxShadow:_boxShadow];
}
if (strongSelf->_transform) {
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a61a248a/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Model/WXComponent.m b/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
index 2feb24c..560e17e 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
@@ -212,7 +212,7 @@
}
if (_boxShadow) {
- [self configViewLayer:self.view boxShadow:_boxShadow];
+ [self configBoxShadow:_boxShadow];
}
_view.wx_component = self;
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a61a248a/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m b/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
index 686b341..ffc4922 100644
--- a/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
+++ b/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
@@ -9,6 +9,7 @@
#import "WXComponent+ViewManagement.h"
#import "WXComponent_internal.h"
#import "WXComponent+GradientColor.h"
+#import "WXComponent+BoxShadow.h"
#import "WXAssert.h"
#import "WXView.h"
#import "WXSDKInstance_private.h"
@@ -113,6 +114,7 @@
if (styles[@"boxShadow"]) {
_lastBoxShadow = _boxShadow;
_boxShadow = styles[@"boxShadow"]?[WXConvert WXBoxShadow:styles[@"boxShadow"] scaleFactor:self.weexInstance.pixelScaleFactor]:nil;
+ [self configBoxShadow:_boxShadow];
[self setNeedsDisplay];
}
[8/8] incubator-weex git commit: Merge branch '0.11-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.11-dev
Posted by cx...@apache.org.
Merge branch '0.11-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.11-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/72c7ee1e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/72c7ee1e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/72c7ee1e
Branch: refs/heads/0.11-dev
Commit: 72c7ee1ebd80cbfd5926f6afa456279e720bbfb9
Parents: 574bf76 a291232
Author: cxfeng <cx...@apache.org>
Authored: Wed Mar 8 17:52:08 2017 +0800
Committer: cxfeng <cx...@apache.org>
Committed: Wed Mar 8 17:52:08 2017 +0800
----------------------------------------------------------------------
android/sdk/libs/armeabi/libweexv8.so | Bin 3583820 -> 3583820 bytes
android/sdk/libs/x86/libweexv8.so | Bin 4340864 -> 4340864 bytes
.../ui/component/list/BasicListComponent.java | 10 +++++++---
.../ui/component/list/ListComponentView.java | 1 +
.../ui/component/list/SimpleRecyclerView.java | 5 +++++
.../refresh/wrapper/BounceRecyclerView.java | 10 +++++++++-
6 files changed, 22 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[7/8] incubator-weex git commit: Merge branch
'ios-boxshadow-bugfix-0.11-dev' of https://github.com/kfeagle/incubator-weex
into 0.11-dev
Posted by cx...@apache.org.
Merge branch 'ios-boxshadow-bugfix-0.11-dev' of https://github.com/kfeagle/incubator-weex into 0.11-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/574bf762
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/574bf762
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/574bf762
Branch: refs/heads/0.11-dev
Commit: 574bf7623ae801cf5ec911dfc3d48048d552e6c1
Parents: 7a752dd b78b6f9
Author: cxfeng <cx...@apache.org>
Authored: Wed Mar 8 17:51:54 2017 +0800
Committer: cxfeng <cx...@apache.org>
Committed: Wed Mar 8 17:51:54 2017 +0800
----------------------------------------------------------------------
.../xcshareddata/xcschemes/WeexDemo.xcscheme | 2 +-
.../Sources/Display/WXComponent+BoxShadow.h | 5 +----
.../Sources/Display/WXComponent+BoxShadow.m | 22 ++++++++++----------
.../WeexSDK/Sources/Events/WXComponent+Events.m | 4 ++++
.../WeexSDK/Sources/Layout/WXComponent+Layout.m | 10 ++++++---
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 2 +-
.../Sources/View/WXComponent+ViewManagement.m | 2 ++
package.json | 2 +-
8 files changed, 28 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
[6/8] incubator-weex git commit: + [ios] fix bug : rax active lose
efficacy
Posted by cx...@apache.org.
+ [ios] fix bug : rax active lose efficacy
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b78b6f98
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b78b6f98
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b78b6f98
Branch: refs/heads/0.11-dev
Commit: b78b6f98ee7b6b5eab9fb5d30db8f687c622192f
Parents: 957f185
Author: kfeagle <su...@163.com>
Authored: Wed Mar 8 17:36:55 2017 +0800
Committer: kfeagle <su...@163.com>
Committed: Wed Mar 8 17:36:55 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b78b6f98/ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m b/ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m
index 985af01..c33141d 100644
--- a/ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m
+++ b/ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m
@@ -159,6 +159,10 @@ if ([removeEventName isEqualToString:@#eventName]) {\
WX_ADD_EVENT(touchend, addTouchEndEvent)
WX_ADD_EVENT(touchcancel, addTouchCancelEvent)
+ if(_isListenPseudoTouch) {
+ self.touchGesture.listenPseudoTouch = YES;
+ }
+
[self addEvent:addEventName];
}
[5/8] incubator-weex git commit: * [ios] the demo need not update
Posted by cx...@apache.org.
* [ios] the demo need not update
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/957f185f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/957f185f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/957f185f
Branch: refs/heads/0.11-dev
Commit: 957f185f5336cbf2dbc7ebe8fd1c2c194ea44f59
Parents: 39ea2f3
Author: kfeagle <su...@163.com>
Authored: Wed Mar 8 02:40:35 2017 +0800
Committer: kfeagle <su...@163.com>
Committed: Wed Mar 8 02:40:35 2017 +0800
----------------------------------------------------------------------
examples/module/websocket-demo.we | 57 +++++++++++++++++-----------------
1 file changed, 28 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/957f185f/examples/module/websocket-demo.we
----------------------------------------------------------------------
diff --git a/examples/module/websocket-demo.we b/examples/module/websocket-demo.we
index be58cc2..4fa338c 100644
--- a/examples/module/websocket-demo.we
+++ b/examples/module/websocket-demo.we
@@ -2,7 +2,7 @@
<scroller>
<div>
<div style="background-color: #286090">
- <text class="title" style="height: 80px ;padding: 20px;color: white">websocket</text>
+ <text class="title" style="height: 80 ;padding: 20;color: #FFFFFF">websocket</text>
</div>
<input
type="text"
@@ -19,57 +19,56 @@
<text class="button" onclick="{{send}}">send</text>
<text class="button" onclick="{{close}}">close</text>
</div>
- <div style="background-color: lightgray;margin-top: 20px">
- <text class="title" style="height: 80px ;padding: 20px;color: black">method = send</text>
+ <div style="background-color: #D3D3D3;margin-top: 20">
+ <text class="title" style="height: 80 ;padding: 20;color: #000000">method = send</text>
</div>
- <text style="color: black;height: 80px">{{sendinfo}}</text>
- <div style="background-color: lightgray">
- <text class="title" style="height: 80px ;padding: 20px;color: black">method = onopen</text>
+ <text style="color: #000000;height: 80">{{sendinfo}}</text>
+ <div style="background-color: #D3D3D3">
+ <text class="title" style="height: 80 ;padding: 20;color: #000000">method = onopen</text>
</div>
- <text style="color: black;height: 80px">{{onopeninfo}}</text>
- <div style="background-color: lightgray">
- <text class="title" style="height: 80px ;padding: 20px;color: black">method = onmessage</text>
+ <text style="color: #000000;height: 80">{{onopeninfo}}</text>
+ <div style="background-color: #D3D3D3">
+ <text class="title" style="height: 80 ;padding: 20;color: #000000">method = onmessage</text>
</div>
- <text style="color: black;height: 100px">{{onmessage}}</text>
- <div style="background-color: lightgray">
- <text class="title" style="height: 80px ;padding: 20px;color: black">method = onclose</text>
+ <text style="color: #000000;height: 100">{{onmessage}}</text>
+ <div style="background-color: #D3D3D3">
+ <text class="title" style="height: 80 ;padding: 20;color: #000000">method = onclose</text>
</div>
- <text style="color: black;height: 80px">{{oncloseinfo}}</text>
- <div style="background-color: lightgray">
- <text class="title" style="height: 80px ;padding: 20px;color: black">method = onerror</text>
+ <text style="color: #000000;height: 80">{{oncloseinfo}}</text>
+ <div style="background-color: #D3D3D3">
+ <text class="title" style="height: 80 ;padding: 20;color: #000000">method = onerror</text>
</div>
- <text style="color: black;height: 80px">{{onerrorinfo}}</text>
- <div style="background-color: lightgray">
- <text class="title" style="height: 80px ;padding: 20px;color: black">method = close</text>
+ <text style="color: #000000;height: 80">{{onerrorinfo}}</text>
+ <div style="background-color: #D3D3D3">
+ <text class="title" style="height: 80 ;padding: 20;color: #000000">method = close</text>
</div>
- <text style="color: black;height: 80px">{{closeinfo}}</text>
+ <text style="color: #000000;height: 80">{{closeinfo}}</text>
</div>
</div>
</scroller>
</template>
<style>
.input {
- font-size: 40px;
- height: 80px;
- width: 600px;
+ font-size: 40;
+ height: 80;
+ width: 600;
}
.button {
- font-size: 36px;
- width: 150px;
+ font-size: 36;
+ width: 150;
color: #41B883;
text-align: center;
- padding-top: 10px;
- padding-bottom: 10px;
- border-width: 2px;
+ padding-top: 10;
+ padding-bottom: 10;
+ border-width: 2;
border-style: solid;
- margin-right: 20px;
+ margin-right: 20;
border-color: rgb(162, 217, 192);
background-color: rgba(162, 217, 192, 0.2);
}
</style>
<script>
var websocket = require('@weex-module/webSocket');
- var navigator = require('@weex-module/navigator');
module.exports = {
data: {
connectinfo: '',
[3/8] incubator-weex git commit: * [ios] update the box-shadow update
logic
Posted by cx...@apache.org.
* [ios] update the box-shadow update logic
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/56443c15
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/56443c15
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/56443c15
Branch: refs/heads/0.11-dev
Commit: 56443c15518064c72ea2fbddae2f7c75aec6917a
Parents: aa17918
Author: kfeagle <su...@163.com>
Authored: Wed Mar 8 02:27:04 2017 +0800
Committer: kfeagle <su...@163.com>
Committed: Wed Mar 8 02:27:04 2017 +0800
----------------------------------------------------------------------
.../xcshareddata/xcschemes/WeexDemo.xcscheme | 2 +-
ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/56443c15/ios/playground/WeexDemo.xcodeproj/xcshareddata/xcschemes/WeexDemo.xcscheme
----------------------------------------------------------------------
diff --git a/ios/playground/WeexDemo.xcodeproj/xcshareddata/xcschemes/WeexDemo.xcscheme b/ios/playground/WeexDemo.xcodeproj/xcshareddata/xcschemes/WeexDemo.xcscheme
index a0422b6..a33c31d 100644
--- a/ios/playground/WeexDemo.xcodeproj/xcshareddata/xcschemes/WeexDemo.xcscheme
+++ b/ios/playground/WeexDemo.xcodeproj/xcshareddata/xcschemes/WeexDemo.xcscheme
@@ -63,7 +63,7 @@
</AdditionalOptions>
</TestAction>
<LaunchAction
- buildConfiguration = "Release"
+ buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/56443c15/ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m b/ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m
index 3cdadc2..5053cd6 100644
--- a/ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m
+++ b/ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m
@@ -117,9 +117,13 @@
strongSelf.layer.transform = CATransform3DIdentity;
}
- strongSelf.view.frame = strongSelf.calculatedFrame;
- if (![strongSelf EqualBoxShadow:_boxShadow withBoxShadow:_lastBoxShadow]) {
+ if (!CGRectEqualToRect(strongSelf.view.frame,strongSelf.calculatedFrame)) {
+ strongSelf.view.frame = strongSelf.calculatedFrame;
[strongSelf configBoxShadow:_boxShadow];
+ } else {
+ if (![strongSelf EqualBoxShadow:_boxShadow withBoxShadow:_lastBoxShadow]) {
+ [strongSelf configBoxShadow:_boxShadow];
+ }
}
if (strongSelf->_transform) {
[2/8] incubator-weex git commit: + [ios] update weed-styler to 0.19
to support box-shadow
Posted by cx...@apache.org.
+ [ios] update weed-styler to 0.19 to support box-shadow
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/aa17918e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/aa17918e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/aa17918e
Branch: refs/heads/0.11-dev
Commit: aa17918e3af23f9ac16e1340061345270fc7488d
Parents: a61a248
Author: kfeagle <su...@163.com>
Authored: Wed Mar 8 01:39:54 2017 +0800
Committer: kfeagle <su...@163.com>
Committed: Wed Mar 8 01:39:54 2017 +0800
----------------------------------------------------------------------
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/aa17918e/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 2d738e9..213cae7 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
"weex-components": "^0.2.0",
"weex-picker": "^0.1.0",
"weex-rax-framework": "0.1.7",
- "weex-styler":"0.1.8",
+ "weex-styler":"0.1.9",
"weex-vue-framework": "2.1.8-weex.1"
},
"devDependencies": {
[4/8] incubator-weex git commit: * [ios] update websocket demo
Posted by cx...@apache.org.
* [ios] update websocket demo
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/39ea2f3b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/39ea2f3b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/39ea2f3b
Branch: refs/heads/0.11-dev
Commit: 39ea2f3bb6630c6e8c41c19bb568743c7c01c315
Parents: 56443c1
Author: kfeagle <su...@163.com>
Authored: Wed Mar 8 02:36:44 2017 +0800
Committer: kfeagle <su...@163.com>
Committed: Wed Mar 8 02:36:44 2017 +0800
----------------------------------------------------------------------
examples/module/websocket-demo.we | 57 +++++++++++++++++-----------------
1 file changed, 29 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/39ea2f3b/examples/module/websocket-demo.we
----------------------------------------------------------------------
diff --git a/examples/module/websocket-demo.we b/examples/module/websocket-demo.we
index 4fa338c..be58cc2 100644
--- a/examples/module/websocket-demo.we
+++ b/examples/module/websocket-demo.we
@@ -2,7 +2,7 @@
<scroller>
<div>
<div style="background-color: #286090">
- <text class="title" style="height: 80 ;padding: 20;color: #FFFFFF">websocket</text>
+ <text class="title" style="height: 80px ;padding: 20px;color: white">websocket</text>
</div>
<input
type="text"
@@ -19,56 +19,57 @@
<text class="button" onclick="{{send}}">send</text>
<text class="button" onclick="{{close}}">close</text>
</div>
- <div style="background-color: #D3D3D3;margin-top: 20">
- <text class="title" style="height: 80 ;padding: 20;color: #000000">method = send</text>
+ <div style="background-color: lightgray;margin-top: 20px">
+ <text class="title" style="height: 80px ;padding: 20px;color: black">method = send</text>
</div>
- <text style="color: #000000;height: 80">{{sendinfo}}</text>
- <div style="background-color: #D3D3D3">
- <text class="title" style="height: 80 ;padding: 20;color: #000000">method = onopen</text>
+ <text style="color: black;height: 80px">{{sendinfo}}</text>
+ <div style="background-color: lightgray">
+ <text class="title" style="height: 80px ;padding: 20px;color: black">method = onopen</text>
</div>
- <text style="color: #000000;height: 80">{{onopeninfo}}</text>
- <div style="background-color: #D3D3D3">
- <text class="title" style="height: 80 ;padding: 20;color: #000000">method = onmessage</text>
+ <text style="color: black;height: 80px">{{onopeninfo}}</text>
+ <div style="background-color: lightgray">
+ <text class="title" style="height: 80px ;padding: 20px;color: black">method = onmessage</text>
</div>
- <text style="color: #000000;height: 100">{{onmessage}}</text>
- <div style="background-color: #D3D3D3">
- <text class="title" style="height: 80 ;padding: 20;color: #000000">method = onclose</text>
+ <text style="color: black;height: 100px">{{onmessage}}</text>
+ <div style="background-color: lightgray">
+ <text class="title" style="height: 80px ;padding: 20px;color: black">method = onclose</text>
</div>
- <text style="color: #000000;height: 80">{{oncloseinfo}}</text>
- <div style="background-color: #D3D3D3">
- <text class="title" style="height: 80 ;padding: 20;color: #000000">method = onerror</text>
+ <text style="color: black;height: 80px">{{oncloseinfo}}</text>
+ <div style="background-color: lightgray">
+ <text class="title" style="height: 80px ;padding: 20px;color: black">method = onerror</text>
</div>
- <text style="color: #000000;height: 80">{{onerrorinfo}}</text>
- <div style="background-color: #D3D3D3">
- <text class="title" style="height: 80 ;padding: 20;color: #000000">method = close</text>
+ <text style="color: black;height: 80px">{{onerrorinfo}}</text>
+ <div style="background-color: lightgray">
+ <text class="title" style="height: 80px ;padding: 20px;color: black">method = close</text>
</div>
- <text style="color: #000000;height: 80">{{closeinfo}}</text>
+ <text style="color: black;height: 80px">{{closeinfo}}</text>
</div>
</div>
</scroller>
</template>
<style>
.input {
- font-size: 40;
- height: 80;
- width: 600;
+ font-size: 40px;
+ height: 80px;
+ width: 600px;
}
.button {
- font-size: 36;
- width: 150;
+ font-size: 36px;
+ width: 150px;
color: #41B883;
text-align: center;
- padding-top: 10;
- padding-bottom: 10;
- border-width: 2;
+ padding-top: 10px;
+ padding-bottom: 10px;
+ border-width: 2px;
border-style: solid;
- margin-right: 20;
+ margin-right: 20px;
border-color: rgb(162, 217, 192);
background-color: rgba(162, 217, 192, 0.2);
}
</style>
<script>
var websocket = require('@weex-module/webSocket');
+ var navigator = require('@weex-module/navigator');
module.exports = {
data: {
connectinfo: '',