From fd0921870df6799a3a7ab087bf29b1f987aa025c Mon Sep 17 00:00:00 2001 From: kehaoyuan Date: Thu, 3 May 2018 10:34:36 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D3.2=E7=9A=84=E4=B8=80?= =?UTF-8?q?=E4=BA=9Bbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/gamecenter/adapter/InstallFragmentAdapter.java | 3 ++- .../java/com/gh/gamecenter/ask/AnswerCommentFragment.java | 3 ++- .../java/com/gh/gamecenter/ask/QuestionsEditFragment.java | 4 +++- .../java/com/gh/gamecenter/download/GameDownloadFragment.java | 2 +- .../main/java/com/gh/gamecenter/receiver/InstallReceiver.java | 4 +++- 5 files changed, 11 insertions(+), 5 deletions(-) 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 13822d745c..88fadf5f8e 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java @@ -115,7 +115,7 @@ public class InstallFragmentAdapter extends BaseRecyclerAdapter { Collections.sort(sortedList, new Comparator() { // 按安装时间排序 @Override public int compare(GameInfoEntity lhs, GameInfoEntity rhs) { - return lhs.getInstallTime() > rhs.getInstallTime()? -1 : 1; + return lhs.getInstallTime() > rhs.getInstallTime() ? -1 : 1; } }); for (GameInfoEntity info : sortedList) { @@ -488,6 +488,7 @@ public class InstallFragmentAdapter extends BaseRecyclerAdapter { //跳转到快传 - 搜索接收者页面 public void skipKc(int i) { GameEntity gameEntity = gameList.get(i); + if (gameEntity.getApk().size() == 0) return; String packageName = gameEntity.getApk().get(0).getPackageName(); PackageManager pm = mContext.getPackageManager(); FileInfo fileInfo = new FileInfo(); diff --git a/app/src/main/java/com/gh/gamecenter/ask/AnswerCommentFragment.java b/app/src/main/java/com/gh/gamecenter/ask/AnswerCommentFragment.java index a6c81e30ba..d4ce27384f 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/AnswerCommentFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/AnswerCommentFragment.java @@ -32,6 +32,7 @@ import com.gh.gamecenter.ask.viewmodel.AnswerCommentViewModel; import com.gh.gamecenter.baselist.ListAdapter; import com.gh.gamecenter.baselist.ListFragment; import com.gh.gamecenter.entity.CommentEntity; +import com.halo.assistant.HaloApp; import com.lightgame.utils.Util_System_Keyboard; import com.lightgame.utils.Utils; @@ -146,7 +147,7 @@ public class AnswerCommentFragment extends ListFragment { InputMethodManager keyboard = (InputMethodManager) - getContext().getSystemService(Context.INPUT_METHOD_SERVICE); + HaloApp.getInstance().getApplication().getSystemService(Context.INPUT_METHOD_SERVICE); keyboard.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0); }, 200); } diff --git a/app/src/main/java/com/gh/gamecenter/ask/QuestionsEditFragment.java b/app/src/main/java/com/gh/gamecenter/ask/QuestionsEditFragment.java index c73040c7db..dfcc06e71b 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/QuestionsEditFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/QuestionsEditFragment.java @@ -683,7 +683,9 @@ public class QuestionsEditFragment extends NormalFragment { String etContent = s.toString(); if (etContent.contains(" ")) { mTitle.setText(etContent.replaceAll(" ", "")); - mTitle.setSelection(start); + int length = mTitle.getText().toString().length(); + if (start >= 0 && start <= length) + mTitle.setSelection(start); return; } if (mQuestionsEntity == null) { diff --git a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java index e7d397940b..958104f0e3 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java @@ -146,7 +146,7 @@ public class GameDownloadFragment extends BaseFragment implements View.OnClickLi } } else { location = adapter.getLocation(downloadEntity.getUrl()); - if (location != null && adapter.getDownloadingList().size() > 0) { + if (location != null && adapter.getDownloadingList().size() > location) { adapter.getDownloadingList().set(location, downloadEntity); adapter.notifyItemChanged(adapter.getBase() + location + 1); } diff --git a/app/src/main/java/com/gh/gamecenter/receiver/InstallReceiver.java b/app/src/main/java/com/gh/gamecenter/receiver/InstallReceiver.java index 428c875031..32663d39d6 100644 --- a/app/src/main/java/com/gh/gamecenter/receiver/InstallReceiver.java +++ b/app/src/main/java/com/gh/gamecenter/receiver/InstallReceiver.java @@ -29,7 +29,9 @@ public class InstallReceiver extends BroadcastReceiver { public void onReceive(Context context, Intent intent) { String path = intent.getStringExtra(EntranceUtils.KEY_PATH); if (PackageUtils.isCanLaunchSetup(context, path)) { - context.startActivity(PackageUtils.getInstallIntent(context, path)); + Intent installIntent = PackageUtils.getInstallIntent(context, path); + installIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + context.startActivity(installIntent); } else { if (RunningUtils.isRunning(context)) { if (RunningUtils.isEqualsTop(context, DownloadManagerActivity.class.getName())) { From 665fbb0f6cae13ba543ddb1e53346503247fdb0f Mon Sep 17 00:00:00 2001 From: kehaoyuan Date: Thu, 3 May 2018 17:39:26 +0800 Subject: [PATCH 2/4] =?UTF-8?q?PATCH=5FVERSION=5FNAME=20=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E4=B8=BA=203.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index fe20e98ba3..d09c2f04bc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,7 +21,7 @@ org.gradle.parallel=true channel_file=channel.txt # tinker patch version_name -PATCH_VERSION_NAME=3.2 +PATCH_VERSION_NAME=3.2.1 # Third-party keys DEBUG_UMENG_APPKEY=58e5b0b9c62dca35a00005e6 From 6e9edabd943fb0c008efa0fb7da6426f3685c549 Mon Sep 17 00:00:00 2001 From: kehaoyuan Date: Fri, 11 May 2018 17:31:43 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=8E=89=E7=BA=BF=E9=97=AE=E9=A2=98=EF=BC=8C=E5=AF=B9=E6=8E=A5?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=BB=9F=E8=AE=A1=E9=9C=80=E6=B1=82=EF=BC=88?= =?UTF-8?q?MTA=EF=BC=89=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV3.2.2=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E6=B1=87=E6=80=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/common/util/CollectionUtils.kt | 2 +- .../java/com/gh/common/util/ShareUtils.java | 4 +- .../gh/gamecenter/libao/LibaoSearchAdapter.kt | 2 +- .../gh/gamecenter/login/UserRepository.java | 106 +++++++----------- .../manager/RefreshTokenManager.java | 20 +++- .../gamecenter/personal/PersonalFragment.java | 22 +--- app/src/main/res/values/strings.xml | 3 +- gradle.properties | 4 +- 8 files changed, 68 insertions(+), 95 deletions(-) diff --git a/app/src/main/java/com/gh/common/util/CollectionUtils.kt b/app/src/main/java/com/gh/common/util/CollectionUtils.kt index ecd15794a1..7ee76f15a3 100644 --- a/app/src/main/java/com/gh/common/util/CollectionUtils.kt +++ b/app/src/main/java/com/gh/common/util/CollectionUtils.kt @@ -46,7 +46,7 @@ object CollectionUtils { try { val string = e.response()?.errorBody()?.string() val errorBody = JSONObject(string) - if (errorBody.getInt("status") == 403009) { + if (errorBody.getInt("detail") == 403009) { listener.onSuccess() return } diff --git a/app/src/main/java/com/gh/common/util/ShareUtils.java b/app/src/main/java/com/gh/common/util/ShareUtils.java index 4172c5fd57..4bb086f688 100644 --- a/app/src/main/java/com/gh/common/util/ShareUtils.java +++ b/app/src/main/java/com/gh/common/util/ShareUtils.java @@ -513,8 +513,10 @@ public class ShareUtils { shortMessageShare(); break; case 6: - if (mShareType == ShareType.askInvite || mShareType == ShareType.askNormal) { + if (mShareType == ShareType.askInvite) { copyLink(mTitle + " - 光环助手" + shareUrl); + } else if (mShareType == ShareType.askNormal) { + copyLink(shareUrl); } else if (mShareType != ShareType.shareGh) { copyLink(shareUrl); } else { 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 52f204b00d..fba1f5c9ab 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt @@ -130,7 +130,7 @@ class LibaoSearchAdapter(fragment: LibaoSearchFragment, notifyDataSetChanged() } - override fun postFailed(error: Throwable) { + override fun postFailed(error: Throwable?) { } }) diff --git a/app/src/main/java/com/gh/gamecenter/login/UserRepository.java b/app/src/main/java/com/gh/gamecenter/login/UserRepository.java index 3a7e23a7d9..4ab387037b 100644 --- a/app/src/main/java/com/gh/gamecenter/login/UserRepository.java +++ b/app/src/main/java/com/gh/gamecenter/login/UserRepository.java @@ -10,7 +10,7 @@ import android.support.annotation.Nullable; import android.text.TextUtils; import com.gh.common.constant.Constants; -import com.gh.common.util.AppDebugConfig; +import com.gh.common.util.DataUtils; import com.gh.common.util.DeviceUtils; import com.gh.common.util.GetLoginDataUtils; import com.gh.common.util.LoginUtils; @@ -19,6 +19,7 @@ import com.gh.gamecenter.R; import com.gh.gamecenter.entity.LoginTokenEntity; import com.gh.gamecenter.entity.TokenEntity; import com.gh.gamecenter.entity.UserInfoEntity; +import com.gh.gamecenter.manager.RefreshTokenManager; import com.gh.gamecenter.manager.UserManager; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; @@ -35,6 +36,7 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.Executor; import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import okhttp3.MediaType; import okhttp3.RequestBody; @@ -100,8 +102,7 @@ class UserRepository { long accessExpire = accessToken.getExpire(); if (accessExpire > Utils.getTime(mContext)) { cacheAndNotifyLoginToken(tokenEntity); - getLoginUserInfo(); // 先更新页面 - refreshUserInfo(null); // 再刷新userinfo（目的是确定该用户没在其他设备登录） + refreshUserInfo(null); // 刷新userinfo（目的是确定该用户没在其他设备登录） return; } @@ -225,15 +226,25 @@ class UserRepository { GetLoginDataUtils.getInstance(mContext).QQLogout(); } - if (httpException != null && httpException.code() == 400) { - ResponseBody responseBody = httpException.response().errorBody(); - String string = responseBody.string(); - JSONObject content = new JSONObject(string); - int code = content.getInt("code"); - LoginUtils.outputErrorHint(mContext, code); - Utils.log("login->onFailure:: code:" + code + " content:" + content.toString()); + if (httpException != null) { + if ((httpException.code() == 400 || httpException.code() == 403)) { + ResponseBody responseBody = httpException.response().errorBody(); + String string = responseBody.string(); + JSONObject content = new JSONObject(string); + int code = content.getInt("code"); + if (httpException.code() == 400) { + LoginUtils.outputErrorHint(mContext, code); + } else { + Utils.toast(mContext, mContext.getString(R.string.login_failure_hint_code, code)); + } + Utils.log("login->onFailure:: code:" + code + " content:" + content.toString()); + DataUtils.onMtaEvent(mContext, "登录异常统计_手动登录", "错误码", String.valueOf(code)); + } else { + Utils.toast(mContext, mContext.getString(R.string.login_failure_hint_code, httpException.code())); + } + } else { + Utils.toast(mContext, mContext.getString(R.string.login_failure_hint)); } - Utils.toast(mContext, R.string.login_failure_hint); } catch (Exception e1) { e1.printStackTrace(); } @@ -242,60 +253,27 @@ class UserRepository { } private void refreshToken(final LoginTokenEntity refreshToken) { - RequestBody body = null; - try { - JSONObject content = new JSONObject(); - JSONObject device = DeviceUtils.getLoginDevice(mContext.getApplicationContext()); - content.put("refresh_token", refreshToken.getRefreshToken().getValue()); - content.put("device", device); - body = RequestBody.create(MediaType.parse("application/json"), content.toString()); - } catch (JSONException e) { - e.printStackTrace(); - } - - mUserseaService - .refreshToken(body) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Response() { - @Override - public void onResponse(LoginTokenEntity response) { - super.onResponse(response); - response.setLoginType(refreshToken.getLoginType()); - response.setId(refreshToken.getId()); - - userTokenHandle(response, null); - } - - @Override - public void onApiFailure(ApiResponse e) { - super.onApiFailure(e); - try { - HttpException httpException = e.getHttpException(); - - String string = httpException.response().errorBody().string(); - JSONObject content = new JSONObject(string); - int code = content.getInt("code"); -// Utils.toast(mContext, mContext.getString(R.string.login_refresh_error)); -// if (code == 400802) { // 其他设备登录了该账号 网络重试已经做了处理 -// EventBus.getDefault().post(new EBShowDialog("loginException", string)); // 打开提示框 -// } - - if (code == 400802 || code == 400401) { // 自动注销 - logout(); - } else { - ApiResponse value = new ApiResponse<>(); - value.setThrowable(value.getThrowable()); - value.setHttpException(httpException); - mLoginObsResponseUserInfo.postValue(value); - } - - if (AppDebugConfig.IS_DEBUG) Utils.log("refreshToken::" + code); - } catch (Exception e1) { - e1.printStackTrace(); + SINGLE_EXECUTOR.execute(() -> { + if (!TextUtils.isEmpty(UserManager.getInstance().getToken())) return; + RefreshTokenManager.getInstance(mContext).refreshToken(refreshToken.getRefreshToken().getValue() + , new RefreshTokenManager.refreshCallBack() { + @Override + public void onLogin() { + LoginTokenEntity tokenEntity = UserManager.getInstance().getLoginTokenEntity(); + UserInfoEntity userInfoEntity = UserManager.getInstance().getUserInfoEntity(); + cacheAndNotifyLoginToken(tokenEntity); + cacheAndNotifyUserInfo(userInfoEntity, false); } - } - }); + + @Override + public void onLoginFailure() { + Observable.create(subscriber -> subscriber.onNext("")) + .delay(1000, TimeUnit.MILLISECONDS).subscribe(o -> { + mLoginObsResponseUserInfo.postValue(new ApiResponse<>()); // 改变界面(切换成未登录状态) + }); + } + }); + }); } //更改用户信息 diff --git a/app/src/main/java/com/gh/gamecenter/manager/RefreshTokenManager.java b/app/src/main/java/com/gh/gamecenter/manager/RefreshTokenManager.java index 02fba9d26f..ff45f9c144 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/RefreshTokenManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/RefreshTokenManager.java @@ -1,10 +1,12 @@ package com.gh.gamecenter.manager; import android.content.Context; +import android.content.SharedPreferences; import android.preference.PreferenceManager; import android.text.TextUtils; import com.gh.common.constant.Constants; +import com.gh.common.util.DataUtils; import com.gh.common.util.DeviceUtils; import com.gh.gamecenter.BuildConfig; import com.gh.gamecenter.entity.LoginTokenEntity; @@ -40,6 +42,7 @@ public class RefreshTokenManager { private AppDatabase mDatabase; private UserseaService mUserseaService; private ApiService mApiService; + private SharedPreferences mSp; private Context mContext; @@ -51,6 +54,7 @@ public class RefreshTokenManager { mDatabase = AppDatabase.getInstance(context); mUserseaService = RetrofitManager.getInstance(context).getUsersea(); mApiService = RetrofitManager.getInstance(context).getApi(); + mSp = PreferenceManager.getDefaultSharedPreferences(context); } public static RefreshTokenManager getInstance(Context context) { @@ -90,11 +94,6 @@ public class RefreshTokenManager { @Override public void onResponse(LoginTokenEntity response) { super.onResponse(response); - LoginTokenEntity loginTokenEntity = UserManager.getInstance().getLoginTokenEntity(); - if (loginTokenEntity != null) { - response.setLoginType(loginTokenEntity.getLoginType()); - response.setId(loginTokenEntity.getId()); - } saveLoginToken(response, mContext); refreshUserInfo(callBack, response.getId()); @@ -119,6 +118,7 @@ public class RefreshTokenManager { if (code == 400802 || code == 400401) { // 自动注销 EventBus.getDefault().post(new EBReuse(PersonalFragment.LOGOUT_TAG)); + DataUtils.onMtaEvent(mContext, "登录异常统计_自动登录", "错误码_RefreshToken", code + "_" + token); } } catch (Exception e1) { e1.printStackTrace(); @@ -160,6 +160,14 @@ public class RefreshTokenManager { } private void saveLoginToken(final LoginTokenEntity tokenEntity, final Context context) { + String tokenKey = mSp.getString(Constants.LOGIN_TOKEN_ID, null); + if (tokenKey == null) return; + LoginTokenEntity loginTokenEntity = mDatabase.loginTokenDao().getTokenById(tokenKey); + if (loginTokenEntity != null) { + // 同步LoginType&&dbKey + tokenEntity.setLoginType(loginTokenEntity.getLoginType()); + tokenEntity.setId(loginTokenEntity.getId()); + } UserManager.getInstance().setLoginTokenEntity(tokenEntity); SINGLE_EXECUTOR.execute(new Runnable() { @@ -169,7 +177,7 @@ public class RefreshTokenManager { if (mDatabase.loginTokenDao().updateToken(tokenEntity) <= 0) { mDatabase.loginTokenDao().addToken(tokenEntity); } - PreferenceManager.getDefaultSharedPreferences(context).edit().putString(Constants.LOGIN_TOKEN_ID, tokenEntity.getId()).apply(); + mSp.edit().putString(Constants.LOGIN_TOKEN_ID, tokenEntity.getId()).apply(); } }); } 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 9c4cfd6032..ce7646756a 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java @@ -116,7 +116,6 @@ public class PersonalFragment extends BaseFragment implements Observer 起一个难忘的名字吧 登录异常，请稍后重试 + 登录异常(%1$d)，请稍后重试 选择地区 退出账号 分享 @@ -549,6 +550,6 @@ 我来评论 已连续签到 %1$d 天]]> %1$d]]> - 著作权归作者所有©光环助手 + 著作权归作者所有©光环助手 diff --git a/gradle.properties b/gradle.properties index d09c2f04bc..c19713ec0d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,7 +21,7 @@ org.gradle.parallel=true channel_file=channel.txt # tinker patch version_name -PATCH_VERSION_NAME=3.2.1 +PATCH_VERSION_NAME=3.2.2 # Third-party keys DEBUG_UMENG_APPKEY=58e5b0b9c62dca35a00005e6 @@ -43,7 +43,7 @@ UMENG_MESSAGE_SECRET=8bcce6bed547ee624f5c2cc64d39a9e9 BUGLY_APPID=d5de44c594 # usersea -DEV_USERSEA_APP_ID=3111120926 +DEV_USERSEA_APP_ID=2017101012 DEV_USERSEA_APP_SECRET=597aa2b463f5770013146675 USERSEA_APP_ID=2017101012 From 7e350cac4131f4bdef9954ce12fdf80962b64a9f Mon Sep 17 00:00:00 2001 From: kehaoyuan Date: Tue, 15 May 2018 19:01:17 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=8A=AB=E6=8C=81?= =?UTF-8?q?=E6=8E=A5=E5=85=A5MTA,=E4=BC=98=E5=8C=96=E4=B8=8B=E8=BD=BD(?= =?UTF-8?q?=E6=9C=89=E6=95=88=E9=98=B2=E6=AD=A2=E8=A7=A3=E6=9E=90=E5=8C=85?= =?UTF-8?q?=E9=94=99=E8=AF=AF)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/gamecenter/MainActivity.java | 16 +++++++++++++--- .../gh/gamecenter/discover/DiscoverFragment.java | 6 ++++-- libraries/LGLibrary | 2 +- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index 799f0837fd..6a0bb8d649 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -11,6 +11,7 @@ import android.content.pm.PackageInfo; import android.net.Uri; import android.os.Bundle; import android.os.Handler; +import android.os.Message; import android.os.SystemClock; import android.preference.PreferenceManager; import android.provider.Settings; @@ -74,6 +75,7 @@ import com.google.gson.reflect.TypeToken; import com.halo.assistant.HaloApp; import com.lightgame.config.CommonDebug; import com.lightgame.download.DataWatcher; +import com.lightgame.download.DownloadConfig; import com.lightgame.download.DownloadEntity; import com.lightgame.download.DownloadStatus; import com.lightgame.download.FileUtils; @@ -171,6 +173,9 @@ public class MainActivity extends BaseActivity { if (DownloadStatus.hijack.equals(downloadEntity.getStatus())) { // 链接被劫持 processHijack(downloadEntity); + String nameAndPlatform = downloadEntity.getName() + ":" + + PlatformUtils.getInstance(getApplicationContext()).getPlatformName(downloadEntity.getPlatform()); + DataUtils.onMtaEvent(getApplicationContext(), "下载劫持", "游戏名字", nameAndPlatform, "网络状态" + DeviceUtils.getNetwork(getApplication())); return; } else if (DownloadStatus.notfound.equals(downloadEntity.getStatus())) { // 404 Not Found @@ -240,8 +245,10 @@ public class MainActivity extends BaseActivity { * 3. */ - DataUtils.onMtaEvent(getApplication(), "解析包错误分析", "游戏名字" - , downloadEntity.getName() + ":" + PlatformUtils.getInstance(getApplicationContext()).getPlatformName(downloadEntity.getPlatform())); + DataUtils.onMtaEvent(getApplication(), "解析包错误分析" + , "游戏名字", downloadEntity.getName() + ":" + + PlatformUtils.getInstance(getApplicationContext()).getPlatformName(downloadEntity.getPlatform()) + , "网络状态", DeviceUtils.getNetwork(getApplication())); } } @@ -765,7 +772,10 @@ public class MainActivity extends BaseActivity { for (DownloadEntity downloadEntity : DownloadManager.getInstance(this).getAll()) { if (DownloadStatus.neterror.equals(downloadEntity.getStatus()) || DownloadStatus.timeout.equals(downloadEntity.getStatus())) { - DownloadManager.getInstance(this).add(downloadEntity); + Message msg = Message.obtain(); + msg.what = DownloadConfig.CONTINUE_DOWNLOAD_TASK; + msg.obj = downloadEntity.getUrl(); + DownloadManager.getInstance(getApplicationContext()).sendMessageDelayed(msg, 1000); } Utils.log("checkRetryDownload::" + downloadEntity.getStatus()); } diff --git a/app/src/main/java/com/gh/gamecenter/discover/DiscoverFragment.java b/app/src/main/java/com/gh/gamecenter/discover/DiscoverFragment.java index 4b7821ee14..3102a7cc1a 100644 --- a/app/src/main/java/com/gh/gamecenter/discover/DiscoverFragment.java +++ b/app/src/main/java/com/gh/gamecenter/discover/DiscoverFragment.java @@ -177,8 +177,10 @@ public class DiscoverFragment extends BaseFragment { @Override public void run() { GameTrendsInfo gameTrendsInfo = mGameTrendsDao.findGameTrendsInfo(UserManager.getInstance().getUserId()); - gameTrendsInfo.setReadPostTime(gameTrendsInfo.getInternetPostTime()); - mGameTrendsDao.add(gameTrendsInfo); + if (gameTrendsInfo != null) { + gameTrendsInfo.setReadPostTime(gameTrendsInfo.getInternetPostTime()); + mGameTrendsDao.add(gameTrendsInfo); + } } }); } diff --git a/libraries/LGLibrary b/libraries/LGLibrary index 3894faf023..5b735b0e09 160000 --- a/libraries/LGLibrary +++ b/libraries/LGLibrary @@ -1 +1 @@ -Subproject commit 3894faf02397f382674a15523be657ebda3ce2ec +Subproject commit 5b735b0e099fa7cb6d3b8ec259567e14e6c99065