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

部分enum修改

Browse Source
This commit is contained in:
kehaoyuan
2017-12-12 10:22:16 +08:00
parent 886007eae5
commit dc186e2e6b
12 changed files with 34 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/gh/gamecenter/ask/AskHotAdapter.java
View File

@ -44,13 +44,13 @@ public class AskHotAdapter extends ListAdapter {
@Override
protected void loadChange(LoadStatus status) {
switch (status) {
case over:
case OVER:
mIsOver = true;
break;
case error:
case ERROR:
mIsNetworkError = true;
break;
case retry:
case RETRY:
mIsNetworkError = false;
break;
}

4
app/src/main/java/com/gh/gamecenter/ask/AskHotFragment.java
View File

@ -41,8 +41,8 @@ public class AskHotFragment extends ListFragment {
switch (view.getId()) {
case R.id.footerview_item:
if (mAdapter.isNetworkError()) {
mAdapter.loadChange(LoadStatus.retry);
mListViewModel.load(LoadType.retry);
mAdapter.loadChange(LoadStatus.RETRY);
mListViewModel.load(LoadType.RETRY);
}
break;
case R.id.ask_item_constraintlayout:

6
app/src/main/java/com/gh/gamecenter/ask/AskQuestionsBodyAdapter.java
View File

@ -41,13 +41,13 @@ public class AskQuestionsBodyAdapter extends ListAdapter {
@Override
protected void loadChange(LoadStatus status) {
switch (status) {
case over:
case OVER:
mIsOver = true;
break;
case error:
case ERROR:
mIsNetworkError = true;
break;
case retry:
case RETRY:
mIsNetworkError = false;
break;
}

4
app/src/main/java/com/gh/gamecenter/ask/AskQuestionsBodyFragment.java
View File

@ -41,8 +41,8 @@ public class AskQuestionsBodyFragment extends ListFragment {
switch (view.getId()) {
case R.id.footerview_item:
if (mAdapter.isNetworkError()) {
mAdapter.loadChange(LoadStatus.retry);
mListViewModel.load(LoadType.retry);
mAdapter.loadChange(LoadStatus.RETRY);
mListViewModel.load(LoadType.RETRY);
}
break;
}

6
app/src/main/java/com/gh/gamecenter/ask/search/AskSearchAdapter.java
View File

@ -40,13 +40,13 @@ public class AskSearchAdapter extends ListAdapter {
@Override
protected void loadChange(LoadStatus status) {
switch (status) {
case over:
case OVER:
mIsOver = true;
break;
case error:
case ERROR:
mIsNetworkError = true;
break;
case retry:
case RETRY:
mIsNetworkError = false;
break;
}

4
app/src/main/java/com/gh/gamecenter/ask/search/AskSearchFragment.java
View File

@ -42,8 +42,8 @@ public class AskSearchFragment extends ListFragment {
switch (view.getId()) {
case R.id.footerview_item:
if (mAdapter.isNetworkError()) {
mAdapter.loadChange(LoadStatus.retry);
mListViewModel.load(LoadType.retry);
mAdapter.loadChange(LoadStatus.RETRY);
mListViewModel.load(LoadType.RETRY);
}
break;
}

12
app/src/main/java/com/gh/gamecenter/baselist/ListFragment.java
View File

@ -59,7 +59,7 @@ public abstract class ListFragment<T> extends BaseFragment implements
final ListViewModel.Factory factory = new ListViewModel.Factory(getActivity().getApplication(), this);
mListViewModel = ViewModelProviders.of(this, factory).get(ListViewModel.class);
mListViewModel.getObsListData().observe(this, this);
mListViewModel.load(LoadType.nomarl);
mListViewModel.load(LoadType.NORMAL);
mListRv.addItemDecoration(new VerticalItemDecoration(getContext(), 8, true));
}
@ -76,7 +76,7 @@ public abstract class ListFragment<T> extends BaseFragment implements
public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
if (mLayoutManager.findLastVisibleItemPosition() == provideListAdapter().getItemCount() - 1 &&
RecyclerView.SCROLL_STATE_IDLE == newState)
mListViewModel.load(LoadType.nomarl);
mListViewModel.load(LoadType.NORMAL);
}
});
}
@ -87,7 +87,7 @@ public abstract class ListFragment<T> extends BaseFragment implements
@Override
public void onRefresh() {
mListViewModel.load(LoadType.refresh);
mListViewModel.load(LoadType.REFRESH);
}
@Override
@ -103,7 +103,7 @@ public abstract class ListFragment<T> extends BaseFragment implements
mListRv.setVisibility(View.GONE);
mListRefresh.setRefreshing(false);
mListViewModel.load(LoadType.refresh);
mListViewModel.load(LoadType.REFRESH);
}
@Override
@ -135,11 +135,11 @@ public abstract class ListFragment<T> extends BaseFragment implements
@Override
public void onLoadMoreError() {
provideListAdapter().loadChange(LoadStatus.error);
provideListAdapter().loadChange(LoadStatus.ERROR);
}
@Override
public void onLoadOver() {
provideListAdapter().loadChange(LoadStatus.over);
provideListAdapter().loadChange(LoadStatus.OVER);
}
}

6
app/src/main/java/com/gh/gamecenter/baselist/ListRepository.java
View File

@ -92,12 +92,12 @@ public class ListRepository<T> {
}
protected void load(LoadType loadType) {
if (loadType == null) loadType = LoadType.nomarl;
if (loadType == null) loadType = LoadType.NORMAL;
switch (loadType) {
case refresh:
case REFRESH:
resetOffset();
break;
case retry:
case RETRY:
mIsNetworkError = false;
break;
}

14
app/src/main/java/com/gh/gamecenter/baselist/LoadStatus.java
View File

@ -6,17 +6,11 @@ package com.gh.gamecenter.baselist;
public enum LoadStatus {
error("error"),
ERROR,
over("over"),
OVER,
refresh("refresh"),
REFRESH,
retry("retry");
private String mStatus;
LoadStatus(String status) {
mStatus = status;
}
RETRY
}

17
app/src/main/java/com/gh/gamecenter/baselist/LoadType.java
View File

@ -4,17 +4,8 @@ package com.gh.gamecenter.baselist;
* Created by khy on 4/12/17.
*/
public enum LoadType {
nomarl("nomarl"),
refresh("refresh"),
retry("retry");
private String mStatus;
LoadType(String status) {
mStatus = status;
}
public enum LoadType {
NORMAL,
REFRESH,
RETRY
}

2
app/src/main/java/com/gh/gamecenter/retrofit/OkHttpRetryInterceptor.kt
View File

@ -43,7 +43,7 @@ class OkHttpRetryInterceptor internal constructor(context: Context) : Intercepto
var tryCount = 0
val token = chain.request().header("token")
val url = request.url().toString()
while ((response == null || (token != null && response.code() == 401 && (!url.contains("refresh")))) // 排除刷新token接口，避免进入死循环
while ((response == null || (token != null && response.code() == 401 && (!url.contains("REFRESH")))) // 排除刷新token接口，避免进入死循环
&& ++tryCount <= mMaxRetryCount) {
if (CommonDebug.IS_DEBUG) {
CommonDebug.logMethodWithParams(this, "Retrying ${request.url()} for $tryCount")

2
app/src/main/java/com/gh/gamecenter/retrofit/service/UserseaService.java
View File

@ -55,7 +55,7 @@ public interface UserseaService {
* 刷新accessToken
*/
@Headers({"Content-Type: application/json", "Accept: application/json"})
@POST("tokens/refresh")
@POST("tokens/REFRESH")
Observable<LoginTokenEntity> refreshToken(@Body RequestBody body);
/**