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

feat:set rotation as view's prop

Browse Source
This commit is contained in:
pengfei.zhou
2019-11-29 15:16:15 +08:00
parent 4e596642f2
commit 3a89571f42
7 changed files with 42 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Android/doric/src/main/java/pub/doric/plugin/ShaderPlugin.java
View File

@@ -174,7 +174,11 @@ public class ShaderPlugin extends DoricJavaPlugin {
if (clz == DoricPromise.class) {
return doricPromise;
} else {
return jsValue;
try {
return DoricUtils.toJavaObject(clz, jsValue);
} catch (Exception e) {
return jsValue;
}
}
}
}

2
Android/doric/src/main/java/pub/doric/refresh/DoricSwipeLayout.java
View File

@@ -912,7 +912,7 @@ public class DoricSwipeLayout extends ViewGroup implements NestedScrollingParent
ViewCompat.offsetTopAndBottom(mRefreshView, offset);
mCurrentTargetOffsetTop = mRefreshView.getTop();
if (mRefreshView.getMeasuredHeight() > 0) {
mRefreshView.setProgressRotation((float) mRefreshView.getBottom() / (float) mRefreshView.getMeasuredHeight());
mRefreshView.setProgressRotation((float) mRefreshView.getBottom() / (float) mRefreshView.getMeasuredHeight() * 2);
}
}

26
Android/doric/src/main/java/pub/doric/shader/ViewNode.java
View File

@@ -184,6 +184,17 @@ public abstract class ViewNode<T extends View> extends DoricContextHolder {
setBgColor(prop.asNumber().toInt());
}
break;
case "rotation":
if (isAnimating()) {
addAnimator(ObjectAnimator.ofFloat(
this,
name,
getRotation(),
prop.asNumber().toFloat()));
} else {
setRotation(prop.asNumber().toFloat());
}
break;
case "onClick":
final String functionId = prop.asString().value();
view.setOnClickListener(new View.OnClickListener() {
@@ -374,20 +385,19 @@ public abstract class ViewNode<T extends View> extends DoricContextHolder {
}
@DoricMethod
public void setRotation(JSValue jsValue) {
float rotation = jsValue.asNumber().toFloat();
while (rotation > 1) {
rotation = rotation - 1;
public void setRotation(float rotation) {
while (rotation > 2) {
rotation = rotation - 2;
}
while (rotation < -1) {
rotation = rotation + 1;
while (rotation < -2) {
rotation = rotation + 2;
}
getNodeView().setRotation(rotation * 360);
getNodeView().setRotation(rotation * 180);
}
@DoricMethod
public float getRotation() {
return getNodeView().getRotation() / 360;
return getNodeView().getRotation() / 180;
}
@DoricMethod