diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java index eb8eb0d9bb..e737ba2a2d 100644 --- a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java @@ -5,6 +5,7 @@ import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.support.v4.app.Fragment; +import android.support.v4.view.ViewPager; import android.text.TextUtils; import android.view.View; import android.widget.*; @@ -143,7 +144,7 @@ public class GameDetailActivity extends BaseActivity { // init(view); init(""); - mViewPager.setScrollable(false); + mViewPager.setScrollable(true); mConcernManager = new ConcernManager(GameDetailActivity.this); @@ -171,6 +172,27 @@ public class GameDetailActivity extends BaseActivity { mNoConnection.setVisibility(View.VISIBLE); } + mViewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { + @Override + public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { + + } + + @Override + public void onPageSelected(int position) { + if (position == 0) { + mTanBarFuLi.performClick(); + } else { + mTanBarXinXi.performClick(); + } + } + + @Override + public void onPageScrollStateChanged(int state) { + + } + }); + } private void initGameDetailTop() { diff --git a/app/src/main/java/com/gh/gamecenter/KaiFuActivity.java b/app/src/main/java/com/gh/gamecenter/KaiFuActivity.java index e08ca360ff..f9a48f776f 100644 --- a/app/src/main/java/com/gh/gamecenter/KaiFuActivity.java +++ b/app/src/main/java/com/gh/gamecenter/KaiFuActivity.java @@ -195,12 +195,6 @@ public class KaiFuActivity extends BaseActivity implements KaiFuDialogAdapter.On if ("即将开服↑".equals(mChangeName.getText().toString())) { mChangeName.setText("当前开服↓"); - mChangeName.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.theme)); - mChangeRl.setBackgroundResource(R.drawable.comment_border_bg); - mMovePosition = mInitMovePosition + mAdapter.getLoadCountTop() - 20; - moveToPosition(mMovePosition); - } else { - mChangeName.setText("即将开服↑"); mChangeName.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.content)); mChangeRl.setBackgroundResource(R.drawable.border_suggest_bg); if (kaifuOffset == 0 && mInitMovePosition < 4) { @@ -209,6 +203,12 @@ public class KaiFuActivity extends BaseActivity implements KaiFuDialogAdapter.On mMovePosition = mInitMovePosition + mAdapter.getLoadCountTop() - 24; } moveToPosition(mMovePosition); + } else { + mChangeName.setText("即将开服↑"); + mChangeName.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.theme)); + mChangeRl.setBackgroundResource(R.drawable.comment_border_bg); + mMovePosition = mInitMovePosition + mAdapter.getLoadCountTop() - 20; + moveToPosition(mMovePosition); } } }); diff --git a/app/src/main/java/com/gh/gamecenter/VoteActivity.java b/app/src/main/java/com/gh/gamecenter/VoteActivity.java index 5fbc26c05b..e7e6290848 100644 --- a/app/src/main/java/com/gh/gamecenter/VoteActivity.java +++ b/app/src/main/java/com/gh/gamecenter/VoteActivity.java @@ -237,6 +237,10 @@ public class VoteActivity extends BaseActivity implements SwipeRefreshLayout.OnR if (!TextUtils.isEmpty(id)) { mVoteDao.add(new VersionVoteInfo(id)); mAdapter.voteCallBack(cast, isNewVote, id, name); + + if (isNewVote) { + mVoteRv.scrollToPosition(mAdapter.getItemCount() - 1); + } } } catch (Exception e) { diff --git a/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java index ec75b14231..4f46242ccc 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java @@ -224,8 +224,8 @@ public class LibaoDetailAdapter extends BaseRecyclerAdapter { int count = (int) (((float) mLibaoEntity.getAvailable() / (float) mLibaoEntity.getTotal()) * 100); Spanned content = null; - String status = mLibaoEntity.getStatus(); - if ("coming".equals(status) || "finish".equals(status)) { + String status = mLibaoEntity.getBeforeStatus(); + if ("coming".equals(status) || "finish".equals(status) || TextUtils.isEmpty(status)) { content = Html.fromHtml("剩余:--"); } else if ("ling".equals(status)) { content = Html.fromHtml(StringUtils.buildString("剩余:" , "" , count + "%" , "")); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java index 497553666b..3ff3ad9a33 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java @@ -89,6 +89,7 @@ public class PlatformAdapter extends BaseRecyclerAdapter { viewHolder.download_item_tv_name.setVisibility(View.GONE); viewHolder.download_item_tv_status.setVisibility(View.GONE); viewHolder.download_item_iv_pic.setImageURI(Uri.parse("res:///" + R.drawable.platform_vote)); + viewHolder.itemView.setBackgroundDrawable(new ColorDrawable(0)); viewHolder.itemView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java index 6e52e8518b..b6928021d6 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java @@ -270,7 +270,7 @@ public class FuLiAdapter extends BaseRecyclerAdapter { layout.setLayoutParams(new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, DisplayUtils.dip2px(mContext, 35))); layout.setGravity(Gravity.CENTER_HORIZONTAL); TextView textView = new TextView(mContext); - textView.setText("查看更多→"); + textView.setText("查看游戏介绍→"); textView.setTextColor(ContextCompat.getColor(mContext, R.color.content)); textView.setPadding(0, DisplayUtils.dip2px(mContext, 8), 0, 0); layout.addView(textView); diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/FuliFragment.java b/app/src/main/java/com/gh/gamecenter/gamedetail/FuliFragment.java index 7d782d0a30..970f6b74a2 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/FuliFragment.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/FuliFragment.java @@ -95,7 +95,7 @@ public class FuliFragment extends BaseFragment { public void onEventMainThread(EBSlide busOne) { if (busOne.getPosition() == 1) { - Utils.log("FuLiDetails:" + busOne.getDistance()); + Utils.log("FuLiDetails:" + busOne.getDistance() + "::" + dis); if (busOne.isReset()) { mRecyclerView.scrollBy(0, distance - dis); } else { diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiAdapter.java index ccd638c34c..e6d1d6fa7d 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiAdapter.java @@ -334,31 +334,32 @@ public class XinXiAdapter extends BaseRecyclerAdapter { } - if (mGameDetailEntity.getTag() != null - && mGameDetailEntity.getTag().size() != 0) { + if (fragment.isNoTabBar && mGameDetailEntity.getNews() != null + && mGameDetailEntity.getNews().size() != 0) { if (position_notice != -1) { + position_news = position_notice + 1; + } else { + position_news = 1; + } + } + + if (mGameDetailEntity.getTips() != null || mGameDetailEntity.getTag() != null + && mGameDetailEntity.getTag().size() != 0) { + if (position_news != -1) { + position_plugin = position_news + 1; + } else if (position_notice != -1) { position_plugin = position_notice + 1; } else { position_plugin = 1; } } - if (fragment.isNoTabBar && mGameDetailEntity.getNews() != null - && mGameDetailEntity.getNews().size() != 0) { - if (position_plugin != -1) { - position_news = position_plugin + 1; - } else if (position_notice != -1) { - position_news = position_notice + 1; - } else { - position_news = 1; - } - } if (mGameDetailEntity.getGallery() != null && mGameDetailEntity.getGallery().size() != 0) { - if (position_news != -1) { - position_intro = position_news + 1; - } else if (position_plugin != -1) { + if (position_plugin != -1) { position_intro = position_plugin + 1; + } else if (position_news != -1) { + position_intro = position_news + 1; } else if (position_notice != -1) { position_intro = position_notice + 1; } else { @@ -370,10 +371,10 @@ public class XinXiAdapter extends BaseRecyclerAdapter { && mGameDetailEntity.getGameTag().size() > 0) { if (position_intro != -1) { position_gametag = position_intro + 1; - } else if (position_news != -1) { - position_gametag = position_news + 1; } else if (position_plugin != -1) { position_gametag = position_plugin + 1; + } else if (position_news != -1) { + position_gametag = position_news + 1; } else if (position_notice != -1) { position_gametag = position_notice + 1; } else { @@ -386,10 +387,10 @@ public class XinXiAdapter extends BaseRecyclerAdapter { position_game = position_gametag + 1; } else if (position_intro != -1) { position_game = position_intro + 1; - } else if (position_news != -1) { - position_game = position_news + 1; } else if (position_plugin != -1) { position_game = position_plugin + 1; + } else if (position_news != -1) { + position_game = position_news + 1; } else if (position_notice != -1) { position_game = position_notice + 1; } else { diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java index fd5a5dd821..248da6866d 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java @@ -168,7 +168,7 @@ class SearchGameListFragmentAdapter extends BaseRecyclerAdapter { StringUtils.buildString(entrance , "+(搜索-列表[" , key , "=" , type + "=" , String.valueOf(position + 1) , "])")); - dao.add(key); + dao.add(gameEntity.getName()); } }); @@ -219,7 +219,7 @@ class SearchGameListFragmentAdapter extends BaseRecyclerAdapter { GameUtils.startGameDetailActivity(mContext, gameEntity, StringUtils.buildString(entrance , "+(搜索-列表[" , key , "=" , type , "=" , String.valueOf(position + 1) , "])")); - dao.add(key); + dao.add(gameEntity.getName()); } }); } diff --git a/app/src/main/res/layout/activity_kaifu.xml b/app/src/main/res/layout/activity_kaifu.xml index 76154d66ae..e9e1ba9187 100644 --- a/app/src/main/res/layout/activity_kaifu.xml +++ b/app/src/main/res/layout/activity_kaifu.xml @@ -84,7 +84,7 @@ android:id="@+id/kaifu_change_name" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="当前开服↓" + android:text="即将开服↑" android:textSize="14sp" android:paddingRight="9dp" android:textColor="@color/theme" diff --git a/app/src/main/res/layout/activity_suggest.xml b/app/src/main/res/layout/activity_suggest.xml index 5e0ef9fb97..0ae450604b 100644 --- a/app/src/main/res/layout/activity_suggest.xml +++ b/app/src/main/res/layout/activity_suggest.xml @@ -57,7 +57,7 @@ android:focusable = "true" android:gravity = "top" android:inputType = "textMultiLine" - android:maxLines = "12" + android:maxLines = "4" android:minLines = "2" android:paddingRight = "23dp" android:paddingLeft = "23dp" @@ -65,7 +65,8 @@ android:textSize = "14sp" android:textColorHint = "@color/content" android:lineSpacingMultiplier = "1.2" - android:maxLength="256"/> + android:maxLength="256" + android:textCursorDrawable = "@drawable/cursor_color"/> + android:maxLength="64" + android:textCursorDrawable = "@drawable/cursor_color"/> + android:maxLength="64" + android:textCursorDrawable = "@drawable/cursor_color"/> diff --git a/app/src/main/res/layout/dialog_modify_nickname.xml b/app/src/main/res/layout/dialog_modify_nickname.xml index 336415e511..9f8a452b24 100644 --- a/app/src/main/res/layout/dialog_modify_nickname.xml +++ b/app/src/main/res/layout/dialog_modify_nickname.xml @@ -37,7 +37,8 @@ android:layout_marginTop = "8dp" android:layout_marginBottom = "8dp" android:layout_marginLeft = "15dp" - android:layout_marginRight = "15dp" /> + android:layout_marginRight = "15dp" + android:textCursorDrawable = "@drawable/cursor_color"/> diff --git a/app/src/main/res/layout/fragment_fuli.xml b/app/src/main/res/layout/fragment_fuli.xml index 3355791ced..f561586c4c 100644 --- a/app/src/main/res/layout/fragment_fuli.xml +++ b/app/src/main/res/layout/fragment_fuli.xml @@ -2,12 +2,14 @@ + android:layout_height = "match_parent" + android:descendantFocusability="blocksDescendants"> + android:layout_height = "match_parent" + android:overScrollMode="never"> \ No newline at end of file diff --git a/app/src/main/res/layout/game_news_search_item.xml b/app/src/main/res/layout/game_news_search_item.xml index 321723b680..28336e66ba 100644 --- a/app/src/main/res/layout/game_news_search_item.xml +++ b/app/src/main/res/layout/game_news_search_item.xml @@ -19,7 +19,8 @@ android:paddingRight = "53dp" android:singleLine = "true" android:textColorHint = "@color/hint" - android:textSize = "16sp" /> + android:textSize = "16sp" + android:textCursorDrawable = "@drawable/cursor_color"/> + android:orientation = "vertical" + android:paddingBottom="10dp"/> + android:textSize = "16sp" + android:textCursorDrawable = "@drawable/cursor_color"/> + android:textSize = "16sp" + android:textCursorDrawable = "@drawable/cursor_color"/> 无需root尽享插件功能 加载中... 搜索游戏 - 右划一个游戏\\n可以免流量分享哦 + 右划一个游戏\n可以免流量分享哦 我知道了 复制 请输入关键字