Repository: incubator-weex Updated Branches: refs/heads/master 1a2ee1c93 -> b7c069340
[WEEX-355][android] recycle-list adapter for weex-core new architecture Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b7c06934 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b7c06934 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b7c06934 Branch: refs/heads/master Commit: b7c069340bee5b96801e25114a307c7061f30d43 Parents: 1a2ee1c Author: jianbai.gbj <[email protected]> Authored: Mon May 14 17:38:15 2018 +0800 Committer: YorkShen <[email protected]> Committed: Mon May 14 18:30:49 2018 +0800 ---------------------------------------------------------------------- android/playground/app/build.gradle | 2 +- weex_core/Source/core/render/node/render_object.h | 3 +-- weex_core/debug.sh | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b7c06934/android/playground/app/build.gradle ---------------------------------------------------------------------- diff --git a/android/playground/app/build.gradle b/android/playground/app/build.gradle index 2caa695..82ec5c4 100755 --- a/android/playground/app/build.gradle +++ b/android/playground/app/build.gradle @@ -99,7 +99,7 @@ dependencies { compile 'com.taobao.android:dexposed:0.1.8' compile 'com.loopj.android:android-async-http:1.4.9@aar' - compile 'com.facebook.fresco:fresco:0.12.0+' + compile 'com.facebook.fresco:fresco:0.12.0' compile 'com.facebook.fresco:animated-gif:0.12.0' compile 'com.squareup.okhttp:okhttp:2.3.0' http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b7c06934/weex_core/Source/core/render/node/render_object.h ---------------------------------------------------------------------- diff --git a/weex_core/Source/core/render/node/render_object.h b/weex_core/Source/core/render/node/render_object.h index 6fa638c..2671fe1 100644 --- a/weex_core/Source/core/render/node/render_object.h +++ b/weex_core/Source/core/render/node/render_object.h @@ -154,8 +154,7 @@ namespace WeexCore { virtual StyleType ApplyStyle(const std::string &key, const std::string &value, const bool updating) { bool insert = false; - if(value.length() > 0 && value.at(0) == JSON_OBJECT_MARK_CHAR - || value.at(0) == JSON_ARRAY_MARK_CHAR){ + if(value.length() > 0 && (value.at(0) == JSON_OBJECT_MARK_CHAR || value.at(0) == JSON_ARRAY_MARK_CHAR)){ mapInsertOrAssign(mStyles, key, value); insert = true; } http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b7c06934/weex_core/debug.sh ---------------------------------------------------------------------- diff --git a/weex_core/debug.sh b/weex_core/debug.sh index 79152ef..c3b6c5f 100755 --- a/weex_core/debug.sh +++ b/weex_core/debug.sh @@ -1,2 +1,2 @@ ## show c plus plus crash stack -adb logcat | $NDK/ndk-stack -sym ../android/sdk/build/intermediates/cmake/debug/obj/x86 +adb logcat | $NDK/ndk-stack -sym ../android/sdk/build/intermediates/cmake/debug/obj/armeabi-v7a
