Commit 6abee7ac authored by EXT Ait Ammar Adam's avatar EXT Ait Ammar Adam
Browse files

Version_21/05_Adam

parent 5f2b411c
......@@ -7,7 +7,7 @@
<script type="text/javascript" src="closure-library/closure/goog/base.js"></script>
<link type="text/css" rel="stylesheet" href="media/blockly.css">
<link type="text/css" rel="stylesheet" href="closure-library/closure/goog/css/dialog.css">
<script type="text/javascript" src="blockly-83330fc4-b12c-49c7-a14c-c26e5ad3351b.js"></script>
<script type="text/javascript" src="blockly-2f60a92b-6db0-42f2-b302-a75581aacd24.js"></script>
<style>
html, body {
background-color: #fff;
......
56BBE5B300CE00F8AB0ABBD401CBDF2A.cache.js
0A68CDEBE4A651489C4CB81761FB88AE.cache.js
locale default
user.agent gecko1_8
19890C3BAAC84638FAFF3C14F37B7F23.cache.js
locale fr_FR
user.agent gecko1_8
5D702697F2D6F1EDD1B2851EE3BF5464.cache.js
CB8740F63DD560B2D09CF5E9447DCF53.cache.js
locale default
user.agent safari
6BAD5F2F461DED68DA7DE56340857173.cache.js
D5ACA0E59585AFC5ACF5E7709EF46203.cache.js
locale fr_FR
user.agent safari
E01E2C8A9420BD373707C992CE33F499.cache.js
locale default
user.agent gecko1_8
Devmode:devmode.js
\ No newline at end of file
......@@ -576,7 +576,9 @@ public final class YaBlocksEditor extends FileEditor
else if (propertyName.contains("Trigger")) {
// Supprime tous les blocs spéciaux pour manuel, géolocalisation et QR code
if (!thisFormName.equals("Screen1")){
// Supprime 2 fois sinon le 1er manuel n'est pas supprimé
deleteSpecialBlocks();
deleteSpecialBlocks();
if (propertyValue.equals("0")) {
// Ajouter le bouton ClueNext - Colin
......@@ -598,8 +600,8 @@ public final class YaBlocksEditor extends FileEditor
// QR-Code
else if (propertyValue.equals("2")) {
// Ajouter les blocs de qr code - Colin
String qrcodeBlocks = JemBlocksMethods.addNewBlocks(this, QR_CODE);
String updatedQRblocks = JemBlocksMethods.updateBlock(QR_CODE,CURRENT_FORM,this.getForm().getName());
String qrcodeBlocks = JemBlocksMethods.addNewBlocks(this, updatedQRblocks);
reloadBlocks(qrcodeBlocks);
}
}
......@@ -631,6 +633,9 @@ public final class YaBlocksEditor extends FileEditor
}
// Composant Prise photo
if (component.getName().contains("Prise")) {
if (JemBlocksMethods.blocsExist(blocksContent, JemBlocksRegex.TVB)) {
reloadBlocks(JemBlocksMethods.updateBlock(blocksContent, JemBlocksRegex.TVB,""));
}
// Tout d'abord nous mettons à jour la chaine générique avec le nom d'activité suivante
String updatedPictureBlocs = JemBlocksMethods.tellNextActivity(this.getForm().getName(), JemBlocksStrings.TAKE_PICTURE_COMPONENT);
String pictureBlock = JemBlocksMethods.addNewBlocks(this, updatedPictureBlocs);
......@@ -638,6 +643,9 @@ public final class YaBlocksEditor extends FileEditor
}
// Composant Question ouverte
else if (component.getName().contains("Question")) {
if (JemBlocksMethods.blocsExist(blocksContent, JemBlocksRegex.TVB)) {
reloadBlocks(JemBlocksMethods.updateBlock(blocksContent, JemBlocksRegex.TVB,""));
}
String openQuestionBlock;
if (JemBlocksMethods.blocsExist(blocksContent, JemBlocksRegex.OPEN_QUESTION_COMPONENT)){
// Suppression des blocs existans pour remplacement
......@@ -657,7 +665,7 @@ public final class YaBlocksEditor extends FileEditor
else if (component.getName().contains("QCM")) {
// Mise à jour de la chaine générique avec le nom d'activité suivante
if (JemBlocksMethods.blocsExist(blocksContent, JemBlocksRegex.TVB)) {
alert("Trouve");
reloadBlocks(JemBlocksMethods.updateBlock(blocksContent, JemBlocksRegex.TVB,""));
}
......@@ -695,16 +703,33 @@ public final class YaBlocksEditor extends FileEditor
// Composant Prise photo
if (component.getName().contains("CameraButton")) {
// Supprimer les blocs de Prise photo s'il y en a
if (JemBlocksMethods.blocsExist(blocksContent, JemBlocksRegex.TAKE_PICTURE_COMPONENT)){
reloadBlocks(JemBlocksMethods.updateBlock(blocksContent, JemBlocksRegex.TAKE_PICTURE_COMPONENT,""));
if (JemBlocksMethods.blocsExist(blocksContent, JemBlocksRegex.Take_Picture_Component)){
reloadBlocks(JemBlocksMethods.updateBlock(blocksContent, JemBlocksRegex.Take_Picture_Component,""));
String tvb = JemBlocksMethods.tellNextActivity(this.getForm().getName(), TVB);
this.reloadBlocks( JemBlocksMethods.addNewBlocks(this, tvb));
}
}
// Composant Question Ouverte
if (component.getName().contains("Question")) {
if (JemBlocksMethods.blocsExist(blocksContent, JemBlocksRegex.QCM_COMPONENT)){
reloadBlocks(JemBlocksMethods.updateBlock(blocksContent, JemBlocksRegex.QCM_COMPONENT,""));
String tvb = JemBlocksMethods.tellNextActivity(this.getForm().getName(), TVB);
this.reloadBlocks( JemBlocksMethods.addNewBlocks(this, tvb));}
// Supprimer les blocs de Question Ouverte s'il y en a
if (JemBlocksMethods.blocsExist(blocksContent, JemBlocksRegex.OPEN_QUESTION_COMPONENT))
reloadBlocks(JemBlocksMethods.updateBlock(blocksContent, JemBlocksRegex.OPEN_QUESTION_COMPONENT,""));
}
// Composant QCM
if ( component.getName().contains("QCM")){
if (JemBlocksMethods.blocsExist(blocksContent, JemBlocksRegex.QCM_COMPONENT)){
reloadBlocks(JemBlocksMethods.updateBlock(blocksContent, JemBlocksRegex.QCM_COMPONENT,""));
String tvb = JemBlocksMethods.tellNextActivity(this.getForm().getName(), TVB);
this.reloadBlocks( JemBlocksMethods.addNewBlocks(this, tvb));
}
}
}
/*
......
......@@ -277,8 +277,9 @@ public final class AddFormCommand extends ChainableCommand {
String blockTVB = JemBlocksMethods.addNewBlocks(thisBlocksEditor, TVB);
blockTVB = JemBlocksMethods.tellNextActivity(defaultFormName,blockTVB);
thisBlocksEditor.reloadBlocks(blockTVB);
String blockclue = JemBlocksMethods.addNewBlocks(thisBlocksEditor, CLUE_NEXT_MANUAL);
thisBlocksEditor.reloadBlocks((blockclue));
}
} else {
......
......@@ -646,6 +646,7 @@ var componentTypeJson = [{ "name": "AccelerometerSensor",
{ "name": "OpenScreenAnimation", "editorType": "screen_animation", "defaultValue": "default"},
{ "name": "PoiRadius", "editorType": "non_negative_integer", "defaultValue": "5"},
{ "name": "PoiTime", "editorType": "string", "defaultValue": ""},
{ "name": "QRCodeTextCode", "editorType": "text", "defaultValue": "Code"},
{ "name": "ScreenOrientation", "editorType": "screen_orientation", "defaultValue": "unspecified"},
{ "name": "Scrollable", "editorType": "boolean", "defaultValue": "True"},
{ "name": "ShowStatusBar", "editorType": "boolean", "defaultValue": "True"},
......@@ -670,6 +671,7 @@ var componentTypeJson = [{ "name": "AccelerometerSensor",
{ "name": "OpenScreenAnimation", "description": "The animation for switching to another screen. Valid options are default, fade, zoom, slidehorizontal, slidevertical, and none", "type": "text", "rw": "read-write", "deprecated": "false"},
{ "name": "PoiRadius", "description": "", "type": "number", "rw": "read-write", "deprecated": "false"},
{ "name": "PoiTime", "description": "The caption for the form, which apears in the title bar", "type": "text", "rw": "read-write", "deprecated": "false"},
{ "name": "QRCodeTextCode", "description": "", "type": "text", "rw": "read-write", "deprecated": "false"},
{ "name": "ScreenOrientation", "description": "The requested screen orientation, specified as a text value. Commonly used values are landscape, portrait, sensor, user and unspecified. See the Android developer documentation for ActivityInfo.Screen_Orientation for the complete list of possible settings.", "type": "text", "rw": "read-write", "deprecated": "false"},
{ "name": "Scrollable", "description": "When checked, there will be a vertical scrollbar on the screen, and the height of the application can exceed the physical height of the device. When unchecked, the application height is constrained to the height of the device.", "type": "boolean", "rw": "read-write", "deprecated": "false"},
{ "name": "ShowStatusBar", "description": "The status bar is the topmost bar on the screen. This property reports whether the status bar is visible.", "type": "boolean", "rw": "read-write", "deprecated": "false"},
......@@ -1942,6 +1944,30 @@ var componentTypeJson = [{ "name": "AccelerometerSensor",
],
"methods": [{ "name": "Speak", "description": "Speaks the given message.", "deprecated": "false", "params": [{ "name": "message", "type": "text"}]}]}
,
{ "name": "TextToSpeechCopie",
"version": "5",
"categoryString": "TESTINGRESOURCES",
"helpString": "The TestToSpeech component speaks a given text aloud. You can set the pitch and the rate of speech. <p>You can also set a language by supplying a language code. This changes the pronounciation of words, not the actual language spoken. For example, setting the language to French and speaking English text will sound like someone speaking English (en) with a French accent.<\/p> <p>You can also specify a country by supplying a country code. This can affect the pronounciation. For example, British English (GBR) will sound different from US English (USA). Not every country code will affect every language.<\/p> <p>The languages and countries available depend on the particular device, and can be listed with the AvailableLanguages and AvailableCountries properties.<\/p>",
"showOnPalette": "true",
"nonVisible": "true",
"iconName": "images/textToSpeech.png",
"properties": [{ "name": "Country", "editorType": "countries", "defaultValue": ""},
{ "name": "Language", "editorType": "languages", "defaultValue": ""},
{ "name": "Pitch", "editorType": "float", "defaultValue": "1.0"},
{ "name": "SpeechRate", "editorType": "float", "defaultValue": "1.0"}],
"blockProperties": [{ "name": "AvailableCountries", "description": "List of the country codes available on this device for use with TextToSpeech. Check the Android developer documentation under supported languages to find the meanings of these abbreviations.", "type": "list", "rw": "read-only", "deprecated": "false"},
{ "name": "AvailableLanguages", "description": "List of the languages available on this device for use with TextToSpeech. Check the Android developer documentation under supported languages to find the meanings of these abbreviations.", "type": "list", "rw": "read-only", "deprecated": "false"},
{ "name": "Country", "description": "Country code to use for speech generation. This can affect the pronounciation. For example, British English (GBR) will sound different from US English (USA). Not every country code will affect every language.", "type": "text", "rw": "read-write", "deprecated": "false"},
{ "name": "Language", "description": "Sets the language for TextToSpeech. This changes the way that words are pronounced, not the actual language that is spoken. For example setting the language to and speaking English text with sound like someone speaking English with a Frernch accent.", "type": "text", "rw": "read-write", "deprecated": "false"},
{ "name": "Pitch", "description": "Sets the Pitch for TextToSpeech The values should be between 0 and 2 where lower values lower the tone of synthesized voice and greater values raise it.", "type": "number", "rw": "read-write", "deprecated": "false"},
{ "name": "Result", "description": "", "type": "boolean", "rw": "read-only", "deprecated": "false"},
{ "name": "SpeechRate", "description": "Sets the SpeechRate for TextToSpeech. The values should be between 0 and 2 where lower values slow down the pitch and greater values accelerate it.", "type": "number", "rw": "read-write", "deprecated": "false"}],
"events": [{ "name": "AfterSpeaking", "description": "Event to raise after the message is spoken.", "deprecated": "false", "params": [{ "name": "result", "type": "boolean"}]}
,
{ "name": "BeforeSpeaking", "description": "Event to raise when Speak is invoked, before the message is spoken.", "deprecated": "false", "params": []}
],
"methods": [{ "name": "Speak", "description": "Speaks the given message.", "deprecated": "false", "params": [{ "name": "message", "type": "text"}]}]}
,
{ "name": "Texting",
"version": "3",
"categoryString": "INTERNAL",
......
......@@ -57,6 +57,7 @@ Spinner
TableArrangement
TextBox
TextToSpeech
TextToSpeechCopie
Texting
TimePicker
TinyDB
......
......@@ -58,6 +58,7 @@
{"name": "TableArrangement", "permissions": [], "libraries": [], "native": [], "assets": []},
{"name": "TextBox", "permissions": [], "libraries": [], "native": [], "assets": []},
{"name": "TextToSpeech", "permissions": [], "libraries": [], "native": [], "assets": []},
{"name": "TextToSpeechCopie", "permissions": [], "libraries": [], "native": [], "assets": []},
{"name": "Texting", "permissions": ["android.permission.RECEIVE_SMS", "android.permission.SEND_SMS", "android.permission.GET_ACCOUNTS", "android.permission.USE_CREDENTIALS", "android.permission.ACCOUNT_MANAGER", "com.google.android.apps.googlevoice.permission.RECEIVE_SMS", "com.google.android.apps.googlevoice.permission.SEND_SMS", "android.permission.MANAGE_ACCOUNTS"], "libraries": ["google-oauth-client-beta.jar", "google-http-client-android3-beta.jar", "guava-14.0.1.jar", "google-http-client-beta.jar", "google-api-client-android2-beta.jar", "google-http-client-android2-beta.jar", "google-api-client-beta.jar"], "native": [], "assets": []},
{"name": "TimePicker", "permissions": ["android.permission.INTERNET"], "libraries": [], "native": [], "assets": []},
{"name": "TinyDB", "permissions": [], "libraries": [], "native": [], "assets": []},
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment