修改了右滑的错误动画

zzz40500 · Jan 30, 2015 · 38e4168 · 38e4168
1 parent b654013
commit 38e4168
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 17 deletions.
diff --git a/Demo.apk b/Demo.apk
diff --git a/app/src/main/java/com/mingle/headsupdemo/MainActivity.java b/app/src/main/java/com/mingle/headsupdemo/MainActivity.java
@@ -23,17 +23,6 @@ public class MainActivity extends ActionBarActivity {
 
 
 
-
-
-
-
-
-
-
-
-
-
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

diff --git a/library/src/main/java/com/mingle/headsUp/FloatView.java b/library/src/main/java/com/mingle/headsUp/FloatView.java
@@ -5,6 +5,7 @@
 import android.content.Context;
 import android.os.Handler;
 import android.os.Message;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.VelocityTracker;
@@ -138,8 +139,7 @@ public boolean onTouchEvent(MotionEvent event) {
                 break;
             case MotionEvent.ACTION_UP:
                 velocityTracker.computeCurrentVelocity(1000,maxVelocity);
-                int velocity= (int) velocityTracker.getYVelocity(pointerId);
-                double dis=distance.getSplineFlingDistance(velocity);
+                int dis= (int) velocityTracker.getYVelocity(pointerId);
                 if(scrollOrientationEnum==ScrollOrientationEnum.NONE){
                     if(headsUp.getNotification().contentIntent!=null){
 
@@ -160,12 +160,12 @@ public boolean onTouchEvent(MotionEvent event) {
                 }else{
                     toX= (int) (preLeft-Math.abs(dis));
                 }
-
-                if (toX < -validWidth) {
+                Log.e("toX","  "+toX);
+                if (toX <= -validWidth) {
                     float preAlpha=1-Math.abs(preLeft)/validWidth;
                     preAlpha=preAlpha>=0?preAlpha:0;
-                    translationX(preLeft,validWidth+10,preAlpha,0);
-                } else if (toX < validWidth) {
+                    translationX(preLeft,-(validWidth+10),preAlpha,0);
+                } else if (toX <= validWidth) {
                     float preAlpha=1-Math.abs(preLeft)/validWidth;
                     preAlpha=preAlpha>=0?preAlpha:0;
                     translationX(preLeft,0,preAlpha,1);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -23,17 +23,6 @@ public class MainActivity extends ActionBarActivity {














		@Override
		protected void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
Expand Down