Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/2.0' into 2.0

Browse Source 
# Conflicts:
#	app/src/main/java/com/gh/gamecenter/GameDetailActivity.java
#	app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java
#	app/src/main/res/layout/gamedetail_item_top.xml
This commit is contained in:
khy
2016-09-14 17:56:32 +08:00
parent 385a206f6b 405056cbd3
commit 03e05b3e35
114 changed files with 3438 additions and 5020 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/gh/common/util/ImageUtils.java
View File

@ -12,7 +12,6 @@ import android.widget.ImageView.ScaleType;
import com.gh.common.view.CircleImageView;
import com.gh.gamecenter.R;
import com.gh.gamecenter.eventbus.EBImage;
import com.nostra13.universalimageloader.core.DisplayImageOptions;
import com.nostra13.universalimageloader.core.ImageLoader;
import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
@ -24,8 +23,6 @@ import java.lang.ref.WeakReference;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import de.greenrobot.event.EventBus;
public class ImageUtils {
private static ImageUtils singleton;
private static ImageLoader imageLoader;
@ -168,8 +165,6 @@ public class ImageUtils {
imageView.setLayoutParams(layoutParams);
}
EventBus.getDefault().post(new EBImage(imageUri, newHeight));
if (imageView instanceof CircleImageView) {
imageView.setScaleType(ScaleType.CENTER_CROP);
} else {