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 85a29464f0..395a87821f 100644 --- a/app/src/main/java/com/gh/common/util/DialogUtils.java +++ b/app/src/main/java/com/gh/common/util/DialogUtils.java @@ -15,6 +15,7 @@ import android.text.Spanned; import android.text.TextPaint; import android.view.Display; import android.view.Gravity; +import android.view.LayoutInflater; import android.view.View; import android.view.Window; import android.view.WindowManager; @@ -353,7 +354,7 @@ public class DialogUtils { showWarningDialog(context, "下载提示", "您当前使用的网络为2G/3G/4G，开始下载将会消耗移动流量，确定下载？", listener); } - public static void showCancelDialog(Context context, final ConfirmListener listener, CancelListener cancelListener) { + public static void showCancelDialog(Context context, final ConfirmListener listener, CancelListener cancelListener) { Spanned content = Html.fromHtml("取消关注游戏后，您将无法及时收到游戏" + "攻略、" + "资讯等最新动态提醒。"); @@ -406,41 +407,78 @@ public class DialogUtils { public static void showAlertDialog(Context context, String title, CharSequence message , String positive, String negative, final ConfirmListener cmListener, final CancelListener clListener) { - 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, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - if (clListener != null) { - clListener.onCancel(); - } - } - }) - .create(); - alertDialog.show(); +// 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, new DialogInterface.OnClickListener() { +// @Override +// public void onClick(DialogInterface dialog, int which) { +// if (clListener != null) { +// clListener.onCancel(); +// } +// } +// }) +// .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(14); +// positiveBtn.setTextColor(ContextCompat.getColor(context, R.color.theme)); +// negativeBtn.setTextSize(14); +// negativeBtn.setTextColor(ContextCompat.getColor(context, R.color.theme)); +// if (mesage != null) { +// mesage.setTextSize(14); +// mesage.setTextColor(ContextCompat.getColor(context, R.color.system_bar)); +// mesage.setLineSpacing(1.0f, 1.3f); +// } - 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); + final Dialog dialog = new Dialog(context, R.style.GhAlertDialog); - positiveBtn.setTextSize(14); - positiveBtn.setTextColor(ContextCompat.getColor(context, R.color.theme)); - negativeBtn.setTextSize(14); - negativeBtn.setTextColor(ContextCompat.getColor(context, R.color.theme)); - if (mesage != null) { - mesage.setTextSize(14); - mesage.setTextColor(ContextCompat.getColor(context, R.color.system_bar)); - mesage.setLineSpacing(1.0f, 1.3f); - } + View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_alert, null); + TextView contentTv = contentView.findViewById(R.id.dialog_content); + TextView titleTv = contentView.findViewById(R.id.dialog_title); + TextView negativeTv = contentView.findViewById(R.id.dialog_negative); + TextView positiveTv = contentView.findViewById(R.id.dialog_positive); + + contentTv.setText(message); + titleTv.setText(title); + negativeTv.setText(negative); + positiveTv.setText(positive); + + negativeTv.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + if (clListener != null) { + clListener.onCancel(); + } + dialog.dismiss(); + } + }); + + positiveTv.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + if (cmListener != null) { + cmListener.onConfirm(); + } + dialog.dismiss(); + } + }); + + dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); + dialog.setContentView(contentView); + dialog.show(); } @@ -455,37 +493,74 @@ public class DialogUtils { * @param cmListener */ + // TODO: 8/10/17 将下面几个弹窗整理在一起 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(); +// 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(14); +// positiveBtn.setTextColor(ContextCompat.getColor(context, R.color.theme)); +// negativeBtn.setTextSize(14); +// negativeBtn.setTextColor(ContextCompat.getColor(context, R.color.hint)); +// if (mesage != null) { +// mesage.setTextSize(14); +// mesage.setTextColor(ContextCompat.getColor(context, R.color.system_bar)); +// mesage.setLineSpacing(1.0f, 1.3f); +// } - 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); + final Dialog dialog = new Dialog(context, R.style.GhAlertDialog); + + View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_alert, null); + TextView contentTv = contentView.findViewById(R.id.dialog_content); + TextView titleTv = contentView.findViewById(R.id.dialog_title); + TextView negativeTv = contentView.findViewById(R.id.dialog_negative); + TextView positiveTv = contentView.findViewById(R.id.dialog_positive); + + contentTv.setText(message); + titleTv.setText(title); + negativeTv.setText(negative); + negativeTv.setTextColor(ContextCompat.getColor(context, R.color.hint)); + positiveTv.setText(positive); + + negativeTv.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + dialog.dismiss(); + } + }); + + positiveTv.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + if (cmListener != null) { + cmListener.onConfirm(); + } + dialog.dismiss(); + } + }); + + dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); + dialog.setContentView(contentView); + dialog.show(); - positiveBtn.setTextSize(14); - positiveBtn.setTextColor(ContextCompat.getColor(context, R.color.theme)); - negativeBtn.setTextSize(14); - negativeBtn.setTextColor(ContextCompat.getColor(context, R.color.hint)); - if (mesage != null) { - mesage.setTextSize(14); - mesage.setTextColor(ContextCompat.getColor(context, R.color.system_bar)); - mesage.setLineSpacing(1.0f, 1.3f); - } } @@ -495,48 +570,94 @@ public class DialogUtils { public static void showCancelListenerDialog(Context context, String title, CharSequence message , String positive, String negative, final ConfirmListener cmListener, final CancelListener clListener) { - 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, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - if (clListener != null) { - clListener.onCancel(); - } - } - }) - .setOnCancelListener(new DialogInterface.OnCancelListener() { - @Override - public void onCancel(DialogInterface dialogInterface) { - clListener.onCancel(); - } - }) - .create(); +// 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, new DialogInterface.OnClickListener() { +// @Override +// public void onClick(DialogInterface dialog, int which) { +// if (clListener != null) { +// clListener.onCancel(); +// } +// } +// }) +// .setOnCancelListener(new DialogInterface.OnCancelListener() { +// @Override +// public void onCancel(DialogInterface dialogInterface) { +// clListener.onCancel(); +// } +// }) +// .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(14); +// positiveBtn.setTextColor(ContextCompat.getColor(context, R.color.theme)); +// negativeBtn.setTextSize(14); +// negativeBtn.setTextColor(ContextCompat.getColor(context, R.color.hint)); +// if (mesage != null) { +// mesage.setTextSize(14); +// mesage.setTextColor(ContextCompat.getColor(context, R.color.system_bar)); +// mesage.setLineSpacing(1.0f, 1.3f); +// } - alertDialog.show(); + final Dialog dialog = new Dialog(context, R.style.GhAlertDialog); - 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); + View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_alert, null); + TextView contentTv = contentView.findViewById(R.id.dialog_content); + TextView titleTv = contentView.findViewById(R.id.dialog_title); + TextView negativeTv = contentView.findViewById(R.id.dialog_negative); + TextView positiveTv = contentView.findViewById(R.id.dialog_positive); + + contentTv.setText(message); + titleTv.setText(title); + negativeTv.setText(negative); + negativeTv.setTextColor(ContextCompat.getColor(context, R.color.hint)); + positiveTv.setText(positive); + + negativeTv.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + if (clListener != null) { + clListener.onCancel(); + } + dialog.dismiss(); + } + }); + + positiveTv.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + if (cmListener != null) { + cmListener.onConfirm(); + } + dialog.dismiss(); + } + }); + + dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); + dialog.setContentView(contentView); + dialog.setOnCancelListener(new DialogInterface.OnCancelListener() { + @Override + public void onCancel(DialogInterface dialogInterface) { + if (clListener != null) + clListener.onCancel(); + } + }); + dialog.show(); - positiveBtn.setTextSize(14); - positiveBtn.setTextColor(ContextCompat.getColor(context, R.color.theme)); - negativeBtn.setTextSize(14); - negativeBtn.setTextColor(ContextCompat.getColor(context, R.color.hint)); - if (mesage != null) { - mesage.setTextSize(14); - mesage.setTextColor(ContextCompat.getColor(context, R.color.system_bar)); - mesage.setLineSpacing(1.0f, 1.3f); - } } @@ -547,43 +668,82 @@ public class DialogUtils { public static void showPermissionDialog(Context context, String title, CharSequence message , String positive, String negative, final ConfirmListener cmListener, final CancelListener clListener) { - 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, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - if (clListener != null) { - clListener.onCancel(); - } - } - }) - .setCancelable(false) - .create(); +// 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, new DialogInterface.OnClickListener() { +// @Override +// public void onClick(DialogInterface dialog, int which) { +// if (clListener != null) { +// clListener.onCancel(); +// } +// } +// }) +// .setCancelable(false) +// .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); +// } - alertDialog.show(); + final Dialog dialog = new Dialog(context, R.style.GhAlertDialog); - 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); + View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_alert, null); + TextView contentTv = contentView.findViewById(R.id.dialog_content); + TextView titleTv = contentView.findViewById(R.id.dialog_title); + TextView negativeTv = contentView.findViewById(R.id.dialog_negative); + TextView positiveTv = contentView.findViewById(R.id.dialog_positive); - 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); - } + contentTv.setText(message); + titleTv.setText(title); + negativeTv.setText(negative); + negativeTv.setTextColor(ContextCompat.getColor(context, R.color.hint)); + positiveTv.setText(positive); + + negativeTv.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + if (clListener != null) { + clListener.onCancel(); + } + dialog.dismiss(); + } + }); + + positiveTv.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + if (cmListener != null) { + cmListener.onConfirm(); + } + dialog.dismiss(); + } + }); + + dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); + dialog.setContentView(contentView); + dialog.setCancelable(false); + dialog.show(); } diff --git a/app/src/main/java/com/gh/common/util/LibaoUtils.java b/app/src/main/java/com/gh/common/util/LibaoUtils.java index bca19d3eb4..11e0e16cf2 100644 --- a/app/src/main/java/com/gh/common/util/LibaoUtils.java +++ b/app/src/main/java/com/gh/common/util/LibaoUtils.java @@ -470,7 +470,7 @@ public class LibaoUtils { case "finish": Utils.toast(context, "礼包领取时间已结束"); break; - case "fetched": // TODO 应该返回 libaoCode + case "fetched": // TODO 应该返回 libaoCode??4.3 Utils.toast(context, "你已领过这个礼包了"); int countdown = 0; if (errorJson.toString().contains("countdown")) { 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 9dda258037..fd9b662dfe 100644 --- a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java @@ -216,22 +216,30 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { Utils.log("url = " + url); Utils.log("url = " + uri.getScheme()); String host = uri.getHost(); - String id = uri.getPath().substring(1); + String path = uri.getPath(); + String id = null; + if (!TextUtils.isEmpty(path)) { + id = path.substring(1); + } Intent intent; switch (host) { case "article": mContext.startActivity(NewsDetailActivity.getIntentById(mContext, id, StringUtils.buildString(mEntrance, "+(新闻详情[", mNewsDetailEntity.getTitle(), "])"))); + break; case "game": GameDetailActivity.startGameDetailActivity(mContext, id, StringUtils.buildString(mEntrance, "+(新闻详情[", mNewsDetailEntity.getTitle(), "])")); + break; case "column": String name = uri.getQueryParameter("name"); SubjectActivity.startSubjectActivity(mContext, id, name, false , StringUtils.buildString(mEntrance, "+(新闻详情[", mNewsDetailEntity.getTitle(), "])")); + break; case "libao": mContext.startActivity(LibaoDetailActivity.getIntentById(mContext, id, StringUtils.buildString(mEntrance, "+(新闻详情[", mNewsDetailEntity.getTitle(), "])"))); + break; case "qq": String qq = id; intent = new Intent(); @@ -242,6 +250,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { } catch (Exception e) { e.printStackTrace(); } + break; case "qqqun": String key = uri.getQueryParameter("key"); intent = new Intent(); @@ -253,16 +262,18 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { } catch (Exception e) { e.printStackTrace(); } + break; case "inurl": intent = new Intent(mContext, WebActivity.class); intent.putExtra("url", uri.getQueryParameter("url")); mContext.startActivity(intent); + break; case "outurl": intent = new Intent(); intent.setAction(Intent.ACTION_VIEW); intent.setData(Uri.parse(uri.getQueryParameter("url"))); mContext.startActivity(intent); - + break; } return true; } @@ -441,7 +452,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { // 统计阅读量 NewsUtils.statNewsViews(mContext, newsEntity.getId()); NewsDetailActivity.startNewsDetailActivity(mContext, newsEntity - , StringUtils.buildString(mEntrance, "+(新闻详情[", mTitle,"]:相关推荐[", String.valueOf(viewHolder.getPosition() + 1), "])")); + , StringUtils.buildString(mEntrance, "+(新闻详情[", mTitle, "]:相关推荐[", String.valueOf(viewHolder.getPosition() + 1), "])")); } }); viewHolder.newsMoreLl.addView(view); diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpRetryInterceptor.kt b/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpRetryInterceptor.kt index 2ef21d1766..dfb80a58ec 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpRetryInterceptor.kt +++ b/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpRetryInterceptor.kt @@ -4,6 +4,7 @@ import android.content.Context import android.text.TextUtils import com.gh.common.util.DeviceUtils import com.gh.common.util.LoginUtils +import com.gh.gamecenter.R import com.gh.gamecenter.entity.LoginResponseEntity import com.gh.gamecenter.entity.UserInfoEntity import com.gh.gamecenter.eventbus.EBReuse @@ -110,6 +111,7 @@ class OkHttpRetryInterceptor internal constructor(context: Context) : Intercepto Utils.log("=======string::" + string) val content = JSONObject(string) val code = content.getInt("code") + Utils.toast(mContext, mContext.getString(R.string.login_refresh_error)) LoginUtils.cleanUserData(mContext) EventBus.getDefault().post(EBReuse(PersonalFragment.LOGOUT_TAG)) tryCount = 4 // 只要token刷新异常直接主动退出登录 diff --git a/app/src/main/res/layout/dialog_alert.xml b/app/src/main/res/layout/dialog_alert.xml new file mode 100644 index 0000000000..130970f291 --- /dev/null +++ b/app/src/main/res/layout/dialog_alert.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0043c00b16..bf19e5c1f4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -292,5 +292,6 @@ 礼包内容 领取规则 使用说明 + 账号状态失效，请重新登录 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 0d2ea4aa6c..651fb63109 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -89,7 +89,7 @@ \ No newline at end of file