From 825ea594f4cedeb8ea6da8dd47dafa33979da752 Mon Sep 17 00:00:00 2001 From: chenjuntao Date: Mon, 20 Aug 2018 11:37:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A4=BE=E5=8C=BA=E7=9A=84?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E6=98=BE=E7=A4=BA=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qa/answer/edit/AnswerEditFragment.java | 10 ++++-- .../detail/QuestionsDetailAdapter.java | 31 +++++++++++++++---- .../CommunitiesSelectWrapperFragment.kt | 7 +++++ .../gh/gamecenter/qa/select/OpenedAdapter.kt | 8 ++--- .../gamecenter/qa/select/VotingFragment.java | 10 +++--- 5 files changed, 47 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditFragment.java b/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditFragment.java index f6e45291aa..f0fe34e148 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditFragment.java @@ -192,9 +192,13 @@ public class AnswerEditFragment extends NormalFragment { if (isReady) { mEditContent.scrollTo(0, 10000000); - InputMethodManager imm = (InputMethodManager) - getContext().getSystemService(Context.INPUT_METHOD_SERVICE); - imm.showSoftInput(mEditContent, InputMethodManager.SHOW_IMPLICIT); + try { + InputMethodManager imm = (InputMethodManager) + getContext().getSystemService(Context.INPUT_METHOD_SERVICE); + imm.showSoftInput(mEditContent, InputMethodManager.SHOW_IMPLICIT); + } catch (Exception e) { + e.printStackTrace(); + } mEditContent.postDelayed(() -> mEditContent.focusEditor(), 800); } diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailAdapter.java index 04809b99f8..10a93ced92 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailAdapter.java @@ -32,6 +32,8 @@ import com.google.android.flexbox.FlexboxLayout; import java.util.ArrayList; import java.util.List; +import butterknife.BindView; + /** * Created by khy on 7/12/17. */ @@ -101,11 +103,7 @@ public class QuestionsDetailAdapter extends ListAdapter { return new AnswerViewHolder(view, mListClickListener); case ItemViewType.ITEM_EMPTY: view = mLayoutInflater.inflate(R.layout.reuse_nodata_skip, parent, false); - ((TextView) view.findViewById(R.id.reuse_nodata_skip_tv_hint)).setText("暂无回答"); - ((TextView) view.findViewById(R.id.reuse_nodata_skip_tv_btn)).setText("我来回答"); - view.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, DisplayUtils.dip2px(200))); - view.setOnClickListener(v -> mListClickListener.onListClick(view, 1, null)); - return new ReuseViewHolder(view); + return new EmptyViewHolder(view); default: return null; } @@ -118,6 +116,17 @@ public class QuestionsDetailAdapter extends ListAdapter { case ItemViewType.ITEM_TOP: initQuestionsDetailItemViewHolder((QuestionsDetailItemViewHolder) holder); break; + case ItemViewType.ITEM_EMPTY: + EmptyViewHolder emptyViewHolder = (EmptyViewHolder) holder; + if (mQuestionsDetailEntity != null && mQuestionsDetailEntity.isAnswerFold()) { + emptyViewHolder.tvHint.setText(""); + } else { + emptyViewHolder.tvHint.setText("暂无回答"); + } + emptyViewHolder.tvBtn.setText("我来回答"); + emptyViewHolder.itemView.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, DisplayUtils.dip2px(200))); + emptyViewHolder.itemView.setOnClickListener(v -> mListClickListener.onListClick(holder.itemView, 1, null)); + break; case ItemViewType.ITEM_FOOTER: FooterViewHolder footerViewHolder = (FooterViewHolder) holder; footerViewHolder.initItemPadding(); @@ -140,7 +149,6 @@ public class QuestionsDetailAdapter extends ListAdapter { drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight()); footerViewHolder.hint.setCompoundDrawables(null, null, drawable, null); footerViewHolder.hint.setCompoundDrawablePadding(20); - } } else { footerViewHolder.loading.setVisibility(View.VISIBLE); @@ -288,4 +296,15 @@ public class QuestionsDetailAdapter extends ListAdapter { mIsNoneData = isNoneData; notifyDataSetChanged(); } + + class EmptyViewHolder extends ReuseViewHolder { + @BindView(R.id.reuse_nodata_skip_tv_hint) + TextView tvHint; + @BindView(R.id.reuse_nodata_skip_tv_btn) + TextView tvBtn; + + public EmptyViewHolder(View itemView) { + super(itemView); + } + } } 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 bd4c23ce8c..6c4ed8b938 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 @@ -4,6 +4,7 @@ import android.os.Bundle import android.support.v4.app.Fragment import com.gh.base.fragment.BaseFragment_TabLayout +import com.gh.common.util.EntranceUtils import com.gh.gamecenter.R class CommunitiesSelectWrapperFragment : BaseFragment_TabLayout() { @@ -13,6 +14,12 @@ class CommunitiesSelectWrapperFragment : BaseFragment_TabLayout() { val element = VotingFragment() element.arguments = arguments fragments.add(element) + + val showSecondTabAsDefault = arguments?.getBoolean(EntranceUtils.KEY_SHOW_SELECT_COMMUNITY, false) + ?: false + if (showSecondTabAsDefault) { + mViewPager.post { mViewPager.currentItem = 1 } + } } override fun initTabTitleList(tabTitleList: MutableList) { 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 e549466e4d..c0ad9262cb 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 @@ -103,18 +103,18 @@ class OpenedAdapter(context: Context, val mListViewModel: OpenedViewModel) : Lis } } - holder.itemView.setOnClickListener({ + holder.itemView.setOnClickListener { if (mIsOver && mContext !is CommunitiesSelectActivity) { - CheckLoginUtils.checkLogin(mContext, { + CheckLoginUtils.checkLogin(mContext) { val bundle = Bundle() bundle.putBoolean(EntranceUtils.KEY_SHOW_SELECT_COMMUNITY, true) val intent = CommunitiesSelectActivity.getIntent(mContext, bundle) mContext.startActivity(intent) - }) + } } else if (isNetworkError) { mListViewModel.load(LoadType.RETRY) } - }) + } } } 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 8ba2803880..c732462410 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 @@ -116,9 +116,9 @@ public class VotingFragment extends ListFragment { - selectGameDialog.cancel(); - }); + back.setOnClickListener((v) -> selectGameDialog.cancel()); } private void sendSuggestion(InstallGameEntity entity) {