Merge branch 'dev' into alpha

src/platforms/app-plus/service/api/device/system.js

@@ -20,6 +20,7 @@ export function getSystemInfoSync () {
 export function getSystemInfo () {
   const platform = plus.os.name.toLowerCase()
   const ios = platform === 'ios'
+  const isAndroid = platform === 'android'
   const {
     screenWidth,
     screenHeight
@@ -86,7 +87,7 @@ export function getSystemInfo () {
     windowHeight,
     statusBarHeight,
     language: plus.os.language,
-    system: `${platform} ${plus.os.version}`,
+    system: `${ios ? 'iOS' : isAndroid ? 'Android' : ''} ${plus.os.version}`,
     version: plus.runtime.innerVersion,
     fontSizeSetting: '',
     platform,
@@ -102,4 +103,4 @@ export function getSystemInfo () {
     },
     deviceId: deviceId()
   }
-}
+}