tool

2022-09-14 19:12:35 +08:00 · 2022-09-14 19:12:35 +08:00 · 05fff27c2f
commit 05fff27c2f
parent 7ed1a5ad60
6 changed files with 52 additions and 25 deletions
--- a/cmd/v2/ui/app_monitor.go
+++ b/cmd/v2/ui/app_monitor.go
@ -30,7 +30,7 @@ type appMonitor struct {

 func (this *appMonitor) LazyInit(obs observer.Observer) error {
 	this.obs = obs
-	this.tabItem = container.NewTabItemWithIcon(common.TOOLBAR_MONITOR, theme.ComputerIcon(), nil)
+	this.tabItem = container.NewTabItemWithIcon(common.TOOLBAR_MONITOR, theme.MediaVideoIcon(), nil)

 	content := container.NewMax()
 	content.Objects = []fyne.CanvasObject{}
--- a/cmd/v2/ui/app_testcase.go
+++ b/cmd/v2/ui/app_testcase.go
@ -29,7 +29,7 @@ func (a *appTester) disEnabled(t *model.TestCase) bool {
 }

 func (a *appTester) LazyInit(obs observer.Observer) error {
-	a.tabItem = container.NewTabItemWithIcon(common.TOOLBAR_TESTER, theme.AccountIcon(), nil)
+	a.tabItem = container.NewTabItemWithIcon(common.TOOLBAR_TESTER, theme.DocumentIcon(), nil)

 	content := container.NewMax()
 	title := widget.NewLabel(common.APP_TESTCASE_TITLE)
--- a/cmd/v2/ui/mainwindow.go
+++ b/cmd/v2/ui/mainwindow.go
@ -85,14 +85,14 @@ func (ui *MainWindowImpl) createWindowContainer() {

 	// tool bar
 	toolbar := widget.NewToolbar(
-		widget.NewToolbarAction(theme.ComputerIcon(), func() {
+		widget.NewToolbarAction(theme.MediaVideoIcon(), func() {
 			openApp2(common.TOOLBAR_MONITOR)
 		}),
-		widget.NewToolbarAction(theme.AccountIcon(), func() {
+		widget.NewToolbarAction(theme.DocumentIcon(), func() {
 			openApp2(common.TOOLBAR_TESTER)
 		}),
 		widget.NewToolbarSeparator(),
-		widget.NewToolbarAction(theme.ContentClearIcon(), func() {
+		widget.NewToolbarAction(theme.FileIcon(), func() {
 			newLogViewer().Win.Show()
 		}),
 		widget.NewToolbarSpacer(),
--- a/cmd/v2/ui/protocol.go
+++ b/cmd/v2/ui/protocol.go
@ -58,6 +58,7 @@ var (
 		ff(comm.ModuleHero, hero.HeroSubTypeList):  &formview.HeroListView{},
 		ff(comm.ModuleHero, hero.StrengthenUplv):   &formview.HeroStrengthenUplvView{},
 		ff(comm.ModuleHero, hero.StrengthenUpStar): &formview.HeroStrengthenUpStarView{},
+		ff(comm.ModuleHero, hero.DrawCard):         &formview.HeroZhaomuView{},
 		//equip
 		ff(comm.ModuleEquipment, "getlist"): &formview.EquipListView{},
 		ff(comm.ModuleEquipment, "equip"):   &formview.EquipUpDownView{},
@ -70,8 +71,8 @@ var (
 		ff(comm.ModuleFriend, friend.FriendSubTypeAddBlack):  &formview.FriendAddBlackView{},
 		ff(comm.ModuleFriend, friend.FriendSubTypeDelBlack):  &formview.FriendDelblackView{},
 		ff(comm.ModuleFriend, friend.FriendSubTypeSearch):    &formview.FriendSearchView{},
-		ff(comm.ModuleFriend, friend.FriendSubTypeZanList):   &formview.FriendZanView{},
-		ff(comm.ModuleFriend, friend.FriendSubTypeRandList):  &formview.FriendRandListView{},
+		// ff(comm.ModuleFriend, friend.FriendSubTypeZanList):   &formview.FriendZanView{},
+		ff(comm.ModuleFriend, friend.FriendSubTypeRandList): &formview.FriendRandListView{},
 		// shop
 		ff(comm.ModuleShop, "getlist"): &formview.ShopListView{},
 		ff(comm.ModuleShop, "buy"):     &formview.ShopBuyView{},
@ -82,11 +83,13 @@ var (
 		// pagoda
 		ff(comm.ModulePagoda, "getlist"): &formview.PagodaListView{},
 		// rtask
-		ff(comm.ModuleRtask, rtask.RtaskSubTypeList):   &formview.RtaskListView{},
-		ff(comm.ModuleRtask, rtask.RtaskSubTypeApply):  &formview.RtaskDoitView{},
-		ff(comm.ModuleRtask, rtask.RtaskSubTypeChoose): &formview.RtaskChooseView{},
-		ff(comm.ModuleRtask, rtask.RtaskSubTypeReward): &formview.RtaskRewardView{},
-		ff(comm.ModuleRtask, "rtest"):                  &formview.RtaskTestView{},
+		ff(comm.ModuleRtask, rtask.RtaskSubTypeList):         &formview.RtaskListView{},
+		ff(comm.ModuleRtask, rtask.RtaskSubTypeApply):        &formview.RtaskDoitView{},
+		ff(comm.ModuleRtask, rtask.RtaskSubTypeChoose):       &formview.RtaskChooseView{},
+		ff(comm.ModuleRtask, rtask.RtaskSubTypeReward):       &formview.RtaskRewardView{},
+		ff(comm.ModuleRtask, "rtest"):                        &formview.RtaskTestView{},
+		ff(comm.ModuleRtask, rtask.RtaskSubTypeBattleStart):  &formview.RtaskBattlestartView{},
+		ff(comm.ModuleRtask, rtask.RtaskSubTypeBattleFinish): &formview.RtaskBattleFinishView{},
 		// linestory
 		ff(comm.ModuleLinestory, linestory.LinestorySubTypeDostart): &formview.LinestoryStartView{},
 		ff(comm.ModuleLinestory, linestory.LinestorySubTypeDotask):  &formview.LinestoryTaskView{},
@ -136,6 +139,7 @@ var (
 			ff(comm.ModuleHero, hero.HeroSubTypeList),
 			ff(comm.ModuleHero, hero.StrengthenUplv),
 			ff(comm.ModuleHero, hero.StrengthenUpStar),
+			ff(comm.ModuleHero, hero.DrawCard),
 		},
 		"equipment": {
 			ff(comm.ModuleEquipment, "getlist"),
@ -155,7 +159,7 @@ var (
 			ff(comm.ModuleFriend, friend.FriendSubTypeAddBlack),
 			ff(comm.ModuleFriend, friend.FriendSubTypeDelBlack),
 			ff(comm.ModuleFriend, friend.FriendSubTypeSearch),
-			ff(comm.ModuleFriend, friend.FriendSubTypeZanList),
+			// ff(comm.ModuleFriend, friend.FriendSubTypeZanList),
 			ff(comm.ModuleFriend, friend.FriendSubTypeRandList),
 		},
 		"shop": {
@ -176,6 +180,8 @@ var (
 			ff(comm.ModuleRtask, rtask.RtaskSubTypeChoose),
 			ff(comm.ModuleRtask, rtask.RtaskSubTypeReward),
 			ff(comm.ModuleRtask, "rtest"),
+			ff(comm.ModuleRtask, rtask.RtaskSubTypeBattleStart),
+			ff(comm.ModuleRtask, rtask.RtaskSubTypeBattleFinish),
 		},
 		"linestory": {
 			ff(comm.ModuleLinestory, linestory.LinestorySubTypeDostart),
@ -410,6 +416,13 @@ var (
 			Rsp:      &pb.HeroStrengthenUpStarResp{},
 			Enabled:  true,
 		},
+		ff(comm.ModuleHero, hero.DrawCard): {
+			NavLabel: "招募",
+			Desc:     "抽卡招募",
+			MainType: string(comm.ModuleHero),
+			SubType:  hero.DrawCard,
+			Enabled:  true,
+		},
 		//equipment
 		string(comm.ModuleEquipment): {
 			NavLabel: "装备",
@ -513,13 +526,13 @@ var (
 			Rsp:      &pb.FriendSearchResp{},
 			Enabled:  true,
 		},
-		ff(comm.ModuleFriend, friend.FriendSubTypeZanList): {
-			NavLabel: "好友点赞",
-			Desc:     "点赞好友",
-			MainType: string(comm.ModuleFriend),
-			SubType:  friend.FriendSubTypeZanList,
-			Enabled:  true,
-		},
+		// ff(comm.ModuleFriend, friend.FriendSubTypeZanList): {
+		// 	NavLabel: "好友点赞",
+		// 	Desc:     "点赞好友",
+		// 	MainType: string(comm.ModuleFriend),
+		// 	SubType:  friend.FriendSubTypeZanList,
+		// 	Enabled:  true,
+		// },
 		//shop
 		string(comm.ModuleShop): {
 			NavLabel: "商店",
@ -613,6 +626,20 @@ var (
 			SubType:  rtask.RtaskSubTypeReward,
 			Enabled:  true,
 		},
+		ff(comm.ModuleRtask, rtask.RtaskSubTypeBattleStart): {
+			NavLabel: "战斗开始",
+			Desc:     "战斗开始",
+			MainType: string(comm.ModuleRtask),
+			SubType:  rtask.RtaskSubTypeBattleStart,
+			Enabled:  true,
+		},
+		ff(comm.ModuleRtask, rtask.RtaskSubTypeBattleFinish): {
+			NavLabel: "战斗结束",
+			Desc:     "战斗结束",
+			MainType: string(comm.ModuleRtask),
+			SubType:  rtask.RtaskSubTypeBattleFinish,
+			Enabled:  true,
+		},
 		ff(comm.ModuleRtask, "rtest"): {
 			NavLabel: "测试",
 			Desc:     "测试任务触发",
--- a/cmd/v2/ui/toy_datetime.go
+++ b/cmd/v2/ui/toy_datetime.go
@ -1,7 +1,6 @@
 package ui

 import (
-	"go_dreamfactory/cmd/v2/lib/common"
 	"go_dreamfactory/cmd/v2/service/observer"
 	"time"

@ -30,14 +29,14 @@ func (tdt *toyDateTime) Init(obs observer.Observer) error {
 	tdt.time = canvas.NewText("", nil)
 	tdt.time.TextSize = 42

-	tdt.widget = widget.NewCard("", common.DATETIME,
+	tdt.widget = widget.NewCard("", "",
 		container.NewVBox(
 			container.NewHBox(layout.NewSpacer(), tdt.date, tdt.week, layout.NewSpacer()),
 			container.NewCenter(tdt.time),
 		),
 	)

-	tdt.widget.Resize(fyne.NewSize(ToyWidth, 130))
+	tdt.widget.Resize(fyne.NewSize(ToyWidth, 100))

 	// for init
 	tdt.Run()
--- a/cmd/v2/ui/toy_userinfo.go
+++ b/cmd/v2/ui/toy_userinfo.go
@ -15,6 +15,7 @@ import (
 	"fyne.io/fyne/v2/container"
 	"fyne.io/fyne/v2/data/binding"
 	"fyne.io/fyne/v2/layout"
+	"fyne.io/fyne/v2/theme"
 	"fyne.io/fyne/v2/widget"
 	"github.com/atotto/clipboard"
 	"github.com/sirupsen/logrus"
@ -41,7 +42,7 @@ func (this *toyUserInfo) Init(obs observer.Observer) error {
 	this.data = binding.BindStringList(&[]string{})

 	// 复制UID button
-	this.copyBtn = widget.NewButton(common.USERINFO_BTN_COPY, func() {
+	this.copyBtn = widget.NewButtonWithIcon("", theme.ContentCopyIcon(), func() {
 		if this.userInfo != nil && this.userInfo.DbUser != nil {
 			_ = clipboard.WriteAll(this.userInfo.DbUser.Uid)
 		}
@ -49,7 +50,7 @@ func (this *toyUserInfo) Init(obs observer.Observer) error {
 	this.copyBtn.Disable()

 	// 刷新
-	this.refreshBtn = widget.NewButton(common.USERINFO_BTN_REFRESH, func() {
+	this.refreshBtn = widget.NewButtonWithIcon("", theme.ViewRefreshIcon(), func() {
 		if err := service.GetPttService().SendToClient(
 			string(comm.ModuleUser),
 			user.UserSubTypeInfo,