You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/03/08 03:32:42 UTC
[7/8] incubator-weex git commit: * [android] Rename variable name
from mWXSDKInstance to instance.
* [android] Rename variable name from mWXSDKInstance to instance.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/cc263086
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/cc263086
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/cc263086
Branch: refs/heads/0.11-dev
Commit: cc26308656c158321fe4c59636e1151ac7299899
Parents: 0e75941
Author: YorkShen <sh...@gmail.com>
Authored: Wed Mar 8 11:31:25 2017 +0800
Committer: YorkShen <sh...@gmail.com>
Committed: Wed Mar 8 11:31:25 2017 +0800
----------------------------------------------------------------------
.../taobao/weex/ui/animation/WXAnimationModule.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/cc263086/android/sdk/src/main/java/com/taobao/weex/ui/animation/WXAnimationModule.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/animation/WXAnimationModule.java b/android/sdk/src/main/java/com/taobao/weex/ui/animation/WXAnimationModule.java
index 5969f1c..e974633 100755
--- a/android/sdk/src/main/java/com/taobao/weex/ui/animation/WXAnimationModule.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/animation/WXAnimationModule.java
@@ -263,7 +263,7 @@ public class WXAnimationModule extends WXModule {
}
}
- public static void startAnimation(WXSDKInstance mWXSDKInstance, WXComponent component,
+ public static void startAnimation(WXSDKInstance instance, WXComponent component,
@NonNull WXAnimationBean animationBean, @Nullable String callback) {
if(component == null){
return;
@@ -274,9 +274,9 @@ public class WXAnimationModule extends WXModule {
return;
}
try {
- Animator animator = createAnimator(animationBean, component.getHostView(),mWXSDKInstance.getViewPortWidth());
+ Animator animator = createAnimator(animationBean, component.getHostView(),instance.getViewPortWidth());
if (animator != null) {
- Animator.AnimatorListener animatorCallback = createAnimatorListener(mWXSDKInstance, callback);
+ Animator.AnimatorListener animatorCallback = createAnimatorListener(instance, callback);
if(Build.VERSION.SDK_INT<Build.VERSION_CODES.JELLY_BEAN_MR2) {
component.getHostView().setLayerType(View.LAYER_TYPE_HARDWARE, null);
}
@@ -349,15 +349,15 @@ public class WXAnimationModule extends WXModule {
public static
@Nullable
- Animator.AnimatorListener createAnimatorListener(final WXSDKInstance mWXSDKInstance, @Nullable final String callBack) {
+ Animator.AnimatorListener createAnimatorListener(final WXSDKInstance instance, @Nullable final String callBack) {
if (!TextUtils.isEmpty(callBack)) {
return new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
- if (mWXSDKInstance == null) {
- WXLogUtils.e("WXRenderStatement-onAnimationEnd mWXSDKInstance == null NPE");
+ if (instance == null) {
+ WXLogUtils.e("WXRenderStatement-onAnimationEnd WXSDKInstance == null NPE");
} else {
- WXSDKManager.getInstance().callback(mWXSDKInstance.getInstanceId(),
+ WXSDKManager.getInstance().callback(instance.getInstanceId(),
callBack,
new HashMap<String, Object>());
}