diff --git a/app/src/main/java/com/gh/base/AppController.java b/app/src/main/java/com/gh/base/AppController.java index 6b85c49c71..ef5827fa2d 100644 --- a/app/src/main/java/com/gh/base/AppController.java +++ b/app/src/main/java/com/gh/base/AppController.java @@ -16,9 +16,9 @@ import com.gh.common.constant.Config; import com.gh.common.util.DataUtils; import com.gh.common.util.StringUtils; import com.gh.common.util.TokenUtils; -import com.lightgame.utils.Utils; import com.gh.gamecenter.BuildConfig; import com.leon.channel.helper.ChannelReaderUtil; +import com.lightgame.utils.Utils; import com.umeng.message.IUmengRegisterCallback; import com.umeng.message.PushAgent; import com.umeng.message.UTrack; @@ -79,11 +79,16 @@ public class AppController extends Application { return mChannel; } + @Override + protected void attachBaseContext(Context base) { + super.attachBaseContext(base); + MultiDex.install(this); + } + @Override public void onCreate() { super.onCreate(); - MultiDex.install(this); mInstance = this; //TODO 强烈不建议开发阶段开启这个Handler，必须处理错误 @@ -153,47 +158,41 @@ public class AppController extends Application { }; Logger.setLogger(this, newLogger); } - - try { - //友盟推送 - final PushAgent pushAgent = PushAgent.getInstance(this); - pushAgent.setAppkeyAndSecret(Config.UMENG_APPKEY, Config.UMENG_MESSAGE_SECRET); - if (BuildConfig.DEBUG) { - // 设置debug的key，覆盖掉原值，非debug build这个if分支会被去掉 - pushAgent.setAppkeyAndSecret(Config.DEBUG_UMENG_APPKEY, Config.DEBUG_UMENG_MESSAGE_SECRET); - } - - //注册推送服务，每次调用register方法都会回调该接口 - pushAgent.register(new IUmengRegisterCallback() { - - @Override - public void onSuccess(String deviceToken) { - //注册成功会返回device token - Utils.log("deviceToken::" + deviceToken); - - //设置别名 - pushAgent.addExclusiveAlias(TokenUtils.getDeviceId(getApplicationContext()), - "GHDID", new UTrack.ICallBack() { - @Override - public void onMessage(boolean b, String s) { - Utils.log(StringUtils.buildString("ExclusiveAlias::", String.valueOf(b), "==", s)); - - } - }); - } - - @Override - public void onFailure(String s, String s1) { - Utils.log("deviceToken::" + "注册失败"); - } - }); - - // 友盟推送数据处理 - pushAgent.setNotificationClickHandler(new GHUmengNotificationClickHandler()); - } catch (Exception e) { - e.printStackTrace(); + //友盟推送 + final PushAgent pushAgent = PushAgent.getInstance(this); + pushAgent.setAppkeyAndSecret(Config.UMENG_APPKEY, Config.UMENG_MESSAGE_SECRET); + if (BuildConfig.DEBUG) { + // 设置debug的key，覆盖掉原值，非debug build这个if分支会被去掉 + pushAgent.setAppkeyAndSecret(Config.DEBUG_UMENG_APPKEY, Config.DEBUG_UMENG_MESSAGE_SECRET); } + //注册推送服务，每次调用register方法都会回调该接口 + pushAgent.register(new IUmengRegisterCallback() { + + @Override + public void onSuccess(String deviceToken) { + //注册成功会返回device token + Utils.log("deviceToken::" + deviceToken); + + //设置别名 + pushAgent.addExclusiveAlias(TokenUtils.getDeviceId(getApplicationContext()), + "GHDID", new UTrack.ICallBack() { + @Override + public void onMessage(boolean b, String s) { + Utils.log(StringUtils.buildString("ExclusiveAlias::", String.valueOf(b), "==", s)); + + } + }); + } + + @Override + public void onFailure(String s, String s1) { + Utils.log("deviceToken::" + "注册失败"); + } + }); + + // 友盟推送数据处理 + pushAgent.setNotificationClickHandler(new GHUmengNotificationClickHandler()); // // 监听屏幕状态广播 // if (shouldInit()) { // UnlockScreenReceiver unlockScreenReceiver = new UnlockScreenReceiver(); diff --git a/app/src/main/java/com/gh/base/BaseActivity.java b/app/src/main/java/com/gh/base/BaseActivity.java index ec3574d36a..a0adf6e060 100644 --- a/app/src/main/java/com/gh/base/BaseActivity.java +++ b/app/src/main/java/com/gh/base/BaseActivity.java @@ -123,7 +123,7 @@ public abstract class BaseActivity extends BaseAppCompatToolBarActivity implemen public void onEventMainThread(final EBShowDialog showDialog) { if (!mIsPause && this.getClass().getName().equals(RunningUtils.getTopActivity(this))) { if ("hijack".equals(showDialog.getType())) { - DialogUtils.showQqSessionDialog(this, null);// 建议用户联系客服 + DialogUtils.showQqSessionDialog(this, "2586716223");// 建议用户联系客服 } else if ("plugin".equals(showDialog.getType())) { DialogUtils.showPluginDialog(this, new DialogUtils.ConfirmListener() { @Override diff --git a/app/src/main/java/com/gh/common/util/ConcernContentUtils.java b/app/src/main/java/com/gh/common/util/ConcernContentUtils.java index 4c07df02b1..55c81620e3 100644 --- a/app/src/main/java/com/gh/common/util/ConcernContentUtils.java +++ b/app/src/main/java/com/gh/common/util/ConcernContentUtils.java @@ -69,7 +69,7 @@ public class ConcernContentUtils { DisplayUtils.dip2px(context, 2), DisplayUtils.dip2px(context, 4)); lparams.weight = 1; imageView.setLayoutParams(lparams); - ImageUtils.getInstance().display(context.getResources(), imageView, + ImageUtils.Companion.getInstance().display(context.getResources(), imageView, ScalingUtils.ScaleType.CENTER_CROP, list.get(position)); break; case 1: @@ -78,7 +78,7 @@ public class ConcernContentUtils { lparams.setMargins(DisplayUtils.dip2px(context, 2), 0, DisplayUtils.dip2px(context, 2), DisplayUtils.dip2px(context, 4)); imageView.setLayoutParams(lparams); - ImageUtils.getInstance().display(context.getResources(), imageView, + ImageUtils.Companion.getInstance().display(context.getResources(), imageView, ScalingUtils.ScaleType.CENTER_CROP, list.get(position)); break; default: @@ -89,7 +89,7 @@ public class ConcernContentUtils { DisplayUtils.dip2px(context, 2), DisplayUtils.dip2px(context, 4)); lparams.weight = 1; imageView.setLayoutParams(lparams); - ImageUtils.getInstance().display(context.getResources(), imageView, + ImageUtils.Companion.getInstance().display(context.getResources(), imageView, ScalingUtils.ScaleType.CENTER_CROP, list.get(position)); break; } diff --git a/app/src/main/java/com/gh/common/util/ConcernUtils.java b/app/src/main/java/com/gh/common/util/ConcernUtils.java deleted file mode 100644 index 7430fa51b4..0000000000 --- a/app/src/main/java/com/gh/common/util/ConcernUtils.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.gh.common.util; - -import android.content.Context; - -import com.gh.gamecenter.eventbus.EBReuse; -import com.gh.gamecenter.retrofit.Response; -import com.gh.gamecenter.retrofit.RetrofitManager; - -import org.greenrobot.eventbus.EventBus; -import org.json.JSONArray; - -import okhttp3.MediaType; -import okhttp3.RequestBody; -import okhttp3.ResponseBody; -import retrofit2.HttpException; -import rx.Observable; -import rx.functions.Func1; -import rx.schedulers.Schedulers; - -/** - * Created by khy on 2016/8/24. - * croncern 工具类 - */ -public class ConcernUtils { - - public static void postConcernGameId(final Context context, final String gameId) { - TokenUtils.getToken(context, true) - .flatMap(new Func1>() { - @Override - public Observable call(String token) { - JSONArray params = new JSONArray(); - params.put(gameId); - RequestBody body = RequestBody.create(MediaType.parse("application/json"), params.toString()); - return RetrofitManager.getUser().postConcern(token, body); - } - }).subscribeOn(Schedulers.io()) - .observeOn(Schedulers.io()) - .subscribe(new Response()); - } - - public static void deleteConcernData(final Context context, final String gameId) { - TokenUtils.getToken(context, true) - .flatMap(new Func1>() { - @Override - public Observable call(String token) { - return RetrofitManager.getUser().deleteConcern(token, gameId); - } - }).subscribeOn(Schedulers.io()) - .observeOn(Schedulers.io()) - .subscribe(new Response()); - } - - public static void updateConcernData(final Context context, final JSONArray data) { - TokenUtils.getToken(context, true) - .flatMap(new Func1>() { - @Override - public Observable call(String token) { - RequestBody body = RequestBody.create(MediaType.parse("application/json"), - data.toString()); - return RetrofitManager.getUser().putConcern(token, body); - } - }) - .subscribeOn(Schedulers.io()) - .observeOn(Schedulers.io()) - .subscribe(new Response() { - @Override - public void onResponse(ResponseBody response) { - super.onResponse(response); - EventBus.getDefault().post(new EBReuse("UpdateConcernSuccess")); - } - - @Override - public void onFailure(HttpException e) { - super.onFailure(e); - EventBus.getDefault().post(new EBReuse("UpdateConcernFailure")); - } - }); - } - -} - diff --git a/app/src/main/java/com/gh/common/util/ConcernUtils.kt b/app/src/main/java/com/gh/common/util/ConcernUtils.kt new file mode 100644 index 0000000000..4db1bca26a --- /dev/null +++ b/app/src/main/java/com/gh/common/util/ConcernUtils.kt @@ -0,0 +1,63 @@ +package com.gh.common.util + +import android.content.Context +import com.gh.gamecenter.eventbus.EBReuse +import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.retrofit.RetrofitManager +import okhttp3.MediaType +import okhttp3.RequestBody +import okhttp3.ResponseBody +import org.greenrobot.eventbus.EventBus +import org.json.JSONArray +import retrofit2.HttpException +import rx.schedulers.Schedulers + +/** + * Created by khy on 2016/8/24. + * croncern 工具类 + */ +object ConcernUtils { + + fun postConcernGameId(context: Context, gameId: String) { + TokenUtils.getToken(context, true) + .flatMap { token -> + val params = JSONArray() + params.put(gameId) + val body = RequestBody.create(MediaType.parse("application/json"), params.toString()) + RetrofitManager.getUser().postConcern(token, body) + }.subscribeOn(Schedulers.io()) + .observeOn(Schedulers.io()) + .subscribe(Response()) + } + + fun deleteConcernData(context: Context, gameId: String) { + TokenUtils.getToken(context, true) + .flatMap { token -> RetrofitManager.getUser().deleteConcern(token, gameId) }.subscribeOn(Schedulers.io()) + .observeOn(Schedulers.io()) + .subscribe(Response()) + } + + fun updateConcernData(context: Context, data: JSONArray) { + TokenUtils.getToken(context, true) + .flatMap { token -> + val body = RequestBody.create(MediaType.parse("application/json"), + data.toString()) + RetrofitManager.getUser().putConcern(token, body) + } + .subscribeOn(Schedulers.io()) + .observeOn(Schedulers.io()) + .subscribe(object : Response() { + override fun onResponse(response: ResponseBody) { + super.onResponse(response) + EventBus.getDefault().post(EBReuse("UpdateConcernSuccess")) + } + + override fun onFailure(e: HttpException) { + super.onFailure(e) + EventBus.getDefault().post(EBReuse("UpdateConcernFailure")) + } + }) + } + +} + diff --git a/app/src/main/java/com/gh/common/util/ImageUtils.java b/app/src/main/java/com/gh/common/util/ImageUtils.java deleted file mode 100644 index 58e318b713..0000000000 --- a/app/src/main/java/com/gh/common/util/ImageUtils.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.gh.common.util; - -import android.content.Context; -import android.content.res.Resources; -import android.graphics.drawable.Animatable; -import android.graphics.drawable.ColorDrawable; -import android.net.Uri; -import android.support.v4.content.ContextCompat; -import android.view.ViewGroup; - -import com.facebook.common.executors.CallerThreadExecutor; -import com.facebook.drawee.backends.pipeline.Fresco; -import com.facebook.drawee.controller.BaseControllerListener; -import com.facebook.drawee.controller.ControllerListener; -import com.facebook.drawee.drawable.ScalingUtils; -import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder; -import com.facebook.drawee.view.SimpleDraweeView; -import com.facebook.imagepipeline.datasource.BaseBitmapDataSubscriber; -import com.facebook.imagepipeline.image.ImageInfo; -import com.facebook.imagepipeline.request.ImageRequest; -import com.facebook.imagepipeline.request.ImageRequestBuilder; -import com.gh.gamecenter.R; - -public class ImageUtils { - - private static ImageUtils singleton; - - public static ImageUtils getInstance() { - if (singleton == null) { - synchronized (ImageUtils.class) { - if (singleton == null) { - singleton = new ImageUtils(); - return singleton; - } - } - } - return singleton; - } - - // 自适应图片宽高 - public void display(final SimpleDraweeView simpleDraweeView, String url, final int width) { - ControllerListener listener = new BaseControllerListener() { - @Override - public void onFinalImageSet(String id, ImageInfo imageInfo, Animatable animatable) { - if (imageInfo == null) { - return; - } - ViewGroup.LayoutParams layoutParams = simpleDraweeView.getLayoutParams(); - float scale = (float) imageInfo.getHeight() / (float) imageInfo.getWidth(); - layoutParams.height = (int) (width * scale); - simpleDraweeView.setLayoutParams(layoutParams); - } - }; - simpleDraweeView.setController(Fresco.newDraweeControllerBuilder() - .setUri(url) - .setControllerListener(listener) - .build()); - } - - // 设置缩放类型，设置按压状态下的叠加图 - public void display(Resources resources, SimpleDraweeView simpleDraweeView, - ScalingUtils.ScaleType scaleType, String url) { - final Context context = simpleDraweeView.getContext(); - simpleDraweeView.setHierarchy(new GenericDraweeHierarchyBuilder(resources) - .setFadeDuration(500) - .setPressedStateOverlay(new ColorDrawable(ContextCompat.getColor(context, R.color.pressed_bg))) - .setPlaceholderImage(R.drawable.ocupy2, ScalingUtils.ScaleType.CENTER) - .setBackground(new ColorDrawable(ContextCompat.getColor(context, R.color.placeholder_bg))) - .setActualImageScaleType(scaleType) - .build()); -// simpleDraweeView.setImageURI(url); - display(simpleDraweeView, url); - } - - public static void display(SimpleDraweeView simpleDraweeView, String url) { -// if (url.startsWith("http://image.ghzhushou.com") && url.endsWith(".jpg")) { -// url = url + "?x-oss-process=image/format,webp"; -// } - simpleDraweeView.setImageURI(url); - } - - // 设置占位符 - public void display(Resources resources, SimpleDraweeView simpleDraweeView, String url, int placeholderImage) { - final Context context = simpleDraweeView.getContext(); - simpleDraweeView.setHierarchy(new GenericDraweeHierarchyBuilder(resources) - .setFadeDuration(500) - .setPressedStateOverlay(new ColorDrawable(ContextCompat.getColor(context, R.color.pressed_bg))) - .setBackground(new ColorDrawable(ContextCompat.getColor(context, R.color.placeholder_bg))) - .setPlaceholderImage(placeholderImage) - .build()); -// simpleDraweeView.setImageURI(url); - display(simpleDraweeView, url); - } - - // 图片下载监听和设置低高分辨率图片 - public void display(SimpleDraweeView simpleDraweeView, String url, String lowUrl, - ControllerListener listener) { - simpleDraweeView.setController(Fresco.newDraweeControllerBuilder() - .setImageRequest(ImageRequest.fromUri(url)) - .setControllerListener(listener) - .setLowResImageRequest(ImageRequest.fromUri(lowUrl)) // 低分辨率图片 - .build()); - } - - // 获取bitmap - public void display(Context context, String url, BaseBitmapDataSubscriber dataSubscriber) { - ImageRequest imageRequest = ImageRequestBuilder - .newBuilderWithSource(Uri.parse(url)) - .setProgressiveRenderingEnabled(true) - .build(); - - Fresco.getImagePipeline() - .fetchDecodedImage(imageRequest, context) - .subscribe(dataSubscriber, CallerThreadExecutor.getInstance()); - } - -} diff --git a/app/src/main/java/com/gh/common/util/ImageUtils.kt b/app/src/main/java/com/gh/common/util/ImageUtils.kt new file mode 100644 index 0000000000..2edc5c708a --- /dev/null +++ b/app/src/main/java/com/gh/common/util/ImageUtils.kt @@ -0,0 +1,111 @@ +package com.gh.common.util + +import android.content.Context +import android.content.res.Resources +import android.graphics.drawable.Animatable +import android.graphics.drawable.ColorDrawable +import android.net.Uri +import android.support.v4.content.ContextCompat +import com.facebook.common.executors.CallerThreadExecutor +import com.facebook.drawee.backends.pipeline.Fresco +import com.facebook.drawee.controller.BaseControllerListener +import com.facebook.drawee.controller.ControllerListener +import com.facebook.drawee.drawable.ScalingUtils +import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder +import com.facebook.drawee.view.SimpleDraweeView +import com.facebook.imagepipeline.datasource.BaseBitmapDataSubscriber +import com.facebook.imagepipeline.image.ImageInfo +import com.facebook.imagepipeline.request.ImageRequest +import com.facebook.imagepipeline.request.ImageRequestBuilder +import com.gh.gamecenter.R + +class ImageUtils { + + // 自适应图片宽高 + fun display(simpleDraweeView: SimpleDraweeView, url: String, width: Int) { + val listener = object : BaseControllerListener() { + override fun onFinalImageSet(id: String?, imageInfo: ImageInfo?, animatable: Animatable?) { + if (imageInfo == null) { + return + } + val layoutParams = simpleDraweeView.layoutParams + val scale = imageInfo.height.toFloat() / imageInfo.width.toFloat() + layoutParams.height = (width * scale).toInt() + simpleDraweeView.layoutParams = layoutParams + } + } + simpleDraweeView.controller = Fresco.newDraweeControllerBuilder() + .setUri(url) + .setControllerListener(listener) + .build() + } + + // 设置缩放类型，设置按压状态下的叠加图 + fun display(resources: Resources, simpleDraweeView: SimpleDraweeView, + scaleType: ScalingUtils.ScaleType, url: String) { + val context = simpleDraweeView.context + simpleDraweeView.hierarchy = GenericDraweeHierarchyBuilder(resources) + .setFadeDuration(500) + .setPressedStateOverlay(ColorDrawable(ContextCompat.getColor(context, R.color.pressed_bg))) + .setPlaceholderImage(R.drawable.ocupy2, ScalingUtils.ScaleType.CENTER) + .setBackground(ColorDrawable(ContextCompat.getColor(context, R.color.placeholder_bg))) + .setActualImageScaleType(scaleType) + .build() + // simpleDraweeView.setImageURI(url); + display(simpleDraweeView, url) + } + + // 设置占位符 + fun display(resources: Resources, simpleDraweeView: SimpleDraweeView, url: String, placeholderImage: Int) { + val context = simpleDraweeView.context + simpleDraweeView.hierarchy = GenericDraweeHierarchyBuilder(resources) + .setFadeDuration(500) + .setPressedStateOverlay(ColorDrawable(ContextCompat.getColor(context, R.color.pressed_bg))) + .setBackground(ColorDrawable(ContextCompat.getColor(context, R.color.placeholder_bg))) + .setPlaceholderImage(placeholderImage) + .build() + // simpleDraweeView.setImageURI(url); + display(simpleDraweeView, url) + } + + // 图片下载监听和设置低高分辨率图片 + fun display(simpleDraweeView: SimpleDraweeView, url: String, lowUrl: String, + listener: ControllerListener) { + simpleDraweeView.controller = Fresco.newDraweeControllerBuilder() + .setImageRequest(ImageRequest.fromUri(url)) + .setControllerListener(listener) + .setLowResImageRequest(ImageRequest.fromUri(lowUrl)) // 低分辨率图片 + .build() + } + + // 获取bitmap + fun display(context: Context, url: String, dataSubscriber: BaseBitmapDataSubscriber) { + val imageRequest = ImageRequestBuilder + .newBuilderWithSource(Uri.parse(url)) + .setProgressiveRenderingEnabled(true) + .build() + + Fresco.getImagePipeline() + .fetchDecodedImage(imageRequest, context) + .subscribe(dataSubscriber, CallerThreadExecutor.getInstance()) + } + + companion object { + + fun getInstance(): ImageUtils { + return Inner.anotherSingle + } + + private object Inner { + val anotherSingle = ImageUtils() + } + + fun display(simpleDraweeView: SimpleDraweeView, url: String) { + // if (url.startsWith("http://image.ghzhushou.com") && url.endsWith(".jpg")) { + // url = url + "?x-oss-process=image/format,webp"; + // } + simpleDraweeView.setImageURI(url) + } + } + +} diff --git a/app/src/main/java/com/gh/common/util/ShareUtils.java b/app/src/main/java/com/gh/common/util/ShareUtils.java index 7bbc19a883..3292236145 100644 --- a/app/src/main/java/com/gh/common/util/ShareUtils.java +++ b/app/src/main/java/com/gh/common/util/ShareUtils.java @@ -299,7 +299,7 @@ public class ShareUtils { } private void loadBitMap(final String iconUrl, final WXMediaMessage msg, final SendMessageToWX.Req req) { - ImageUtils.getInstance().display(mContext, iconUrl, new BaseBitmapDataSubscriber() { + ImageUtils.Companion.getInstance().display(mContext, iconUrl, new BaseBitmapDataSubscriber() { @Override protected void onNewResultImpl(Bitmap bitmap) { Bitmap compressBp = compressBitmap(bitmap); diff --git a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java index 9c794dcb03..8bd9ce01f8 100644 --- a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java @@ -94,7 +94,7 @@ public class ConcernActivity extends BaseActivity implements OnClickListener { for (ConcernInfo concernInfo : concernManager.getConcernGame()) { data.put(concernInfo.getId()); } - ConcernUtils.updateConcernData(this, data); + ConcernUtils.INSTANCE.updateConcernData(this, data); } @Override diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java index e75a6277f2..8d36055f82 100644 --- a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java @@ -291,7 +291,7 @@ public class GameDetailActivity extends BaseActivity { } mGameName.setText(mGameEntity.getName()); - ImageUtils.display(mGameIcon, mGameEntity.getIcon()); + ImageUtils.Companion.display(mGameIcon, mGameEntity.getIcon()); if (mGameEntity.getApk() == null || mGameEntity.getApk().isEmpty()) { mGameInfo.setText(""); } else { @@ -510,7 +510,7 @@ public class GameDetailActivity extends BaseActivity { Toast.makeText(GameDetailActivity.this, "关注成功", Toast.LENGTH_SHORT).show(); // 添加关注 - ConcernUtils.postConcernGameId(GameDetailActivity.this, mGameEntity.getId()); + ConcernUtils.INSTANCE.postConcernGameId(GameDetailActivity.this, mGameEntity.getId()); } else { Map kv2 = new HashMap<>(); kv2.put("点击", "取消关注"); @@ -532,7 +532,7 @@ public class GameDetailActivity extends BaseActivity { mGameConcern.setTextColor(0xffffffff); // 取消关注 - ConcernUtils.deleteConcernData(GameDetailActivity.this, mGameEntity.getId()); + ConcernUtils.INSTANCE.deleteConcernData(GameDetailActivity.this, mGameEntity.getId()); } }); } diff --git a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java index f9418e4268..7dc222bf4b 100644 --- a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java @@ -213,7 +213,7 @@ public class MessageDetailActivity extends BaseActivity implements OnCommentCall mMessageDetailIconDv.setImageURI( Uri.parse("res:///" + R.drawable.user_default_icon_comment)); } else { - ImageUtils.display(mMessageDetailIconDv, icon); + ImageUtils.Companion.display(mMessageDetailIconDv, icon); } mMessageDetailUserNameTv.setText(sp.getString("user_name", "光环用户")); } @@ -224,7 +224,7 @@ public class MessageDetailActivity extends BaseActivity implements OnCommentCall mMessageDetailIconDv.setImageURI( Uri.parse("res:///" + R.drawable.user_default_icon_comment)); } else { - ImageUtils.display(mMessageDetailIconDv, icon); + ImageUtils.Companion.display(mMessageDetailIconDv, icon); } mMessageDetailUserNameTv.setText(sp.getString("user_name", "光环用户")); } diff --git a/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java b/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java index 298854c835..fe784a3909 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java @@ -109,7 +109,7 @@ public class ShareCardActivity extends BaseActivity { mShareGameNameTv.setText(gameName); mShareContentTv.setText(Html.fromHtml(shareContent)); // mShareGameIconDv.setImageURI(gameIconUrl); - ImageUtils.display(mShareGameIconDv, gameIconUrl); + ImageUtils.Companion.display(mShareGameIconDv, gameIconUrl); mShareQrCodeDv.setImageResource(R.drawable.test_qrcode); // 延迟操作，等待截图部分绘制完成 diff --git a/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java b/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java index d41a24b9e5..0741865279 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java @@ -171,7 +171,7 @@ public class ShareCardPicActivity extends BaseActivity { mShareGameNameTv.setText(gameName); mShareContentTv.setText(Html.fromHtml(shareContent)); // mShareGameIconDv.setImageURI(gameIconUrl); - ImageUtils.display(mShareGameIconDv, gameIconUrl); + ImageUtils.Companion.display(mShareGameIconDv, gameIconUrl); mShareQrCodeDv.setImageResource(R.drawable.test_qrcode); if (shareArrImg.size() > 1) { diff --git a/app/src/main/java/com/gh/gamecenter/UserInfoActivity.java b/app/src/main/java/com/gh/gamecenter/UserInfoActivity.java index 0058a029f4..ec4a8b270f 100644 --- a/app/src/main/java/com/gh/gamecenter/UserInfoActivity.java +++ b/app/src/main/java/com/gh/gamecenter/UserInfoActivity.java @@ -67,7 +67,7 @@ public class UserInfoActivity extends BaseActivity { if (!TextUtils.isEmpty(editContent)) switch (requestCode) { case 0x130: - ImageUtils.display(mUserinfoIconSd, editContent); + ImageUtils.Companion.display(mUserinfoIconSd, editContent); break; case 0x131: mUserinfoNicknameTv.setText(editContent); diff --git a/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java b/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java index d7a17791a0..9ce205a7c0 100644 --- a/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java @@ -108,7 +108,7 @@ public class ViewImageActivity extends Activity implements OnPageChangeListener final ZoomSimpleDraweeView imageView = (ZoomSimpleDraweeView) view.findViewById(R.id.viewimage_iv_show); final ProgressBarCircularIndeterminate progressBar = (ProgressBarCircularIndeterminate) view.findViewById(R.id.viewimage_pb_loading); progressBar.setVisibility(View.VISIBLE); - ImageUtils.getInstance().display(imageView, newUrls.get(position), urls.get(position), + ImageUtils.Companion.getInstance().display(imageView, newUrls.get(position), urls.get(position), new BaseControllerListener() { @Override public void onFinalImageSet(String id, ImageInfo imageInfo, Animatable animatable) { @@ -274,7 +274,7 @@ public class ViewImageActivity extends Activity implements OnPageChangeListener imageView.setController(controller); } else { // imageView.setImageURI(url); - ImageUtils.display(imageView, url); + ImageUtils.Companion.display(imageView, url); // ImageUtils.getInstance(getApplicationContext()).display(url, imageView, new BaseControllerListener(){ // @Override // public void onFinalImageSet(String id, Object imageInfo, Animatable animatable) { diff --git a/app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java b/app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java index 8569d6f4df..e7e6393d31 100644 --- a/app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java +++ b/app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java @@ -86,7 +86,7 @@ public class WeiBoShareActivity extends Activity implements WbShareCallback { } private void weiboLoadBitMap(String iconUrl) { - ImageUtils.getInstance().display(this, iconUrl, new BaseBitmapDataSubscriber() { + ImageUtils.Companion.getInstance().display(this, iconUrl, new BaseBitmapDataSubscriber() { @Override protected void onNewResultImpl(Bitmap bitmap) { Utils.log("分享获取bitmap成功，准备分享"); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java index f89cbbee7a..1f5d4d0ed4 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java @@ -158,13 +158,13 @@ public class CommentDetailAdapter extends BaseRecyclerAdapter { if (mUserName != null && mUserIcon != null && !mUserIcon.isEmpty() && !mUserIcon.isEmpty() && mCommentDao.isMyComment(commentEntity.getId())) { holder.commentUserNameTv.setText(mSharedPreferences.getString("user_name", null)); - ImageUtils.display(holder.commentUserIconDv, mSharedPreferences.getString("user_icon", null)); + ImageUtils.Companion.display(holder.commentUserIconDv, mSharedPreferences.getString("user_icon", null)); } else { holder.commentUserNameTv.setText(commentEntity.getUser().getName()); if (commentEntity.getUser().getIcon().isEmpty()) { holder.commentUserIconDv.setImageURI(Uri.parse("res:///" + R.drawable.user_default_icon_comment)); } else { - ImageUtils.display(holder.commentUserIconDv, commentEntity.getUser().getIcon()); + ImageUtils.Companion.display(holder.commentUserIconDv, commentEntity.getUser().getIcon()); } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java index 91d859ca78..083817455a 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java @@ -117,7 +117,7 @@ public class ConcernAdapter extends BaseRecyclerAdapter { public void onBindViewHolder(final ConcernViewHolder holder, int position) { ConcernInfo concernInfo = mConcernList.get(position); // holder.concern_item_icon.setImageURI(concernInfo.getIcon()); - ImageUtils.display(holder.concern_item_icon, concernInfo.getIcon()); + ImageUtils.Companion.display(holder.concern_item_icon, concernInfo.getIcon()); if (mConcernGameList != null && position < mConcernGameList.size()) { GameEntity gameEntity = mConcernGameList.get(position); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java index bbca9d5eaf..29cf60641c 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java @@ -125,7 +125,7 @@ public class ConcernRecommendAdapter extends BaseRecyclerAdapter { holder.swipeText.setPadding(0, 0, DisplayUtils.dip2px(mContext, 15), 0); - ImageUtils.display(holder.gameThumb, gameEntity.getIcon()); + ImageUtils.Companion.display(holder.gameThumb, gameEntity.getIcon()); if (gameEntity.getApk() == null || gameEntity.getApk().isEmpty() || gameEntity.getTag() == null || gameEntity.getTag().isEmpty()) { diff --git a/app/src/main/java/com/gh/gamecenter/adapter/KaiFuAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/KaiFuAdapter.java index 764eefd164..67b92af434 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/KaiFuAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/KaiFuAdapter.java @@ -478,7 +478,7 @@ public class KaiFuAdapter extends BaseRecyclerAdapter { holder.kaifuTop.setVisibility(View.GONE); } - ImageUtils.display(holder.gameThumb, gameEntity.getIcon()); + ImageUtils.Companion.display(holder.gameThumb, gameEntity.getIcon()); holder.gameName.setText(gameEntity.getName()); if (gameEntity.getApk() == null || gameEntity.getApk().isEmpty()) { holder.gameDes.setText(gameEntity.getBrief()); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java index 3bc535ab48..4cd793c4b1 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java @@ -160,7 +160,7 @@ public class LibaoDetailAdapter extends BaseRecyclerAdapter { private void initLibaoDetailTop(LibaoDetailTopViewHolder holder) { - ImageUtils.display(holder.libaoGameIcon, mLibaoEntity.getIcon()); + ImageUtils.Companion.display(holder.libaoGameIcon, mLibaoEntity.getIcon()); holder.libaoName.setText(mLibaoEntity.getName()); if (TextUtils.isEmpty(mLibaoEntity.getPlatform())) { holder.libaoGameName.setText(mLibaoEntity.getGame().getName()); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java index 9d16486932..d1ebcd2ca0 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java @@ -295,7 +295,7 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { } // viewHolder.thumb.setImageURI(mConcernEntity.getGameIcon()); - ImageUtils.display(viewHolder.thumb, mConcernEntity.getGameIcon()); + ImageUtils.Companion.display(viewHolder.thumb, mConcernEntity.getGameIcon()); viewHolder.title.setText(mConcernEntity.getGameName()); NewsUtils.setNewsPublishOn(viewHolder.time, mConcernEntity.getTime()); @@ -417,14 +417,14 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { !userIcon.isEmpty() && mCommentDao.isMyComment(commentEntity.getId())) { holder.commentUserNameTv.setText(sp.getString("user_name", null)); // holder.commentUserIconDv.setImageURI(sp.getString("user_icon", null)); - ImageUtils.display(holder.commentUserIconDv, sp.getString("user_icon", null)); + ImageUtils.Companion.display(holder.commentUserIconDv, sp.getString("user_icon", null)); } else { holder.commentUserNameTv.setText(commentEntity.getUser().getName()); if (commentEntity.getUser().getIcon().isEmpty()) { holder.commentUserIconDv.setImageURI(Uri.parse("res:///" + R.drawable.user_default_icon_comment)); } else { // holder.commentUserIconDv.setImageURI(commentEntity.getUser().getIcon()); - ImageUtils.display(holder.commentUserIconDv, commentEntity.getUser().getIcon()); + ImageUtils.Companion.display(holder.commentUserIconDv, commentEntity.getUser().getIcon()); } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java index 807304e06e..6bc9ef5dfa 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java @@ -330,7 +330,7 @@ public class PlatformAdapter extends BaseRecyclerAdapter { viewHolder.itemView.setBackgroundColor(0x00ffffff); // viewHolder.mDownloadItemIvPic.setImageURI(apkEntity.getApkCollection().getIcon()); - ImageUtils.display(viewHolder.mDownloadItemIvPic, apkEntity.getApkCollection().getIcon()); + ImageUtils.Companion.display(viewHolder.mDownloadItemIvPic, apkEntity.getApkCollection().getIcon()); if (mCloseEntity.getPosition() == position && mAdapterPosition == mCloseEntity.getAdapterPosition()) { viewHolder.mDownloadItemOpenCollection.setVisibility(View.GONE); viewHolder.mDownloadItemColseCollection.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/PluginAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/PluginAdapter.java index 3cb64fa318..c72ffbf7bc 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/PluginAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/PluginAdapter.java @@ -135,7 +135,7 @@ public class PluginAdapter extends BaseRecyclerAdapter { holder.gameOrder.setVisibility(View.GONE); // viewHolder.gameThumb.setImageURI(gameEntity.getIcon()); - ImageUtils.display(holder.gameThumb, gameEntity.getIcon()); + ImageUtils.Companion.display(holder.gameThumb, gameEntity.getIcon()); if (gameEntity.isPluggable()) { holder.gameName.setText(gameEntity.getName() + " - " + PlatformUtils.getInstance(mContext).getPlatformName(gameEntity.getApk().get(0).getPlatform())); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java index 9503706a6f..795d42d139 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java @@ -339,7 +339,7 @@ public class ToolBoxRvAdapter extends BaseRecyclerAdapter { private void initToolBoxViewHolder(ToolBoxViewHolder viewHolder, final ToolBoxEntity toolBoxEntity) { viewHolder.mDes.setText(toolBoxEntity.getDes()); viewHolder.mTitle.setText(toolBoxEntity.getName()); - ImageUtils.display(viewHolder.mGameThumb, toolBoxEntity.getIcon()); + ImageUtils.Companion.display(viewHolder.mGameThumb, toolBoxEntity.getIcon()); viewHolder.itemView.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameTestViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameTestViewHolder.java index 7474127536..f47c59bd5e 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameTestViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameTestViewHolder.java @@ -106,7 +106,7 @@ public class GameTestViewHolder extends GameViewHolder { } gameName.setPadding(0, 0, paddRight, 0); - ImageUtils.display(gameThumb, gameEntity.getIcon()); + ImageUtils.Companion.display(gameThumb, gameEntity.getIcon()); gameName.setText(gameEntity.getName()); if (gameEntity.getApk() == null || gameEntity.getApk().isEmpty()) { gameDes.setText(gameEntity.getBrief()); diff --git a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java index 1080dce897..0524127193 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java @@ -145,7 +145,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { } else if (!TextUtils.isEmpty(icon)) { // viewHolder.dmIcon.setImageURI(icon); - ImageUtils.display(viewHolder.dmIcon, icon); + ImageUtils.Companion.display(viewHolder.dmIcon, icon); } else { viewHolder.dmIcon.setImageURI(Uri.parse("res:///" + R.drawable.logo)); } diff --git a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java index 469d5703c7..0b0124bc16 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java @@ -380,7 +380,7 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter { viewHolder.guIcon.setImageURI(Uri.parse("res:///" + R.drawable.logo)); } else { // viewHolder.guIcon.setImageURI(updateEntity.getIcon()); - ImageUtils.display(viewHolder.guIcon, updateEntity.getIcon()); + ImageUtils.Companion.display(viewHolder.guIcon, updateEntity.getIcon()); } final String platform = PlatformUtils.getInstance(mContext) diff --git a/app/src/main/java/com/gh/gamecenter/fragment/MainFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/MainFragment.java index a146f9b2a5..7042794f3e 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/MainFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/MainFragment.java @@ -175,6 +175,8 @@ public class MainFragment extends BaseFragment_ViewPager_Checkable { } private void checkMessageUnread(final Context context, boolean isCheck) { + if (context == null) return; + TokenUtils.getToken(context, isCheck) .flatMap(new Func1>() { @Override diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java index 67d614dbb7..4c0d28e63f 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java @@ -654,7 +654,7 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter { if (mSubjectDigestList.size() >= i + 1) { // if (mSubjectDigestList.size() >= 5 && i < 5) { - ImageUtils.display(subjectIcon, mSubjectDigestList.get(i).getIcon()); + ImageUtils.Companion.display(subjectIcon, mSubjectDigestList.get(i).getIcon()); subjectName.setText(mSubjectDigestList.get(i).getName()); } @@ -779,7 +779,7 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter { } holder.gameName.setPadding(0, 0, paddRight, 0); - ImageUtils.display(holder.gameThumb, gameEntity.getIcon()); + ImageUtils.Companion.display(holder.gameThumb, gameEntity.getIcon()); if (gameEntity.isPluggable() && gameEntity.getApk().size() > 0) { holder.gameName.setText(String.format("%s - %s", gameEntity.getName(), PlatformUtils.getInstance(mContext).getPlatformName( @@ -841,7 +841,7 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter { final String name = mSubjectList.get(i).getName(); String tag = entity.getImage(); holder.image.setTag(tag); - ImageUtils.getInstance().display(holder.image, entity.getImage(), + ImageUtils.Companion.getInstance().display(holder.image, entity.getImage(), mContext.getResources().getDisplayMetrics().widthPixels - DisplayUtils.dip2px(mContext, 16)); holder.image.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java index ff3d85758e..5370011a7c 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java @@ -17,7 +17,6 @@ import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; -import com.lightgame.adapter.BaseRecyclerAdapter; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DataUtils; import com.gh.common.util.DisplayUtils; @@ -50,6 +49,7 @@ import com.gh.gamecenter.entity.ToolBoxEntity; import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; +import com.lightgame.adapter.BaseRecyclerAdapter; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailToolsAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailToolsAdapter.java index c48d00ae77..c17b7a2857 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailToolsAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailToolsAdapter.java @@ -70,7 +70,7 @@ public class GameDetailToolsAdapter extends BaseRecyclerAdapter { viewHolder.mDes.setText(toolBoxEntity.getDes()); viewHolder.mTitle.setText(toolBoxEntity.getName()); - ImageUtils.display(viewHolder.mGameThumb, toolBoxEntity.getIcon()); + ImageUtils.Companion.display(viewHolder.mGameThumb, toolBoxEntity.getIcon()); viewHolder.itemView.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameGalleryAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameGalleryAdapter.java index 2b1452ea57..1fa5515b1b 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameGalleryAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameGalleryAdapter.java @@ -42,7 +42,7 @@ class GameGalleryAdapter extends BaseRecyclerAdapter { @Override public void onBindViewHolder(final GameGalleryViewHolder holder, int position) { // holder.screenshot_item_iv.setImageURI(gallery.get(position)); - ImageUtils.display(holder.screenshotIv, gallery.get(position)); + ImageUtils.Companion.display(holder.screenshotIv, gallery.get(position)); holder.itemView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiAdapter.java index c8508b8217..54ed9caeed 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiAdapter.java @@ -483,7 +483,7 @@ public class XinXiAdapter extends BaseRecyclerAdapter { final GameEntity gameEntity = mGameList.get(position - position_game - 1); - ImageUtils.display(holder.gameThumb, gameEntity.getIcon()); + ImageUtils.Companion.display(holder.gameThumb, gameEntity.getIcon()); holder.gameName.setText(gameEntity.getName()); if (gameEntity.getApk() == null || gameEntity.getApk().isEmpty()) { holder.gameDes.setText(gameEntity.getBrief()); diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao1FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/Libao1FragmentAdapter.java index 0e0a56a2db..d5eab99d40 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao1FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao1FragmentAdapter.java @@ -227,7 +227,7 @@ class Libao1FragmentAdapter extends BaseRecyclerAdapter { .getPlatformName(libaoEntity.getPlatform())); } // holder.libaoGameIcon.setImageURI(libaoEntity.getIcon()); - ImageUtils.display(holder.libaoGameIcon, libaoEntity.getIcon()); + ImageUtils.Companion.display(holder.libaoGameIcon, libaoEntity.getIcon()); String content; if (libaoEntity.getContent().contains("
")) { diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java index c3a7b34be7..11205380a1 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java @@ -191,7 +191,7 @@ class Libao2FragmentAdapter extends BaseRecyclerAdapter { public void onFailure(HttpException e) { if (e != null && e.code() == 409) { addLibaoListById(offset); - ConcernUtils.updateConcernData(mContext, new JSONArray(mGameIdList)); + ConcernUtils.INSTANCE.updateConcernData(mContext, new JSONArray(mGameIdList)); return; } mCallBackListener.loadError(); @@ -323,7 +323,7 @@ class Libao2FragmentAdapter extends BaseRecyclerAdapter { final LibaoEntity libaoEntity = mLibaoList.get(position - 1); holder.libaoName.setText(libaoEntity.getName()); // holder.libaoGameIcon.setImageURI(libaoEntity.getIcon()); - ImageUtils.display(holder.libaoGameIcon, libaoEntity.getIcon()); + ImageUtils.Companion.display(holder.libaoGameIcon, libaoEntity.getIcon()); if (TextUtils.isEmpty(libaoEntity.getPlatform())) { holder.libaoGameName.setText(libaoEntity.getGame().getName()); } else { diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java index bae5ee2746..9ef6634552 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java @@ -89,7 +89,7 @@ class Libao3FragmentAdapter extends BaseRecyclerAdapter { final LibaoEntity libaoEntity = mLibaoList.get(position); holder.libaoName.setText(libaoEntity.getName()); - ImageUtils.display(holder.libaoGameIcon, libaoEntity.getIcon()); + ImageUtils.Companion.display(holder.libaoGameIcon, libaoEntity.getIcon()); if (TextUtils.isEmpty(libaoEntity.getPlatform())) { holder.libaoGameName.setText(libaoEntity.getGame().getName()); diff --git a/app/src/main/java/com/gh/gamecenter/message/CommentFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/message/CommentFragmentAdapter.java index 1b37869c42..9e0a1ee2cd 100644 --- a/app/src/main/java/com/gh/gamecenter/message/CommentFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/message/CommentFragmentAdapter.java @@ -207,7 +207,7 @@ public class CommentFragmentAdapter extends BaseRecyclerAdapter { UserEntity userEntity = commentEntity.getUserEntity(); if (userEntity != null) { viewHolder.userName.setText(userEntity.getName()); - ImageUtils.display(viewHolder.userIcon, userEntity.getIcon()); + ImageUtils.Companion.display(viewHolder.userIcon, userEntity.getIcon()); } viewHolder.requestControl.setText("回复了你的评论"); diff --git a/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java index 12134ea982..4db0529d30 100644 --- a/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java @@ -8,17 +8,16 @@ import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; +import com.gh.base.OnRequestCallBackListener; import com.gh.common.util.CommentUtils; import com.gh.common.util.EntranceUtils; import com.gh.common.util.QQUtils; import com.gh.common.util.TokenUtils; -import com.lightgame.utils.Utils; import com.gh.gamecenter.GameDetailActivity; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.SubjectActivity; import com.gh.gamecenter.WebActivity; -import com.lightgame.adapter.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.db.KeFuMarkReadDao; import com.gh.gamecenter.db.MessageMarkReadDao; @@ -26,10 +25,11 @@ import com.gh.gamecenter.db.info.KeFuMarkReadInfo; import com.gh.gamecenter.db.info.MessageMarkReadInfo; import com.gh.gamecenter.entity.MessageKeFuEntity; import com.gh.gamecenter.eventbus.EBUISwitch; -import com.gh.base.OnRequestCallBackListener; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.google.gson.Gson; +import com.lightgame.adapter.BaseRecyclerAdapter; +import com.lightgame.utils.Utils; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/gh/gamecenter/message/NoticeFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/message/NoticeFragmentAdapter.java index 604a476835..4a1e112c71 100644 --- a/app/src/main/java/com/gh/gamecenter/message/NoticeFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/message/NoticeFragmentAdapter.java @@ -8,17 +8,16 @@ import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; +import com.gh.base.OnRequestCallBackListener; import com.gh.common.util.CommentUtils; import com.gh.common.util.EntranceUtils; import com.gh.common.util.QQUtils; import com.gh.common.util.TokenUtils; -import com.lightgame.utils.Utils; import com.gh.gamecenter.GameDetailActivity; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.SubjectActivity; import com.gh.gamecenter.WebActivity; -import com.lightgame.adapter.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.db.MessageMarkReadDao; import com.gh.gamecenter.db.NoticeMarkReadDao; @@ -26,10 +25,11 @@ import com.gh.gamecenter.db.info.MessageMarkReadInfo; import com.gh.gamecenter.db.info.NoticeMarkReadInfo; import com.gh.gamecenter.entity.MessageNoticeEntity; import com.gh.gamecenter.eventbus.EBUISwitch; -import com.gh.base.OnRequestCallBackListener; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.google.gson.Gson; +import com.lightgame.adapter.BaseRecyclerAdapter; +import com.lightgame.utils.Utils; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java index 32c19b2cb6..bd616a56dc 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java @@ -138,7 +138,7 @@ public class News1FragmentAdapter extends BaseRecyclerAdapter { } }); // viewHolder.thumb.setImageURI(newsEntity.getThumbnail().getUrl().get(0)); - ImageUtils.display(viewHolder.thumb, newsEntity.getThumbnail().getUrl().get(0)); + ImageUtils.Companion.display(viewHolder.thumb, newsEntity.getThumbnail().getUrl().get(0)); viewHolder.title.setText(newsEntity.getTitle()); int views = newsEntity.getViews(); if (views == 0) { @@ -189,9 +189,9 @@ public class News1FragmentAdapter extends BaseRecyclerAdapter { // viewHolder.thumb1.setImageURI(newsEntity.getThumbnail().getUrl().get(0)); // viewHolder.thumb2.setImageURI(newsEntity.getThumbnail().getUrl().get(1)); // viewHolder.thumb3.setImageURI(newsEntity.getThumbnail().getUrl().get(2)); - ImageUtils.display(viewHolder.thumb1, newsEntity.getThumbnail().getUrl().get(0)); - ImageUtils.display(viewHolder.thumb2, newsEntity.getThumbnail().getUrl().get(1)); - ImageUtils.display(viewHolder.thumb3, newsEntity.getThumbnail().getUrl().get(2)); + ImageUtils.Companion.display(viewHolder.thumb1, newsEntity.getThumbnail().getUrl().get(0)); + ImageUtils.Companion.display(viewHolder.thumb2, newsEntity.getThumbnail().getUrl().get(1)); + ImageUtils.Companion.display(viewHolder.thumb3, newsEntity.getThumbnail().getUrl().get(2)); int views = newsEntity.getViews(); if (views == 0) { viewHolder.read.setVisibility(View.GONE); @@ -222,7 +222,7 @@ public class News1FragmentAdapter extends BaseRecyclerAdapter { } }); viewHolder.title.setText(newsEntity.getTitle()); - ImageUtils.getInstance().display(viewHolder.thumb, newsEntity.getThumbnail().getUrl().get(0), + ImageUtils.Companion.getInstance().display(viewHolder.thumb, newsEntity.getThumbnail().getUrl().get(0), mContext.getResources().getDisplayMetrics().widthPixels - DisplayUtils.dip2px(mContext, 40)); int views = newsEntity.getViews(); if (views == 0) { diff --git a/app/src/main/java/com/gh/gamecenter/news/News2Fragment.java b/app/src/main/java/com/gh/gamecenter/news/News2Fragment.java index 0c1dc9f714..4907d8df82 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News2Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/news/News2Fragment.java @@ -332,7 +332,7 @@ public class News2Fragment extends BaseFragment implements SwipeRefreshLayout.On concern.setVisibility(View.VISIBLE); // icon.setImageURI(gameEntity.getIcon()); - ImageUtils.display(icon, gameEntity.getIcon()); + ImageUtils.Companion.display(icon, gameEntity.getIcon()); name.setText(gameEntity.getName()); concern.setImageResource(R.drawable.concern_select_true); diff --git a/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java index 530815e8a1..ea518c7e02 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java @@ -230,7 +230,7 @@ public class News2FragmentAdapter extends BaseRecyclerAdapter { public void onFailure(HttpException e) { if (e != null && e.code() == 409) { loadDataByGameId(offset); - ConcernUtils.updateConcernData(mContext, new JSONArray(gameIdList)); + ConcernUtils.INSTANCE.updateConcernData(mContext, new JSONArray(gameIdList)); return; } @@ -501,7 +501,7 @@ public class News2FragmentAdapter extends BaseRecyclerAdapter { final ConcernEntity concernEntity = concernList.get(position); - ImageUtils.display(viewHolder.thumb, concernEntity.getGameIcon()); + ImageUtils.Companion.display(viewHolder.thumb, concernEntity.getGameIcon()); viewHolder.title.setText(concernEntity.getGameName()); NewsUtils.setNewsPublishOn(viewHolder.time, concernEntity.getTime()); diff --git a/app/src/main/java/com/gh/gamecenter/news/News4FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/news/News4FragmentAdapter.java index 9e62862e8f..d288e112ce 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News4FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/news/News4FragmentAdapter.java @@ -137,7 +137,7 @@ public class News4FragmentAdapter extends BaseRecyclerAdapter { } }); // viewHolder.thumb.setImageURI(newsEntity.getThumbnail().getUrl().get(0)); - ImageUtils.display(viewHolder.thumb, newsEntity.getThumbnail().getUrl().get(0)); + ImageUtils.Companion.display(viewHolder.thumb, newsEntity.getThumbnail().getUrl().get(0)); viewHolder.title.setText(newsEntity.getTitle()); int views = newsEntity.getViews(); if (views == 0) { @@ -188,9 +188,9 @@ public class News4FragmentAdapter extends BaseRecyclerAdapter { // viewHolder.thumb1.setImageURI(newsEntity.getThumbnail().getUrl().get(0)); // viewHolder.thumb2.setImageURI(newsEntity.getThumbnail().getUrl().get(1)); // viewHolder.thumb3.setImageURI(newsEntity.getThumbnail().getUrl().get(2)); - ImageUtils.display(viewHolder.thumb1, newsEntity.getThumbnail().getUrl().get(0)); - ImageUtils.display(viewHolder.thumb2, newsEntity.getThumbnail().getUrl().get(1)); - ImageUtils.display(viewHolder.thumb3, newsEntity.getThumbnail().getUrl().get(2)); + ImageUtils.Companion.display(viewHolder.thumb1, newsEntity.getThumbnail().getUrl().get(0)); + ImageUtils.Companion.display(viewHolder.thumb2, newsEntity.getThumbnail().getUrl().get(1)); + ImageUtils.Companion.display(viewHolder.thumb3, newsEntity.getThumbnail().getUrl().get(2)); int views = newsEntity.getViews(); if (views == 0) { viewHolder.read.setVisibility(View.GONE); @@ -221,7 +221,7 @@ public class News4FragmentAdapter extends BaseRecyclerAdapter { } }); viewHolder.title.setText(newsEntity.getTitle()); - ImageUtils.getInstance().display(viewHolder.thumb, newsEntity.getThumbnail().getUrl().get(0), + ImageUtils.Companion.getInstance().display(viewHolder.thumb, newsEntity.getThumbnail().getUrl().get(0), mContext.getResources().getDisplayMetrics().widthPixels - DisplayUtils.dip2px(mContext, 40)); int views = newsEntity.getViews(); if (views == 0) { diff --git a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java index 856fbec6d7..a136626e8d 100644 --- a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java @@ -325,7 +325,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { } private void initGameDetailTopViewHolder(GameDetailTopViewHolder viewHolder) { - ImageUtils.display(viewHolder.gamedetailThumb, mGameEntity.getIcon()); + ImageUtils.Companion.display(viewHolder.gamedetailThumb, mGameEntity.getIcon()); viewHolder.gamedetailName.setText(mGameEntity.getName()); if (mGameEntity.getApk() != null && mGameEntity.getApk().size() != 0) { for (int i = 0, size = mGameEntity.getApk().size(); i < size; i++) { @@ -376,7 +376,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { Toast.makeText(mContext, "关注成功", Toast.LENGTH_SHORT).show(); // 添加关注 - ConcernUtils.postConcernGameId(mContext, mGameEntity.getId()); + ConcernUtils.INSTANCE.postConcernGameId(mContext, mGameEntity.getId()); } else { Map kv = new HashMap<>(); kv.put("状态", "取消关注"); @@ -402,7 +402,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { concern.setTextColor(Color.WHITE); //取消关注 - ConcernUtils.deleteConcernData(mContext, mGameEntity.getId()); + ConcernUtils.INSTANCE.deleteConcernData(mContext, mGameEntity.getId()); } }); } @@ -479,7 +479,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { likeCount.setText(String.valueOf(commentEntity.getVote())); userName.setText(commentEntity.getUser().getName()); // userIcon.setImageURI(commentEntity.getUser().getIcon()); - ImageUtils.display(userIcon, commentEntity.getUser().getIcon()); + ImageUtils.Companion.display(userIcon, commentEntity.getUser().getIcon()); holder.list.addView(contentView); if (commentEntity.getParent() != null) { diff --git a/app/src/main/java/com/gh/gamecenter/personal/ConcernFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/personal/ConcernFragmentAdapter.java index 66b8f3ac8c..b1fc62d567 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/ConcernFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/personal/ConcernFragmentAdapter.java @@ -188,7 +188,7 @@ class ConcernFragmentAdapter extends BaseRecyclerAdapter { private void initGameNormal(final GameNormalViewHolder holder, final GameEntity gameEntity, int i) { - ImageUtils.display(holder.gameThumb, gameEntity.getIcon()); + ImageUtils.Companion.display(holder.gameThumb, gameEntity.getIcon()); holder.gameName.setText(gameEntity.getName()); int paddRight = 0; diff --git a/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java index 1fa66a163e..d7a44e8a45 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java @@ -407,7 +407,7 @@ class InstallFragmentAdapter extends BaseRecyclerAdapter { holder.swipeText.setPadding(0, 0, DisplayUtils.dip2px(mContext, 15), 0); - ImageUtils.display(holder.gameThumb, gameEntity.getIcon()); + ImageUtils.Companion.display(holder.gameThumb, gameEntity.getIcon()); if (gameEntity.getApk() == null || gameEntity.getApk().isEmpty() || gameEntity.getTag() == null || gameEntity.getTag().isEmpty()) { diff --git a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java index 7f9dfbbe54..608b5532e8 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java @@ -29,6 +29,7 @@ import com.gh.gamecenter.entity.AppEntity; import com.gh.gamecenter.eventbus.EBNetworkState; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; +import com.lightgame.utils.Utils; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; @@ -116,6 +117,7 @@ public class PersonalFragment extends BaseFragment implements LoginUtils.OnLogin public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); checkUpdate(); + Utils.log("==========PersonalFragment"); } diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java index 246fb5df6c..353e38047a 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java @@ -132,7 +132,7 @@ class SearchGameDetailFragmentAdapter extends BaseRecyclerAdapter { final GameNormalViewHolder viewHolder = (GameNormalViewHolder) holder; final GameEntity gameEntity = gameList.get(position); - ImageUtils.display(viewHolder.gameThumb, gameEntity.getIcon()); + ImageUtils.Companion.display(viewHolder.gameThumb, gameEntity.getIcon()); viewHolder.gameName.setText(gameEntity.getName()); if (gameEntity.getApk() == null || gameEntity.getApk().isEmpty()) { viewHolder.gameDes.setText(gameEntity.getBrief()); diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java index 17c80fadf1..9f45f30c6d 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java @@ -141,7 +141,7 @@ class SearchGameListFragmentAdapter extends BaseRecyclerAdapter { if (holder instanceof GameNormalViewHolder && position == 0) { final GameNormalViewHolder viewHolder = (GameNormalViewHolder) holder; - ImageUtils.display(((GameNormalViewHolder) holder).gameThumb, gameEntity.getIcon()); + ImageUtils.Companion.display(((GameNormalViewHolder) holder).gameThumb, gameEntity.getIcon()); viewHolder.gameName.setText(gameEntity.getName()); if (gameEntity.getApk() == null || gameEntity.getApk().isEmpty()) { viewHolder.gameDes.setText(gameEntity.getBrief()); diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java b/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java index 18a78e82c4..12749e10d2 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java @@ -232,7 +232,7 @@ public class SubjectAdapter extends BaseRecyclerAdapter { holder.line.setVisibility(View.GONE); int widthPixels = mContext.getResources().getDisplayMetrics().widthPixels; final GameEntity gameEntity = mSubjectList.get(position); - ImageUtils.getInstance().display(holder.image, gameEntity.getImage(), widthPixels); + ImageUtils.Companion.getInstance().display(holder.image, gameEntity.getImage(), widthPixels); holder.itemView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -304,7 +304,7 @@ public class SubjectAdapter extends BaseRecyclerAdapter { final GameEntity gameEntity = mSubjectList.get(position); // holder.gameThumb.setImageURI(gameEntity.getIcon()); - ImageUtils.display(holder.gameThumb, gameEntity.getIcon()); + ImageUtils.Companion.display(holder.gameThumb, gameEntity.getIcon()); holder.gameName.setText(gameEntity.getName()); if (gameEntity.getApk() == null || gameEntity.getApk().isEmpty()) { holder.gameDes.setText(gameEntity.getBrief()); @@ -374,7 +374,7 @@ public class SubjectAdapter extends BaseRecyclerAdapter { final GameEntity gameEntity = mSubjectList.get(position); // holder.gameThumb.setImageURI(gameEntity.getIcon()); - ImageUtils.display(holder.gameThumb, gameEntity.getIcon()); + ImageUtils.Companion.display(holder.gameThumb, gameEntity.getIcon()); holder.gameName.setText(gameEntity.getName()); if (gameEntity.getApk() == null || gameEntity.getApk().isEmpty()) { holder.gameDes.setText(gameEntity.getBrief()); diff --git a/libraries/UmengPush/libs/utdid4all-1.1.5.3_proguard.jar b/libraries/UmengPush/libs/utdid4all-1.1.5.3_proguard.jar new file mode 100644 index 0000000000..5eed5beed5 Binary files /dev/null and b/libraries/UmengPush/libs/utdid4all-1.1.5.3_proguard.jar differ