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

# Conflicts:
#	app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java
#	app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java
#	app/src/main/java/com/gh/gamecenter/news/NewsConcernViewHolder.java
#	app/src/main/res/layout/news_digest_item.xml
This commit is contained in:
khy
2016-11-16 10:11:25 +08:00
43 changed files with 1658 additions and 1598 deletions

View File

@ -224,7 +224,10 @@ public class SettingActivity extends BaseActivity implements OnClickListener {
finish();
break;
case R.id.setting_cv_fix_download:
sp.edit().putBoolean("isShow", true).apply();
Editor editor = sp.edit();
editor.putBoolean("isShow", true);
editor.putBoolean("isCheckShow", false);
editor.apply();
toast("修复成功,快去首页看看吧");
EventBus.getDefault().post(new EBReuse("Refresh"));
break;