@dcloudio/uni-quickapp-webview 2.0.2-5000720260410001 → 2.0.2-5010520260709001

package/dist/index.js

@@ -829,24 +829,44 @@ function addSafeAreaInsets (result) {
 }
 
 function getOSInfo (system, platform) {
+  /**
+   * system 枚举值说明：
+   *
+   * weixin: 操作系统及版本
+   * qq: 操作系统及版本
+   * kuaishou: 操作系统及版本
+   *
+   * alipay、dingding: 系统版本
+   * baidu: 操作系统版本
+   * toutiao/douyin: 操作系统版本
+   * jd: 操作系统版本
+   * harmony: 操作系统版本
+   *
+   * lark: 文档无此字段
+   */
   let osName = '';
   let osVersion = '';
 
   if (
     platform &&
-    ( "quickapp-webview" === 'mp-baidu')
+    ( "quickapp-webview" === 'mp-harmony')
   ) {
     osName = platform;
     osVersion = system;
+    system = `${osName} ${osVersion}`;
   } else {
-    osName = system.split(' ')[0] || platform;
+    {
+      osName = system.split(' ')[0] || platform;
+    }
     osVersion = system.split(' ')[1] || '';
   }
 
   osName = osName.toLocaleLowerCase();
+
   switch (osName) {
     case 'harmony': // alipay
-    case 'ohos': // weixin
+    case 'ohos': // weixin harmony
+    case 'openharmonyos': // weixin 由 HarmonyOS 改为了 OpenHarmonyOS
     case 'openharmony': // feishu
       osName = 'harmonyos';
       break
@@ -864,8 +884,41 @@ function getOSInfo (system, platform) {
 
   return {
     osName,
-    osVersion
+    osVersion,
+    system
+  }
+}
+
+function getPlatform (platform) {
+  /**
+   * platform 枚举值说明：
+   *
+   * weixin：ios、android、windows、mac、ohos、ohos_pc、devtools
+   * alipay、dingding：Android，iOS / iPhone OS，Harmony
+   * harmony: 固定 ohos
+   *
+   * toutiao: Android，iOS 无 harmony 平台，暂不处理
+   * lark: 'pc' | 'mobile' | 'android' | 'ios', 无 harmony 平台，暂不处理
+   *
+   * baidu：无相关描述
+   * qq: 无相关描述
+   * kuaishou: 无相关描述
+   * jd: 无相关描述
+   */
+  platform = platform.toLowerCase();
+  {
+    switch (platform) {
+      case 'iphone os':
+        platform = 'ios';
+        break
+      case 'openharmonyos':
+      case 'openharmony':
+      case 'harmony':
+        platform = 'harmonyos';
+        break
+    }
   }
+  return platform
 }
 
 function populateParameters (result) {
@@ -880,7 +933,7 @@ function populateParameters (result) {
   const extraParam = {};
 
   // osName osVersion
-  const { osName, osVersion } = getOSInfo(system, platform);
+  const { osName, osVersion, system: updatedSystem } = getOSInfo(system, platform);
   let hostVersion = version;
 
   // deviceType
@@ -931,6 +984,8 @@ function populateParameters (result) {
     hostFontSizeSetting: fontSizeSetting,
     windowTop: 0,
     windowBottom: 0,
+    platform: getPlatform(platform),
+    system: updatedSystem,
     // TODO
     osLanguage: undefined,
     osTheme: undefined,
@@ -945,12 +1000,15 @@ function populateParameters (result) {
 }
 
 function getGetDeviceType (result, model) {
+  const platform = result.platform || '';
   let deviceType = result.deviceType || 'phone';
   {
     const deviceTypeMaps = {
       ipad: 'pad',
       windows: 'pc',
-      mac: 'pc'
+      mac: 'pc',
+      linux: 'pc',
+      pc: 'pc'
     };
     const deviceTypeMapsKeys = Object.keys(deviceTypeMaps);
     const _model = model.toLocaleLowerCase();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-quickapp-webview",
-  "version": "2.0.2-5000720260410001",
+  "version": "2.0.2-5010520260709001",
   "description": "uni-app quickapp-webview",
   "main": "dist/index.js",
   "repository": {
@@ -17,5 +17,5 @@
     "name": "quickapp-webview",
     "title": "快应用(Webview)版"
   },
-  "gitHead": "82deb22abba40f01d10a6a4deb83b418e0adc266"
+  "gitHead": "f17eaf4bf390726fa12db98e6efbe0557841bed0"
 }