From f15466dbcf710c332882130d362e58f9f80cac00 Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Sat, 30 Jan 2021 20:18:54 +0800
Subject: [PATCH] =?UTF-8?q?fix(App):=20=E7=BD=91=E7=BB=9C=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=94=AF=E6=8C=81=205g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/platforms/app-plus/service/api/constants.js             | 2 +-
 .../app-plus/service/api/device/get-network-type.js         | 6 +++---
 src/platforms/app-plus/service/framework/app.js             | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/platforms/app-plus/service/api/constants.js b/src/platforms/app-plus/service/api/constants.js
index 50f999af9..4ae962c0e 100644
--- a/src/platforms/app-plus/service/api/constants.js
+++ b/src/platforms/app-plus/service/api/constants.js
@@ -1,5 +1,5 @@
 export const DEVICE_FREQUENCY = 200
-export const NETWORK_TYPES = ['unknown', 'none', 'ethernet', 'wifi', '2g', '3g', '4g']
+export const NETWORK_TYPES = ['unknown', 'none', 'ethernet', 'wifi', '2g', '3g', '4g', '5g']
 
 export const MAP_ID = '__UNIAPP_MAP'
 
diff --git a/src/platforms/app-plus/service/api/device/get-network-type.js b/src/platforms/app-plus/service/api/device/get-network-type.js
index 1ff25f6a6..e2080e7be 100644
--- a/src/platforms/app-plus/service/api/device/get-network-type.js
+++ b/src/platforms/app-plus/service/api/device/get-network-type.js
@@ -1,10 +1,10 @@
 import {
   NETWORK_TYPES
-} from '../constants'
+} from '../constants'
 
 export function getNetworkType () {
   return {
     errMsg: 'getNetworkType:ok',
-    networkType: NETWORK_TYPES[plus.networkinfo.getCurrentType()]
+    networkType: NETWORK_TYPES[plus.networkinfo.getCurrentType()] || 'unknown'
   }
-}
+}
diff --git a/src/platforms/app-plus/service/framework/app.js b/src/platforms/app-plus/service/framework/app.js
index da95a65e8..d5d5fa979 100644
--- a/src/platforms/app-plus/service/framework/app.js
+++ b/src/platforms/app-plus/service/framework/app.js
@@ -86,7 +86,7 @@ function initGlobalListeners () {
   })
 
   plus.globalEvent.addEventListener('netchange', () => {
-    const networkType = NETWORK_TYPES[plus.networkinfo.getCurrentType()]
+    const networkType = NETWORK_TYPES[plus.networkinfo.getCurrentType()] || 'unknown'
     publish('onNetworkStatusChange', {
       isConnected: networkType !== 'none',
       networkType
@@ -237,4 +237,4 @@ export function registerApp (appVm) {
   __uniConfig.ready = true
 
   process.env.NODE_ENV !== 'production' && perf('registerApp')
-}
+}
-- 
GitLab