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

feat: add API clearAnimation

Browse Source
This commit is contained in:
pengfei.zhou 2021-04-21 18:59:29 +08:00 committed by osborn
parent 93293b099f
commit 5c20680c4c
12 changed files with 155 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
doric-android/doric/src/main/java/pub/doric/shader/ViewNode.java
View File

@ -51,6 +51,7 @@ import com.github.pengfeizhou.jscore.JavaValue;
import org.json.JSONObject;
import java.util.LinkedList;
import java.util.WeakHashMap;
import pub.doric.DoricContext;
import pub.doric.DoricRegistry;
@ -77,6 +78,7 @@ public abstract class ViewNode<T extends View> extends DoricContextHolder {
protected ViewGroup.LayoutParams mLayoutParams;
private String mType;
protected JSObject mFlexConfig;
private final WeakHashMap<String, Animator> animators = new WeakHashMap<>();
public JSObject getFlexConfig() {
return mFlexConfig;
@ -904,7 +906,7 @@ public abstract class ViewNode<T extends View> extends DoricContextHolder {
return getNodeView().getPivotY() / getNodeView().getHeight();
}
private String[] animatedKeys = {
private final String[] animatedKeys = {
"translationX",
"translationY",
"scaleX",
@ -916,7 +918,25 @@ public abstract class ViewNode<T extends View> extends DoricContextHolder {
public void doAnimation(JSValue value, final DoricPromise promise) {
Animator animator = parseAnimator(value);
if (animator != null) {
String animatorId = value.asObject().getProperty("id").asString().value();
animators.put(animatorId, animator);
// final float tx = getTranslationX();
// final float ty = getTranslationY();
// final float sx = getScaleX();
// final float sy = getScaleY();
// final float r = getRotation();
animator.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationCancel(Animator animation) {
super.onAnimationCancel(animation);
// setTranslationX(tx);
// setTranslationY(ty);
// setScaleX(sx);
// setScaleY(sy);
// setRotation(r);
promise.reject(new JavaValue("Animation cancelled"));
}
@Override
public void onAnimationEnd(Animator animation) {
super.onAnimationEnd(animation);
@ -931,6 +951,28 @@ public abstract class ViewNode<T extends View> extends DoricContextHolder {
}
}
@DoricMethod
public void clearAnimation(String id, final DoricPromise promise) {
Animator animator = animators.get(id);
if (animator != null) {
animator.cancel();
promise.resolve();
} else {
promise.reject(new JavaValue("Cannot find running animation for " + id));
}
}
@DoricMethod
public void cancelAnimation(String id, final DoricPromise promise) {
Animator animator = animators.get(id);
if (animator != null) {
animator.cancel();
promise.resolve();
} else {
promise.reject(new JavaValue("Cannot find running animation for " + id));
}
}
private Animator parseAnimator(JSValue value) {
if (!value.isObject()) {
DoricLog.e("parseAnimator error");

14
doric-js/bundle/doric-lib.es5.js
View File

@ -1380,6 +1380,7 @@ var Animation = /** @class */ (function () {
this.changeables = new Map;
this.duration = 0;
this.fillMode = exports.FillMode.Forward;
this.id = uniqueId("Animation");
}
Animation.prototype.toModel = function () {
var e_1, _a;
@ -1409,7 +1410,8 @@ var Animation = /** @class */ (function () {
repeatCount: this.repeatCount,
repeatMode: this.repeatMode,
fillMode: this.fillMode,
timingFunction: this.timingFunction
timingFunction: this.timingFunction,
id: this.id,
};
};
return Animation;
@ -1480,13 +1482,13 @@ var TranslationAnimation = /** @class */ (function (_super) {
var _this = _super.call(this) || this;
_this.translationXChangeable = {
key: "translationX",
fromValue: 1,
toValue: 1,
fromValue: 0,
toValue: 0,
};
_this.translationYChangeable = {
key: "translationY",
fromValue: 1,
toValue: 1,
fromValue: 0,
toValue: 0,
};
_this.changeables.set("translationX", _this.translationXChangeable);
_this.changeables.set("translationY", _this.translationYChangeable);
@ -1640,6 +1642,7 @@ var AnimationSet = /** @class */ (function () {
function AnimationSet() {
this.animations = [];
this._duration = 0;
this.id = uniqueId("AnimationSet");
}
AnimationSet.prototype.addAnimation = function (anim) {
this.animations.push(anim);
@ -1661,6 +1664,7 @@ var AnimationSet = /** @class */ (function () {
return e.toModel();
}),
delay: this.delay,
id: this.id,
};
};
return AnimationSet;

23
doric-js/bundle/doric-lib.js
View File

@ -314,6 +314,15 @@ class View {
}
});
}
cancelAnimation(context, animation) {
return this.nativeChannel(context, "cancelAnimation")(animation.id).then(() => {
this.__dirty_props__.translationX = this.translationX || 0;
this.__dirty_props__.translationY = this.translationY || 0;
this.__dirty_props__.scaleX = this.scaleX || 1;
this.__dirty_props__.scaleY = this.scaleY || 1;
this.__dirty_props__.rotation = this.rotation || 0;
});
}
}
__decorate$d([
Property,
@ -1051,6 +1060,7 @@ class Animation {
this.changeables = new Map;
this.duration = 0;
this.fillMode = exports.FillMode.Forward;
this.id = uniqueId("Animation");
}
toModel() {
const changeables = [];
@ -1069,7 +1079,8 @@ class Animation {
repeatCount: this.repeatCount,
repeatMode: this.repeatMode,
fillMode: this.fillMode,
timingFunction: this.timingFunction
timingFunction: this.timingFunction,
id: this.id,
};
}
}
@ -1119,13 +1130,13 @@ class TranslationAnimation extends Animation {
super();
this.translationXChangeable = {
key: "translationX",
fromValue: 1,
toValue: 1,
fromValue: 0,
toValue: 0,
};
this.translationYChangeable = {
key: "translationY",
fromValue: 1,
toValue: 1,
fromValue: 0,
toValue: 0,
};
this.changeables.set("translationX", this.translationXChangeable);
this.changeables.set("translationY", this.translationYChangeable);
@ -1228,6 +1239,7 @@ class AnimationSet {
constructor() {
this.animations = [];
this._duration = 0;
this.id = uniqueId("AnimationSet");
}
addAnimation(anim) {
this.animations.push(anim);
@ -1245,6 +1257,7 @@ class AnimationSet {
return e.toModel();
}),
delay: this.delay,
id: this.id,
};
}
}

23
doric-js/bundle/doric-vm.js
View File

@ -1835,6 +1835,15 @@ class View {
}
});
}
cancelAnimation(context, animation) {
return this.nativeChannel(context, "cancelAnimation")(animation.id).then(() => {
this.__dirty_props__.translationX = this.translationX || 0;
this.__dirty_props__.translationY = this.translationY || 0;
this.__dirty_props__.scaleX = this.scaleX || 1;
this.__dirty_props__.scaleY = this.scaleY || 1;
this.__dirty_props__.rotation = this.rotation || 0;
});
}
}
__decorate$d([
Property,
@ -2572,6 +2581,7 @@ class Animation {
this.changeables = new Map;
this.duration = 0;
this.fillMode = exports.FillMode.Forward;
this.id = uniqueId("Animation");
}
toModel() {
const changeables = [];
@ -2590,7 +2600,8 @@ class Animation {
repeatCount: this.repeatCount,
repeatMode: this.repeatMode,
fillMode: this.fillMode,
timingFunction: this.timingFunction
timingFunction: this.timingFunction,
id: this.id,
};
}
}
@ -2640,13 +2651,13 @@ class TranslationAnimation extends Animation {
super();
this.translationXChangeable = {
key: "translationX",
fromValue: 1,
toValue: 1,
fromValue: 0,
toValue: 0,
};
this.translationYChangeable = {
key: "translationY",
fromValue: 1,
toValue: 1,
fromValue: 0,
toValue: 0,
};
this.changeables.set("translationX", this.translationXChangeable);
this.changeables.set("translationY", this.translationYChangeable);
@ -2749,6 +2760,7 @@ class AnimationSet {
constructor() {
this.animations = [];
this._duration = 0;
this.id = uniqueId("AnimationSet");
}
addAnimation(anim) {
this.animations.push(anim);
@ -2766,6 +2778,7 @@ class AnimationSet {
return e.toModel();
}),
delay: this.delay,
id: this.id,
};
}
}

6
doric-js/index.d.ts vendored
View File

@ -298,6 +298,7 @@ declare module 'doric/lib/src/ui/view' {
*/
flexConfig?: FlexConfig;
doAnimation(context: BridgeContext, animation: IAnimation): Promise<void>;
cancelAnimation(context: BridgeContext, animation: IAnimation): Promise<void>;
}
export abstract class Superview extends View {
subviewById(id: string): View | undefined;
@ -326,6 +327,7 @@ declare module 'doric/lib/src/ui/animation' {
export interface IAnimation extends Modeling {
duration: number;
delay?: number;
id: string;
}
export interface Changeable {
fromValue: number;
@ -382,6 +384,7 @@ declare module 'doric/lib/src/ui/animation' {
delay?: number;
fillMode: FillMode;
timingFunction?: TimingFunction;
id: string;
toModel(): {
type: string;
delay: number | undefined;
@ -395,6 +398,7 @@ declare module 'doric/lib/src/ui/animation' {
repeatMode: RepeatMode | undefined;
fillMode: FillMode;
timingFunction: TimingFunction | undefined;
id: string;
};
}
export class ScaleAnimation extends Animation {
@ -442,12 +446,14 @@ declare module 'doric/lib/src/ui/animation' {
}
export class AnimationSet implements IAnimation {
delay?: number;
id: string;
addAnimation(anim: IAnimation): void;
get duration(): number;
set duration(v: number);
toModel(): {
animations: Model;
delay: number | undefined;
id: string;
};
}
export {};

5
doric-js/lib/src/ui/animation.d.ts vendored
View File

@ -7,6 +7,7 @@ export declare enum RepeatMode {
export interface IAnimation extends Modeling {
duration: number;
delay?: number;
id: string;
}
export interface Changeable {
fromValue: number;
@ -63,6 +64,7 @@ declare abstract class Animation implements IAnimation {
delay?: number;
fillMode: FillMode;
timingFunction?: TimingFunction;
id: string;
toModel(): {
type: string;
delay: number | undefined;
@ -76,6 +78,7 @@ declare abstract class Animation implements IAnimation {
repeatMode: RepeatMode | undefined;
fillMode: FillMode;
timingFunction: TimingFunction | undefined;
id: string;
};
}
export declare class ScaleAnimation extends Animation {
@ -132,12 +135,14 @@ export declare class AnimationSet implements IAnimation {
private animations;
private _duration;
delay?: number;
id: string;
addAnimation(anim: IAnimation): void;
get duration(): number;
set duration(v: number);
toModel(): {
animations: Model;
delay: number | undefined;
id: string;
};
}
export {};

15
doric-js/lib/src/ui/animation.js
View File

@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { uniqueId } from "../util/uniqueId";
export var RepeatMode;
(function (RepeatMode) {
RepeatMode[RepeatMode["RESTART"] = 1] = "RESTART";
@ -65,6 +66,7 @@ class Animation {
this.changeables = new Map;
this.duration = 0;
this.fillMode = FillMode.Forward;
this.id = uniqueId("Animation");
}
toModel() {
const changeables = [];
@ -83,7 +85,8 @@ class Animation {
repeatCount: this.repeatCount,
repeatMode: this.repeatMode,
fillMode: this.fillMode,
timingFunction: this.timingFunction
timingFunction: this.timingFunction,
id: this.id,
};
}
}
@ -133,13 +136,13 @@ export class TranslationAnimation extends Animation {
super();
this.translationXChangeable = {
key: "translationX",
fromValue: 1,
toValue: 1,
fromValue: 0,
toValue: 0,
};
this.translationYChangeable = {
key: "translationY",
fromValue: 1,
toValue: 1,
fromValue: 0,
toValue: 0,
};
this.changeables.set("translationX", this.translationXChangeable);
this.changeables.set("translationY", this.translationYChangeable);
@ -242,6 +245,7 @@ export class AnimationSet {
constructor() {
this.animations = [];
this._duration = 0;
this.id = uniqueId("AnimationSet");
}
addAnimation(anim) {
this.animations.push(anim);
@ -259,6 +263,7 @@ export class AnimationSet {
return e.toModel();
}),
delay: this.delay,
id: this.id,
};
}
}

1
doric-js/lib/src/ui/view.d.ts vendored
View File

@ -130,6 +130,7 @@ export declare abstract class View implements Modeling {
*/
flexConfig?: FlexConfig;
doAnimation(context: BridgeContext, animation: IAnimation): Promise<void>;
cancelAnimation(context: BridgeContext, animation: IAnimation): Promise<void>;
}
export declare abstract class Superview extends View {
subviewById(id: string): View | undefined;

9
doric-js/lib/src/ui/view.js
View File

@ -199,6 +199,15 @@ export class View {
}
});
}
cancelAnimation(context, animation) {
return this.nativeChannel(context, "cancelAnimation")(animation.id).then(() => {
this.__dirty_props__.translationX = this.translationX || 0;
this.__dirty_props__.translationY = this.translationY || 0;
this.__dirty_props__.scaleX = this.scaleX || 1;
this.__dirty_props__.scaleY = this.scaleY || 1;
this.__dirty_props__.rotation = this.rotation || 0;
});
}
}
__decorate([
Property,

17
doric-js/src/ui/animation.ts
View File

@ -15,6 +15,7 @@
*/
import { Modeling, Model } from "../util/types"
import { uniqueId } from "../util/uniqueId"
export type AnimatedKey = "translationX" | "translationY" | "scaleX" | "scaleY" | "rotation" | "pivotX" | "pivotY" | "rotationX" | "rotationY"
@ -26,6 +27,7 @@ export enum RepeatMode {
export interface IAnimation extends Modeling {
duration: number
delay?: number
id: string
}
export interface Changeable {
@ -85,6 +87,7 @@ abstract class Animation implements IAnimation {
delay?: number
fillMode = FillMode.Forward
timingFunction?: TimingFunction
id = uniqueId("Animation")
toModel() {
const changeables = []
for (let e of this.changeables.values()) {
@ -102,7 +105,8 @@ abstract class Animation implements IAnimation {
repeatCount: this.repeatCount,
repeatMode: this.repeatMode,
fillMode: this.fillMode,
timingFunction: this.timingFunction
timingFunction: this.timingFunction,
id: this.id,
}
}
}
@ -160,13 +164,13 @@ export class ScaleAnimation extends Animation {
export class TranslationAnimation extends Animation {
private translationXChangeable: Changeable = {
key: "translationX",
fromValue: 1,
toValue: 1,
fromValue: 0,
toValue: 0,
}
private translationYChangeable: Changeable = {
key: "translationY",
fromValue: 1,
toValue: 1,
fromValue: 0,
toValue: 0,
}
constructor() {
super()
@ -292,6 +296,8 @@ export class AnimationSet implements IAnimation {
private animations: IAnimation[] = []
private _duration = 0
delay?: number
id = uniqueId("AnimationSet")
addAnimation(anim: IAnimation) {
this.animations.push(anim)
}
@ -311,6 +317,7 @@ export class AnimationSet implements IAnimation {
return e.toModel()
}) as Model,
delay: this.delay,
id: this.id,
}
}
}

10
doric-js/src/ui/view.es5.ts
View File

@ -342,6 +342,16 @@ export abstract class View implements Modeling {
}
})
}
clearAnimation(context: BridgeContext, animation: IAnimation) {
return this.nativeChannel(context, "clearAnimation")(animation.id).then(() => {
this.__dirty_props__.translationX = this.translationX || 0
this.__dirty_props__.translationY = this.translationY || 0
this.__dirty_props__.scaleX = this.scaleX || 1
this.__dirty_props__.scaleY = this.scaleY || 1
this.__dirty_props__.rotation = this.rotation || 0
})
}
}
export abstract class Superview extends View {

14
doric-js/src/ui/view.ts
View File

@ -351,6 +351,20 @@ export abstract class View implements Modeling {
}
})
}
clearAnimation(context: BridgeContext, animation: IAnimation) {
return this.nativeChannel(context, "clearAnimation")(animation.id).then(() => {
this.__dirty_props__.translationX = this.translationX || 0
this.__dirty_props__.translationY = this.translationY || 0
this.__dirty_props__.scaleX = this.scaleX || 1
this.__dirty_props__.scaleY = this.scaleY || 1
this.__dirty_props__.rotation = this.rotation || 0
})
}
cancelAnimation(context: BridgeContext, animation: IAnimation) {
return this.nativeChannel(context, "cancelAnimation")(animation.id)
}
}
export abstract class Superview extends View {