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
8e4a32f1
authored
Oct 03, 2017
by
Fernando Martínez Santiago
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
soporte a entrega por picto pulsado
parent
ca165925
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
1 deletions
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/dao/User.java
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/VOCA.java
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/dao/User.java
View file @
8e4a32f1
...
@@ -2,7 +2,6 @@ package com.yottacode.pictogram.dao;
...
@@ -2,7 +2,6 @@ package com.yottacode.pictogram.dao;
import
android.content.Context
;
import
android.content.Context
;
import
android.graphics.Bitmap
;
import
android.graphics.Bitmap
;
import
android.util.Log
;
import
com.yottacode.pictogram.tools.Img
;
import
com.yottacode.pictogram.tools.Img
;
...
@@ -37,6 +36,7 @@ public class User {
...
@@ -37,6 +36,7 @@ public class User {
static
String
TTS_ENGINE
=
"tts engine"
;
static
String
TTS_ENGINE
=
"tts engine"
;
static
String
TTS_VOICE
=
"tts voice"
;
static
String
TTS_VOICE
=
"tts voice"
;
static
String
DELIVERY
=
"delivery"
;
static
String
DELIVERY
=
"delivery"
;
static
String
DELIVERY_EACH_PICTO
=
"delivery_each_picto"
;
}
}
public
final
static
class
JSON_STUDENT_INPUT_FEEDBACK
{
public
final
static
class
JSON_STUDENT_INPUT_FEEDBACK
{
public
static
String
VIBRATION
=
"vibration"
;
public
static
String
VIBRATION
=
"vibration"
;
...
@@ -299,6 +299,12 @@ public class User {
...
@@ -299,6 +299,12 @@ public class User {
}
}
/**
/**
* True if every picto is delivered withput pressing delivery key
*/
public
boolean
one_picto_delivery
()
{
return
this
.
attributes_stu
.
optBoolean
(
JSON_STUDENT_ATTTRS
.
DELIVERY_EACH_PICTO
,
false
);
}
/**
*
*
* @return input selection of the student configuration (default: "click")
* @return input selection of the student configuration (default: "click")
*/
*/
...
...
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/VOCA.java
View file @
8e4a32f1
...
@@ -829,6 +829,8 @@ public class VOCA extends Activity implements VocabularyTalk.iVocabularyListener
...
@@ -829,6 +829,8 @@ public class VOCA extends Activity implements VocabularyTalk.iVocabularyListener
}
else
if
(
tapeAdapter
.
getCount
()
<
VOCA
.
this
.
maxInTape
&&
!
VOCA
.
this
.
tapeAdapter
.
play
())
{
}
else
if
(
tapeAdapter
.
getCount
()
<
VOCA
.
this
.
maxInTape
&&
!
VOCA
.
this
.
tapeAdapter
.
play
())
{
addPictoWord
(
parent
.
getChildAt
(
position
),
p
);
addPictoWord
(
parent
.
getChildAt
(
position
),
p
);
}
}
if
(
PCBcontext
.
getPcbdb
().
getCurrentUser
().
one_picto_delivery
())
ttsButton
.
performClick
();
}
}
}
}
...
...
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