Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release' into dev

Browse Source 
# Conflicts:
#	dependencies.gradle
This commit is contained in:
chenjuntao
2024-04-16 17:01:37 +08:00
parent 5c8a275b3e e5dbdb154f
commit c771bad1ea
7 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java
View File

@ -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(),

2
app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java
View File

@ -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())) {

2
app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java
View File

@ -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());

8
app/src/main/java/com/gh/ndownload/NDownloadBridge.kt
View File

@ -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
)
}
}