clockworkpi/LauncherGoDev
1
0
Fork 0
mirror of https://github.com/clockworkpi/LauncherGoDev.git synced 2026-03-19 10:22:41 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

big update, add goroutine sdl render

Browse Source 
replace a lot of self.Screen.Draw() to self.Screen.Refresh()
This commit is contained in:
cuu
2023-01-23 14:04:11 +00:00
parent 057bcc86f1
commit 7814f9ca6f
40 changed files with 358 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Menu/GameShell/10_Settings/About/about.go
View File

@@ -350,27 +350,23 @@ func (self *AboutPage) OnLoadCb() {
func (self *AboutPage) OnReturnBackCb() {
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
func (self *AboutPage) KeyDown(ev *event.Event) {
if ev.Data["Key"] == UI.CurKeys["A"] || ev.Data["Key"] == UI.CurKeys["Menu"] {
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["Up"] {
self.ScrollUp()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["Down"] {
self.ScrollDown()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
}

12
Menu/GameShell/10_Settings/Airplane/airplane_page.go
View File

@@ -137,8 +137,7 @@ func (self *AirplanePage) ToggleModeAni() {
self.airwire_y -= v
self.dialog_index = 2
time.BlockDelay(40)
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
UI.System("sudo rfkill unblock all")
@@ -153,8 +152,7 @@ func (self *AirplanePage) ToggleModeAni() {
self.airwire_y += v
self.dialog_index = 3
time.BlockDelay(40)
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
UI.System("sudo rfkill block all")
self.Screen.TitleBar.InAirPlaneMode = true
@@ -195,8 +193,7 @@ func (self *AirplanePage) KeyDown(ev *event.Event) {
if ev.Data["Key"] == UI.CurKeys["A"] || ev.Data["Key"] == UI.CurKeys["Menu"] {
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["B"] {
@@ -207,8 +204,7 @@ func (self *AirplanePage) KeyDown(ev *event.Event) {
self.UnBlockAll()
self.Screen.SwapAndShow()
time.BlockDelay(1000)
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
}

35
Menu/GameShell/10_Settings/Bluetooth/ble_agent_pair_page.go
View File

@@ -17,7 +17,7 @@ import (
"github.com/cuu/gogame/font"
*/
"github.com/cuu/gogame/event"
"github.com/cuu/gogame/time"
//"github.com/cuu/gogame/time"
//"github.com/godbus/dbus"
//"github.com/muka/go-bluetooth/api"
//"github.com/muka/go-bluetooth/bluez"
@@ -62,8 +62,7 @@ func (self *BleAgentPairPage) ShowPinCode(device string, pincode string) {
if self.Screen.CurPage() != self {
self.Screen.PushPage(self)
self.ClearCanvas()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
self.Pin = pincode
@@ -82,8 +81,7 @@ func (self *BleAgentPairPage) ShowPassKey(device string, passkey uint32, entered
if self.Screen.CurPage() != self {
self.Screen.PushPage(self)
self.ClearCanvas()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
self.Pass = fmt.Sprintf("%06d", passkey)
@@ -100,36 +98,24 @@ func (self *BleAgentPairPage) ShowPassKey(device string, passkey uint32, entered
func (self *BleAgentPairPage) PairOKCb() {
self.ClearCanvas()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
self.Screen.MsgBox.SetText("Device paired")
self.Screen.MsgBox.Draw()
self.Screen.SwapAndShow()
time.BlockDelay(1500)
self.Screen.ShowMsg("Device paired",1500)
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
self.Screen.FootBar.ResetNavText()
}
func (self *BleAgentPairPage) PairErrorCb(err_msg string) {
self.ClearCanvas()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
self.Screen.MsgBox.SetText(err_msg)
self.Screen.MsgBox.Draw()
self.Screen.SwapAndShow()
time.BlockDelay(1500)
self.Screen.ShowMsg(err_msg,1500)
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
self.Screen.FootBar.ResetNavText()
}
@@ -145,8 +131,7 @@ func (self *BleAgentPairPage) KeyDown(ev *event.Event) {
}
}
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
}

48
Menu/GameShell/10_Settings/Bluetooth/bluetooth_page.go
View File

@@ -62,19 +62,16 @@ func (self *BleForgetConfirmPage) KeyDown(ev *event.Event) {
if ev.Data["Key"] == UI.CurKeys["A"] || ev.Data["Key"] == UI.CurKeys["Menu"] {
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["B"] {
self.SnapMsg("Deleting")
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
time.BlockDelay(400)
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
}
@@ -310,8 +307,7 @@ func (self *BleInfoPage) TryToForget() {
time.BlockDelay(400)
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
} else {
@@ -327,17 +323,14 @@ func (self *BleInfoPage) TryToDisconnect() {
if is_connected {
self.Screen.FootBar.UpdateNavText("Disconnecting")
self.Screen.MsgBox.SetText("Disconnecting")
self.Screen.MsgBox.Draw()
self.Screen.SwapAndShow()
self.Screen.ShowMsg("Disconnecting",0)
self.MyDevice.Disconnect()
time.BlockDelay(350)
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
self.Screen.FootBar.ResetNavText()
}
@@ -369,22 +362,19 @@ func (self *BleInfoPage) KeyDown(ev *event.Event) {
if ev.Data["Key"] == UI.CurKeys["A"] || ev.Data["Key"] == UI.CurKeys["Menu"] {
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["Up"] {
self.ScrollUp()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["Down"] {
self.ScrollDown()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["Enter"] {
self.Click()
@@ -512,9 +502,8 @@ func NewBluetoothPage() *BluetoothPage {
func (self *BluetoothPage) ShowBox(msg string) {
self.MsgBox.Text = msg
self.ShowingMessageBox = true
self.Screen.Draw()
self.MsgBox.Draw()
self.Screen.SwapAndShow()
self.Screen.ShowMsg(msg,0)
}
func (self *BluetoothPage) HideBox() {
@@ -562,8 +551,7 @@ func (self *BluetoothPage) AbortedAndReturnToUpLevel() {
self.HideBox()
self.Screen.FootBar.ResetNavText()
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
@@ -816,8 +804,7 @@ func (self *BluetoothPage) KeyDown(ev *event.Event) {
self.HideBox()
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
self.Screen.FootBar.ResetNavText()
}
@@ -825,15 +812,13 @@ func (self *BluetoothPage) KeyDown(ev *event.Event) {
if ev.Data["Key"] == UI.CurKeys["Up"] {
self.ScrollUp()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["Down"] {
self.ScrollDown()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["X"] {
@@ -854,8 +839,7 @@ func (self *BluetoothPage) KeyDown(ev *event.Event) {
self.InfoPage.MyDevice = self.MyList[self.PsIndex].(*NetItem).Device
self.Screen.PushPage(self.InfoPage)
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["B"] {

9
Menu/GameShell/10_Settings/Brightness/brightness_page.go
View File

@@ -294,20 +294,17 @@ func (self *BrightnessPage) WhenSliderDrag(val int) {
func (self *BrightnessPage) KeyDown(ev *event.Event) {
if ev.Data["Key"] == UI.CurKeys["A"] || ev.Data["Key"] == UI.CurKeys["Menu"] {
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["Right"] {
self.MySlider.Further()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["Left"] {
self.MySlider.StepBack()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
}

21
Menu/GameShell/10_Settings/ButtonsLayout/buttons_layout_page.go
View File

@@ -110,8 +110,7 @@ func (self *UpdateConfirmPage) KeyDown(ev *event.Event) {
if ev.Data["Key"] == UI.CurKeys["A"] || ev.Data["Key"] == UI.CurKeys["Menu"] {
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["B"] {
@@ -153,8 +152,7 @@ func (self *UpdateConfirmPage) KeyDown(ev *event.Event) {
func (self *UpdateConfirmPage) OnReturnBackCb() {
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
func (self *UpdateConfirmPage) Draw() {
@@ -287,8 +285,7 @@ func (self *ButtonsLayoutPage) ToggleMode() {
}
self.dialog_index = 1
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
} else {
d := []byte("xbox")
@@ -298,8 +295,7 @@ func (self *ButtonsLayoutPage) ToggleMode() {
}
self.dialog_index = 0
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
}
@@ -320,8 +316,7 @@ func (self *ButtonsLayoutPage) OnLoadCb() {
func (self *ButtonsLayoutPage) OnReturnBackCb() {
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
@@ -329,8 +324,7 @@ func (self *ButtonsLayoutPage) KeyDown(ev *event.Event) {
if ev.Data["Key"] == UI.CurKeys["A"] || ev.Data["Key"] == UI.CurKeys["Menu"] {
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["B"] {
@@ -340,8 +334,7 @@ func (self *ButtonsLayoutPage) KeyDown(ev *event.Event) {
if ev.Data["Key"] == UI.CurKeys["X"] {
self.ConfirmPage.LayoutMode = self.GetButtonsLayoutMode()
self.Screen.PushPage(self.ConfirmPage)
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
}

30
Menu/GameShell/10_Settings/GateWay/gateway_page.go
View File

@@ -224,25 +224,17 @@ func (self *GateWayPage) Click() {
self.MyList[i].(*PageListItem).Active = false
}
cur_li.Active = self.ApplyGateWay(cur_li.Value)
self.Screen.MsgBox.SetText("Applying")
self.Screen.MsgBox.Draw()
self.Screen.SwapAndShow()
time.BlockDelay(1000)
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.ShowMsg("Applying",1000)
self.Screen.Refresh()
} else {
self.Screen.MsgBox.SetText("Do it in GameShell")
self.Screen.MsgBox.Draw()
self.Screen.SwapAndShow()
self.Screen.ShowMsg("Do it in GameShell",0)
}
}
func (self *GateWayPage) ClearAllGateways() {
self.Screen.MsgBox.SetText("Cleaning up")
self.Screen.MsgBox.Draw()
self.Screen.SwapAndShow()
self.Screen.ShowMsg("Cleaning up",0)
UI.System("sudo ip route del 0/0")
time.BlockDelay(800)
@@ -251,8 +243,7 @@ func (self *GateWayPage) ClearAllGateways() {
self.MyList[i].(*PageListItem).Active = false
}
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
@@ -332,8 +323,7 @@ func (self *GateWayPage) KeyDown(ev *event.Event) {
if ev.Data["Key"] == UI.CurKeys["A"] || ev.Data["Key"] == UI.CurKeys["Menu"] {
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["B"] {
@@ -347,15 +337,13 @@ func (self *GateWayPage) KeyDown(ev *event.Event) {
if ev.Data["Key"] == UI.CurKeys["Up"] {
self.ScrollUp()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["Down"] {
self.ScrollDown()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
}

12
Menu/GameShell/10_Settings/Languages/languages_page.go
View File

@@ -244,8 +244,7 @@ func (self *LanguagesPage) Click() {
time.BlockDelay(1000)
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
@@ -279,8 +278,7 @@ func (self *LanguagesPage) KeyDown(ev *event.Event) {
if ev.Data["Key"] == UI.CurKeys["A"] || ev.Data["Key"] == UI.CurKeys["Menu"] {
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["B"] {
@@ -290,15 +288,13 @@ func (self *LanguagesPage) KeyDown(ev *event.Event) {
if ev.Data["Key"] == UI.CurKeys["Up"] {
self.ScrollUp()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["Down"] {
self.ScrollDown()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
}

3
Menu/GameShell/10_Settings/PowerOFF/poweroff_confirm_page.go
View File

@@ -28,8 +28,7 @@ func (self *PowerOFFConfirmPage) KeyDown(ev *event.Event) {
if ev.Data["Key"] == UI.CurKeys["Menu"] || ev.Data["Key"] == UI.CurKeys["A"] {
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}

24
Menu/GameShell/10_Settings/PowerOptions/power_options_page.go
View File

@@ -293,22 +293,19 @@ func (self *InfoPage) KeyDown(ev *event.Event) {
if ev.Data["Key"] == UI.CurKeys["A"] || ev.Data["Key"] == UI.CurKeys["Menu"] {
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["Up"] {
self.ScrollUp()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["Down"] {
self.ScrollDown()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
}
@@ -494,8 +491,7 @@ func (self *PowerOptionsPage) Click() {
time.BlockDelay(1000)
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
func (self *PowerOptionsPage) OnLoadCb() {
@@ -513,8 +509,7 @@ func (self *PowerOptionsPage) OnLoadCb() {
func (self *PowerOptionsPage) KeyDown(ev *event.Event) {
if ev.Data["Key"] == UI.CurKeys["A"] || ev.Data["Key"] == UI.CurKeys["Menu"] {
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["B"] {
@@ -524,15 +519,13 @@ func (self *PowerOptionsPage) KeyDown(ev *event.Event) {
if ev.Data["Key"] == UI.CurKeys["Up"] {
self.ScrollUp()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["Down"] {
self.ScrollDown()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["Y"] {
@@ -547,8 +540,7 @@ func (self *PowerOptionsPage) KeyDown(ev *event.Event) {
self.InfoPage.Time3 = time3
self.Screen.PushPage(self.InfoPage)
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
}

9
Menu/GameShell/10_Settings/Settings.go
View File

@@ -241,20 +241,17 @@ func (self *SettingsPage) KeyDown(ev *event.Event) {
if ev.Data["Key"] == UI.CurKeys["A"] || ev.Data["Key"] == UI.CurKeys["Menu"] {
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["Up"] {
self.ScrollUp()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["Down"] {
self.ScrollDown()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["Enter"] {

9
Menu/GameShell/10_Settings/Sound/sound_page.go
View File

@@ -269,20 +269,17 @@ func (self *SoundPage) KeyDown(ev *event.Event) {
if ev.Data["Key"] == UI.CurKeys["A"] || ev.Data["Key"] == UI.CurKeys["Menu"] {
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["Right"] {
self.MySlider.Further()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["Left"] {
self.MySlider.StepBack()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
}

18
Menu/GameShell/10_Settings/TimeZone/time_zone_page.go
View File

@@ -257,8 +257,7 @@ func (self *TimeZoneListPage) Click() {
fmt.Println("add ", cur_li.Path)
}
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
func (self *TimeZoneListPage) Rescan() {
@@ -270,32 +269,27 @@ func (self *TimeZoneListPage) KeyDown(ev *event.Event) {
if ev.Data["Key"] == UI.CurKeys["Menu"] || ev.Data["Key"] == UI.CurKeys["A"] {
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["Up"] {
self.ScrollUp()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["Down"] {
self.ScrollDown()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["Right"] {
self.FastScrollDown(5)
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["Left"] {
self.FastScrollUp(5)
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["Enter"] {

30
Menu/GameShell/10_Settings/Update/update_page.go
View File

@@ -4,7 +4,7 @@ import (
"bytes"
"encoding/json"
"fmt"
"github.com/cuu/gogame/time"
//"github.com/cuu/gogame/time"
"github.com/veandco/go-sdl2/ttf"
"net/http"
"os/exec"
@@ -47,8 +47,7 @@ func (self *UpdateConfirmPage) KeyDown(ev *event.Event) {
if ev.Data["Key"] == UI.CurKeys["A"] || ev.Data["Key"] == UI.CurKeys["Menu"] {
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["B"] {
@@ -64,8 +63,7 @@ func (self *UpdateConfirmPage) KeyDown(ev *event.Event) {
func (self *UpdateConfirmPage) OnReturnBackCb() {
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
func (self *UpdateConfirmPage) Draw() {
@@ -208,11 +206,7 @@ func (self *UpdatePage) CheckUpdate() bool {
self.Screen.SwapAndShow()
} else {
self.Screen.Draw()
self.Screen.MsgBox.SetText("Launchergo is up to date")
self.Screen.MsgBox.Draw()
self.Screen.SwapAndShow()
time.BlockDelay(765)
self.Screen.ShowMsg("Launchergo is up to date",765)
}
defer resp.Body.Close()
@@ -224,26 +218,18 @@ func (self *UpdatePage) CheckUpdate() bool {
func (self *UpdatePage) KeyDown(ev *event.Event) {
if ev.Data["Key"] == UI.CurKeys["A"] || ev.Data["Key"] == UI.CurKeys["Menu"] {
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["X"] {
if self.Screen.IsWifiConnectedNow() == true {
if self.CheckUpdate() == true {
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
} else {
self.Screen.Draw()
self.Screen.MsgBox.SetText("Check Update Failed")
self.Screen.MsgBox.Draw()
self.Screen.SwapAndShow()
self.Screen.ShowMsg("Check Update Failed",0)
}
} else {
self.Screen.Draw()
self.Screen.MsgBox.SetText("Please Check your Wi-Fi connection")
self.Screen.MsgBox.Draw()
self.Screen.SwapAndShow()
self.Screen.ShowMsg("Please Check your Wi-Fi connection",0)
}
}
}

45
Menu/GameShell/10_Settings/Wifi/wifi.go
View File

@@ -50,23 +50,20 @@ func (self *WifiDisconnectConfirmPage) KeyDown(ev *event.Event) {
if ev.Data["Key"] == UI.CurKeys["A"] || ev.Data["Key"] == UI.CurKeys["Menu"] {
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["B"] {
fmt.Println("Disconnecting..")
self.SnapMsg("Disconnecting...")
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
self.Parent.Parent.Disconnect()
time.BlockDelay(400)
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
self.Parent.Parent.Rescan(false)
}
}
@@ -242,8 +239,7 @@ func (self *WifiInfoPage) TryDisconnect() {
if len(ip) > 6 {
self.Screen.PushPage(self.DisconnectConfirmPage)
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
} else {
fmt.Println("WifiInfoPage TryDisconnect can not get IP,maybe you are offline")
return
@@ -263,8 +259,7 @@ func (self *WifiInfoPage) OnLoadCb() {
func (self *WifiInfoPage) OnReturnBackCb() {
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
@@ -272,20 +267,17 @@ func (self *WifiInfoPage) KeyDown(ev *event.Event) {
if ev.Data["Key"] == UI.CurKeys["A"] || ev.Data["Key"] == UI.CurKeys["Menu"] {
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["Up"] {
self.ScrollUp()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["Down"] {
self.ScrollDown()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["Enter"] {
@@ -411,10 +403,7 @@ func NewWifiList() *WifiList {
func (self *WifiList) ShowBox(msg string) {
self.MsgBox.Text = msg
self.ShowingMessageBox = true
self.Screen.Draw()
self.MsgBox.Draw()
self.Screen.SwapAndShow()
self.Screen.ShowMsg(msg,0)
}
func (self *WifiList) HideBox() {
@@ -688,8 +677,8 @@ func (self *WifiList) AbortedAndReturnToUpLevel() {
self.HideBox()
self.Screen.FootBar.ResetNavText()
self.ReturnToUpLevelPage()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
func (self *WifiList) OnKbdReturnBackCb() {
@@ -718,14 +707,12 @@ func (self *WifiList) KeyDown(ev *event.Event) {
if ev.Data["Key"] == UI.CurKeys["Up"] {
self.ScrollUp()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["Down"] {
self.ScrollDown()
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
if ev.Data["Key"] == UI.CurKeys["Enter"] { // enter to set password,enter is B on GM
@@ -745,8 +732,7 @@ func (self *WifiList) KeyDown(ev *event.Event) {
fmt.Println("APIOBJ.PasswordPage.SetPassword ", thepass, len(thepass))
APIOBJ.PasswordPage.SetPassword(thepass)
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
}
@@ -762,8 +748,7 @@ func (self *WifiList) KeyDown(ev *event.Event) {
self.InfoPage.BSSID = self.MyList[self.PsIndex].Bssid
self.InfoPage.ESSID = self.MyList[self.PsIndex].Essid
self.Screen.PushPage(self.InfoPage)
self.Screen.Draw()
self.Screen.SwapAndShow()
self.Screen.Refresh()
}
}