You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ky...@apache.org on 2018/05/24 07:53:25 UTC
[1/3] incubator-weex git commit: [WEEX-403] Update libweexcore.so for
x86 and armeabi-v7a
Repository: incubator-weex
Updated Branches:
refs/heads/master 5ab00a0da -> d3ffa31f0
[WEEX-403] Update libweexcore.so for x86 and armeabi-v7a
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/d3ffa31f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d3ffa31f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d3ffa31f
Branch: refs/heads/master
Commit: d3ffa31f050f8dc218585859221b68bd34b43b3f
Parents: 0168902
Author: miomin <mi...@foxmail.com>
Authored: Thu May 24 15:47:51 2018 +0800
Committer: YorkShen <sh...@gmail.com>
Committed: Thu May 24 15:53:16 2018 +0800
----------------------------------------------------------------------
android/sdk/libs/armeabi-v7a/libweexcore.so | Bin 0 -> 632692 bytes
android/sdk/libs/x86/libweexcore.so | Bin 0 -> 1193884 bytes
weex_core/debug.sh | 6 +++---
weex_core/release.sh | 6 +++---
4 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d3ffa31f/android/sdk/libs/armeabi-v7a/libweexcore.so
----------------------------------------------------------------------
diff --git a/android/sdk/libs/armeabi-v7a/libweexcore.so b/android/sdk/libs/armeabi-v7a/libweexcore.so
new file mode 100644
index 0000000..2d8b967
Binary files /dev/null and b/android/sdk/libs/armeabi-v7a/libweexcore.so differ
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d3ffa31f/android/sdk/libs/x86/libweexcore.so
----------------------------------------------------------------------
diff --git a/android/sdk/libs/x86/libweexcore.so b/android/sdk/libs/x86/libweexcore.so
new file mode 100644
index 0000000..5a6c37f
Binary files /dev/null and b/android/sdk/libs/x86/libweexcore.so differ
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d3ffa31f/weex_core/debug.sh
----------------------------------------------------------------------
diff --git a/weex_core/debug.sh b/weex_core/debug.sh
index 1896fb7..cb10c74 100755
--- a/weex_core/debug.sh
+++ b/weex_core/debug.sh
@@ -1,6 +1,6 @@
cd ../android/sdk
gradle compileDebugSources
cd ..
-cp sdk/build/intermediates/cmake/debug/obj/armeabi/libweexjsc.so sdk/libs/armeabi/libweexjsc.so
-cp sdk/build/intermediates/cmake/debug/obj/armeabi-v7a/libweexjsc.so sdk/libs/armeabi-v7a/libweexjsc.so
-cp sdk/build/intermediates/cmake/debug/obj/x86/libweexjsc.so sdk/libs/x86/libweexjsc.so
+cp sdk/build/intermediates/cmake/debug/obj/armeabi/libweexcore.so sdk/libs/armeabi/libweexcore.so
+cp sdk/build/intermediates/cmake/debug/obj/armeabi-v7a/libweexcore.so sdk/libs/armeabi-v7a/libweexcore.so
+cp sdk/build/intermediates/cmake/debug/obj/x86/libweexcore.so sdk/libs/x86/libweexcore.so
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d3ffa31f/weex_core/release.sh
----------------------------------------------------------------------
diff --git a/weex_core/release.sh b/weex_core/release.sh
index 3cbb4b3..af143d0 100644
--- a/weex_core/release.sh
+++ b/weex_core/release.sh
@@ -1,6 +1,6 @@
cd ../android
rm -rf sdk/build/intermediates/bundles/release/jni/*
./gradlew clean assemble
-cp sdk/build/intermediates/bundles/release/jni/armeabi/libweexjsc.so sdk/libs/armeabi/libweexjsc.so
-cp sdk/build/intermediates/bundles/release/jni/armeabi-v7a/libweexjsc.so sdk/libs/armeabi-v7a/libweexjsc.so
-cp sdk/build/intermediates/bundles/release/jni/x86/libweexjsc.so sdk/libs/x86/libweexjsc.so
+cp sdk/build/intermediates/bundles/release/jni/armeabi/libweexcore.so sdk/libs/armeabi/libweexcore.so
+cp sdk/build/intermediates/bundles/release/jni/armeabi-v7a/libweexcore.so sdk/libs/armeabi-v7a/libweexcore.so
+cp sdk/build/intermediates/bundles/release/jni/x86/libweexcore.so sdk/libs/x86/libweexcore.so
[2/3] incubator-weex git commit: [WEEX-403] Update libweexcore.so
Posted by ky...@apache.org.
[WEEX-403] Update libweexcore.so
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0168902b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0168902b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0168902b
Branch: refs/heads/master
Commit: 0168902b5e9eaf19f86ea140457c29384fd6a565
Parents: 7d28c1c
Author: miomin <mi...@foxmail.com>
Authored: Thu May 24 15:41:17 2018 +0800
Committer: YorkShen <sh...@gmail.com>
Committed: Thu May 24 15:53:16 2018 +0800
----------------------------------------------------------------------
android/sdk/libs/armeabi-v7a/libweexjsc.so | Bin 628596 -> 0 bytes
android/sdk/libs/armeabi/libweexcore.so | Bin 0 -> 640884 bytes
android/sdk/libs/armeabi/libweexjsc.so | Bin 640884 -> 0 bytes
android/sdk/libs/x86/libweexjsc.so | Bin 1185692 -> 0 bytes
4 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0168902b/android/sdk/libs/armeabi-v7a/libweexjsc.so
----------------------------------------------------------------------
diff --git a/android/sdk/libs/armeabi-v7a/libweexjsc.so b/android/sdk/libs/armeabi-v7a/libweexjsc.so
deleted file mode 100755
index 3e4ca8a..0000000
Binary files a/android/sdk/libs/armeabi-v7a/libweexjsc.so and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0168902b/android/sdk/libs/armeabi/libweexcore.so
----------------------------------------------------------------------
diff --git a/android/sdk/libs/armeabi/libweexcore.so b/android/sdk/libs/armeabi/libweexcore.so
new file mode 100644
index 0000000..936a639
Binary files /dev/null and b/android/sdk/libs/armeabi/libweexcore.so differ
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0168902b/android/sdk/libs/armeabi/libweexjsc.so
----------------------------------------------------------------------
diff --git a/android/sdk/libs/armeabi/libweexjsc.so b/android/sdk/libs/armeabi/libweexjsc.so
deleted file mode 100644
index f6f75bc..0000000
Binary files a/android/sdk/libs/armeabi/libweexjsc.so and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0168902b/android/sdk/libs/x86/libweexjsc.so
----------------------------------------------------------------------
diff --git a/android/sdk/libs/x86/libweexjsc.so b/android/sdk/libs/x86/libweexjsc.so
deleted file mode 100644
index ac8b642..0000000
Binary files a/android/sdk/libs/x86/libweexjsc.so and /dev/null differ
[3/3] incubator-weex git commit: [WEEX-403] Fix waterfall sticky
Posted by ky...@apache.org.
[WEEX-403] Fix waterfall sticky
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7d28c1cb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7d28c1cb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7d28c1cb
Branch: refs/heads/master
Commit: 7d28c1cb6bcfbb47a8b3acfc581335698f0fc700
Parents: 5ab00a0
Author: miomin <mi...@foxmail.com>
Authored: Thu May 24 15:28:03 2018 +0800
Committer: YorkShen <sh...@gmail.com>
Committed: Thu May 24 15:53:16 2018 +0800
----------------------------------------------------------------------
weex_core/Source/core/render/node/render_list.h | 4 ++--
weex_core/Source/core/render/node/render_object.h | 13 ++++++++++---
2 files changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7d28c1cb/weex_core/Source/core/render/node/render_list.h
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/render/node/render_list.h b/weex_core/Source/core/render/node/render_list.h
index 25b6ed0..abc23cd 100644
--- a/weex_core/Source/core/render/node/render_list.h
+++ b/weex_core/Source/core/render/node/render_list.h
@@ -205,8 +205,8 @@ namespace WeexCore {
if (Type() == kRenderWaterfall || Type() == kRenderRecycleList) {
if(child->Type() == kRenderHeader || child->Type() == kRenderFooter) {
child->ApplyStyle(WIDTH, to_string(mAvailableWidth), updating);
- } else if (child->getStypePositionType() == kSticky) {
- child->ApplyStyle(WIDTH, to_string(GetViewPortWidth()), updating);
+ } else if (child->IsSticky()) {
+ child->ApplyStyle(WIDTH, to_string(mAvailableWidth), updating);
} else if (child->Type() == kRenderCell || child->Type() == kRenderCellSlot){
child->ApplyStyle(WIDTH, to_string(mColumnWidth), updating);
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7d28c1cb/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 7c45485..c92f4e9 100644
--- a/weex_core/Source/core/render/node/render_object.h
+++ b/weex_core/Source/core/render/node/render_object.h
@@ -64,7 +64,6 @@ namespace WeexCore {
friend class RenderPage;
-
public:
inline void LayoutBefore() {
if (isDirty()) {
@@ -210,6 +209,9 @@ namespace WeexCore {
return kTypeLayout;
} else if (key == POSITION) {
setStylePositionType(GetWXCorePositionType(value));
+ if (value == STICKY) {
+ mIsSticky = true;
+ }
mapInsertOrAssign(mStyles, key, value);
return kTypeStyle;
} else if (key == LEFT) {
@@ -438,14 +440,18 @@ namespace WeexCore {
return mIsRootRender;
}
- inline bool IsAppendTree(){
+ inline bool IsAppendTree() {
std::string append = GetAttr(APPEND);
- if(append == "tree"){
+ if(append == "tree") {
return true;
}
return false;
}
+ inline bool IsSticky() {
+ return mIsSticky;
+ }
+
private:
RenderObject *mParentRender;
StylesMap *mStyles;
@@ -453,6 +459,7 @@ namespace WeexCore {
EventsSet *mEvents;
float mViewPortWidth = -1;
bool mIsRootRender;
+ bool mIsSticky = false;
};
} //end WeexCore
#endif //RenderObject_h