|
@@ -1046,7 +1046,16 @@ class MainActivity :BaseActivity<MainActivityPresenter, MainActivityLayoutBindin
|
|
|
val sosInteractionVO = Gson().fromJson(tcpModel.data.toString(), InteractionVO::class.java)
|
|
|
if (tcpModel.action == TcpAction.SOSAction.CANCEL) {
|
|
|
//紧急呼叫已处理
|
|
|
- cancelSosCall(sosInteractionVO.fromEthMac.toUpperCase(Locale.ROOT))
|
|
|
+ val addr = sosInteractionVO.fromEthMac.toUpperCase(Locale.ROOT)
|
|
|
+ cancelSosCall(addr)
|
|
|
+ //删除sosList中对应item
|
|
|
+ var iterator = sosList.iterator()
|
|
|
+ while (iterator.hasNext()){
|
|
|
+ val it = iterator.next()
|
|
|
+ if (it.addr.equals(addr)) {
|
|
|
+ sosList.remove(it)
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
} else if (tcpModel.type == TcpType.DEVICE) {
|
|
|
//检查APP版本
|