This commit is contained in:
Waldi
2016-11-21 11:20:47 +01:00
parent d21ee5da2b
commit 6cfe3975b9
4 changed files with 81 additions and 29 deletions

View File

@@ -3,6 +3,7 @@ using System.Diagnostics;
using System.Globalization;
using System.Net.Sockets;
using System.Text;
using BS.Shared.Extensions;
namespace BS.Shared
{
@@ -15,9 +16,7 @@ namespace BS.Shared
public long RecipientPersonOid { get; set; }
public DataIdentifier DataIdentifier { get; set; }
public string ChatMessage { get; set; }
public byte[] SoundDatei { get; set; }
public byte[] DokumentenDatei { get; set; }
public byte[] BildDatei { get; set; }
public byte[] MediaDatei { get; set; }
public DateTime MessageTimeStamp { get; set; }
public string Tenant { get; set; }
public bool IsDelivered { get; set; }
@@ -25,6 +24,7 @@ namespace BS.Shared
public long ClientseitigeOid { get; set; }
public bool IsEmployee { get; set; }
public string MessageId { get; set; }
public int MediaTyp { get; set; }
public byte[] DataBuffer = new byte[1024];
@@ -45,6 +45,7 @@ namespace BS.Shared
Tenant = "";
IsEmployee = pIsEmployee;
MessageId = "";
MediaTyp = 0;
}
public Packet()
@@ -53,6 +54,7 @@ namespace BS.Shared
ChatMessage = "";
Tenant = "";
ClientName = "";
MediaTyp = 0;
}
public void GetData(string message)
@@ -73,9 +75,8 @@ namespace BS.Shared
Tenant = gesplittet[7];
var isEmployeeString = gesplittet[8];
MessageId = gesplittet[9];
//var SoundDateiAsString = gesplittet[10];
//var DokumentenDateiAsString = gesplittet[11];
//var BildDateiAsString = gesplittet[12];
var mediatypString = gesplittet[10];
var mediaDateiSring = gesplittet[11];
DataIdentifier = (DataIdentifier) Convert.ToInt32(chatIdentifierString);
@@ -85,6 +86,20 @@ namespace BS.Shared
ClientseitigeOid = Convert.ToInt64(clientseitigeOidString);
IsEmployee = Convert.ToInt32(isEmployeeString) == 1;
if (!mediatypString.IsNullOrEmpty())
{
MediaTyp = Convert.ToInt32(mediatypString);
}
else
{
MediaTyp = 0;
}
if (!mediaDateiSring.IsNullOrEmpty())
{
MediaDatei = Convert.FromBase64String(mediaDateiSring);
}
var chatNameLength = Convert.ToInt32(chatNameLengthString);
var chatMessageLength = Convert.ToInt32(chatMessageLengthString);
@@ -120,12 +135,12 @@ namespace BS.Shared
}
public byte[] GetDataStream(long senderPersonOid, long empfaengerPersonoid, string clientName, string message, DataIdentifier dataIdentifier, string tenant, bool isDelivered, bool IsEmploye, string Messageid)
public byte[] GetDataStream(long senderPersonOid, long empfaengerPersonoid, string clientName, string message, DataIdentifier dataIdentifier, string tenant, bool isDelivered, bool IsEmploye, string Messageid,int mediatyp,byte[]mediaDatei)
{
//Bewo-Client spezialisiert
var result = "";
result += senderPersonOid + ";" + empfaengerPersonoid + ";" + clientName.Length + ";" + message.Length + ";" + (int)dataIdentifier + ";" + 0 + ";" + 0 + ";" + tenant + ";" + (IsEmploye ? 1 : 0) + ";" + Messageid + ";" + clientName + message + DateTime.Now.ToString("dd.MM.yyyy HH:mm:ss") + "" + (isDelivered ? 1 : 0);
result += senderPersonOid + ";" + empfaengerPersonoid + ";" + clientName.Length + ";" + message.Length + ";" + (int)dataIdentifier + ";" + 0 + ";" + 0 + ";" + tenant + ";" + (IsEmploye ? 1 : 0) + ";" + Messageid + ";" + clientName + message + DateTime.Now.ToString("dd.MM.yyyy HH:mm:ss") + "" + (isDelivered ? 1 : 0) + ";" + mediatyp + ";" + Convert.ToBase64String(mediaDatei);
return Encoding.UTF8.GetBytes(result);
}