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

replace wlan0 to sysgo.WifiDev

Browse Source 
move execCmd to UI.ExecCmd

add read app-local.ini in config.go for dev/ run launcher out of
GameShell
This commit is contained in:
cuu
2021-10-10 12:44:05 +08:00
parent d463dd10ec
commit d3f3a4350b
11 changed files with 94 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Menu/GameShell/10_Settings/Wifi/plugin_init.go
View File

@@ -32,7 +32,7 @@ var (
func (self *WifiPlugin) Init( main_screen *UI.MainScreen ) {
self.PasswordPage = UI.NewKeyboard()
self.PasswordPage.Name = "Enter wifi password"
self.PasswordPage.Screen= main_screen

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

@@ -5,8 +5,8 @@ import (
"fmt"
//"strconv"
"strings"
"os"
"os/exec"
//"os"
// "os/exec"
gotime "time"
//"github.com/godbus/dbus"
@@ -33,21 +33,6 @@ type WifiDisconnectConfirmPage struct {
Parent *WifiInfoPage
}
func cmdEnv() []string {
return []string{"LANG=C", "LC_ALL=C"}
}
func execCmd(cmdArgs []string) ([]byte, error) {
cmd := exec.Command(cmdArgs[0], cmdArgs[1:]...)
cmd.Env = append(os.Environ(), cmdEnv()...)
out, err := cmd.Output()
if err != nil {
err = fmt.Errorf(`failed to execute "%v" (%+v)`, strings.Join(cmdArgs, " "), err)
}
return out, err
}
func NewWifiDisconnectConfirmPage() *WifiDisconnectConfirmPage {
p := &WifiDisconnectConfirmPage{}
p.ListFont = UI.Fonts["veramono20"]
@@ -488,10 +473,10 @@ func (self *WifiList) Disconnect() {
self.Connecting = false
wpa_cli_disconnect := []string{"wpa_cli","disconnect",self.CurEssid,"-i",sysgo.WifiDev}
execCmd( wpa_cli_disconnect )
UI.ExecCmd( wpa_cli_disconnect )
fmt.Println(wpa_cli_disconnect)
dhcp_release := []string{"dhclient","-r",sysgo.WifiDev}
execCmd(dhcp_release)
UI.ExecCmd(dhcp_release)
self.CurEssid = ""
self.CurBssid = ""
@@ -578,7 +563,7 @@ func (self *WifiList) ConfigWireless(password string) {
self.CurBssid = self.MyList[self.PsIndex].Bssid
self.MyList[self.PsIndex].Password = password
dhcp := []string{"dhclient" ,sysgo.WifiDev}
execCmd(dhcp)
UI.ExecCmd(dhcp)
GsConnectManager.ReadNetAddress(gotime.Second*3)
self.CurIP = GsConnectManager.IPv4().String()
self.ShowBox("Connected")
@@ -603,10 +588,8 @@ func (self *WifiList) ConfigWireless(password string) {
func (self *WifiList) GetWirelessIP() string {
cli := fmt.Sprintf( "ip -4 addr show %s | grep -oP '(?<=inet\\s)\\d+(\\.\\d+){3}'",sysgo.WifiDev)
out := UI.System(cli)
if len(out) > 5 {
out = strings.TrimSuffix(out,"\n")
}
out := UI.SystemTrim(cli)
return out
}