Skip to content
This repository has been archived by the owner on Jun 3, 2021. It is now read-only.

[Android]fix slider border radius invalid problem #2658

Merged
merged 2 commits into from
Jul 8, 2019
Merged

[Android]fix slider border radius invalid problem #2658

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc8339a
[Android]fix slider border radius invalid problem
katherine95s Jul 8, 2019
464cf8e
[Android]move getComponent and holdComponent to WXFrameLayout
katherine95s Jul 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import com.taobao.weex.dom.WXEvent;
import com.taobao.weex.ui.ComponentCreator;
import com.taobao.weex.ui.action.BasicComponentData;
import com.taobao.weex.ui.view.BaseFrameLayout;
import com.taobao.weex.ui.view.WXCircleIndicator;
import com.taobao.weex.ui.view.WXCirclePageAdapter;
import com.taobao.weex.ui.view.WXCircleViewPager;
Expand Down Expand Up @@ -104,8 +105,8 @@ public WXSlider(WXSDKInstance instance, WXVContainer parent, BasicComponentData
}

@Override
protected FrameLayout initComponentHostView(@NonNull Context context) {
FrameLayout view = new FrameLayout(context);
protected BaseFrameLayout initComponentHostView(@NonNull Context context) {
BaseFrameLayout view = new BaseFrameLayout(context);
// init view pager
if (getAttrs() != null) {
Object obj = getAttrs().get(INFINITE);
Expand Down
5 changes: 3 additions & 2 deletions android/sdk/src/main/java/com/taobao/weex/ui/component/WXSliderNeighbor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import com.taobao.weex.common.WXThread;
import com.taobao.weex.ui.ComponentCreator;
import com.taobao.weex.ui.action.BasicComponentData;
import com.taobao.weex.ui.view.BaseFrameLayout;
import com.taobao.weex.ui.view.WXCircleIndicator;
import com.taobao.weex.ui.view.WXCirclePageAdapter;
import com.taobao.weex.ui.view.WXCircleViewPager;
Expand Down Expand Up @@ -79,8 +80,8 @@ public void bindData(WXComponent component) {
}

@Override
protected FrameLayout initComponentHostView(@NonNull Context context) {
FrameLayout view = new FrameLayout(context);
protected BaseFrameLayout initComponentHostView(@NonNull Context context) {
BaseFrameLayout view = new BaseFrameLayout(context);

// init view pager
FrameLayout.LayoutParams pagerParams = new FrameLayout.LayoutParams(
Expand Down
152 changes: 152 additions & 0 deletions android/sdk/src/main/java/com/taobao/weex/ui/view/BaseFrameLayout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package com.taobao.weex.ui.view;

import android.content.Context;
import android.graphics.Canvas;
import android.graphics.drawable.Drawable;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.view.View;
import android.widget.FrameLayout;

import com.taobao.weex.WXSDKInstance;
import com.taobao.weex.WXSDKManager;
import com.taobao.weex.common.Constants;
import com.taobao.weex.common.WXErrorCode;
import com.taobao.weex.ui.component.WXComponent;
import com.taobao.weex.ui.component.WXDiv;
import com.taobao.weex.ui.flat.widget.Widget;
import com.taobao.weex.utils.WXExceptionUtils;
import com.taobao.weex.utils.WXLogUtils;
import com.taobao.weex.utils.WXViewUtils;

import java.lang.ref.WeakReference;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

public class BaseFrameLayout extends FrameLayout implements IRenderStatus<WXDiv>,IRenderResult<WXDiv>{
private WeakReference<WXDiv> mWeakReference;
private List<Widget> mWidgets;

public BaseFrameLayout(Context context){
super(context);
}

@Nullable
@Override
public WXDiv getComponent() {
return null != mWeakReference ? mWeakReference.get() : null;
}

@Override
public void holdComponent(WXDiv component) {
mWeakReference = new WeakReference<WXDiv>(component);
}

@Override
protected void dispatchDraw(Canvas canvas) {
try {
dispatchDrawInterval(canvas);
} catch (Throwable e) {
if (getComponent() != null) {
notifyLayerOverFlow();
if (null != getComponent()){
WXSDKInstance instance = WXSDKManager.getInstance().getSDKInstance(getComponent().getInstanceId());
if (null != instance && null != instance.getApmForInstance() &&!instance.getApmForInstance().hasReportLayerOverDraw){
instance.getApmForInstance().hasReportLayerOverDraw = true;
reportLayerOverFlowError();
}
}
}
WXLogUtils.e("Layer overflow limit error", WXLogUtils.getStackTrace(e));
}
}
private int reportLayerOverFlowError() {
int deep = calLayerDeep(this, 0);
if (getComponent() != null) {
WXExceptionUtils.commitCriticalExceptionRT(getComponent().getInstanceId(),
WXErrorCode.WX_RENDER_ERR_LAYER_OVERFLOW,
"draw android view",
WXErrorCode.WX_RENDER_ERR_LAYER_OVERFLOW.getErrorMsg() + "Layer overflow limit error: " + deep + " layers!",
null);
}
return deep;
}
private int calLayerDeep(View view, int deep) {
deep++;
if (view.getParent() != null && view.getParent() instanceof View) {
return calLayerDeep((View) view.getParent(), deep);
}
return deep;
}

public void notifyLayerOverFlow() {
if (getComponent() == null)
return;

WXSDKInstance instance = getComponent().getInstance();
if (instance == null)
return;

if (instance.getLayerOverFlowListeners() == null)
return;

for (String ref : instance.getLayerOverFlowListeners()) {
WXComponent component = WXSDKManager.getInstance().getWXRenderManager().getWXComponent(instance.getInstanceId(), ref);
Map<String, Object> params = new HashMap<>();
params.put(Constants.Weex.REF, ref);
params.put(Constants.Weex.INSTANCEID, component.getInstanceId());
component.fireEvent(Constants.Event.LAYEROVERFLOW, params);
}
}
private void dispatchDrawInterval(Canvas canvas) {
if (mWidgets != null) {
canvas.save();
canvas.translate(getPaddingLeft(), getPaddingTop());
for (Widget widget : mWidgets) {
widget.draw(canvas);
}
canvas.restore();
} else {
WXViewUtils.clipCanvasWithinBorderBox(this, canvas);
super.dispatchDraw(canvas);
}
}
public void mountFlatGUI(List<Widget> widgets){
this.mWidgets = widgets;
if (mWidgets != null) {
setWillNotDraw(true);
}
invalidate();
}

public void unmountFlatGUI(){
mWidgets = null;
setWillNotDraw(false);
invalidate();
}

@Override
protected boolean verifyDrawable(@NonNull Drawable who) {
return mWidgets != null || super.verifyDrawable(who);
}

}
129 changes: 1 addition & 128 deletions android/sdk/src/main/java/com/taobao/weex/ui/view/WXFrameLayout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,43 +19,18 @@
package com.taobao.weex.ui.view;

import android.content.Context;
import android.graphics.Canvas;
import android.graphics.drawable.Drawable;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.view.MotionEvent;
import android.view.View;
import android.widget.FrameLayout;

import com.taobao.weex.WXSDKInstance;
import com.taobao.weex.WXSDKManager;
import com.taobao.weex.common.Constants;
import com.taobao.weex.common.WXErrorCode;
import com.taobao.weex.ui.component.WXComponent;
import com.taobao.weex.ui.component.WXDiv;
import com.taobao.weex.ui.flat.widget.Widget;
import com.taobao.weex.ui.view.gesture.WXGesture;
import com.taobao.weex.ui.view.gesture.WXGestureObservable;
import com.taobao.weex.utils.WXExceptionUtils;
import com.taobao.weex.utils.WXLogUtils;
import com.taobao.weex.utils.WXViewUtils;

import java.lang.ref.WeakReference;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
* FrameLayout wrapper
*
*/
public class WXFrameLayout extends FrameLayout implements WXGestureObservable,IRenderStatus<WXDiv>,IRenderResult<WXDiv> {
public class WXFrameLayout extends BaseFrameLayout implements WXGestureObservable{

private WXGesture wxGesture;

private WeakReference<WXDiv> mWeakReference;

private List<Widget> mWidgets;

public WXFrameLayout(Context context) {
super(context);
Expand All @@ -80,106 +55,4 @@ public boolean dispatchTouchEvent(MotionEvent event) {
return result;
}

@Override
public void holdComponent(WXDiv component) {
mWeakReference = new WeakReference<WXDiv>(component);
}

@Nullable
@Override
public WXDiv getComponent() {
return null != mWeakReference ? mWeakReference.get() : null;
}

public void mountFlatGUI(List<Widget> widgets){
this.mWidgets = widgets;
if (mWidgets != null) {
setWillNotDraw(true);
}
invalidate();
}

public void unmountFlatGUI(){
mWidgets = null;
setWillNotDraw(false);
invalidate();
}

@Override
protected boolean verifyDrawable(@NonNull Drawable who) {
return mWidgets != null || super.verifyDrawable(who);
}

@Override
protected void dispatchDraw(Canvas canvas) {
try {
dispatchDrawInterval(canvas);
} catch (Throwable e) {
if (getComponent() != null) {
notifyLayerOverFlow();
if (null != getComponent()){
WXSDKInstance instance = WXSDKManager.getInstance().getSDKInstance(getComponent().getInstanceId());
if (null != instance && null != instance.getApmForInstance() &&!instance.getApmForInstance().hasReportLayerOverDraw){
instance.getApmForInstance().hasReportLayerOverDraw = true;
reportLayerOverFlowError();
}
}
}
WXLogUtils.e("Layer overflow limit error", WXLogUtils.getStackTrace(e));
}
}

private int reportLayerOverFlowError() {
int deep = calLayerDeep(this, 0);
if (getComponent() != null) {
WXExceptionUtils.commitCriticalExceptionRT(getComponent().getInstanceId(),
WXErrorCode.WX_RENDER_ERR_LAYER_OVERFLOW,
"draw android view",
WXErrorCode.WX_RENDER_ERR_LAYER_OVERFLOW.getErrorMsg() + "Layer overflow limit error: " + deep + " layers!",
null);
}
return deep;
}

private void dispatchDrawInterval(Canvas canvas) {
if (mWidgets != null) {
canvas.save();
canvas.translate(getPaddingLeft(), getPaddingTop());
for (Widget widget : mWidgets) {
widget.draw(canvas);
}
canvas.restore();
} else {
WXViewUtils.clipCanvasWithinBorderBox(this, canvas);
super.dispatchDraw(canvas);
}
}

private int calLayerDeep(View view, int deep) {
deep++;
if (view.getParent() != null && view.getParent() instanceof View) {
return calLayerDeep((View) view.getParent(), deep);
}
return deep;
}

public void notifyLayerOverFlow() {
if (getComponent() == null)
return;

WXSDKInstance instance = getComponent().getInstance();
if (instance == null)
return;

if (instance.getLayerOverFlowListeners() == null)
return;

for (String ref : instance.getLayerOverFlowListeners()) {
WXComponent component = WXSDKManager.getInstance().getWXRenderManager().getWXComponent(instance.getInstanceId(), ref);
Map<String, Object> params = new HashMap<>();
params.put(Constants.Weex.REF, ref);
params.put(Constants.Weex.INSTANCEID, component.getInstanceId());
component.fireEvent(Constants.Event.LAYEROVERFLOW, params);
}
}
}