diff --git a/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java b/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java index d08cc9e..767c20b 100644 --- a/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java +++ b/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java @@ -33,7 +33,7 @@ this.message = message; } - public boolean getSuccess() { + public boolean isSuccess() { return success; } @@ -48,6 +48,7 @@ private String cell; private String co; private String gas; + private String gasTime; private String h2s; private String hatCode; private String hatId; @@ -61,9 +62,8 @@ private String vastCode; private String workerId; private String workerName; - private String gasTime; - public boolean getAlarmFlag() { + public boolean isAlarmFlag() { return alarmFlag; } @@ -111,6 +111,14 @@ this.gas = gas; } + public String getGasTime() { + return gasTime; + } + + public void setGasTime(String gasTime) { + this.gasTime = gasTime; + } + public String getH2s() { return h2s; } @@ -214,13 +222,5 @@ public void setWorkerName(String workerName) { this.workerName = workerName; } - - public String getGasTime() { - return gasTime; - } - - public void setGasTime(String gasTime) { - this.gasTime = gasTime; - } } } diff --git a/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java b/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java index d08cc9e..767c20b 100644 --- a/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java +++ b/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java @@ -33,7 +33,7 @@ this.message = message; } - public boolean getSuccess() { + public boolean isSuccess() { return success; } @@ -48,6 +48,7 @@ private String cell; private String co; private String gas; + private String gasTime; private String h2s; private String hatCode; private String hatId; @@ -61,9 +62,8 @@ private String vastCode; private String workerId; private String workerName; - private String gasTime; - public boolean getAlarmFlag() { + public boolean isAlarmFlag() { return alarmFlag; } @@ -111,6 +111,14 @@ this.gas = gas; } + public String getGasTime() { + return gasTime; + } + + public void setGasTime(String gasTime) { + this.gasTime = gasTime; + } + public String getH2s() { return h2s; } @@ -214,13 +222,5 @@ public void setWorkerName(String workerName) { this.workerName = workerName; } - - public String getGasTime() { - return gasTime; - } - - public void setGasTime(String gasTime) { - this.gasTime = gasTime; - } } } diff --git a/app/src/main/java/com/casic/br/operationsite/service/TcpMessageService.kt b/app/src/main/java/com/casic/br/operationsite/service/TcpMessageService.kt index 8e6b856..787df08 100644 --- a/app/src/main/java/com/casic/br/operationsite/service/TcpMessageService.kt +++ b/app/src/main/java/com/casic/br/operationsite/service/TcpMessageService.kt @@ -37,7 +37,7 @@ if (msg.what == LocaleConstant.TCP_CONNECTED_CODE) { "指令连接成功，现在可以下发指令了".show(this) } else { - "指令连接断开，请稍后5秒，开始自动重连".show(this) + "指令连接断开，开始自动重连".show(this) } return true } diff --git a/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java b/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java index d08cc9e..767c20b 100644 --- a/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java +++ b/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java @@ -33,7 +33,7 @@ this.message = message; } - public boolean getSuccess() { + public boolean isSuccess() { return success; } @@ -48,6 +48,7 @@ private String cell; private String co; private String gas; + private String gasTime; private String h2s; private String hatCode; private String hatId; @@ -61,9 +62,8 @@ private String vastCode; private String workerId; private String workerName; - private String gasTime; - public boolean getAlarmFlag() { + public boolean isAlarmFlag() { return alarmFlag; } @@ -111,6 +111,14 @@ this.gas = gas; } + public String getGasTime() { + return gasTime; + } + + public void setGasTime(String gasTime) { + this.gasTime = gasTime; + } + public String getH2s() { return h2s; } @@ -214,13 +222,5 @@ public void setWorkerName(String workerName) { this.workerName = workerName; } - - public String getGasTime() { - return gasTime; - } - - public void setGasTime(String gasTime) { - this.gasTime = gasTime; - } } } diff --git a/app/src/main/java/com/casic/br/operationsite/service/TcpMessageService.kt b/app/src/main/java/com/casic/br/operationsite/service/TcpMessageService.kt index 8e6b856..787df08 100644 --- a/app/src/main/java/com/casic/br/operationsite/service/TcpMessageService.kt +++ b/app/src/main/java/com/casic/br/operationsite/service/TcpMessageService.kt @@ -37,7 +37,7 @@ if (msg.what == LocaleConstant.TCP_CONNECTED_CODE) { "指令连接成功，现在可以下发指令了".show(this) } else { - "指令连接断开，请稍后5秒，开始自动重连".show(this) + "指令连接断开，开始自动重连".show(this) } return true } diff --git a/app/src/main/java/com/casic/br/operationsite/view/check/EnvironmentActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/check/EnvironmentActivity.kt index 765756e..b529dd7 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/check/EnvironmentActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/check/EnvironmentActivity.kt @@ -161,17 +161,7 @@ binding.rtspPlayerView.layoutParams = params VideoPlayerManager.setGSYVideoPlayerOptions(binding.rtspPlayerView, LocaleConstant.RTSP_URL) - timer = Timer() workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] - timer.schedule(object : TimerTask() { - override fun run() { - workSiteViewModel.getWorkers(context, RuntimeCache.projectId) - - if (!isWebSocketConnected) { - initWebSocket() - } - } - }, 0, 2000) workSiteViewModel.workerResult.observe(this) { if (it.code == 200) { it.data.first().apply { @@ -203,6 +193,16 @@ } } } + timer = Timer() + timer.schedule(object : TimerTask() { + override fun run() { + workSiteViewModel.getWorkers(context, RuntimeCache.projectId) + + if (!isWebSocketConnected) { + initWebSocket() + } + } + }, 0, 2000) } private fun initWebSocket() { diff --git a/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java b/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java index d08cc9e..767c20b 100644 --- a/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java +++ b/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java @@ -33,7 +33,7 @@ this.message = message; } - public boolean getSuccess() { + public boolean isSuccess() { return success; } @@ -48,6 +48,7 @@ private String cell; private String co; private String gas; + private String gasTime; private String h2s; private String hatCode; private String hatId; @@ -61,9 +62,8 @@ private String vastCode; private String workerId; private String workerName; - private String gasTime; - public boolean getAlarmFlag() { + public boolean isAlarmFlag() { return alarmFlag; } @@ -111,6 +111,14 @@ this.gas = gas; } + public String getGasTime() { + return gasTime; + } + + public void setGasTime(String gasTime) { + this.gasTime = gasTime; + } + public String getH2s() { return h2s; } @@ -214,13 +222,5 @@ public void setWorkerName(String workerName) { this.workerName = workerName; } - - public String getGasTime() { - return gasTime; - } - - public void setGasTime(String gasTime) { - this.gasTime = gasTime; - } } } diff --git a/app/src/main/java/com/casic/br/operationsite/service/TcpMessageService.kt b/app/src/main/java/com/casic/br/operationsite/service/TcpMessageService.kt index 8e6b856..787df08 100644 --- a/app/src/main/java/com/casic/br/operationsite/service/TcpMessageService.kt +++ b/app/src/main/java/com/casic/br/operationsite/service/TcpMessageService.kt @@ -37,7 +37,7 @@ if (msg.what == LocaleConstant.TCP_CONNECTED_CODE) { "指令连接成功，现在可以下发指令了".show(this) } else { - "指令连接断开，请稍后5秒，开始自动重连".show(this) + "指令连接断开，开始自动重连".show(this) } return true } diff --git a/app/src/main/java/com/casic/br/operationsite/view/check/EnvironmentActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/check/EnvironmentActivity.kt index 765756e..b529dd7 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/check/EnvironmentActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/check/EnvironmentActivity.kt @@ -161,17 +161,7 @@ binding.rtspPlayerView.layoutParams = params VideoPlayerManager.setGSYVideoPlayerOptions(binding.rtspPlayerView, LocaleConstant.RTSP_URL) - timer = Timer() workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] - timer.schedule(object : TimerTask() { - override fun run() { - workSiteViewModel.getWorkers(context, RuntimeCache.projectId) - - if (!isWebSocketConnected) { - initWebSocket() - } - } - }, 0, 2000) workSiteViewModel.workerResult.observe(this) { if (it.code == 200) { it.data.first().apply { @@ -203,6 +193,16 @@ } } } + timer = Timer() + timer.schedule(object : TimerTask() { + override fun run() { + workSiteViewModel.getWorkers(context, RuntimeCache.projectId) + + if (!isWebSocketConnected) { + initWebSocket() + } + } + }, 0, 2000) } private fun initWebSocket() { diff --git a/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt index 1284708..dd5bddb 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt @@ -169,16 +169,31 @@ } } - //左右边距 - val viewWidth = getScreenWidth() - (15 + 15).dp2px(this) - imageAdapter = EditableImageAdapter(this, recyclerViewImages, viewWidth, 3, 3) - binding.recyclerView.addItemDecoration( - RecyclerViewItemOffsets(marginOffset, marginOffset, marginOffset, marginOffset) - ) - binding.recyclerView.adapter = imageAdapter - - timer = Timer() workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] + workSiteViewModel.workerResult.observe(this) { + if (it.code == 200) { + it.data.first().apply { + binding.heartRateView.text = "心率：${heartRate}bpm" + binding.bloodOxygenView.text = "血氧：${bloodOxygen}%" + binding.coValueView.text = "一氧化碳：${co}ppm" + binding.gasValueView.text = "甲烷：${gas}ppm" + binding.h2sValueView.text = "硫化氢：${h2s}ppm" + binding.o2ValueView.text = "氧气：${o2}%VOL" + binding.valueUpdateView.text = "更新时间：${gasTime}" + + Log.d(kTag, "heartRate, bloodOxygen, co, gas, h2s, o2") + Log.d(kTag, "$heartRate, $bloodOxygen, $co, $gas, $h2s, $o2") + + if (gas.toFloat().toInt() >= 20 + && SocketManager.get.nettyClient.connectStatus + ) { + Log.d(kTag, "initOnCreate: 发送甲烷浓度超限报警") + SocketManager.get.send(LocaleConstant.GAS_COMMAND) + } + } + } + } + timer = Timer() timer.schedule(object : TimerTask() { override fun run() { workSiteViewModel.getWorkers(context, RuntimeCache.projectId) @@ -188,23 +203,14 @@ } } }, 0, 2000) - workSiteViewModel.workerResult.observe(this) { - if (it.code == 200) { - it.data.first().apply { - binding.heartRateView.text = "心率：${heartRate}bpm" - binding.bloodOxygenView.text = "血氧：${bloodOxygen}%" - binding.coValueView.text = "一氧化碳：${co}ppm" - binding.gasValueView.text = "甲烷：${gas}ppm" - binding.h2sValueView.text = "硫化氢：${co}ppm" - binding.o2ValueView.text = "氧气：${o2}%VOL" - binding.valueUpdateView.text = "更新时间：${gasTime}" - if (gas.toInt() >= 20) { - SocketManager.get.send(LocaleConstant.GAS_COMMAND) - } - } - } - } + //左右边距 + val viewWidth = getScreenWidth() - (15 + 15).dp2px(this) + imageAdapter = EditableImageAdapter(this, recyclerViewImages, viewWidth, 3, 3) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(marginOffset, marginOffset, marginOffset, marginOffset) + ) + binding.recyclerView.adapter = imageAdapter } override fun handleMessage(msg: Message): Boolean { diff --git a/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java b/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java index d08cc9e..767c20b 100644 --- a/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java +++ b/app/src/main/java/com/casic/br/operationsite/model/WorkerModel.java @@ -33,7 +33,7 @@ this.message = message; } - public boolean getSuccess() { + public boolean isSuccess() { return success; } @@ -48,6 +48,7 @@ private String cell; private String co; private String gas; + private String gasTime; private String h2s; private String hatCode; private String hatId; @@ -61,9 +62,8 @@ private String vastCode; private String workerId; private String workerName; - private String gasTime; - public boolean getAlarmFlag() { + public boolean isAlarmFlag() { return alarmFlag; } @@ -111,6 +111,14 @@ this.gas = gas; } + public String getGasTime() { + return gasTime; + } + + public void setGasTime(String gasTime) { + this.gasTime = gasTime; + } + public String getH2s() { return h2s; } @@ -214,13 +222,5 @@ public void setWorkerName(String workerName) { this.workerName = workerName; } - - public String getGasTime() { - return gasTime; - } - - public void setGasTime(String gasTime) { - this.gasTime = gasTime; - } } } diff --git a/app/src/main/java/com/casic/br/operationsite/service/TcpMessageService.kt b/app/src/main/java/com/casic/br/operationsite/service/TcpMessageService.kt index 8e6b856..787df08 100644 --- a/app/src/main/java/com/casic/br/operationsite/service/TcpMessageService.kt +++ b/app/src/main/java/com/casic/br/operationsite/service/TcpMessageService.kt @@ -37,7 +37,7 @@ if (msg.what == LocaleConstant.TCP_CONNECTED_CODE) { "指令连接成功，现在可以下发指令了".show(this) } else { - "指令连接断开，请稍后5秒，开始自动重连".show(this) + "指令连接断开，开始自动重连".show(this) } return true } diff --git a/app/src/main/java/com/casic/br/operationsite/view/check/EnvironmentActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/check/EnvironmentActivity.kt index 765756e..b529dd7 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/check/EnvironmentActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/check/EnvironmentActivity.kt @@ -161,17 +161,7 @@ binding.rtspPlayerView.layoutParams = params VideoPlayerManager.setGSYVideoPlayerOptions(binding.rtspPlayerView, LocaleConstant.RTSP_URL) - timer = Timer() workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] - timer.schedule(object : TimerTask() { - override fun run() { - workSiteViewModel.getWorkers(context, RuntimeCache.projectId) - - if (!isWebSocketConnected) { - initWebSocket() - } - } - }, 0, 2000) workSiteViewModel.workerResult.observe(this) { if (it.code == 200) { it.data.first().apply { @@ -203,6 +193,16 @@ } } } + timer = Timer() + timer.schedule(object : TimerTask() { + override fun run() { + workSiteViewModel.getWorkers(context, RuntimeCache.projectId) + + if (!isWebSocketConnected) { + initWebSocket() + } + } + }, 0, 2000) } private fun initWebSocket() { diff --git a/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt index 1284708..dd5bddb 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt @@ -169,16 +169,31 @@ } } - //左右边距 - val viewWidth = getScreenWidth() - (15 + 15).dp2px(this) - imageAdapter = EditableImageAdapter(this, recyclerViewImages, viewWidth, 3, 3) - binding.recyclerView.addItemDecoration( - RecyclerViewItemOffsets(marginOffset, marginOffset, marginOffset, marginOffset) - ) - binding.recyclerView.adapter = imageAdapter - - timer = Timer() workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] + workSiteViewModel.workerResult.observe(this) { + if (it.code == 200) { + it.data.first().apply { + binding.heartRateView.text = "心率：${heartRate}bpm" + binding.bloodOxygenView.text = "血氧：${bloodOxygen}%" + binding.coValueView.text = "一氧化碳：${co}ppm" + binding.gasValueView.text = "甲烷：${gas}ppm" + binding.h2sValueView.text = "硫化氢：${h2s}ppm" + binding.o2ValueView.text = "氧气：${o2}%VOL" + binding.valueUpdateView.text = "更新时间：${gasTime}" + + Log.d(kTag, "heartRate, bloodOxygen, co, gas, h2s, o2") + Log.d(kTag, "$heartRate, $bloodOxygen, $co, $gas, $h2s, $o2") + + if (gas.toFloat().toInt() >= 20 + && SocketManager.get.nettyClient.connectStatus + ) { + Log.d(kTag, "initOnCreate: 发送甲烷浓度超限报警") + SocketManager.get.send(LocaleConstant.GAS_COMMAND) + } + } + } + } + timer = Timer() timer.schedule(object : TimerTask() { override fun run() { workSiteViewModel.getWorkers(context, RuntimeCache.projectId) @@ -188,23 +203,14 @@ } } }, 0, 2000) - workSiteViewModel.workerResult.observe(this) { - if (it.code == 200) { - it.data.first().apply { - binding.heartRateView.text = "心率：${heartRate}bpm" - binding.bloodOxygenView.text = "血氧：${bloodOxygen}%" - binding.coValueView.text = "一氧化碳：${co}ppm" - binding.gasValueView.text = "甲烷：${gas}ppm" - binding.h2sValueView.text = "硫化氢：${co}ppm" - binding.o2ValueView.text = "氧气：${o2}%VOL" - binding.valueUpdateView.text = "更新时间：${gasTime}" - if (gas.toInt() >= 20) { - SocketManager.get.send(LocaleConstant.GAS_COMMAND) - } - } - } - } + //左右边距 + val viewWidth = getScreenWidth() - (15 + 15).dp2px(this) + imageAdapter = EditableImageAdapter(this, recyclerViewImages, viewWidth, 3, 3) + binding.recyclerView.addItemDecoration( + RecyclerViewItemOffsets(marginOffset, marginOffset, marginOffset, marginOffset) + ) + binding.recyclerView.adapter = imageAdapter } override fun handleMessage(msg: Message): Boolean { diff --git a/app/src/main/java/com/casic/br/operationsite/vm/WorkSiteViewModel.kt b/app/src/main/java/com/casic/br/operationsite/vm/WorkSiteViewModel.kt index df7bdc5..954d4d0 100644 --- a/app/src/main/java/com/casic/br/operationsite/vm/WorkSiteViewModel.kt +++ b/app/src/main/java/com/casic/br/operationsite/vm/WorkSiteViewModel.kt @@ -34,10 +34,10 @@ val response = RetrofitServiceManager.getProjectListByPage(keywords, state, page) when (response.getResponseCode()) { 200 -> { + loadState.value = LoadState.Success worksiteModel.value = gson.fromJson( response, object : TypeToken() {}.type ) - loadState.value = LoadState.Success } else -> { @@ -55,10 +55,10 @@ val response = RetrofitServiceManager.getProjectDetail(projectId) when (response.getResponseCode()) { 200 -> { + loadState.value = LoadState.Success detailModel.value = gson.fromJson( response, object : TypeToken() {}.type ) - loadState.value = LoadState.Success } else -> { @@ -93,10 +93,10 @@ val response = RetrofitServiceManager.getWorkers(projectId) when (response.getResponseCode()) { 200 -> { + loadState.value = LoadState.Success workerResult.value = gson.fromJson( response, object : TypeToken() {}.type ) - loadState.value = LoadState.Success } else -> {