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
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
/**
* 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.widget.FrameLayout;
import com.taobao.weex.ui.flat.widget.Widget;
import com.taobao.weex.utils.WXLogUtils;
import com.taobao.weex.utils.WXViewUtils;
import java.util.List;

public class BaseFrameLayout extends FrameLayout{
private List<Widget> mWidgets;

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

@Override
protected void dispatchDraw(Canvas canvas) {
try {
dispatchDrawInterval(canvas);
} catch (Throwable e) {
WXLogUtils.e(WXLogUtils.getStackTrace(e));
}
}

protected 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);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -20,47 +20,48 @@

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> {

private WXGesture wxGesture;
public class WXFrameLayout extends BaseFrameLayout implements WXGestureObservable,IRenderStatus<WXDiv>,IRenderResult<WXDiv>{

private WeakReference<WXDiv> mWeakReference;
private WXGesture wxGesture;

private List<Widget> mWidgets;

public WXFrameLayout(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
public void registerGestureListener(WXGesture wxGesture) {
this.wxGesture = wxGesture;
Expand All @@ -79,41 +80,10 @@ 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);
super.dispatchDrawInterval(canvas);
} catch (Throwable e) {
if (getComponent() != null) {
notifyLayerOverFlow();
Expand All @@ -128,7 +98,6 @@ protected void dispatchDraw(Canvas canvas) {
WXLogUtils.e("Layer overflow limit error", WXLogUtils.getStackTrace(e));
}
}

private int reportLayerOverFlowError() {
int deep = calLayerDeep(this, 0);
if (getComponent() != null) {
Expand All @@ -140,21 +109,6 @@ private int reportLayerOverFlowError() {
}
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) {
Expand Down Expand Up @@ -182,4 +136,5 @@ public void notifyLayerOverFlow() {
component.fireEvent(Constants.Event.LAYEROVERFLOW, params);
}
}

}