Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
yotta
/
pictogram
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
60
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
a30990d1
authored
May 05, 2018
by
Fernando Martínez Santiago
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
libreria websockets actualizada a 0.5.1
parent
78f2452c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
android/Pictogram/commonlibrary/build.gradle
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/net/websockets/Room.java
android/Pictogram/supervisor/supervisor.iml
android/Pictogram/commonlibrary/build.gradle
View file @
a30990d1
...
@@ -46,7 +46,7 @@ dependencies {
...
@@ -46,7 +46,7 @@ dependencies {
testCompile
'junit:junit:4.12'
testCompile
'junit:junit:4.12'
compile
'com.android.support:support-v4:24.2.1'
compile
'com.android.support:support-v4:24.2.1'
compile
'com.android.support:appcompat-v7:24.2.1'
compile
'com.android.support:appcompat-v7:24.2.1'
compile
'com.github.nkzawa:socket.io-client:0.5.
0
'
compile
'com.github.nkzawa:socket.io-client:0.5.
1
'
compile
'com.koushikdutta.async:androidasync:2.+'
compile
'com.koushikdutta.async:androidasync:2.+'
compile
'com.koushikdutta.ion:ion:2.+'
compile
'com.koushikdutta.ion:ion:2.+'
compile
'com.google.android.gms:play-services-ads:9.2.1'
compile
'com.google.android.gms:play-services-ads:9.2.1'
...
...
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/net/websockets/Room.java
View file @
a30990d1
...
@@ -42,7 +42,7 @@ public class Room {
...
@@ -42,7 +42,7 @@ public class Room {
@Override
@Override
public
void
call
(
Object
...
args
)
{
public
void
call
(
Object
...
args
)
{
Log
.
e
(
LOG_TAG
,
"Websockect disconnect"
);
Log
.
e
(
LOG_TAG
,
"Websockect disconnect"
);
PCBcontext
.
getNetService
().
setOffline
(
new
SocketIOException
(
"Websocket connection is lost"
));
//
PCBcontext.getNetService().setOffline(new SocketIOException("Websocket connection is lost"));
}
}
});
});
connect
();
connect
();
...
...
android/Pictogram/supervisor/supervisor.iml
View file @
a30990d1
...
@@ -155,18 +155,17 @@
...
@@ -155,18 +155,17 @@
</content>
</content>
<orderEntry
type=
"jdk"
jdkName=
"Android API 24 Platform"
jdkType=
"Android SDK"
/>
<orderEntry
type=
"jdk"
jdkName=
"Android API 24 Platform"
jdkType=
"Android SDK"
/>
<orderEntry
type=
"sourceFolder"
forTests=
"false"
/>
<orderEntry
type=
"sourceFolder"
forTests=
"false"
/>
<orderEntry
type=
"library"
name=
"com.squareup.okio:okio:1.3.0@jar"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.github.nkzawa:socket.io-client:0.5.1@jar"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.github.nkzawa:socket.io-client:0.5.0@jar"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.github.nkzawa:engine.io-client:0.5.0@jar"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.android.support:support-annotations:24.2.1@jar"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.android.support:support-annotations:24.2.1@jar"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.google.android.gms:play-services-basement-9.2.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.google.android.gms:play-services-basement-9.2.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.squareup.okhttp:okhttp:2.4.0@jar"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.android.support:support-fragment-24.2.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.android.support:support-fragment-24.2.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.google.android.gms:play-services-auth-9.2.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.google.android.gms:play-services-auth-9.2.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.koushikdutta.async:androidasync-2.2.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.koushikdutta.async:androidasync-2.2.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.android.support:support-v4-24.2.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.android.support:support-v4-24.2.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.google.code.gson:gson:2.3@jar"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.google.code.gson:gson:2.3@jar"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.squareup.okhttp:okhttp-ws:2.3.0@jar"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.google.android.gms:play-services-iid-9.2.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.google.android.gms:play-services-iid-9.2.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.github.nkzawa:engine.io-client:0.5.1@jar"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.android.support:animated-vector-drawable-24.2.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.android.support:animated-vector-drawable-24.2.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.google.android.gms:play-services-base-9.2.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.google.android.gms:play-services-base-9.2.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.koushikdutta.ion:ion-2.2.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.koushikdutta.ion:ion-2.2.1"
level=
"project"
/>
...
@@ -181,10 +180,11 @@
...
@@ -181,10 +180,11 @@
<orderEntry
type=
"library"
name=
"com.google.android.gms:play-services-ads-9.2.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.google.android.gms:play-services-ads-9.2.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.google.android.gms:play-services-gcm-9.2.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.google.android.gms:play-services-gcm-9.2.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"pl.droidsonroids.gif:android-gif-drawable-1.1.7"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"pl.droidsonroids.gif:android-gif-drawable-1.1.7"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.squareup.ok
http:okhttp:2.3
.0@jar"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.squareup.ok
io:okio:1.4
.0@jar"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.google.android.gms:play-services-ads-lite-9.2.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.google.android.gms:play-services-ads-lite-9.2.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.android.support:appcompat-v7-24.2.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.android.support:appcompat-v7-24.2.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.android.support:support-core-ui-24.2.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.android.support:support-core-ui-24.2.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.squareup.okhttp:okhttp-ws:2.4.0@jar"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.android.support:support-compat-24.2.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"com.android.support:support-compat-24.2.1"
level=
"project"
/>
<orderEntry
type=
"module"
module-name=
"commonlibrary"
/>
<orderEntry
type=
"module"
module-name=
"commonlibrary"
/>
<orderEntry
type=
"module"
module-name=
"tabletlibrary"
/>
<orderEntry
type=
"module"
module-name=
"tabletlibrary"
/>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment