Added missing code for parsing device type

Change-Id: I09b863c1ca32ff2780186868c4f3a3753ea820e8
Signed-off-by: kmook <kmook.choi@samsung.com>

diff --git a/common/Types.h b/common/Types.h
index 481e819f096e6e451b46ba515d1cace09e8de576..6b90880935245ca6c251fc87413b5a8a5bcb2571 100644 (file)
--- a/common/Types.h
+++ b/common/Types.h
@@ -134,6 +134,9 @@ enum request_type {
 #define CONV_JSON_DEVICE_NAME                                  CONV_DEVICE_NAME
 #define CONV_JSON_DEVICE_TYPE                                  CONV_DEVICE_TYPE
 #define CONV_JSON_DEVICE_ADDRESS                               "host_address"
+#define CONV_SMART_TV                                                  "Samsung SmartTV"
+#define CONV_DEVICE_TYPE_TV                                            "TV"
+#define CONV_DEVICE_TYPE_MOBILE                                        "MOBILE"
 
 enum ApplicationState {
        APP_COMM_STATE_NONE = 0,

diff --git a/daemon/DiscoveryManager.cpp b/daemon/DiscoveryManager.cpp
index ad879e90287455c9b8d6abb216e7be50aae2149a..54c202f48afb4d7bd9cac6713b0c039dde5bbe73 100755 (executable)
--- a/daemon/DiscoveryManager.cpp
+++ b/daemon/DiscoveryManager.cpp
@@ -251,6 +251,7 @@ int conv::DiscoveryManager::convertDeviceIntoJson(conv::IDevice* device_info, Js
        jsonData->set(NULL, CONV_JSON_DEVICE_ID, device_info->getId());
        jsonData->set(NULL, CONV_JSON_DEVICE_NAME, device_info->getName());
        jsonData->set(NULL, CONV_JSON_DEVICE_ADDRESS, device_info->getAddress());
+       jsonData->set(NULL, CONV_JSON_DEVICE_TYPE, device_info->getType());
 
        return CONV_ERROR_NONE;
 }

diff --git a/daemon/IDevice.h b/daemon/IDevice.h
index 30dac5fcf9284e4295aca7f7b4e7dd00be655260..0eca23325e15ece905fb6604869c6c4991aa1d39 100644 (file)
--- a/daemon/IDevice.h
+++ b/daemon/IDevice.h
@@ -34,6 +34,7 @@ namespace conv {
                        virtual string getName() = 0;
                        virtual string getId() = 0;
                        virtual string getAddress() = 0;
+                       virtual string getType() = 0;
                        virtual int setAddress(std::string host_address) = 0;
        };
 }

diff --git a/daemon/ServiceManager.cpp b/daemon/ServiceManager.cpp
index 18755a65bbe294db618526ac86760466f8e26ee7..66e52fbf26b8f9ec1a0938102cc0c2c72822fd50 100755 (executable)
--- a/daemon/ServiceManager.cpp
+++ b/daemon/ServiceManager.cpp
@@ -316,10 +316,10 @@ static iotcon_representation_h _get_d2d_service_representation(conv::ServiceMana
        iotcon_attributes_add_str(attributes, CONV_JSON_DEVICE_NAME, deviceName);
 #if defined(_TV_)
        _D("device type : TV");
-       string deviceTypeStr("TV");
+       string deviceTypeStr(CONV_DEVICE_TYPE_TV);
 #else
        _D("device type : MOBILE");
-       string deviceTypeStr("MOBILE");
+       string deviceTypeStr(CONV_DEVICE_TYPE_MOBILE);
 #endif
        char* deviceType = new char[deviceTypeStr.size() + 1];
 

diff --git a/daemon/discovery_provider/SmartviewDiscoveryProvider.cpp b/daemon/discovery_provider/SmartviewDiscoveryProvider.cpp
index 429fc342eaf9ed64c5ce28e0595d1b963f53146b..0d6c92aadf5af4133cfb1e13b7dce6f5013c549d 100755 (executable)
--- a/daemon/discovery_provider/SmartviewDiscoveryProvider.cpp
+++ b/daemon/discovery_provider/SmartviewDiscoveryProvider.cpp
@@ -140,6 +140,11 @@ conv::SmartViewDevice* conv::SmartviewDiscoveryProvider::convertIntoConvDevice(S
        conv::SmartViewDevice*  device_info = new(std::nothrow) conv::SmartViewDevice;
        device_info->setId(serv_id);
        device_info->setName(serv_name);
+       if ( !strcmp(CONV_SMART_TV, smartview_service->getType().c_str()) ) {
+               device_info->setType(CONV_DEVICE_TYPE_TV);
+       } else {
+               device_info->setType(CONV_DEVICE_TYPE_MOBILE);
+       }
 
        return device_info;
 }

diff --git a/daemon/discovery_provider/iotcon/DeviceAdapter.cpp b/daemon/discovery_provider/iotcon/DeviceAdapter.cpp
index f701a7b44a87adee45fdbb5a0271657cf8a4483e..4fd27c5ebd1ff36e51810863ff424bedaa904ad7 100755 (executable)
--- a/daemon/discovery_provider/iotcon/DeviceAdapter.cpp
+++ b/daemon/discovery_provider/iotcon/DeviceAdapter.cpp
@@ -74,6 +74,11 @@ string conv::DeviceAdapter::getAddress()
        return m_resource_h.getHostAddress();
 }
 
+string conv::DeviceAdapter::getType()
+{
+       return m_resource_h.getDeviceType();
+}
+
 int conv::DeviceAdapter::getServiceList(std::list<IService*> *list)
 {
        for (service_list_t::iterator iterPos = service_list.begin(); iterPos != service_list.end(); ++iterPos) {

diff --git a/daemon/discovery_provider/iotcon/DeviceAdapter.h b/daemon/discovery_provider/iotcon/DeviceAdapter.h
index fcf599e9848e2065bb70437d5de75fd4ca486de9..e427d5270d56cc0e545f909bd8bb5a886be3d100 100644 (file)
--- a/daemon/discovery_provider/iotcon/DeviceAdapter.h
+++ b/daemon/discovery_provider/iotcon/DeviceAdapter.h
@@ -35,6 +35,7 @@ namespace conv {
                        string getName();
                        string getId();
                        string getAddress();
+                       string getType();
                        int setAddress(std::string host_address);
 
                private :

diff --git a/daemon/discovery_provider/smartview/SmartViewDevice.cpp b/daemon/discovery_provider/smartview/SmartViewDevice.cpp
index 7e941a223db13a6f907a875df44e5433eac72dc3..b3ef4fa525904cd58d0872726e2877883313a6d0 100755 (executable)
--- a/daemon/discovery_provider/smartview/SmartViewDevice.cpp
+++ b/daemon/discovery_provider/smartview/SmartViewDevice.cpp
@@ -96,6 +96,11 @@ string conv::SmartViewDevice::getAddress()
        return ip_address;
 }
 
+string conv::SmartViewDevice::getType()
+{
+       return type;
+}
+
 int conv::SmartViewDevice::getServiceList(std::list<IService*> *list)
 {
        for (service_list_t::iterator iterPos = service_list.begin(); iterPos != service_list.end(); ++iterPos)
@@ -123,3 +128,9 @@ int conv::SmartViewDevice::setAddress(string id)
        ip_address = id;
        return CONV_ERROR_NONE;
 }
+
+int conv::SmartViewDevice::setType(string deviceType)
+{
+       type = deviceType;
+       return CONV_ERROR_NONE;
+}

diff --git a/daemon/discovery_provider/smartview/SmartViewDevice.h b/daemon/discovery_provider/smartview/SmartViewDevice.h
index dec050fd21e08109495f1933acb1c7a1884a0b35..de22e0d1177605a68d9a32de77367beb20bb52d7 100755 (executable)
--- a/daemon/discovery_provider/smartview/SmartViewDevice.h
+++ b/daemon/discovery_provider/smartview/SmartViewDevice.h
@@ -38,9 +38,11 @@ namespace conv {
                        std::string getName();
                        std::string getId();
                        std::string getAddress();
+                       std::string getType();
                        int setName(std::string name);
                        int setId(std::string id);
                        int setAddress(std::string host_address);
+                       int setType(std::string type);
 
                private:
                        service_list_t service_list;