From e057b6530bef9b2bd2978d8051ab0a143b1c4916 Mon Sep 17 00:00:00 2001 From: huangzhuanghua Date: Tue, 2 May 2017 10:28:04 +0800 Subject: [PATCH 1/4] =?UTF-8?q?confirem=E4=BF=AE=E6=94=B9=E4=B8=BAconfirm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/gh/base/BaseActivity.java | 4 +-- .../java/com/gh/base/BaseDetailActivity.java | 4 +-- .../com/gh/base/BaseFragmentActivity.java | 4 +-- .../java/com/gh/common/util/DialogUtils.java | 28 +++++++++---------- .../com/gh/common/util/DownloadItemUtils.java | 12 ++++---- .../java/com/gh/common/util/LibaoUtils.java | 16 +++++------ .../java/com/gh/common/util/PackageUtils.java | 4 +-- .../java/com/gh/download/DownloadManager.java | 4 +-- .../com/gh/gamecenter/CleanApkActivity.java | 4 +-- .../gh/gamecenter/FileReceiverActivity.java | 4 +-- .../com/gh/gamecenter/FileSenderActivity.java | 4 +-- .../com/gh/gamecenter/GameDetailActivity.java | 8 +++--- .../java/com/gh/gamecenter/MainActivity.java | 8 +++--- .../gh/gamecenter/NewGameDetailActivity.java | 8 +++--- .../com/gh/gamecenter/NewsDetailActivity.java | 4 +-- .../com/gh/gamecenter/SettingActivity.java | 4 +-- .../gh/gamecenter/ShareGhWfifActivity.java | 4 +-- .../com/gh/gamecenter/SuggestionActivity.java | 4 +-- .../gh/gamecenter/adapter/ConcernAdapter.java | 4 +-- .../gamecenter/adapter/PlatformAdapter.java | 16 +++++------ .../download/GameDownLoadFragment.java | 4 +-- .../download/GameDownloadFragmentAdapter.java | 16 +++++------ .../download/GameUpdateFragmentAdapter.java | 8 +++--- .../libao/Libao3FragmentAdapter.java | 4 +-- .../newsdetail/NewsDetailAdapter.java | 4 +-- .../search/SearchHistoryFragment.java | 4 +-- 26 files changed, 94 insertions(+), 94 deletions(-) diff --git a/app/src/main/java/com/gh/base/BaseActivity.java b/app/src/main/java/com/gh/base/BaseActivity.java index 272b5830bc..a195d2c448 100644 --- a/app/src/main/java/com/gh/base/BaseActivity.java +++ b/app/src/main/java/com/gh/base/BaseActivity.java @@ -184,9 +184,9 @@ public class BaseActivity extends Activity implements OnCallBackListener { if ("hijack".equals(showDialog.getType())) { DialogUtils.showQqSessionDialog(this, null);// 建议用户联系客服 } else if ("plugin".equals(showDialog.getType())) { - DialogUtils.showPluginDialog(this, new DialogUtils.ConfiremListener() { + DialogUtils.showPluginDialog(this, new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { if (FileUtils.isEmptyFile(showDialog.getPath())) { Toast.makeText(BaseActivity.this, "解析包出错（可能被误删了），请重新下载", Toast.LENGTH_SHORT).show(); } else { diff --git a/app/src/main/java/com/gh/base/BaseDetailActivity.java b/app/src/main/java/com/gh/base/BaseDetailActivity.java index ef34bcab81..c3feb99cf8 100644 --- a/app/src/main/java/com/gh/base/BaseDetailActivity.java +++ b/app/src/main/java/com/gh/base/BaseDetailActivity.java @@ -310,9 +310,9 @@ public abstract class BaseDetailActivity extends BaseActivity implements View.On if (NetworkUtils.isWifiConnected(this)) { download(); } else { - DialogUtils.showDownloadDialog(this, new DialogUtils.ConfiremListener() { + DialogUtils.showDownloadDialog(this, new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { download(); } }); diff --git a/app/src/main/java/com/gh/base/BaseFragmentActivity.java b/app/src/main/java/com/gh/base/BaseFragmentActivity.java index 97f9b60ef2..4d4ad951b7 100644 --- a/app/src/main/java/com/gh/base/BaseFragmentActivity.java +++ b/app/src/main/java/com/gh/base/BaseFragmentActivity.java @@ -174,9 +174,9 @@ public class BaseFragmentActivity extends FragmentActivity { if ("hijack".equals(showDialog.getType())) { DialogUtils.showQqSessionDialog(this, null);// 建议用户联系客服 } else if ("plugin".equals(showDialog.getType())) { - DialogUtils.showPluginDialog(this, new DialogUtils.ConfiremListener() { + DialogUtils.showPluginDialog(this, new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { if (FileUtils.isEmptyFile(showDialog.getPath())) { Toast.makeText(BaseFragmentActivity.this, "解析包出错（可能被误删了），请重新下载", Toast.LENGTH_SHORT).show(); } else { 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 f74466ab01..99eb579a37 100644 --- a/app/src/main/java/com/gh/common/util/DialogUtils.java +++ b/app/src/main/java/com/gh/common/util/DialogUtils.java @@ -203,7 +203,7 @@ public class DialogUtils { } public static void showWarningDialog(Context context, String title, CharSequence msg, String cancel, String confirm, - final ConfiremListener cmListener, final CancelListener clListener) { + final ConfirmListener cmListener, final CancelListener clListener) { if (isShow) { return; @@ -243,7 +243,7 @@ public class DialogUtils { public void onClick(View v) { dialog.dismiss(); if (cmListener != null) { - cmListener.onConfirem(); + cmListener.onConfirm(); } } }); @@ -260,7 +260,7 @@ public class DialogUtils { dialog.show(); } - public static void showInstallHintDialog(Context context, final ConfiremListener cmListener) { + public static void showInstallHintDialog(Context context, final ConfirmListener cmListener) { final Dialog dialog = new Dialog(context); @@ -307,7 +307,7 @@ public class DialogUtils { dialog.dismiss(); if (installhint_select.getVisibility() == View.VISIBLE) { if (cmListener != null) { - cmListener.onConfirem(); + cmListener.onConfirm(); } } } @@ -355,9 +355,9 @@ public class DialogUtils { public static void showHijackDialog(final Context context) { showWarningDialog(context, "警告", "您当前网络环境异常，下载地址已被替换（网络劫持），请更换网络环境进行下载。", - new ConfiremListener() { + new ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { // 跳转wifi管理界面 context.startActivity(new Intent("android.settings.WIFI_SETTINGS")); } @@ -372,9 +372,9 @@ public class DialogUtils { final String finalQq = qq; showWarningDialog(context, "警告", "您当前网络环境异常，下载地址可能被运营商恶意替换（网络劫持）" + "，如多次下载失败，请联系客服获取正确的下载地址（客服QQ：" + qq + "）" - , "取消", "前往QQ", new ConfiremListener() { + , "取消", "前往QQ", new ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { if (ShareUtils.isQQClientAvailable(context)) { //安装了QQ会直接调用QQ，打开手机QQ进行会话 QQ号：2586716223 String str = "mqqwpa://im/chat?chat_type=wpa&uin=" + finalQq + "&version=1&src_type=web&web_src=oicqzone.com"; @@ -390,22 +390,22 @@ public class DialogUtils { } - public static void showWarningDialog(Context context, String title, CharSequence msg, final ConfiremListener listener) { + public static void showWarningDialog(Context context, String title, CharSequence msg, final ConfirmListener listener) { showWarningDialog(context, title, msg, "取消", "确定", listener, null); } - public static void showDownloadDialog(Context context, ConfiremListener listener) { + public static void showDownloadDialog(Context context, ConfirmListener listener) { showWarningDialog(context, "下载提示", "您当前使用的网络为2G/3G/4G，开始下载将会消耗移动流量，确定下载？", listener); } - public static void showCancelDialog(Context context, final ConfiremListener listener) { + public static void showCancelDialog(Context context, final ConfirmListener listener) { Spanned content = Html.fromHtml("取消关注游戏后，您将无法及时收到游戏" + "攻略、" + "资讯等最新动态提醒。"); showWarningDialog(context, "取消关注", content, "暂不取消", "确定取消", listener, null); } - public static void showPluginDialog(Context context, final ConfiremListener listener) { + public static void showPluginDialog(Context context, final ConfirmListener listener) { Spanned spanned = Html.fromHtml("您将进行插件化安装以实现插件功能，此过程将" + "卸载" + "当前使用的版本并" + "安装插件版本"); @@ -436,8 +436,8 @@ public class DialogUtils { disclaimerDialog.show(); } - public interface ConfiremListener { - void onConfirem(); + public interface ConfirmListener { + void onConfirm(); } public interface CancelListener { diff --git a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java index 5295997d21..c19bdf7c38 100644 --- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java +++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java @@ -304,9 +304,9 @@ public class DownloadItemUtils { if (NetworkUtils.isWifiConnected(context)) { download(context, gameEntity, downloadBtn, entrance, location); } else { - DialogUtils.showDownloadDialog(context, new DialogUtils.ConfiremListener() { + DialogUtils.showDownloadDialog(context, new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { download(context, gameEntity, downloadBtn, entrance, location); } }); @@ -315,9 +315,9 @@ public class DownloadItemUtils { if (NetworkUtils.isWifiConnected(context)) { plugin(context, gameEntity, downloadBtn, entrance, location); } else { - DialogUtils.showDownloadDialog(context, new DialogUtils.ConfiremListener() { + DialogUtils.showDownloadDialog(context, new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { plugin(context, gameEntity, downloadBtn, entrance, location); } }); @@ -338,9 +338,9 @@ public class DownloadItemUtils { if (NetworkUtils.isWifiConnected(context)) { update(context, gameEntity, entrance, location); } else { - DialogUtils.showDownloadDialog(context, new DialogUtils.ConfiremListener() { + DialogUtils.showDownloadDialog(context, new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { update(context, gameEntity, entrance, location); } }); 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 3a0cc8848f..082c617a71 100644 --- a/app/src/main/java/com/gh/common/util/LibaoUtils.java +++ b/app/src/main/java/com/gh/common/util/LibaoUtils.java @@ -288,9 +288,9 @@ public class LibaoUtils { Html.fromHtml("请先" + "" + "安装《" + libaoEntity.getGame().getName() + "》 " + platform + ""), "关闭", "立即安装" - , new DialogUtils.ConfiremListener() { + , new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { adapter.openDownload(); } }, null); @@ -360,9 +360,9 @@ public class LibaoUtils { + "" + libaoCode + "" + "
淘号礼包不保证可用，请尽快进入游戏尝试兑换") , "关闭", " 复制礼包码" - , new DialogUtils.ConfiremListener() { + , new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { copyLink(finalLibaoCode, libaoBtn.getContext()); if (isInstallRequired) { @@ -475,9 +475,9 @@ public class LibaoUtils { + "" + libaoCode + "" + "
请尽快使用，礼包码将于60分钟后进入淘号池") , "关闭", " 复制礼包码" - , new DialogUtils.ConfiremListener() { + , new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { copyLink(finalLibaoCode, libaoBtn.getContext()); if (isInstallRequired) { libaoBtn.postDelayed(new Runnable() { @@ -583,9 +583,9 @@ public class LibaoUtils { public static void lunningAppDialog(final Context context, Spanned msg, final LibaoEntity libaoEntity) { DialogUtils.showWarningDialog(context, "复制成功", msg , "关闭", "启动游戏" - , new DialogUtils.ConfiremListener() { + , new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { if (LibaoUtils.isAppInstalled(context, libaoEntity.getPackageName())) { PackageUtils.launchApplicationByPackageName(context, libaoEntity.getPackageName()); } else { diff --git a/app/src/main/java/com/gh/common/util/PackageUtils.java b/app/src/main/java/com/gh/common/util/PackageUtils.java index 90dfa26c78..7e781b2733 100644 --- a/app/src/main/java/com/gh/common/util/PackageUtils.java +++ b/app/src/main/java/com/gh/common/util/PackageUtils.java @@ -120,9 +120,9 @@ public class PackageUtils { if (isCanLaunchSetup(context, path)) { context.startActivity(PackageUtils.getInstallIntent(context, path)); } else { - DialogUtils.showPluginDialog(context, new DialogUtils.ConfiremListener() { + DialogUtils.showPluginDialog(context, new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { context.startActivity(PackageUtils.getUninstallIntent(context, path)); } }); diff --git a/app/src/main/java/com/gh/download/DownloadManager.java b/app/src/main/java/com/gh/download/DownloadManager.java index 9ef1b267fe..45c641e78d 100644 --- a/app/src/main/java/com/gh/download/DownloadManager.java +++ b/app/src/main/java/com/gh/download/DownloadManager.java @@ -94,9 +94,9 @@ public class DownloadManager { final SharedPreferences.Editor edit = sp.edit(); if (sp.getBoolean("InstallHint" + PackageUtils.getVersionName(context), true)) { DialogUtils.showInstallHintDialog(context, - new DialogUtils.ConfiremListener() { + new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { edit.putBoolean("InstallHint" + PackageUtils.getVersionName(context), false).apply(); } }); diff --git a/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java b/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java index 007ecc22d8..d639985e9d 100644 --- a/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java @@ -124,9 +124,9 @@ public class CleanApkActivity extends BaseActivity implements CleanApkAdapter.On DialogUtils.showWarningDialog(CleanApkActivity.this, "删除安装包" , Html.fromHtml("你选择的安装包中包含" + "未安装" + "的应用，确定删除吗？"), "取消 ", "确定" - , new DialogUtils.ConfiremListener() { + , new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { deleteApk(apkList, selectPosition); } }, null); diff --git a/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java b/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java index d70d21ed23..d0f4002d54 100644 --- a/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java +++ b/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java @@ -466,9 +466,9 @@ public class FileReceiverActivity extends BaseActivity implements FileReceiverAd } else { DialogUtils.showWarningDialog(FileReceiverActivity.this, "退出提示", "退出会中断接收，确定要退出吗？" , "取消", "确定" - , new DialogUtils.ConfiremListener() { + , new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { colsePage(); } }, null); diff --git a/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java b/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java index f293263966..eb275ccc04 100644 --- a/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java +++ b/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java @@ -438,9 +438,9 @@ public class FileSenderActivity extends BaseActivity implements FileSenderAdapte if (!isSendOver) { DialogUtils.showWarningDialog(FileSenderActivity.this, "退出传送", "退出会中断所有游戏的传送，确定要退出吗？" , "取消", "确定" - , new DialogUtils.ConfiremListener() { + , new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { colsePage(); } diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java index 432412dec7..ea076f71a7 100644 --- a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java @@ -221,9 +221,9 @@ public class GameDetailActivity extends BaseFragmentActivity { kv2.put("点击", "取消关注"); DataUtils.onEvent(GameDetailActivity.this, "插件数据", mGameEntity.getName(), kv2); - DialogUtils.showCancelDialog(GameDetailActivity.this, new DialogUtils.ConfiremListener() { + DialogUtils.showCancelDialog(GameDetailActivity.this, new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { Map kv = new HashMap<>(); kv.put("状态", "取消关注"); DataUtils.onEvent(GameDetailActivity.this, "游戏关注", mGameEntity.getName(), kv); @@ -405,9 +405,9 @@ public class GameDetailActivity extends BaseFragmentActivity { if (NetworkUtils.isWifiConnected(this)) { download(); } else { - DialogUtils.showDownloadDialog(this, new DialogUtils.ConfiremListener() { + DialogUtils.showDownloadDialog(this, new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { download(); } }); diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index c20a5963ba..dd3d621061 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -323,9 +323,9 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene } final String path = downloadEntity.getPath(); DialogUtils.showWarningDialog(this, "提示", msg, "直接退出", "立即安装", - new DialogUtils.ConfiremListener() { + new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { handler.postDelayed(new Runnable() { @Override public void run() { @@ -800,9 +800,9 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene "读取应用列表”选择为打开" + "“允许”，否则光环助手将无法帮您安装插件加速版的游戏"); DialogUtils.showWarningDialog(this, "提示", content, "忽略", "去开启", - new DialogUtils.ConfiremListener() { + new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { // 跳转应用信息界面 Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS); Uri uri = Uri.fromParts("package", getPackageName(), null); diff --git a/app/src/main/java/com/gh/gamecenter/NewGameDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewGameDetailActivity.java index e3d3922c26..f0c9f0a4b7 100644 --- a/app/src/main/java/com/gh/gamecenter/NewGameDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewGameDetailActivity.java @@ -221,9 +221,9 @@ public class NewGameDetailActivity extends BaseFragmentActivity { kv2.put("点击", "取消关注"); DataUtils.onEvent(NewGameDetailActivity.this, "插件数据", mGameEntity.getName(), kv2); - DialogUtils.showCancelDialog(NewGameDetailActivity.this, new DialogUtils.ConfiremListener() { + DialogUtils.showCancelDialog(NewGameDetailActivity.this, new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { Map kv = new HashMap<>(); kv.put("状态", "取消关注"); DataUtils.onEvent(NewGameDetailActivity.this, "游戏关注", mGameEntity.getName(), kv); @@ -403,9 +403,9 @@ public class NewGameDetailActivity extends BaseFragmentActivity { if (NetworkUtils.isWifiConnected(this)) { download(); } else { - DialogUtils.showDownloadDialog(this, new DialogUtils.ConfiremListener() { + DialogUtils.showDownloadDialog(this, new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { download(); } }); diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java index 63dda2e3ee..20cea51376 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java @@ -409,9 +409,9 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener if (NetworkUtils.isWifiConnected(this)) { download(); } else { - DialogUtils.showDownloadDialog(this, new DialogUtils.ConfiremListener() { + DialogUtils.showDownloadDialog(this, new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { download(); } }); diff --git a/app/src/main/java/com/gh/gamecenter/SettingActivity.java b/app/src/main/java/com/gh/gamecenter/SettingActivity.java index ccab0e6fd5..962012fb57 100644 --- a/app/src/main/java/com/gh/gamecenter/SettingActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SettingActivity.java @@ -180,9 +180,9 @@ public class SettingActivity extends BaseActivity implements OnClickListener { break; case R.id.setting_rl_cache: DialogUtils.showWarningDialog(this, "清除缓存", "清空缓存后未安装的游戏可能需要重新下载，确定清空？", - new DialogUtils.ConfiremListener() { + new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { loadingDialog = DialogUtils.showWaitDialog(context, "清除缓存中..."); claerCache(); } diff --git a/app/src/main/java/com/gh/gamecenter/ShareGhWfifActivity.java b/app/src/main/java/com/gh/gamecenter/ShareGhWfifActivity.java index 1de07300e0..2a4af60437 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareGhWfifActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareGhWfifActivity.java @@ -294,9 +294,9 @@ public class ShareGhWfifActivity extends BaseActivity { private void backActivity() { DialogUtils.showWarningDialog(this, "退出分享", "退出本页面即会关闭分享热点，确定退出吗？" , "取消", "确定" - , new DialogUtils.ConfiremListener() { + , new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { isColseActivity = true; unregisterReceiver(mWifiAPBroadcastReceiver); try { diff --git a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java index 1cc07a8bdf..c1b7eedcec 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java @@ -328,9 +328,9 @@ public class SuggestionActivity extends BaseActivity implements SuggestTypeAdapt DialogUtils.showWarningDialog(this, "温馨提示", "填写联系方式有助于我们更好地一对一解决您的问题，确定不填写吗？", "直接提交", "我要填写", - new DialogUtils.ConfiremListener() { + new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { mSuggestEmailEt.requestFocus(); new Thread() { public void run() { diff --git a/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java index 2e384bec19..1a35d9a9c3 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java @@ -123,9 +123,9 @@ public class ConcernAdapter extends BaseRecyclerAdapter { @Override public void onClick(View v) { // 删除关注表中的数据，并更新界面 - DialogUtils.showCancelDialog(mContext, new DialogUtils.ConfiremListener() { + DialogUtils.showCancelDialog(mContext, new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { ConcernInfo concernInfo = mConcernList.get(holder.getPosition()); if (mConcernManager.findConcernById(concernInfo.getId()) != null) { Map kv = new HashMap<>(); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java index 3ffcdbb360..ba1fe5895c 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java @@ -111,9 +111,9 @@ public class PlatformAdapter extends BaseRecyclerAdapter { if (NetworkUtils.isWifiConnected(mContext)) { download(apkEntity, viewHolder.download_item_tv_status, "下载"); } else { - DialogUtils.showDownloadDialog(mContext, new DialogUtils.ConfiremListener() { + DialogUtils.showDownloadDialog(mContext, new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { download(apkEntity, viewHolder.download_item_tv_status, "下载"); } }); @@ -141,9 +141,9 @@ public class PlatformAdapter extends BaseRecyclerAdapter { if (NetworkUtils.isWifiConnected(mContext)) { download(apkEntity, viewHolder.download_item_tv_status, "插件化"); } else { - DialogUtils.showDownloadDialog(mContext, new DialogUtils.ConfiremListener() { + DialogUtils.showDownloadDialog(mContext, new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { download(apkEntity, viewHolder.download_item_tv_status, "插件化"); } }); @@ -154,9 +154,9 @@ public class PlatformAdapter extends BaseRecyclerAdapter { if (NetworkUtils.isWifiConnected(mContext)) { update(apkEntity); } else { - DialogUtils.showDownloadDialog(mContext, new DialogUtils.ConfiremListener() { + DialogUtils.showDownloadDialog(mContext, new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { update(apkEntity); } }); @@ -348,9 +348,9 @@ public class PlatformAdapter extends BaseRecyclerAdapter { // 显示插件化 private void showPluginDialog(final ApkEntity apkEntity, final PlatformAdapter adapter, final int location) { - DialogUtils.showPluginDialog(mContext, new DialogUtils.ConfiremListener() { + DialogUtils.showPluginDialog(mContext, new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { Map kv6 = new HashMap<>(); kv6.put("操作", "点击插件化安装完成"); DataUtils.onEvent(mContext, "插件化", mGameEntity.getName(), kv6); diff --git a/app/src/main/java/com/gh/gamecenter/download/GameDownLoadFragment.java b/app/src/main/java/com/gh/gamecenter/download/GameDownLoadFragment.java index 184eef5709..81c6a55ae0 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameDownLoadFragment.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameDownLoadFragment.java @@ -373,9 +373,9 @@ public class GameDownLoadFragment extends Fragment implements View.OnClickListen if (NetworkUtils.isWifiConnected(getActivity())) { allStart(); } else { - DialogUtils.showDownloadDialog(getActivity(), new DialogUtils.ConfiremListener() { + DialogUtils.showDownloadDialog(getActivity(), new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { allStart(); } }); diff --git a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java index 27bf63cee8..61ea564718 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java @@ -228,9 +228,9 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { msg.obj = url; DownloadManager.getInstance(mContext).sendMessageDelayed(msg, 1000); } else { - DialogUtils.showDownloadDialog(mContext, new DialogUtils.ConfiremListener() { + DialogUtils.showDownloadDialog(mContext, new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { LinearLayout.LayoutParams lparams = new LinearLayout.LayoutParams( 0, LinearLayout.LayoutParams.WRAP_CONTENT); lparams.weight = 4; @@ -386,9 +386,9 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { viewHolder.dm_item_head_tv_allstart.setText("全部暂停"); viewHolder.dm_item_head_tv_allstart.setTextColor(mContext.getResources().getColor(R.color.btn_gray)); } else { - DialogUtils.showDownloadDialog(mContext, new DialogUtils.ConfiremListener() { + DialogUtils.showDownloadDialog(mContext, new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { for (DownloadEntity downloadEntity : downloadingList) { DownloadManager.getInstance(mContext).put(downloadEntity.getUrl(), System.currentTimeMillis()); @@ -445,9 +445,9 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { // 显示插件化 void showPluginDialog(final String path) { - DialogUtils.showPluginDialog(mContext, new DialogUtils.ConfiremListener() { + DialogUtils.showPluginDialog(mContext, new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { for (DownloadEntity downloadEntity : DownloadManager.getInstance(mContext).getAll()) { if (downloadEntity.isPluggable() && downloadEntity.getPath().equals(path)) { @@ -475,9 +475,9 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { } else { msg = "游戏还没下载完，确定删除？"; } - DialogUtils.showWarningDialog(mContext, "删除下载", msg, new DialogUtils.ConfiremListener() { + DialogUtils.showWarningDialog(mContext, "删除下载", msg, new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { removeDownload(entry); } }); diff --git a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java index dedb1ff34f..83f71751e0 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java @@ -317,9 +317,9 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter { } }, 1000); } else { - DialogUtils.showDownloadDialog(mContext, new DialogUtils.ConfiremListener() { + DialogUtils.showDownloadDialog(mContext, new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { viewHolder.dm_item_head_tv_allstart.setText("更新中"); for (int i = 0; i < updateList.size(); i++) { if (DownloadManager.getInstance(mContext).get(updateList.get(i).getUrl()) == null) { @@ -404,9 +404,9 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter { notifyItemChanged(0); } else { - DialogUtils.showDownloadDialog(mContext, new DialogUtils.ConfiremListener() { + DialogUtils.showDownloadDialog(mContext, new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { if ("插件化".equals(str)) { viewHolder.gu_item_btv_update.setText("插件化中"); viewHolder.gu_item_btv_update.setTextColor(0xFF06D0A8); diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java index f818e15d94..8f3f90a653 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java @@ -138,9 +138,9 @@ class Libao3FragmentAdapter extends BaseRecyclerAdapter { DialogUtils.showWarningDialog(mContext, "删除礼包", Html.fromHtml("礼包码删除之后" + "不可恢复" + "，请确定您已经兑换过该礼包") , "取消", "确定删除" - , new DialogUtils.ConfiremListener() { + , new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { LibaoUtils.deleteLibaoCode(mContext, libaoEntity.getCode(), true, new LibaoUtils.PostLibaoListener() { @Override public void postSucced(Object response) { 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 ea0e5dfa53..5a7692ca7a 100644 --- a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java @@ -515,9 +515,9 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { kv2.put("点击", "取消关注"); DataUtils.onEvent(mContext, "插件数据", mGameEntity.getName(), kv2); - DialogUtils.showCancelDialog(mContext, new DialogUtils.ConfiremListener() { + DialogUtils.showCancelDialog(mContext, new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { Map kv = new HashMap<>(); kv.put("状态", "取消关注"); DataUtils.onEvent(mContext, "游戏关注", mGameEntity.getName(), kv); 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 5e650312fd..85ecceaf9d 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragment.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragment.java @@ -145,9 +145,9 @@ public class SearchHistoryFragment extends Fragment { @OnClick(R.id.search_history_clean) public void onDeleteClick() { DialogUtils.showWarningDialog(getActivity(), "清空记录", "确定清空历史搜索记录？", - new DialogUtils.ConfiremListener() { + new DialogUtils.ConfirmListener() { @Override - public void onConfirem() { + public void onConfirm() { dao.deleteAll(); mHistoryadapter.clearSearchResult(); mSearchHistoryRl.setVisibility(View.GONE); From 471ebb3b6eac57f10cf8be3c785d8a6cd3f26a1d Mon Sep 17 00:00:00 2001 From: huangzhuanghua Date: Tue, 2 May 2017 10:39:10 +0800 Subject: [PATCH 2/4] =?UTF-8?q?icon-default=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/gh/gamecenter/MainActivity.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index dd3d621061..13d5643cd6 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -484,7 +484,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene Log.e("TD_CHANNEL_ID", (String) PackageUtils.getMetaData(this, getPackageName(), "TD_CHANNEL_ID")); if (sp.getBoolean("changeDefaultIcon", false) && sp.getInt("default_user_icon", 0) != 0) { - postDefaultIcon(true, sp.getInt("default_user_icon", 0)); + postDefaultIcon(true, sp.getInt("default_user_icon", 0), 1); } getSuggestionType(); @@ -1536,14 +1536,14 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene DownloadManager.getInstance(this).removeObserver(dataWatcher); if (sp.getBoolean("changeDefaultIcon", false) && sp.getInt("default_user_icon", 0) != 0) { - postDefaultIcon(true, sp.getInt("default_user_icon", 0)); + postDefaultIcon(true, sp.getInt("default_user_icon", 0), 1); } handler.removeCallbacksAndMessages(null); } // 提交默认头像 - private void postDefaultIcon(boolean isCheck, final int i) { + private void postDefaultIcon(boolean isCheck, final int i, final int count) { TokenUtils.getToken(this, isCheck) .flatMap(new Func1>() { @Override @@ -1560,19 +1560,15 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene .subscribe(new JSONObjectResponse() { @Override public void onResponse(JSONObject response) { - super.onResponse(response); - sp.edit().putBoolean("changeDefaultIcon", false); + sp.edit().putBoolean("changeDefaultIcon", false).apply(); } @Override public void onFailure(HttpException e) { - super.onFailure(e); if (e != null) { if (e.code() == 401) { - postDefaultIcon(true, i); - return; + postDefaultIcon(true, i, count - 1); } - } } } From 4db2b1cc290ceb7c589e76952a9238cad9232a64 Mon Sep 17 00:00:00 2001 From: huangzhuanghua Date: Tue, 2 May 2017 10:44:23 +0800 Subject: [PATCH 3/4] =?UTF-8?q?retrofit2.adapter.rxjava.HttpException?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BAretrofit2.HttpException?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/gh/common/util/ConcernUtils.java | 2 +- app/src/main/java/com/gh/common/util/LibaoUtils.java | 2 +- app/src/main/java/com/gh/common/util/PlatformUtils.java | 2 +- app/src/main/java/com/gh/common/util/PostCommentUtils.java | 2 +- app/src/main/java/com/gh/common/util/TagUtils.java | 2 +- app/src/main/java/com/gh/gamecenter/GameDetailActivity.java | 2 +- app/src/main/java/com/gh/gamecenter/GameNewsActivity.java | 2 +- app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java | 2 +- app/src/main/java/com/gh/gamecenter/MainActivity.java | 2 +- app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java | 2 +- app/src/main/java/com/gh/gamecenter/NewGameDetailActivity.java | 2 +- app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java | 2 +- app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java | 2 +- app/src/main/java/com/gh/gamecenter/SuggestionActivity.java | 2 +- app/src/main/java/com/gh/gamecenter/VoteActivity.java | 2 +- .../java/com/gh/gamecenter/adapter/CommentDetailAdapter.java | 2 +- .../main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java | 2 +- app/src/main/java/com/gh/gamecenter/adapter/KaiFuAdapter.java | 2 +- .../main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java | 2 +- .../java/com/gh/gamecenter/adapter/MessageDetailAdapter.java | 2 +- .../main/java/com/gh/gamecenter/adapter/NewsNormalAdapter.java | 2 +- app/src/main/java/com/gh/gamecenter/adapter/SubjectAdapter.java | 2 +- app/src/main/java/com/gh/gamecenter/adapter/VoteAdapter.java | 2 +- .../com/gh/gamecenter/download/GameUpdateFragmentAdapter.java | 2 +- .../main/java/com/gh/gamecenter/game/GameFragmentAdapter.java | 2 +- .../main/java/com/gh/gamecenter/gamedetail/XinXiAdapter.java | 2 +- app/src/main/java/com/gh/gamecenter/geetest/GeetestUtils.java | 2 +- .../java/com/gh/gamecenter/libao/Libao1FragmentAdapter.java | 2 +- .../java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java | 2 +- .../java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java | 2 +- .../main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java | 2 +- .../java/com/gh/gamecenter/manager/DataCollectionManager.java | 2 +- app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java | 2 +- .../java/com/gh/gamecenter/message/CommentFragmentAdapter.java | 2 +- .../java/com/gh/gamecenter/message/KeFuFragmentAdapter.java | 2 +- .../main/java/com/gh/gamecenter/message/MessageFragment.java | 2 +- .../java/com/gh/gamecenter/message/NoticeFragmentAdapter.java | 2 +- .../main/java/com/gh/gamecenter/news/News1FragmentAdapter.java | 2 +- .../main/java/com/gh/gamecenter/news/News2FragmentAdapter.java | 2 +- .../main/java/com/gh/gamecenter/news/News3FragmentAdapter.java | 2 +- .../main/java/com/gh/gamecenter/news/News4FragmentAdapter.java | 2 +- .../java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java | 2 +- .../main/java/com/gh/gamecenter/personal/PersonalFragment.java | 2 +- app/src/main/java/com/gh/gamecenter/retrofit/Response.java | 2 +- .../gh/gamecenter/search/SearchGameDetailFragmentAdapter.java | 2 +- .../com/gh/gamecenter/search/SearchGameListFragmentAdapter.java | 2 +- 46 files changed, 46 insertions(+), 46 deletions(-) diff --git a/app/src/main/java/com/gh/common/util/ConcernUtils.java b/app/src/main/java/com/gh/common/util/ConcernUtils.java index fafc4533fa..1c01b6ea14 100644 --- a/app/src/main/java/com/gh/common/util/ConcernUtils.java +++ b/app/src/main/java/com/gh/common/util/ConcernUtils.java @@ -7,7 +7,7 @@ import com.gh.gamecenter.retrofit.RetrofitManager; import de.greenrobot.event.EventBus; import okhttp3.*; import org.json.JSONArray; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.Observable; import rx.functions.Func1; import rx.schedulers.Schedulers; 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 082c617a71..b17431dd94 100644 --- a/app/src/main/java/com/gh/common/util/LibaoUtils.java +++ b/app/src/main/java/com/gh/common/util/LibaoUtils.java @@ -34,7 +34,7 @@ import java.util.List; import de.greenrobot.event.EventBus; import okhttp3.ResponseBody; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.Observable; import rx.android.schedulers.AndroidSchedulers; import rx.functions.Func1; diff --git a/app/src/main/java/com/gh/common/util/PlatformUtils.java b/app/src/main/java/com/gh/common/util/PlatformUtils.java index bf86a1b68e..d8dfa09bfd 100644 --- a/app/src/main/java/com/gh/common/util/PlatformUtils.java +++ b/app/src/main/java/com/gh/common/util/PlatformUtils.java @@ -12,7 +12,7 @@ import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import de.greenrobot.event.EventBus; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; diff --git a/app/src/main/java/com/gh/common/util/PostCommentUtils.java b/app/src/main/java/com/gh/common/util/PostCommentUtils.java index c54d7943e0..4e1597b42c 100644 --- a/app/src/main/java/com/gh/common/util/PostCommentUtils.java +++ b/app/src/main/java/com/gh/common/util/PostCommentUtils.java @@ -6,7 +6,7 @@ import com.gh.gamecenter.retrofit.*; import com.gh.gamecenter.retrofit.Response; import okhttp3.*; import org.json.JSONObject; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.Observable; import rx.android.schedulers.AndroidSchedulers; import rx.functions.Func1; diff --git a/app/src/main/java/com/gh/common/util/TagUtils.java b/app/src/main/java/com/gh/common/util/TagUtils.java index 50c1ea9f32..39629c6826 100644 --- a/app/src/main/java/com/gh/common/util/TagUtils.java +++ b/app/src/main/java/com/gh/common/util/TagUtils.java @@ -7,7 +7,7 @@ import android.support.v4.util.ArrayMap; import com.gh.gamecenter.entity.TagEntity; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java index ea076f71a7..2eb08c02da 100644 --- a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java @@ -29,7 +29,7 @@ import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.jakewharton.rxbinding.view.RxView; import com.tencent.tauth.Tencent; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.android.schedulers.AndroidSchedulers; import rx.functions.Action1; import rx.schedulers.Schedulers; diff --git a/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java b/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java index a78560179c..cf2f73f2c5 100644 --- a/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java @@ -26,7 +26,7 @@ import java.util.ArrayList; import java.util.List; import butterknife.BindView; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; diff --git a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java index ed71301a4e..ef4c86ad78 100644 --- a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java @@ -21,7 +21,7 @@ import com.gh.gamecenter.retrofit.RetrofitManager; import java.util.Calendar; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index 13d5643cd6..2b49985d79 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -100,7 +100,7 @@ import de.greenrobot.event.EventBus; import okhttp3.MediaType; import okhttp3.RequestBody; import okhttp3.ResponseBody; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.Observable; import rx.android.schedulers.AndroidSchedulers; import rx.functions.Action1; diff --git a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java index 486aa8fe74..26718a0401 100644 --- a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java @@ -26,7 +26,7 @@ import com.gh.gamecenter.manager.CommentManager; import com.gh.gamecenter.retrofit.*; import com.google.gson.Gson; import org.json.*; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; diff --git a/app/src/main/java/com/gh/gamecenter/NewGameDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewGameDetailActivity.java index f0c9f0a4b7..4d13cc3458 100644 --- a/app/src/main/java/com/gh/gamecenter/NewGameDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewGameDetailActivity.java @@ -29,7 +29,7 @@ import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.jakewharton.rxbinding.view.RxView; import com.tencent.tauth.Tencent; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.android.schedulers.AndroidSchedulers; import rx.functions.Action1; import rx.schedulers.Schedulers; diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java index 20cea51376..af902e3e63 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java @@ -26,7 +26,7 @@ import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.jakewharton.rxbinding.view.RxView; import com.tencent.tauth.Tencent; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.android.schedulers.AndroidSchedulers; import rx.functions.Action1; import rx.schedulers.Schedulers; diff --git a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java index f8d7bf238d..a7753ec285 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java @@ -19,7 +19,7 @@ import com.gh.gamecenter.adapter.viewholder.NewsTextViewHolder; import com.gh.gamecenter.entity.NewsEntity; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.android.schedulers.AndroidSchedulers; import rx.functions.Func1; import rx.schedulers.Schedulers; diff --git a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java index c1b7eedcec..1236392a31 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java @@ -70,7 +70,7 @@ import butterknife.OnClick; import okhttp3.MediaType; import okhttp3.RequestBody; import okhttp3.ResponseBody; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.Observable; import rx.Observer; import rx.Subscriber; diff --git a/app/src/main/java/com/gh/gamecenter/VoteActivity.java b/app/src/main/java/com/gh/gamecenter/VoteActivity.java index 78e18ae572..3d6ec109d2 100644 --- a/app/src/main/java/com/gh/gamecenter/VoteActivity.java +++ b/app/src/main/java/com/gh/gamecenter/VoteActivity.java @@ -25,7 +25,7 @@ import com.gh.gamecenter.retrofit.RetrofitManager; import okhttp3.*; import org.json.JSONException; import org.json.JSONObject; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.Observable; import rx.android.schedulers.AndroidSchedulers; import rx.functions.Func1; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java index a8f9e899f1..ac1efb975e 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java @@ -29,7 +29,7 @@ import org.json.JSONObject; import java.util.ArrayList; import java.util.List; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java index bf3ef99a16..fe0400080b 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java @@ -31,7 +31,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.Observable; import rx.android.schedulers.AndroidSchedulers; import rx.functions.Func1; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/KaiFuAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/KaiFuAdapter.java index b13cd56cb2..07c80613a9 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/KaiFuAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/KaiFuAdapter.java @@ -41,7 +41,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; 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 58f926ed23..13e2bcf4ce 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java @@ -21,7 +21,7 @@ import com.gh.gamecenter.gamedetail.GameDetailNewsViewHolder; import com.gh.gamecenter.listener.OnCallBackListener; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java index 7681ef9cff..8df870f571 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java @@ -20,7 +20,7 @@ import com.gh.gamecenter.entity.ConcernEntity; import com.gh.gamecenter.manager.VisitManager; import com.gh.gamecenter.retrofit.*; import org.json.*; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/NewsNormalAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/NewsNormalAdapter.java index 2a04b6ec4a..23a7b721a2 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/NewsNormalAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/NewsNormalAdapter.java @@ -18,7 +18,7 @@ import com.gh.gamecenter.manager.VisitManager; import com.gh.gamecenter.retrofit.*; import org.json.JSONException; import org.json.JSONObject; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.Observable; import rx.Subscriber; import rx.android.schedulers.AndroidSchedulers; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/SubjectAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/SubjectAdapter.java index 8c7d978cb2..5540a432a3 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/SubjectAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/SubjectAdapter.java @@ -36,7 +36,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.android.schedulers.AndroidSchedulers; import rx.functions.Func1; import rx.schedulers.Schedulers; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/VoteAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/VoteAdapter.java index 5f31aa8a60..0f6c7a3f60 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/VoteAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/VoteAdapter.java @@ -14,7 +14,7 @@ import com.gh.gamecenter.entity.VersionVoteEntity; import com.gh.gamecenter.listener.OnCallBackListener; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; diff --git a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java index 83f71751e0..945efbbb56 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java @@ -24,7 +24,7 @@ import com.gh.gamecenter.manager.PackageManager; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import de.greenrobot.event.EventBus; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.Observable; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java index a837b235da..46267b2fd8 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java @@ -70,7 +70,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.android.schedulers.AndroidSchedulers; import rx.functions.Func1; import rx.schedulers.Schedulers; 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 9d9469fbb2..db72457692 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiAdapter.java @@ -48,7 +48,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.Observable; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; diff --git a/app/src/main/java/com/gh/gamecenter/geetest/GeetestUtils.java b/app/src/main/java/com/gh/gamecenter/geetest/GeetestUtils.java index 305648b5a5..bb52bf7af0 100644 --- a/app/src/main/java/com/gh/gamecenter/geetest/GeetestUtils.java +++ b/app/src/main/java/com/gh/gamecenter/geetest/GeetestUtils.java @@ -11,7 +11,7 @@ import com.gh.gamecenter.retrofit.JSONObjectResponse; import com.gh.gamecenter.retrofit.RetrofitManager; import okhttp3.ResponseBody; import org.json.JSONObject; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.Observable; import rx.android.schedulers.AndroidSchedulers; import rx.functions.Func1; diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao1FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/Libao1FragmentAdapter.java index 0f82a76c2e..a04178cac7 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao1FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao1FragmentAdapter.java @@ -22,7 +22,7 @@ import com.gh.gamecenter.entity.LibaoStatusEntity; import com.gh.gamecenter.listener.OnCallBackListener; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.Observable; import rx.android.schedulers.AndroidSchedulers; import rx.functions.Func1; diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java index 8cdd30ae92..96a6cfeb96 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java @@ -23,7 +23,7 @@ import com.gh.gamecenter.manager.ConcernManager; import com.gh.gamecenter.newsdetail.NewsDetailCommentViewHolder; import com.gh.gamecenter.retrofit.*; import org.json.JSONArray; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.Observable; import rx.Subscriber; import rx.android.schedulers.AndroidSchedulers; diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java index 8f3f90a653..d94c695124 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java @@ -14,7 +14,7 @@ import com.gh.gamecenter.db.LibaoDao; import com.gh.gamecenter.db.info.LibaoInfo; import com.gh.gamecenter.entity.LibaoEntity; import com.gh.gamecenter.listener.OnCallBackListener; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java index 45b7f4dc9b..8dd1aa4ee1 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java @@ -21,7 +21,7 @@ import com.gh.gamecenter.entity.LibaoEntity; import com.gh.gamecenter.listener.OnCallBackListener; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.android.schedulers.AndroidSchedulers; import rx.functions.Func1; import rx.schedulers.Schedulers; diff --git a/app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java b/app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java index b4e7076e8b..0f98def170 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java @@ -9,7 +9,7 @@ import com.gh.gamecenter.retrofit.*; import com.gh.gamecenter.retrofit.Response; import okhttp3.*; import org.json.*; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; diff --git a/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java b/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java index 9e53a8c1bf..53d8f45963 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java @@ -17,7 +17,7 @@ import com.gh.gamecenter.entity.AppEntity; import com.gh.gamecenter.entity.GameUpdateEntity; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.android.schedulers.AndroidSchedulers; import rx.functions.Func1; import rx.schedulers.Schedulers; diff --git a/app/src/main/java/com/gh/gamecenter/message/CommentFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/message/CommentFragmentAdapter.java index 9c5fac71bb..96b6e5187e 100644 --- a/app/src/main/java/com/gh/gamecenter/message/CommentFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/message/CommentFragmentAdapter.java @@ -14,7 +14,7 @@ import com.gh.gamecenter.entity.UserEntity; import com.gh.gamecenter.listener.OnCallBackListener; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.Observable; import rx.android.schedulers.AndroidSchedulers; import rx.functions.Func1; diff --git a/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java index e1461dadeb..ac05959137 100644 --- a/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java @@ -39,7 +39,7 @@ import de.greenrobot.event.EventBus; import okhttp3.MediaType; import okhttp3.RequestBody; import okhttp3.ResponseBody; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.Observable; import rx.android.schedulers.AndroidSchedulers; import rx.functions.Func1; 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 693807d8f4..f62d7a9a87 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java @@ -30,7 +30,7 @@ import butterknife.BindView; import butterknife.OnClick; import de.greenrobot.event.EventBus; import okhttp3.ResponseBody; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.Observable; import rx.android.schedulers.AndroidSchedulers; import rx.functions.Func1; diff --git a/app/src/main/java/com/gh/gamecenter/message/NoticeFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/message/NoticeFragmentAdapter.java index 42884e5217..696b473dc8 100644 --- a/app/src/main/java/com/gh/gamecenter/message/NoticeFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/message/NoticeFragmentAdapter.java @@ -23,7 +23,7 @@ import com.gh.gamecenter.retrofit.RetrofitManager; import com.google.gson.Gson; import de.greenrobot.event.EventBus; import okhttp3.*; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.Observable; import rx.android.schedulers.AndroidSchedulers; import rx.functions.Func1; diff --git a/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java index 155ab57f62..e861deed6a 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java @@ -18,7 +18,7 @@ import com.gh.gamecenter.manager.VisitManager; import com.gh.gamecenter.retrofit.*; import org.json.JSONException; import org.json.JSONObject; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.Observable; import rx.Subscriber; import rx.android.schedulers.AndroidSchedulers; diff --git a/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java index 522c04454a..11cb657c02 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.android.schedulers.AndroidSchedulers; import rx.functions.Func1; import rx.schedulers.Schedulers; diff --git a/app/src/main/java/com/gh/gamecenter/news/News3FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/news/News3FragmentAdapter.java index 184dbc2591..e5950fe6d0 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News3FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/news/News3FragmentAdapter.java @@ -18,7 +18,7 @@ import com.gh.gamecenter.manager.VisitManager; import com.gh.gamecenter.retrofit.*; import org.json.JSONException; import org.json.JSONObject; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.Observable; import rx.Subscriber; import rx.android.schedulers.AndroidSchedulers; diff --git a/app/src/main/java/com/gh/gamecenter/news/News4FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/news/News4FragmentAdapter.java index ae75de41ff..8c923209ff 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News4FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/news/News4FragmentAdapter.java @@ -62,7 +62,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.Observable; import rx.Subscriber; import rx.android.schedulers.AndroidSchedulers; 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 5a7692ca7a..ec2da9a968 100644 --- a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java @@ -25,7 +25,7 @@ import com.gh.gamecenter.manager.ConcernManager; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import org.json.JSONObject; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; 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 d3b38ecc7f..86bd80d62c 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java @@ -27,7 +27,7 @@ import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import okhttp3.*; import org.json.JSONObject; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.Observable; import rx.android.schedulers.AndroidSchedulers; import rx.functions.Func1; diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/Response.java b/app/src/main/java/com/gh/gamecenter/retrofit/Response.java index ce793587b7..f5cb1a13b6 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/Response.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/Response.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.retrofit; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.Subscriber; /** diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java index 5684490fcc..d479e9fb0f 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java @@ -20,7 +20,7 @@ import com.gh.gamecenter.listener.OnCallBackListener; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import de.greenrobot.event.EventBus; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java index 339d7f829e..fab0e0f17f 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java @@ -32,7 +32,7 @@ import java.util.ArrayList; import java.util.List; import de.greenrobot.event.EventBus; -import retrofit2.adapter.rxjava.HttpException; +import retrofit2.HttpException; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; From b00b79110792d194925c0b686d814edb7dd4e89f Mon Sep 17 00:00:00 2001 From: CsHeng Date: Tue, 2 May 2017 17:15:37 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=90=AF=E5=8A=A8=E5=B1=8F=E5=B9=95?= =?UTF-8?q?=E9=83=A8=E5=88=86=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 3 +- .../java/com/gh/base/NewBaseActivity.java | 242 ++++++++++++++++++ .../com/gh/base/OnBackPressedListener.java | 10 + .../java/com/gh/gamecenter/AboutActivity.java | 32 ++- .../gh/gamecenter/SplashScreenActivity.java | 36 +-- .../gamecenter/retrofit/RetrofitManager.java | 61 ++--- app/src/main/res/layout/splash_guide_item.xml | 15 +- app/src/main/res/values/styles.xml | 12 + dependencies.gradle | 1 + 9 files changed, 336 insertions(+), 76 deletions(-) create mode 100644 app/src/main/java/com/gh/base/NewBaseActivity.java create mode 100644 app/src/main/java/com/gh/base/OnBackPressedListener.java diff --git a/app/build.gradle b/app/build.gradle index afcaad3812..e566ada4bf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,7 +29,7 @@ android { versionName rootProject.ext.versionName applicationId rootProject.ext.applicationId - multiDexEnabled = true; + multiDexEnabled true } @@ -103,6 +103,7 @@ dependencies { compile libs.supportRecyclerView compile libs.supportAppCompat compile libs.supportAnnotation + compile libs.supportPercent compile libs.switchButton diff --git a/app/src/main/java/com/gh/base/NewBaseActivity.java b/app/src/main/java/com/gh/base/NewBaseActivity.java new file mode 100644 index 0000000000..b0b5cff3e6 --- /dev/null +++ b/app/src/main/java/com/gh/base/NewBaseActivity.java @@ -0,0 +1,242 @@ +package com.gh.base; + +import android.annotation.TargetApi; +import android.content.Context; +import android.graphics.Color; +import android.os.Build; +import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; +import android.view.*; +import android.view.View.OnClickListener; +import android.view.ViewGroup.LayoutParams; +import android.widget.*; +import butterknife.ButterKnife; +import com.gh.common.constant.Config; +import com.gh.common.util.*; +import com.gh.download.DownloadManager; +import com.gh.gamecenter.R; +import com.gh.gamecenter.eventbus.EBShowDialog; +import com.gh.gamecenter.listener.OnCallBackListener; +import com.readystatesoftware.systembartint.SystemBarTintManager; +import com.readystatesoftware.systembartint.SystemBarTintManager.SystemBarConfig; +import de.greenrobot.event.EventBus; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.ArrayList; + +import static com.gh.common.util.EntranceUtils.KEY_DATA; +import static com.gh.common.util.EntranceUtils.KEY_ENTRANCE; + +public class NewBaseActivity extends AppCompatActivity implements OnCallBackListener { + + protected String entrance; + private SystemBarTintManager mTintManager; + private boolean isPause; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + Utils.log(this.getClass().getSimpleName()); + AppController.getInstance().addActivity(this); + EventBus.getDefault().register(this); + entrance = getIntent().getStringExtra(KEY_ENTRANCE); + if (getIntent().getBundleExtra(KEY_DATA) != null) { + entrance = getIntent().getBundleExtra(KEY_DATA).getString(KEY_ENTRANCE); + } + } + + protected void init(View contentView, String title) { + init(contentView); + TextView actionbar_tv_title = (TextView) findViewById(R.id.actionbar_tv_title); + actionbar_tv_title.setText(title); + } + + protected void init(View contentView) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { + setTheme(R.style.AppCompatTheme); + setTranslucentStatus(true); + mTintManager = new SystemBarTintManager(this); + mTintManager.setStatusBarTintEnabled(true); +// mTintManager.setNavigationBarTintEnabled(true); + if (Build.MANUFACTURER.equals("Meizu") || Build.MANUFACTURER.equals("Xiaomi")) { + mTintManager.setStatusBarTintColor(Color.WHITE); + } else { + mTintManager.setStatusBarTintColor(Color.BLACK); + } + SystemBarConfig config = mTintManager.getConfig(); + contentView.setPadding(0, config.getPixelInsetTop(false), 0, + config.getPixelInsetBottom()); + + if (Build.MANUFACTURER.equals("Meizu")) { + try { + Window window = getWindow(); + if (window != null) { + WindowManager.LayoutParams lp = window.getAttributes(); + Field darkFlag = WindowManager.LayoutParams.class.getDeclaredField("MEIZU_FLAG_DARK_STATUS_BAR_ICON"); + Field meizuFlags = WindowManager.LayoutParams.class.getDeclaredField("meizuFlags"); + darkFlag.setAccessible(true); + meizuFlags.setAccessible(true); + int bit = darkFlag.getInt(null); + int value = meizuFlags.getInt(lp); + value |= bit; + meizuFlags.setInt(lp, value); + window.setAttributes(lp); + } + } catch (Exception e) { + e.printStackTrace(); + } + } else if (Build.MANUFACTURER.equals("Xiaomi")) { + try { + Window window = getWindow(); + if (window != null) { + Class clazz = window.getClass(); + Class layoutParams = Class.forName("android.view.MiuiWindowManager$LayoutParams"); + Field field = layoutParams.getField("EXTRA_FLAG_STATUS_BAR_DARK_MODE"); + int darkModeFlag = field.getInt(layoutParams); + Method extraFlagField = clazz.getMethod("setExtraFlags", int.class, int.class); + extraFlagField.invoke(window, darkModeFlag, darkModeFlag); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + } + + setContentView(contentView); + + ButterKnife.bind(this); + + int actionbar_height = getSharedPreferences(Config.PREFERENCE, + Context.MODE_PRIVATE).getInt("actionbar_height", + DisplayUtils.dip2px(getApplicationContext(), 55)); + + RelativeLayout reuse_actionbar = (RelativeLayout) findViewById(R.id.reuse_actionbar); + LinearLayout.LayoutParams lparams = new LinearLayout.LayoutParams( + LayoutParams.MATCH_PARENT, actionbar_height); + reuse_actionbar.setLayoutParams(lparams); + + findViewById(R.id.actionbar_rl_back).setOnClickListener( + new OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + protected SystemBarTintManager getTintManager() { + return mTintManager; + } + + @Override + public void finish() { + super.finish(); + AppController.getInstance().removeActivity(this); + } + + public void toast(String msg) { + Toast.makeText(this, msg, Toast.LENGTH_SHORT).show(); + } + + public void toast(int msg) { + Toast.makeText(this, msg, Toast.LENGTH_SHORT).show(); + } + + @TargetApi(19) + protected void setTranslucentStatus(boolean status) { + Window window = getWindow(); + WindowManager.LayoutParams winParams = window.getAttributes(); + final int bits = WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS; + if (status) { + winParams.flags |= bits; + } else { + winParams.flags &= ~bits; + } + window.setAttributes(winParams); + } + + //如果是游戏分享，newsTitle默认为空 + public void showShare(String url, String gameName, String icon, String newsTitle, ArrayList tag) { + + //判断是否是官方版 + boolean isPlugin = false; + if (tag != null) { + for (String s : tag) { + if (!"官方版".equals(s)) { + isPlugin = true; + } + } + } + + ShareUtils.getInstance(this).showShareWindows(new View(this), url, gameName, icon, newsTitle, isPlugin, true); + + if (newsTitle == null) { + DataUtils.onEvent(this, "内容分享", gameName); + } else { + DataUtils.onEvent(this, "内容分享", newsTitle); + } + } + + + public void onEventMainThread(final EBShowDialog showDialog) { + if (!isPause && this.getClass().getName().equals(RunningUtils.getTopActivity(this))) { + if ("hijack".equals(showDialog.getType())) { + DialogUtils.showQqSessionDialog(this, null);// 建议用户联系客服 + } else if ("plugin".equals(showDialog.getType())) { + DialogUtils.showPluginDialog(this, new DialogUtils.ConfirmListener() { + @Override + public void onConfirm() { + if (FileUtils.isEmptyFile(showDialog.getPath())) { + Toast.makeText(NewBaseActivity.this, "解析包出错（可能被误删了），请重新下载", Toast.LENGTH_SHORT).show(); + } else { + startActivity(PackageUtils.getUninstallIntent(NewBaseActivity.this, showDialog.getPath())); + } + } + }); + } + } + } + + @Override + protected void onDestroy() { + super.onDestroy(); + EventBus.getDefault().unregister(this); + } + + @Override + protected void onPause() { + super.onPause(); + DataUtils.onPause(this); + isPause = true; + } + + @Override + protected void onResume() { + super.onResume(); + DataUtils.onResume(this); + isPause = false; + DownloadManager.getInstance(this).initGameMap(); + } + + @Override + public void loadDone() { + + } + + @Override + public void loadDone(Object obj) { + + } + + @Override + public void loadError() { + + } + + @Override + public void loadEmpty() { + + } + +} diff --git a/app/src/main/java/com/gh/base/OnBackPressedListener.java b/app/src/main/java/com/gh/base/OnBackPressedListener.java new file mode 100644 index 0000000000..d35f542f4b --- /dev/null +++ b/app/src/main/java/com/gh/base/OnBackPressedListener.java @@ -0,0 +1,10 @@ +package com.gh.base; + +/** + * @author CsHeng + * @Date 2017/4/28 + * @Time 18:59 + */ +public interface OnBackPressedListener { + void onActionbarBackPressed(); +} diff --git a/app/src/main/java/com/gh/gamecenter/AboutActivity.java b/app/src/main/java/com/gh/gamecenter/AboutActivity.java index a7d3f4cc21..bade6d10df 100644 --- a/app/src/main/java/com/gh/gamecenter/AboutActivity.java +++ b/app/src/main/java/com/gh/gamecenter/AboutActivity.java @@ -11,6 +11,8 @@ import com.gh.base.BaseActivity; import com.gh.common.util.PackageUtils; import com.gh.gamecenter.manager.UpdateManager; +import java.lang.ref.WeakReference; + /** * Created by khy on 2017/2/28. */ @@ -21,20 +23,32 @@ public class AboutActivity extends BaseActivity { @BindView(R.id.about_version_pb) ProgressBar mAboutPb; - Handler handler = new Handler() { + private Handler handler = new MyHandler(this); + + static class MyHandler extends Handler { + + private WeakReference mWeakReference; + + public MyHandler(AboutActivity activity) { + mWeakReference = new WeakReference<>(activity); + } + @Override public void handleMessage(Message msg) { super.handleMessage(msg); - if (msg.what == 0) { - String version = (String) msg.obj; - mAboutVersion.setText("发现新版本 V" + version); - mAboutPb.setVisibility(View.GONE); - } else if (msg.what == 1) { - mAboutVersion.setText("已是最新版本"); - mAboutPb.setVisibility(View.GONE); + final AboutActivity activity = mWeakReference.get(); + if (activity != null) { + if (msg.what == 0) { + final String version = (String) msg.obj; + activity.mAboutVersion.setText("发现新版本 V" + version); + activity.mAboutPb.setVisibility(View.GONE); + } else if (msg.what == 1) { + activity.mAboutVersion.setText("已是最新版本"); + activity.mAboutPb.setVisibility(View.GONE); + } } } - }; + } @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java index f6489bb250..72941d049d 100644 --- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java @@ -5,10 +5,8 @@ import android.app.ActionBar.LayoutParams; import android.content.*; import android.content.SharedPreferences.Editor; import android.os.Bundle; -import android.os.Handler; import android.support.v4.view.PagerAdapter; import android.support.v4.view.ViewPager; -import android.util.DisplayMetrics; import android.view.*; import android.widget.*; import com.gh.base.BaseActivity; @@ -46,8 +44,6 @@ public class SplashScreenActivity extends BaseActivity { private boolean isFirst; private boolean isNewFirstLaunch; - private Handler handler = new Handler(); - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -162,7 +158,7 @@ public class SplashScreenActivity extends BaseActivity { } long end = System.currentTimeMillis() - start; if (end < 3000) { - handler.postDelayed(new Runnable() { + getWindow().getDecorView().postDelayed(new Runnable() { @Override public void run() { launch(); @@ -263,12 +259,6 @@ public class SplashScreenActivity extends BaseActivity { finish(); } - @Override - protected void onDestroy() { - super.onDestroy(); - handler.removeCallbacksAndMessages(null); - } - private class GuidePagerAdapter extends PagerAdapter { private int[] pics = {R.drawable.splash_01}; @@ -280,18 +270,11 @@ public class SplashScreenActivity extends BaseActivity { @Override public Object instantiateItem(ViewGroup container, int position) { + View view = View.inflate(container.getContext(), R.layout.splash_guide_item, container); + ImageView ivImage = (ImageView) view.findViewById(R.id.splsh_guide_iv_image); + ivImage.setImageResource(pics[position]); if (position == pics.length - 1) { - View view = View.inflate(container.getContext(), R.layout.splash_guide_item, null); - - ImageView ivImage = (ImageView) view.findViewById(R.id.splsh_guide_iv_image); - ivImage.setImageResource(pics[position]); - TextView tvSkip = (TextView) view.findViewById(R.id.splsh_guide_tv_skip); - DisplayMetrics outMetrics = new DisplayMetrics(); - getWindowManager().getDefaultDisplay().getMetrics(outMetrics); - RelativeLayout.LayoutParams rparams = (RelativeLayout.LayoutParams) tvSkip.getLayoutParams(); - rparams.height = outMetrics.heightPixels / 4; - tvSkip.setLayoutParams(rparams); tvSkip.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -299,17 +282,8 @@ public class SplashScreenActivity extends BaseActivity { } }); - container.addView(view); - return view; - } else { - ImageView imageView = new ImageView(container.getContext()); - imageView.setScaleType(ImageView.ScaleType.FIT_XY); - imageView.setImageResource(pics[position]); - ViewGroup.LayoutParams params = new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT); - container.addView(imageView, params); - return imageView; } + return view; } @Override diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/RetrofitManager.java b/app/src/main/java/com/gh/gamecenter/retrofit/RetrofitManager.java index 64f2a50c90..2337aee000 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/RetrofitManager.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/RetrofitManager.java @@ -4,6 +4,7 @@ import com.gh.common.constant.Config; import com.gh.gamecenter.BuildConfig; import okhttp3.Cache; import okhttp3.OkHttpClient; +import okhttp3.OkHttpClient.Builder; import okhttp3.logging.HttpLoggingInterceptor; import okhttp3.logging.HttpLoggingInterceptor.Level; import retrofit2.Retrofit; @@ -19,31 +20,31 @@ import java.util.concurrent.TimeUnit; */ public class RetrofitManager { - private static RetrofitManager mInstance; - private ApiService apiService; - private DataService dataService; - private CommentService commentService; - private UserService userService; - private LibaoService libaoService; - private MessageService messageService; + private static RetrofitManager sInstance; + private ApiService mApiService; + private DataService mDataService; + private CommentService mCommentService; + private UserService mUserService; + private LibaoService mLibaoService; + private MessageService mMessageService; private RetrofitManager() { - Cache cache = new Cache(new File(OkHttpCache.getCachePath()), 10 * 1024 * 1024); // 10Mb - HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor(); + final Cache cache = new Cache(new File(OkHttpCache.getCachePath()), 10 * 1024 * 1024); // 10Mb + + final Builder builder = new OkHttpClient.Builder(); if (BuildConfig.DEBUG) { + HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor(); interceptor.setLevel(Level.BASIC); - } else { - interceptor.setLevel(Level.NONE); + builder.addNetworkInterceptor(interceptor); } - OkHttpClient okHttpClient = new OkHttpClient.Builder() + + final OkHttpClient okHttpClient = builder .addNetworkInterceptor(new OkHttpNetworkInterceptor()) - .addNetworkInterceptor(interceptor) .addInterceptor(new OkHttpInterceptor()) .connectTimeout(5, TimeUnit.SECONDS) .cache(cache) .build(); - - apiService = new Retrofit.Builder() + mApiService = new Retrofit.Builder() .client(okHttpClient) .addConverterFactory(GsonConverterFactory.create()) .addCallAdapterFactory(RxJavaCallAdapterFactory.create()) @@ -51,7 +52,7 @@ public class RetrofitManager { .build() .create(ApiService.class); - dataService = new Retrofit.Builder() + mDataService = new Retrofit.Builder() .client(okHttpClient) .addConverterFactory(GsonConverterFactory.create()) .addCallAdapterFactory(RxJavaCallAdapterFactory.create()) @@ -59,7 +60,7 @@ public class RetrofitManager { .build() .create(DataService.class); - commentService = new Retrofit.Builder() + mCommentService = new Retrofit.Builder() .client(okHttpClient) .addConverterFactory(GsonConverterFactory.create()) .addCallAdapterFactory(RxJavaCallAdapterFactory.create()) @@ -67,7 +68,7 @@ public class RetrofitManager { .build() .create(CommentService.class); - userService = new Retrofit.Builder() + mUserService = new Retrofit.Builder() .client(okHttpClient) .addConverterFactory(GsonConverterFactory.create()) .addCallAdapterFactory(RxJavaCallAdapterFactory.create()) @@ -75,7 +76,7 @@ public class RetrofitManager { .build() .create(UserService.class); - libaoService = new Retrofit.Builder() + mLibaoService = new Retrofit.Builder() .client(okHttpClient) .addConverterFactory(GsonConverterFactory.create()) .addCallAdapterFactory(RxJavaCallAdapterFactory.create()) @@ -83,7 +84,7 @@ public class RetrofitManager { .build() .create(LibaoService.class); - messageService = new Retrofit.Builder() + mMessageService = new Retrofit.Builder() .client(okHttpClient) .addConverterFactory(GsonConverterFactory.create()) .addCallAdapterFactory(RxJavaCallAdapterFactory.create()) @@ -93,14 +94,14 @@ public class RetrofitManager { } public static RetrofitManager getInstance() { - if (mInstance == null) { + if (sInstance == null) { synchronized (RetrofitManager.class) { - if (mInstance == null) { - mInstance = new RetrofitManager(); + if (sInstance == null) { + sInstance = new RetrofitManager(); } } } - return mInstance; + return sInstance; } public static ApiService getApi() { @@ -128,27 +129,27 @@ public class RetrofitManager { } public ApiService getApiService() { - return apiService; + return mApiService; } public DataService getDataService() { - return dataService; + return mDataService; } public CommentService getCommentService() { - return commentService; + return mCommentService; } public UserService getUserService() { - return userService; + return mUserService; } public LibaoService getLibaoService() { - return libaoService; + return mLibaoService; } public MessageService getMessageService() { - return messageService; + return mMessageService; } } diff --git a/app/src/main/res/layout/splash_guide_item.xml b/app/src/main/res/layout/splash_guide_item.xml index 62d80fd04b..fe674d3fdf 100644 --- a/app/src/main/res/layout/splash_guide_item.xml +++ b/app/src/main/res/layout/splash_guide_item.xml @@ -1,7 +1,9 @@ - + + + app:layout_heightPercent = "25%" /> - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index c7a4497d70..ae0ae314e7 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -12,6 +12,18 @@ --> + +