diff --git a/app/build.gradle b/app/build.gradle index 2c5e8e9a7d..92d5aab693 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' // kotlin -//tinker插件 -//apply plugin: 'com.tencent.tinker.patch' // apkChannelPackage apply plugin: 'channel' +apply from: 'tinker-support.gradle' + android { compileOptions { @@ -14,12 +14,13 @@ android { targetCompatibility JavaVersion.VERSION_1_7 } -// dexOptions { -// jumboMode = true -// } + dexOptions { + jumboMode = true + } defaultConfig { + multiDexEnabled true javaCompileOptions { annotationProcessorOptions { arguments = [eventBusIndex: 'com.gh.EventBusIndex'] @@ -39,16 +40,12 @@ android { // 由于app只针对中文用户，所以仅保留zh资源，其他删掉 resConfigs "zh" -// jackOptions { -// enabled true -// } minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode rootProject.ext.versionCode versionName rootProject.ext.versionName applicationId rootProject.ext.applicationId - multiDexEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt', 'proguard-fresco.txt' /** @@ -210,13 +207,10 @@ dependencies { exclude module: 'support-v4' } - // tinker - provided "com.tencent.tinker:tinker-android-anno:${tinker}" - compile "com.tencent.tinker:tinker-android-lib:${tinker}" - compile "com.sina.weibo.sdk:core:${weiboSDK}" - compile "com.tencent.bugly:crashreport:${bugly}" + // bugly with tinker support + compile "com.tencent.bugly:crashreport_upgrade:${buglyTinkerSupport}" compile project(':libraries:LGLibrary') compile project(':libraries:MiPush') diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0785cba25d..7f71189dd6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -39,6 +39,14 @@ + + + + + + + + RetrofitManager.getApi().postCollectionArticle(token, body) - CollectionTag.tools -> RetrofitManager.getApi().postCollectionTools(token, body) + CollectionTag.article -> RetrofitManager.getInstance(context).getApi().postCollectionArticle(token, body) + CollectionTag.tools -> RetrofitManager.getInstance(context).getApi().postCollectionTools(token, body) } postCollection .subscribeOn(Schedulers.io()) @@ -50,7 +50,7 @@ object CollectionUtils { listener.onSuccess() return } - } catch (e : Exception) { + } catch (e: Exception) { e.printStackTrace() } } @@ -63,8 +63,8 @@ object CollectionUtils { val postCollection: Observable when (tag) { - CollectionTag.article -> postCollection = RetrofitManager.getApi().deletaCollectionArticle(LoginUtils.getToken(context), id) - CollectionTag.tools -> postCollection = RetrofitManager.getApi().deleteCollectionTools(LoginUtils.getToken(context), id) + CollectionTag.article -> postCollection = RetrofitManager.getInstance(context).getApi().deletaCollectionArticle(LoginUtils.getToken(context), id) + CollectionTag.tools -> postCollection = RetrofitManager.getInstance(context).getApi().deleteCollectionTools(LoginUtils.getToken(context), id) } postCollection .subscribeOn(Schedulers.io()) @@ -84,8 +84,8 @@ object CollectionUtils { fun patchCollection(context: Context, id: String, tag: CollectionTag) { val postCollection = when (tag) { - CollectionTag.article -> RetrofitManager.getApi().patchCollectionArticle(LoginUtils.getToken(context), id) - CollectionTag.tools -> RetrofitManager.getApi().patchCollectionTools(LoginUtils.getToken(context), id) + CollectionTag.article -> RetrofitManager.getInstance(context).getApi().patchCollectionArticle(LoginUtils.getToken(context), id) + CollectionTag.tools -> RetrofitManager.getInstance(context).getApi().patchCollectionTools(LoginUtils.getToken(context), id) } postCollection .subscribeOn(Schedulers.io()) @@ -102,8 +102,6 @@ object CollectionUtils { } - - interface OnCollectionListener { fun onSuccess() fun onError() diff --git a/app/src/main/java/com/gh/common/util/ConcernUtils.kt b/app/src/main/java/com/gh/common/util/ConcernUtils.kt index 2a73b16e96..bf6f7e3fff 100644 --- a/app/src/main/java/com/gh/common/util/ConcernUtils.kt +++ b/app/src/main/java/com/gh/common/util/ConcernUtils.kt @@ -29,7 +29,7 @@ object ConcernUtils { val params = JSONArray() params.put(gameId) val body = RequestBody.create(MediaType.parse("application/json"), params.toString()) - RetrofitManager.getApi() + RetrofitManager.getInstance(context).getApi() .postConcern(LoginUtils.getToken(context), body) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -47,7 +47,7 @@ object ConcernUtils { } fun deleteConcernData(context: Context, gameId: String, listener: onConcernListener) { - RetrofitManager.getApi() + RetrofitManager.getInstance(context).getApi() .deleteConcern(LoginUtils.getToken(context), gameId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -67,7 +67,7 @@ object ConcernUtils { fun updateConcernData(context: Context, data: JSONArray) { val body = RequestBody.create(MediaType.parse("application/json"), data.toString()) - RetrofitManager.getApi() + RetrofitManager.getInstance(context).getApi() .putConcern(LoginUtils.getToken(context), body) .subscribeOn(Schedulers.io()) .observeOn(Schedulers.io()) @@ -90,7 +90,7 @@ object ConcernUtils { val sp = PreferenceManager.getDefaultSharedPreferences(context) if ("2.3" == versionName && !sp.getBoolean("isSwitchConcern", false)) { // 针对助手2.3版本关注数据的迁移 - RetrofitManager.getApi().getConcernData(TokenUtils.getDeviceId(context)) + RetrofitManager.getInstance(context).getApi().getConcernData(TokenUtils.getDeviceId(context)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(object : Response>() { @@ -98,7 +98,7 @@ object ConcernUtils { if (response.isNotEmpty()) { val body = RequestBody.create(MediaType.parse("application/json"), JSONArray(response).toString()) - RetrofitManager.getApi() + RetrofitManager.getInstance(context).getApi() .putConcern(LoginUtils.getToken(context), body) .subscribeOn(Schedulers.io()) .observeOn(Schedulers.io()) @@ -109,7 +109,7 @@ object ConcernUtils { } }) } else { - RetrofitManager.getApi() + RetrofitManager.getInstance(context).getApi() .getConcern(LoginUtils.getToken(context)) .subscribeOn(Schedulers.io()) .observeOn(Schedulers.io()) @@ -130,7 +130,7 @@ object ConcernUtils { val list = ArrayList>() for (gameId in arrGameId) { - list.add(RetrofitManager.getApi().getGameDigest(gameId)) + list.add(RetrofitManager.getInstance(context).getApi().getGameDigest(gameId)) } Observable.merge(list) .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/common/util/DataLogUtils.java b/app/src/main/java/com/gh/common/util/DataLogUtils.java index 38f0f89042..6ff039bfd4 100644 --- a/app/src/main/java/com/gh/common/util/DataLogUtils.java +++ b/app/src/main/java/com/gh/common/util/DataLogUtils.java @@ -2,7 +2,7 @@ package com.gh.common.util; import android.content.Context; -import com.gh.base.AppController; +import com.halo.assistant.AppController; import com.lightgame.download.DownloadEntity; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; @@ -53,7 +53,7 @@ public class DataLogUtils { RequestBody body = RequestBody.create(MediaType.parse("application/json"), new JSONObject(params).toString()); - RetrofitManager.getData().postLog(body) + RetrofitManager.getInstance(context).getData().postLog(body) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response()); diff --git a/app/src/main/java/com/gh/common/util/DeviceUtils.java b/app/src/main/java/com/gh/common/util/DeviceUtils.java index bee4cc7a0b..10729c6511 100644 --- a/app/src/main/java/com/gh/common/util/DeviceUtils.java +++ b/app/src/main/java/com/gh/common/util/DeviceUtils.java @@ -31,6 +31,7 @@ import static android.os.Build.MODEL; public class DeviceUtils { public static JSONObject getLoginDevice(Context context) throws JSONException { // device数据 + context = context.getApplicationContext(); JSONObject object = new JSONObject(); object.put("os", "Android"); object.put("imei", Util_System_Phone_State.getDeviceId(context)); diff --git a/app/src/main/java/com/gh/common/util/DialogUtils.java b/app/src/main/java/com/gh/common/util/DialogUtils.java index 4b51049b37..abeebe580a 100644 --- a/app/src/main/java/com/gh/common/util/DialogUtils.java +++ b/app/src/main/java/com/gh/common/util/DialogUtils.java @@ -23,7 +23,7 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; -import com.gh.base.AppController; +import com.halo.assistant.AppController; import com.gh.gamecenter.R; import com.gh.gamecenter.kuaichuan.WifiMgr; diff --git a/app/src/main/java/com/gh/common/util/LibaoUtils.java b/app/src/main/java/com/gh/common/util/LibaoUtils.java index 64f649d2e5..2d02a08f6d 100644 --- a/app/src/main/java/com/gh/common/util/LibaoUtils.java +++ b/app/src/main/java/com/gh/common/util/LibaoUtils.java @@ -42,8 +42,6 @@ import rx.Observable; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -import static com.gh.gamecenter.retrofit.RetrofitManager.getLibao; - /** * Created by khy on 2016/12/16. * 礼包工具类， 包括联网操作和领取按钮状态 @@ -74,7 +72,7 @@ public class LibaoUtils { //初始化存号箱 获取存号箱所有礼包 public static void getCunHaoXiang(final Context context) { - getLibao() + RetrofitManager.getInstance(context).getApi() .getCunHaoXiang(LoginUtils.getToken(context)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -111,9 +109,9 @@ public class LibaoUtils { Observable observable; if (!TextUtils.isEmpty(captchaCode)) { - observable = getLibao().postLibaoLing(LoginUtils.getToken(context), captchaCode, libaoId); + observable = RetrofitManager.getInstance(context).getApi().postLibaoLing(LoginUtils.getToken(context), captchaCode, libaoId); } else { - observable = RetrofitManager.getLibao().postLibaoLing(LoginUtils.getToken(context), libaoId); + observable = RetrofitManager.getInstance(context).getApi().postLibaoLing(LoginUtils.getToken(context), libaoId); } observable.subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -135,7 +133,7 @@ public class LibaoUtils { private static void postLibaoTao(final Context context, final String libaoId, final boolean isCheck, final PostLibaoListener listener) { - getLibao().postLibaoTao(LoginUtils.getToken(context), libaoId) + RetrofitManager.getInstance(context).getApi().postLibaoTao(LoginUtils.getToken(context), libaoId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new JSONObjectResponse() { @@ -153,7 +151,7 @@ public class LibaoUtils { public static void deleteLibaoCode(final Context context, final String code, final boolean isCheck, final PostLibaoListener listener) { - getLibao().deleteLibaoCode(LoginUtils.getToken(context), code) + RetrofitManager.getInstance(context).getApi().deleteLibaoCode(LoginUtils.getToken(context), code) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response() { @@ -169,8 +167,8 @@ public class LibaoUtils { }); } - public static void getLibaoStatus(String ids, final PostLibaoListener listener) { - getLibao().getLibaoStatus(ids) + public static void getLibaoStatus(Context context, String ids, final PostLibaoListener listener) { + RetrofitManager.getInstance(context).getApi().getLibaoStatus(ids) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response>() { diff --git a/app/src/main/java/com/gh/common/util/LoginUtils.java b/app/src/main/java/com/gh/common/util/LoginUtils.java index 746a95f3a2..5a98350036 100644 --- a/app/src/main/java/com/gh/common/util/LoginUtils.java +++ b/app/src/main/java/com/gh/common/util/LoginUtils.java @@ -41,7 +41,7 @@ public class LoginUtils { } public static void checkPhoneNum(final Context context, final String phoneName, final onCaptchaCallBackListener listener) { // 老用户登录检查手机是否登录过 - RetrofitManager.getApi() + RetrofitManager.getInstance(context).getApi() .checkPhoneNum(phoneName) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -90,7 +90,7 @@ public class LoginUtils { params.put("mobile", phoneNum); RequestBody body = RequestBody.create(MediaType.parse("application/json"), new JSONObject(params).toString()); - RetrofitManager + RetrofitManager.getInstance(context) .getUsersea() .loginByCaptcha(body) .subscribeOn(Schedulers.io()) @@ -142,15 +142,15 @@ public class LoginUtils { Observable observable; if (loginTag == LoginTag.weibo) { - observable = RetrofitManager.getUsersea().loginByWeibo(body); + observable = RetrofitManager.getInstance(context).getUsersea().loginByWeibo(body); } else if (loginTag == LoginTag.qq) { - observable = RetrofitManager.getUsersea().loginByQQ(body); + observable = RetrofitManager.getInstance(context).getUsersea().loginByQQ(body); } else if (loginTag == LoginTag.wechat) { - observable = RetrofitManager.getUsersea().loginByWechat(body); + observable = RetrofitManager.getInstance(context).getUsersea().loginByWechat(body); } else if (loginTag == LoginTag.phone || loginTag == LoginTag.oldUserPhone) { - observable = RetrofitManager.getUsersea().loginByMobile(body); + observable = RetrofitManager.getInstance(context).getUsersea().loginByMobile(body); } else if (loginTag == LoginTag.refresh) { - observable = RetrofitManager.getUsersea().refreshToken(body); + observable = RetrofitManager.getInstance(context).getUsersea().refreshToken(body); } else { return; } @@ -241,7 +241,7 @@ public class LoginUtils { HashMap map = new HashMap<>(); map.put("device_id", syncDeviceID); RequestBody body = RequestBody.create(MediaType.parse("application/json"), new JSONObject(map).toString()); - RetrofitManager.getApi().syncUserData(token, body) + RetrofitManager.getInstance(context).getApi().syncUserData(token, body) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response() { @@ -277,7 +277,7 @@ public class LoginUtils { LoginResponseEntity loginToken = getLoginToken(context); if (loginToken == null || loginToken.getAccessToken() == null) return; - RetrofitManager + RetrofitManager.getInstance(context) .getUsersea() .logout(loginToken.getAccessToken().getValue()) .subscribeOn(Schedulers.io()) @@ -342,7 +342,7 @@ public class LoginUtils { // 获取用户信息 public static void getUserData(final Context context, String token, final onLoginCallBackListener listener, final LoginTag loginTag) { - RetrofitManager + RetrofitManager.getInstance(context) .getApi() .getUserInfo(token) .subscribeOn(Schedulers.io()) @@ -471,7 +471,7 @@ public class LoginUtils { RequestBody body = RequestBody.create(MediaType.parse("application/json"), new JSONObject(map).toString()); - RetrofitManager + RetrofitManager.getInstance(context) .getUsersea() .changeUserInfo(loginToken.getAccessToken().getValue(), body) .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/common/util/NewsUtils.java b/app/src/main/java/com/gh/common/util/NewsUtils.java index 7d8155cc3c..c3f39d807b 100644 --- a/app/src/main/java/com/gh/common/util/NewsUtils.java +++ b/app/src/main/java/com/gh/common/util/NewsUtils.java @@ -1,5 +1,6 @@ package com.gh.common.util; +import android.content.Context; import android.graphics.Color; import android.widget.TextView; @@ -44,8 +45,8 @@ public class NewsUtils { /** * 统计阅读量 */ - public static void statNewsViews(String news_id) { - RetrofitManager.getData().postNewsViews(news_id) + public static void statNewsViews(Context context, String news_id) { + RetrofitManager.getInstance(context).getData().postNewsViews(news_id) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response()); diff --git a/app/src/main/java/com/gh/common/util/PlatformUtils.java b/app/src/main/java/com/gh/common/util/PlatformUtils.java index ec584a7654..bb4bf984db 100644 --- a/app/src/main/java/com/gh/common/util/PlatformUtils.java +++ b/app/src/main/java/com/gh/common/util/PlatformUtils.java @@ -7,7 +7,7 @@ import android.os.Handler; import android.support.v4.util.ArrayMap; import android.text.TextUtils; -import com.gh.base.AppController; +import com.halo.assistant.AppController; import com.lightgame.download.FileUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.entity.PlatformEntity; @@ -262,7 +262,7 @@ public class PlatformUtils { return; } isUpdate = true; - RetrofitManager.getApi().getGamePlatform() + RetrofitManager.getInstance(context).getApi().getGamePlatform() .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response>() { 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 9059475b9f..d88ba1e094 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,6 @@ import rx.Observable; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -import static com.gh.gamecenter.retrofit.RetrofitManager.getComment; - /** * Created by khy on 2016/11/9. */ @@ -31,9 +29,9 @@ public class PostCommentUtils { RequestBody body = RequestBody.create(MediaType.parse("application/json"), content); Observable observable; if (commentEntity != null) { - observable = getComment().postReplyComment(LoginUtils.getToken(context), commentEntity.getId(), body); + observable = RetrofitManager.getInstance(context).getApi().postReplyComment(LoginUtils.getToken(context), commentEntity.getId(), body); } else { - observable = RetrofitManager.getComment().postNewsComment(LoginUtils.getToken(context), newsId, body); + observable = RetrofitManager.getInstance(context).getApi().postNewsComment(LoginUtils.getToken(context), newsId, body); } observable.subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -60,7 +58,7 @@ public class PostCommentUtils { public static void addCommentVoto(final Context context, final String commentId, final PostCommentListener listener) { - getComment() + RetrofitManager.getInstance(context).getApi() .postCommentVote(LoginUtils.getToken(context), commentId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -84,7 +82,7 @@ public class PostCommentUtils { public static void addReportData(final Context context, final String reportData, final PostCommentListener listener) { RequestBody body = RequestBody.create(MediaType.parse("application/json"), reportData); - getComment() + RetrofitManager.getInstance(context).getApi() .postReportData(body, LoginUtils.getToken(context)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/common/util/TagUtils.java b/app/src/main/java/com/gh/common/util/TagUtils.java index 2539d2895c..93590c0a78 100644 --- a/app/src/main/java/com/gh/common/util/TagUtils.java +++ b/app/src/main/java/com/gh/common/util/TagUtils.java @@ -66,7 +66,7 @@ public class TagUtils { return; } isUpdate = true; - RetrofitManager.getApi().getTags() + RetrofitManager.getInstance(context).getApi().getTags() .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response>() { diff --git a/app/src/main/java/com/gh/common/util/TokenUtils.java b/app/src/main/java/com/gh/common/util/TokenUtils.java index bfff13d4a7..fc03121acf 100644 --- a/app/src/main/java/com/gh/common/util/TokenUtils.java +++ b/app/src/main/java/com/gh/common/util/TokenUtils.java @@ -71,7 +71,7 @@ public class TokenUtils { sp.edit().putBoolean("isUploadMid", false).apply(); } RequestBody body = RequestBody.create(MediaType.parse("application/json"), new JSONObject(params).toString()); - RetrofitManager.getUser().postRegister(body) + RetrofitManager.getInstance(context).getApi().postRegister(body) .subscribeOn(Schedulers.io()) .observeOn(Schedulers.io()) .subscribe(new JSONObjectResponse() { @@ -176,7 +176,7 @@ public class TokenUtils { if (token == null) { Map params = new HashMap<>(); params.put("device_id", getDeviceId(context)); - return RetrofitManager.getUser() + return RetrofitManager.getInstance(context).getApi() .postLogin(RequestBody.create(MediaType.parse("application/json"), new JSONObject(params).toString())) .flatMap(new Func1>() { @Override @@ -217,7 +217,7 @@ public class TokenUtils { // 获取服务器时间 public static synchronized void getTime(Context context) { final SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context); - RetrofitManager.getApi().getTime() + RetrofitManager.getInstance(context).getApi().getTime() .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new StringResponse() { @@ -335,7 +335,7 @@ public class TokenUtils { if (params.size() != 0) { RequestBody body = RequestBody.create(MediaType.parse("application/json"), new JSONObject(params).toString()); - RetrofitManager.getUser().postDevice(token, body, TokenUtils.getDeviceId(context)) + RetrofitManager.getInstance(context).getApi().postDevice(token, body, TokenUtils.getDeviceId(context)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response() { diff --git a/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java b/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java index 9cc9cfa948..9e5781f26a 100644 --- a/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java @@ -28,7 +28,7 @@ import android.widget.RelativeLayout; import android.widget.TextView; import com.facebook.drawee.view.SimpleDraweeView; -import com.gh.base.AppController; +import com.halo.assistant.AppController; import com.gh.base.BaseActivity; import com.gh.common.util.DialogUtils; import com.gh.common.util.DisplayUtils; diff --git a/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java b/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java index 570d973714..74cc09e68f 100644 --- a/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java +++ b/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java @@ -22,7 +22,7 @@ import android.widget.RelativeLayout; import android.widget.TextView; import com.facebook.drawee.view.SimpleDraweeView; -import com.gh.base.AppController; +import com.halo.assistant.AppController; import com.gh.base.BaseActivity; import com.gh.common.util.DialogUtils; import com.gh.common.util.PackageUtils; diff --git a/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java b/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java index 68d64e5fc1..210fbdd6f5 100644 --- a/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java +++ b/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java @@ -18,7 +18,7 @@ import android.widget.RelativeLayout; import android.widget.TextView; import com.facebook.drawee.view.SimpleDraweeView; -import com.gh.base.AppController; +import com.halo.assistant.AppController; import com.gh.base.BaseActivity; import com.gh.common.util.DialogUtils; import com.gh.common.util.UserIconUtils; diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java index 7a46c32592..4211659837 100644 --- a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java @@ -67,6 +67,8 @@ import rx.android.schedulers.AndroidSchedulers; import rx.functions.Action1; import rx.schedulers.Schedulers; +import static com.taobao.accs.ACCSManager.mContext; + /** * Created by khy on 2017/3/24. * 游戏详情适配器 @@ -328,7 +330,7 @@ public class GameDetailActivity extends BaseActivity { // 获取游戏摘要 private void getGameDigest() { - RetrofitManager.getApi().getGameDigest(mGameId) + RetrofitManager.getInstance(mContext).getApi().getGameDigest(mGameId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response() { @@ -355,7 +357,7 @@ public class GameDetailActivity extends BaseActivity { // 获取游戏详情 public void getGameDetail() { - RetrofitManager.getApi().getGameDetail(mGameId) + RetrofitManager.getInstance(mContext).getApi().getGameDetail(mGameId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response() { diff --git a/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java b/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java index 9cc1239ea4..21ae96b63f 100644 --- a/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java @@ -37,6 +37,8 @@ import retrofit2.HttpException; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; +import static com.taobao.accs.ACCSManager.mContext; + /** * Created by LGT on 2016/8/29. * 游戏新闻界面 @@ -163,7 +165,7 @@ public class GameNewsActivity extends BaseActivity implements View.OnClickListen } private void getGameArticleType() { - RetrofitManager.getApi() + RetrofitManager.getInstance(mContext).getApi() .getGameArticleType(gameId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/KcSelectGameActivity.java b/app/src/main/java/com/gh/gamecenter/KcSelectGameActivity.java index 65a536c886..527f55806a 100644 --- a/app/src/main/java/com/gh/gamecenter/KcSelectGameActivity.java +++ b/app/src/main/java/com/gh/gamecenter/KcSelectGameActivity.java @@ -14,7 +14,7 @@ import android.widget.ProgressBar; import android.widget.RelativeLayout; import android.widget.TextView; -import com.gh.base.AppController; +import com.halo.assistant.AppController; import com.gh.base.BaseActivity; import com.gh.common.util.DisplayUtils; import com.lightgame.utils.Utils; diff --git a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java index bf6d4607da..4e1399e727 100644 --- a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java @@ -13,7 +13,6 @@ import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; -import com.gh.base.AppController; import com.gh.base.BaseActivity; import com.gh.base.OnRequestCallBackListener; import com.gh.common.util.ApkActiveUtils; @@ -34,6 +33,7 @@ import com.gh.gamecenter.eventbus.EBPackage; import com.gh.gamecenter.eventbus.EBUISwitch; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; +import com.halo.assistant.AppController; import com.lightgame.download.DataWatcher; import com.lightgame.download.DownloadEntity; import com.lightgame.utils.Utils; @@ -185,7 +185,7 @@ public class LibaoDetailActivity extends BaseActivity implements LibaoDetailAdap handler.postDelayed(new Runnable() { @Override public void run() { - getGameDigest(); + getGameDigest(LibaoDetailActivity.this); } }, 1000); } @@ -194,7 +194,7 @@ public class LibaoDetailActivity extends BaseActivity implements LibaoDetailAdap if (mLibaoEntity == null) { String id = getIntent().getStringExtra("id"); if (!TextUtils.isEmpty(id)) { - getLibaoDigest(id); + getLibaoDigest(this, id); } } else { init(); @@ -227,7 +227,7 @@ public class LibaoDetailActivity extends BaseActivity implements LibaoDetailAdap private void init() { if (mLibaoEntity != null && mLibaoEntity.getGame() != null && mLibaoEntity.getGame().getId() != null) { mTitle = mLibaoEntity.getName(); - getGameDigest(); + getGameDigest(this); String status = mLibaoEntity.getStatus(); String beforeStatus = mLibaoEntity.getBeforeStatus(); if (mLibaoEntity.getRepeat() > 0 && @@ -249,8 +249,8 @@ public class LibaoDetailActivity extends BaseActivity implements LibaoDetailAdap } } - private void getLibaoDigest(String libao_id) { - RetrofitManager.getLibao().getLibaoDigest(libao_id) + private void getLibaoDigest(Context context, String libao_id) { + RetrofitManager.getInstance(context).getApi().getLibaoDigest(libao_id) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response() { @@ -265,8 +265,8 @@ public class LibaoDetailActivity extends BaseActivity implements LibaoDetailAdap } // 获取游戏摘要 - private void getGameDigest() { - RetrofitManager.getApi().getGameNewsDigest(mLibaoEntity.getGame().getId()) + private void getGameDigest(final Context context) { + RetrofitManager.getInstance(context).getApi().getGameNewsDigest(mLibaoEntity.getGame().getId()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response() { @@ -279,7 +279,7 @@ public class LibaoDetailActivity extends BaseActivity implements LibaoDetailAdap mDownloadOffText = mGameEntity.getDownloadOffText(); DetailDownloadUtils.detailInitDownload(getDetailViewHolder(), true); - mAdapter.addLibaoDetail(); + mAdapter.addLibaoDetail(context); } @Override diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index 5edb650bc4..ed48207e0b 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -18,7 +18,6 @@ import android.text.Spanned; import android.text.TextUtils; import android.view.KeyEvent; -import com.gh.base.AppController; import com.gh.base.AppUncaughtHandler; import com.gh.base.BaseActivity; import com.gh.common.constant.Config; @@ -58,6 +57,7 @@ import com.gh.gamecenter.retrofit.JSONObjectResponse; import com.gh.gamecenter.retrofit.ObservableUtil; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; +import com.halo.assistant.AppController; import com.lightgame.download.DataWatcher; import com.lightgame.download.DownloadEntity; import com.lightgame.download.DownloadStatus; @@ -91,6 +91,7 @@ import rx.schedulers.Schedulers; import static com.gh.common.util.EntranceUtils.KEY_DATA; import static com.gh.common.util.EntranceUtils.KEY_TO; +import static com.taobao.accs.ACCSManager.mContext; /** * 项目的主Activity，3个Fragment都嵌入在这里。 @@ -220,7 +221,7 @@ public class MainActivity extends BaseActivity { params.put("platform", platform); RequestBody body = RequestBody.create(MediaType.parse("application/json"), new JSONObject(params).toString()); - RetrofitManager.getApi().postDownload(body) + RetrofitManager.getInstance(mContext).getApi().postDownload(body) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response()); @@ -388,7 +389,7 @@ public class MainActivity extends BaseActivity { for (int i = 0, size = localList.size(); i < size; i++) { final String packageName = localList.get(i); - RetrofitManager.getApi().getGameDigestByPackageName(packageName) + RetrofitManager.getInstance(mContext).getApi().getGameDigestByPackageName(packageName) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response>() { @@ -431,7 +432,7 @@ public class MainActivity extends BaseActivity { } else { List> sequences = new ArrayList<>(); for (String id : concernIdList) { - sequences.add(RetrofitManager.getApi().getGameDigest(id)); + sequences.add(RetrofitManager.getInstance(mContext).getApi().getGameDigest(id)); } Observable.merge(sequences) .subscribeOn(Schedulers.io()) @@ -520,8 +521,7 @@ public class MainActivity extends BaseActivity { // 更新用户已安装游戏 RequestBody body = RequestBody.create(MediaType.parse("application/json"), new JSONArray(installed).toString()); - RetrofitManager - .getApi().putPackage(LoginUtils.getToken(MainActivity.this), body) + RetrofitManager.getInstance(mContext).getApi().putPackage(LoginUtils.getToken(MainActivity.this), body) .subscribeOn(Schedulers.io()) .observeOn(Schedulers.io()) .subscribe(new Response()); @@ -558,7 +558,7 @@ public class MainActivity extends BaseActivity { final List list = new ArrayList<>(); List> sequences = new ArrayList<>(); for (ConcernInfo info : concernManager.getInstalledGame()) { - sequences.add(RetrofitManager.getApi().getGameDigest(info.getId())); + sequences.add(RetrofitManager.getInstance(mContext).getApi().getGameDigest(info.getId())); } Observable.merge(sequences) .subscribeOn(Schedulers.io()) @@ -580,9 +580,9 @@ public class MainActivity extends BaseActivity { Object gh_id = PackageUtils.getMetaData(this, packageName, "gh_id"); Observable observable; if (gh_id == null) { - observable = RetrofitManager.getApi().getGameUpdate(packageName); + observable = RetrofitManager.getInstance(mContext).getApi().getGameUpdate(packageName); } else { - observable = RetrofitManager.getApi().getGameUpdate((String) gh_id, packageName); + observable = RetrofitManager.getInstance(mContext).getApi().getGameUpdate((String) gh_id, packageName); } observable.subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -751,7 +751,7 @@ public class MainActivity extends BaseActivity { if (true) { String content = DeviceUtils.getUserDevice(MainActivity.this).toString(); RequestBody body = RequestBody.create(MediaType.parse("application/json"), content); - RetrofitManager.getApi().checkDevice(body) + RetrofitManager.getInstance(mContext).getApi().checkDevice(body) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response() { @@ -789,8 +789,7 @@ public class MainActivity extends BaseActivity { } private void getSuggestionType() { - RetrofitManager - .getApi() + RetrofitManager.getInstance(mContext).getApi() .getSuggestionType() .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -826,7 +825,7 @@ public class MainActivity extends BaseActivity { List> list = new ArrayList<>(); for (String gameId : arrGameId) { - list.add(RetrofitManager.getApi().getGameDigest(gameId)); + list.add(RetrofitManager.getInstance(mContext).getApi().getGameDigest(gameId)); } Observable.merge(list) .subscribeOn(Schedulers.io()) @@ -963,7 +962,7 @@ public class MainActivity extends BaseActivity { } if ("安装".equals(busFour.getType()) && sp.getBoolean("concerngame", true)) {//设置页面控制是否安装后自动关注 // 安装后关注游戏 - RetrofitManager.getApi().getGameDigestByPackageName(packageName) + RetrofitManager.getInstance(mContext).getApi().getGameDigestByPackageName(packageName) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response>() { @@ -986,7 +985,7 @@ public class MainActivity extends BaseActivity { params.put(packageName); RequestBody body = RequestBody.create( MediaType.parse("application/json"), params.toString()); - RetrofitManager.getApi() + RetrofitManager.getInstance(mContext).getApi() .postPackage(LoginUtils.getToken(MainActivity.this), body) .subscribeOn(Schedulers.io()) .observeOn(Schedulers.io()) @@ -997,7 +996,7 @@ public class MainActivity extends BaseActivity { if ("卸载".equals(busFour.getType())) { // 更新已安装游戏 - RetrofitManager.getApi() + RetrofitManager.getInstance(mContext).getApi() .deletePackage(LoginUtils.getToken(this), packageName) .subscribeOn(Schedulers.io()) .observeOn(Schedulers.io()) @@ -1008,7 +1007,7 @@ public class MainActivity extends BaseActivity { } private void concernGame(final String id, final String packageName) { - RetrofitManager.getApi().getGameDigest(id) + RetrofitManager.getInstance(mContext).getApi().getGameDigest(id) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response() { @@ -1042,7 +1041,7 @@ public class MainActivity extends BaseActivity { params.put("icon_key", "icon" + i); RequestBody body = RequestBody.create(MediaType.parse("application/json"), new JSONObject(params).toString()); - RetrofitManager.getUser() + RetrofitManager.getInstance(mContext).getApi() .postDefaultIcon(LoginUtils.getToken(this), body) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java index 0229c5cab2..6e9fb051f2 100644 --- a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java @@ -19,7 +19,6 @@ import android.widget.ScrollView; import android.widget.TextView; import com.facebook.drawee.view.SimpleDraweeView; -import com.gh.base.AppController; import com.gh.base.BaseActivity; import com.gh.common.constant.Config; import com.gh.common.util.CheckLoginUtils; @@ -45,6 +44,7 @@ import com.gh.gamecenter.retrofit.OkHttpCache; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.google.gson.Gson; +import com.halo.assistant.AppController; import com.lightgame.utils.Utils; import org.greenrobot.eventbus.Subscribe; @@ -63,6 +63,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; import static com.gh.gamecenter.personal.PersonalFragment.LOGIN_TAG; +import static com.taobao.accs.ACCSManager.mContext; /** * Created by khy on 2016/11/8. @@ -218,7 +219,7 @@ public class MessageDetailActivity extends BaseActivity implements OnCommentCall } public void getCommentNum() { - RetrofitManager.getComment() + RetrofitManager.getInstance(mContext).getApi() .getNewsCommentnum(newsId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -239,7 +240,7 @@ public class MessageDetailActivity extends BaseActivity implements OnCommentCall } private void getConcernDigest() { - RetrofitManager.getApi().getNewsRichDigest(newsId) + RetrofitManager.getInstance(mContext).getApi().getNewsRichDigest(newsId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response() { @@ -270,7 +271,7 @@ public class MessageDetailActivity extends BaseActivity implements OnCommentCall } private void getNewsViews() { - RetrofitManager.getData() + RetrofitManager.getInstance(mContext).getData() .getNewsViews(newsId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java index 11d5760812..ef45f5e9fd 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java @@ -67,6 +67,8 @@ import rx.android.schedulers.AndroidSchedulers; import rx.functions.Action1; import rx.schedulers.Schedulers; +import static com.taobao.accs.ACCSManager.mContext; + /** * 文章详情页面 要启动该页面 需要传入一下参数 放入 EssayEntity中传过来 文章 id 文章标题 title 文章发表时间 time @@ -438,7 +440,7 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener, } private void getNewsDigest(final String newsId) { - RetrofitManager.getApi().getNewsDigest(newsId) + RetrofitManager.getInstance(mContext).getApi().getNewsDigest(newsId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response() { @@ -639,7 +641,7 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener, mDetailBottomLl.setVisibility(View.GONE); return; } - RetrofitManager.getApi().getGameNewsDigest(gameId) + RetrofitManager.getInstance(mContext).getApi().getGameNewsDigest(gameId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response() { diff --git a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java index 4217c32ca0..06fb5e2595 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java @@ -41,6 +41,8 @@ import rx.android.schedulers.AndroidSchedulers; import rx.functions.Func1; import rx.schedulers.Schedulers; +import static com.taobao.accs.ACCSManager.mContext; + /** * Created by khy on 2016/8/22. * 新闻搜索界面 @@ -183,7 +185,7 @@ public class NewsSearchActivity extends BaseActivity { // DataUtils.onEvent(this, "游戏新闻搜索", searchKey); // DataCollectionUtils.uploadSearch(this, searchKey, "游戏新闻搜索"); - RetrofitManager.getApi().getSearchNews(gameId, searchKey, page, 20) + RetrofitManager.getInstance(mContext).getApi().getSearchNews(gameId, searchKey, page, 20) .map(new Func1, List>() { @Override public List call(List list) { @@ -266,7 +268,7 @@ public class NewsSearchActivity extends BaseActivity { "列表", "游戏新闻搜索", newsEntity.getTitle()); // 统计阅读量 - NewsUtils.statNewsViews(newsEntity.getId()); + NewsUtils.statNewsViews(mContext, newsEntity.getId()); NewsDetailActivity.startNewsDetailActivity(NewsSearchActivity.this, newsEntity, mEntrance + "+(游戏新闻搜索[" + searchKey + "])"); } diff --git a/app/src/main/java/com/gh/gamecenter/ReceiverWaitingActivity.java b/app/src/main/java/com/gh/gamecenter/ReceiverWaitingActivity.java index c37cfbe77c..403ba95922 100644 --- a/app/src/main/java/com/gh/gamecenter/ReceiverWaitingActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ReceiverWaitingActivity.java @@ -22,7 +22,7 @@ import android.widget.RelativeLayout; import android.widget.TextView; import com.facebook.drawee.view.SimpleDraweeView; -import com.gh.base.AppController; +import com.halo.assistant.AppController; import com.gh.base.BaseActivity; import com.gh.common.util.DialogUtils; import com.gh.common.util.DisplayUtils; diff --git a/app/src/main/java/com/gh/gamecenter/ShareGhWfifActivity.java b/app/src/main/java/com/gh/gamecenter/ShareGhWfifActivity.java index ddf5669bdf..477124f73e 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareGhWfifActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareGhWfifActivity.java @@ -17,7 +17,7 @@ import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; -import com.gh.base.AppController; +import com.halo.assistant.AppController; import com.gh.base.BaseActivity; import com.gh.common.util.DialogUtils; import com.gh.common.util.RandomUtils; diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java index 9352c1416d..60de972dc6 100644 --- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java @@ -17,7 +17,6 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; -import com.gh.base.AppController; import com.gh.base.BaseActivity; import com.gh.common.util.PackageUtils; import com.gh.common.util.PlatformUtils; @@ -30,6 +29,7 @@ import com.gh.gamecenter.manager.DataCollectionManager; import com.gh.gamecenter.manager.FilterManager; import com.gh.gamecenter.retrofit.JSONObjectResponse; import com.gh.gamecenter.retrofit.RetrofitManager; +import com.halo.assistant.AppController; import com.lightgame.download.FileUtils; import com.lightgame.utils.AppManager; import com.lightgame.utils.Utils; @@ -50,6 +50,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; import static com.gh.common.util.EntranceUtils.KEY_DATA; +import static com.taobao.accs.ACCSManager.mContext; /** * 引导页面 @@ -282,7 +283,7 @@ public class SplashScreenActivity extends BaseActivity { // 获取下载按钮显示状态 private void getDownloadStatus() { String channel = AppController.getInstance().getChannel(); - RetrofitManager.getApi().getDownloadStatus(PackageUtils.getVersionName(getApplicationContext()), channel) + RetrofitManager.getInstance(mContext).getApi().getDownloadStatus(PackageUtils.getVersionName(getApplicationContext()), channel) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new JSONObjectResponse() { @@ -310,7 +311,7 @@ public class SplashScreenActivity extends BaseActivity { // 获取界面设置 private void getUISetting() { - RetrofitManager.getApi().getUISetting() + RetrofitManager.getInstance(mContext).getApi().getUISetting() .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new JSONObjectResponse() { diff --git a/app/src/main/java/com/gh/gamecenter/SubjectActivity.java b/app/src/main/java/com/gh/gamecenter/SubjectActivity.java index d8ba806841..bb2a874f6f 100644 --- a/app/src/main/java/com/gh/gamecenter/SubjectActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SubjectActivity.java @@ -35,6 +35,7 @@ import retrofit2.HttpException; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; + /** * Created by khy on 2017/4/29. */ @@ -113,7 +114,7 @@ public class SubjectActivity extends BaseActivity { } private void getSubjectName(String id) { - RetrofitManager.getApi() + RetrofitManager.getInstance(this).getApi() .getSubjectName(id) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -144,8 +145,7 @@ public class SubjectActivity extends BaseActivity { } private void loadSubjectType() { - RetrofitManager - .getApi() + RetrofitManager.getInstance(this).getApi() .getColumnSettings(mId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java index 55e30fcfa1..c9ac7d2b27 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java @@ -24,7 +24,7 @@ import android.widget.ProgressBar; import android.widget.ScrollView; import android.widget.TextView; -import com.gh.base.AppController; +import com.halo.assistant.AppController; import com.gh.base.BaseActivity; import com.gh.base.OnRequestCallBackListener; import com.gh.common.constant.Config; @@ -532,7 +532,7 @@ public class SuggestionActivity extends BaseActivity implements SuggestTypeAdapt private void sendSuggestion(final RequestBody body) { - RetrofitManager.getApi().postSuggestion(body, LoginUtils.getToken(this)) + RetrofitManager.getInstance(this).getApi().postSuggestion(body, LoginUtils.getToken(this)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new JSONObjectResponse() { diff --git a/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java b/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java index 41611904f4..883e314048 100644 --- a/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java @@ -38,7 +38,7 @@ import com.facebook.imagepipeline.image.ImageInfo; import com.facebook.imagepipeline.request.ImageRequest; import com.facebook.imagepipeline.request.ImageRequestBuilder; import com.gc.materialdesign.views.ProgressBarCircularIndeterminate; -import com.gh.base.AppController; +import com.halo.assistant.AppController; import com.gh.common.util.DisplayUtils; import com.gh.common.util.EntranceUtils; import com.gh.common.util.ImageUtils; diff --git a/app/src/main/java/com/gh/gamecenter/VoteActivity.java b/app/src/main/java/com/gh/gamecenter/VoteActivity.java index d27e47eb7d..0ad01605d2 100644 --- a/app/src/main/java/com/gh/gamecenter/VoteActivity.java +++ b/app/src/main/java/com/gh/gamecenter/VoteActivity.java @@ -257,7 +257,7 @@ public class VoteActivity extends BaseActivity implements SwipeRefreshLayout.OnR final RequestBody body = RequestBody.create(MediaType.parse("application/json"), object.toString()); - RetrofitManager.getApi() + RetrofitManager.getInstance(this).getApi() .postVersionVote(LoginUtils.getToken(this), body, mGameId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/WebActivity.java b/app/src/main/java/com/gh/gamecenter/WebActivity.java index 10094b093c..5c18fd5548 100644 --- a/app/src/main/java/com/gh/gamecenter/WebActivity.java +++ b/app/src/main/java/com/gh/gamecenter/WebActivity.java @@ -242,7 +242,7 @@ public class WebActivity extends BaseActivity { private void getToolsById() { - RetrofitManager + RetrofitManager.getInstance(this) .getApi() .getToolBoxById(mToolBoxEntity.getId()) .subscribeOn(Schedulers.io()) @@ -268,11 +268,11 @@ public class WebActivity extends BaseActivity { } public void getNewsCommentNum() { - RetrofitManager.getComment() + RetrofitManager.getInstance(this).getApi() .getNewsCommentnum(newsId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new com.gh.gamecenter.retrofit.Response>() { + .subscribe(new Response>() { @Override public void onNext(List response) { diff --git a/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java index 1f5d4d0ed4..8b3be30a3f 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java @@ -71,7 +71,7 @@ public class CommentDetailAdapter extends BaseRecyclerAdapter { public void loadData(int offset) { mIsLoading = true; - RetrofitManager.getComment() + RetrofitManager.getInstance(mContext).getApi() .getCommentTrace(mCommentId, 20, offset) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) 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 7180e0adb7..e32ce5882f 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java @@ -76,7 +76,7 @@ public class ConcernAdapter extends BaseRecyclerAdapter { final List result = new ArrayList<>(); List> sequences = new ArrayList<>(); for (ConcernInfo concernInfo : mConcernList) { - sequences.add(RetrofitManager.getApi().getGameDigest(concernInfo.getId())); + sequences.add(RetrofitManager.getInstance(mContext).getApi().getGameDigest(concernInfo.getId())); } Observable.merge(sequences) .subscribeOn(Schedulers.io()) 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 26723bfc45..4144651f91 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java @@ -5,9 +5,9 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Toast; -import com.gh.common.util.CheckLoginUtils; -import com.lightgame.adapter.BaseRecyclerAdapter; +import com.gh.base.OnRequestCallBackListener; import com.gh.common.util.ApkActiveUtils; +import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DataUtils; import com.gh.common.util.ImageUtils; @@ -17,10 +17,10 @@ import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.ConcernViewHolder; import com.gh.gamecenter.db.info.ConcernInfo; import com.gh.gamecenter.entity.GameEntity; -import com.gh.base.OnRequestCallBackListener; import com.gh.gamecenter.manager.ConcernManager; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; +import com.lightgame.adapter.BaseRecyclerAdapter; import java.util.ArrayList; import java.util.HashMap; @@ -62,7 +62,7 @@ public class ConcernRecommendAdapter extends BaseRecyclerAdapter> sequences = new ArrayList<>(); for (ConcernInfo concernInfo : mConcernManager.getInstalledGame()) { - sequences.add(RetrofitManager.getApi().getGameDigest(concernInfo.getId())); + sequences.add(RetrofitManager.getInstance(mContext).getApi().getGameDigest(concernInfo.getId())); } Observable.merge(sequences) .subscribeOn(Schedulers.io()) @@ -84,7 +84,7 @@ public class ConcernRecommendAdapter extends BaseRecyclerAdapter>() { diff --git a/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java index d670b35bc3..3ca2dff5be 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java @@ -12,7 +12,6 @@ import android.view.inputmethod.InputMethodManager; import android.widget.LinearLayout; import android.widget.Toast; -import com.lightgame.adapter.BaseRecyclerAdapter; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DataUtils; import com.gh.common.util.DisplayUtils; @@ -28,6 +27,7 @@ import com.gh.gamecenter.adapter.viewholder.NewsTextViewHolder; import com.gh.gamecenter.entity.NewsEntity; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; +import com.lightgame.adapter.BaseRecyclerAdapter; import java.util.ArrayList; import java.util.HashMap; @@ -91,9 +91,9 @@ public class GameNewsAdapter extends BaseRecyclerAdapter { Observable> observable; if ("全部".equals(mNewsType)) { - observable = RetrofitManager.getApi().getGameNews(mGameId, 20, offset); + observable = RetrofitManager.getInstance(mContext).getApi().getGameNews(mGameId, 20, offset); } else { - observable = RetrofitManager.getApi().getGameNews(mGameId, 20, offset, mNewsType); + observable = RetrofitManager.getInstance(mContext).getApi().getGameNews(mGameId, 20, offset, mNewsType); } observable.subscribeOn(Schedulers.io()) .map(new Func1, List>() { @@ -205,7 +205,7 @@ public class GameNewsAdapter extends BaseRecyclerAdapter { DataCollectionUtils.uploadClick(mContext, mNewsType, "游戏新闻列表", newsEntity.getTitle()); // 统计阅读量 - NewsUtils.statNewsViews(newsEntity.getId()); + NewsUtils.statNewsViews(mContext, newsEntity.getId()); NewsDetailActivity.startNewsDetailActivity(mContext, newsEntity, StringUtils.buildString(mEntrance, "+(游戏新闻列表[", mNewsType + "])")); } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java index 1a8e096143..5a8bc57dd2 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java @@ -99,7 +99,7 @@ public class ImagePagerAdapter extends RecyclingPagerAdapter { case "news": //TODO 统一startNewsDetailActivity // 统计阅读量 - NewsUtils.statNewsViews(slideEntity.getLink()); + NewsUtils.statNewsViews(mContext, slideEntity.getLink()); Intent intent = new Intent(mContext, NewsDetailActivity.class); intent.putExtra("newsId", slideEntity.getLink()); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java index 7204584b0c..1001a7ae84 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java @@ -13,7 +13,6 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import com.gh.base.AppController; import com.gh.common.constant.ItemViewType; import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.BitmapUtils; @@ -43,6 +42,7 @@ import com.gh.gamecenter.manager.ConcernManager; import com.gh.gamecenter.manager.GameManager; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; +import com.halo.assistant.AppController; import com.lightgame.adapter.BaseRecyclerAdapter; import java.io.File; @@ -243,7 +243,7 @@ public class InstallFragmentAdapter extends BaseRecyclerAdapter { List> sequences = new ArrayList<>(); for (String id : ids) { - sequences.add(RetrofitManager.getApi().getGameDigest(id)); + sequences.add(RetrofitManager.getInstance(mContext).getApi().getGameDigest(id)); } Observable.merge(sequences) .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/gamecenter/adapter/KcSelectGameAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/KcSelectGameAdapter.java index f551a07921..be611eac2c 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/KcSelectGameAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/KcSelectGameAdapter.java @@ -18,7 +18,7 @@ import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; -import com.gh.base.AppController; +import com.halo.assistant.AppController; import com.lightgame.adapter.BaseRecyclerAdapter; import com.gh.common.constant.ItemViewType; import com.gh.common.util.BitmapUtils; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java index eb3de70eae..c50ba8e855 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java @@ -77,8 +77,8 @@ public class LibaoDetailAdapter extends BaseRecyclerAdapter { } - public void addLibaoDetail() { - RetrofitManager.getLibao().getLibaoDetail(mLibaoEntity.getId()) + public void addLibaoDetail(Context context) { + RetrofitManager.getInstance(context).getApi().getLibaoDetail(mLibaoEntity.getId()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response() { @@ -277,7 +277,7 @@ public class LibaoDetailAdapter extends BaseRecyclerAdapter { // 判断按钮状态是否为空(礼包详情进入)，重新获取 if (TextUtils.isEmpty(content)) { - LibaoUtils.getLibaoStatus(mLibaoEntity.getId(), new LibaoUtils.PostLibaoListener() { + LibaoUtils.getLibaoStatus(mContext, mLibaoEntity.getId(), new LibaoUtils.PostLibaoListener() { @Override public void postSucced(Object response) { List statusList = (List) response; 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 b4a55b1d90..f8afad8a7f 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java @@ -125,7 +125,7 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { } public void addHotComment(int offset) { - RetrofitManager.getComment().getHotComment(mConcernEntity.getId(), 10, offset) + RetrofitManager.getInstance(mContext).getApi().getHotComment(mConcernEntity.getId(), 10, offset) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response>() { @@ -151,7 +151,7 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { return; } isLoading = true; - RetrofitManager.getComment().getComment(mConcernEntity.getId(), 10, offset) + RetrofitManager.getInstance(mContext).getApi().getComment(mConcernEntity.getId(), 10, offset) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response>() { @@ -522,7 +522,7 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { } private void statNewsViews(final String news_id) { - RetrofitManager.getData().postNewsViews(news_id) + RetrofitManager.getInstance(mContext).getData().postNewsViews(news_id) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new JSONObjectResponse() { diff --git a/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java index 87c98af036..3e48b80aad 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java @@ -146,11 +146,11 @@ public class ToolBoxRvAdapter extends BaseRecyclerAdapter { Observable> api; if (mIsRequestError || TextUtils.isEmpty(mConcernKey)) { - api = RetrofitManager.getApi().getToolBoxData(offset, mSerchKey); + api = RetrofitManager.getInstance(mContext).getApi().getToolBoxData(offset, mSerchKey); } else if (!mLoadKeyOver) { - api = RetrofitManager.getApi().getToolBoxData(offset, mConcernKey, mSerchKey); + api = RetrofitManager.getInstance(mContext).getApi().getToolBoxData(offset, mConcernKey, mSerchKey); } else { - api = RetrofitManager.getApi().getToolBoxDataExclude(offset, mConcernKey, mSerchKey); + api = RetrofitManager.getInstance(mContext).getApi().getToolBoxDataExclude(offset, mConcernKey, mSerchKey); } final int finalOffset = offset; api diff --git a/app/src/main/java/com/gh/gamecenter/adapter/VoteAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/VoteAdapter.java index 3f9b99e3c7..4ce019ed6b 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/VoteAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/VoteAdapter.java @@ -66,7 +66,7 @@ public class VoteAdapter extends BaseRecyclerAdapter { } public void getVersionVote(final int offset) { - RetrofitManager + RetrofitManager.getInstance(mContext) .getApi() .getVersionVote(mGameId, offset, 20) .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/gamecenter/changeskin/ChangeSkinUtils.java b/app/src/main/java/com/gh/gamecenter/changeskin/ChangeSkinUtils.java index bd62a20039..1b0a1bf79b 100644 --- a/app/src/main/java/com/gh/gamecenter/changeskin/ChangeSkinUtils.java +++ b/app/src/main/java/com/gh/gamecenter/changeskin/ChangeSkinUtils.java @@ -7,7 +7,7 @@ import android.view.View; import android.widget.ProgressBar; import android.widget.TextView; -import com.gh.base.AppController; +import com.halo.assistant.AppController; import com.lightgame.utils.Utils; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.GameDetailSkinViewHolder; 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 488a6c52cb..a1ffaf4e3e 100644 --- a/app/src/main/java/com/gh/gamecenter/changeskin/DownloadUtils.java +++ b/app/src/main/java/com/gh/gamecenter/changeskin/DownloadUtils.java @@ -3,7 +3,7 @@ package com.gh.gamecenter.changeskin; import android.os.Handler; import android.os.Message; -import com.gh.base.AppController; +import com.halo.assistant.AppController; import com.lightgame.utils.Utils; import java.io.BufferedInputStream; diff --git a/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java b/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java index b5c3b8f062..c662e92ef6 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java @@ -49,6 +49,7 @@ import rx.functions.Action1; import rx.functions.Func1; import rx.schedulers.Schedulers; + /** * Created by khy on 18/07/17. */ @@ -75,7 +76,7 @@ public class ArticleAdapter extends BaseRecyclerAdapter { return; } isLoading = true; - RetrofitManager + RetrofitManager.getInstance(mContext) .getApi() .getCollectionArticle(LoginUtils.getToken(mContext), offset) .subscribeOn(Schedulers.io()) @@ -154,7 +155,7 @@ public class ArticleAdapter extends BaseRecyclerAdapter { }, new Action1() { @Override public void call(String ids) { - RetrofitManager.getData() + RetrofitManager.getInstance(mContext).getData() .getNewsViews(ids) .map(new Func1, String>() { @Override @@ -384,7 +385,7 @@ public class ArticleAdapter extends BaseRecyclerAdapter { // 统计新闻阅读量 private void statNewsViews(final NewsEntity newsEntity, final int position) { - RetrofitManager.getData().postNewsViews(newsEntity.getId()) + RetrofitManager.getInstance(mContext).getData().postNewsViews(newsEntity.getId()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new JSONObjectResponse() { diff --git a/app/src/main/java/com/gh/gamecenter/collection/ToolsAdapter.java b/app/src/main/java/com/gh/gamecenter/collection/ToolsAdapter.java index 7a7f1969b6..d2c77dddaf 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/ToolsAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/collection/ToolsAdapter.java @@ -54,7 +54,7 @@ public class ToolsAdapter extends BaseRecyclerAdapter { return; } isLoading = true; - RetrofitManager + RetrofitManager.getInstance(mContext) .getApi() .getCollectionTools(LoginUtils.getToken(mContext), offset) .subscribeOn(Schedulers.io()) 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 efc30a4e7a..5e7fa02462 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java @@ -16,19 +16,15 @@ import android.widget.LinearLayout; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DataUtils; import com.gh.common.util.DialogUtils; -import com.lightgame.download.FileUtils; import com.gh.common.util.ImageUtils; import com.gh.common.util.MD5Utils; import com.gh.common.util.NetworkUtils; import com.gh.common.util.PackageUtils; import com.gh.common.util.PlatformUtils; import com.gh.common.util.StringUtils; -import com.lightgame.download.DownloadEntity; import com.gh.download.DownloadManager; -import com.lightgame.download.DownloadStatus; import com.gh.gamecenter.DownloadManagerActivity; import com.gh.gamecenter.R; -import com.lightgame.adapter.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.DownloadHeadViewHolder; import com.gh.gamecenter.adapter.viewholder.GameUpdateViewHolder; import com.gh.gamecenter.db.info.ConcernInfo; @@ -39,6 +35,10 @@ import com.gh.gamecenter.manager.ConcernManager; import com.gh.gamecenter.manager.PackageManager; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; +import com.lightgame.adapter.BaseRecyclerAdapter; +import com.lightgame.download.DownloadEntity; +import com.lightgame.download.DownloadStatus; +import com.lightgame.download.FileUtils; import org.greenrobot.eventbus.EventBus; @@ -104,9 +104,9 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter { Object gh_id = PackageUtils.getMetaData(mContext, packageName, "gh_id"); Observable observable; if (gh_id == null) { - observable = RetrofitManager.getApi().getGameUpdate(packageName); + observable = RetrofitManager.getInstance(mContext).getApi().getGameUpdate(packageName); } else { - observable = RetrofitManager.getApi().getGameUpdate((String) gh_id, packageName); + observable = RetrofitManager.getInstance(mContext).getApi().getGameUpdate((String) gh_id, packageName); } observable.subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -149,9 +149,9 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter { for (String packageName : packages) { gh_id = PackageUtils.getMetaData(mContext, packageName, "gh_id"); if (gh_id == null) { - sequences.add(RetrofitManager.getApi().getGameUpdate(packageName)); + sequences.add(RetrofitManager.getInstance(mContext).getApi().getGameUpdate(packageName)); } else { - sequences.add(RetrofitManager.getApi().getGameUpdate((String) gh_id, packageName)); + sequences.add(RetrofitManager.getInstance(mContext).getApi().getGameUpdate((String) gh_id, packageName)); } } Observable.merge(sequences) diff --git a/app/src/main/java/com/gh/gamecenter/fragment/MainFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/MainFragment.java index 451bfaad94..042d8c93c0 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/MainFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/MainFragment.java @@ -44,6 +44,7 @@ import rx.schedulers.Schedulers; import static com.gh.gamecenter.MainActivity.EB_MAINACTIVITY_TAG; import static com.gh.gamecenter.MainActivity.EB_SKIP_GAMEFRAGMENT; +import static com.taobao.accs.ACCSManager.mContext; /** * @author CsHeng @@ -135,7 +136,7 @@ public class MainFragment extends BaseFragment_ViewPager_Checkable { } private void getSearchHints() { - RetrofitManager.getApi().getSearchHints() + RetrofitManager.getInstance(mContext).getApi().getSearchHints() .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response>() { @@ -193,9 +194,9 @@ public class MainFragment extends BaseFragment_ViewPager_Checkable { final MessageMarkReadDao readDao) { Observable observable; if ("kefu".equals(type)) { - observable = RetrofitManager.getMessage().postMarkKeFuRead(body, LoginUtils.getToken(context)); + observable = RetrofitManager.getInstance(context).getApi().postMarkKeFuRead(body, LoginUtils.getToken(context)); } else { - observable = RetrofitManager.getMessage().postMarkNoticeRead(body, LoginUtils.getToken(context)); + observable = RetrofitManager.getInstance(context).getApi().postMarkNoticeRead(body, LoginUtils.getToken(context)); } observable.subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java index e0e4f689c9..fcdd5f1a7a 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java @@ -79,6 +79,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.functions.Func1; import rx.schedulers.Schedulers; + /** * Created by khy on 2016/12/6. */ @@ -175,7 +176,7 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter { } public void initSubjectDigest(final boolean isLoadMore) { - RetrofitManager.getApi() + RetrofitManager.getInstance(mContext).getApi() .getSubjectDigest() .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -206,7 +207,7 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter { } private void initSlide(final boolean isFirst) { - RetrofitManager.getApi().getSlide() + RetrofitManager.getInstance(mContext).getApi().getSlide() .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response>() { @@ -233,7 +234,7 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter { } private void initSubjectList() { - RetrofitManager.getApi().getColumn() + RetrofitManager.getInstance(mContext).getApi().getColumn() .map(new Func1, List>() { @Override public List call(List list) { @@ -901,7 +902,7 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter { case "news": //TODO 统一startNewsDetailActivity // 统计阅读量 - NewsUtils.statNewsViews(entity.getLink()); + NewsUtils.statNewsViews(mContext, entity.getLink()); Intent intent = new Intent(mContext, NewsDetailActivity.class); intent.putExtra("newsId", entity.getLink()); @@ -1026,7 +1027,7 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter { } private void changeSubjectGame(final ProgressBar progressBar, final SubjectEntity subjectEntity) { - RetrofitManager.getApi() + RetrofitManager.getInstance(mContext).getApi() .getSubjectGame(subjectEntity.getId()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java index 62d5d2e2c4..f3bcdebede 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java @@ -68,6 +68,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.functions.Func1; import rx.schedulers.Schedulers; + /** * Created by khy on 2017/3/27. * 游戏详情 - 福利适配器 @@ -93,7 +94,6 @@ public class FuLiAdapter extends BaseRecyclerAdapter { public FuLiAdapter(Context context, String entrance, GameEntity gameEntity, GameDetailEntity detailEntity) { super(context); - this.mContext = context; this.entrance = entrance; isOpenLibaoList = false; @@ -232,7 +232,7 @@ public class FuLiAdapter extends BaseRecyclerAdapter { private void getToolTox() { - RetrofitManager + RetrofitManager.getInstance(mContext) .getApi() .getGameToolBoxData(mGameEntity.getId(), 0) .subscribeOn(Schedulers.io()) @@ -250,7 +250,7 @@ public class FuLiAdapter extends BaseRecyclerAdapter { // 获取游戏新闻 private void getGameNews() { - RetrofitManager.getApi().getGameNews(mGameEntity.getId(), 3) + RetrofitManager.getInstance(mContext).getApi().getGameNews(mGameEntity.getId(), 3) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response>() { @@ -288,7 +288,7 @@ public class FuLiAdapter extends BaseRecyclerAdapter { private void addLibaoList() { if (mGameEntity == null) return; - RetrofitManager.getLibao().getLibaoByGame(mGameEntity.getId(), 0, 128) + RetrofitManager.getInstance(mContext).getApi().getLibaoByGame(mGameEntity.getId(), 0, 128) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response>() { @@ -314,7 +314,7 @@ public class FuLiAdapter extends BaseRecyclerAdapter { builder.deleteCharAt(builder.length() - 1); String ids = builder.toString(); - RetrofitManager.getLibao().getLibaoStatus(ids) + RetrofitManager.getInstance(mContext).getApi().getLibaoStatus(ids) .map(new Func1, Object>() { @Override public Object call(List list) { @@ -567,7 +567,7 @@ public class FuLiAdapter extends BaseRecyclerAdapter { DataCollectionUtils.uploadClick(mContext, "资讯攻略", "游戏详情", newsEntity.getTitle()); // 统计阅读量 - NewsUtils.statNewsViews(newsEntity.getId()); + NewsUtils.statNewsViews(mContext, newsEntity.getId()); NewsDetailActivity.startNewsDetailActivity(mContext, newsEntity, entrance + "+(游戏详情[" + mGameEntity.getName() + "]:资讯攻略-列表[" + (ii + 1) + "])"); } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiAdapter.java index f4a5741fb2..2fd3f4984e 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiAdapter.java @@ -154,7 +154,7 @@ public class XinXiAdapter extends BaseRecyclerAdapter { // 获取游戏新闻 private void getGameNews() { - RetrofitManager.getApi().getGameNews(mGameEntity.getId(), 3) + RetrofitManager.getInstance(mContext).getApi().getGameNews(mGameEntity.getId(), 3) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response>() { @@ -204,7 +204,7 @@ public class XinXiAdapter extends BaseRecyclerAdapter { } private void getRemenkapai(final int count) { - RetrofitManager.getApi().getRemenkapai() + RetrofitManager.getInstance(mContext).getApi().getRemenkapai() .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response>() { @@ -241,7 +241,7 @@ public class XinXiAdapter extends BaseRecyclerAdapter { List> sequences = new ArrayList<>(); for (String id : ids) { - sequences.add(RetrofitManager.getApi().getGameDigest(id)); + sequences.add(RetrofitManager.getInstance(mContext).getApi().getGameDigest(id)); } Observable.merge(sequences) .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/gamecenter/geetest/GeetestUtils.java b/app/src/main/java/com/gh/gamecenter/geetest/GeetestUtils.java index 7bd572ac17..37cf659a8d 100644 --- a/app/src/main/java/com/gh/gamecenter/geetest/GeetestUtils.java +++ b/app/src/main/java/com/gh/gamecenter/geetest/GeetestUtils.java @@ -67,7 +67,7 @@ public class GeetestUtils { private void checkServer(final Context context) { isOperating = true; - RetrofitManager.getLibao() + RetrofitManager.getInstance(context).getApi() .getCaptchaData(LoginUtils.getToken(context)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuFragment.java b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuFragment.java index 6db8226487..af1cc538ba 100644 --- a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuFragment.java +++ b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuFragment.java @@ -8,7 +8,7 @@ import android.view.View; import android.widget.CheckedTextView; import android.widget.LinearLayout; -import com.gh.base.AppController; +import com.halo.assistant.AppController; import com.gh.base.adapter.FragmentAdapter; import com.gh.base.fragment.BaseFragment; import com.gh.gamecenter.R; diff --git a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpAdapter.java b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpAdapter.java index e3b0021231..b4b33f5a24 100644 --- a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpAdapter.java @@ -82,7 +82,7 @@ public class KaiFuVpAdapter extends BaseRecyclerAdapter { public void addList(int offset) { mIsLoaded = false; - RetrofitManager.getApi() + RetrofitManager.getInstance(mContext).getApi() .getKaiFuData(mGameId, mDay, offset, 20) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java index fd8a80ed27..70fc0ab636 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java @@ -1,5 +1,6 @@ package com.gh.gamecenter.libao; +import android.content.Context; import android.content.Intent; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView.ViewHolder; @@ -143,18 +144,18 @@ class Libao2FragmentAdapter extends BaseRecyclerAdapter { if (s == null) { mCallBackListener.loadEmpty(); } else { - addLibaoListByKey(offset); + addLibaoListByKey(mContext, offset); } } }); } else { - addLibaoListByKey(offset); + addLibaoListByKey(mContext, offset); } } - public void addLibaoListByKey(final int offset) { - RetrofitManager.getLibao().getLibaoByConcern(key, offset) + public void addLibaoListByKey(final Context context, final int offset) { + RetrofitManager.getInstance(context).getApi().getLibaoByConcern(key, offset) .map(new Func1, List>() { @Override public List call(List list) { @@ -190,7 +191,7 @@ class Libao2FragmentAdapter extends BaseRecyclerAdapter { @Override public void onFailure(HttpException e) { if (e != null && e.code() == 409) { - addLibaoListById(offset); + addLibaoListById(context, offset); ConcernUtils.INSTANCE.updateConcernData(mContext, new JSONArray(mGameIdList)); return; } @@ -212,7 +213,7 @@ class Libao2FragmentAdapter extends BaseRecyclerAdapter { builder.deleteCharAt(builder.length() - 1); String ids = builder.toString(); - LibaoUtils.getLibaoStatus(ids, new LibaoUtils.PostLibaoListener() { + LibaoUtils.getLibaoStatus(mContext, ids, new LibaoUtils.PostLibaoListener() { @Override public void postSucced(Object response) { List statusList = (List) response; @@ -229,8 +230,8 @@ class Libao2FragmentAdapter extends BaseRecyclerAdapter { }); } - public void addLibaoListById(int offset) { - RetrofitManager.getLibao().getLibaoByGame(ids, offset, 20) + public void addLibaoListById(Context context, int offset) { + RetrofitManager.getInstance(context).getApi().getLibaoByGame(ids, offset, 20) .map(new Func1, List>() { @Override public List call(List list) { diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java index 1f09e86afa..93e6bbfadc 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java @@ -58,7 +58,7 @@ public class LibaoHistoryAdapter extends BaseRecyclerAdapter { public void loadList(int offset) { isLoading = true; - RetrofitManager.getLibao() + RetrofitManager.getInstance(mContext).getApi() .getHistoryLibao("true", offset) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt index 040bab582e..4fe84ad5b7 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt @@ -48,7 +48,7 @@ class LibaoNewAdapter(callBackListener: OnRequestCallBackListener, fun addLibaoList(offset: Int) { if (isLoading) return isLoading = true - RetrofitManager.getLibao().getLibao(offset).map { list -> + RetrofitManager.getInstance(mContext).getApi().getLibao(offset).map { list -> // 去掉重复数据 LibaoUtils.removeDuplicateData(mLibaoList, list) } @@ -110,7 +110,7 @@ class LibaoNewAdapter(callBackListener: OnRequestCallBackListener, builder.deleteCharAt(builder.length - 1) val ids = builder.toString() - LibaoUtils.getLibaoStatus(ids, object : LibaoUtils.PostLibaoListener { + LibaoUtils.getLibaoStatus(mContext, ids, object : LibaoUtils.PostLibaoListener { override fun postSucced(response: Any) { val statusList = response as List diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt b/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt index d854a1082b..e4c0d333b4 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt @@ -60,7 +60,7 @@ class LibaoSearchAdapter(fragment: LibaoSearchFragment, if (isLoading || TextUtils.isEmpty(searchKey)) return if (offset == 0) mLibaoList.clear() isLoading = true - RetrofitManager.getLibao().getLibaoBySearch(searchKey, offset).map { list -> + RetrofitManager.getInstance(mContext).getApi().getLibaoBySearch(searchKey, offset).map { list -> // 去掉重复数据 LibaoUtils.removeDuplicateData(mLibaoList, list) } @@ -122,7 +122,7 @@ class LibaoSearchAdapter(fragment: LibaoSearchFragment, builder.deleteCharAt(builder.length - 1) val ids = builder.toString() - LibaoUtils.getLibaoStatus(ids, object : LibaoUtils.PostLibaoListener { + LibaoUtils.getLibaoStatus(mContext, ids, object : LibaoUtils.PostLibaoListener { override fun postSucced(response: Any) { val statusList = response as List diff --git a/app/src/main/java/com/gh/gamecenter/manager/ConcernManager.java b/app/src/main/java/com/gh/gamecenter/manager/ConcernManager.java index 13976632bf..886876dad6 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/ConcernManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/ConcernManager.java @@ -4,7 +4,7 @@ import android.content.Context; import android.support.v4.util.ArrayMap; import android.text.TextUtils; -import com.gh.base.AppController; +import com.halo.assistant.AppController; import com.gh.common.util.PackageUtils; import com.gh.common.util.TrafficUtils; import com.gh.gamecenter.db.ConcernDao; diff --git a/app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java b/app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java index 1c8527b54a..d784ac6c03 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java @@ -3,16 +3,16 @@ package com.gh.gamecenter.manager; import android.content.Context; import android.preference.PreferenceManager; -import com.gh.base.AppController; import com.gh.common.util.Installation; import com.gh.common.util.PackageUtils; import com.gh.common.util.TokenUtils; -import com.lightgame.utils.Utils; import com.gh.gamecenter.db.DataCollectionDao; import com.gh.gamecenter.db.info.DataCollectionInfo; import com.gh.gamecenter.retrofit.JSONObjectResponse; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; +import com.halo.assistant.AppController; +import com.lightgame.utils.Utils; import org.json.JSONArray; import org.json.JSONException; @@ -71,7 +71,7 @@ public class DataCollectionManager { RequestBody body = RequestBody.create(MediaType.parse("application/json"), new JSONObject(params).toString()); - RetrofitManager.getData().postRealData(body) + RetrofitManager.getInstance(mContext).getData().postRealData(body) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response() { @@ -183,7 +183,7 @@ public class DataCollectionManager { RequestBody body = RequestBody.create(MediaType.parse("application/json"), new JSONArray(params).toString()); - RetrofitManager.getData().postData(body) + RetrofitManager.getInstance(mContext).getData().postData(body) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new JSONObjectResponse() { diff --git a/app/src/main/java/com/gh/gamecenter/manager/FilterManager.java b/app/src/main/java/com/gh/gamecenter/manager/FilterManager.java index 174779e1a6..a87fbe4e27 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/FilterManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/FilterManager.java @@ -20,6 +20,7 @@ import java.util.List; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; + public class FilterManager { private FilterDao mFilterDao; @@ -75,7 +76,7 @@ public class FilterManager { } else { since = mFilterDao.getSince(); } - RetrofitManager.getApi().getPackageUsed(since, skip) + RetrofitManager.getInstance(mContext).getApi().getPackageUsed(since, skip) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response>() { diff --git a/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java b/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java index 42f170ae01..1e3f84487e 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java @@ -14,7 +14,7 @@ import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; -import com.gh.base.AppController; +import com.halo.assistant.AppController; import com.gh.common.util.DataLogUtils; import com.gh.common.util.DataUtils; import com.gh.common.util.DialogUtils; @@ -115,7 +115,7 @@ public class UpdateManager { loadingDialog = DialogUtils.showWaitDialog(mContext, "检查更新中..."); } String channel = AppController.getInstance().getChannel(); - RetrofitManager.getApi().getUpdate(PackageUtils.getVersionName(mContext), channel) + RetrofitManager.getInstance(mContext).getApi().getUpdate(PackageUtils.getVersionName(mContext), channel) .map(new Func1() { @Override public String call(AppEntity appEntity) { diff --git a/app/src/main/java/com/gh/gamecenter/message/CommentFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/message/CommentFragmentAdapter.java index be89d98ea6..2ebe9f333e 100644 --- a/app/src/main/java/com/gh/gamecenter/message/CommentFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/message/CommentFragmentAdapter.java @@ -60,7 +60,7 @@ public class CommentFragmentAdapter extends BaseRecyclerAdapter { public void loadData(final int offset) { isLoaded = false; - RetrofitManager.getMessage() + RetrofitManager.getInstance(mContext).getApi() .getMessageCommentData(LoginUtils.getToken(mContext), offset, 20) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java index 39953da7e0..fb29d8f56d 100644 --- a/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java @@ -83,7 +83,7 @@ public class KeFuFragmentAdapter extends BaseRecyclerAdapter { public void loadData(final int offset) { isLoaded = false; - RetrofitManager.getMessage() + RetrofitManager.getInstance(mContext).getApi() .getMessageKeFuData(LoginUtils.getToken(mContext), offset, 20) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -149,7 +149,7 @@ public class KeFuFragmentAdapter extends BaseRecyclerAdapter { String ids = new Gson().toJson(mReceiveIds); final RequestBody body = RequestBody.create(MediaType.parse("application/json"), ids); - RetrofitManager.getMessage() + RetrofitManager.getInstance(mContext).getApi() .postKeFuDataReceive(body, LoginUtils.getToken(mContext)) .subscribeOn(Schedulers.io()) .observeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java b/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java index 733a78ae75..b02e00af3a 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java @@ -122,7 +122,7 @@ public class MessageFragment extends BaseFragment_ViewPager_Checkable { } private void initMessageUnread(final Context context) { - RetrofitManager.getMessage() + RetrofitManager.getInstance(context).getApi() .getMessageUnread(LoginUtils.getToken(context)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -175,7 +175,7 @@ public class MessageFragment extends BaseFragment_ViewPager_Checkable { } private void postMarkCommentRead(final Context context) { - RetrofitManager.getMessage() + RetrofitManager.getInstance(context).getApi() .postMarkCommentRead(LoginUtils.getToken(context)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/message/NoticeFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/message/NoticeFragmentAdapter.java index 4252c15cf1..10caf3ca4a 100644 --- a/app/src/main/java/com/gh/gamecenter/message/NoticeFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/message/NoticeFragmentAdapter.java @@ -81,7 +81,7 @@ public class NoticeFragmentAdapter extends BaseRecyclerAdapter { public void loadData(final int offset) { isLoaded = false; - RetrofitManager.getMessage() + RetrofitManager.getInstance(mContext).getApi() .getMessageNoticeData(LoginUtils.getToken(mContext), offset, 20) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -156,7 +156,7 @@ public class NoticeFragmentAdapter extends BaseRecyclerAdapter { final RequestBody body = RequestBody.create(MediaType.parse("application/json"), ids); - RetrofitManager.getMessage() + RetrofitManager.getInstance(mContext).getApi() .postNoticeDataReceive(body, LoginUtils.getToken(mContext)) .subscribeOn(Schedulers.io()) .observeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java index 77feeac396..ab7ccb6a64 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java @@ -48,6 +48,7 @@ import rx.functions.Action1; import rx.functions.Func1; import rx.schedulers.Schedulers; + /** * Created by khy on 2016/6/30. * 资讯-资讯-数据适配器 @@ -257,7 +258,7 @@ public class News1FragmentAdapter extends BaseRecyclerAdapter { // 统计新闻阅读量 private void statNewsViews(final NewsEntity newsEntity, final int position) { - RetrofitManager.getData().postNewsViews(newsEntity.getId()) + RetrofitManager.getInstance(mContext).getData().postNewsViews(newsEntity.getId()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new JSONObjectResponse() { @@ -287,7 +288,7 @@ public class News1FragmentAdapter extends BaseRecyclerAdapter { return; } isLoading = true; - RetrofitManager.getApi() + RetrofitManager.getInstance(mContext).getApi() .getZiXun(offset) .map(new Func1, List>() { @Override @@ -363,7 +364,7 @@ public class News1FragmentAdapter extends BaseRecyclerAdapter { }, new Action1() { @Override public void call(String ids) { - RetrofitManager.getData() + RetrofitManager.getInstance(mContext).getData() .getNewsViews(ids) .map(new Func1, String>() { @Override diff --git a/app/src/main/java/com/gh/gamecenter/news/News2Fragment.java b/app/src/main/java/com/gh/gamecenter/news/News2Fragment.java index f0afc90766..542fb11373 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News2Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/news/News2Fragment.java @@ -54,6 +54,8 @@ import rx.functions.Action1; import rx.functions.Func1; import rx.schedulers.Schedulers; +import static com.taobao.accs.ACCSManager.mContext; + /** * Created by khy on 2016/8/15. * 资讯-关注界面 @@ -200,9 +202,9 @@ public class News2Fragment extends BaseFragment implements SwipeRefreshLayout.On List> sequences = new ArrayList<>(); for (int i = 0, size = installedList.size() + 1; i < size; i++) { if (i == size - 1) { - sequences.add(RetrofitManager.getApi().getGameDigest("5618b86e8ab49e17088b4575"));// 光环助手ID + sequences.add(RetrofitManager.getInstance(mContext).getApi().getGameDigest("5618b86e8ab49e17088b4575"));// 光环助手ID } else { - sequences.add(RetrofitManager.getApi().getGameDigest(installedList.get(i).getId())); + sequences.add(RetrofitManager.getInstance(mContext).getApi().getGameDigest(installedList.get(i).getId())); } } Observable.merge(sequences) @@ -238,7 +240,7 @@ public class News2Fragment extends BaseFragment implements SwipeRefreshLayout.On } } - RetrofitManager.getApi() + RetrofitManager.getInstance(mContext).getApi() .getRemenkapai() .map(new Func1, String>() { @Override diff --git a/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java index dc3803cc44..77f743ee5a 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java @@ -1,5 +1,6 @@ package com.gh.gamecenter.news; +import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.support.v7.widget.RecyclerView; @@ -11,9 +12,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Toast; -import com.gh.base.AppController; import com.gh.base.OnRequestCallBackListener; -import com.lightgame.adapter.BaseRecyclerAdapter; import com.gh.common.constant.ItemViewType; import com.gh.common.util.ConcernContentUtils; import com.gh.common.util.ConcernUtils; @@ -51,6 +50,8 @@ import com.gh.gamecenter.retrofit.JSONObjectResponse; import com.gh.gamecenter.retrofit.ObservableUtil; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; +import com.halo.assistant.AppController; +import com.lightgame.adapter.BaseRecyclerAdapter; import org.json.JSONArray; import org.json.JSONException; @@ -168,17 +169,17 @@ public class News2FragmentAdapter extends BaseRecyclerAdapter { if (s == null) { listener.loadEmpty(); } else { - loadDataByKey(offset); + loadDataByKey(mContext, offset); } } }); } else { - loadDataByKey(offset); + loadDataByKey(mContext, offset); } } - private void loadDataByKey(final int offset) { - RetrofitManager.getApi() + private void loadDataByKey(final Context context, final int offset) { + RetrofitManager.getInstance(context).getApi() .getGuanZhuByKey(key, offset) .map(new Func1, List>() { @Override @@ -204,8 +205,8 @@ public class News2FragmentAdapter extends BaseRecyclerAdapter { } getLibaoStatus(response); - getNewsViews(response, offset); - getNewsCommentnum(response, offset); + getNewsViews(context, response, offset); + getNewsCommentnum(context, response, offset); } else { isOver = true; @@ -229,7 +230,7 @@ public class News2FragmentAdapter extends BaseRecyclerAdapter { @Override public void onFailure(HttpException e) { if (e != null && e.code() == 409) { - loadDataByGameId(offset); + loadDataByGameId(context, offset); ConcernUtils.INSTANCE.updateConcernData(mContext, new JSONArray(gameIdList)); return; } @@ -283,7 +284,7 @@ public class News2FragmentAdapter extends BaseRecyclerAdapter { builder.deleteCharAt(builder.length() - 1); String ids = builder.toString(); - LibaoUtils.getLibaoStatus(ids, new LibaoUtils.PostLibaoListener() { + LibaoUtils.getLibaoStatus(mContext, ids, new LibaoUtils.PostLibaoListener() { @Override public void postSucced(Object response) { libaoStatusList.addAll((List) response); @@ -298,7 +299,7 @@ public class News2FragmentAdapter extends BaseRecyclerAdapter { } // 获取新闻阅读量 - private void getNewsViews(final List list, final int start) { + private void getNewsViews(final Context context, final List list, final int start) { if (list == null || list.isEmpty()) { return; } @@ -319,7 +320,7 @@ public class News2FragmentAdapter extends BaseRecyclerAdapter { }, new Action1() { @Override public void call(String ids) { - RetrofitManager.getData() + RetrofitManager.getInstance(context).getData() .getNewsViews(ids) .map(new Func1, String>() { @Override @@ -348,7 +349,7 @@ public class News2FragmentAdapter extends BaseRecyclerAdapter { } // 获取新闻评论数 - private void getNewsCommentnum(final List list, final int start) { + private void getNewsCommentnum(final Context context, final List list, final int start) { if (list == null || list.isEmpty()) { return; } @@ -368,7 +369,7 @@ public class News2FragmentAdapter extends BaseRecyclerAdapter { }, new Action1() { @Override public void call(String ids) { - RetrofitManager.getComment() + RetrofitManager.getInstance(context).getApi() .getNewsCommentnum(ids) .map(new Func1, String>() { @Override @@ -396,8 +397,8 @@ public class News2FragmentAdapter extends BaseRecyclerAdapter { }); } - private void loadDataByGameId(final int offset) { - RetrofitManager.getApi() + private void loadDataByGameId(final Context context, final int offset) { + RetrofitManager.getInstance(context).getApi() .getGuanZhuById(ids, offset) .map(new Func1, List>() { @Override @@ -422,8 +423,8 @@ public class News2FragmentAdapter extends BaseRecyclerAdapter { notifyDataSetChanged(); } - getNewsViews(response, offset); - getNewsCommentnum(response, offset); + getNewsViews(mContext, response, offset); + getNewsCommentnum(context, response, offset); getLibaoStatus(response); } else { isOver = true; @@ -676,7 +677,7 @@ public class News2FragmentAdapter extends BaseRecyclerAdapter { DataCollectionUtils.uploadClick(mContext, "列表", "资讯-关注", concernEntity.getTitle()); //统计阅读量 - statNewsViews(concernEntity, viewHolder.getPosition()); + statNewsViews(mContext, concernEntity, viewHolder.getPosition()); AppController.put("ConcernEntity", concernEntity); skipPosition = viewHolder.getPosition(); if (concernEntity.getLink() != null) { @@ -709,7 +710,7 @@ public class News2FragmentAdapter extends BaseRecyclerAdapter { public void onClick(View v) { isNetworkError = false; notifyItemChanged(getItemCount() - 1); - loadDataByKey(concernList.size()); + loadDataByKey(mContext, concernList.size()); } }); } else if (isOver) { @@ -724,8 +725,8 @@ public class News2FragmentAdapter extends BaseRecyclerAdapter { } // 统计新闻阅读量 - private void statNewsViews(final ConcernEntity concernEntity, final int position) { - RetrofitManager.getData().postNewsViews(concernEntity.getId()) + private void statNewsViews(Context context, final ConcernEntity concernEntity, final int position) { + RetrofitManager.getInstance(context).getData().postNewsViews(concernEntity.getId()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new JSONObjectResponse() { diff --git a/app/src/main/java/com/gh/gamecenter/news/News3FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/news/News3FragmentAdapter.java index 861691d0a5..9ec9c77c9f 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News3FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/news/News3FragmentAdapter.java @@ -105,7 +105,7 @@ public class News3FragmentAdapter extends BaseRecyclerAdapter { DataCollectionManager.onEvent(mContext, "click-item", map); // 统计阅读量 - NewsUtils.statNewsViews(newsEntity.getId()); + NewsUtils.statNewsViews(mContext, newsEntity.getId()); NewsDetailActivity.startNewsDetailActivity(mContext, newsEntity, StringUtils.buildString("(资讯:攻略[" + viewHolder.getAdapterPosition() + "])")); } }); @@ -142,7 +142,7 @@ public class News3FragmentAdapter extends BaseRecyclerAdapter { notifyDataSetChanged(); } - RetrofitManager + RetrofitManager.getInstance(mContext) .getApi() .getNews("攻略", 20, offset) .map(new Func1, List>() { diff --git a/app/src/main/java/com/gh/gamecenter/news/News4FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/news/News4FragmentAdapter.java index a478c63286..e612d61ca3 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News4FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/news/News4FragmentAdapter.java @@ -48,6 +48,7 @@ import rx.functions.Action1; import rx.functions.Func1; import rx.schedulers.Schedulers; + /** * Created by khy on 2016/6/30. * 资讯-原创-数据适配器 @@ -255,7 +256,7 @@ public class News4FragmentAdapter extends BaseRecyclerAdapter { } private void statNewsViews(final NewsEntity newsEntity, final int position) { - RetrofitManager.getData().postNewsViews(newsEntity.getId()) + RetrofitManager.getInstance(mContext).getData().postNewsViews(newsEntity.getId()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new JSONObjectResponse() { @@ -284,7 +285,7 @@ public class News4FragmentAdapter extends BaseRecyclerAdapter { return; } isLoading = true; - RetrofitManager.getApi() + RetrofitManager.getInstance(mContext).getApi() .getYuanChuang(offset) .map(new Func1, List>() { @Override @@ -359,7 +360,7 @@ public class News4FragmentAdapter extends BaseRecyclerAdapter { }, new Action1() { @Override public void call(String ids) { - RetrofitManager.getData() + RetrofitManager.getInstance(mContext).getData() .getNewsViews(ids) .map(new Func1, String>() { @Override 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 bc3c26323f..6ccc73ca60 100644 --- a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java @@ -109,7 +109,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { } public void getNewsDetail() { - RetrofitManager.getApi().getNewsDetail(mId) + RetrofitManager.getInstance(mContext).getApi().getNewsDetail(mId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response() { @@ -469,7 +469,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { DataCollectionUtils.uploadClick(mContext, "相关推荐", "新闻详情", newsEntity.getTitle()); // 统计阅读量 - NewsUtils.statNewsViews(newsEntity.getId()); + NewsUtils.statNewsViews(mContext, newsEntity.getId()); NewsDetailActivity.startNewsDetailActivity(mContext, newsEntity , StringUtils.buildString(mEntrance, "+(新闻详情[", mTitle,"]:相关推荐[", String.valueOf(viewHolder.getPosition() + 1), "])")); } @@ -606,7 +606,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { } private void getNewsMore() { - RetrofitManager.getApi().getNewsSuggestion(mNewsDetailEntity.getId()) + RetrofitManager.getInstance(mContext).getApi().getNewsSuggestion(mNewsDetailEntity.getId()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response>() { @@ -641,7 +641,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { } public void getNewsCommentNum() { - RetrofitManager.getComment() + RetrofitManager.getInstance(mContext).getApi() .getNewsCommentnum(mNewsDetailEntity.getId()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -663,7 +663,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { } public void getNewsHotComment() { - RetrofitManager.getComment() + RetrofitManager.getInstance(mContext).getApi() .getHotComment(mId, 3, 0) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -687,7 +687,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { } private void getNewsComment() { - RetrofitManager.getComment() + RetrofitManager.getInstance(mContext).getApi() .getComment(mId, 3, 0) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) 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 b1fc62d567..453dcb83b0 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/ConcernFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/personal/ConcernFragmentAdapter.java @@ -86,7 +86,7 @@ class ConcernFragmentAdapter extends BaseRecyclerAdapter { List> sequences = new ArrayList<>(); for (ConcernInfo concernInfo : concernList) { - sequences.add(RetrofitManager.getApi().getGameDigest(concernInfo.getId())); + sequences.add(RetrofitManager.getInstance(mContext).getApi().getGameDigest(concernInfo.getId())); } Observable.merge(sequences) .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java index d7a44e8a45..f6bb20f550 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java @@ -14,7 +14,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import com.gh.base.AppController; +import com.halo.assistant.AppController; import com.gh.common.constant.ItemViewType; import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.BitmapUtils; @@ -237,7 +237,7 @@ class InstallFragmentAdapter extends BaseRecyclerAdapter { List> sequences = new ArrayList<>(); for (String id : ids) { - sequences.add(RetrofitManager.getApi().getGameDigest(id)); + sequences.add(RetrofitManager.getInstance(mContext).getApi().getGameDigest(id)); } Observable.merge(sequences) .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java index 9c4fcb0b44..d94ec173ff 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java @@ -11,7 +11,7 @@ import android.widget.RelativeLayout; import android.widget.TextView; import com.facebook.drawee.view.SimpleDraweeView; -import com.gh.base.AppController; +import com.halo.assistant.AppController; import com.gh.base.fragment.BaseFragment; import com.gh.common.util.ConcernUtils; import com.gh.common.util.DataCollectionUtils; @@ -59,6 +59,8 @@ import retrofit2.HttpException; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; +import static com.taobao.accs.ACCSManager.mContext; + /** * @author 温冠超 * 294299195@qq.com @@ -250,7 +252,7 @@ public class PersonalFragment extends BaseFragment implements GetLoginDataUtils. private void checkMessageUnread(final Context context) { if (context == null) return; - RetrofitManager.getMessage() + RetrofitManager.getInstance(context).getApi() .getMessageUnread(LoginUtils.getToken(context)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -313,9 +315,9 @@ public class PersonalFragment extends BaseFragment implements GetLoginDataUtils. private void checkUpdate() { String channel = AppController.getInstance().getChannel(); - RetrofitManager. - getApi(). - getUpdate(PackageUtils.getVersionName(getContext()), channel) + RetrofitManager.getInstance(mContext) + .getApi() + .getUpdate(PackageUtils.getVersionName(getContext()), channel) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response() { diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/CommentService.java b/app/src/main/java/com/gh/gamecenter/retrofit/CommentService.java deleted file mode 100644 index 02db9f1e5f..0000000000 --- a/app/src/main/java/com/gh/gamecenter/retrofit/CommentService.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.gh.gamecenter.retrofit; - -import com.gh.gamecenter.entity.CommentEntity; -import com.gh.gamecenter.entity.CommentnumEntity; - -import java.util.List; - -import okhttp3.RequestBody; -import okhttp3.ResponseBody; -import retrofit2.http.Body; -import retrofit2.http.GET; -import retrofit2.http.Header; -import retrofit2.http.Headers; -import retrofit2.http.POST; -import retrofit2.http.Path; -import retrofit2.http.Query; -import rx.Observable; - -/** - * Created by LGT on 2016/11/9. - * comment.ghzs666.com - */ -public interface CommentService { - - @GET("article/{ids}/comment/num") - // 获取新闻评论数 - Observable> getNewsCommentnum(@Path("ids") String ids); - - @POST("report") - //提交举报信息 - Observable postReportData(@Body RequestBody reportData, @Header("TOKEN") String token); - - @Headers({"Content-Type: application/json", "Accept: application/json"}) - @POST("article/{news_id}/comment") - // 发布评论 - Observable postNewsComment(@Header("TOKEN") String token, @Path("news_id") String news_id, - @Body RequestBody body); - - @POST("comment/{comment_id}/vote") - // 评论点赞 - Observable postCommentVote(@Header("TOKEN") String token, @Path("comment_id") String comment_id); - - @GET("article/{news_id}/comment?order=hot") - // 获取新闻评论 - Observable> getHotComment(@Path("news_id") String news_id, @Query("limit") int limit, - @Query("offset") int offset); - - @GET("article/{news_id}/comment") - // 获取新闻评论 - Observable> getComment(@Path("news_id") String news_id, @Query("limit") int limit, - @Query("offset") int offset); - - @Headers({"Content-Type: application/json", "Accept: application/json"}) - @POST("article/comment/{comment_id}/reply") - // 发布评论 - Observable postReplyComment(@Header("TOKEN") String token, @Path("comment_id") String comment_id, - @Body RequestBody body); - - @GET("article/comment/{comment_id}/trace") - // 获取评论对话 - Observable> getCommentTrace(@Path("comment_id") String news_id, @Query("limit") int limit, - @Query("offset") int offset); - -} diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/LibaoService.java b/app/src/main/java/com/gh/gamecenter/retrofit/LibaoService.java deleted file mode 100644 index 1dd05908b4..0000000000 --- a/app/src/main/java/com/gh/gamecenter/retrofit/LibaoService.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.gh.gamecenter.retrofit; - -import com.gh.gamecenter.entity.LibaoDetailEntity; -import com.gh.gamecenter.entity.LibaoEntity; -import com.gh.gamecenter.entity.LibaoStatusEntity; - -import java.util.List; - -import okhttp3.ResponseBody; -import retrofit2.http.DELETE; -import retrofit2.http.GET; -import retrofit2.http.Header; -import retrofit2.http.POST; -import retrofit2.http.Path; -import retrofit2.http.Query; -import rx.Observable; - -/** - * libao.ghzs666.com - */ -public interface LibaoService { - - @GET("libao?limit=20") - Observable> getLibao(@Query("offset") int offset); //获取礼包列表数据 - - @GET("libao?limit=20") - Observable> getLibaoBySearch(@Query("keyword") String searchKey, @Query("offset") int offset); //搜索礼包列表数据 - - @GET("libao?limit=20") - Observable> getLibaoByConcern(@Query("key") String key, @Query("offset") int offset); //关注礼包列表数据 - - @GET("libao") - Observable> getLibaoByGame(@Query("game_id") String libaoId, - @Query("offset") int offset, @Query("limit") int limit); //获取游戏详情礼包数据 - - @GET("libao/{libao_id}/detail") - Observable getLibaoDetail(@Path("libao_id") String libaoId); //获取礼包详情数据 - - @GET("libao/{libao_id}/digest") - Observable getLibaoDigest(@Path("libao_id") String libaoId); //获取礼包摘要数据 - - @GET("libao/status") - Observable> getLibaoStatus(@Query("ids") String libaoIds); //获取礼包领取按钮状态 - - @GET("libao/cunhaoxiang") - Observable> getCunHaoXiang(@Header("TOKEN") String token); // 获取礼包存号箱数据 - - @POST("libao/{libao_id}/ling") - Observable postLibaoLing(@Header("TOKEN") String token, @Path("libao_id") String libaoId); // 领取礼包 - - @POST("libao/{libao_id}/ling") - Observable postLibaoLing(@Header("TOKEN") String token, @Header("CODE") String captchaCode, - @Path("libao_id") String libaoId); // 领取礼包 带验证数据 - - @POST("libao/{libao_id}/tao") - Observable postLibaoTao(@Header("TOKEN") String token, @Path("libao_id") String libaoId); // 礼包 淘号 - - @DELETE("libao/code/{code}") - Observable deleteLibaoCode(@Header("TOKEN") String token, @Path("code") String code); //删除存号箱的礼包 - - @POST("libao/captcha") - Observable getCaptchaData(@Header("TOKEN") String token); //获取验证码数据 - - @GET("libao") - Observable> getHistoryLibao(@Query("history") String history, @Query("offset") int offset); //获取历史礼包数据 - -} diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/MessageService.java b/app/src/main/java/com/gh/gamecenter/retrofit/MessageService.java deleted file mode 100644 index d7a8a8529d..0000000000 --- a/app/src/main/java/com/gh/gamecenter/retrofit/MessageService.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.gh.gamecenter.retrofit; - -import com.gh.gamecenter.entity.MessageCommentEntity; -import com.gh.gamecenter.entity.MessageKeFuEntity; -import com.gh.gamecenter.entity.MessageNoticeEntity; -import com.gh.gamecenter.entity.MessageUnreadEntity; - -import java.util.List; - -import okhttp3.RequestBody; -import okhttp3.ResponseBody; -import retrofit2.http.Body; -import retrofit2.http.GET; -import retrofit2.http.Header; -import retrofit2.http.Headers; -import retrofit2.http.POST; -import retrofit2.http.Query; -import rx.Observable; - -/** - * Created by khy on 2017/4/25. - */ - -public interface MessageService { - - @GET("message/private") - Observable> getMessageKeFuData(@Header("TOKEN") String token, - @Query("offset") int offset, @Query("limit") int limit); // 获取消息-客服数据 - - @GET("message/sync") - Observable getMessageUnread(@Header("TOKEN") String token); // 获取消息未读数据 - - @Headers({"Content-Type: application/json", "Accept: application/json"}) - @POST("message/private/confirm/receive") - Observable postKeFuDataReceive(@Body RequestBody body, @Header("TOKEN") String token); //确认接收客服消息 - - @Headers({"Content-Type: application/json", "Accept: application/json"}) - @POST("message/private/confirm/read") - Observable postMarkKeFuRead(@Body RequestBody body, @Header("TOKEN") String token); //提交已读客服消息 - - @GET("message/user/announcement") - Observable> getMessageNoticeData(@Header("TOKEN") String token, - @Query("offset") int offset, @Query("limit") int limit); // 获取消息-客服数据 - - @Headers({"Content-Type: application/json", "Accept: application/json"}) - @POST("message/user/announcement/confirm/read") - Observable postMarkNoticeRead(@Body RequestBody body, @Header("TOKEN") String token); //提交已读公告消息 - - @Headers({"Content-Type: application/json", "Accept: application/json"}) - @POST("message/user/announcement/confirm/receive") - Observable postNoticeDataReceive(@Body RequestBody body, @Header("TOKEN") String token); //提交已读客服消息 - - @GET("message/user/comment") - Observable> getMessageCommentData(@Header("TOKEN") String token, - @Query("offset") int offset, @Query("limit") int limit); // 获取消息-评论数据 - - @Headers({"Content-Type: application/json", "Accept: application/json"}) - @POST("message/user/comment/confirm/read") - Observable postMarkCommentRead(@Header("TOKEN") String token); //提交已读评论消息 -} diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpRetryInterceptor.kt b/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpRetryInterceptor.kt index 7a895bb6e7..39cfb21781 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpRetryInterceptor.kt +++ b/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpRetryInterceptor.kt @@ -64,7 +64,7 @@ class OkHttpRetryInterceptor internal constructor(context: Context) : Intercepto params.put("refresh_token", value) val jsonObject = JSONObject(params) try { - val device = DeviceUtils.getLoginDevice(mContext.getApplicationContext()) + val device = DeviceUtils.getLoginDevice(mContext) jsonObject.put("device", device) } catch (e: JSONException) { e.printStackTrace() @@ -72,7 +72,7 @@ class OkHttpRetryInterceptor internal constructor(context: Context) : Intercepto val body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString()) // 同步请求 - RetrofitManager + RetrofitManager.getInstance(mContext) .getUsersea() .refreshToken(body) .subscribe(object : com.gh.gamecenter.retrofit.Response() { @@ -81,7 +81,7 @@ class OkHttpRetryInterceptor internal constructor(context: Context) : Intercepto val accessToken = loginResponseEntity?.accessToken?.value // Utils.log("=======accessToken::" + accessToken) - RetrofitManager + RetrofitManager.getInstance(mContext) .getApi() .getUserInfo(accessToken) .subscribe(object : com.gh.gamecenter.retrofit.Response(){ diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/RetrofitManager.java b/app/src/main/java/com/gh/gamecenter/retrofit/RetrofitManager.java index 7b869219a5..02d1a56134 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/RetrofitManager.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/RetrofitManager.java @@ -2,9 +2,11 @@ package com.gh.gamecenter.retrofit; import android.content.Context; -import com.gh.base.AppController; import com.gh.common.constant.Config; import com.gh.gamecenter.Injection; +import com.gh.gamecenter.retrofit.service.ApiService; +import com.gh.gamecenter.retrofit.service.DataService; +import com.gh.gamecenter.retrofit.service.UserseaService; import java.io.File; import java.util.concurrent.TimeUnit; @@ -25,10 +27,6 @@ public class RetrofitManager { private static final byte[] LOCK = new byte[0]; private ApiService mApiService; private DataService mDataService; - private CommentService mCommentService; - private UserService mUserService; - private LibaoService mLibaoService; - private MessageService mMessageService; private UserseaService mUserseaService; public static T provideService(OkHttpClient client, String url, Class serviceCls) { @@ -39,10 +37,7 @@ public class RetrofitManager { .baseUrl(url).build().create(serviceCls); } - private RetrofitManager() { - - final Context context = AppController.getInstance().getApplicationContext(); - + private RetrofitManager(Context context) { final Cache cache = new Cache(new File(OkHttpCache.getCachePath(context)), 10 * 1024 * 1024); // 10Mb final OkHttpClient okHttpClient = Injection.provideRetrofitBuilder() @@ -55,51 +50,30 @@ public class RetrofitManager { mApiService = provideService(okHttpClient, Config.API_HOST, ApiService.class); mDataService = provideService(okHttpClient, Config.DATA_HOST, DataService.class); - mCommentService = provideService(okHttpClient, Config.COMMENT_HOST, CommentService.class); - mUserService = provideService(okHttpClient, Config.USER_HOST, UserService.class); - mLibaoService = provideService(okHttpClient, Config.LIBAO_HOST, LibaoService.class); - mMessageService = provideService(okHttpClient, Config.MESSAGE_HOST, MessageService.class); mUserseaService = provideService(okHttpClient, Config.USERSEA_HOST, UserseaService.class); - } - public static RetrofitManager getInstance() { + public static RetrofitManager getInstance(Context context) { if (sInstance == null) { synchronized (LOCK) { if (sInstance == null) { - sInstance = new RetrofitManager(); + sInstance = new RetrofitManager(context); } } } return sInstance; } - public static ApiService getApi() { - return getInstance().mApiService; + public ApiService getApi() { + return mApiService; } - public static DataService getData() { - return getInstance().mDataService; + public DataService getData() { + return mDataService; } - public static CommentService getComment() { - return getInstance().mCommentService; - } - - public static UserService getUser() { - return getInstance().mUserService; - } - - public static LibaoService getLibao() { - return getInstance().mLibaoService; - } - - public static MessageService getMessage() { - return getInstance().mMessageService; - } - - public static UserseaService getUsersea() { - return getInstance().mUserseaService; + public UserseaService getUsersea() { + return mUserseaService; } } diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/UserService.java b/app/src/main/java/com/gh/gamecenter/retrofit/UserService.java deleted file mode 100644 index ce207dad72..0000000000 --- a/app/src/main/java/com/gh/gamecenter/retrofit/UserService.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.gh.gamecenter.retrofit; - -import okhttp3.RequestBody; -import okhttp3.ResponseBody; -import retrofit2.http.Body; -import retrofit2.http.Header; -import retrofit2.http.Headers; -import retrofit2.http.POST; -import retrofit2.http.Path; -import rx.Observable; - -/** - * Created by LGT on 2016/12/5. - * user.ghzs666.com - */ -public interface UserService { - - @Headers({"Content-Type: application/json", "Accept: application/json"}) - @POST("name") - Observable postName(@Header("TOKEN") String token, @Body RequestBody body); // 修改昵称 - - @Headers({"Content-Type: application/json", "Accept: application/json"}) - @POST("device/{device_id}") - Observable postDevice(@Header("TOKEN") String token, @Body RequestBody body, - @Path("device_id") String device_id); // 修改设备信息 - - - @Headers({"Content-Type: application/json", "Accept: application/json"}) - @POST("device/register") - Observable postRegister(@Body RequestBody body); // 注册设备 - - @Headers({"Content-Type: application/json", "Accept: application/json"}) - @POST("login") - Observable postLogin(@Body RequestBody body); // 用户登录 - - @Headers({"Content-Type: application/json", "Accept: application/json"}) - @POST("icon-default") - // 上传用户所使用的助手信息 - Observable postDefaultIcon(@Header("TOKEN") String token, @Body RequestBody body); - -} diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/ApiService.java b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java similarity index 62% rename from app/src/main/java/com/gh/gamecenter/retrofit/ApiService.java rename to app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java index 28d845c201..4bde01d93e 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/ApiService.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java @@ -1,11 +1,20 @@ -package com.gh.gamecenter.retrofit; +package com.gh.gamecenter.retrofit.service; import com.gh.gamecenter.entity.AppEntity; +import com.gh.gamecenter.entity.CommentEntity; +import com.gh.gamecenter.entity.CommentnumEntity; import com.gh.gamecenter.entity.ConcernEntity; import com.gh.gamecenter.entity.GameDetailEntity; import com.gh.gamecenter.entity.GameDigestEntity; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.entity.GameUpdateEntity; +import com.gh.gamecenter.entity.LibaoDetailEntity; +import com.gh.gamecenter.entity.LibaoEntity; +import com.gh.gamecenter.entity.LibaoStatusEntity; +import com.gh.gamecenter.entity.MessageCommentEntity; +import com.gh.gamecenter.entity.MessageKeFuEntity; +import com.gh.gamecenter.entity.MessageNoticeEntity; +import com.gh.gamecenter.entity.MessageUnreadEntity; import com.gh.gamecenter.entity.NewsDetailEntity; import com.gh.gamecenter.entity.NewsEntity; import com.gh.gamecenter.entity.PackageEntity; @@ -290,4 +299,157 @@ public interface ApiService { // // 上传用户所使用的助手信息 // Observable postGhzs(@Header("TOKEN") String token, @Body RequestBody body); + + /*********** CommentService ************/ + + @GET("article/{ids}/comment/num") + // 获取新闻评论数 + Observable> getNewsCommentnum(@Path("ids") String ids); + + @POST("report") + //提交举报信息 + Observable postReportData(@Body RequestBody reportData, @Header("TOKEN") String token); + + @Headers({"Content-Type: application/json", "Accept: application/json"}) + @POST("article/{news_id}/comment") + // 发布评论 + Observable postNewsComment(@Header("TOKEN") String token, @Path("news_id") String news_id, + @Body RequestBody body); + + @POST("comment/{comment_id}/vote") + // 评论点赞 + Observable postCommentVote(@Header("TOKEN") String token, @Path("comment_id") String comment_id); + + @GET("article/{news_id}/comment?order=hot") + // 获取新闻评论 + Observable> getHotComment(@Path("news_id") String news_id, @Query("limit") int limit, + @Query("offset") int offset); + + @GET("article/{news_id}/comment") + // 获取新闻评论 + Observable> getComment(@Path("news_id") String news_id, @Query("limit") int limit, + @Query("offset") int offset); + + @Headers({"Content-Type: application/json", "Accept: application/json"}) + @POST("article/comment/{comment_id}/reply") + // 发布评论 + Observable postReplyComment(@Header("TOKEN") String token, @Path("comment_id") String comment_id, + @Body RequestBody body); + + @GET("article/comment/{comment_id}/trace") + // 获取评论对话 + Observable> getCommentTrace(@Path("comment_id") String news_id, @Query("limit") int limit, + @Query("offset") int offset); + + /********* LibaoService ********/ + + @GET("libao?limit=20") + Observable> getLibao(@Query("offset") int offset); //获取礼包列表数据 + + @GET("libao?limit=20") + Observable> getLibaoBySearch(@Query("keyword") String searchKey, @Query("offset") int offset); //搜索礼包列表数据 + + @GET("libao?limit=20") + Observable> getLibaoByConcern(@Query("key") String key, @Query("offset") int offset); //关注礼包列表数据 + + @GET("libao") + Observable> getLibaoByGame(@Query("game_id") String libaoId, + @Query("offset") int offset, @Query("limit") int limit); //获取游戏详情礼包数据 + + @GET("libao/{libao_id}/detail") + Observable getLibaoDetail(@Path("libao_id") String libaoId); //获取礼包详情数据 + + @GET("libao/{libao_id}/digest") + Observable getLibaoDigest(@Path("libao_id") String libaoId); //获取礼包摘要数据 + + @GET("libao/status") + Observable> getLibaoStatus(@Query("ids") String libaoIds); //获取礼包领取按钮状态 + + @GET("libao/cunhaoxiang") + Observable> getCunHaoXiang(@Header("TOKEN") String token); // 获取礼包存号箱数据 + + @POST("libao/{libao_id}/ling") + Observable postLibaoLing(@Header("TOKEN") String token, @Path("libao_id") String libaoId); // 领取礼包 + + @POST("libao/{libao_id}/ling") + Observable postLibaoLing(@Header("TOKEN") String token, @Header("CODE") String captchaCode, + @Path("libao_id") String libaoId); // 领取礼包 带验证数据 + + @POST("libao/{libao_id}/tao") + Observable postLibaoTao(@Header("TOKEN") String token, @Path("libao_id") String libaoId); // 礼包 淘号 + + @DELETE("libao/code/{code}") + Observable deleteLibaoCode(@Header("TOKEN") String token, @Path("code") String code); //删除存号箱的礼包 + + @POST("libao/captcha") + Observable getCaptchaData(@Header("TOKEN") String token); //获取验证码数据 + + @GET("libao") + Observable> getHistoryLibao(@Query("history") String history, @Query("offset") int offset); //获取历史礼包数据 + + + /***************8 MessageService *******/ + + + @GET("message/private") + Observable> getMessageKeFuData(@Header("TOKEN") String token, + @Query("offset") int offset, @Query("limit") int limit); // 获取消息-客服数据 + + @GET("message/sync") + Observable getMessageUnread(@Header("TOKEN") String token); // 获取消息未读数据 + + @Headers({"Content-Type: application/json", "Accept: application/json"}) + @POST("message/private/confirm/receive") + Observable postKeFuDataReceive(@Body RequestBody body, @Header("TOKEN") String token); //确认接收客服消息 + + @Headers({"Content-Type: application/json", "Accept: application/json"}) + @POST("message/private/confirm/read") + Observable postMarkKeFuRead(@Body RequestBody body, @Header("TOKEN") String token); //提交已读客服消息 + + @GET("message/user/announcement") + Observable> getMessageNoticeData(@Header("TOKEN") String token, + @Query("offset") int offset, @Query("limit") int limit); // 获取消息-客服数据 + + @Headers({"Content-Type: application/json", "Accept: application/json"}) + @POST("message/user/announcement/confirm/read") + Observable postMarkNoticeRead(@Body RequestBody body, @Header("TOKEN") String token); //提交已读公告消息 + + @Headers({"Content-Type: application/json", "Accept: application/json"}) + @POST("message/user/announcement/confirm/receive") + Observable postNoticeDataReceive(@Body RequestBody body, @Header("TOKEN") String token); //提交已读客服消息 + + @GET("message/user/comment") + Observable> getMessageCommentData(@Header("TOKEN") String token, + @Query("offset") int offset, @Query("limit") int limit); // 获取消息-评论数据 + + @Headers({"Content-Type: application/json", "Accept: application/json"}) + @POST("message/user/comment/confirm/read") + Observable postMarkCommentRead(@Header("TOKEN") String token); //提交已读评论消息 + + + /********* UserService ***********/ + @Headers({"Content-Type: application/json", "Accept: application/json"}) + @POST("name") + Observable postName(@Header("TOKEN") String token, @Body RequestBody body); // 修改昵称 + + @Headers({"Content-Type: application/json", "Accept: application/json"}) + @POST("device/{device_id}") + Observable postDevice(@Header("TOKEN") String token, @Body RequestBody body, + @Path("device_id") String device_id); // 修改设备信息 + + + @Headers({"Content-Type: application/json", "Accept: application/json"}) + @POST("device/register") + Observable postRegister(@Body RequestBody body); // 注册设备 + + @Headers({"Content-Type: application/json", "Accept: application/json"}) + @POST("login") + Observable postLogin(@Body RequestBody body); // 用户登录 + + @Headers({"Content-Type: application/json", "Accept: application/json"}) + @POST("icon-default") + // 上传用户所使用的助手信息 + Observable postDefaultIcon(@Header("TOKEN") String token, @Body RequestBody body); + + } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/service/CommentService.java b/app/src/main/java/com/gh/gamecenter/retrofit/service/CommentService.java new file mode 100644 index 0000000000..4a1cba374a --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/retrofit/service/CommentService.java @@ -0,0 +1,64 @@ +//package com.gh.gamecenter.retrofit.service; +// +//import com.gh.gamecenter.entity.CommentEntity; +//import com.gh.gamecenter.entity.CommentnumEntity; +// +//import java.util.List; +// +//import okhttp3.RequestBody; +//import okhttp3.ResponseBody; +//import retrofit2.http.Body; +//import retrofit2.http.GET; +//import retrofit2.http.Header; +//import retrofit2.http.Headers; +//import retrofit2.http.POST; +//import retrofit2.http.Path; +//import retrofit2.http.Query; +//import rx.Observable; +// +///** +// * Created by LGT on 2016/11/9. +// * comment.ghzs666.com +// */ +//public interface CommentService { +// +// @GET("article/{ids}/comment/num") +// // 获取新闻评论数 +// Observable> getNewsCommentnum(@Path("ids") String ids); +// +// @POST("report") +// //提交举报信息 +// Observable postReportData(@Body RequestBody reportData, @Header("TOKEN") String token); +// +// @Headers({"Content-Type: application/json", "Accept: application/json"}) +// @POST("article/{news_id}/comment") +// // 发布评论 +// Observable postNewsComment(@Header("TOKEN") String token, @Path("news_id") String news_id, +// @Body RequestBody body); +// +// @POST("comment/{comment_id}/vote") +// // 评论点赞 +// Observable postCommentVote(@Header("TOKEN") String token, @Path("comment_id") String comment_id); +// +// @GET("article/{news_id}/comment?order=hot") +// // 获取新闻评论 +// Observable> getHotComment(@Path("news_id") String news_id, @Query("limit") int limit, +// @Query("offset") int offset); +// +// @GET("article/{news_id}/comment") +// // 获取新闻评论 +// Observable> getComment(@Path("news_id") String news_id, @Query("limit") int limit, +// @Query("offset") int offset); +// +// @Headers({"Content-Type: application/json", "Accept: application/json"}) +// @POST("article/comment/{comment_id}/reply") +// // 发布评论 +// Observable postReplyComment(@Header("TOKEN") String token, @Path("comment_id") String comment_id, +// @Body RequestBody body); +// +// @GET("article/comment/{comment_id}/trace") +// // 获取评论对话 +// Observable> getCommentTrace(@Path("comment_id") String news_id, @Query("limit") int limit, +// @Query("offset") int offset); +// +//} diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/DataService.java b/app/src/main/java/com/gh/gamecenter/retrofit/service/DataService.java similarity index 96% rename from app/src/main/java/com/gh/gamecenter/retrofit/DataService.java rename to app/src/main/java/com/gh/gamecenter/retrofit/service/DataService.java index 762f3a1411..f565f34e07 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/DataService.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/service/DataService.java @@ -1,4 +1,4 @@ -package com.gh.gamecenter.retrofit; +package com.gh.gamecenter.retrofit.service; import com.gh.gamecenter.entity.ViewsEntity; diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/service/LibaoService.java b/app/src/main/java/com/gh/gamecenter/retrofit/service/LibaoService.java new file mode 100644 index 0000000000..a80d195251 --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/retrofit/service/LibaoService.java @@ -0,0 +1,67 @@ +//package com.gh.gamecenter.retrofit.service; +// +//import com.gh.gamecenter.entity.LibaoDetailEntity; +//import com.gh.gamecenter.entity.LibaoEntity; +//import com.gh.gamecenter.entity.LibaoStatusEntity; +// +//import java.util.List; +// +//import okhttp3.ResponseBody; +//import retrofit2.http.DELETE; +//import retrofit2.http.GET; +//import retrofit2.http.Header; +//import retrofit2.http.POST; +//import retrofit2.http.Path; +//import retrofit2.http.Query; +//import rx.Observable; +// +///** +// * libao.ghzs666.com +// */ +//public interface LibaoService { +// +// @GET("libao?limit=20") +// Observable> getLibao(@Query("offset") int offset); //获取礼包列表数据 +// +// @GET("libao?limit=20") +// Observable> getLibaoBySearch(@Query("keyword") String searchKey, @Query("offset") int offset); //搜索礼包列表数据 +// +// @GET("libao?limit=20") +// Observable> getLibaoByConcern(@Query("key") String key, @Query("offset") int offset); //关注礼包列表数据 +// +// @GET("libao") +// Observable> getLibaoByGame(@Query("game_id") String libaoId, +// @Query("offset") int offset, @Query("limit") int limit); //获取游戏详情礼包数据 +// +// @GET("libao/{libao_id}/detail") +// Observable getLibaoDetail(@Path("libao_id") String libaoId); //获取礼包详情数据 +// +// @GET("libao/{libao_id}/digest") +// Observable getLibaoDigest(@Path("libao_id") String libaoId); //获取礼包摘要数据 +// +// @GET("libao/status") +// Observable> getLibaoStatus(@Query("ids") String libaoIds); //获取礼包领取按钮状态 +// +// @GET("libao/cunhaoxiang") +// Observable> getCunHaoXiang(@Header("TOKEN") String token); // 获取礼包存号箱数据 +// +// @POST("libao/{libao_id}/ling") +// Observable postLibaoLing(@Header("TOKEN") String token, @Path("libao_id") String libaoId); // 领取礼包 +// +// @POST("libao/{libao_id}/ling") +// Observable postLibaoLing(@Header("TOKEN") String token, @Header("CODE") String captchaCode, +// @Path("libao_id") String libaoId); // 领取礼包 带验证数据 +// +// @POST("libao/{libao_id}/tao") +// Observable postLibaoTao(@Header("TOKEN") String token, @Path("libao_id") String libaoId); // 礼包 淘号 +// +// @DELETE("libao/code/{code}") +// Observable deleteLibaoCode(@Header("TOKEN") String token, @Path("code") String code); //删除存号箱的礼包 +// +// @POST("libao/captcha") +// Observable getCaptchaData(@Header("TOKEN") String token); //获取验证码数据 +// +// @GET("libao") +// Observable> getHistoryLibao(@Query("history") String history, @Query("offset") int offset); //获取历史礼包数据 +// +//} diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/service/MessageService.java b/app/src/main/java/com/gh/gamecenter/retrofit/service/MessageService.java new file mode 100644 index 0000000000..85e9506f69 --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/retrofit/service/MessageService.java @@ -0,0 +1,60 @@ +//package com.gh.gamecenter.retrofit.service; +// +//import com.gh.gamecenter.entity.MessageCommentEntity; +//import com.gh.gamecenter.entity.MessageKeFuEntity; +//import com.gh.gamecenter.entity.MessageNoticeEntity; +//import com.gh.gamecenter.entity.MessageUnreadEntity; +// +//import java.util.List; +// +//import okhttp3.RequestBody; +//import okhttp3.ResponseBody; +//import retrofit2.http.Body; +//import retrofit2.http.GET; +//import retrofit2.http.Header; +//import retrofit2.http.Headers; +//import retrofit2.http.POST; +//import retrofit2.http.Query; +//import rx.Observable; +// +///** +// * Created by khy on 2017/4/25. +// */ +// +//public interface MessageService { +// +// @GET("message/private") +// Observable> getMessageKeFuData(@Header("TOKEN") String token, +// @Query("offset") int offset, @Query("limit") int limit); // 获取消息-客服数据 +// +// @GET("message/sync") +// Observable getMessageUnread(@Header("TOKEN") String token); // 获取消息未读数据 +// +// @Headers({"Content-Type: application/json", "Accept: application/json"}) +// @POST("message/private/confirm/receive") +// Observable postKeFuDataReceive(@Body RequestBody body, @Header("TOKEN") String token); //确认接收客服消息 +// +// @Headers({"Content-Type: application/json", "Accept: application/json"}) +// @POST("message/private/confirm/read") +// Observable postMarkKeFuRead(@Body RequestBody body, @Header("TOKEN") String token); //提交已读客服消息 +// +// @GET("message/user/announcement") +// Observable> getMessageNoticeData(@Header("TOKEN") String token, +// @Query("offset") int offset, @Query("limit") int limit); // 获取消息-客服数据 +// +// @Headers({"Content-Type: application/json", "Accept: application/json"}) +// @POST("message/user/announcement/confirm/read") +// Observable postMarkNoticeRead(@Body RequestBody body, @Header("TOKEN") String token); //提交已读公告消息 +// +// @Headers({"Content-Type: application/json", "Accept: application/json"}) +// @POST("message/user/announcement/confirm/receive") +// Observable postNoticeDataReceive(@Body RequestBody body, @Header("TOKEN") String token); //提交已读客服消息 +// +// @GET("message/user/comment") +// Observable> getMessageCommentData(@Header("TOKEN") String token, +// @Query("offset") int offset, @Query("limit") int limit); // 获取消息-评论数据 +// +// @Headers({"Content-Type: application/json", "Accept: application/json"}) +// @POST("message/user/comment/confirm/read") +// Observable postMarkCommentRead(@Header("TOKEN") String token); //提交已读评论消息 +//} diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/service/UserService.java b/app/src/main/java/com/gh/gamecenter/retrofit/service/UserService.java new file mode 100644 index 0000000000..57288335ee --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/retrofit/service/UserService.java @@ -0,0 +1,41 @@ +//package com.gh.gamecenter.retrofit.service; +// +//import okhttp3.RequestBody; +//import okhttp3.ResponseBody; +//import retrofit2.http.Body; +//import retrofit2.http.Header; +//import retrofit2.http.Headers; +//import retrofit2.http.POST; +//import retrofit2.http.Path; +//import rx.Observable; +// +///** +// * Created by LGT on 2016/12/5. +// * user.ghzs666.com +// */ +//public interface UserService { +// +// @Headers({"Content-Type: application/json", "Accept: application/json"}) +// @POST("name") +// Observable postName(@Header("TOKEN") String token, @Body RequestBody body); // 修改昵称 +// +// @Headers({"Content-Type: application/json", "Accept: application/json"}) +// @POST("device/{device_id}") +// Observable postDevice(@Header("TOKEN") String token, @Body RequestBody body, +// @Path("device_id") String device_id); // 修改设备信息 +// +// +// @Headers({"Content-Type: application/json", "Accept: application/json"}) +// @POST("device/register") +// Observable postRegister(@Body RequestBody body); // 注册设备 +// +// @Headers({"Content-Type: application/json", "Accept: application/json"}) +// @POST("login") +// Observable postLogin(@Body RequestBody body); // 用户登录 +// +// @Headers({"Content-Type: application/json", "Accept: application/json"}) +// @POST("icon-default") +// // 上传用户所使用的助手信息 +// Observable postDefaultIcon(@Header("TOKEN") String token, @Body RequestBody body); +// +//} diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/UserseaService.java b/app/src/main/java/com/gh/gamecenter/retrofit/service/UserseaService.java similarity index 98% rename from app/src/main/java/com/gh/gamecenter/retrofit/UserseaService.java rename to app/src/main/java/com/gh/gamecenter/retrofit/service/UserseaService.java index f6e7e85b7f..6cb832130c 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/UserseaService.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/service/UserseaService.java @@ -1,4 +1,4 @@ -package com.gh.gamecenter.retrofit; +package com.gh.gamecenter.retrofit.service; import com.gh.gamecenter.entity.LoginResponseEntity; import com.gh.gamecenter.entity.UserInfoEntity; 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 c4a759b2df..23ed5bf052 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java @@ -71,7 +71,7 @@ class SearchGameDetailFragmentAdapter extends BaseRecyclerAdapter { } private void search(String key) { - RetrofitManager.getApi().getSearchGame(key) + RetrofitManager.getInstance(mContext).getApi().getSearchGame(key) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response>() { 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 82b446d48c..4bf5d065e9 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java @@ -77,7 +77,7 @@ class SearchGameListFragmentAdapter extends BaseRecyclerAdapter { } private void searchGame(String key) { - RetrofitManager.getApi().getSearchGame(key) + RetrofitManager.getInstance(mContext).getApi().getSearchGame(key) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response>() { diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragment.java b/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragment.java index 90ec0114a0..ee9af9d4cb 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragment.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragment.java @@ -28,6 +28,8 @@ import butterknife.OnClick; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; +import static com.taobao.accs.ACCSManager.mContext; + public class SearchHistoryFragment extends BaseFragment { @BindView(R.id.search_hot_tv) @@ -103,8 +105,7 @@ public class SearchHistoryFragment extends BaseFragment { private void loadSearchHotData() { - RetrofitManager - .getApi() + RetrofitManager.getInstance(mContext).getApi() .getHotSearch().subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new JSONArrayResponse() { diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java b/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java index c28e6b8613..1ae7ef86c7 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java @@ -49,8 +49,6 @@ import rx.android.schedulers.AndroidSchedulers; import rx.functions.Func1; import rx.schedulers.Schedulers; -import static android.R.attr.name; - public class SubjectAdapter extends BaseRecyclerAdapter { @@ -97,7 +95,7 @@ public class SubjectAdapter extends BaseRecyclerAdapter { public void initList(final int page) { mIsLoaded = false; - RetrofitManager.getApi().getColumn(mId, mOrder, page, mType) + RetrofitManager.getInstance(mContext).getApi().getColumn(mId, mOrder, page, mType) .map(new Func1, List>() { @Override public List call(List list) { @@ -250,7 +248,7 @@ public class SubjectAdapter extends BaseRecyclerAdapter { case "news": //TODO 统一startNewsDetailActivity // 统计阅读量 - NewsUtils.statNewsViews(gameEntity.getLink()); + NewsUtils.statNewsViews(mContext, gameEntity.getLink()); Intent intent = new Intent(mContext, NewsDetailActivity.class); intent.putExtra("newsId", gameEntity.getLink()); diff --git a/app/src/main/java/com/gh/base/AppController.java b/app/src/main/java/com/halo/assistant/AppController.java similarity index 96% rename from app/src/main/java/com/gh/base/AppController.java rename to app/src/main/java/com/halo/assistant/AppController.java index 3bd5e0a85f..ee3f21b20b 100644 --- a/app/src/main/java/com/gh/base/AppController.java +++ b/app/src/main/java/com/halo/assistant/AppController.java @@ -1,16 +1,19 @@ -package com.gh.base; +package com.halo.assistant; import android.app.ActivityManager; import android.app.ActivityManager.RunningAppProcessInfo; import android.content.Context; import android.os.Process; -import android.support.multidex.MultiDexApplication; import android.support.v4.util.ArrayMap; import android.text.TextUtils; import android.util.Log; import com.facebook.drawee.backends.pipeline.Fresco; import com.gh.EventBusIndex; +import com.gh.base.AppUncaughtHandler; +import com.gh.base.GHActivityLifecycleCallbacksImpl; +import com.gh.base.GHPushMessageReceiver; +import com.gh.base.GHUmengNotificationClickHandler; import com.gh.common.constant.Config; import com.gh.common.util.DataUtils; import com.gh.common.util.StringUtils; @@ -34,7 +37,7 @@ import java.util.List; import java.util.concurrent.Executor; import java.util.concurrent.Executors; -public class AppController extends MultiDexApplication { +public class AppController extends TinkerApplicationImpl { public static final String KEY_FILE_INFO = "FileInfo"; //快传文件发送单线程 diff --git a/build.gradle b/build.gradle index b49015845b..4f527ab0aa 100644 --- a/build.gradle +++ b/build.gradle @@ -12,9 +12,13 @@ buildscript { } dependencies { classpath "com.android.tools.build:gradle:2.3.3" - classpath "com.neenbedankt.gradle.plugins:android-apt:1.8" + // for tinker -// classpath 'com.tencent.tinker:tinker-patch-gradle-plugin:1.7.9' +// classpath 'com.tencent.tinker:tinker-patch-gradle-plugin:1.8.1' + + // bugly for tinker + classpath "com.tencent.bugly:tinker-support:1.0.8" + // for apkChannelPackage https://github.com/ltlovezh/ApkChannelPackage classpath "com.leon.channel:plugin:1.0.5" diff --git a/dependencies.gradle b/dependencies.gradle index d86fa1e6b0..0ab31625f9 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -50,7 +50,8 @@ ext { leakcanary = '1.5.1' - tinker = "1.7.9" + tinker = "1.8.1" bugly = "2.6.5" + buglyTinkerSupport = "1.3.1" } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index e9563d0b5a..72a1508468 100644 --- a/gradle.properties +++ b/gradle.properties @@ -43,11 +43,11 @@ USERSEA_APP_SECRET=597aa2b463f5770013146675 # hosts DEV_API_HOST=https\://dev.api.ghzs666.com/v3d0/ +DEV_LIBAO_HOST=https\://dev.api.ghzs666.com/v3d0/ +DEV_MESSAGE_HOST=https\://dev.api.ghzs666.com/v3d0/ +DEV_USER_HOST=https\://dev.api.ghzs666.com/v3d0/ +DEV_COMMENT_HOST=https\://dev.api.ghzs666.com/v3d0/ DEV_DATA_HOST=http\://data.ghzs666.com/ -DEV_LIBAO_HOST=https\://dev.libao.ghzs666.com/v3d0/ -DEV_MESSAGE_HOST=https\://dev.message.ghzs666.com/v3d0/ -DEV_USER_HOST=https\://dev.user.ghzs666.com/v1d2/ -DEV_COMMENT_HOST=https\://dev.comment.ghzs666.com/v3d0/ DEV_USERSEA_HOST=https\://dev.usersea.ghzs666.com/v1d0/ API_HOST=http\://api.ghzs666.com/v3d0/ @@ -57,3 +57,6 @@ MESSAGE_HOST=http\://message.ghzs666.com/v1d1/ USER_HOST=http\://user.ghzs666.com/v1d2/ COMMENT_HOST=http\://comment.ghzs666.com/v1d3/ USERSEA_HOST=https\://usersea.ghzs666.com/v1d0/ + +#TINKER_ID= +TINKER_ENABLED=1 \ No newline at end of file