bluetooth alpha 1

This commit is contained in:
cuu 2018-12-18 20:30:59 +08:00
parent f4e4ff3921
commit c73e08eb69
2 changed files with 39 additions and 14 deletions

View File

@ -578,7 +578,26 @@ func (self *BluetoothPage) AbortedAndReturnToUpLevel() {
func (self *BluetoothPage) TryConnect() { func (self *BluetoothPage) TryConnect() {
if self.PsIndex >= len(self.MyList) {
return
}
cur_li := self.MyList[self.PsIndex]
if cur_li.(*NetItem).Props.Connected {
return
}
self.Screen.FootBar.UpdateNavText("Connecting")
self.ShowBox("Connecting")
cur_li.(*NetItem).Device.Connect()
self.HideBox()
self.Screen.FootBar.ResetNavText()
} }
func (self *BluetoothPage) RefreshDevices() { func (self *BluetoothPage) RefreshDevices() {
@ -670,8 +689,6 @@ func (self *BluetoothPage) ScrollUp() {
return return
} }
fmt.Println("Scroll Up")
self.PsIndex -= 1 self.PsIndex -= 1
if self.PsIndex < 0 { if self.PsIndex < 0 {
self.PsIndex=0 self.PsIndex=0

View File

@ -45,21 +45,29 @@ func (self *BluetoothPlugin) Init( main_screen *UI.MainScreen ) {
os.Exit(1) os.Exit(1)
} }
err = api.On("discovery", emitter.NewCallback(func(ev emitter.Event) {
discoveryEvent := ev.GetData().(api.DiscoveredDeviceEvent)
dev := discoveryEvent.Device
showDeviceInfo(dev)
}))
if err != nil {
fmt.Println(err)
}
self.BluetoothPage = NewBluetoothPage() self.BluetoothPage = NewBluetoothPage()
self.BluetoothPage.SetScreen( main_screen) self.BluetoothPage.SetScreen( main_screen)
self.BluetoothPage.SetName("Bluetooth") self.BluetoothPage.SetName("Bluetooth")
self.BluetoothPage.Init() self.BluetoothPage.Init()
err = api.On("discovery", emitter.NewCallback(func(ev emitter.Event) {
//discoveryEvent := ev.GetData().(api.DiscoveredDeviceEvent)
//dev := discoveryEvent.Device
//showDeviceInfo(dev)
self.BluetoothPage.RefreshDevices()
self.BluetoothPage.GenNetworkList()
main_screen.Draw()
main_screen.SwapAndShow()
}))
if err != nil {
fmt.Println(err)
}
} }
func (self *BluetoothPlugin) Run( main_screen *UI.MainScreen ) { func (self *BluetoothPlugin) Run( main_screen *UI.MainScreen ) {