Commit fae860e4 by CaryaLiu

Merge branch 'master' into develop

# Conflicts:
#	android
#	yarn-error.log
#	yarn.lock
parents 7b87aa99 41463039
......@@ -12,6 +12,7 @@
},
"dependencies": {
"@react-native-community/masked-view": "^0.1.10",
"@react-navigation/bottom-tabs": "^5.8.0",
"@react-navigation/native": "^5.7.3",
"@react-navigation/stack": "^5.9.0",
"bufferutil": "^4.0.1",
......
export const IC_LAUNCHER = require('../images/ic_launcher.png')
\ No newline at end of file
export const IC_LAUNCHER = require('../images/ic_launcher.png')
export const IC_WARN = require('../images/ic_warn.png')
......@@ -11,4 +11,5 @@ import { NativeModules, requireNativeComponent } from 'react-native';
//export default NativeModules.BMCUI;
//不使用export default时,对应的import语句需要使用大括号
export var BMCUI = NativeModules.BMCUI;
export var ImagePicker = NativeModules.ImagePicker;
\ No newline at end of file
export var ImagePicker = NativeModules.ImagePicker;
export var BMCInfo = NativeModules.BMCInfo;
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment