|
@@ -443,7 +443,7 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
|
|
|
protected void initView(View RootView) {
|
|
|
|
|
|
//默认的通话状态
|
|
|
- Constants.CALL_STATE = Constants.STANDBY;
|
|
|
+ //Constants.CALL_STATE = Constants.STANDBY;
|
|
|
vRightPatientInfo.setVisibility(View.VISIBLE);
|
|
|
vRightCallInfo.setVisibility(View.GONE);
|
|
|
vRightCallListInfo.setVisibility(View.GONE);
|
|
@@ -1191,6 +1191,10 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
|
|
|
*/
|
|
|
@OnClick(R.id.right_in_calling_layout_iv_call)
|
|
|
public void Call(View view) {
|
|
|
+ if (!Constants.CALL_STATE.equals(Constants.STANDBY)) {
|
|
|
+ ToastUtil.showToast("请先取消当前呼叫");
|
|
|
+ return;
|
|
|
+ }
|
|
|
currentTime = System.currentTimeMillis();
|
|
|
if (currentTime - lastClickTime > CLICK_DELAY_TIME) {
|
|
|
lastClickTime = currentTime;
|
|
@@ -1211,7 +1215,7 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
|
|
|
//ToastUtil.showToast(sipAddress+"===="+sickBedInfo.getDeviceMAC());
|
|
|
callBed = true;
|
|
|
ivCallPic.setImageResource(R.mipmap.ic_calling_sickbed_right_hang_up);
|
|
|
- mainFragmentActivity.initiateCall(sipAddress, "", sickBedInfo.getDeviceMAC() == null ? "-1" : sickBedInfo.getDeviceMAC());
|
|
|
+ mainFragmentActivity.initiateCall(sipAddress, Constants.SON_CALL, sickBedInfo.getDeviceMAC() == null ? "-1" : sickBedInfo.getDeviceMAC());
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
@@ -1303,7 +1307,7 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
|
|
|
if (null == sickbedInformationList || null == sickbedInformationList.get(position) || null == sickbedInformationList.get(position).getPatientID()) {
|
|
|
return;
|
|
|
}
|
|
|
- if (!Constants.CALL_STATE.equals(Constants.STANDBY) && !sickBedInfo.equals(sickbedInformationList.get(position))) {
|
|
|
+ if (!Constants.CALL_STATE.equals(Constants.STANDBY) /*&& !sickBedInfo.equals(sickbedInformationList.get(position))*/) {
|
|
|
ToastUtil.showToast("请先取消当前呼叫");
|
|
|
return;
|
|
|
}
|
|
@@ -1315,7 +1319,7 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
|
|
|
if (StringUtils.notEmpty(sipAddress)) {
|
|
|
callBed = true;
|
|
|
ivCallPic.setImageResource(R.mipmap.ic_calling_sickbed_right_hang_up);
|
|
|
- mainFragmentActivity.initiateCall(sipAddress, "", sickBedInfo.getDeviceMAC() == null ? "-1" : sickBedInfo.getDeviceMAC());
|
|
|
+ mainFragmentActivity.initiateCall(sipAddress, Constants.SON_CALL, sickBedInfo.getDeviceMAC() == null ? "-1" : sickBedInfo.getDeviceMAC());
|
|
|
}
|
|
|
} else {
|
|
|
endCall();
|
|
@@ -1447,7 +1451,7 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
|
|
|
*/
|
|
|
@Override
|
|
|
public void callListItemOnclick(View view, int position) {
|
|
|
- if (!Constants.CALL_STATE.equals(Constants.STANDBY) && !callItemChooseEntity.equals(MyApplication.callEntityList.get(position))) {
|
|
|
+ if (!Constants.CALL_STATE.equals(Constants.STANDBY) /*&& !callItemChooseEntity.equals(MyApplication.callEntityList.get(position))*/) {
|
|
|
ToastUtil.showToast("请先取消当前呼叫");
|
|
|
return;
|
|
|
}
|
|
@@ -2611,23 +2615,23 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
|
|
|
if (Constants.currentFragment != 0) {
|
|
|
return;
|
|
|
}
|
|
|
- Message msg = handler.obtainMessage();
|
|
|
+ /*Message msg = handler.obtainMessage();
|
|
|
Bundle data = new Bundle();
|
|
|
data.putByteArray(OUTBUTTONCLICK_CONTENT, buffer);
|
|
|
msg.setData(data);
|
|
|
msg.what = OUTBUTTONCLICK;
|
|
|
- handler.sendMessage(msg);
|
|
|
+ handler.sendMessage(msg);*/
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public void forkSpringData(int data) {
|
|
|
//叉簧开关 的状态(Waderson)
|
|
|
- Message msg = handler.obtainMessage();
|
|
|
+ /*Message msg = handler.obtainMessage();
|
|
|
Bundle data_p = new Bundle();
|
|
|
data_p.putInt(SPRINGCLICK_CONTENT, data);
|
|
|
msg.setData(data_p);
|
|
|
msg.what = SPRINGCLICK;
|
|
|
- handler.sendMessage(msg);
|
|
|
+ handler.sendMessage(msg);*/
|
|
|
}
|
|
|
|
|
|
@Override
|