|
@@ -50,6 +50,7 @@ import com.wdkl.ncs.android.middleware.model.dos.DeviceDO
|
|
import com.wdkl.ncs.android.middleware.model.dto.TcpSeverDTO
|
|
import com.wdkl.ncs.android.middleware.model.dto.TcpSeverDTO
|
|
import com.wdkl.ncs.android.middleware.model.vo.HostDevicePartSettingVO
|
|
import com.wdkl.ncs.android.middleware.model.vo.HostDevicePartSettingVO
|
|
import com.wdkl.ncs.android.middleware.model.vo.InteractionVO
|
|
import com.wdkl.ncs.android.middleware.model.vo.InteractionVO
|
|
|
|
+import com.wdkl.ncs.android.middleware.model.vo.NurseDeviceInfoVO
|
|
import com.wdkl.ncs.android.middleware.tcp.TcpClient
|
|
import com.wdkl.ncs.android.middleware.tcp.TcpClient
|
|
import com.wdkl.ncs.android.middleware.tcp.channel.DeviceChannel
|
|
import com.wdkl.ncs.android.middleware.tcp.channel.DeviceChannel
|
|
import com.wdkl.ncs.android.middleware.tcp.channel.EntraceGuardUtil
|
|
import com.wdkl.ncs.android.middleware.tcp.channel.EntraceGuardUtil
|
|
@@ -368,8 +369,8 @@ class NurseHomeActivity : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
|
|
var intentFilter = IntentFilter()
|
|
var intentFilter = IntentFilter()
|
|
intentFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION)
|
|
intentFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION)
|
|
//手柄状态监听
|
|
//手柄状态监听
|
|
- intentFilter.addAction(Constants.HOOK_OFF_ACTION)
|
|
|
|
- intentFilter.addAction(Constants.HOOK_ON_ACTION)
|
|
|
|
|
|
+ intentFilter.addAction(Constants.HOOK_OFF)
|
|
|
|
+ intentFilter.addAction(Constants.HOOK_ON)
|
|
registerReceiver(receiver, intentFilter)
|
|
registerReceiver(receiver, intentFilter)
|
|
}
|
|
}
|
|
|
|
|
|
@@ -468,6 +469,11 @@ class NurseHomeActivity : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
|
|
SerialPortUtil.getInstance().closeHeart()
|
|
SerialPortUtil.getInstance().closeHeart()
|
|
SerialPortUtil.getInstance().closeSerialPort()
|
|
SerialPortUtil.getInstance().closeSerialPort()
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ override fun onNoneNet() {
|
|
|
|
+ showMessage("None net")
|
|
|
|
+ }
|
|
|
|
+
|
|
/**
|
|
/**
|
|
*处理错误信息
|
|
*处理错误信息
|
|
*/
|
|
*/
|
|
@@ -549,9 +555,9 @@ class NurseHomeActivity : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
|
|
JanusConstant.STUN_SERVER = arrayOf<String>(data.stunServer)
|
|
JanusConstant.STUN_SERVER = arrayOf<String>(data.stunServer)
|
|
//JanusConstant.TURN_SERVER = data.turnServer
|
|
//JanusConstant.TURN_SERVER = data.turnServer
|
|
|
|
|
|
- if (data.isLedControl != null) {
|
|
|
|
- SettingConfig.setLedControl(activity, data.isLedControl)
|
|
|
|
- if (data.isLedControl) {
|
|
|
|
|
|
+ if (data.ledControl != null) {
|
|
|
|
+ SettingConfig.setLedControl(activity, data.ledControl)
|
|
|
|
+ if (data.ledControl) {
|
|
led_settings_radio_bt.visibility = View.GONE
|
|
led_settings_radio_bt.visibility = View.GONE
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -691,6 +697,10 @@ class NurseHomeActivity : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ override fun showDeviceData(data: NurseDeviceInfoVO) {
|
|
|
|
+ //
|
|
|
|
+ }
|
|
|
|
+
|
|
override fun setLedDeviceInfo(data: ArrayList<DeviceDO>) {
|
|
override fun setLedDeviceInfo(data: ArrayList<DeviceDO>) {
|
|
Log.d(TAG, "get led count: " + data.size)
|
|
Log.d(TAG, "get led count: " + data.size)
|
|
if (data.size > 0) {
|
|
if (data.size > 0) {
|