diff --git a/app/src/main/java/com/unionmed/unionmedtv/activity/HospitalActivity.java b/app/src/main/java/com/unionmed/unionmedtv/activity/HospitalActivity.java index 1371bc7..d202255 100644 --- a/app/src/main/java/com/unionmed/unionmedtv/activity/HospitalActivity.java +++ b/app/src/main/java/com/unionmed/unionmedtv/activity/HospitalActivity.java @@ -128,6 +128,9 @@ public class HospitalActivity extends BaseActivity { public void onSucceed(HttpData> stringHttpData) { LogUtils.e("成功:" + stringHttpData); if (stringHttpData.getData().getCode() == 200) { + if(stringHttpData.getData().getData()==null){ + return; + } List doctorInfo = stringHttpData.getData().getData().getMember(); if (doctorInfo == null) { return; diff --git a/app/src/main/java/com/unionmed/unionmedtv/fragment/MyDoctorFragment.java b/app/src/main/java/com/unionmed/unionmedtv/fragment/MyDoctorFragment.java index 8447309..d860beb 100644 --- a/app/src/main/java/com/unionmed/unionmedtv/fragment/MyDoctorFragment.java +++ b/app/src/main/java/com/unionmed/unionmedtv/fragment/MyDoctorFragment.java @@ -117,14 +117,16 @@ public class MyDoctorFragment extends Fragment implements View.OnClickListener { public void onSucceed(HttpData> stringHttpData) { LogUtils.e("成功:" + stringHttpData); if (stringHttpData.isRequestSucceed()) { - List doctorInfo = stringHttpData.getData().getData().getMember(); - if (doctorInfo.size()==0) { - recyclerView.setVisibility(View.GONE); - return; + if(stringHttpData.getData().isInnerRequestSucceed()){ + List doctorInfo = stringHttpData.getData().getData().getMember(); + if (doctorInfo.size()==0) { + recyclerView.setVisibility(View.GONE); + return; + } + recyclerView.setVisibility(View.VISIBLE); + list.addAll(doctorInfo); + contractedDoctorAdapter.notifyDataSetChanged(); } - recyclerView.setVisibility(View.VISIBLE); - list.addAll(doctorInfo); - contractedDoctorAdapter.notifyDataSetChanged(); } } diff --git a/app/src/main/java/com/unionmed/unionmedtv/utils/MyGridLayoutManager.java b/app/src/main/java/com/unionmed/unionmedtv/utils/MyGridLayoutManager.java index 96b046f..1573161 100644 --- a/app/src/main/java/com/unionmed/unionmedtv/utils/MyGridLayoutManager.java +++ b/app/src/main/java/com/unionmed/unionmedtv/utils/MyGridLayoutManager.java @@ -51,37 +51,40 @@ public class MyGridLayoutManager extends GridLayoutManager { @Override public View onInterceptFocusSearch(View focused, int direction) { int currentPosition = getPosition(getFocusedChild()); - int spanCount = getSpanCount(); - int lastVisiblePosition = findLastVisibleItemPosition(); + int count = getItemCount()-1; switch (direction) { case View.FOCUS_DOWN: - if(currentPosition + getSpanCount()lastVisiblePosition){ - scrollToPosition(lastVisiblePosition); - return findViewByPosition(lastVisiblePosition); + } else if (currentPosition + getSpanCount() > count) { + scrollToPosition(count); + return findViewByPosition(count); } break; case View.FOCUS_UP: if (currentPosition % getSpanCount() == 0 && upView != null) { upView.requestFocus(); + } else if (currentPosition - getSpanCount() < count) { + int nextRowFirstPosition1 = currentPosition - getSpanCount(); + scrollToPosition(nextRowFirstPosition1); + return findViewByPosition(nextRowFirstPosition1); } break; case View.FOCUS_RIGHT: - if (currentPosition % getSpanCount() == getSpanCount() - 1) { + if (currentPosition