from:"misakuo"

[4/9] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev

2017-09-27 Thread misakuo

Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-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/08e1c3e4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/08e1c3e4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/08e1c3e4

Branch: refs/heads/0.16-dev
Commit: 08e1c3e4e81c57e8fc50852d0452b8d32d78fe47
Parents: 5e342b4 0faa131
Author: misakuo <misa...@apache.org>
Authored: Mon Sep 25 17:11:28 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Mon Sep 25 17:11:28 2017 +0800

--
 pre-build/native-bundle-main.js | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)
--

[GitHub] incubator-weex pull request #750: * [android] remove methods

2017-09-27 Thread misakuo

GitHub user misakuo opened a pull request:

https://github.com/apache/incubator-weex/pull/750

* [android] remove methods

Remove 3 methods

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/misakuo/incubator-weex 
android-bugfix-reduce-method

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-weex/pull/750.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #750


commit 901be692f9b2469b88460f13881b78a094c80a0c
Author: misakuo <misa...@apache.org>
Date:   2017-09-21T06:18:37Z

Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev

commit 9314f30904dd47ce496968dc54a6a4f18652e9b1
Author: misakuo <misa...@apache.org>
Date:   2017-09-25T03:00:50Z

Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev

commit 5e342b4b0546a36be2b7b2ee65d8c093b7544525
Author: misakuo <misa...@apache.org>
Date:   2017-09-25T03:13:42Z

Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev

commit 08e1c3e4e81c57e8fc50852d0452b8d32d78fe47
Author: misakuo <misa...@apache.org>
Date:   2017-09-25T09:11:28Z

Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev

commit 8eb26bb76572ad4d3c31302da3d5793380fbddd7
Author: misakuo <misa...@apache.org>
Date:   2017-09-26T03:24:07Z

Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev

commit 20771648e257894b8ba870b895c9db8148088e7e
Author: misakuo <misa...@apache.org>
Date:   2017-09-26T07:53:51Z

Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev

commit fc7bcca34fb90be76fb1fbffad9c2873746e5cb6
Author: misakuo <misa...@apache.org>
Date:   2017-09-27T06:25:15Z

Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev

commit 4656959c140dc3f8f540e4ad2e62a030cf9303b8
Author: misakuo <misa...@apache.org>
Date:   2017-09-27T10:42:30Z

Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev

commit c643ceafeb284602acc2ea87a0a0cf1dfa5d7854
Author: misakuo <misa...@apache.org>
Date:   2017-09-27T10:52:02Z

* [android] remove 3 methods




---

[3/4] incubator-weex git commit: * [android] prevent NPE

2017-09-27 Thread misakuo

* [android] prevent NPE


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/007dd161
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/007dd161
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/007dd161

Branch: refs/heads/0.16-dev
Commit: 007dd161ddee82d6ce4b681b33e43646d8b6568b
Parents: 2c75a84
Author: misakuo <misa...@apache.org>
Authored: Wed Sep 27 17:12:33 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Wed Sep 27 17:12:33 2017 +0800

--
 .../java/com/taobao/weex/ui/component/WXComponent.java| 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/007dd161/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
index b389d67..e9d7296 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
@@ -44,6 +44,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewGroup.MarginLayoutParams;
 import android.widget.FrameLayout;
+
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.taobao.weex.ComponentObserver;
@@ -67,8 +68,6 @@ import com.taobao.weex.tracing.Stopwatch;
 import com.taobao.weex.tracing.WXTracing;
 import com.taobao.weex.ui.IFComponentHolder;
 import com.taobao.weex.ui.animation.WXAnimationModule;
-import com.taobao.weex.ui.component.binding.Statements;
-import com.taobao.weex.ui.component.list.WXCell;
 import com.taobao.weex.ui.component.pesudo.OnActivePseudoListner;
 import com.taobao.weex.ui.component.pesudo.PesudoStatus;
 import com.taobao.weex.ui.component.pesudo.TouchActivePseudoListener;
@@ -88,6 +87,7 @@ import com.taobao.weex.utils.WXReflectionUtils;
 import com.taobao.weex.utils.WXResourceUtils;
 import com.taobao.weex.utils.WXUtils;
 import com.taobao.weex.utils.WXViewUtils;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -854,7 +854,11 @@ public abstract class  WXComponent 
implements IWXObject, IWXActi
   case Constants.Name.BOTTOM:
 return true;
   case Constants.Name.BOX_SHADOW:
-updateBoxShadow();
+try {
+  updateBoxShadow();
+} catch (Throwable t) {
+  t.printStackTrace();
+}
 return true;
   default:
 return false;

[4/4] incubator-weex git commit: * [android] fix negative offset

2017-09-27 Thread misakuo

* [android] fix negative offset


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/27f69b75
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/27f69b75
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/27f69b75

Branch: refs/heads/0.16-dev
Commit: 27f69b75a2881afcc229a78e00b43ae2a2d0abd6
Parents: 007dd16
Author: misakuo <misa...@apache.org>
Authored: Wed Sep 27 18:05:08 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Wed Sep 27 18:05:08 2017 +0800

--
 .../main/java/com/taobao/weex/utils/BoxShadowUtil.java| 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/27f69b75/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java 
b/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
index 892e80c..3f522dd 100644
--- a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
@@ -139,8 +139,14 @@ public class BoxShadowUtil {
 viewWidth + 2f * shadowSpread, viewHeight + 2f * shadowSpread
 );
 
-float shadowDx = 2f * dx + shadowRadius;
-float shadowDy = 2f * dy + shadowRadius;
+float shadowDx = shadowRadius;
+float shadowDy = shadowRadius;
+if (dx > 0) {
+  shadowDx = shadowDx + 2f * dx;
+}
+if (dy > 0) {
+  shadowDy = shadowDy + 2f * dy;
+}
 shadowRect.offset(shadowDx, shadowDy);
 
 Paint shadowPaint = new Paint();

[GitHub] incubator-weex pull request #748: * [android] better solution for draw box-s...

2017-09-27 Thread misakuo

GitHub user misakuo opened a pull request:

https://github.com/apache/incubator-weex/pull/748

* [android] better solution for draw box-shadow

Using `BlurMaskFilter` instead of the `Paint.setSahdowLayer` to draw shadow 
layer

Testcase:
http://dotwe.org/vue/2023765cfe6cfc27f722ab88e014fbfe

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/misakuo/incubator-weex 
android-feature-boxshadow

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-weex/pull/748.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #748


commit 0839ee18c27c52a9030e06c3e2cd5142ee6db616
Author: misakuo <misa...@apache.org>
Date:   2017-09-27T07:22:02Z

* [android] better solution for draw box-shadow




---

[GitHub] incubator-weex pull request #172: * [android] allow 0 as width or height for...

2017-09-26 Thread misakuo

Github user misakuo closed the pull request at:

https://github.com/apache/incubator-weex/pull/172


---

incubator-weex git commit: + [android] fix npe caused by tracing

2017-09-25 Thread misakuo

Repository: incubator-weex
Updated Branches:
  refs/heads/0.16-dev 0faa131c7 -> ae69e1e8d


+ [android] fix npe caused by tracing


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ae69e1e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ae69e1e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ae69e1e8

Branch: refs/heads/0.16-dev
Commit: ae69e1e8d83b5a51bf097432faab35d539048a6b
Parents: 0faa131
Author: misakuo <misa...@apache.org>
Authored: Mon Sep 25 17:17:27 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Mon Sep 25 17:17:27 2017 +0800

--
 .../weex/dom/action/AbstractAddElementAction.java   | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ae69e1e8/android/sdk/src/main/java/com/taobao/weex/dom/action/AbstractAddElementAction.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/dom/action/AbstractAddElementAction.java
 
b/android/sdk/src/main/java/com/taobao/weex/dom/action/AbstractAddElementAction.java
index 3d026ee..9f35263 100644
--- 
a/android/sdk/src/main/java/com/taobao/weex/dom/action/AbstractAddElementAction.java
+++ 
b/android/sdk/src/main/java/com/taobao/weex/dom/action/AbstractAddElementAction.java
@@ -49,9 +49,11 @@ public abstract class AbstractAddElementAction extends 
TraceableAction implement
 }
 long startNanos = System.nanoTime();
 WXComponent component = 
WXComponentFactory.newInstance(context.getInstance(), dom, parent);
-component.mTraceInfo.domThreadStart = dom.mDomThreadTimestamp;
-component.mTraceInfo.rootEventId = mTracingEventId;
-component.mTraceInfo.domQueueTime = mDomQueueTime;
+if (component != null) {
+  component.mTraceInfo.domThreadStart = dom.mDomThreadTimestamp;
+  component.mTraceInfo.rootEventId = mTracingEventId;
+  component.mTraceInfo.domQueueTime = mDomQueueTime;
+}
 
 context.registerComponent(dom.getRef(), component);
 if (component instanceof WXVContainer) {
@@ -65,7 +67,9 @@ public abstract class AbstractAddElementAction extends 
TraceableAction implement
 }
   }
 }
-component.mTraceInfo.domThreadNanos = System.nanoTime() - startNanos;
+if (component != null) {
+  component.mTraceInfo.domThreadNanos = System.nanoTime() - startNanos;
+}
 return component;
   }

[11/17] incubator-weex git commit: + [android] support the box-shadow attribute on android 4.3 or higher

