From 4fc10d360ae5a0eade4de86cb54d94f50275fe40 Mon Sep 17 00:00:00 2001
From: huangzhuanghua <401742778@qq.com>
Date: Mon, 9 Jan 2017 11:53:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/gh/base/GHUmengNotificationClickHandler.java | 3 ++-
 app/src/main/java/com/gh/common/util/ConcernUtils.java    | 7 ++++---
 app/src/main/java/com/gh/gamecenter/MainActivity.java     | 8 ++++----
 app/src/main/java/com/gh/gamecenter/SkipActivity.java     | 3 ++-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/gh/base/GHUmengNotificationClickHandler.java b/app/src/main/java/com/gh/base/GHUmengNotificationClickHandler.java
index f339f9a10f..3780ed4580 100644
--- a/app/src/main/java/com/gh/base/GHUmengNotificationClickHandler.java
+++ b/app/src/main/java/com/gh/base/GHUmengNotificationClickHandler.java
@@ -42,7 +42,8 @@ public class GHUmengNotificationClickHandler extends UmengNotificationClickHandl
 				bundle.putString("to", "WebActivity");
 				bundle.putString("url", response.getString("target"));
 			}
-			if (RunningUtils.isRunning(context)) {
+			if (RunningUtils.isRunning(context)
+					&& MainActivity.class.getName().equals(RunningUtils.getBaseActivity(context))) {
 				// 应用正在运行，前台或后台
 				String to = bundle.getString("to");
 				if (!TextUtils.isEmpty(to)) {
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 9065738c89..66d5895444 100644
--- a/app/src/main/java/com/gh/common/util/ConcernUtils.java
+++ b/app/src/main/java/com/gh/common/util/ConcernUtils.java
@@ -2,6 +2,7 @@ package com.gh.common.util;
 
 import android.content.Context;
 
+import com.gh.gamecenter.retrofit.Response;
 import com.gh.gamecenter.retrofit.RetrofitManager;
 
 import org.json.JSONArray;
@@ -31,7 +32,7 @@ public class ConcernUtils {
                     }
                 }).subscribeOn(Schedulers.io())
                 .observeOn(Schedulers.io())
-                .subscribe();
+                .subscribe(new Response<ResponseBody>());
     }
 
     public static void deleteConcernData(final Context context, final String gameId) {
@@ -43,7 +44,7 @@ public class ConcernUtils {
                     }
                 }).subscribeOn(Schedulers.io())
                 .observeOn(Schedulers.io())
-                .subscribe();
+                .subscribe(new Response<ResponseBody>());
     }
 
     public static void updateConcernData(final Context context, final JSONArray data) {
@@ -58,7 +59,7 @@ public class ConcernUtils {
                 })
                 .subscribeOn(Schedulers.io())
                 .observeOn(Schedulers.io())
-                .subscribe();
+                .subscribe(new Response<ResponseBody>());
     }
 
 }
diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java
index 3680862e65..e156a4842c 100644
--- a/app/src/main/java/com/gh/gamecenter/MainActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java
@@ -463,7 +463,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene
 											}
 										}).subscribeOn(Schedulers.io())
 										.observeOn(Schedulers.io())
-										.subscribe();
+										.subscribe(new Response<ResponseBody>());
 							}
 							sp.edit().putBoolean("isSwitchConcern", true).apply();
 							getConcernDigest(response);
@@ -715,7 +715,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene
 							}
 						}).subscribeOn(Schedulers.io())
 						.observeOn(Schedulers.io())
-						.subscribe();
+						.subscribe(new Response<ResponseBody>());
 
 				handler.postDelayed(new Runnable() {
 					@Override
@@ -1184,7 +1184,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene
 										}
 									}).subscribeOn(Schedulers.io())
 									.observeOn(Schedulers.io())
-									.subscribe();
+									.subscribe(new Response<ResponseBody>());
 						}
 					});
 		}
@@ -1199,7 +1199,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene
 						}
 					}).subscribeOn(Schedulers.io())
 					.observeOn(Schedulers.io())
-					.subscribe();
+					.subscribe(new Response<ResponseBody>());
 		}
 
 		DataCollectionUtils.uploadInorunstall(this, busFour.getType(), busFour.getPackageName());
diff --git a/app/src/main/java/com/gh/gamecenter/SkipActivity.java b/app/src/main/java/com/gh/gamecenter/SkipActivity.java
index 9bee74d002..816be1b296 100644
--- a/app/src/main/java/com/gh/gamecenter/SkipActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/SkipActivity.java
@@ -28,7 +28,8 @@ public class SkipActivity extends BaseActivity {
 			Intent intent = new Intent();
 			intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 			intent.putExtra("entrance", "(网页跳转)");
-			if (RunningUtils.isRunning(this)) {
+			if (RunningUtils.isRunning(this)
+					&& MainActivity.class.getName().equals(RunningUtils.getBaseActivity(this))) {
 				// 应用正在运行，前台或后台
 				if ("article".equals(host)) {
 					intent.setClass(this, NewsDetailActivity.class);