Asset

app/src/main/java/app/brest/testmin3d/ARActivity.java

@@ -486,6 +486,7 @@ public class ARActivity extends RendererActivity
     public void onClickPickUp(View v)
     {
         synchronized (mUpdate) {mUpdate=false;}
+        Stage s = mGame.getCurrentStageObj();
         ArrayList<Resource> res = null;
         boolean stageFinished = mGame.pickResource();
         boolean finished = false;
@@ -504,7 +505,6 @@ public class ARActivity extends RendererActivity
 
         if(stageFinished)
         {
-            Stage s = mGame.getCurrentStageObj();
             Resource stageRes = s.getResource();
 
             if(finished)
@@ -512,13 +512,20 @@ public class ARActivity extends RendererActivity
                 Intent intent2 = new Intent(this, EndActivity.class);
                 startActivity(intent2);
             }
+            System.out.println("Ressource: '"+s.getResourceName()+"' : "+!s.getResourceName().isEmpty());
+            if(!s.getResourceName().isEmpty())
+            {
+                Intent intent = new Intent(this, ViewerActivity.class);
+                intent.putExtra("resource", stageRes);
+                startActivity(intent);
+            }
 
-            Intent intent = new Intent(this, ViewerActivity.class);
-            intent.putExtra("resource", stageRes );
-            startActivity(intent);
-
-            Intent intent2 = new Intent(this, TransferActivity.class);
-            startActivity(intent2);
+            System.out.println("Transition: '"+s.isTransition());
+            if(s.isTransition())
+            {
+                Intent intent2 = new Intent(this, TransferActivity.class);
+                startActivity(intent2);
+            }
         }
         for(int i=0; i<res.size(); i++)
         {

app/src/main/java/app/brest/testmin3d/NewMenuActivity.java

@@ -246,24 +246,31 @@ public class NewMenuActivity extends Activity implements View.OnClickListener{
     public void onSendClick(View v)
     {
         //TODO : Transmssion des donnes
+        Stage s = mGame.getCurrentStageObj();
         boolean finished = mGame.nextStage();
 
-        Stage s = mGame.getCurrentStageObj();
         Resource stageRes = s.getResource();
-
+        System.out.println("Ressource: '"+s.toString());
         if(finished)
         {
             Intent intent2 = new Intent(this, EndActivity.class);
             startActivity(intent2);
         }
 
-        Intent intent = new Intent(this, ViewerActivity.class);
-        intent.putExtra("resource", stageRes );
-        startActivity(intent);
-
+        System.out.println("Ressource: '"+s.getResourceName()+"' : "+!s.getResourceName().isEmpty());
+        if(!s.getResourceName().isEmpty())
+        {
+            Intent intent = new Intent(this, ViewerActivity.class);
+            intent.putExtra("resource", stageRes);
+            startActivity(intent);
+        }
 
-        Intent intent2 = new Intent(this, TransferActivity.class);
-        startActivity(intent2);
+        System.out.println("Transition: '"+s.isTransition());
+        if(s.isTransition())
+        {
+            Intent intent2 = new Intent(this, TransferActivity.class);
+            startActivity(intent2);
+        }
     }
 
     @Override

app/src/main/java/app/brest/testmin3d/ViewerActivity.java

@@ -132,7 +132,7 @@ public class ViewerActivity extends RendererActivity implements View.OnTouchList
         {
             Bitmap bmp=null;
             try {
-                bmp = FileManager.openImage(mResource.getName());
+                bmp = FileManager.openImage("map");
             } catch (Exception e) {
                 e.printStackTrace();
             }

app/src/main/java/app/brest/utils/app/brest/game/Stage.java

@@ -17,6 +17,7 @@ public class Stage implements Serializable {
     public Stage(JSONObject obj)
     {
         try {
+            System.out.println("Obj: "+obj.toString());
             mStage=obj.getInt("stage");
             mResourceName=obj.getString("resource");
             mNResourceStep=obj.getInt("n_resource_step");