Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

光环助手V3.2 DEV（20180415-1700）测试问题汇总

Browse Source 
http://gitlab.ghzhushou.com/pm/halo-app-issues/issues/207
This commit is contained in:
kehaoyuan
2018-04-17 15:16:25 +08:00
parent a0737d0010
commit 840eff3cc4
13 changed files with 49 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/com/gh/common/util/LoginUtils.java
View File

@ -153,21 +153,15 @@ public class LoginUtils {
if (exception.code() == 403) {
try {
JSONObject errorJson = new JSONObject(exception.response().errorBody().string());
String detail = errorJson.getString("detail");
switch (detail) {
case "too frequent":
Utils.toast(context, R.string.comment_failed_toofrequent);
break;
case "user blocked":
int errorCode = errorJson.getInt("code");
switch (errorCode) {
case 403019:
Utils.toast(context, R.string.comment_failed_userblocked);
break;
case "user banned":
Utils.toast(context, R.string.comment_failed_userbanned);
case 403020:
Utils.toast(context, R.string.comment_failed_toofrequent);
break;
case "article blocked":
Utils.toast(context, R.string.comment_failed_articleblocked);
break;
case "illegal":
case 403021:
Utils.toast(context, R.string.comment_failed_illegal);
break;
default:

14
app/src/main/java/com/gh/gamecenter/ask/AnswerCommentFragment.java
View File

@ -36,8 +36,6 @@ import com.lightgame.utils.Utils;
import org.json.JSONObject;
import java.util.Iterator;
import butterknife.BindView;
import butterknife.OnClick;
import butterknife.Optional;
@ -96,20 +94,8 @@ public class AnswerCommentFragment extends ListFragment<CommentEntity, AnswerCom
if (exception.code() == 403) {
try {
JSONObject errorJson = new JSONObject(exception.response().errorBody().string());
Iterator<String> keys = errorJson.keys();
while (keys.hasNext()) { // todo 叫后端统一 code/detail
String key = keys.next();
if (key.equals("detail") && "user banned".equals(errorJson.getString(key))) {
toast(R.string.comment_failed_userblocked);
return;
}
}
int errorCode = errorJson.getInt("code");
switch (errorCode) {
case 403018:
toast("内容可能已被删除");
setSoftInput(false);
break;
case 403019:
toast(R.string.comment_failed_userblocked);
break;

12
app/src/main/java/com/gh/gamecenter/ask/AskQuestionsRecommendsFragment.java
View File

@ -56,21 +56,23 @@ public class AskQuestionsRecommendsFragment extends ListFragment<AnswerEntity, A
mListViewModel.getRefreshCount().observe(this, integer -> {
if (integer != null) {
switch (integer) {
case 0:
mRefreshHint.setText("已经没有新内容咯，请稍后再试");
mRefreshHint.setVisibility(View.VISIBLE);
mBaseHandler.sendEmptyMessageDelayed(1, 2000);
AskLogUtils.communityRefresh(getContext(), integer);
break;
case -1:
mRefreshHint.setText("获取失败，请检查网络设置");
toast("获取失败，请检查网络设置");
break;
default:
mRefreshHint.setText("成功获取" + integer + "条内容");
mRefreshHint.setVisibility(View.VISIBLE);
mBaseHandler.sendEmptyMessageDelayed(1, 2000);
AskLogUtils.communityRefresh(getContext(), integer);
break;
}
mRefreshHint.setVisibility(View.VISIBLE);
mBaseHandler.sendEmptyMessageDelayed(1, 2000);
AskLogUtils.communityRefresh(getContext(), integer);
}
if (mListRefresh.isRefreshing()) {

2
app/src/main/java/com/gh/gamecenter/ask/AskSubjectPageAdapter.java
View File

@ -41,7 +41,7 @@ public class AskSubjectPageAdapter extends RecyclingPagerAdapter {
}
AskSubjectEntity entity = mEntityList.get(position % mEntityList.size());
binding.setEntity(entity);
ImageUtils.Companion.getInstance().displayScale(binding.subjectIcon, entity.getIcon(), DisplayUtils.dip2px(mContext, 67));
ImageUtils.Companion.getInstance().displayScale(binding.subjectIcon, entity.getThumb(), DisplayUtils.dip2px(mContext, 67));
binding.getRoot().setOnClickListener(v -> {
mContext.startActivity(CommunitySubjectActivity.getIntent(mContext, entity));
});

3
app/src/main/java/com/gh/gamecenter/ask/SelectGameViewModel.java
View File

@ -6,6 +6,7 @@ import android.support.annotation.NonNull;
import com.gh.gamecenter.ask.entity.AskGameSelectEntity;
import com.gh.gamecenter.baselist.ListViewModel;
import com.gh.gamecenter.retrofit.RetrofitManager;
import com.halo.assistant.HaloApp;
import java.util.List;
@ -24,6 +25,6 @@ public class SelectGameViewModel extends ListViewModel<AskGameSelectEntity, AskG
@Override
public Observable<List<AskGameSelectEntity>> provideDataObservable(int page) {
return RetrofitManager.getInstance(getApplication()).getApi().getAskGameSelect(page);
return RetrofitManager.getInstance(getApplication()).getApi().getAskGameSelect(HaloApp.getInstance().getChannel(), page);
}
}

12
app/src/main/java/com/gh/gamecenter/ask/entity/AskSubjectEntity.java
View File

@ -18,6 +18,8 @@ public class AskSubjectEntity implements Parcelable {
@SerializedName("_id")
private String id;
private String thumb;
private String icon;
private String title;
@ -31,6 +33,7 @@ public class AskSubjectEntity implements Parcelable {
protected AskSubjectEntity(Parcel in) {
id = in.readString();
thumb = in.readString();
icon = in.readString();
title = in.readString();
description = in.readString();
@ -57,6 +60,14 @@ public class AskSubjectEntity implements Parcelable {
this.id = id;
}
public String getThumb() {
return thumb;
}
public void setThumb(String thumb) {
this.thumb = thumb;
}
public String getIcon() {
return icon;
}
@ -97,6 +108,7 @@ public class AskSubjectEntity implements Parcelable {
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeString(id);
dest.writeString(thumb);
dest.writeString(icon);
dest.writeString(title);
dest.writeString(description);

3
app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java
View File

@ -45,7 +45,6 @@ import com.gh.gamecenter.eventbus.EBNetworkState;
import com.gh.gamecenter.eventbus.EBReuse;
import com.gh.gamecenter.eventbus.EBSkip;
import com.gh.gamecenter.login.ApiResponse;
import com.gh.gamecenter.login.AppDatabase;
import com.gh.gamecenter.login.LoginTag;
import com.gh.gamecenter.login.UserViewModel;
import com.gh.gamecenter.manager.UserManager;
@ -126,7 +125,6 @@ public class PersonalFragment extends BaseFragment implements Observer<ApiRespon
private SharedPreferences sp;
private AppDatabase mDatabase;
private UserViewModel mUserViewModel;
private MessageUnreadViewModel mUnreadViewModel;
@ -154,7 +152,6 @@ public class PersonalFragment extends BaseFragment implements Observer<ApiRespon
super.onCreate(savedInstanceState);
sp = PreferenceManager.getDefaultSharedPreferences(getContext());
mDatabase = AppDatabase.getInstance(getContext());
checkUpdate();

6
app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java
View File

@ -685,7 +685,7 @@ public interface ApiService {
* 社区列表
*/
@GET("communities")
Observable<List<AskGameSelectEntity>> getAskGameSelect(@Query("page") int page);
Observable<List<AskGameSelectEntity>> getAskGameSelect(@Query("channel") String channel, @Query("page") int page);
/**
* 社区列表
@ -893,7 +893,7 @@ public interface ApiService {
* 删除用户草稿
*/
@DELETE("users/{user_id}/answer_drafts/{draft_id}")
Observable<ResponseBody> deleteAnswerDrafts(@Path("user_id")String userId, @Path("draft_id")String draftId);
Observable<ResponseBody> deleteAnswerDrafts(@Path("user_id") String userId, @Path("draft_id") String draftId);
/**
* 获取用户收藏的回答列表
@ -944,7 +944,7 @@ public interface ApiService {
Observable<ResponseBody> postVoteAnswerComment(@Path("answer_id") String answerId, @Path("comment_id") String commentId);
/**
* 举报回答的评论
* 举报回答的评论
*/
@POST("answers/{answer_id}/comments/{comment_id}:report")
Observable<ResponseBody> postReportOfAnswerComment(@Path("answer_id") String answerId, @Path("comment_id") String commentId, @Body RequestBody reportData);