Merge pull request #80 from cientopolis/issue15bis

Issue15bis

Author: javier7ar

SamplersConfig.json

@@ -109,7 +109,13 @@
           "sampleText" : "your comments",
           "inputType" : "text",
           "maxLength" : 50,
-          "optional" : true
+          "optional" : true,
+          "nextStepId": 9
+        },
+        {
+          "id" : 9,
+          "type" : "Sound",
+          "text" : "Please, record the sound"
         }
     ]
   }

build.gradle

@@ -3,9 +3,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
+        classpath 'com.android.tools.build:gradle:3.0.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,6 +16,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
 

sampleApplication/src/main/java/org/cientopolis/sampleapplication/MyMainSamplersActivity.java

@@ -13,6 +13,7 @@
 import org.cientopolis.samplers.framework.multipleSelect.MultipleSelectOption;
 import org.cientopolis.samplers.framework.Step;
 import org.cientopolis.samplers.framework.Workflow;
+import org.cientopolis.samplers.framework.soundRecord.SoundRecordStep;
 import org.cientopolis.samplers.network.NetworkConfiguration;
 import org.cientopolis.samplers.ui.SamplersMainActivity;
 
@@ -29,7 +30,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         // Set the network configuration
-        NetworkConfiguration.setURL("http://192.168.1.10/samplers/upload.php");
+        NetworkConfiguration.setURL("http://192.168.0.100/samplers/upload.php");
         NetworkConfiguration.setPARAM_NAME("sample");
 
         lb_main_welcome_message.setText("Bienvenido a la Aplicacion de Prueba!");
@@ -40,15 +41,18 @@ protected void onCreate(Bundle savedInstanceState) {
     protected Workflow getWorkflow() {
         Workflow workflow = new Workflow();
         Step step;
-
+/*
         // InformationStep
-        workflow.addStep(new InformationStep(1, "Informacion de prueba para ver que se muestra bien",4));
+        workflow.addStep(new InformationStep(1, "Informacion de prueba para ver que se muestra bien",103));
 
         // Insert Time
         workflow.addStep(new InsertTimeStep(101, "Seleccione la Hora de la muestra",102));
 
         // Insert Date
         workflow.addStep(new InsertDateStep(102, "Seleccione la Fecha de la muestra",2));
+*/
+        // Sound
+        workflow.addStep(new SoundRecordStep(103, "Grabe algo",5));
 
         // SelectOneStep
         ArrayList<SelectOneOption> optionsToSelect2 = new ArrayList<SelectOneOption>();
@@ -63,7 +67,7 @@ protected Workflow getWorkflow() {
         workflow.addStep(new LocationStep(4, "Seleccione la posicion de la muestra",7));
 
         // PhotoStep
-        PhotoStep photoStep = new PhotoStep(5, "Saque una foto de su gato","",6);
+        PhotoStep photoStep = new PhotoStep(5, "Saque una foto de su gato","",7);
         // set help resource
         photoStep.setHelpResourseId(R.raw.photohelp);
         workflow.addStep(photoStep);

samplers.gradle

@@ -115,9 +115,13 @@ task samplers_config {
                     stepClassGenerator = new org.cientopolis.samplers.InsertTimeStepClassGenerator(step.id, step.nextStepId, step.text)
                     break
 
+                case "Sound":
+                    stepClassGenerator = new org.cientopolis.samplers.SoundRecordStepClassGenerator(step.id, step.nextStepId, step.text)
+                    break
+
                 default:
                     stepClassGenerator = null;
-                    break;
+                    break
             }
 
             if (stepClassGenerator != null) {

samplersFramework/build.gradle

@@ -38,7 +38,9 @@ dependencies {
     testCompile 'junit:junit:4.12'
 
     // Libraries dependencies
+    // Location
     compile ('com.google.android.gms:play-services-location:10.2.1')
+    // Maps
     compile ('com.google.android.gms:play-services-maps:10.2.1')
 
     // Added manually as libraries (.jar in libs folder)

samplersFramework/src/main/AndroidManifest.xml

@@ -5,6 +5,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
     <!-- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> -->
     <application
@@ -33,6 +34,7 @@
         <activity android:name=".ui.HelpActivity"
             android:label="@string/title_activity_help"
             android:theme="@style/SamplersFrameworkAppTheme"></activity>
+        <service android:name=".framework.soundRecord.service.RecordingService" />
     </application>
 
 </manifest>

samplersFramework/src/main/java/org/cientopolis/samplers/framework/StepResult.java

@@ -8,7 +8,7 @@
  * Abstract class, there is a diferent StepResult subclass for the diferents {@link Step}.
  * See the diferent subclasses for details.
  */
-public abstract class StepResult implements Serializable {
+public  class StepResult implements Serializable {
     /**
      * The id of the {@link Step} that generated the StepResult.
      */

samplersFramework/src/main/java/org/cientopolis/samplers/framework/base/StepFragment.java

@@ -73,9 +73,7 @@ private void myOnAttach(Context context) {
 
         if (context instanceof StepFragmentInteractionListener) {
             mListener = (StepFragmentInteractionListener) context;
-            Log.e("MultipleSelectFragment", "mListener asignado");
         } else {
-            Log.e("MultipleSelectFragment", "mListener NO asignado");
             throw new RuntimeException(context.toString()
                     + " must implement StepFragmentInteractionListener");
         }

samplersFramework/src/main/java/org/cientopolis/samplers/framework/information/InformationFragment.java

@@ -49,7 +49,7 @@ protected InformationStep getStep() {
     @Override
     protected StepResult getStepResult() {
         // TODO: 01/03/2017 see stepResult of InformationStep
-        return null;
+        return new InformationStepResult(getStep().getId());
     }
 
 

samplersFramework/src/main/java/org/cientopolis/samplers/framework/information/InformationStepResult.java

@@ -0,0 +1,18 @@
+package org.cientopolis.samplers.framework.information;
+
+import org.cientopolis.samplers.framework.StepResult;
+
+/**
+ * Created by Xavier on 01/12/2017.
+ */
+
+public class InformationStepResult extends StepResult {
+    /**
+     * Constructor.
+     *
+     * @param stepId The id of the {@link Step} that generated the StepResult.
+     */
+    public InformationStepResult(int stepId) {
+        super(stepId);
+    }
+}