You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/04/11 03:14:56 UTC
[1/5] incubator-weex git commit: * [android] update support tablet
Repository: incubator-weex
Updated Branches:
refs/heads/0.12-dev 41ed95b84 -> 2697555b9
* [android] update support tablet
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/22819909
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/22819909
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/22819909
Branch: refs/heads/0.12-dev
Commit: 22819909797700cf68d9cded1f076e78d214c3e9
Parents: a1c51ce
Author: xkli <56...@qq.com>
Authored: Fri Mar 31 16:15:45 2017 +0800
Committer: xkli <56...@qq.com>
Committed: Fri Mar 31 16:15:45 2017 +0800
----------------------------------------------------------------------
.../main/java/com/taobao/weex/WXEnvironment.java | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/22819909/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 8935820..0483faf 100755
--- a/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
@@ -341,7 +341,9 @@ public class WXEnvironment {
/**
* Tell whether Weex can run on current hardware.
* @return true if weex can run on current hardware, otherwise false.
+ * Weex has removed the restrictions on the tablet, please use {@link #isCPUSupport()}
*/
+ @Deprecated
public static boolean isHardwareSupport() {
boolean excludeX86 = "true".equals(options.get(SETTING_EXCLUDE_X86SUPPORT));
boolean isX86AndExcluded = WXSoInstallMgrSdk.isX86() && excludeX86;
@@ -354,6 +356,21 @@ public class WXEnvironment {
return isCPUSupport && !WXUtils.isTabletDevice();
}
+ /**
+ * Determine whether Weex supports the current CPU architecture
+ * @return true when support
+ */
+ public static boolean isCPUSupport(){
+ boolean excludeX86 = "true".equals(options.get(SETTING_EXCLUDE_X86SUPPORT));
+ boolean isX86AndExcluded = WXSoInstallMgrSdk.isX86() && excludeX86;
+ boolean isCPUSupport = WXSoInstallMgrSdk.isCPUSupport() && !isX86AndExcluded;
+ if (WXEnvironment.isApkDebugable()) {
+ WXLogUtils.d("WXEnvironment.sSupport:" + isCPUSupport
+ + "isX86AndExclueded: "+ isX86AndExcluded);
+ }
+ return isCPUSupport;
+ }
+
public static boolean isApkDebugable() {
if (sApplication == null) {
return false;
[3/5] incubator-weex git commit: Merge branch '0.12-dev' into
0.12-dev-pad
Posted by so...@apache.org.
Merge branch '0.12-dev' into 0.12-dev-pad
* 0.12-dev: (22 commits)
* [jsfm] update jsfm version to 0.19.17 for fixed Vue leak
* [jsfm] v0.19.17
* [jsfm] update weex-vue-framework to 2.2.1-weex.2 && destroy runtime document
* [android] fix setSize when defaultHeight is use screen height
* [jsfm] update vue framework to 2.2.2-weex.1
* [test] Closes #141: invalid/pullrequest
* [test] Closes #141: invalid/pullrequest
* [test] fix CI
* [android] update imageView
* [android] avoid remove-readd view when fixed component view already moved
* [android] avoid remove-readd view when fixed component view already moved
* [html5] clear log.
+ [ios] change to color
* [ios] fix box shadow shadowColor get method circularly called
* [ios] add default value
* [ios] refactor gradient-color method
* [html5] update build & test config.
* [html5] fix soucemap with flow.
* [html5] fix dangerfile.
* [html5] remove unused dependencies.
...
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/61f7ad81
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/61f7ad81
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/61f7ad81
Branch: refs/heads/0.12-dev
Commit: 61f7ad811d88b8cdd0de1cddc983ba6a9d11e913
Parents: 71bf802 41c8ef6
Author: xkli <56...@qq.com>
Authored: Thu Apr 6 15:08:32 2017 +0800
Committer: xkli <56...@qq.com>
Committed: Thu Apr 6 15:08:32 2017 +0800
----------------------------------------------------------------------
.eslintrc | 3 +-
android/sdk/assets/main.js | 14 +-
.../java/com/taobao/weex/WXSDKInstance.java | 17 +-
.../taobao/weex/ui/component/WXComponent.java | 7 +-
.../com/taobao/weex/ui/component/WXImage.java | 6 +
build/config.js | 8 +-
build/karma.vue.conf.js | 69 ++++++--
dangerfile.js | 6 +-
html5/render/vue/components/a.js | 3 +-
html5/render/vue/components/div.js | 10 +-
html5/render/vue/components/image.js | 2 +-
html5/render/vue/mixins/base.js | 7 +
html5/test/render/index.js | 3 -
html5/test/render/vue/components/a.js | 38 +++++
html5/test/render/vue/components/div.js | 29 ++++
html5/test/render/vue/components/image.js | 44 +++---
html5/test/render/vue/components/list.js | 21 ++-
html5/test/render/vue/components/switch.js | 35 +++--
html5/test/render/vue/components/text.js | 42 ++---
html5/test/render/vue/components/web.js | 14 +-
html5/test/render/vue/examples/list-cell.js | 16 +-
html5/test/render/vue/helper.js | 157 ++++++++++++++++---
html5/test/render/vue/utils.js | 1 -
html5/test/render/vue/validator/check.js | 1 -
html5/test/render/vue/validator/index.js | 1 -
html5/test/render/vue/validator/prop.js | 1 -
html5/test/render/vue/validator/style.js | 1 -
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 8 -
ios/sdk/WeexSDK/Resources/main.js | 14 +-
.../Component/WXComponent+GradientColor.h | 18 ---
.../Component/WXComponent+GradientColor.m | 124 ---------------
.../Sources/Component/WXComponent_internal.h | 3 +
.../Sources/Display/WXComponent+BoxShadow.h | 2 +-
.../Sources/Display/WXComponent+BoxShadow.m | 10 +-
ios/sdk/WeexSDK/Sources/Display/WXInnerLayer.h | 2 +-
ios/sdk/WeexSDK/Sources/Display/WXInnerLayer.m | 4 +-
.../WeexSDK/Sources/Layout/WXComponent+Layout.m | 3 +-
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 29 +++-
ios/sdk/WeexSDK/Sources/Utility/WXBoxShadow.h | 2 +-
ios/sdk/WeexSDK/Sources/Utility/WXBoxShadow.m | 25 +--
ios/sdk/WeexSDK/Sources/Utility/WXUtility.h | 27 ++++
ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 101 ++++++++++++
.../Sources/View/WXComponent+ViewManagement.m | 1 -
package.json | 11 +-
test/ci-funcs.sh | 3 +-
45 files changed, 575 insertions(+), 368 deletions(-)
----------------------------------------------------------------------
[5/5] incubator-weex git commit: Merge branch '0.12-dev-pad' of
github.com:xkli/incubator-weex into 0.12-dev This closes #204
Posted by so...@apache.org.
Merge branch '0.12-dev-pad' of github.com:xkli/incubator-weex into 0.12-dev
This closes #204
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/2697555b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/2697555b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/2697555b
Branch: refs/heads/0.12-dev
Commit: 2697555b9acc6fe6892728e94f82f79fce25ae6d
Parents: 41ed95b 3df8d86
Author: sospartan <so...@apache.org>
Authored: Tue Apr 11 11:14:26 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Tue Apr 11 11:14:26 2017 +0800
----------------------------------------------------------------------
.../main/java/com/taobao/weex/WXEnvironment.java | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2697555b/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
----------------------------------------------------------------------
diff --cc android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
index 6426841,44c5a77..50449d4
mode 100644,100755..100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
[2/5] incubator-weex git commit: Merge branch '0.12-dev' into
0.12-dev-pad
Posted by so...@apache.org.
Merge branch '0.12-dev' into 0.12-dev-pad
* 0.12-dev: (158 commits)
* [test] update test
* [ios] fix compiler complains
* [html5] clear logs.
* [html5] fix danger.js
* [html5] update
* [html5] true to ignore.
* [html5] add flow ignore paths to danger.js
* [html5] fix lint & add flow check for building vue-render.
* [html5] add flow-type supported.
* [html5] use warning tip.
* [html5] fix modules.
* [html5] fix path.
* [html5] support @appear.native for compatiblitiy with weex native.
* [html5] fix postcss config for vue-loader.
* [html5] fix scroll direction of event.contentOffset.y
* [html5] update
* [html5] add comp-dom map for readme.
* [html5] fix v-model binding for textarea.
* [html5] hyphenate static style.
* [html5] fix indicator's zIndex.
...
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/71bf802f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/71bf802f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/71bf802f
Branch: refs/heads/0.12-dev
Commit: 71bf802ff72a50736dc1e2630d051a6adb6e70f6
Parents: 2281990 b74c338
Author: xkli <56...@qq.com>
Authored: Fri Mar 31 16:16:22 2017 +0800
Committer: xkli <56...@qq.com>
Committed: Fri Mar 31 16:16:22 2017 +0800
----------------------------------------------------------------------
.eslintrc | 10 +
.flowconfig | 16 +
bin/dist-vue.sh | 42 +
build/config.js | 9 +-
build/webpack.examples.web.config.js | 24 +-
dangerfile.js | 28 +
examples/vue/animation.vue | 4 +-
examples/vue/components/countdown.vue | 2 +-
examples/vue/components/image.vue | 2 +-
examples/vue/components/list.vue | 19 +-
examples/vue/components/marquee.vue | 3 +-
examples/vue/components/navigator.vue | 7 +-
examples/vue/components/scroller.vue | 34 +-
examples/vue/components/slider.vue | 22 +-
examples/vue/components/text.vue | 2 +-
examples/vue/components/textarea.vue | 57 +
examples/vue/components/video.vue | 2 +-
examples/vue/components/web.vue | 2 +-
examples/vue/iconfont.vue | 2 +-
examples/vue/include/base-url.js | 4 +-
examples/vue/include/button.vue | 2 +-
examples/vue/include/countdown.vue | 2 +-
examples/vue/include/example-list-item.vue | 2 +-
examples/vue/include/example-list.vue | 2 +-
examples/vue/include/h1.vue | 2 +-
examples/vue/include/h2.vue | 2 +-
examples/vue/include/h3.vue | 2 +-
examples/vue/include/hn.vue | 2 +-
examples/vue/include/list-item.vue | 2 +-
examples/vue/include/marquee.vue | 4 +-
examples/vue/include/navbar.vue | 2 +-
examples/vue/include/navpage.vue | 2 +-
examples/vue/include/panel.vue | 10 +-
examples/vue/include/slider-item.vue | 2 +-
examples/vue/include/slider-page.vue | 5 +-
examples/vue/include/tabbar.vue | 6 +-
examples/vue/include/tabitem.vue | 2 +-
examples/vue/include/tip.vue | 2 +-
examples/vue/include/wxc-list-item.vue | 2 +-
examples/vue/modules/stream.vue | 2 +-
examples/vue/showcase/calculator.vue | 2 +-
examples/vue/showcase/include/banners.vue | 4 +-
examples/vue/showcase/include/brand.vue | 2 +-
examples/vue/showcase/include/category.vue | 8 +-
examples/vue/showcase/include/coupon.vue | 2 +-
examples/vue/showcase/include/goods.vue | 4 +-
examples/vue/showcase/include/headlines.vue | 2 +-
examples/vue/showcase/include/match.vue | 4 +-
examples/vue/showcase/include/resource.vue | 2 +-
examples/vue/showcase/include/scene.vue | 4 +-
examples/vue/showcase/itemlist.vue | 246 +-
examples/vue/showcase/new-fashion.vue | 2 +-
examples/vue/style/index.vue | 2 +-
examples/vue/style/style-box.vue | 2 +-
examples/vue/style/style-flex.vue | 2 +-
examples/vue/style/style-item.vue | 2 +-
examples/vue/syntax/hello-world-3.vue | 4 +-
examples/vue/syntax/hello-world-4.vue | 4 +-
examples/vue/syntax/hello-world-5.vue | 4 +-
examples/vue/syntax/hello-world.vue | 4 +-
examples/vue/syntax/include/btn.vue | 2 +-
examples/vue/syntax/include/sub.vue | 2 +-
examples/vue/syntax/script-component.vue | 2 +-
examples/vue/syntax/script-data.vue | 2 +-
examples/vue/syntax/script-events.vue | 4 +-
examples/vue/syntax/script-instance.vue | 2 +-
examples/vue/syntax/script-lifecycle.vue | 4 +-
examples/vue/syntax/script-module.vue | 2 +-
examples/vue/syntax/script-options.vue | 2 +-
examples/vue/syntax/template-class.vue | 2 +-
examples/vue/syntax/template-event.vue | 2 +-
examples/vue/syntax/template-if.vue | 2 +-
examples/vue/syntax/template-repeat-update.vue | 2 +-
examples/vue/syntax/template-repeat.vue | 8 +-
flow-typed/npm/animationjs_vx.x.x.js | 60 +
flow-typed/npm/babel-core_vx.x.x.js | 227 +
flow-typed/npm/babel-eslint_vx.x.x.js | 73 +
flow-typed/npm/babel-istanbul_vx.x.x.js | 353 +
flow-typed/npm/babel-loader_vx.x.x.js | 67 +
flow-typed/npm/babel-plugin-coverage_vx.x.x.js | 32 +
flow-typed/npm/babel-preset-es2015_vx.x.x.js | 32 +
flow-typed/npm/babel-runtime_vx.x.x.js | 1691 ++++
flow-typed/npm/chai_v3.5.x.js | 212 +
flow-typed/npm/chromedriver_vx.x.x.js | 46 +
flow-typed/npm/core-js_vx.x.x.js | 9390 ++++++++++++++++++
flow-typed/npm/cross-spawn_vx.x.x.js | 59 +
flow-typed/npm/css-loader_vx.x.x.js | 87 +
flow-typed/npm/cubicbezier_vx.x.x.js | 109 +
flow-typed/npm/danger_vx.x.x.js | 284 +
flow-typed/npm/envd_vx.x.x.js | 109 +
flow-typed/npm/eslint-plugin-flowtype_vx.x.x.js | 319 +
flow-typed/npm/eslint_vx.x.x.js | 1978 ++++
flow-typed/npm/flow-bin_v0.x.x.js | 6 +
flow-typed/npm/fs-extra_vx.x.x.js | 221 +
flow-typed/npm/http-server_vx.x.x.js | 39 +
flow-typed/npm/httpurl_vx.x.x.js | 67 +
flow-typed/npm/inline-style-prefixer_vx.x.x.js | 347 +
flow-typed/npm/json-loader_vx.x.x.js | 33 +
flow-typed/npm/karma-coverage_vx.x.x.js | 81 +
flow-typed/npm/karma-mocha-reporter_vx.x.x.js | 38 +
flow-typed/npm/karma-mocha_vx.x.x.js | 53 +
.../npm/karma-phantomjs-launcher_vx.x.x.js | 59 +
flow-typed/npm/karma-sourcemap-loader_vx.x.x.js | 33 +
flow-typed/npm/karma-webpack_vx.x.x.js | 45 +
flow-typed/npm/karma_vx.x.x.js | 445 +
flow-typed/npm/lazyimg_vx.x.x.js | 32 +
flow-typed/npm/macaca-cli_vx.x.x.js | 123 +
flow-typed/npm/macaca-utils_vx.x.x.js | 39 +
flow-typed/npm/mocha_v2.4.x.js | 25 +
flow-typed/npm/modals_vx.x.x.js | 81 +
flow-typed/npm/nightwatch_vx.x.x.js | 633 ++
flow-typed/npm/phantomjs-prebuilt_vx.x.x.js | 389 +
flow-typed/npm/query-string_vx.x.x.js | 33 +
flow-typed/npm/reify_vx.x.x.js | 95 +
flow-typed/npm/rollup-plugin-buble_vx.x.x.js | 39 +
flow-typed/npm/rollup-plugin-commonjs_vx.x.x.js | 81 +
flow-typed/npm/rollup-plugin-eslint_vx.x.x.js | 39 +
.../rollup-plugin-flow-no-whitespace_vx.x.x.js | 33 +
flow-typed/npm/rollup-plugin-flow_vx.x.x.js | 33 +
flow-typed/npm/rollup-plugin-json_vx.x.x.js | 46 +
.../npm/rollup-plugin-node-resolve_vx.x.x.js | 53 +
flow-typed/npm/rollup-plugin-postcss_vx.x.x.js | 38 +
flow-typed/npm/rollup-plugin-replace_vx.x.x.js | 46 +
flow-typed/npm/rollup-plugin-uglify_vx.x.x.js | 32 +
flow-typed/npm/rollup-watch_vx.x.x.js | 67 +
flow-typed/npm/rollup_vx.x.x.js | 46 +
flow-typed/npm/scroll-to_vx.x.x.js | 33 +
flow-typed/npm/selenium-server_vx.x.x.js | 39 +
flow-typed/npm/semver_v5.1.x.js | 81 +
flow-typed/npm/serve_vx.x.x.js | 18 +
flow-typed/npm/sinon-chai_vx.x.x.js | 32 +
flow-typed/npm/sinon_vx.x.x.js | 263 +
flow-typed/npm/uglify-js_vx.x.x.js | 116 +
flow-typed/npm/vue-loader_vx.x.x.js | 122 +
flow-typed/npm/vue-template-compiler_vx.x.x.js | 38 +
flow-typed/npm/vue_vx.x.x.js | 1089 ++
flow-typed/npm/webdriver-client_vx.x.x.js | 129 +
flow-typed/npm/webpack_vx.x.x.js | 1523 +++
flow-typed/npm/weex-components_vx.x.x.js | 33 +
flow-typed/npm/weex-loader_vx.x.x.js | 108 +
flow-typed/npm/weex-picker_vx.x.x.js | 81 +
flow-typed/npm/weex-rax-framework_vx.x.x.js | 165 +
flow-typed/npm/weex-styler_vx.x.x.js | 66 +
flow-typed/npm/weex-vdom-tester_vx.x.x.js | 108 +
flow-typed/npm/weex-vue-framework_vx.x.x.js | 33 +
flow-typed/npm/weex-wd_vx.x.x.js | 38 +
flow-typed/npm/wwp_vx.x.x.js | 39 +
flow-typed/npm/xml2map_vx.x.x.js | 45 +
html5/render/browser/extend/api/stream.js | 2 +-
html5/render/browser/extend/components/input.js | 33 +
.../browser/extend/components/textarea.js | 32 +
html5/render/browser/utils/index.js | 9 +
html5/render/vue/README.md | 51 +-
html5/render/vue/components/a.js | 15 +-
html5/render/vue/components/div.js | 15 +-
html5/render/vue/components/image.js | 81 +-
html5/render/vue/components/index.js | 9 +-
html5/render/vue/components/input.js | 31 +-
.../render/vue/components/scrollable/header.js | 40 +-
.../vue/components/scrollable/list/cell.js | 15 +-
.../vue/components/scrollable/list/index.js | 32 +-
.../vue/components/scrollable/list/listMixin.js | 118 +-
.../components/scrollable/loading-indicator.js | 3 +-
.../render/vue/components/scrollable/loading.js | 55 +-
.../render/vue/components/scrollable/refresh.js | 64 +-
.../vue/components/scrollable/scroller.js | 30 +-
.../render/vue/components/scrollable/shared.js | 22 -
html5/render/vue/components/slider/index.js | 40 +-
html5/render/vue/components/slider/indicator.js | 115 +-
.../render/vue/components/slider/slideMixin.js | 141 +-
html5/render/vue/components/switch.js | 11 +-
html5/render/vue/components/text.js | 45 +-
html5/render/vue/components/textarea.js | 29 +-
html5/render/vue/components/video.js | 14 +-
html5/render/vue/components/web.js | 19 +-
html5/render/vue/env/WXEnvironment.js | 39 -
html5/render/vue/env/index.js | 17 +-
html5/render/vue/env/viewport.js | 56 +-
html5/render/vue/env/weex.js | 30 +-
html5/render/vue/env/wx-env.js | 48 +
html5/render/vue/index.js | 64 +-
html5/render/vue/mixins/base.js | 103 +-
html5/render/vue/mixins/event.js | 76 -
html5/render/vue/mixins/index.js | 8 +-
html5/render/vue/mixins/input-common.js | 47 +
html5/render/vue/mixins/scrollable.js | 110 +
html5/render/vue/mixins/style.js | 265 +-
html5/render/vue/modules/dom.js | 69 +-
html5/render/vue/modules/index.js | 42 +-
html5/render/vue/styles/components.css | 225 +-
html5/render/vue/styles/reset.css | 44 +-
html5/render/vue/utils/component.js | 83 +-
html5/render/vue/utils/event.js | 91 +-
html5/render/vue/utils/func.js | 81 +-
html5/render/vue/utils/index.js | 55 +-
html5/render/vue/utils/lazyload.js | 102 +
html5/render/vue/utils/perf.js | 170 +
html5/render/vue/utils/style.js | 21 +
html5/render/vue/utils/type.js | 20 +
index.html | 3 +-
.../Recycler/WXRecyclerDataController.m | 2 +-
.../Component/WXComponent+GradientColor.h | 3 -
ios/sdk/WeexSDK/Sources/Utility/WXBoxShadow.m | 12 +-
ios/sdk/WeexSDK/Sources/WeexSDK.h | 1 +
package.json | 20 +-
packages/weex-vue-render/README.md | 51 +-
packages/weex-vue-render/package.json | 13 +-
vue.html | 53 +-
208 files changed, 25346 insertions(+), 1238 deletions(-)
----------------------------------------------------------------------
[4/5] incubator-weex git commit: * [android] update isHardwareSupport
resuse isCPUSupport
Posted by so...@apache.org.
* [android] update isHardwareSupport resuse isCPUSupport
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/3df8d860
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/3df8d860
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/3df8d860
Branch: refs/heads/0.12-dev
Commit: 3df8d860f143ce3fc5614c4c53284e5c1e431f3c
Parents: 61f7ad8
Author: xkli <56...@qq.com>
Authored: Tue Apr 11 11:10:56 2017 +0800
Committer: xkli <56...@qq.com>
Committed: Tue Apr 11 11:10:56 2017 +0800
----------------------------------------------------------------------
.../sdk/src/main/java/com/taobao/weex/WXEnvironment.java | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3df8d860/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 0483faf..44c5a77 100755
--- a/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
@@ -345,15 +345,10 @@ public class WXEnvironment {
*/
@Deprecated
public static boolean isHardwareSupport() {
- boolean excludeX86 = "true".equals(options.get(SETTING_EXCLUDE_X86SUPPORT));
- boolean isX86AndExcluded = WXSoInstallMgrSdk.isX86() && excludeX86;
- boolean isCPUSupport = WXSoInstallMgrSdk.isCPUSupport() && !isX86AndExcluded;
if (WXEnvironment.isApkDebugable()) {
- WXLogUtils.d("WXEnvironment.sSupport:" + isCPUSupport
- + "isX86AndExclueded: "+ isX86AndExcluded
- + " !WXUtils.isTabletDevice():" + !WXUtils.isTabletDevice());
+ WXLogUtils.d("isTableDevice:" + WXUtils.isTabletDevice());
}
- return isCPUSupport && !WXUtils.isTabletDevice();
+ return isCPUSupport() && !WXUtils.isTabletDevice();
}
/**