update
This commit is contained in:
parent
f85d227a71
commit
d1f0eb3487
10
lib/ai.go
10
lib/ai.go
@ -11,7 +11,7 @@ import (
|
||||
type myAI struct {
|
||||
robots []*Robot
|
||||
scenes []*scene
|
||||
callers []ICaller
|
||||
iscenes []IScene
|
||||
tickets Tickets //票池
|
||||
robotCount uint32 //机器人数量
|
||||
lock sync.Mutex //
|
||||
@ -51,14 +51,14 @@ func (m *myAI) init() error {
|
||||
}
|
||||
|
||||
//启动时载入所有Caller
|
||||
func (m *myAI) LoadCallers() []ICaller {
|
||||
return m.callers
|
||||
func (m *myAI) LoadCallers() []IScene {
|
||||
return m.iscenes
|
||||
|
||||
}
|
||||
|
||||
// 初始化caller
|
||||
func (m *myAI) InitCaller(callers ...ICaller) {
|
||||
m.callers = append(m.callers, callers...)
|
||||
func (m *myAI) InitCaller(scenes ...IScene) {
|
||||
m.iscenes = append(m.iscenes, scenes...)
|
||||
}
|
||||
|
||||
// 加入机器人
|
||||
|
15
main.go
15
main.go
@ -10,13 +10,13 @@ import (
|
||||
"fyne.io/fyne/canvas"
|
||||
"fyne.io/fyne/v2/app"
|
||||
"github.com/sirupsen/logrus"
|
||||
"legu.airobot/busi/friend"
|
||||
"legu.airobot/busi"
|
||||
"legu.airobot/lib"
|
||||
"legu.airobot/theme"
|
||||
"legu.airobot/ui"
|
||||
)
|
||||
|
||||
var callers []lib.ICaller
|
||||
var scenes []lib.IScene
|
||||
|
||||
func init() {
|
||||
_ = os.Setenv("FYNE_SCALE", "0.9")
|
||||
@ -27,9 +27,8 @@ func init() {
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
registerCalls(
|
||||
&friend.FriendRecommend{},
|
||||
&friend.FriendApply{},
|
||||
registerScenes(
|
||||
&busi.FriendScene{},
|
||||
)
|
||||
}
|
||||
|
||||
@ -37,7 +36,7 @@ func main() {
|
||||
app := app.NewWithID("aiRobot")
|
||||
app.SetIcon(theme.ResourceAppPng)
|
||||
|
||||
appUI, err := ui.NewUI(app, callers)
|
||||
appUI, err := ui.NewUI(app, scenes)
|
||||
if err != nil {
|
||||
w := fyne.CurrentApp().NewWindow("错误")
|
||||
w.SetContent(canvas.NewText(err.Error(), color.RGBA{255, 0, 0, 255}))
|
||||
@ -76,6 +75,6 @@ func setupLogger() (err error) {
|
||||
return nil
|
||||
}
|
||||
|
||||
func registerCalls(params ...lib.ICaller) {
|
||||
callers = append(callers, params...)
|
||||
func registerScenes(params ...lib.IScene) {
|
||||
scenes = append(scenes, params...)
|
||||
}
|
||||
|
@ -1 +0,0 @@
|
||||
{"level":"debug","msg":"配置","time":"2022-12-12 10:38:50","场景":[{"id":"799348400","name":"场景1","desc":"111","callers":[{"id":"799348400_1670808209409441100","name":"好友推荐","key":"friend.randlist","num":1}]},{"id":"261021700","name":"登录","callers":[{"id":"261021700_1670808329010907700","name":"好友申请","key":"friend.apply"}],"status":1}]}
|
@ -16,9 +16,7 @@ func TestAction(t *testing.T) {
|
||||
//注册caller
|
||||
friend_recommend := &friend.FriendRecommend{}
|
||||
friend_recommend.Desc = ""
|
||||
ai.InitCaller(
|
||||
friend_recommend,
|
||||
)
|
||||
ai.InitCaller()
|
||||
|
||||
// 创建场景
|
||||
scene := lib.NewScene(ai, lib.SceneParam{
|
||||
|
@ -122,7 +122,7 @@ func (mw *MainWindow) startContainer() {
|
||||
dialog.ShowError(err, mw.w)
|
||||
return
|
||||
}
|
||||
ai.InitCaller(mw.callers...)
|
||||
ai.InitCaller(mw.scenes...)
|
||||
}
|
||||
content := container.NewCenter(startBtn)
|
||||
mw.changeContent(content)
|
||||
@ -484,7 +484,7 @@ func (mw *MainWindow) sceneContainer() {
|
||||
}
|
||||
registerCallerList.ListWidget = registerCallerList.CreateList()
|
||||
registerCallerReload := func() {
|
||||
for _, v := range mw.UIImpl.callers {
|
||||
for _, v := range mw.UIImpl.scenes {
|
||||
info := v.Info()
|
||||
item := lib.Item{
|
||||
Id: info.Name,
|
||||
|
6
ui/ui.go
6
ui/ui.go
@ -15,10 +15,10 @@ type UIImpl struct {
|
||||
app fyne.App
|
||||
storage storage.Storage
|
||||
config *storage.Config
|
||||
callers []lib.ICaller
|
||||
scenes []lib.IScene
|
||||
}
|
||||
|
||||
func NewUI(app fyne.App, callers []lib.ICaller) (*UIImpl, error) {
|
||||
func NewUI(app fyne.App, scenes []lib.IScene) (*UIImpl, error) {
|
||||
app.Settings().SetTheme(&theme.MyTheme{})
|
||||
|
||||
storage, err := storage.NewOSStorage()
|
||||
@ -38,7 +38,7 @@ func NewUI(app fyne.App, callers []lib.ICaller) (*UIImpl, error) {
|
||||
app: app,
|
||||
storage: storage,
|
||||
config: config,
|
||||
callers: callers,
|
||||
scenes: scenes,
|
||||
}, nil
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user