Merge remote-tracking branch 'remotes/upstream/release-0.16' into android-feature-text-rtl
# Conflicts: # android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.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/c2db749c Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c2db749c Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c2db749c Branch: refs/heads/master Commit: c2db749c754790d77c62ee331fc6ae1509d6465c Parents: 8e41fb3 3cf15bc Author: misakuo <misa...@apache.org> Authored: Wed Oct 11 10:09:29 2017 +0800 Committer: misakuo <misa...@apache.org> Committed: Wed Oct 11 10:09:29 2017 +0800 ---------------------------------------------------------------------- .github/PULL_REQUEST_TEMPLATE.md | 34 +- CONTRIBUTING.md | 20 +- README.md | 1 + WeexSDK.podspec | 2 +- android/sdk/libs/armeabi/libweexjsb.so | Bin 22556 -> 22620 bytes android/sdk/libs/armeabi/libweexjsc.so | Bin 325660 -> 342264 bytes android/sdk/libs/armeabi/libweexjss.so | Bin 6754016 -> 6754016 bytes android/sdk/libs/x86/libweexjsc.so | Bin 12121924 -> 12126020 bytes .../main/java/com/taobao/weex/WXSDKEngine.java | 3 +- .../java/com/taobao/weex/WXSDKInstance.java | 11 +- .../taobao/weex/bridge/NativeInvokeHelper.java | 2 +- .../java/com/taobao/weex/bridge/WXBridge.java | 43 ++- .../com/taobao/weex/bridge/WXBridgeManager.java | 184 ++++++--- .../java/com/taobao/weex/common/IWXBridge.java | 9 + .../main/java/com/taobao/weex/dom/WXAttr.java | 15 +- .../com/taobao/weex/dom/WXCellDomObject.java | 11 + .../java/com/taobao/weex/dom/WXDomManager.java | 4 + .../java/com/taobao/weex/dom/WXDomObject.java | 19 +- .../main/java/com/taobao/weex/dom/WXEvent.java | 3 + .../taobao/weex/dom/WXRecyclerDomObject.java | 50 ++- .../com/taobao/weex/dom/WXTextDomObject.java | 39 +- .../com/taobao/weex/dom/binding/ELUtils.java | 14 +- .../taobao/weex/dom/binding/WXStatement.java | 93 +---- .../java/com/taobao/weex/dom/flex/CSSNode.java | 32 +- .../com/taobao/weex/el/parse/ArrayStack.java | 3 - .../java/com/taobao/weex/el/parse/Block.java | 7 +- .../java/com/taobao/weex/el/parse/Operator.java | 3 +- .../com/taobao/weex/el/parse/Operators.java | 3 - .../java/com/taobao/weex/el/parse/Symbol.java | 3 +- .../java/com/taobao/weex/el/parse/Token.java | 5 +- .../taobao/weex/ui/component/WXComponent.java | 26 +- .../weex/ui/component/binding/Layouts.java | 106 ++++- .../weex/ui/component/binding/Statements.java | 122 ++++-- .../ui/component/list/BasicListComponent.java | 82 +--- .../taobao/weex/ui/component/list/WXCell.java | 30 ++ .../list/template/CellLifecycleManager.java | 211 ---------- .../component/list/template/DomTreeBuilder.java | 100 +++++ .../component/list/template/TemplateCache.java | 30 ++ .../list/template/TemplateViewHolder.java | 9 + .../list/template/WXRecyclerTemplateList.java | 387 ++++++++++++++----- .../weex/ui/view/WXBaseCircleIndicator.java | 40 +- .../com/taobao/weex/utils/BoxShadowUtil.java | 65 ++-- .../java/com/taobao/weex/utils/WXFileUtils.java | 26 ++ .../java/com/taobao/weex/utils/WXLogUtils.java | 17 + .../taobao/weex/utils/WXReflectionUtils.java | 6 + .../taobao/weex/utils/WXSoInstallMgrSdk.java | 56 +++ .../java/com/taobao/weex/WXSDKEngineTest.java | 12 +- .../java/com/taobao/weex/el/ParserTest.java | 4 +- .../ui/component/binding/StatementTest.java | 8 +- .../com/taobao/weex/utils/WXFileUtilsTest.java | 8 + .../taobao/weex/bridge/WXWebsocketBridge.java | 15 + dangerfile-android.js | 8 +- dangerfile-ios.js | 10 +- dangerfile-jsfm.js | 8 +- dangerfile.js | 6 +- doc/source/cn/guide/set-up-env.md | 4 +- .../cn/references/advanced/extend-to-ios.md | 4 +- doc/source/cn/references/components/image.md | 24 ++ doc/source/cn/releasenote.md | 51 +++ doc/source/guide/set-up-env.md | 34 +- doc/source/references/advanced/extend-to-ios.md | 4 +- doc/source/references/components/image.md | 22 ++ doc/source/releasenote.md | 51 +++ examples/component/web-demo.we | 3 +- html5/render/browser/extend/api/stream.js | 2 +- .../RecycleList/WXComponent+DataBinding.h | 2 +- .../RecycleList/WXComponent+DataBinding.mm | 2 + .../Sources/Component/WXComponent_internal.h | 2 + .../Sources/Component/WXImageComponent.m | 89 ++--- .../Sources/Component/WXScrollerComponent.m | 38 +- .../WeexSDK/Sources/Component/WXTextComponent.m | 3 +- ios/sdk/WeexSDK/Sources/Component/WXTransform.m | 5 +- .../WeexSDK/Sources/Component/WXWebComponent.m | 2 + .../Sources/Controller/WXBaseViewController.h | 2 +- .../Sources/Controller/WXBaseViewController.m | 6 + .../Sources/Controller/WXRootViewController.m | 1 + .../WeexSDK/Sources/Events/WXComponent+Events.m | 15 +- .../WeexSDK/Sources/Loader/WXResourceLoader.m | 10 + .../WeexSDK/Sources/Manager/WXTracingManager.m | 6 +- .../WeexSDK/Sources/Module/WXNavigatorModule.h | 3 +- .../WeexSDK/Sources/Module/WXWebSocketModule.m | 2 +- ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 2 +- ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 7 +- ios/sdk/WeexSDK/Sources/View/WXView.m | 9 + ios/sdk/WeexSDKTests/WXStreamModuleTests.m | 2 +- pre-build/native-bundle-main.js | 16 +- scripts/commit-msg.sh | 6 +- 87 files changed, 1609 insertions(+), 825 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c2db749c/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java ---------------------------------------------------------------------- diff --cc android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java index eea8df9,e9a5c79..c66e1af --- a/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java +++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXTextDomObject.java @@@ -37,9 -39,11 +37,12 @@@ import android.text.TextUtils import android.text.style.AbsoluteSizeSpan; import android.text.style.AlignmentSpan; import android.text.style.ForegroundColorSpan; + import android.util.Log; + + import com.taobao.weex.WXEnvironment; import com.taobao.weex.common.Constants; + import com.taobao.weex.common.WXThread; import com.taobao.weex.dom.flex.CSSConstants; import com.taobao.weex.dom.flex.CSSNode; import com.taobao.weex.dom.flex.FloatUtil;
