From d758042ab52dd357125c4e94ba248adf23790a4f Mon Sep 17 00:00:00 2001 From: shaoying Date: Wed, 13 Jan 2021 08:39:47 +0800 Subject: [PATCH] add camera --- core/chat/meet.go | 19 ++++++++++++++++++- core/chat/search.go | 2 +- type.go | 3 ++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/core/chat/meet.go b/core/chat/meet.go index de429679..bf4fcd36 100644 --- a/core/chat/meet.go +++ b/core/chat/meet.go @@ -3,11 +3,13 @@ package chat import ( ice "github.com/shylinux/icebergs" "github.com/shylinux/icebergs/base/mdb" + "github.com/shylinux/icebergs/base/tcp" kit "github.com/shylinux/toolkits" ) const ( - MISS = "miss" + MISS = "miss" + MEDIA = "media" ) const MEET = "meet" @@ -21,6 +23,21 @@ func init() { ice.CTX_INIT: {Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { m.Load() }}, ice.CTX_EXIT: {Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { m.Save() }}, + MEDIA: {Name: "media name auto open snapshot", Help: "视频会议", Meta: kit.Dict( + "display", "/plugin/local/chat/media.js", + ), Action: map[string]*ice.Action{ + tcp.OPEN: {Name: "open", Help: "打开摄相头", Hand: func(m *ice.Message, arg ...string) { + m.Cmdy(mdb.IMPORT, m.Prefix(MISS), "", mdb.HASH) + }}, + "snapshot": {Name: "snapshot", Help: "拍照", Hand: func(m *ice.Message, arg ...string) { + m.Cmdy(mdb.IMPORT, m.Prefix(MISS), "", mdb.HASH) + }}, + mdb.IMPORT: {Name: "import", Help: "导入", Hand: func(m *ice.Message, arg ...string) { + m.Cmdy(mdb.IMPORT, m.Prefix(MISS), "", mdb.HASH) + }}, + }, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { + + }}, MISS: {Name: "miss name auto create", Help: "资料", Action: map[string]*ice.Action{ mdb.CREATE: {Name: "create name 照片 性别 年龄 身高 体重 籍贯 户口 学历 学校 职业 公司 年薪 资产 家境", Help: "添加", Hand: func(m *ice.Message, arg ...string) { m.Cmdy(mdb.INSERT, m.Prefix(MISS), "", mdb.HASH, arg) diff --git a/core/chat/search.go b/core/chat/search.go index 6d94b4d9..61304692 100644 --- a/core/chat/search.go +++ b/core/chat/search.go @@ -27,7 +27,7 @@ func init() { m.PushSearch(kit.SSH_CMD, P_SEARCH, value) }) }}, - mdb.PLUGIN: {Name: "plugin", Help: "插件", Hand: func(m *ice.Message, arg ...string) { + ctx.COMMAND: {Name: "command", Help: "命令", Hand: func(m *ice.Message, arg ...string) { if len(arg) > 0 && arg[0] == "run" { m.Cmdy(arg[1:]) return diff --git a/type.go b/type.go index ab8bf5aa..6e2d50e8 100644 --- a/type.go +++ b/type.go @@ -101,6 +101,7 @@ func (c *Context) _hand(m *Message, cmd *Command, key string, k string, h *Actio } } } + if h.Hand == nil { m.Cmdy(kit.Split(h.Name), arg) } else { @@ -119,7 +120,7 @@ func (c *Context) cmd(m *Message, cmd *Command, key string, arg ...string) *Mess return c._hand(m, cmd, key, arg[1], h, arg[2:]...) } } - if len(arg) > 0 && cmd.Action != nil { + if len(arg) > 0 && arg[0] != "command" && cmd.Action != nil { if h, ok := cmd.Action[arg[0]]; ok { return c._hand(m, cmd, key, arg[0], h, arg[1:]...) }