浏览代码

<fix bug: 呼叫列表中,如果总机先拨打通话过来,分机再拨打通话过来,会直接替换掉总机,但分机先拨打过来的情况下,总机却不会替换到掉分机>

weizhengliang 5 年之前
父节点
当前提交
5df4391b17
共有 1 个文件被更改,包括 9 次插入2 次删除
  1. 9 2
      app/src/main/java/com/wdkl/callingmainnurse/ui/fragment/CallingBedFragment.java

+ 9 - 2
app/src/main/java/com/wdkl/callingmainnurse/ui/fragment/CallingBedFragment.java

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