From bb77cf4624f2ffc095834421450564dd904deff3 Mon Sep 17 00:00:00 2001 From: kehaoyuan Date: Wed, 15 Jan 2020 14:18:05 +0800 Subject: [PATCH] fix bug --- .../download/GameDownloadFragmentAdapter.java | 12 ++++----- .../fragment/SearchToolbarFragment.java | 17 +++--------- .../gamecenter/home/HomeGameItemViewHolder.kt | 2 +- .../detail/VideoDetailContainerFragment.kt | 11 +++++++- .../question_video_status_gradient.xml | 2 +- app/src/main/res/layout/fragment_login.xml | 2 +- app/src/main/res/layout/game_attach_item.xml | 4 ++- app/src/main/res/layout/home_amway_item.xml | 2 ++ .../res/layout/layout_menu_my_ask_draft.xml | 27 ++++++++++--------- 9 files changed, 42 insertions(+), 37 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java index ee9f1c8167..f87aebcfae 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java @@ -12,6 +12,11 @@ import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.collection.ArrayMap; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.ViewHolder; + import com.gh.common.util.BitmapUtils; import com.gh.common.util.DataUtils; import com.gh.common.util.DialogUtils; @@ -45,11 +50,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import androidx.collection.ArrayMap; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.RecyclerView.ViewHolder; - /** * Created by LGT on 2016/8/15. @@ -551,7 +551,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { } else { downloadingList.remove(location.intValue()); initLocationMap(); - notifyItemRemoved(location + getBase() + 1); + notifyDataSetChanged(); EventBus.getDefault().post(new EBDownloadChanged("download", View.VISIBLE, downloadingList.size())); } diff --git a/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java index 7ad293c272..12a235d352 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java @@ -27,14 +27,11 @@ import com.gh.common.util.DisplayUtils; import com.gh.common.util.EntranceUtils; import com.gh.common.util.MtaHelper; import com.gh.download.DownloadManager; -import com.gh.gamecenter.BuildConfig; import com.gh.gamecenter.DownloadManagerActivity; import com.gh.gamecenter.MessageActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.SearchActivity; -import com.gh.gamecenter.WebActivity; import com.gh.gamecenter.entity.GameUpdateEntity; -import com.gh.gamecenter.entity.SettingsEntity; import com.gh.gamecenter.eventbus.EBDownloadStatus; import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.message.MessageUnreadViewModel; @@ -257,16 +254,10 @@ public class SearchToolbarFragment extends BaseFragment implements View.OnClickL MtaHelper.onEvent("首页_点击", "顶栏", "消息中心"); DataCollectionUtils.uploadClick(getActivity(), "消息图标", "主页"); - if (BuildConfig.DEBUG) { - SettingsEntity.Advertisement videoAdvertisement = Config.getSettings().getVideoAdvertisement(); - Intent webIntentByShare = WebActivity.getWebIntentByShare(getContext(), videoAdvertisement.getLink(), true); - startActivity(webIntentByShare); - } else { - CheckLoginUtils.checkLogin(requireContext(), "(工具栏)", () -> { - Intent i = MessageActivity.getIntent(requireContext(), "(工具栏)"); - startActivityForResult(i, REQUEST_MESSAGE); - }); - } + CheckLoginUtils.checkLogin(requireContext(), "(工具栏)", () -> { + Intent i = MessageActivity.getIntent(requireContext(), "(工具栏)"); + startActivityForResult(i, REQUEST_MESSAGE); + }); break; } } diff --git a/app/src/main/java/com/gh/gamecenter/home/HomeGameItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/home/HomeGameItemViewHolder.kt index e02be3c142..af037fa634 100644 --- a/app/src/main/java/com/gh/gamecenter/home/HomeGameItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/home/HomeGameItemViewHolder.kt @@ -20,7 +20,7 @@ class HomeGameItemViewHolder(val binding: HomeGameItemBinding) : BaseRecyclerVie fun bindGame(game: GameEntity) { binding.data = game - val firstTag = if (game.tagStyle.isNotEmpty()) " " + game.tagStyle[0].name + " " else "" + val firstTag = if (game.tagStyle.isNotEmpty()) " " + game.tagStyle[0].name + " " else "" val gameBrief = SpannableStringBuilder(firstTag + " " + game.brief) if (firstTag.isNotEmpty()) { val tagSpan = RoundStrokeBackgroundColorSpan( diff --git a/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerFragment.kt b/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerFragment.kt index 77fa2f8247..1e1fd4dc89 100644 --- a/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerFragment.kt @@ -26,6 +26,7 @@ import com.gh.download.DownloadManager import com.gh.download.cache.CacheManager import com.gh.download.cache.CacheObserver import com.gh.gamecenter.R +import com.gh.gamecenter.WebActivity import com.gh.gamecenter.entity.LinkEntity import com.gh.gamecenter.entity.VideoEntity import com.gh.gamecenter.eventbus.EBDownloadStatus @@ -392,7 +393,15 @@ class VideoDetailContainerFragment : BaseLazyFragment(), OnBackPressedListener { marquee_ad.setOnClickListener { DirectUtils.directToLinkPage(requireContext(), LinkEntity(link = link, type = linkType, community = linkCommunity), "", "视频详情") } - icon_ad.setOnClickListener { marquee_ad.performClick() } + icon_ad.setOnClickListener { + if (linkType == "web") { + // 当前入口打开Web页面要显示分享按钮 + val webIntentByShare = WebActivity.getWebIntentByShare(context, link, true) + startActivity(webIntentByShare) + } else { + marquee_ad.performClick() + } + } if (duration > 0) { mAdCountDownTimer = startTimer(duration.toLong()) } diff --git a/app/src/main/res/drawable/question_video_status_gradient.xml b/app/src/main/res/drawable/question_video_status_gradient.xml index 2c2910d3a2..f4ae846301 100644 --- a/app/src/main/res/drawable/question_video_status_gradient.xml +++ b/app/src/main/res/drawable/question_video_status_gradient.xml @@ -3,7 +3,7 @@ diff --git a/app/src/main/res/layout/game_attach_item.xml b/app/src/main/res/layout/game_attach_item.xml index 695957b39c..86f110e1b6 100644 --- a/app/src/main/res/layout/game_attach_item.xml +++ b/app/src/main/res/layout/game_attach_item.xml @@ -69,16 +69,18 @@ diff --git a/app/src/main/res/layout/home_amway_item.xml b/app/src/main/res/layout/home_amway_item.xml index 813a26e9e1..661691a12b 100644 --- a/app/src/main/res/layout/home_amway_item.xml +++ b/app/src/main/res/layout/home_amway_item.xml @@ -78,6 +78,7 @@ android:text="@{data.game.star + ``}" android:textColor="@color/theme" android:textSize="12sp" + android:textStyle="bold" app:layout_constraintBottom_toBottomOf="@id/amway_score_icon" app:layout_constraintLeft_toRightOf="@id/amway_score_icon" app:layout_constraintTop_toTopOf="@id/amway_score_icon" @@ -171,6 +172,7 @@ app:layout_constraintLeft_toRightOf="@id/user_icon_container" app:layout_constraintTop_toTopOf="@id/user_icon_container" tools:text="我是大哥大" /> + - + + android:text="草稿" + android:textColor="@color/text_1383EB" + android:textSize="12sp" /> - +