diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java index 2d18fc2643..828c69a058 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java @@ -266,7 +266,6 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener, mDetailRv.setAdapter(adapter); newsId = getIntent().getStringExtra(EntranceUtils.KEY_NEWSID); - Utils.log("==========IDIDID::" + newsId); mIsCollectionNews = getIntent().getBooleanExtra(KEY_COLLECTIONNEWS, false); if (newsId == null) { diff --git a/app/src/main/java/com/gh/gamecenter/ask/AnswerDetailFragment.java b/app/src/main/java/com/gh/gamecenter/ask/AnswerDetailFragment.java index 8644553b80..cb478633b1 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/AnswerDetailFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/AnswerDetailFragment.java @@ -144,7 +144,6 @@ public class AnswerDetailFragment extends NormalFragment { mViewModel.getAnswerDetail(mAnswerId, mEntrance); } - initMenu(R.menu.menu_answer); mRichEditor.setInputEnabled(false); } @@ -159,6 +158,7 @@ public class AnswerDetailFragment extends NormalFragment { public void onActivityCreated(@Nullable Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); setNavigationTitle(getString(R.string.answer_detail_title)); + initMenu(R.menu.menu_answer); } @Override diff --git a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuWrapperFragment.java index b1a0aaed35..182491022d 100644 --- a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuWrapperFragment.java +++ b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuWrapperFragment.java @@ -44,34 +44,25 @@ public class KaiFuWrapperFragment extends NormalFragment { @Override public void onActivityCreated(@Nullable Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - createMenu(); + setNavigationTitle(R.string.title_kaifu); + initMenu(R.menu.menu_button); + mResetMenuItem = getItemMenu(R.id.menu_button); + mResetMenuItem.setTitle(R.string.menu_text_reset); + mResetMenuItem.setVisible(false); + final TextView textView = mResetMenuItem.getActionView().findViewById(R.id.tv_menu_button); + textView.setText(R.string.menu_text_reset); } @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setHasOptionsMenu(true); - - if (mResetMenuItem == null) createMenu(); - mResetMenuItem.setTitle(R.string.menu_text_reset); - mResetMenuItem.setVisible(false); - final TextView textView = mResetMenuItem.getActionView().findViewById(R.id.tv_menu_button); - textView.setText(R.string.menu_text_reset); - - FragmentTransaction fragmentTransaction = getChildFragmentManager().beginTransaction(); mKaiFuFragment = new KaiFuFragment(); fragmentTransaction.add(R.id.layout_fragment_content, mKaiFuFragment); fragmentTransaction.commit(); } - private void createMenu() { - if (mResetMenuItem != null) return; - setNavigationTitle(R.string.title_kaifu); - initMenu(R.menu.menu_button); - mResetMenuItem = getItemMenu(R.id.menu_button); - } - private void resetFragment() { if (mGameKaiFuFragment == null) return; mKaiFuFragment.setCurPage(mGameKaiFuFragment.getCurPage()); diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java b/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java index aadaaf4622..81e850d901 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java @@ -274,9 +274,15 @@ public class MessageDetailFragment extends NormalFragment implements OnCommentCa }); } - @OnClick(R.id.message_detail_comment_hint_rl) - public void OnHintClikListener() { - setSoftInput(true); + @OnClick({R.id.message_detail_comment_hint_rl, R.id.reuse_no_connection}) + public void OnViewClick(View view) { + if (view.getId() == R.id.message_detail_comment_hint_rl) { + setSoftInput(true); + } else if (view.getId() == R.id.reuse_no_connection) { + if (newsId != null && mConcernEntity == null) { + showNoConnection(false); + } + } } //软键盘控制 diff --git a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java index e0eb0a3698..d91777996f 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java @@ -325,7 +325,7 @@ public class PersonalFragment extends BaseFragment implements Observer>() { diff --git a/app/src/main/res/layout/dialog_sign.xml b/app/src/main/res/layout/dialog_sign.xml index 9605f90a7d..d06b53f297 100644 --- a/app/src/main/res/layout/dialog_sign.xml +++ b/app/src/main/res/layout/dialog_sign.xml @@ -14,7 +14,7 @@ android:id = "@+id/dialog_title" android:layout_width = "match_parent" android:layout_height = "wrap_content" - android:layout_marginTop = "15dp" + android:layout_marginTop = "12dp" android:gravity = "center" android:textColor = "@color/theme" android:textSize = "16dp" @@ -24,7 +24,7 @@ android:id = "@+id/dialog_content" android:layout_width = "match_parent" android:layout_height = "wrap_content" - android:layout_marginTop = "18dp" + android:layout_marginTop = "13dp" android:gravity = "center" android:textColor = "@android:color/black" android:textSize = "14sp" /> @@ -33,7 +33,7 @@ android:id = "@+id/dialog_content2" android:layout_width = "match_parent" android:layout_height = "wrap_content" - android:layout_marginTop = "12dp" + android:layout_marginTop = "6dp" android:gravity = "center" android:textColor = "@android:color/black" android:textSize = "14sp" /> @@ -42,7 +42,7 @@ android:id = "@+id/questionsdetail_line_top" android:layout_width = "match_parent" android:layout_height = "1dp" - android:layout_marginTop = "20dp" + android:layout_marginTop = "17dp" android:layout_marginBottom="-1dp" android:background = "@color/cutting_line" /> diff --git a/app/src/main/res/layout/fragment_personal.xml b/app/src/main/res/layout/fragment_personal.xml index e17263c4ee..1b0c381df5 100644 --- a/app/src/main/res/layout/fragment_personal.xml +++ b/app/src/main/res/layout/fragment_personal.xml @@ -23,8 +23,8 @@ + android:paddingTop = "35dp" > @@ -30,7 +30,7 @@ android:id = "@+id/message_user_name" android:layout_width = "wrap_content" android:layout_height = "wrap_content" - android:layout_marginLeft = "15dp" + android:layout_marginLeft = "14dp" android:layout_marginTop = "4dp" android:text = "@{messageEntity.userEntity.name}" android:textColor = "@color/black" @@ -55,7 +55,7 @@ android:layout_width = "0dp" android:layout_height = "wrap_content" android:layout_marginLeft = "15dp" - android:layout_marginTop = "12dp" + android:layout_marginTop = "8dp" android:textColor = "@color/black" android:textSize = "14sp" app:layout_constraintLeft_toRightOf = "@id/message_user_icon" @@ -67,7 +67,7 @@ android:layout_width = "0dp" android:layout_height = "wrap_content" android:layout_marginLeft = "15dp" - android:layout_marginTop = "10dp" + android:layout_marginTop = "8dp" android:padding="10dp" android:background = "@color/background" app:layout_constraintLeft_toRightOf = "@id/message_user_icon" @@ -103,7 +103,7 @@ android:layout_width = "wrap_content" android:layout_height = "wrap_content" android:layout_marginLeft = "15dp" - android:layout_marginTop = "12dp" + android:layout_marginTop = "8dp" android:textColor = "@color/hint" android:textSize = "11sp" app:layout_constraintLeft_toRightOf = "@id/message_user_icon" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ec49a427c3..3d5b8c5b7d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -545,7 +545,7 @@ 恢复中... 查看评论 我来评论 - 已连续签到%1$d天]]> + 已连续签到 %1$d 天]]> %1$d]]>