mirror of
https://gitlab.linphone.org/BC/public/linphone-iphone.git
synced 2026-05-06 21:33:08 +00:00
Add default image when filepath is empty
Remove FileTransfer Callbacks when leave chatroom Fix editMode
This commit is contained in:
parent
26b51208ba
commit
053b39083c
2 changed files with 36 additions and 14 deletions
|
|
@ -219,12 +219,18 @@ class ChatConversationTableViewSwift: UIViewController, UICollectionViewDataSour
|
|||
|
||||
func collectionView(_ collectionView: UICollectionView, didEndDisplaying cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
|
||||
let customCell = cell as! MultilineMessageCell
|
||||
|
||||
if customCell.isPlayingVoiceRecording {
|
||||
AudioPlayer.stopSharedPlayer()
|
||||
}
|
||||
|
||||
if customCell.ephemeralTimer != nil {
|
||||
customCell.ephemeralTimer?.invalidate()
|
||||
}
|
||||
|
||||
if customCell.chatMessageDelegate != nil {
|
||||
customCell.chatMessage?.removeDelegate(delegate: customCell.chatMessageDelegate!)
|
||||
}
|
||||
}
|
||||
|
||||
func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
|
||||
|
|
|
|||
|
|
@ -1232,6 +1232,17 @@ class MultilineMessageCell: SwipeCollectionViewCell, UICollectionViewDataSource,
|
|||
NSLayoutConstraint.deactivate(imageConstraints)
|
||||
imageViewBubble.isHidden = true
|
||||
}
|
||||
} else {
|
||||
if content.filePath == "" {
|
||||
imagesGridCollectionView.append(SwiftUtil.textToImage(drawText: "Error", inImage: UIImage(named: "file_default")!, forReplyBubble: true))
|
||||
collectionViewImagesGrid.reloadData()
|
||||
|
||||
collectionViewImagesGrid.isHidden = false
|
||||
NSLayoutConstraint.activate(imagesGridConstraints)
|
||||
imageViewBubble.image = nil
|
||||
NSLayoutConstraint.deactivate(imageConstraints)
|
||||
imageViewBubble.isHidden = true
|
||||
}
|
||||
}
|
||||
}}
|
||||
if imagesGridCollectionView.count > 0 {
|
||||
|
|
@ -1294,23 +1305,27 @@ class MultilineMessageCell: SwipeCollectionViewCell, UICollectionViewDataSource,
|
|||
}
|
||||
imageUser.isHidden = true
|
||||
contentView.onClick {
|
||||
self.deleteItemCheckBox.isSelected = !self.deleteItemCheckBox.isSelected
|
||||
ChatConversationTableViewModel.sharedModel.messageListSelected.value![self.selfIndexMessage] = self.deleteItemCheckBox.isSelected
|
||||
|
||||
if ChatConversationTableViewModel.sharedModel.messageListSelected.value![self.selfIndexMessage] == true {
|
||||
ChatConversationTableViewModel.sharedModel.messageSelected.value! += 1
|
||||
}else{
|
||||
ChatConversationTableViewModel.sharedModel.messageSelected.value! -= 1
|
||||
if ChatConversationTableViewModel.sharedModel.editModeOn.value! {
|
||||
self.deleteItemCheckBox.isSelected = !self.deleteItemCheckBox.isSelected
|
||||
ChatConversationTableViewModel.sharedModel.messageListSelected.value![self.selfIndexMessage] = self.deleteItemCheckBox.isSelected
|
||||
|
||||
if ChatConversationTableViewModel.sharedModel.messageListSelected.value![self.selfIndexMessage] == true {
|
||||
ChatConversationTableViewModel.sharedModel.messageSelected.value! += 1
|
||||
}else{
|
||||
ChatConversationTableViewModel.sharedModel.messageSelected.value! -= 1
|
||||
}
|
||||
}
|
||||
}
|
||||
deleteItemCheckBox.onClick {
|
||||
self.deleteItemCheckBox.isSelected = !self.deleteItemCheckBox.isSelected
|
||||
ChatConversationTableViewModel.sharedModel.messageListSelected.value![self.selfIndexMessage] = self.deleteItemCheckBox.isSelected
|
||||
|
||||
if ChatConversationTableViewModel.sharedModel.messageListSelected.value![self.selfIndexMessage] == true {
|
||||
ChatConversationTableViewModel.sharedModel.messageSelected.value! += 1
|
||||
}else{
|
||||
ChatConversationTableViewModel.sharedModel.messageSelected.value! -= 1
|
||||
if ChatConversationTableViewModel.sharedModel.editModeOn.value! {
|
||||
self.deleteItemCheckBox.isSelected = !self.deleteItemCheckBox.isSelected
|
||||
ChatConversationTableViewModel.sharedModel.messageListSelected.value![self.selfIndexMessage] = self.deleteItemCheckBox.isSelected
|
||||
|
||||
if ChatConversationTableViewModel.sharedModel.messageListSelected.value![self.selfIndexMessage] == true {
|
||||
ChatConversationTableViewModel.sharedModel.messageSelected.value! += 1
|
||||
}else{
|
||||
ChatConversationTableViewModel.sharedModel.messageSelected.value! -= 1
|
||||
}
|
||||
}
|
||||
}
|
||||
}else{
|
||||
|
|
@ -1815,6 +1830,7 @@ class MultilineMessageCell: SwipeCollectionViewCell, UICollectionViewDataSource,
|
|||
}
|
||||
|
||||
func file_transfer_progress_indication_recv(message: ChatMessage, content: Content, offset: Int, total: Int) {
|
||||
print("file_transfer_progress_indication_recvfile_transfer_progress_indication_recv")
|
||||
let p = Float(offset) / Float(total)
|
||||
if ((imagesGridCollectionView.count) > 0){
|
||||
if !message.isOutgoing {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue