go fmt ./...

This commit is contained in:
cuu
2021-10-11 13:55:54 +08:00
parent 0fe6399441
commit 7382cc40b1
88 changed files with 10028 additions and 10478 deletions

View File

@@ -1,156 +1,155 @@
package Bluetooth
import (
"fmt"
//"os"
//"log"
//"strings"
//"github.com/fatih/structs"
/*
"github.com/veandco/go-sdl2/ttf"
"github.com/cuu/gogame/draw"
"github.com/cuu/gogame/surface"
"github.com/cuu/gogame/rect"
"github.com/cuu/gogame/color"
"github.com/cuu/gogame/font"
*/
"github.com/cuu/gogame/time"
"github.com/cuu/gogame/event"
//"github.com/godbus/dbus"
//"github.com/muka/go-bluetooth/api"
//"github.com/muka/go-bluetooth/bluez"
//"github.com/muka/go-bluetooth/bluez/profile"
"github.com/muka/go-bluetooth/bluez/profile/device"
"github.com/clockworkpi/LauncherGoDev/sysgo/UI"
"fmt"
//"os"
//"log"
//"strings"
//"github.com/fatih/structs"
/*
"github.com/veandco/go-sdl2/ttf"
"github.com/cuu/gogame/draw"
"github.com/cuu/gogame/surface"
"github.com/cuu/gogame/rect"
"github.com/cuu/gogame/color"
"github.com/cuu/gogame/font"
*/
"github.com/cuu/gogame/event"
"github.com/cuu/gogame/time"
//"github.com/godbus/dbus"
//"github.com/muka/go-bluetooth/api"
//"github.com/muka/go-bluetooth/bluez"
//"github.com/muka/go-bluetooth/bluez/profile"
"github.com/clockworkpi/LauncherGoDev/sysgo/UI"
"github.com/muka/go-bluetooth/bluez/profile/device"
)
type BleAgentPairPage struct {
UI.Page
Pin string
Pass string
DevObj *device.Device1
Leader *BluetoothPlugin
UI.Page
Pin string
Pass string
DevObj *device.Device1
Leader *BluetoothPlugin
}
func NewBleAgentPairPage() *BleAgentPairPage {
p := &BleAgentPairPage{}
p.PageIconMargin = 20
p := &BleAgentPairPage{}
p.PageIconMargin = 20
p.SelectedIconTopOffset = 20
p.EasingDur = 10
p.Align = UI.ALIGN["SLeft"]
p.FootMsg = [5]string{"Nav.","","","Back",""}
return p
p.FootMsg = [5]string{"Nav.", "", "", "Back", ""}
return p
}
func (self *BleAgentPairPage) Init() {
self.PosX = self.Index * self.Screen.Width
self.Width = self.Screen.Width
self.Height = self.Screen.Height
self.CanvasHWND = self.Screen.CanvasHWND
self.PosX = self.Index * self.Screen.Width
self.Width = self.Screen.Width
self.Height = self.Screen.Height
self.CanvasHWND = self.Screen.CanvasHWND
}
func (self *BleAgentPairPage) ShowPinCode(device string,pincode string) {
fmt.Println( fmt.Sprintf("ShowPinCode %s %d" ,device,pincode))
if self.Screen.CurPage() != self {
self.Screen.PushPage(self)
self.ClearCanvas()
self.Screen.Draw()
self.Screen.SwapAndShow()
}
self.Pin = pincode
txt := self.Pin
if len(self.Pin) > 0 {
txt = fmt.Sprintf("Pin code: %s",self.Pin)
}
self.Screen.MsgBox.SetText(txt)
self.Screen.MsgBox.Draw()
self.Screen.SwapAndShow()
func (self *BleAgentPairPage) ShowPinCode(device string, pincode string) {
fmt.Println(fmt.Sprintf("ShowPinCode %s %d", device, pincode))
if self.Screen.CurPage() != self {
self.Screen.PushPage(self)
self.ClearCanvas()
self.Screen.Draw()
self.Screen.SwapAndShow()
}
self.Pin = pincode
txt := self.Pin
if len(self.Pin) > 0 {
txt = fmt.Sprintf("Pin code: %s", self.Pin)
}
self.Screen.MsgBox.SetText(txt)
self.Screen.MsgBox.Draw()
self.Screen.SwapAndShow()
}
func (self *BleAgentPairPage) ShowPassKey(device string,passkey uint32,entered uint16) {
fmt.Println(fmt.Sprintf("ShowPassKey %06d %d",passkey,entered) )
if self.Screen.CurPage() != self {
self.Screen.PushPage(self)
self.ClearCanvas()
self.Screen.Draw()
self.Screen.SwapAndShow()
}
self.Pass = fmt.Sprintf("%06d",passkey)
txt := self.Pass
if len(self.Pass) > 0 {
txt = fmt.Sprintf("Pair code: %s",self.Pass)
}
self.Screen.MsgBox.SetText(txt)
self.Screen.MsgBox.Draw()
self.Screen.SwapAndShow()
func (self *BleAgentPairPage) ShowPassKey(device string, passkey uint32, entered uint16) {
fmt.Println(fmt.Sprintf("ShowPassKey %06d %d", passkey, entered))
if self.Screen.CurPage() != self {
self.Screen.PushPage(self)
self.ClearCanvas()
self.Screen.Draw()
self.Screen.SwapAndShow()
}
self.Pass = fmt.Sprintf("%06d", passkey)
txt := self.Pass
if len(self.Pass) > 0 {
txt = fmt.Sprintf("Pair code: %s", self.Pass)
}
self.Screen.MsgBox.SetText(txt)
self.Screen.MsgBox.Draw()
self.Screen.SwapAndShow()
}
func (self *BleAgentPairPage) PairOKCb() {
self.ClearCanvas()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.MsgBox.SetText("Device paired")
self.Screen.MsgBox.Draw()
self.Screen.SwapAndShow()
time.BlockDelay(1500)
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.FootBar.ResetNavText()
self.ClearCanvas()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.MsgBox.SetText("Device paired")
self.Screen.MsgBox.Draw()
self.Screen.SwapAndShow()
time.BlockDelay(1500)
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.FootBar.ResetNavText()
}
func (self *BleAgentPairPage) PairErrorCb( err_msg string) {
self.ClearCanvas()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.MsgBox.SetText(err_msg)
self.Screen.MsgBox.Draw()
self.Screen.SwapAndShow()
time.BlockDelay(1500)
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.FootBar.ResetNavText()
func (self *BleAgentPairPage) PairErrorCb(err_msg string) {
self.ClearCanvas()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.MsgBox.SetText(err_msg)
self.Screen.MsgBox.Draw()
self.Screen.SwapAndShow()
time.BlockDelay(1500)
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.FootBar.ResetNavText()
}
func (self *BleAgentPairPage) KeyDown(ev *event.Event) {
if ev.Data["Key"] == UI.CurKeys["A"] || ev.Data["Key"] == UI.CurKeys["Menu"] {
if self.DevObj != nil {
err := self.DevObj.CancelPairing()
if err != nil {
fmt.Println(err)
return
}
}
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
}
if ev.Data["Key"] == UI.CurKeys["A"] || ev.Data["Key"] == UI.CurKeys["Menu"] {
if self.DevObj != nil {
err := self.DevObj.CancelPairing()
if err != nil {
fmt.Println(err)
return
}
}
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
}
}
func (self *BleAgentPairPage) Draw() {
// DoNothing
// DoNothing
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,55 +1,54 @@
package Bluetooth
import (
//"fmt"
//bleapi "github.com/muka/go-bluetooth/api"
//"github.com/muka/go-bluetooth/bluez/profile"
"github.com/muka/go-bluetooth/bluez/profile/device"
//"fmt"
//bleapi "github.com/muka/go-bluetooth/api"
//"github.com/muka/go-bluetooth/bluez/profile"
"github.com/muka/go-bluetooth/bluez/profile/device"
"github.com/veandco/go-sdl2/ttf"
"github.com/veandco/go-sdl2/sdl"
"github.com/veandco/go-sdl2/ttf"
"github.com/cuu/gogame/rect"
"github.com/cuu/gogame/surface"
"github.com/cuu/gogame/color"
"github.com/cuu/gogame/draw"
"github.com/cuu/gogame/color"
"github.com/cuu/gogame/draw"
"github.com/cuu/gogame/rect"
"github.com/cuu/gogame/surface"
"github.com/clockworkpi/LauncherGoDev/sysgo/UI"
"github.com/clockworkpi/LauncherGoDev/sysgo/UI"
)
var NetItemDefaultHeight = 30
type NetItemMultiIcon struct {
UI.MultiIconItem
CanvasHWND *sdl.Surface // self._Parent._CanvasHWND
CanvasHWND *sdl.Surface // self._Parent._CanvasHWND
Parent UI.WidgetInterface //
}
func NewNetItemMultiIcon() *NetItemMultiIcon{
func NewNetItemMultiIcon() *NetItemMultiIcon {
p := &NetItemMultiIcon{}
p.IconIndex = 0
p.IconWidth = 18
p.IconHeight = 18
p.Width = 18
p.Height = 18
p.IconHeight = 18
p.Width = 18
p.Height = 18
return p
}
func (self *NetItemMultiIcon) Draw() {
_,h_ := self.Parent.Size()
dest_rect := rect.Rect(self.PosX,self.PosY+(h_-self.Height)/2, self.Width,self.Height)
area_rect := rect.Rect(0,self.IconIndex*self.IconHeight,self.IconWidth,self.IconHeight)
surface.Blit(self.CanvasHWND,self.ImgSurf,&dest_rect,&area_rect)
_, h_ := self.Parent.Size()
dest_rect := rect.Rect(self.PosX, self.PosY+(h_-self.Height)/2, self.Width, self.Height)
area_rect := rect.Rect(0, self.IconIndex*self.IconHeight, self.IconWidth, self.IconHeight)
surface.Blit(self.CanvasHWND, self.ImgSurf, &dest_rect, &area_rect)
}
type NetItemIcon struct {
UI.IconItem
CanvasHWND *sdl.Surface
Parent UI.WidgetInterface
Parent UI.WidgetInterface
}
func NewNetItemIcon() *NetItemIcon {
@@ -60,76 +59,72 @@ func NewNetItemIcon() *NetItemIcon {
}
func (self *NetItemIcon) Draw() {
_,h_ := self.Parent.Size()
_, h_ := self.Parent.Size()
dest_rect := rect.Rect(self.PosX,self.PosY+(h_-self.Height)/2,self.Width,self.Height)
dest_rect := rect.Rect(self.PosX, self.PosY+(h_-self.Height)/2, self.Width, self.Height)
surface.Blit(self.CanvasHWND, self.ImgSurf, &dest_rect, nil)
surface.Blit(self.CanvasHWND,self.ImgSurf,&dest_rect,nil)
}
type NetItem struct {
UI.Widget
Channel string //'10'
Stren string //19%
Icons map[string]UI.IconItemInterface
Labels map[string]UI.LabelInterface
IsActive bool
FontObj *ttf.Font
RSSI int // 0
MacAddr string //
Parent *BluetoothPage
Path string ///org/bluez/hci0/dev_34_88_5D_97_FF_26
Props *device.Device1Properties
Device *device.Device1
}
UI.Widget
Channel string //'10'
Stren string //19%
Icons map[string]UI.IconItemInterface
Labels map[string]UI.LabelInterface
IsActive bool
FontObj *ttf.Font
RSSI int // 0
MacAddr string //
Parent *BluetoothPage
Path string ///org/bluez/hci0/dev_34_88_5D_97_FF_26
Props *device.Device1Properties
Device *device.Device1
}
func NewNetItem() *NetItem {
p:= &NetItem{}
p.Height = NetItemDefaultHeight
p := &NetItem{}
p.Height = NetItemDefaultHeight
p.Labels = make(map[string]UI.LabelInterface)
p.Icons = make( map[string]UI.IconItemInterface)
return p
p.Icons = make(map[string]UI.IconItemInterface)
return p
}
func (self *NetItem) SetActive(act bool) {
self.IsActive = act
self.IsActive = act
}
func (self *NetItem) Init(_label string) {
func (self *NetItem) Init( _label string) {
self.MacAddr = self.Props.Address
self.SetActive(self.Props.Connected)
name_label := UI.NewLabel()
name_label.PosX = 12
name_label.CanvasHWND = self.Parent.CanvasHWND
mac_addr := self.MacAddr
if len(self.Props.Name) > 3 {
mac_addr = self.Props.Name
}
self.RSSI = int(self.Props.RSSI)
name_label.Init(mac_addr,self.FontObj,nil)
self.Labels["mac_addr"] = name_label
done_icon := NewNetItemIcon()
self.MacAddr = self.Props.Address
self.SetActive(self.Props.Connected)
name_label := UI.NewLabel()
name_label.PosX = 12
name_label.CanvasHWND = self.Parent.CanvasHWND
mac_addr := self.MacAddr
if len(self.Props.Name) > 3 {
mac_addr = self.Props.Name
}
self.RSSI = int(self.Props.RSSI)
name_label.Init(mac_addr, self.FontObj, nil)
self.Labels["mac_addr"] = name_label
done_icon := NewNetItemIcon()
done_icon.ImgSurf = UI.MyIconPool.GetImgSurf("done")
done_icon.CanvasHWND = self.Parent.GetCanvasHWND()
done_icon.Parent = self
@@ -139,32 +134,32 @@ func (self *NetItem) Init( _label string) {
}
func (self *NetItem) Connect() {
if self.Device != nil {
self.Device.Connect()
}
if self.Device != nil {
self.Device.Connect()
}
}
func (self *NetItem) GetLinkObj() UI.PluginInterface {
return nil
return nil
}
func (self *NetItem) Draw() {
for k,v := range self.Labels {
x,_ := v.Coord()
_,h := v.Size()
self.Labels[k].NewCoord(x, self.PosY+(self.Height - h)/2)
self.Labels[k].Draw()
}
if self.IsActive {
self.Icons["done"].NewCoord(UI.Width-22, self.PosY)
self.Icons["done"].Draw()
}
for k, v := range self.Labels {
x, _ := v.Coord()
_, h := v.Size()
self.Labels[k].NewCoord(x, self.PosY+(self.Height-h)/2)
self.Labels[k].Draw()
}
if self.IsActive {
self.Icons["done"].NewCoord(UI.Width-22, self.PosY)
self.Icons["done"].Draw()
}
draw.Line(self.Parent.CanvasHWND, &color.Color{169, 169, 169, 255},
self.PosX, self.PosY+self.Height-1,
self.PosX+self.Width, self.PosY+self.Height-1,
1)
draw.Line(self.Parent.CanvasHWND,&color.Color{169,169,169,255},
self.PosX,self.PosY+self.Height-1,
self.PosX+self.Width,self.PosY+self.Height-1,
1)
}

View File

@@ -1,133 +1,129 @@
package Bluetooth
import (
"fmt"
"fmt"
//"log"
//"os"
//"time"
"github.com/godbus/dbus/v5"
//"github.com/muka/go-bluetooth/api"
"github.com/muka/go-bluetooth/hw"
//"github.com/muka/go-bluetooth/bluez/profile"
"github.com/muka/go-bluetooth/bluez/profile/agent"
//"github.com/muka/go-bluetooth/bluez/profile/adapter"
/*
"github.com/veandco/go-sdl2/ttf"
"github.com/godbus/dbus/v5"
//"github.com/muka/go-bluetooth/api"
"github.com/muka/go-bluetooth/hw"
//"github.com/muka/go-bluetooth/bluez/profile"
"github.com/muka/go-bluetooth/bluez/profile/agent"
//"github.com/muka/go-bluetooth/bluez/profile/adapter"
/*
"github.com/veandco/go-sdl2/ttf"
"github.com/cuu/gogame/surface"
"github.com/cuu/gogame/event"
"github.com/cuu/gogame/rect"
"github.com/cuu/gogame/color"
*/
"github.com/cuu/gogame/surface"
"github.com/cuu/gogame/event"
"github.com/cuu/gogame/rect"
"github.com/cuu/gogame/color"
*/
"github.com/clockworkpi/LauncherGoDev/sysgo/UI"
log "github.com/sirupsen/logrus"
"github.com/clockworkpi/LauncherGoDev/sysgo/UI"
log "github.com/sirupsen/logrus"
)
/******************************************************************************/
type BluetoothPlugin struct {
UI.Plugin
BluetoothPage *BluetoothPage
PairPage *BleAgentPairPage
UI.Plugin
BluetoothPage *BluetoothPage
PairPage *BleAgentPairPage
}
const (
adapterID = "hci0"
BUS_NAME = "org.bluez"
AGENT_INTERFACE = "org.bluez.Agent1"
adapterID = "hci0"
BUS_NAME = "org.bluez"
AGENT_INTERFACE = "org.bluez.Agent1"
)
func (self *BluetoothPlugin) InitAgent() {
conn, err := dbus.SystemBus()
if err != nil {
return
}
ag := agent.NewSimpleAgent()
err = agent.ExposeAgent(conn, ag, agent.CapKeyboardDisplay, true)
if err != nil {
fmt.Println( fmt.Errorf("SimpleAgent: %s", err) )
return
}
conn, err := dbus.SystemBus()
if err != nil {
return
}
ag := agent.NewSimpleAgent()
err = agent.ExposeAgent(conn, ag, agent.CapKeyboardDisplay, true)
if err != nil {
fmt.Println(fmt.Errorf("SimpleAgent: %s", err))
return
}
}
func (self *BluetoothPlugin) Init( main_screen *UI.MainScreen ) {
log.Println("Reset bluetooth device")
btmgmt := hw.NewBtMgmt(adapterID)
btmgmt.SetPowered(true)
func (self *BluetoothPlugin) Init(main_screen *UI.MainScreen) {
self.BluetoothPage = NewBluetoothPage()
self.BluetoothPage.SetScreen( main_screen)
self.BluetoothPage.SetName("Bluetooth")
self.BluetoothPage.Leader = self
self.BluetoothPage.Init()
self.PairPage = NewBleAgentPairPage()
self.PairPage.SetScreen( main_screen)
self.PairPage.SetName("Bluetooth pair")
self.PairPage.Leader = self
self.PairPage.Init()
self.InitAgent()
/*
a, err := adapter.GetAdapter(adapterID)
if err != nil {
fmt.Println(err)
return
}
log.Println("Reset bluetooth device")
discovery, cancel, err := api.Discover(a, nil)
if err != nil {
fmt.Println(err)
}
btmgmt := hw.NewBtMgmt(adapterID)
btmgmt.SetPowered(true)
defer cancel()
self.BluetoothPage = NewBluetoothPage()
self.BluetoothPage.SetScreen(main_screen)
self.BluetoothPage.SetName("Bluetooth")
self.BluetoothPage.Leader = self
self.BluetoothPage.Init()
wait := make(chan error)
self.PairPage = NewBleAgentPairPage()
self.PairPage.SetScreen(main_screen)
self.PairPage.SetName("Bluetooth pair")
self.PairPage.Leader = self
self.PairPage.Init()
go func() {
for dev := range discovery {
if dev == nil {
return
}
wait <- nil
}
}()
self.InitAgent()
go func() {
sleep := 5
time.Sleep(time.Duration(sleep) * time.Second)
log.Debugf("Discovery timeout exceeded (%ds)", sleep)
wait <- nil
}()
/*
a, err := adapter.GetAdapter(adapterID)
if err != nil {
fmt.Println(err)
return
}
err = <-wait
if err != nil {
fmt.Println(err)
}
*/
discovery, cancel, err := api.Discover(a, nil)
if err != nil {
fmt.Println(err)
}
defer cancel()
wait := make(chan error)
go func() {
for dev := range discovery {
if dev == nil {
return
}
wait <- nil
}
}()
go func() {
sleep := 5
time.Sleep(time.Duration(sleep) * time.Second)
log.Debugf("Discovery timeout exceeded (%ds)", sleep)
wait <- nil
}()
err = <-wait
if err != nil {
fmt.Println(err)
}
*/
//self.BluetoothPage.RefreshDevices()
//self.BluetoothPage.GenNetworkList()
//self.BluetoothPage.RefreshDevices()
//self.BluetoothPage.GenNetworkList()
}
func (self *BluetoothPlugin) Run( main_screen *UI.MainScreen ) {
if main_screen != nil {
main_screen.PushCurPage()
main_screen.SetCurPage(self.BluetoothPage)
main_screen.Draw()
main_screen.SwapAndShow()
}
func (self *BluetoothPlugin) Run(main_screen *UI.MainScreen) {
if main_screen != nil {
main_screen.PushCurPage()
main_screen.SetCurPage(self.BluetoothPage)
main_screen.Draw()
main_screen.SwapAndShow()
}
}
var APIOBJ BluetoothPlugin