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
9836ef65
authored
May 31, 2017
by
german
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Arreglado issue
#232
en la parte del PCB
parent
bd3b65b6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/net/websockets/VocabularyTalk.java
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/net/websockets/VocabularyTalk.java
View file @
9836ef65
...
...
@@ -34,7 +34,7 @@ public class VocabularyTalk implements Emitter.Listener {
final
String
param_picto
=
"picto"
;
final
String
param_stu_picto
=
"stu_picto"
;
final
String
param_picto_id
=
"id"
;
final
String
param_stupicto_scene
=
"scene"
;
final
String
param_stupicto_scene
=
"
id_
scene"
;
final
String
param_picto_cat
=
"id_cat"
;
final
String
action_update
=
"update"
;
final
String
action_update_category
=
"update_category"
;
...
...
@@ -48,12 +48,12 @@ public class VocabularyTalk implements Emitter.Listener {
Log
.
i
(
LOG_TAG
,
"raw Received message "
+
msg
.
toString
());
String
action
=
msg
.
getString
(
param_action
).
toLowerCase
();
JSONObject
stu_picto
=
msg
.
getJSONObject
(
param_attributes
).
getJSONObject
(
param_stu_picto
);
int
stupicto_id
=
stu_picto
.
getInt
(
param_picto_id
);
JSONObject
attributes
=
msg
.
getJSONObject
(
param_attributes
);
JSONObject
attrs_stu_picto
=
stu_picto
.
optJSONObject
(
param_attributes
);
JSONObject
picto_stupicto
=
stu_picto
.
optJSONObject
(
param_picto
);
int
picto_id
=
picto_stupicto
.
getInt
(
param_picto_id
);
int
picto_cat
=
attrs_stu_picto
!=
null
?
attrs_stu_picto
.
optInt
(
param_picto_cat
,
Picto
.
NO_CATEGORY
)
:
0
;
if
(
PCBcontext
.
getPcbdb
().
getCurrentUser
().
get_active_scene
()
==
stu_picto
.
getInt
(
param_stupicto_scene
))
{
if
(
PCBcontext
.
getPcbdb
().
getCurrentUser
().
get_active_scene
()
==
attributes
.
getInt
(
param_stupicto_scene
))
{
PCBcontext
.
getNetService
().
nextSynchro
(
new
Date
().
getTime
()
+
PCBcontext
.
getNetService
().
getSynchroTimingLength
()
*
2
);
//nos saltamos una sincronización para evitar que llegue antes que los websockets
for
(
iVocabularyListener
listener
:
this
.
listeners
)
listener
.
change
(
action
.
equals
(
action_update
)
?
iVocabularyListener
.
action
.
update
...
...
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