diff --git a/app/src/main/java/com/gh/common/util/ApkActiveUtils.java b/app/src/main/java/com/gh/common/util/ApkActiveUtils.java index 693ce5d344..36881e9dd1 100644 --- a/app/src/main/java/com/gh/common/util/ApkActiveUtils.java +++ b/app/src/main/java/com/gh/common/util/ApkActiveUtils.java @@ -1,7 +1,5 @@ package com.gh.common.util; -import android.content.Context; - import com.gh.gamecenter.entity.ApkEntity; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.manager.PackageManager; diff --git a/app/src/main/java/com/gh/common/util/AppDebugConfig.java b/app/src/main/java/com/gh/common/util/AppDebugConfig.java index 961b6d93a3..3e7d06bf90 100644 --- a/app/src/main/java/com/gh/common/util/AppDebugConfig.java +++ b/app/src/main/java/com/gh/common/util/AppDebugConfig.java @@ -94,7 +94,7 @@ public class AppDebugConfig { // activityManager.getMemoryClass(); final String tag = "MM_INFO"; // Log.i(tag, "Class " + activityManager.getMemoryClass()); - final long mb = 1024 * 1024l; + final long mb = 1024 * 1024; //Get VM Heap Size by calling: Log.i(tag, "VM Heap Size:" + Runtime.getRuntime().totalMemory() / mb); diff --git a/app/src/main/java/com/gh/common/util/AppManager.java b/app/src/main/java/com/gh/common/util/AppManager.java index d683f6d672..4cba8ead20 100644 --- a/app/src/main/java/com/gh/common/util/AppManager.java +++ b/app/src/main/java/com/gh/common/util/AppManager.java @@ -67,7 +67,6 @@ public class AppManager { if (activity != null) { mActivityStack.remove(activity); activity.finish(); - activity = null; } } diff --git a/app/src/main/java/com/gh/common/util/DialogUtils.java b/app/src/main/java/com/gh/common/util/DialogUtils.java index 54b2459032..cf02609a77 100644 --- a/app/src/main/java/com/gh/common/util/DialogUtils.java +++ b/app/src/main/java/com/gh/common/util/DialogUtils.java @@ -79,10 +79,12 @@ public class DialogUtils { Window dialogWindow = dialog.getWindow(); WindowManager m = activity.getWindowManager(); Display d = m.getDefaultDisplay(); - WindowManager.LayoutParams p = dialogWindow.getAttributes(); - p.height = (int) (d.getHeight() * 0.82); - p.width = (int) (d.getWidth() * 0.80); - dialogWindow.setAttributes(p); + if (dialogWindow != null) { + WindowManager.LayoutParams p = dialogWindow.getAttributes(); + p.height = (int) (d.getHeight() * 0.82); + p.width = (int) (d.getWidth() * 0.80); + dialogWindow.setAttributes(p); + } SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月dd日", Locale.getDefault()); dateTv.setText(format.format(new Date().getTime())); diff --git a/app/src/main/java/com/gh/common/util/NotificationUtils.java b/app/src/main/java/com/gh/common/util/NotificationUtils.java index f312beec87..298a77ca38 100644 --- a/app/src/main/java/com/gh/common/util/NotificationUtils.java +++ b/app/src/main/java/com/gh/common/util/NotificationUtils.java @@ -8,6 +8,8 @@ import com.gh.download.*; import com.gh.download.DownloadManager; import com.gh.gamecenter.R; +import java.util.List; + /** * Created by LGT on 2016/10/10. */ @@ -77,13 +79,16 @@ public class NotificationUtils { public static void showDownloadingNotification(Context context) { NotificationManager manager = getNotificationManager(context); int downloadingSize = 0; - for (DownloadEntity entity : DownloadManager.getInstance(context).getAll()) { - if (entity.getStatus().equals(DownloadStatus.downloading) - || entity.getStatus().equals(DownloadStatus.waiting) - || entity.getStatus().equals(DownloadStatus.pause) - || entity.getStatus().equals(DownloadStatus.timeout) - || entity.getStatus().equals(DownloadStatus.neterror)) { - downloadingSize++; + List all = DownloadManager.getInstance(context).getAll(); + if (all != null) { + for (DownloadEntity entity : all) { + if (entity.getStatus().equals(DownloadStatus.downloading) + || entity.getStatus().equals(DownloadStatus.waiting) + || entity.getStatus().equals(DownloadStatus.pause) + || entity.getStatus().equals(DownloadStatus.timeout) + || entity.getStatus().equals(DownloadStatus.neterror)) { + downloadingSize++; + } } } if (downloadingSize == 0) { 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 0a4503f088..6b6efe9280 100644 --- a/app/src/main/java/com/gh/common/util/ShareUtils.java +++ b/app/src/main/java/com/gh/common/util/ShareUtils.java @@ -32,6 +32,7 @@ import java.util.List; * Created by khy on 2016/9/4. */ public class ShareUtils { + private static ShareUtils instance; private static IWXAPI api; private static Tencent mTencent; @@ -281,7 +282,7 @@ public class ShareUtils { summary = "绿色安全的手游加速助手"; } - ArrayList imageUrls = new ArrayList(); + ArrayList imageUrls = new ArrayList<>(); imageUrls.add(shareIcon); if (summary != null) { diff --git a/app/src/main/java/com/gh/gamecenter/AboutActivity.java b/app/src/main/java/com/gh/gamecenter/AboutActivity.java index edb74cd309..d65c6fa586 100644 --- a/app/src/main/java/com/gh/gamecenter/AboutActivity.java +++ b/app/src/main/java/com/gh/gamecenter/AboutActivity.java @@ -9,6 +9,7 @@ import butterknife.BindView; import butterknife.OnClick; import com.gh.base.BaseActivity; import com.gh.common.util.PackageUtils; +import com.gh.common.util.StringUtils; import com.gh.gamecenter.manager.UpdateManager; import java.lang.ref.WeakReference; @@ -40,7 +41,7 @@ public class AboutActivity extends BaseActivity { if (activity != null) { if (msg.what == 0) { final String version = (String) msg.obj; - activity.mAboutVersion.setText("发现新版本 V" + version); + activity.mAboutVersion.setText(StringUtils.buildString("发现新版本 V" , version)); activity.mAboutPb.setVisibility(View.GONE); } else if (msg.what == 1) { activity.mAboutVersion.setText("已是最新版本"); diff --git a/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java b/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java index e04b804a7c..3d9d437db8 100644 --- a/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java +++ b/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java @@ -200,7 +200,7 @@ public class FileReceiverActivity extends BaseActivity implements FileReceiverAd String sizeName = df.format(size) + "MB"; mSenderUserDes.setText(mFileInfos.size() + "个游戏,共" + sizeName); - mSenderUserName.setText("来自 " + mIpPortInfo.getSenderName()); + mSenderUserName.setText(StringUtils.buildString("来自 " , mIpPortInfo.getSenderName())); mSenderUserIcon.setImageURI(UserIconUtils.getUserIcon(mIpPortInfo.getSenderIcon())); mReceiverBottom.setVisibility(View.GONE); diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java index 7673ab85a4..8d4d5e7ced 100644 --- a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java @@ -588,9 +588,6 @@ public class GameDetailActivity extends BaseActivity { mGameEntity.getName(), downloadAddWord)); } } else { - Utils.log((mGameEntity.getTag() != null) + "==" +(mGameEntity.getTag().size() != 0) - + "==" + (!TextUtils.isEmpty(mGameEntity.getApk().get(0).getGhVersion())) - + "==" + (!PackageUtils.isSignature(this, mGameEntity.getApk().get(0).getPackageName()))); if (mGameEntity.getTag() != null && mGameEntity.getTag().size() != 0 && !TextUtils.isEmpty(mGameEntity.getApk().get(0).getGhVersion()) && !PackageUtils.isSignature(this, mGameEntity.getApk().get(0).getPackageName())) { diff --git a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java index ee59e7e0f0..b2958a5cf5 100644 --- a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java @@ -328,7 +328,7 @@ public class MessageDetailActivity extends BaseActivity implements MessageDetail e.printStackTrace(); } if (newsId == null && mConcernEntity == null || - newsId == null && mConcernEntity != null && mConcernEntity.getId() == null) { + newsId == null && mConcernEntity.getId() == null) { Utils.toast(this, "评论异常 id null"); mSendingDialog.cancel(); return; 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 6b7f40fce5..ec75b14231 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java @@ -286,7 +286,7 @@ public class LibaoDetailAdapter extends BaseRecyclerAdapter { final List codes = mLibaoDao.findCodes(mLibaoEntity.getId()); - if (codes == null && codes.isEmpty()) return; + if (codes == null || codes.size() == 0) return; holder.libaoCodeRv.setVisibility(View.VISIBLE); holder.libaoCodeRv.setAdapter(new LiBaoCodeAdapter(mContext, codes)); diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailKaiFuAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailKaiFuAdapter.java index 15ffdd2a6c..5ac8e3ce4a 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailKaiFuAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailKaiFuAdapter.java @@ -376,7 +376,7 @@ public class GameDetailKaiFuAdapter extends BaseRecyclerAdapter { } private void initKaifuDetail(CalendarEntity entity) { - if (entity == null && entity.getServer() == null && entity.getServer().size() == 0) { + if (entity == null || (entity.getServer() != null && entity.getServer().size() == 0)) { return; } 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 52a215f263..685448d1fa 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiAdapter.java @@ -264,7 +264,6 @@ public class XinXiAdapter extends BaseRecyclerAdapter { initIntroViewHolder((GameDetailIntroViewHolder) holder); } else if (holder instanceof GameDetailGameTagViewHolder) { initGameTagViewHolder((GameDetailGameTagViewHolder) holder); - } else if (holder instanceof GameDetailGameViewHolder) { } else if (holder instanceof GameNormalViewHolder) { initGameNormalViewHolder((GameNormalViewHolder) holder, position); } else if (holder instanceof FooterViewHolder) { diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiFragment.java b/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiFragment.java index f08fdc73d0..ea735fa369 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiFragment.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiFragment.java @@ -141,7 +141,7 @@ public class XinXiFragment extends BaseFragment { for (int i = 0; i < gameList.size(); i++) { GameEntity gameEntity = gameList.get(i); if (gameEntity.getName().equals(status.getName())) { - if (gameEntity != null && gameEntity.getEntryMap() != null) { + if (gameEntity.getEntryMap() != null) { gameEntity.getEntryMap().remove(status.getPlatform()); } mAdapter.notifyItemChanged(mAdapter.getGamePosition() + i + 1); diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java b/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java index 761bf63f87..e63bba4b03 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java @@ -125,7 +125,7 @@ public class MessageFragment extends BaseFragment implements ViewPager.OnPageCha super.onResponse(response); if (response.getComment() > 0) { mMessageCommentHint.setVisibility(View.VISIBLE); - mMessageCommentHint.setText(response.getComment() + ""); + mMessageCommentHint.setText(String.valueOf(response.getComment())); } // if (response.getNoticeList() != null && response.getNoticeList().size() > 0) { diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragment.java b/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragment.java index 85ecceaf9d..864fd169c6 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragment.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragment.java @@ -65,7 +65,7 @@ public class SearchHistoryFragment extends Fragment { mHistorylist = dao.getAll(); if (mHistorylist == null) { mHistorylist = new ArrayList<>(); - } else if (mHistorylist != null && mHistorylist.size() > 0) { + } else if (mHistorylist.size() > 0) { mSearchHistoryRl.setVisibility(View.VISIBLE); } diff --git a/app/src/main/res/drawable/et_line.xml b/app/src/main/res/drawable/et_line.xml index 28b387d038..e4773c924f 100644 --- a/app/src/main/res/drawable/et_line.xml +++ b/app/src/main/res/drawable/et_line.xml @@ -4,5 +4,5 @@ - + diff --git a/app/src/main/res/layout/activity_game_news.xml b/app/src/main/res/layout/activity_game_news.xml index 0d48c2aa81..38096ec24a 100644 --- a/app/src/main/res/layout/activity_game_news.xml +++ b/app/src/main/res/layout/activity_game_news.xml @@ -26,7 +26,7 @@ android:paddingBottom = "10dp" android:visibility = "gone" /> - + diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml index 1677c2af00..3f93c3e2d6 100644 --- a/app/src/main/res/layout/activity_setting.xml +++ b/app/src/main/res/layout/activity_setting.xml @@ -31,7 +31,7 @@ android:layout_gravity = "center" android:gravity = "center" android:text = "@string/setting_download_fix" - android:textSize = "18dp" + android:textSize = "18sp" android:textColor = "@android:color/white" /> diff --git a/app/src/main/res/layout/activity_sharecard_pic.xml b/app/src/main/res/layout/activity_sharecard_pic.xml index 72affeb4f9..08100e27fb 100644 --- a/app/src/main/res/layout/activity_sharecard_pic.xml +++ b/app/src/main/res/layout/activity_sharecard_pic.xml @@ -163,7 +163,7 @@ android:layout_height = "wrap_content" android:textColor = "@android:color/white" android:text = "分享" - android:textSize = "15dp" + android:textSize = "15sp" android:layout_toRightOf = "@+id/sharecard_share_icon" /> diff --git a/app/src/main/res/layout/fragment_personal.xml b/app/src/main/res/layout/fragment_personal.xml index 144fb35cc6..69e948e8d5 100644 --- a/app/src/main/res/layout/fragment_personal.xml +++ b/app/src/main/res/layout/fragment_personal.xml @@ -189,7 +189,7 @@ android:layout_height = "wrap_content" android:text = "@string/personale_mygame" android:textColor = "@color/title" - android:textSize = "15dp" + android:textSize = "15sp" android:layout_marginRight = "5dp" android:gravity = "center_vertical" /> diff --git a/app/src/main/res/layout/game_normal_item.xml b/app/src/main/res/layout/game_normal_item.xml index 1a187911be..cee5a383af 100644 --- a/app/src/main/res/layout/game_normal_item.xml +++ b/app/src/main/res/layout/game_normal_item.xml @@ -80,7 +80,7 @@ android:paddingLeft="3dp" android:paddingRight="3dp" android:textColor="@android:color/white" - android:textSize="9dp" + android:textSize="9sp" android:maxLines="1" android:visibility="gone" android:layout_centerVertical="true" diff --git a/app/src/main/res/layout/game_normal_item_swipe.xml b/app/src/main/res/layout/game_normal_item_swipe.xml index fc3e9abb5f..2f39943aab 100644 --- a/app/src/main/res/layout/game_normal_item_swipe.xml +++ b/app/src/main/res/layout/game_normal_item_swipe.xml @@ -122,7 +122,7 @@ android:paddingLeft="3dp" android:paddingRight="3dp" android:textColor="@android:color/white" - android:textSize="9dp" + android:textSize="9sp" android:maxLines="1" android:visibility="gone" android:layout_centerVertical="true" diff --git a/app/src/main/res/layout/game_test_item.xml b/app/src/main/res/layout/game_test_item.xml index 823899b615..6ec76cb2f1 100644 --- a/app/src/main/res/layout/game_test_item.xml +++ b/app/src/main/res/layout/game_test_item.xml @@ -79,7 +79,7 @@ android:paddingLeft="3dp" android:paddingRight="3dp" android:textColor="@android:color/white" - android:textSize="9dp" + android:textSize="9sp" android:maxLines="1" android:visibility="gone" android:layout_centerVertical="true" diff --git a/app/src/main/res/layout/gamedetail_item_fuli.xml b/app/src/main/res/layout/gamedetail_item_fuli.xml index 20040ccbea..d37773d3c0 100644 --- a/app/src/main/res/layout/gamedetail_item_fuli.xml +++ b/app/src/main/res/layout/gamedetail_item_fuli.xml @@ -16,7 +16,7 @@ android:layout_marginBottom = "12dp" android:text = "@string/fuli_description" android:textColor = "@color/text_3a3a3a" - android:textSize = "15dp" /> + android:textSize = "15sp" /> diff --git a/app/src/main/res/layout/gamedetail_item_gametag.xml b/app/src/main/res/layout/gamedetail_item_gametag.xml index 8991c6b5ff..e4a649d60d 100644 --- a/app/src/main/res/layout/gamedetail_item_gametag.xml +++ b/app/src/main/res/layout/gamedetail_item_gametag.xml @@ -15,7 +15,7 @@ android:layout_centerVertical = "true" android:text = "@string/game_tag" android:textColor = "@color/text_3a3a3a" - android:textSize = "15dp" /> + android:textSize = "15sp" /> + android:textSize = "15sp" /> diff --git a/app/src/main/res/layout/gamedetail_item_libao_rv.xml b/app/src/main/res/layout/gamedetail_item_libao_rv.xml index a0305f52d8..179d38bd4a 100644 --- a/app/src/main/res/layout/gamedetail_item_libao_rv.xml +++ b/app/src/main/res/layout/gamedetail_item_libao_rv.xml @@ -15,7 +15,7 @@ android:layout_marginBottom = "12dp" android:text = "@string/libao_game" android:textColor = "@color/text_3a3a3a" - android:textSize = "15dp" /> + android:textSize = "15sp" /> + android:textSize = "15sp" /> + android:textSize = "15sp" /> + android:textSize = "15sp" /> \ No newline at end of file diff --git a/app/src/main/res/values/styles_themes.xml b/app/src/main/res/values/styles_themes.xml index b4ecde6f81..ecaf7fce42 100644 --- a/app/src/main/res/values/styles_themes.xml +++ b/app/src/main/res/values/styles_themes.xml @@ -121,7 +121,7 @@ ?actionBarSize 0dp 0dp - 15dp + 15sp