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/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<ViewHolder> {
             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<ViewHolder> {
         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/app/src/main/java/com/gh/ndownload/NDownloadBridge.kt b/app/src/main/java/com/gh/ndownload/NDownloadBridge.kt
index 540922e923..3f728d9f9a 100644
--- a/app/src/main/java/com/gh/ndownload/NDownloadBridge.kt
+++ b/app/src/main/java/com/gh/ndownload/NDownloadBridge.kt
@@ -266,11 +266,15 @@ object NDownloadBridge : InnerDownloadListener, IErrorRetryHandler {
                 try {
                     if (ChannelReader.containV2Signature(file)) {
                         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
+                    )
                 }
             }
 
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)) {
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<ViewHolder> {
         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());