|
@@ -299,7 +299,8 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, CallingbedMa
|
|
|
|
|
|
if (TextUtils.isEmpty(Constant.SIP_ID)) {
|
|
|
showMessage("SIP ID为空")
|
|
|
- } else if (Constant.DEVICE_STATUS == 0) {
|
|
|
+ }
|
|
|
+ if (Constant.DEVICE_STATUS == 0) {
|
|
|
showMessage("设备未启用")
|
|
|
}
|
|
|
|
|
@@ -651,7 +652,7 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, CallingbedMa
|
|
|
if (System.currentTimeMillis() - clickSosTime > 10000) {
|
|
|
runOnUiThread {
|
|
|
clickSosTime = System.currentTimeMillis()
|
|
|
- if (Constant.DEVICE_STATUS == 1 && Constant.TCP_CONNECTED) {
|
|
|
+ if (Constant.TCP_CONNECTED) {
|
|
|
SOSHelper.sosStart()
|
|
|
}
|
|
|
}
|
|
@@ -1088,15 +1089,13 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, CallingbedMa
|
|
|
}
|
|
|
} else if (intent.action == ConnectivityManager.CONNECTIVITY_ACTION) {
|
|
|
updateNetState()
|
|
|
- if (initialized) {
|
|
|
- if (NetHelper.getInstance().networkAvailable()) {
|
|
|
- if (!Constant.TCP_CONNECTED) {
|
|
|
- TcpClient.getInstance().doConnect()
|
|
|
- }
|
|
|
- if (SocketManager.getInstance().userState == 0) {
|
|
|
- //如果socket断开了则重连
|
|
|
- connectRtcWebSocket()
|
|
|
- }
|
|
|
+ if (initialized && NetHelper.getInstance().networkAvailable()) {
|
|
|
+ if (!Constant.TCP_CONNECTED) {
|
|
|
+ TcpClient.getInstance().doConnect()
|
|
|
+ }
|
|
|
+ if (SocketManager.getInstance().userState == 0) {
|
|
|
+ //如果socket断开了则重连
|
|
|
+ connectRtcWebSocket()
|
|
|
}
|
|
|
}
|
|
|
}
|