diff --git a/app/src/main/java/com/gh/common/util/AskErrorResponseUtils.java b/app/src/main/java/com/gh/common/util/AskErrorResponseUtils.java index 6fa7184b5b..05e6c9cc28 100644 --- a/app/src/main/java/com/gh/common/util/AskErrorResponseUtils.java +++ b/app/src/main/java/com/gh/common/util/AskErrorResponseUtils.java @@ -17,29 +17,10 @@ public class AskErrorResponseUtils { public static void errorResponseControl(Context context, HttpException e) { if (e == null) return; int code = e.code(); - try { - JSONObject object = new JSONObject(e.response().errorBody().string()); - int errorCode = object.getInt("code"); - if (errorCode == 400) { - switch (errorCode) { - case 400001: - Utils.toast(context, "提交的参数不符合接口的要求"); - break; - case 400003: - Utils.toast(context, "客户端提供的expert_id不存在"); - break; - case 400004: - Utils.toast(context, "缺少参数"); - break; - case 400005: - Utils.toast(context, "用户的评论被墙(黑名单)"); - break; - default: - Utils.toast(context, "网络错误"); - break; - } - } else if (code == 403) { + if (code == 403) { + JSONObject object = new JSONObject(e.response().errorBody().string()); + int errorCode = object.getInt("code"); switch (errorCode) { case 403001: Utils.toast(context, "标签名称太长了"); @@ -90,8 +71,14 @@ public class AskErrorResponseUtils { Utils.toast(context, "网络错误"); break; } - } else if (code == 401 && errorCode == 404001) { - Utils.toast(context, "请求的资源不存在"); + } else if (code == 401) { + JSONObject object = new JSONObject(e.response().errorBody().string()); + int errorCode = object.getInt("code"); + if (errorCode == 404001) { + Utils.toast(context, "请求的资源不存在"); + } + } else { + Utils.toast(context, "网络错误"); } } catch (Exception e1) { diff --git a/app/src/main/java/com/gh/common/util/CheckLoginUtils.java b/app/src/main/java/com/gh/common/util/CheckLoginUtils.java index c42e72573a..7824f1855e 100644 --- a/app/src/main/java/com/gh/common/util/CheckLoginUtils.java +++ b/app/src/main/java/com/gh/common/util/CheckLoginUtils.java @@ -5,7 +5,11 @@ import android.content.Intent; import android.text.TextUtils; import com.gh.gamecenter.LoginActivity; +import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.manager.UserManager; +import com.gh.gamecenter.personal.PersonalFragment; + +import org.greenrobot.eventbus.EventBus; /** * Created by khy on 28/06/17. @@ -16,6 +20,11 @@ public class CheckLoginUtils { public static void checkLogin(final Context context, OnLoginListener listener) { // String token = LoginUtils.getToken(context); if (TextUtils.isEmpty(UserManager.getInstance().getToken())) { + // 验证登录真实性 + if (!TextUtils.isEmpty(UserManager.getInstance().getTokenId(context))) { + EventBus.getDefault().post(new EBReuse(PersonalFragment.LOGIN_RETRY)); + return; + } AskLogUtils.login(context, "dialog", null); DialogUtils.showWarningDialog(context, "登录提示", "需要登录才能使用该功能喔!", "取消", "快速登录", new DialogUtils.ConfirmListener() { diff --git a/app/src/main/java/com/gh/common/view/FixedSpeedScroller.java b/app/src/main/java/com/gh/common/view/FixedSpeedScroller.java new file mode 100644 index 0000000000..bdf5f3fec4 --- /dev/null +++ b/app/src/main/java/com/gh/common/view/FixedSpeedScroller.java @@ -0,0 +1,45 @@ +package com.gh.common.view; + +import android.content.Context; +import android.view.animation.Interpolator; +import android.widget.Scroller; + +/** + * Created by khy on 20/04/18. + */ + +public class FixedSpeedScroller extends Scroller { + private int mDuration = 0; + + public FixedSpeedScroller(Context context) { + super(context); + } + + public FixedSpeedScroller(Context context, Interpolator interpolator) { + super(context, interpolator); + } + + public FixedSpeedScroller(Context context, Interpolator interpolator, boolean flywheel) { + super(context, interpolator, flywheel); + } + + + @Override + public void startScroll(int startX, int startY, int dx, int dy, int duration) { + super.startScroll(startX, startY, dx, dy, mDuration); + } + + + @Override + public void startScroll(int startX, int startY, int dx, int dy) { + super.startScroll(startX, startY, dx, dy, mDuration); + } + + public void setmDuration(int time) { + mDuration = time; + } + + public int getmDuration() { + return mDuration; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/adapter/AskSelectGameAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/AskSelectGameAdapter.java index 5b25847602..b99ca90c32 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/AskSelectGameAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/AskSelectGameAdapter.java @@ -59,11 +59,11 @@ public class AskSelectGameAdapter extends ListAdapter { if (i == 0) { AskGameSelectEntity e = new AskGameSelectEntity(); if ("opened".equals(entity.getStatus())) { - e.setId("已开通"); + e.setId("已开通的游戏"); mEntityList.add(i, e); i++; } else { - e.setId("投票中"); + e.setId("投票中的游戏"); mEntityList.add(i, e); break; } @@ -73,7 +73,7 @@ public class AskSelectGameAdapter extends ListAdapter { if (!TextUtils.isEmpty(status) && !status.equals(lastEntity.getStatus())) { // 已开通/投票中 断点 mTitlePosition = i - 1; AskGameSelectEntity e = new AskGameSelectEntity(); - e.setId("投票中"); + e.setId("投票中的游戏"); mEntityList.add(i, e); break; } @@ -90,7 +90,7 @@ public class AskSelectGameAdapter extends ListAdapter { } AskGameSelectEntity entity = mEntityList.get(position); - if ("投票中".equals(entity.getId()) || "已开通".equals(entity.getId())) { + if ("投票中的游戏".equals(entity.getId()) || "已开通的游戏".equals(entity.getId())) { return ItemViewType.ITEM_TOP; } else { return ItemViewType.ITEM_BODY; diff --git a/app/src/main/java/com/gh/gamecenter/ask/AnswerCommentFragment.java b/app/src/main/java/com/gh/gamecenter/ask/AnswerCommentFragment.java index 4d43c70cb3..c55ef579b9 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/AnswerCommentFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/AnswerCommentFragment.java @@ -274,6 +274,7 @@ public class AnswerCommentFragment extends ListFragment= 35) { mBaseHandler.sendEmptyMessageDelayed(1, 1000); return; @@ -202,6 +202,7 @@ public class AskQuestionsRecommendsFragment extends ListFragment()); + mLoadStatusLiveData.postValue(LoadStatus.INIT_FAILED); } } mIsLoading = false; @@ -197,8 +200,8 @@ public class AskQuestionsRecommendsViewModel extends ListViewModel { - mContext.startActivity(CommunitySubjectActivity.getIntent(mContext, entity)); + if ("answer_list".equals(entity.getType())) { + mContext.startActivity(CommunitySubjectActivity.getIntent(mContext, entity)); + } else { + mContext.startActivity(AnswerDetailActivity.getIntent(mContext, entity.getId(), "(问答专题)")); + } + }); return binding.getRoot(); } diff --git a/app/src/main/java/com/gh/gamecenter/ask/AskSubjectViewHolder.java b/app/src/main/java/com/gh/gamecenter/ask/AskSubjectViewHolder.java index b178f1d02b..f5666b42d8 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/AskSubjectViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/ask/AskSubjectViewHolder.java @@ -1,12 +1,16 @@ package com.gh.gamecenter.ask; +import android.support.v4.view.ViewPager; import android.view.View; import android.widget.RadioGroup; import com.gh.base.BaseRecyclerViewHolder; +import com.gh.common.view.FixedSpeedScroller; import com.gh.gamecenter.R; import com.gh.gamecenter.ask.entity.AskSubjectEntity; +import java.lang.reflect.Field; + import butterknife.BindView; import cn.trinea.android.view.autoscrollviewpager.AutoScrollViewPager; @@ -23,5 +27,18 @@ public class AskSubjectViewHolder extends BaseRecyclerViewHolder mAdapter.getTitlePosition()) { - mRvTitle.setText("投票中"); + mRvTitle.setText("投票中的游戏"); } else { - mRvTitle.setText("已开通"); + mRvTitle.setText("已开通的游戏"); } } } diff --git a/app/src/main/java/com/gh/gamecenter/ask/entity/AskSubjectEntity.java b/app/src/main/java/com/gh/gamecenter/ask/entity/AskSubjectEntity.java index 8c4e9447e9..36bf3c44d5 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/entity/AskSubjectEntity.java +++ b/app/src/main/java/com/gh/gamecenter/ask/entity/AskSubjectEntity.java @@ -15,11 +15,13 @@ public class AskSubjectEntity implements Parcelable { public final static String TAG = "AskSubjectEntity"; - @SerializedName("_id") + @SerializedName("link") private String id; private String thumb; + private String type; + private String icon; private String title; @@ -34,6 +36,7 @@ public class AskSubjectEntity implements Parcelable { protected AskSubjectEntity(Parcel in) { id = in.readString(); thumb = in.readString(); + type = in.readString(); icon = in.readString(); title = in.readString(); description = in.readString(); @@ -68,6 +71,14 @@ public class AskSubjectEntity implements Parcelable { this.thumb = thumb; } + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + public String getIcon() { return icon; } @@ -109,6 +120,7 @@ public class AskSubjectEntity implements Parcelable { public void writeToParcel(Parcel dest, int flags) { dest.writeString(id); dest.writeString(thumb); + dest.writeString(type); dest.writeString(icon); dest.writeString(title); dest.writeString(description); diff --git a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/AnswerFoldFragment.java b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/AnswerFoldFragment.java index d63b5abd38..ba0381808c 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/AnswerFoldFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/AnswerFoldFragment.java @@ -6,6 +6,7 @@ import android.support.v7.widget.RecyclerView; import android.view.View; import com.gh.common.util.EntranceUtils; +import com.gh.common.util.UrlFilterUtils; import com.gh.common.view.VerticalItemDecoration; import com.gh.gamecenter.AnswerDetailActivity; import com.gh.gamecenter.NewsDetailActivity; @@ -72,7 +73,8 @@ public class AnswerFoldFragment extends ListFragment> provideDataObservable(int page) { - return RetrofitManager.getInstance(getContext()).getApi().getQuestionsAnswer(mQuestionsId, true, page); + return RetrofitManager.getInstance(getContext()).getApi() + .getQuestionsAnswer(mQuestionsId, UrlFilterUtils.getFilterQuery("fold", "true"), page); } @Override diff --git a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsDetailAdapter.java index ed89775eeb..3eff8bf274 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsDetailAdapter.java @@ -174,11 +174,10 @@ public class QuestionsDetailAdapter extends ListAdapter { List tags = mQuestionsDetailEntity.getTags(); holder.mTagRl.removeAllViews(); - addTag(holder.mTagRl, mQuestionsDetailEntity.getCommunityName(), false); for (int i = 0; i < tags.size(); i++) { - addTag(holder.mTagRl, tags.get(i), i == tags.size() - 1); + addTag(holder.mTagRl, tags.get(i), false); } - + addTag(holder.mTagRl, mQuestionsDetailEntity.getCommunityName(), true); String description = mQuestionsDetailEntity.getDescription(); if (TextUtils.isEmpty(description)) { holder.mDesRl.setVisibility(View.GONE); diff --git a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsDetailFragment.java b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsDetailFragment.java index 51730f946c..fa2ddd6c3d 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsDetailFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsDetailFragment.java @@ -26,6 +26,7 @@ import com.gh.common.util.DataUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.util.EntranceUtils; import com.gh.common.util.ShareUtils; +import com.gh.common.util.UrlFilterUtils; import com.gh.common.view.VerticalItemDecoration; import com.gh.gamecenter.AnswerDetailActivity; import com.gh.gamecenter.AnswerEditActivity; @@ -167,7 +168,8 @@ public class QuestionsDetailFragment extends ListFragment> provideDataObservable(int page) { - return RetrofitManager.getInstance(getContext()).getApi().getQuestionsAnswer(mQuestionsId, false, page); + return RetrofitManager.getInstance(getContext()).getApi() + .getQuestionsAnswer(mQuestionsId, UrlFilterUtils.getFilterQuery("fold", "false"), page); } @Override @@ -338,7 +340,7 @@ public class QuestionsDetailFragment extends ListFragment { - - public QuestionsDetailViewModel(@NonNull Application application) { - super(application); - } - - @Override - public Observable> provideDataObservable(int page) { - return RetrofitManager.getInstance(getApplication()).getApi().getQuestionsAnswer("", false, page); - } -} diff --git a/app/src/main/java/com/gh/gamecenter/baselist/ListAdapter.java b/app/src/main/java/com/gh/gamecenter/baselist/ListAdapter.java index faa96b7aa2..455a9cfbe1 100644 --- a/app/src/main/java/com/gh/gamecenter/baselist/ListAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/baselist/ListAdapter.java @@ -104,15 +104,16 @@ public abstract class ListAdapter extends BaseRecyclerAdapter { mIsOver = false; mIsNetworkError = true; break; - case INIT: case LIST_LOADED: case LIST_LOADING: if (!mIsNetworkError && !mIsOver) return; mIsNetworkError = false; mIsOver = false; break; - case REFRESH: + case INIT: if (mEntityList != null) mEntityList.clear(); + mIsNetworkError = false; + mIsOver = false; notifyDataSetChanged(); return; } diff --git a/app/src/main/java/com/gh/gamecenter/baselist/ListRepository.java b/app/src/main/java/com/gh/gamecenter/baselist/ListRepository.java index 41747f25b5..5a3b144c51 100644 --- a/app/src/main/java/com/gh/gamecenter/baselist/ListRepository.java +++ b/app/src/main/java/com/gh/gamecenter/baselist/ListRepository.java @@ -122,7 +122,7 @@ public class ListRepository { if (loadType == LoadType.REFRESH) { initLoadParams(); } else if (loadType == LoadType.RETRY) { - mLoadStatusLiveData.setValue(LoadStatus.INIT); + mLoadStatusLiveData.setValue(LoadStatus.LIST_LOADED); } loadData(); } diff --git a/app/src/main/java/com/gh/gamecenter/baselist/LoadStatus.java b/app/src/main/java/com/gh/gamecenter/baselist/LoadStatus.java index 8a844f47af..ce202874ba 100644 --- a/app/src/main/java/com/gh/gamecenter/baselist/LoadStatus.java +++ b/app/src/main/java/com/gh/gamecenter/baselist/LoadStatus.java @@ -5,10 +5,6 @@ package com.gh.gamecenter.baselist; */ public enum LoadStatus { - - // todo 删除 - REFRESH, - //初始化加载状态 INIT, INIT_LOADING, 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 5fc77c1d71..bf6fcec93d 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java @@ -252,6 +252,7 @@ public class SearchToolbarFragment extends BaseFragment implements View.OnClickL mDownloadView.setVisibility(View.GONE); layoutParams.weight = 0.4f; } + mDownloadView.setLayoutParams(layoutParams); } } diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java index 515355e362..a529e3d20a 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java @@ -101,6 +101,8 @@ class Libao3FragmentAdapter extends BaseRecyclerAdapter if (response.size() > 0) { getLibaoStatus(response); } + + mPage++; } @Override diff --git a/app/src/main/java/com/gh/gamecenter/login/UserRepository.java b/app/src/main/java/com/gh/gamecenter/login/UserRepository.java index cae5e1a267..1f155f2cb0 100644 --- a/app/src/main/java/com/gh/gamecenter/login/UserRepository.java +++ b/app/src/main/java/com/gh/gamecenter/login/UserRepository.java @@ -509,4 +509,8 @@ class UserRepository { public MediatorLiveData> getEditObsUserInfo() { return mEditObsResponseUserInfo; } + + public String getCachedId() { + return mCachedId; + } } diff --git a/app/src/main/java/com/gh/gamecenter/login/UserViewModel.java b/app/src/main/java/com/gh/gamecenter/login/UserViewModel.java index 3aeba74ce0..f7381d0a0f 100644 --- a/app/src/main/java/com/gh/gamecenter/login/UserViewModel.java +++ b/app/src/main/java/com/gh/gamecenter/login/UserViewModel.java @@ -5,11 +5,9 @@ import android.arch.lifecycle.AndroidViewModel; import android.arch.lifecycle.LiveData; import android.arch.lifecycle.ViewModel; import android.arch.lifecycle.ViewModelProvider; -import android.preference.PreferenceManager; import android.support.annotation.NonNull; import android.text.TextUtils; -import com.gh.common.constant.Constants; import com.gh.gamecenter.entity.UserInfoEntity; import org.json.JSONObject; @@ -31,8 +29,6 @@ public class UserViewModel extends AndroidViewModel { public static final String TYPE_PORTRAIT = "icon"; public static final String TYPE_REGION = "region"; - private String mCurrentUserId; - private UserRepository mUserRepository; private final LiveData> mLoginLiveUserInfo; @@ -40,7 +36,6 @@ public class UserViewModel extends AndroidViewModel { public UserViewModel(@NonNull Application application, UserRepository repository) { super(application); - mCurrentUserId = PreferenceManager.getDefaultSharedPreferences(application).getString(Constants.LOGIN_TOKEN_ID, null); mUserRepository = repository; mLoginLiveUserInfo = repository.getLoginUserInfo(); mEditLiveUserInfo = repository.getEditObsUserInfo(); @@ -63,7 +58,7 @@ public class UserViewModel extends AndroidViewModel { } public boolean isLogin() { - return !TextUtils.isEmpty(mCurrentUserId); + return !TextUtils.isEmpty(mUserRepository.getCachedId()); } public void changeUserInfo(String content, String type) { @@ -71,14 +66,9 @@ public class UserViewModel extends AndroidViewModel { } public void logout() { - setCurrentUserId(null); mUserRepository.logout(); } - private void setCurrentUserId(String currentUserId) { - mCurrentUserId = currentUserId; - } - public static class Factory extends ViewModelProvider.NewInstanceFactory { @NonNull private final Application mApplication; diff --git a/app/src/main/java/com/gh/gamecenter/manager/RefreshTokenManager.java b/app/src/main/java/com/gh/gamecenter/manager/RefreshTokenManager.java index 378db2d119..a03dc4809e 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/RefreshTokenManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/RefreshTokenManager.java @@ -94,7 +94,7 @@ public class RefreshTokenManager { response.setLoginType(loginTokenEntity.getLoginType()); response.setId(loginTokenEntity.getId()); } - savaLoginToken(response, mContext); + saveLoginToken(response, mContext); refreshUserInfo(callBack, response.getId()); } @@ -131,7 +131,7 @@ public class RefreshTokenManager { private void refreshUserInfo(final refreshCallBack callBack, final String cacheId) { mApiService - .getUserInfo(BuildConfig.API_HOST + "users:validate") + .getRetryUserInfo(BuildConfig.API_HOST + "users:validate") .subscribe(new Response() { @Override public void onResponse(UserInfoEntity response) { @@ -158,7 +158,7 @@ public class RefreshTokenManager { }); } - private void savaLoginToken(final LoginTokenEntity tokenEntity, final Context context) { + private void saveLoginToken(final LoginTokenEntity tokenEntity, final Context context) { UserManager.getInstance().setLoginTokenEntity(tokenEntity); SINGLE_EXECUTOR.execute(new Runnable() { diff --git a/app/src/main/java/com/gh/gamecenter/manager/UserManager.java b/app/src/main/java/com/gh/gamecenter/manager/UserManager.java index 8c3883f23a..f45e24c329 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/UserManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/UserManager.java @@ -4,6 +4,7 @@ import android.content.Context; import android.preference.PreferenceManager; import android.text.TextUtils; +import com.gh.common.constant.Constants; import com.gh.gamecenter.entity.LoginTokenEntity; import com.gh.gamecenter.entity.UserInfoEntity; @@ -93,6 +94,10 @@ public class UserManager { return mCommunityName; } + public String getTokenId(Context context) { + return PreferenceManager.getDefaultSharedPreferences(context).getString(Constants.LOGIN_TOKEN_ID, null); + } + public void logout() { mUserInfoEntity = null; mLoginTokenEntity = null; 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 e1cf93c656..818396f149 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java @@ -116,6 +116,7 @@ public class PersonalFragment extends BaseFragment implements Observer" + intent.getAction() + "==" + intent.getDataString()); // 接收安装广播 if (intent.getAction().equals(Intent.ACTION_PACKAGE_ADDED)) { String packageName = intent.getDataString(); diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java index 18f3ee0e41..54cc7765a9 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java @@ -398,8 +398,8 @@ public interface ApiService { Observable getUserInfo(@Url String url); @Headers({"Content-Type: application/json"}) // Headers(Content-Type) 作为区分 userinfo 的唯一标识 - @GET("users:validate") - Observable getRetryUserInfo(); // 在OkHttpRetryInterceptor使用主要是不允许这个接口重试 + @POST() + Observable getRetryUserInfo(@Url String url); // 在OkHttpRetryInterceptor使用主要是不允许这个接口重试 // /** // * 检查手机号码是否可用 @@ -452,7 +452,7 @@ public interface ApiService { */ @Headers({"Content-Type: application/json", "Accept: application/json"}) @PUT("users/{user_id}/packages") - Observable putPackage(@Path("user_id") String user_id, @Body RequestBody body); + Observable putPackage(@Path("user_id") String user_id, @Body RequestBody body); // todo /*********** CommentService ************/ @@ -710,7 +710,7 @@ public interface ApiService { * 社区问题的回答列表 */ @GET("questions/{questions_id}/answers?view=digest") - Observable> getQuestionsAnswer(@Path("questions_id") String questionsId, @Query("fold") boolean isFold, @Query("page") int page); + Observable> getQuestionsAnswer(@Path("questions_id") String questionsId, @Query("filter") String filter, @Query("page") int page); /** * 获取社区达人列表 diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectListFragment.java b/app/src/main/java/com/gh/gamecenter/subject/SubjectListFragment.java index e60465bc49..a9e27ece7c 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectListFragment.java +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectListFragment.java @@ -61,7 +61,7 @@ public class SubjectListFragment extends BaseFragment implements OnTitleClickLis private String mListOrder; // 列表排序 最新/最热 private boolean mIsOrder; - private boolean mScorllTop = false; + private boolean mScrollTop = false; private int page = 1; @@ -131,8 +131,8 @@ public class SubjectListFragment extends BaseFragment implements OnTitleClickLis public void onScrollStateChanged(RecyclerView recyclerView, int newState) { super.onScrollStateChanged(recyclerView, newState); int position = mLayoutManager.findFirstCompletelyVisibleItemPosition(); - if (mScorllTop && position == 0 && newState == RecyclerView.SCROLL_STATE_IDLE) { - mScorllTop = false; + if (mScrollTop && position == 0 && newState == RecyclerView.SCROLL_STATE_IDLE) { + mScrollTop = false; EventBus.getDefault().post(new EBReuse(SubjectTileFragment.OPEN_APPBAR)); } @@ -271,7 +271,7 @@ public class SubjectListFragment extends BaseFragment implements OnTitleClickLis EventBus.getDefault().post(new EBReuse(SubjectTileFragment.OPEN_APPBAR)); } else { mLayoutManager.smoothScrollToPosition(mRvSubject, null, 0); - mScorllTop = true; + mScrollTop = true; } } diff --git a/app/src/main/res/layout/vote_item.xml b/app/src/main/res/layout/vote_item.xml index 173d0f976e..dde34586a1 100644 --- a/app/src/main/res/layout/vote_item.xml +++ b/app/src/main/res/layout/vote_item.xml @@ -82,9 +82,4 @@ android:textSize = "12sp" /> - - \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 24e31eca68..e1264da851 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -216,7 +216,7 @@ 接收游戏 发送游戏 开服表 - 选择游戏 + 光环问答 评论详情 原创 资讯