diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2216792a4d..e0731e441e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -87,38 +87,11 @@ - - - - - - - - - - - - - - - - - + android:screenOrientation="portrait" + android:windowSoftInputMode="stateHidden|adjustResize"/> @@ -130,10 +103,10 @@ android:screenOrientation="portrait" android:windowSoftInputMode="stateVisible" /> + + + + + + + + + + + + + + + + + request) { + Utils.log("111" + request.getTag().toString()); + Utils.log("111" + tag); + Utils.log("111" + (request.getTag() == tag)); return request.getTag() == tag; } }); diff --git a/app/src/main/java/com/gh/base/AppController.java b/app/src/main/java/com/gh/base/AppController.java index fcdb20e4ce..a8b85a985e 100644 --- a/app/src/main/java/com/gh/base/AppController.java +++ b/app/src/main/java/com/gh/base/AppController.java @@ -13,7 +13,6 @@ import android.util.Log; import com.android.volley.Request; import com.android.volley.RequestQueue; import com.android.volley.toolbox.Volley; -import com.gh.base.GHPushMessageReceiver.PushHandler; import com.gh.common.util.DataUtils; import com.gh.common.util.Utils; import com.xiaomi.channel.commonutils.logger.LoggerInterface; @@ -32,7 +31,6 @@ public class AppController extends Application { public static final String APP_KEY = "5451735292993"; private static AppController mInstance; - private static PushHandler handler = null; private static ArrayMap objectMap = new ArrayMap<>(); private RequestQueue mRequestQueue; @@ -95,9 +93,6 @@ public class AppController extends Application { } }; Logger.setLogger(this, newLogger); - if (handler == null) { - handler = new PushHandler(); - } } @@ -176,42 +171,18 @@ public class AppController extends Application { } public static void addToRequestQueue(Request request, String tag) { - request.setTag(TextUtils.isEmpty(tag) ? TAG : tag); + if (TextUtils.isEmpty(tag)) { + tag = TAG; + } + request.setTag(tag); getInstance().addRequest(request); } - public static void addToRequestQueue(Request request, Object obj) { - String tag = null; - if (obj != null) { - tag = obj.getClass().getSimpleName(); - } - addToRequestQueue(request, tag); - } - - public static void addToRequestQueue(Request request, Class clazz) { - String tag = null; - if (clazz != null) { - tag = clazz.getSimpleName(); - } - addToRequestQueue(request, tag); - } - public static void canclePendingRequests(String tag) { - if (tag != null) { - getInstance().cancleRequest(tag); - } - } - - public static void canclePendingRequests(Object obj) { - if (obj != null) { - getInstance().cancleRequest(obj.getClass().getSimpleName()); - } - } - - public static void canclePendingRequests(Class clazz) { - if (clazz != null) { - getInstance().cancleRequest(clazz.getSimpleName()); + if (TextUtils.isEmpty(tag)) { + tag = TAG; } + getInstance().cancleRequest(tag); } public void addRequest(Request request) { @@ -241,8 +212,4 @@ public class AppController extends Application { return false; } - public static PushHandler getHandler() { - return handler; - } - } diff --git a/app/src/main/java/com/gh/base/GHPushMessageReceiver.java b/app/src/main/java/com/gh/base/GHPushMessageReceiver.java index 56c3c99cca..71ce42d99f 100644 --- a/app/src/main/java/com/gh/base/GHPushMessageReceiver.java +++ b/app/src/main/java/com/gh/base/GHPushMessageReceiver.java @@ -9,11 +9,8 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.graphics.BitmapFactory; import android.os.Build; -import android.os.Handler; -import android.os.Message; import android.support.v4.app.NotificationCompat; import android.support.v4.util.ArrayMap; -import android.text.TextUtils; import android.util.Log; import android.widget.RemoteViews; @@ -21,8 +18,6 @@ import com.gh.common.util.FileUtils; import com.gh.common.util.PackageUtils; import com.gh.common.util.Utils; import com.gh.gamecenter.R; -import com.xiaomi.mipush.sdk.ErrorCode; -import com.xiaomi.mipush.sdk.MiPushClient; import com.xiaomi.mipush.sdk.MiPushCommandMessage; import com.xiaomi.mipush.sdk.MiPushMessage; import com.xiaomi.mipush.sdk.PushMessageReceiver; @@ -62,18 +57,6 @@ import java.util.Locale; */ public class GHPushMessageReceiver extends PushMessageReceiver { - private String mRegId; - private String mReason; - private String mCommand; - private String mMessage; - private String mTopic; - private String mAlias; - private String mAccount; - private String mStartTime; - private String mEndTime; - - private long mResultCode = -1; - @Override public void onReceivePassThroughMessage(Context context, MiPushMessage message) { @@ -142,17 +125,6 @@ public class GHPushMessageReceiver extends PushMessageReceiver { } Log.v(AppController.TAG, "onReceivePassThroughMessage is called. " + message.toString()); - String log = context.getString(R.string.recv_passthrough_message, message.getContent()); - - if (!TextUtils.isEmpty(message.getTopic())) { - mTopic = message.getTopic(); - } else if (!TextUtils.isEmpty(message.getAlias())) { - mAlias = message.getAlias(); - } - - Message msg = Message.obtain(); - msg.obj = log; - AppController.getHandler().sendMessage(msg); } private void showNotification(Context context, JSONObject jsonObject, int id) throws JSONException { @@ -232,7 +204,7 @@ public class GHPushMessageReceiver extends PushMessageReceiver { } private ArrayMap getInstalledMapFromLocal(Context context) { - ArrayMap map = new ArrayMap(); + ArrayMap map = new ArrayMap<>(); ArrayList list = getAllPackageName(context); for (String str : list) { map.put(str, true); @@ -241,7 +213,7 @@ public class GHPushMessageReceiver extends PushMessageReceiver { } private ArrayList getAllPackageName(Context context) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); List packageInfos = context.getPackageManager() .getInstalledPackages(0); for (int i = 0, size = packageInfos.size(); i < size; i++) { @@ -258,21 +230,6 @@ public class GHPushMessageReceiver extends PushMessageReceiver { MiPushMessage message) { Log.v(AppController.TAG, "onNotificationMessageClicked is called. " + message.toString()); - String log = context.getString(R.string.click_notification_message, - message.getContent()); - - if (!TextUtils.isEmpty(message.getTopic())) { - mTopic = message.getTopic(); - } else if (!TextUtils.isEmpty(message.getAlias())) { - mAlias = message.getAlias(); - } - - Message msg = Message.obtain(); - if (message.isNotified()) { - msg.obj = log; - } - AppController.getHandler().sendMessage(msg); - } @Override @@ -280,93 +237,12 @@ public class GHPushMessageReceiver extends PushMessageReceiver { MiPushMessage message) { Log.v(AppController.TAG, "onNotificationMessageArrived is called. " + message.toString()); - String log = context.getString(R.string.arrive_notification_message, - message.getContent()); - - if (!TextUtils.isEmpty(message.getTopic())) { - mTopic = message.getTopic(); - } else if (!TextUtils.isEmpty(message.getAlias())) { - mAlias = message.getAlias(); - } - - Message msg = Message.obtain(); - msg.obj = log; - AppController.getHandler().sendMessage(msg); } @Override public void onCommandResult(Context context, MiPushCommandMessage message) { - Log.v(AppController.TAG, "onCommandResult is called. " + message.toString()); - String command = message.getCommand(); - List arguments = message.getCommandArguments(); - String cmdArg1 = ((arguments != null && arguments.size() > 0) ? arguments - .get(0) : null); - String cmdArg2 = ((arguments != null && arguments.size() > 1) ? arguments - .get(1) : null); - String log = ""; - if (MiPushClient.COMMAND_REGISTER.equals(command)) { - if (message.getResultCode() == ErrorCode.SUCCESS) { - mRegId = cmdArg1; - log = context.getString(R.string.register_success); - } else { - log = context.getString(R.string.register_fail); - } - } else if (MiPushClient.COMMAND_SET_ALIAS.equals(command)) { - if (message.getResultCode() == ErrorCode.SUCCESS) { - mAlias = cmdArg1; - log = context.getString(R.string.set_alias_success, mAlias); - } else { - log = context.getString(R.string.set_alias_fail, message.getReason()); - } - } else if (MiPushClient.COMMAND_UNSET_ALIAS.equals(command)) { - if (message.getResultCode() == ErrorCode.SUCCESS) { - mAlias = cmdArg1; - log = context.getString(R.string.unset_alias_success, mAlias); - } else { - log = context.getString(R.string.unset_alias_fail, message.getReason()); - } - } else if (MiPushClient.COMMAND_SET_ACCOUNT.equals(command)) { - if (message.getResultCode() == ErrorCode.SUCCESS) { - mAccount = cmdArg1; - log = context.getString(R.string.set_account_success, mAccount); - } else { - log = context.getString(R.string.set_account_fail, message.getReason()); - } - } else if (MiPushClient.COMMAND_UNSET_ACCOUNT.equals(command)) { - if (message.getResultCode() == ErrorCode.SUCCESS) { - mAccount = cmdArg1; - log = context.getString(R.string.unset_account_success, mAccount); - } else { - log = context.getString(R.string.unset_account_fail, message.getReason()); - } - } else if (MiPushClient.COMMAND_SUBSCRIBE_TOPIC.equals(command)) { - if (message.getResultCode() == ErrorCode.SUCCESS) { - mTopic = cmdArg1; - log = context.getString(R.string.subscribe_topic_success, mTopic); - } else { - log = context.getString(R.string.subscribe_topic_fail, message.getReason()); - } - } else if (MiPushClient.COMMAND_UNSUBSCRIBE_TOPIC.equals(command)) { - if (message.getResultCode() == ErrorCode.SUCCESS) { - log = context.getString(R.string.unsubscribe_topic_success, mTopic); - } else { - log = context.getString(R.string.unsubscribe_topic_fail, message.getReason()); - } - } else if (MiPushClient.COMMAND_SET_ACCEPT_TIME.equals(command)) { - if (message.getResultCode() == ErrorCode.SUCCESS) { - mStartTime = cmdArg1; - mEndTime = cmdArg2; - log = context.getString(R.string.set_accept_time_success, mStartTime, mEndTime); - } else { - log = context.getString(R.string.set_accept_time_fail, message.getReason()); - } - } else { - log = message.getReason(); - } - - Message msg = Message.obtain(); - msg.obj = log; - AppController.getHandler().sendMessage(msg); + Log.v(AppController.TAG, "onCommandResult is called. " + + message.toString()); } @Override @@ -374,40 +250,6 @@ public class GHPushMessageReceiver extends PushMessageReceiver { MiPushCommandMessage message) { Log.v(AppController.TAG, "onReceiveRegisterResult is called. " + message.toString()); - String command = message.getCommand(); - List arguments = message.getCommandArguments(); - String cmdArg1 = ((arguments != null && arguments.size() > 0) ? arguments - .get(0) : null); - String log; - if (MiPushClient.COMMAND_REGISTER.equals(command)) { - if (message.getResultCode() == ErrorCode.SUCCESS) { - mRegId = cmdArg1; - log = context.getString(R.string.register_success); - } else { - log = context.getString(R.string.register_fail); - } - } else { - log = message.getReason(); - } - - Message msg = Message.obtain(); - msg.obj = log; - AppController.getHandler().sendMessage(msg); } - public static String getSimpleDate() { - return new SimpleDateFormat("yyyy-MM-dd hh:mm:ss", Locale.getDefault()).format(new Date()); - } - - public static class PushHandler extends Handler { - - @Override - public void handleMessage(Message msg) { - String s = (String) msg.obj; - if (!TextUtils.isEmpty(s)) { - Utils.log(getSimpleDate() + " PushHandler:" + s); - } - } - - } } 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 17ebe0fd29..ee1a49df0e 100644 --- a/app/src/main/java/com/gh/common/util/ConcernUtils.java +++ b/app/src/main/java/com/gh/common/util/ConcernUtils.java @@ -19,7 +19,7 @@ import java.util.UUID; */ public class ConcernUtils { - public static void loadConcernData(final String url, final DownJsonListener listener){ + public static void loadConcernData(final String url, final DownJsonListener listener) { new Thread(new Runnable() { @Override public void run() { 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 24877703b1..e8a0d3ffce 100644 --- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java +++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java @@ -2,7 +2,6 @@ package com.gh.common.util; import android.content.Context; import android.content.Intent; -import android.content.res.ColorStateList; import android.graphics.Color; import android.os.Message; import android.support.v4.util.ArrayMap; @@ -265,13 +264,6 @@ public class DownloadItemUtils { String platform = PlatformUtils.getInstance(context) .getPlatformName(downloadEntity.getPlatform()); - int[] btn_colors = new int[] { Color.WHITE - , context.getResources().getColor(R.color.theme) }; - int[][] states = new int[2][]; - states[0] = new int[] { android.R.attr.state_pressed }; - states[1] = new int[] {}; - ColorStateList btn_sl = new ColorStateList(states, btn_colors); - DownloadStatus status = downloadEntity.getStatus(); if (status.equals(DownloadStatus.downloading)) { if (!"pause".equals(DownloadManager.getInstance(context).getStatus(downloadEntity.getUrl()))) { @@ -290,7 +282,7 @@ public class DownloadItemUtils { if (isNormal) { downloadBtn.setText("下载中"); downloadBtn.setBackgroundResource(R.drawable.game_item_btn_downloading_style); - downloadBtn.setTextColor(btn_sl); + downloadBtn.setTextColor(context.getResources().getColorStateList(R.color.text_downloading_style)); } } else if (status.equals(DownloadStatus.waiting)) { game_progressbar.setProgress((int) (downloadEntity.getPercent() * 10)); @@ -304,7 +296,7 @@ public class DownloadItemUtils { if (isNormal) { downloadBtn.setText("下载中"); downloadBtn.setBackgroundResource(R.drawable.game_item_btn_downloading_style); - downloadBtn.setTextColor(btn_sl); + downloadBtn.setTextColor(context.getResources().getColorStateList(R.color.text_downloading_style)); } } else if (status.equals(DownloadStatus.pause) || status.equals(DownloadStatus.timeout) @@ -320,7 +312,7 @@ public class DownloadItemUtils { if (isNormal) { downloadBtn.setText("下载中"); downloadBtn.setBackgroundResource(R.drawable.game_item_btn_downloading_style); - downloadBtn.setTextColor(btn_sl); + downloadBtn.setTextColor(context.getResources().getColorStateList(R.color.text_downloading_style)); } } else if (status.equals(DownloadStatus.done)) { game_progressbar.setProgress(1000); @@ -550,16 +542,9 @@ public class DownloadItemUtils { addDownloadEntry(context, entity, 0, entrance); Toast.makeText(context, entity.getName() + "已加入下载队列", Toast.LENGTH_SHORT).show(); - int[] btn_colors = new int[] { Color.WHITE - , context.getResources().getColor(R.color.theme) }; - int[][] states = new int[2][]; - states[0] = new int[] { android.R.attr.state_pressed }; - states[1] = new int[] {}; - ColorStateList btn_sl = new ColorStateList(states, btn_colors); - downloadBtn.setText("下载中"); downloadBtn.setBackgroundResource(R.drawable.game_item_btn_downloading_style); - downloadBtn.setTextColor(btn_sl); + downloadBtn.setTextColor(context.getResources().getColorStateList(R.color.text_downloading_style)); DownloadManager.getInstance(context).putStatus(entity.getApk().get(0).getUrl(), "downloading"); } else { @@ -619,16 +604,9 @@ public class DownloadItemUtils { addDownloadEntry(context, entity, 0, entrance); Toast.makeText(context, entity.getName() + "已加入下载队列", Toast.LENGTH_SHORT).show(); - int[] btn_colors = new int[] { Color.WHITE - , context.getResources().getColor(R.color.theme) }; - int[][] states = new int[2][]; - states[0] = new int[] { android.R.attr.state_pressed }; - states[1] = new int[] {}; - ColorStateList btn_sl = new ColorStateList(states, btn_colors); - downloadBtn.setText("下载中"); downloadBtn.setBackgroundResource(R.drawable.game_item_btn_downloading_style); - downloadBtn.setTextColor(btn_sl); + downloadBtn.setTextColor(context.getResources().getColorStateList(R.color.text_downloading_style)); DownloadManager.getInstance(context).putStatus(entity.getApk().get(0).getUrl(), "downloading"); } else { diff --git a/app/src/main/java/com/gh/common/util/NewsUtils.java b/app/src/main/java/com/gh/common/util/NewsUtils.java index 2fc1301273..f22a0a5e64 100644 --- a/app/src/main/java/com/gh/common/util/NewsUtils.java +++ b/app/src/main/java/com/gh/common/util/NewsUtils.java @@ -57,7 +57,7 @@ public class NewsUtils { JsonObjectExtendedRequest request = new JsonObjectExtendedRequest( Request.Method.POST, url, null, null); request.setShouldCache(false); - AppController.addToRequestQueue(request, NewsUtils.class); + AppController.addToRequestQueue(request); } } 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 844de48d19..87ffcca7a4 100644 --- a/app/src/main/java/com/gh/common/util/PlatformUtils.java +++ b/app/src/main/java/com/gh/common/util/PlatformUtils.java @@ -13,7 +13,6 @@ import com.gh.base.AppController; import com.gh.common.constant.Config; import com.gh.common.constant.Constants; import com.gh.gamecenter.R; -import com.gh.gamecenter.SplashScreenActivity; import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.volley.extended.JsonArrayExtendedRequest; @@ -306,7 +305,7 @@ public class PlatformUtils { isUpdate = false; } }); - AppController.addToRequestQueue(request, SplashScreenActivity.class); + AppController.addToRequestQueue(request); } } diff --git a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java index 7b8e442be7..720dd64bb7 100644 --- a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java @@ -8,6 +8,7 @@ import android.view.View.OnClickListener; import android.widget.LinearLayout; import android.widget.RelativeLayout; +import com.gh.base.AppController; import com.gh.base.BaseActivity; import com.gh.common.constant.Config; import com.gh.common.util.ConcernUtils; @@ -27,6 +28,8 @@ import java.util.List; public class ConcernActivity extends BaseActivity implements OnClickListener { + public static final String TAG = ConcernActivity.class.getSimpleName(); + private Concern_LinearLayout view; private RecyclerView concern_rv_show, concern_rv_recommend; private ConcernAdapter concernAdapter; @@ -170,6 +173,7 @@ public class ConcernActivity extends BaseActivity implements OnClickListener { @Override protected void onDestroy() { super.onDestroy(); + AppController.canclePendingRequests(TAG); String uuid = TokenUtils.getDeviceId(this); JSONArray data = new JSONArray(); for (ConcernInfo concernInfo : concernManager.getConcernGame()) { diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java index 32ba627ae2..3334f22c36 100644 --- a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java @@ -30,6 +30,8 @@ import java.util.Map; */ public class GameDetailActivity extends DetailActivity implements View.OnClickListener{ + public static final String TAG = GameDetailActivity.class.getSimpleName(); + private GameDetailAdapter adapter; private String gameId; @@ -150,7 +152,7 @@ public class GameDetailActivity extends DetailActivity implements View.OnClickLi reuse_no_connection.setVisibility(View.VISIBLE); } }); - AppController.addToRequestQueue(request, GameDetailActivity.class); + AppController.addToRequestQueue(request, TAG); } // 关注事件 @@ -163,6 +165,7 @@ public class GameDetailActivity extends DetailActivity implements View.OnClickLi @Override protected void onDestroy() { super.onDestroy(); + AppController.canclePendingRequests(TAG); adapter = null; } diff --git a/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java b/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java index e8b11ce5bf..049a905f94 100644 --- a/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java @@ -11,6 +11,7 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.RelativeLayout; +import com.gh.base.AppController; import com.gh.base.BaseActivity; import com.gh.common.util.DisplayUtils; import com.gh.gamecenter.adapter.GameNewsAdapter; @@ -24,6 +25,8 @@ import java.util.ArrayList; */ public class GameNewsActivity extends BaseActivity implements View.OnClickListener{ + public static final String TAG = GameNewsActivity.class.getSimpleName(); + private GameNewsAdapter adapter; private GameNewsTypeListAdapter typeListAdapter; @@ -144,6 +147,7 @@ public class GameNewsActivity extends BaseActivity implements View.OnClickListen @Override protected void onDestroy() { super.onDestroy(); + AppController.canclePendingRequests(TAG); adapter = null; typeListAdapter = null; } diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index ad8f16b2e7..3b0e16e0bb 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -119,6 +119,8 @@ import de.greenrobot.event.EventBus; */ public class MainActivity extends BaseFragmentActivity implements OnClickListener { + public static final String TAG = MainActivity.class.getSimpleName(); + public static ArrayMap uninstallMap; public static String searchHint; @@ -353,7 +355,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene StringExtendedRequest request = new StringExtendedRequest(Method.POST, url, null, null); request.setParams(params); request.setShouldCache(false); - AppController.addToRequestQueue(request, MainActivity.class); + AppController.addToRequestQueue(request, TAG); } /* @@ -526,7 +528,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene } } }); - AppController.addToRequestQueue(request, MainActivity.class); + AppController.addToRequestQueue(request, TAG); } } @@ -599,7 +601,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene } } }); - AppController.addToRequestQueue(request, MainActivity.class); + AppController.addToRequestQueue(request, TAG); } } } @@ -772,7 +774,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene } } }, null); - AppController.addToRequestQueue(request, MainActivity.class); + AppController.addToRequestQueue(request, TAG); } } } @@ -815,7 +817,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene } } }); - AppController.addToRequestQueue(request, MainActivity.class); + AppController.addToRequestQueue(request, TAG); } } @@ -924,7 +926,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene } } }, null); - AppController.addToRequestQueue(request, MainActivity.class); + AppController.addToRequestQueue(request, TAG); } // 获取免责声明 @@ -959,7 +961,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene sp.edit().putBoolean("isShowDisclaimer", false).apply(); } }); - AppController.addToRequestQueue(request, MainActivity.class); + AppController.addToRequestQueue(request, TAG); } private Class intentClass(String to) { @@ -1100,7 +1102,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene } } }, null); - AppController.addToRequestQueue(searchRequst, MainActivity.class); + AppController.addToRequestQueue(searchRequst, TAG); } private void checkUpdate() { @@ -1176,7 +1178,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene } }, null); - AppController.addToRequestQueue(updateRequest, MainActivity.class); + AppController.addToRequestQueue(updateRequest, TAG); } private void showUpdateDialog(final String md5) { @@ -1475,7 +1477,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene JsonObjectExtendedRequest request = new JsonObjectExtendedRequest( Method.POST, Config.HOST + "v2/stat/download", jsonObject.toString(), null, null); - AppController.addToRequestQueue(request, MainActivity.class); + AppController.addToRequestQueue(request, TAG); } public void onEventMainThread(EBSkip skip) { @@ -1599,7 +1601,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene } } }, null); - AppController.addToRequestQueue(request, MainActivity.class); + AppController.addToRequestQueue(request, TAG); } Map map = new HashMap<>(); @@ -1620,7 +1622,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene concernManager.addByEntity(gameEntity); } }, null); - AppController.addToRequestQueue(request, MainActivity.class); + AppController.addToRequestQueue(request, TAG); } } @@ -1635,8 +1637,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene protected void onDestroy() { super.onDestroy(); isDestroy = true; - AppController.canclePendingRequests(GameFragment.class); - AppController.canclePendingRequests(NewsFragment.class); + AppController.canclePendingRequests(TAG); DownloadManager.getInstance(this).removeObserver(dataWatcher); gameFragment = null; personalFragment = null; diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java index 5370b90b56..f21565bb8c 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java @@ -47,6 +47,7 @@ import java.util.Map; */ public class NewsDetailActivity extends DetailActivity implements OnClickListener { + public static final String TAG = NewsDetailActivity.class.getSimpleName(); private NewsDetailAdapter adapter; private String newsId; @@ -257,7 +258,7 @@ public class NewsDetailActivity extends DetailActivity implements OnClickListene } } }); - AppController.addToRequestQueue(request, NewsDetailActivity.class); + AppController.addToRequestQueue(request, TAG); } private long[] mHits = new long[2]; @@ -336,7 +337,7 @@ public class NewsDetailActivity extends DetailActivity implements OnClickListene } } }, null); - AppController.addToRequestQueue(gameRequest, NewsDetailActivity.class); + AppController.addToRequestQueue(gameRequest, TAG); } // 关注事件 @@ -422,7 +423,7 @@ public class NewsDetailActivity extends DetailActivity implements OnClickListene @Override protected void onDestroy() { super.onDestroy(); - AppController.canclePendingRequests(NewsDetailActivity.class); + AppController.canclePendingRequests(TAG); adapter = null; } diff --git a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java index f47efa3880..418f48b18b 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java @@ -24,6 +24,7 @@ import com.gh.base.BaseActivity; import com.gh.common.constant.Config; import com.gh.common.util.DisplayUtils; import com.gh.common.util.MeasureHeightLayoutManager; +import com.gh.common.util.NewsUtils; import com.gh.common.view.VerticalItemDecoration; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.entity.NewsEntity; @@ -41,6 +42,8 @@ import java.util.List; */ public class NewsSearchActivity extends BaseActivity { + public static final String TAG = NewsSearchActivity.class.getSimpleName(); + private RecyclerView mNewsRecyclerView; private List newsEntities; private NewsSearchAdapter searchAdapter; @@ -206,12 +209,13 @@ public class NewsSearchActivity extends BaseActivity { searchAdapter.notifyItemChanged(searchAdapter.getItemCount() - 1); } }); - AppController.addToRequestQueue(request, GameNewsActivity.class); + AppController.addToRequestQueue(request, TAG); } @Override protected void onDestroy() { super.onDestroy(); + AppController.canclePendingRequests(TAG); gameName = null; searchKey = null; gameId = null; @@ -272,10 +276,10 @@ public class NewsSearchActivity extends BaseActivity { viewHolder.linearLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Intent intent = new Intent(getApplicationContext(),NewsDetailActivity.class); - intent.putExtra("newsId", newsEntities.get(holder.getPosition()).getId()); - intent.putExtra("entrance", "游戏详情-全部资讯"); - startActivity(intent); + NewsEntity newsEntity = newsEntities.get(holder.getPosition()); + // 统计阅读量 + NewsUtils.statNewsViews(newsEntity.getId()); + NewsUtils.startNewsActivity(NewsSearchActivity.this, newsEntity, "游戏详情-全部资讯"); } }); }else if (holder instanceof FooterViewHolder){ diff --git a/app/src/main/java/com/gh/gamecenter/PluginActivity.java b/app/src/main/java/com/gh/gamecenter/PluginActivity.java index aac013a077..536ed21fec 100644 --- a/app/src/main/java/com/gh/gamecenter/PluginActivity.java +++ b/app/src/main/java/com/gh/gamecenter/PluginActivity.java @@ -25,6 +25,8 @@ import java.util.List; */ public class PluginActivity extends BaseActivity { + public static final String TAG = PluginActivity.class.getSimpleName(); + private RecyclerView plugin_list; private PluginAdapter adapter; private ProgressBarCircularIndeterminate plugin_pb_loading; @@ -135,7 +137,7 @@ public class PluginActivity extends BaseActivity { @Override protected void onDestroy() { super.onDestroy(); - AppController.canclePendingRequests(PluginActivity.class); + AppController.canclePendingRequests(TAG); plugin_list = null; adapter = null; plugin_pb_loading = null; diff --git a/app/src/main/java/com/gh/gamecenter/SettingActivity.java b/app/src/main/java/com/gh/gamecenter/SettingActivity.java index db3e10e2ea..d3fe007cc6 100644 --- a/app/src/main/java/com/gh/gamecenter/SettingActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SettingActivity.java @@ -57,6 +57,8 @@ import de.greenrobot.event.EventBus; */ public class SettingActivity extends BaseActivity implements OnClickListener { + public static final String TAG = SettingActivity.class.getSimpleName(); + private SwitchButton setting_sb_autoinstall, setting_sb_autodelete, setting_sb_deletedata, setting_sb_autoupdate; private TextView setting_tv_version, app_tv_speed, app_tv_percent, @@ -421,7 +423,7 @@ public class SettingActivity extends BaseActivity implements OnClickListener { toast("检查更新失败"); } }); - AppController.addToRequestQueue(request, SettingActivity.class); + AppController.addToRequestQueue(request, TAG); } private void showUpdateDialog(final String md5) { @@ -562,6 +564,7 @@ public class SettingActivity extends BaseActivity implements OnClickListener { protected void onDestroy() { saveCurrentSetting(); super.onDestroy(); + AppController.canclePendingRequests(TAG); setting_sb_autoinstall = null; setting_sb_autodelete = null; setting_sb_deletedata = null; diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java index fe7c485d03..07bfd09f05 100644 --- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java @@ -60,6 +60,8 @@ import java.util.Set; */ public class SplashScreenActivity extends BaseActivity { + public static final String TAG = SplashScreenActivity.class.getSimpleName(); + private ConcernManager concernManager; private SharedPreferences sp; @@ -256,7 +258,7 @@ public class SplashScreenActivity extends BaseActivity { } }, null); request.setShouldCache(false); - AppController.addToRequestQueue(request, SplashScreenActivity.class); + AppController.addToRequestQueue(request, TAG); } /* @@ -283,7 +285,7 @@ public class SplashScreenActivity extends BaseActivity { } } }, null); - AppController.addToRequestQueue(request, SplashScreenActivity.class); + AppController.addToRequestQueue(request, TAG); } /* @@ -314,7 +316,7 @@ public class SplashScreenActivity extends BaseActivity { } } }); - AppController.addToRequestQueue(request, SplashScreenActivity.class); + AppController.addToRequestQueue(request, TAG); } /* @@ -371,7 +373,7 @@ public class SplashScreenActivity extends BaseActivity { } } }, null); - AppController.addToRequestQueue(request, SplashScreenActivity.class); + AppController.addToRequestQueue(request, TAG); } // 跳转到主界面 diff --git a/app/src/main/java/com/gh/gamecenter/SubjectActivity.java b/app/src/main/java/com/gh/gamecenter/SubjectActivity.java index b568f84fc6..0518673efa 100644 --- a/app/src/main/java/com/gh/gamecenter/SubjectActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SubjectActivity.java @@ -22,6 +22,8 @@ import com.gh.gamecenter.eventbus.EBPackage; public class SubjectActivity extends BaseActivity { + public static final String TAG = SubjectActivity.class.getSimpleName(); + private RecyclerView subject_list; private SubjectAdapter adapter; private ProgressBarCircularIndeterminate subject_pb_loading; @@ -154,7 +156,7 @@ public class SubjectActivity extends BaseActivity { @Override public void onDestroy() { super.onDestroy(); - AppController.canclePendingRequests(SubjectActivity.class); + AppController.canclePendingRequests(TAG); subject_list = null; adapter = null; subject_pb_loading = null; diff --git a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java index 0cbab5b6d5..8d2e680641 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java @@ -42,6 +42,8 @@ import java.util.regex.Pattern; * */ public class SuggestionActivity extends BaseActivity implements OnClickListener { + public static final String TAG = SuggestionActivity.class.getSimpleName(); + private TextView tv_suggest_connectway; private EditText et_suggest_content, et_suggest_connectway; private CardView btn_suggest_post; @@ -111,7 +113,7 @@ public class SuggestionActivity extends BaseActivity implements OnClickListener @Override public void onDismiss(DialogInterface dialog) { if (isShowing) { - AppController.canclePendingRequests(SuggestionActivity.class); + AppController.canclePendingRequests(TAG); toast("取消发送"); } } @@ -166,7 +168,7 @@ public class SuggestionActivity extends BaseActivity implements OnClickListener @Override public void onDismiss(DialogInterface dialog) { if (isShowing) { - AppController.canclePendingRequests(SuggestionActivity.class); + AppController.canclePendingRequests(TAG); toast("取消发送"); } } @@ -178,7 +180,7 @@ public class SuggestionActivity extends BaseActivity implements OnClickListener } private void sendSuggestion(final Dialog dialog, String email) { - Map map = new HashMap(); + Map map = new HashMap<>(); map.put("message", et_suggest_content.getText().toString().trim()); map.put("from", email); map.put("ghversion", PackageUtils.getVersion(this)); @@ -216,7 +218,7 @@ public class SuggestionActivity extends BaseActivity implements OnClickListener } }); request.setShouldCache(false); - AppController.addToRequestQueue(request, SuggestionActivity.class); + AppController.addToRequestQueue(request, TAG); } private boolean isEmailAddress(String email) { 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 2fa8745a3f..d00bb739e1 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java @@ -96,7 +96,7 @@ public class ConcernAdapter extends RecyclerView.Adapter { } } }); - AppController.addToRequestQueue(concernObjectRequest, ConcernActivity.class); + AppController.addToRequestQueue(concernObjectRequest, ConcernActivity.TAG); } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java index 7070b70f67..c44754c5d1 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java @@ -80,7 +80,7 @@ public class ConcernRecommendAdapter extends RecyclerView.Adapter } } }); - AppController.addToRequestQueue(request, GameFragment.class); + AppController.addToRequestQueue(request, PluginActivity.TAG); } } 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 b5896f7c4e..4d4d2483e6 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/SubjectAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/SubjectAdapter.java @@ -133,7 +133,7 @@ public class SubjectAdapter extends RecyclerView.Adapter kv = new HashMap<>(); kv.put("版本", updateEntity.getPlatform()); diff --git a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java index 96dcadd476..b96c24b586 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java @@ -12,6 +12,7 @@ import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.TextView; +import com.gh.base.AppController; import com.gh.gamecenter.MainActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.eventbus.EBDownloadChanged; @@ -31,6 +32,8 @@ import de.greenrobot.event.EventBus; */ public class GameUpdateFragment extends Fragment { + public static final String TAG = GameUpdateFragment.class.getSimpleName(); + private View view; private RecyclerView gameupdate_rv_show; private GameUpdateAdapter adapter; @@ -173,6 +176,7 @@ public class GameUpdateFragment extends Fragment { public void onDestroy() { super.onDestroy(); EventBus.getDefault().unregister(this); + AppController.canclePendingRequests(TAG); view = null; gameupdate_rv_show = null; gameupdate_ll_loading = null; diff --git a/app/src/main/java/com/gh/gamecenter/game/Game1Fragment.java b/app/src/main/java/com/gh/gamecenter/game/Game1Fragment.java index b062431e02..ef0a9d5c15 100644 --- a/app/src/main/java/com/gh/gamecenter/game/Game1Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/game/Game1Fragment.java @@ -36,6 +36,8 @@ import java.util.List; */ public class Game1Fragment extends BaseFragment implements SwipeRefreshLayout.OnRefreshListener { + public static final String TAG = Game1Fragment.class.getSimpleName(); + private SwipeRefreshLayout fm_game_swipe_refresh; private RecyclerView fm_game_rv_list; private Game1FragmentAdapter adapter; @@ -354,7 +356,7 @@ public class Game1Fragment extends BaseFragment implements SwipeRefreshLayout.On @Override public void onDestroy() { super.onDestroy(); - AppController.canclePendingRequests(Game1Fragment.class); + AppController.canclePendingRequests(TAG); fm_game_rv_list = null; adapter = null; reuse_no_connection = null; diff --git a/app/src/main/java/com/gh/gamecenter/game/Game1FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/game/Game1FragmentAdapter.java index fa2f8b9479..96347c65d3 100644 --- a/app/src/main/java/com/gh/gamecenter/game/Game1FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/game/Game1FragmentAdapter.java @@ -29,6 +29,7 @@ import com.gh.common.util.DisplayUtils; import com.gh.common.util.DownloadItemUtils; import com.gh.common.util.GameViewUtils; import com.gh.common.util.ImageUtils; +import com.gh.common.util.NewsUtils; import com.gh.common.util.PlatformUtils; import com.gh.common.util.TimestampUtils; import com.gh.common.view.AutoScrollViewPager; @@ -185,7 +186,7 @@ public class Game1FragmentAdapter extends RecyclerView.Adapter pluginList.size() + 2) { + notifyItemChanged(pluginList.size() + 2); + } initLocationMap(); } if (!isInitPlugin) { @@ -812,6 +816,9 @@ public class Game1FragmentAdapter extends RecyclerView.Adapter list, final int start) { @@ -187,7 +187,7 @@ public class News1FragmentAdapter extends RecyclerView.Adapter list, final int start) { @@ -188,7 +188,7 @@ public class News2FragmentAdapter extends RecyclerView.Adapter + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/color/text_plugining_style.xml b/app/src/main/res/color/text_plugining_style.xml new file mode 100644 index 0000000000..c1262bc9bc --- /dev/null +++ b/app/src/main/res/color/text_plugining_style.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable-nodpi/splash_01.jpg b/app/src/main/res/drawable-nodpi/splash_01.jpg index e57cd3adab..76037f23ad 100644 Binary files a/app/src/main/res/drawable-nodpi/splash_01.jpg and b/app/src/main/res/drawable-nodpi/splash_01.jpg differ diff --git a/app/src/main/res/drawable-nodpi/splash_02.jpg b/app/src/main/res/drawable-nodpi/splash_02.jpg index 7abccf575d..60f2844c99 100644 Binary files a/app/src/main/res/drawable-nodpi/splash_02.jpg and b/app/src/main/res/drawable-nodpi/splash_02.jpg differ diff --git a/app/src/main/res/drawable-nodpi/splash_03.jpg b/app/src/main/res/drawable-nodpi/splash_03.jpg index afb9a90bbf..08657d352b 100644 Binary files a/app/src/main/res/drawable-nodpi/splash_03.jpg and b/app/src/main/res/drawable-nodpi/splash_03.jpg differ diff --git a/app/src/main/res/drawable-nodpi/splash_04.jpg b/app/src/main/res/drawable-nodpi/splash_04.jpg index 804f0005df..6b1499abb3 100644 Binary files a/app/src/main/res/drawable-nodpi/splash_04.jpg and b/app/src/main/res/drawable-nodpi/splash_04.jpg differ