diff --git a/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java b/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java index 2b8a8e5c4b..0545abc424 100644 --- a/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java +++ b/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java @@ -85,14 +85,13 @@ public class DetailDownloadUtils { if (viewHolder.isNewsDetail) { viewHolder.mDownloadPb.setText(status); }else if (viewHolder.gameEntity.getVersionNumber().contains("无版号")) { - viewHolder.gameEntity.getApk(); - if (!viewHolder.gameEntity.getApk().isEmpty()) { - viewHolder.mDownloadPb.setText(String.format(status + "(%s)", viewHolder.gameEntity.getApk().get(0).getSize())); - } + viewHolder.mDownloadPb.setText(String.format(status + "(%s)", viewHolder.gameEntity.getApk().get(0).getSize())); } else if (TextUtils.isEmpty(viewHolder.downloadAddWord)) { - viewHolder.mDownloadPb.setText(String.format(status + "《%s》", viewHolder.gameEntity.getName())); +// viewHolder.mDownloadPb.setText(String.format(status + "《%s》", viewHolder.gameEntity.getName())); + viewHolder.mDownloadPb.setText(String.format(status + "(%s)", viewHolder.gameEntity.getApk().get(0).getSize())); } else { - viewHolder.mDownloadPb.setText(String.format(status + "《%s》%s", viewHolder.gameEntity.getName(), viewHolder.downloadAddWord)); +// viewHolder.mDownloadPb.setText(String.format(status + "《%s》%s", viewHolder.gameEntity.getName(), viewHolder.downloadAddWord)); + viewHolder.mDownloadPb.setText(String.format(status + "(%s)%s", viewHolder.gameEntity.getApk().get(0).getSize(), viewHolder.downloadAddWord)); } } if (isCheck && viewHolder.gameEntity.getApk().size() == 1) { diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt index 3d6803daf6..1f0a2db6f4 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt @@ -55,7 +55,6 @@ import com.shuyu.gsyvideoplayer.GSYVideoManager import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder import com.shuyu.gsyvideoplayer.listener.GSYSampleCallBack import com.shuyu.gsyvideoplayer.utils.OrientationUtils -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.piece_game_detail_video.* import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe @@ -478,15 +477,17 @@ class GameDetailFragment : NormalFragment() { val fragmentsList = ArrayList() val tabTitleList = ArrayList() + val descFragment = DescFragment() + descFragment.arguments = bundle + fragmentsList.add(descFragment) + tabTitleList.add(getString(R.string.game_detail_desc)) + val fuliFragment = FuLiFragment() fuliFragment.arguments = bundle fragmentsList.add(fuliFragment) tabTitleList.add(getString(R.string.game_detail_dongtai)) - val descFragment = DescFragment() - descFragment.arguments = bundle - fragmentsList.add(descFragment) - tabTitleList.add(getString(R.string.game_detail_desc)) + if (data.game.showComment) { val ratingFragment = RatingFragment() @@ -600,6 +601,9 @@ class GameDetailFragment : NormalFragment() { popupWindow.dismiss() MtaHelper.onEvent("游戏详情_新", "问题反馈按钮", mViewModel.game?.name ?: "") } + layout.findViewById(R.id.copyright_container).setOnClickListener { + popupWindow.dismiss() + } } private fun initGameDetailTop() { @@ -930,8 +934,8 @@ class GameDetailFragment : NormalFragment() { } companion object { - const val INDEX_TRENDES = 0 - const val INDEX_DESC = 1 + const val INDEX_DESC = 0 + const val INDEX_TRENDES = 1 const val INDEX_RATING = 2 const val SKIP_DESC = "skipDesc" const val SKIP_FULI = "skipFuli" diff --git a/app/src/main/res/layout/layout_gamedetail_more.xml b/app/src/main/res/layout/layout_gamedetail_more.xml index 5928ce0fbc..62ae84ed66 100644 --- a/app/src/main/res/layout/layout_gamedetail_more.xml +++ b/app/src/main/res/layout/layout_gamedetail_more.xml @@ -15,7 +15,7 @@ @@ -74,6 +74,36 @@ android:textSize="14sp" /> + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index dc3c583e83..f76b5bf1ef 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -103,8 +103,8 @@ 完成 继续发送 关注 - 动态 - 介绍 + 专区 + 详情 评论 请输入搜索关键字 搜索