[*]修改主页指针跳转动画

陈奇

2018-11-27 ce4ea39afd14301dd1df0501a657fa6de97d576a

[*]修改主页指针跳转动画

 .gradle/4.1/fileHashes/fileHashes.bin

Binary files differ

 .gradle/4.1/fileHashes/fileHashes.lock

Binary files differ

 .gradle/4.1/javaCompile/classAnalysis.bin

Binary files differ

 .gradle/4.1/javaCompile/javaCompile.lock

Binary files differ

 .gradle/4.1/javaCompile/taskHistory.bin

Binary files differ

 .gradle/4.1/taskHistory/fileSnapshots.bin

Binary files differ

 .gradle/4.1/taskHistory/taskHistory.bin

Binary files differ

 .gradle/4.1/taskHistory/taskHistory.lock

Binary files differ

 .idea/misc.xml

@@ -108,7 +108,7 @@
      </value>
    </option>
  </component>
  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/build/classes" />
  </component>
  <component name="ProjectType">

 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);

 app/src/main/res/layout/fragment_monitor_layout.xml

@@ -107,6 +107,7 @@
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:text="累计计量(uSv)"
                        android:textColor="@color/black_txt"
                        android:textSize="12sp" />

                    <TextView
@@ -138,6 +139,7 @@
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:text="实时计量(uSv/h)"
                        android:textColor="@color/black_txt"
                        android:textSize="12sp" />

                    <TextView
@@ -177,10 +179,10 @@
                        android:id="@+id/pv"
                        android:layout_width="@dimen/x280"
                        android:layout_height="@dimen/x280"
                        android:transitionName="pv_main"
                        android:layout_alignParentStart="true"
                        android:layout_alignParentTop="true"
                        android:layout_gravity="center_horizontal" />
                        android:layout_gravity="center_horizontal"
                        android:transitionName="pv_main" />

                    <TextView
                        android:id="@+id/tv_tishi"
@@ -240,9 +242,9 @@
            android:layout_alignParentRight="true"
            android:layout_gravity="right"
            android:layout_marginTop="20dp"
            android:transitionName="dddd"
            android:layout_marginRight="20dp"
            android:src="@mipmap/icon_full" />
            android:src="@mipmap/icon_full"
            android:transitionName="dddd" />

        <TextView
            android:id="@+id/tv_dianliang2"