Browse Source

Updated.

develop
Mingcai SHEN 3 years ago
parent
commit
f38cc014f9
3 changed files with 18 additions and 8 deletions
  1. +2
    -2
      data.go
  2. +9
    -4
      recog.go
  3. +7
    -2
      scene.go

+ 2
- 2
data.go
File diff suppressed because it is too large
View File


+ 9
- 4
recog.go View File

@ -60,11 +60,16 @@ func setTestCmd(c *fiber.Ctx) error {
return failureResponse(c, "3", e.Error(), 200) return failureResponse(c, "3", e.Error(), 200)
} }
case "STOP": case "STOP":
testStopChannel <- true
log.Println("STOP ...")
if nil != testStopChannel {
testStopChannel <- true
log.Println("STOP ...")
}
case "CANCEL": case "CANCEL":
testStopChannel <- true
log.Println("CANCEL ...")
if nil != testStopChannel {
testStopChannel <- true
log.Println("CANCEL ...")
}
default: default:
log.Println("UNKNOWN ...") log.Println("UNKNOWN ...")
} }

+ 7
- 2
scene.go View File

@ -72,8 +72,12 @@ func setScene(c *fiber.Ctx) error {
} }
func stopScene(c *fiber.Ctx) error { func stopScene(c *fiber.Ctx) error {
currentScene = nil
sceneStopChannel <- true
if nil != testStopChannel {
testStopChannel <- true
}
if nil != sceneStopChannel {
sceneStopChannel <- true
}
return successResponse(c, "Updated successfully.") return successResponse(c, "Updated successfully.")
} }
@ -130,6 +134,7 @@ func sceneTaskProc(cmd *SceneCommand) error {
case <-sceneStopChannel: case <-sceneStopChannel:
log.Println("Scene Stopping...") log.Println("Scene Stopping...")
go pushEvent(cmd.PushUrl, cmd.Scene, 0, "SCENE END", false, false) go pushEvent(cmd.PushUrl, cmd.Scene, 0, "SCENE END", false, false)
currentScene = nil
return return
} }
} }

Loading…
Cancel
Save