遥控移动焦点优化

app/src/main/java/com/unionmed/unionmedtv/activity/HospitalActivity.java

@@ -128,6 +128,9 @@ public class HospitalActivity extends BaseActivity {
                     public void onSucceed(HttpData<ApiResponse<GetHospitalApi>> stringHttpData) {
                         LogUtils.e("成功：" + stringHttpData);
                         if (stringHttpData.getData().getCode() == 200) {
+                            if(stringHttpData.getData().getData()==null){
+                                return;
+                            }
                             List<GetHospitalApi.MemberBean> doctorInfo = stringHttpData.getData().getData().getMember();
                             if (doctorInfo == null) {
                                 return;

app/src/main/java/com/unionmed/unionmedtv/fragment/MyDoctorFragment.java

@@ -117,6 +117,7 @@ public class MyDoctorFragment extends Fragment implements View.OnClickListener {
                     public void onSucceed(HttpData<ApiResponse<GetContractedDoctorApi.DoctorInfo>> stringHttpData) {
                         LogUtils.e("成功：" + stringHttpData);
                         if (stringHttpData.isRequestSucceed()) {
+                            if(stringHttpData.getData().isInnerRequestSucceed()){
                                 List<GetContractedDoctorApi.DoctorInfo.MemberBean> doctorInfo = stringHttpData.getData().getData().getMember();
                                 if (doctorInfo.size()==0) {
                                     recyclerView.setVisibility(View.GONE);
@@ -126,6 +127,7 @@ public class MyDoctorFragment extends Fragment implements View.OnClickListener {
                                 list.addAll(doctorInfo);
                                 contractedDoctorAdapter.notifyDataSetChanged();
                             }
+                        }
 
                     }
 

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 count = getItemCount()-1;
-        int lastVisiblePosition = findLastVisibleItemPosition();
         switch (direction) {
             case View.FOCUS_DOWN:
-                if(currentPosition + getSpanCount()<lastVisiblePosition){
+                if (currentPosition + getSpanCount() < count) {
                     int nextRowFirstPosition1 = currentPosition + getSpanCount();
                     scrollToPosition(nextRowFirstPosition1);
                     return findViewByPosition(nextRowFirstPosition1);
-                }else if(currentPosition + getSpanCount()>lastVisiblePosition){
+                } else if (currentPosition + getSpanCount() > count) {
-                    scrollToPosition(lastVisiblePosition);
+                    scrollToPosition(count);
-                    return findViewByPosition(lastVisiblePosition);
+                    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<count) {
                     int nextRowFirstPosition = currentPosition + getSpanCount() - (getSpanCount() - 1);
                     scrollToPosition(nextRowFirstPosition);
                     return findViewByPosition(nextRowFirstPosition);
-                } else if (currentPosition == lastVisiblePosition) {
+                } else if (currentPosition == count) {
                     return findViewByPosition(currentPosition);
                 }
                 break;
             case View.FOCUS_LEFT:
                 if (currentPosition == 0) {
                     return findViewByPosition(currentPosition);
-                } else if (currentPosition % getSpanCount() == 0) {
+                } else if (currentPosition <=count) {
                     int nextRowFirstPosition = currentPosition - 1;
                     scrollToPosition(nextRowFirstPosition);
                     return findViewByPosition(nextRowFirstPosition);