Merge branch 'dev' into alpha

docs/api/system/network.md

@@ -23,6 +23,7 @@
 |2g|2g 网络||
 |3g|3g 网络||
 |4g|4g 网络||
+|5g|5g 网络||
 |ethernet|有线网络|App|
 |unknown|Android 下不常见的网络类型||
 |none|无网络| |

src/platforms/app-plus/service/api/constants.js

 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'
 

src/platforms/app-plus/service/api/device/get-network-type.js

 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'
   }
-}
+}

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')
-}
+}