Browse Source

1、页面跳转动画bug

RaoMeng 9 years ago
parent
commit
60f0ec08dd

+ 0 - 5
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -742,9 +742,4 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         return (BusinessCircleFragment) sfmanager.findFragmentByTag(TAG_BusinessCircle);
     }
 
-
-    @Override
-    public void startActivity(Intent intent) {
-        super.startActivity(intent);
-    }
 }

+ 13 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/base/ActionBackActivity.java

@@ -138,6 +138,7 @@ public class ActionBackActivity extends StackActivity {
 
     protected boolean onHomeAsUp() {
         finish();
+        overridePendingTransition(R.anim.anim_activity_back_in, R.anim.anim_activity_back_out);
         return true;
     }
 
@@ -166,8 +167,18 @@ public class ActionBackActivity extends StackActivity {
 
     @Override
     public void startActivity(Intent intent) {
-        super.startActivity(intent);
-        overridePendingTransition(R.anim.anim_activity_in, R.anim.anim_activity_out);
+        if (intent.getAction() != null){
+            if (!intent.getAction().equals(Intent.ACTION_MAIN)){
+                super.startActivity(intent);
+                overridePendingTransition(R.anim.anim_activity_in, R.anim.anim_activity_out);
+            }else {
+                super.startActivity(intent);
+                overridePendingTransition(R.anim.anim_to_main_in, R.anim.anim_to_main_out);
+            }
+        }else {
+            super.startActivity(intent);
+            overridePendingTransition(R.anim.anim_activity_in, R.anim.anim_activity_out);
+        }
     }
 
     @Override

+ 0 - 21
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/base/BaseActivity.java

@@ -2,7 +2,6 @@ package com.xzjmyk.pm.activity.ui.base;
 
 import android.app.Activity;
 import android.content.Context;
-import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.os.Bundle;
 import android.util.TypedValue;
@@ -13,7 +12,6 @@ import com.android.volley.Request;
 import com.android.volley.RetryPolicy;
 import com.umeng.analytics.MobclickAgent;
 import com.xzjmyk.pm.activity.MyApplication;
-import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
 import com.xzjmyk.pm.activity.util.Constants;
@@ -166,23 +164,4 @@ public abstract class BaseActivity extends ActionBackActivity {
     public void ToastMessage(String message) {
         ViewUtil.ToastMessage(this, message);
     }
-
-
-    @Override
-    public void startActivity(Intent intent) {
-        super.startActivity(intent);
-        overridePendingTransition(R.anim.anim_activity_in, R.anim.anim_activity_out);
-    }
-
-    @Override
-    public void startActivityForResult(Intent intent, int requestCode) {
-        super.startActivityForResult(intent, requestCode);
-        overridePendingTransition(R.anim.anim_activity_in, R.anim.anim_activity_out);
-    }
-
-    @Override
-    public void onBackPressed() {
-        super.onBackPressed();
-        overridePendingTransition(R.anim.anim_activity_back_in,R.anim.anim_activity_back_out);
-    }
 }

+ 1 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/SigninFragment.java

@@ -258,6 +258,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                 break;
             case R.id.back:
                 ct.finish();
+                getActivity().overridePendingTransition(R.anim.anim_activity_back_in, R.anim.anim_activity_back_out);
                 break;
             case R.id.signin_btn:
                 if (isPlay()) {

+ 4 - 0
WeiChat/src/main/res/anim/anim_to_main_in.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<translate xmlns:android="http://schemas.android.com/apk/res/android">
+
+</translate>

+ 14 - 0
WeiChat/src/main/res/anim/anim_to_main_out.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="200"
+        android:fromYDelta="0"
+        android:toYDelta="50%p"
+        android:interpolator="@android:anim/accelerate_decelerate_interpolator"/>
+    <alpha
+        android:duration="150"
+        android:fromAlpha="1"
+        android:toAlpha="0"
+        android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+        />
+</set>