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 c27e088204..240b863abd 100644
--- a/app/src/main/java/com/gh/common/util/DialogUtils.java
+++ b/app/src/main/java/com/gh/common/util/DialogUtils.java
@@ -4,6 +4,8 @@ import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
+import android.text.Html;
+import android.text.Spanned;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.Window;
@@ -162,8 +164,139 @@ public class DialogUtils {
dialog.show();
}
+ public static void showSuccessDialog(Context context) {
+ final Dialog dialog = new Dialog(context);
+ View view = View.inflate(context, R.layout.gamedetails_attention_dialog, null);
+ TextView title = (TextView) view.findViewById(R.id.dialog_title);
+ title.setText("关注成功");
+ TextView confirm = (TextView) view.findViewById(R.id.dialog_confirm);
+ confirm.setText("我知道了");
+ confirm.setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ dialog.dismiss();
+ }
+ });
+ TextView message = (TextView) view.findViewById(R.id.dialog_message);
+ message.setText("游戏的最新动态消息会优先提醒您，包括攻略、资讯、开服信息、开测信息以及最新的插件。");
+ view.findViewById(R.id.dialog_rl_cancel).setVisibility(View.GONE);
+ dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+ dialog.setContentView(view);
+ dialog.show();
+ }
+
+ public static void showCancelDialog(Context context, final ConfiremListener listener) {
+ final Dialog dialog = new Dialog(context);
+ View view = View.inflate(context, R.layout.gamedetails_attention_dialog, null);
+ TextView title = (TextView) view.findViewById(R.id.dialog_title);
+ title.setText("取消关注");
+ TextView cancel = (TextView) view.findViewById(R.id.dialog_cancel);
+ cancel.setText("取消");
+ cancel.setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ dialog.dismiss();
+ }
+ });
+ TextView message = (TextView) view.findViewById(R.id.dialog_message);
+
+ Spanned content = Html
+ .fromHtml("取消关注游戏后，您将无法及时收到游戏的攻略、资讯等最新动态提醒，您确定取消吗？");
+ message.setText(content);
+
+ view.findViewById(R.id.dialog_rl_confirm).setVisibility(View.VISIBLE);
+ view.findViewById(R.id.dialog_confirm).setOnClickListener(
+ new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ dialog.dismiss();
+ if (listener != null) {
+ listener.onConfirem();
+ }
+ }
+ });
+ dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+ dialog.setContentView(view);
+ dialog.show();
+ }
+
+ public static void showPluginDialog(Context context, final ConfiremListener cListener,
+ final DismissListener dListener) {
+ final Dialog dialog = new Dialog(context);
+ View view = View.inflate(context, R.layout.search_history_delete_dialog, null);
+ TextView title = (TextView) view.findViewById(R.id.delete_dialog_title);
+ title.setText("插件化安装");
+ TextView content = (TextView) view
+ .findViewById(R.id.delete_dialog_message);
+ Spanned spanned = Html.fromHtml("您将进行插件化安装以实现插件功能,此过程将"
+ + "卸载" + "当前使用的版本并"
+ + "安装插件版本" + "。");
+ content.setText(spanned);
+
+ TextView cancel = (TextView) view
+ .findViewById(R.id.delete_dialog_cancel);
+ cancel.setText("取消");
+ cancel.setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ dialog.dismiss();
+ }
+ });
+ TextView confirm = (TextView) view
+ .findViewById(R.id.delete_dialog_confirm);
+ confirm.setText("确定");
+ confirm.setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ dialog.dismiss();
+ if (cListener != null) {
+ cListener.onConfirem();
+ }
+ }
+ });
+
+ if (dListener != null) {
+ dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+ @Override
+ public void onDismiss(DialogInterface dialog) {
+ dListener.onDismiss();
+ }
+ });
+ }
+
+ dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+ dialog.setContentView(view);
+ dialog.show();
+ }
+
+ public static void showDisclaimerDialog(Context context, String content) {
+ final Dialog disclaimerDialog = new Dialog(context);
+ View view = View.inflate(context, R.layout.setting_disclaimer_dialog, null);
+ TextView title = (TextView) view
+ .findViewById(R.id.disclaimer_dialog_title);
+ title.setText("免责声明");
+ TextView message = (TextView) view
+ .findViewById(R.id.disclaimer_dialog_message);
+ Spanned spanned = Html.fromHtml(content);
+ message.setText(spanned);
+ view.findViewById(R.id.disclaimer_dialog_confirm).setOnClickListener(
+ new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ disclaimerDialog.dismiss();
+ }
+ });
+ disclaimerDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+ disclaimerDialog.setContentView(view);
+ disclaimerDialog.show();
+ }
+
public interface ConfiremListener{
void onConfirem();
}
+ public interface DismissListener{
+ void onDismiss();
+ }
+
}
diff --git a/app/src/main/java/com/gh/common/view/DownloadDialog.java b/app/src/main/java/com/gh/common/view/DownloadDialog.java
index d3c57aaea3..82bc0ac41d 100644
--- a/app/src/main/java/com/gh/common/view/DownloadDialog.java
+++ b/app/src/main/java/com/gh/common/view/DownloadDialog.java
@@ -1,6 +1,5 @@
package com.gh.common.view;
-import android.app.Dialog;
import android.content.Context;
import android.content.SharedPreferences;
import android.graphics.Color;
@@ -16,8 +15,6 @@ import android.support.v4.view.ViewPager;
import android.support.v4.view.ViewPager.OnPageChangeListener;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.RecyclerView;
-import android.text.Html;
-import android.text.Spanned;
import android.text.TextUtils;
import android.util.SparseArray;
import android.view.Gravity;
@@ -26,7 +23,6 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
-import android.view.Window;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.LinearLayout.LayoutParams;
@@ -513,35 +509,9 @@ public class DownloadDialog {
// 显示插件化
private void showPluginDialog(final ApkEntity apkEntity,
final RecyclerViewAdapter adapter, final int location) {
- final Dialog dialog = new Dialog(context);
- View view = View.inflate(context,
- R.layout.search_history_delete_dialog, null);
- TextView title = (TextView) view.findViewById(R.id.delete_dialog_title);
- title.setText("插件化安装");
- TextView content = (TextView) view
- .findViewById(R.id.delete_dialog_message);
- Spanned spanned = Html.fromHtml("您将进行插件化安装以实现插件功能,此过程将"
- + "卸载" + "当前使用的版本并"
- + "安装插件版本" + "。");
- content.setText(spanned);
-
- TextView cancel = (TextView) view
- .findViewById(R.id.delete_dialog_cancel);
- cancel.setText("取消");
- cancel.setOnClickListener(new OnClickListener() {
+ DialogUtils.showPluginDialog(context, new DialogUtils.ConfiremListener() {
@Override
- public void onClick(View v) {
- dialog.dismiss();
- }
- });
- TextView confirm = (TextView) view
- .findViewById(R.id.delete_dialog_confirm);
- confirm.setText("确定");
- confirm.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- dialog.dismiss();
-
+ public void onConfirem() {
Map kv6 = new HashMap();
kv6.put("操作", "点击插件化安装完成");
DataUtils.onEvent(context, "插件化", gameName, kv6);
@@ -557,11 +527,7 @@ public class DownloadDialog {
context.startActivity(PackageUtils.getUninstallIntent(context, path));
}
}
- });
-
- dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
- dialog.setContentView(view);
- dialog.show();
+ }, null);
}
private class RecyclerViewAdapter extends
diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailsActivity.java b/app/src/main/java/com/gh/gamecenter/GameDetailsActivity.java
index 65e15552c8..40ee569af9 100644
--- a/app/src/main/java/com/gh/gamecenter/GameDetailsActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/GameDetailsActivity.java
@@ -1,7 +1,5 @@
package com.gh.gamecenter;
-import android.app.Dialog;
-import android.content.DialogInterface;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
@@ -11,14 +9,11 @@ import android.support.v4.app.FragmentPagerAdapter;
import android.support.v4.util.ArrayMap;
import android.support.v4.view.ViewPager;
import android.support.v4.view.ViewPager.OnPageChangeListener;
-import android.text.Html;
-import android.text.Spanned;
import android.text.TextUtils;
import android.util.DisplayMetrics;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup.LayoutParams;
-import android.view.Window;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ProgressBar;
@@ -420,14 +415,33 @@ public class GameDetailsActivity extends BaseFragmentActivity implements
top_tv_attention
.setBackgroundResource(R.drawable.border_red_bg);
top_tv_attention.setTextColor(0xffbc2132);
- showSuccessDialog();
+
+ DialogUtils.showSuccessDialog(this);
} else {
Map kv2 = new HashMap();
kv2.put("点击", "取消关注");
- DataUtils.onEvent(GameDetailsActivity.this, "插件数据",
- entity.getName(), kv2);
+ DataUtils.onEvent(GameDetailsActivity.this, "插件数据", entity.getName(), kv2);
- showCancelDialog();
+ DialogUtils.showCancelDialog(this, new DialogUtils.ConfiremListener() {
+ @Override
+ public void onConfirem() {
+ Map kv = new HashMap();
+ kv.put("状态", "取消关注");
+ DataUtils.onEvent(GameDetailsActivity.this, "游戏关注", entity.getName(), kv);
+
+ Map map = new HashMap();
+ map.put("game", entity.getName());
+ map.put("type", "关注");
+ map.put("createdOn", System.currentTimeMillis() / 1000);
+ DataCollectionManager.onEvent(GameDetailsActivity.this, "concern", map);
+
+ concernManager.deleteConcern(entity.getId());
+
+ top_tv_attention.setText("关注");
+ top_tv_attention.setBackgroundResource(R.drawable.textview_red_style);
+ top_tv_attention.setTextColor(0xffffffff);
+ }
+ });
}
break;
case R.id.gamedetails_tv_download:
@@ -624,108 +638,10 @@ public class GameDetailsActivity extends BaseFragmentActivity implements
}
}
- private void showSuccessDialog() {
- final Dialog dialog = new Dialog(this);
- View view = View.inflate(this, R.layout.gamedetails_attention_dialog,
- null);
- TextView title = (TextView) view.findViewById(R.id.dialog_title);
- title.setText("关注成功");
- TextView confirm = (TextView) view.findViewById(R.id.dialog_confirm);
- confirm.setText("我知道了");
- confirm.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- dialog.dismiss();
- }
- });
- TextView message = (TextView) view.findViewById(R.id.dialog_message);
- message.setText("游戏的最新动态消息会优先提醒您，包括攻略、资讯、开服信息、开测信息以及最新的插件。");
- view.findViewById(R.id.dialog_rl_cancel).setVisibility(View.GONE);
- dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
- dialog.setContentView(view);
- dialog.show();
- }
-
- private void showCancelDialog() {
- final Dialog dialog = new Dialog(this);
- View view = View.inflate(this, R.layout.gamedetails_attention_dialog,
- null);
- TextView title = (TextView) view.findViewById(R.id.dialog_title);
- title.setText("取消关注");
- TextView cancel = (TextView) view.findViewById(R.id.dialog_cancel);
- cancel.setText("取消");
- cancel.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- dialog.dismiss();
- }
- });
- TextView message = (TextView) view.findViewById(R.id.dialog_message);
-
- Spanned content = Html
- .fromHtml("取消关注游戏后，您将无法及时收到游戏的攻略、资讯等最新动态提醒，您确定取消吗？");
- message.setText(content);
-
- view.findViewById(R.id.dialog_rl_confirm).setVisibility(View.VISIBLE);
- view.findViewById(R.id.dialog_confirm).setOnClickListener(
- new OnClickListener() {
- @Override
- public void onClick(View v) {
-
- Map kv = new HashMap();
- kv.put("状态", "取消关注");
- DataUtils.onEvent(GameDetailsActivity.this, "游戏关注",
- entity.getName(), kv);
-
- Map map = new HashMap();
- map.put("game", entity.getName());
- map.put("type", "关注");
- map.put("createdOn", System.currentTimeMillis() / 1000);
- DataCollectionManager.onEvent(GameDetailsActivity.this,
- "concern", map);
-
- concernManager.deleteConcern(entity.getId());
- dialog.dismiss();
- top_tv_attention.setText("关注");
- top_tv_attention
- .setBackgroundResource(R.drawable.textview_red_style);
- top_tv_attention.setTextColor(0xffffffff);
- }
- });
- dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
- dialog.setContentView(view);
- dialog.show();
- }
-
private void showPluginDialog(final String path, final String gameName) {
- final Dialog dialog = new Dialog(this);
- View view = View.inflate(this, R.layout.search_history_delete_dialog,
- null);
- TextView title = (TextView) view.findViewById(R.id.delete_dialog_title);
- title.setText("插件化安装");
- TextView content = (TextView) view
- .findViewById(R.id.delete_dialog_message);
- Spanned spanned = Html.fromHtml("您将进行插件化安装以实现插件功能,此过程将"
- + "卸载" + "当前使用的版本并"
- + "安装插件版本" + "。");
- content.setText(spanned);
-
- TextView cancel = (TextView) view
- .findViewById(R.id.delete_dialog_cancel);
- cancel.setText("取消");
- cancel.setOnClickListener(new OnClickListener() {
+ DialogUtils.showPluginDialog(this, new DialogUtils.ConfiremListener() {
@Override
- public void onClick(View v) {
- dialog.dismiss();
- }
- });
- TextView confirm = (TextView) view
- .findViewById(R.id.delete_dialog_confirm);
- confirm.setText("确定");
- confirm.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- dialog.dismiss();
+ public void onConfirem() {
Map kv6 = new HashMap();
kv6.put("操作", "一次性完成");
DataUtils.onEvent(GameDetailsActivity.this, "插件化", gameName, kv6);
@@ -736,18 +652,12 @@ public class GameDetailsActivity extends BaseFragmentActivity implements
startActivity(PackageUtils.getUninstallIntent(getApplicationContext(), path));
}
}
- });
-
- dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+ }, new DialogUtils.DismissListener() {
@Override
- public void onDismiss(DialogInterface dialog) {
+ public void onDismiss() {
isShowPluginDialog = false;
}
});
-
- dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
- dialog.setContentView(view);
- dialog.show();
}
@Override
diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java
index f3cf1ed3a2..af24a81ba3 100644
--- a/app/src/main/java/com/gh/gamecenter/MainActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java
@@ -34,6 +34,7 @@ import com.gh.base.AppController;
import com.gh.base.BaseFragmentActivity;
import com.gh.common.constant.Config;
import com.gh.common.util.DataUtils;
+import com.gh.common.util.DialogUtils;
import com.gh.common.util.FileUtils;
import com.gh.common.util.MD5Utils;
import com.gh.common.util.NetworkUtils;
@@ -532,7 +533,7 @@ public class MainActivity extends BaseFragmentActivity implements
sp.edit().putString("disclaimer", content)
.apply();
if (isFirst) {
- showDisclaimerDialog(content);
+ DialogUtils.showDisclaimerDialog(MainActivity.this, content);
}
}
} catch (JSONException e) {
@@ -553,30 +554,6 @@ public class MainActivity extends BaseFragmentActivity implements
AppController.addToRequestQueue(request, MainActivity.class);
}
- // 弹出免责声明的窗口
- private void showDisclaimerDialog(String content) {
- final Dialog disclaimerDialog = new Dialog(this);
- View view = View
- .inflate(this, R.layout.setting_disclaimer_dialog, null);
- TextView title = (TextView) view
- .findViewById(R.id.disclaimer_dialog_title);
- title.setText("免责声明");
- TextView message = (TextView) view
- .findViewById(R.id.disclaimer_dialog_message);
- Spanned spanned = Html.fromHtml(content);
- message.setText(spanned);
- view.findViewById(R.id.disclaimer_dialog_confirm).setOnClickListener(
- new OnClickListener() {
- @Override
- public void onClick(View v) {
- disclaimerDialog.dismiss();
- }
- });
- disclaimerDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
- disclaimerDialog.setContentView(view);
- disclaimerDialog.show();
- }
-
Runnable runnable = new Runnable() {
@Override
public void run() {
diff --git a/app/src/main/java/com/gh/gamecenter/NewsActivity.java b/app/src/main/java/com/gh/gamecenter/NewsActivity.java
index 70be43d390..652a214887 100644
--- a/app/src/main/java/com/gh/gamecenter/NewsActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/NewsActivity.java
@@ -1,6 +1,5 @@
package com.gh.gamecenter;
-import android.app.Dialog;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
@@ -11,8 +10,6 @@ import android.support.v4.util.ArrayMap;
import android.support.v4.view.MotionEventCompat;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
-import android.text.Html;
-import android.text.Spanned;
import android.text.TextUtils;
import android.util.DisplayMetrics;
import android.view.LayoutInflater;
@@ -746,79 +743,6 @@ public class NewsActivity extends BaseActivity implements OnClickListener {
adapter.notifyItemChanged(adapter.getItemCount() - 1);
}
- private void showSuccessDialog() {
- final Dialog dialog = new Dialog(this);
- View view = View.inflate(this, R.layout.gamedetails_attention_dialog,
- null);
- TextView title = (TextView) view.findViewById(R.id.dialog_title);
- title.setText("关注成功");
- TextView confirm = (TextView) view.findViewById(R.id.dialog_confirm);
- confirm.setText("我知道了");
- confirm.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- dialog.dismiss();
- }
- });
- TextView message = (TextView) view.findViewById(R.id.dialog_message);
- message.setText("游戏的最新动态消息会优先提醒您，包括攻略、资讯、开服信息、开测信息以及最新的插件。");
- view.findViewById(R.id.dialog_rl_cancel).setVisibility(View.GONE);
- dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
- dialog.setContentView(view);
- dialog.show();
- }
-
- private void showCancelDialog(final TextView attention) {
- final Dialog dialog = new Dialog(this);
- View view = View.inflate(this, R.layout.gamedetails_attention_dialog,
- null);
- TextView title = (TextView) view.findViewById(R.id.dialog_title);
- title.setText("取消关注");
- TextView cancel = (TextView) view.findViewById(R.id.dialog_cancel);
- cancel.setText("取消");
- cancel.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- dialog.dismiss();
- }
- });
- TextView message = (TextView) view.findViewById(R.id.dialog_message);
-
- Spanned content = Html
- .fromHtml("取消关注游戏后，您将无法及时收到游戏的攻略、资讯等最新动态提醒，您确定取消吗？");
- message.setText(content);
-
- view.findViewById(R.id.dialog_rl_confirm).setVisibility(View.VISIBLE);
- view.findViewById(R.id.dialog_confirm).setOnClickListener(
- new OnClickListener() {
- @Override
- public void onClick(View v) {
-
- Map kv = new HashMap();
- kv.put("状态", "取消关注");
- DataUtils.onEvent(NewsActivity.this, "游戏关注",
- gameEntity.getName(), kv);
-
- Map map = new HashMap();
- map.put("game", gameEntity.getName());
- map.put("type", "关注");
- map.put("createdOn", System.currentTimeMillis() / 1000);
- DataCollectionManager.onEvent(NewsActivity.this,
- "concern", map);
-
- concernManager.deleteConcern(gameEntity.getId());
- dialog.dismiss();
- attention.setText("关注");
- attention
- .setBackgroundResource(R.drawable.textview_red_style);
- attention.setTextColor(0xffffffff);
- }
- });
- dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
- dialog.setContentView(view);
- dialog.show();
- }
-
public class JsInterface {
private Context context;
private ArrayList imgs = new ArrayList();
@@ -936,13 +860,32 @@ public class NewsActivity extends BaseActivity implements OnClickListener {
essaydetails_attention.setText("取消关注");
essaydetails_attention.setBackgroundResource(R.drawable.border_red_bg);
essaydetails_attention.setTextColor(0xffbc2132);
- showSuccessDialog();
+
+ DialogUtils.showSuccessDialog(NewsActivity.this);
} else {
Map kv2 = new HashMap();
kv2.put("点击", "取消关注");
DataUtils.onEvent(NewsActivity.this, "插件数据", gameEntity.getName(), kv2);
- showCancelDialog(essaydetails_attention);
+ DialogUtils.showCancelDialog(NewsActivity.this, new DialogUtils.ConfiremListener() {
+ @Override
+ public void onConfirem() {
+ Map kv = new HashMap();
+ kv.put("状态", "取消关注");
+ DataUtils.onEvent(NewsActivity.this, "游戏关注", gameEntity.getName(), kv);
+
+ Map map = new HashMap();
+ map.put("game", gameEntity.getName());
+ map.put("type", "关注");
+ map.put("createdOn", System.currentTimeMillis() / 1000);
+ DataCollectionManager.onEvent(NewsActivity.this, "concern", map);
+
+ concernManager.deleteConcern(gameEntity.getId());
+ essaydetails_attention.setText("关注");
+ essaydetails_attention.setBackgroundResource(R.drawable.textview_red_style);
+ essaydetails_attention.setTextColor(0xffffffff);
+ }
+ });
}
}
}
diff --git a/app/src/main/java/com/gh/gamecenter/SettingActivity.java b/app/src/main/java/com/gh/gamecenter/SettingActivity.java
index 03261f22b1..f602603de7 100644
--- a/app/src/main/java/com/gh/gamecenter/SettingActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/SettingActivity.java
@@ -235,7 +235,7 @@ public class SettingActivity extends BaseActivity implements OnClickListener {
case R.id.setting_tv_disclaimer:
String content = sp.getString("disclaimer", null);
if (!TextUtils.isEmpty(content)) {
- showDisclaimerDialog(content);
+ DialogUtils.showDisclaimerDialog(this, content);
}
break;
case R.id.setting_rl_font_size:
@@ -317,30 +317,6 @@ public class SettingActivity extends BaseActivity implements OnClickListener {
}
}
- // 弹出免责声明的窗口
- private void showDisclaimerDialog(String content) {
- final Dialog disclaimerDialog = new Dialog(this);
- View view = View
- .inflate(this, R.layout.setting_disclaimer_dialog, null);
- TextView title = (TextView) view
- .findViewById(R.id.disclaimer_dialog_title);
- title.setText("免责声明");
- TextView message = (TextView) view
- .findViewById(R.id.disclaimer_dialog_message);
- Spanned spanned = Html.fromHtml(content);
- message.setText(spanned);
- view.findViewById(R.id.disclaimer_dialog_confirm).setOnClickListener(
- new OnClickListener() {
- @Override
- public void onClick(View v) {
- disclaimerDialog.dismiss();
- }
- });
- disclaimerDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
- disclaimerDialog.setContentView(view);
- disclaimerDialog.show();
- }
-
private void checkUpdate() {
String TD_CHANNEL_ID = (String) PackageUtils.getMetaData(this,
getPackageName(), "TD_CHANNEL_ID");
@@ -386,7 +362,7 @@ public class SettingActivity extends BaseActivity implements OnClickListener {
showUpdateDialog(updateMD5);
} else {
- showCancelDialog();
+ toast("已是最新版本");
}
}
@@ -540,39 +516,6 @@ public class SettingActivity extends BaseActivity implements OnClickListener {
DownloadManager.getInstance(getApplicationContext()).add(downloadEntry);
}
- private void showCancelDialog() {
-
- final Dialog dialog = new Dialog(SettingActivity.this);
- View view = View.inflate(SettingActivity.this,
- R.layout.search_history_delete_dialog, null);
- TextView title = (TextView) view.findViewById(R.id.delete_dialog_title);
- title.setText("更新提示");
- TextView content = (TextView) view
- .findViewById(R.id.delete_dialog_message);
-
- content.setText("已经是最新版本！");
-
- view.findViewById(R.id.delete_dialog_rl_cancel)
- .setVisibility(View.GONE);
- view.findViewById(R.id.delete_dialog_rl_confirm).setVisibility(
- View.VISIBLE);
-
- TextView cancel = (TextView) view
- .findViewById(R.id.delete_dialog_confirm);
-
- cancel.setVisibility(View.VISIBLE);
- cancel.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- dialog.dismiss();
- }
- });
-
- dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
- dialog.setContentView(view);
- dialog.show();
- }
-
@Override
public void onResume() {
super.onResume();
diff --git a/app/src/main/java/com/gh/gamecenter/download/DownLoadManagerFragment.java b/app/src/main/java/com/gh/gamecenter/download/DownLoadManagerFragment.java
index 13a5351fb5..26d1d3aa20 100644
--- a/app/src/main/java/com/gh/gamecenter/download/DownLoadManagerFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/download/DownLoadManagerFragment.java
@@ -1,6 +1,5 @@
package com.gh.gamecenter.download;
-import android.app.Dialog;
import android.os.Bundle;
import android.os.Message;
import android.support.annotation.Nullable;
@@ -8,15 +7,12 @@ import android.support.v4.app.Fragment;
import android.support.v4.util.ArrayMap;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
-import android.text.Html;
-import android.text.Spanned;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.View.OnLongClickListener;
import android.view.ViewGroup;
-import android.view.Window;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.LinearLayout.LayoutParams;
@@ -505,35 +501,9 @@ public class DownLoadManagerFragment extends Fragment {
// 显示插件化
private void showPluginDialog(final String path) {
- final Dialog dialog = new Dialog(getActivity());
- View view = View.inflate(getActivity(),
- R.layout.search_history_delete_dialog, null);
- TextView title = (TextView) view.findViewById(R.id.delete_dialog_title);
- title.setText("插件化安装");
- TextView content = (TextView) view
- .findViewById(R.id.delete_dialog_message);
- Spanned spanned = Html.fromHtml("您将进行插件化安装以实现插件功能,此过程将"
- + "卸载" + "当前使用的版本并"
- + "安装插件版本" + "。");
- content.setText(spanned);
-
- TextView cancel = (TextView) view
- .findViewById(R.id.delete_dialog_cancel);
- cancel.setText("取消");
- cancel.setOnClickListener(new OnClickListener() {
+ DialogUtils.showPluginDialog(getActivity(), new DialogUtils.ConfiremListener() {
@Override
- public void onClick(View v) {
- dialog.dismiss();
- }
- });
- TextView confirm = (TextView) view
- .findViewById(R.id.delete_dialog_confirm);
- confirm.setText("确定");
- confirm.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- dialog.dismiss();
-
+ public void onConfirem() {
for (DownloadEntry downloadEntry : DownloadManager.getInstance(
getActivity()).getAll()) {
if (downloadEntry.getMeta().get("isPlugin") != null
@@ -552,11 +522,7 @@ public class DownLoadManagerFragment extends Fragment {
startActivity(PackageUtils.getUninstallIntent(getActivity(), path));
}
}
- });
-
- dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
- dialog.setContentView(view);
- dialog.show();
+ }, null);
}
private class DownLoadListAdapter extends
diff --git a/app/src/main/java/com/gh/gamecenter/game/Game2FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/game/Game2FragmentAdapter.java
index 4a2ddfdcb9..ca2ecb4c90 100644
--- a/app/src/main/java/com/gh/gamecenter/game/Game2FragmentAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/game/Game2FragmentAdapter.java
@@ -9,9 +9,6 @@ import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
import com.android.volley.Response;
import com.android.volley.VolleyError;
diff --git a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragmentAdapter.java
index 199473c748..3d6ca5e8ec 100644
--- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragmentAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragmentAdapter.java
@@ -1,6 +1,5 @@
package com.gh.gamecenter.personal;
-import android.app.Dialog;
import android.content.Intent;
import android.graphics.Color;
import android.graphics.Rect;
@@ -18,8 +17,6 @@ import android.support.v4.widget.ContentLoadingProgressBar;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.RecyclerView.ViewHolder;
-import android.text.Html;
-import android.text.Spanned;
import android.text.TextUtils;
import android.util.DisplayMetrics;
import android.util.SparseArray;
@@ -29,7 +26,6 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
-import android.view.Window;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ProgressBar;
@@ -46,6 +42,7 @@ import com.gh.base.AppController;
import com.gh.common.constant.Config;
import com.gh.common.constant.Constants;
import com.gh.common.util.DataUtils;
+import com.gh.common.util.DialogUtils;
import com.gh.common.util.DisplayUtils;
import com.gh.common.util.FileUtils;
import com.gh.common.util.ImageUtils;
@@ -1216,35 +1213,9 @@ public class PersonalFragmentAdapter extends
private void showPluginDialog(final ApkEntity apkEntity,
final String gameName, final PlatformViewAdapter adapter,
final int location) {
- final Dialog dialog = new Dialog(fragmentActivity);
- View view = View.inflate(fragmentActivity,
- R.layout.search_history_delete_dialog, null);
- TextView title = (TextView) view.findViewById(R.id.delete_dialog_title);
- title.setText("插件化安装");
- TextView content = (TextView) view
- .findViewById(R.id.delete_dialog_message);
- Spanned spanned = Html.fromHtml("您将进行插件化安装以实现插件功能,此过程将"
- + "卸载" + "当前使用的版本并"
- + "安装插件版本" + "。");
- content.setText(spanned);
-
- TextView cancel = (TextView) view
- .findViewById(R.id.delete_dialog_cancel);
- cancel.setText("取消");
- cancel.setOnClickListener(new OnClickListener() {
+ DialogUtils.showPluginDialog(fragmentActivity, new DialogUtils.ConfiremListener() {
@Override
- public void onClick(View v) {
- dialog.dismiss();
- }
- });
- TextView confirm = (TextView) view
- .findViewById(R.id.delete_dialog_confirm);
- confirm.setText("确定");
- confirm.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- dialog.dismiss();
-
+ public void onConfirem() {
Map kv6 = new HashMap();
kv6.put("操作", "点击插件化安装完成");
DataUtils.onEvent(fragmentActivity, "插件化", gameName, kv6);
@@ -1266,11 +1237,7 @@ public class PersonalFragmentAdapter extends
fragmentActivity.startActivity(PackageUtils.getUninstallIntent(fragmentActivity, path));
}
}
- });
-
- dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
- dialog.setContentView(view);
- dialog.show();
+ }, null);
}
public void updateItem(EBDownloadDelete busThree) {