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 a6e9ba5ca2..4b51049b37 100644 --- a/app/src/main/java/com/gh/common/util/DialogUtils.java +++ b/app/src/main/java/com/gh/common/util/DialogUtils.java @@ -499,6 +499,50 @@ public class DialogUtils { } + /** + * 取消按钮灰色 + * @param context + * @param title + * @param message + * @param positive + * @param negative + * @param cmListener + */ + + public static void showAlertDialog(Context context, String title, CharSequence message + , String positive, String negative, final ConfirmListener cmListener) { + + AlertDialog alertDialog = new AlertDialog.Builder(context, R.style.GhAlertDialog) + .setTitle(title) + .setMessage(message) + .setPositiveButton(positive, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + if (cmListener != null) { + cmListener.onConfirm(); + } + } + }) + .setNegativeButton(negative, null) + .create(); + alertDialog.show(); + + TextView mesage = (TextView) alertDialog.findViewById(android.R.id.message); + Button positiveBtn = alertDialog.getButton(android.app.AlertDialog.BUTTON_POSITIVE); + Button negativeBtn = alertDialog.getButton(android.app.AlertDialog.BUTTON_NEGATIVE); + + positiveBtn.setTextSize(13); + positiveBtn.setTextColor(ContextCompat.getColor(context, R.color.theme)); + negativeBtn.setTextSize(13); + negativeBtn.setTextColor(ContextCompat.getColor(context, R.color.hint)); + if (mesage != null) { + mesage.setTextSize(13); + mesage.setTextColor(ContextCompat.getColor(context, R.color.title)); + mesage.setLineSpacing(1.0f, 1.3f); + } + + } + /** * 特殊：验证手机号码 */ diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index d1e0a74d4f..1618d57c4c 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -43,6 +43,7 @@ import com.gh.gamecenter.entity.GameUpdateEntity; import com.gh.gamecenter.eventbus.EBDownloadStatus; import com.gh.gamecenter.eventbus.EBPackage; import com.gh.gamecenter.eventbus.EBShowDialog; +import com.gh.gamecenter.eventbus.EBSkip; import com.gh.gamecenter.eventbus.EBUISwitch; import com.gh.gamecenter.fragment.MainFragment; import com.gh.gamecenter.manager.ConcernManager; @@ -707,7 +708,8 @@ public class MainActivity extends BaseActivity { if (LoginUtils.getUserInfo(this) != null && getIntent() != null && getIntent().getBundleExtra(KEY_DATA) != null && getIntent().getBundleExtra(KEY_DATA).getBoolean("exceptionReStart", false)) { DialogUtils.showWarningDialog(this, "发生闪退", "光环助手刚刚发生了闪退，反馈一下（只需简单描述你刚才的操作）以帮忙我们更好地修复问题？" - , "暂不", " 反馈一下", new DialogUtils.ConfirmListener() { + , "暂不", " 反馈一下" + , new DialogUtils.ConfirmListener() { @Override public void onConfirm() { SuggestionActivity.startSuggestionActivity(MainActivity.this, 3, null, null); @@ -765,8 +767,7 @@ public class MainActivity extends BaseActivity { , "残忍拒绝", "前往登录", new DialogUtils.ConfirmListener() { @Override public void onConfirm() { - Intent intent = LoginActivity.getIntent(MainActivity.this, true); - startActivity(intent); + EventBus.getDefault().post(new EBSkip(MainActivity.EB_SKIP_GAMEFRAGMENT, 2)); } }, null); } 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 f643939d2f..eb3de70eae 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java @@ -349,14 +349,14 @@ public class LibaoDetailAdapter extends BaseRecyclerAdapter { eTime.setLayoutParams(params); } - int repeat = mLibaoEntity.getRepeat(); - if (repeat > 0) { - TextView tvRepeat = new TextView(mContext); - tvRepeat.setTextColor(Color.parseColor("#717171")); - tvRepeat.setText(StringUtils.buildString("领取次数：每人最多可以领取", String.valueOf(repeat), "次（每天0点刷新）")); - holder.newsList.addView(tvRepeat); - tvRepeat.setLayoutParams(params); - } +// int repeat = mLibaoEntity.getRepeat(); +// if (repeat > 0) { +// TextView tvRepeat = new TextView(mContext); +// tvRepeat.setTextColor(Color.parseColor("#717171")); +// tvRepeat.setText(StringUtils.buildString("领取次数：每人最多可以领取", String.valueOf(repeat), "次（每天0点刷新）")); +// holder.newsList.addView(tvRepeat); +// tvRepeat.setLayoutParams(params); +// } } else if (mLibaoDetailEntity.getDes() != null && position == getItemCount() - 2) { holder.newsTitle.setText("使用说明"); TextView desTv = new TextView(mContext); diff --git a/app/src/main/java/com/gh/gamecenter/entity/LibaoEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/LibaoEntity.kt index 39e21d85d3..158d7a4be8 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/LibaoEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/LibaoEntity.kt @@ -94,7 +94,7 @@ class LibaoEntity : Parcelable { companion object { fun createLibaoEntity(concernEntity: ConcernEntity, libaoStatusEntity: LibaoStatusEntity, - code: String): LibaoEntity { + code: String?): LibaoEntity { val libaoEntity = LibaoEntity() libaoEntity.id = concernEntity.id libaoEntity.libaoId = concernEntity.id 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 8d4f5648b2..a6e5430071 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/MainFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/MainFragment.java @@ -34,7 +34,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import butterknife.BindView; import okhttp3.MediaType; import okhttp3.RequestBody; import okhttp3.ResponseBody; @@ -56,11 +55,10 @@ public class MainFragment extends BaseFragment_ViewPager_Checkable { public static final int INDEX_GAME = 0; public static final int INDEX_NEWS = 1; - public static final int INDEX_MESSAGE = 2; public static final int INDEX_PERSONAL = 3; private ArrayList mSearchHintLint; - @BindView(R.id.main_iv_message_hint) - View mMessageHint; +// @BindView(R.id.main_iv_message_hint) +// View mMessageHint; @Override protected int getLayoutId() { @@ -81,7 +79,6 @@ public class MainFragment extends BaseFragment_ViewPager_Checkable { protected void initFragmentList(List fragments) { fragments.add(new GameWrapperFragment()); fragments.add(new NewsWrapperFragment()); -// fragments.add(new MessageFragment()); fragments.add(new PersonalFragment()); } 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 d9f4d35d8c..9c4fcb0b44 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java @@ -195,13 +195,13 @@ public class PersonalFragment extends BaseFragment implements GetLoginDataUtils. case R.id.personal_login_wechat: if (mUserInfoEntity != null) { - DialogUtils.showWarningDialog(getContext(), "期待你的建议", "签到功能暂未开放，如果你有好的建议请反馈给我们，谢谢！" - , "以后再说", " 我有一个想法", new DialogUtils.ConfirmListener() { + DialogUtils.showAlertDialog(getContext(), "期待你的建议", "签到功能暂未开放，如果你有好的建议请反馈给我们，谢谢！" + , "我有一个想法", " 以后再说", new DialogUtils.ConfirmListener() { @Override public void onConfirm() { SuggestionActivity.startSuggestionActivity(getContext(), 2, null, "签到功能的建议："); } - }, null); + }); } else { GetLoginDataUtils.getInstance(getActivity()).WCLogin(this); } diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index 0ee0e64ced..4ac7e0a14a 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -72,44 +72,44 @@ android:textSize = "10sp" /> - + + + + + + + - + + + + - + + + + + - - + + + + + + + + + + - - + + + + + + + +