2017-09-24 Thread misakuo

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b0e072a4/android/sdk/src/main/java/com/taobao/weex/ui/flat/widget/WidgetGroup.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/flat/widget/WidgetGroup.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/flat/widget/WidgetGroup.java
new file mode 100644
index 000..42ca263
--- /dev/null
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/flat/widget/WidgetGroup.java
@@ -0,0 +1,54 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.taobao.weex.ui.flat.widget;
+
+
+import android.graphics.Canvas;
+import android.support.annotation.NonNull;
+import android.support.annotation.RestrictTo;
+import android.support.annotation.RestrictTo.Scope;
+import com.taobao.weex.ui.flat.FlatGUIContext;
+import java.util.LinkedList;
+import java.util.List;
+
+@RestrictTo(Scope.LIBRARY)
+public class WidgetGroup extends BaseWidget {
+
+  private List mChildren = new LinkedList<>();
+
+  public WidgetGroup(@NonNull FlatGUIContext context) {
+super(context);
+  }
+
+  public void replaceAll(@NonNull List widgets) {
+mChildren = widgets;
+invalidate();
+  }
+
+  public List getChildren() {
+return mChildren;
+  }
+
+  @Override
+  public void onDraw(@NonNull Canvas canvas) {
+for (Widget child : mChildren) {
+  child.draw(canvas);
+}
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b0e072a4/android/sdk/src/main/java/com/taobao/weex/ui/module/WXTimerModule.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/module/WXTimerModule.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/module/WXTimerModule.java
index caa28a6..ae0ed99 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/module/WXTimerModule.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/module/WXTimerModule.java
@@ -27,6 +27,7 @@ import static 
com.taobao.weex.common.WXJSBridgeMsgType.MODULE_TIMEOUT;
 
 import android.os.Handler;
 import android.os.Message;
+import android.support.annotation.FloatRange;
 import android.support.annotation.IntDef;
 import android.support.annotation.IntRange;
 import android.support.annotation.VisibleForTesting;
@@ -63,16 +64,16 @@ public class WXTimerModule extends WXModule implements 
Destroyable, Handler.Call
 
 
   @JSMethod(uiThread = false)
-  public void setTimeout(@IntRange(from = 1) int funcId, @IntRange(from = 0) 
int delay) {
+  public void setTimeout(@IntRange(from = 1) int funcId, @FloatRange(from = 0) 
float delay) {
 if(mWXSDKInstance != null) {
-  postOrHoldMessage(MODULE_TIMEOUT, funcId, delay, 
Integer.parseInt(mWXSDKInstance.getInstanceId()));
+  postOrHoldMessage(MODULE_TIMEOUT, funcId, (int) delay, 
Integer.parseInt(mWXSDKInstance.getInstanceId()));
 }
   }
 
   @JSMethod(uiThread = false)
-  public void setInterval(@IntRange(from = 1) int funcId, @IntRange(from = 0) 
int interval) {
+  public void setInterval(@IntRange(from = 1) int funcId, @FloatRange(from = 
0) float interval) {
 if(mWXSDKInstance != null) {
-  postOrHoldMessage(MODULE_INTERVAL, funcId, interval, 
Integer.parseInt(mWXSDKInstance.getInstanceId()));
+  postOrHoldMessage(MODULE_INTERVAL, funcId, (int) interval, 
Integer.parseInt(mWXSDKInstance.getInstanceId()));
 }
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b0e072a4/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java
index 1fdba29..5983f2d 100644
--- 
a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java
+++ 
b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java
@@ -37,7 +37,6 @@ import com.taobao.weex.utils.WXViewUtils;
 public class WXBaseCircleIndicator extends FrameLayout implements 
OnPageChangeListener, WXGestureObservable {
 
   private final Paint mPaintPage = new

[13/17] incubator-weex git commit: Revert "+ [android] support the box-shadow attribute on android 4.3 or higher"

2017-09-24 Thread misakuo

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7b2150a5/ios/sdk/WeexSDK/dependency/SRWebSocket.m
--
diff --git a/ios/sdk/WeexSDK/dependency/SRWebSocket.m 
b/ios/sdk/WeexSDK/dependency/SRWebSocket.m
new file mode 100644
index 000..03ad557
--- /dev/null
+++ b/ios/sdk/WeexSDK/dependency/SRWebSocket.m
@@ -0,0 +1,1806 @@
+//
+// Copyright 2012 Square Inc.
+// Portions Copyright (c) 2016-present, Facebook, Inc.
+//
+// All rights reserved.
+//
+// This source code is licensed under the BSD-style license found in the
+// LICENSE file in the root directory of this source tree. An additional grant
+// of patent rights can be found in the PATENTS file in the same directory.
+//
+
+#import "SRWebSocket.h"
+
+#if TARGET_OS_IPHONE
+#define HAS_ICU
+#endif
+
+#ifdef HAS_ICU
+#import 
+#endif
+
+#if TARGET_OS_IPHONE
+#import 
+#else
+#import 
+#endif
+
+#import 
+#import 
+
+#if OS_OBJECT_USE_OBJC_RETAIN_RELEASE
+#define sr_dispatch_retain(x)
+#define sr_dispatch_release(x)
+#define maybe_bridge(x) ((__bridge void *) x)
+#else
+#define sr_dispatch_retain(x) dispatch_retain(x)
+#define sr_dispatch_release(x) dispatch_release(x)
+#define maybe_bridge(x) (x)
+#endif
+
+#if !__has_feature(objc_arc) 
+#error SocketRocket must be compiled with ARC enabled
+#endif
+
+
+typedef enum  {
+SROpCodeTextFrame = 0x1,
+SROpCodeBinaryFrame = 0x2,
+// 3-7 reserved.
+SROpCodeConnectionClose = 0x8,
+SROpCodePing = 0x9,
+SROpCodePong = 0xA,
+// B-F reserved.
+} SROpCode;
+
+typedef struct {
+BOOL fin;
+//  BOOL rsv1;
+//  BOOL rsv2;
+//  BOOL rsv3;
+uint8_t opcode;
+BOOL masked;
+uint64_t payload_length;
+} frame_header;
+
+static NSString *const SRWebSocketAppendToSecKeyString = 
@"258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
+
+static inline int32_t validate_dispatch_data_partial_string(NSData *data);
+static inline void SRFastLog(NSString *format, ...);
+
+@interface NSData (SRWebSocket)
+
+- (NSString *)stringBySHA1ThenBase64Encoding;
+
+@end
+
+
+@interface NSString (SRWebSocket)
+
+- (NSString *)stringBySHA1ThenBase64Encoding;
+
+@end
+
+
+@interface NSURL (SRWebSocket)
+
+// The origin isn't really applicable for a native application.
+// So instead, just map ws -> http and wss -> https.
+- (NSString *)SR_origin;
+
+@end
+
+
+@interface _SRRunLoopThread : NSThread
+
+@property (nonatomic, readonly) NSRunLoop *runLoop;
+
+@end
+
+
+static NSString *newSHA1String(const char *bytes, size_t length) {
+uint8_t md[CC_SHA1_DIGEST_LENGTH];
+
+assert(length >= 0);
+assert(length <= UINT32_MAX);
+CC_SHA1(bytes, (CC_LONG)length, md);
+
+NSData *data = [NSData dataWithBytes:md length:CC_SHA1_DIGEST_LENGTH];
+
+if ([data respondsToSelector:@selector(base64EncodedStringWithOptions:)]) {
+return [data base64EncodedStringWithOptions:0];
+}
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+return [data base64Encoding];
+#pragma clang diagnostic pop
+}
+
+@implementation NSData (SRWebSocket)
+
+- (NSString *)stringBySHA1ThenBase64Encoding;
+{
+return newSHA1String(self.bytes, self.length);
+}
+
+@end
+
+
+@implementation NSString (SRWebSocket)
+
+- (NSString *)stringBySHA1ThenBase64Encoding;
+{
+return newSHA1String(self.UTF8String, self.length);
+}
+
+@end
+
+NSString *const SRWebSocketErrorDomain = @"SRWebSocketErrorDomain";
+NSString *const SRHTTPResponseErrorKey = @"HTTPResponseStatusCode";
+
+// Returns number of bytes consumed. Returning 0 means you didn't match.
+// Sends bytes to callback handler;
+typedef size_t (^stream_scanner)(NSData *collected_data);
+
+typedef void (^data_callback)(SRWebSocket *webSocket,  NSData *data);
+
+@interface SRIOConsumer : NSObject {
+stream_scanner _scanner;
+data_callback _handler;
+size_t _bytesNeeded;
+BOOL _readToCurrentFrame;
+BOOL _unmaskBytes;
+}
+@property (nonatomic, copy, readonly) stream_scanner consumer;
+@property (nonatomic, copy, readonly) data_callback handler;
+@property (nonatomic, assign) size_t bytesNeeded;
+@property (nonatomic, assign, readonly) BOOL readToCurrentFrame;
+@property (nonatomic, assign, readonly) BOOL unmaskBytes;
+
+@end
+
+// This class is not thread-safe, and is expected to always be run on the same 
queue.
+@interface SRIOConsumerPool : NSObject
+
+- (id)initWithBufferCapacity:(NSUInteger)poolSize;
+
+- (SRIOConsumer *)consumerWithScanner:(stream_scanner)scanner 
handler:(data_callback)handler bytesNeeded:(size_t)bytesNeeded 
readToCurrentFrame:(BOOL)readToCurrentFrame unmaskBytes:(BOOL)unmaskBytes;
+- (void)returnConsumer:(SRIOConsumer *)consumer;
+
+@end
+
+@interface SRWebSocket ()  
+
+@property (nonatomic) SRReadyState readyState;
+
+@property (nonatomic) NSOperationQueue *delegateOperationQueue;
+@property (nonatomic) dispatch_queue_t delegateDispatchQueue;
+
+// Specifies whether SSL trust chain should NOT be evaluated.
+//

[16/17] incubator-weex git commit: Revert "+ [android] support the box-shadow attribute on android 4.3 or higher"

2017-09-24 Thread misakuo

Revert "+ [android] support the box-shadow attribute on android 4.3 or higher"

This reverts commit b0e072a4211d2b39cc3618c753a50efc3647cf23.


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7b2150a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7b2150a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7b2150a5

Branch: refs/heads/0.16-dev
Commit: 7b2150a55b63b8150d4394b8cef8e3c38495b6c7
Parents: b0e072a
Author: misakuo <misa...@apache.org>
Authored: Fri Sep 22 10:49:41 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Fri Sep 22 10:49:41 2017 +0800

--
 .travis.yml |   47 +-
 POSSIBLE-NOTICES-FOR-BIN-DIST   |5 +-
 WeexSDK.podspec |2 +
 android/build.gradle|   13 +-
 .../gradle/wrapper/gradle-wrapper.properties|2 +-
 .../alibaba/weex/benchmark/BenchmarkTest.java   |6 +-
 android/sdk/libs/armeabi/libweexjsc.so  |  Bin 325660 -> 325660 bytes
 android/sdk/libs/armeabi/libweexjss.so  |  Bin 6754016 -> 6754012 bytes
 .../java/com/taobao/weex/WXSDKInstance.java |  102 +-
 .../appfram/websocket/WebSocketCloseCodes.java  |2 +-
 .../com/taobao/weex/bridge/WXBridgeManager.java |   27 +-
 .../java/com/taobao/weex/common/Constants.java  |2 -
 .../com/taobao/weex/dom/ImmutableDomObject.java |   21 +-
 .../main/java/com/taobao/weex/dom/WXStyle.java  |   17 +
 .../com/taobao/weex/dom/WXTextDomObject.java|   11 +-
 .../com/taobao/weex/dom/action/Actions.java |4 +-
 .../weex/dom/action/CreateBodyAction.java   |   12 +-
 .../weex/dom/action/ReloadPageAction.java   |6 +-
 .../taobao/weex/ui/component/WXComponent.java   |  143 +-
 .../com/taobao/weex/ui/component/WXDiv.java |   74 +-
 .../com/taobao/weex/ui/component/WXSlider.java  |4 +-
 .../com/taobao/weex/ui/component/WXText.java|   65 +-
 .../taobao/weex/ui/component/WXVContainer.java  |   44 +-
 .../taobao/weex/ui/component/list/WXCell.java   |   61 +-
 .../weex/ui/component/list/WXListComponent.java |   53 +-
 .../com/taobao/weex/ui/flat/FlatComponent.java  |   33 -
 .../com/taobao/weex/ui/flat/FlatGUIContext.java |  146 --
 .../taobao/weex/ui/flat/WidgetContainer.java|   93 -
 .../weex/ui/flat/widget/AndroidViewWidget.java  |   76 -
 .../taobao/weex/ui/flat/widget/BaseWidget.java  |  130 --
 .../taobao/weex/ui/flat/widget/TextWidget.java  |   49 -
 .../com/taobao/weex/ui/flat/widget/Widget.java  |   51 -
 .../taobao/weex/ui/flat/widget/WidgetGroup.java |   54 -
 .../taobao/weex/ui/module/WXTimerModule.java|9 +-
 .../weex/ui/view/WXBaseCircleIndicator.java |  131 +-
 .../com/taobao/weex/ui/view/WXFrameLayout.java  |   53 +-
 .../weex/ui/view/border/BorderCorner.java   |   37 +-
 .../taobao/weex/ui/view/border/BorderUtil.java  |   26 +
 .../weex/ui/view/border/BottomLeftCorner.java   |7 +-
 .../weex/ui/view/border/BottomRightCorner.java  |7 +-
 .../weex/ui/view/border/TopLeftCorner.java  |7 +-
 .../weex/ui/view/border/TopRightCorner.java |7 +-
 .../com/taobao/weex/utils/FunctionParser.java   |6 +
 .../java/com/taobao/weex/utils/LogLevel.java|4 +-
 .../java/com/taobao/weex/utils/OsVersion.java   |2 +-
 .../main/java/com/taobao/weex/utils/Trace.java  |4 +-
 .../java/com/taobao/weex/utils/WXLogUtils.java  |   14 -
 .../java/com/taobao/weex/utils/WXViewUtils.java |   31 -
 .../com/taobao/weex/ui/component/WXDivTest.java |   12 +-
 .../taobao/weex/ui/component/WXTextTest.java|   18 +-
 .../weex/ui/module/WXTimerModuleTest.java   |   45 +-
 dangerfile-android.js   |  108 --
 dangerfile-ios.js   |  107 --
 dangerfile-jsfm.js  |  105 -
 ios/sdk/WeexSDK.xcodeproj/project.pbxproj   |   42 +
 .../Sources/Bridge/WXDebugLoggerBridge.h|   26 +
 .../Sources/Bridge/WXDebugLoggerBridge.m|  213 +++
 ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m |   89 +-
 .../Component/Recycler/WXMultiColumnLayout.m|   32 +-
 .../Sources/Component/WXComponent_internal.h|2 +-
 .../Sources/Component/WXImageComponent.m|   34 +-
 .../WeexSDK/Sources/Component/WXTextComponent.m |6 +-
 .../Sources/Display/WXComponent+Display.m   |2 +-
 ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m|4 +
 .../WeexSDK/Sources/Events/WXComponent+Events.m |   35 +-
 .../Sources/Manager/WXComponentManager.m|9 +-
 ios/sdk/WeexSDK/Sources/Model/WXComponent.m |   30 +-
 .../WeexSDK/Sources/Module/WXAnimationModule.m  |   26 +-
 .../WeexSDK/Sources/Module/WXModalUIModule.m|4 +-
 .../WeexSDK/Sources/Module/WXWebSocketModule.m  |1 +
 ios/sdk/WeexSDK/Sources/Utility/WXConvert.m

[12/17] incubator-weex git commit: + [android] support the box-shadow attribute on android 4.3 or higher

2017-09-24 Thread misakuo

+ [android] support the box-shadow attribute on android 4.3 or higher


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b0e072a4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b0e072a4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b0e072a4

Branch: refs/heads/0.16-dev
Commit: b0e072a4211d2b39cc3618c753a50efc3647cf23
Parents: 4490223
Author: misakuo <misa...@apache.org>
Authored: Fri Sep 22 10:46:12 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Fri Sep 22 10:46:12 2017 +0800

--
 .travis.yml |   47 +-
 POSSIBLE-NOTICES-FOR-BIN-DIST   |5 +-
 WeexSDK.podspec |2 -
 android/build.gradle|   13 +-
 .../gradle/wrapper/gradle-wrapper.properties|2 +-
 .../alibaba/weex/benchmark/BenchmarkTest.java   |6 +-
 android/sdk/libs/armeabi/libweexjsc.so  |  Bin 325660 -> 325660 bytes
 android/sdk/libs/armeabi/libweexjss.so  |  Bin 6754012 -> 6754016 bytes
 .../java/com/taobao/weex/WXSDKInstance.java |  102 +-
 .../appfram/websocket/WebSocketCloseCodes.java  |2 +-
 .../com/taobao/weex/bridge/WXBridgeManager.java |   27 +-
 .../java/com/taobao/weex/common/Constants.java  |2 +
 .../com/taobao/weex/dom/ImmutableDomObject.java |   21 +-
 .../main/java/com/taobao/weex/dom/WXStyle.java  |   17 -
 .../com/taobao/weex/dom/WXTextDomObject.java|   11 +-
 .../com/taobao/weex/dom/action/Actions.java |4 +-
 .../weex/dom/action/CreateBodyAction.java   |   12 +-
 .../weex/dom/action/ReloadPageAction.java   |6 +-
 .../taobao/weex/ui/component/WXComponent.java   |  143 +-
 .../com/taobao/weex/ui/component/WXDiv.java |   74 +-
 .../com/taobao/weex/ui/component/WXSlider.java  |4 +-
 .../com/taobao/weex/ui/component/WXText.java|   65 +-
 .../taobao/weex/ui/component/WXVContainer.java  |   44 +-
 .../taobao/weex/ui/component/list/WXCell.java   |   61 +-
 .../weex/ui/component/list/WXListComponent.java |   53 +-
 .../com/taobao/weex/ui/flat/FlatComponent.java  |   33 +
 .../com/taobao/weex/ui/flat/FlatGUIContext.java |  146 ++
 .../taobao/weex/ui/flat/WidgetContainer.java|   93 +
 .../weex/ui/flat/widget/AndroidViewWidget.java  |   76 +
 .../taobao/weex/ui/flat/widget/BaseWidget.java  |  130 ++
 .../taobao/weex/ui/flat/widget/TextWidget.java  |   49 +
 .../com/taobao/weex/ui/flat/widget/Widget.java  |   51 +
 .../taobao/weex/ui/flat/widget/WidgetGroup.java |   54 +
 .../taobao/weex/ui/module/WXTimerModule.java|9 +-
 .../weex/ui/view/WXBaseCircleIndicator.java |  131 +-
 .../com/taobao/weex/ui/view/WXFrameLayout.java  |   53 +-
 .../weex/ui/view/border/BorderCorner.java   |   37 +-
 .../taobao/weex/ui/view/border/BorderUtil.java  |   26 -
 .../weex/ui/view/border/BottomLeftCorner.java   |7 +-
 .../weex/ui/view/border/BottomRightCorner.java  |7 +-
 .../weex/ui/view/border/TopLeftCorner.java  |7 +-
 .../weex/ui/view/border/TopRightCorner.java |7 +-
 .../com/taobao/weex/utils/FunctionParser.java   |6 -
 .../java/com/taobao/weex/utils/LogLevel.java|4 +-
 .../java/com/taobao/weex/utils/OsVersion.java   |2 +-
 .../main/java/com/taobao/weex/utils/Trace.java  |4 +-
 .../java/com/taobao/weex/utils/WXLogUtils.java  |   14 +
 .../java/com/taobao/weex/utils/WXViewUtils.java |   31 +
 .../com/taobao/weex/ui/component/WXDivTest.java |   12 +-
 .../taobao/weex/ui/component/WXTextTest.java|   18 +-
 .../weex/ui/module/WXTimerModuleTest.java   |   45 +-
 dangerfile-android.js   |  108 ++
 dangerfile-ios.js   |  107 ++
 dangerfile-jsfm.js  |  105 +
 ios/sdk/WeexSDK.xcodeproj/project.pbxproj   |   42 -
 .../Sources/Bridge/WXDebugLoggerBridge.h|   26 -
 .../Sources/Bridge/WXDebugLoggerBridge.m|  213 ---
 ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m |   89 +-
 .../Component/Recycler/WXMultiColumnLayout.m|   32 +-
 .../Sources/Component/WXComponent_internal.h|2 +-
 .../Sources/Component/WXImageComponent.m|   34 +-
 .../WeexSDK/Sources/Component/WXTextComponent.m |6 +-
 .../Sources/Display/WXComponent+Display.m   |2 +-
 ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m|4 -
 .../WeexSDK/Sources/Events/WXComponent+Events.m |   35 +-
 .../Sources/Manager/WXComponentManager.m|9 +-
 ios/sdk/WeexSDK/Sources/Model/WXComponent.m |   30 +-
 .../WeexSDK/Sources/Module/WXAnimationModule.m  |   26 +-
 .../WeexSDK/Sources/Module/WXModalUIModule.m|4 +-
 .../WeexSDK/Sources/Module/WXWebSocketModule.m  |1 -
 ios/sdk/WeexSDK/Sources/Utility/WXConvert.m |   24 +-
 ios/sdk/WeexSDK/Sources/Utility/WXUtility.m |4 +
 ...

[14/17] incubator-weex git commit: Revert "+ [android] support the box-shadow attribute on android 4.3 or higher"

2017-09-24 Thread misakuo

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7b2150a5/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m 
b/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
index bd31e97..b7027b1 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
@@ -29,7 +29,6 @@
 #import "UIBezierPath+Weex.h"
 #import "WXSDKEngine.h"
 #import "WXUtility.h"
-#import 
 
 @interface WXImageView : UIImageView
 
@@ -47,12 +46,8 @@
 static dispatch_queue_t WXImageUpdateQueue;
 
 @interface WXImageComponent ()
-{
-NSString * _imageSrc;
-pthread_mutex_t _imageSrcMutex;
-pthread_mutexattr_t _propertMutexAttr;
-}
 
+@property (nonatomic, strong) NSString *imageSrc;
 @property (nonatomic, strong) NSString *placeholdSrc;
 @property (nonatomic, assign) CGFloat blurRadius;
 @property (nonatomic, assign) UIViewContentMode resizeMode;
@@ -77,15 +72,8 @@ WX_EXPORT_METHOD(@selector(save:))
 if (!WXImageUpdateQueue) {
 WXImageUpdateQueue = 
dispatch_queue_create("com.taobao.weex.ImageUpdateQueue", 
DISPATCH_QUEUE_SERIAL);
 }
-
-pthread_mutexattr_init(&(_propertMutexAttr));
-pthread_mutexattr_settype(&(_propertMutexAttr), 
PTHREAD_MUTEX_RECURSIVE);
-pthread_mutex_init(&(_imageSrcMutex), &(_propertMutexAttr));
-
 if (attributes[@"src"]) {
- pthread_mutex_lock(&(_imageSrcMutex));
 _imageSrc = [[WXConvert NSString:attributes[@"src"]] 
stringByTrimmingCharactersInSet:[NSCharacterSet 
whitespaceAndNewlineCharacterSet]];
- pthread_mutex_unlock(&(_imageSrcMutex));
 } else {
 WXLogWarning(@"image src is nil");
 }
@@ -235,14 +223,13 @@ WX_EXPORT_METHOD(@selector(save:))
 - (void)dealloc
 {
 [self cancelImage];
-pthread_mutex_destroy(&(_imageSrcMutex));
-pthread_mutexattr_destroy(&_propertMutexAttr);
 }
 
 - (void)updateAttributes:(NSDictionary *)attributes
 {
 if (attributes[@"src"]) {
-[self setImageSrc:[[WXConvert NSString:attributes[@"src"]] 
stringByTrimmingCharactersInSet:[NSCharacterSet 
whitespaceAndNewlineCharacterSet]]];
+_imageSrc = [[WXConvert NSString:attributes[@"src"]] 
stringByTrimmingCharactersInSet:[NSCharacterSet 
whitespaceAndNewlineCharacterSet]];
+[self updateImage];
 }
 if (attributes[@"quality"]) {
 _imageQuality = [WXConvert WXImageQuality:attributes[@"quality"]];
@@ -321,24 +308,13 @@ WX_EXPORT_METHOD(@selector(save:))
 }
 }
 
-- (NSString *)imageSrc
-{
-pthread_mutex_lock(&(_imageSrcMutex));
-NSString * imageSrcCpy = [_imageSrc copy];
-pthread_mutex_unlock(&(_imageSrcMutex));
-
-return imageSrcCpy;
-}
-
 - (void)setImageSrc:(NSString*)src
 {
-pthread_mutex_lock(&(_imageSrcMutex));
 if (![src isEqualToString:_imageSrc]) {
 _imageSrc = src;
 _imageDownloadFinish = NO;
 [self updateImage];
 }
-pthread_mutex_unlock(&(_imageSrcMutex));
 }
 
 - (void)updateImage
@@ -372,6 +348,7 @@ WX_EXPORT_METHOD(@selector(save:))
 NSString *placeholderSrc = self.placeholdSrc;
 
 if ([WXUtility isBlankString:placeholderSrc]) {
+//WXLogError(@"image placeholder src is empty");
 return;
 }
 
@@ -410,7 +387,8 @@ WX_EXPORT_METHOD(@selector(save:))
 
 - (void)updateContentImageWithFailedBlock:(void(^)(NSString *, NSError 
*))downloadFailedBlock
 {
-NSString *imageSrc = [NSString stringWithFormat:@"%@", self.imageSrc?:@""];
+NSString *imageSrc = self.imageSrc;
+
 if ([WXUtility isBlankString:imageSrc]) {
 WXLogError(@"image src is empty");
 return;

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7b2150a5/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m 
b/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
index 7556074..664b0e8 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
@@ -362,14 +362,12 @@ do {\
 
 - (NSAttributedString *)ctAttributedString
 {
-NSAttributedString * attributedString = nil;
 pthread_mutex_lock(&(_ctAttributedStringMutex));
 if (!_ctAttributedString) {
-_ctAttributedString = [self buildCTAttributeString];
+_ctAttributedString = [[self buildCTAttributeString] copy];
 }
-attributedString = [_ctAttributedString copy];
 pthread_mutex_unlock(&(_ctAttributedStringMutex));
-return attributedString;
+return [_ctAttributedString copy];
 }
 
 - (void)repaintText:(NSNotification *)notification

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7b2150a5/ios/sdk/WeexSDK/Sources/Display/WXComponent+Display.m

[06/17] incubator-weex git commit: Merge remote-tracking branch 'remotes/upstream/0.16-dev' into android-feature-boxshadow

2017-09-24 Thread misakuo

Merge remote-tracking branch 'remotes/upstream/0.16-dev' into 
android-feature-boxshadow

# Conflicts:
#   test/screenshot/border-android.png


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/467386dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/467386dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/467386dd

Branch: refs/heads/0.16-dev
Commit: 467386dd226c3cb2a8067e831479dbad12cecebe
Parents: 2e4d799 c95944b
Author: misakuo <misa...@apache.org>
Authored: Mon Sep 11 12:02:54 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Mon Sep 11 12:02:54 2017 +0800

--
 android/gradle.properties   |   5 +-
 android/jacoco.gradle   |  43 +
 .../playground/app/src/main/AndroidManifest.xml |   8 ++
 .../alibaba/weex/util/CoverageDataDumper.java   |  36 +++
 .../alibaba/weex/util/JacocoCodeCoverage.java   |  93 +++
 .../weex/appfram/pickers/DatePickerImpl.java|   3 +-
 .../WeexSDK/Sources/Bridge/WXBridgeContext.m|   4 +-
 .../Sources/Component/WXComponent_internal.h|   1 +
 .../WeexSDK/Sources/Component/WXListComponent.m |   4 +
 .../WeexSDK/Sources/Layout/WXComponent+Layout.m |   4 +-
 .../Sources/Manager/WXComponentManager.m|   5 +-
 .../WeexSDK/Sources/Manager/WXTracingManager.h  |   5 +
 .../WeexSDK/Sources/Manager/WXTracingManager.m  |  11 +++
 ios/sdk/WeexSDK/Sources/Model/WXComponent.m |  14 ++-
 ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m   |   4 +
 .../WeexSDK/Sources/Module/WXPrerenderManager.m |  50 +++---
 ios/sdk/WeexSDK/Sources/Monitor/WXMonitor.h |   1 +
 ios/sdk/WeexSDK/Sources/Monitor/WXMonitor.m |   1 +
 .../Sources/Protocol/WXAppMonitorProtocol.h |   1 +
 ios/sdk/WeexSDK/Sources/Utility/WXLog.m |  15 +--
 test/pages/modules/modal-event.vue  |   2 +-
 test/pages/modules/picker-event.vue |   6 +-
 test/run.sh |  25 -
 test/screenshot/border-ios.png  | Bin 126185 -> 128088 bytes
 test/screenshot/compositing-ios.png | Bin 228306 -> 229534 bytes
 test/screenshot/image-resize-android.png| Bin 214440 -> 218804 bytes
 test/screenshot/image-resize-ios.png| Bin 138033 -> 138103 bytes
 test/scripts/modules/picker-event.test.js   |   4 +-
 28 files changed, 302 insertions(+), 43 deletions(-)
--

[07/17] incubator-weex git commit: * [android] using clip canvas instead of draw self path

2017-09-24 Thread misakuo

* [android] using clip canvas instead of draw self path


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f81c7e74
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f81c7e74
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f81c7e74

Branch: refs/heads/0.16-dev
Commit: f81c7e746e904f9856f89a922ec006fa834f9273
Parents: 467386d
Author: misakuo <misa...@apache.org>
Authored: Mon Sep 11 14:43:39 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Mon Sep 11 14:43:39 2017 +0800

--
 .../com/taobao/weex/utils/BoxShadowUtil.java| 71 +---
 1 file changed, 47 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f81c7e74/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java 
b/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
index d5c6371..7c6478a 100644
--- a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
@@ -28,8 +28,6 @@ import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.PixelFormat;
 import android.graphics.PointF;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffXfermode;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.Region;
@@ -40,6 +38,7 @@ import android.os.Build;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
+import android.view.ViewGroup;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -69,6 +68,12 @@ public class BoxShadowUtil {
   return;
 }
 
+if (options.isClear && Build.VERSION.SDK_INT >= 
Build.VERSION_CODES.JELLY_BEAN_MR2) {
+  target.getOverlay().clear();
+  WXLogUtils.d(TAG, "Remove box-shadow");
+  return;
+}
+
 if (radii != null) {
   if (radii.length != 8) {
 WXLogUtils.w(TAG, "Length of radii must be 8");
@@ -111,6 +116,18 @@ public class BoxShadowUtil {
 Bitmap output = Bitmap.createBitmap(canvasWidth, canvasHeight, 
Bitmap.Config.ARGB_);
 Canvas canvas = new Canvas(output);
 
+float offsetX = shadowRadius + shadowSpread + Math.abs(dx);
+float offsetY = shadowRadius + shadowSpread + Math.abs(dy);
+RectF selfRect = new RectF(
+offsetX,
+offsetY,
+(float) Math.floor(viewWidth + offsetX),
+(float) Math.floor(viewHeight + offsetY));
+Path contentPath = new Path();
+contentPath.addRoundRect(selfRect, radii, Path.Direction.CCW);
+// can not antialias
+canvas.clipPath(contentPath, Region.Op.DIFFERENCE);
+
 RectF shadowRect = new RectF(
 shadowRadius,
 shadowRadius,
@@ -130,24 +147,17 @@ public class BoxShadowUtil {
 shadowPaint.setShadowLayer(shadowRadius, dx, dy, shadowColor);
 
 Path shadowPath = new Path();
-shadowPath.addRoundRect(shadowRect, radii, Path.Direction.CCW);
+float[] shadowRadii = new float[8];
+for (int i = 0; i < radii.length; i++) {
+  float contentRadius = radii[i];
+  if (contentRadius == 0f) {
+shadowRadii[i] = 0f;
+  } else {
+shadowRadii[i] = radii[i] + shadowSpread;
+  }
+}
+shadowPath.addRoundRect(shadowRect, shadowRadii, Path.Direction.CCW);
 canvas.drawPath(shadowPath, shadowPaint);
-
-float offsetX = shadowRadius + shadowSpread + dx;
-float offsetY = shadowRadius + shadowSpread + dy;
-RectF selfRect = new RectF(
-offsetX,
-offsetY,
-viewWidth + offsetX,
-viewHeight + offsetY);
-Paint maskPaint = new Paint();
-maskPaint.setAntiAlias(true);
-maskPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.DST_OUT));
-
-Path contentPath = new Path();
-contentPath.addRoundRect(selfRect, radii, Path.Direction.CCW);
-canvas.drawPath(contentPath, maskPaint);
-
 return output;
   }
 
@@ -173,8 +183,8 @@ public class BoxShadowUtil {
   target.getOverlay().clear();
   target.getOverlay().add(shadowDrawable);
   //Relayout to ensure the shadows are fully drawn
-  //target.getParent().requestLayout();
-  WXLogUtils.e("FLAG", "shadow");
+  target.getParent().requestLayout();
+  ((ViewGroup) target.getParent()).invalidate(shadowDrawable.getBounds());
 } else {
   // I have a dream that one day our minSdkVersion will equals or higher 
than 21
   Log.w("BoxShadowUtil", "Call setNormalBoxShadow() requires API level 18 
or higher.");
@@ -196,7 +206,7 @@ public

[10/17] incubator-weex git commit: + [android] support the box-shadow attribute on android 4.3 or higher

2017-09-24 Thread misakuo

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b0e072a4/ios/sdk/WeexSDK/Sources/Display/WXComponent+Display.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Display/WXComponent+Display.m 
b/ios/sdk/WeexSDK/Sources/Display/WXComponent+Display.m
index 5d22939..52af2ba 100644
--- a/ios/sdk/WeexSDK/Sources/Display/WXComponent+Display.m
+++ b/ios/sdk/WeexSDK/Sources/Display/WXComponent+Display.m
@@ -331,13 +331,13 @@
 WXRadii *radii = borderRect.radii;
 CGFloat topLeft = radii.topLeft, topRight = radii.topRight, bottomLeft = 
radii.bottomLeft, bottomRight = radii.bottomRight;
 
+CGContextSetAlpha(context, _opacity);
 // fill background color
 if (_backgroundColor && CGColorGetAlpha(_backgroundColor.CGColor) > 0) {
 CGContextSetFillColorWithColor(context, _backgroundColor.CGColor);
 UIBezierPath *bezierPath = [UIBezierPath 
wx_bezierPathWithRoundedRect:rect topLeft:topLeft topRight:topRight 
bottomLeft:bottomLeft bottomRight:bottomRight];
 [bezierPath fill];
 }
-
 // Top
 if (_borderTopWidth > 0) {
 if(_borderTopStyle == WXBorderStyleDashed || _borderTopStyle == 
WXBorderStyleDotted){

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b0e072a4/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m 
b/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m
index c2db44a..cc9373b 100644
--- a/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m
+++ b/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m
@@ -28,7 +28,6 @@
 #import "WXResourceRequestHandlerDefaultImpl.h"
 #import "WXNavigationDefaultImpl.h"
 #import "WXURLRewriteDefaultImpl.h"
-#import "WXWebSocketDefaultImpl.h"
 
 #import "WXSDKManager.h"
 #import "WXSDKError.h"
@@ -168,9 +167,6 @@
 [self registerHandler:[WXResourceRequestHandlerDefaultImpl new] 
withProtocol:@protocol(WXResourceRequestHandler)];
 [self registerHandler:[WXNavigationDefaultImpl new] 
withProtocol:@protocol(WXNavigationProtocol)];
 [self registerHandler:[WXURLRewriteDefaultImpl new] 
withProtocol:@protocol(WXURLRewriteProtocol)];
-if (NSClassFromString(@"WXWebSocketDefaultImpl")) {
-[self registerHandler:[NSClassFromString(@"WXWebSocketDefaultImpl") 
new] withProtocol:NSProtocolFromString(@"WXWebSocketHandler")];
-}
 
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b0e072a4/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 d3dceb0..8eb799b 100644
--- a/ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m
+++ b/ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m
@@ -271,9 +271,12 @@ if ([removeEventName isEqualToString:@#eventName]) {\
 {
 if (_tapGesture) {
 _tapGesture.delegate = nil;
-if ([self.view.gestureRecognizers containsObject:_tapGesture]) {
-[self.view removeGestureRecognizer:_tapGesture];
+if ([self isViewLoaded]) {
+if ([self.view.gestureRecognizers containsObject:_tapGesture]) {
+[self.view removeGestureRecognizer:_tapGesture];
+}
 }
+[_tapGesture removeTarget:self action:@selector(onClick:)];
 _tapGesture = nil;
 }
 }
@@ -345,9 +348,12 @@ if ([removeEventName isEqualToString:@#eventName]) {\
   
 for (UISwipeGestureRecognizer *recognizer in _swipeGestures) {
 recognizer.delegate = nil;
-if ([[self.view gestureRecognizers] containsObject:recognizer]) {
-[self.view removeGestureRecognizer:recognizer];
+if([self isViewLoaded]) {
+if ([[self.view gestureRecognizers] containsObject:recognizer]) {
+[self.view removeGestureRecognizer:recognizer];
+}
 }
+[recognizer removeTarget:self action:@selector(onSwipe:)];
 }
 _swipeGestures = nil;
 }
@@ -400,10 +406,12 @@ if ([removeEventName isEqualToString:@#eventName]) {\
 {
 if (_longPressGesture) {
 _longPressGesture.delegate = nil;
-
-if([[self.view gestureRecognizers] containsObject:_longPressGesture]) {
-[self.view removeGestureRecognizer:_longPressGesture];
+if ([self isViewLoaded]) {
+if([[self.view gestureRecognizers] 
containsObject:_longPressGesture]) {
+[self.view removeGestureRecognizer:_longPressGesture];
+}
 }
+[_longPressGesture removeTarget:self action:@selector(onLongPress:)];
 _longPressGesture = nil;
 }
 }
@@ -550,11 +558,14 @@ if ([removeEventName isEqualToString:@#eventName]) {\
 && !_listenHorizontalPan && !_listenVerticalPan
 ) {
 
-if ([[self.view gestureRecognizers]

[09/17] incubator-weex git commit: + [android] support the box-shadow attribute on android 4.3 or higher

2017-09-24 Thread misakuo

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b0e072a4/ios/sdk/WeexSDK/dependency/SRWebSocket.m
--
diff --git a/ios/sdk/WeexSDK/dependency/SRWebSocket.m 
b/ios/sdk/WeexSDK/dependency/SRWebSocket.m
deleted file mode 100644
index 03ad557..000
--- a/ios/sdk/WeexSDK/dependency/SRWebSocket.m
+++ /dev/null
@@ -1,1806 +0,0 @@
-//
-// Copyright 2012 Square Inc.
-// Portions Copyright (c) 2016-present, Facebook, Inc.
-//
-// All rights reserved.
-//
-// This source code is licensed under the BSD-style license found in the
-// LICENSE file in the root directory of this source tree. An additional grant
-// of patent rights can be found in the PATENTS file in the same directory.
-//
-
-#import "SRWebSocket.h"
-
-#if TARGET_OS_IPHONE
-#define HAS_ICU
-#endif
-
-#ifdef HAS_ICU
-#import 
-#endif
-
-#if TARGET_OS_IPHONE
-#import 
-#else
-#import 
-#endif
-
-#import 
-#import 
-
-#if OS_OBJECT_USE_OBJC_RETAIN_RELEASE
-#define sr_dispatch_retain(x)
-#define sr_dispatch_release(x)
-#define maybe_bridge(x) ((__bridge void *) x)
-#else
-#define sr_dispatch_retain(x) dispatch_retain(x)
-#define sr_dispatch_release(x) dispatch_release(x)
-#define maybe_bridge(x) (x)
-#endif
-
-#if !__has_feature(objc_arc) 
-#error SocketRocket must be compiled with ARC enabled
-#endif
-
-
-typedef enum  {
-SROpCodeTextFrame = 0x1,
-SROpCodeBinaryFrame = 0x2,
-// 3-7 reserved.
-SROpCodeConnectionClose = 0x8,
-SROpCodePing = 0x9,
-SROpCodePong = 0xA,
-// B-F reserved.
-} SROpCode;
-
-typedef struct {
-BOOL fin;
-//  BOOL rsv1;
-//  BOOL rsv2;
-//  BOOL rsv3;
-uint8_t opcode;
-BOOL masked;
-uint64_t payload_length;
-} frame_header;
-
-static NSString *const SRWebSocketAppendToSecKeyString = 
@"258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
-
-static inline int32_t validate_dispatch_data_partial_string(NSData *data);
-static inline void SRFastLog(NSString *format, ...);
-
-@interface NSData (SRWebSocket)
-
-- (NSString *)stringBySHA1ThenBase64Encoding;
-
-@end
-
-
-@interface NSString (SRWebSocket)
-
-- (NSString *)stringBySHA1ThenBase64Encoding;
-
-@end
-
-
-@interface NSURL (SRWebSocket)
-
-// The origin isn't really applicable for a native application.
-// So instead, just map ws -> http and wss -> https.
-- (NSString *)SR_origin;
-
-@end
-
-
-@interface _SRRunLoopThread : NSThread
-
-@property (nonatomic, readonly) NSRunLoop *runLoop;
-
-@end
-
-
-static NSString *newSHA1String(const char *bytes, size_t length) {
-uint8_t md[CC_SHA1_DIGEST_LENGTH];
-
-assert(length >= 0);
-assert(length <= UINT32_MAX);
-CC_SHA1(bytes, (CC_LONG)length, md);
-
-NSData *data = [NSData dataWithBytes:md length:CC_SHA1_DIGEST_LENGTH];
-
-if ([data respondsToSelector:@selector(base64EncodedStringWithOptions:)]) {
-return [data base64EncodedStringWithOptions:0];
-}
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-return [data base64Encoding];
-#pragma clang diagnostic pop
-}
-
-@implementation NSData (SRWebSocket)
-
-- (NSString *)stringBySHA1ThenBase64Encoding;
-{
-return newSHA1String(self.bytes, self.length);
-}
-
-@end
-
-
-@implementation NSString (SRWebSocket)
-
-- (NSString *)stringBySHA1ThenBase64Encoding;
-{
-return newSHA1String(self.UTF8String, self.length);
-}
-
-@end
-
-NSString *const SRWebSocketErrorDomain = @"SRWebSocketErrorDomain";
-NSString *const SRHTTPResponseErrorKey = @"HTTPResponseStatusCode";
-
-// Returns number of bytes consumed. Returning 0 means you didn't match.
-// Sends bytes to callback handler;
-typedef size_t (^stream_scanner)(NSData *collected_data);
-
-typedef void (^data_callback)(SRWebSocket *webSocket,  NSData *data);
-
-@interface SRIOConsumer : NSObject {
-stream_scanner _scanner;
-data_callback _handler;
-size_t _bytesNeeded;
-BOOL _readToCurrentFrame;
-BOOL _unmaskBytes;
-}
-@property (nonatomic, copy, readonly) stream_scanner consumer;
-@property (nonatomic, copy, readonly) data_callback handler;
-@property (nonatomic, assign) size_t bytesNeeded;
-@property (nonatomic, assign, readonly) BOOL readToCurrentFrame;
-@property (nonatomic, assign, readonly) BOOL unmaskBytes;
-
-@end
-
-// This class is not thread-safe, and is expected to always be run on the same 
queue.
-@interface SRIOConsumerPool : NSObject
-
-- (id)initWithBufferCapacity:(NSUInteger)poolSize;
-
-- (SRIOConsumer *)consumerWithScanner:(stream_scanner)scanner 
handler:(data_callback)handler bytesNeeded:(size_t)bytesNeeded 
readToCurrentFrame:(BOOL)readToCurrentFrame unmaskBytes:(BOOL)unmaskBytes;
-- (void)returnConsumer:(SRIOConsumer *)consumer;
-
-@end
-
-@interface SRWebSocket ()  
-
-@property (nonatomic) SRReadyState readyState;
-
-@property (nonatomic) NSOperationQueue *delegateOperationQueue;
-@property (nonatomic) dispatch_queue_t delegateDispatchQueue;
-
-// Specifies whether SSL trust chain should NOT be evaluated.

[04/17] incubator-weex git commit: * [android] support border-radius

2017-09-24 Thread misakuo

* [android] support border-radius


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a45a5b3f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a45a5b3f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a45a5b3f

Branch: refs/heads/0.16-dev
Commit: a45a5b3f9bee3897007e5a5d480e97e464bc38ec
Parents: d2725ea
Author: misakuo <misa...@apache.org>
Authored: Mon Sep 11 11:53:25 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Mon Sep 11 11:53:25 2017 +0800

--
 .../taobao/weex/ui/component/WXComponent.java   | 51 +---
 .../com/taobao/weex/utils/BoxShadowUtil.java| 39 ++-
 2 files changed, 70 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a45a5b3f/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
index 74308b4..88ffece 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
@@ -659,9 +659,23 @@ public abstract class  WXComponent 
implements IWXObject, IWXActi
   case Constants.Name.BORDER_TOP_RIGHT_RADIUS:
   case Constants.Name.BORDER_BOTTOM_RIGHT_RADIUS:
   case Constants.Name.BORDER_BOTTOM_LEFT_RADIUS:
-Float radius = WXUtils.getFloat(param,null);
-if (radius != null)
-  setBorderRadius(key,radius);
+final Float radius = WXUtils.getFloat(param,null);
+final String finalKey = key;
+if (radius != null) {
+  if (this instanceof WXDiv && mHost != null) {
+/* Hacked by moxun
+   Set border radius on ViewGroup will cause the Overlay to be cut 
and don't know why
+   Delay setting border radius can avoid the problem, and don't 
know why too, dog scienceâ¦â¦ */
+mHost.postDelayed(new Runnable() {
+  @Override
+  public void run() {
+setBorderRadius(finalKey, radius);
+  }
+}, 64);
+  } else {
+setBorderRadius(finalKey, radius);
+  }
+}
 return true;
   case Constants.Name.BORDER_WIDTH:
   case Constants.Name.BORDER_TOP_WIDTH:
@@ -754,12 +768,33 @@ public abstract class  WXComponent 
implements IWXObject, IWXActi
 return;
   }
 
-  String radius = null;
-  Object borderRadius = 
getDomObject().getStyles().get(Constants.Name.BORDER_RADIUS);
-  if (borderRadius != null) {
-radius = borderRadius.toString();
+  float[] radii = new float[] {0, 0, 0, 0, 0, 0, 0, 0};
+  WXStyle style = getDomObject().getStyles();
+  if (style != null) {
+float tl = 
WXUtils.getFloat(style.get(Constants.Name.BORDER_TOP_LEFT_RADIUS), 0f);
+radii[0] = tl;
+radii[1] = tl;
+
+float tr = 
WXUtils.getFloat(style.get(Constants.Name.BORDER_TOP_RIGHT_RADIUS), 0f);
+radii[2] = tr;
+radii[3] = tr;
+
+float br = 
WXUtils.getFloat(style.get(Constants.Name.BORDER_BOTTOM_RIGHT_RADIUS), 0f);
+radii[4] = br;
+radii[5] = br;
+
+float bl = 
WXUtils.getFloat(style.get(Constants.Name.BORDER_BOTTOM_LEFT_RADIUS), 0f);
+radii[6] = bl;
+radii[7] = bl;
+
+if (style.containsKey(Constants.Name.BORDER_RADIUS)) {
+  float radius = 
WXUtils.getFloat(style.get(Constants.Name.BORDER_RADIUS), 0f);
+  for (int i = 0; i < radii.length; i++) {
+radii[i] = radius;
+  }
+}
   }
-  BoxShadowUtil.setBoxShadow(mHost, boxShadow.toString(), radius, 
getInstance().getInstanceViewPortWidth());
+  BoxShadowUtil.setBoxShadow(mHost, boxShadow.toString(), radii, 
getInstance().getInstanceViewPortWidth());
 } else {
   WXLogUtils.w("Can not resolve styles");
 }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a45a5b3f/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java 
b/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
index 13bc49a..d5c6371 100644
--- a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java
@@ -52,13 +52,12 @@ import java.util.List;
  *
  * @see https://www.w3schools.com/cssref/css3_pr_box-shadow.asp;>CSS3 
box-shadow Property

[2/5] incubator-weex git commit: * [android] fix wrong draw indicator

2017-09-21 Thread misakuo

* [android] fix wrong draw indicator


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5123304c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5123304c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5123304c

Branch: refs/heads/0.16-dev
Commit: 5123304c7eb885953e189ebf29b63e4836059286
Parents: e52d273
Author: misakuo <misa...@apache.org>
Authored: Wed Sep 20 14:12:30 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Wed Sep 20 14:12:30 2017 +0800

--
 .../weex/ui/view/WXBaseCircleIndicator.java | 131 +++
 1 file changed, 19 insertions(+), 112 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5123304c/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java
index 1fdba29..604561c 100644
--- 
a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java
+++ 
b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java
@@ -37,7 +37,6 @@ import com.taobao.weex.utils.WXViewUtils;
 public class WXBaseCircleIndicator extends FrameLayout implements 
OnPageChangeListener, WXGestureObservable {
 
   private final Paint mPaintPage = new Paint();
-  private final Paint mPaintStroke = new Paint();
   private final Paint mPaintFill = new Paint();
   private WXGesture wxGesture;
   private WXCircleViewPager mCircleViewPager;
@@ -53,38 +52,24 @@ public class WXBaseCircleIndicator extends FrameLayout 
implements OnPageChangeLi
   /**
* Fill color of unselected circle
*/
-  private int pageColor;
+  private int pageColor = Color.BLUE;
   /**
* Fill color of the selected circle
*/
-  private int fillColor;
+  private int fillColor = Color.BLACK;
   private int realCurrentItem;
-  private OnPageChangeListener mListener;
 
 
   public WXBaseCircleIndicator(Context context) {
 super(context);
-getAttrs(context);
 init();
   }
 
-  /**
-   * Get attribute of xml
-   */
-  private void getAttrs(Context context) {
+  private void init() {
 radius = WXViewUtils.dip2px(5);
 circlePadding = WXViewUtils.dip2px(5);
-pageColor = Color.parseColor("#ff");
-// strokeWidth= WAViewUtils.dip2px((float)1.5);
-// strokeColor = Color.parseColor("#FFDD");
-fillColor = Color.parseColor("#ffd545");
-  }
-
-  private void init() {
-mPaintStroke.setAntiAlias(true);
-mPaintStroke.setStyle(Style.STROKE);
-// mPaintStroke.setColor(strokeColor);
-// mPaintStroke.setStrokeWidth(strokeWidth);
+pageColor = Color.LTGRAY;
+fillColor = Color.DKGRAY;
 
 mPaintFill.setStyle(Style.FILL);
 mPaintFill.setAntiAlias(true);
@@ -102,21 +87,9 @@ public class WXBaseCircleIndicator extends FrameLayout 
implements OnPageChangeLi
*/
   public WXBaseCircleIndicator(Context context, AttributeSet attrs) {
 super(context, attrs);
-getAttrs(context);
 init();
   }
 
-  public void setOnPageChangeListener(OnPageChangeListener listener) {
-mListener = listener;
-  }
-
-  /**
-   * @return the mCircleViewPager
-   */
-  public WXCircleViewPager getCircleViewPager() {
-return mCircleViewPager;
-  }
-
   /**
* @param mCircleViewPager the mCircleViewPager to set
*/
@@ -125,38 +98,27 @@ public class WXBaseCircleIndicator extends FrameLayout 
implements OnPageChangeLi
 if (this.mCircleViewPager != null) {
   this.mCircleViewPager.addOnPageChangeListener(this);
   this.realCurrentItem = mCircleViewPager.getRealCurrentItem();
+  if (realCurrentItem < 0) {
+realCurrentItem = 0;
+  }
 }
 requestLayout();
   }
 
   @Override
   public void onPageScrolled(int position, float positionOffset, int 
positionOffsetPixels) {
-if (mListener != null) {
-  mListener.onPageScrolled(position, positionOffset, positionOffsetPixels);
-}
+
   }
 
   @Override
   public void onPageSelected(int position) {
 realCurrentItem = mCircleViewPager.getRealCurrentItem();
 invalidate();
-if (mListener != null) {
-  mListener.onPageSelected(position);
-}
   }
 
   @Override
   public void onPageScrollStateChanged(int state) {
-if (mListener != null) {
-  mListener.onPageScrollStateChanged(state);
-}
-  }
 
-  /**
-   * @return the radius
-   */
-  public float getRadius() {
-return radius;
   }
 
   /**
@@ -167,27 +129,6 @@ public class WXBaseCircleIndicator extends FrameLayout 
implements OnPageChangeLi
   }
 
   /**
-   * @re

[1/5] incubator-weex git commit: * [android] fix tracing crash

2017-09-21 Thread misakuo

Repository: incubator-weex
Updated Branches:
  refs/heads/0.16-dev 20b115706 -> 5c90b13a7


* [android] fix tracing crash


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f1ce1009
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f1ce1009
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f1ce1009

Branch: refs/heads/0.16-dev
Commit: f1ce1009a804307bb01e8e4a421a15899bad0a7c
Parents: 55d7c35
Author: misakuo <misa...@apache.org>
Authored: Fri Sep 15 16:14:02 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Fri Sep 15 16:14:02 2017 +0800

--
 .../com/taobao/weex/dom/action/CreateBodyAction.java| 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f1ce1009/android/sdk/src/main/java/com/taobao/weex/dom/action/CreateBodyAction.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/dom/action/CreateBodyAction.java 
b/android/sdk/src/main/java/com/taobao/weex/dom/action/CreateBodyAction.java
index 8c4df7d..cd51668 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/action/CreateBodyAction.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/action/CreateBodyAction.java
@@ -50,11 +50,13 @@ class CreateBodyAction extends AbstractAddElementAction {
 
   @Override
   public void executeDom(DOMActionContext context) {
-if (WXEnvironment.isApkDebugable()) {
-  WXTracing.TraceEvent execJsEndEvent = 
WXTracing.newEvent("executeBundleJS", context.getInstanceId(), -1);
-  execJsEndEvent.traceId = context.getInstance().mExecJSTraceId;
-  execJsEndEvent.ph = "E";
-  execJsEndEvent.submit();
+if (WXTracing.isAvailable()) {
+  if (context != null && context.getInstance() != null) {
+WXTracing.TraceEvent execJsEndEvent = 
WXTracing.newEvent("executeBundleJS", context.getInstanceId(), -1);
+execJsEndEvent.traceId = context.getInstance().mExecJSTraceId;
+execJsEndEvent.ph = "E";
+execJsEndEvent.submit();
+  }
 }
 addDomInternal(context, mData);
   }

[4/5] incubator-weex git commit: Merge remote-tracking branch 'upstream/pr706' into apache-0.16-dev

2017-09-21 Thread misakuo

Merge remote-tracking branch 'upstream/pr706' into apache-0.16-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/d1cd420e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d1cd420e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d1cd420e

Branch: refs/heads/0.16-dev
Commit: d1cd420e931b23b16ea6a86c315e53967a2610a7
Parents: 20b1157 f1ce100
Author: misakuo <misa...@apache.org>
Authored: Thu Sep 21 14:22:45 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Thu Sep 21 14:22:45 2017 +0800

--
 .../com/taobao/weex/dom/action/CreateBodyAction.java| 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)
--

[3/5] incubator-weex git commit: * [android] change init color

2017-09-21 Thread misakuo

* [android] change init color


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0c95bcd6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0c95bcd6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0c95bcd6

Branch: refs/heads/0.16-dev
Commit: 0c95bcd6ac28a5cc00f4c234f10a591691779ff4
Parents: 5123304
Author: misakuo <misa...@apache.org>
Authored: Wed Sep 20 14:17:02 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Wed Sep 20 14:17:02 2017 +0800

--
 .../main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0c95bcd6/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java
index 604561c..5983f2d 100644
--- 
a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java
+++ 
b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java
@@ -52,11 +52,11 @@ public class WXBaseCircleIndicator extends FrameLayout 
implements OnPageChangeLi
   /**
* Fill color of unselected circle
*/
-  private int pageColor = Color.BLUE;
+  private int pageColor = Color.LTGRAY;
   /**
* Fill color of the selected circle
*/
-  private int fillColor = Color.BLACK;
+  private int fillColor = Color.DKGRAY;
   private int realCurrentItem;

[5/5] incubator-weex git commit: Merge remote-tracking branch 'upstream/pr716' into apache-0.16-dev

2017-09-21 Thread misakuo

Merge remote-tracking branch 'upstream/pr716' into apache-0.16-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/5c90b13a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5c90b13a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5c90b13a

Branch: refs/heads/0.16-dev
Commit: 5c90b13a79113155cafac54f9edbd1b497cfc645
Parents: d1cd420 0c95bcd
Author: misakuo <misa...@apache.org>
Authored: Thu Sep 21 14:23:00 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Thu Sep 21 14:23:00 2017 +0800

--
 .../weex/ui/view/WXBaseCircleIndicator.java | 131 +++
 1 file changed, 19 insertions(+), 112 deletions(-)
--

[GitHub] incubator-weex pull request #716: * [android] fix wrong draw indicator

2017-09-20 Thread misakuo

GitHub user misakuo opened a pull request:

https://github.com/apache/incubator-weex/pull/716

* [android] fix wrong draw indicator

Testcase:
http://dotwe.org/weex/66c39d1999e50e9b8274b1a4a7aa02c5

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/misakuo/incubator-weex 
android-bugfix-slider-indicator

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-weex/pull/716.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #716


commit 5123304c7eb885953e189ebf29b63e4836059286
Author: misakuo <misa...@apache.org>
Date:   2017-09-20T06:12:30Z

* [android] fix wrong draw indicator




---

[GitHub] incubator-weex pull request #706: * [android] fix tracing crash

2017-09-15 Thread misakuo

GitHub user misakuo opened a pull request:

https://github.com/apache/incubator-weex/pull/706

* [android] fix tracing crash



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/misakuo/incubator-weex 
android-bugfix-tracing-crash

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-weex/pull/706.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #706


commit f1ce1009a804307bb01e8e4a421a15899bad0a7c
Author: misakuo <misa...@apache.org>
Date:   2017-09-15T08:14:02Z

* [android] fix tracing crash




---

[2/3] incubator-weex git commit: do not let same crash page reload again on short time

2017-09-14 Thread misakuo

 do not let same crash page reload again on short time


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e095a741
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e095a741
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e095a741

Branch: refs/heads/0.16-dev
Commit: e095a74117491273125b59380029915acc51eb3c
Parents: f5bc342
Author: å¾¡é <wentao@alibaba-inc.com>
Authored: Thu Sep 14 00:53:01 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Fri Sep 15 11:50:06 2017 +0800

--
 .../java/com/taobao/weex/WXSDKInstance.java | 26 ++-
 .../com/taobao/weex/bridge/WXBridgeManager.java | 27 +---
 .../com/taobao/weex/dom/action/Actions.java |  4 +--
 .../weex/dom/action/ReloadPageAction.java   |  6 +++--
 4 files changed, 43 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e095a741/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java 
b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
index 69fc649..537f43a 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
@@ -614,21 +614,23 @@ public class WXSDKInstance implements 
IWXActivityStateListener,DomContext, View.
 return "";
   }
 
-  public void reloadPage() {
+  public void reloadPage(boolean reloadThis) {
+
 WXSDKEngine.reload();
 
-// å¯ä»¥åéå¹¿æåï¼
-if (mContext != null) {
-  Intent intent = new Intent();
-  intent.setAction(IWXDebugProxy.ACTION_INSTANCE_RELOAD);
-  intent.putExtra("url", mBundleUrl);
-  mContext.sendBroadcast(intent);
+if (reloadThis) {
+  // å¯ä»¥åéå¹¿æåï¼
+  if (mContext != null)  {
+Intent intent = new Intent();
+intent.setAction(IWXDebugProxy.ACTION_INSTANCE_RELOAD);
+intent.putExtra("url", mBundleUrl);
+mContext.sendBroadcast(intent);
+  }
+  // mRendered = false;
+  //destroy();
+  // renderInternal(mPackage, mTemplate, mOptions, mJsonInitData, mFlag);
+  // refreshInstance("{}");
 }
-// mRendered = false;
-//destroy();
-// renderInternal(mPackage, mTemplate, mOptions, mJsonInitData, mFlag);
-// refreshInstance("{}");
-
   }
   /**
* Refresh instance asynchronously.

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e095a741/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java 
b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
index 89b2d3b..3b11387 100644
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
@@ -135,6 +135,9 @@ public class WXBridgeManager implements 
Callback,BactchExecutor {
   private static final int CRASHREINIT = 50;
   private static int reInitCount = 1;
 
+  private static String crashUrl = null;
+  private static long lastCrashTime = 0;
+
 
   /**
* next tick tasks, can set priority
@@ -962,12 +965,15 @@ public class WXBridgeManager implements 
Callback,BactchExecutor {
 WXLogUtils.e("[WXBridgeManager] callReportCrashReloadPage exception: 
", e);
   }
   try {
+
   if (WXSDKManager.getInstance().getSDKInstance(instanceId) != null) {
-  // JSONObject domObject = JSON.parseObject(tasks);
+  boolean reloadThisInstance = shouReloadCurrentInstance(
+  
WXSDKManager.getInstance().getSDKInstance(instanceId).getBundleUrl());
   WXDomModule domModule = getDomModule(instanceId);
-  Action action = Actions.getReloadPage(instanceId);
-  domModule.postAction((DOMAction)action, true);
+  Action action = Actions.getReloadPage(instanceId, 
reloadThisInstance);
+  domModule.postAction((DOMAction) action, true);
   }
+
   } catch (Exception e) {
   WXLogUtils.e("[WXBridgeManager] callReloadPage exception: ", e);
   commitJSBridgeAlarmMonitor(instanceId, 
WXErrorCode.WX_ERR_RELOAD_PAGE,"[WXBridgeManager] callReloadPage exception 
"+e.getCause());
@@ -975,6 +981,19 @@ public class WXBridgeManager implements 
Callback,BactchExecutor {
   return IWXBridge.INSTANCE_RENDERING_ERROR;
   }
 
+  public boolean shouReloadCurrentIn

[1/3] incubator-weex git commit: * [android] fix java doc

2017-09-14 Thread misakuo

Repository: incubator-weex
Updated Branches:
  refs/heads/0.16-dev 84b000d31 -> 55d7c3573


* [android] fix java doc


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f5bc3421
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f5bc3421
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f5bc3421

Branch: refs/heads/0.16-dev
Commit: f5bc3421fc2d09c6c7cce383f4a17a04069109c5
Parents: f95d20d
Author: misakuo <misa...@apache.org>
Authored: Fri Sep 15 10:37:10 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Fri Sep 15 10:37:10 2017 +0800

--
 .../com/taobao/weex/appfram/websocket/WebSocketCloseCodes.java   | 2 +-
 android/sdk/src/main/java/com/taobao/weex/utils/OsVersion.java   | 2 +-
 android/sdk/src/main/java/com/taobao/weex/utils/Trace.java   | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f5bc3421/android/sdk/src/main/java/com/taobao/weex/appfram/websocket/WebSocketCloseCodes.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/appfram/websocket/WebSocketCloseCodes.java
 
b/android/sdk/src/main/java/com/taobao/weex/appfram/websocket/WebSocketCloseCodes.java
index 6251399..0f742ae 100644
--- 
a/android/sdk/src/main/java/com/taobao/weex/appfram/websocket/WebSocketCloseCodes.java
+++ 
b/android/sdk/src/main/java/com/taobao/weex/appfram/websocket/WebSocketCloseCodes.java
@@ -20,7 +20,7 @@ package com.taobao.weex.appfram.websocket;
 
 /**
  * Created by moxun on 17/1/3.
- * @link {https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent}
+ * @see https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent;>CloseEvent
  */
 
 public enum WebSocketCloseCodes {

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f5bc3421/android/sdk/src/main/java/com/taobao/weex/utils/OsVersion.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/OsVersion.java 
b/android/sdk/src/main/java/com/taobao/weex/utils/OsVersion.java
index ef2f0c9..7c53095 100644
--- a/android/sdk/src/main/java/com/taobao/weex/utils/OsVersion.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/OsVersion.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.taobao.weex.util;
+package com.taobao.weex.utils;
 
 /**
  * Android OS version utilities.

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f5bc3421/android/sdk/src/main/java/com/taobao/weex/utils/Trace.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/Trace.java 
b/android/sdk/src/main/java/com/taobao/weex/utils/Trace.java
index 7506804..cfe307e 100644
--- a/android/sdk/src/main/java/com/taobao/weex/utils/Trace.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/Trace.java
@@ -21,8 +21,6 @@ package com.taobao.weex.utils;
 import android.annotation.TargetApi;
 import android.os.Build;
 
-import com.taobao.weex.util.OsVersion;
-
 /**
  * Hepler class for systrace.
  *
@@ -82,7 +80,7 @@ public class Trace {
 
   /**
* Writes a trace message to indicate that a given section of code has ended.
-   * This call must be preceeded by a corresponding call to {@link 
#beginSection()}
+   * This call must be preceeded by a corresponding call to {@link 
#beginSection(String)}
* on the same thread.
*/
   public static void endSection() {

[3/3] incubator-weex git commit: Merge branch '0.16-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into apache-0.16-dev

2017-09-14 Thread misakuo

Merge branch '0.16-dev' of 
https://git-wip-us.apache.org/repos/asf/incubator-weex into apache-0.16-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/55d7c357
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/55d7c357
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/55d7c357

Branch: refs/heads/0.16-dev
Commit: 55d7c3573de06fed6ed46a3e1f2a934016478dd2
Parents: e095a74 84b000d
Author: misakuo <misa...@apache.org>
Authored: Fri Sep 15 11:50:39 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Fri Sep 15 11:50:39 2017 +0800

--

--

[GitHub] incubator-weex pull request #704: * [android] fix java doc

2017-09-14 Thread misakuo

GitHub user misakuo opened a pull request:

https://github.com/apache/incubator-weex/pull/704

* [android] fix java doc

Fix java doc

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/misakuo/incubator-weex android-bugfix-javadoc

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-weex/pull/704.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #704


commit f5bc3421fc2d09c6c7cce383f4a17a04069109c5
Author: misakuo <misa...@apache.org>
Date:   2017-09-15T02:37:10Z

* [android] fix java doc




---

[2/7] incubator-weex git commit: * [android] when WxInstance report createInstance Exception after jsc thread crash, will try reload again

2017-09-06 Thread misakuo

 * [android] when WxInstance report createInstance Exception after jsc thread 
crash, will try reload again


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/6e09b827
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/6e09b827
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/6e09b827

Branch: refs/heads/0.16-dev
Commit: 6e09b827f7c4ce47a69099cc4b65438a2bdcedf2
Parents: f9584d1
Author: yuhun-alibaba <tomcat...@gmail.com>
Authored: Thu Aug 31 20:44:39 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Wed Sep 6 17:51:11 2017 +0800

--
 .../src/main/java/com/taobao/weex/WXSDKInstance.java  |  8 
 .../java/com/taobao/weex/bridge/WXBridgeManager.java  | 14 ++
 2 files changed, 22 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6e09b827/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java 
b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
index 9e26736..7e0da86 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
@@ -117,6 +117,7 @@ public class WXSDKInstance implements 
IWXActivityStateListener,DomContext, View.
   private boolean trackComponent;
   private boolean enableLayerType = true;
   private boolean mNeedValidate = false;
+  private boolean mNeedReLoad = false;
   private static volatile int mViewPortWidth = 750;
   private int mInstanceViewPortWidth = 750;
 
@@ -203,6 +204,13 @@ public class WXSDKInstance implements 
IWXActivityStateListener,DomContext, View.
 return mNeedValidate;
   }
 
+  public boolean isNeedReLoad() {
+return mNeedReLoad;
+  }
+
+  public void setNeedLoad(boolean load) {
+mNeedReLoad = load;
+  }
   /*
   *  Warning: use setInstanceViewPortWidth instead.
   *  store custom ViewPort Width

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6e09b827/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java 
b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
index f6c3144..89b2d3b 100644
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
@@ -1804,6 +1804,20 @@ public class WXBridgeManager implements 
Callback,BactchExecutor {
 if (instanceId != null && (instance = 
WXSDKManager.getInstance().getSDKInstance(instanceId)) != null) {
   instance.onJSException(WXErrorCode.WX_ERR_JS_EXECUTE.getErrorCode(), 
function, exception);
 
+  if (METHOD_CREATE_INSTANCE.equals(function)) {
+try {
+  if (reInitCount > 1 && !instance.isNeedReLoad()) {
+// JSONObject domObject = JSON.parseObject(tasks);
+WXDomModule domModule = getDomModule(instanceId);
+Action action = Actions.getReloadPage(instanceId);
+domModule.postAction((DOMAction)action, true);
+instance.setNeedLoad(true);
+return;
+  }
+} catch (Exception e) {
+  e.printStackTrace();
+}
+  }
   String err = "function:" + function + "#exception:" + exception;
   commitJSBridgeAlarmMonitor(instanceId, WXErrorCode.WX_ERR_JS_EXECUTE, 
err);

[4/7] incubator-weex git commit: * [android] change for android so check fail

2017-09-06 Thread misakuo

* [android] change for android so check fail


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/669c84b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/669c84b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/669c84b1

Branch: refs/heads/0.16-dev
Commit: 669c84b1ac61ef05d652e859e62ecdcb2e688c71
Parents: d4eff8e
Author: yuhun-alibaba <tomcat...@gmail.com>
Authored: Fri Sep 1 15:46:59 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Wed Sep 6 17:51:13 2017 +0800

--
 dangerfile.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/669c84b1/dangerfile.js
--
diff --git a/dangerfile.js b/dangerfile.js
index 50e28ed..05db91d 100644
--- a/dangerfile.js
+++ b/dangerfile.js
@@ -344,8 +344,8 @@ function getContent(url) {
 // handle http errors
 console.log('response:', response.statusCode)
 if (response.statusCode < 200 || response.statusCode > 299) {
-  if (response.statusCode === 404) {
-// ignore this, probably a renamed file.
+  if (response.statusCode === 404  || response.statusCode === 502) {
+// ignore this, probably a renamed file,or .so that can't blame 
 return resolve('')
   }
   reject(new Error('Failed to load page, status code: ' + 
response.statusCode + ', '

[3/7] incubator-weex git commit: * [android] add getCacheDir method for native call, kernerl use it to init crash Handler

2017-09-06 Thread misakuo

 * [android] add getCacheDir method for native call, kernerl use it to init 
crash Handler


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f9584d1b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f9584d1b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f9584d1b

Branch: refs/heads/0.16-dev
Commit: f9584d1b86bc9d31edbb3f338f4facd0c5a784e7
Parents: 1a6f447
Author: yuhun-alibaba <tomcat...@gmail.com>
Authored: Thu Aug 31 15:55:16 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Wed Sep 6 17:51:11 2017 +0800

--
 .../main/java/com/taobao/weex/WXEnvironment.java| 16 
 .../com/taobao/weex/bridge/WXBridgeManager.java |  9 +
 .../main/java/com/taobao/weex/bridge/WXParams.java  |  9 +
 .../main/java/com/taobao/weex/common/WXConfig.java  |  1 +
 4 files changed, 35 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f9584d1b/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java 
b/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
index fecfc11..d1e0779 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
@@ -102,6 +102,7 @@ public class WXEnvironment {
 Map<String, String> configs = new HashMap<>();
 configs.put(WXConfig.os, OS);
 configs.put(WXConfig.appVersion, getAppVersionName());
+configs.put(WXConfig.cacheDir, getAppCacheFile());
 configs.put(WXConfig.devId, DEV_Id);
 configs.put(WXConfig.sysVersion, SYS_VERSION);
 configs.put(WXConfig.sysModel, SYS_MODEL);
@@ -137,6 +138,21 @@ public class WXEnvironment {
 return versionName;
   }
 
+  /**
+   *
+   * @return string cache file
+   */
+  private static String getAppCacheFile() {
+String cache = "";
+try {
+  cache = sApplication.getApplicationContext().getCacheDir().getPath();
+} catch (Exception e) {
+  WXLogUtils.e("WXEnvironment getAppCacheFile Exception: ", e);
+}
+return cache;
+  }
+
+
   public static Map<String, String> getCustomOptions() {
 return options;
   }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f9584d1b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java 
b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
index e4f846b..f6c3144 100644
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
@@ -938,6 +938,14 @@ public class WXBridgeManager implements 
Callback,BactchExecutor {
 if (instance != null) {
   url = instance.getBundleUrl();
 }
+try {
+if (WXEnvironment.getApplication() != null) {
+crashFile = 
WXEnvironment.getApplication().getApplicationContext().getCacheDir().getPath() 
+ crashFile;
+// Log.e("jsengine", "callReportCrashReloadPage crashFile:" + 
crashFile);
+}
+} catch (Throwable e) {
+e.printStackTrace();
+}
 callReportCrash(crashFile, instanceId, url);
 if (reInitCount > CRASHREINIT) {
   return IWXBridge.INSTANCE_RENDERING_ERROR;
@@ -1604,6 +1612,7 @@ public class WXBridgeManager implements 
Callback,BactchExecutor {
 Map<String, String> config = WXEnvironment.getConfig();
 WXParams wxParams = new WXParams();
 wxParams.setPlatform(config.get(WXConfig.os));
+wxParams.setCacheDir(config.get(WXConfig.cacheDir));
 wxParams.setOsVersion(config.get(WXConfig.sysVersion));
 wxParams.setAppVersion(config.get(WXConfig.appVersion));
 wxParams.setWeexVersion(config.get(WXConfig.weexVersion));

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f9584d1b/android/sdk/src/main/java/com/taobao/weex/bridge/WXParams.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXParams.java 
b/android/sdk/src/main/java/com/taobao/weex/bridge/WXParams.java
index f3de40e..6f964ce 100644
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXParams.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXParams.java
@@ -33,6 +33,7 @@ public class WXParams {
   private String shouldInfoCollect;
   private String logLevel;
   private String needInitV8;
+  private String

[1/7] incubator-weex git commit: * [android] correct the format of the date returned by pickDate method.

2017-09-06 Thread misakuo

Repository: incubator-weex
Updated Branches:
  refs/heads/0.16-dev a944f3ede -> ff13f51d5


* [android] correct the format of the date returned by pickDate method.


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/1a6f4475
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1a6f4475
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1a6f4475

Branch: refs/heads/0.16-dev
Commit: 1a6f4475f9eb44e1e5efe60420375778386842bf
Parents: be18b19
Author: coreycao 
Authored: Wed Sep 6 17:38:24 2017 +0800
Committer: coreycao 
Committed: Wed Sep 6 17:38:24 2017 +0800

--
 .../main/java/com/taobao/weex/appfram/pickers/DatePickerImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1a6f4475/android/sdk/src/main/java/com/taobao/weex/appfram/pickers/DatePickerImpl.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/appfram/pickers/DatePickerImpl.java 
b/android/sdk/src/main/java/com/taobao/weex/appfram/pickers/DatePickerImpl.java
index c6ccac3..f6950bf 100644
--- 
a/android/sdk/src/main/java/com/taobao/weex/appfram/pickers/DatePickerImpl.java
+++ 
b/android/sdk/src/main/java/com/taobao/weex/appfram/pickers/DatePickerImpl.java
@@ -58,7 +58,8 @@ public class DatePickerImpl {
 public void onDateSet(DatePicker view, int year, int 
monthOfYear, int dayOfMonth) {
 int realMonth = monthOfYear + 1;
 String realMonthString = realMonth < 10 ? "0" + 
realMonth : String.valueOf(realMonth);
-String result = year + "-" + realMonthString + "-" + 
dayOfMonth;
+String realDayString = dayOfMonth < 10 ? "0" + 
dayOfMonth : String.valueOf(dayOfMonth);
+String result = year + "-" + realMonthString + "-" + 
realDayString;
 listener.onPick(true, result);
 }
 },

[6/7] incubator-weex git commit: * [android] update so, support gcanvas

2017-09-06 Thread misakuo

 * [android] update so, support gcanvas


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/af1d7311
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/af1d7311
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/af1d7311

Branch: refs/heads/0.16-dev
Commit: af1d73112494d6b8c58514904c95b8ddd2a24b7e
Parents: 669c84b
Author: yuhun-alibaba <tomcat...@gmail.com>
Authored: Tue Sep 5 20:07:55 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Wed Sep 6 17:51:14 2017 +0800

--
 android/sdk/libs/armeabi/libweexjsc.so | Bin 325660 -> 325660 bytes
 android/sdk/libs/armeabi/libweexjss.so | Bin 6754012 -> 6754012 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/af1d7311/android/sdk/libs/armeabi/libweexjsc.so
--
diff --git a/android/sdk/libs/armeabi/libweexjsc.so 
b/android/sdk/libs/armeabi/libweexjsc.so
index 3368735..d3fb7e7 100755
Binary files a/android/sdk/libs/armeabi/libweexjsc.so and 
b/android/sdk/libs/armeabi/libweexjsc.so differ

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/af1d7311/android/sdk/libs/armeabi/libweexjss.so
--
diff --git a/android/sdk/libs/armeabi/libweexjss.so 
b/android/sdk/libs/armeabi/libweexjss.so
index df1e4d8..c0236b6 100755
Binary files a/android/sdk/libs/armeabi/libweexjss.so and 
b/android/sdk/libs/armeabi/libweexjss.so differ

[7/7] incubator-weex git commit: Merge branch '0.16-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into apache-0.16-dev

2017-09-06 Thread misakuo

Merge branch '0.16-dev' of 
https://git-wip-us.apache.org/repos/asf/incubator-weex into apache-0.16-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/ff13f51d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ff13f51d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ff13f51d

Branch: refs/heads/0.16-dev
Commit: ff13f51d5d591e0c587dcd94209cdf0c54183864
Parents: af1d731 a944f3e
Author: misakuo <misa...@apache.org>
Authored: Wed Sep 6 17:51:39 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Wed Sep 6 17:51:39 2017 +0800

--

--

[5/7] incubator-weex git commit: * [android] update libweexjsc.so, jsc will run on a process alone

2017-09-06 Thread misakuo

 * [android] update libweexjsc.so, jsc will run on a process alone


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/d4eff8eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d4eff8eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d4eff8eb

Branch: refs/heads/0.16-dev
Commit: d4eff8eb1cd3f59b73cc3e2d57a8d9f185e8c29b
Parents: 6e09b82
Author: yuhun-alibaba <tomcat...@gmail.com>
Authored: Fri Sep 1 12:10:45 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Wed Sep 6 17:51:13 2017 +0800

--
 android/sdk/libs/armeabi/libweexjsb.so | Bin 0 -> 22556 bytes
 android/sdk/libs/armeabi/libweexjsc.so | Bin 7570392 -> 325660 bytes
 android/sdk/libs/armeabi/libweexjss.so | Bin 0 -> 6754012 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d4eff8eb/android/sdk/libs/armeabi/libweexjsb.so
--
diff --git a/android/sdk/libs/armeabi/libweexjsb.so 
b/android/sdk/libs/armeabi/libweexjsb.so
new file mode 100755
index 000..c46e857
Binary files /dev/null and b/android/sdk/libs/armeabi/libweexjsb.so differ

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d4eff8eb/android/sdk/libs/armeabi/libweexjsc.so
--
diff --git a/android/sdk/libs/armeabi/libweexjsc.so 
b/android/sdk/libs/armeabi/libweexjsc.so
index a365bed..3368735 100755
Binary files a/android/sdk/libs/armeabi/libweexjsc.so and 
b/android/sdk/libs/armeabi/libweexjsc.so differ

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d4eff8eb/android/sdk/libs/armeabi/libweexjss.so
--
diff --git a/android/sdk/libs/armeabi/libweexjss.so 
b/android/sdk/libs/armeabi/libweexjss.so
new file mode 100755
index 000..df1e4d8
Binary files /dev/null and b/android/sdk/libs/armeabi/libweexjss.so differ

[incubator-weex] Git Push Summary

2017-09-06 Thread misakuo

Repository: incubator-weex
Updated Branches:
  refs/heads/apache-0.16-dev [deleted] ff13f51d5

[GitHub] incubator-weex issue #687: * [android] correct the format of the date return...

2017-09-06 Thread misakuo

Github user misakuo commented on the issue:

https://github.com/apache/incubator-weex/pull/687
  
I think seperated  is better : )
Just feel free to send your PRs


---

[1/7] incubator-weex git commit: * [android] correct the format of the date returned by pickDate method.

2017-09-06 Thread misakuo

Repository: incubator-weex
Updated Branches:
  refs/heads/apache-0.16-dev [created] ff13f51d5


* [android] correct the format of the date returned by pickDate method.


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/1a6f4475
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1a6f4475
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1a6f4475

Branch: refs/heads/apache-0.16-dev
Commit: 1a6f4475f9eb44e1e5efe60420375778386842bf
Parents: be18b19
Author: coreycao 
Authored: Wed Sep 6 17:38:24 2017 +0800
Committer: coreycao 
Committed: Wed Sep 6 17:38:24 2017 +0800

--
 .../main/java/com/taobao/weex/appfram/pickers/DatePickerImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1a6f4475/android/sdk/src/main/java/com/taobao/weex/appfram/pickers/DatePickerImpl.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/appfram/pickers/DatePickerImpl.java 
b/android/sdk/src/main/java/com/taobao/weex/appfram/pickers/DatePickerImpl.java
index c6ccac3..f6950bf 100644
--- 
a/android/sdk/src/main/java/com/taobao/weex/appfram/pickers/DatePickerImpl.java
+++ 
b/android/sdk/src/main/java/com/taobao/weex/appfram/pickers/DatePickerImpl.java
@@ -58,7 +58,8 @@ public class DatePickerImpl {
 public void onDateSet(DatePicker view, int year, int 
monthOfYear, int dayOfMonth) {
 int realMonth = monthOfYear + 1;
 String realMonthString = realMonth < 10 ? "0" + 
realMonth : String.valueOf(realMonth);
-String result = year + "-" + realMonthString + "-" + 
dayOfMonth;
+String realDayString = dayOfMonth < 10 ? "0" + 
dayOfMonth : String.valueOf(dayOfMonth);
+String result = year + "-" + realMonthString + "-" + 
realDayString;
 listener.onPick(true, result);
 }
 },

[7/7] incubator-weex git commit: Merge branch '0.16-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into apache-0.16-dev

2017-09-06 Thread misakuo

Merge branch '0.16-dev' of 
https://git-wip-us.apache.org/repos/asf/incubator-weex into apache-0.16-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/ff13f51d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ff13f51d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ff13f51d

Branch: refs/heads/apache-0.16-dev
Commit: ff13f51d5d591e0c587dcd94209cdf0c54183864
Parents: af1d731 a944f3e
Author: misakuo <misa...@apache.org>
Authored: Wed Sep 6 17:51:39 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Wed Sep 6 17:51:39 2017 +0800

--

--

[3/7] incubator-weex git commit: * [android] add getCacheDir method for native call, kernerl use it to init crash Handler

2017-09-06 Thread misakuo

 * [android] add getCacheDir method for native call, kernerl use it to init 
crash Handler


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f9584d1b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f9584d1b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f9584d1b

Branch: refs/heads/apache-0.16-dev
Commit: f9584d1b86bc9d31edbb3f338f4facd0c5a784e7
Parents: 1a6f447
Author: yuhun-alibaba <tomcat...@gmail.com>
Authored: Thu Aug 31 15:55:16 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Wed Sep 6 17:51:11 2017 +0800

--
 .../main/java/com/taobao/weex/WXEnvironment.java| 16 
 .../com/taobao/weex/bridge/WXBridgeManager.java |  9 +
 .../main/java/com/taobao/weex/bridge/WXParams.java  |  9 +
 .../main/java/com/taobao/weex/common/WXConfig.java  |  1 +
 4 files changed, 35 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f9584d1b/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java 
b/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
index fecfc11..d1e0779 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
@@ -102,6 +102,7 @@ public class WXEnvironment {
 Map<String, String> configs = new HashMap<>();
 configs.put(WXConfig.os, OS);
 configs.put(WXConfig.appVersion, getAppVersionName());
+configs.put(WXConfig.cacheDir, getAppCacheFile());
 configs.put(WXConfig.devId, DEV_Id);
 configs.put(WXConfig.sysVersion, SYS_VERSION);
 configs.put(WXConfig.sysModel, SYS_MODEL);
@@ -137,6 +138,21 @@ public class WXEnvironment {
 return versionName;
   }
 
+  /**
+   *
+   * @return string cache file
+   */
+  private static String getAppCacheFile() {
+String cache = "";
+try {
+  cache = sApplication.getApplicationContext().getCacheDir().getPath();
+} catch (Exception e) {
+  WXLogUtils.e("WXEnvironment getAppCacheFile Exception: ", e);
+}
+return cache;
+  }
+
+
   public static Map<String, String> getCustomOptions() {
 return options;
   }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f9584d1b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java 
b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
index e4f846b..f6c3144 100644
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
@@ -938,6 +938,14 @@ public class WXBridgeManager implements 
Callback,BactchExecutor {
 if (instance != null) {
   url = instance.getBundleUrl();
 }
+try {
+if (WXEnvironment.getApplication() != null) {
+crashFile = 
WXEnvironment.getApplication().getApplicationContext().getCacheDir().getPath() 
+ crashFile;
+// Log.e("jsengine", "callReportCrashReloadPage crashFile:" + 
crashFile);
+}
+} catch (Throwable e) {
+e.printStackTrace();
+}
 callReportCrash(crashFile, instanceId, url);
 if (reInitCount > CRASHREINIT) {
   return IWXBridge.INSTANCE_RENDERING_ERROR;
@@ -1604,6 +1612,7 @@ public class WXBridgeManager implements 
Callback,BactchExecutor {
 Map<String, String> config = WXEnvironment.getConfig();
 WXParams wxParams = new WXParams();
 wxParams.setPlatform(config.get(WXConfig.os));
+wxParams.setCacheDir(config.get(WXConfig.cacheDir));
 wxParams.setOsVersion(config.get(WXConfig.sysVersion));
 wxParams.setAppVersion(config.get(WXConfig.appVersion));
 wxParams.setWeexVersion(config.get(WXConfig.weexVersion));

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f9584d1b/android/sdk/src/main/java/com/taobao/weex/bridge/WXParams.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXParams.java 
b/android/sdk/src/main/java/com/taobao/weex/bridge/WXParams.java
index f3de40e..6f964ce 100644
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXParams.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXParams.java
@@ -33,6 +33,7 @@ public class WXParams {
   private String shouldInfoCollect;
   private String logLevel;
   private String needInitV8;
+  priva

[5/7] incubator-weex git commit: * [android] update libweexjsc.so, jsc will run on a process alone

2017-09-06 Thread misakuo

 * [android] update libweexjsc.so, jsc will run on a process alone


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/d4eff8eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d4eff8eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d4eff8eb

Branch: refs/heads/apache-0.16-dev
Commit: d4eff8eb1cd3f59b73cc3e2d57a8d9f185e8c29b
Parents: 6e09b82
Author: yuhun-alibaba <tomcat...@gmail.com>
Authored: Fri Sep 1 12:10:45 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Wed Sep 6 17:51:13 2017 +0800

--
 android/sdk/libs/armeabi/libweexjsb.so | Bin 0 -> 22556 bytes
 android/sdk/libs/armeabi/libweexjsc.so | Bin 7570392 -> 325660 bytes
 android/sdk/libs/armeabi/libweexjss.so | Bin 0 -> 6754012 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d4eff8eb/android/sdk/libs/armeabi/libweexjsb.so
--
diff --git a/android/sdk/libs/armeabi/libweexjsb.so 
b/android/sdk/libs/armeabi/libweexjsb.so
new file mode 100755
index 000..c46e857
Binary files /dev/null and b/android/sdk/libs/armeabi/libweexjsb.so differ

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d4eff8eb/android/sdk/libs/armeabi/libweexjsc.so
--
diff --git a/android/sdk/libs/armeabi/libweexjsc.so 
b/android/sdk/libs/armeabi/libweexjsc.so
index a365bed..3368735 100755
Binary files a/android/sdk/libs/armeabi/libweexjsc.so and 
b/android/sdk/libs/armeabi/libweexjsc.so differ

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d4eff8eb/android/sdk/libs/armeabi/libweexjss.so
--
diff --git a/android/sdk/libs/armeabi/libweexjss.so 
b/android/sdk/libs/armeabi/libweexjss.so
new file mode 100755
index 000..df1e4d8
Binary files /dev/null and b/android/sdk/libs/armeabi/libweexjss.so differ

[4/7] incubator-weex git commit: * [android] change for android so check fail

2017-09-06 Thread misakuo

* [android] change for android so check fail


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/669c84b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/669c84b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/669c84b1

Branch: refs/heads/apache-0.16-dev
Commit: 669c84b1ac61ef05d652e859e62ecdcb2e688c71
Parents: d4eff8e
Author: yuhun-alibaba <tomcat...@gmail.com>
Authored: Fri Sep 1 15:46:59 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Wed Sep 6 17:51:13 2017 +0800

--
 dangerfile.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/669c84b1/dangerfile.js
--
diff --git a/dangerfile.js b/dangerfile.js
index 50e28ed..05db91d 100644
--- a/dangerfile.js
+++ b/dangerfile.js
@@ -344,8 +344,8 @@ function getContent(url) {
 // handle http errors
 console.log('response:', response.statusCode)
 if (response.statusCode < 200 || response.statusCode > 299) {
-  if (response.statusCode === 404) {
-// ignore this, probably a renamed file.
+  if (response.statusCode === 404  || response.statusCode === 502) {
+// ignore this, probably a renamed file,or .so that can't blame 
 return resolve('')
   }
   reject(new Error('Failed to load page, status code: ' + 
response.statusCode + ', '

[2/7] incubator-weex git commit: * [android] when WxInstance report createInstance Exception after jsc thread crash, will try reload again

2017-09-06 Thread misakuo

 * [android] when WxInstance report createInstance Exception after jsc thread 
crash, will try reload again


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/6e09b827
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/6e09b827
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/6e09b827

Branch: refs/heads/apache-0.16-dev
Commit: 6e09b827f7c4ce47a69099cc4b65438a2bdcedf2
Parents: f9584d1
Author: yuhun-alibaba <tomcat...@gmail.com>
Authored: Thu Aug 31 20:44:39 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Wed Sep 6 17:51:11 2017 +0800

--
 .../src/main/java/com/taobao/weex/WXSDKInstance.java  |  8 
 .../java/com/taobao/weex/bridge/WXBridgeManager.java  | 14 ++
 2 files changed, 22 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6e09b827/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java 
b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
index 9e26736..7e0da86 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
@@ -117,6 +117,7 @@ public class WXSDKInstance implements 
IWXActivityStateListener,DomContext, View.
   private boolean trackComponent;
   private boolean enableLayerType = true;
   private boolean mNeedValidate = false;
+  private boolean mNeedReLoad = false;
   private static volatile int mViewPortWidth = 750;
   private int mInstanceViewPortWidth = 750;
 
@@ -203,6 +204,13 @@ public class WXSDKInstance implements 
IWXActivityStateListener,DomContext, View.
 return mNeedValidate;
   }
 
+  public boolean isNeedReLoad() {
+return mNeedReLoad;
+  }
+
+  public void setNeedLoad(boolean load) {
+mNeedReLoad = load;
+  }
   /*
   *  Warning: use setInstanceViewPortWidth instead.
   *  store custom ViewPort Width

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6e09b827/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java 
b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
index f6c3144..89b2d3b 100644
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
@@ -1804,6 +1804,20 @@ public class WXBridgeManager implements 
Callback,BactchExecutor {
 if (instanceId != null && (instance = 
WXSDKManager.getInstance().getSDKInstance(instanceId)) != null) {
   instance.onJSException(WXErrorCode.WX_ERR_JS_EXECUTE.getErrorCode(), 
function, exception);
 
+  if (METHOD_CREATE_INSTANCE.equals(function)) {
+try {
+  if (reInitCount > 1 && !instance.isNeedReLoad()) {
+// JSONObject domObject = JSON.parseObject(tasks);
+WXDomModule domModule = getDomModule(instanceId);
+Action action = Actions.getReloadPage(instanceId);
+domModule.postAction((DOMAction)action, true);
+instance.setNeedLoad(true);
+return;
+  }
+} catch (Exception e) {
+  e.printStackTrace();
+}
+  }
   String err = "function:" + function + "#exception:" + exception;
   commitJSBridgeAlarmMonitor(instanceId, WXErrorCode.WX_ERR_JS_EXECUTE, 
err);

[6/7] incubator-weex git commit: * [android] update so, support gcanvas

2017-09-06 Thread misakuo

 * [android] update so, support gcanvas


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/af1d7311
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/af1d7311
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/af1d7311

Branch: refs/heads/apache-0.16-dev
Commit: af1d73112494d6b8c58514904c95b8ddd2a24b7e
Parents: 669c84b
Author: yuhun-alibaba <tomcat...@gmail.com>
Authored: Tue Sep 5 20:07:55 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Wed Sep 6 17:51:14 2017 +0800

--
 android/sdk/libs/armeabi/libweexjsc.so | Bin 325660 -> 325660 bytes
 android/sdk/libs/armeabi/libweexjss.so | Bin 6754012 -> 6754012 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/af1d7311/android/sdk/libs/armeabi/libweexjsc.so
--
diff --git a/android/sdk/libs/armeabi/libweexjsc.so 
b/android/sdk/libs/armeabi/libweexjsc.so
index 3368735..d3fb7e7 100755
Binary files a/android/sdk/libs/armeabi/libweexjsc.so and 
b/android/sdk/libs/armeabi/libweexjsc.so differ

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/af1d7311/android/sdk/libs/armeabi/libweexjss.so
--
diff --git a/android/sdk/libs/armeabi/libweexjss.so 
b/android/sdk/libs/armeabi/libweexjss.so
index df1e4d8..c0236b6 100755
Binary files a/android/sdk/libs/armeabi/libweexjss.so and 
b/android/sdk/libs/armeabi/libweexjss.so differ

[GitHub] incubator-weex pull request #684: * [android] correct the format of the date...

2017-09-06 Thread misakuo

Github user misakuo commented on a diff in the pull request:

https://github.com/apache/incubator-weex/pull/684#discussion_r137216945
  
--- Diff: ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m ---
@@ -82,6 +82,7 @@ - (void)viewDidLoad
 _webview = (WXWebView *)self.view;
 _webview.delegate = self;
 _webview.allowsInlineMediaPlayback = YES;
+_webview.scalesPageToFit = YES;
--- End diff --

Sure, you can close this and create new PR based on 0.16-dev


---

[GitHub] incubator-weex pull request #684: * [android] correct the format of the date...

2017-09-06 Thread misakuo

Github user misakuo commented on a diff in the pull request:

https://github.com/apache/incubator-weex/pull/684#discussion_r137215833
  
--- Diff: ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m ---
@@ -82,6 +82,7 @@ - (void)viewDidLoad
 _webview = (WXWebView *)self.view;
 _webview.delegate = self;
 _webview.allowsInlineMediaPlayback = YES;
+_webview.scalesPageToFit = YES;
--- End diff --

maybe you can revert it simply


---

[GitHub] incubator-weex pull request #684: * [android] correct the format of the date...

2017-09-06 Thread misakuo

Github user misakuo commented on a diff in the pull request:

https://github.com/apache/incubator-weex/pull/684#discussion_r137211104
  
--- Diff: ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m ---
@@ -82,6 +82,7 @@ - (void)viewDidLoad
 _webview = (WXWebView *)self.view;
 _webview.delegate = self;
 _webview.allowsInlineMediaPlayback = YES;
+_webview.scalesPageToFit = YES;
--- End diff --

what is this?


---

[GitHub] incubator-weex pull request #685: + [android] box-shadow style support for a...

2017-09-06 Thread misakuo

GitHub user misakuo opened a pull request:

https://github.com/apache/incubator-weex/pull/685

+ [android] box-shadow style support for android 4.3 and higher

Testcase: http://dotwe.org/weex/b75ac9ec5938c6ffb5f43a015685bdf4

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/misakuo/incubator-weex 
android-feature-boxshadow

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-weex/pull/685.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #685


commit 833be26af709d087672fcb9f1c86fd4398e98bd4
Author: misakuo <misa...@apache.org>
Date:   2017-09-06T07:35:12Z

+ [android] box-shadow style support for android 4.3 and higher




---

[GitHub] incubator-weex issue #684: * [android] correct the format of the date return...

2017-09-06 Thread misakuo

Github user misakuo commented on the issue:

https://github.com/apache/incubator-weex/pull/684
  
Thanks for your contribution, and please send this pr to branch `0.16-dev` 
:)


---

incubator-weex git commit: * [android] fix the memory leak caused by BroadcastReceiver

2017-08-28 Thread misakuo

Repository: incubator-weex
Updated Branches:
  refs/heads/0.16-dev 9684dcd75 -> 87c06c5f1


* [android] fix the memory leak caused by BroadcastReceiver


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/87c06c5f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/87c06c5f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/87c06c5f

Branch: refs/heads/0.16-dev
Commit: 87c06c5f1fd208745c53f725ede50bd573618c89
Parents: 9684dcd
Author: misakuo <misa...@apache.org>
Authored: Tue Aug 29 13:44:37 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Tue Aug 29 13:44:37 2017 +0800

--
 .../com/taobao/weex/ui/component/WXText.java| 25 +---
 .../taobao/weex/ui/component/WXVContainer.java  |  6 +
 2 files changed, 23 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/87c06c5f/android/sdk/src/main/java/com/taobao/weex/ui/component/WXText.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXText.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXText.java
index 59e81fb..aad2bf4 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXText.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXText.java
@@ -27,6 +27,7 @@ import android.support.v4.content.LocalBroadcastManager;
 import android.text.Layout;
 import android.view.ViewGroup;
 
+import com.taobao.weex.WXEnvironment;
 import com.taobao.weex.WXSDKInstance;
 import com.taobao.weex.annotation.Component;
 import com.taobao.weex.common.Constants;
@@ -162,16 +163,23 @@ public class WXText extends WXComponent {
   @Override
   public void destroy() {
 super.destroy();
-if (getContext() != null && mTypefaceObserver != null) {
-  
LocalBroadcastManager.getInstance(getContext()).unregisterReceiver(mTypefaceObserver);
+if (WXEnvironment.getApplication() != null && mTypefaceObserver != null) {
+  WXLogUtils.d("WXText", "Unregister the typeface observer");
+  
LocalBroadcastManager.getInstance(WXEnvironment.getApplication()).unregisterReceiver(mTypefaceObserver);
+  mTypefaceObserver = null;
 }
   }
 
   private void registerTypefaceObserver(String desiredFontFamily) {
-if (getContext() == null) {
-  WXLogUtils.w("WXText", "Content is null on register typeface observer");
+if (WXEnvironment.getApplication() == null) {
+  WXLogUtils.w("WXText", "ApplicationContent is null on register typeface 
observer");
+  return;
 }
 mFontFamily = desiredFontFamily;
+if (mTypefaceObserver != null) {
+  return;
+}
+
 mTypefaceObserver = new BroadcastReceiver() {
   @Override
   public void onReceive(Context context, Intent intent) {
@@ -181,20 +189,21 @@ public class WXText extends WXComponent {
 }
 
 FontDO fontDO = TypefaceUtil.getFontDO(fontFamily);
-if (fontDO != null && fontDO.getTypeface() != null) {
-  Layout layout = getHostView().getTextLayout();
+if (fontDO != null && fontDO.getTypeface() != null && getHostView() != 
null) {
+  WXTextView hostView = getHostView();
+  Layout layout = hostView.getTextLayout();
   if (layout != null) {
 layout.getPaint().setTypeface(fontDO.getTypeface());
 WXLogUtils.d("WXText", "Apply font family " + fontFamily + " to 
paint");
   } else {
 WXLogUtils.w("WXText", "Layout not created");
   }
-  getHostView().invalidate();
+  hostView.invalidate();
 }
 WXLogUtils.d("WXText", "Font family " + fontFamily + " is available");
   }
 };
 
-
LocalBroadcastManager.getInstance(getContext()).registerReceiver(mTypefaceObserver,
 new IntentFilter(TypefaceUtil.ACTION_TYPE_FACE_AVAILABLE));
+
LocalBroadcastManager.getInstance(WXEnvironment.getApplication()).registerReceiver(mTypefaceObserver,
 new IntentFilter(TypefaceUtil.ACTION_TYPE_FACE_AVAILABLE));
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/87c06c5f/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
index 871b18a..f769c2a 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
+++ b/android/sdk/src/main/

[GitHub] incubator-weex pull request #662: * [android] fix the memory leak caused by ...

2017-08-28 Thread misakuo

GitHub user misakuo opened a pull request:

https://github.com/apache/incubator-weex/pull/662

* [android] fix the memory leak caused by BroadcastReceiver



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/misakuo/incubator-weex 
android-bugfix-text-memory-leaked

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-weex/pull/662.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #662


commit 87c06c5f1fd208745c53f725ede50bd573618c89
Author: misakuo <misa...@apache.org>
Date:   2017-08-29T05:44:37Z

* [android] fix the memory leak caused by BroadcastReceiver




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

incubator-weex git commit: * [android] fix the IndexOutOfBoundsException

2017-08-28 Thread misakuo

Repository: incubator-weex
Updated Branches:
  refs/heads/0.16-dev 68a3fb2e1 -> 88ae8eb96


* [android] fix the IndexOutOfBoundsException


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/88ae8eb9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/88ae8eb9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/88ae8eb9

Branch: refs/heads/0.16-dev
Commit: 88ae8eb9648a4d1217048aaa6d9419dd93bff24f
Parents: 68a3fb2
Author: misakuo <misa...@apache.org>
Authored: Tue Aug 29 13:08:58 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Tue Aug 29 13:08:58 2017 +0800

--
 .../ui/component/list/BasicListComponent.java   | 21 +++-
 1 file changed, 7 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/88ae8eb9/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
index 7559991..66eb75b 100644
--- 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
+++ 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
@@ -1349,15 +1349,11 @@ public abstract class BasicListComponent

[GitHub] incubator-weex pull request #660: * [android] fix the IndexOutOfBoundsExcept...

2017-08-28 Thread misakuo

GitHub user misakuo opened a pull request:

https://github.com/apache/incubator-weex/pull/660

* [android] fix the IndexOutOfBoundsException



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/misakuo/incubator-weex 
android-bugfix-list-onscroll

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-weex/pull/660.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #660


commit 88ae8eb9648a4d1217048aaa6d9419dd93bff24f
Author: misakuo <misa...@apache.org>
Date:   2017-08-29T05:08:58Z

* [android] fix the IndexOutOfBoundsException




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

incubator-weex git commit: * [android] fix NPE on findFirstVisibleItemPosition

2017-08-28 Thread misakuo

Repository: incubator-weex
Updated Branches:
  refs/heads/0.16-dev 05c3fc337 -> 68a3fb2e1


* [android] fix NPE on findFirstVisibleItemPosition


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/68a3fb2e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/68a3fb2e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/68a3fb2e

Branch: refs/heads/0.16-dev
Commit: 68a3fb2e1ae2e7f7e2aab1a8d2c60a0ae6693e74
Parents: 05c3fc3
Author: misakuo <misa...@apache.org>
Authored: Mon Aug 28 21:58:42 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Mon Aug 28 21:58:42 2017 +0800

--
 .../ui/component/list/BasicListComponent.java   | 29 ++--
 1 file changed, 27 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/68a3fb2e/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
index bd65c1f..7559991 100644
--- 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
+++ 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
@@ -1350,6 +1350,19 @@ public abstract class BasicListComponent

[GitHub] incubator-weex pull request #659: * [android] fix NPE on findFirstVisibleIte...

2017-08-28 Thread misakuo

GitHub user misakuo opened a pull request:

https://github.com/apache/incubator-weex/pull/659

* [android] fix NPE on findFirstVisibleItemPosition

as the title, no testcase needed

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/misakuo/incubator-weex 
android-bugfix-list-onscroll

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-weex/pull/659.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #659


commit 68a3fb2e1ae2e7f7e2aab1a8d2c60a0ae6693e74
Author: misakuo <misa...@apache.org>
Date:   2017-08-28T13:58:42Z

* [android] fix NPE on findFirstVisibleItemPosition




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

incubator-weex git commit: * [android] fix NPE on empty param

2017-08-24 Thread misakuo

Repository: incubator-weex
Updated Branches:
  refs/heads/0.16-dev 1584c8816 -> 83eb2746d


* [android] fix NPE on empty param


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/83eb2746
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/83eb2746
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/83eb2746

Branch: refs/heads/0.16-dev
Commit: 83eb2746de2330e942f70727deea83dfa51edf9a
Parents: 1584c88
Author: misakuo <misa...@apache.org>
Authored: Thu Aug 24 19:09:45 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Thu Aug 24 19:09:45 2017 +0800

--
 .../sdk/src/main/java/com/taobao/weex/ui/component/WXText.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/83eb2746/android/sdk/src/main/java/com/taobao/weex/ui/component/WXText.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXText.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXText.java
index 2d78563..59e81fb 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXText.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXText.java
@@ -117,7 +117,9 @@ public class WXText extends WXComponent {
   case Constants.Name.VALUE:
 return true;
   case Constants.Name.FONT_FAMILY:
-registerTypefaceObserver(param.toString());
+if (param != null) {
+  registerTypefaceObserver(param.toString());
+}
 return true;
   default:
 return super.setProperty(key, param);

[GitHub] incubator-weex pull request #647: * [android] fix NPE on empty param

2017-08-24 Thread misakuo

GitHub user misakuo opened a pull request:

https://github.com/apache/incubator-weex/pull/647

* [android] fix NPE on empty param



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/misakuo/incubator-weex 
android-bugfix-font-family-npe

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-weex/pull/647.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #647


commit 83eb2746de2330e942f70727deea83dfa51edf9a
Author: misakuo <misa...@apache.org>
Date:   2017-08-24T11:09:45Z

* [android] fix NPE on empty param




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[2/2] incubator-weex git commit: Merge remote-tracking branch 'upstream/pr634' into apache-0.16-dev

2017-08-23 Thread misakuo

Merge remote-tracking branch 'upstream/pr634' into apache-0.16-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/61abcdc3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/61abcdc3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/61abcdc3

Branch: refs/heads/0.16-dev
Commit: 61abcdc375b2b386880e29ceaea1f4c866d18d0f
Parents: 365332e 837f033
Author: misakuo <misa...@apache.org>
Authored: Thu Aug 24 10:28:13 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Thu Aug 24 10:28:13 2017 +0800

--
 .../main/java/com/taobao/weex/WXSDKInstance.java   | 17 +++--
 1 file changed, 15 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/61abcdc3/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
--

[2/2] incubator-weex git commit: Merge remote-tracking branch 'upstream/pr631' into apache-0.16-dev

2017-08-23 Thread misakuo

Merge remote-tracking branch 'upstream/pr631' into apache-0.16-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/365332e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/365332e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/365332e9

Branch: refs/heads/0.16-dev
Commit: 365332e9728f17703ea0a0f1a59a9fe4b16fd42a
Parents: bade862 c05cfcb
Author: misakuo <misa...@apache.org>
Authored: Thu Aug 24 10:27:42 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Thu Aug 24 10:27:42 2017 +0800

--
 .../main/java/com/taobao/weex/dom/action/TraceableAction.java   | 1 +
 .../com/taobao/weex/ui/component/list/BasicListComponent.java   | 5 +
 2 files changed, 6 insertions(+)
--

[1/2] incubator-weex git commit: * [android] show alert in debug mode when pageName not be set

2017-08-23 Thread misakuo

Repository: incubator-weex
Updated Branches:
  refs/heads/0.16-dev 365332e97 -> 61abcdc37


* [android] show alert in debug mode when pageName not be set


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/837f033c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/837f033c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/837f033c

Branch: refs/heads/0.16-dev
Commit: 837f033c6898f484efa77bb9c4271e90a5868c7c
Parents: 41ce0f6
Author: misakuo <misa...@apache.org>
Authored: Wed Aug 23 11:46:45 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Wed Aug 23 11:46:45 2017 +0800

--
 .../main/java/com/taobao/weex/WXSDKInstance.java   | 17 +++--
 1 file changed, 15 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/837f033c/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java 
b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
index 1c2877a..de68c64 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
@@ -18,6 +18,7 @@
  */
 package com.taobao.weex;
 
+import android.app.AlertDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
@@ -398,8 +399,18 @@ public class WXSDKInstance implements 
IWXActivityStateListener,DomContext, View.
*/
   public void render(String pageName, String template, Map<String, Object> 
options, String jsonInitData, WXRenderStrategy flag) {
 if(WXEnvironment.isApkDebugable() && 
WXPerformance.DEFAULT.equals(pageName)){
-   WXLogUtils.e("Please set your pageName or your js bundle url !!!");
-   return;
+  WXLogUtils.e("WXSDKInstance", "Please set your pageName or your js 
bundle url !!!");
+
+  if (getUIContext() != null) {
+new AlertDialog.Builder(getUIContext())
+.setTitle("Error: Missing pageName")
+.setMessage("We highly recommend you to set pageName. Call" +
+"\nWXSDKInstance#render(String pageName, String template, 
Map<String, Object> options, String jsonInitData, WXRenderStrategy flag)\n" +
+"to fix it.")
+.show();
+  }
+
+  return;
 }
 renderInternal(pageName,template,options,jsonInitData,flag);
   }
@@ -423,6 +434,8 @@ public class WXSDKInstance implements 
IWXActivityStateListener,DomContext, View.
   return;
 }
 
+WXLogUtils.d("WXSDKInstance", "Start render page: " + pageName);
+
 if (WXTracing.isAvailable()) {
   WXTracing.TraceEvent traceEvent = WXTracing.newEvent("executeBundleJS", 
mInstanceId, -1);
   traceEvent.traceId = mExecJSTraceId;

[1/2] incubator-weex git commit: * [android] fix crash caused by invalid position

2017-08-23 Thread misakuo

Repository: incubator-weex
Updated Branches:
  refs/heads/0.16-dev bade86257 -> 365332e97


* [android] fix crash caused by invalid position


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c05cfcb8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c05cfcb8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c05cfcb8

Branch: refs/heads/0.16-dev
Commit: c05cfcb84e8d57139e51895a76cd5d880a407f61
Parents: 6b782f6
Author: misakuo <misa...@apache.org>
Authored: Tue Aug 22 15:29:35 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Tue Aug 22 15:29:35 2017 +0800

--
 .../main/java/com/taobao/weex/dom/action/TraceableAction.java   | 1 +
 .../com/taobao/weex/ui/component/list/BasicListComponent.java   | 5 +
 2 files changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c05cfcb8/android/sdk/src/main/java/com/taobao/weex/dom/action/TraceableAction.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/dom/action/TraceableAction.java 
b/android/sdk/src/main/java/com/taobao/weex/dom/action/TraceableAction.java
index 5bd2689..c4cc59a 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/action/TraceableAction.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/action/TraceableAction.java
@@ -67,6 +67,7 @@ public class TraceableAction {
   mBeginEvent.name = type;
   mBeginEvent.payload = payload;
   mBeginEvent.parseJsonTime = Stopwatch.nanosToMillis(mParseJsonNanos);
+  mBeginEvent.tname = "JSThread";
   mBeginEvent.submit();
 }
   }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c05cfcb8/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
index c7c0bb6..7833cbf 100644
--- 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
+++ 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
@@ -520,6 +520,11 @@ public abstract class BasicListComponent

[2/2] incubator-weex git commit: Merge remote-tracking branch 'upstream/pr627' into apache-0.16-dev

2017-08-23 Thread misakuo

Merge remote-tracking branch 'upstream/pr627' into apache-0.16-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/bade8625
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/bade8625
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/bade8625

Branch: refs/heads/0.16-dev
Commit: bade862570aa755df2ef3a6a57e291644d6166fb
Parents: 849ed3e 5e339e3
Author: misakuo <misa...@apache.org>
Authored: Thu Aug 24 10:27:10 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Thu Aug 24 10:27:10 2017 +0800

--
 .../java/com/taobao/weex/ui/component/AbstractEditComponent.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--

[1/2] incubator-weex git commit: * [android] fix wrong setting font size

2017-08-23 Thread misakuo

Repository: incubator-weex
Updated Branches:
  refs/heads/0.16-dev 849ed3eb7 -> bade86257


* [android] fix wrong setting font size


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5e339e35
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5e339e35
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5e339e35

Branch: refs/heads/0.16-dev
Commit: 5e339e35f323756c6d2cf4a1145731085149c16f
Parents: 6b782f6
Author: misakuo <misa...@apache.org>
Authored: Tue Aug 22 11:21:15 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Tue Aug 22 11:21:15 2017 +0800

--
 .../java/com/taobao/weex/ui/component/AbstractEditComponent.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5e339e35/android/sdk/src/main/java/com/taobao/weex/ui/component/AbstractEditComponent.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/AbstractEditComponent.java
 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/AbstractEditComponent.java
index 179b179..a8d1963 100644
--- 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/AbstractEditComponent.java
+++ 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/AbstractEditComponent.java
@@ -456,7 +456,9 @@ public abstract class AbstractEditComponent extends 
WXComponent {
   @WXComponentProp(name = Constants.Name.FONT_SIZE)
   public void setFontSize(String fontSize) {
 if (getHostView() != null && fontSize != null ) {
-  getHostView().setTextSize(TypedValue.COMPLEX_UNIT_PX, 
WXStyle.getFontSize(getDomObject().getStyles(),getInstance().getInstanceViewPortWidth()));
+  Map<String, Object> map = new HashMap<>(1);
+  map.put(Constants.Name.FONT_SIZE, fontSize);
+  getHostView().setTextSize(TypedValue.COMPLEX_UNIT_PX, 
WXStyle.getFontSize(map, getInstance().getInstanceViewPortWidth()));
 }
   }

[GitHub] incubator-weex issue #639: Fix typo in involved

2017-08-23 Thread misakuo

Github user misakuo commented on the issue:

https://github.com/apache/incubator-weex/pull/639
  
Thanks for your contribution


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

incubator-weex git commit: Fix typo in involved

2017-08-23 Thread misakuo

Repository: incubator-weex
Updated Branches:
  refs/heads/dev a7f8c310a -> 9eda7b7e4


Fix typo in involved

Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9eda7b7e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9eda7b7e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9eda7b7e

Branch: refs/heads/dev
Commit: 9eda7b7e454faf10f541bd3877e8dcd80345cc03
Parents: a7f8c31
Author: Adam Altman 
Authored: Wed Aug 23 13:33:26 2017 -0500
Committer: GitHub 
Committed: Wed Aug 23 13:33:26 2017 -0500

--
 doc/themes/weex/languages/en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9eda7b7e/doc/themes/weex/languages/en.yml
--
diff --git a/doc/themes/weex/languages/en.yml b/doc/themes/weex/languages/en.yml
index 12cec69..f0e5270 100644
--- a/doc/themes/weex/languages/en.yml
+++ b/doc/themes/weex/languages/en.yml
@@ -90,7 +90,7 @@ menu:
   download: Download
   resources: Resources
   tools: Tools
-  invovled: Get Invovled
+  invovled: Get Involved
   advanced: Advanced
   github: GitHub
   legacy: Old Syntax Doc

incubator-weex git commit: * [android] fix NPE on reading bundle data size

2017-08-23 Thread misakuo

Repository: incubator-weex
Updated Branches:
  refs/heads/0.16-dev 41ce0f6c4 -> 4025b5b36


* [android] fix NPE on reading bundle data size


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/4025b5b3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4025b5b3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4025b5b3

Branch: refs/heads/0.16-dev
Commit: 4025b5b36b13fbf35cd16dc1acf45ad7180f5f2c
Parents: 41ce0f6
Author: misakuo <misa...@apache.org>
Authored: Wed Aug 23 15:33:32 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Wed Aug 23 15:33:32 2017 +0800

--
 android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4025b5b3/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java 
b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
index 1c2877a..73c32ee 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
@@ -1564,7 +1564,9 @@ public class WXSDKInstance implements 
IWXActivityStateListener,DomContext, View.
 event.tname = "Network";
 event.ph = "E";
 event.extParams = new HashMap<>();
-event.extParams.put("BundleSize", response.originalData.length);
+if (response != null && response.originalData != null) {
+  event.extParams.put("BundleSize", response.originalData.length);
+}
 event.submit();
   }

[GitHub] incubator-weex pull request #635: * [android] fix NPE on reading bundle data...

2017-08-23 Thread misakuo

GitHub user misakuo opened a pull request:

https://github.com/apache/incubator-weex/pull/635

* [android] fix NPE on reading bundle data size

as title

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/misakuo/incubator-weex 
android-bugfix-tracing-npe

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-weex/pull/635.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #635


commit 4025b5b36b13fbf35cd16dc1acf45ad7180f5f2c
Author: misakuo <misa...@apache.org>
Date:   2017-08-23T07:33:32Z

* [android] fix NPE on reading bundle data size




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

incubator-weex git commit: * [doc] update doc for idea plugin

2017-08-22 Thread misakuo

Repository: incubator-weex
Updated Branches:
  refs/heads/dev 28fe94890 -> 7e9d53263


* [doc] update doc for idea plugin


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7e9d5326
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7e9d5326
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7e9d5326

Branch: refs/heads/dev
Commit: 7e9d5326332cb8536e1f70346ff89a769828
Parents: 28fe948
Author: misakuo <misa...@apache.org>
Authored: Wed Aug 23 10:18:41 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Wed Aug 23 10:18:41 2017 +0800

--
 doc/_config.yml| 2 ++
 doc/_config_cn.yml | 2 ++
 doc/source/cn/guide/tools/index.md | 2 +-
 doc/source/guide/tools/index.md| 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7e9d5326/doc/_config.yml
--
diff --git a/doc/_config.yml b/doc/_config.yml
index e262984..ff70324 100644
--- a/doc/_config.yml
+++ b/doc/_config.yml
@@ -335,3 +335,5 @@ alias:
   cn/guide/tools/weexpack.html: cn/guide/tools/toolkit.html
   guide/tools/devtools.html: guide/tools/toolkit.html
   guide/tools/weexpack.html: guide/tools/toolkit.html
+  cn/guide/tools/plugin.html: cn/giude/tools/plugin.html
+  guide/tools/plugin.html: guide/tools/plugin.html

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7e9d5326/doc/_config_cn.yml
--
diff --git a/doc/_config_cn.yml b/doc/_config_cn.yml
index ef5679f..93eff7d 100644
--- a/doc/_config_cn.yml
+++ b/doc/_config_cn.yml
@@ -333,3 +333,5 @@ alias:
   cn/guide/tools/weexpack.html: cn/guide/tools/toolkit.html
   guide/tools/devtools.html: guide/tools/toolkit.html
   guide/tools/weexpack.html: guide/tools/toolkit.html
+  cn/guide/tools/plugin.html: cn/giude/tools/plugin.html
+  guide/tools/plugin.html: guide/tools/plugin.html

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7e9d5326/doc/source/cn/guide/tools/index.md
--
diff --git a/doc/source/cn/guide/tools/index.md 
b/doc/source/cn/guide/tools/index.md
index 6dacd4c..2abb520 100644
--- a/doc/source/cn/guide/tools/index.md
+++ b/doc/source/cn/guide/tools/index.md
@@ -8,4 +8,4 @@ version: 2.1
 # å¨è¾¹å·¥å·  
 
 - [weex-toolkit](./toolkit.html)
-- [Weex Language Supportæä»¶](./plugin.md)
+- [Weex Language Supportæä»¶](./plugin.html)

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7e9d5326/doc/source/guide/tools/index.md
--
diff --git a/doc/source/guide/tools/index.md b/doc/source/guide/tools/index.md
index 74f8373..356bf98 100644
--- a/doc/source/guide/tools/index.md
+++ b/doc/source/guide/tools/index.md
@@ -8,4 +8,4 @@ version: 2.1
 # Tools  
 
 - [weex-toolkit](./toolkit.html)
-- [IDEA / WebStorm Plugin](./plugin.md)
+- [IDEA / WebStorm Plugin](./plugin.html)

[GitHub] incubator-weex pull request #633: * [doc] update doc for idea plugin

2017-08-22 Thread misakuo

GitHub user misakuo opened a pull request:

https://github.com/apache/incubator-weex/pull/633

* [doc] update doc for idea plugin



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/misakuo/incubator-weex dev-doc

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-weex/pull/633.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #633


commit 7e9d5326332cb8536e1f70346ff89a769828
Author: misakuo <misa...@apache.org>
Date:   2017-08-23T02:18:41Z

* [doc] update doc for idea plugin




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[2/2] incubator-weex git commit: Merge remote-tracking branch 'upstream/pr625' into apache-0.16-dev

2017-08-22 Thread misakuo

Merge remote-tracking branch 'upstream/pr625' into apache-0.16-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/41ce0f6c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/41ce0f6c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/41ce0f6c

Branch: refs/heads/0.16-dev
Commit: 41ce0f6c4d95e2ac0beca54c401eaa7505d5fb19
Parents: e10aadc b4b7c91
Author: misakuo <misa...@apache.org>
Authored: Wed Aug 23 09:39:11 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Wed Aug 23 09:39:11 2017 +0800

--
 .../com/taobao/weex/ui/component/WXText.java| 52 +++-
 .../com/taobao/weex/utils/TypefaceUtil.java |  8 +++
 2 files changed, 59 insertions(+), 1 deletion(-)
--

[1/2] incubator-weex git commit: * [android] fix wrong draw on first download iconfont

2017-08-22 Thread misakuo

Repository: incubator-weex
Updated Branches:
  refs/heads/0.16-dev e10aadc15 -> 41ce0f6c4


* [android] fix wrong draw on first download iconfont


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b4b7c919
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b4b7c919
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b4b7c919

Branch: refs/heads/0.16-dev
Commit: b4b7c919ce4157e1d356f7b863580b6bcfdead7c
Parents: 6b782f6
Author: misakuo <misa...@apache.org>
Authored: Tue Aug 22 10:35:52 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Tue Aug 22 10:35:52 2017 +0800

--
 .../com/taobao/weex/ui/component/WXText.java| 52 +++-
 .../com/taobao/weex/utils/TypefaceUtil.java |  8 +++
 2 files changed, 59 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b4b7c919/android/sdk/src/main/java/com/taobao/weex/ui/component/WXText.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXText.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXText.java
index e93263b..2d78563 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXText.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXText.java
@@ -18,8 +18,12 @@
  */
 package com.taobao.weex.ui.component;
 
+import android.content.BroadcastReceiver;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.support.annotation.NonNull;
+import android.support.v4.content.LocalBroadcastManager;
 import android.text.Layout;
 import android.view.ViewGroup;
 
@@ -29,6 +33,9 @@ import com.taobao.weex.common.Constants;
 import com.taobao.weex.dom.WXDomObject;
 import com.taobao.weex.ui.ComponentCreator;
 import com.taobao.weex.ui.view.WXTextView;
+import com.taobao.weex.utils.FontDO;
+import com.taobao.weex.utils.TypefaceUtil;
+import com.taobao.weex.utils.WXLogUtils;
 
 import java.lang.reflect.InvocationTargetException;
 
@@ -42,6 +49,8 @@ public class WXText extends WXComponent {
* The default text size
**/
   public static final int sDEFAULT_SIZE = 32;
+  private BroadcastReceiver mTypefaceObserver;
+  private String mFontFamily;
 
   public static class Creator implements ComponentCreator {
 
@@ -102,12 +111,14 @@ public class WXText extends WXComponent {
   case Constants.Name.FONT_STYLE:
   case Constants.Name.COLOR:
   case Constants.Name.TEXT_DECORATION:
-  case Constants.Name.FONT_FAMILY:
   case Constants.Name.TEXT_ALIGN:
   case Constants.Name.TEXT_OVERFLOW:
   case Constants.Name.LINE_HEIGHT:
   case Constants.Name.VALUE:
 return true;
+  case Constants.Name.FONT_FAMILY:
+registerTypefaceObserver(param.toString());
+return true;
   default:
 return super.setProperty(key, param);
 }
@@ -145,4 +156,43 @@ public class WXText extends WXComponent {
 }
 return super.convertEmptyProperty(propName, originalValue);
   }
+
+  @Override
+  public void destroy() {
+super.destroy();
+if (getContext() != null && mTypefaceObserver != null) {
+  
LocalBroadcastManager.getInstance(getContext()).unregisterReceiver(mTypefaceObserver);
+}
+  }
+
+  private void registerTypefaceObserver(String desiredFontFamily) {
+if (getContext() == null) {
+  WXLogUtils.w("WXText", "Content is null on register typeface observer");
+}
+mFontFamily = desiredFontFamily;
+mTypefaceObserver = new BroadcastReceiver() {
+  @Override
+  public void onReceive(Context context, Intent intent) {
+String fontFamily = intent.getStringExtra("fontFamily");
+if (!mFontFamily.equals(fontFamily)) {
+  return;
+}
+
+FontDO fontDO = TypefaceUtil.getFontDO(fontFamily);
+if (fontDO != null && fontDO.getTypeface() != null) {
+  Layout layout = getHostView().getTextLayout();
+  if (layout != null) {
+layout.getPaint().setTypeface(fontDO.getTypeface());
+WXLogUtils.d("WXText", "Apply font family " + fontFamily + " to 
paint");
+  } else {
+WXLogUtils.w("WXText", "Layout not created");
+  }
+  getHostView().invalidate();
+}
+WXLogUtils.d("WXText", "Font family " + fontFamily + " is available");
+  }
+};
+
+
LocalBroadcastManager.getInstance(getContext()).registerReceiver(mTypefaceObserver,
 new IntentFilter(TypefaceUtil.ACTION_TYPE_FACE_AVAILABLE));
+

[GitHub] incubator-weex pull request #631: * [android] fix crash caused by invalid po...

2017-08-22 Thread misakuo

GitHub user misakuo opened a pull request:

https://github.com/apache/incubator-weex/pull/631

* [android] fix crash caused by invalid position

no test case needed

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/misakuo/incubator-weex 
android-bugfix-scroll-to-crash

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-weex/pull/631.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #631


commit c05cfcb84e8d57139e51895a76cd5d880a407f61
Author: misakuo <misa...@apache.org>
Date:   2017-08-22T07:29:35Z

* [android] fix crash caused by invalid position




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-weex pull request #627: * [android] fix wrong setting font size

2017-08-21 Thread misakuo

GitHub user misakuo opened a pull request:

https://github.com/apache/incubator-weex/pull/627

* [android] fix wrong setting font size

Testcase: http://dotwe.org/vue/9b024ef78f8b8fd18095569aa8d72021

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/misakuo/incubator-weex 
android-bugfix-input-font-size

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-weex/pull/627.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #627


commit 5e339e35f323756c6d2cf4a1145731085149c16f
Author: misakuo <misa...@apache.org>
Date:   2017-08-22T03:21:15Z

* [android] fix wrong setting font size




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-weex pull request #625: * [android] fix wrong draw on first downlo...

2017-08-21 Thread misakuo

GitHub user misakuo opened a pull request:

https://github.com/apache/incubator-weex/pull/625

* [android] fix wrong draw on first download iconfont

Testcase: http://dotwe.org/vue/6ece072d0abd9a9e5718eb26bd5719f8

**NOTE: .woff font not supported in Android Nougat**

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/misakuo/incubator-weex 
android-bugfix-load-iconfont

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-weex/pull/625.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #625


commit b4b7c919ce4157e1d356f7b863580b6bcfdead7c
Author: misakuo <misa...@apache.org>
Date:   2017-08-22T02:35:52Z

* [android] fix wrong draw on first download iconfont




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[1/2] incubator-weex git commit: * [android] change offset on scroll event to negative number

2017-08-21 Thread misakuo

Repository: incubator-weex
Updated Branches:
  refs/heads/0.16-dev 4bd54daf7 -> 6b782f638


* [android] change offset on scroll event to negative number


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/278334f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/278334f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/278334f2

Branch: refs/heads/0.16-dev
Commit: 278334f2d266fdceb69192f7b7d49772065a7621
Parents: e22f02a
Author: misakuo <misa...@apache.org>
Authored: Mon Aug 21 14:12:08 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Mon Aug 21 14:12:08 2017 +0800

--
 .../java/com/taobao/weex/ui/component/list/BasicListComponent.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/278334f2/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
index 3c8be1c..c7c0bb6 100644
--- 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
+++ 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
@@ -1301,7 +1301,7 @@ public abstract class BasicListComponent

[2/2] incubator-weex git commit: Merge remote-tracking branch 'upstream/pr624' into apache-0.16-dev

2017-08-21 Thread misakuo

Merge remote-tracking branch 'upstream/pr624' into apache-0.16-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/6b782f63
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/6b782f63
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/6b782f63

Branch: refs/heads/0.16-dev
Commit: 6b782f63848ba2d4a554ff0f2b25e18019a724ed
Parents: 4bd54da 278334f
Author: misakuo <misa...@apache.org>
Authored: Mon Aug 21 17:26:19 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Mon Aug 21 17:26:19 2017 +0800

--
 .../java/com/taobao/weex/ui/component/list/BasicListComponent.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[GitHub] incubator-weex pull request #624: * [android] change offset on scroll event ...

2017-08-21 Thread misakuo

GitHub user misakuo opened a pull request:

https://github.com/apache/incubator-weex/pull/624

* [android] change offset on scroll event to negative number

As title

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/misakuo/incubator-weex 
android-bugfix-list-onscroll

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-weex/pull/624.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #624


commit 278334f2d266fdceb69192f7b7d49772065a7621
Author: misakuo <misa...@apache.org>
Date:   2017-08-21T06:12:08Z

* [android] change offset on scroll event to negative number




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[1/2] incubator-weex git commit: * [doc] add doc of idea plugin

2017-08-20 Thread misakuo

Repository: incubator-weex
Updated Branches:
  refs/heads/dev a52c861e1 -> f76aa0690


* [doc] add doc of idea plugin


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/6e36b074
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/6e36b074
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/6e36b074

Branch: refs/heads/dev
Commit: 6e36b0749f667c02107037ebde407d278ec6ac83
Parents: 9db8054
Author: misakuo <misa...@apache.org>
Authored: Mon Aug 21 12:22:04 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Mon Aug 21 12:22:04 2017 +0800

--
 doc/source/cn/guide/tools/index.md  |  1 +
 doc/source/cn/guide/tools/plugin.md | 70 
 doc/source/guide/tools/index.md |  1 +
 doc/source/guide/tools/plugin.md| 61 +
 doc/themes/weex/layout/_partial/sidebar.ejs |  3 +
 5 files changed, 136 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6e36b074/doc/source/cn/guide/tools/index.md
--
diff --git a/doc/source/cn/guide/tools/index.md 
b/doc/source/cn/guide/tools/index.md
index cd2c226..6dacd4c 100644
--- a/doc/source/cn/guide/tools/index.md
+++ b/doc/source/cn/guide/tools/index.md
@@ -8,3 +8,4 @@ version: 2.1
 # å¨è¾¹å·¥å·  
 
 - [weex-toolkit](./toolkit.html)
+- [Weex Language Supportæä»¶](./plugin.md)

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6e36b074/doc/source/cn/guide/tools/plugin.md
--
diff --git a/doc/source/cn/guide/tools/plugin.md 
b/doc/source/cn/guide/tools/plugin.md
new file mode 100644
index 000..467b890
--- /dev/null
+++ b/doc/source/cn/guide/tools/plugin.md
@@ -0,0 +1,70 @@
+# Weexè¯æ³æ¯ææä»¶ 
+
+[Weex Language 
Support](https://plugins.jetbrains.com/plugin/9189-weex-language-support) 
æä»¶æ¯å®æ¹æä¾çä¸ä¸ªå·¥å·ï¼ä½ å¯ä»¥ä½¿ç¨å®å¨IntelliJ 
IDEAï¼WebStormçä¸ç³»åIDEä¸å¯¹Weex DSLè¿è¡è¯æ³é«äº®ï¼èªå¨è¡¥å
¨åéè¯¯æ£æ¥çæä½ã
+
+### æ¯æçIDE
+ä½ å¯ä»¥å¨ä»»ä½æä½ç³»ç»ä¸çä¸åIDEä¸å®è£åä½¿ç¨Weex Language 
Supportæä»¶ï¼
+**IntelliJ IDEA Ultimate, PhpStorm,  WebStorm,  PyCharm,  RubyMine,  AppCode,  
CLion,  Gogland,  Rider**
+
+### å®è£
+å¨IDEçæä»¶ä»åºä¸æç´¢`Weex Language Support`æ¥å®è£
è¯¥æä»¶ï¼å®è£å®æ¯åéå¯IDEå³å¯æ¿æ´»æä»¶ç¸å³åè½
+![install 
plugin](https://img.alicdn.com/tfs/TB1y6nrXwvGK1Jjy0FdXXaxzVXa-1316-462.png)
+
+### éç½®
+æå¼`Preferences -> Other Settings -> Weex language support`å¯é
ç½®æä»¶çç¸å³åè½
+![plugin 
settings](https://img.alicdn.com/tfs/TB1FonrXwvGK1Jjy0FgXXX9hFXa-559-244.png)   
 
+- Target Weex Version: é
ç½®æä»¶ä»¥åªä¸ä¸ªçæ¬çè¯æ³è§åæ¥å¯¹DSLè¿è¡æç¤ºåæ£æ¥ï¼é»è®¤å¼`LATEST`è¡¨ç¤ºæ»æ¯åºç¨æè¡æ°çæ¬weexçè¯æ³è§å
+- Vue Support: éç½®æä»¶æ¯å¦æ¯æWeex 
2.0çæ¬çDSL(.vueæä»¶)ï¼å¼å¯åéå¯çæï¼æ³¨æï¼å¦æIDEåæå
¶ä»æ¯æVueè¯æ³çæä»¶ï¼åéè¦å
³éç¸åºçæä»¶åWeexæä»¶æè½çæï¼
+- Custom Rules: å¼å¥èªå®ä¹çWeex DSLè§åï¼å¦æä½ 
å¨nativeä¸å®ä¹äºèªå·±çModuleæComponentï¼å¯éè¿èªå®ä¹è§åå¼å
¥æä»¶ä¸æ¥æä¾ç¸åºçæç¤ºåè¡¥å¨æ¯æï¼èªå®ä¹è§åçæ 
¼å¼å°å¨åæååº
+- Global Weex Components: é»è®¤å°ï¼æä»¶ä¼è§£æå½åå·¥ç¨ånpm 
rootè·¯å¾ä¸ç`node_modules`ç®å½ï¼è§£æå¶ä¸åå«çWeex 
Componentså¹¶å¯¹å¶æä¾è¡¥å¨æ¯æãå¦æä½ 
çé¡¹ç®ä¸å¼ç¨äºè¿ä¸¤ä¸ªè·¯å¾ä»¥å¤çComponentsï¼å¯ä»¥å¨æ¤å¤å°å
¶æ·»å å°æç´¢è·¯å¾ä¸ï¼æä»¶å°ä¼å°å¶ä¸çComponentsè½½å
¥ï¼å¹¶å¨ç¼åDSLæ¶ä¸ºç¸åºçæ ç¾æä¾è¡¥å¨æ¯æ
+
+### èªå®ä¹è§åæ ¼å¼
+èªå®ä¹è§ååå«å¨ä¸ä¸ªjsonæä»¶ä¸ï¼jsonæä»¶çæ 
¹èç¹ä¸ºæ°ç»ç±»åï¼æ°ç»ä¸çæ¯ä¸ä¸ªåç´ å¯¹åºDSLä¸çä¸ä¸ªæ 
ç¾ã
+æä»¬ä»¥``æ ç¾çè§åæ¥ä¸¾ä¾ï¼
+```js
+{
+"tag": "loading", //æ ç¾åï¼ä¸å¯ä¸ºç©º
+"attrs": [ //æ ç¾å±æ§åè¡¨ï¼å¯ä¸ºç©º
+  {
+"name": "display", //å±æ§åï¼ä¸å¯ä¸ºç©º
+"valuePattern": null, 
//å±æ§å¼çæ£åè¡¨è¾¾å¼ï¼ç¨äºæ£æµå¼æ¯å¦åæ³ï¼å¯ä¸ºç©º
+"valueEnum": [ //å±æ§å¼æä¸¾ï¼å¯ä¸ºç©º
+  "show",
+  "hide"
+],
+"valueType": "var", //å±æ§å¼ç±»åï¼å¿
é¡»æ¯varæfunctionï¼å³å®è¯¥ä»æ°æ®åè¡¨è¿æ¯å½æ°åè¡¨ä¸æ¥æ¾å±æ§å¼è¡¥å
¨çåéå¼ï¼ä¸å¯ä¸ºç©º
+"since": 0, //è¯¥å±æ

[2/2] incubator-weex git commit: Merge remote-tracking branch 'upstream/pr623' into apache-dev

2017-08-20 Thread misakuo

Merge remote-tracking branch 'upstream/pr623' into apache-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/f76aa069
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f76aa069
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f76aa069

Branch: refs/heads/dev
Commit: f76aa0690cfb7624a84445151e0370fd9de2308e
Parents: a52c861 6e36b07
Author: misakuo <misa...@apache.org>
Authored: Mon Aug 21 12:25:58 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Mon Aug 21 12:25:58 2017 +0800

--
 doc/source/cn/guide/tools/index.md  |  1 +
 doc/source/cn/guide/tools/plugin.md | 70 
 doc/source/guide/tools/index.md |  1 +
 doc/source/guide/tools/plugin.md| 61 +
 doc/themes/weex/layout/_partial/sidebar.ejs |  3 +
 5 files changed, 136 insertions(+)
--

[GitHub] incubator-weex pull request #623: * [doc] add doc of idea plugin

2017-08-20 Thread misakuo

GitHub user misakuo opened a pull request:

https://github.com/apache/incubator-weex/pull/623

* [doc] add doc of idea plugin

add docs of idea plugin

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/misakuo/incubator-weex doc-idea-plugin

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-weex/pull/623.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #623


commit 6e36b0749f667c02107037ebde407d278ec6ac83
Author: misakuo <misa...@apache.org>
Date:   2017-08-21T04:22:04Z

* [doc] add doc of idea plugin




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[2/2] incubator-weex git commit: Update WXSwipeLayout.java

2017-08-20 Thread misakuo

Update WXSwipeLayout.java

Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/11f0db34
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/11f0db34
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/11f0db34

Branch: refs/heads/0.16-dev
Commit: 11f0db3467ff39ec68d0b0b206454157e2aa8573
Parents: 74181e4
Author: fantasticcmm <750813...@qq.com>
Authored: Fri Aug 18 16:38:11 2017 +0800
Committer: GitHub 
Committed: Fri Aug 18 16:38:11 2017 +0800

--
 .../java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java| 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/11f0db34/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java
 
b/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java
index 8674f22..fa26de7 100644
--- 
a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java
+++ 
b/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java
@@ -249,7 +249,6 @@ public class WXSwipeLayout extends FrameLayout implements 
NestedScrollingParent
 mCurrentAction = PULL_REFRESH;
 isConfirm = true;
   } else if (dy > 0 && !canChildScrollDown() && (!mRefreshing)) {
-//å½åæ£å¨å·æ°æ¶ä¸ååº"ä¸æå è½½æ´å¤"
 mCurrentAction = LOAD_MORE;
 isConfirm = true;
   }

[1/2] incubator-weex git commit: 下拉刷新组件在刷新时，快速上滑导致下拉刷新结束后不会隐藏的bug

2017-08-20 Thread misakuo

Repository: incubator-weex
Updated Branches:
  refs/heads/0.16-dev 6c281c86c -> 11f0db346


ä¸æå·æ°ç»ä»¶å¨å·æ°æ¶ï¼å¿«éä¸æ»å¯¼è´ä¸æå·æ°ç»æåä¸ä¼éèçbug


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/74181e44
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/74181e44
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/74181e44

Branch: refs/heads/0.16-dev
Commit: 74181e440b53fb1c593bf00f738a02809407ea8a
Parents: 6c281c8
Author: å°æ 
Authored: Fri Aug 18 16:12:10 2017 +0800
Committer: å°æ 
Committed: Fri Aug 18 16:12:10 2017 +0800

--
 .../java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/74181e44/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java
 
b/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java
index 0b5de59..8674f22 100644
--- 
a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java
+++ 
b/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java
@@ -248,7 +248,8 @@ public class WXSwipeLayout extends FrameLayout implements 
NestedScrollingParent
   if (dy < 0 && !canChildScrollUp()) {
 mCurrentAction = PULL_REFRESH;
 isConfirm = true;
-  } else if (dy > 0 && !canChildScrollDown()) {
+  } else if (dy > 0 && !canChildScrollDown() && (!mRefreshing)) {
+//å½åæ£å¨å·æ°æ¶ä¸ååº"ä¸æå è½½æ´å¤"
 mCurrentAction = LOAD_MORE;
 isConfirm = true;
   }

[1/2] incubator-weex git commit: * [android] ignore scroll event when list can not scroll vertically

2017-08-18 Thread misakuo

Repository: incubator-weex
Updated Branches:
  refs/heads/0.16-dev e2b13c16a -> e22f02a8c


* [android] ignore scroll event when list can not scroll vertically


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/cfc14120
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/cfc14120
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/cfc14120

Branch: refs/heads/0.16-dev
Commit: cfc14120db76a1881711a4b68313a863a15e94f2
Parents: e2b13c1
Author: misakuo <misa...@apache.org>
Authored: Fri Aug 18 11:29:05 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Fri Aug 18 11:29:05 2017 +0800

--
 .../com/taobao/weex/ui/component/list/BasicListComponent.java   | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/cfc14120/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
index 89bd644..2a6c960 100644
--- 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
+++ 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
@@ -1287,6 +1287,11 @@ public abstract class BasicListComponent

[2/2] incubator-weex git commit: * [android] compute content size & content offset based on layout result

2017-08-18 Thread misakuo

* [android] compute content size & content offset based on layout result


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e22f02a8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e22f02a8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e22f02a8

Branch: refs/heads/0.16-dev
Commit: e22f02a8cd3a4183af919b7296e25ffd3cb71295
Parents: cfc1412
Author: misakuo <misa...@apache.org>
Authored: Fri Aug 18 14:46:49 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Fri Aug 18 14:46:49 2017 +0800

--
 .../taobao/weex/ui/component/WXComponent.java   | 14 -
 .../ui/component/list/BasicListComponent.java   | 54 +++-
 2 files changed, 65 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e22f02a8/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
index c9eaa7b..dd7e470 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
@@ -514,11 +514,21 @@ public abstract class  WXComponent 
implements IWXObject, IWXActi
   }
 
   public float getLayoutWidth(){
-return mDomObj == null ? 0 : mDomObj.getLayoutWidth();
+float w = 0f;
+if (mDomObj != null) {
+  w = mDomObj.getLayoutWidth();
+  w = Float.isNaN(w) ? 0f : w;
+}
+return w;
   }
 
   public float getLayoutHeight(){
-return mDomObj == null ? 0 : mDomObj.getLayoutHeight();
+float h = 0f;
+if (mDomObj != null) {
+  h = mDomObj.getLayoutHeight();
+  h = Float.isNaN(h) ? 0f : h;
+}
+return h;
   }
 
   public void setPadding(Spacing padding, Spacing border) {

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e22f02a8/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
index 2a6c960..3c8be1c 100644
--- 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
+++ 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
@@ -1301,8 +1301,9 @@ public abstract class BasicListComponent event = new HashMap<>(2);
 Map<String, Object> contentSize = new HashMap<>(2);
@@ -1337,4 +1338,55 @@ public abstract class BasicListComponent

[GitHub] incubator-weex pull request #617: * [android] compute content size and offse...

2017-08-18 Thread misakuo

GitHub user misakuo opened a pull request:

https://github.com/apache/incubator-weex/pull/617

* [android] compute content size and offset based on css layout result

Testcase:
list: http://dotwe.org/weex/0eacaa08c50a9ef00474f2333c56743c
waterfall: http://dotwe.org/vue/7a9195643e9e8da352b0d879cdbe68c0

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/misakuo/incubator-weex 
android-bugfix-list-onscroll

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-weex/pull/617.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #617


commit cfc14120db76a1881711a4b68313a863a15e94f2
Author: misakuo <misa...@apache.org>
Date:   2017-08-18T03:29:05Z

* [android] ignore scroll event when list can not scroll vertically

commit e22f02a8cd3a4183af919b7296e25ffd3cb71295
Author: misakuo <misa...@apache.org>
Date:   2017-08-18T06:46:49Z

* [android] compute content size & content offset based on layout result




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-weex issue #609: *[android]fix the bug of extra data not add to pa...

2017-08-17 Thread misakuo

Github user misakuo commented on the issue:

https://github.com/apache/incubator-weex/pull/609
  
Is the iOS have the `extra` field now?


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[1/3] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev

2017-08-16 Thread misakuo

Repository: incubator-weex
Updated Branches:
  refs/heads/0.16-dev 77fff9fa5 -> 7098973be


Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-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/64bb75da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/64bb75da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/64bb75da

Branch: refs/heads/0.16-dev
Commit: 64bb75da32e3cb5c111da320ec2fdc491dcd5d94
Parents: 1215e8f 2074156
Author: misakuo <misa...@apache.org>
Authored: Tue Aug 15 17:55:53 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Tue Aug 15 17:55:53 2017 +0800

--
 android/sdk/libs/armeabi/libweexjsc.so  | Bin 7570392 -> 7570504 bytes
 android/sdk/libs/x86/libweexjsc.so  | Bin 7570392 -> 12121924 bytes
 .../java/com/taobao/weex/WXEnvironment.java |   2 +-
 .../java/com/taobao/weex/WXSDKInstance.java |  37 ++-
 .../main/java/com/taobao/weex/WXSDKManager.java |  30 +-
 .../taobao/weex/adapter/ITracingAdapter.java|  31 ++
 .../com/taobao/weex/bridge/WXBridgeManager.java |  66 +++-
 .../java/com/taobao/weex/common/Constants.java  |   2 +
 .../taobao/weex/dom/DOMActionContextImpl.java   |  15 +-
 .../com/taobao/weex/dom/RenderActionTask.java   |  26 +-
 .../java/com/taobao/weex/dom/WXDomHandler.java  |   8 +-
 .../java/com/taobao/weex/dom/WXDomManager.java  |  16 +-
 .../java/com/taobao/weex/dom/WXDomModule.java   |  39 ++-
 .../java/com/taobao/weex/dom/WXDomObject.java   |  24 +-
 .../java/com/taobao/weex/dom/WXDomTask.java |   1 +
 .../dom/action/AbstractAddElementAction.java|  26 +-
 .../dom/action/AbstractLayoutFinishAction.java  |   3 +-
 .../weex/dom/action/AddElementAction.java   |  26 ++
 .../taobao/weex/dom/action/AddEventAction.java  |  24 +-
 .../weex/dom/action/CreateBodyAction.java   |  19 ++
 .../weex/dom/action/CreateFinishAction.java |   6 +
 .../weex/dom/action/RefreshFinishAction.java|   4 +
 .../taobao/weex/dom/action/TraceableAction.java |  82 +
 .../weex/dom/action/UpdateAttributeAction.java  |   2 +-
 .../weex/dom/action/UpdateStyleAction.java  |   2 +-
 .../java/com/taobao/weex/tracing/Stopwatch.java | 132 
 .../java/com/taobao/weex/tracing/WXTracing.java | 129 
 .../com/taobao/weex/ui/WXRenderManager.java |  26 +-
 .../ui/component/AbstractEditComponent.java |   2 +-
 .../taobao/weex/ui/component/WXComponent.java   |  65 +++-
 .../taobao/weex/ui/component/WXVContainer.java  |  18 ++
 .../ui/component/list/BasicListComponent.java   |   1 +
 .../java/com/taobao/weex/utils/WXLogUtils.java  |  45 +--
 .../com/taobao/weex/utils/WXLogUtilsTest.java   |   1 -
 doc/source/_posts/arkit.md  | 112 +++
 doc/source/_posts/cn/hello.md   |   6 -
 doc/source/_posts/hello_world.md|   7 -
 doc/source/_posts/test.md   |  14 -
 doc/source/cn/blog/index.md |   4 -
 .../cn/references/advanced/extend-to-ios.md |   4 +-
 .../advanced/integrate-devtool-to-android.md|  86 -
 doc/source/cn/references/common-style.md|   2 +
 doc/source/cn/references/components/text.md |   4 +-
 doc/source/cn/references/modules/animation.md   |   2 +-
 doc/source/references/advanced/extend-to-ios.md |   5 +-
 doc/source/references/common-style.md   |   2 +
 doc/source/references/components/text.md|   4 +-
 doc/source/references/modules/animation.md  |   2 +-
 doc/themes/weex/layout/_partial/header.ejs  |   1 +
 .../weex/layout/_partial/post/summary.ejs   |   1 +
 doc/themes/weex/source/css/blog.scss|   3 +
 doc/themes/weex/source/css/media-queries.scss   |   1 +
 doc/themes/weex/source/css/partial/header.scss  |   6 +-
 html5/runtime/normalize.js  |  13 +-
 ios/sdk/WeexSDK.xcodeproj/project.pbxproj   |  24 +-
 .../Sources/Component/WXComponent_internal.h|  12 +
 .../WeexSDK/Sources/Component/WXListComponent.m |   4 +-
 .../Sources/Display/WXComponent+Display.m   |  16 +-
 .../WeexSDK/Sources/Layout/WXComponent+Layout.m |   3 +-
 ios/sdk/WeexSDK/Sources/Model/WXComponent.m |  67 +++-
 .../WeexSDK/Sources/Module/WXAnimationLayout.h  |  49 ---
 .../WeexSDK/Sources/Module/WXAnimationLayout.m  | 115 ---
 .../WeexSDK/Sources/Module/WXAnimationModule.h  |   2 +
 .../WeexSDK/Sources/Module/WXAnimationModule.m  |  88 --
 ios/sdk/WeexSDK/Sources/Module/WXTransition.h   |  43 +++
 ios/sdk/WeexSDK/Sources/Module/WXTransition.m   | 311 +++
 ios/sdk/WeexSDK/Sources/Utility/WXConvert.m |   3 +-
 package.json|   4 +-
 pre-build/native-bundle-main.js |  10 +-
 test/run.sh |  18 +-
 70 files changed, 1609 insertions(+), 349 deletions(-)
--

[2/3] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev

2017-08-16 Thread misakuo

Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-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/7d9492af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7d9492af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7d9492af

Branch: refs/heads/0.16-dev
Commit: 7d9492afe0ce032bd0bd5f13a73a5a0c572f5657
Parents: 64bb75d 77fff9f
Author: misakuo <misa...@apache.org>
Authored: Wed Aug 16 12:08:44 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Wed Aug 16 12:08:44 2017 +0800

--
 android/sdk/libs/armeabi/libweexjsc.so  | Bin 7570504 -> 7570392 bytes
 .../java/com/taobao/weex/common/Constants.java  |   1 +
 .../weex/dom/action/GetComponentRectAction.java |  12 
 .../weex/ui/component/ContentMeasurable.java|  29 --
 .../taobao/weex/ui/component/WXScroller.java|  16 +-
 .../com/taobao/weex/ui/component/WXSlider.java  |   6 +-
 .../ui/component/list/BasicListComponent.java   |  18 +-
 .../weex/ui/view/WXBaseCircleIndicator.java |   3 +-
 .../taobao/weex/ui/view/WXCircleViewPager.java  |  57 ---
 .../ui/view/refresh/core/WXSwipeLayout.java |  15 -
 .../ui/view/refresh/wrapper/BaseBounceView.java |   2 +-
 examples/vue/market/gcanvas.vue |  10 +++-
 test/run.sh |   6 +-
 13 files changed, 57 insertions(+), 118 deletions(-)
--

[3/3] incubator-weex git commit: + [android] invoke callbacks on instance created

2017-08-16 Thread misakuo

+ [android] invoke callbacks on instance created


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7098973b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7098973b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7098973b

Branch: refs/heads/0.16-dev
Commit: 7098973bec44a40e24710692beea6ae24c39040b
Parents: 7d9492a
Author: misakuo <misa...@apache.org>
Authored: Wed Aug 16 12:19:01 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Wed Aug 16 12:19:01 2017 +0800

--
 android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7098973b/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java 
b/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java
index e6511d4..1da1a5f 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java
@@ -277,6 +277,11 @@ public class WXSDKManager {
   void createInstance(WXSDKInstance instance, String code, Map<String, Object> 
options, String jsonInitData) {
 mWXRenderManager.registerInstance(instance);
 mBridgeManager.createInstance(instance.getInstanceId(), code, options, 
jsonInitData);
+if (mLifeCycleCallbacks != null) {
+  for (InstanceLifeCycleCallbacks callbacks : mLifeCycleCallbacks) {
+callbacks.onInstanceCreated(instance.getInstanceId());
+  }
+}
   }
 
   void refreshInstance(String instanceId, WXRefreshData jsonData) {
@@ -447,5 +452,6 @@ public class WXSDKManager {
 
   public interface InstanceLifeCycleCallbacks {
 void onInstanceDestroyed(String instanceId);
+void onInstanceCreated(String instanceId);
   }
 }

[GitHub] incubator-weex pull request #604: + [android] add life cycle callbacks for W...

2017-08-16 Thread misakuo

GitHub user misakuo opened a pull request:

https://github.com/apache/incubator-weex/pull/604

+ [android] add life cycle callbacks for WXSDKInstance



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/misakuo/incubator-weex 
android-feature-instance-lifecycle-callbacks

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-weex/pull/604.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #604


commit 64bb75da32e3cb5c111da320ec2fdc491dcd5d94
Author: misakuo <misa...@apache.org>
Date:   2017-08-15T09:55:53Z

Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev

commit 7d9492afe0ce032bd0bd5f13a73a5a0c572f5657
Author: misakuo <misa...@apache.org>
Date:   2017-08-16T04:08:44Z

Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev

commit 7098973bec44a40e24710692beea6ae24c39040b
Author: misakuo <misa...@apache.org>
Date:   2017-08-16T04:19:01Z

+ [android] invoke callbacks on instance created




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[09/13] incubator-weex git commit: * [android] using independent Handler to handle auto scroll

2017-08-15 Thread misakuo

* [android] using independent Handler to handle auto scroll


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a62383e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a62383e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a62383e6

Branch: refs/heads/0.16-dev
Commit: a62383e6f49af57d60fbcbd9ecbe1b17724b02f5
Parents: fe0b41e
Author: misakuo <misa...@apache.org>
Authored: Tue Aug 15 16:12:04 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Tue Aug 15 16:12:04 2017 +0800

--
 .../taobao/weex/ui/view/WXCircleViewPager.java  | 36 ++--
 1 file changed, 25 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a62383e6/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
index 93cac73..7e8e091 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
@@ -22,6 +22,7 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Handler;
 import android.os.Looper;
+import android.os.Message;
 import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.util.AttributeSet;
@@ -41,6 +42,7 @@ import java.lang.reflect.Field;
 @SuppressLint("HandlerLeak")
 public class WXCircleViewPager extends ViewPager implements 
WXGestureObservable {
 
+  private final int SCROLL_TO_NEXT = 1;
   private WXGesture wxGesture;
   private boolean isAutoScroll;
   private long intervalTime = 3 * 1000;
@@ -48,7 +50,17 @@ public class WXCircleViewPager extends ViewPager implements 
WXGestureObservable
   private boolean needLoop = true;
   private boolean scrollable = true;
   private int mState = ViewPager.SCROLL_STATE_IDLE;
-  private Handler mAutoScrollHandler;
+  private Handler mAutoScrollHandler = new Handler(Looper.getMainLooper()) {
+@Override
+public void handleMessage(Message msg) {
+  if (msg.what == SCROLL_TO_NEXT) {
+showNextItem();
+this.sendEmptyMessageDelayed(SCROLL_TO_NEXT, intervalTime);
+return;
+  }
+  super.handleMessage(msg);
+}
+  };
 
   private Runnable scrollAction = new ScrollAction(this);
 
@@ -59,7 +71,6 @@ public class WXCircleViewPager extends ViewPager implements 
WXGestureObservable
   }
 
   private void init() {
-mAutoScrollHandler = new Handler(Looper.getMainLooper());
 setOverScrollMode(View.OVER_SCROLL_NEVER);
 
 addOnPageChangeListener(new OnPageChangeListener() {
@@ -153,12 +164,14 @@ public class WXCircleViewPager extends ViewPager 
implements WXGestureObservable
*/
   public void startAutoScroll() {
 isAutoScroll = true;
-mAutoScrollHandler.removeCallbacks(scrollAction);
-mAutoScrollHandler.postDelayed(scrollAction, intervalTime);
+mAutoScrollHandler.removeCallbacksAndMessages(null);
+mAutoScrollHandler.sendEmptyMessageDelayed(SCROLL_TO_NEXT, intervalTime);
+//mAutoScrollHandler.removeCallbacksAndMessages(scrollAction);
+//mAutoScrollHandler.postDelayed(scrollAction, intervalTime);
   }
 
   public void pauseAutoScroll(){
-mAutoScrollHandler.removeCallbacks(scrollAction);
+mAutoScrollHandler.removeCallbacksAndMessages(null);
   }
 
   /**
@@ -166,7 +179,7 @@ public class WXCircleViewPager extends ViewPager implements 
WXGestureObservable
*/
   public void stopAutoScroll() {
 isAutoScroll = false;
-mAutoScrollHandler.removeCallbacks(scrollAction);
+mAutoScrollHandler.removeCallbacksAndMessages(null);
   }
 
   public boolean isAutoScroll() {
@@ -219,12 +232,13 @@ public class WXCircleViewPager extends ViewPager 
implements WXGestureObservable
 switch (ev.getAction()) {
   case MotionEvent.ACTION_DOWN:
   case MotionEvent.ACTION_MOVE:
-mAutoScrollHandler.removeCallbacks(scrollAction);
+mAutoScrollHandler.removeCallbacksAndMessages(null);
 break;
   case MotionEvent.ACTION_UP:
   case MotionEvent.ACTION_CANCEL:
 if (isAutoScroll()) {
-  mAutoScrollHandler.postDelayed(scrollAction, intervalTime);
+  mAutoScrollHandler.sendEmptyMessageDelayed(SCROLL_TO_NEXT, 
intervalTime);
+  //postDelayed(scrollAction, intervalTime);
 }
 break;
 }
@@ -300,7 +314,7 @@ public class WXCircleViewPager extends ViewPager implements 
WXGestureObservable
   @Override
   protected void onDetachedFromWindow() {
 supe

[10/13] incubator-weex git commit: * [android] clean redundant

2017-08-15 Thread misakuo

* [android] clean redundant


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/d336ad2a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d336ad2a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d336ad2a

Branch: refs/heads/0.16-dev
Commit: d336ad2aed639d1e95d65428788ef26466208fb7
Parents: a62383e
Author: misakuo <misa...@apache.org>
Authored: Tue Aug 15 16:48:48 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Tue Aug 15 16:48:48 2017 +0800

--
 .../taobao/weex/ui/view/WXCircleViewPager.java  | 33 ++--
 1 file changed, 2 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d336ad2a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
index 7e8e091..1659c30 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
@@ -34,7 +34,6 @@ import com.taobao.weex.ui.view.gesture.WXGesture;
 import com.taobao.weex.ui.view.gesture.WXGestureObservable;
 import com.taobao.weex.utils.WXLogUtils;
 
-import java.lang.ref.WeakReference;
 import java.lang.reflect.Field;
 
 /**
@@ -54,6 +53,7 @@ public class WXCircleViewPager extends ViewPager implements 
WXGestureObservable
 @Override
 public void handleMessage(Message msg) {
   if (msg.what == SCROLL_TO_NEXT) {
+WXLogUtils.d("[CircleViewPager] trigger auto play action");
 showNextItem();
 this.sendEmptyMessageDelayed(SCROLL_TO_NEXT, intervalTime);
 return;
@@ -62,8 +62,6 @@ public class WXCircleViewPager extends ViewPager implements 
WXGestureObservable
 }
   };
 
-  private Runnable scrollAction = new ScrollAction(this);
-
   @SuppressLint("NewApi")
   public WXCircleViewPager(Context context) {
 super(context);
@@ -166,8 +164,6 @@ public class WXCircleViewPager extends ViewPager implements 
WXGestureObservable
 isAutoScroll = true;
 mAutoScrollHandler.removeCallbacksAndMessages(null);
 mAutoScrollHandler.sendEmptyMessageDelayed(SCROLL_TO_NEXT, intervalTime);
-//mAutoScrollHandler.removeCallbacksAndMessages(scrollAction);
-//mAutoScrollHandler.postDelayed(scrollAction, intervalTime);
   }
 
   public void pauseAutoScroll(){
@@ -238,7 +234,6 @@ public class WXCircleViewPager extends ViewPager implements 
WXGestureObservable
   case MotionEvent.ACTION_CANCEL:
 if (isAutoScroll()) {
   mAutoScrollHandler.sendEmptyMessageDelayed(SCROLL_TO_NEXT, 
intervalTime);
-  //postDelayed(scrollAction, intervalTime);
 }
 break;
 }
@@ -246,7 +241,7 @@ public class WXCircleViewPager extends ViewPager implements 
WXGestureObservable
   }
 
   public void destory() {
-
+mAutoScrollHandler.removeCallbacksAndMessages(null);
   }
 
   @Override
@@ -310,28 +305,4 @@ public class WXCircleViewPager extends ViewPager 
implements WXGestureObservable
   superSetCurrentItem(superGetCurrentItem() + 1, true);
 }
   }
-
-  @Override
-  protected void onDetachedFromWindow() {
-super.onDetachedFromWindow();
-mAutoScrollHandler.removeCallbacksAndMessages(null);
-  }
-
-  private static final class ScrollAction implements Runnable {
-private WeakReference targetRef;
-private ScrollAction(WXCircleViewPager target) {
-  this.targetRef = new WeakReference<>(target);
-}
-
-@Override
-public void run() {
-  WXLogUtils.d("[CircleViewPager] trigger auto play action");
-  WXCircleViewPager target;
-  if ((target = targetRef.get()) != null) {
-target.showNextItem();
-target.removeCallbacks(this);
-target.postDelayed(this, target.getIntervalTime());
-  }
-}
-  }
 }

[06/13] incubator-weex git commit: * [android] using independent Handler to handle auto scroll

2017-08-15 Thread misakuo

* [android] using independent Handler to handle auto scroll


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/99870708
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/99870708
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/99870708

Branch: refs/heads/0.16-dev
Commit: 998707085d749b2dc0289650c29d665396276c27
Parents: 7606dc7
Author: misakuo <misa...@apache.org>
Authored: Tue Aug 15 14:42:59 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Tue Aug 15 14:42:59 2017 +0800

--
 .../com/taobao/weex/ui/view/WXCircleViewPager.java | 13 +
 1 file changed, 9 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/99870708/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
index 160dcb1..f01702e 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
@@ -20,6 +20,8 @@ package com.taobao.weex.ui.view;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
 import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.util.AttributeSet;
@@ -46,6 +48,7 @@ public class WXCircleViewPager extends ViewPager implements 
WXGestureObservable
   private boolean needLoop = true;
   private boolean scrollable = true;
   private int mState = ViewPager.SCROLL_STATE_IDLE;
+  private Handler mAutoScrollHandler;
 
   private Runnable scrollAction = new ScrollAction(this);
 
@@ -56,6 +59,8 @@ public class WXCircleViewPager extends ViewPager implements 
WXGestureObservable
   }
 
   private void init() {
+mAutoScrollHandler = new Handler(Looper.getMainLooper());
+
 setOverScrollMode(View.OVER_SCROLL_NEVER);
 
 addOnPageChangeListener(new OnPageChangeListener() {
@@ -149,12 +154,12 @@ public class WXCircleViewPager extends ViewPager 
implements WXGestureObservable
*/
   public void startAutoScroll() {
 isAutoScroll = true;
-removeCallbacks(scrollAction);
-postDelayed(scrollAction, intervalTime);
+mAutoScrollHandler.removeCallbacks(scrollAction);
+mAutoScrollHandler.postDelayed(scrollAction, intervalTime);
   }
 
   public void pauseAutoScroll(){
-removeCallbacks(scrollAction);
+mAutoScrollHandler.removeCallbacks(scrollAction);
   }
 
   /**
@@ -162,7 +167,7 @@ public class WXCircleViewPager extends ViewPager implements 
WXGestureObservable
*/
   public void stopAutoScroll() {
 isAutoScroll = false;
-removeCallbacks(scrollAction);
+mAutoScrollHandler.removeCallbacks(scrollAction);
   }
 
   public boolean isAutoScroll() {

[12/13] incubator-weex git commit: * [android] merge

2017-08-15 Thread misakuo

* [android] merge


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7031a924
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7031a924
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7031a924

Branch: refs/heads/0.16-dev
Commit: 7031a924d94eb083ecf35f70e68a33ad568f7510
Parents: 2382887 8a8dfb8
Author: misakuo <misa...@apache.org>
Authored: Tue Aug 15 17:13:36 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Tue Aug 15 17:13:36 2017 +0800

--
 android/sdk/libs/x86/libweexjsc.so  | Bin 7570392 -> 12121924 bytes
 .../java/com/taobao/weex/common/Constants.java  |   2 +
 .../java/com/taobao/weex/dom/WXDomObject.java   |  15 +-
 doc/source/_posts/arkit.md  | 112 +++
 doc/source/_posts/cn/hello.md   |   6 -
 doc/source/_posts/hello_world.md|   7 -
 doc/source/_posts/test.md   |  14 -
 doc/source/cn/blog/index.md |   4 -
 .../cn/references/advanced/extend-to-ios.md |   4 +-
 .../advanced/integrate-devtool-to-android.md|  86 -
 doc/source/cn/references/common-style.md|   2 +
 doc/source/cn/references/components/text.md |   4 +-
 doc/source/cn/references/modules/animation.md   |   2 +-
 doc/source/references/advanced/extend-to-ios.md |   5 +-
 doc/source/references/common-style.md   |   2 +
 doc/source/references/components/text.md|   4 +-
 doc/source/references/modules/animation.md  |   2 +-
 doc/themes/weex/layout/_partial/header.ejs  |   1 +
 .../weex/layout/_partial/post/summary.ejs   |   1 +
 doc/themes/weex/source/css/blog.scss|   3 +
 doc/themes/weex/source/css/media-queries.scss   |   1 +
 doc/themes/weex/source/css/partial/header.scss  |   6 +-
 html5/runtime/normalize.js  |  13 +-
 ios/sdk/WeexSDK.xcodeproj/project.pbxproj   |  24 +-
 .../Sources/Component/WXComponent_internal.h|  12 +
 .../WeexSDK/Sources/Component/WXListComponent.m |   4 +-
 .../Sources/Display/WXComponent+Display.m   |  16 +-
 .../WeexSDK/Sources/Layout/WXComponent+Layout.m |   3 +-
 ios/sdk/WeexSDK/Sources/Model/WXComponent.m |  67 +++-
 .../WeexSDK/Sources/Module/WXAnimationLayout.h  |  49 ---
 .../WeexSDK/Sources/Module/WXAnimationLayout.m  | 115 ---
 .../WeexSDK/Sources/Module/WXAnimationModule.h  |   2 +
 .../WeexSDK/Sources/Module/WXAnimationModule.m  |  88 --
 ios/sdk/WeexSDK/Sources/Module/WXTransition.h   |  43 +++
 ios/sdk/WeexSDK/Sources/Module/WXTransition.m   | 311 +++
 ios/sdk/WeexSDK/Sources/Utility/WXConvert.m |   3 +-
 package.json|   4 +-
 pre-build/native-bundle-main.js |  10 +-
 test/run.sh |  18 +-
 39 files changed, 766 insertions(+), 299 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7031a924/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
--
diff --cc android/sdk/src/main/java/com/taobao/weex/common/Constants.java
index b9abceb,73c3399..92cb971
--- a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
+++ b/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
@@@ -170,7 -170,8 +170,9 @@@ public class Constants 
  String OFFSET = "offset";
  String ANIMATED = "animated";
  String STABLE = "stable";
+ String TRANSFORM = "transform";
+ String TRANSFORM_ORIGIN = "transformOrigin";
 +String KEEP_INDEX = "keepIndex";
  
  String INSERT_CELL_ANIMATION = "insertAnimation";
  String DELETE_CELL_ANIMATION = "deleteAnimation";

[07/13] incubator-weex git commit: * [android] using independent Handler to handle auto scroll

2017-08-15 Thread misakuo

* [android] using independent Handler to handle auto scroll


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/be89af83
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/be89af83
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/be89af83

Branch: refs/heads/0.16-dev
Commit: be89af838d49cb730527de9b1fb717c9885da50c
Parents: 9987070
Author: misakuo <misa...@apache.org>
Authored: Tue Aug 15 15:09:47 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Tue Aug 15 15:09:47 2017 +0800

--
 .../com/taobao/weex/ui/view/WXCircleViewPager.java| 14 ++
 1 file changed, 6 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/be89af83/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
index f01702e..6419e48 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
@@ -48,7 +48,7 @@ public class WXCircleViewPager extends ViewPager implements 
WXGestureObservable
   private boolean needLoop = true;
   private boolean scrollable = true;
   private int mState = ViewPager.SCROLL_STATE_IDLE;
-  private Handler mAutoScrollHandler;
+  private Handler mAutoScrollHandler = new Handler(Looper.getMainLooper());
 
   private Runnable scrollAction = new ScrollAction(this);
 
@@ -59,8 +59,6 @@ public class WXCircleViewPager extends ViewPager implements 
WXGestureObservable
   }
 
   private void init() {
-mAutoScrollHandler = new Handler(Looper.getMainLooper());
-
 setOverScrollMode(View.OVER_SCROLL_NEVER);
 
 addOnPageChangeListener(new OnPageChangeListener() {
@@ -220,12 +218,12 @@ public class WXCircleViewPager extends ViewPager 
implements WXGestureObservable
 switch (ev.getAction()) {
   case MotionEvent.ACTION_DOWN:
   case MotionEvent.ACTION_MOVE:
-removeCallbacks(scrollAction);
+mAutoScrollHandler.removeCallbacks(scrollAction);
 break;
   case MotionEvent.ACTION_UP:
   case MotionEvent.ACTION_CANCEL:
 if (isAutoScroll()) {
-  postDelayed(scrollAction, intervalTime);
+  mAutoScrollHandler.postDelayed(scrollAction, intervalTime);
 }
 break;
 }
@@ -301,7 +299,7 @@ public class WXCircleViewPager extends ViewPager implements 
WXGestureObservable
   @Override
   protected void onDetachedFromWindow() {
 super.onDetachedFromWindow();
-removeCallbacks(scrollAction);
+mAutoScrollHandler.removeCallbacks(scrollAction);
   }
 
   private static final class ScrollAction implements Runnable {
@@ -316,8 +314,8 @@ public class WXCircleViewPager extends ViewPager implements 
WXGestureObservable
   WXCircleViewPager target;
   if ((target = targetRef.get()) != null) {
 target.showNextItem();
-target.removeCallbacks(this);
-target.postDelayed(this, target.getIntervalTime());
+target.mAutoScrollHandler.removeCallbacks(this);
+target.mAutoScrollHandler.postDelayed(this, target.getIntervalTime());
   }
 }
   }

[05/13] incubator-weex git commit: + [android] add the 'keep-index' property for slider

2017-08-15 Thread misakuo

+ [android] add the 'keep-index' property for slider


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7606dc7d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7606dc7d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7606dc7d

Branch: refs/heads/0.16-dev
Commit: 7606dc7de79ecb82e589b224a736faccb6467308
Parents: 1215e8f
Author: misakuo <misa...@apache.org>
Authored: Fri Aug 11 14:26:41 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Fri Aug 11 14:26:41 2017 +0800

--
 .../sdk/src/main/java/com/taobao/weex/common/Constants.java| 1 +
 .../src/main/java/com/taobao/weex/ui/component/WXSlider.java   | 6 +-
 .../java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java| 3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7606dc7d/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java 
b/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
index e24ed22..b9abceb 100644
--- a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
+++ b/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
@@ -170,6 +170,7 @@ public class Constants {
 String OFFSET = "offset";
 String ANIMATED = "animated";
 String STABLE = "stable";
+String KEEP_INDEX = "keepIndex";
 
 String INSERT_CELL_ANIMATION = "insertAnimation";
 String DELETE_CELL_ANIMATION = "deleteAnimation";

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7606dc7d/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
index 8dc5918..4ef51f3 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
@@ -63,6 +63,7 @@ public class WXSlider extends WXVContainer {
   Map<String, Object> params = new HashMap<>();
   private float offsetXAccuracy = 0.1f;
   private int initIndex = -1;
+  private boolean keepIndex = false;
 
   public static class Creator implements ComponentCreator {
 public WXComponent createInstance(WXSDKInstance instance, WXDomObject 
node, WXVContainer parent) throws IllegalAccessException, 
InvocationTargetException, InstantiationException {
@@ -188,7 +189,7 @@ public class WXSlider extends WXVContainer {
   mViewPager.setCurrentItem(initIndex);
   initIndex = -1;
 } else {
-  if (mViewPager.getCurrentItem() == 0) {
+  if (!keepIndex) {
 mViewPager.setCurrentItem(0);
   }
 }
@@ -291,6 +292,9 @@ public class WXSlider extends WXVContainer {
 boolean scrollable = WXUtils.getBoolean(param, true);
 setScrollable(scrollable);
 return true;
+  case Constants.Name.KEEP_INDEX:
+this.keepIndex = WXUtils.getBoolean(param, false);
+return true;
 }
 return super.setProperty(key, param);
   }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7606dc7d/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java
index 18b88af..1fdba29 100644
--- 
a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java
+++ 
b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java
@@ -123,7 +123,8 @@ public class WXBaseCircleIndicator extends FrameLayout 
implements OnPageChangeLi
   public void setCircleViewPager(WXCircleViewPager mCircleViewPager) {
 this.mCircleViewPager = mCircleViewPager;
 if (this.mCircleViewPager != null) {
-  this.mCircleViewPager.setOnPageChangeListener(this);
+  this.mCircleViewPager.addOnPageChangeListener(this);
+  this.realCurrentItem = mCircleViewPager.getRealCurrentItem();
 }
 requestLayout();
   }

[08/13] incubator-weex git commit: * [android] using independent Handler to handle auto scroll

2017-08-15 Thread misakuo

* [android] using independent Handler to handle auto scroll


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/fe0b41ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/fe0b41ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/fe0b41ec

Branch: refs/heads/0.16-dev
Commit: fe0b41ec834e7d747dcab48732f34a5cec6d2e48
Parents: be89af8
Author: misakuo <misa...@apache.org>
Authored: Tue Aug 15 15:32:38 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Tue Aug 15 15:32:38 2017 +0800

--
 .../src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/fe0b41ec/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
index 6419e48..93cac73 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
@@ -48,7 +48,7 @@ public class WXCircleViewPager extends ViewPager implements 
WXGestureObservable
   private boolean needLoop = true;
   private boolean scrollable = true;
   private int mState = ViewPager.SCROLL_STATE_IDLE;
-  private Handler mAutoScrollHandler = new Handler(Looper.getMainLooper());
+  private Handler mAutoScrollHandler;
 
   private Runnable scrollAction = new ScrollAction(this);
 
@@ -59,6 +59,7 @@ public class WXCircleViewPager extends ViewPager implements 
WXGestureObservable
   }
 
   private void init() {
+mAutoScrollHandler = new Handler(Looper.getMainLooper());
 setOverScrollMode(View.OVER_SCROLL_NEVER);
 
 addOnPageChangeListener(new OnPageChangeListener() {

[03/13] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev

2017-08-15 Thread misakuo

Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-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/043bc963
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/043bc963
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/043bc963

Branch: refs/heads/0.16-dev
Commit: 043bc9631801a6e74e6c4147ab057b6f17b5f27c
Parents: a2e79af 5894ef6
Author: misakuo <misa...@apache.org>
Authored: Thu Aug 10 17:03:43 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Thu Aug 10 17:03:43 2017 +0800

--
 .gitignore  | 2 +-
 .travis.yml | 8 +-
 android/build.gradle| 8 +-
 .../java/com/taobao/weex/bridge/WXBridge.java   | 8 +-
 .../com/taobao/weex/bridge/WXBridgeManager.java |36 +-
 .../taobao/weex/bridge/WXValidateProcessor.java | 7 +-
 .../java/com/taobao/weex/common/Constants.java  | 1 +
 .../java/com/taobao/weex/dom/WXDomObject.java   |17 +-
 .../com/taobao/weex/dom/WXTextDomObject.java|91 +-
 .../dom/action/AbstractAddElementAction.java| 2 +-
 .../taobao/weex/dom/action/AnimationAction.java | 1 +
 .../ui/animation/CameraDistanceProperty.java|54 +
 .../weex/ui/animation/WXAnimationBean.java  |86 +-
 .../taobao/weex/ui/component/WXComponent.java   |16 -
 .../java/com/taobao/weex/utils/WXViewUtils.java | 4 +-
 build/build.js  | 1 +
 build/config.js |17 +-
 html5/frameworks/legacy/core/array.js   | 4 +
 html5/frameworks/legacy/core/object.js  | 6 +
 html5/frameworks/legacy/static/create.js| 7 +-
 html5/frameworks/legacy/vm/directive.js | 6 +
 html5/frameworks/vanilla/index.js   |35 +-
 html5/render/vue/README.md  |15 +
 html5/render/vue/components/image.js|58 +-
 html5/render/vue/config.js  |10 +-
 html5/render/vue/core/node.js   |27 +-
 html5/render/vue/lib/gesture.js | 6 +
 html5/render/vue/modules/modal/toast.js |23 +-
 html5/runtime/callback-manager.js   |12 +-
 html5/runtime/config.js | 5 +-
 html5/runtime/normalize.js  |   107 +
 html5/runtime/task-center.js|59 +-
 html5/runtime/vdom/document.js  | 2 +
 html5/runtime/vdom/element.js   |15 +-
 html5/test/render/vue/core/node.js  | 2 +
 ios/.gitignore  | 1 +
 .../WeexDemo.xcodeproj/project.pbxproj  |24 +-
 ios/playground/WeexDemo/AppDelegate.m   | 8 +-
 ios/playground/WeexDemo/WXDemoViewController.m  | 2 -
 ios/playground/WeexDemo/WXExtModule.h   |26 +
 ios/playground/WeexDemo/WXExtModule.m   |43 +
 ios/sdk/WeexSDK.xcodeproj/project.pbxproj   | 8 +
 .../Component/Recycler/WXRecyclerComponent.m|58 +-
 .../Recycler/WXRecyclerDragController.h |52 +
 .../Recycler/WXRecyclerDragController.m |   208 +
 .../Sources/Component/WXImageComponent.m|   150 +-
 .../WeexSDK/Sources/Loader/WXResourceLoader.m   | 2 +-
 ios/sdk/WeexSDK/Sources/WeexSDK.h   | 1 +
 package.json|17 +-
 packages/weex-js-framework/.npmignore   | 4 +
 packages/weex-js-framework/index.js | 26001 +
 packages/weex-js-framework/index.min.js | 1 +
 packages/weex-js-framework/package.json |22 +
 packages/weex-js-runtime/.npmignore | 4 +
 packages/weex-js-runtime/index.js   |  4088 +++
 packages/weex-js-runtime/index.min.js   | 1 +
 packages/weex-js-runtime/index.min.js.gz|   Bin 0 -> 13215 bytes
 packages/weex-js-runtime/package.json   |22 +
 packages/weex-legacy-framework/.npmignore   | 4 +
 packages/weex-legacy-framework/index.js |  5770 
 packages/weex-legacy-framework/index.min.js | 1 +
 packages/weex-legacy-framework/package.json |22 +
 packages/weex-vue-render/README.md  |15 +
 packages/weex-vue-render/package.json   | 2 +-
 pre-build/native-bundle-main.js |16 +-
 scripts/commit-msg.sh   | 2 +-
 test/pages/components/iconfont.vue  |71 +
 test/pages/components/input-event.vue   |65 +
 test/pages/components/refresh-loading.vue   |   115 +
 test/pages/components/switch-event.vue  |60 +
 test/pages/components/web-event.vue |56 +
 test/pages/inc

[11/13] incubator-weex git commit: Revert: + [android] return contentSize on getComponentRect when target component implemented ContentMeasurable @notdanger

2017-08-15 Thread misakuo

Revert: + [android] return contentSize on getComponentRect when target 
component implemented ContentMeasurable @notdanger


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/23828878
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/23828878
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/23828878

Branch: refs/heads/0.16-dev
Commit: 238288782c20cbe420bb0f0192a7b09d56d275fb
Parents: d336ad2
Author: misakuo <misa...@apache.org>
Authored: Tue Aug 15 17:09:11 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Tue Aug 15 17:09:11 2017 +0800

--
 .../weex/dom/action/GetComponentRectAction.java | 12 
 .../weex/ui/component/ContentMeasurable.java| 29 
 .../taobao/weex/ui/component/WXScroller.java| 16 +--
 .../ui/component/list/BasicListComponent.java   | 18 +---
 4 files changed, 2 insertions(+), 73 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/23828878/android/sdk/src/main/java/com/taobao/weex/dom/action/GetComponentRectAction.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/dom/action/GetComponentRectAction.java
 
b/android/sdk/src/main/java/com/taobao/weex/dom/action/GetComponentRectAction.java
index d622248..cf8e224 100644
--- 
a/android/sdk/src/main/java/com/taobao/weex/dom/action/GetComponentRectAction.java
+++ 
b/android/sdk/src/main/java/com/taobao/weex/dom/action/GetComponentRectAction.java
@@ -28,7 +28,6 @@ import com.taobao.weex.bridge.JSCallback;
 import com.taobao.weex.bridge.SimpleJSCallback;
 import com.taobao.weex.dom.RenderAction;
 import com.taobao.weex.dom.RenderActionContext;
-import com.taobao.weex.ui.component.ContentMeasurable;
 import com.taobao.weex.ui.component.WXComponent;
 import com.taobao.weex.utils.WXViewUtils;
 
@@ -75,17 +74,6 @@ class GetComponentRectAction implements RenderAction {
 size.put("top", getWebPxValue(sizes.top,viewPort));
 options.put("size", size);
 options.put("result", true);
-
-if (component instanceof ContentMeasurable) {
-  Rect contentFrame = ((ContentMeasurable) 
component).getContentFrame();
-  if (contentFrame != null) {
-Map<String, Float> contentSize = new HashMap<>(2);
-contentSize.put("width", getWebPxValue(contentFrame.width(), 
viewPort));
-contentSize.put("height", getWebPxValue(contentFrame.height(), 
viewPort));
-options.put("contentSize", contentSize);
-  }
-}
-
   } else {
 options.put("errMsg", "Component does not exist");
   }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/23828878/android/sdk/src/main/java/com/taobao/weex/ui/component/ContentMeasurable.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/ContentMeasurable.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/ContentMeasurable.java
deleted file mode 100644
index b804d5b..000
--- 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/ContentMeasurable.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.taobao.weex.ui.component;
-
-import android.graphics.Rect;
-
-/**
- * Created by moxun on 2017/7/31.
- */
-
-public interface ContentMeasurable {
-  Rect getContentFrame();
-}

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/23828878/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java
index 49037ca..627776f 100644
---

[02/13] incubator-weex git commit: Revert "Revert "+ [android] ignore set index when current index not zero @notdanger""

2017-08-15 Thread misakuo

Revert "Revert "+ [android] ignore set index when current index not zero 
@notdanger""

This reverts commit 947e8510b5f6aabd21ac6c6ada1ff3b0cd0d35eb.


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a2e79af4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a2e79af4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a2e79af4

Branch: refs/heads/0.16-dev
Commit: a2e79af4c238a3a09bef1a11127dca2066e4b987
Parents: eeff020
Author: misakuo <misa...@apache.org>
Authored: Wed Aug 9 16:18:52 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Wed Aug 9 16:18:52 2017 +0800

--
 .../sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a2e79af4/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java 
b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
index dd593f9..8dc5918 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
@@ -188,7 +188,9 @@ public class WXSlider extends WXVContainer {
   mViewPager.setCurrentItem(initIndex);
   initIndex = -1;
 } else {
-  mViewPager.setCurrentItem(0);
+  if (mViewPager.getCurrentItem() == 0) {
+mViewPager.setCurrentItem(0);
+  }
 }
 if (mIndicator != null) {
   mIndicator.getHostView().forceLayout();

< 1 2 3 4 >

201 - 300 of 380 matches

Mail list logo