mqtt加入认证,优化视频播放与浏览器

This commit is contained in:
2025-03-07 16:04:19 +08:00
parent c71e8bc13d
commit febcdfdbf7
13 changed files with 60 additions and 82 deletions

View File

@@ -16,11 +16,11 @@ func OnlyVideo(c *leaf.Context) {
defer utils.BlankClose()
if url, ok := payload.Game["video"]; ok {
local, err := utils.LinkVideo(url.(string))
path, local, err := utils.LinkVideo(url.(string))
if err != nil {
zap.S().Errorln("视频文件获取异常: ", err)
return
}
_ = video.Play(c, local)
_ = video.Play(c, path, local)
}
}

View File

@@ -12,7 +12,7 @@ import (
func Video(item schema.WaitItemModel) func(c context.Context) error {
return func(c context.Context) error {
local, err := utils.LinkVideo(item.Data)
path, local, err := utils.LinkVideo(item.Data)
if err != nil {
return fmt.Errorf("视频文件获取异常: %w", err)
}
@@ -24,7 +24,7 @@ func Video(item schema.WaitItemModel) func(c context.Context) error {
defer utils.BlankClose()
for {
err := video.Play(c, local)
err := video.Play(c, path, local)
if err != nil {
return fmt.Errorf("视频播放异常: %w", err)
}

View File

@@ -13,14 +13,11 @@ func Pause(ps *common.PauseSub, isPause bool, play func(c context.Context) error
run := true
if isPause {
p := make(chan int8)
defer close(p)
zap.S().Infoln("待机暂停控制器")
defer zap.S().Infoln("待机暂停控制器结束")
ps.Add(p)
defer ps.Remove(p)
zap.S().Infoln("待机控制器")
defer zap.S().Infoln("待机控制器结束")
p := ps.GetNew()
defer ps.Close(p)
// 等待组
var wait sync.WaitGroup

View File

@@ -25,6 +25,9 @@ func Time(rootRules []cronrange.Rule, cron string, play func(c context.Context)
a := make(chan bool)
defer close(a)
zap.S().Infoln("待机时间控制器")
defer zap.S().Infoln("待机时间控制器结束")
// 等待组
var waitGroup sync.WaitGroup
defer waitGroup.Wait()

View File

@@ -38,7 +38,7 @@ func WaitAction(ctrl *common.CtrlWait) leaf.HandlerFunc {
waitGroup.Add(1)
go func() {
defer waitGroup.Done()
ps.Run()
ps.Run(c)
}()
// 处理每个待机控制