From 66e69514a34463606f10147e3a22316b0fee2db5 Mon Sep 17 00:00:00 2001 From: Rahul Rahul Date: Fri, 2 Oct 2015 16:40:16 -0700 Subject: [PATCH] Updated android fridgeclient and fridgeserver example. Added a new fridgegroupserver and fridgegroupclient example. This creates proxy child resources from the fridgeResource. Change-Id: I235ea32a2a9dd2d596cfd1a3407f2a012d6fe3cd Signed-off-by: Rahul Rahul Reviewed-on: https://gerrit.iotivity.org/gerrit/3439 Tested-by: jenkins-iotivity Reviewed-by: Patrick Lankswert --- android/examples/examples.iml | 10 + android/examples/fridgeclient/.gitignore | 0 android/examples/fridgeclient/build.gradle | 72 ++-- android/examples/fridgeclient/fridgeclient.iml | 188 ++++++----- .../fridgeclient/src/main/AndroidManifest.xml | 8 +- .../org/iotivity/base/examples/FridgeClient.java | 248 ++++++++++++++ .../base/examples/fridgeclient/FridgeClient.java | 363 --------------------- .../examples/fridgeclient/StringConstants.java | 33 -- .../src/main/res/drawable-hdpi/ic_launcher.png | Bin 9397 -> 0 bytes .../src/main/res/drawable-hdpi/iotivityicon.png | Bin 0 -> 2300 bytes .../src/main/res/drawable-hdpi/iotivitylogo.png | Bin 0 -> 123110 bytes .../src/main/res/drawable-mdpi/ic_launcher.png | Bin 5237 -> 0 bytes .../src/main/res/drawable-mdpi/iotivityicon.png | Bin 0 -> 2300 bytes .../src/main/res/drawable-mdpi/iotivitylogo.png | Bin 0 -> 123110 bytes .../src/main/res/drawable-xhdpi/ic_launcher.png | Bin 14383 -> 0 bytes .../src/main/res/drawable-xhdpi/iotivityicon.png | Bin 0 -> 2300 bytes .../src/main/res/drawable-xhdpi/iotivitylogo.png | Bin 0 -> 123110 bytes .../src/main/res/drawable-xxhdpi/ic_launcher.png | Bin 19388 -> 0 bytes .../src/main/res/drawable-xxhdpi/iotivityicon.png | Bin 0 -> 2300 bytes .../src/main/res/drawable-xxhdpi/iotivitylogo.png | Bin 0 -> 123110 bytes .../src/main/res/layout/activity_fridge_client.xml | 50 ++- .../src/main/res/menu/menu_fridge_client.xml | 2 +- .../src/main/res/values-w820dp/dimens.xml | 0 .../fridgeclient/src/main/res/values/dimens.xml | 0 .../fridgeclient/src/main/res/values/strings.xml | 0 .../fridgeclient/src/main/res/values/styles.xml | 2 +- android/examples/fridgegroupclient/.gitignore | 1 + android/examples/fridgegroupclient/build.gradle | 35 ++ .../fridgegroupclient/src/main/AndroidManifest.xml | 32 ++ .../iotivity/base/examples/FridgeGroupClient.java | 258 +++++++++++++++ .../src/main/res/drawable-hdpi/iotivityicon.png | Bin 0 -> 2300 bytes .../src/main/res/drawable-hdpi/iotivitylogo.png | Bin 0 -> 123110 bytes .../src/main/res/drawable-mdpi/iotivityicon.png | Bin 0 -> 2300 bytes .../src/main/res/drawable-mdpi/iotivitylogo.png | Bin 0 -> 123110 bytes .../src/main/res/drawable-xhdpi/iotivityicon.png | Bin 0 -> 2300 bytes .../src/main/res/drawable-xhdpi/iotivitylogo.png | Bin 0 -> 123110 bytes .../src/main/res/drawable-xxhdpi/iotivityicon.png | Bin 0 -> 2300 bytes .../src/main/res/drawable-xxhdpi/iotivitylogo.png | Bin 0 -> 123110 bytes .../src/main/res/layout/activity_fridge_client.xml | 40 +++ .../src/main/res/values-w820dp/dimens.xml | 6 + .../src/main/res/values/assets.xml | 2 + .../src/main/res/values/dimens.xml | 5 + .../src/main/res/values/strings.xml | 4 + .../src/main/res/values/styles.xml | 8 + android/examples/fridgegroupserver/.gitignore | 1 + android/examples/fridgegroupserver/build.gradle | 35 ++ .../fridgegroupserver/src/main/AndroidManifest.xml | 34 ++ .../org/iotivity/base/examples/DoorResource.java | 172 ++++++++++ .../iotivity/base/examples/FridgeGroupServer.java | 143 ++++++++ .../org/iotivity/base/examples/FridgeResource.java | 82 +++++ .../org/iotivity/base/examples/LightResource.java | 161 +++++++++ .../org/iotivity/base/examples/Refrigerator.java | 62 ++++ .../java/org/iotivity/base/examples/Resource.java | 59 ++++ .../src/main/res/drawable-hdpi/ic_launcher.png | Bin .../src/main/res/drawable-hdpi/iotivityicon.png | Bin 0 -> 2300 bytes .../src/main/res/drawable-hdpi/iotivitylogo.png | Bin 0 -> 123110 bytes .../src/main/res/drawable-mdpi/ic_launcher.png | Bin .../src/main/res/drawable-mdpi/iotivityicon.png | Bin 0 -> 2300 bytes .../src/main/res/drawable-mdpi/iotivitylogo.png | Bin 0 -> 123110 bytes .../src/main/res/drawable-xhdpi/ic_launcher.png | Bin .../src/main/res/drawable-xhdpi/iotivityicon.png | Bin 0 -> 2300 bytes .../src/main/res/drawable-xhdpi/iotivitylogo.png | Bin 0 -> 123110 bytes .../src/main/res/drawable-xxhdpi/ic_launcher.png | Bin .../src/main/res/drawable-xxhdpi/iotivityicon.png | Bin 0 -> 2300 bytes .../src/main/res/drawable-xxhdpi/iotivitylogo.png | Bin 0 -> 123110 bytes .../src/main/res/layout/activity_fridge_server.xml | 40 +++ .../src/main/res/values-w820dp/dimens.xml | 6 + .../src/main/res/values/dimens.xml | 5 + .../src/main/res/values/strings.xml | 4 + .../src/main/res/values/styles.xml | 8 + android/examples/fridgeserver/.gitignore | 0 android/examples/fridgeserver/build.gradle | 72 ++-- android/examples/fridgeserver/fridgeserver.iml | 187 ++++++----- .../fridgeserver/src/main/AndroidManifest.xml | 5 +- .../base/examples/fridgeserver/DeviceResource.java | 135 ++++---- .../base/examples/fridgeserver/DoorResource.java | 145 ++++---- .../base/examples/fridgeserver/FridgeServer.java | 123 ++++--- .../base/examples/fridgeserver/LightResource.java | 129 ++++---- .../base/examples/fridgeserver/Refrigerator.java | 19 +- .../base/examples/fridgeserver/Resource.java | 20 ++ .../examples/fridgeserver/StringConstants.java | 37 --- .../src/main/res/drawable-hdpi/iotivityicon.png | Bin 0 -> 2300 bytes .../src/main/res/drawable-hdpi/iotivitylogo.png | Bin 0 -> 123110 bytes .../src/main/res/drawable-mdpi/iotivityicon.png | Bin 0 -> 2300 bytes .../src/main/res/drawable-mdpi/iotivitylogo.png | Bin 0 -> 123110 bytes .../src/main/res/drawable-xhdpi/iotivityicon.png | Bin 0 -> 2300 bytes .../src/main/res/drawable-xhdpi/iotivitylogo.png | Bin 0 -> 123110 bytes .../src/main/res/drawable-xxhdpi/iotivityicon.png | Bin 0 -> 2300 bytes .../src/main/res/drawable-xxhdpi/iotivitylogo.png | Bin 0 -> 123110 bytes .../src/main/res/layout/activity_fridge_server.xml | 50 ++- .../src/main/res/menu/menu_fridge_server.xml | 6 - .../src/main/res/values-w820dp/dimens.xml | 0 .../fridgeserver/src/main/res/values/dimens.xml | 0 .../fridgeserver/src/main/res/values/strings.xml | 0 .../fridgeserver/src/main/res/values/styles.xml | 2 +- android/examples/settings.gradle | 2 +- 96 files changed, 2072 insertions(+), 1039 deletions(-) mode change 100644 => 100755 android/examples/fridgeclient/.gitignore mode change 100644 => 100755 android/examples/fridgeclient/src/main/AndroidManifest.xml create mode 100755 android/examples/fridgeclient/src/main/java/org/iotivity/base/examples/FridgeClient.java delete mode 100644 android/examples/fridgeclient/src/main/java/org/iotivity/base/examples/fridgeclient/FridgeClient.java delete mode 100644 android/examples/fridgeclient/src/main/java/org/iotivity/base/examples/fridgeclient/StringConstants.java delete mode 100755 android/examples/fridgeclient/src/main/res/drawable-hdpi/ic_launcher.png create mode 100755 android/examples/fridgeclient/src/main/res/drawable-hdpi/iotivityicon.png create mode 100755 android/examples/fridgeclient/src/main/res/drawable-hdpi/iotivitylogo.png delete mode 100755 android/examples/fridgeclient/src/main/res/drawable-mdpi/ic_launcher.png create mode 100755 android/examples/fridgeclient/src/main/res/drawable-mdpi/iotivityicon.png create mode 100755 android/examples/fridgeclient/src/main/res/drawable-mdpi/iotivitylogo.png delete mode 100755 android/examples/fridgeclient/src/main/res/drawable-xhdpi/ic_launcher.png create mode 100755 android/examples/fridgeclient/src/main/res/drawable-xhdpi/iotivityicon.png create mode 100755 android/examples/fridgeclient/src/main/res/drawable-xhdpi/iotivitylogo.png delete mode 100755 android/examples/fridgeclient/src/main/res/drawable-xxhdpi/ic_launcher.png create mode 100755 android/examples/fridgeclient/src/main/res/drawable-xxhdpi/iotivityicon.png create mode 100755 android/examples/fridgeclient/src/main/res/drawable-xxhdpi/iotivitylogo.png mode change 100644 => 100755 android/examples/fridgeclient/src/main/res/layout/activity_fridge_client.xml mode change 100644 => 100755 android/examples/fridgeclient/src/main/res/menu/menu_fridge_client.xml mode change 100644 => 100755 android/examples/fridgeclient/src/main/res/values-w820dp/dimens.xml mode change 100644 => 100755 android/examples/fridgeclient/src/main/res/values/dimens.xml mode change 100644 => 100755 android/examples/fridgeclient/src/main/res/values/strings.xml mode change 100644 => 100755 android/examples/fridgeclient/src/main/res/values/styles.xml create mode 100755 android/examples/fridgegroupclient/.gitignore create mode 100755 android/examples/fridgegroupclient/build.gradle create mode 100755 android/examples/fridgegroupclient/src/main/AndroidManifest.xml create mode 100755 android/examples/fridgegroupclient/src/main/java/org/iotivity/base/examples/FridgeGroupClient.java create mode 100755 android/examples/fridgegroupclient/src/main/res/drawable-hdpi/iotivityicon.png create mode 100755 android/examples/fridgegroupclient/src/main/res/drawable-hdpi/iotivitylogo.png create mode 100755 android/examples/fridgegroupclient/src/main/res/drawable-mdpi/iotivityicon.png create mode 100755 android/examples/fridgegroupclient/src/main/res/drawable-mdpi/iotivitylogo.png create mode 100755 android/examples/fridgegroupclient/src/main/res/drawable-xhdpi/iotivityicon.png create mode 100755 android/examples/fridgegroupclient/src/main/res/drawable-xhdpi/iotivitylogo.png create mode 100755 android/examples/fridgegroupclient/src/main/res/drawable-xxhdpi/iotivityicon.png create mode 100755 android/examples/fridgegroupclient/src/main/res/drawable-xxhdpi/iotivitylogo.png create mode 100755 android/examples/fridgegroupclient/src/main/res/layout/activity_fridge_client.xml create mode 100755 android/examples/fridgegroupclient/src/main/res/values-w820dp/dimens.xml create mode 100755 android/examples/fridgegroupclient/src/main/res/values/assets.xml create mode 100755 android/examples/fridgegroupclient/src/main/res/values/dimens.xml create mode 100755 android/examples/fridgegroupclient/src/main/res/values/strings.xml create mode 100755 android/examples/fridgegroupclient/src/main/res/values/styles.xml create mode 100755 android/examples/fridgegroupserver/.gitignore create mode 100755 android/examples/fridgegroupserver/build.gradle create mode 100755 android/examples/fridgegroupserver/src/main/AndroidManifest.xml create mode 100755 android/examples/fridgegroupserver/src/main/java/org/iotivity/base/examples/DoorResource.java create mode 100755 android/examples/fridgegroupserver/src/main/java/org/iotivity/base/examples/FridgeGroupServer.java create mode 100755 android/examples/fridgegroupserver/src/main/java/org/iotivity/base/examples/FridgeResource.java create mode 100755 android/examples/fridgegroupserver/src/main/java/org/iotivity/base/examples/LightResource.java create mode 100755 android/examples/fridgegroupserver/src/main/java/org/iotivity/base/examples/Refrigerator.java create mode 100755 android/examples/fridgegroupserver/src/main/java/org/iotivity/base/examples/Resource.java rename android/examples/{fridgeserver => fridgegroupserver}/src/main/res/drawable-hdpi/ic_launcher.png (100%) create mode 100755 android/examples/fridgegroupserver/src/main/res/drawable-hdpi/iotivityicon.png create mode 100755 android/examples/fridgegroupserver/src/main/res/drawable-hdpi/iotivitylogo.png rename android/examples/{fridgeserver => fridgegroupserver}/src/main/res/drawable-mdpi/ic_launcher.png (100%) create mode 100755 android/examples/fridgegroupserver/src/main/res/drawable-mdpi/iotivityicon.png create mode 100755 android/examples/fridgegroupserver/src/main/res/drawable-mdpi/iotivitylogo.png rename android/examples/{fridgeserver => fridgegroupserver}/src/main/res/drawable-xhdpi/ic_launcher.png (100%) create mode 100755 android/examples/fridgegroupserver/src/main/res/drawable-xhdpi/iotivityicon.png create mode 100755 android/examples/fridgegroupserver/src/main/res/drawable-xhdpi/iotivitylogo.png rename android/examples/{fridgeserver => fridgegroupserver}/src/main/res/drawable-xxhdpi/ic_launcher.png (100%) create mode 100755 android/examples/fridgegroupserver/src/main/res/drawable-xxhdpi/iotivityicon.png create mode 100755 android/examples/fridgegroupserver/src/main/res/drawable-xxhdpi/iotivitylogo.png create mode 100755 android/examples/fridgegroupserver/src/main/res/layout/activity_fridge_server.xml create mode 100755 android/examples/fridgegroupserver/src/main/res/values-w820dp/dimens.xml create mode 100755 android/examples/fridgegroupserver/src/main/res/values/dimens.xml create mode 100755 android/examples/fridgegroupserver/src/main/res/values/strings.xml create mode 100755 android/examples/fridgegroupserver/src/main/res/values/styles.xml mode change 100644 => 100755 android/examples/fridgeserver/.gitignore mode change 100644 => 100755 android/examples/fridgeserver/src/main/AndroidManifest.xml mode change 100644 => 100755 android/examples/fridgeserver/src/main/java/org/iotivity/base/examples/fridgeserver/DeviceResource.java mode change 100644 => 100755 android/examples/fridgeserver/src/main/java/org/iotivity/base/examples/fridgeserver/DoorResource.java mode change 100644 => 100755 android/examples/fridgeserver/src/main/java/org/iotivity/base/examples/fridgeserver/FridgeServer.java mode change 100644 => 100755 android/examples/fridgeserver/src/main/java/org/iotivity/base/examples/fridgeserver/LightResource.java mode change 100644 => 100755 android/examples/fridgeserver/src/main/java/org/iotivity/base/examples/fridgeserver/Refrigerator.java mode change 100644 => 100755 android/examples/fridgeserver/src/main/java/org/iotivity/base/examples/fridgeserver/Resource.java delete mode 100644 android/examples/fridgeserver/src/main/java/org/iotivity/base/examples/fridgeserver/StringConstants.java create mode 100755 android/examples/fridgeserver/src/main/res/drawable-hdpi/iotivityicon.png create mode 100755 android/examples/fridgeserver/src/main/res/drawable-hdpi/iotivitylogo.png create mode 100755 android/examples/fridgeserver/src/main/res/drawable-mdpi/iotivityicon.png create mode 100755 android/examples/fridgeserver/src/main/res/drawable-mdpi/iotivitylogo.png create mode 100755 android/examples/fridgeserver/src/main/res/drawable-xhdpi/iotivityicon.png create mode 100755 android/examples/fridgeserver/src/main/res/drawable-xhdpi/iotivitylogo.png create mode 100755 android/examples/fridgeserver/src/main/res/drawable-xxhdpi/iotivityicon.png create mode 100755 android/examples/fridgeserver/src/main/res/drawable-xxhdpi/iotivitylogo.png mode change 100644 => 100755 android/examples/fridgeserver/src/main/res/layout/activity_fridge_server.xml delete mode 100644 android/examples/fridgeserver/src/main/res/menu/menu_fridge_server.xml mode change 100644 => 100755 android/examples/fridgeserver/src/main/res/values-w820dp/dimens.xml mode change 100644 => 100755 android/examples/fridgeserver/src/main/res/values/dimens.xml mode change 100644 => 100755 android/examples/fridgeserver/src/main/res/values/strings.xml mode change 100644 => 100755 android/examples/fridgeserver/src/main/res/values/styles.xml diff --git a/android/examples/examples.iml b/android/examples/examples.iml index 533d794..c659f4f 100755 --- a/android/examples/examples.iml +++ b/android/examples/examples.iml @@ -7,6 +7,16 @@