diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkTaskActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkTaskActivity.kt index 9ded0c3..34b9b5f 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkTaskActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkTaskActivity.kt @@ -13,7 +13,7 @@ import com.casic.br.operationsite.model.WorkSiteListModel import com.casic.br.operationsite.service.TcpMessageService import com.casic.br.operationsite.utils.RuntimeCache -import com.casic.br.operationsite.view.check.GuardiansActivity +import com.casic.br.operationsite.view.check.DisclosureActivity import com.casic.br.operationsite.vm.WorkSiteViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder @@ -125,8 +125,7 @@ position: Int, t: WorkSiteListModel.DataModel.RowsModel ) { RuntimeCache.projectId = t.id -// navigatePageTo() - navigatePageTo() + navigatePageTo() } }) } diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkTaskActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkTaskActivity.kt index 9ded0c3..34b9b5f 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkTaskActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkTaskActivity.kt @@ -13,7 +13,7 @@ import com.casic.br.operationsite.model.WorkSiteListModel import com.casic.br.operationsite.service.TcpMessageService import com.casic.br.operationsite.utils.RuntimeCache -import com.casic.br.operationsite.view.check.GuardiansActivity +import com.casic.br.operationsite.view.check.DisclosureActivity import com.casic.br.operationsite.vm.WorkSiteViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder @@ -125,8 +125,7 @@ position: Int, t: WorkSiteListModel.DataModel.RowsModel ) { RuntimeCache.projectId = t.id -// navigatePageTo() - navigatePageTo() + navigatePageTo() } }) } 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 c9fa134..c63c6c3 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 @@ -206,7 +206,7 @@ override fun onOpen(webSocket: WebSocket, response: Response) { super.onOpen(webSocket, response) this@EnvironmentActivity.webSocket = webSocket - isWebSocketConnected = false + isWebSocketConnected = true lifecycleScope.launch(Dispatchers.Main) { weakReferenceHandler.sendEmptyMessage(LocaleConstant.WEBSOCKET_CONNECTED_CODE) } diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkTaskActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkTaskActivity.kt index 9ded0c3..34b9b5f 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkTaskActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkTaskActivity.kt @@ -13,7 +13,7 @@ import com.casic.br.operationsite.model.WorkSiteListModel import com.casic.br.operationsite.service.TcpMessageService import com.casic.br.operationsite.utils.RuntimeCache -import com.casic.br.operationsite.view.check.GuardiansActivity +import com.casic.br.operationsite.view.check.DisclosureActivity import com.casic.br.operationsite.vm.WorkSiteViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder @@ -125,8 +125,7 @@ position: Int, t: WorkSiteListModel.DataModel.RowsModel ) { RuntimeCache.projectId = t.id -// navigatePageTo() - navigatePageTo() + navigatePageTo() } }) } 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 c9fa134..c63c6c3 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 @@ -206,7 +206,7 @@ override fun onOpen(webSocket: WebSocket, response: Response) { super.onOpen(webSocket, response) this@EnvironmentActivity.webSocket = webSocket - isWebSocketConnected = false + isWebSocketConnected = true lifecycleScope.launch(Dispatchers.Main) { weakReferenceHandler.sendEmptyMessage(LocaleConstant.WEBSOCKET_CONNECTED_CODE) } diff --git a/app/src/main/java/com/casic/br/operationsite/view/check/SuppliesActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/check/SuppliesActivity.kt index b93c694..9688a09 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/check/SuppliesActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/check/SuppliesActivity.kt @@ -103,6 +103,7 @@ constructionCheckViewModel.setCurrentPhase("before_operation_protection") //播放RTSP流 binding.videoView.setVideoURI(Uri.parse("rtsp://192.168.10.137:554")) + binding.stepView.text = "稍后开始检查第一项:四合一,请准备" } private fun initWebSocket() { @@ -118,7 +119,7 @@ override fun onOpen(webSocket: WebSocket, response: Response) { super.onOpen(webSocket, response) this@SuppliesActivity.webSocket = webSocket - isWebSocketConnected = false + isWebSocketConnected = true lifecycleScope.launch(Dispatchers.Main) { weakReferenceHandler.sendEmptyMessage(LocaleConstant.WEBSOCKET_CONNECTED_CODE) } @@ -191,21 +192,28 @@ recyclerViewImages.add(imagePath) imageAdapter.notifyDataSetChanged() - if (recyclerViewImages.size == 6) { - AlertControlDialog.Builder() - .setContext(this) - .setTitle("温馨提示") - .setMessage("检测到施工前劳保用品准备完毕,是否开始施工?") - .setNegativeButton("取消") - .setPositiveButton("确定") - .setOnDialogButtonClickListener(object : - AlertControlDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - navigatePageTo() - } + when (recyclerViewImages.size) { + 1 -> binding.stepView.text = "稍后开始检第二项:防护面罩,请准备" + 2 -> binding.stepView.text = "稍后开始检第三项:安全帽,请准备" + 3 -> binding.stepView.text = "稍后开始检第四项:闪光灯,请准备" + 4 -> binding.stepView.text = "稍后开始检第五项:鼓风机,请准备" + 5 -> binding.stepView.text = "稍后开始检第六项:三脚架,请准备" + 6 -> { + AlertControlDialog.Builder() + .setContext(this) + .setTitle("温馨提示") + .setMessage("检测到施工前劳保用品准备完毕,是否开始施工?") + .setNegativeButton("取消") + .setPositiveButton("确定") + .setOnDialogButtonClickListener(object : + AlertControlDialog.OnDialogButtonClickListener { + override fun onConfirmClick() { + navigatePageTo() + } - override fun onCancelClick() {} - }).build().show() + override fun onCancelClick() {} + }).build().show() + } } } catch (e: Exception) { e.printStackTrace() diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkTaskActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkTaskActivity.kt index 9ded0c3..34b9b5f 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkTaskActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkTaskActivity.kt @@ -13,7 +13,7 @@ import com.casic.br.operationsite.model.WorkSiteListModel import com.casic.br.operationsite.service.TcpMessageService import com.casic.br.operationsite.utils.RuntimeCache -import com.casic.br.operationsite.view.check.GuardiansActivity +import com.casic.br.operationsite.view.check.DisclosureActivity import com.casic.br.operationsite.vm.WorkSiteViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder @@ -125,8 +125,7 @@ position: Int, t: WorkSiteListModel.DataModel.RowsModel ) { RuntimeCache.projectId = t.id -// navigatePageTo() - navigatePageTo() + navigatePageTo() } }) } 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 c9fa134..c63c6c3 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 @@ -206,7 +206,7 @@ override fun onOpen(webSocket: WebSocket, response: Response) { super.onOpen(webSocket, response) this@EnvironmentActivity.webSocket = webSocket - isWebSocketConnected = false + isWebSocketConnected = true lifecycleScope.launch(Dispatchers.Main) { weakReferenceHandler.sendEmptyMessage(LocaleConstant.WEBSOCKET_CONNECTED_CODE) } diff --git a/app/src/main/java/com/casic/br/operationsite/view/check/SuppliesActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/check/SuppliesActivity.kt index b93c694..9688a09 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/check/SuppliesActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/check/SuppliesActivity.kt @@ -103,6 +103,7 @@ constructionCheckViewModel.setCurrentPhase("before_operation_protection") //播放RTSP流 binding.videoView.setVideoURI(Uri.parse("rtsp://192.168.10.137:554")) + binding.stepView.text = "稍后开始检查第一项:四合一,请准备" } private fun initWebSocket() { @@ -118,7 +119,7 @@ override fun onOpen(webSocket: WebSocket, response: Response) { super.onOpen(webSocket, response) this@SuppliesActivity.webSocket = webSocket - isWebSocketConnected = false + isWebSocketConnected = true lifecycleScope.launch(Dispatchers.Main) { weakReferenceHandler.sendEmptyMessage(LocaleConstant.WEBSOCKET_CONNECTED_CODE) } @@ -191,21 +192,28 @@ recyclerViewImages.add(imagePath) imageAdapter.notifyDataSetChanged() - if (recyclerViewImages.size == 6) { - AlertControlDialog.Builder() - .setContext(this) - .setTitle("温馨提示") - .setMessage("检测到施工前劳保用品准备完毕,是否开始施工?") - .setNegativeButton("取消") - .setPositiveButton("确定") - .setOnDialogButtonClickListener(object : - AlertControlDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - navigatePageTo() - } + when (recyclerViewImages.size) { + 1 -> binding.stepView.text = "稍后开始检第二项:防护面罩,请准备" + 2 -> binding.stepView.text = "稍后开始检第三项:安全帽,请准备" + 3 -> binding.stepView.text = "稍后开始检第四项:闪光灯,请准备" + 4 -> binding.stepView.text = "稍后开始检第五项:鼓风机,请准备" + 5 -> binding.stepView.text = "稍后开始检第六项:三脚架,请准备" + 6 -> { + AlertControlDialog.Builder() + .setContext(this) + .setTitle("温馨提示") + .setMessage("检测到施工前劳保用品准备完毕,是否开始施工?") + .setNegativeButton("取消") + .setPositiveButton("确定") + .setOnDialogButtonClickListener(object : + AlertControlDialog.OnDialogButtonClickListener { + override fun onConfirmClick() { + navigatePageTo() + } - override fun onCancelClick() {} - }).build().show() + override fun onCancelClick() {} + }).build().show() + } } } catch (e: Exception) { e.printStackTrace() diff --git a/app/src/main/res/layout/activity_supplies.xml b/app/src/main/res/layout/activity_supplies.xml index c2a4c1c..3ed8cde 100644 --- a/app/src/main/res/layout/activity_supplies.xml +++ b/app/src/main/res/layout/activity_supplies.xml @@ -52,11 +52,19 @@ android:layout_marginVertical="@dimen/dp_15" android:layout_weight="1" /> + +