From c73e08eb693ac37dd70faf904f95ff8c43407c54 Mon Sep 17 00:00:00 2001
From: cuu <dexterkidd@gmail.com>
Date: Tue, 18 Dec 2018 20:30:59 +0800
Subject: [PATCH] bluetooth alpha 1

---
 .../10_Settings/Bluetooth/bluetooth_page.go   | 27 +++++++++++++++----
 .../10_Settings/Bluetooth/plugin_init.go      | 26 +++++++++++-------
 2 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/Menu/GameShell/10_Settings/Bluetooth/bluetooth_page.go b/Menu/GameShell/10_Settings/Bluetooth/bluetooth_page.go
index 65dbabc..739eeb9 100644
--- a/Menu/GameShell/10_Settings/Bluetooth/bluetooth_page.go
+++ b/Menu/GameShell/10_Settings/Bluetooth/bluetooth_page.go
@@ -577,8 +577,27 @@ func (self *BluetoothPage) AbortedAndReturnToUpLevel() {
 }
 
 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() {
@@ -669,9 +688,7 @@ func (self *BluetoothPage) ScrollUp() {
   if len(self.MyList) == 0 {
     return
   }
-  
-  fmt.Println("Scroll Up")
-  
+
   self.PsIndex -= 1
   if self.PsIndex < 0 {
     self.PsIndex=0
diff --git a/Menu/GameShell/10_Settings/Bluetooth/plugin_init.go b/Menu/GameShell/10_Settings/Bluetooth/plugin_init.go
index 96430de..14c6272 100644
--- a/Menu/GameShell/10_Settings/Bluetooth/plugin_init.go
+++ b/Menu/GameShell/10_Settings/Bluetooth/plugin_init.go
@@ -45,21 +45,29 @@ func (self *BluetoothPlugin) Init( main_screen *UI.MainScreen ) {
 		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.SetScreen( main_screen)
 	self.BluetoothPage.SetName("Bluetooth")
 	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 ) {