diff --git a/app/src/main/assets/DeviceCommand.json b/app/src/main/assets/DeviceCommand.json index 8dd80f4..41f0680 100644 --- a/app/src/main/assets/DeviceCommand.json +++ b/app/src/main/assets/DeviceCommand.json @@ -16,10 +16,6 @@ "command": "AA 01 00 93 1A 00 AE" }, { - "type": "甲烷报警", - "command": "AA 01 00 93 02 00 96" - }, - { "type": "不安全行为报警", "command": "AA 01 00 93 01 00 95" }, diff --git a/app/src/main/assets/DeviceCommand.json b/app/src/main/assets/DeviceCommand.json index 8dd80f4..41f0680 100644 --- a/app/src/main/assets/DeviceCommand.json +++ b/app/src/main/assets/DeviceCommand.json @@ -16,10 +16,6 @@ "command": "AA 01 00 93 1A 00 AE" }, { - "type": "甲烷报警", - "command": "AA 01 00 93 02 00 96" - }, - { "type": "不安全行为报警", "command": "AA 01 00 93 01 00 95" }, diff --git a/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitService.kt index 48ebbdb..5367e1b 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitService.kt @@ -71,6 +71,7 @@ @GET("/emergency/notifyStageFinished") suspend fun notifyStageFinished( @Header("token") token: String, + @Query("operationId") operationId: String?, @Query("stage") stage: String ): String diff --git a/app/src/main/assets/DeviceCommand.json b/app/src/main/assets/DeviceCommand.json index 8dd80f4..41f0680 100644 --- a/app/src/main/assets/DeviceCommand.json +++ b/app/src/main/assets/DeviceCommand.json @@ -16,10 +16,6 @@ "command": "AA 01 00 93 1A 00 AE" }, { - "type": "甲烷报警", - "command": "AA 01 00 93 02 00 96" - }, - { "type": "不安全行为报警", "command": "AA 01 00 93 01 00 95" }, diff --git a/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitService.kt index 48ebbdb..5367e1b 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitService.kt @@ -71,6 +71,7 @@ @GET("/emergency/notifyStageFinished") suspend fun notifyStageFinished( @Header("token") token: String, + @Query("operationId") operationId: String?, @Query("stage") stage: String ): String diff --git a/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitServiceManager.kt index b1097f8..b1946bf 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitServiceManager.kt @@ -90,8 +90,10 @@ /** * 上报每个大阶段场景 */ - suspend fun notifyStageFinished(stage: String): String { - return api.notifyStageFinished(AuthenticationHelper.token!!, stage) + suspend fun notifyStageFinished(operationId: String?, stage: String): String { + return api.notifyStageFinished( + AuthenticationHelper.token!!, operationId, stage + ) } /** diff --git a/app/src/main/assets/DeviceCommand.json b/app/src/main/assets/DeviceCommand.json index 8dd80f4..41f0680 100644 --- a/app/src/main/assets/DeviceCommand.json +++ b/app/src/main/assets/DeviceCommand.json @@ -16,10 +16,6 @@ "command": "AA 01 00 93 1A 00 AE" }, { - "type": "甲烷报警", - "command": "AA 01 00 93 02 00 96" - }, - { "type": "不安全行为报警", "command": "AA 01 00 93 01 00 95" }, diff --git a/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitService.kt index 48ebbdb..5367e1b 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitService.kt @@ -71,6 +71,7 @@ @GET("/emergency/notifyStageFinished") suspend fun notifyStageFinished( @Header("token") token: String, + @Query("operationId") operationId: String?, @Query("stage") stage: String ): String diff --git a/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitServiceManager.kt index b1097f8..b1946bf 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitServiceManager.kt @@ -90,8 +90,10 @@ /** * 上报每个大阶段场景 */ - suspend fun notifyStageFinished(stage: String): String { - return api.notifyStageFinished(AuthenticationHelper.token!!, stage) + suspend fun notifyStageFinished(operationId: String?, stage: String): String { + return api.notifyStageFinished( + AuthenticationHelper.token!!, operationId, stage + ) } /** diff --git a/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt b/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt index 18e43a3..d8c25e3 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt @@ -61,7 +61,7 @@ "指令发送失败，请确认是否处于同一网段".show(this) return@setOnClickListener } - sceneViewModel.notifyStageFinished("Environment") + sceneViewModel.notifyStageFinished(null, "Environment") //下发指令 SocketManager.get.send(LocaleConstant.CONFIRM_AIR_COMMAND) @@ -74,8 +74,6 @@ override fun initOnCreate(savedInstanceState: Bundle?) { ActivityStackManager.addActivity(this) - RuntimeCache.currentScene = CurrentScene.Disclosure - constructionCheckViewModel = ViewModelProvider(this)[ConstructionCheckViewModel::class.java] sceneViewModel = ViewModelProvider(this)[SceneViewModel::class.java] airViewModel = ViewModelProvider(this)[AirViewModel::class.java] @@ -143,4 +141,9 @@ } }) } + + override fun onResume() { + super.onResume() + RuntimeCache.currentScene = CurrentScene.Disclosure + } } \ No newline at end of file diff --git a/app/src/main/assets/DeviceCommand.json b/app/src/main/assets/DeviceCommand.json index 8dd80f4..41f0680 100644 --- a/app/src/main/assets/DeviceCommand.json +++ b/app/src/main/assets/DeviceCommand.json @@ -16,10 +16,6 @@ "command": "AA 01 00 93 1A 00 AE" }, { - "type": "甲烷报警", - "command": "AA 01 00 93 02 00 96" - }, - { "type": "不安全行为报警", "command": "AA 01 00 93 01 00 95" }, diff --git a/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitService.kt index 48ebbdb..5367e1b 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitService.kt @@ -71,6 +71,7 @@ @GET("/emergency/notifyStageFinished") suspend fun notifyStageFinished( @Header("token") token: String, + @Query("operationId") operationId: String?, @Query("stage") stage: String ): String diff --git a/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitServiceManager.kt index b1097f8..b1946bf 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitServiceManager.kt @@ -90,8 +90,10 @@ /** * 上报每个大阶段场景 */ - suspend fun notifyStageFinished(stage: String): String { - return api.notifyStageFinished(AuthenticationHelper.token!!, stage) + suspend fun notifyStageFinished(operationId: String?, stage: String): String { + return api.notifyStageFinished( + AuthenticationHelper.token!!, operationId, stage + ) } /** diff --git a/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt b/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt index 18e43a3..d8c25e3 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt @@ -61,7 +61,7 @@ "指令发送失败，请确认是否处于同一网段".show(this) return@setOnClickListener } - sceneViewModel.notifyStageFinished("Environment") + sceneViewModel.notifyStageFinished(null, "Environment") //下发指令 SocketManager.get.send(LocaleConstant.CONFIRM_AIR_COMMAND) @@ -74,8 +74,6 @@ override fun initOnCreate(savedInstanceState: Bundle?) { ActivityStackManager.addActivity(this) - RuntimeCache.currentScene = CurrentScene.Disclosure - constructionCheckViewModel = ViewModelProvider(this)[ConstructionCheckViewModel::class.java] sceneViewModel = ViewModelProvider(this)[SceneViewModel::class.java] airViewModel = ViewModelProvider(this)[AirViewModel::class.java] @@ -143,4 +141,9 @@ } }) } + + override fun onResume() { + super.onResume() + RuntimeCache.currentScene = CurrentScene.Disclosure + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/test/view/EnvironmentActivity.kt b/app/src/main/java/com/casic/br/operationsite/test/view/EnvironmentActivity.kt index 3ee8052..d5afc88 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/view/EnvironmentActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/view/EnvironmentActivity.kt @@ -133,8 +133,6 @@ override fun initOnCreate(savedInstanceState: Bundle?) { ActivityStackManager.addActivity(this) - RuntimeCache.currentScene = CurrentScene.Environment - weakReferenceHandler = WeakReferenceHandler(this) constructionCheckViewModel = ViewModelProvider(this)[ConstructionCheckViewModel::class.java] @@ -145,6 +143,7 @@ if (path.isNotBlank()) { val map = HashMap() map["id"] = RuntimeCache.uploadFileTaskId + map["deviceCode"] = "YTJ_010002" map["imageId"] = UUID.randomUUID().toString() map["scenario"] = "before_operation_environment" map["image"] = path @@ -242,5 +241,6 @@ super.onResume() GSYVideoManager.onResume() isConfirmedFirst = true + RuntimeCache.currentScene = CurrentScene.Environment } } \ No newline at end of file diff --git a/app/src/main/assets/DeviceCommand.json b/app/src/main/assets/DeviceCommand.json index 8dd80f4..41f0680 100644 --- a/app/src/main/assets/DeviceCommand.json +++ b/app/src/main/assets/DeviceCommand.json @@ -16,10 +16,6 @@ "command": "AA 01 00 93 1A 00 AE" }, { - "type": "甲烷报警", - "command": "AA 01 00 93 02 00 96" - }, - { "type": "不安全行为报警", "command": "AA 01 00 93 01 00 95" }, diff --git a/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitService.kt index 48ebbdb..5367e1b 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitService.kt @@ -71,6 +71,7 @@ @GET("/emergency/notifyStageFinished") suspend fun notifyStageFinished( @Header("token") token: String, + @Query("operationId") operationId: String?, @Query("stage") stage: String ): String diff --git a/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitServiceManager.kt index b1097f8..b1946bf 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitServiceManager.kt @@ -90,8 +90,10 @@ /** * 上报每个大阶段场景 */ - suspend fun notifyStageFinished(stage: String): String { - return api.notifyStageFinished(AuthenticationHelper.token!!, stage) + suspend fun notifyStageFinished(operationId: String?, stage: String): String { + return api.notifyStageFinished( + AuthenticationHelper.token!!, operationId, stage + ) } /** diff --git a/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt b/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt index 18e43a3..d8c25e3 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt @@ -61,7 +61,7 @@ "指令发送失败，请确认是否处于同一网段".show(this) return@setOnClickListener } - sceneViewModel.notifyStageFinished("Environment") + sceneViewModel.notifyStageFinished(null, "Environment") //下发指令 SocketManager.get.send(LocaleConstant.CONFIRM_AIR_COMMAND) @@ -74,8 +74,6 @@ override fun initOnCreate(savedInstanceState: Bundle?) { ActivityStackManager.addActivity(this) - RuntimeCache.currentScene = CurrentScene.Disclosure - constructionCheckViewModel = ViewModelProvider(this)[ConstructionCheckViewModel::class.java] sceneViewModel = ViewModelProvider(this)[SceneViewModel::class.java] airViewModel = ViewModelProvider(this)[AirViewModel::class.java] @@ -143,4 +141,9 @@ } }) } + + override fun onResume() { + super.onResume() + RuntimeCache.currentScene = CurrentScene.Disclosure + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/test/view/EnvironmentActivity.kt b/app/src/main/java/com/casic/br/operationsite/test/view/EnvironmentActivity.kt index 3ee8052..d5afc88 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/view/EnvironmentActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/view/EnvironmentActivity.kt @@ -133,8 +133,6 @@ override fun initOnCreate(savedInstanceState: Bundle?) { ActivityStackManager.addActivity(this) - RuntimeCache.currentScene = CurrentScene.Environment - weakReferenceHandler = WeakReferenceHandler(this) constructionCheckViewModel = ViewModelProvider(this)[ConstructionCheckViewModel::class.java] @@ -145,6 +143,7 @@ if (path.isNotBlank()) { val map = HashMap() map["id"] = RuntimeCache.uploadFileTaskId + map["deviceCode"] = "YTJ_010002" map["imageId"] = UUID.randomUUID().toString() map["scenario"] = "before_operation_environment" map["image"] = path @@ -242,5 +241,6 @@ super.onResume() GSYVideoManager.onResume() isConfirmedFirst = true + RuntimeCache.currentScene = CurrentScene.Environment } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt b/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt index cfdd73d..5ca1c8e 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt @@ -191,8 +191,6 @@ override fun initOnCreate(savedInstanceState: Bundle?) { ActivityStackManager.addActivity(this) - RuntimeCache.currentScene = CurrentScene.Guardian - weakReferenceHandler = WeakReferenceHandler(this) //动态设置rtspPlayerView宽高 @@ -369,5 +367,6 @@ override fun onResume() { super.onResume() GSYVideoManager.onResume() + RuntimeCache.currentScene = CurrentScene.Guardian } } \ No newline at end of file diff --git a/app/src/main/assets/DeviceCommand.json b/app/src/main/assets/DeviceCommand.json index 8dd80f4..41f0680 100644 --- a/app/src/main/assets/DeviceCommand.json +++ b/app/src/main/assets/DeviceCommand.json @@ -16,10 +16,6 @@ "command": "AA 01 00 93 1A 00 AE" }, { - "type": "甲烷报警", - "command": "AA 01 00 93 02 00 96" - }, - { "type": "不安全行为报警", "command": "AA 01 00 93 01 00 95" }, diff --git a/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitService.kt index 48ebbdb..5367e1b 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitService.kt @@ -71,6 +71,7 @@ @GET("/emergency/notifyStageFinished") suspend fun notifyStageFinished( @Header("token") token: String, + @Query("operationId") operationId: String?, @Query("stage") stage: String ): String diff --git a/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitServiceManager.kt index b1097f8..b1946bf 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitServiceManager.kt @@ -90,8 +90,10 @@ /** * 上报每个大阶段场景 */ - suspend fun notifyStageFinished(stage: String): String { - return api.notifyStageFinished(AuthenticationHelper.token!!, stage) + suspend fun notifyStageFinished(operationId: String?, stage: String): String { + return api.notifyStageFinished( + AuthenticationHelper.token!!, operationId, stage + ) } /** diff --git a/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt b/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt index 18e43a3..d8c25e3 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt @@ -61,7 +61,7 @@ "指令发送失败，请确认是否处于同一网段".show(this) return@setOnClickListener } - sceneViewModel.notifyStageFinished("Environment") + sceneViewModel.notifyStageFinished(null, "Environment") //下发指令 SocketManager.get.send(LocaleConstant.CONFIRM_AIR_COMMAND) @@ -74,8 +74,6 @@ override fun initOnCreate(savedInstanceState: Bundle?) { ActivityStackManager.addActivity(this) - RuntimeCache.currentScene = CurrentScene.Disclosure - constructionCheckViewModel = ViewModelProvider(this)[ConstructionCheckViewModel::class.java] sceneViewModel = ViewModelProvider(this)[SceneViewModel::class.java] airViewModel = ViewModelProvider(this)[AirViewModel::class.java] @@ -143,4 +141,9 @@ } }) } + + override fun onResume() { + super.onResume() + RuntimeCache.currentScene = CurrentScene.Disclosure + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/test/view/EnvironmentActivity.kt b/app/src/main/java/com/casic/br/operationsite/test/view/EnvironmentActivity.kt index 3ee8052..d5afc88 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/view/EnvironmentActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/view/EnvironmentActivity.kt @@ -133,8 +133,6 @@ override fun initOnCreate(savedInstanceState: Bundle?) { ActivityStackManager.addActivity(this) - RuntimeCache.currentScene = CurrentScene.Environment - weakReferenceHandler = WeakReferenceHandler(this) constructionCheckViewModel = ViewModelProvider(this)[ConstructionCheckViewModel::class.java] @@ -145,6 +143,7 @@ if (path.isNotBlank()) { val map = HashMap() map["id"] = RuntimeCache.uploadFileTaskId + map["deviceCode"] = "YTJ_010002" map["imageId"] = UUID.randomUUID().toString() map["scenario"] = "before_operation_environment" map["image"] = path @@ -242,5 +241,6 @@ super.onResume() GSYVideoManager.onResume() isConfirmedFirst = true + RuntimeCache.currentScene = CurrentScene.Environment } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt b/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt index cfdd73d..5ca1c8e 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt @@ -191,8 +191,6 @@ override fun initOnCreate(savedInstanceState: Bundle?) { ActivityStackManager.addActivity(this) - RuntimeCache.currentScene = CurrentScene.Guardian - weakReferenceHandler = WeakReferenceHandler(this) //动态设置rtspPlayerView宽高 @@ -369,5 +367,6 @@ override fun onResume() { super.onResume() GSYVideoManager.onResume() + RuntimeCache.currentScene = CurrentScene.Guardian } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/test/view/SuppliesActivity.kt b/app/src/main/java/com/casic/br/operationsite/test/view/SuppliesActivity.kt index f473f27..c2d2894 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/view/SuppliesActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/view/SuppliesActivity.kt @@ -151,8 +151,6 @@ override fun initOnCreate(savedInstanceState: Bundle?) { ActivityStackManager.addActivity(this) - RuntimeCache.currentScene = CurrentScene.Supply - weakReferenceHandler = WeakReferenceHandler(this) constructionCheckViewModel = ViewModelProvider(this)[ConstructionCheckViewModel::class.java] @@ -190,7 +188,7 @@ ) //左右边距 - imageAdapter = EditableImageAdapter(this, recyclerViewImages, videoWidth, 5, 3) + imageAdapter = EditableImageAdapter(this, recyclerViewImages, videoWidth, 6, 3) binding.recyclerView.addItemDecoration( RecyclerViewItemOffsets(marginOffset, marginOffset, marginOffset, marginOffset) ) @@ -223,7 +221,8 @@ 2 -> binding.stepView.text = "稍后开始检查第三项：灭火器，请准备" 3 -> binding.stepView.text = "稍后开始检查第四项：警示牌，请准备" 4 -> binding.stepView.text = "稍后开始检查第五项：鼓风机，请准备" - 5 -> AlertControlDialog.Builder() + 5 -> binding.stepView.text = "五必须检测完成" + 6 -> AlertControlDialog.Builder() .setContext(this) .setTitle("温馨提示") .setMessage("检测到施工前劳保用品准备完毕，是否开始施工交底？") @@ -231,7 +230,9 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - sceneViewModel.notifyStageFinished("Supply") + sceneViewModel.notifyStageFinished( + RuntimeCache.uploadFileTaskId, "Supply" + ) SocketManager.get.send(LocaleConstant.START_VIDEO_COMMAND) navigatePageTo() } @@ -280,5 +281,6 @@ override fun onResume() { super.onResume() GSYVideoManager.onResume() + RuntimeCache.currentScene = CurrentScene.Supply } } \ No newline at end of file diff --git a/app/src/main/assets/DeviceCommand.json b/app/src/main/assets/DeviceCommand.json index 8dd80f4..41f0680 100644 --- a/app/src/main/assets/DeviceCommand.json +++ b/app/src/main/assets/DeviceCommand.json @@ -16,10 +16,6 @@ "command": "AA 01 00 93 1A 00 AE" }, { - "type": "甲烷报警", - "command": "AA 01 00 93 02 00 96" - }, - { "type": "不安全行为报警", "command": "AA 01 00 93 01 00 95" }, diff --git a/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitService.kt index 48ebbdb..5367e1b 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitService.kt @@ -71,6 +71,7 @@ @GET("/emergency/notifyStageFinished") suspend fun notifyStageFinished( @Header("token") token: String, + @Query("operationId") operationId: String?, @Query("stage") stage: String ): String diff --git a/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitServiceManager.kt index b1097f8..b1946bf 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/retrofit/RetrofitServiceManager.kt @@ -90,8 +90,10 @@ /** * 上报每个大阶段场景 */ - suspend fun notifyStageFinished(stage: String): String { - return api.notifyStageFinished(AuthenticationHelper.token!!, stage) + suspend fun notifyStageFinished(operationId: String?, stage: String): String { + return api.notifyStageFinished( + AuthenticationHelper.token!!, operationId, stage + ) } /** diff --git a/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt b/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt index 18e43a3..d8c25e3 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt @@ -61,7 +61,7 @@ "指令发送失败，请确认是否处于同一网段".show(this) return@setOnClickListener } - sceneViewModel.notifyStageFinished("Environment") + sceneViewModel.notifyStageFinished(null, "Environment") //下发指令 SocketManager.get.send(LocaleConstant.CONFIRM_AIR_COMMAND) @@ -74,8 +74,6 @@ override fun initOnCreate(savedInstanceState: Bundle?) { ActivityStackManager.addActivity(this) - RuntimeCache.currentScene = CurrentScene.Disclosure - constructionCheckViewModel = ViewModelProvider(this)[ConstructionCheckViewModel::class.java] sceneViewModel = ViewModelProvider(this)[SceneViewModel::class.java] airViewModel = ViewModelProvider(this)[AirViewModel::class.java] @@ -143,4 +141,9 @@ } }) } + + override fun onResume() { + super.onResume() + RuntimeCache.currentScene = CurrentScene.Disclosure + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/test/view/EnvironmentActivity.kt b/app/src/main/java/com/casic/br/operationsite/test/view/EnvironmentActivity.kt index 3ee8052..d5afc88 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/view/EnvironmentActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/view/EnvironmentActivity.kt @@ -133,8 +133,6 @@ override fun initOnCreate(savedInstanceState: Bundle?) { ActivityStackManager.addActivity(this) - RuntimeCache.currentScene = CurrentScene.Environment - weakReferenceHandler = WeakReferenceHandler(this) constructionCheckViewModel = ViewModelProvider(this)[ConstructionCheckViewModel::class.java] @@ -145,6 +143,7 @@ if (path.isNotBlank()) { val map = HashMap() map["id"] = RuntimeCache.uploadFileTaskId + map["deviceCode"] = "YTJ_010002" map["imageId"] = UUID.randomUUID().toString() map["scenario"] = "before_operation_environment" map["image"] = path @@ -242,5 +241,6 @@ super.onResume() GSYVideoManager.onResume() isConfirmedFirst = true + RuntimeCache.currentScene = CurrentScene.Environment } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt b/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt index cfdd73d..5ca1c8e 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt @@ -191,8 +191,6 @@ override fun initOnCreate(savedInstanceState: Bundle?) { ActivityStackManager.addActivity(this) - RuntimeCache.currentScene = CurrentScene.Guardian - weakReferenceHandler = WeakReferenceHandler(this) //动态设置rtspPlayerView宽高 @@ -369,5 +367,6 @@ override fun onResume() { super.onResume() GSYVideoManager.onResume() + RuntimeCache.currentScene = CurrentScene.Guardian } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/test/view/SuppliesActivity.kt b/app/src/main/java/com/casic/br/operationsite/test/view/SuppliesActivity.kt index f473f27..c2d2894 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/view/SuppliesActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/view/SuppliesActivity.kt @@ -151,8 +151,6 @@ override fun initOnCreate(savedInstanceState: Bundle?) { ActivityStackManager.addActivity(this) - RuntimeCache.currentScene = CurrentScene.Supply - weakReferenceHandler = WeakReferenceHandler(this) constructionCheckViewModel = ViewModelProvider(this)[ConstructionCheckViewModel::class.java] @@ -190,7 +188,7 @@ ) //左右边距 - imageAdapter = EditableImageAdapter(this, recyclerViewImages, videoWidth, 5, 3) + imageAdapter = EditableImageAdapter(this, recyclerViewImages, videoWidth, 6, 3) binding.recyclerView.addItemDecoration( RecyclerViewItemOffsets(marginOffset, marginOffset, marginOffset, marginOffset) ) @@ -223,7 +221,8 @@ 2 -> binding.stepView.text = "稍后开始检查第三项：灭火器，请准备" 3 -> binding.stepView.text = "稍后开始检查第四项：警示牌，请准备" 4 -> binding.stepView.text = "稍后开始检查第五项：鼓风机，请准备" - 5 -> AlertControlDialog.Builder() + 5 -> binding.stepView.text = "五必须检测完成" + 6 -> AlertControlDialog.Builder() .setContext(this) .setTitle("温馨提示") .setMessage("检测到施工前劳保用品准备完毕，是否开始施工交底？") @@ -231,7 +230,9 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - sceneViewModel.notifyStageFinished("Supply") + sceneViewModel.notifyStageFinished( + RuntimeCache.uploadFileTaskId, "Supply" + ) SocketManager.get.send(LocaleConstant.START_VIDEO_COMMAND) navigatePageTo() } @@ -280,5 +281,6 @@ override fun onResume() { super.onResume() GSYVideoManager.onResume() + RuntimeCache.currentScene = CurrentScene.Supply } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/test/vm/SceneViewModel.kt b/app/src/main/java/com/casic/br/operationsite/test/vm/SceneViewModel.kt index 90da407..c09ac6e 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/vm/SceneViewModel.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/vm/SceneViewModel.kt @@ -5,7 +5,7 @@ import com.pengxh.kt.lite.extensions.launch class SceneViewModel : BaseViewModel() { - fun notifyStageFinished(stage: String) = launch({ - RetrofitServiceManager.notifyStageFinished(stage) + fun notifyStageFinished(operationId: String?, stage: String) = launch({ + RetrofitServiceManager.notifyStageFinished(operationId, stage) }) } \ No newline at end of file