didi · hiyuki · Nov 26, 2024 · Nov 25, 2024 · Nov 26, 2024 · Nov 26, 2024
diff --git a/packages/api-proxy/src/platform/api/lifecycle/index.ali.js b/packages/api-proxy/src/platform/api/lifecycle/index.ali.js
diff --git a/packages/api-proxy/src/platform/api/lifecycle/index.js b/packages/api-proxy/src/platform/api/lifecycle/index.js
diff --git a/packages/api-proxy/src/platform/api/lifecycle/index.web.js b/packages/api-proxy/src/platform/api/lifecycle/index.web.js
diff --git a/packages/api-proxy/src/platform/api/system/index.ali.js b/packages/api-proxy/src/platform/api/system/index.ali.js
@@ -40,9  40,15 @@ const getDeviceInfo = function () {
 
 const getWindowInfo = ENV_OBJ.getWindowInfo || envError('getWindowInfo')
 
 const getLaunchOptionsSync = ENV_OBJ.getLaunchOptionsSync || envError('getLaunchOptionsSync')
 
 const getEnterOptionsSync = ENV_OBJ.getEnterOptionsSync || envError('getEnterOptionsSync')
 
 export {
   getSystemInfo,
   getSystemInfoSync,
   getDeviceInfo,
-  getWindowInfo
   getWindowInfo,
   getLaunchOptionsSync,
   getEnterOptionsSync
 }
diff --git a/packages/api-proxy/src/platform/api/system/index.js b/packages/api-proxy/src/platform/api/system/index.js
@@ -8,9  8,15 @@ const getDeviceInfo = ENV_OBJ.getDeviceInfo || envError('getDeviceInfo')
 
 const getWindowInfo = ENV_OBJ.getWindowInfo || envError('getWindowInfo')
 
 const getLaunchOptionsSync = ENV_OBJ.getLaunchOptionsSync || envError('getLaunchOptionsSync')
 
 const getEnterOptionsSync = ENV_OBJ.getEnterOptionsSync || envError('getEnterOptionsSync')
 
 export {
   getSystemInfo,
   getSystemInfoSync,
   getDeviceInfo,
-  getWindowInfo
   getWindowInfo,
   getLaunchOptionsSync,
   getEnterOptionsSync
 }
diff --git a/packages/api-proxy/src/platform/api/system/index.web.js b/packages/api-proxy/src/platform/api/system/index.web.js
@@ -1,10  1,6 @@
-import { envError, isBrowser, throwSSRWarning, successHandle } from '../../../common/js'
 import { isBrowser, throwSSRWarning, successHandle } from '../../../common/js'
 
-function getSystemInfoSync () {
-  if (!isBrowser) {
-    throwSSRWarning('getSystemInfoSync API is running in non browser environments')
-    return
-  }
 const getDeviceInfo = function () {
   const ua = navigator.userAgent.split('(')[1]?.split(')')[0] || ''
   const phones = new Map([
     ['iPhone', /iPhone|iPad|iPod|iOS/i],
@@ -37,20  33,57 @@ function getSystemInfoSync () {
   } else {
     system = `Android ${ua.replace(/^.*Android ([\d.] );.*$/, '$1')}`
   }
-
   return {
-    brand: brand,
     abi: null,
     deviceAbi: null,
     benchmarkLevel: null,
     brand,
     model: brand,
     system,
     platform: navigator.platform,
     cpuType: null,
     memorySize: null
   }
 }
 
 const getWindowInfo = function () {
   return {
     pixelRatio: window.devicePixelRatio,
     screenWidth: window.screen.width,
     screenHeight: window.screen.height,
     windowWidth: document.documentElement.clientWidth,
     windowHeight: document.documentElement.clientHeight,
     statusBarHeight: null,
     safeArea: null,
     screenTop: null
   }
 }
 
 function getSystemInfoSync () {
   if (!isBrowser) {
     throwSSRWarning('getSystemInfoSync API is running in non browser environments')
     return
   }
 
   const {
     pixelRatio,
     screenWidth,
     screenHeight,
     windowWidth,
     windowHeight,
     statusBarHeight,
     safeArea
   } = getWindowInfo()
   const {
     benchmarkLevel,
     brand,
     model,
     system,
     platform
   } = getDeviceInfo()
   const result = Object.assign({
     language: navigator.language,
     version: null,
-    system,
-    platform: navigator.platform,
     fontSizeSetting: null,
     SDKVersion: null,
     benchmarkLevel: null,
@@ -64,9  97,23 @@ function getSystemInfoSync () {
     notificationSoundAuthorized: null,
     bluetoothEnabled: null,
     locationEnabled: null,
-    wifiEnabled: null,
-    safeArea: null
-  }
     wifiEnabled: null
   }, {
     pixelRatio,
     screenWidth,
     screenHeight,
     windowWidth,
     windowHeight,
     statusBarHeight,
     safeArea
   }, {
     benchmarkLevel,
     brand,
     model,
     system,
     platform
   })
   return result
 }
 
 function getSystemInfo (options = {}) {
@@ -79,13  126,27 @@ function getSystemInfo (options = {}) {
   successHandle(res, options.success, options.complete)
 }
 
-const getDeviceInfo = envError('getDeviceInfo')
 const getEnterOptionsSync = function () {
   if (!isBrowser) {
     throwSSRWarning('getEnterOptionsSync API is running in non browser environments')
     return
   }
   return global.__mpxEnterOptions || {}
 }
 
-const getWindowInfo = envError('getWindowInfo')
 const getLaunchOptionsSync = function () {
   if (!isBrowser) {
     throwSSRWarning('getLaunchOptionsSync API is running in non browser environments')
     return
   }
   return global.__mpxEnterOptions || {}
 }
 
 export {
   getSystemInfo,
   getSystemInfoSync,
   getDeviceInfo,
-  getWindowInfo
   getWindowInfo,
   getLaunchOptionsSync,
   getEnterOptionsSync
 }
diff --git a/packages/api-proxy/src/platform/api/system/rnSystem.js b/packages/api-proxy/src/platform/api/system/rnSystem.js
@@ -75,9  75,26 @@ const getDeviceInfo = function () {
   return deviceInfo
 }
 
 const getLaunchOptionsSync = function () {
   const options = global.__mpxEnterOptions || {}
   const { path, scene, query } = options
   return {
     path,
     scene,
     query
   }
 }
 
 const getEnterOptionsSync = function () {
   const result = getLaunchOptionsSync()
   return result
 }
 
 export {
   getSystemInfo,
   getSystemInfoSync,
   getDeviceInfo,
-  getWindowInfo
   getWindowInfo,
   getLaunchOptionsSync,
   getEnterOptionsSync
 }
diff --git a/packages/api-proxy/src/platform/index.js b/packages/api-proxy/src/platform/index.js
@@ -105,9  105,6 @@ export * from './api/video'
 // onWindowResize, offWindowResize
 export * from './api/window'
 
-// getEnterOptionsSync
-export * from './api/lifecycle'
-
 // getLocation, openLocation, chooseLocation
 export * from './api/location'