@aks-dev/easyui 1.0.54 → 1.0.55
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/jsbridge/RNEasyui.ts +5 -5
- package/package.json +1 -1
- package/screen/px2dp.ts +2 -6
package/jsbridge/RNEasyui.ts
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* @Author: shiguo
|
|
3
3
|
* @Date: 2022-04-19 10:23:01
|
|
4
4
|
* @LastEditors: shiguo
|
|
5
|
-
* @LastEditTime: 2022-05-31
|
|
5
|
+
* @LastEditTime: 2022-05-31 18:42:45
|
|
6
6
|
* @FilePath: /@aks-dev/easyui/jsbridge/RNEasyui.ts
|
|
7
7
|
*/
|
|
8
8
|
|
|
@@ -19,12 +19,12 @@ export const getStatusBarHeight = () => {
|
|
|
19
19
|
const deviceHeight = Dimensions.get('window').height;
|
|
20
20
|
const isiPhoneX = Platform.OS == 'ios' && (deviceHeight > 736)
|
|
21
21
|
if (isiPhoneX) return Promise.resolve(44)
|
|
22
|
+
return Promise.resolve(20)
|
|
22
23
|
}
|
|
23
24
|
|
|
24
25
|
export const getNavigationBarHeight = () => {
|
|
25
26
|
if (Platform.OS == 'android') return RNEasyui.getNavigationBarHeight();
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
return Promise.resolve(64)
|
|
27
|
+
|
|
28
|
+
return Promise.resolve(44)
|
|
29
|
+
|
|
30
30
|
}
|
package/package.json
CHANGED
package/screen/px2dp.ts
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* @Author: shiguo
|
|
3
3
|
* @Date: 2022-04-18 14:32:25
|
|
4
4
|
* @LastEditors: shiguo
|
|
5
|
-
* @LastEditTime: 2022-05-31 18:
|
|
5
|
+
* @LastEditTime: 2022-05-31 18:43:44
|
|
6
6
|
* @FilePath: /@aks-dev/easyui/screen/px2dp.ts
|
|
7
7
|
*/
|
|
8
8
|
import { Dimensions, Platform, StatusBar } from 'react-native';
|
|
@@ -45,11 +45,7 @@ export const statusBarHeight = (() => {
|
|
|
45
45
|
|
|
46
46
|
|
|
47
47
|
|
|
48
|
-
export let navigationBarHeight =
|
|
49
|
-
if (isAndroid) return statusBarHeight
|
|
50
|
-
if (isiPhoneX) return 44
|
|
51
|
-
return 24
|
|
52
|
-
})()
|
|
48
|
+
export let navigationBarHeight = 44
|
|
53
49
|
|
|
54
50
|
|
|
55
51
|
|