|
@@ -9,8 +9,10 @@ import android.content.SharedPreferences;
|
|
import android.net.ConnectivityManager;
|
|
import android.net.ConnectivityManager;
|
|
import android.net.NetworkInfo;
|
|
import android.net.NetworkInfo;
|
|
import android.net.wifi.WifiManager;
|
|
import android.net.wifi.WifiManager;
|
|
|
|
+import android.os.CountDownTimer;
|
|
import android.os.Handler;
|
|
import android.os.Handler;
|
|
import android.os.Message;
|
|
import android.os.Message;
|
|
|
|
+import android.text.TextUtils;
|
|
import android.util.Log;
|
|
import android.util.Log;
|
|
import android.view.View;
|
|
import android.view.View;
|
|
import android.widget.RadioButton;
|
|
import android.widget.RadioButton;
|
|
@@ -27,12 +29,15 @@ import com.wdkl.tradition.entity.InitDataEntity;
|
|
import com.wdkl.tradition.entity.MessageEvent;
|
|
import com.wdkl.tradition.entity.MessageEvent;
|
|
import com.wdkl.tradition.entity.RoomEntity;
|
|
import com.wdkl.tradition.entity.RoomEntity;
|
|
import com.wdkl.tradition.entity.UdpEntity;
|
|
import com.wdkl.tradition.entity.UdpEntity;
|
|
|
|
+import com.wdkl.tradition.service.ISerialPortListener;
|
|
|
|
+import com.wdkl.tradition.service.SerialModel;
|
|
|
|
+import com.wdkl.tradition.service.SerialPortService;
|
|
|
|
+import com.wdkl.tradition.service.SerialSignalTypeEnum;
|
|
import com.wdkl.tradition.util.AutoRebootUtil;
|
|
import com.wdkl.tradition.util.AutoRebootUtil;
|
|
import com.wdkl.tradition.util.CutSerialPortUtil;
|
|
import com.wdkl.tradition.util.CutSerialPortUtil;
|
|
import com.wdkl.tradition.util.LogUtil;
|
|
import com.wdkl.tradition.util.LogUtil;
|
|
import com.wdkl.tradition.util.MediaPlayerManger;
|
|
import com.wdkl.tradition.util.MediaPlayerManger;
|
|
import com.wdkl.tradition.util.NetUtil;
|
|
import com.wdkl.tradition.util.NetUtil;
|
|
-import com.wdkl.tradition.util.SerialPortSendUtil;
|
|
|
|
import com.wdkl.tradition.util.SharedPreferencesUtil;
|
|
import com.wdkl.tradition.util.SharedPreferencesUtil;
|
|
import com.wdkl.tradition.util.SipUtil.SipCallBackI;
|
|
import com.wdkl.tradition.util.SipUtil.SipCallBackI;
|
|
import com.wdkl.tradition.util.SipUtil.SipHelperUtil;
|
|
import com.wdkl.tradition.util.SipUtil.SipHelperUtil;
|
|
@@ -53,10 +58,10 @@ import org.json.JSONObject;
|
|
|
|
|
|
import java.lang.ref.WeakReference;
|
|
import java.lang.ref.WeakReference;
|
|
import java.net.InetAddress;
|
|
import java.net.InetAddress;
|
|
|
|
+import java.nio.charset.StandardCharsets;
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
|
|
|
|
import okhttp3.Call;
|
|
import okhttp3.Call;
|
|
-import serialporttest.utils.SerialPortUtil;
|
|
|
|
|
|
|
|
import static com.wdkl.tradition.common.Constants.EVENT_BROADCAST;
|
|
import static com.wdkl.tradition.common.Constants.EVENT_BROADCAST;
|
|
import static com.wdkl.tradition.common.Constants.EVENT_CALL_OUT;
|
|
import static com.wdkl.tradition.common.Constants.EVENT_CALL_OUT;
|
|
@@ -77,7 +82,7 @@ import static com.wdkl.tradition.util.ethernetwifiwithsipconnectstatus.WifiBindS
|
|
* Created by 胡博文 on 2018/1/29.
|
|
* Created by 胡博文 on 2018/1/29.
|
|
*/
|
|
*/
|
|
|
|
|
|
-public class TraditionActivity extends BaseActivity implements SerialPortUtil.ISerialPortBedOnclickEvent, IVvsipServiceListener, SipCallBackI, MediaPlayerManger.PlayMusicCompleteListener {
|
|
|
|
|
|
+public class TraditionActivity extends BaseActivity implements ISerialPortListener, IVvsipServiceListener, SipCallBackI, MediaPlayerManger.PlayMusicCompleteListener {
|
|
|
|
|
|
private TextView tvSipState, tvMac, tvIp, tvState, tvEth, tvCallState, tvSerialReceive, tvSerialSend, tvVersionname;
|
|
private TextView tvSipState, tvMac, tvIp, tvState, tvEth, tvCallState, tvSerialReceive, tvSerialSend, tvVersionname;
|
|
|
|
|
|
@@ -113,8 +118,6 @@ public class TraditionActivity extends BaseActivity implements SerialPortUtil.IS
|
|
*/
|
|
*/
|
|
String macAddress = "";
|
|
String macAddress = "";
|
|
|
|
|
|
- //串口工具类
|
|
|
|
- public SerialPortUtil serialPortUtil;
|
|
|
|
|
|
|
|
private WifiBindSipStatusConnector wac;
|
|
private WifiBindSipStatusConnector wac;
|
|
private WifiManager wifiManager;
|
|
private WifiManager wifiManager;
|
|
@@ -163,11 +166,11 @@ public class TraditionActivity extends BaseActivity implements SerialPortUtil.IS
|
|
switch (checkedId) {
|
|
switch (checkedId) {
|
|
case R.id.rb_calling_mode_dual:
|
|
case R.id.rb_calling_mode_dual:
|
|
SharedPreferencesUtil.putIntSp(TraditionActivity.this, Constants.MSG_SP, SharedPreferencesUtil.CallingMode, 0);
|
|
SharedPreferencesUtil.putIntSp(TraditionActivity.this, Constants.MSG_SP, SharedPreferencesUtil.CallingMode, 0);
|
|
- SerialPortSendUtil.changeCallingMode("0");
|
|
|
|
|
|
+ SerialPortService.getInstance().setCallMode(0);
|
|
break;
|
|
break;
|
|
case R.id.rb_calling_mode_single:
|
|
case R.id.rb_calling_mode_single:
|
|
SharedPreferencesUtil.putIntSp(TraditionActivity.this, Constants.MSG_SP, SharedPreferencesUtil.CallingMode, 1);
|
|
SharedPreferencesUtil.putIntSp(TraditionActivity.this, Constants.MSG_SP, SharedPreferencesUtil.CallingMode, 1);
|
|
- SerialPortSendUtil.changeCallingMode("1");
|
|
|
|
|
|
+ SerialPortService.getInstance().setCallMode(1);
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -191,8 +194,7 @@ public class TraditionActivity extends BaseActivity implements SerialPortUtil.IS
|
|
}
|
|
}
|
|
});
|
|
});
|
|
|
|
|
|
- serialPortUtil = ((MyApplication) this.getApplication()).serialPortUtil;
|
|
|
|
- serialPortUtil.setOnDataReceiveListener(this);
|
|
|
|
|
|
+ SerialPortService.getInstance().setSerialPortListener(this);
|
|
|
|
|
|
wardInformationList = new ArrayList<>();
|
|
wardInformationList = new ArrayList<>();
|
|
|
|
|
|
@@ -240,8 +242,7 @@ public class TraditionActivity extends BaseActivity implements SerialPortUtil.IS
|
|
@Override
|
|
@Override
|
|
protected void onNewIntent(Intent intent) {
|
|
protected void onNewIntent(Intent intent) {
|
|
super.onNewIntent(intent);
|
|
super.onNewIntent(intent);
|
|
- serialPortUtil = ((MyApplication) this.getApplication()).serialPortUtil;
|
|
|
|
- serialPortUtil.setOnDataReceiveListener(this);
|
|
|
|
|
|
+ SerialPortService.getInstance().setSerialPortListener(this);
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -257,10 +258,10 @@ public class TraditionActivity extends BaseActivity implements SerialPortUtil.IS
|
|
int callMode = SharedPreferencesUtil.getIntSp(TraditionActivity.this, Constants.MSG_SP, SharedPreferencesUtil.CallingMode);
|
|
int callMode = SharedPreferencesUtil.getIntSp(TraditionActivity.this, Constants.MSG_SP, SharedPreferencesUtil.CallingMode);
|
|
|
|
|
|
if (callMode == 1) {
|
|
if (callMode == 1) {
|
|
- SerialPortSendUtil.changeCallingMode("1");
|
|
|
|
|
|
+ SerialPortService.getInstance().setCallMode(1);
|
|
rbSingleMode.setChecked(true);
|
|
rbSingleMode.setChecked(true);
|
|
} else {
|
|
} else {
|
|
- SerialPortSendUtil.changeCallingMode("0");
|
|
|
|
|
|
+ SerialPortService.getInstance().setCallMode(0);
|
|
rbDualMode.setChecked(true);
|
|
rbDualMode.setChecked(true);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -492,7 +493,6 @@ public class TraditionActivity extends BaseActivity implements SerialPortUtil.IS
|
|
setSystemTime(initDataEntity);
|
|
setSystemTime(initDataEntity);
|
|
}
|
|
}
|
|
if (!isMacRegister) {
|
|
if (!isMacRegister) {
|
|
- SerialPortSendUtil.changeRegisterState();
|
|
|
|
isMacRegister = true;
|
|
isMacRegister = true;
|
|
}
|
|
}
|
|
//当网络
|
|
//当网络
|
|
@@ -627,15 +627,15 @@ public class TraditionActivity extends BaseActivity implements SerialPortUtil.IS
|
|
switch (state) {
|
|
switch (state) {
|
|
case REGISTERING:
|
|
case REGISTERING:
|
|
tvSipState.setBackgroundResource(R.color.yellow_color);
|
|
tvSipState.setBackgroundResource(R.color.yellow_color);
|
|
- SerialPortSendUtil.sipRegistering();
|
|
|
|
|
|
+ //SerialPortSendUtil.sipRegistering();
|
|
break;
|
|
break;
|
|
case REGISTERFAIL:
|
|
case REGISTERFAIL:
|
|
tvSipState.setBackgroundResource(R.color.red_color);
|
|
tvSipState.setBackgroundResource(R.color.red_color);
|
|
- SerialPortSendUtil.sipRegisterFail();
|
|
|
|
|
|
+ //SerialPortSendUtil.sipRegisterFail();
|
|
break;
|
|
break;
|
|
case REGISTERCOM:
|
|
case REGISTERCOM:
|
|
tvSipState.setBackgroundResource(R.color.green);
|
|
tvSipState.setBackgroundResource(R.color.green);
|
|
- SerialPortSendUtil.sipRegisterCom();
|
|
|
|
|
|
+ //SerialPortSendUtil.sipRegisterCom();
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -649,43 +649,55 @@ public class TraditionActivity extends BaseActivity implements SerialPortUtil.IS
|
|
super.onDestroy();
|
|
super.onDestroy();
|
|
//=============================================SIP关闭服务===================================//
|
|
//=============================================SIP关闭服务===================================//
|
|
SipHelperUtil.getInstance(this).unRegisterSip();
|
|
SipHelperUtil.getInstance(this).unRegisterSip();
|
|
- serialPortUtil.closeSerialPort();
|
|
|
|
|
|
+ SerialPortService.getInstance().closeSerialPort();
|
|
}
|
|
}
|
|
|
|
|
|
/***********************************串口回调**********************************************/
|
|
/***********************************串口回调**********************************************/
|
|
@Override
|
|
@Override
|
|
- public void serialPortBedOnclick(String str) {
|
|
|
|
|
|
+ public void onSerialReceived(SerialModel model) {
|
|
try {
|
|
try {
|
|
- String newStr = CutSerialPortUtil.delHeadAndEnd(str, "$", "#");
|
|
|
|
- String content[] = newStr.split(",");
|
|
|
|
- LogUtil.d("serialPortBedOnclick", "newStr==" + newStr);
|
|
|
|
|
|
+ SerialSignalTypeEnum serialSignalTypeEnum = SerialSignalTypeEnum.getEnum(model.getDataType());
|
|
|
|
+ if (serialSignalTypeEnum == null) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ String uartAddr = SerialPortService.getUAddr(model.getSlaveAddH(), model.getSlaveAddL());
|
|
|
|
+ LogUtil.d("onSerialReceived", "addr==" + uartAddr);
|
|
if (isMacRegister) {
|
|
if (isMacRegister) {
|
|
- switch (content[0]) {
|
|
|
|
- case "A":
|
|
|
|
|
|
+ switch (serialSignalTypeEnum) {
|
|
|
|
+ case MCU_MSG_CALLIN_REQ:
|
|
//分机呼叫主机
|
|
//分机呼叫主机
|
|
- EventBus.getDefault().post(new MessageEvent(content[1].substring(0, content[1].length() - 1), EVENT_CALL_OUT));
|
|
|
|
|
|
+ EventBus.getDefault().post(new MessageEvent(uartAddr, EVENT_CALL_OUT));
|
|
break;
|
|
break;
|
|
- case "B":
|
|
|
|
|
|
+ case MCU_MSG_CALLOFF_REQ:
|
|
//分机挂断主机
|
|
//分机挂断主机
|
|
- EventBus.getDefault().post(new MessageEvent(content[1].substring(0, content[1].length() - 1), EVENT_HANG_UP));
|
|
|
|
- break;
|
|
|
|
- case "C":
|
|
|
|
- EventBus.getDefault().post(new MessageEvent(content[1].substring(0, content[1].length() - 1), EVENT_EMERGENCY_CALL));
|
|
|
|
|
|
+ EventBus.getDefault().post(new MessageEvent(uartAddr, EVENT_HANG_UP));
|
|
break;
|
|
break;
|
|
- case "D":
|
|
|
|
- UdpSendUtil.sendRegister(content[1].substring(0, 4));
|
|
|
|
|
|
+ case MCU_MSG_SOSON_REQ:
|
|
|
|
+ EventBus.getDefault().post(new MessageEvent(uartAddr, EVENT_EMERGENCY_CALL));
|
|
break;
|
|
break;
|
|
- case "V":
|
|
|
|
- Constants.MCU_VERSION_NUMBER = content[1].substring(0, 17);
|
|
|
|
|
|
+ case MCU_MSG_VERSION_INFO:
|
|
|
|
+ byte[] versionInfo = model.getData();
|
|
|
|
+ if (TextUtils.isEmpty(Constants.MCU_VERSION_NUMBER) && versionInfo.length > 0) {
|
|
|
|
+ Constants.MCU_VERSION_NUMBER = new String(versionInfo, StandardCharsets.US_ASCII);
|
|
|
|
+ }
|
|
LogUtil.d("serialPortBedOnclick", "Constants.MCU_VERSION_NUMBER==" + Constants.MCU_VERSION_NUMBER);
|
|
LogUtil.d("serialPortBedOnclick", "Constants.MCU_VERSION_NUMBER==" + Constants.MCU_VERSION_NUMBER);
|
|
break;
|
|
break;
|
|
|
|
+ case MCU_MSG_INQUIRE_RES:
|
|
|
|
+ //分机状态回复
|
|
|
|
+ break;
|
|
|
|
+ case MCU_MSG_CALLMODE_RES: //通话模式状态请求
|
|
|
|
+ int callMode = SharedPreferencesUtil.getIntSp(TraditionActivity.this, Constants.MSG_SP, SharedPreferencesUtil.CallingMode);
|
|
|
|
+ SerialPortService.getInstance().setCallMode(callMode);
|
|
|
|
+ break;
|
|
}
|
|
}
|
|
} else {//这里实际上是执行了“E”指令
|
|
} else {//这里实际上是执行了“E”指令
|
|
- UdpSendUtil.sendOnlyId(content[1].substring(0, 4), content[1].substring(4, 19));//后来增加了字符
|
|
|
|
- //UdpSendUtil.sendRegister(content[1].substring(0, 4));
|
|
|
|
|
|
+ //UdpSendUtil.sendOnlyId(content[1].substring(0, 4), content[1].substring(4, 19));//后来增加了字符
|
|
|
|
+ UdpSendUtil.sendRegister(uartAddr);
|
|
}
|
|
}
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
- LogUtil.d("serialPortBedOnclick", "Exception==");
|
|
|
|
|
|
+ LogUtil.d("onSerialReceived", "Exception==");
|
|
|
|
+ e.printStackTrace();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -727,16 +739,17 @@ public class TraditionActivity extends BaseActivity implements SerialPortUtil.IS
|
|
if (MediaPlayerManger.getInstance().isPlaying()) {
|
|
if (MediaPlayerManger.getInstance().isPlaying()) {
|
|
MediaPlayerManger.getInstance().stopMediaPlayer();
|
|
MediaPlayerManger.getInstance().stopMediaPlayer();
|
|
//关闭广播通道
|
|
//关闭广播通道
|
|
- SerialPortSendUtil.closeSoundChannel("FFFF");
|
|
|
|
|
|
+ SerialPortService.getInstance().stopBroadcast();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
EventBus.getDefault().post(new MessageEvent("", Constants.EVENT_SIP_CALL_OUT));
|
|
EventBus.getDefault().post(new MessageEvent("", Constants.EVENT_SIP_CALL_OUT));
|
|
//打开声音通道
|
|
//打开声音通道
|
|
- SerialPortSendUtil.openSoundChannel(call.macStr);
|
|
|
|
|
|
+ //SerialPortSendUtil.openSoundChannel(call.macStr);
|
|
|
|
+ SerialPortService.getInstance().startCall(call.macStr);
|
|
//自动接听
|
|
//自动接听
|
|
SipHelperUtil.getInstance(TraditionActivity.this).getmSipCallBackI().autoTalking();
|
|
SipHelperUtil.getInstance(TraditionActivity.this).getmSipCallBackI().autoTalking();
|
|
- Constants.CALLING_MAC = call.macStr;
|
|
|
|
|
|
|
|
|
|
+ Constants.CALLING_MAC = call.macStr;
|
|
isConversation = true;
|
|
isConversation = true;
|
|
break;
|
|
break;
|
|
case 1:
|
|
case 1:
|
|
@@ -748,7 +761,8 @@ public class TraditionActivity extends BaseActivity implements SerialPortUtil.IS
|
|
EventBus.getDefault().post(new MessageEvent(call.macStr, Constants.EVENT_SIP_HANG_UP));
|
|
EventBus.getDefault().post(new MessageEvent(call.macStr, Constants.EVENT_SIP_HANG_UP));
|
|
//关闭声音通道
|
|
//关闭声音通道
|
|
Constants.CALLING_MAC = "";
|
|
Constants.CALLING_MAC = "";
|
|
- SerialPortSendUtil.closeSoundChannel(call.macStr);
|
|
|
|
|
|
+ //SerialPortSendUtil.closeSoundChannel(call.macStr);
|
|
|
|
+ SerialPortService.getInstance().stopCall(call.macStr);
|
|
isConversation = false;
|
|
isConversation = false;
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
@@ -856,7 +870,8 @@ public class TraditionActivity extends BaseActivity implements SerialPortUtil.IS
|
|
@Override
|
|
@Override
|
|
public void run() {
|
|
public void run() {
|
|
//关闭广播通道
|
|
//关闭广播通道
|
|
- SerialPortSendUtil.closeSoundChannel("FFFF");
|
|
|
|
|
|
+ //SerialPortSendUtil.closeSoundChannel("FFFF");
|
|
|
|
+ SerialPortService.getInstance().stopBroadcast();
|
|
}
|
|
}
|
|
}, 100);
|
|
}, 100);
|
|
|
|
|
|
@@ -888,7 +903,8 @@ public class TraditionActivity extends BaseActivity implements SerialPortUtil.IS
|
|
//发送sendUpRemove udp
|
|
//发送sendUpRemove udp
|
|
UdpSendUtil.sendHangUp(wardInformation_hangUp, device_mac);
|
|
UdpSendUtil.sendHangUp(wardInformation_hangUp, device_mac);
|
|
|
|
|
|
- SerialPortSendUtil.closeSoundChannel(device_mac);
|
|
|
|
|
|
+ //SerialPortSendUtil.closeSoundChannel(device_mac);
|
|
|
|
+ SerialPortService.getInstance().stopCall(device_mac);
|
|
setDoorLamp("8", device_mac);//20191108 waderson
|
|
setDoorLamp("8", device_mac);//20191108 waderson
|
|
|
|
|
|
}
|
|
}
|
|
@@ -906,9 +922,11 @@ public class TraditionActivity extends BaseActivity implements SerialPortUtil.IS
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (!deviceMAC.equals(Constants.CALLING_MAC)) {
|
|
if (!deviceMAC.equals(Constants.CALLING_MAC)) {
|
|
- SerialPortSendUtil.closeEmergency(deviceMAC);
|
|
|
|
|
|
+ //SerialPortSendUtil.closeEmergency(deviceMAC);
|
|
|
|
+ SerialPortService.getInstance().sendSOSOffCmd(deviceMAC);
|
|
}
|
|
}
|
|
- SerialPortSendUtil.closeSoundChannel(deviceMAC);
|
|
|
|
|
|
+ //SerialPortSendUtil.closeSoundChannel(deviceMAC);
|
|
|
|
+ SerialPortService.getInstance().stopCall(deviceMAC);
|
|
setDoorLamp("8", deviceMAC);//20190604 waderson
|
|
setDoorLamp("8", deviceMAC);//20190604 waderson
|
|
break;
|
|
break;
|
|
case "call_change_sip_voice": //护士主机改变子机SIP协议栈的通话音量
|
|
case "call_change_sip_voice": //护士主机改变子机SIP协议栈的通话音量
|
|
@@ -930,7 +948,7 @@ public class TraditionActivity extends BaseActivity implements SerialPortUtil.IS
|
|
String callMode = udpEntity.getLevel();
|
|
String callMode = udpEntity.getLevel();
|
|
LogUtil.d("wzl", "set callMode: " + callMode);
|
|
LogUtil.d("wzl", "set callMode: " + callMode);
|
|
SharedPreferencesUtil.putIntSp(TraditionActivity.this, Constants.MSG_SP, SharedPreferencesUtil.CallingMode, StringUtils.parseInt(callMode));
|
|
SharedPreferencesUtil.putIntSp(TraditionActivity.this, Constants.MSG_SP, SharedPreferencesUtil.CallingMode, StringUtils.parseInt(callMode));
|
|
- SerialPortSendUtil.changeCallingMode(callMode);
|
|
|
|
|
|
+ SerialPortService.getInstance().setCallMode(StringUtils.parseInt(callMode));
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
case "tradition_check":
|
|
case "tradition_check":
|
|
@@ -1020,7 +1038,8 @@ public class TraditionActivity extends BaseActivity implements SerialPortUtil.IS
|
|
MediaPlayerManger.getInstance().stopMediaPlayer();
|
|
MediaPlayerManger.getInstance().stopMediaPlayer();
|
|
|
|
|
|
//打开广播通道
|
|
//打开广播通道
|
|
- SerialPortSendUtil.openBroadcast();
|
|
|
|
|
|
+ //SerialPortSendUtil.openBroadcast();
|
|
|
|
+ SerialPortService.getInstance().startBroadcast();
|
|
|
|
|
|
//=====================播放廣播===================//
|
|
//=====================播放廣播===================//
|
|
MediaPlayerManger.getInstance()
|
|
MediaPlayerManger.getInstance()
|
|
@@ -1050,7 +1069,8 @@ public class TraditionActivity extends BaseActivity implements SerialPortUtil.IS
|
|
isBroadcastPlay = false;
|
|
isBroadcastPlay = false;
|
|
tvCallState.setText("通话状态:");
|
|
tvCallState.setText("通话状态:");
|
|
//关闭广播通道
|
|
//关闭广播通道
|
|
- SerialPortSendUtil.closeSoundChannel("FFFF");
|
|
|
|
|
|
+ //SerialPortSendUtil.closeSoundChannel("FFFF");
|
|
|
|
+ SerialPortService.getInstance().stopBroadcast();
|
|
}
|
|
}
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
@@ -1085,16 +1105,26 @@ public class TraditionActivity extends BaseActivity implements SerialPortUtil.IS
|
|
* 门灯操作
|
|
* 门灯操作
|
|
*/
|
|
*/
|
|
public void setDoorLamp(String type, String macStr) {
|
|
public void setDoorLamp(String type, String macStr) {
|
|
|
|
+ //type: "7"-开启, "8"-关闭
|
|
if (!StringUtils.notEmpty(macStr) || null == wardInformationList) return;
|
|
if (!StringUtils.notEmpty(macStr) || null == wardInformationList) return;
|
|
try {
|
|
try {
|
|
RoomEntity.WardInformation wardInformation = WardInformationUtil.getWardInformation(wardInformationList, macStr);
|
|
RoomEntity.WardInformation wardInformation = WardInformationUtil.getWardInformation(wardInformationList, macStr);
|
|
ArrayList<RoomEntity.WardInformation> list_doorLamp = WardInformationUtil.getDoorLightWardInformation(wardInformationList, wardInformation.getRoomID());
|
|
ArrayList<RoomEntity.WardInformation> list_doorLamp = WardInformationUtil.getDoorLightWardInformation(wardInformationList, wardInformation.getRoomID());
|
|
for (int i = 0; i < list_doorLamp.size(); i++) {
|
|
for (int i = 0; i < list_doorLamp.size(); i++) {
|
|
- if (null != serialPortUtil) {
|
|
|
|
|
|
+ /*if (null != serialPortUtil) {
|
|
serialPortUtil.doorLamp(type, list_doorLamp.get(i).getDeviceMAC());
|
|
serialPortUtil.doorLamp(type, list_doorLamp.get(i).getDeviceMAC());
|
|
} else {
|
|
} else {
|
|
MyApplication.serialPortUtil.doorLamp(type, list_doorLamp.get(i).getDeviceMAC());
|
|
MyApplication.serialPortUtil.doorLamp(type, list_doorLamp.get(i).getDeviceMAC());
|
|
|
|
+ }*/
|
|
|
|
+
|
|
|
|
+ if ("7".equals(type)) {
|
|
|
|
+ //开启门灯
|
|
|
|
+ SerialPortService.getInstance().sendDoorLedOnCmd(list_doorLamp.get(i).getDeviceMAC());
|
|
|
|
+ } else if ("8".equals(type)) {
|
|
|
|
+ //关闭门灯
|
|
|
|
+ SerialPortService.getInstance().sendDoorLedOffCmd(list_doorLamp.get(i).getDeviceMAC());
|
|
}
|
|
}
|
|
|
|
+
|
|
}
|
|
}
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
@@ -1104,7 +1134,8 @@ public class TraditionActivity extends BaseActivity implements SerialPortUtil.IS
|
|
/********************************************EVENTBUS 回调******************************************/
|
|
/********************************************EVENTBUS 回调******************************************/
|
|
@Override
|
|
@Override
|
|
public void playMusicComplete(int position) {
|
|
public void playMusicComplete(int position) {
|
|
- SerialPortSendUtil.closeSoundChannel("FFFF");
|
|
|
|
|
|
+ //SerialPortSendUtil.closeSoundChannel("FFFF");
|
|
|
|
+ SerialPortService.getInstance().stopBroadcast();
|
|
//播放广播恢复默认状态
|
|
//播放广播恢复默认状态
|
|
Constants.IN_TIME_BROADCAST = "";
|
|
Constants.IN_TIME_BROADCAST = "";
|
|
}
|
|
}
|