|
@@ -1,8 +1,6 @@
|
|
-package com.wdkl.callingmainnurse.ui.fragment;
|
|
|
|
|
|
+package com.wdkl.callingmainnursemanager.ui.fragment;
|
|
|
|
|
|
import android.annotation.SuppressLint;
|
|
import android.annotation.SuppressLint;
|
|
-import android.content.DialogInterface;
|
|
|
|
-import android.content.Intent;
|
|
|
|
import android.os.Bundle;
|
|
import android.os.Bundle;
|
|
import android.os.Handler;
|
|
import android.os.Handler;
|
|
import android.os.Message;
|
|
import android.os.Message;
|
|
@@ -27,52 +25,49 @@ import android.widget.Spinner;
|
|
import android.widget.TextView;
|
|
import android.widget.TextView;
|
|
|
|
|
|
import com.google.gson.Gson;
|
|
import com.google.gson.Gson;
|
|
-import com.wdkl.callingmainnurse.MyApplication;
|
|
|
|
-import com.wdkl.callingmainnurse.R;
|
|
|
|
-import com.wdkl.callingmainnurse.adapter.CallListAdapter;
|
|
|
|
-import com.wdkl.callingmainnurse.adapter.CallingQueuingInfoAdapter;
|
|
|
|
-import com.wdkl.callingmainnurse.adapter.DutyDoctorAdapter;
|
|
|
|
-import com.wdkl.callingmainnurse.adapter.DutyNurseAdapter;
|
|
|
|
-import com.wdkl.callingmainnurse.adapter.ImportantMessageAdapter;
|
|
|
|
-import com.wdkl.callingmainnurse.adapter.SicknessBedAdapter;
|
|
|
|
-import com.wdkl.callingmainnurse.adapter.SicknessRoomAdapter;
|
|
|
|
-import com.wdkl.callingmainnurse.adapter.VoiceMessageAdapter;
|
|
|
|
-import com.wdkl.callingmainnurse.base.BaseFragment;
|
|
|
|
-import com.wdkl.callingmainnurse.common.Constants;
|
|
|
|
-import com.wdkl.callingmainnurse.entity.CallingQueuingInfoEntity;
|
|
|
|
-import com.wdkl.callingmainnurse.entity.HospitalInfoEntity;
|
|
|
|
-import com.wdkl.callingmainnurse.entity.InitDataEntity;
|
|
|
|
-import com.wdkl.callingmainnurse.entity.MessageEntity;
|
|
|
|
-import com.wdkl.callingmainnurse.entity.MessageEvent;
|
|
|
|
-import com.wdkl.callingmainnurse.entity.RoomEntity;
|
|
|
|
-import com.wdkl.callingmainnurse.entity.SystemInfoEntity;
|
|
|
|
-import com.wdkl.callingmainnurse.entity.UdpEntity;
|
|
|
|
-import com.wdkl.callingmainnurse.ui.activity.MainFragmentActivity;
|
|
|
|
-import com.wdkl.callingmainnurse.ui.activity.SysCallingVolSetActivity;
|
|
|
|
-import com.wdkl.callingmainnurse.util.ListComparatorUtil;
|
|
|
|
-import com.wdkl.callingmainnurse.util.LogUtil;
|
|
|
|
-import com.wdkl.callingmainnurse.util.PalyPhonetics;
|
|
|
|
-import com.wdkl.callingmainnurse.util.SharedPreferencesUtil;
|
|
|
|
-import com.wdkl.callingmainnurse.util.SipUtil.SipHelperUtil;
|
|
|
|
-import com.wdkl.callingmainnurse.util.StringUtils;
|
|
|
|
-import com.wdkl.callingmainnurse.util.ToastUtil;
|
|
|
|
-import com.wdkl.callingmainnurse.util.UIUtils;
|
|
|
|
-import com.wdkl.callingmainnurse.util.UdpSendUtil;
|
|
|
|
-import com.wdkl.callingmainnurse.util.VoiceManagerUtil;
|
|
|
|
-import com.wdkl.callingmainnurse.util.VoiceMessageRoomWardInformationUtil;
|
|
|
|
-import com.wdkl.callingmainnurse.widget.dialog.UrgentPopupwindow;
|
|
|
|
-import com.wdkl.callingmainnurse.widget.view.GridSpacingItemDecoration;
|
|
|
|
|
|
+import com.wdkl.callingmainnursemanager.MyApplication;
|
|
|
|
+import com.wdkl.callingmainnursemanager.R;
|
|
|
|
+import com.wdkl.callingmainnursemanager.adapter.CallListAdapter;
|
|
|
|
+import com.wdkl.callingmainnursemanager.adapter.CallingQueuingInfoAdapter;
|
|
|
|
+import com.wdkl.callingmainnursemanager.adapter.DutyDoctorAdapter;
|
|
|
|
+import com.wdkl.callingmainnursemanager.adapter.DutyNurseAdapter;
|
|
|
|
+import com.wdkl.callingmainnursemanager.adapter.ImportantMessageAdapter;
|
|
|
|
+import com.wdkl.callingmainnursemanager.adapter.SicknessBedAdapter;
|
|
|
|
+import com.wdkl.callingmainnursemanager.adapter.SicknessRoomAdapter;
|
|
|
|
+import com.wdkl.callingmainnursemanager.adapter.VoiceMessageAdapter;
|
|
|
|
+import com.wdkl.callingmainnursemanager.base.BaseFragment;
|
|
|
|
+import com.wdkl.callingmainnursemanager.common.Constants;
|
|
|
|
+import com.wdkl.callingmainnursemanager.entity.CallingQueuingInfoEntity;
|
|
|
|
+import com.wdkl.callingmainnursemanager.entity.HospitalInfoEntity;
|
|
|
|
+import com.wdkl.callingmainnursemanager.entity.InitDataEntity;
|
|
|
|
+import com.wdkl.callingmainnursemanager.entity.MessageEntity;
|
|
|
|
+import com.wdkl.callingmainnursemanager.entity.MessageEvent;
|
|
|
|
+import com.wdkl.callingmainnursemanager.entity.RoomEntity;
|
|
|
|
+import com.wdkl.callingmainnursemanager.entity.SystemInfoEntity;
|
|
|
|
+import com.wdkl.callingmainnursemanager.entity.UdpEntity;
|
|
|
|
+import com.wdkl.callingmainnursemanager.ui.activity.MainFragmentActivity;
|
|
|
|
+import com.wdkl.callingmainnursemanager.util.ListComparatorUtil;
|
|
|
|
+import com.wdkl.callingmainnursemanager.util.LogUtil;
|
|
|
|
+import com.wdkl.callingmainnursemanager.util.PalyPhonetics;
|
|
|
|
+import com.wdkl.callingmainnursemanager.util.SharedPreferencesUtil;
|
|
|
|
+import com.wdkl.callingmainnursemanager.util.StringUtils;
|
|
|
|
+import com.wdkl.callingmainnursemanager.util.ToastUtil;
|
|
|
|
+import com.wdkl.callingmainnursemanager.util.UIUtils;
|
|
|
|
+import com.wdkl.callingmainnursemanager.util.UdpSendUtil;
|
|
|
|
+import com.wdkl.callingmainnursemanager.util.VoiceManagerUtil;
|
|
|
|
+import com.wdkl.callingmainnursemanager.util.VoiceMessageRoomWardInformationUtil;
|
|
|
|
+import com.wdkl.callingmainnursemanager.widget.dialog.UrgentPopupwindow;
|
|
|
|
+import com.wdkl.callingmainnursemanager.widget.view.GridSpacingItemDecoration;
|
|
|
|
+import com.wdkl.callingmainnursemanager.util.PopupwindowVoiceNoticeUtil;
|
|
import com.zhy.http.okhttp.OkHttpUtils;
|
|
import com.zhy.http.okhttp.OkHttpUtils;
|
|
import com.zhy.http.okhttp.callback.StringCallback;
|
|
import com.zhy.http.okhttp.callback.StringCallback;
|
|
|
|
|
|
-import org.greenrobot.eventbus.EventBus;
|
|
|
|
import org.greenrobot.eventbus.Subscribe;
|
|
import org.greenrobot.eventbus.Subscribe;
|
|
import org.greenrobot.eventbus.ThreadMode;
|
|
import org.greenrobot.eventbus.ThreadMode;
|
|
import org.json.JSONException;
|
|
import org.json.JSONException;
|
|
import org.json.JSONObject;
|
|
import org.json.JSONObject;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
-import java.util.List;
|
|
|
|
|
|
|
|
import butterknife.Bind;
|
|
import butterknife.Bind;
|
|
import butterknife.ButterKnife;
|
|
import butterknife.ButterKnife;
|
|
@@ -80,14 +75,13 @@ import butterknife.OnClick;
|
|
import okhttp3.Call;
|
|
import okhttp3.Call;
|
|
import serialporttest.utils.SerialPortUtil;
|
|
import serialporttest.utils.SerialPortUtil;
|
|
|
|
|
|
-import static com.wdkl.callingmainnurse.common.Constants.DOOR_CALL;
|
|
|
|
-import static com.wdkl.callingmainnurse.common.Constants.FTP_VOICE;
|
|
|
|
-import static com.wdkl.callingmainnurse.util.FtpUtil.ftpFilePath;
|
|
|
|
-import static com.wdkl.callingmainnurse.util.PopupwindowVoiceNoticeUtil.mVoiceMessageDetailPopupwindow;
|
|
|
|
-import static com.wdkl.callingmainnurse.util.StringUtils.notEmpty;
|
|
|
|
-import static com.wdkl.callingmainnurse.util.ToastUtil.showToast;
|
|
|
|
-import static com.wdkl.callingmainnurse.widget.VoiceMessageRecordPopupwindow.fileOriginalName;
|
|
|
|
-import static com.wdkl.callingmainnurse.widget.VoiceMessageRecordPopupwindow.getCurrentDate;
|
|
|
|
|
|
+import static com.wdkl.callingmainnursemanager.common.Constants.DOOR_CALL;
|
|
|
|
+import static com.wdkl.callingmainnursemanager.common.Constants.FTP_VOICE;
|
|
|
|
+import static com.wdkl.callingmainnursemanager.util.FtpUtil.ftpFilePath;
|
|
|
|
+import static com.wdkl.callingmainnursemanager.util.StringUtils.notEmpty;
|
|
|
|
+import static com.wdkl.callingmainnursemanager.util.ToastUtil.showToast;
|
|
|
|
+import static com.wdkl.callingmainnursemanager.widget.VoiceMessageRecordPopupwindow.fileOriginalName;
|
|
|
|
+import static com.wdkl.callingmainnursemanager.widget.VoiceMessageRecordPopupwindow.getCurrentDate;
|
|
|
|
|
|
/**
|
|
/**
|
|
* Created by xuhuan on 2017/8/23 <br></>
|
|
* Created by xuhuan on 2017/8/23 <br></>
|
|
@@ -537,6 +531,7 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
|
|
initRecyclerManager();
|
|
initRecyclerManager();
|
|
//初始化病房数据
|
|
//初始化病房数据
|
|
getRoomData();
|
|
getRoomData();
|
|
|
|
+ //getRoomTestData();
|
|
//获得医院信息
|
|
//获得医院信息
|
|
getHospitalData();
|
|
getHospitalData();
|
|
//初始化排队信息栏数据
|
|
//初始化排队信息栏数据
|
|
@@ -651,7 +646,7 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
|
|
loopVoice.setPalyDismiss(true);
|
|
loopVoice.setPalyDismiss(true);
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
- for (int i=0; i<PalyPhonetics.speakEntityList.size(); i++) {//将播报列表也删除该元素 两种实体格式不一样,所以要用循环
|
|
|
|
|
|
+ for (int i = 0; i< PalyPhonetics.speakEntityList.size(); i++) {//将播报列表也删除该元素 两种实体格式不一样,所以要用循环
|
|
if(PalyPhonetics.speakEntityList.get(i).equals(deleteEntity)) {
|
|
if(PalyPhonetics.speakEntityList.get(i).equals(deleteEntity)) {
|
|
PalyPhonetics.speakEntityList.remove(i);
|
|
PalyPhonetics.speakEntityList.remove(i);
|
|
}
|
|
}
|
|
@@ -682,13 +677,13 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
|
|
}
|
|
}
|
|
RoomEntity entity = new RoomEntity();
|
|
RoomEntity entity = new RoomEntity();
|
|
ArrayList<RoomEntity.WardInformation> wardInformations = new ArrayList<>();
|
|
ArrayList<RoomEntity.WardInformation> wardInformations = new ArrayList<>();
|
|
- for (int i = 0; i < 50; i++) {
|
|
|
|
|
|
+ for (int i = 0; i < 200; i++) {
|
|
ArrayList<RoomEntity.WardInformation.SickbedInformation> sickbedInformations = new ArrayList<>();
|
|
ArrayList<RoomEntity.WardInformation.SickbedInformation> sickbedInformations = new ArrayList<>();
|
|
RoomEntity.WardInformation wardInfo = new RoomEntity.WardInformation();
|
|
RoomEntity.WardInformation wardInfo = new RoomEntity.WardInformation();
|
|
wardInfo.setRoomNum("" + i);
|
|
wardInfo.setRoomNum("" + i);
|
|
- for (int j = 0; j < 5; j++) {
|
|
|
|
|
|
+ for (int j = 0; j < 2; j++) {
|
|
RoomEntity.WardInformation.SickbedInformation sickBedInfo = new RoomEntity.WardInformation.SickbedInformation();
|
|
RoomEntity.WardInformation.SickbedInformation sickBedInfo = new RoomEntity.WardInformation.SickbedInformation();
|
|
- int bedNum = i*5 + j;
|
|
|
|
|
|
+ int bedNum = i*2 + j;
|
|
sickBedInfo.setBedNum("" + bedNum);
|
|
sickBedInfo.setBedNum("" + bedNum);
|
|
sickBedInfo.setPatientName("" + bedNum);
|
|
sickBedInfo.setPatientName("" + bedNum);
|
|
sickbedInformations.add(sickBedInfo);
|
|
sickbedInformations.add(sickBedInfo);
|
|
@@ -1280,7 +1275,7 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
|
|
} else {
|
|
} else {
|
|
if (!Constants.CALL_STATE.equals(Constants.STANDBY)) return;
|
|
if (!Constants.CALL_STATE.equals(Constants.STANDBY)) return;
|
|
if (MyApplication.callEntityList.get(position).getType().equals(Constants.WSHROOM_CALL)) {
|
|
if (MyApplication.callEntityList.get(position).getType().equals(Constants.WSHROOM_CALL)) {
|
|
- showToast("不支持卫生间通话");
|
|
|
|
|
|
+ ToastUtil.showToast("不支持卫生间通话");
|
|
vRightCallListInfo.setVisibility(View.GONE);
|
|
vRightCallListInfo.setVisibility(View.GONE);
|
|
vRightPatientInfo.setVisibility(View.VISIBLE);
|
|
vRightPatientInfo.setVisibility(View.VISIBLE);
|
|
vRightCallInfo.setVisibility(View.GONE);
|
|
vRightCallInfo.setVisibility(View.GONE);
|
|
@@ -1289,7 +1284,7 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
|
|
//tvCallListRoomMsg.setText(MyApplication.callEntityList.get(position).getRoomNumber() + "房卫生间紧急呼叫");
|
|
//tvCallListRoomMsg.setText(MyApplication.callEntityList.get(position).getRoomNumber() + "房卫生间紧急呼叫");
|
|
return;
|
|
return;
|
|
} else if (MyApplication.callEntityList.get(position).getType().equals(Constants.ROOMHELP_CALL)) {
|
|
} else if (MyApplication.callEntityList.get(position).getType().equals(Constants.ROOMHELP_CALL)) {
|
|
- showToast("不支持紧急增援通话");
|
|
|
|
|
|
+ ToastUtil.showToast("不支持紧急增援通话");
|
|
vRightCallListInfo.setVisibility(View.GONE);
|
|
vRightCallListInfo.setVisibility(View.GONE);
|
|
vRightPatientInfo.setVisibility(View.VISIBLE);
|
|
vRightPatientInfo.setVisibility(View.VISIBLE);
|
|
vRightCallInfo.setVisibility(View.GONE);
|
|
vRightCallInfo.setVisibility(View.GONE);
|
|
@@ -1535,16 +1530,16 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
|
|
*/
|
|
*/
|
|
private void sendUdpVoiceMessage(String fileName) {
|
|
private void sendUdpVoiceMessage(String fileName) {
|
|
MessageEntity messageEntity = new MessageEntity();
|
|
MessageEntity messageEntity = new MessageEntity();
|
|
- messageEntity.setHosManInfo(mVoiceMessageDetailPopupwindow.getMessageEntity().getHosManInfo());
|
|
|
|
|
|
+ messageEntity.setHosManInfo(PopupwindowVoiceNoticeUtil.mVoiceMessageDetailPopupwindow.getMessageEntity().getHosManInfo());
|
|
messageEntity.setDeviceType(VoiceMessageAdapter.CHAT_ITEM_TYPE_RIGHT + "");
|
|
messageEntity.setDeviceType(VoiceMessageAdapter.CHAT_ITEM_TYPE_RIGHT + "");
|
|
- messageEntity.setDeviceID(mVoiceMessageDetailPopupwindow.getMessageEntity().getDeviceID());
|
|
|
|
- messageEntity.setPatientID(mVoiceMessageDetailPopupwindow.getMessageEntity().getPatientID());
|
|
|
|
- messageEntity.setPatientName(mVoiceMessageDetailPopupwindow.getMessageEntity().getPatientName());
|
|
|
|
|
|
+ messageEntity.setDeviceID(PopupwindowVoiceNoticeUtil.mVoiceMessageDetailPopupwindow.getMessageEntity().getDeviceID());
|
|
|
|
+ messageEntity.setPatientID(PopupwindowVoiceNoticeUtil.mVoiceMessageDetailPopupwindow.getMessageEntity().getPatientID());
|
|
|
|
+ messageEntity.setPatientName(PopupwindowVoiceNoticeUtil.mVoiceMessageDetailPopupwindow.getMessageEntity().getPatientName());
|
|
messageEntity.setFileOriginalName(fileName);
|
|
messageEntity.setFileOriginalName(fileName);
|
|
messageEntity.setFileStoreName(fileName);
|
|
messageEntity.setFileStoreName(fileName);
|
|
messageEntity.setMessageTime(getCurrentDate());
|
|
messageEntity.setMessageTime(getCurrentDate());
|
|
messageEntity.setContent("");
|
|
messageEntity.setContent("");
|
|
- messageEntity.setID(mVoiceMessageDetailPopupwindow.getMessageEntity().getID());
|
|
|
|
|
|
+ messageEntity.setID(PopupwindowVoiceNoticeUtil.mVoiceMessageDetailPopupwindow.getMessageEntity().getID());
|
|
UdpSendUtil.sendVoiceMessage(messageEntity);
|
|
UdpSendUtil.sendVoiceMessage(messageEntity);
|
|
}
|
|
}
|
|
|
|
|