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 408f69e8ef..2aee53e460 100644 --- a/app/src/main/java/com/gh/common/util/LibaoUtils.java +++ b/app/src/main/java/com/gh/common/util/LibaoUtils.java @@ -320,12 +320,27 @@ public class LibaoUtils { // 类型为复制的,不需要登录也可以直接复制 if ("copy".equals(libaoEntity.getReceiveMethod())) { - libaoBtn.setText(R.string.libao_copy); - libaoBtn.setTextColor(ExtensionsKt.toColor(R.color.white, context)); - libaoBtn.setBackgroundResource(R.drawable.button_normal_round_style); - libaoBtn.setOnClickListener( v -> { - ExtensionsKt.copyTextAndToast(libaoEntity.getCode(), libaoEntity.getToast()); - }); + if ("finish".equals(libaoEntity.getStatus())) { + libaoBtn.setText(R.string.libao_finish); + libaoBtn.setBackgroundResource(R.drawable.button_border_round_gray); + libaoBtn.setTextColor(context.getResources().getColor(R.color.button_gray)); + libaoBtn.setOnClickListener(v -> ToastUtils.toast("兑换码领取已结束")); + } else { + libaoBtn.setText(R.string.libao_copy); + libaoBtn.setTextColor(ExtensionsKt.toColor(R.color.white, context)); + libaoBtn.setBackgroundResource(R.drawable.button_normal_round_style); + libaoBtn.setOnClickListener(v -> { + LogUtils.uploadReceiveGift( + "game_gift_code_successful", + libaoEntity.getId(), + libaoEntity.getName(), + "游戏详情", + libaoEntity.getGame().getId(), + libaoEntity.getGame().getName() + ); + ExtensionsKt.copyTextAndToast(libaoEntity.getCode(), libaoEntity.getToast()); + }); + } return; } diff --git a/app/src/main/java/com/gh/common/util/LogUtils.java b/app/src/main/java/com/gh/common/util/LogUtils.java index 234a157207..9cc382493a 100644 --- a/app/src/main/java/com/gh/common/util/LogUtils.java +++ b/app/src/main/java/com/gh/common/util/LogUtils.java @@ -1028,7 +1028,7 @@ public class LogUtils { JSONObject object = new JSONObject(); JSONObject payloadObject = new JSONObject(); try { - object.put(KEY_EVENT, event);//game_gift_get_successful领取礼包、game_gift_dig_successful淘号 + object.put(KEY_EVENT, event);//game_gift_get_successful领取礼包、game_gift_dig_successful淘号、game_gift_code_successful复制礼包 payloadObject.put("gift_id", giftId); payloadObject.put("gift_name", giftName); payloadObject.put("location", location); diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailViewModel.kt index f60fd1d385..ec9248de64 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailViewModel.kt @@ -25,6 +25,7 @@ import com.gh.gamecenter.core.utils.SPUtils import com.gh.gamecenter.core.utils.UrlFilterUtils import com.gh.gamecenter.entity.* import com.gh.gamecenter.feature.entity.GameEntity +import com.gh.gamecenter.feature.entity.SimpleGame import com.gh.gamecenter.feature.utils.ApkActiveUtils import com.gh.gamecenter.gamedetail.entity.BigEvent import com.gh.gamecenter.gamedetail.entity.CustomColumn @@ -162,8 +163,12 @@ class GameDetailViewModel( // 初始化礼包按钮状态 for (entity in data.detailEntity) { if (entity.type == "libao") { + val simpleGame = SimpleGame(gameId, mName = game?.name) if (entity.libao != null) { loadLiBaoStatus(data, entity.libao!!) + for (libaoEntity in entity.libao!!) { + libaoEntity.game = simpleGame + } } break } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameLibaoAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameLibaoAdapter.kt index 7c7e24f9ba..322479375c 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameLibaoAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameLibaoAdapter.kt @@ -70,7 +70,7 @@ class GameLibaoAdapter( holder.binding.remainingTv.visibility = View.GONE holder.binding.libaoCodeTv.visibility = View.VISIBLE - val text = "礼包码:${libaoEntity.code}" + val text = "兑换码:${libaoEntity.code}" holder.binding.libaoCodeTv.text = SpanBuilder(text).color( holder.binding.root.context, 4, @@ -79,7 +79,7 @@ class GameLibaoAdapter( ).build() holder.binding.copyLibaoCodeIv.visibility = View.VISIBLE holder.binding.copyLibaoCodeIv.setOnClickListener { - libaoEntity.code?.copyTextAndToast(libaoEntity.toast) + holder.binding.receiveTv.performClick() } } else if (libaoEntity.universal || libaoEntity.status == "check") { //通用码礼包/或者还未添加礼包码时,不显示进度条,显示礼包码