diff --git a/app/src/main/java/com/gh/base/BaseActivity.java b/app/src/main/java/com/gh/base/BaseActivity.java index 4ad9e5c8bb..3f2f989b3d 100644 --- a/app/src/main/java/com/gh/base/BaseActivity.java +++ b/app/src/main/java/com/gh/base/BaseActivity.java @@ -11,6 +11,7 @@ import android.view.Window; import androidx.annotation.NonNull; import androidx.lifecycle.Lifecycle; +import com.gh.common.constant.Constants; import com.gh.common.util.DataUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.PackageUtils; @@ -44,6 +45,7 @@ import static com.gh.common.util.EntranceUtils.KEY_ENTRANCE; public abstract class BaseActivity extends BaseToolBarActivity implements EasyPermissions.PermissionCallbacks { + @NonNull protected String mEntrance; private boolean mIsPause; @@ -102,6 +104,9 @@ public abstract class BaseActivity extends BaseToolBarActivity implements EasyPe EventBus.getDefault().register(this); ButterKnife.bind(this); mEntrance = getIntent().getStringExtra(KEY_ENTRANCE); + if (TextUtils.isEmpty(mEntrance)) { + mEntrance = Constants.ENTRANCE_UNKNOWN; + } Utils.log("ENTRANCE -> " + mEntrance); } diff --git a/app/src/main/java/com/gh/base/fragment/BaseFragment.java b/app/src/main/java/com/gh/base/fragment/BaseFragment.java index 78a022995f..27deda4729 100644 --- a/app/src/main/java/com/gh/base/fragment/BaseFragment.java +++ b/app/src/main/java/com/gh/base/fragment/BaseFragment.java @@ -10,6 +10,7 @@ import android.view.View; import android.view.ViewGroup; import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.StringRes; import androidx.fragment.app.Fragment; @@ -18,6 +19,7 @@ import androidx.lifecycle.Lifecycle; import com.gh.base.OnListClickListener; import com.gh.base.OnRequestCallBackListener; +import com.gh.common.constant.Constants; import com.gh.gamecenter.eventbus.EBMiPush; import com.lightgame.OnTitleClickListener; import com.lightgame.utils.RuntimeUtils; @@ -50,6 +52,7 @@ public abstract class BaseFragment extends Fragment implements OnRequestCallB protected boolean isEverPause; + @NonNull protected String mEntrance; protected final Handler mBaseHandler = new BaseFragment.BaseHandler(this); @@ -119,6 +122,10 @@ public abstract class BaseFragment extends Fragment implements OnRequestCallB mEntrance = getArguments().getString(KEY_ENTRANCE); } + if (TextUtils.isEmpty(mEntrance)) { + mEntrance = Constants.ENTRANCE_UNKNOWN; + } + isEverPause = false; EventBus.getDefault().register(this); diff --git a/app/src/main/java/com/gh/common/constant/Constants.java b/app/src/main/java/com/gh/common/constant/Constants.java index f015b9fc45..9a2f8d73cd 100644 --- a/app/src/main/java/com/gh/common/constant/Constants.java +++ b/app/src/main/java/com/gh/common/constant/Constants.java @@ -48,4 +48,6 @@ public class Constants { public static final int COMMENT_CD = 60 * 1000; public static final String[] REPORT_LIST = new String[]{"垃圾广告营销", "恶意攻击谩骂", "淫秽色情信息", "违法有害信息", "其它"}; + + public static final String ENTRANCE_UNKNOWN = "(unknown)"; } diff --git a/app/src/main/java/com/gh/gamecenter/category/CategoryListTabFragment.kt b/app/src/main/java/com/gh/gamecenter/category/CategoryListTabFragment.kt index b2146514e2..3cdd5418b9 100644 --- a/app/src/main/java/com/gh/gamecenter/category/CategoryListTabFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/category/CategoryListTabFragment.kt @@ -12,6 +12,7 @@ import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView import butterknife.BindView import butterknife.OnClick +import com.gh.common.constant.Constants import com.gh.common.util.EntranceUtils import com.gh.common.util.StringUtils import com.gh.gamecenter.R @@ -92,7 +93,7 @@ class CategoryListTabFragment : NormalFragment(), SubjectTypeAdapter.OnSelectTyp val arguments = arguments mName = arguments?.getString(EntranceUtils.KEY_NAME) - mEntrance = arguments?.getString(EntranceUtils.KEY_ENTRANCE) + mEntrance = arguments?.getString(EntranceUtils.KEY_ENTRANCE) ?: Constants.ENTRANCE_UNKNOWN mTagType = arguments?.getString(EntranceUtils.KEY_TAGTYPE) mPrimeCategory = arguments?.getParcelable(EntranceUtils.KEY_DATA) diff --git a/app/src/main/java/com/gh/gamecenter/category/NewCategoryListFragment.kt b/app/src/main/java/com/gh/gamecenter/category/NewCategoryListFragment.kt index 35d2aa6851..cce47d2c31 100644 --- a/app/src/main/java/com/gh/gamecenter/category/NewCategoryListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/category/NewCategoryListFragment.kt @@ -7,6 +7,7 @@ import androidx.recyclerview.widget.RecyclerView import butterknife.BindView import com.ethanhua.skeleton.Skeleton import com.ethanhua.skeleton.ViewSkeletonScreen +import com.gh.common.constant.Constants import com.gh.common.exposure.ExposureListener import com.gh.common.util.EntranceUtils import com.gh.common.util.observeNonNull @@ -55,7 +56,7 @@ class NewCategoryListFragment : ListFragment diff --git a/app/src/main/java/com/gh/gamecenter/qa/entity/CommunitySelectEntity.kt b/app/src/main/java/com/gh/gamecenter/qa/entity/CommunitySelectEntity.kt index 3cf63a459d..8c66a9a5fc 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/entity/CommunitySelectEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/entity/CommunitySelectEntity.kt @@ -13,6 +13,5 @@ data class CommunitySelectEntity( var status: String? = "", var vote: Int = 0, var game: CommunitiesGameEntity = CommunitiesGameEntity(), - var me: MeEntity = MeEntity(), - var categoryName: String = "" // open fragment + var me: MeEntity = MeEntity() ) \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/qa/entity/CommunitySelectOpenEntity.kt b/app/src/main/java/com/gh/gamecenter/qa/entity/CommunitySelectOpenEntity.kt index 4f6814a7a5..edd7ea1d9d 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/entity/CommunitySelectOpenEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/entity/CommunitySelectOpenEntity.kt @@ -3,7 +3,7 @@ import com.google.gson.annotations.SerializedName data class CommunitySelectOpenEntity( - @SerializedName("cate_name") + @SerializedName("name") val categoryName: String = "", val list: List ) \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/CommunitiesSelectWrapperFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/select/CommunitiesSelectWrapperFragment.kt index 221d88d93a..0c7fac3f41 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/select/CommunitiesSelectWrapperFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/select/CommunitiesSelectWrapperFragment.kt @@ -7,7 +7,7 @@ import com.gh.gamecenter.R class CommunitiesSelectWrapperFragment : BaseFragment_TabLayout() { - override fun initFragmentList(fragments: MutableList) { + override fun initFragmentList(fragments: MutableList) { fragments.add(OpenedFragment()) val element = VotingFragment() element.arguments = arguments @@ -21,6 +21,6 @@ class CommunitiesSelectWrapperFragment : BaseFragment_TabLayout() { override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) - setNavigationTitle(getString(R.string.title_select_game)) + setNavigationTitle(getString(R.string.title_community_select)) } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/CommunitySelectOpenItem.kt b/app/src/main/java/com/gh/gamecenter/qa/select/CommunitySelectOpenItem.kt index 658bc473b8..88d7475e5b 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/select/CommunitySelectOpenItem.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/select/CommunitySelectOpenItem.kt @@ -4,6 +4,6 @@ import com.gh.gamecenter.qa.entity.CommunitySelectEntity import com.google.gson.annotations.SerializedName data class CommunitySelectOpenItem(@SerializedName("cate_name") - val categoryName: String? = null, + val categoryName: String = "", var leftData: CommunitySelectEntity? = null, var rightData: CommunitySelectEntity? = null) \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/OpenedAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/select/OpenedAdapter.kt index bcb4868118..d6b7e4a1e9 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/select/OpenedAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/select/OpenedAdapter.kt @@ -9,7 +9,6 @@ import android.view.View import android.view.ViewGroup import android.widget.LinearLayout import com.gh.common.constant.ItemViewType -import com.gh.gamecenter.MainActivity import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.baselist.ListAdapter @@ -29,10 +28,6 @@ class OpenedAdapter(context: Context, val mListViewModel: OpenedViewModel) : Lis else UserManager.getInstance().community.id override fun areItemsTheSame(oldItem: CommunitySelectOpenItem?, newItem: CommunitySelectOpenItem?): Boolean { - if (!oldItem?.categoryName.isNullOrEmpty() && !newItem?.categoryName.isNullOrEmpty()) { - return oldItem?.categoryName == newItem?.categoryName - } - if (oldItem?.rightData != null && newItem?.rightData != null) { return oldItem.rightData == newItem.rightData } @@ -61,97 +56,111 @@ class OpenedAdapter(context: Context, val mListViewModel: OpenedViewModel) : Lis } override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { - if (holder is OpenedViewHolder) { - val entity = mEntityList[position] - val isSelectLeft = mCommunityId == entity.leftData?.id - val isSelectRight = mCommunityId == entity.rightData?.id + when (holder) { + is OpenedViewHolder -> bindBodyItem(holder) + is FooterViewHolder -> bindFooterItem(holder) + is OpenedHeadViewHolder -> holder.bind.categoryName = mEntityList[position].categoryName + } + } - holder.bind.data = entity - holder.bind.isSelectLeft = isSelectLeft - holder.bind.isSelectRight = isSelectRight + override fun getItemViewType(position: Int): Int { + if (itemCount - 1 == position) { + return ItemViewType.ITEM_FOOTER + } + val itemData = mEntityList[position] + if (itemData.leftData != null) { + return ItemViewType.ITEM_BODY + } + return ItemViewType.ITEM_HEADER + } - if (isSelectLeft) { - holder.bind.leftContainer.setBackgroundColor(ContextCompat.getColor(mContext,R.color.text_f5f5f5)) - } else { - holder.bind.leftContainer.setBackgroundColor(Color.WHITE) - } - if (isSelectRight) { - holder.bind.rightContainer.setBackgroundColor(ContextCompat.getColor(mContext,R.color.text_f5f5f5)) - } else { - holder.bind.rightContainer.setBackgroundColor(Color.WHITE) - } + override fun getItemCount(): Int { + return if (mEntityList == null || mEntityList.isEmpty()) 0 else mEntityList.size + 1 + } - holder.bind.leftContainer.setOnClickListener { - if (mContext is CommunitiesSelectActivity && UserManager.getInstance().community.id.isNotEmpty()) { - UserManager.getInstance().setCommunityData(CommunityEntity(entity.leftData?.id!!, entity.leftData?.name!!)) - (mContext as Activity).setResult(Activity.RESULT_OK) - (mContext as Activity).finish() - } else { - UserManager.getInstance().setCommunityData(CommunityEntity(entity.leftData?.id!!, entity.leftData?.name!!)) - EventBus.getDefault().post(EBReuse(AskFragment.EB_SELECT_KEY)) - } - } - - holder.bind.rightContainer.setOnClickListener { - if (mContext is CommunitiesSelectActivity && UserManager.getInstance().community.id.isNotEmpty()) { - UserManager.getInstance().setCommunityData(CommunityEntity(entity.rightData?.id!!, entity.rightData?.name!!)) - (mContext as Activity).setResult(Activity.RESULT_OK) - (mContext as Activity).finish() - } else { - UserManager.getInstance().setCommunityData(CommunityEntity(entity.rightData?.id!!, entity.rightData?.name!!)) - EventBus.getDefault().post(EBReuse(AskFragment.EB_SELECT_KEY)) - } - } - } else if (holder is FooterViewHolder) { - holder.itemView.setBackgroundColor(ContextCompat.getColor(mContext, R.color.background)) - val item = holder.itemView as LinearLayout - holder.lineLeft.visibility = View.GONE - holder.lineRight.visibility = View.GONE - if (mIsNetworkError) { + private fun bindFooterItem(holder: FooterViewHolder) { + holder.itemView.setBackgroundColor(ContextCompat.getColor(mContext, R.color.background)) + val item = holder.itemView as LinearLayout + holder.lineLeft.visibility = View.GONE + holder.lineRight.visibility = View.GONE + when { + mIsNetworkError -> { holder.loading.visibility = View.GONE holder.hint.setText(R.string.loading_failed_retry) holder.hint.setCompoundDrawables(null, null, null, null) holder.hint.setPadding(0, 0, 0, 0) item.gravity = Gravity.CENTER - } else if (mIsLoading) { + } + mIsLoading -> { holder.loading.visibility = View.VISIBLE holder.hint.setText(R.string.loading) holder.hint.setCompoundDrawables(null, null, null, null) holder.hint.setPadding(0, 0, 0, 0) item.gravity = Gravity.CENTER - } else { + } + else -> { holder.loading.visibility = View.GONE holder.hint.setText(R.string.loading_more_hint) holder.hint.setCompoundDrawables(null, null, null, null) holder.hint.setPadding(0, 0, 0, 0) item.gravity = Gravity.CENTER } - if (!mIsOver) { - holder.itemView.layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT) + } + if (!mIsOver) { + holder.itemView.layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT) + } else { + holder.itemView.layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 0) + } + + holder.itemView.setOnClickListener { + mListViewModel.load(LoadType.RETRY) + } + } + + private fun bindBodyItem(holder: OpenedViewHolder) { + val entity = mEntityList[holder.adapterPosition] + val isSelectLeft = mCommunityId == entity.leftData?.id + val isSelectRight = mCommunityId == entity.rightData?.id + + holder.bind.data = entity + holder.bind.isSelectLeft = isSelectLeft + holder.bind.isSelectRight = isSelectRight + + if (isSelectLeft) { + holder.bind.leftContainer.setBackgroundColor(ContextCompat.getColor(mContext, R.color.text_f5f5f5)) + } else { + holder.bind.leftContainer.setBackgroundColor(Color.WHITE) + } + if (isSelectRight) { + holder.bind.rightContainer.setBackgroundColor(ContextCompat.getColor(mContext, R.color.text_f5f5f5)) + } else { + holder.bind.rightContainer.setBackgroundColor(Color.WHITE) + } + + holder.bind.leftContainer.setOnClickListener { + if (mContext is CommunitiesSelectActivity && UserManager.getInstance().community.id.isNotEmpty()) { + UserManager.getInstance().setCommunityData(CommunityEntity(entity.leftData?.id!!, entity.leftData?.name!!)) + (mContext as Activity).setResult(Activity.RESULT_OK) + (mContext as Activity).finish() } else { - holder.itemView.layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 0) + UserManager.getInstance().setCommunityData(CommunityEntity(entity.leftData?.id!!, entity.leftData?.name!!)) + EventBus.getDefault().post(EBReuse(AskFragment.EB_SELECT_KEY)) } + } - holder.itemView.setOnClickListener { - mListViewModel.load(LoadType.RETRY) + holder.bind.rightContainer.setOnClickListener { + if (mContext is CommunitiesSelectActivity && UserManager.getInstance().community.id.isNotEmpty()) { + UserManager.getInstance().setCommunityData(CommunityEntity(entity.rightData?.id!!, entity.rightData?.name!!)) + (mContext as Activity).setResult(Activity.RESULT_OK) + (mContext as Activity).finish() + } else { + UserManager.getInstance().setCommunityData(CommunityEntity(entity.rightData?.id!!, entity.rightData?.name!!)) + EventBus.getDefault().post(EBReuse(AskFragment.EB_SELECT_KEY)) } } } - override fun getItemViewType(position: Int): Int { - val itemData = mEntityList[position] - if (!itemData.categoryName.isNullOrEmpty()) { - return ItemViewType.ITEM_HEADER - } - - if (itemData.leftData != null) { - return ItemViewType.ITEM_BODY - } - - return ItemViewType.ITEM_FOOTER - } - - override fun getItemCount(): Int { - return if (mEntityList == null || mEntityList.isEmpty()) 0 else mEntityList.size + 1 + fun getListData(): List { + return mEntityList } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/OpenedFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/select/OpenedFragment.kt index ac9ea05085..128fd08d46 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/select/OpenedFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/select/OpenedFragment.kt @@ -1,30 +1,32 @@ package com.gh.gamecenter.qa.select -import android.graphics.Color import android.os.Bundle import android.view.View -import androidx.core.content.ContextCompat -import androidx.recyclerview.widget.GridLayoutManager +import android.widget.RelativeLayout +import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.gh.common.view.GridDivider +import butterknife.BindView +import com.gh.common.view.VerticalItemDecoration import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListFragment -import com.gh.gamecenter.baselist.LoadType -import com.gh.gamecenter.qa.entity.CommunitySelectEntity +import com.lightgame.utils.Utils +import kotterknife.bindView class OpenedFragment : ListFragment() { + @BindView(R.id.name) + lateinit var mCategoryName: TextView + + private lateinit var mLayoutParam: RelativeLayout.LayoutParams + private var mAdapter: OpenedAdapter? = null - private var mGridLayoutManager: GridLayoutManager? = null - - override fun getLayoutId(): Int { return R.layout.fragment_ask_selectgame } override fun getItemDecoration(): RecyclerView.ItemDecoration { - return GridDivider(context, 2, 2, ContextCompat.getColor(context!!, R.color.cutting_line), true) + return VerticalItemDecoration(context, true) } override fun provideListAdapter(): OpenedAdapter { @@ -34,26 +36,32 @@ class OpenedFragment : ListFragment() return mAdapter!! } - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - mListViewModel?.setOverLimitSize(16) - } - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - mGridLayoutManager = GridLayoutManager(context, 2) - mGridLayoutManager?.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() { - override fun getSpanSize(position: Int): Int { - return if (position == mAdapter?.itemCount!! - 1) 2 else 1 - } - } - mListRv.layoutManager = mGridLayoutManager - mListRv.setBackgroundColor(Color.WHITE) + mLayoutParam = mCategoryName.layoutParams as RelativeLayout.LayoutParams mListRv.addOnScrollListener(object : RecyclerView.OnScrollListener() { - override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) { - if (mGridLayoutManager!!.findLastVisibleItemPosition() == provideListAdapter().itemCount - 1 - && RecyclerView.SCROLL_STATE_IDLE == newState) - mListViewModel.load(LoadType.NORMAL) + override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) { + super.onScrolled(recyclerView, dx, dy) + val position = mLayoutManager.findFirstVisibleItemPosition() + if (position == RecyclerView.NO_POSITION) return + mAdapter?.run { + // set data + mCategoryName.text = getListData()[position].categoryName + + // move + val item = getListData()[position + 1] + if (item.rightData == null && item.leftData == null) { + val bottom = mLayoutManager.findViewByPosition(position)?.bottom ?: return + if (bottom <= mCategoryName.height) { + mLayoutParam.topMargin = bottom - mCategoryName.height + } else { + mLayoutParam.topMargin = 0 + } + } else { + mLayoutParam.topMargin = 0 + } + mCategoryName.layoutParams = mLayoutParam + } } }) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/OpenedViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/select/OpenedViewModel.kt index 3ddd1f1e67..d49f786aa0 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/select/OpenedViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/select/OpenedViewModel.kt @@ -8,6 +8,7 @@ import com.gh.gamecenter.qa.entity.CommunitySelectEntity import com.gh.gamecenter.qa.entity.CommunitySelectOpenEntity import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp +import com.lightgame.utils.Utils import io.reactivex.Observable class OpenedViewModel(application: Application) : ListViewModel(application) { @@ -36,7 +37,7 @@ class OpenedViewModel(application: Application) : ListViewModel, - originalList: MutableList) { + originalList: MutableList, + categoryName: String) { for (entity in originalList) { val openEntity = itemList[itemList.count() - 1] - if (openEntity.categoryName.isNullOrEmpty()) { - if (openEntity.leftData != null) { - openEntity.leftData = entity - continue - } - if (openEntity.rightData != null) { + if (openEntity.leftData != null && openEntity.rightData == null) { + if (openEntity.rightData == null) { openEntity.rightData = entity continue } - itemList.add(CommunitySelectOpenItem(leftData = entity)) + itemList.add(CommunitySelectOpenItem(categoryName = categoryName, leftData = entity)) + } else { + itemList.add(CommunitySelectOpenItem(categoryName = categoryName, leftData = entity)) } } } @@ -85,6 +85,6 @@ class OpenedViewModel(application: Application) : ListViewModel> { return RetrofitManager.getInstance(getApplication()).api.getCommunitySelectOpened(HaloApp.getInstance().channel, - UrlFilterUtils.getFilterQuery("status", "opened"), page, 100) + UrlFilterUtils.getFilterQuery("category", "all"), page, 100) } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/VotingFragment.java b/app/src/main/java/com/gh/gamecenter/qa/select/VotingFragment.java index f7cc5b8e78..e4801a75e4 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/select/VotingFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/select/VotingFragment.java @@ -2,10 +2,12 @@ package com.gh.gamecenter.qa.select; import android.app.Dialog; import android.os.Bundle; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; + import android.view.View; import android.view.Window; import android.widget.ProgressBar; @@ -14,6 +16,7 @@ import android.widget.TextView; import com.gh.base.fragment.WaitingDialogFragment; import com.gh.common.util.CheckLoginUtils; import com.gh.common.view.VerticalItemDecoration; +import com.gh.gamecenter.GameDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.baselist.ListFragment; import com.gh.gamecenter.baselist.LoadType; @@ -54,12 +57,6 @@ public class VotingFragment extends ListFragment \ No newline at end of file diff --git a/app/src/main/res/layout/community_select_opened_item.xml b/app/src/main/res/layout/community_select_opened_item.xml index 2d3960678a..d78aa07a37 100644 --- a/app/src/main/res/layout/community_select_opened_item.xml +++ b/app/src/main/res/layout/community_select_opened_item.xml @@ -5,6 +5,8 @@ + + @@ -73,7 +75,7 @@ @@ -83,7 +85,8 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" - android:background="@android:color/white"> + android:background="@android:color/white" + android:visibility="@{data.rightData != null?View.VISIBLE:View.INVISIBLE}"> + android:layout_height = "wrap_content"> + + - + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cf59053ab1..598a9b21da 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -226,6 +226,7 @@ 发送游戏 开服表 选择游戏 + 选择问答专区 评论详情 原创 资讯