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/03/26 04:23:49 UTC
[1/5] incubator-weex git commit: [WEEX-253][android]WXScroller
Handler should use mainLooper ensure main thread
Repository: incubator-weex
Updated Branches:
refs/heads/master 7b5f09edc -> edb442697
[WEEX-253][android]WXScroller Handler should use mainLooper ensure main thread
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8e6299d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8e6299d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8e6299d3
Branch: refs/heads/master
Commit: 8e6299d37750a54bf88d33f7cfefe108febae666
Parents: 4a3b952
Author: jianbai.gbj <ji...@alibaba-inc.com>
Authored: Tue Mar 20 10:56:12 2018 +0800
Committer: jianbai.gbj <ji...@alibaba-inc.com>
Committed: Tue Mar 20 10:56:12 2018 +0800
----------------------------------------------------------------------
.../src/main/java/com/taobao/weex/ui/component/WXScroller.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8e6299d3/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java
index 4e3561d..f21d33b 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java
@@ -24,6 +24,7 @@ import android.graphics.Point;
import android.graphics.Rect;
import android.os.Build;
import android.os.Handler;
+import android.os.Looper;
import android.support.annotation.NonNull;
import android.text.TextUtils;
import android.view.View;
@@ -107,7 +108,7 @@ public class WXScroller extends WXVContainer<ViewGroup> implements WXScrollViewL
private int mContentHeight = 0;
private WXStickyHelper stickyHelper;
- private Handler handler=new Handler();
+ private Handler handler=new Handler(Looper.getMainLooper());
private boolean isScrollable = true;
[2/5] incubator-weex git commit: [WEEX-261][android]Flat GUI
NullPointerException fix
Posted by mi...@apache.org.
[WEEX-261][android]Flat GUI NullPointerException fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/6e5558be
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/6e5558be
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/6e5558be
Branch: refs/heads/master
Commit: 6e5558bef03ed69f7d651ac09db46c201309a9c3
Parents: 8e6299d
Author: jianbai.gbj <ji...@alibaba-inc.com>
Authored: Thu Mar 22 14:25:24 2018 +0800
Committer: jianbai.gbj <ji...@alibaba-inc.com>
Committed: Thu Mar 22 14:25:24 2018 +0800
----------------------------------------------------------------------
.../main/java/com/taobao/weex/ui/component/WXComponent.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6e5558be/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
index 6522c9b..1dfb506 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
@@ -553,10 +553,14 @@ public abstract class WXComponent<T extends View> implements IWXObject, IWXActi
private void setComponentLayoutParams(int realWidth, int realHeight, int realLeft, int realTop,
int realRight, int realBottom, Point rawOffset) {
+ if(getInstance() == null || getInstance().isDestroy()){
+ return;
+ }
+
FlatGUIContext UIImp = getInstance().getFlatUIContext();
WidgetContainer ancestor;
Widget widget;
- if ((ancestor = UIImp.getFlatComponentAncestor(this)) != null) {
+ if (UIImp != null && (ancestor = UIImp.getFlatComponentAncestor(this)) != null) {
if (this instanceof FlatComponent && !((FlatComponent) this).promoteToView(true)) {
widget = ((FlatComponent) this).getOrCreateFlatWidget();
} else {
[3/5] incubator-weex git commit: [WEEX-261][android]Flat GUI
NullPointerException fix
Posted by mi...@apache.org.
[WEEX-261][android]Flat GUI NullPointerException fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a6fa146c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a6fa146c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a6fa146c
Branch: refs/heads/master
Commit: a6fa146cb97fbcd38d75e5c8cd20a2165c5dbb78
Parents: 6e5558b
Author: jianbai.gbj <ji...@alibaba-inc.com>
Authored: Thu Mar 22 15:05:33 2018 +0800
Committer: jianbai.gbj <ji...@alibaba-inc.com>
Committed: Thu Mar 22 15:05:33 2018 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/ui/WXComponentRegistry.java | 5 +++--
.../taobao/weex/ui/config/AutoScanConfigRegister.java | 11 +++++++++++
2 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a6fa146c/android/sdk/src/main/java/com/taobao/weex/ui/WXComponentRegistry.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/WXComponentRegistry.java b/android/sdk/src/main/java/com/taobao/weex/ui/WXComponentRegistry.java
index bfaff30..39e3b89 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/WXComponentRegistry.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/WXComponentRegistry.java
@@ -29,16 +29,17 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
/**
* All components must be registered within this class before used.
*/
public class WXComponentRegistry {
- private static Map<String, IFComponentHolder> sTypeComponentMap = new HashMap<>();
+ private static Map<String, IFComponentHolder> sTypeComponentMap = new ConcurrentHashMap<>();
private static ArrayList<Map<String, Object>> sComponentInfos=new ArrayList<>();
- public static boolean registerComponent(final String type, final IFComponentHolder holder, final Map<String, Object> componentInfo) throws WXException {
+ public static synchronized boolean registerComponent(final String type, final IFComponentHolder holder, final Map<String, Object> componentInfo) throws WXException {
if (holder == null || TextUtils.isEmpty(type)) {
return false;
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a6fa146c/android/sdk/src/main/java/com/taobao/weex/ui/config/AutoScanConfigRegister.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/config/AutoScanConfigRegister.java b/android/sdk/src/main/java/com/taobao/weex/ui/config/AutoScanConfigRegister.java
index 94278a9..5c35de6 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/config/AutoScanConfigRegister.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/config/AutoScanConfigRegister.java
@@ -45,6 +45,17 @@ public class AutoScanConfigRegister {
* auto scan config files and do auto config from files, none need center register
* */
public static void doScanConfig(){
+ Thread thread = new Thread(new Runnable() {
+ @Override
+ public void run() {
+ doScanConfigSync();
+ }
+ });
+ thread.setName("AutoScanConfigRegister");
+ thread.start();
+ }
+
+ private static void doScanConfigSync(){
if(WXEnvironment.sApplication == null){
return;
}
[5/5] incubator-weex git commit: Merge remote-tracking branch
'upstream/pr1081' into apache-master
Posted by mi...@apache.org.
Merge remote-tracking branch 'upstream/pr1081' into apache-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/edb44269
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/edb44269
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/edb44269
Branch: refs/heads/master
Commit: edb442697a49a1c73a94e65cbfb8bbad9a39954b
Parents: 7b5f09e 1e70579
Author: misakuo <mi...@apache.org>
Authored: Mon Mar 26 12:23:38 2018 +0800
Committer: misakuo <mi...@apache.org>
Committed: Mon Mar 26 12:23:38 2018 +0800
----------------------------------------------------------------------
.../sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[4/5] incubator-weex git commit: [WEEX-261][android]Flat GUI
NullPointerException fix
Posted by mi...@apache.org.
[WEEX-261][android]Flat GUI NullPointerException fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/1e70579d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1e70579d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1e70579d
Branch: refs/heads/master
Commit: 1e70579d30f65f13498907b1816ee92bb4b10d41
Parents: a6fa146
Author: jianbai.gbj <ji...@alibaba-inc.com>
Authored: Thu Mar 22 17:54:08 2018 +0800
Committer: jianbai.gbj <ji...@alibaba-inc.com>
Committed: Thu Mar 22 17:54:08 2018 +0800
----------------------------------------------------------------------
.../sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1e70579d/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
index fca40d9..176e9f5 100644
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
@@ -1877,7 +1877,7 @@ public class WXBridgeManager implements Callback, BactchExecutor {
invokeExecJS(String.valueOf(instanceId), null, METHOD_CALL_JS, args);
task.clear();
for(int i=0; i<tasks.length; i++){
- args[i] = null;
+ tasks[i] = null;
}
args = null;
} catch (Throwable e) {