From c2f26724218dd2ff65b468236c6d356800d9e389 Mon Sep 17 00:00:00 2001 From: huangzhuanghua <401742778@qq.com> Date: Mon, 28 Nov 2016 17:25:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B7=B3=E8=BD=AC=E6=84=8F?= =?UTF-8?q?=E8=A7=81=E5=8F=8D=E9=A6=88=E9=A1=B5=E9=9D=A2=E5=B8=A6content?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/gamecenter/MainActivity.java | 34 +++++++++---------- .../java/com/gh/gamecenter/SkipActivity.java | 2 ++ .../gh/gamecenter/SplashScreenActivity.java | 2 ++ .../com/gh/gamecenter/SubjectActivity.java | 7 ---- 4 files changed, 21 insertions(+), 24 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index 2d48a1f2b8..7308a7aef7 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -108,8 +108,6 @@ import de.greenrobot.event.EventBus; */ public class MainActivity extends BaseFragmentActivity implements OnClickListener { - public static final String TAG = MainActivity.class.getSimpleName(); - private GameFragment gameFragment; private NewsFragment newsFragment; private PersonalFragment personalFragment; @@ -216,7 +214,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene JSONObject jsonObject = new JSONObject(params); JsonObjectExtendedRequest request = new JsonObjectExtendedRequest(Method.POST, Config.HOST + "stat/download", jsonObject.toString(), null, null); - AppController.addToRequestQueue(request, TAG); + AppController.addToRequestQueue(request); } // 统计下载完成事件 @@ -345,7 +343,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, TAG); + AppController.addToRequestQueue(request); } // 上传网络错误log @@ -373,7 +371,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, TAG); + AppController.addToRequestQueue(request); } /* @@ -584,7 +582,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene } } }); - AppController.addToRequestQueue(request, TAG); + AppController.addToRequestQueue(request); } } @@ -679,7 +677,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene } } }); - AppController.addToRequestQueue(request, TAG); + AppController.addToRequestQueue(request); } } @@ -742,7 +740,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene } } }); - AppController.addToRequestQueue(request, TAG); + AppController.addToRequestQueue(request); } } } @@ -877,7 +875,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene } } }, null); - AppController.addToRequestQueue(request, TAG); + AppController.addToRequestQueue(request); } private int count; @@ -918,7 +916,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene } } }); - AppController.addToRequestQueue(request, TAG); + AppController.addToRequestQueue(request); } } @@ -1010,7 +1008,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene } } }, null); - AppController.addToRequestQueue(request, TAG); + AppController.addToRequestQueue(request); } private Class intentClass(String to) { @@ -1030,6 +1028,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene Runnable runnable = new Runnable() { @Override public void run() { + //TODO 重复跳转问题 if (getIntent() != null && getIntent().getExtras() != null) { String to = getIntent().getExtras().getString("to"); if(!TextUtils.isEmpty(to)){ @@ -1067,6 +1066,8 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene } else if ("SubjectActivity".equals(to)) { toIntent.putExtra("id", getIntent().getExtras().getString("id")); toIntent.putExtra("name", getIntent().getExtras().getString("name")); + } else if ("SuggestionActivity".equals(to)) { + toIntent.putExtra("content", getIntent().getExtras().getString("content")); } startActivity(toIntent); } @@ -1130,7 +1131,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene } } }, null); - AppController.addToRequestQueue(request, TAG); + AppController.addToRequestQueue(request); } private void checkUpdate() { @@ -1184,7 +1185,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene } } }, null); - AppController.addToRequestQueue(request, TAG); + AppController.addToRequestQueue(request); } private void showUpdateDialog(final String md5) { @@ -1328,7 +1329,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, TAG); + AppController.addToRequestQueue(request); Utils.log("提交更新数据" + new JSONObject(params).toString()); } @@ -1585,7 +1586,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene } } }, null); - AppController.addToRequestQueue(request, TAG); + AppController.addToRequestQueue(request); } Map map = new HashMap<>(); @@ -1624,7 +1625,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene } } }, null); - AppController.addToRequestQueue(request, TAG); + AppController.addToRequestQueue(request); } @Override @@ -1637,7 +1638,6 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene @Override protected void onDestroy() { super.onDestroy(); - AppController.canclePendingRequests(TAG); DownloadManager.getInstance(this).removeObserver(dataWatcher); } } diff --git a/app/src/main/java/com/gh/gamecenter/SkipActivity.java b/app/src/main/java/com/gh/gamecenter/SkipActivity.java index b6baefb273..32b293f89a 100644 --- a/app/src/main/java/com/gh/gamecenter/SkipActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SkipActivity.java @@ -39,6 +39,7 @@ public class SkipActivity extends BaseActivity { intent.putExtra("id", id); intent.putExtra("name", getIntent().getData().getQueryParameter("name")); } else if ("suggestion".equals(host)) { + intent.putExtra("content", getIntent().getData().getQueryParameter("content")); intent.setClass(this, SuggestionActivity.class); } } else { @@ -58,6 +59,7 @@ public class SkipActivity extends BaseActivity { intent.putExtra("id", id); intent.putExtra("name", getIntent().getData().getQueryParameter("name")); } else if ("suggestion".equals(host)) { + intent.putExtra("content", getIntent().getData().getQueryParameter("content")); intent.putExtra("to", "SuggestionActivity"); } } diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java index be83f390cb..c37992a4c7 100644 --- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java @@ -436,6 +436,8 @@ public class SplashScreenActivity extends BaseActivity { } else if ("SubjectActivity".equals(to)) { intent.putExtra("id", bundle.getString("id")); intent.putExtra("name", bundle.getString("name")); + } else if ("SuggestionActivity".equals(to)) { + intent.putExtra("content", bundle.getString("content")); } if ("NewsActivity".equals(to)) { intent.putExtra("to", "NewsDetailActivity"); diff --git a/app/src/main/java/com/gh/gamecenter/SubjectActivity.java b/app/src/main/java/com/gh/gamecenter/SubjectActivity.java index e3ff7248f4..395b3e0bcc 100644 --- a/app/src/main/java/com/gh/gamecenter/SubjectActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SubjectActivity.java @@ -24,8 +24,6 @@ import java.util.ArrayList; 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; @@ -184,9 +182,4 @@ public class SubjectActivity extends BaseActivity { DownloadManager.getInstance(getApplicationContext()).removeObserver(dataWatcher); } - @Override - public void onDestroy() { - super.onDestroy(); - AppController.canclePendingRequests(TAG); - } }