|
@@ -1398,7 +1398,7 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
|
|
if (!MyApplication.callEntityList.contains(udpEntity)) {
|
|
if (!MyApplication.callEntityList.contains(udpEntity)) {
|
|
MyApplication.callEntityList.add(udpEntity);
|
|
MyApplication.callEntityList.add(udpEntity);
|
|
setPowerLed("2");//有电话过来就让电源灯闪 Waderson 20171221
|
|
setPowerLed("2");//有电话过来就让电源灯闪 Waderson 20171221
|
|
- //sortList();//在此执行排序 Waderson 20171031
|
|
|
|
|
|
+ sortList();//在此执行排序 Waderson 20171031
|
|
//sendCallWaitingNumber(MyApplication.callEntityList.size());
|
|
//sendCallWaitingNumber(MyApplication.callEntityList.size());
|
|
}
|
|
}
|
|
callListAdapter.notifyDataSetChanged();
|
|
callListAdapter.notifyDataSetChanged();
|
|
@@ -1754,6 +1754,7 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
|
|
ArrayList<UdpEntity> callList = ((MyApplication) getActivity().getApplication()).callEntityList;
|
|
ArrayList<UdpEntity> callList = ((MyApplication) getActivity().getApplication()).callEntityList;
|
|
if (null != callList && callList.size() > 1) {
|
|
if (null != callList && callList.size() > 1) {
|
|
ArrayList<UdpEntity> wcList = new ArrayList<>();
|
|
ArrayList<UdpEntity> wcList = new ArrayList<>();
|
|
|
|
+ ArrayList<UdpEntity> managerList = new ArrayList<>();
|
|
ArrayList<UdpEntity> supportList = new ArrayList<>();
|
|
ArrayList<UdpEntity> supportList = new ArrayList<>();
|
|
ArrayList<UdpEntity> bedList = new ArrayList<>();
|
|
ArrayList<UdpEntity> bedList = new ArrayList<>();
|
|
ArrayList<UdpEntity> traditionBedList = new ArrayList<>();
|
|
ArrayList<UdpEntity> traditionBedList = new ArrayList<>();
|
|
@@ -1773,11 +1774,16 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
|
|
mainList.add(callList.get(i));
|
|
mainList.add(callList.get(i));
|
|
} else if (DOOR_CALL.equals(callList.get(i).getType())) {
|
|
} else if (DOOR_CALL.equals(callList.get(i).getType())) {
|
|
doorList.add(callList.get(i));
|
|
doorList.add(callList.get(i));
|
|
|
|
+ } else if (Constants.MANAGER_CALL.equals(callList.get(i).getType())) {
|
|
|
|
+ managerList.add(callList.get(i));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (wcList.size() > 1) {
|
|
if (wcList.size() > 1) {
|
|
ListComparatorUtil.sort(wcList);
|
|
ListComparatorUtil.sort(wcList);
|
|
}
|
|
}
|
|
|
|
+ if (managerList.size() > 1) {
|
|
|
|
+ ListComparatorUtil.sort(managerList);
|
|
|
|
+ }
|
|
if (supportList.size() > 1) {
|
|
if (supportList.size() > 1) {
|
|
ListComparatorUtil.sort(supportList);
|
|
ListComparatorUtil.sort(supportList);
|
|
}
|
|
}
|
|
@@ -1795,13 +1801,14 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
|
|
}
|
|
}
|
|
callList.clear();
|
|
callList.clear();
|
|
callList.addAll(wcList);
|
|
callList.addAll(wcList);
|
|
|
|
+ callList.addAll(managerList);
|
|
callList.addAll(supportList);
|
|
callList.addAll(supportList);
|
|
callList.addAll(bedList);
|
|
callList.addAll(bedList);
|
|
callList.addAll(traditionBedList);
|
|
callList.addAll(traditionBedList);
|
|
callList.addAll(mainList);
|
|
callList.addAll(mainList);
|
|
callList.addAll(doorList);
|
|
callList.addAll(doorList);
|
|
((MyApplication) getActivity().getApplication()).callEntityList = callList;
|
|
((MyApplication) getActivity().getApplication()).callEntityList = callList;
|
|
- wcList = supportList = bedList = traditionBedList = mainList = doorList = null;
|
|
|
|
|
|
+ wcList = supportList = bedList = traditionBedList = mainList = doorList = managerList = null;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|