From fdfad0edf1dace20c228cc7436a73f7ebe910501 Mon Sep 17 00:00:00 2001 From: jack <1484288157@qq.com> Date: Tue, 19 Oct 2021 10:22:06 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV5?= =?UTF-8?q?.4.0=E3=80=91=E5=89=8D=E7=AB=AF=E4=BC=98=E5=8C=96=E6=B1=87?= =?UTF-8?q?=E6=80=BB=E7=AC=AC=E4=BA=8C=E5=91=A8(1,3)=20https://git.ghzs.co?= =?UTF-8?q?m/pm/halo-app-issues/-/issues/1574?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/common/util/DialogUtils.java | 3 +- .../gamedetail/desc/DescFragment.kt | 4 +- .../gamedetail/desc/GameLibaoAdapter.kt | 8 +- .../gh/gamecenter/libao/Libao2Fragment.java | 2 +- .../libao/Libao2FragmentAdapter.java | 8 ++ .../gh/gamecenter/libao/LibaoNewAdapter.kt | 81 +++++++++++-------- .../gh/gamecenter/libao/LibaoNewFragment.java | 2 +- .../gh/gamecenter/libao/LibaoSearchAdapter.kt | 5 ++ 8 files changed, 70 insertions(+), 43 deletions(-) diff --git a/app/src/main/java/com/gh/common/util/DialogUtils.java b/app/src/main/java/com/gh/common/util/DialogUtils.java index 3016bf1a2f..cd126073e0 100644 --- a/app/src/main/java/com/gh/common/util/DialogUtils.java +++ b/app/src/main/java/com/gh/common/util/DialogUtils.java @@ -1456,7 +1456,8 @@ public class DialogUtils { View item = LayoutInflater.from(context).inflate(R.layout.imprint_content_item, null); ImprintContentItemBinding bind = DataBindingUtil.bind(item); bind.setApk(apk); - bind.setPlatformName(apk.getPlatformName()); + String platform = TextUtils.isEmpty(apk.getRemark()) ? apk.getPlatformName() : apk.getPlatformName() + "\n" + apk.getRemark(); + bind.setPlatformName(platform); content.addView(item, LinearLayout.LayoutParams.MATCH_PARENT, DisplayUtils.dip2px(40)); } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescFragment.kt index 9797143edd..b0b6a38668 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescFragment.kt @@ -212,14 +212,14 @@ class DescFragment : BaseFragment(), IScrollable { MtaHelper.onEvent("游戏详情_新", "游戏礼包", "${mViewModel.game?.name}+${liBao.name}") startActivityForResult(intent, 100) } - /*R.id.receiveTv -> { + R.id.receiveTv -> { val liBao = data as LibaoEntity if (liBao.status == "ling") { MtaHelper.onEvent("游戏详情_新", "游戏礼包[领取]", "${mViewModel.game?.name}+${liBao.name}") } val intent = LibaoDetailActivity.getIntent(context, liBao, true, "游戏详情") startActivityForResult(intent, 100) - }*/ + } } } 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 eba5ffc191..2c0b482799 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 @@ -125,12 +125,14 @@ class GameLibaoAdapter(val context: Context, val libaos: ArrayList, LibaoUtils.initLibaoBtn(context, holder.binding.receiveTv, libaoEntity, false, null, true, "游戏详情"){ notifyItemChanged(position) } + if (!libaoEntity.packageName.isNullOrEmpty()) { + holder.binding.receiveTv.setOnClickListener { + listListener?.onListClick(it, position, libaoEntity) + } + } holder.itemView.setOnClickListener { listListener?.onListClick(it, position, libaoEntity) } -// holder.binding.receiveTv.setOnClickListener { -// listListener?.onListClick(it, position, libaoEntity) -// } } is MoreViewHolder -> { holder.binding.arrowIv.rotation = if (mIsExpand) 180f else 0f diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java b/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java index e18179d75b..35245e40ab 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java @@ -220,7 +220,7 @@ public class Libao2Fragment extends BaseFragment implements SwipeRefreshLayout.O default: LibaoEntity libaoEntity = (LibaoEntity) data; adapter.setSkipPosition(position); - intent = LibaoDetailActivity.getIntent(getContext(), libaoEntity, false, mEntrance + "+(礼包中心:关注)"); + intent = LibaoDetailActivity.getIntent(getContext(), libaoEntity, view.getId() == R.id.libao_btn_status, mEntrance + "+(礼包中心:关注)"); startActivityForResult(intent, LIBAO_CONCERN_REQUEST); break; } diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java index db0ac554a4..bd7d72c510 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java @@ -232,6 +232,14 @@ class Libao2FragmentAdapter extends BaseRecyclerAdapter { notifyItemChanged(position); } }); + if (libaoEntity.getPackageName() != null && !libaoEntity.getPackageName().isEmpty()) { + holder.libaoBtnStatus.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + mListListener.onListClick(holder.libaoBtnStatus, position, libaoEntity); + } + }); + } // LibaoUtils.setLiBaoBtnStatusRound(holder.libaoBtnStatus, libaoEntity, true, mContext); } } diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt index 18b8de5730..f3d9622744 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt @@ -26,9 +26,11 @@ import java.util.* /** * Created by khy on 5/09/17. */ -class LibaoNewAdapter(context: Context, callBackListener: OnRequestCallBackListener, - listListener: OnListClickListener, - entrance: String?) : BaseRecyclerAdapter(context) { +class LibaoNewAdapter( + context: Context, callBackListener: OnRequestCallBackListener, + listListener: OnListClickListener, + entrance: String? +) : BaseRecyclerAdapter(context) { private val mCallBackListener: OnRequestCallBackListener = callBackListener private val mListListener: OnListClickListener = listListener @@ -56,39 +58,39 @@ class LibaoNewAdapter(context: Context, callBackListener: OnRequestCallBackListe // 去掉重复数据 LibaoUtils.removeDuplicateData(mLibaoList, list) } - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(object : Response>() { - override fun onResponse(response: List?) { - mLibaoList.addAll(response!!) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(object : Response>() { + override fun onResponse(response: List?) { + mLibaoList.addAll(response!!) // notifyDataSetChanged() - if (response.size < 10) { - isOver = true - mCallBackListener.loadDone("TAG") - } - - if (mLibaoList.size == 0) { - mCallBackListener.loadEmpty() - } else { - mCallBackListener.loadDone() - } - - if (response.isNotEmpty()) { - getLibaoStatus(response) - } - - mPage++ - isLoading = false - isNetworkError = false + if (response.size < 10) { + isOver = true + mCallBackListener.loadDone("TAG") } - override fun onFailure(e: HttpException?) { - mCallBackListener.loadError() - isNetworkError = true - isLoading = false + if (mLibaoList.size == 0) { + mCallBackListener.loadEmpty() + } else { + mCallBackListener.loadDone() } - }) + + if (response.isNotEmpty()) { + getLibaoStatus(response) + } + + mPage++ + isLoading = false + isNetworkError = false + } + + override fun onFailure(e: HttpException?) { + mCallBackListener.loadError() + isNetworkError = true + isLoading = false + } + }) } /** @@ -187,8 +189,10 @@ class LibaoNewAdapter(context: Context, callBackListener: OnRequestCallBackListe if (TextUtils.isEmpty(libaoEntity.platform)) { holder.libaoGameName.text = libaoEntity.game?.name } else { - holder.libaoGameName.text = StringUtils.buildString(libaoEntity.game?.name, " - ", PlatformUtils.getInstance(mContext) - .getPlatformName(libaoEntity.platform)) + holder.libaoGameName.text = StringUtils.buildString( + libaoEntity.game?.name, " - ", PlatformUtils.getInstance(mContext) + .getPlatformName(libaoEntity.platform) + ) } holder.libaoGameIcon.displayGameIcon(libaoEntity.getIcon(), libaoEntity.getIconSubscript()) @@ -201,11 +205,18 @@ class LibaoNewAdapter(context: Context, callBackListener: OnRequestCallBackListe holder.libaoDes.text = content if (libaoEntity.status != null) { - LibaoUtils.initLibaoBtn(mContext, holder.libaoBtnStatus, libaoEntity, false, null, true, - mEntrance + "+(礼包中心:最新)"){ + LibaoUtils.initLibaoBtn( + mContext, holder.libaoBtnStatus, libaoEntity, false, null, true, + mEntrance + "+(礼包中心:最新)" + ) { notifyItemChanged(position) } // LibaoUtils.setLiBaoBtnStatusRound(holder.libaoBtnStatus, libaoEntity, true, mContext) + if (!libaoEntity.packageName.isNullOrEmpty()) { + holder.libaoBtnStatus.setOnClickListener { + mListListener.onListClick(holder.libaoBtnStatus, position, libaoEntity) + } + } } } diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewFragment.java b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewFragment.java index 07738f8474..9001473575 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewFragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewFragment.java @@ -283,7 +283,7 @@ public class LibaoNewFragment extends BaseFragment implements SwipeRefreshLayout super.onListClick(view, position, data); LibaoEntity libaoEntity = (LibaoEntity) data; mAdapter.setSkipPosition(position); - Intent intent = LibaoDetailActivity.getIntent(getContext(), libaoEntity, false, mEntrance + "+(礼包中心:最新)"); + Intent intent = LibaoDetailActivity.getIntent(getContext(), libaoEntity, view.getId() == R.id.libao_btn_status, mEntrance + "+(礼包中心:最新)"); startActivityForResult(intent, LIBAO_NEW_REQUEST); } } 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 22b3a013fe..943cf74f93 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt @@ -219,6 +219,11 @@ class LibaoSearchAdapter(fragment: LibaoSearchFragment, mEntrance + "+(礼包中心:最新)"){ notifyItemChanged(position) } + if (!libaoEntity.packageName.isNullOrEmpty()) { + holder.libaoBtnStatus.setOnClickListener { + mListListener.onListClick(holder.libaoBtnStatus, position, libaoEntity) + } + } } holder.libaoBtnStatus.isClickable = false }