tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: image inside list flushes when loading more or in other situations

Browse Source
This commit is contained in:
pengfei.zhou
2022-06-02 14:40:04 +08:00
committed by osborn
parent 75151d57d4
commit 531e2d9298
7 changed files with 89 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
doric-android/doric/src/main/java/pub/doric/shader/ImageNode.java
View File

@@ -94,7 +94,7 @@ public class ImageNode extends ViewNode<ImageView> {
private JSObject stretchInset = null;
private float imageScale = DoricUtils.getScreenScale();
private Animatable2Compat.AnimationCallback animationCallback = null;
private int scaleType = 0;
private int scaleType = 2;
public ImageNode(DoricContext doricContext) {
super(doricContext);
@@ -170,9 +170,11 @@ public class ImageNode extends ViewNode<ImageView> {
if (loadCallback.isString()) {
this.loadCallbackId = loadCallback.asString().value();
}
}
super.blend(jsObject);
if (scaleType == 2 && mView.getScaleType() != ImageView.ScaleType.CENTER_CROP) {
mView.setScaleType(ImageView.ScaleType.CENTER_CROP);
}
}
private Drawable getPlaceHolderDrawable() {
@@ -292,16 +294,20 @@ public class ImageNode extends ViewNode<ImageView> {
}
}));
}
Drawable placeHolderDrawable = getPlaceHolderDrawable();
Drawable placeHolderDrawable = null;
if (mView.getDrawable() != null) {
placeHolderDrawable = mView.getDrawable();
} else {
placeHolderDrawable = getPlaceHolderDrawable();
}
if (placeHolderDrawable != null) {
requestBuilder = requestBuilder.apply(RequestOptions.placeholderOf(placeHolderDrawable));
}
Drawable errorDrawable = getErrorDrawable();
if (errorDrawable != null) {
requestBuilder = requestBuilder.apply(RequestOptions.errorOf(errorDrawable));
if (errorDrawable == null) {
errorDrawable = new ColorDrawable(Color.TRANSPARENT);
}
requestBuilder = requestBuilder.apply(RequestOptions.errorOf(errorDrawable));
} catch (Throwable e) {
e.printStackTrace();
DoricLog.e("ImageNode blend error, please check the glide version");
@@ -361,8 +367,8 @@ public class ImageNode extends ViewNode<ImageView> {
}
if (scaleType == 3) { // image tile
BitmapDrawable drawable = new BitmapDrawable(getContext().getResources(),bitmap);
drawable.setTileModeXY(Shader.TileMode.REPEAT , Shader.TileMode.REPEAT);
BitmapDrawable drawable = new BitmapDrawable(getContext().getResources(), bitmap);
drawable.setTileModeXY(Shader.TileMode.REPEAT, Shader.TileMode.REPEAT);
drawable.setDither(true);
super.setResource(drawable);
} else if (stretchInset != null) {
@@ -424,6 +430,7 @@ public class ImageNode extends ViewNode<ImageView> {
public void onError(Throwable t) {
t.printStackTrace();
DoricLog.e("Cannot load resource %s, %s", resource.toString(), t.getLocalizedMessage());
view.setImageDrawable(null);
}
@Override
@@ -445,7 +452,7 @@ public class ImageNode extends ViewNode<ImageView> {
if (!prop.isNumber()) {
return;
}
scaleType = prop.asNumber().toInt();
scaleType = prop.asNumber().toInt();
switch (scaleType) {
case 1:
view.setScaleType(ImageView.ScaleType.FIT_CENTER);
@@ -575,8 +582,7 @@ public class ImageNode extends ViewNode<ImageView> {
@Override
protected void reset() {
super.reset();
mView.setImageDrawable(null);
mView.setScaleType(ImageView.ScaleType.CENTER_CROP);
scaleType = 2;
loadCallbackId = "";
isBlur = false;
placeHolderImage = null;

6
doric-android/doric/src/main/java/pub/doric/shader/flowlayout/FlowLayoutItemNode.java
View File

@@ -23,6 +23,7 @@ import com.github.pengfeizhou.jscore.JSValue;
import pub.doric.DoricContext;
import pub.doric.extension.bridge.DoricPlugin;
import pub.doric.shader.StackNode;
import pub.doric.shader.SuperNode;
/**
* @Description: com.github.penfeizhou.doric.widget
@@ -35,6 +36,11 @@ public class FlowLayoutItemNode extends StackNode {
public FlowLayoutItemNode(DoricContext doricContext) {
super(doricContext);
}
@Override
public void init(SuperNode<?> superNode) {
super.init(superNode);
this.mReusable = true;
}

6
doric-android/doric/src/main/java/pub/doric/shader/list/ListItemNode.java
View File

@@ -23,6 +23,7 @@ import com.github.pengfeizhou.jscore.JSValue;
import pub.doric.DoricContext;
import pub.doric.extension.bridge.DoricPlugin;
import pub.doric.shader.StackNode;
import pub.doric.shader.SuperNode;
/**
* @Description: com.github.penfeizhou.doric.widget
@@ -35,6 +36,11 @@ public class ListItemNode extends StackNode {
public ListItemNode(DoricContext doricContext) {
super(doricContext);
}
@Override
public void init(SuperNode<?> superNode) {
super.init(superNode);
this.mReusable = true;
}

3
doric-android/doric/src/main/java/pub/doric/shader/list/ListNode.java
View File

@@ -168,7 +168,8 @@ public class ListNode extends SuperNode<RecyclerView> implements IDoricScrollabl
@Override
public void blend(JSObject jsObject) {
super.blend(jsObject);
if (jsObject.propertySet().size() > 1 || !jsObject.propertySet().contains("subviews")) {
int limit = jsObject.propertySet().contains("loadMoreView") ? 2 : 1;
if (jsObject.propertySet().size() > limit || !jsObject.propertySet().contains("subviews")) {
if (mView != null) {
mView.post(new Runnable() {
@SuppressLint("NotifyDataSetChanged")

8
doric-android/doric/src/main/java/pub/doric/shader/slider/SlideItemNode.java
View File

@@ -24,6 +24,7 @@ import com.github.pengfeizhou.jscore.JSValue;
import pub.doric.DoricContext;
import pub.doric.extension.bridge.DoricPlugin;
import pub.doric.shader.StackNode;
import pub.doric.shader.SuperNode;
/**
* @Description: com.github.penfeizhou.doric.widget
@@ -36,7 +37,12 @@ public class SlideItemNode extends StackNode {
public SlideItemNode(DoricContext doricContext) {
super(doricContext);
this.mReusable = true;
}
@Override
public void init(SuperNode<?> superNode) {
super.init(superNode);
mReusable = true;
}
@Override