From 2c76ecbb7edf6e30f1dda4c930a02945c360ecab Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Tue, 27 Nov 2018 17:18:57 +0800
Subject: [PATCH] [*]修改页面动画
---
app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java b/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
index 9ab6e2c..3e0cf72 100644
--- a/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
+++ b/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
@@ -14,7 +14,6 @@
import android.os.Handler;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
-import android.support.v4.app.ActivityOptionsCompat;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
@@ -402,12 +401,9 @@
iv_dianliang.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- Intent intent = new Intent(getActivity(), BLESearchActivity.class);
- ActivityOptionsCompat optionsCompat = ActivityOptionsCompat.makeSceneTransitionAnimation(getActivity(), iv_dianliang, "dddd");
- startActivity(intent,optionsCompat.toBundle());
-// if (BuildConfig.BUILD_TYPE.equals(VersionConstants.DEBUG)) {
-// FlipAnimatorXViewShow(iv_dianliang, tv_dianliang2, 200);
-// }
+ if (BuildConfig.BUILD_TYPE.equals(VersionConstants.DEBUG)) {
+ FlipAnimatorXViewShow(iv_dianliang, tv_dianliang2, 200);
+ }
}
});
tv_dianliang2.setOnClickListener(new View.OnClickListener() {
@@ -480,6 +476,7 @@
if (MainApp.theApp.bleManager == null || !(MainApp.theApp.bleManager != null && MainApp.theApp.bleManager.isSupportBle())) {
return;
}
+ startActivity(new Intent(getActivity(), BLESearchActivity.class));
break;
case R.id.iv_his:
intent = new Intent(getActivity(), ChartActivity.class);
--
Gitblit v1.8.0