# Conflicts:
#	uni_modules/uni-fileSystemManager/package.json
#	uni_modules/uni-fileSystemManager/utssdk/app-android/FileDescriptorUtil.uts
#	uni_modules/uni-fileSystemManager/utssdk/app-android/index.uts
#	uni_modules/uni-fileSystemManager/utssdk/app-js/index.uts
#	uni_modules/uni-fileSystemManager/utssdk/interface.uts
#	uni_modules/uni-fileSystemManager/utssdk/unierror.uts
#	uni_modules/uni-getAppBaseInfo/utssdk/app-android/index.uts
#	uni_modules/uni-getAppBaseInfo/utssdk/app-ios/index.uts
#	uni_modules/uni-getAppBaseInfo/utssdk/interface.uts
#	uni_modules/uni-getDeviceInfo/utssdk/app-android/device/DeviceUtil.uts
#	uni_modules/uni-getDeviceInfo/utssdk/interface.uts
#	uni_modules/uni-getPerformance/utssdk/interface.uts
#	uni_modules/uni-getProvider/utssdk/app-android/index.uts
#	uni_modules/uni-getProvider/utssdk/interface.uts
#	uni_modules/uni-getSystemInfo/utssdk/app-android/index.uts
#	uni_modules/uni-getSystemInfo/utssdk/app-ios/index.uts
#	uni_modules/uni-getSystemInfo/utssdk/interface.uts
#	uni_modules/uni-getbatteryinfo/utssdk/interface.uts
#	uni_modules/uni-media/utssdk/app-android/index.uts
#	uni_modules/uni-media/utssdk/app-android/utils/ChooseImageUtils.uts
#	uni_modules/uni-media/utssdk/app-android/utils/ChooseMediaUtils.uts
#	uni_modules/uni-media/utssdk/app-android/utils/CompressUtils.uts
#	uni_modules/uni-media/utssdk/app-ios/Frameworks/DCloudMediaPicker.xcframework/Info.plist
#	uni_modules/uni-media/utssdk/app-ios/Frameworks/DCloudMediaPicker.xcframework/ios-arm64/DCloudMediaPicker.framework/DCloudMediaPicker
#	uni_modules/uni-media/utssdk/app-ios/Frameworks/DCloudMediaPicker.xcframework/ios-arm64_x86_64-simulator/DCloudMediaPicker.framework/DCloudMediaPicker
#	uni_modules/uni-media/utssdk/app-ios/Frameworks/DCloudMediaPicker.xcframework/ios-arm64_x86_64-simulator/DCloudMediaPicker.framework/_CodeSignature/CodeDirectory
#	uni_modules/uni-media/utssdk/app-ios/Frameworks/DCloudMediaPicker.xcframework/ios-arm64_x86_64-simulator/DCloudMediaPicker.framework/_CodeSignature/CodeRequirements-1
#	uni_modules/uni-media/utssdk/app-ios/Frameworks/DCloudMediaPicker.xcframework/ios-arm64_x86_64-simulator/DCloudMediaPicker.framework/_CodeSignature/CodeResources
#	uni_modules/uni-media/utssdk/app-ios/index.uts
#	uni_modules/uni-media/utssdk/app-ios/info.plist
#	uni_modules/uni-media/utssdk/interface.uts
#	uni_modules/uni-navigationBar/utssdk/app-android/index.uts
#	uni_modules/uni-network/utssdk/app-ios/index.uts
#	uni_modules/uni-network/utssdk/app-ios/interface.uts
#	uni_modules/uni-network/utssdk/app-ios/network/NetworkManager.uts
#	uni_modules/uni-payment-alipay/utssdk/app-android/Alipay.uts
#	uni_modules/uni-payment-alipay/utssdk/app-android/index.uts
#	uni_modules/uni-payment-alipay/utssdk/app-ios/config.json
#	uni_modules/uni-payment-alipay/utssdk/app-ios/index.uts
#	uni_modules/uni-payment-wxpay/utssdk/app-android/index.uts
#	uni_modules/uni-payment-wxpay/utssdk/app-android/src/WXPayEntryActivity.uts
#	uni_modules/uni-payment-wxpay/utssdk/app-android/src/Wxpay.uts
#	uni_modules/uni-payment-wxpay/utssdk/app-ios/config.json
#	uni_modules/uni-payment-wxpay/utssdk/app-ios/index.uts
#	uni_modules/uni-payment/utssdk/app-android/index.uts
#	uni_modules/uni-payment/utssdk/app-ios/index.uts
#	uni_modules/uni-payment/utssdk/interface.uts
#	uni_modules/uni-payment/utssdk/unierror.uts
#	uni_modules/uni-prompt/utssdk/app-android/res/layout/ac_recyclerview_layout_top.xml
#	uni_modules/uni-prompt/utssdk/app-android/res/layout/ac_recyclerview_layout_top_night.xml
#	uni_modules/uni-prompt/utssdk/app-android/res/layout/uni_prompt_ac_recyclerview_layout_top.xml
#	uni_modules/uni-prompt/utssdk/app-android/res/layout/uni_prompt_ac_recyclerview_layout_top_night.xml
#	uni_modules/uni-prompt/utssdk/app-android/showToast.uts
#	uni_modules/uni-route/utssdk/app-android/navigateBack.uts
#	uni_modules/uni-route/utssdk/constants.uts
#	uni_modules/uni-route/utssdk/interface.uts
#	uni_modules/uni-tabBar/utssdk/interface.uts
#	uni_modules/uni-websocket/utssdk/app-ios/websocket/WebsockerClient.uts

(cherry picked from commit 5ae463a3)

把全局的callback放到独立文件中，避免在uniapp1.0中编译byjs后缀的方法

(cherry picked from commit 71100e80)