Commit a5703a44 by pidan

Merge branch 'feature/私享房需求' of http://git.yabolive.net:88/pidan/FuSiLive into feature/私享房需求

* 'feature/私享房需求' of http://git.yabolive.net:88/pidan/FuSiLive:
  修复一个相册崩溃问题
parents 74e74f06 847793dd
...@@ -1618,7 +1618,9 @@ extension FUSChatCallHelper { ...@@ -1618,7 +1618,9 @@ extension FUSChatCallHelper {
waitCountDownDisposeBag = .init() waitCountDownDisposeBag = .init()
callConnectSuccessDisposedBag = .init() callConnectSuccessDisposedBag = .init()
diamondAgainPay.accept(1) diamondAgainPay.accept(1)
otherFriendInfoDisposeBag = .init()
otherFriendInfoIsReady.accept(nil)
state.accept(.idle) state.accept(.idle)
isCaller.accept(false) isCaller.accept(false)
callOrderId.accept(nil) callOrderId.accept(nil)
......
...@@ -617,11 +617,13 @@ extension FUSBindAgentViewController: AVCaptureMetadataOutputObjectsDelegate { ...@@ -617,11 +617,13 @@ extension FUSBindAgentViewController: AVCaptureMetadataOutputObjectsDelegate {
// MARK: - 相册图片处理‌:ml-citation{ref="6" data="citationList"} // MARK: - 相册图片处理‌:ml-citation{ref="6" data="citationList"}
extension FUSBindAgentViewController: UIImagePickerControllerDelegate, UINavigationControllerDelegate { extension FUSBindAgentViewController: UIImagePickerControllerDelegate, UINavigationControllerDelegate {
public func imagePickerController(_ picker: UIImagePickerController, @objc public func imagePickerController(_ picker: UIImagePickerController,
didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey : Any]) { didFinishPickingMediaWithInfo info: NSDictionary) {
guard let image = info[.originalImage] as? UIImage,
guard let swiftInfo = info as? [AnyHashable: Any],
let image = swiftInfo[UIImagePickerController.InfoKey.originalImage] as? UIImage,
let ciImage = CIImage(image: image) else { let ciImage = CIImage(image: image) else {
dismiss(animated: true) picker.dismiss(animated: true)
return return
} }
...@@ -636,7 +638,7 @@ extension FUSBindAgentViewController: UIImagePickerControllerDelegate, UINavigat ...@@ -636,7 +638,7 @@ extension FUSBindAgentViewController: UIImagePickerControllerDelegate, UINavigat
} }
guard let stringValue = features.first?.messageString else { return } guard let stringValue = features.first?.messageString else { return }
dismiss(animated: true) picker.dismiss(animated: true)
// fus_uploadQrCodeMsg(stringValue) { [weak self] success in // fus_uploadQrCodeMsg(stringValue) { [weak self] success in
// if success { // if success {
......
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 sign in to comment