Pārlūkot izejas kodu

优化模块间导出函数的命名

niujiuru 1 mēnesi atpakaļ
vecāks
revīzija
1d7ed944e5
3 mainītis faili ar 7 papildinājumiem un 7 dzēšanām
  1. 2 2
      air720u/air720u.go
  2. 1 1
      air720u/eth2net.go
  3. 4 4
      netmgrd/netmgrd.go

+ 2 - 2
air720u/air720u.go

@@ -199,7 +199,7 @@ func monitorAir720uInfo(exitCh <-chan struct{}) {
 }
 
 // 打开连接到4G网络
-func OpenEth2Net() bool {
+func Start4GNetwork() bool {
 	mu3.Lock()
 	defer mu3.Unlock()
 
@@ -243,7 +243,7 @@ func OpenEth2Net() bool {
 }
 
 // 从4G网络断开连接
-func CloseEth2Net() {
+func Stop4GNetwork() {
 	mu3.Lock()
 	defer mu3.Unlock()
 

+ 1 - 1
air720u/eth2net.go

@@ -234,7 +234,7 @@ func isInterfaceUp(name string) (bool, error) {
 	return link.Attrs().Flags&net.FlagUp != 0, nil
 }
 
-func IsEth2CableConnected() (bool, error) {
+func Is4GCableConnected() (bool, error) {
 	if up, _ := isInterfaceUp("eth2"); !up { // 管理状态
 		err := enableEth2()
 		if err != nil {

+ 4 - 4
netmgrd/netmgrd.go

@@ -227,7 +227,7 @@ func closeEth0Net() {
 // 打开连接网络
 func openNetwork() {
 	closeEth0Net()
-	modem.CloseEth2Net()
+	modem.Stop4GNetwork()
 
 	eth0CableOK, _ := isEth0CableConnected()
 	if eth0CableOK && openEth0Net() {
@@ -237,14 +237,14 @@ func openNetwork() {
 	}
 
 	tryOpenLTE := func() bool {
-		if eth2CableOK, _ := modem.IsEth2CableConnected(); eth2CableOK {
-			if modem.OpenEth2Net() {
+		if eth2CableOK, _ := modem.Is4GCableConnected(); eth2CableOK {
+			if modem.Start4GNetwork() {
 				return true
 			}
 			// 4G模组重新上电初始化后重试
 			modem.ModuleExit()
 			modem.ModuleInit(true)
-			return modem.OpenEth2Net()
+			return modem.Start4GNetwork()
 		}
 		return false
 	}