From c332e217753c8ce352b1ab3bc91b7b41b786cc28 Mon Sep 17 00:00:00 2001 From: "arya.k" Date: Thu, 1 Oct 2015 15:10:37 +0530 Subject: [PATCH] [TIZEN] Added Resource Container Sample Application. - Removed Contianer module from RESampleServer Application. Change-Id: Ie2226d0235aa893f00c9bd63b343d2ec0c69c6b3 Signed-off-by: arya.k Reviewed-on: https://gerrit.iotivity.org/gerrit/3359 Tested-by: jenkins-iotivity Reviewed-by: Abhishek Pandey Reviewed-by: Uze Choi --- .../examples/tizen/ContainerServerApp/.cproject | 523 +++++++++++++++++++++ .../examples/tizen/ContainerServerApp/.exportMap | 4 + .../examples/tizen/ContainerServerApp/.project | 43 ++ .../edc_resource/container_control.edc} | 65 +-- .../tizen/ContainerServerApp/inc/container.h} | 10 +- .../tizen/ContainerServerApp/inc/rcmain.h} | 16 +- .../lib/ResourceContainerConfig.xml | 16 + .../tizen/ContainerServerApp/res/ui_controls.edc | 25 + .../shared/res/containerServer.png | Bin 0 -> 57662 bytes .../tizen/ContainerServerApp/src/container.cpp} | 52 +- .../tizen/ContainerServerApp/src/rcmain.cpp | 255 ++++++++++ .../tizen/ContainerServerApp/tizen-manifest.xml | 13 + .../examples/tizen/RESampleServerApp/.cproject | 4 - .../examples/tizen/RESampleServerApp/inc/remain.h | 2 - .../tizen/RESampleServerApp/res/ui_controls.edc | 1 - .../tizen/RESampleServerApp/src/remain.cpp | 4 +- .../tizen/RESampleServerApp/src/reservermain.cpp | 80 ---- 17 files changed, 917 insertions(+), 196 deletions(-) create mode 100644 service/resource-container/examples/tizen/ContainerServerApp/.cproject create mode 100644 service/resource-container/examples/tizen/ContainerServerApp/.exportMap create mode 100644 service/resource-container/examples/tizen/ContainerServerApp/.project rename service/{resource-encapsulation/examples/tizen/RESampleServerApp/edc_resource/re_container_control.edc => resource-container/examples/tizen/ContainerServerApp/edc_resource/container_control.edc} (58%) rename service/{resource-encapsulation/examples/tizen/RESampleServerApp/inc/recontainer.h => resource-container/examples/tizen/ContainerServerApp/inc/container.h} (89%) rename service/{resource-encapsulation/examples/tizen/RESampleServerApp/inc/reservermain.h => resource-container/examples/tizen/ContainerServerApp/inc/rcmain.h} (73%) create mode 100644 service/resource-container/examples/tizen/ContainerServerApp/lib/ResourceContainerConfig.xml create mode 100644 service/resource-container/examples/tizen/ContainerServerApp/res/ui_controls.edc create mode 100644 service/resource-container/examples/tizen/ContainerServerApp/shared/res/containerServer.png rename service/{resource-encapsulation/examples/tizen/RESampleServerApp/src/recontainer.cpp => resource-container/examples/tizen/ContainerServerApp/src/container.cpp} (93%) create mode 100644 service/resource-container/examples/tizen/ContainerServerApp/src/rcmain.cpp create mode 100644 service/resource-container/examples/tizen/ContainerServerApp/tizen-manifest.xml delete mode 100644 service/resource-encapsulation/examples/tizen/RESampleServerApp/src/reservermain.cpp diff --git a/service/resource-container/examples/tizen/ContainerServerApp/.cproject b/service/resource-container/examples/tizen/ContainerServerApp/.cproject new file mode 100644 index 0000000..13e4714 --- /dev/null +++ b/service/resource-container/examples/tizen/ContainerServerApp/.cproject @@ -0,0 +1,523 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/service/resource-container/examples/tizen/ContainerServerApp/.exportMap b/service/resource-container/examples/tizen/ContainerServerApp/.exportMap new file mode 100644 index 0000000..43e310e --- /dev/null +++ b/service/resource-container/examples/tizen/ContainerServerApp/.exportMap @@ -0,0 +1,4 @@ +{ + global: main; + local: *; +}; diff --git a/service/resource-container/examples/tizen/ContainerServerApp/.project b/service/resource-container/examples/tizen/ContainerServerApp/.project new file mode 100644 index 0000000..6d6e23e --- /dev/null +++ b/service/resource-container/examples/tizen/ContainerServerApp/.project @@ -0,0 +1,43 @@ + + + ContainerServerApp + + + + + + org.eclipse.cdt.managedbuilder.core.genmakebuilder + + + + + org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder + full,incremental, + + + + + org.tizen.nativecore.apichecker.core.builder + + + + + + org.eclipse.cdt.core.cnature + org.eclipse.cdt.core.ccnature + org.eclipse.cdt.managedbuilder.core.managedBuildNature + org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + org.tizen.nativecore.apichecker.core.tizenCppNature + + + + 0 + + 26 + + org.eclipse.ui.ide.multiFilter + 1.0-projectRelativePath-matches-false-false-*/.tpk + + + + diff --git a/service/resource-encapsulation/examples/tizen/RESampleServerApp/edc_resource/re_container_control.edc b/service/resource-container/examples/tizen/ContainerServerApp/edc_resource/container_control.edc similarity index 58% rename from service/resource-encapsulation/examples/tizen/RESampleServerApp/edc_resource/re_container_control.edc rename to service/resource-container/examples/tizen/ContainerServerApp/edc_resource/container_control.edc index 8aaa19b..b5080ea 100644 --- a/service/resource-encapsulation/examples/tizen/RESampleServerApp/edc_resource/re_container_control.edc +++ b/service/resource-container/examples/tizen/ContainerServerApp/edc_resource/container_control.edc @@ -17,7 +17,7 @@ * limitations under the License. * ******************************************************************/ - + group { name: "container_layout"; @@ -81,65 +81,4 @@ group } } } -} - -group -{ - name: "popup_datetime_text"; - parts - { - part - { - name: "pad_l"; - type: SPACER; - scale: 1; - description - { - state: "default" 0.0; - min: POPUP_CONTENT_DEFAULT_PADDING_LEFT_MIN_INC 0; - fixed: 1 0; - rel1.relative: 0.0 0.0; - rel2.relative: 0.0 1.0; - align: 0.0 0.0; - } - } - part - { - name: "pad_r"; - type: SPACER; - scale: 1; - description - { - state: "default" 0.0; - min: POPUP_CONTENT_DEFAULT_PADDING_LEFT_MIN_INC 0; - fixed: 1 0; - rel1.relative: 1.0 0.0; - rel2.relative: 1.0 1.0; - align: 1.0 0.0; - } - } - part - { - name: "elm.swallow.content"; - type: SWALLOW; - scale: 1; - description - { - state: "default" 0.0; - min: 0 POPUP_EDITFIELD_LAYOUT_MINMAX_HEIGHT_INC; - max: -1 POPUP_EDITFIELD_LAYOUT_MINMAX_HEIGHT_INC; - align: 0.5 0.5; - rel1 - { - relative: 1.0 0.0; - to_x: "pad_l"; - } - rel2 - { - relative: 0.0 1.0; - to_x: "pad_r"; - } - } - } - } -} +} \ No newline at end of file diff --git a/service/resource-encapsulation/examples/tizen/RESampleServerApp/inc/recontainer.h b/service/resource-container/examples/tizen/ContainerServerApp/inc/container.h similarity index 89% rename from service/resource-encapsulation/examples/tizen/RESampleServerApp/inc/recontainer.h rename to service/resource-container/examples/tizen/ContainerServerApp/inc/container.h index cb31b74..5639986 100644 --- a/service/resource-encapsulation/examples/tizen/RESampleServerApp/inc/recontainer.h +++ b/service/resource-container/examples/tizen/ContainerServerApp/inc/container.h @@ -18,12 +18,10 @@ * ******************************************************************/ -#include "remain.h" +#include "rcmain.h" -#ifndef RECONTAINER_H__ -#define RECONTAINER_H__ - -# define LOG_TAG "recontainer" +#ifndef CONTAINER_H__ +#define CONTAINER_H__ using namespace std; @@ -35,4 +33,4 @@ static void startContainer(void *data, Evas_Object *obj, void *event_info); static void stopContainer(void *data, Evas_Object *obj, void *event_info); -#endif // RECONTAINER_H__ +#endif // CONTAINER_H__ diff --git a/service/resource-encapsulation/examples/tizen/RESampleServerApp/inc/reservermain.h b/service/resource-container/examples/tizen/ContainerServerApp/inc/rcmain.h similarity index 73% rename from service/resource-encapsulation/examples/tizen/RESampleServerApp/inc/reservermain.h rename to service/resource-container/examples/tizen/ContainerServerApp/inc/rcmain.h index 6f731c7..22d080f 100644 --- a/service/resource-encapsulation/examples/tizen/RESampleServerApp/inc/reservermain.h +++ b/service/resource-container/examples/tizen/ContainerServerApp/inc/rcmain.h @@ -18,8 +18,8 @@ * ******************************************************************/ -#ifndef RESERVERMAIN_H__ -#define RESERVERMAIN_H__ +#ifndef RCMAIN_H__ +#define RCMAIN_H__ #include #include @@ -35,16 +35,14 @@ using namespace OC; #ifdef LOG_TAG #undef LOG_TAG #endif -#define LOG_TAG "reservermain" +#define LOG_TAG "containerserver" #if !defined(PACKAGE) -#define PACKAGE "org.tizen.resampleserver" +#define PACKAGE "org.tizen.containerserver" #endif -#define ELM_DEMO_EDJ "opt/usr/apps/org.tizen.resampleserver/res/ui_controls.edj" +#define ELM_DEMO_EDJ "opt/usr/apps/org.tizen.containerserver/res/ui_controls.edj" -void start_server(void *data, Evas_Object *obj, void *event_info); +void containerCreateUI(void *data, Evas_Object *obj, void *event_info); -void start_server_cb(void *data, Evas_Object *obj, void *event_info); - -#endif // RESERVERMAIN_H__ \ No newline at end of file +#endif // RCMAIN_H__ diff --git a/service/resource-container/examples/tizen/ContainerServerApp/lib/ResourceContainerConfig.xml b/service/resource-container/examples/tizen/ContainerServerApp/lib/ResourceContainerConfig.xml new file mode 100644 index 0000000..3dfc9a9 --- /dev/null +++ b/service/resource-container/examples/tizen/ContainerServerApp/lib/ResourceContainerConfig.xml @@ -0,0 +1,16 @@ + + + + oic.bundle.hueSample + /opt/usr/apps/org.tizen.containerserver/lib/libHueBundle.so + huesample + 1.0.0 + + + light + oic.r.control +
http://192.168.0.2/api/newdeveloper/lights/1
+ + + + diff --git a/service/resource-container/examples/tizen/ContainerServerApp/res/ui_controls.edc b/service/resource-container/examples/tizen/ContainerServerApp/res/ui_controls.edc new file mode 100644 index 0000000..c542f97 --- /dev/null +++ b/service/resource-container/examples/tizen/ContainerServerApp/res/ui_controls.edc @@ -0,0 +1,25 @@ +/****************************************************************** + * + * Copyright 2015 Samsung Electronics All Rights Reserved. + * + * + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + ******************************************************************/ + +collections +{ + base_scale: 1.8; + #include "../edc_resource/container_control.edc" +} \ No newline at end of file diff --git a/service/resource-container/examples/tizen/ContainerServerApp/shared/res/containerServer.png b/service/resource-container/examples/tizen/ContainerServerApp/shared/res/containerServer.png new file mode 100644 index 0000000000000000000000000000000000000000..9765b1bda7e5bddf0925555ab204b887a873bf24 GIT binary patch literal 57662 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 kZ}gYfNaCF}xV$|1>H6z0+kD @@ -166,12 +165,12 @@ static void addHueResourceConfig(void *data, Evas_Object *obj, void *event_info) if (checkContainer) { std::map resourceParams; - resourceParams["resourceType"] = "oic.light.control"; + resourceParams["resourceType"] = "oic.r.light"; resourceParams["address"] = "http://192.168.0.2/api/newdeveloper/lights/1"; if (s_hueBundleFlag) { container->addResourceConfig("oic.bundle.hueSample", "", resourceParams); - logMessage += "Resource added
"; + logMessage += "1 Light Resource added
"; listHueResources(NULL, NULL, NULL); } else @@ -322,8 +321,8 @@ static void addHueBundle(void *data, Evas_Object *obj, void *event_info) { std::map bundleParams; container->addBundle("oic.bundle.hueSample", "", - "/opt/usr/apps/org.tizen.resampleserver/lib/libHueBundle.so", - "hueSample", bundleParams); + "/opt/usr/apps/org.tizen.containerserver/lib/libHueBundle.so", + "huesample", bundleParams); logMessage += "HUE Bundle added
"; } else @@ -349,8 +348,8 @@ static void addBMIBundle(void *data, Evas_Object *obj, void *event_info) { std::map bundleParams; container->addBundle("oic.bundle.BMISensor", "", - "/opt/usr/apps/org.tizen.resampleserver/lib/libBMISensorBundle.so", - "BMISensor", bundleParams); + "/opt/usr/apps/org.tizen.containerserver/lib/libBMISensorBundle.so", + "bmisensor", bundleParams); logMessage += "BMI Bundle added
"; } else @@ -422,7 +421,7 @@ static void startHueBundle(void *data, Evas_Object *obj, void *event_info) if (checkContainer) { container->startBundle("oic.bundle.hueSample"); - logMessage += "BMI Bundle started
"; + logMessage += "HUE Bundle started
"; s_hueBundleFlag = true; } else @@ -523,31 +522,22 @@ void *showContainerAPIs(void *data) elm_list_item_append(listnew, "2. List Hue resources", NULL, NULL, listHueResources, NULL); - elm_list_item_append(listnew, "3. Add HUE Resource Config", NULL, NULL, + elm_list_item_append(listnew, "3. Add HUE Bundle Resource", NULL, NULL, addHueResourceConfig, NULL); - elm_list_item_append(listnew, "4. Remove HUE Resource Config", NULL, NULL, + elm_list_item_append(listnew, "4. Remove HUE Bundle Resource", NULL, NULL, removeHueResourceConfig, NULL); - elm_list_item_append(listnew, "5. List BMI resources", NULL, NULL, - listBMIResources, NULL); - - elm_list_item_append(listnew, "6. Add BMI Bundle", NULL, NULL, + elm_list_item_append(listnew, "5. Add BMI Bundle", NULL, NULL, addBMIBundle, NULL); - elm_list_item_append(listnew, "7. Start BMI Bundle", NULL, NULL, + elm_list_item_append(listnew, "6. Start BMI Bundle", NULL, NULL, startBMIBundle, NULL); - elm_list_item_append(listnew, "8. Add BMI Resource Config", NULL, NULL, - addBMIResourceConfig, NULL); - - elm_list_item_append(listnew, "9. Remove BMI Resource Config", NULL, NULL, - removeBMIResourceConfig, NULL); - - elm_list_item_append(listnew, "10. Remove BMI Bundle", NULL, NULL, + elm_list_item_append(listnew, "7. Remove BMI Bundle", NULL, NULL, removeBMIBundle, NULL); - elm_list_item_append(listnew, "11. Stop BMI Bundle", NULL, NULL, + elm_list_item_append(listnew, "8. Stop BMI Bundle", NULL, NULL, stopBMIBundle, NULL); elm_list_go(listnew); @@ -559,7 +549,7 @@ void *showContainerAPIs(void *data) static void startContainer(void *data, Evas_Object *obj, void *event_info) { std::string xmlDescription = - "/opt/usr/apps/org.tizen.resampleserver/lib/ResourceContainerConfig.xml"; + "/opt/usr/apps/org.tizen.containerserver/lib/ResourceContainerConfig.xml"; string logMessage = ""; if (NULL != listnew) @@ -573,8 +563,7 @@ static void startContainer(void *data, Evas_Object *obj, void *event_info) s_containerFlag = true; s_hueBundleFlag = true; logMessage += "CONTAINER STARTED
"; - logMessage += "HUE BUNDLE ADDED
"; - logMessage += "HUE BUNDLE STARTED
"; + logMessage += "ADD AND START BUNDLES
"; } else { @@ -642,6 +631,7 @@ naviframe_pop_cb(void *data, Elm_Object_Item *it) // Method to set up server screens void containerCreateUI(void *data, Evas_Object *obj, void *event_info) { + dlog_print(DLOG_INFO, LOG_TAG, "#### container UI"); s_containerFlag = false; s_hueBundleFlag = false; Evas_Object *layout; @@ -656,6 +646,7 @@ void containerCreateUI(void *data, Evas_Object *obj, void *event_info) scroller = elm_scroller_add(nf); elm_scroller_bounce_set(scroller, EINA_FALSE, EINA_TRUE); elm_scroller_policy_set(scroller, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO); + dlog_print(DLOG_INFO, LOG_TAG, "#### container UI 1"); // Layout layout = elm_layout_add(nf); @@ -663,18 +654,21 @@ void containerCreateUI(void *data, Evas_Object *obj, void *event_info) evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_object_content_set(scroller, layout); + dlog_print(DLOG_INFO, LOG_TAG, "#### container UI 2"); // Button start_button = elm_button_add(layout); elm_object_part_content_set(layout, "start_button", start_button); elm_object_text_set(start_button, "Start Container"); evas_object_smart_callback_add(start_button, "clicked", startContainer, NULL); + dlog_print(DLOG_INFO, LOG_TAG, "#### container UI 3"); // Button stop_button = elm_button_add(layout); elm_object_part_content_set(layout, "stop_button", stop_button); elm_object_text_set(stop_button, "Stop Container"); evas_object_smart_callback_add(stop_button, "clicked", stopContainer, NULL); + dlog_print(DLOG_INFO, LOG_TAG, "#### container UI 4"); // List listnew = elm_list_add(layout); @@ -682,6 +676,7 @@ void containerCreateUI(void *data, Evas_Object *obj, void *event_info) evas_object_smart_callback_add(listnew, "selected", list_selected_cb, NULL); elm_object_part_content_set(layout, "listnew", listnew); elm_list_go(listnew); + dlog_print(DLOG_INFO, LOG_TAG, "#### container UI 5"); // log_entry - text area for log log_entry = elm_entry_add(layout); @@ -694,4 +689,5 @@ void containerCreateUI(void *data, Evas_Object *obj, void *event_info) nf_it = elm_naviframe_item_push(nf, "Resource Container", NULL, NULL, scroller, NULL); elm_naviframe_item_pop_cb_set(nf_it, naviframe_pop_cb, NULL); + dlog_print(DLOG_INFO, LOG_TAG, "#### container UI 6"); } diff --git a/service/resource-container/examples/tizen/ContainerServerApp/src/rcmain.cpp b/service/resource-container/examples/tizen/ContainerServerApp/src/rcmain.cpp new file mode 100644 index 0000000..c845270 --- /dev/null +++ b/service/resource-container/examples/tizen/ContainerServerApp/src/rcmain.cpp @@ -0,0 +1,255 @@ +/****************************************************************** + * + * Copyright 2015 Samsung Electronics All Rights Reserved. + * + * + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + ******************************************************************/ + +#include "rcmain.h" +#include + +typedef struct appdata +{ + Evas_Object *win; + Evas_Object *conform; + Evas_Object *layout; + Evas_Object *nf; + Evas_Object *findButton; + Evas_Object *logtext; + Evas_Object *listview; +} appdata_s; + +static void +win_delete_request_cb(void *data , Evas_Object *obj , void *event_info) +{ + ui_app_exit(); +} + +static void +list_selected_cb(void *data, Evas_Object *obj, void *event_info) +{ + Elm_Object_Item *it = (Elm_Object_Item *)event_info; + elm_list_item_selected_set(it, EINA_FALSE); +} + +static Eina_Bool +naviframe_pop_cb(void *data, Elm_Object_Item *it) +{ + ui_app_exit(); + return EINA_FALSE; +} + +static void +create_list_view(appdata_s *ad) +{ + Evas_Object *list; + Evas_Object *btn; + Evas_Object *nf = ad->nf; + Elm_Object_Item *nf_it; + + // List + list = elm_list_add(nf); + elm_list_mode_set(list, ELM_LIST_COMPRESS); + evas_object_smart_callback_add(list, "selected", list_selected_cb, NULL); + + // Main Menu Items Here + elm_list_item_append(list, "Resource Container", NULL, NULL, containerCreateUI, nf); + + elm_list_go(list); + + // This button is set for devices which doesn't have H/W back key. + btn = elm_button_add(nf); + elm_object_style_set(btn, "naviframe/end_btn/default"); + nf_it = elm_naviframe_item_push(nf, "Resource Encapsulation", btn, NULL, list, NULL); + elm_naviframe_item_pop_cb_set(nf_it, naviframe_pop_cb, ad->win); +} + + +static void +create_base_gui(appdata_s *ad) +{ + // Window + ad->win = elm_win_util_standard_add(PACKAGE, PACKAGE); + elm_win_conformant_set(ad->win, EINA_TRUE); + elm_win_autodel_set(ad->win, EINA_TRUE); + + if (elm_win_wm_rotation_supported_get(ad->win)) + { + int rots[4] = { 0, 90, 180, 270 }; + elm_win_wm_rotation_available_rotations_set(ad->win, (const int *)(&rots), 4); + } + + evas_object_smart_callback_add(ad->win, "delete,request", win_delete_request_cb, NULL); + + // Conformant + ad->conform = elm_conformant_add(ad->win); + evas_object_size_hint_weight_set(ad->conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(ad->win, ad->conform); + evas_object_show(ad->conform); + + // Base Layout + ad->layout = elm_layout_add(ad->conform); + evas_object_size_hint_weight_set(ad->layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_layout_theme_set(ad->layout, "layout", "application", "default"); + evas_object_show(ad->layout); + + elm_object_content_set(ad->conform, ad->layout); + + // Naviframe + ad->nf = elm_naviframe_add(ad->layout); + create_list_view(ad); + elm_object_part_content_set(ad->layout, "elm.swallow.content", ad->nf); + eext_object_event_callback_add(ad->nf, EEXT_CALLBACK_BACK, eext_naviframe_back_cb, NULL); + eext_object_event_callback_add(ad->nf, EEXT_CALLBACK_MORE, eext_naviframe_more_cb, NULL); + + // Show window after base gui is set up + evas_object_show(ad->win); +} + +// Configures the OCPlatform +static void +configure_platform() +{ + try + { + PlatformConfig config + { OC::ServiceType::InProc, ModeType::Server, "0.0.0.0", 0, OC::QualityOfService::LowQos }; + + OCPlatform::Configure(config); + + dlog_print(DLOG_INFO, LOG_TAG, "#### Platform configuration done!!!!"); + } + catch (OCException &e) + { + dlog_print(DLOG_ERROR, LOG_TAG, "Exception occured! (%s)", e.what()); + } +} + +static bool +app_create(void *data) +{ + /* Hook to take necessary actions before main event loop starts + Initialize UI resources and application's data + If this function returns true, the main loop of application starts + If this function returns false, the application is terminated */ + appdata_s *ad = (appdata_s *)data; + + elm_app_base_scale_set(1.8); + + create_base_gui(ad); + + configure_platform(); + + return true; +} + +static void +app_control(app_control_h app_control, void *data) +{ + // Handle the launch request. +} + +static void +app_pause(void *data) +{ + // Take necessary actions when application becomes invisible. +} + +static void +app_resume(void *data) +{ + // Take necessary actions when application becomes visible. +} + +static void +app_terminate(void *data) +{ + // Release all resources. +} + +static void +ui_app_lang_changed(app_event_info_h event_info, void *user_data) +{ + // APP_EVENT_LANGUAGE_CHANGED + char *locale = NULL; + system_settings_get_value_string(SYSTEM_SETTINGS_KEY_LOCALE_LANGUAGE, &locale); + elm_language_set(locale); + free(locale); + return; +} + +static void +ui_app_orient_changed(app_event_info_h event_info, void *user_data) +{ + // APP_EVENT_DEVICE_ORIENTATION_CHANGED + return; +} + +static void +ui_app_region_changed(app_event_info_h event_info, void *user_data) +{ + // APP_EVENT_REGION_FORMAT_CHANGED +} + +static void +ui_app_low_battery(app_event_info_h event_info, void *user_data) +{ + // APP_EVENT_LOW_BATTERY +} + +static void +ui_app_low_memory(app_event_info_h event_info, void *user_data) +{ + // APP_EVENT_LOW_MEMORY +} + +int +main(int argc, char *argv[]) +{ + appdata_s ad = {0,}; + int ret = 0; + + ui_app_lifecycle_callback_s event_callback = {0,}; + app_event_handler_h handlers[5] = {NULL, }; + + event_callback.create = app_create; + event_callback.terminate = app_terminate; + event_callback.pause = app_pause; + event_callback.resume = app_resume; + event_callback.app_control = app_control; + + ui_app_add_event_handler(&handlers[APP_EVENT_LOW_BATTERY], APP_EVENT_LOW_BATTERY, + ui_app_low_battery, &ad); + ui_app_add_event_handler(&handlers[APP_EVENT_LOW_MEMORY], APP_EVENT_LOW_MEMORY, + ui_app_low_memory, &ad); + ui_app_add_event_handler(&handlers[APP_EVENT_DEVICE_ORIENTATION_CHANGED], + APP_EVENT_DEVICE_ORIENTATION_CHANGED, + ui_app_orient_changed, &ad); + ui_app_add_event_handler(&handlers[APP_EVENT_LANGUAGE_CHANGED], + APP_EVENT_LANGUAGE_CHANGED, + ui_app_lang_changed, &ad); + ui_app_add_event_handler(&handlers[APP_EVENT_REGION_FORMAT_CHANGED], + APP_EVENT_REGION_FORMAT_CHANGED, + ui_app_region_changed, &ad); + ui_app_remove_event_handler(handlers[APP_EVENT_LOW_MEMORY]); + + ret = ui_app_main(argc, argv, &event_callback, &ad); + if (APP_ERROR_NONE != ret) + { + dlog_print(DLOG_ERROR, LOG_TAG, "app_main() is failed. err = %d", ret); + } + return ret; +} diff --git a/service/resource-container/examples/tizen/ContainerServerApp/tizen-manifest.xml b/service/resource-container/examples/tizen/ContainerServerApp/tizen-manifest.xml new file mode 100644 index 0000000..002f284 --- /dev/null +++ b/service/resource-container/examples/tizen/ContainerServerApp/tizen-manifest.xml @@ -0,0 +1,13 @@ + + + + + + containerServer.png + + + http://tizen.org/privilege/network.get + http://tizen.org/privilege/internet + + true + diff --git a/service/resource-encapsulation/examples/tizen/RESampleServerApp/.cproject b/service/resource-encapsulation/examples/tizen/RESampleServerApp/.cproject index 3f3bacd..724b1d4 100644 --- a/service/resource-encapsulation/examples/tizen/RESampleServerApp/.cproject +++ b/service/resource-encapsulation/examples/tizen/RESampleServerApp/.cproject @@ -239,12 +239,8 @@ - - - - diff --git a/service/resource-encapsulation/examples/tizen/RESampleServerApp/inc/remain.h b/service/resource-encapsulation/examples/tizen/RESampleServerApp/inc/remain.h index ca6fb73..1e5a899 100644 --- a/service/resource-encapsulation/examples/tizen/RESampleServerApp/inc/remain.h +++ b/service/resource-encapsulation/examples/tizen/RESampleServerApp/inc/remain.h @@ -45,6 +45,4 @@ using namespace OC; void serverCreateUI(void *data, Evas_Object *obj, void *event_info); -void containerCreateUI(void *data, Evas_Object *obj, void *event_info); - #endif // REMAIN_H__ \ No newline at end of file diff --git a/service/resource-encapsulation/examples/tizen/RESampleServerApp/res/ui_controls.edc b/service/resource-encapsulation/examples/tizen/RESampleServerApp/res/ui_controls.edc index 7e64650..5caf512 100644 --- a/service/resource-encapsulation/examples/tizen/RESampleServerApp/res/ui_controls.edc +++ b/service/resource-encapsulation/examples/tizen/RESampleServerApp/res/ui_controls.edc @@ -22,5 +22,4 @@ collections { base_scale: 1.8; #include "../edc_resource/re_server_control.edc" - #include "../edc_resource/re_container_control.edc" } \ No newline at end of file diff --git a/service/resource-encapsulation/examples/tizen/RESampleServerApp/src/remain.cpp b/service/resource-encapsulation/examples/tizen/RESampleServerApp/src/remain.cpp index f374be8..849734a 100644 --- a/service/resource-encapsulation/examples/tizen/RESampleServerApp/src/remain.cpp +++ b/service/resource-encapsulation/examples/tizen/RESampleServerApp/src/remain.cpp @@ -66,9 +66,7 @@ create_list_view(appdata_s *ad) evas_object_smart_callback_add(list, "selected", list_selected_cb, NULL); // Main Menu Items Here - elm_list_item_append(list, "Resource Server", NULL, NULL, serverCreateUI, nf); - - elm_list_item_append(list, "Resource Container", NULL, NULL, containerCreateUI, nf); + elm_list_item_append(list, "Start Temperature Sensor", NULL, NULL, serverCreateUI, nf); elm_list_go(list); diff --git a/service/resource-encapsulation/examples/tizen/RESampleServerApp/src/reservermain.cpp b/service/resource-encapsulation/examples/tizen/RESampleServerApp/src/reservermain.cpp deleted file mode 100644 index 6465794..0000000 --- a/service/resource-encapsulation/examples/tizen/RESampleServerApp/src/reservermain.cpp +++ /dev/null @@ -1,80 +0,0 @@ -/****************************************************************** - * - * Copyright 2015 Samsung Electronics All Rights Reserved. - * - * - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - ******************************************************************/ - -#include "reservermain.h" -#include - -typedef struct appdata -{ - Evas_Object *win; - Evas_Object *conform; - Evas_Object *layout; - Evas_Object *nf; - Evas_Object *findButton; - Evas_Object *logtext; - Evas_Object *listview; -} appdata_s; - -static void -win_delete_request_cb(void *data , Evas_Object *obj , void *event_info) -{ - ui_app_exit(); -} - -static void -list_selected_cb(void *data, Evas_Object *obj, void *event_info) -{ - Elm_Object_Item *it = (Elm_Object_Item *)event_info; - elm_list_item_selected_set(it, EINA_FALSE); -} - -static Eina_Bool -naviframe_pop_cb(void *data, Elm_Object_Item *it) -{ - ui_app_exit(); - return EINA_FALSE; -} - -static void -create_list_view(appdata_s *ad) -{ - Evas_Object *list; - Evas_Object *btn; - Evas_Object *nf = ad->nf; - Elm_Object_Item *nf_it; - - // List - list = elm_list_add(nf); - elm_list_mode_set(list, ELM_LIST_COMPRESS); - evas_object_smart_callback_add(list, "selected", list_selected_cb, NULL); - - // Main Menu Items Here - elm_list_item_append(list, "Create Resource [Auto control]", NULL, NULL, start_server, nf); - - elm_list_item_append(list, "Create Resource [Developer control]", NULL, NULL, start_server_cb, nf); - - elm_list_go(list); - - // This button is set for devices which doesn't have H/W back key. - btn = elm_button_add(nf); - elm_object_style_set(btn, "naviframe/end_btn/default"); - nf_it = elm_naviframe_item_push(nf, "Resource Encapsulation", btn, NULL, list, NULL); - elm_naviframe_item_pop_cb_set(nf_it, naviframe_pop_cb, ad->win); -} -- 2.7.4