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

Packet Buffer auf 30MB gesetzt

Browse Source
This commit is contained in:
staccatomamba
2016-11-25 11:23:44 +01:00
parent 6f72e9646d
commit 780e881951
5 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Android/BewoMitarbeiterApp/app/app.iml
View File

@@ -66,14 +66,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -82,6 +74,14 @@
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
@@ -100,8 +100,6 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/multi-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />

13
Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/KontaktChatActivity.java
View File

@@ -43,6 +43,7 @@ import entities.ChatEntity;
import entities.ChatMessage;
import entities.ChatPerson;
import entities.ImageEntity;
import soapConnection.ApplicationUser;
import soapConnection.JsonSoapPrimitiveRequest;
import soapConnection.OnRequestSuccessCallback;
import soapConnection.Packet;
@@ -772,6 +773,16 @@ public class KontaktChatActivity extends ActionBarActivity implements Connectivi
if(callback != null) {
callback.doCallback();
}
// JsonSoapPrimitiveImageRequestListener
ArrayList<PropertyInfo> propertyInfos = new ArrayList<>();
propertyInfos.add(SoapConnectionManager.BuildProperty("pPersonOid", SoapConnectionManager.getUser().getPersonOid(), Long.class));
JsonSoapPrimitiveRequest request = new JsonSoapPrimitiveRequest(SoapCalls.LOGIN_CALL, propertyInfos);
BeWoLog.writeToLogFile("Lade Kontakte erneut herunter. (JsonSoapPrimitiveImageRequestListener->onRequestSuccess)");
spiceManager.execute(request, new KontaktChatActivity.JsonSoapPrimitiveImageRequestListener());
}
}
@@ -902,6 +913,8 @@ public class KontaktChatActivity extends ActionBarActivity implements Connectivi
if(!result.isEmpty()) {
Log.i("IMAGES", "" + result.get(0).Image.length);
} else {
Log.i("IMAGES", "Es wurden keine Bilder geladen.");
}
// List<ContactListItem> lc = databaseHandler.getAllContacts();

1
BeWo/View/ChatView.xaml.cs
View File

@@ -1973,6 +1973,7 @@ namespace BeWo.View
}
serverStream.Write(outStream, 0, outStream.Length);
serverStream.Flush();

2
BeWoChatServer/Server.cs
View File

@@ -94,7 +94,7 @@ namespace BeWoChatServer
}
var packet = new Packet(socket, clientName, oid, recipientPersonOid, isEmployee);
socket.BeginReceive(packet.DataBuffer, 0, packet.DataBuffer.Length, SocketFlags.None, asyncCallback, packet);
}
catch (Exception e)

2
Shared/Packet.cs
View File

@@ -26,7 +26,7 @@ namespace BS.Shared
public string MessageId { get; set; }
public int MediaTyp { get; set; }
public byte[] DataBuffer = new byte[1024];
public byte[] DataBuffer = new byte[31457280];
// Aufbau Message:
// die ersten fünf ";" ignorieren