updare

src/go.mod

@@ -5,7 +5,7 @@ go 1.20
 replace infish.cn/comm => ../comm
 
 require (
-	gioui.org v0.0.0-20210308172011-57750fc8a0a6
+	gioui.org v0.3.1
 	github.com/huaweicloud/huaweicloud-sdk-go-obs v3.23.9+incompatible
 	github.com/jessevdk/go-flags v1.5.0
 	github.com/natefinch/lumberjack v2.0.0+incompatible
@@ -16,6 +16,8 @@ require (
 )
 
 require (
+	gioui.org/cpu v0.0.0-20210817075930-8d6a761490d2 // indirect
+	gioui.org/shader v1.0.8 // indirect
 	github.com/StackExchange/wmi v1.2.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.2.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
@@ -23,6 +25,7 @@ require (
 	github.com/fsnotify/fsnotify v1.4.9 // indirect
 	github.com/go-ole/go-ole v1.2.5 // indirect
 	github.com/go-redis/redis/v8 v8.11.5 // indirect
+	github.com/go-text/typesetting v0.0.0-20230803102845-24e03d8b5372 // indirect
 	github.com/golang-migrate/migrate/v4 v4.15.2 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
@@ -52,8 +55,9 @@ require (
 	go.uber.org/atomic v1.10.0 // indirect
 	go.uber.org/multierr v1.6.0 // indirect
 	golang.org/x/crypto v0.7.0 // indirect
-	golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6 // indirect
-	golang.org/x/image v0.0.0-20210216034530-4410531fe030 // indirect
+	golang.org/x/exp v0.0.0-20221012211006-4de253d81b95 // indirect
+	golang.org/x/exp/shiny v0.0.0-20220827204233-334a2380cb91 // indirect
+	golang.org/x/image v0.5.0 // indirect
 	golang.org/x/net v0.8.0 // indirect
 	golang.org/x/sync v0.1.0 // indirect
 	golang.org/x/sys v0.6.0 // indirect

src/go.sum

@@ -49,8 +49,15 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-gioui.org v0.0.0-20210308172011-57750fc8a0a6 h1:K72hopUosKG3ntOPNG4OzzbuhxGuVf06fa2la1/H/Ho=
+eliasnaur.com/font v0.0.0-20230308162249-dd43949cb42d h1:ARo7NCVvN2NdhLlJE9xAbKweuI9L6UgfTbYb0YwPacY=
 gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8=
+gioui.org v0.3.1 h1:hslYkrkIWvx28Mxe3A87opl+8s9mnWsnWmPDh11+zco=
+gioui.org v0.3.1/go.mod h1:2atiYR4upH71/6ehnh6XsUELa7JZOrOHHNMDxGBZF0Q=
+gioui.org/cpu v0.0.0-20210808092351-bfe733dd3334/go.mod h1:A8M0Cn5o+vY5LTMlnRoK3O5kG+rH0kWfJjeKd9QpBmQ=
+gioui.org/cpu v0.0.0-20210817075930-8d6a761490d2 h1:AGDDxsJE1RpcXTAxPG2B4jrwVUJGFDjINIPi1jtO6pc=
+gioui.org/cpu v0.0.0-20210817075930-8d6a761490d2/go.mod h1:A8M0Cn5o+vY5LTMlnRoK3O5kG+rH0kWfJjeKd9QpBmQ=
+gioui.org/shader v1.0.8 h1:6ks0o/A+b0ne7RzEqRZK5f4Gboz2CfG+mVliciy6+qA=
+gioui.org/shader v1.0.8/go.mod h1:mWdiME581d/kV7/iEhLmUgUK5iZ09XR5XpduXzbePVM=
 github.com/AdaLogics/go-fuzz-headers v0.0.0-20210715213245-6c3934b029d8/go.mod h1:CzsSbkDixRphAF5hS6wbMKq0eI6ccJRb7/A0M6JBnwg=
 github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k=
 github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
@@ -463,6 +470,9 @@ github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
+github.com/go-text/typesetting v0.0.0-20230803102845-24e03d8b5372 h1:FQivqchis6bE2/9uF70M2gmmLpe82esEm2QadL0TEJo=
+github.com/go-text/typesetting v0.0.0-20230803102845-24e03d8b5372/go.mod h1:evDBbvNR/KaVFZ2ZlDSOWWXIUKq0wCOEtzLxRM8SG3k=
+github.com/go-text/typesetting-utils v0.0.0-20230616150549-2a7df14b6a22 h1:LBQTFxP2MfsyEDqSKmUBZaDuDHN1vpqDyOZjcqS7MYI=
 github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0=
 github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY=
 github.com/gobuffalo/depgen v0.1.0/go.mod h1:+ifsuy7fhi15RWncXQQKjWS9JPkdah5sZvtHc2RXGlg=
@@ -1232,8 +1242,11 @@ golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
-golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6 h1:QE6XYQK6naiK1EPAe1g/ILLxN5RBoH5xkJk3CqlMI/Y=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
+golang.org/x/exp v0.0.0-20221012211006-4de253d81b95 h1:sBdrWpxhGDdTAYNqbgBLAR+ULAPPhfgncLr1X0lyWtg=
+golang.org/x/exp v0.0.0-20221012211006-4de253d81b95/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
+golang.org/x/exp/shiny v0.0.0-20220827204233-334a2380cb91 h1:ryT6Nf0R83ZgD8WnFFdfI8wCeyqgdXWN4+CkFVNPAT0=
+golang.org/x/exp/shiny v0.0.0-20220827204233-334a2380cb91/go.mod h1:VjAR7z0ngyATZTELrBSkxOOHhhlnVUxDye4mcjx5h/8=
 golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
@@ -1242,8 +1255,9 @@ golang.org/x/image v0.0.0-20200119044424-58c23975cae1/go.mod h1:FeLwcggjj3mMvU+o
 golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.0.0-20200618115811-c13761719519/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.0.0-20201208152932-35266b937fa6/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20210216034530-4410531fe030 h1:lP9pYkih3DUSC641giIXa2XqfTIbbbRr0w2EOTA7wHA=
 golang.org/x/image v0.0.0-20210216034530-4410531fe030/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/image v0.5.0 h1:5JMiNunQeQw++mMOz48/ISeNu3Iweh/JaZU8ZLqHRrI=
+golang.org/x/image v0.5.0/go.mod h1:FVC7BI/5Ym8R25iw5OLsgshdUBbT1h5jZTpA+mvAdZ4=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -1512,6 +1526,7 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

src/lancher1/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"image/color"
 	"log"
 	"os"
 	"os/exec"
@@ -15,7 +16,6 @@ import (
 	"gioui.org/op"
 	"gioui.org/text"
 	"gioui.org/unit"
-	"gioui.org/widget"
 	"gioui.org/widget/material"
 	"github.com/jessevdk/go-flags"
 	"github.com/nats-io/nats.go"
@@ -183,13 +183,13 @@ func draw(w *app.Window) error {
 	var ops op.Ops
 
 	// startButton is a clickable widget
-	var startButton widget.Clickable
+	// var startButton widget.Clickable
 
 	// is the egg boiling?
 	var boiling bool
 
 	// th defines the material design style
-	th := material.NewTheme([]text.FontFace{})
+	th := material.NewTheme()
 
 	for {
 		select {
@@ -201,52 +201,62 @@ func draw(w *app.Window) error {
 
 			// this is sent when the application should re-render.
 			case system.FrameEvent:
+
 				gtx := layout.NewContext(&ops, e)
-				// Let's try out the flexbox layout concept
-				if startButton.Clicked() {
-					boiling = !boiling
-				}
-
-				layout.Flex{
-					// Vertical alignment, from top to bottom
-					Axis: layout.Vertical,
-					// Empty space is left at the start, i.e. at the top
-					Spacing: layout.SpaceStart,
-				}.Layout(gtx,
-					layout.Rigid(
-						func(gtx C) D {
-							bar := material.ProgressBar(th, progress)
-							return bar.Layout(gtx)
-						},
-					),
-					layout.Rigid(
-						func(gtx C) D {
-							// We start by defining a set of margins
-							margins := layout.Inset{
-								Top:    unit.Dp(25),
-								Bottom: unit.Dp(25),
-								Right:  unit.Dp(25),
-								Left:   unit.Dp(25),
-							}
-							// Then we lay out within those margins ...
-							return margins.Layout(gtx,
-								// ...the same function we earlier used to create a button
-								func(gtx C) D {
-									var text string
-									if !boiling {
-										text = "Start"
-									} else {
-										text = "Stop"
-									}
-									btn := material.Button(th, &startButton, text)
-									return btn.Layout(gtx)
-								},
-							)
-						},
-					),
-				)
+
+				title := material.H1(th, "下载中")
+				maroon := color.NRGBA{R: 127, G: 0, B: 0, A: 255}
+				title.Color = maroon
+				title.Alignment = text.Middle
+				title.Layout(gtx)
 				e.Frame(gtx.Ops)
 
+				// gtx := layout.NewContext(&ops, e)
+				// // Let's try out the flexbox layout concept
+				// if startButton.Clicked() {
+				// 	boiling = !boiling
+				// }
+
+				// layout.Flex{
+				// 	// Vertical alignment, from top to bottom
+				// 	Axis: layout.Vertical,
+				// 	// Empty space is left at the start, i.e. at the top
+				// 	Spacing: layout.SpaceStart,
+				// }.Layout(gtx,
+				// 	// layout.Rigid(
+				// 	// 	func(gtx C) D {
+				// 	// 		bar := material.ProgressBar(th, progress)
+				// 	// 		return bar.Layout(gtx)
+				// 	// 	},
+				// 	// ),
+				// 	layout.Rigid(
+				// 		func(gtx C) D {
+				// 			// We start by defining a set of margins
+				// 			margins := layout.Inset{
+				// 				Top:    unit.Dp(25),
+				// 				Bottom: unit.Dp(25),
+				// 				Right:  unit.Dp(25),
+				// 				Left:   unit.Dp(25),
+				// 			}
+				// 			// Then we lay out within those margins ...
+				// 			return margins.Layout(gtx,
+				// 				// ...the same function we earlier used to create a button
+				// 				func(gtx C) D {
+				// 					var text string
+				// 					if !boiling {
+				// 						text = "Start"
+				// 					} else {
+				// 						text = "Stop"
+				// 					}
+				// 					btn := material.Button(th, &startButton, text)
+				// 					return btn.Layout(gtx)
+				// 				},
+				// 			)
+				// 		},
+				// 	),
+				// )
+				// e.Frame(gtx.Ops)
+
 			// this is sent when the application is closed.
 			case system.DestroyEvent:
 				return e.Err

src/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"image/color"
 	"log"
 	"os"
 	"os/exec"
@@ -16,7 +17,6 @@ import (
 	"gioui.org/op"
 	"gioui.org/text"
 	"gioui.org/unit"
-	"gioui.org/widget"
 	"gioui.org/widget/material"
 	"github.com/jessevdk/go-flags"
 	"infish.cn/comm"
@@ -146,7 +146,7 @@ func main() {
 	}()
 
 	w := app.NewWindow(
-		app.Title("uploader"),
+		app.Title("updater"),
 		app.Size(unit.Dp(600), unit.Dp(400)),
 	)
 
@@ -159,23 +159,23 @@ func main() {
 		os.Exit(0)
 	}()
 
-	go func() {
-		if len(GAppOption.Url) < 1 {
-			return
-		}
+	// go func() {
+	// 	if len(GAppOption.Url) < 1 {
+	// 		return
+	// 	}
 
-		upgradeLancherExe(GAppOption.Url, func(i int, s string) {
-			fmt.Println("xxx=>", i, s)
+	// 	upgradeLancherExe(GAppOption.Url, func(i int, s string) {
+	// 		fmt.Println("xxx=>", i, s)
 
-			if i == -1 {
-				installError = s
-				w.Invalidate()
-				return
-			}
-			installSucc = true
-			w.Invalidate()
-		})
-	}()
+	// 		if i == -1 {
+	// 			installError = s
+	// 			w.Invalidate()
+	// 			return
+	// 		}
+	// 		installSucc = true
+	// 		w.Invalidate()
+	// 	})
+	// }()
 
 	app.Main()
 }
@@ -184,85 +184,27 @@ type C = layout.Context
 type D = layout.Dimensions
 
 func draw(w *app.Window) error {
-	// ops are the operations from the UI
 	var ops op.Ops
-
-	// startButton is a clickable widget
-	var startButton widget.Clickable
-
-	// is the egg boiling?
-	var boiling bool
-
-	// th defines the material design style
-	th := material.NewTheme([]text.FontFace{})
-
+	th := material.NewTheme()
 	for {
 		select {
-		// listen for events in the window.
 		case e := <-w.Events():
-
-			// detect what type of event
 			switch e := e.(type) {
 
-			// this is sent when the application should re-render.
 			case system.FrameEvent:
 				gtx := layout.NewContext(&ops, e)
-				// Let's try out the flexbox layout concept
-				if startButton.Clicked() {
-					boiling = !boiling
-				}
-
-				layout.Flex{
-					// Vertical alignment, from top to bottom
-					Axis: layout.Vertical,
-					// Empty space is left at the start, i.e. at the top
-					Spacing: layout.SpaceStart,
-				}.Layout(gtx,
-					layout.Rigid(
-						func(gtx C) D {
-							bar := material.ProgressBar(th, progress)
-							return bar.Layout(gtx)
-						},
-					),
-					layout.Rigid(
-						func(gtx C) D {
-							// We start by defining a set of margins
-							margins := layout.Inset{
-								Top:    unit.Dp(25),
-								Bottom: unit.Dp(25),
-								Right:  unit.Dp(25),
-								Left:   unit.Dp(25),
-							}
-							// Then we lay out within those margins ...
-							return margins.Layout(gtx,
-								// ...the same function we earlier used to create a button
-								func(gtx C) D {
-									var text string
-									if !boiling {
-										text = "Start"
-									} else {
-										text = "Stop"
-									}
-									btn := material.Button(th, &startButton, text)
-									return btn.Layout(gtx)
-								},
-							)
-						},
-					),
-				)
+				title := material.Body1(th, "下载中...")
+				maroon := color.NRGBA{R: 0, G: 0, B: 0, A: 255}
+				title.Color = maroon
+				title.Alignment = text.Middle
+				title.Layout(gtx)
+
 				e.Frame(gtx.Ops)
 
-			// this is sent when the application is closed.
 			case system.DestroyEvent:
 				return e.Err
 			}
 
-		//listen for events in the incrementor channel
-		case p := <-progressIncrementer:
-			if boiling && progress < 1 {
-				progress += p
-				w.Invalidate()
-			}
 		}
 	}
 }