From 5e668d9e13bc9239c57c66d67281446b8d7dbabd Mon Sep 17 00:00:00 2001 From: CsHeng Date: Fri, 16 Jun 2017 16:12:28 +0800 Subject: [PATCH] fix deprecated --- .../main/java/com/gh/base/AppController.java | 28 ++++++++-------- .../java/com/gh/base/BaseDetailActivity.java | 5 +-- .../com/gh/common/util/DownloadItemUtils.java | 25 +++++--------- .../gh/common/view/CardRelativeLayout.java | 33 ++++++++++--------- .../gamecenter/DownloadManagerActivity.java | 4 +-- .../com/gh/gamecenter/GameDetailActivity.java | 7 ++-- .../com/gh/gamecenter/NewsDetailActivity.java | 5 +-- ...ragment.java => GameDownloadFragment.java} | 2 +- .../download/GameUpdateFragmentAdapter.java | 8 ++--- 9 files changed, 57 insertions(+), 60 deletions(-) rename app/src/main/java/com/gh/gamecenter/download/{GameDownLoadFragment.java => GameDownloadFragment.java} (99%) diff --git a/app/src/main/java/com/gh/base/AppController.java b/app/src/main/java/com/gh/base/AppController.java index 175e3f35f4..1b29d1eaee 100644 --- a/app/src/main/java/com/gh/base/AppController.java +++ b/app/src/main/java/com/gh/base/AppController.java @@ -72,20 +72,6 @@ public class AppController extends Application { objectMap.remove(key); } - public static String getProcessName(Context cxt, int pid) { - ActivityManager am = (ActivityManager) cxt.getSystemService(Context.ACTIVITY_SERVICE); - List runningApps = am.getRunningAppProcesses(); - if (runningApps == null) { - return null; - } - for (RunningAppProcessInfo procInfo : runningApps) { - if (procInfo.pid == pid) { - return procInfo.processName; - } - } - return null; - } - public static synchronized AppController getInstance() { return mInstance; } @@ -239,4 +225,18 @@ public class AppController extends Application { return false; } +// public static String getProcessName(Context cxt, int pid) { +// ActivityManager am = (ActivityManager) cxt.getSystemService(Context.ACTIVITY_SERVICE); +// List runningApps = am.getRunningAppProcesses(); +// if (runningApps == null) { +// return null; +// } +// for (RunningAppProcessInfo procInfo : runningApps) { +// if (procInfo.pid == pid) { +// return procInfo.processName; +// } +// } +// return null; +// } + } diff --git a/app/src/main/java/com/gh/base/BaseDetailActivity.java b/app/src/main/java/com/gh/base/BaseDetailActivity.java index baf0e32e93..be705425b9 100644 --- a/app/src/main/java/com/gh/base/BaseDetailActivity.java +++ b/app/src/main/java/com/gh/base/BaseDetailActivity.java @@ -2,6 +2,7 @@ package com.gh.base; import android.content.Intent; import android.os.Bundle; +import android.support.v4.content.ContextCompat; import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.view.View; @@ -275,9 +276,9 @@ public abstract class BaseDetailActivity extends BaseActivity implements View.On detail_tv_per.setText("安装"); if (mDownloadEntity.isPluggable() && PackageManager.isInstalled(mDownloadEntity.getPackageName())) { - detail_pb_progressbar.setProgressDrawable(getResources().getDrawable(R.drawable.progressbar_plugin_radius_style)); + detail_pb_progressbar.setProgressDrawable(ContextCompat.getDrawable(this, R.drawable.progressbar_plugin_radius_style)); } else { - detail_pb_progressbar.setProgressDrawable(getResources().getDrawable(R.drawable.progressbar_normal_radius_style)); + detail_pb_progressbar.setProgressDrawable(ContextCompat.getDrawable(this, R.drawable.progressbar_normal_radius_style)); } break; case cancel: diff --git a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java index 186cc1c4e8..92eaf80a13 100644 --- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java +++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java @@ -3,6 +3,7 @@ package com.gh.common.util; import android.content.Context; import android.graphics.Color; import android.os.Message; +import android.support.v4.content.ContextCompat; import android.support.v4.util.ArrayMap; import android.support.v7.widget.RecyclerView; import android.text.TextUtils; @@ -239,7 +240,7 @@ public class DownloadItemUtils { if (isNormal) { holder.gameDownloadBtn.setText("下载中"); holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_downloading_style); - holder.gameDownloadBtn.setTextColor(context.getResources().getColorStateList(R.color.text_downloading_style)); + holder.gameDownloadBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.text_downloading_style)); } } else if (status.equals(DownloadStatus.waiting)) { holder.gameProgressbar.setProgress((int) (downloadEntity.getPercent() * 10)); @@ -253,7 +254,7 @@ public class DownloadItemUtils { if (isNormal) { holder.gameDownloadBtn.setText("下载中"); holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_downloading_style); - holder.gameDownloadBtn.setTextColor(context.getResources().getColorStateList(R.color.text_downloading_style)); + holder.gameDownloadBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.text_downloading_style)); } } else if (status.equals(DownloadStatus.pause) || status.equals(DownloadStatus.timeout) @@ -269,7 +270,7 @@ public class DownloadItemUtils { if (isNormal) { holder.gameDownloadBtn.setText("下载中"); holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_downloading_style); - holder.gameDownloadBtn.setTextColor(context.getResources().getColorStateList(R.color.text_downloading_style)); + holder.gameDownloadBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.text_downloading_style)); } } else if (status.equals(DownloadStatus.done)) { holder.gameProgressbar.setProgress(1000); @@ -388,7 +389,7 @@ public class DownloadItemUtils { downloadBtn.setText("下载中"); downloadBtn.setBackgroundResource(R.drawable.game_item_btn_downloading_style); - downloadBtn.setTextColor(context.getResources().getColorStateList(R.color.text_downloading_style)); + downloadBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.text_downloading_style)); DownloadManager.getInstance(context).putStatus(gameEntity.getApk().get(0).getUrl(), "downloading"); } else { @@ -397,10 +398,7 @@ public class DownloadItemUtils { } //插件化 - private static void plugin(Context context, - GameEntity gameEntity, - TextView downloadBtn, - String entrance, + private static void plugin(Context context, GameEntity gameEntity, TextView downloadBtn, String entrance, String location) { String msg = FileUtils.isCanDownload(context, gameEntity.getApk().get(0).getSize()); if (TextUtils.isEmpty(msg)) { @@ -411,7 +409,7 @@ public class DownloadItemUtils { downloadBtn.setText("下载中"); downloadBtn.setBackgroundResource(R.drawable.game_item_btn_downloading_style); - downloadBtn.setTextColor(context.getResources().getColorStateList(R.color.text_downloading_style)); + downloadBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.text_downloading_style)); DownloadManager.getInstance(context).putStatus(gameEntity.getApk().get(0).getUrl(), "downloading"); } else { @@ -420,9 +418,7 @@ public class DownloadItemUtils { } //安装 - private static void install(final Context context, - GameEntity gameEntity, - int position, + private static void install(final Context context, GameEntity gameEntity, int position, RecyclerView.Adapter adapter) { DownloadEntity downloadEntity = DownloadManager.getInstance(context).get(gameEntity.getApk().get(0).getUrl()); if (downloadEntity != null) { @@ -441,10 +437,7 @@ public class DownloadItemUtils { } //更新 - private static void update(Context context, - GameEntity gameEntity, - String entrance, - String location) { + private static void update(Context context, GameEntity gameEntity, String entrance, String location) { DataUtils.onGameUpdateEvent(context, gameEntity.getName(), gameEntity.getApk().get(0).getPlatform(), "下载开始"); DownloadManager.createDownload(context, gameEntity, "更新", entrance, location); } diff --git a/app/src/main/java/com/gh/common/view/CardRelativeLayout.java b/app/src/main/java/com/gh/common/view/CardRelativeLayout.java index 11adc2f5b6..e218b11818 100644 --- a/app/src/main/java/com/gh/common/view/CardRelativeLayout.java +++ b/app/src/main/java/com/gh/common/view/CardRelativeLayout.java @@ -4,6 +4,7 @@ import android.content.Context; import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.drawable.Drawable; +import android.support.v4.content.ContextCompat; import android.util.AttributeSet; import android.widget.RelativeLayout; @@ -47,25 +48,25 @@ public class CardRelativeLayout extends RelativeLayout { } if (isTran) { - mLeftDrawable = getResources().getDrawable(R.drawable.frame_tran_left); - topDrawable = getResources().getDrawable(R.drawable.frame_tran_top); - mRightDrawable = getResources().getDrawable(R.drawable.frame_tran_right); - bottomDrawable = getResources().getDrawable(R.drawable.frame_tran_bottom); + mLeftDrawable = ContextCompat.getDrawable(context, R.drawable.frame_tran_left); + topDrawable = ContextCompat.getDrawable(context, R.drawable.frame_tran_top); + mRightDrawable = ContextCompat.getDrawable(context, R.drawable.frame_tran_right); + bottomDrawable = ContextCompat.getDrawable(context, R.drawable.frame_tran_bottom); - leftTopDrawable = getResources().getDrawable(R.drawable.frame_tran_left_top_square); - rightTopDrawable = getResources().getDrawable(R.drawable.frame_tran_right_top_square); - leftBottomDrawable = getResources().getDrawable(R.drawable.frame_tran_left_bottom_square); - rightBottomDrawable = getResources().getDrawable(R.drawable.frame_tran_right_bottom_square); + leftTopDrawable = ContextCompat.getDrawable(context, R.drawable.frame_tran_left_top_square); + rightTopDrawable = ContextCompat.getDrawable(context, R.drawable.frame_tran_right_top_square); + leftBottomDrawable = ContextCompat.getDrawable(context, R.drawable.frame_tran_left_bottom_square); + rightBottomDrawable = ContextCompat.getDrawable(context, R.drawable.frame_tran_right_bottom_square); } else { - mLeftDrawable = getResources().getDrawable(R.drawable.frame_left); - topDrawable = getResources().getDrawable(R.drawable.frame_top); - mRightDrawable = getResources().getDrawable(R.drawable.frame_right); - bottomDrawable = getResources().getDrawable(R.drawable.frame_bottom); + mLeftDrawable = ContextCompat.getDrawable(context, R.drawable.frame_left); + topDrawable = ContextCompat.getDrawable(context, R.drawable.frame_top); + mRightDrawable = ContextCompat.getDrawable(context, R.drawable.frame_right); + bottomDrawable = ContextCompat.getDrawable(context, R.drawable.frame_bottom); - leftTopDrawable = getResources().getDrawable(R.drawable.frame_left_top_square); - rightTopDrawable = getResources().getDrawable(R.drawable.frame_right_top_square); - leftBottomDrawable = getResources().getDrawable(R.drawable.frame_left_bottom_square); - rightBottomDrawable = getResources().getDrawable(R.drawable.frame_right_bottom_square); + leftTopDrawable = ContextCompat.getDrawable(context, R.drawable.frame_left_top_square); + rightTopDrawable = ContextCompat.getDrawable(context, R.drawable.frame_right_top_square); + leftBottomDrawable = ContextCompat.getDrawable(context, R.drawable.frame_left_bottom_square); + rightBottomDrawable = ContextCompat.getDrawable(context, R.drawable.frame_right_bottom_square); } } diff --git a/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java b/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java index 99119f8a98..662e7af179 100644 --- a/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java +++ b/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java @@ -19,7 +19,7 @@ import com.gh.common.util.EntranceUtils; import com.gh.download.DownloadManager; import com.gh.base.adapter.FragmentAdapter; import com.gh.gamecenter.download.FileSendFragment; -import com.gh.gamecenter.download.GameDownLoadFragment; +import com.gh.gamecenter.download.GameDownloadFragment; import com.gh.gamecenter.download.GameUpdateFragment; import com.gh.gamecenter.eventbus.EBDownloadChanged; import com.gh.gamecenter.eventbus.EBMiPush; @@ -149,7 +149,7 @@ public class DownloadManagerActivity extends BaseActivity implements OnClickList downloadmanager_slide_line.setLayoutParams(lparams); List list = new ArrayList<>(); - list.add(new GameDownLoadFragment()); + list.add(new GameDownloadFragment()); list.add(new GameUpdateFragment()); list.add(new FileSendFragment()); downloadmanager_viewPager.setAdapter(new FragmentAdapter(getSupportFragmentManager(), list)); diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java index d935c354cc..e975db4e0f 100644 --- a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java @@ -7,6 +7,7 @@ import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.support.design.widget.AppBarLayout; import android.support.v4.app.Fragment; +import android.support.v4.content.ContextCompat; import android.support.v4.view.ViewPager; import android.text.TextUtils; import android.view.MotionEvent; @@ -20,6 +21,7 @@ import android.widget.Toast; import com.facebook.drawee.view.SimpleDraweeView; import com.gh.base.AppController; import com.gh.base.BaseActivity; +import com.gh.base.adapter.FragmentAdapter; import com.gh.common.constant.Config; import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.ConcernUtils; @@ -39,7 +41,6 @@ import com.gh.common.view.NoScrollableViewPager; import com.gh.download.DataWatcher; import com.gh.download.DownloadEntity; import com.gh.download.DownloadManager; -import com.gh.base.adapter.FragmentAdapter; import com.gh.gamecenter.entity.ApkEntity; import com.gh.gamecenter.entity.GameDetailEntity; import com.gh.gamecenter.entity.GameEntity; @@ -612,9 +613,9 @@ public class GameDetailActivity extends BaseActivity { mDownloadPer.setText("安装"); if (mDownloadEntity.isPluggable() && PackageManager.isInstalled(mDownloadEntity.getPackageName())) { - mDownloadPb.setProgressDrawable(getResources().getDrawable(R.drawable.progressbar_plugin_radius_style)); + mDownloadPb.setProgressDrawable(ContextCompat.getDrawable(this, R.drawable.progressbar_plugin_radius_style)); } else { - mDownloadPb.setProgressDrawable(getResources().getDrawable(R.drawable.progressbar_normal_radius_style)); + mDownloadPb.setProgressDrawable(ContextCompat.getDrawable(this, R.drawable.progressbar_normal_radius_style)); } break; case cancel: diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java index 2f87698189..309d5efd3a 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java @@ -7,6 +7,7 @@ import android.content.SharedPreferences; import android.os.Bundle; import android.os.Handler; import android.os.SystemClock; +import android.support.v4.content.ContextCompat; import android.support.v4.view.MotionEventCompat; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; @@ -689,9 +690,9 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener detail_tv_per.setText("安装"); if (mDownloadEntity.isPluggable() && PackageManager.isInstalled(mDownloadEntity.getPackageName())) { - detail_pb_progressbar.setProgressDrawable(getResources().getDrawable(R.drawable.progressbar_plugin_radius_style)); + detail_pb_progressbar.setProgressDrawable(ContextCompat.getDrawable(this, R.drawable.progressbar_plugin_radius_style)); } else { - detail_pb_progressbar.setProgressDrawable(getResources().getDrawable(R.drawable.progressbar_normal_radius_style)); + detail_pb_progressbar.setProgressDrawable(ContextCompat.getDrawable(this, R.drawable.progressbar_normal_radius_style)); } break; case cancel: diff --git a/app/src/main/java/com/gh/gamecenter/download/GameDownLoadFragment.java b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java similarity index 99% rename from app/src/main/java/com/gh/gamecenter/download/GameDownLoadFragment.java rename to app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java index 4f41cafc91..0639feb55a 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameDownLoadFragment.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java @@ -44,7 +44,7 @@ import org.greenrobot.eventbus.ThreadMode; * * @author 黄壮华 */ -public class GameDownLoadFragment extends BaseFragment implements View.OnClickListener { +public class GameDownloadFragment extends BaseFragment implements View.OnClickListener { private RecyclerViewExtended downloadmanager_rv_show; private GameDownloadFragmentAdapter adapter; 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 90f9fa0159..a1b831db8f 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java @@ -409,11 +409,11 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter { if (NetworkUtils.isWifiConnected(mContext)) { if ("插件化".equals(str)) { viewHolder.gu_item_btv_update.setText("插件化中"); - viewHolder.gu_item_btv_update.setTextColor(mContext.getResources().getColorStateList(R.color.text_plugining_style)); + viewHolder.gu_item_btv_update.setTextColor(ContextCompat.getColorStateList(mContext, R.color.text_plugining_style)); viewHolder.gu_item_btv_update.setBackgroundResource(R.drawable.game_item_btn_plugining_style); } else { viewHolder.gu_item_btv_update.setText("更新中"); - viewHolder.gu_item_btv_update.setTextColor(mContext.getResources().getColorStateList(R.color.text_downloading_style)); + viewHolder.gu_item_btv_update.setTextColor(ContextCompat.getColorStateList(mContext, R.color.text_downloading_style)); viewHolder.gu_item_btv_update.setBackgroundResource(R.drawable.game_item_btn_downloading_style); } @@ -482,12 +482,12 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter { if (updateEntity.isPluggable()) { viewHolder.gu_item_btv_update.setText("插件化中"); viewHolder.gu_item_btv_update.setTextColor( - mContext.getResources().getColorStateList(R.color.text_plugining_style)); + ContextCompat.getColorStateList(mContext, R.color.text_plugining_style)); viewHolder.gu_item_btv_update.setBackgroundResource(R.drawable.game_item_btn_plugining_style); } else { viewHolder.gu_item_btv_update.setText("更新中"); viewHolder.gu_item_btv_update.setTextColor( - mContext.getResources().getColorStateList(R.color.text_downloading_style)); + ContextCompat.getColorStateList(mContext, R.color.text_downloading_style)); viewHolder.gu_item_btv_update.setBackgroundResource(R.drawable.game_item_btn_downloading_style); } }