Update library

Pinoccio · Jul 29, 2014 · 11bdca4 · 11bdca4
1 parent 8d780fb
commit 11bdca4
Show file tree

Hide file tree

Showing 3 changed files with 131 additions and 4 deletions.
diff --git a/app/src/main/java/io/pinocc/pinocciohq/MyActivity.java b/app/src/main/java/io/pinocc/pinocciohq/MyActivity.java
@@ -6,20 +6,70 @@
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.TextView;
 import android.widget.ToggleButton;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+
 import io.pinocc.pinocico.java.*;
 import org.json.JSONObject;
 
 import java.io.IOException;
+import java.lang.reflect.Array;
 
 
 public class MyActivity extends Activity {
-    private static  String USER_AGENT = "Mozilla/5.0";
 
+    final PinoccioAPI pinoccioAPI = new PinoccioAPI();
+    Boolean isRunning = Boolean.FALSE;
+    int troopID;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_my);
+        if (!isRunning) {
+            isRunning = Boolean.TRUE;
+            Thread thread = new Thread(new Runnable(){
+                @Override
+                public void run() {
+                    try {
+                        final JsonObject obj = pinoccioAPI.troopsInAccount("q4vn2g1smdcmb5efuco1eoj184").get(0).getAsJsonObject();
+                        runOnUiThread(new Runnable() {
+                            @Override
+                            public void run() {
+                                troopID = obj.get("id").getAsInt();
+                                Thread thread = new Thread(new Runnable(){
+                                    @Override
+                                    public void run() {
+                                        try {
+                                            final JsonObject obj = pinoccioAPI.runBitlashCommand(troopID,2,"print temperature.f","q4vn2g1smdcmb5efuco1eoj184").getAsJsonObject();
+
+                                            System.out.println(obj.get("reply"));
+
+                                            runOnUiThread(new Runnable() {
+                                                @Override
+                                                public void run() {
+                                                    //((TextView) findViewById(R.id.textView)).setText(obj.get("name").getAsString());
+                                                }
+                                            });
+                                        } catch (Exception e) {
+                                            e.printStackTrace();
+                                        }
+                                    }
+                                });
+                                thread.start();
+                            }
+                        });
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            });
+            thread.start();
+
+
+        }
     }
 
 
@@ -41,6 +91,48 @@ public boolean onOptionsItemSelected(MenuItem item) {
         }
         return super.onOptionsItemSelected(item);
     }
+
+    public void getAllData(){
+        Thread thread = new Thread(new Runnable(){
+            @Override
+            public void run() {
+                try {
+                    final JsonObject obj = pinoccioAPI.troopsInAccount("q4vn2g1smdcmb5efuco1eoj184").get(0).getAsJsonObject();
+                    runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            ((TextView) findViewById(R.id.textView2)).setText(obj.get("name").getAsString());
+                            troopID = obj.get("id").getAsInt();
+                        }
+                    });
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+        thread.start();
+        System.out.println(troopID);
+
+        thread = null;
+        thread = new Thread(new Runnable(){
+            @Override
+            public void run() {
+                try {
+                    final JsonArray obj = pinoccioAPI.scoutsInTroop(troopID,"q4vn2g1smdcmb5efuco1eoj184").getAsJsonArray();
+                    runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            //((TextView) findViewById(R.id.textView2)).setText(obj.get("name").getAsString());
+                        }
+                    });
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+        thread.start();
+    }
+
     boolean onOff;
     int TROOP_ID_INT = 4;
     int SCOUT_ID_INT = 2;
@@ -51,7 +143,7 @@ public void turnLEDOn(View viw) throws IOException {
             @Override
             public void run() {
                 try {
-                    pinoccioAPI.troopsInAccount("q4vn2g1smdcmb5efuco1eoj184"); 
+
                     onOff = ((ToggleButton) findViewById(R.id.togglebutton)).isChecked();
                     if (onOff) {
                         pinoccioAPI.turnLEDOn(TROOP_ID_INT, SCOUT_ID_INT, SESSION_TOKEN_STRING);

diff --git a/app/src/main/res/layout/activity_my.xml b/app/src/main/res/layout/activity_my.xml
@@ -13,5 +13,19 @@
         android:layout_height="wrap_content"
         android:textOn="LED on"
         android:textOff="LED off"
-        android:onClick="turnLEDOn"/>
+        android:onClick="turnLEDOn"
+        android:layout_centerVertical="true"
+        android:layout_centerHorizontal="true" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:text="Troop Name"
+        android:id="@+id/textView2"
+        android:layout_above="@+id/togglebutton"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="34dp" />
+
+
 </RelativeLayout>
diff --git a/library-java-pinoccio/src/main/java/io/pinocc/pinocico/java/PinoccioAPI.java b/library-java-pinoccio/src/main/java/io/pinocc/pinocico/java/PinoccioAPI.java
@@ -4,6 +4,8 @@
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.net.URLEncoder;
+
 import com.google.gson.*;
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -24,9 +26,28 @@ public JsonArray troopsInAccount(String token) {
         JsonElement jElement = new JsonParser().parse(requestAPI(String.format("https://api.pinocc.io/v1/troops?token=%s",token)));
         JsonObject  jObject = jElement.getAsJsonObject();
         JsonArray jAry = jObject.getAsJsonArray("data");
-        System.out.println(jObject);
         return jAry;
     }
+    public JsonArray scoutsInTroop(int troopID, String token) {
+
+        JsonElement jElement = new JsonParser().parse(requestAPI(String.format("https://api.pinocc.io/v1/%s/scouts?token=%s",troopID,token)));
+        JsonObject  jObject = jElement.getAsJsonObject();
+        JsonArray jAry = jObject.getAsJsonArray("data");
+        return jAry;
+
+    }
+    public JsonObject runBitlashCommand(int troopID, int scoutID, String command, String token){
+        String url = null;
+        try {
+             url = URLEncoder.encode(command, "UTF-8");
+        }catch (Exception exc){
+
+        }
+        JsonElement jElement = new JsonParser().parse(requestAPI(String.format("https://api.pinocc.io/v1/%s/%s/command/%s?token=%s",troopID,scoutID,url,token)));
+        JsonObject  jObject = jElement.getAsJsonObject().get("data").getAsJsonObject();
+        return jObject;
+    }
+
     private String requestAPI(String urlToRead) {
         URL url;
         HttpURLConnection conn;