From 89de5f24bf2a5242e3d49b0d939ab0c4b5cc4f1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B6=E5=AD=90=E7=BB=B4?= Date: Tue, 16 Apr 2024 11:19:40 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=A9=BA=E6=8C=87?= =?UTF-8?q?=E9=92=88=E9=97=AA=E9=80=80=E9=97=AE=E9=A2=98=20https://sentry.?= =?UTF-8?q?shanqu.cc/organizations/lightgame/issues/380027/events/ee8c112a?= =?UTF-8?q?97a940beb59a2d733d228dd9/=3Fproject=3D22?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java | 2 +- .../java/com/gh/gamecenter/adapter/MessageDetailAdapter.java | 2 +- .../com/gh/gamecenter/message/view/concern/ConcernAdapter.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 9f2eefe382..98f255d455 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java @@ -205,7 +205,7 @@ public class LibaoDetailAdapter extends BaseRecyclerAdapter { GameEntity gameEntity = mLibaoEntity.getGame().toGameEntity(); GameItemViewHolder.initGameSubtitleAndAdLabel(gameEntity, holder.binding.gameSubtitleTv, null, null, false, null, false, null); } else { - holder.binding.libaodetailGameIcon.displayGameIcon(mLibaoEntity.getIcon(), null, mLibaoEntity.getGame().getIconFloat()); + holder.binding.libaodetailGameIcon.displayGameIcon(mLibaoEntity.getIcon(), null, null); } holder.binding.libaodetailName.setText(mLibaoEntity.getName()); if (TextUtils.isEmpty(mLibaoEntity.getPlatform())) { 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 b2ee32acc2..e7ac07f66b 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java @@ -297,7 +297,7 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { if (mConcernEntity.getGame() != null) { viewHolder.binding.newsDigestThumb.displayGameIcon(mConcernEntity.getGame().getIcon(), mConcernEntity.getGame().getIconSubscript(), mConcernEntity.getGame().getIconFloat()); } else { - viewHolder.binding.newsDigestThumb.displayGameIcon(mConcernEntity.getGameIcon(), null, mConcernEntity.getGame().getIconFloat()); + viewHolder.binding.newsDigestThumb.displayGameIcon(mConcernEntity.getGameIcon(), null, null); } viewHolder.binding.newsDigestTitle.setText(mConcernEntity.getGameName()); NewsUtils.setNewsPublishOn(viewHolder.binding.newsDigestTime, mConcernEntity.getTime()); diff --git a/module_message/src/main/java/com/gh/gamecenter/message/view/concern/ConcernAdapter.java b/module_message/src/main/java/com/gh/gamecenter/message/view/concern/ConcernAdapter.java index 9b6eb627b3..17c86219c8 100644 --- a/module_message/src/main/java/com/gh/gamecenter/message/view/concern/ConcernAdapter.java +++ b/module_message/src/main/java/com/gh/gamecenter/message/view/concern/ConcernAdapter.java @@ -365,7 +365,7 @@ class ConcernAdapter extends BaseRecyclerAdapter { if (concernEntity.getGame() != null) { viewHolder.binding.newsDigestThumb.displayGameIcon(concernEntity.getGame().getIcon(), concernEntity.getGame().getIconSubscript(), concernEntity.getGame().getIconFloat()); } else { - viewHolder.binding.newsDigestThumb.displayGameIcon(concernEntity.getGameIcon(), null, concernEntity.getGame().getIconFloat()); + viewHolder.binding.newsDigestThumb.displayGameIcon(concernEntity.getGameIcon(), null, null); } viewHolder.binding.newsDigestTitle.setText(concernEntity.getGameName()); From 71453054d9a1d48fac49c55f3290266bc233467d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=BE=E7=A5=A5=E4=BF=8A?= Date: Tue, 16 Apr 2024 11:35:29 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E5=88=86=E4=BA=AB=E5=9F=8B=E7=82=B9=E4=B8=8A=E6=8A=A5=E9=80=A0?= =?UTF-8?q?=E6=88=90=E7=9A=84=E7=A9=BA=E6=8C=87=E9=92=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/gamecenter/WeiBoShareActivity.java | 8 ++--- .../gamecenter/common/utils/ShareUtils.java | 36 +++++++++---------- .../gh/gamecenter/wxapi/WXEntryActivity.java | 8 ++--- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java b/app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java index f8b547997e..aedf7ae267 100644 --- a/app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java +++ b/app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java @@ -269,9 +269,9 @@ public class WeiBoShareActivity extends Activity implements WbShareCallback { if (ShareUtils.shareEntrance == ShareUtils.ShareEntrance.inviteFriends) { IntegralLogHelper.INSTANCE.logInviteResult("成功", "微博"); } - if (ShareUtils.shareEntrance == ShareUtils.ShareEntrance.askNormal || + if (ShareUtils.additionalParams != null && (ShareUtils.shareEntrance == ShareUtils.ShareEntrance.askNormal || ShareUtils.shareEntrance == ShareUtils.ShareEntrance.communityArticle || - ShareUtils.shareEntrance == ShareUtils.ShareEntrance.video) { + ShareUtils.shareEntrance == ShareUtils.ShareEntrance.video)) { com.gh.gamecenter.common.utils.NewLogUtils.logShareResult(ShareUtils.additionalParams, true); SensorsBridge.trackArticleShareResult( ShareUtils.additionalParams.getCustomerType(), @@ -319,9 +319,9 @@ public class WeiBoShareActivity extends Activity implements WbShareCallback { com.gh.gamecenter.common.utils.NewLogUtils.logShareResult(ShareUtils.additionalParams, false); } - if(ShareUtils.shareEntrance == ShareUtils.ShareEntrance.video + if(ShareUtils.additionalParams != null && (ShareUtils.shareEntrance == ShareUtils.ShareEntrance.video || ShareUtils.shareEntrance == ShareUtils.ShareEntrance.communityArticle - || ShareUtils.shareEntrance == ShareUtils.ShareEntrance.askNormal) + || ShareUtils.shareEntrance == ShareUtils.ShareEntrance.askNormal)) { SensorsBridge.trackArticleShareResult( ShareUtils.additionalParams.getCustomerType(), diff --git a/module_common/src/main/java/com/gh/gamecenter/common/utils/ShareUtils.java b/module_common/src/main/java/com/gh/gamecenter/common/utils/ShareUtils.java index 8ce5b4f845..7f7ea35dce 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/utils/ShareUtils.java +++ b/module_common/src/main/java/com/gh/gamecenter/common/utils/ShareUtils.java @@ -165,9 +165,9 @@ public class ShareUtils { shareType = "QQ空间"; } - if (ShareUtils.shareEntrance == ShareUtils.ShareEntrance.askNormal || + if (additionalParams != null && (ShareUtils.shareEntrance == ShareUtils.ShareEntrance.askNormal || ShareUtils.shareEntrance == ShareEntrance.communityArticle || - ShareUtils.shareEntrance == ShareUtils.ShareEntrance.video) { + ShareUtils.shareEntrance == ShareUtils.ShareEntrance.video)) { NewLogUtils.logShareResult(ShareUtils.additionalParams, true); SensorsBridge.trackArticleShareResult( @@ -207,9 +207,9 @@ public class ShareUtils { Utils.toast(mContext, R.string.share_fail_hint); LogUtils.uploadShareResult(shareType, ShareUtils.shareEntrance.getName(), "fail", ShareUtils.shareEntity.getShareUrl(), ShareUtils.shareEntity.getShareTitle(), ShareUtils.shareEntity.getSummary(), ShareUtils.resourceId); - if (ShareUtils.shareEntrance == ShareUtils.ShareEntrance.askNormal || + if (additionalParams != null && (ShareUtils.shareEntrance == ShareUtils.ShareEntrance.askNormal || ShareUtils.shareEntrance == ShareEntrance.communityArticle || - ShareUtils.shareEntrance == ShareUtils.ShareEntrance.video) { + ShareUtils.shareEntrance == ShareUtils.ShareEntrance.video)) { NewLogUtils.logShareResult(ShareUtils.additionalParams, false); SensorsBridge.trackArticleShareResult( additionalParams.getCustomerType(), @@ -521,9 +521,9 @@ public class ShareUtils { shareType = "qq_friend"; LogUtils.uploadShareType(shareType, shareEntrance.getName(), shareUrl, mTitle, mSummary, resourceId); - if(ShareUtils.shareEntrance == ShareEntrance.video + if(additionalParams != null && (ShareUtils.shareEntrance == ShareEntrance.video || ShareUtils.shareEntrance == ShareEntrance.communityArticle - || ShareUtils.shareEntrance == ShareEntrance.askNormal) + || ShareUtils.shareEntrance == ShareEntrance.askNormal)) { SensorsBridge.trackArticleShare( additionalParams.getCustomerType(), @@ -580,9 +580,9 @@ public class ShareUtils { mShareType = ShareType.wechat; LogUtils.uploadShareType(shareType, shareEntrance.getName(), shareUrl, mTitle, mSummary, resourceId); - if(ShareUtils.shareEntrance == ShareEntrance.video + if(additionalParams != null && (ShareUtils.shareEntrance == ShareEntrance.video || ShareUtils.shareEntrance == ShareEntrance.communityArticle - || ShareUtils.shareEntrance == ShareEntrance.askNormal) + || ShareUtils.shareEntrance == ShareEntrance.askNormal)) { SensorsBridge.trackArticleShare( additionalParams.getCustomerType(), @@ -724,9 +724,9 @@ public class ShareUtils { MtaHelper.onEvent("内容分享", "QQ空间", mTitle); LogUtils.uploadShareType(shareType, shareEntrance.getName(), shareUrl, mTitle, mSummary, resourceId); - if(ShareUtils.shareEntrance == ShareEntrance.video + if(additionalParams != null && (ShareUtils.shareEntrance == ShareEntrance.video || ShareUtils.shareEntrance == ShareEntrance.communityArticle - || ShareUtils.shareEntrance == ShareEntrance.askNormal) + || ShareUtils.shareEntrance == ShareEntrance.askNormal)) { SensorsBridge.trackArticleShare( additionalParams.getCustomerType(), @@ -787,9 +787,9 @@ public class ShareUtils { shareType = "wechat_moment"; LogUtils.uploadShareType(shareType, shareEntrance.getName(), shareUrl, mTitle, mSummary, resourceId); - if(ShareUtils.shareEntrance == ShareEntrance.video + if(additionalParams != null && (ShareUtils.shareEntrance == ShareEntrance.video || ShareUtils.shareEntrance == ShareEntrance.communityArticle - || ShareUtils.shareEntrance == ShareEntrance.askNormal) + || ShareUtils.shareEntrance == ShareEntrance.askNormal)) { SensorsBridge.trackArticleShare( additionalParams.getCustomerType(), @@ -852,9 +852,9 @@ public class ShareUtils { shareType = "sina_weibo"; LogUtils.uploadShareType(shareType, shareEntrance.getName(), shareUrl, mTitle, mSummary, resourceId); - if(ShareUtils.shareEntrance == ShareEntrance.video + if(additionalParams != null && (ShareUtils.shareEntrance == ShareEntrance.video || ShareUtils.shareEntrance == ShareEntrance.communityArticle - || ShareUtils.shareEntrance == ShareEntrance.askNormal) + || ShareUtils.shareEntrance == ShareEntrance.askNormal)) { SensorsBridge.trackArticleShare( additionalParams.getCustomerType(), @@ -901,9 +901,9 @@ public class ShareUtils { shareType = "sms"; LogUtils.uploadShareType(shareType, shareEntrance.getName(), shareUrl, mTitle, mSummary, resourceId); - if(ShareUtils.shareEntrance == ShareEntrance.video + if(additionalParams != null && (ShareUtils.shareEntrance == ShareEntrance.video || ShareUtils.shareEntrance == ShareEntrance.communityArticle - || ShareUtils.shareEntrance == ShareEntrance.askNormal) + || ShareUtils.shareEntrance == ShareEntrance.askNormal)) { SensorsBridge.trackArticleShare( additionalParams.getCustomerType(), @@ -980,9 +980,9 @@ public class ShareUtils { LogUtils.uploadShareType(shareType, shareEntrance.getName(), shareUrl, mTitle, mSummary, resourceId); LogUtils.uploadShareResult(shareType, shareEntrance.getName(), "success", shareUrl, mTitle, mSummary, resourceId); - if(ShareUtils.shareEntrance == ShareEntrance.video + if(additionalParams != null && (ShareUtils.shareEntrance == ShareEntrance.video || ShareUtils.shareEntrance == ShareEntrance.communityArticle - || ShareUtils.shareEntrance == ShareEntrance.askNormal) + || ShareUtils.shareEntrance == ShareEntrance.askNormal)) { SensorsBridge.trackArticleShare( additionalParams.getCustomerType(), diff --git a/module_login/src/main/java/com/gh/gamecenter/wxapi/WXEntryActivity.java b/module_login/src/main/java/com/gh/gamecenter/wxapi/WXEntryActivity.java index 051e0207fa..c867a67ee6 100644 --- a/module_login/src/main/java/com/gh/gamecenter/wxapi/WXEntryActivity.java +++ b/module_login/src/main/java/com/gh/gamecenter/wxapi/WXEntryActivity.java @@ -122,9 +122,9 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler, WeC EventBus.getDefault().post(new EBShare(ShareUtils.shareEntrance, shareType)); com.gh.gamecenter.common.utils.LogUtils.uploadShareResult(ShareUtils.shareType, ShareUtils.shareEntrance.getName(), "success", ShareUtils.shareEntity.getShareUrl(), ShareUtils.shareEntity.getShareTitle(), ShareUtils.shareEntity.getSummary(), ShareUtils.resourceId); - if (ShareUtils.shareEntrance == ShareUtils.ShareEntrance.askNormal || + if (ShareUtils.additionalParams != null && (ShareUtils.shareEntrance == ShareUtils.ShareEntrance.askNormal || ShareUtils.shareEntrance == ShareUtils.ShareEntrance.communityArticle || - ShareUtils.shareEntrance == ShareUtils.ShareEntrance.video) { + ShareUtils.shareEntrance == ShareUtils.ShareEntrance.video)) { com.gh.gamecenter.common.utils.NewLogUtils.logShareResult(ShareUtils.additionalParams, true); SensorsBridge.trackArticleShareResult( ShareUtils.additionalParams.getCustomerType(), @@ -197,9 +197,9 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler, WeC com.gh.gamecenter.common.utils.NewLogUtils.logShareResult(ShareUtils.additionalParams, false); } - if(ShareUtils.shareEntrance == ShareUtils.ShareEntrance.video + if(ShareUtils.additionalParams != null && (ShareUtils.shareEntrance == ShareUtils.ShareEntrance.video || ShareUtils.shareEntrance == ShareUtils.ShareEntrance.communityArticle - || ShareUtils.shareEntrance == ShareUtils.ShareEntrance.askNormal) + || ShareUtils.shareEntrance == ShareUtils.ShareEntrance.askNormal)) { String shareType; if ("wechat_friend".equals(ShareUtils.shareType)) { From 79cf1566b2772d067cf8d73cc9009939d15cb6f5 Mon Sep 17 00:00:00 2001 From: chenjuntao Date: Tue, 16 Apr 2024 09:33:50 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E6=B8=B8=E6=88=8F=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E8=A7=A3=E6=9E=90=E5=8C=85=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20https://jira.shanqu.cc/browse/GHZS-5218?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/gh/ndownload/NDownloadBridge.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/gh/ndownload/NDownloadBridge.kt b/app/src/main/java/com/gh/ndownload/NDownloadBridge.kt index 540922e923..403cc80e22 100644 --- a/app/src/main/java/com/gh/ndownload/NDownloadBridge.kt +++ b/app/src/main/java/com/gh/ndownload/NDownloadBridge.kt @@ -264,13 +264,17 @@ object NDownloadBridge : InnerDownloadListener, IErrorRetryHandler { val file = File(downloadEntity.path) val oaidString = "o|${HaloApp.getInstance().oaid}" try { - if (ChannelReader.containV2Signature(file)) { + if (ChannelReader.containV2Signature(file) && ChannelReader.getChannelByV2(file).isEmpty()) { ChannelWriter.addChannelByV2(file, oaidString, true) - } else { + } else if (ChannelReader.containV1Signature(file) && ChannelReader.getChannelByV1(file).isEmpty()) { ChannelWriter.addChannelByV1(file, oaidString) } } catch (e: Exception) { - SentryHelper.onEvent("ADD_CHANNEL_FAILED", "error_digest", e.localizedMessage) + SentryHelper.onEvent( + "ADD_CHANNEL_FAILED", + "game_id", downloadEntity.gameId, + "error_digest", e.localizedMessage + ) } } From f8703b9fe197a52cc54b8807a703260bc05385d3 Mon Sep 17 00:00:00 2001 From: juntao Date: Tue, 16 Apr 2024 14:34:40 +0800 Subject: [PATCH 4/5] =?UTF-8?q?chore:=20=E7=89=88=E6=9C=AC=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E8=87=B3=205.34.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dependencies.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 804d84e321..85eaf067c2 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -7,8 +7,8 @@ ext { targetSdkVersion = 30 // application info (每个大版本之间的 versionCode 增加 20) - versionCode = 1036 - versionName = "5.34.6" + versionCode = 1037 + versionName = "5.34.7" applicationId = "com.gh.gamecenter" applicationIdGat = "com.gh.gamecenter.intl" From 2b91545d349ec6847a8f74894d82a75a1f772f5d Mon Sep 17 00:00:00 2001 From: chenjuntao Date: Tue, 16 Apr 2024 15:03:12 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=E6=B8=B8=E6=88=8F=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E8=A7=A3=E6=9E=90=E5=8C=85=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20https://jira.shanqu.cc/browse/GHZS-5218?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenjuntao --- app/src/main/java/com/gh/ndownload/NDownloadBridge.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/gh/ndownload/NDownloadBridge.kt b/app/src/main/java/com/gh/ndownload/NDownloadBridge.kt index 403cc80e22..3f728d9f9a 100644 --- a/app/src/main/java/com/gh/ndownload/NDownloadBridge.kt +++ b/app/src/main/java/com/gh/ndownload/NDownloadBridge.kt @@ -264,7 +264,7 @@ object NDownloadBridge : InnerDownloadListener, IErrorRetryHandler { val file = File(downloadEntity.path) val oaidString = "o|${HaloApp.getInstance().oaid}" try { - if (ChannelReader.containV2Signature(file) && ChannelReader.getChannelByV2(file).isEmpty()) { + if (ChannelReader.containV2Signature(file)) { ChannelWriter.addChannelByV2(file, oaidString, true) } else if (ChannelReader.containV1Signature(file) && ChannelReader.getChannelByV1(file).isEmpty()) { ChannelWriter.addChannelByV1(file, oaidString)