You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by mi...@apache.org on 2018/01/06 07:15:49 UTC
[4/5] incubator-weex git commit: * [android] merge changes from master
* [android] merge changes from master
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ea038079
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ea038079
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ea038079
Branch: refs/heads/master
Commit: ea0380790e1694c7bbe7f7ef62f578dc333b8d44
Parents: f39a402 6ed0074
Author: misakuo <mi...@apache.org>
Authored: Thu Dec 21 12:45:24 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Thu Dec 21 12:45:24 2017 +0800
----------------------------------------------------------------------
WeexSDK.podspec | 2 +-
android/build.gradle | 10 +-
.../java/com/alibaba/weex/IndexActivity.java | 4 +-
.../java/com/alibaba/weex/WXApplication.java | 3 +
.../DefaultAccessibilityRoleAdapter.java | 62 +++
.../weex/extend/component/WXParallax.java | 24 +-
android/sdk/libs/armeabi/libweexjsb.so | Bin 22620 -> 22624 bytes
android/sdk/libs/armeabi/libweexjsc.so | Bin 335324 -> 335340 bytes
android/sdk/libs/armeabi/libweexjss.so | Bin 6754016 -> 6754020 bytes
android/sdk/libs/armeabi/libweexjst.so | Bin 22552 -> 22552 bytes
android/sdk/libs/x86/libweexjsc.so | Bin 12126020 -> 12126020 bytes
.../java/com/taobao/weex/WXEnvironment.java | 7 +-
.../java/com/taobao/weex/WXRenderErrorCode.java | 65 ++-
.../main/java/com/taobao/weex/WXSDKEngine.java | 15 +-
.../java/com/taobao/weex/WXSDKInstance.java | 145 +++++--
.../main/java/com/taobao/weex/WXSDKManager.java | 10 +
.../adapter/IWXAccessibilityRoleAdapter.java | 27 ++
.../weex/appfram/pickers/DatePickerImpl.java | 5 +-
.../weex/appfram/pickers/WXPickersModule.java | 9 +-
.../java/com/taobao/weex/bridge/WXBridge.java | 4 +-
.../com/taobao/weex/bridge/WXBridgeManager.java | 398 +++++++++++--------
.../com/taobao/weex/bridge/WXModuleManager.java | 11 +-
.../taobao/weex/bridge/WXServiceManager.java | 20 +-
.../java/com/taobao/weex/common/Constants.java | 5 +
.../com/taobao/weex/common/WXErrorCode.java | 60 ++-
.../com/taobao/weex/common/WXJSService.java | 6 +-
.../java/com/taobao/weex/common/WXThread.java | 11 +-
.../java/com/taobao/weex/dom/WXDomManager.java | 21 +-
.../java/com/taobao/weex/dom/WXDomObject.java | 188 +++++++--
.../dom/action/AbstractAddElementAction.java | 26 +-
.../dom/action/AbstractLayoutFinishAction.java | 7 +-
.../weex/dom/action/AddElementAction.java | 19 +-
.../taobao/weex/dom/action/AddEventAction.java | 20 +-
.../taobao/weex/dom/action/AnimationAction.java | 13 +-
.../weex/dom/action/CreateBodyAction.java | 11 +-
.../weex/dom/action/ModuleInvocationAction.java | 8 +
.../weex/dom/action/MoveElementAction.java | 13 +-
.../weex/dom/action/RemoveElementAction.java | 17 +-
.../weex/dom/action/RemoveEventAction.java | 9 +-
.../weex/dom/action/ScrollToElementAction.java | 4 -
.../weex/dom/action/UpdateAttributeAction.java | 10 +-
.../weex/dom/action/UpdateFinishAction.java | 5 -
.../weex/dom/action/UpdateStyleAction.java | 12 +-
.../weex/dom/transition/WXTransition.java | 263 +++++++++---
.../ui/component/AbstractEditComponent.java | 13 +-
.../taobao/weex/ui/component/WXComponent.java | 49 ++-
.../com/taobao/weex/ui/component/WXEmbed.java | 8 +-
.../taobao/weex/ui/component/WXScroller.java | 4 +-
.../com/taobao/weex/ui/component/WXSlider.java | 2 +
.../taobao/weex/ui/component/WXVContainer.java | 11 +-
.../ui/component/list/BasicListComponent.java | 5 +-
.../weex/ui/component/list/WXListComponent.java | 17 +-
.../list/template/WXRecyclerTemplateList.java | 17 +-
.../com/taobao/weex/ui/view/WXEditText.java | 6 -
.../weex/ui/view/WXHorizontalScrollView.java | 6 -
.../weex/ui/view/listview/WXRecyclerView.java | 9 +-
.../ui/view/refresh/core/WXRefreshView.java | 9 +-
.../ui/view/refresh/core/WXSwipeLayout.java | 12 +-
.../refresh/wrapper/BounceRecyclerView.java | 7 -
.../refresh/wrapper/BounceScrollerView.java | 6 -
.../com/taobao/weex/utils/BoxShadowUtil.java | 257 ++++++++----
.../com/taobao/weex/utils/WXExceptionUtils.java | 93 +++++
.../taobao/weex/utils/WXSoInstallMgrSdk.java | 71 ++--
.../java/com/taobao/weex/utils/WXViewUtils.java | 17 +-
.../taobao/weex/bridge/WXBridgeManagerTest.java | 3 +-
.../com/taobao/weex/dom/WXDomStatementTest.java | 8 +-
.../taobao/weex/utils/WXExceptionUtilsTest.java | 73 ++++
doc/source/cn/references/common-style.md | 2 +-
doc/source/cn/references/components/scroller.md | 4 +
doc/source/cn/references/weex-variable.md | 2 +-
doc/source/cn/releasenote.md | 29 ++
doc/source/references/common-style.md | 2 +-
doc/source/references/components/scroller.md | 26 +-
doc/source/references/weex-variable.md | 2 +-
doc/source/releasenote.md | 30 ++
examples/vue/transition.vue | 57 ++-
html5/render/vue/README.md | 10 +-
.../vue/components/scrollable/waterfall.js | 45 ++-
html5/render/vue/components/switch.js | 27 +-
html5/render/vue/core/style.js | 24 +-
html5/render/vue/utils/style.js | 4 +-
html5/runtime/api/WeexInstance.js | 52 ++-
html5/runtime/api/init.js | 5 +-
html5/runtime/bridge/CallbackManager.js | 4 +-
html5/runtime/bridge/TaskCenter.js | 6 +-
html5/runtime/bridge/debug.js | 65 +++
html5/runtime/bridge/receiver.js | 4 +-
html5/runtime/utils.js | 22 -
html5/runtime/vdom/Document.js | 2 +-
html5/runtime/vdom/Element.js | 5 +-
html5/runtime/vdom/directive.js | 69 ----
html5/test/render/vue/modules/modal.js | 9 +-
html5/test/render/vue/utils/style.js | 7 +-
html5/test/unit/runtime/vdom/directive.js | 101 -----
.../WeexDemo.xcodeproj/project.pbxproj | 12 +-
.../AppIcon.appiconset/Contents.json | 5 +
.../LaunchImage.launchimage/Contents.json | 122 +-----
.../LaunchImage.launchimage/Default-4.7@2x.png | Bin 24902 -> 0 bytes
.../Default-568h@2x-1.png | Bin 22184 -> 0 bytes
.../LaunchImage.launchimage/Default.png | Bin 6733 -> 0 bytes
.../LaunchImage.launchimage/Default@2x-1.png | Bin 19694 -> 0 bytes
.../LaunchImage.launchimage/Default@3x-1.png | Bin 66666 -> 0 bytes
.../LaunchImage.launchimage/Default@3x.png | Bin 66666 -> 0 bytes
.../LaunchImage.launchimage/Retinal HD 4.7.png | Bin 0 -> 33603 bytes
.../LaunchImage.launchimage/Retinal HD 5.5.png | Bin 0 -> 72798 bytes
.../iPhone5.5-landscape.png | Bin 0 -> 66768 bytes
.../iPhoneX-landscape.png | Bin 0 -> 68749 bytes
.../LaunchImage.launchimage/iPhoneX@3x.png | Bin 0 -> 68622 bytes
.../WeexDemo/WXConfigCenterDefaultImpl.m | 2 +-
ios/playground/WeexDemo/WXDemoViewController.m | 21 +-
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 12 +
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 2 +-
.../Component/Recycler/WXMultiColumnLayout.m | 5 +
.../Component/Recycler/WXRecyclerComponent.m | 15 +
.../Sources/Component/WXComponent_internal.h | 3 +-
.../WeexSDK/Sources/Component/WXEditComponent.m | 20 +-
.../Sources/Component/WXImageComponent.m | 8 +-
.../WeexSDK/Sources/Component/WXListComponent.m | 10 +
.../Sources/Component/WXScrollerComponent.m | 66 ++-
.../WeexSDK/Sources/Component/WXTextComponent.m | 90 +++--
ios/sdk/WeexSDK/Sources/Component/WXTransform.m | 35 +-
.../WeexSDK/Sources/Component/WXWebComponent.m | 12 +-
ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 1 +
ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h | 10 +
.../WeexSDK/Sources/Layout/WXComponent+Layout.m | 8 +-
.../Sources/Manager/WXComponentManager.m | 24 +-
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 44 +-
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.h | 2 +-
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 12 +-
.../WeexSDK/Sources/Module/WXAnimationModule.m | 8 +-
ios/sdk/WeexSDK/Sources/Module/WXLocaleModule.h | 27 ++
ios/sdk/WeexSDK/Sources/Module/WXLocaleModule.m | 41 ++
ios/sdk/WeexSDK/Sources/Module/WXTransition.h | 4 +-
ios/sdk/WeexSDK/Sources/Module/WXTransition.m | 242 ++++++-----
.../WeexSDK/Sources/Monitor/WXExceptionUtils.m | 2 +-
ios/sdk/WeexSDK/Sources/Utility/WXConvert.m | 54 ++-
ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 2 +-
ios/sdk/WeexSDK/Sources/Utility/WXUtility.h | 4 +-
ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 31 +-
package.json | 2 +-
packages/weex-vue-render/README.md | 10 +-
packages/weex-vue-render/package.json | 2 +-
test/pages/components/web-event.vue | 14 +-
test/screenshot/border-android.png | Bin 160024 -> 159136 bytes
test/screenshot/compositing-ios.png | Bin 229534 -> 236255 bytes
test/screenshot/image-resize-ios.png | Bin 138103 -> 145574 bytes
test/scripts/components/web-event.test.js | 4 +-
147 files changed, 2595 insertions(+), 1260 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ea038079/android/playground/app/src/main/java/com/alibaba/weex/WXApplication.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ea038079/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
----------------------------------------------------------------------
diff --cc android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
index da756ce,923ff91..4ae572a
--- a/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
@@@ -30,9 -28,9 +30,11 @@@ import android.text.TextUtils
import com.taobao.weappplus_sdk.BuildConfig;
import com.taobao.weex.common.WXConfig;
+import com.taobao.weex.utils.FontDO;
+ import com.taobao.weex.common.WXErrorCode;
import com.taobao.weex.utils.LogLevel;
+import com.taobao.weex.utils.TypefaceUtil;
+ import com.taobao.weex.utils.WXExceptionUtils;
import com.taobao.weex.utils.WXLogUtils;
import com.taobao.weex.utils.WXSoInstallMgrSdk;
import com.taobao.weex.utils.WXUtils;