Skip to content

Commit

Permalink
activity animation
Browse files Browse the repository at this point in the history
  • Loading branch information
Yang Zhou committed Jun 15, 2016
1 parent 6f29825 commit 991aa63
Show file tree
Hide file tree
Showing 13 changed files with 502 additions and 13 deletions.
17 changes: 11 additions & 6 deletions app/app.iml
Original file line number Diff line number Diff line change
Expand Up @@ -87,19 +87,24 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.3.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.3.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/cardview-v7/23.0.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/cardview-v7/23.3.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.3.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.3.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.3.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/23.3.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.fightyz/ZUtil/v1.2/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
Expand All @@ -109,14 +114,14 @@
</content>
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="recyclerview-v7-23.1.1" level="project" />
<orderEntry type="library" exported="" name="recyclerview-v7-23.3.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-23.3.0" level="project" />
<orderEntry type="library" exported="" name="cardview-v7-23.0.1" level="project" />
<orderEntry type="library" exported="" name="support-annotations-23.3.0" level="project" />
<orderEntry type="library" exported="" name="support-vector-drawable-23.3.0" level="project" />
<orderEntry type="library" exported="" name="animated-vector-drawable-23.3.0" level="project" />
<orderEntry type="library" exported="" name="ZUtil-v1.2" level="project" />
<orderEntry type="library" exported="" name="design-23.3.0" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-23.3.0" level="project" />
<orderEntry type="library" exported="" name="design-23.1.1" level="project" />
<orderEntry type="library" exported="" name="cardview-v7-23.3.0" level="project" />
</component>
</module>
8 changes: 4 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ repositories {

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:23.0.1'
compile 'com.android.support:recyclerview-v7:23.0.1'
compile 'com.android.support:cardview-v7:23.0.1'
compile 'com.android.support:design:23.1.1'
compile 'com.android.support:appcompat-v7:23.3.0'
compile 'com.android.support:recyclerview-v7:23.3.0'
compile 'com.android.support:cardview-v7:23.3.0'
compile 'com.android.support:design:23.3.0'
compile 'com.github.fightyz:ZUtil:v1.2'
}
3 changes: 2 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
</activity>
<activity
android:name=".PeripheralDetailActivity"
android:label="@string/title_activity_peripheral_detail" >
android:label="@string/title_activity_peripheral_detail"
android:theme="@style/BlankTheme">
</activity>
</application>

Expand Down
93 changes: 93 additions & 0 deletions app/src/main/java/org/esec/mcg/bleinsight/BaseActivity.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
package org.esec.mcg.bleinsight;

import android.app.Activity;
import android.support.v7.app.AppCompatActivity;
import android.view.MotionEvent;
import android.view.VelocityTracker;

import org.esec.mcg.library.logger.LogUtils;

/**
* Created by yz on 2016/6/13.
*/
public class BaseActivity extends AppCompatActivity {

// 手指向右滑动时的最小速度
private static final int XSPEED_MIN = 200;

// 手指向右滑动时的最小距离
private static final int XDISTANCE_MIN = 150;

// 记录手指按下时的横坐标
private float xDown;

// 记录手指移动时的横坐标
private float xMove;

// 用于计算手指滑动的速度
private VelocityTracker mVelocityTracker;

@Override
public void onBackPressed() {
super.onBackPressed();
overridePendingTransition(R.anim.in_from_left, R.anim.out_to_right);
}

@Override
public boolean dispatchTouchEvent(MotionEvent event) {
LogUtils.d("onTouchEvent");
createVelocityTracker(event);
switch (event.getAction()) {
case MotionEvent.ACTION_DOWN:
xDown = event.getRawX();
break;

case MotionEvent.ACTION_MOVE:
xMove = event.getRawX();
// 活动的距离
int distanceX = (int) (xMove - xDown);
// 获取顺时速度
int xSpeed = getScrollVelocity();
// 当滑动的距离大于我们设定的最小距离且滑动的瞬间速度大于我们设定的速度时,返回到上一个activity
if (distanceX > XDISTANCE_MIN && xSpeed > XSPEED_MIN) {
finish();
overridePendingTransition(R.anim.in_from_left, R.anim.out_to_right);
}
break;

case MotionEvent.ACTION_UP:
recycleVelocityTracker();
break;

default:
break;

}
return super.dispatchTouchEvent(event);
}

private void createVelocityTracker(MotionEvent event) {
if (mVelocityTracker == null) {
mVelocityTracker = VelocityTracker.obtain();
}
mVelocityTracker.addMovement(event);
}

/**
* 获取手指在content界面滑动的速度
* @return 滑动速度,以每秒钟移动了多少像素值为单位
*/
private int getScrollVelocity() {
mVelocityTracker.computeCurrentVelocity(1000);
int velocity = (int)mVelocityTracker.getXVelocity();
return Math.abs(velocity);
}

/**
* 回收VelocityTracker对象
*/
private void recycleVelocityTracker() {
mVelocityTracker.recycle();
mVelocityTracker = null;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

import java.util.List;

public class PeripheralDetailActivity extends AppCompatActivity
public class PeripheralDetailActivity extends SwipeActivity
implements ExpandableRecyclerAdapter.ExpandCollapseListener, InsightDeviceUiCallbacks {

public static final String EXTRAS_DEVICE_NAME = "BLE_DEVICE_NAME";
Expand Down Expand Up @@ -69,6 +69,7 @@ public class PeripheralDetailActivity extends AppCompatActivity
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_peripheral_detail);
setSwipeAnyWhere(false);

connectViewsVariables();
setSupportActionBar(mToolbar);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.util.Log;
import android.view.View;
import android.widget.TextView;
import android.widget.Toast;
Expand Down Expand Up @@ -116,6 +117,12 @@ protected void onPause() {
invalidateOptionsMenu();
}

@Override
protected void onDestroy() {
LogUtils.e("onDestroy");
super.onDestroy();
}

@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == ENABLE_BT_REQUEST_ID) {
Expand Down
Loading

0 comments on commit 991aa63

Please sign in to comment.