ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo

Browse Source 
# Conflicts:
#	BeWoChatServer/Server.cs
This commit is contained in:
staccatomamba
2016-11-30 13:45:56 +01:00
parent 337b1859a1 31cb1e38c0
commit 40e2f8b561
3 changed files with 266 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
BeWoChatServer/Server.cs
View File

@@ -427,7 +427,8 @@ namespace BeWoChatServer
InsUser = dataPacket.ClientName,
TeamOid = dataPacket.RecipientPersonOid,
IsDelivered = true,
MessageId = dataPacket.MessageId
MessageId = dataPacket.MessageId,
MediaTyp = dataPacket.MediaTyp
};
var team = DAOFactory.GenericDAO.LoadByID<Team>(dataPacket.RecipientPersonOid);
@@ -435,6 +436,7 @@ namespace BeWoChatServer
Console.WriteLine(DateTime.Now + ": Speichere Team-Nachricht in der Datenbank");
DAOFactory.GenericDAO.Insert(chatMessage);
<<<<<<< .mine
var newestMessage = DAOFactory.SearchDAO.GetNewestChatMessageForConversation(dataPacket.RecipientPersonOid, dataPacket.SenderPersonOid, true);
var newestChatMessage = new NewestChatMessage()
{
@@ -451,6 +453,40 @@ namespace BeWoChatServer
DAOFactory.GenericDAO.Insert(newestChatMessage);
=======
//Media Bereich mit Bild und Dok.
if (dataPacket.MediaDatei != null)
{
byte[] media = dataPacket.MediaDatei;
byte[] ThImage = null;
if (dataPacket.MediaTyp == 1)
{
ThImage = media;
}
var chatMediaMessage = new ChatMediaMessage
{
Media = media,
InsUser = dataPacket.ClientName,
ImageThumpNail = BS.Shared.Core.Utils.ErstelleThumbnail(ThImage, 150, 150),
ChatMessageOid = chatMessage.Oid
};
Console.WriteLine(DateTime.Now + ": Speichere die Chat-Media-Nachricht in der Datenbank");
DAOFactory.GenericDAO.Insert(chatMediaMessage);
}
>>>>>>> .theirs
var personOids = team.MemberList.Select(s => s.Person.Oid.Value);
if (chatMessage.Oid != null)