李攀 / fangTang · Commits

Commit 51f2f2dd369bd27dbd7d69eb3083f8305c8eb72f

Authored by wugian
1 parent bb873079
build: skipped

gradle udpate

Inline Side-by-side
Showing 3 changed files with 23 additions and 30 deletions
@@ -151,7 +151,7 @@ dependencies { @@ -151,7 +151,7 @@ dependencies {
151 compile files('libs/glide-3.7.0.jar') 151 compile files('libs/glide-3.7.0.jar')
152 compile files('libs/greenbluetoothlelib.jar') 152 compile files('libs/greenbluetoothlelib.jar')
153 153
154 - compile project(':transitionhelper') 154 +// compile project(':transitionhelper')
155 compile project(':uil') 155 compile project(':uil')
156 compile project(':volley') 156 compile project(':volley')
157 compile project(':pinying') 157 compile project(':pinying')
1 package com.xgimi.gimicinema.activity; 1 package com.xgimi.gimicinema.activity;
2 2
3 -import android.animation.AnimatorSet;  
4 -import android.animation.ObjectAnimator;  
5 import android.app.Activity; 3 import android.app.Activity;
6 import android.app.ProgressDialog; 4 import android.app.ProgressDialog;
7 import android.content.Context; 5 import android.content.Context;
@@ -21,7 +19,6 @@ import android.view.View; @@ -21,7 +19,6 @@ import android.view.View;
21 import android.view.ViewGroup; 19 import android.view.ViewGroup;
22 import android.view.ViewTreeObserver; 20 import android.view.ViewTreeObserver;
23 import android.view.Window; 21 import android.view.Window;
24 -import android.view.animation.AccelerateInterpolator;  
25 import android.widget.AdapterView; 22 import android.widget.AdapterView;
26 import android.widget.BaseAdapter; 23 import android.widget.BaseAdapter;
27 import android.widget.Button; 24 import android.widget.Button;
@@ -33,7 +30,6 @@ import android.widget.RatingBar; @@ -33,7 +30,6 @@ import android.widget.RatingBar;
33 import android.widget.RelativeLayout; 30 import android.widget.RelativeLayout;
34 import android.widget.TextView; 31 import android.widget.TextView;
35 import android.widget.Toast; 32 import android.widget.Toast;
36 -  
37 import com.gimi.common.cinema.model.LocalMovieMessage; 33 import com.gimi.common.cinema.model.LocalMovieMessage;
38 import com.gimi.common.cinema.model.MovieCast; 34 import com.gimi.common.cinema.model.MovieCast;
39 import com.gimi.common.cinema.model.MovieMessage; 35 import com.gimi.common.cinema.model.MovieMessage;
@@ -50,10 +46,6 @@ import com.xgimi.gimicinema.presenter.MovieDetailPresenter; @@ -50,10 +46,6 @@ import com.xgimi.gimicinema.presenter.MovieDetailPresenter;
50 import com.xgimi.gimicinema.view.FocusBorderView; 46 import com.xgimi.gimicinema.view.FocusBorderView;
51 import com.xgimi.gimicinema.view.MovieItem; 47 import com.xgimi.gimicinema.view.MovieItem;
52 48
53 -import immortalz.me.library.TransitionsHelper;  
54 -import immortalz.me.library.bean.InfoBean;  
55 -import immortalz.me.library.method.ColorShowMethod;  
56 -  
57 import java.util.ArrayList; 49 import java.util.ArrayList;
58 import java.util.HashMap; 50 import java.util.HashMap;
59 import java.util.List; 51 import java.util.List;
@@ -378,26 +370,26 @@ public class MovieDetailMsgActivity extends BaseActivity @@ -378,26 +370,26 @@ public class MovieDetailMsgActivity extends BaseActivity
378 370
379 backgroundIv = (ImageView) findViewById(R.id.background_iv); 371 backgroundIv = (ImageView) findViewById(R.id.background_iv);
380 372
381 - TransitionsHelper.getInstance()  
382 - .setShowMethod(new ColorShowMethod(R.color.green_p, R.color.bg_teal) {  
383 - @Override  
384 - public void loadCopyView(InfoBean bean, ImageView copyView) {  
385 - AnimatorSet set = new AnimatorSet();  
386 - set.playTogether(  
387 -// ObjectAnimator.ofFloat(copyView, "rotation", 0, 180),  
388 - ObjectAnimator.ofFloat(copyView, "scaleX", 1, 0),  
389 - ObjectAnimator.ofFloat(copyView, "scaleY", 1, 0)  
390 - );  
391 - set.setInterpolator(new AccelerateInterpolator());  
392 - set.setDuration(duration / 4 * 5).start();  
393 - }  
394 -  
395 - @Override  
396 - public void loadTargetView(InfoBean bean, ImageView targetView) {  
397 -  
398 - }  
399 - })  
400 - .show(this, null); 373 +// TransitionsHelper.getInstance()
  374 +// .setShowMethod(new ColorShowMethod(R.color.green_p, R.color.bg_teal) {
  375 +// @Override
  376 +// public void loadCopyView(InfoBean bean, ImageView copyView) {
  377 +// AnimatorSet set = new AnimatorSet();
  378 +// set.playTogether(
  379 +//// ObjectAnimator.ofFloat(copyView, "rotation", 0, 180),
  380 +// ObjectAnimator.ofFloat(copyView, "scaleX", 1, 0),
  381 +// ObjectAnimator.ofFloat(copyView, "scaleY", 1, 0)
  382 +// );
  383 +// set.setInterpolator(new AccelerateInterpolator());
  384 +// set.setDuration(duration / 4 * 5).start();
  385 +// }
  386 +//
  387 +// @Override
  388 +// public void loadTargetView(InfoBean bean, ImageView targetView) {
  389 +//
  390 +// }
  391 +// })
  392 +// .show(this, null);
401 393
402 394
403 mSpinner = new ProgressDialog(context); 395 mSpinner = new ProgressDialog(context);
@@ -11,7 +11,8 @@ @@ -11,7 +11,8 @@
11 # When configured, Gradle will run in incubating parallel mode. 11 # When configured, Gradle will run in incubating parallel mode.
12 # This option should only be used with decoupled projects. More details, visit 12 # This option should only be used with decoupled projects. More details, visit
13 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects 13 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
14 -# org.gradle.parallel=true 14 +org.gradle.parallel=true
  15 +org.gradle.daemon=true
15 #Fri Oct 28 11:43:32 CST 2016 16 #Fri Oct 28 11:43:32 CST 2016
16 ANDROID_MIN_SDK_VERSION=18 17 ANDROID_MIN_SDK_VERSION=18
17 ANDROID_BUILD_COMPILE_SDK_VERSION=18 18 ANDROID_BUILD_COMPILE_SDK_VERSION=18
Please register or login to post a comment