Modify android sample server application

change server application UI to test android bundle

Change-Id: I079fcca51d61d3240a07bf5e3cb782ece8389600
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4779
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/resource-container/examples/android/RCSampleServerApp/app/src/main/java/org/iotivity/service/sample/container/ResourceContainer.java b/service/resource-container/examples/android/RCSampleServerApp/app/src/main/java/org/iotivity/service/sample/container/ResourceContainer.java
index a5cf6e8..e3842dd 100755 (executable)
--- a/service/resource-container/examples/android/RCSampleServerApp/app/src/main/java/org/iotivity/service/sample/container/ResourceContainer.java
+++ b/service/resource-container/examples/android/RCSampleServerApp/app/src/main/java/org/iotivity/service/sample/container/ResourceContainer.java
@@ -113,10 +113,10 @@ public class ResourceContainer {
     }
 
     // List Bundle Resources
-    public void listDIBundleResources() {
+    public void listBundleResources(String bundleId) {
 
         List<String> bundleResources = containerInstance
-                .listBundleResources("oic.bundle.discomfortIndexSensor");
+                .listBundleResources(bundleId);
         Iterator<String> it = bundleResources.iterator();
         logMessage = "";
 
@@ -161,32 +161,44 @@ public class ResourceContainer {
         resourceContainerActivityInstance.getHandler().sendMessage(msg);
     }
 
+    public boolean bundleExists(String bundleId)
+    {
+        List<RcsBundleInfo> bundleList = containerInstance.listBundles();
+        Iterator<RcsBundleInfo> it = bundleList.iterator();
+
+        while (it.hasNext())
+        {
+            if (it.next().getID().equals(bundleId))
+                return true;
+        }
+
+        return false;
+    }
+
     // Add BMI Bundles
     public void addBMIBundle() {
-        Map<String, String> bundleParams = null;
-        List<RcsBundleInfo> bundleList = containerInstance.listBundles();
-        if (1 < bundleList.size()) {
+        Map<String, String> bundleParams = new HashMap<String, String>();
+
+        if (bundleExists("oic.bundle.BMISensor"))
             logMessage = "Bundle already added" + "\n";
 
-        } else {
-            for (int i = 0; i < 2; i++) {
-                containerInstance
-                        .addBundle(
-                                "oic.bundle.BMISensor",
-                                "xyz",
-                                "data/data/org.iotivity.service.sample.server/files/libBMISensorBundle.so",
-                                "bmisensor", bundleParams);
-            }
+        else {
+            containerInstance
+                    .addBundle(
+                            "oic.bundle.BMISensor",
+                            "",
+                            "/data/data/org.iotivity.service.sample.resourcecontainer/files/libBMISensorBundle.so",
+                            "bmisensor", bundleParams);
 
             logMessage = "bundle to add : " + "\n";
             logMessage = logMessage + "ID :" + "oic.bundle.BMISensor" + "\n";
             logMessage = logMessage + "Uri: " + "xyz" + "\n";
             logMessage = logMessage
                     + "Path : "
-                    + "data/data/org.iotivity.service.sample.server/files/libBMISensorBundle.so"
+                    + "/data/data/org.iotivity.service.sample.server/files/libBMISensorBundle.so"
                     + "\n\n";
             logMessage = logMessage + "bundle added successfully" + "\n";
-        }
+            }
 
         ResourceContainerActivity.setMessageLog(logMessage);
         msg = Message.obtain();
@@ -197,20 +209,18 @@ public class ResourceContainer {
     // Remove Bundle BMI
     public void removeBMIBundle() {
 
-        List<RcsBundleInfo> bundleList = containerInstance.listBundles();
-        if (1 == bundleList.size()) {
+        if (!bundleExists("oic.bundle.BMISensor"))
             logMessage = "BMI Bundle not added" + "\n";
 
-        } else {
+        else {
+            containerInstance.removeBundle("oic.bundle.BMISensor");
 
-            for (int i = 0; i < 2; i++) {
-                containerInstance.removeBundle("oic.bundle.BMISensor");
-            }
             startBundleFlag = false;
             logMessage = "bundle to remove : " + "\n";
             logMessage = logMessage + "ID :" + "oic.bundle.BMISensor" + "\n\n";
             logMessage = logMessage + " bundle removed  successfully" + "\n";
         }
+
         ResourceContainerActivity.setMessageLog(logMessage);
         msg = Message.obtain();
         msg.what = 1;
@@ -220,8 +230,7 @@ public class ResourceContainer {
     // Start Bundle BMI
     public void startBMIBundle() {
 
-        List<RcsBundleInfo> bundleList = containerInstance.listBundles();
-        if (1 == bundleList.size()) {
+        if (!bundleExists("oic.bundle.BMISensor")) {
             logMessage = "BMI bundle not added" + "\n";
         } else if (true == startBundleFlag) {
             logMessage = "Bundle already started" + "\n";
@@ -233,6 +242,7 @@ public class ResourceContainer {
             logMessage += " ID : oic.bundle.BMISensor" + "\n\n";
             logMessage += " bundle started successfully" + "\n";
         }
+
         ResourceContainerActivity.setMessageLog(logMessage);
         msg = Message.obtain();
         msg.what = 1;
@@ -242,164 +252,19 @@ public class ResourceContainer {
     // Stop Bundle BMI
     public void stopBMIBundle() {
 
-        if (false == startBundleFlag) {
+        if (!bundleExists("oic.bundle.BMISensor")) {
+            logMessage = "BMI Bundle not added" + "\n";
+        }
+        else if (false == startBundleFlag) {
             logMessage = "Bundle is not Started" + "\n";
         } else {
-
-            List<RcsBundleInfo> bundleList = containerInstance.listBundles();
-            if (0 == bundleList.size()) {
-                logMessage = "No bundle to Stop" + "\n";
-
-            } else {
                 containerInstance.stopBundle("oic.bundle.BMISensor");
                 startBundleFlag = false;
                 logMessage = " bundle to stop" + "\n";
                 logMessage = logMessage + " ID : oic.bundle.BMISensor" + "\n\n";
                 logMessage = logMessage + " bundle stopped successfully" + "\n";
-            }
-        }
-
-        ResourceContainerActivity.setMessageLog(logMessage);
-        msg = Message.obtain();
-        msg.what = 1;
-        resourceContainerActivityInstance.getHandler().sendMessage(msg);
-    }
-
-    // Add Resource Configuration DI
-    public void addDIResourceConfig() {
-
-        List<RcsBundleInfo> bundleList = containerInstance.listBundles();
-        List<String> bundleResources = containerInstance
-                .listBundleResources("oic.bundle.discomfortIndexSensor");
-
-        if (0 == bundleList.size()) {
-            logMessage = "No bundle found" + "\n";
-        } else if ((0 == bundleList.size()) && (0 == bundleResources.size())) {
-
-            logMessage = "No bundle found" + "\n";
-        } else {
-
-            Map<String, String> params = new HashMap<String, String>();
-            params.put("resourceType", "oic.r.sensor");
-            params.put("address",
-                    "http://192.168.0.2/api/newdeveloper/sensor/22");
-            containerInstance.addResourceConfig(
-                    "oic.bundle.discomfortIndexSensor", "", params);
-            logMessage = "resource added successfully" + "\n";
-        }
-        ResourceContainerActivity.setMessageLog(logMessage);
-        msg = Message.obtain();
-        msg.what = 1;
-        resourceContainerActivityInstance.getHandler().sendMessage(msg);
-    }
-
-    // Remove Resource Configuration DI
-    public void removeDIResourceConfig() {
-
-        List<String> bundleResources = containerInstance
-                .listBundleResources("oic.bundle.discomfortIndexSensor");
-        if (bundleResources.size() >= 1) {
-            String element = bundleResources.get(0);
-            containerInstance.removeResourceConfig(
-                    "oic.bundle.discomfortIndexSensor", element);
-            Message msg;
-            logMessage = "resource removed successfully: \n" + element + "\n";
-            ResourceContainerActivity.setMessageLog(logMessage);
-            msg = Message.obtain();
-            msg.what = 1;
-            resourceContainerActivityInstance.getHandler().sendMessage(msg);
-        } else {
-            logMessage = "No resource to remove" + "\n";
-            ResourceContainerActivity.setMessageLog(logMessage);
-            msg = Message.obtain();
-            msg.what = 1;
-            resourceContainerActivityInstance.getHandler().sendMessage(msg);
         }
-    }
-
-    // Add Resource Configuration BMI
-    public void addBMIResourceConfig() {
 
-        if (false == startBundleFlag) {
-            logMessage = "Bundle is not started" + "\n";
-        } else {
-            List<RcsBundleInfo> bundleList = containerInstance.listBundles();
-            List<String> bundleResources = containerInstance
-                    .listBundleResources("oic.bundle.BMISensor");
-
-            if (0 == bundleList.size()) {
-                logMessage = "No bundle found" + "\n";
-            } else if ((0 == bundleList.size())
-                    && (0 == bundleResources.size())) {
-
-                logMessage = "No bundle found" + "\n";
-            } else {
-
-                Map<String, String> params = new HashMap<String, String>();
-                params.put("resourceType", "oic.r.sensor");
-                params.put("address",
-                        "http://192.168.0.2/api/newdeveloper/sensor/22");
-                containerInstance.addResourceConfig("oic.bundle.BMISensor", "",
-                        params);
-                logMessage = "resource added successfully" + "\n";
-            }
-        }
-        ResourceContainerActivity.setMessageLog(logMessage);
-        msg = Message.obtain();
-        msg.what = 1;
-        resourceContainerActivityInstance.getHandler().sendMessage(msg);
-    }
-
-    // Remove Resource Configuration BMI
-    public void removeBMIResourceConfig() {
-
-        if (false == startBundleFlag) {
-            logMessage = "Bundle is not started" + "\n";
-
-        } else {
-            List<String> bundleResources = containerInstance
-                    .listBundleResources("oic.bundle.BMISensor");
-            if (bundleResources.size() >= 1) {
-                String element = bundleResources.get(0);
-                containerInstance.removeResourceConfig("oic.bundle.BMISensor",
-                        element);
-                Message msg;
-                logMessage = "resource removed successfully: \n" + element
-                        + "\n";
-
-            } else {
-                logMessage = "No resource to remove" + "\n";
-            }
-        }
-        ResourceContainerActivity.setMessageLog(logMessage);
-        msg = Message.obtain();
-        msg.what = 1;
-        resourceContainerActivityInstance.getHandler().sendMessage(msg);
-    }
-
-    // List Bundle Resources
-    public void listBMIBundleResources() {
-
-        if (false == startBundleFlag) {
-            logMessage = "Bundle is not started" + "\n";
-
-        } else {
-            List<String> bundleResources = containerInstance
-                    .listBundleResources("oic.bundle.BMISensor");
-            Iterator<String> it = bundleResources.iterator();
-            logMessage = "";
-
-            if (0 == bundleResources.size()) {
-                logMessage = logMessage + "No resource found in the bundle"
-                        + "\n";
-            } else {
-                while (it.hasNext()) {
-                    String element = (String) it.next();
-                    logMessage = logMessage + element + "\n";
-                }
-            }
-
-        }
         ResourceContainerActivity.setMessageLog(logMessage);
         msg = Message.obtain();
         msg.what = 1;

diff --git a/service/resource-container/examples/android/RCSampleServerApp/app/src/main/java/org/iotivity/service/sample/container/ResourceContainerActivity.java b/service/resource-container/examples/android/RCSampleServerApp/app/src/main/java/org/iotivity/service/sample/container/ResourceContainerActivity.java
index 6b2c30c..3f688f0 100755 (executable)
--- a/service/resource-container/examples/android/RCSampleServerApp/app/src/main/java/org/iotivity/service/sample/container/ResourceContainerActivity.java
+++ b/service/resource-container/examples/android/RCSampleServerApp/app/src/main/java/org/iotivity/service/sample/container/ResourceContainerActivity.java
@@ -76,6 +76,7 @@ public class ResourceContainerActivity extends Activity {
     public List<String>                      sensors;
     public List<String>                      diApiList;
     public List<String>                      bmiApiList;
+    public List<String>                      diAndroidApiList;
     HashMap<String, List<String>>            listChild;
 
     private static Handler                   mHandler;
@@ -118,30 +119,32 @@ public class ResourceContainerActivity extends Activity {
         logs = (EditText) findViewById(R.id.log);
 
         sensors = new ArrayList<String>();
-        diApiList = new ArrayList<String>();
         bmiApiList = new ArrayList<String>();
+        diApiList = new ArrayList<String>();
+        diAndroidApiList = new ArrayList<String>();
         listChild = new HashMap<String, List<String>>();
 
         // Adding list items (header)
-        sensors.add("Discomfort Index Sensor");
         sensors.add("BMI Sensor");
+        sensors.add("Discomfort Index Sensor");
+        sensors.add("Android Discomfort Index Sensor");
+
+        // Adding child data [BMI sensor]
+        bmiApiList.add("1. Add BMI sensor bundle");
+        bmiApiList.add("2. Start BMI sensor bundle");
+        bmiApiList.add("3. List bundle resources");
+        bmiApiList.add("4. Stop BMI sensor bundle");
+        bmiApiList.add("5. Remove BMI sensor bundle");
 
         // Adding child data [discomfort Index sensor]
         diApiList.add("1. List bundle resources");
-        diApiList.add("2. Add Resource");
-        diApiList.add("3. Remove Resource");
 
-        // Adding child data [BMI sensor]
-        bmiApiList.add("1. Add Bundle");
-        bmiApiList.add("2. Start Bundle");
-        bmiApiList.add("3. List bundle resources");
-        bmiApiList.add("4. Add Resource ");
-        bmiApiList.add("5. Remove Resource");
-        bmiApiList.add("6. Stop Bundle");
-        bmiApiList.add("7. Remove Bundle");
+        // Adding child data [discomfort Index sensor - android]
+        diAndroidApiList.add("1. List bundle resources");
 
-        listChild.put(sensors.get(0), diApiList);
-        listChild.put(sensors.get(1), bmiApiList);
+        listChild.put(sensors.get(0), bmiApiList);
+        listChild.put(sensors.get(1), diApiList);
+        listChild.put(sensors.get(2), diAndroidApiList);
         listAdapter = new ExpandableList(this, sensors, listChild);
 
         // getting the sd card path
@@ -212,37 +215,32 @@ public class ResourceContainerActivity extends Activity {
                     public boolean onChildClick(ExpandableListView parent,
                                                 View v, int groupPosition, int childPosition,
                                                 long id) {
-
                         if (0 == groupPosition) {
                             if (childPosition == 0) {
-                                resourceContainerInstance
-                                        .listDIBundleResources();
-                            } else if (childPosition == 1) {
-                                resourceContainerInstance.addDIResourceConfig();
-                            } else if (childPosition == 2) {
-                                resourceContainerInstance
-                                        .removeDIResourceConfig();
-                            }
-                        } else {
-                            if (childPosition == 0) {
                                 resourceContainerInstance.addBMIBundle();
                             } else if (childPosition == 1) {
                                 resourceContainerInstance.startBMIBundle();
                             } else if (childPosition == 2) {
                                 resourceContainerInstance
-                                        .listBMIBundleResources();
+                                        .listBundleResources("oic.bundle.BMISensor");
                             } else if (childPosition == 3) {
-                                resourceContainerInstance
-                                        .addBMIResourceConfig();
-                            } else if (childPosition == 4) {
-                                resourceContainerInstance
-                                        .removeBMIResourceConfig();
-                            } else if (childPosition == 5) {
                                 resourceContainerInstance.stopBMIBundle();
-                            } else if (childPosition == 6) {
+                            } else if (childPosition == 4) {
                                 resourceContainerInstance.removeBMIBundle();
                             }
                         }
+                        else if (1 == groupPosition) {
+                            if (childPosition == 0) {
+                                resourceContainerInstance
+                                        .listBundleResources("oic.bundle.discomfortIndexSensor");
+
+                            }
+                        } else if (2 == groupPosition) {
+                            if (childPosition == 0) {
+                                resourceContainerInstance
+                                        .listBundleResources("oic.android.sample");
+                            }
+                        }
                         return false;
                     }
                 });