diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6a1ee6bbbc..1d0bcac51f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -143,7 +143,8 @@ - + @@ -205,7 +206,7 @@ android:exported="false" > 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 e79757ec85..b6efa14434 100644 --- a/app/src/main/java/com/gh/base/AppController.java +++ b/app/src/main/java/com/gh/base/AppController.java @@ -162,14 +162,6 @@ public class AppController extends Application { getInstance().addRequest(request); } - public static void addToRequestQueue(Request request, String tag) { - if (TextUtils.isEmpty(tag)) { - tag = TAG; - } - request.setTag(tag); - getInstance().addRequest(request); - } - public static void canclePendingRequests(String tag) { if (TextUtils.isEmpty(tag)) { tag = TAG; diff --git a/app/src/main/java/com/gh/base/DetailActivity.java b/app/src/main/java/com/gh/base/BaseDetailActivity.java similarity index 96% rename from app/src/main/java/com/gh/base/DetailActivity.java rename to app/src/main/java/com/gh/base/BaseDetailActivity.java index 1142d7ceba..e67eb06624 100644 --- a/app/src/main/java/com/gh/base/DetailActivity.java +++ b/app/src/main/java/com/gh/base/BaseDetailActivity.java @@ -41,8 +41,9 @@ import java.util.Map; /** * Created by Administrator on 2016/9/19. + * 游戏详情、新闻详情基类（控制底部下载栏） */ -public abstract class DetailActivity extends BaseActivity implements View.OnClickListener { +public abstract class BaseDetailActivity extends BaseActivity implements View.OnClickListener { protected TextView actionbar_tv_title; protected RecyclerView detail_rv_show; @@ -71,7 +72,7 @@ public abstract class DetailActivity extends BaseActivity implements View.OnClic if (gameEntity != null && gameEntity.getApk().size() == 1) { String url = gameEntity.getApk().get(0).getUrl(); if (url.equals(downloadEntity.getUrl())) { - if (!"pause".equals(DownloadManager.getInstance(DetailActivity.this). + if (!"pause".equals(DownloadManager.getInstance(BaseDetailActivity.this). getStatus(downloadEntity.getUrl()))) { mDownloadEntity = downloadEntity; invalidate(); @@ -393,7 +394,7 @@ public abstract class DetailActivity extends BaseActivity implements View.OnClic Map kv = new HashMap<>(); kv.put("版本", gameEntity.getApk().get(0).getPlatform()); kv.put("页面", name); - DataUtils.onEvent(DetailActivity.this, "游戏启动", gameEntity.getName(), kv); + DataUtils.onEvent(BaseDetailActivity.this, "游戏启动", gameEntity.getName(), kv); PackageUtils.launchApplicationByPackageName(this, gameEntity.getApk().get(0).getPackageName()); } else { @@ -411,19 +412,19 @@ public abstract class DetailActivity extends BaseActivity implements View.OnClic Map kv = new HashMap<>(); kv.put("版本", apkEntity.getPlatform()); kv.put("状态", "下载开始"); - DataUtils.onEvent(DetailActivity.this, "游戏下载", gameEntity.getName(), kv); + DataUtils.onEvent(BaseDetailActivity.this, "游戏下载", gameEntity.getName(), kv); Map kv2 = new HashMap<>(); kv2.put("版本", apkEntity.getPlatform()); kv2.put("状态", "下载开始"); kv2.put("页面", name); kv2.put("位置", entrance); - DataUtils.onEvent(DetailActivity.this, "游戏下载位置", gameEntity.getName(), kv2); + DataUtils.onEvent(BaseDetailActivity.this, "游戏下载位置", gameEntity.getName(), kv2); Map kv3 = new HashMap<>(); kv3.put(entrance, "下载数"); kv3.put(entrance, "下载开始"); - DataUtils.onEvent(DetailActivity.this, "应用数据", gameEntity.getName(), kv3); + DataUtils.onEvent(BaseDetailActivity.this, "应用数据", gameEntity.getName(), kv3); Map map = new HashMap<>(); map.put("game", gameEntity.getName()); @@ -446,7 +447,7 @@ public abstract class DetailActivity extends BaseActivity implements View.OnClic detail_pb_progressbar.setProgress(0); detail_tv_per.setText("0.0%"); - DownloadManager.getInstance(DetailActivity.this).putStatus(apkEntity.getUrl(), "downloading"); + DownloadManager.getInstance(BaseDetailActivity.this).putStatus(apkEntity.getUrl(), "downloading"); } else { toast(msg); } diff --git a/app/src/main/java/com/gh/base/HomeFragment.java b/app/src/main/java/com/gh/base/HomeFragment.java index 1e7a53cf17..8b8a70eaaf 100644 --- a/app/src/main/java/com/gh/base/HomeFragment.java +++ b/app/src/main/java/com/gh/base/HomeFragment.java @@ -23,12 +23,10 @@ import com.gh.common.util.DisplayUtils; import com.gh.download.DownloadManager; import com.gh.gamecenter.ConcernActivity; import com.gh.gamecenter.DownloadManagerActivity; -import com.gh.gamecenter.MainActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.SearchActivity; import com.gh.gamecenter.eventbus.EBDownloadStatus; import com.gh.gamecenter.eventbus.EBReuse; -import com.gh.gamecenter.eventbus.EBTopStatus; import com.gh.gamecenter.manager.DataCollectionManager; import com.gh.gamecenter.manager.PackageManager; @@ -58,10 +56,22 @@ public class HomeFragment extends Fragment implements View.OnClickListener { private String hint; + @Override + public void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + if (!TextUtils.isEmpty(hint)) { + outState.putString("hint", hint); + } + } + @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); + if (savedInstanceState != null) { + hint = savedInstanceState.getString("hint"); + } + view = View.inflate(getActivity(), R.layout.fragment_home, null); SharedPreferences sp = getActivity().getSharedPreferences( @@ -72,8 +82,7 @@ public class HomeFragment extends Fragment implements View.OnClickListener { DisplayUtils.dip2px(getActivity(), 48))); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - int top = DisplayUtils.getInternalDimensionSize(getResources(), - "status_bar_height"); + int top = DisplayUtils.getInternalDimensionSize(getResources(), "status_bar_height"); home_actionbar.setPadding(0, top, 0, 0); lparams.height += top; } @@ -124,8 +133,7 @@ public class HomeFragment extends Fragment implements View.OnClickListener { searchHint = (TextView) view.findViewById(R.id.actionbar_search_input); searchHint.setOnClickListener(this); - if (!TextUtils.isEmpty(MainActivity.searchHint)) { - hint = MainActivity.searchHint; + if (!TextUtils.isEmpty(hint)) { searchHint.setHint(hint); } } @@ -189,10 +197,12 @@ public class HomeFragment extends Fragment implements View.OnClickListener { } } - public void onEventMainThread(EBTopStatus status) { - if (!TextUtils.isEmpty(status.getSearchHint())) { - hint = status.getSearchHint(); - searchHint.setHint(hint); + public void setHint(String hint) { + if (!TextUtils.isEmpty(hint)) { + this.hint = hint; + if (searchHint != null) { + searchHint.setHint(hint); + } } } diff --git a/app/src/main/java/com/gh/common/util/ConcernContentUtils.java b/app/src/main/java/com/gh/common/util/ConcernContentUtils.java index 19bbf63523..9420398a89 100644 --- a/app/src/main/java/com/gh/common/util/ConcernContentUtils.java +++ b/app/src/main/java/com/gh/common/util/ConcernContentUtils.java @@ -15,7 +15,7 @@ import java.util.List; /** * Created by khy on 2016/11/8. * - * 初始化z资讯关注-内容图片 + * 初始化资讯关注-内容图片 * **/ public class ConcernContentUtils { diff --git a/app/src/main/java/com/gh/common/util/HttpsUtils.java b/app/src/main/java/com/gh/common/util/HttpsUtils.java index 0158283113..288bbde2d3 100644 --- a/app/src/main/java/com/gh/common/util/HttpsUtils.java +++ b/app/src/main/java/com/gh/common/util/HttpsUtils.java @@ -1,8 +1,12 @@ package com.gh.common.util; +import java.io.IOException; +import java.io.InputStream; import java.net.URL; +import java.security.KeyStore; import java.security.SecureRandom; import java.security.cert.CertificateException; +import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; import javax.net.ssl.HostnameVerifier; @@ -11,6 +15,7 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSession; import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.TrustManager; +import javax.net.ssl.TrustManagerFactory; import javax.net.ssl.X509TrustManager; /** @@ -26,7 +31,6 @@ public class HttpsUtils { @Override public void checkServerTrusted(X509Certificate[] chain, String authType) - throws CertificateException { } @@ -42,7 +46,6 @@ public class HttpsUtils { public boolean verify(String hostname, SSLSession session) { return true; } - } private static SSLSocketFactory mSSLSocketFactory; @@ -53,8 +56,12 @@ public class HttpsUtils { SSLContext sc = SSLContext.getInstance("TLS"); sc.init(null, new TrustManager[]{new MyTrustManager()}, new SecureRandom()); mSSLSocketFactory = sc.getSocketFactory(); +// SSLContext sslContext = SSLContext.getInstance("TLS"); +// sslContext.init(null, null, null); +// mSSLSocketFactory = sslContext.getSocketFactory(); mHostnameVerifier = new MyHostnameVerifier(); +// mHostnameVerifier = OkHostnameVerifier.INSTANCE; HttpsURLConnection.setDefaultSSLSocketFactory(mSSLSocketFactory); HttpsURLConnection.setDefaultHostnameVerifier(mHostnameVerifier); @@ -62,4 +69,30 @@ public class HttpsUtils { return (HttpsURLConnection) url.openConnection(); } + public SSLSocketFactory setCertificates(InputStream is) { + try { + CertificateFactory certificateFactory = CertificateFactory.getInstance("X.509"); + KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType()); + keyStore.load(null); + keyStore.setCertificateEntry("0", certificateFactory.generateCertificate(is)); + SSLContext sslContext = SSLContext.getInstance("TLS"); + TrustManagerFactory trustManagerFactory = + TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); + trustManagerFactory.init(keyStore); + sslContext.init(null, trustManagerFactory.getTrustManagers(), new SecureRandom()); + return sslContext.getSocketFactory(); + } catch (Exception e) { + e.printStackTrace(); + } finally { + if (is != null) { + try { + is.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return null; + } + } 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 91bfb7407b..443dff2c61 100644 --- a/app/src/main/java/com/gh/common/util/PackageUtils.java +++ b/app/src/main/java/com/gh/common/util/PackageUtils.java @@ -73,28 +73,19 @@ public class PackageUtils { } /* - * 判断是否可以更新 + * 判断是否可以更新，只判断gh_version的大小 */ public static boolean isCanUpdate(Context context, GameUpdateEntity gameUpdateEntity) { - // 判断是否gh_version是否相同 + // 判断是否gh_version是否存在 String gh_version = (String) PackageUtils.getMetaData( context, gameUpdateEntity.getPackageName(), "gh_version"); if (gh_version != null) { gh_version = gh_version.substring(2); - // 判断gh_version是否相同 - if (gh_version.equals(gameUpdateEntity.getGhVersion())) { - // 判断version是否相同 - String version = PackageUtils.getVersionByPackage( - context, gameUpdateEntity.getPackageName()); - if (version != null && version.equals(gameUpdateEntity.getVersion())) { - // 版本相同,无需显示插件更新,继续查看是否有可更新的游戏包 - return false; - } - } + // 判断gh_version的大小 + return Long.parseLong(gh_version) < Long.parseLong(gameUpdateEntity.getGhVersion()); } else { return false; } - return true; } /* @@ -102,10 +93,7 @@ public class PackageUtils { */ public static boolean isSignature(Context context, String packageName) { String signature = getApkSignatureByPackageName(context, packageName); - if (publicKey.equals(signature)) { - return true; - } - return false; + return publicKey.equals(signature); } /* 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 8e9730c3b9..00b999ab3d 100644 --- a/app/src/main/java/com/gh/common/util/PostCommentUtils.java +++ b/app/src/main/java/com/gh/common/util/PostCommentUtils.java @@ -18,8 +18,12 @@ import org.json.JSONObject; */ public class PostCommentUtils { - public static void addCommentData(final String url, final String content, final Context context, - final PostCommentListener listener) { + public static void addCommentData(Context context, String url, String content, PostCommentListener listener) { + addCommentData(context, url, content, true, listener); + } + + public static void addCommentData(final Context context, final String url, final String content, + final boolean isCheck, final PostCommentListener listener) { new Thread(new Runnable() { @Override public void run() { @@ -36,8 +40,7 @@ public class PostCommentUtils { @Override public void onErrorResponse(VolleyError error) { if (error.networkResponse != null && error.networkResponse.statusCode == 401) { - TokenUtils.getToken(context, false); - addCommentData(url, content, context, listener); + addCommentData(context, url, content, false, listener); return; } if (listener != null){ @@ -46,13 +49,17 @@ public class PostCommentUtils { } }); request.setShouldCache(false); - request.addHeader("TOKEN", TokenUtils.getToken(context)); + request.addHeader("TOKEN", TokenUtils.getToken(context, isCheck)); AppController.addToRequestQueue(request); } }).start(); } - public static void addCommentVoto(final String newsId, final Context context) { + public static void addCommentVoto(final Context context, final String newsId) { + addCommentVoto(context, newsId, true); + } + + public static void addCommentVoto(final Context context, final String newsId, final boolean isCheck) { new Thread(new Runnable() { @Override public void run() { @@ -63,13 +70,12 @@ public class PostCommentUtils { @Override public void onErrorResponse(VolleyError error) { if (error.networkResponse != null && error.networkResponse.statusCode == 401) { - TokenUtils.getToken(context, false); - addCommentVoto(newsId, context); + addCommentVoto(context, newsId, false); } } }); request.setShouldCache(false); - request.addHeader("TOKEN", TokenUtils.getToken(context)); + request.addHeader("TOKEN", TokenUtils.getToken(context, isCheck)); AppController.addToRequestQueue(request); } }).start(); diff --git a/app/src/main/java/com/gh/common/util/RunningUtils.java b/app/src/main/java/com/gh/common/util/RunningUtils.java index 2ce68b4fe5..917b70ad3a 100644 --- a/app/src/main/java/com/gh/common/util/RunningUtils.java +++ b/app/src/main/java/com/gh/common/util/RunningUtils.java @@ -85,8 +85,8 @@ public class RunningUtils { .getSystemService(Context.ACTIVITY_SERVICE); List infos = activityManager.getRunningTasks(100); for (RunningTaskInfo info : infos) { - if (info.topActivity.getPackageName().equals( - context.getPackageName())) { + if (info.topActivity.getPackageName().equals(context.getPackageName()) + && info.baseActivity.getPackageName().equals(context.getPackageName())) { return true; } } diff --git a/app/src/main/java/com/gh/common/util/TimestampUtils.java b/app/src/main/java/com/gh/common/util/TimestampUtils.java index a84ef4905b..05149b749d 100644 --- a/app/src/main/java/com/gh/common/util/TimestampUtils.java +++ b/app/src/main/java/com/gh/common/util/TimestampUtils.java @@ -49,6 +49,8 @@ public class TimestampUtils { intervalMap.put("^" + Config.HOST + "support/setting/platform" + "$", 120); intervalMap.put("^" + Config.HOST + "update/package/.+" + "$", 125); intervalMap.put("^" + Config.HOST + "update/game/.+/package/.+" + "$", 130); + intervalMap.put("^" + Config.COMMENT_HOST + "article/.+/comment\\?limit=10\\&offset=.+" + "$", 135); + intervalMap.put("^" + Config.COMMENT_HOST + "article/.+/comment\\?order=hot\\&limit=10\\&offset=.+" + "$", 140); } private static void initCDMap() { @@ -79,6 +81,8 @@ public class TimestampUtils { cdMap.put("^" + Config.HOST + "support/setting/platform" + "$", Constants.PLATFORM_CD); cdMap.put("^" + Config.HOST + "update/package/.+" + "$", Constants.UPDATE_CD); cdMap.put("^" + Config.HOST + "update/game/.+/package/.+" + "$", Constants.UPDATE_CD); + cdMap.put("^" + Config.COMMENT_HOST + "article/.+/comment\\?limit=10\\&offset=.+" + "$", Constants.COMMENT_CD); + cdMap.put("^" + Config.COMMENT_HOST + "article/.+/comment\\?order=hot\\&limit=10\\&offset=.+" + "$", Constants.COMMENT_CD); cdMap.put("^" + Config.HOST + "device/.+/concern" + "$", 0); cdMap.put("^" + Config.HOST + "device/.+/concern/.+" + "$", 0); cdMap.put("^" + Config.HOST + "stat/download" + "$", 0); diff --git a/app/src/main/java/com/gh/common/view/KeyboardLayout.java b/app/src/main/java/com/gh/common/view/KeyboardLayout.java deleted file mode 100644 index 2733099d2e..0000000000 --- a/app/src/main/java/com/gh/common/view/KeyboardLayout.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.gh.common.view; - -import android.content.Context; -import android.util.AttributeSet; -import android.widget.RelativeLayout; - -public class KeyboardLayout extends RelativeLayout { - - private OnKeyboardChangedListener mListener; - - public KeyboardLayout(Context context) { - super(context); - - } - - public KeyboardLayout(Context context, AttributeSet attrs) { - super(context, attrs); - - } - - @Override - protected void onSizeChanged(int w, int h, int oldw, int oldh) { - - super.onSizeChanged(w, h, oldw, oldh); - if (mListener != null) { - mListener.OnKeyboardChanged(w, h, oldw, oldh); - } - } - - public interface OnKeyboardChangedListener { - void OnKeyboardChanged(int w, int h, int oldw, int oldh); - } - - public void setOnKeyboardChangedListener(OnKeyboardChangedListener listener) { - this.mListener = listener; - } - -} diff --git a/app/src/main/java/com/gh/common/view/MyRecyclerView.java b/app/src/main/java/com/gh/common/view/MyRecyclerView.java deleted file mode 100644 index fd0c18f1ba..0000000000 --- a/app/src/main/java/com/gh/common/view/MyRecyclerView.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.gh.common.view; - -import android.content.Context; -import android.support.v7.widget.RecyclerView; -import android.util.AttributeSet; -import android.view.MotionEvent; - -/** - * 重写RecyclerView 解决触摸事件 - * - * @author 黄壮华 - * - */ -public class MyRecyclerView extends RecyclerView { - - public static boolean isCanMove = false; - - public MyRecyclerView(Context context, AttributeSet attrs) { - super(context, attrs); - - } - - private float xDis; - - @Override - public boolean dispatchTouchEvent(MotionEvent ev) { - - switch (ev.getAction()) { - case MotionEvent.ACTION_DOWN: - xDis = ev.getX(); - break; - case MotionEvent.ACTION_MOVE: - if (isCanMove) { - if (xDis - ev.getX() > 0) { - MyViewPager.isCanMove = true; - return false; - } else if (xDis - ev.getX() < 0) { - isCanMove = false; - } - } - xDis = ev.getX(); - break; - default: - break; - } - return super.dispatchTouchEvent(ev); - } -} diff --git a/app/src/main/java/com/gh/common/view/MyViewPager.java b/app/src/main/java/com/gh/common/view/MyViewPager.java deleted file mode 100644 index dac749a28c..0000000000 --- a/app/src/main/java/com/gh/common/view/MyViewPager.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.gh.common.view; - -import android.content.Context; -import android.support.v4.view.ViewPager; -import android.util.AttributeSet; -import android.view.MotionEvent; - -/** - * 重写ViewPager 解决触摸事件 - * - * @author 黄壮华 - * - */ -public class MyViewPager extends ViewPager { - - public static boolean isCanMove = false; - - public MyViewPager(Context context, AttributeSet attrs) { - super(context, attrs); - - } - - @Override - public boolean onInterceptTouchEvent(MotionEvent ev) { - - switch (ev.getAction()) { - case MotionEvent.ACTION_MOVE: - if (isCanMove) { - return true; - } - break; - default: - break; - } - return super.onInterceptTouchEvent(ev); - } - - @Override - public boolean dispatchTouchEvent(MotionEvent ev) { - - switch (ev.getAction()) { - case MotionEvent.ACTION_DOWN: - isCanMove = false; - break; - case MotionEvent.ACTION_MOVE: - if (isCanMove) { - return onTouchEvent(ev); - } - break; - case MotionEvent.ACTION_UP: - if (isCanMove) { - return onTouchEvent(ev); - } - break; - default: - break; - } - return super.dispatchTouchEvent(ev); - } -} diff --git a/app/src/main/java/com/gh/download/DownloadTask.java b/app/src/main/java/com/gh/download/DownloadTask.java index cd287ba6dc..6d073e7698 100644 --- a/app/src/main/java/com/gh/download/DownloadTask.java +++ b/app/src/main/java/com/gh/download/DownloadTask.java @@ -123,6 +123,9 @@ public class DownloadTask implements DownloadListener { || status == DownloadStatus.notfound) { entry.setProgress(0); entry.setPercent(0); + if (status == DownloadStatus.hijack) { + entry.setError(error); + } FileUtils.deleteFile(entry.getPath()); DownloadDao.getInstance(context).delete(entry.getUrl()); Utils.log(DownloadTask.class.getSimpleName(), diff --git a/app/src/main/java/com/gh/download/DownloadThread.java b/app/src/main/java/com/gh/download/DownloadThread.java index 2b71b6f80b..7d16f06fe2 100644 --- a/app/src/main/java/com/gh/download/DownloadThread.java +++ b/app/src/main/java/com/gh/download/DownloadThread.java @@ -86,7 +86,7 @@ public class DownloadThread extends Thread { //链接被劫持，抛出异常 Utils.log("eTag = " + eTag); Utils.log("eTag2 = " + eTag2); - listener.onStatusChanged(DownloadStatus.hijack); + listener.onStatusChanged(DownloadStatus.hijack, connection.getURL().toString()); Utils.log(DownloadThread.class.getSimpleName(), "error-->链接被劫持"); return; } diff --git a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java index 1c14ad8f3f..58575ab9f9 100644 --- a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java @@ -8,7 +8,6 @@ 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; @@ -28,8 +27,6 @@ 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; @@ -210,7 +207,6 @@ 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 8bc9327b73..e2149fc781 100644 --- a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java @@ -10,11 +10,11 @@ import android.widget.RelativeLayout; import com.android.volley.Response; import com.android.volley.VolleyError; import com.gh.base.AppController; -import com.gh.base.DetailActivity; +import com.gh.base.BaseDetailActivity; import com.gh.common.constant.Config; import com.gh.common.util.DataUtils; import com.gh.common.util.DialogUtils; -import com.gh.gamecenter.changeskin.InitChangeSkinUtils; +import com.gh.gamecenter.changeskin.ChangeSkinUtils; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.eventbus.EBConcernChanged; import com.gh.gamecenter.gamedetail.GameDetailAdapter; @@ -30,9 +30,7 @@ import java.util.Map; /** * Created by khy on 2016/8/12. */ -public class GameDetailActivity extends DetailActivity implements View.OnClickListener{ - - public static final String TAG = GameDetailActivity.class.getSimpleName(); +public class GameDetailActivity extends BaseDetailActivity implements View.OnClickListener{ private GameDetailAdapter adapter; @@ -141,7 +139,7 @@ public class GameDetailActivity extends DetailActivity implements View.OnClickLi String url = "http://www.ghzhushou.com/game/" + adapter.getGameDetailEntity().getShareCode(); showShare(url, gameEntity.getName(), gameEntity.getIcon(), null, gameEntity.getTag(), entrance, "游戏"); } else if (v == actionbar_rl_back) { - if (InitChangeSkinUtils.isChecking) { + if (ChangeSkinUtils.isChecking) { DialogUtils.showWarningDialog(GameDetailActivity.this, "退出提示", "素材更新还在检测中，如果强行退出会中断所有进度，确定退出？", "取消", "强行退出", new DialogUtils.ConfiremListener() { @@ -181,7 +179,7 @@ public class GameDetailActivity extends DetailActivity implements View.OnClickLi reuse_no_connection.setVisibility(View.VISIBLE); } }); - AppController.addToRequestQueue(request, TAG); + AppController.addToRequestQueue(request); } // 关注事件 @@ -229,15 +227,9 @@ public class GameDetailActivity extends DetailActivity implements View.OnClickLi } } - @Override - protected void onDestroy() { - super.onDestroy(); - AppController.canclePendingRequests(TAG); - } - @Override public boolean onKeyDown(int keyCode, KeyEvent event) { - if (keyCode == KeyEvent.KEYCODE_BACK && event.getRepeatCount() == 0 && InitChangeSkinUtils.isChecking) { + if (keyCode == KeyEvent.KEYCODE_BACK && event.getRepeatCount() == 0 && ChangeSkinUtils.isChecking) { DialogUtils.showWarningDialog(GameDetailActivity.this, "退出提示", "素材更新还在检测中，如果强行退出会中断所有进度，确定退出？", "取消", "强行退出", new DialogUtils.ConfiremListener() { diff --git a/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java b/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java index bdf2f78b33..a5a64f12c3 100644 --- a/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java @@ -11,7 +11,6 @@ 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; @@ -25,8 +24,6 @@ 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; @@ -148,12 +145,6 @@ public class GameNewsActivity extends BaseActivity implements View.OnClickListen typeListAdapter.setNewsType(change.getType(), change.getPosition()); } - @Override - protected void onDestroy() { - super.onDestroy(); - AppController.canclePendingRequests(TAG); - } - @Override public void onClick(View v) { if (v == ivSearch){ diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index cc26650d2b..b6ba1301cd 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -64,7 +64,6 @@ import com.gh.gamecenter.eventbus.EBDownloadStatus; import com.gh.gamecenter.eventbus.EBPackage; import com.gh.gamecenter.eventbus.EBShowDialog; import com.gh.gamecenter.eventbus.EBSkip; -import com.gh.gamecenter.eventbus.EBTopStatus; import com.gh.gamecenter.eventbus.EBUISwitch; import com.gh.gamecenter.game.GameFragment; import com.gh.gamecenter.manager.ConcernManager; @@ -109,10 +108,6 @@ import de.greenrobot.event.EventBus; */ public class MainActivity extends BaseFragmentActivity implements OnClickListener { - public static final String TAG = MainActivity.class.getSimpleName(); - - public static String searchHint; - private GameFragment gameFragment; private NewsFragment newsFragment; private PersonalFragment personalFragment; @@ -130,10 +125,13 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene private SharedPreferences sp; private ConcernManager concernManager; + private String searchHint; + private int currentTab; private boolean isShowDownload = false; private boolean isNewFirstLaunch; + private boolean isSkipped; private Handler handler = new Handler(); @@ -217,7 +215,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); } // 统计下载完成事件 @@ -322,6 +320,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene map.put("game", downloadEntity.getName()); map.put("game_id", downloadEntity.getGameId()); map.put("platform", downloadEntity.getPlatform()); + map.put("hijack_url", downloadEntity.getError()); DataCollectionManager.onEvent(MainActivity.this, "hijack", map); // 上传劫持log uploadHijackLog(new HashMap<>(map)); @@ -345,7 +344,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 +372,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); } /* @@ -444,6 +443,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); outState.putInt("currentTab", currentTab); + outState.putBoolean("isSkipped", isSkipped); } @Override @@ -463,9 +463,12 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene sp = getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE); isNewFirstLaunch = sp.getBoolean("isNewFirstLaunchV" + PackageUtils.getVersion(getApplicationContext()), true); + isSkipped = false; + initViews(); if (savedInstanceState != null) { currentTab = savedInstanceState.getInt("currentTab"); + isSkipped = savedInstanceState.getBoolean("isSkipped"); } else if (isNewFirstLaunch) { currentTab = 1; } else { @@ -502,7 +505,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene new Thread(){ @Override public void run() { - // 注册设备 + // 注册设备 TokenUtils.register(MainActivity.this); initConcern(); // 初始化关注 } @@ -589,7 +592,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene } } }); - AppController.addToRequestQueue(request, TAG); + AppController.addToRequestQueue(request); } } @@ -692,7 +695,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene } } }); - AppController.addToRequestQueue(request, TAG); + AppController.addToRequestQueue(request); } } @@ -755,7 +758,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene } } }); - AppController.addToRequestQueue(request, TAG); + AppController.addToRequestQueue(request); } } } @@ -890,7 +893,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene } } }, null); - AppController.addToRequestQueue(request, TAG); + AppController.addToRequestQueue(request); } private int count; @@ -931,7 +934,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene } } }); - AppController.addToRequestQueue(request, TAG); + AppController.addToRequestQueue(request); } } @@ -1023,7 +1026,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene } } }, null); - AppController.addToRequestQueue(request, TAG); + AppController.addToRequestQueue(request); } private Class intentClass(String to) { @@ -1043,7 +1046,9 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene Runnable runnable = new Runnable() { @Override public void run() { - if (getIntent() != null && getIntent().getExtras() != null) { + if (getIntent() != null && getIntent().getExtras() != null + && !isSkipped) { + isSkipped = true; String to = getIntent().getExtras().getString("to"); if(!TextUtils.isEmpty(to)){ Class clazz = intentClass(to); @@ -1080,6 +1085,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); } @@ -1133,12 +1140,17 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene } else { searchHint = searchHintList.get(RandomUtils.nextInt(searchHintList.size())); } - EventBus.getDefault().post(new EBTopStatus("搜索", searchHintList.get(0))); + if (gameFragment != null) { + gameFragment.setHint(searchHint); + } + if (newsFragment != null) { + newsFragment.setHint(searchHint); + } } } } }, null); - AppController.addToRequestQueue(request, TAG); + AppController.addToRequestQueue(request); } private void checkUpdate() { @@ -1192,7 +1204,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene } } }, null); - AppController.addToRequestQueue(request, TAG); + AppController.addToRequestQueue(request); } private void showUpdateDialog(final String md5) { @@ -1336,7 +1348,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()); } @@ -1409,6 +1421,9 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene } if (gameFragment == null) { gameFragment = new GameFragment(); + if (!TextUtils.isEmpty(searchHint)) { + gameFragment.setHint(searchHint); + } transaction.add(R.id.main_content, gameFragment); } } else { @@ -1432,6 +1447,9 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene } if (newsFragment == null) { newsFragment = new NewsFragment(); + if (!TextUtils.isEmpty(searchHint)) { + newsFragment.setHint(searchHint); + } transaction.add(R.id.main_content, newsFragment); } } else { @@ -1587,7 +1605,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene } } }, null); - AppController.addToRequestQueue(request, TAG); + AppController.addToRequestQueue(request); } Map map = new HashMap<>(); @@ -1626,7 +1644,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene } } }, null); - AppController.addToRequestQueue(request, TAG); + AppController.addToRequestQueue(request); } @Override @@ -1639,7 +1657,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/MessageDetailActivity.java b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java index f2059baa2e..452db3c206 100644 --- a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java @@ -10,6 +10,7 @@ import android.os.Bundle; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.text.Editable; +import android.text.TextUtils; import android.text.TextWatcher; import android.view.View; import android.view.ViewTreeObserver; @@ -89,6 +90,12 @@ public class MessageDetailActivity extends BaseActivity implements MessageDetail private CommentDao mCommentDao; + @Override + protected void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + AppController.put("ConcernEntity", adapter.getConcernEntity()); + } + private ConcernEntity mConcernEntity; private String newsId; @@ -139,7 +146,7 @@ public class MessageDetailActivity extends BaseActivity implements MessageDetail }); //检查sp是否有用户信息 - if (sp.getString("user_name", null) == null || sp.getString("user_name" , null).isEmpty()) { + if (TextUtils.isEmpty(sp.getString("user_name", null))) { new Thread(new Runnable() { @Override public void run() { @@ -160,7 +167,6 @@ public class MessageDetailActivity extends BaseActivity implements MessageDetail }); } }).start(); - } else { if (sp.getString("user_icon", "res:///"+ R.drawable.user_default_icon_comment).isEmpty()) { mMessageDetailIconDv.setImageURI("res:///" + R.drawable.user_default_icon_comment); @@ -268,11 +274,6 @@ public class MessageDetailActivity extends BaseActivity implements MessageDetail setSoftInput(true); } - @OnClick(R.id.reuse_no_connection) - public void OnConnectionClikListener() { - showNoConnection(false); - } - @OnTouch(R.id.message_detail_rv) public boolean OnRecyclerTouchListener() { if (mMessageDetailCommentRl.getVisibility() == View.VISIBLE) { @@ -298,12 +299,13 @@ public class MessageDetailActivity extends BaseActivity implements MessageDetail } catch (JSONException e) { e.printStackTrace(); } - if (newsId == null) { newsId = mConcernEntity.getId(); } - PostCommentUtils.addCommentData(Config.COMMENT_HOST + "article/" + newsId + "/comment" - , jsonObject.toString(), MessageDetailActivity.this, new PostCommentUtils.PostCommentListener() { + final String newsId = adapter.getNewsId(); + PostCommentUtils.addCommentData(MessageDetailActivity.this, + Config.COMMENT_HOST + "article/" + newsId + "/comment", jsonObject.toString(), + new PostCommentUtils.PostCommentListener() { @Override public void postSucced(JSONObject response) { mSendingDialog.dismiss(); diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java index 898de78f2f..b2c2230c58 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java @@ -19,7 +19,7 @@ import com.android.volley.Response; import com.android.volley.TimeoutError; import com.android.volley.VolleyError; import com.gh.base.AppController; -import com.gh.base.DetailActivity; +import com.gh.base.BaseDetailActivity; import com.gh.common.constant.Config; import com.gh.common.util.DataUtils; import com.gh.common.util.DisplayUtils; @@ -42,9 +42,7 @@ import java.util.Map; * * @author 黄壮华 */ -public class NewsDetailActivity extends DetailActivity implements OnClickListener { - - public static final String TAG = NewsDetailActivity.class.getSimpleName(); +public class NewsDetailActivity extends BaseDetailActivity implements OnClickListener { private NewsDetailAdapter adapter; @@ -261,7 +259,7 @@ public class NewsDetailActivity extends DetailActivity implements OnClickListene } } }); - AppController.addToRequestQueue(request, TAG); + AppController.addToRequestQueue(request); } private long[] mHits = new long[2]; @@ -344,7 +342,7 @@ public class NewsDetailActivity extends DetailActivity implements OnClickListene } } }, null); - AppController.addToRequestQueue(gameRequest, TAG); + AppController.addToRequestQueue(gameRequest); } // 关注事件 @@ -417,10 +415,4 @@ public class NewsDetailActivity extends DetailActivity implements OnClickListene } } - @Override - protected void onDestroy() { - super.onDestroy(); - AppController.canclePendingRequests(TAG); - } - } diff --git a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java index dc680d4352..e8e65b609c 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java @@ -44,11 +44,10 @@ import java.util.Map; /** * Created by khy on 2016/8/22. + * 新闻搜索界面 */ public class NewsSearchActivity extends BaseActivity { - public static final String TAG = NewsSearchActivity.class.getSimpleName(); - private RecyclerView gamedetail_news_rv; private List newsEntities; private NewsSearchAdapter searchAdapter; @@ -221,7 +220,7 @@ public class NewsSearchActivity extends BaseActivity { searchAdapter.notifyItemChanged(searchAdapter.getItemCount() - 1); } }); - AppController.addToRequestQueue(request, TAG); + AppController.addToRequestQueue(request); } private void removeDuplicateData(ArrayList newsList) { @@ -241,12 +240,6 @@ public class NewsSearchActivity extends BaseActivity { } } - @Override - protected void onDestroy() { - super.onDestroy(); - AppController.canclePendingRequests(TAG); - } - public class NewsSearchAdapter extends RecyclerView.Adapter{ @Override public int getItemViewType(int position) { diff --git a/app/src/main/java/com/gh/gamecenter/PluginActivity.java b/app/src/main/java/com/gh/gamecenter/PluginActivity.java index 8c6db5a379..7e1a498acb 100644 --- a/app/src/main/java/com/gh/gamecenter/PluginActivity.java +++ b/app/src/main/java/com/gh/gamecenter/PluginActivity.java @@ -7,7 +7,6 @@ import android.view.View; import android.widget.LinearLayout; import com.gc.materialdesign.views.ProgressBarCircularIndeterminate; -import com.gh.base.AppController; import com.gh.base.BaseActivity; import com.gh.common.util.DownloadItemUtils; import com.gh.download.DataWatcher; @@ -24,11 +23,10 @@ import java.util.List; /** * Created by LGT on 2016/7/6. + * 可插件化界面 */ 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; @@ -165,9 +163,4 @@ public class PluginActivity extends BaseActivity { DownloadManager.getInstance(this).addObserver(dataWatcher); } - @Override - protected void onDestroy() { - super.onDestroy(); - AppController.canclePendingRequests(TAG); - } } diff --git a/app/src/main/java/com/gh/gamecenter/SettingActivity.java b/app/src/main/java/com/gh/gamecenter/SettingActivity.java index bd21116de3..2196a8f1ef 100644 --- a/app/src/main/java/com/gh/gamecenter/SettingActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SettingActivity.java @@ -65,8 +65,6 @@ 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, setting_sb_concerngame; private TextView setting_tv_version, app_tv_speed, app_tv_percent, @@ -409,8 +407,7 @@ public class SettingActivity extends BaseActivity implements OnClickListener { appEntity = gson.fromJson(response.toString(), AppEntity.class); - float version = Float.valueOf(appEntity - .getVersion()); + float version = Float.valueOf(appEntity.getVersion()); float currentVersion = Float.valueOf(PackageUtils.getVersion(getApplicationContext())); if (version > currentVersion) { @@ -450,7 +447,7 @@ public class SettingActivity extends BaseActivity implements OnClickListener { toast("检查更新失败"); } }); - AppController.addToRequestQueue(request, TAG); + AppController.addToRequestQueue(request); } private void showUpdateDialog(final String md5) { @@ -472,10 +469,7 @@ public class SettingActivity extends BaseActivity implements OnClickListener { @Override public void onClick(View v) { if (appEntity.isForce()) { - Intent data = new Intent(); - data.putExtra("isForce", true); - setResult(RESULT_OK, data); - finish(); + AppController.getInstance().finishActivity(); } else { updateDialog.dismiss(); } @@ -525,10 +519,7 @@ public class SettingActivity extends BaseActivity implements OnClickListener { DownloadManager.getInstance(getApplicationContext()).cancel( appEntity.getUrl()); if (appEntity.isForce()) { - Intent data = new Intent(); - data.putExtra("isForce", true); - setResult(RESULT_OK, data); - finish(); + AppController.getInstance().finishActivity(); } else { downloadDialog.dismiss(); isShowDownload = false; @@ -586,7 +577,7 @@ public class SettingActivity extends BaseActivity implements OnClickListener { StringExtendedRequest request = new StringExtendedRequest(Request.Method.POST, url, null, null); request.setParams(params); request.setShouldCache(false); - AppController.addToRequestQueue(request, TAG); + AppController.addToRequestQueue(request); Utils.log("提交更新数据" + new JSONObject(params).toString()); } @@ -609,6 +600,5 @@ public class SettingActivity extends BaseActivity implements OnClickListener { protected void onDestroy() { saveCurrentSetting(); super.onDestroy(); - AppController.canclePendingRequests(TAG); } } diff --git a/app/src/main/java/com/gh/gamecenter/SkipActivity.java b/app/src/main/java/com/gh/gamecenter/SkipActivity.java index 60236df69c..b9a0fcb438 100644 --- a/app/src/main/java/com/gh/gamecenter/SkipActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SkipActivity.java @@ -1,9 +1,12 @@ package com.gh.gamecenter; import android.content.Intent; +import android.net.Uri; import android.os.Bundle; +import android.text.TextUtils; import com.gh.base.BaseActivity; +import com.gh.common.util.PlatformUtils; import com.gh.common.util.RunningUtils; /** @@ -18,7 +21,10 @@ public class SkipActivity extends BaseActivity { if (getIntent() != null) { String host = getIntent().getData().getHost(); - String id = getIntent().getData().getPath().substring(1); + String id = getIntent().getData().getPath(); + if (!TextUtils.isEmpty(id)) { + id = id.substring(1); + } Intent intent = new Intent(); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.putExtra("entrance", "(网页跳转)"); @@ -34,6 +40,9 @@ public class SkipActivity extends BaseActivity { intent.setClass(this, SubjectActivity.class); 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 { // 应用未在运行 @@ -51,8 +60,14 @@ public class SkipActivity extends BaseActivity { intent.putExtra("to", "SubjectActivity"); intent.putExtra("id", id); intent.putExtra("name", getIntent().getData().getQueryParameter("name")); + } else if ("suggestion".equals(host)) { + Uri uri = getIntent().getData(); + String content = "【" + uri.getQueryParameter("game_name") + + "-" + PlatformUtils.getInstance(this).getPlatformName(uri.getQueryParameter("platform")) + + "-V" + uri.getQueryParameter("version") + "】"; + intent.putExtra("content", content); + intent.putExtra("to", "SuggestionActivity"); } - } startActivity(intent); } diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java index 1fb675a744..c37992a4c7 100644 --- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java @@ -27,6 +27,7 @@ import com.gh.common.util.FileUtils; import com.gh.common.util.PackageUtils; import com.gh.common.util.TimestampUtils; import com.gh.common.util.TokenUtils; +import com.gh.common.util.Utils; import com.gh.download.DownloadManager; import com.gh.download.DownloadService; import com.gh.gamecenter.db.info.FilterInfo; @@ -77,6 +78,12 @@ public class SplashScreenActivity extends BaseActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + // 处理助手已经在后台运行导致的再次启动助手 + if ((getIntent().getFlags() & Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT) != 0) { + finish(); + return; + } + start = System.currentTimeMillis(); TimestampUtils.initMap(); @@ -113,6 +120,12 @@ public class SplashScreenActivity extends BaseActivity { } } + @Override + protected void onNewIntent(Intent intent) { + super.onNewIntent(intent); + Utils.log("flags---------------onNewIntent"); + } + private class ViewPagerAdapter extends PagerAdapter { private int[] pics = { R.drawable.splash_01 }; @@ -423,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..fa744797c0 100644 --- a/app/src/main/java/com/gh/gamecenter/SubjectActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SubjectActivity.java @@ -7,7 +7,6 @@ import android.view.View; import android.widget.LinearLayout; import com.gc.materialdesign.views.ProgressBarCircularIndeterminate; -import com.gh.base.AppController; import com.gh.base.BaseActivity; import com.gh.common.util.DownloadItemUtils; import com.gh.download.DataWatcher; @@ -24,8 +23,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 +181,4 @@ public class SubjectActivity extends BaseActivity { DownloadManager.getInstance(getApplicationContext()).removeObserver(dataWatcher); } - @Override - public void onDestroy() { - super.onDestroy(); - AppController.canclePendingRequests(TAG); - } } diff --git a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java index 8d2bef6caf..fd994a2a8f 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java @@ -41,8 +41,6 @@ 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; @@ -86,6 +84,12 @@ public class SuggestionActivity extends BaseActivity implements OnClickListener } }); + + String content = getIntent().getStringExtra("content"); + if (!TextUtils.isEmpty(content)) { + et_suggest_content.setText(content); + et_suggest_content.setSelection(et_suggest_content.getText().length()); + } } @Override @@ -223,7 +227,7 @@ public class SuggestionActivity extends BaseActivity implements OnClickListener } }); request.setShouldCache(false); - AppController.addToRequestQueue(request, TAG); + AppController.addToRequestQueue(request); } 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 b60066669e..f253df411b 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java @@ -92,7 +92,7 @@ public class ConcernAdapter extends RecyclerView.Adapter { } } }); - AppController.addToRequestQueue(concernObjectRequest, ConcernActivity.TAG); + AppController.addToRequestQueue(concernObjectRequest); } } 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 e4aba641a5..d198262cc5 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java @@ -98,7 +98,7 @@ public class ConcernRecommendAdapter extends RecyclerView.Adapter list) { 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 97b618c770..565cbb276e 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java @@ -26,7 +26,6 @@ import com.gh.common.util.NewsUtils; import com.gh.common.util.PostCommentUtils; import com.gh.common.util.Utils; import com.gh.common.view.CardLinearLayout; -import com.gh.gamecenter.GameNewsActivity; import com.gh.gamecenter.MessageDetailActivity; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; @@ -138,7 +137,7 @@ public class MessageDetailAdapter extends RecyclerView.Adapter() { @Override @@ -161,14 +160,14 @@ public class MessageDetailAdapter extends RecyclerView.Adapter() { @@ -200,7 +199,7 @@ public class MessageDetailAdapter extends RecyclerView.Adapter patchDatas = new ArrayList(); - private static List updatePatchList; + private static List patchDatas = new ArrayList(); + private static List updatePatchList; private static Timer timer; private static Timer poiTimer; @@ -65,13 +64,13 @@ public class InitChangeSkinUtils { if( "".equals(jsonRuslt) ){ startCheckMD5Thread(); }else { - List patchData = parseDesPatchJson(jsonRuslt); + List patchData = parseDesPatchJson(jsonRuslt); patchDatas.addAll(patchData); if( patchData.size() < SkinConfig.perPage ) { startCheckMD5Thread(); }else{ - pageNum += 1; - String urlPath = SkinConfig.JSON_PATCHURL.replace( "*", ""+pageNum ); + pageNum++; + String urlPath = SkinConfig.JSON_PATCHURL + pageNum; DownloadUtils.downloadJson( urlPath, handler ); } } @@ -179,7 +178,7 @@ public class InitChangeSkinUtils { changeViewState( showTxt, "blue", SkinConfig.TYPE_DESUPDATE, false ); startSetPoint(); - String urlPath = SkinConfig.JSON_PATCHURL.replace( "*", ""+pageNum ); + String urlPath = SkinConfig.JSON_PATCHURL + pageNum; //下载数据json DownloadUtils.downloadJson( urlPath, handler); } @@ -256,21 +255,21 @@ public class InitChangeSkinUtils { } //比较文件的MD5值，返回MD5值不同的文件个数 - private static void relMD5File( Map dirMD5Map ) { - updatePatchList = new ArrayList(); + private static void relMD5File( Map dirMD5Map ) { + updatePatchList = new ArrayList(); int patchSize = 0; curMD5Num = 0; //获取目录下所有文件的 MD5 值 for ( int i = 0; i < patchDatas.size(); i++ ) { - PatchData data = patchDatas.get( i ); - String path = data.filePath; - String updateMD5 = data.MD5; + PatchEntity data = patchDatas.get( i ); + String path = data.path; + String updateMD5 = data.md5; String updateUrl = data.url; String updateSize = data.size; //替换地址中标识符& String replacePath = path.replace("&", SkinConfig.patchVersion); - patchDatas.get(i).filePath = replacePath; + patchDatas.get(i).path = replacePath; String localMD5 = dirMD5Map.get( "/" + replacePath ); if ( localMD5 != null ) { @@ -298,8 +297,8 @@ public class InitChangeSkinUtils { final Thread checkMD5Thrad = new Thread(new Runnable() { @Override public void run() { - localMD5Num = GetFileMD5Utils.getDirNum(new File(filePath)); - Map dirMD5Map = GetFileMD5Utils.getDirMD5(new File(filePath), true, handler); + localMD5Num = FileMD5Utils.getDirNum(new File(filePath)); + Map dirMD5Map = FileMD5Utils.getDirMD5(new File(filePath), handler); Message msg = Message.obtain(); msg.obj = dirMD5Map; msg.what = SkinConfig.MSG_MD5_OVER; @@ -310,32 +309,10 @@ public class InitChangeSkinUtils { } //解析json数据 - private static List parseDesPatchJson(String jsonString) { - List patchList = new ArrayList(); - JSONArray fileArray; - try { - fileArray = new JSONArray(jsonString); - for(int i = 0; i < fileArray.length(); i++ ) { - PatchData patchData = new PatchData(); - JSONObject fileObject = fileArray.getJSONObject(i); - - String md5 = fileObject.getString("md5"); - String size = fileObject.getString("size"); - String path = fileObject.getString("path"); - String url = fileObject.getString("url"); - - patchData.MD5 = md5; - patchData.size = size; - patchData.filePath = path; - patchData.url = url; - - patchList.add(patchData); - } - return patchList; - } catch (JSONException e) { - e.printStackTrace(); - return null; - } + private static List parseDesPatchJson(String jsonString) { + Type listType = new TypeToken>() {}.getType(); + Gson gson = new Gson(); + return gson.fromJson(jsonString, listType); } //指定目录，下载替换文件 @@ -353,8 +330,8 @@ public class InitChangeSkinUtils { } downPosition = i; - PatchData patchData = updatePatchList.get( i ); - String filePath = patchData.filePath; + PatchEntity patchData = updatePatchList.get( i ); + String filePath = patchData.path; Utils.log("updateProgress---" + updatePatchList.size() + "::" + i); DownloadUtils.saveUrlToFile( filePath, patchData.url, handler ); } diff --git a/app/src/main/java/com/gh/gamecenter/changeskin/DownloadUtils.java b/app/src/main/java/com/gh/gamecenter/changeskin/DownloadUtils.java index 22e437b1ae..857b278322 100644 --- a/app/src/main/java/com/gh/gamecenter/changeskin/DownloadUtils.java +++ b/app/src/main/java/com/gh/gamecenter/changeskin/DownloadUtils.java @@ -5,10 +5,6 @@ import android.os.Message; import com.gh.common.util.Utils; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - import java.io.BufferedInputStream; import java.io.ByteArrayOutputStream; import java.io.File; @@ -17,57 +13,72 @@ import java.io.IOException; import java.io.InputStream; import java.net.HttpURLConnection; import java.net.URL; -import java.util.ArrayList; -import java.util.List; /** * Created by yyq on 2016/11/3. + * */ public class DownloadUtils { - //下载需要替换的文件 - public static void saveUrlToFile(String filePath, String destUrl, Handler handler) { - int BUFFER_SIZE = 2048 * 2048; - FileOutputStream fos = null; - BufferedInputStream bis = null; - HttpURLConnection httpUrl = null; - URL url = null; - byte[] buf = new byte[ BUFFER_SIZE ]; - int size = 0; + private static final int BUFFER_SIZE = 2048 * 2048; + private static final int CONNECT_TIME = 5000; + private static final int READ_TIME = 5000; - //建立链接 + //下载需要替换的文件 + public static void saveUrlToFile(String filePath, String url, Handler handler) { + BufferedInputStream bis = null; + FileOutputStream fos = null; try { - url = new URL( destUrl ); - httpUrl = (HttpURLConnection) url.openConnection(); + // 建立链接 + HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection(); + connection.setRequestMethod("GET"); + connection.setConnectTimeout(CONNECT_TIME); + connection.setReadTimeout(READ_TIME); + connection.setDoInput(true); //连接指定的资源 - httpUrl.connect(); + connection.connect(); //获取网络输入流 - bis = new BufferedInputStream( httpUrl.getInputStream() ); - File file = new File( filePath ); + bis = new BufferedInputStream(connection.getInputStream()); + File file = new File(filePath); if(!file.exists()) { - if( !file.getParentFile().exists() ) { - file.getParentFile().mkdirs(); + File dir = file.getParentFile(); + if (dir.exists() || dir.mkdirs()) { + file.createNewFile(); } - file.createNewFile(); } Utils.log("createNewFile::" + file.getName() + "::" + file.getAbsolutePath() + "::" + file.exists() + "::" + file.isFile()); fos = new FileOutputStream(file); //保存文件 - while ( ( size = bis.read( buf ) ) != -1) - fos.write( buf, 0, size ); + int size; + byte[] buffer = new byte[BUFFER_SIZE]; + while ((size = bis.read(buffer)) != -1) { + fos.write(buffer, 0, size); + } + fos.flush(); Utils.log("updateProgress---saveUrlToFile"); - handler.sendEmptyMessage( SkinConfig.MSG_PROGRESS_UPDATE ); - - fos.close(); - bis.close(); - httpUrl.disconnect(); - } catch (Exception e) { + handler.sendEmptyMessage(SkinConfig.MSG_PROGRESS_UPDATE); + } catch (IOException e) { Utils.log("saveUrlToFile::" + e.toString()); - InitChangeSkinUtils.NetWorkErrorControl(); + ChangeSkinUtils.NetWorkErrorControl(); //出现异常暂停下载 e.printStackTrace(); + } finally { + if (bis != null) { + try { + bis.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + if (fos != null) { + try { + fos.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } } } @@ -124,37 +135,6 @@ public class DownloadUtils { } - - //解析json数据 - private static List parseDesPatchJson(String jsonString) { - List patchList = new ArrayList(); - JSONArray fileArray; - try { - fileArray = new JSONArray(jsonString); - for(int i = 0; i < fileArray.length(); i++ ) { - PatchData patchData = new PatchData(); - JSONObject fileObject = fileArray.getJSONObject(i); - - String md5 = fileObject.getString("md5"); - String size = fileObject.getString("size"); - String path = fileObject.getString("path"); - String url = fileObject.getString("url"); - - patchData.MD5 = md5; - patchData.size = size; - patchData.filePath = path; - patchData.url = url; - - patchList.add(patchData); - } - return patchList; - } catch (JSONException e) { - e.printStackTrace(); - return null; - } - } - - private static byte[] readStream(InputStream inputStream) throws IOException { ByteArrayOutputStream bout = new ByteArrayOutputStream(); byte[] buffer = new byte[1024]; diff --git a/app/src/main/java/com/gh/gamecenter/changeskin/GetFileMD5Utils.java b/app/src/main/java/com/gh/gamecenter/changeskin/FileMD5Utils.java similarity index 54% rename from app/src/main/java/com/gh/gamecenter/changeskin/GetFileMD5Utils.java rename to app/src/main/java/com/gh/gamecenter/changeskin/FileMD5Utils.java index c4a43511bd..6d7bca66cf 100644 --- a/app/src/main/java/com/gh/gamecenter/changeskin/GetFileMD5Utils.java +++ b/app/src/main/java/com/gh/gamecenter/changeskin/FileMD5Utils.java @@ -11,21 +11,21 @@ import java.util.Map; /** * Created by yyq on 2016/11/2. + * */ -public class GetFileMD5Utils { +public class FileMD5Utils { + /** * 获取单个文件的MD5值！ - - * @param file - * @return + * @param file 文件 + * @return md5 */ - public static String getFileMD5(File file) { if (!file.isFile()) { return null; } - MessageDigest digest = null; - FileInputStream in = null; + MessageDigest digest; + FileInputStream in; byte buffer[] = new byte[1024]; int len; try { @@ -42,18 +42,17 @@ public class GetFileMD5Utils { BigInteger bigInt = new BigInteger(1, digest.digest()); - if(bigInt.toString().length()<39) { + if (bigInt.toString().length() < 39) { int length = bigInt.toString(16).length(); - if(length < 32){ + if (length < 32) { String bigStr = bigInt.toString(16); - for(int i=0; i<(32-length); i++){ + for (int i = 0; i < (32 - length); i++) { bigStr = "0" + bigStr; } return bigStr; } } - return bigInt.toString(16); } @@ -62,48 +61,48 @@ public class GetFileMD5Utils { /** * 获取文件夹中文件的MD5值 * - * @param file - * @param listChild - * ;true递归子目录中的文件 - * @param handler - * @return + * @param folder 文件夹 + * @param handler handler + * @return 文件MD5 map */ - public static Map getDirMD5(File file, boolean listChild, Handler handler) { - if (!file.isDirectory()) { - return null; + public static Map getDirMD5(File folder, Handler handler) { + Map map = new HashMap<>(); + if (!folder.isDirectory()) { + return map; } - Map map = new HashMap(); String md5; - File files[] = file.listFiles(); - for (int i = 0; i < files.length; i++) { - File f = files[i]; - if (f.isDirectory() && listChild) { - map.putAll(getDirMD5(f, listChild, handler)); + for (File file : folder.listFiles()) { + if (file.isDirectory()) { + map.putAll(getDirMD5(file, handler)); } else { - md5 = getFileMD5(f); - handler.sendEmptyMessage( SkinConfig.MSG_MD5_PROGRSS ); + md5 = getFileMD5(file); + handler.sendEmptyMessage(SkinConfig.MSG_MD5_PROGRSS); if (md5 != null) { - map.put(f.getPath(), md5); + map.put(file.getPath(), md5); } } } return map; } - - public static int getDirNum(File file) { + /** + * 获取文件夹下文件数量 + * @param folder 文件夹 + * @return 文件数量 + */ + public static int getDirNum(File folder) { int dirNum = 0; - File files[] = file.listFiles(); - for (int i = 0; i < files.length; i++) { - File f = files[i]; - if (f.isDirectory()) { - dirNum += getDirNum(f); + if (!folder.isDirectory()) { + return dirNum; + } + for (File file : folder.listFiles()) { + if (file.isDirectory()) { + dirNum += getDirNum(file); } else { - dirNum ++; + dirNum++; } } return dirNum; } - } diff --git a/app/src/main/java/com/gh/gamecenter/changeskin/NetSpeed.java b/app/src/main/java/com/gh/gamecenter/changeskin/NetSpeed.java index 8f2da730d9..17027f1853 100644 --- a/app/src/main/java/com/gh/gamecenter/changeskin/NetSpeed.java +++ b/app/src/main/java/com/gh/gamecenter/changeskin/NetSpeed.java @@ -8,6 +8,7 @@ import android.os.Message; /** * Created by yyq on 2016/11/4. + * */ public class NetSpeed { @@ -29,8 +30,7 @@ public class NetSpeed { Message msg = handler.obtainMessage(); msg.what = SkinConfig.MSG_NETWORK_SPEED ; - String speeds = String.valueOf(speed) + " kb/s"; - msg.obj = speeds; + msg.obj = String.valueOf(speed) + " kb/s"; handler.sendMessage(msg);//更新界面 } } diff --git a/app/src/main/java/com/gh/gamecenter/changeskin/PatchData.java b/app/src/main/java/com/gh/gamecenter/changeskin/PatchEntity.java similarity index 62% rename from app/src/main/java/com/gh/gamecenter/changeskin/PatchData.java rename to app/src/main/java/com/gh/gamecenter/changeskin/PatchEntity.java index 09b10f536b..1d9744bd7c 100644 --- a/app/src/main/java/com/gh/gamecenter/changeskin/PatchData.java +++ b/app/src/main/java/com/gh/gamecenter/changeskin/PatchEntity.java @@ -2,10 +2,11 @@ package com.gh.gamecenter.changeskin; /** * Created by yyq on 2016/11/2. + * */ -public class PatchData { - public String MD5; +public class PatchEntity { + public String md5; public String size; - public String filePath; + public String path; public String url; } diff --git a/app/src/main/java/com/gh/gamecenter/changeskin/SkinConfig.java b/app/src/main/java/com/gh/gamecenter/changeskin/SkinConfig.java index a9628b057f..e76e647e04 100644 --- a/app/src/main/java/com/gh/gamecenter/changeskin/SkinConfig.java +++ b/app/src/main/java/com/gh/gamecenter/changeskin/SkinConfig.java @@ -2,14 +2,15 @@ package com.gh.gamecenter.changeskin; /** * Created by khy on 2016/11/16. + * */ public class SkinConfig { public static int PG_STATE = 1; /* - pageNum : 页数 - perPage : 请求数量 + * pageNum : 页数 + * perPage : 请求数量 */ public static int perPage = 300; @@ -26,10 +27,11 @@ public class SkinConfig { public static final int MSG_MD5_OVER = 104; public static final int MSG_NETWORK_ERROR = 200; - public static String GAME_ID = "57ce84f88ab49e83728b4572"; + public static final String GAME_ID = "57ce84f88ab49e83728b4572"; - // http://api.ghzhushou.com/v2d2/game/57ce84f88ab49e83728b4572/skin/data?page=1&per_page=1000 - public static String JSON_PATCHURL = "http://api.ghzhushou.com/v2d2/game/" + GAME_ID + "/skin/data?page=*&per_page=" + perPage; + // http://api.ghzhushou.com/v2d2/game/57ce84f88ab49e83728b4572/skin/data?per_page=1000&page=1 + public static final String JSON_PATCHURL = "http://api.ghzhushou.com/v2d2/game/" + + GAME_ID + "/skin/data?per_page=" + perPage + "&page="; // ewan.anfeng 安峰 public static String patchVersion = "com.netease.ma.uc"; 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 addd84c68b..91c1282f63 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameDownLoadFragment.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameDownLoadFragment.java @@ -29,7 +29,6 @@ import com.gh.gamecenter.R; import com.gh.gamecenter.eventbus.EBDownloadChanged; import com.gh.gamecenter.eventbus.EBMiPush; import com.gh.gamecenter.eventbus.EBPackage; -import com.gh.gamecenter.eventbus.EBShowDone; import com.gh.gamecenter.eventbus.EBSkip; import com.gh.gamecenter.eventbus.EBUISwitch; @@ -331,12 +330,6 @@ public class GameDownLoadFragment extends Fragment implements View.OnClickListen } } - public void onEventMainThread(EBShowDone showDone) { - if ("下载管理".equals(showDone.getFrom()) && downloadmanager_rv_show != null) { - downloadmanager_rv_show.smoothScrollToPosition(showDone.getPosition()); - } - } - @Override public void onResume() { super.onResume(); 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 7aa0e01d0b..d1d78f567e 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java @@ -12,7 +12,6 @@ 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; @@ -33,8 +32,6 @@ 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 GameUpdateFragmentAdapter adapter; @@ -146,6 +143,5 @@ public class GameUpdateFragment extends Fragment { public void onDestroy() { super.onDestroy(); EventBus.getDefault().unregister(this); - AppController.canclePendingRequests(TAG); } } 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 59c17a66d9..398a08b324 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java @@ -155,7 +155,7 @@ public class GameUpdateFragmentAdapter extends RecyclerView.Adapter packages) { this.packages = packages; } + public List getPackage() { return packages; } diff --git a/app/src/main/java/com/gh/gamecenter/entity/GameDetailEntity.java b/app/src/main/java/com/gh/gamecenter/entity/GameDetailEntity.java index 534f918990..a91725b94a 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/GameDetailEntity.java +++ b/app/src/main/java/com/gh/gamecenter/entity/GameDetailEntity.java @@ -21,14 +21,14 @@ public class GameDetailEntity { @SerializedName("download_off_text") private String downloadOffText; @SerializedName("skin_test") - private boolean skinTest; + private boolean isSkinTest; public boolean isSkinTest() { - return skinTest; + return isSkinTest; } public void setSkinTest(boolean skinTest) { - this.skinTest = skinTest; + this.isSkinTest = skinTest; } public void setDownloadOffText(String downloadOffText) { diff --git a/app/src/main/java/com/gh/gamecenter/entity/GameEntity.java b/app/src/main/java/com/gh/gamecenter/entity/GameEntity.java index d69cbb21fc..50b2a5bf25 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/GameEntity.java +++ b/app/src/main/java/com/gh/gamecenter/entity/GameEntity.java @@ -42,7 +42,7 @@ public class GameEntity { private String link; @SerializedName("concern_article_exists") - private boolean newsExists = true; + private boolean isNewsExists = true; @SerializedName("download_off_text") private String downloadOffText; @@ -56,11 +56,11 @@ public class GameEntity { } public boolean isNewsExists() { - return newsExists; + return isNewsExists; } public void setNewsExists(boolean newsExists) { - this.newsExists = newsExists; + this.isNewsExists = newsExists; } public String getLink() { @@ -211,7 +211,7 @@ public class GameEntity { gameEntity.setType(type); gameEntity.setPluggable(isPluggable); gameEntity.setLink(link); - gameEntity.setNewsExists(newsExists); + gameEntity.setNewsExists(isNewsExists); gameEntity.setDownloadOffText(downloadOffText); return gameEntity; } diff --git a/app/src/main/java/com/gh/gamecenter/entity/GameInfoEntity.java b/app/src/main/java/com/gh/gamecenter/entity/GameInfoEntity.java index 625cf23600..ea914df237 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/GameInfoEntity.java +++ b/app/src/main/java/com/gh/gamecenter/entity/GameInfoEntity.java @@ -1,7 +1,5 @@ package com.gh.gamecenter.entity; -import java.util.ArrayList; - public class GameInfoEntity { private String id; @@ -10,8 +8,6 @@ public class GameInfoEntity { private boolean isSignature; private long installTime; - private ArrayList packageList; - public String getId() { return id; } @@ -52,12 +48,4 @@ public class GameInfoEntity { this.installTime = installTime; } - public ArrayList getPackageList() { - return packageList; - } - - public void setPackageList(ArrayList packageList) { - this.packageList = packageList; - } - } diff --git a/app/src/main/java/com/gh/gamecenter/entity/GameUpdateEntity.java b/app/src/main/java/com/gh/gamecenter/entity/GameUpdateEntity.java index f24963b3fb..8bc43f20c3 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/GameUpdateEntity.java +++ b/app/src/main/java/com/gh/gamecenter/entity/GameUpdateEntity.java @@ -29,18 +29,12 @@ public class GameUpdateEntity { private boolean isPluggable; - private ApkEntity apk; - private String etag; private String brief; private ArrayList tag; - public GameUpdateEntity() { - - } - public String getBrief() { return brief; } @@ -145,22 +139,4 @@ public class GameUpdateEntity { this.etag = etag; } - public ApkEntity getApk() { - if (apk == null) { - apk = new ApkEntity(); - apk.setGhVersion(ghVersion); - apk.setVersion(version); - apk.setPackageName(packageName); - apk.setPlatform(platform); - apk.setSize(size); - apk.setUrl(url); - apk.setEtag(etag); - } - return apk; - } - - public void setApk(ApkEntity apk) { - this.apk = apk; - } - } diff --git a/app/src/main/java/com/gh/gamecenter/entity/NewsDetailEntity.java b/app/src/main/java/com/gh/gamecenter/entity/NewsDetailEntity.java index 619ca1854c..d5ad355220 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/NewsDetailEntity.java +++ b/app/src/main/java/com/gh/gamecenter/entity/NewsDetailEntity.java @@ -8,10 +8,15 @@ public class NewsDetailEntity { @SerializedName("_id") private String id; + private long time; + private String author; + private String content; + private String title; + private String type; @SerializedName("game_id") diff --git a/app/src/main/java/com/gh/gamecenter/entity/NewsEntity.java b/app/src/main/java/com/gh/gamecenter/entity/NewsEntity.java index 40163c660b..fd282bf2d4 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/NewsEntity.java +++ b/app/src/main/java/com/gh/gamecenter/entity/NewsEntity.java @@ -8,6 +8,7 @@ public class NewsEntity { private String id; private String type; + private String title; @SerializedName("time") diff --git a/app/src/main/java/com/gh/gamecenter/entity/SubjectEntity.java b/app/src/main/java/com/gh/gamecenter/entity/SubjectEntity.java index a760346c1a..a2b6bec6ee 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/SubjectEntity.java +++ b/app/src/main/java/com/gh/gamecenter/entity/SubjectEntity.java @@ -60,5 +60,4 @@ public class SubjectEntity { this.data = data; } - } diff --git a/app/src/main/java/com/gh/gamecenter/entity/TagEntity.java b/app/src/main/java/com/gh/gamecenter/entity/TagEntity.java index 83765d0d97..7949c5d2b4 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/TagEntity.java +++ b/app/src/main/java/com/gh/gamecenter/entity/TagEntity.java @@ -31,10 +31,4 @@ public class TagEntity { this.des = des; } - @Override - public String toString() { - return "TagEntity [name=" + name + ", icon=" + icon + ", des=" + des - + "]"; - } - } diff --git a/app/src/main/java/com/gh/gamecenter/entity/ThumbnailEntity.java b/app/src/main/java/com/gh/gamecenter/entity/ThumbnailEntity.java index 7bf231c4d6..6390ef6059 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/ThumbnailEntity.java +++ b/app/src/main/java/com/gh/gamecenter/entity/ThumbnailEntity.java @@ -8,6 +8,7 @@ import java.util.List; public class ThumbnailEntity { private String type; + private List url; public String getType() { diff --git a/app/src/main/java/com/gh/gamecenter/entity/UserEntity.java b/app/src/main/java/com/gh/gamecenter/entity/UserEntity.java index c6ac62bbe7..f76e97664b 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/UserEntity.java +++ b/app/src/main/java/com/gh/gamecenter/entity/UserEntity.java @@ -12,6 +12,7 @@ public class UserEntity { public void setIcon(String icon) { this.icon = icon; } + public String getIcon() { return icon; } @@ -19,6 +20,7 @@ public class UserEntity { public void setName(String name) { this.name = name; } + public String getName() { return name; } diff --git a/app/src/main/java/com/gh/gamecenter/eventbus/EBMoveTop.java b/app/src/main/java/com/gh/gamecenter/eventbus/EBMoveTop.java deleted file mode 100644 index 515bcfcd77..0000000000 --- a/app/src/main/java/com/gh/gamecenter/eventbus/EBMoveTop.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.gh.gamecenter.eventbus; - -public class EBMoveTop { - - private String type; - private int visibility; - private int topMargin; - - public EBMoveTop(String type, int visibility, int topMargin) { - super(); - this.type = type; - this.visibility = visibility; - this.topMargin = topMargin; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public int getVisibility() { - return visibility; - } - - public void setVisibility(int visibility) { - this.visibility = visibility; - } - - public int getTopMargin() { - return topMargin; - } - - public void setTopMargin(int topMargin) { - this.topMargin = topMargin; - } - -} diff --git a/app/src/main/java/com/gh/gamecenter/eventbus/EBPackage.java b/app/src/main/java/com/gh/gamecenter/eventbus/EBPackage.java index 27885d09a9..bda6da40ea 100644 --- a/app/src/main/java/com/gh/gamecenter/eventbus/EBPackage.java +++ b/app/src/main/java/com/gh/gamecenter/eventbus/EBPackage.java @@ -6,7 +6,6 @@ public class EBPackage { private String packageName; public EBPackage(String type, String packageName) { - super(); this.type = type; this.packageName = packageName; } diff --git a/app/src/main/java/com/gh/gamecenter/eventbus/EBSearch.java b/app/src/main/java/com/gh/gamecenter/eventbus/EBSearch.java index 059297be80..b1f75b3996 100644 --- a/app/src/main/java/com/gh/gamecenter/eventbus/EBSearch.java +++ b/app/src/main/java/com/gh/gamecenter/eventbus/EBSearch.java @@ -6,6 +6,7 @@ package com.gh.gamecenter.eventbus; public class EBSearch { private String key; + private boolean isSearch; public EBSearch(String key, boolean isSearch) { diff --git a/app/src/main/java/com/gh/gamecenter/eventbus/EBShowDone.java b/app/src/main/java/com/gh/gamecenter/eventbus/EBShowDone.java deleted file mode 100644 index 2af7913294..0000000000 --- a/app/src/main/java/com/gh/gamecenter/eventbus/EBShowDone.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.gh.gamecenter.eventbus; - -public class EBShowDone { - - private String from; - private int position; - - public EBShowDone(String from, int position) { - super(); - this.from = from; - this.position = position; - } - - public String getFrom() { - return from; - } - - public int getPosition() { - return position; - } - -} diff --git a/app/src/main/java/com/gh/gamecenter/eventbus/EBSlide.java b/app/src/main/java/com/gh/gamecenter/eventbus/EBSlide.java deleted file mode 100644 index 65c8adb616..0000000000 --- a/app/src/main/java/com/gh/gamecenter/eventbus/EBSlide.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.gh.gamecenter.eventbus; - -public class EBSlide { - private int distance; - private int position; - private boolean isReset; - - public EBSlide(int distance, int position, boolean isReset) { - super(); - this.distance = distance; - this.position = position; - this.isReset = isReset; - } - - public int getDistance() { - return distance; - } - - public void setDistance(int distance) { - this.distance = distance; - } - - public int getPosition() { - return position; - } - - public void setPosition(int position) { - this.position = position; - } - - public boolean isReset() { - return isReset; - } - - public void setReset(boolean isReset) { - this.isReset = isReset; - } - -} diff --git a/app/src/main/java/com/gh/gamecenter/eventbus/EBTopStatus.java b/app/src/main/java/com/gh/gamecenter/eventbus/EBTopStatus.java deleted file mode 100644 index 7ffbbbc2ef..0000000000 --- a/app/src/main/java/com/gh/gamecenter/eventbus/EBTopStatus.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.gh.gamecenter.eventbus; - -public class EBTopStatus { - - private String type; - private String searchHint; - - public EBTopStatus(String type, String searchHint) { - super(); - this.type = type; - this.searchHint = searchHint; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getSearchHint() { - return searchHint; - } - - public void setSearchHint(String searchHint) { - this.searchHint = searchHint; - } - -} diff --git a/app/src/main/java/com/gh/gamecenter/eventbus/EBTypeChange.java b/app/src/main/java/com/gh/gamecenter/eventbus/EBTypeChange.java index 2d6914037e..7bf8c7eb55 100644 --- a/app/src/main/java/com/gh/gamecenter/eventbus/EBTypeChange.java +++ b/app/src/main/java/com/gh/gamecenter/eventbus/EBTypeChange.java @@ -11,6 +11,7 @@ public class EBTypeChange { public EBTypeChange(String type, int position) { this.type = type; + this.position = position; } public String getType() { diff --git a/app/src/main/java/com/gh/gamecenter/eventbus/EBUISwitch.java b/app/src/main/java/com/gh/gamecenter/eventbus/EBUISwitch.java index da634ef43a..1e59285b96 100644 --- a/app/src/main/java/com/gh/gamecenter/eventbus/EBUISwitch.java +++ b/app/src/main/java/com/gh/gamecenter/eventbus/EBUISwitch.java @@ -6,7 +6,6 @@ public class EBUISwitch { private int position; public EBUISwitch(String from, int position) { - super(); this.position = position; this.from = from; } 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 628014e8ca..24fb1e97b6 100644 --- a/app/src/main/java/com/gh/gamecenter/game/Game1Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/game/Game1Fragment.java @@ -10,7 +10,6 @@ import android.widget.LinearLayout; import com.facebook.drawee.backends.pipeline.Fresco; import com.gc.materialdesign.views.ProgressBarCircularIndeterminate; -import com.gh.base.AppController; import com.gh.base.BaseFragment; import com.gh.common.util.DownloadItemUtils; import com.gh.download.DataWatcher; @@ -35,8 +34,6 @@ 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; @@ -295,10 +292,4 @@ public class Game1Fragment extends BaseFragment implements SwipeRefreshLayout.On handler.postDelayed(runnable, 1000); } - @Override - public void onDestroy() { - super.onDestroy(); - AppController.canclePendingRequests(TAG); - } - } 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 b2af850260..80164b8408 100644 --- a/app/src/main/java/com/gh/gamecenter/game/Game1FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/game/Game1FragmentAdapter.java @@ -176,7 +176,7 @@ public class Game1FragmentAdapter extends RecyclerView.Adapter(); - sp = getActivity().getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE); + SharedPreferences sp = getActivity().getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE); isNewFirstLaunch = sp.getBoolean("isNewFirstLaunchV" + PackageUtils.getVersion(getActivity()), true); diff --git a/app/src/main/java/com/gh/gamecenter/news/NewsFragment.java b/app/src/main/java/com/gh/gamecenter/news/NewsFragment.java index 1324030931..93c15e6ca5 100644 --- a/app/src/main/java/com/gh/gamecenter/news/NewsFragment.java +++ b/app/src/main/java/com/gh/gamecenter/news/NewsFragment.java @@ -57,9 +57,8 @@ public class NewsFragment extends HomeFragment implements View.OnClickListener, if (savedInstanceState != null) { currentItem = savedInstanceState.getInt("currentItem"); } - home_vp_content.setCurrentItem(currentItem); - initTextView(); + home_vp_content.setCurrentItem(currentItem); DisplayMetrics outMetrics = new DisplayMetrics(); getActivity().getWindowManager().getDefaultDisplay().getMetrics(outMetrics); 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 1c776988fe..2652e5b6ec 100644 --- a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java @@ -64,6 +64,7 @@ import rx.schedulers.Schedulers; /** * Created by LGT on 2016/9/13. + * 新闻详情数据适配器 */ public class NewsDetailAdapter extends RecyclerView.Adapter { @@ -136,7 +137,7 @@ public class NewsDetailAdapter extends RecyclerView.Adapter { } } }); - AppController.addToRequestQueue(request, NewsDetailActivity.TAG); + AppController.addToRequestQueue(request); } private void getNewsMore() { @@ -176,7 +177,7 @@ public class NewsDetailAdapter extends RecyclerView.Adapter { getNewsCommentNum(); } }); - AppController.addToRequestQueue(request, NewsDetailActivity.TAG); + AppController.addToRequestQueue(request); } @Override diff --git a/app/src/main/java/com/gh/gamecenter/personal/ConcernFragment.java b/app/src/main/java/com/gh/gamecenter/personal/ConcernFragment.java index 76df924683..aaf058f8c3 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/ConcernFragment.java +++ b/app/src/main/java/com/gh/gamecenter/personal/ConcernFragment.java @@ -8,7 +8,6 @@ import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; -import com.gh.base.AppController; import com.gh.base.BaseFragment; import com.gh.common.util.DownloadItemUtils; import com.gh.download.DataWatcher; @@ -28,19 +27,16 @@ import de.greenrobot.event.EventBus; /** * Created by LGT on 2016/8/12. + * 我的光环-已关注界面 */ public class ConcernFragment extends BaseFragment { - public static final String TAG = ConcernFragment.class.getSimpleName(); - private RecyclerView fm_concern_rv_show; private ConcernFragmentAdapter adapter; private LinearLayout reuse_nodata_skip; private TextView reuse_nodata_skip_tv_hint; private TextView reuse_nodata_skip_tv_btn; - private boolean isEverpause; - private DataWatcher dataWatcher = new DataWatcher() { @Override public void onDataChanged(DownloadEntity downloadEntity) { @@ -62,8 +58,6 @@ public class ConcernFragment extends BaseFragment { public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - isEverpause = false; - init(R.layout.fm_concern); reuse_nodata_skip.setVisibility(View.GONE); @@ -142,28 +136,20 @@ public class ConcernFragment extends BaseFragment { @Override public void onResume() { - super.onResume(); if (isEverpause) { for (GameEntity entity : adapter.getGameList()) { entity.setEntryMap(DownloadManager.getInstance(getActivity()).getEntryMap(entity.getName())); } adapter.notifyDataSetChanged(); } - isEverpause = false; + super.onResume(); DownloadManager.getInstance(getActivity()).addObserver(dataWatcher); } @Override public void onPause() { super.onPause(); - isEverpause = true; DownloadManager.getInstance(getActivity()).removeObserver(dataWatcher); } - @Override - public void onDestroy() { - super.onDestroy(); - AppController.canclePendingRequests(TAG); - } - } diff --git a/app/src/main/java/com/gh/gamecenter/personal/ConcernFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/personal/ConcernFragmentAdapter.java index 0ebdd1d80d..31ecac4707 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/ConcernFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/personal/ConcernFragmentAdapter.java @@ -41,6 +41,7 @@ import java.util.Map; /** * Created by LGT on 2016/8/15. + * 已关注界面-数据适配器 */ public class ConcernFragmentAdapter extends RecyclerView.Adapter { @@ -110,7 +111,7 @@ public class ConcernFragmentAdapter extends RecyclerView.Adapter() { @Override @@ -240,7 +240,7 @@ public class InstallFragmentAdapter extends RecyclerView.Adapter= Build.VERSION_CODES.KITKAT) { RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) me_iv_top_setting.getLayoutParams(); params.topMargin = DisplayUtils.getInternalDimensionSize(getResources(), "status_bar_height") @@ -383,8 +380,12 @@ public class PersonalFragment extends Fragment implements View.OnClickListener, }.start(); } - private void modifyNickname(final String nickname) { + private void modifyNickname(String nickname) { final Dialog waitDialog = DialogUtils.showWaitDialog(getActivity(), "修改中..."); + modifyNickname(waitDialog, nickname, true); + } + + private void modifyNickname(final Dialog waitDialog, final String nickname, final boolean isCheck) { new Thread(){ @Override public void run() { @@ -404,30 +405,31 @@ public class PersonalFragment extends Fragment implements View.OnClickListener, }, new Response.ErrorListener() { @Override public void onErrorResponse(VolleyError error) { + if (error.networkResponse != null + && error.networkResponse.statusCode == 401) { + modifyNickname(waitDialog, nickname, false); + return; + } waitDialog.dismiss(); - if (error.networkResponse != null) { - if (error.networkResponse.statusCode == 401) { - TokenUtils.getToken(getActivity(), false); // TODO 提示网络请求不能在UI线程执行 - modifyNickname(nickname); - } else if (error.networkResponse.statusCode == 403) { - try { - JSONObject response = new JSONObject(new String(error.networkResponse.data)); - String detail = response.getString("detail"); - if ("too long".equals(detail)) { - Toast.makeText(getActivity(), "昵称太长", Toast.LENGTH_SHORT).show(); - } else if ("invalid".equals(detail)) { - Toast.makeText(getActivity(), "非法字符", Toast.LENGTH_SHORT).show(); - } else if ("repeat".equals(detail)) { - Toast.makeText(getActivity(), "昵称已存在", Toast.LENGTH_SHORT).show(); - } else if ("no change".equals(detail)) { - Toast.makeText(getActivity(), "昵称一致", Toast.LENGTH_SHORT).show(); - } else if ("too frequent".equals(detail)) { - Toast.makeText(getActivity(), "修改太频繁，请稍后再试", Toast.LENGTH_SHORT).show(); - } - } catch (JSONException e) { - e.printStackTrace(); - Toast.makeText(getActivity(), "修改失败", Toast.LENGTH_SHORT).show(); + if (error.networkResponse != null + && error.networkResponse.statusCode == 403) { + try { + JSONObject response = new JSONObject(new String(error.networkResponse.data)); + String detail = response.getString("detail"); + if ("too long".equals(detail)) { + Toast.makeText(getActivity(), "昵称太长", Toast.LENGTH_SHORT).show(); + } else if ("invalid".equals(detail)) { + Toast.makeText(getActivity(), "非法字符", Toast.LENGTH_SHORT).show(); + } else if ("repeat".equals(detail)) { + Toast.makeText(getActivity(), "昵称已存在", Toast.LENGTH_SHORT).show(); + } else if ("no change".equals(detail)) { + Toast.makeText(getActivity(), "昵称一致", Toast.LENGTH_SHORT).show(); + } else if ("too frequent".equals(detail)) { + Toast.makeText(getActivity(), "修改太频繁，请稍后再试", Toast.LENGTH_SHORT).show(); } + } catch (JSONException e) { + e.printStackTrace(); + Toast.makeText(getActivity(), "修改失败", Toast.LENGTH_SHORT).show(); } } else { Toast.makeText(getActivity(), "修改失败", Toast.LENGTH_SHORT).show(); @@ -435,8 +437,8 @@ public class PersonalFragment extends Fragment implements View.OnClickListener, } }); request.setShouldCache(false); - request.addHeader("TOKEN", TokenUtils.getToken(getActivity())); - AppController.addToRequestQueue(request, TAG); + request.addHeader("TOKEN", TokenUtils.getToken(getActivity(), isCheck)); + AppController.addToRequestQueue(request); } }.start(); } @@ -468,16 +470,10 @@ public class PersonalFragment extends Fragment implements View.OnClickListener, Config.USER_HOST + "device/" + TokenUtils.getDeviceId(getActivity()), new JSONObject(params).toString(), null, null); request.addHeader("TOKEN", TokenUtils.getToken(getActivity())); - AppController.addToRequestQueue(request, TAG); + AppController.addToRequestQueue(request); } }.start(); } } - @Override - public void onDestroy() { - super.onDestroy(); - AppController.canclePendingRequests(TAG); - } - } diff --git a/app/src/main/java/com/gh/gamecenter/receiver/ActivitySkipReceiver.java b/app/src/main/java/com/gh/gamecenter/receiver/ActivitySkipReceiver.java index 7c08166ddb..da1551c2b6 100644 --- a/app/src/main/java/com/gh/gamecenter/receiver/ActivitySkipReceiver.java +++ b/app/src/main/java/com/gh/gamecenter/receiver/ActivitySkipReceiver.java @@ -11,6 +11,7 @@ import com.gh.gamecenter.SplashScreenActivity; /** * Created by khy on 2016/9/1. + * 光环插件跳转助手 */ public class ActivitySkipReceiver extends BroadcastReceiver { diff --git a/app/src/main/java/com/gh/gamecenter/receiver/DownloadReceiver.java b/app/src/main/java/com/gh/gamecenter/receiver/DownloadReceiver.java index 5daaea87da..2cee396534 100644 --- a/app/src/main/java/com/gh/gamecenter/receiver/DownloadReceiver.java +++ b/app/src/main/java/com/gh/gamecenter/receiver/DownloadReceiver.java @@ -14,6 +14,7 @@ import de.greenrobot.event.EventBus; /** * Created by LGT on 2016/10/10. + * notification下载跳转 */ public class DownloadReceiver extends BroadcastReceiver { diff --git a/app/src/main/java/com/gh/gamecenter/receiver/InstallAndUninstallReceiver.java b/app/src/main/java/com/gh/gamecenter/receiver/InstallAndUninstallReceiver.java index b8904cf747..ece246ead0 100644 --- a/app/src/main/java/com/gh/gamecenter/receiver/InstallAndUninstallReceiver.java +++ b/app/src/main/java/com/gh/gamecenter/receiver/InstallAndUninstallReceiver.java @@ -19,8 +19,6 @@ public class InstallAndUninstallReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { - - // 接收安装广播 if (intent.getAction().equals(Intent.ACTION_PACKAGE_ADDED)) { String packageName = intent.getDataString(); diff --git a/app/src/main/java/com/gh/gamecenter/receiver/InstallReceiver.java b/app/src/main/java/com/gh/gamecenter/receiver/InstallReceiver.java index c487fba67d..28d7965bb6 100644 --- a/app/src/main/java/com/gh/gamecenter/receiver/InstallReceiver.java +++ b/app/src/main/java/com/gh/gamecenter/receiver/InstallReceiver.java @@ -15,6 +15,7 @@ import de.greenrobot.event.EventBus; /** * Created by LGT on 2016/10/10. + * notification安装跳转 */ public class InstallReceiver extends BroadcastReceiver { diff --git a/app/src/main/java/com/gh/gamecenter/receiver/NetworkStateReceiver.java b/app/src/main/java/com/gh/gamecenter/receiver/NetworkStateReceiver.java index e1c74fe8a1..53068079fa 100644 --- a/app/src/main/java/com/gh/gamecenter/receiver/NetworkStateReceiver.java +++ b/app/src/main/java/com/gh/gamecenter/receiver/NetworkStateReceiver.java @@ -14,10 +14,7 @@ public class NetworkStateReceiver extends BroadcastReceiver { // 监听网络状态的变化 @Override public void onReceive(Context context, Intent intent) { - - EventBus.getDefault().post( - new EBNetworkState(NetworkUtils - .isNetworkConnected(context))); + EventBus.getDefault().post(new EBNetworkState(NetworkUtils.isNetworkConnected(context))); } } diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java index 8c7f0ccf29..3695093c0d 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java @@ -12,10 +12,9 @@ import android.widget.LinearLayout; import android.widget.TextView; import com.gh.gamecenter.R; +import com.gh.gamecenter.listener.OnCallBackListener; -public class SearchGameDetailFragment extends Fragment { - - public static final String TAG = SearchGameDetailFragment.class.getSimpleName(); +public class SearchGameDetailFragment extends Fragment implements OnCallBackListener { private View view; private RecyclerView search_detail; @@ -41,8 +40,7 @@ public class SearchGameDetailFragment extends Fragment { search_detail = (RecyclerView) view.findViewById(R.id.search_detail); search_detail.setHasFixedSize(true); search_detail.setLayoutManager(new LinearLayoutManager(getActivity())); - search_detail.setAdapter(new SearchGameDetailFragmentAdapter(getActivity(), search_detail, - search_loading, reuse_none_date, reuse_no_connection, key)); + search_detail.setAdapter(new SearchGameDetailFragmentAdapter(SearchGameDetailFragment.this, key)); } @Nullable @@ -59,9 +57,33 @@ public class SearchGameDetailFragment extends Fragment { this.key = key; } - public void search(String key) { - search_detail.setAdapter(new SearchGameDetailFragmentAdapter(getActivity(), search_detail, - search_loading, reuse_none_date, reuse_no_connection, key)); + @Override + public void loadDone() { + search_loading.setVisibility(View.GONE); + search_detail.setVisibility(View.VISIBLE); + reuse_none_date.setVisibility(View.GONE); + reuse_no_connection.setVisibility(View.GONE); + } + + @Override + public void loadDone(Object obj) { + + } + + @Override + public void loadError() { + search_loading.setVisibility(View.GONE); + search_detail.setVisibility(View.GONE); + reuse_none_date.setVisibility(View.GONE); + reuse_no_connection.setVisibility(View.VISIBLE); + } + + @Override + public void loadEmpty() { + search_loading.setVisibility(View.GONE); + search_detail.setVisibility(View.GONE); + reuse_none_date.setVisibility(View.VISIBLE); + reuse_no_connection.setVisibility(View.GONE); } } 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 8d19b65315..788641e9ed 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java @@ -9,7 +9,6 @@ import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; import android.view.inputmethod.InputMethodManager; -import android.widget.LinearLayout; import com.android.volley.Response; import com.android.volley.VolleyError; @@ -24,6 +23,7 @@ import com.gh.common.view.DownloadDialog; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.GameNormalViewHolder; import com.gh.gamecenter.entity.GameEntity; +import com.gh.gamecenter.listener.OnCallBackListener; import com.gh.gamecenter.manager.DataCollectionManager; import com.gh.gamecenter.volley.extended.JsonArrayExtendedRequest; import com.google.gson.Gson; @@ -40,43 +40,25 @@ import java.util.Map; public class SearchGameDetailFragmentAdapter extends RecyclerView.Adapter { private Context context; - - private RecyclerView search_detail; - private LinearLayout search_loading; - private LinearLayout search_nogame; - private LinearLayout search_connection; + private OnCallBackListener listener; private List gameList; private String key; - public SearchGameDetailFragmentAdapter(Context context, - RecyclerView search_detail, - LinearLayout search_loading, - LinearLayout search_nogame, - LinearLayout search_connection, - String key) { - - this.context = context; - this.search_detail = search_detail; - this.search_loading = search_loading; - this.search_nogame = search_nogame; - this.search_connection = search_connection; + public SearchGameDetailFragmentAdapter(SearchGameDetailFragment fragment, String key) { + this.context = fragment.getActivity(); + this.listener = fragment; gameList = new ArrayList<>(); this.key = key; if (!TextUtils.isEmpty(key)) { - search_loading.setVisibility(View.VISIBLE); - search_detail.setVisibility(View.GONE); - search_nogame.setVisibility(View.GONE); - search_connection.setVisibility(View.GONE); search(key); } else { - search_loading.setVisibility(View.GONE); - search_detail.setVisibility(View.GONE); - search_nogame.setVisibility(View.VISIBLE); - search_connection.setVisibility(View.GONE); + if (listener != null) { + listener.loadEmpty(); + } } } @@ -86,27 +68,30 @@ public class SearchGameDetailFragmentAdapter extends RecyclerView.Adapter() { @Override public void onResponse(JSONArray response) { - search_loading.setVisibility(View.GONE); - Type listType = new TypeToken>() {}.getType(); Gson gson = new Gson(); List list = gson.fromJson(response.toString(), listType); - if (list != null && list.size() > 0) { - search_detail.setVisibility(View.VISIBLE); + if (list != null && list.size() != 0) { + if (listener != null) { + listener.loadDone(); + } gameList = list; notifyItemRangeInserted(0, gameList.size()); } else { - search_nogame.setVisibility(View.VISIBLE); + if (listener != null) { + listener.loadEmpty(); + } } } }, new Response.ErrorListener() { @Override public void onErrorResponse(VolleyError error) { - search_loading.setVisibility(View.GONE); - search_connection.setVisibility(View.VISIBLE); + if (listener != null) { + listener.loadError(); + } } }); - AppController.addToRequestQueue(request, SearchGameDetailFragment.TAG); + AppController.addToRequestQueue(request); } @Override diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragment.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragment.java index eb789e0498..af64badf7f 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragment.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragment.java @@ -12,12 +12,15 @@ import android.widget.LinearLayout; import android.widget.TextView; import com.gh.gamecenter.R; +import com.gh.gamecenter.listener.OnCallBackListener; -public class SearchGameListFragment extends Fragment { - - public static final String TAG = SearchGameListFragment.class.getSimpleName(); +public class SearchGameListFragment extends Fragment implements OnCallBackListener { private View view; + private RecyclerView search_detail; + private LinearLayout search_loading; + private LinearLayout reuse_none_date; + private LinearLayout reuse_no_connection; private String key; @@ -30,15 +33,14 @@ public class SearchGameListFragment extends Fragment { TextView reuse_tv_none_data = (TextView) view.findViewById(R.id.reuse_tv_none_data); reuse_tv_none_data.setText("搜索为空"); - LinearLayout search_loading = (LinearLayout) view.findViewById(R.id.search_gamedetail_ll_loading); - LinearLayout search_nogame = (LinearLayout) view.findViewById(R.id.reuse_none_data); - LinearLayout search_connection = (LinearLayout) view.findViewById(R.id.reuse_no_connection); + search_loading = (LinearLayout) view.findViewById(R.id.search_gamedetail_ll_loading); + reuse_none_date = (LinearLayout) view.findViewById(R.id.reuse_none_data); + reuse_no_connection = (LinearLayout) view.findViewById(R.id.reuse_no_connection); - RecyclerView search_detail = (RecyclerView) view.findViewById(R.id.search_detail); + search_detail = (RecyclerView) view.findViewById(R.id.search_detail); search_detail.setHasFixedSize(true); search_detail.setLayoutManager(new LinearLayoutManager(getActivity())); - search_detail.setAdapter(new SearchGameListFragmentAdapter(getActivity(), search_detail, - search_loading, search_nogame, search_connection, key)); + search_detail.setAdapter(new SearchGameListFragmentAdapter(SearchGameListFragment.this, key)); } @Nullable @@ -55,4 +57,32 @@ public class SearchGameListFragment extends Fragment { this.key = key; } + @Override + public void loadDone() { + search_loading.setVisibility(View.GONE); + search_detail.setVisibility(View.VISIBLE); + reuse_none_date.setVisibility(View.GONE); + reuse_no_connection.setVisibility(View.GONE); + } + + @Override + public void loadDone(Object obj) { + + } + + @Override + public void loadError() { + search_loading.setVisibility(View.GONE); + search_detail.setVisibility(View.GONE); + reuse_none_date.setVisibility(View.GONE); + reuse_no_connection.setVisibility(View.VISIBLE); + } + + @Override + public void loadEmpty() { + search_loading.setVisibility(View.GONE); + search_detail.setVisibility(View.GONE); + reuse_none_date.setVisibility(View.VISIBLE); + reuse_no_connection.setVisibility(View.GONE); + } } 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 ec3206d7dd..29ea520358 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java @@ -8,7 +8,6 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.view.inputmethod.InputMethodManager; -import android.widget.LinearLayout; import com.android.volley.Response; import com.android.volley.VolleyError; @@ -24,6 +23,7 @@ import com.gh.common.view.DownloadDialog; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.GameNormalViewHolder; import com.gh.gamecenter.entity.GameEntity; +import com.gh.gamecenter.listener.OnCallBackListener; import com.gh.gamecenter.manager.DataCollectionManager; import com.gh.gamecenter.volley.extended.JsonArrayExtendedRequest; import com.google.gson.Gson; @@ -40,42 +40,25 @@ import java.util.Map; public class SearchGameListFragmentAdapter extends RecyclerView.Adapter { private Context context; - - private RecyclerView search_detail; - private LinearLayout search_loading; - private LinearLayout search_nogame; - private LinearLayout search_connection; + private OnCallBackListener listener; private List gameList; private String key; - public SearchGameListFragmentAdapter(Context context, - RecyclerView search_detail, - LinearLayout search_loading, - LinearLayout search_nogame, - LinearLayout search_connection, - String key) { - this.context = context; - this.search_detail = search_detail; - this.search_loading = search_loading; - this.search_nogame = search_nogame; - this.search_connection = search_connection; + public SearchGameListFragmentAdapter(SearchGameListFragment fragment, String key) { + this.context = fragment.getActivity(); + this.listener = fragment; gameList = new ArrayList<>(); this.key = key; if (!TextUtils.isEmpty(key)) { - search_loading.setVisibility(View.VISIBLE); - search_detail.setVisibility(View.GONE); - search_nogame.setVisibility(View.GONE); - search_connection.setVisibility(View.GONE); searchGame(key); } else { - search_loading.setVisibility(View.GONE); - search_detail.setVisibility(View.GONE); - search_nogame.setVisibility(View.VISIBLE); - search_connection.setVisibility(View.GONE); + if (listener != null) { + listener.loadEmpty(); + } } } @@ -85,27 +68,30 @@ public class SearchGameListFragmentAdapter extends RecyclerView.Adapter() { @Override public void onResponse(JSONArray response) { - search_loading.setVisibility(View.GONE); - Type listType = new TypeToken>() {}.getType(); Gson gson = new Gson(); List list = gson.fromJson(response.toString(), listType); - if (list != null && list.size() > 0) { - search_detail.setVisibility(View.VISIBLE); + if (list != null && list.size() != 0) { + if (listener != null) { + listener.loadDone(); + } gameList = list; notifyItemRangeInserted(0, gameList.size()); } else { - search_nogame.setVisibility(View.VISIBLE); + if (listener != null) { + listener.loadEmpty(); + } } } }, new Response.ErrorListener() { @Override public void onErrorResponse(VolleyError error) { - search_loading.setVisibility(View.GONE); - search_connection.setVisibility(View.VISIBLE); + if (listener != null) { + listener.loadError(); + } } }); - AppController.addToRequestQueue(request, SearchGameListFragment.TAG); + AppController.addToRequestQueue(request); } @Override diff --git a/app/src/main/res/layout/fm_search.xml b/app/src/main/res/layout/fm_search.xml index 601afa657a..7d3e483ba0 100644 --- a/app/src/main/res/layout/fm_search.xml +++ b/app/src/main/res/layout/fm_search.xml @@ -8,6 +8,7 @@ android:id="@+id/search_detail" android:layout_width="match_parent" android:layout_height="match_parent" + android:visibility="gone" android:overScrollMode="never" >