#ifndef _NS_CONSTANTS_H_
#define _NS_CONSTANTS_H_
+#define __PRINTLOG 0
#define __NS_FILE__ ( strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__ )
-#ifdef TB_LOG
#include "logger.h"
+
+#ifdef TB_LOG
+#ifdef __TIZEN__
+#include <dlog.h>
+#ifdef LOG_TAG
+#undef LOG_TAG
+#endif // LOG_TAG
+#define LOG_TAG "NotificationService"
+#define NS_CONVERT_LEVEL(level) ( \
+ ((level) == 0) ? DLOG_DEBUG : \
+ ((level) == 1) ? DLOG_INFO : \
+ ((level) == 2) ? DLOG_WARN : \
+ ((level) == 3) ? DLOG_ERROR : DLOG_ERROR)
+#define NS_LOG_V(level, format, ...) (dlog_print(NS_CONVERT_LEVEL(level), LOG_TAG, (format), __VA_ARGS__))
+#define NS_LOG(level, msg) (dlog_print(NS_CONVERT_LEVEL(level), LOG_TAG, (msg)))
+#else // __TIZEN__
#define NS_LOG_V(level, format, ...) (OIC_LOG_V((level), __NS_FILE__, (format), __VA_ARGS__))
#define NS_LOG(level, msg) (OIC_LOG((level), __NS_FILE__, (msg)))
-#else
-#include "logger.h"
+#endif // __TIZEN__
+#else // TB_LOG
+#if (__PRINTLOG == 1)
#define NS_CONVERT_LEVEL(level) ( \
((level) == 0) ? "DEBUG" : \
((level) == 1) ? "INFO" : \
printf((msg)); \
printf("\n"); \
}
-#endif
+#else // (__PRINTLOG == 1)
+#define NS_CONVERT_LEVEL(level)
+#define NS_LOG(level, msg)
+#define NS_LOG_V(level, format, ...) NS_LOG((level), ((format), __VA_ARGS__))
+#endif // (__PRINTLOG == 1)
+#endif // TB_LOG
#define NS_TAG "IOT_NOTI"
// NOTIOBJ //
#define NOTIOBJ_TITLE_KEY "title"
#define NOTIOBJ_ID_KEY "id"
-#define NOTOOBJ_CONTENT_KEY "contentText"
+#define NOTOOBJ_CONTENT_KEY "contenttext"
#define DISCOVERY_TAG "NS_PROVIDER_DISCOVERY"
#define SUBSCRIPTION_TAG "NS_PROVIDER_SUBSCRIPTION"
#define RESOURCE_TAG "NS_PROVIDER_RESOURCE"
#define TOPIC_TAG "NS_PROVIDER_TOPIC"
-#define NS_ROOT_TYPE "oic.r.notification"
-#define NS_COLLECTION_MESSAGE_TYPE "oic.r.notification.message"
-#define NS_COLLECTION_SYNC_TYPE "oic.r.notification.sync"
-#define NS_COLLECTION_TOPIC_TYPE "oic.r.notification.topic"
+#define NS_ROOT_TYPE "oic.wk.notification"
+#define NS_COLLECTION_MESSAGE_TYPE "oic.wk.notification.message"
+#define NS_COLLECTION_SYNC_TYPE "oic.wk.notification.sync"
+#define NS_COLLECTION_TOPIC_TYPE "oic.wk.notification.topic"
-#define NS_DEFAULT_INTERFACE "oic.if.baseline"
+#define NS_INTERFACE_READ "oic.if.r"
+#define NS_INTERFACE_READWRITE "oic.if.rw"
+#define NS_INTERFACE_BASELINE "oic.if.baseline"
#define NS_ROOT_URI "/notification"
#define NS_COLLECTION_MESSAGE_URI "/notification/message"
#define NS_QUERY_CONSUMER_ID "consumerid"
#define NS_QUERY_PROVIDER_ID "providerid"
+#define NS_QUERY_INTERFACE "if"
#define NS_QUERY_ID_SIZE 10
} \
}
+#define VERSION "1.2.1"
+
+#define NS_ATTRIBUTE_VERSION "version"
+#define NS_ATTRIBUTE_POLICY "subcontrollability"
+#define NS_ATTRIBUTE_MESSAGE "messageuri"
+#define NS_ATTRIBUTE_SYNC "syncuri"
+#define NS_ATTRIBUTE_TOPIC "topicuri"
+#define NS_ATTRIBUTE_MESSAGE_ID "messageid"
+#define NS_ATTRIBUTE_PROVIDER_ID "providerid"
+#define NS_ATTRIBUTE_CONSUMER_ID "consumerid"
+#define NS_ATTRIBUTE_TOPIC_LIST "topiclist"
+#define NS_ATTRIBUTE_TOPIC_NAME "topicname"
+#define NS_ATTRIBUTE_TOPIC_SELECTION "topicstate"
+#define NS_ATTRIBUTE_TITLE "title"
+#define NS_ATTRIBUTE_TEXT "contenttext"
+#define NS_ATTRIBUTE_SOURCE "source"
+#define NS_ATTRIBUTE_STATE "state"
+#define NS_ATTRIBUTE_DEVICE "device"
+#define NS_ATTRIBUTE_TYPE "type"
+#define NS_ATTRIBUTE_DATETIME "datetime"
+#define NS_ATTRIBUTE_TTL "ttl"
+#define NS_ATTRIBUTE_ICON_IMAGE "iconimage"
typedef enum eConnectionState
{
TASK_CONSUMER_REQ_DISCOVER = 8001,
TASK_CONSUMER_REQ_SUBSCRIBE = 8002,
TASK_CONSUMER_REQ_SUBSCRIBE_CANCEL = 8003,
- TASK_CONSUMER_RECV_SUBSCRIBE_CONFIRMED = 8004,
+ TASK_CONSUMER_SENT_REQ_OBSERVE = 8004,
TASK_CONSUMER_RECV_PROVIDER_CHANGED = 8005,
TASK_CONSUMER_RECV_MESSAGE = 8101,
TASK_CONSUMER_REQ_TOPIC_URI = 8299,
TASK_CONSUMER_REQ_TOPIC_LIST = 8300,
TASK_CONSUMER_RECV_TOPIC_LIST = 8031,
- TASK_CONSUMER_GET_TOPIC_LIST = 8302,
TASK_CONSUMER_SELECT_TOPIC_LIST = 8303,
TASK_EVENT_CONNECTED = 9000,
TASK_CB_SYNC = 10001,
TASK_SEND_TOPICS = 11000,
- TASK_ADD_TOPIC = 11001,
- TASK_DELETE_TOPIC = 11002,
+ TASK_REGISTER_TOPIC = 11001,
+ TASK_UNREGISTER_TOPIC = 11002,
TASK_SUBSCRIBE_TOPIC = 11003,
TASK_UNSUBSCRIBE_TOPIC = 11004,
- TASK_POST_TOPIC = 11005
+ TASK_POST_TOPIC = 11005,
+ TASK_GET_TOPICS = 11006,
+ TAST_GET_CONSUMER_TOPICS = 11007
} NSTaskType;
NS_RESOURCE_TOPIC = 1002,
} NSResourceType;
+typedef enum eInterfaceType
+{
+ NS_INTERFACE_TYPE_READ = 1,
+ NS_INTERFACE_TYPE_READWRITE = 2,
+} NSInterfaceType;
+
#endif /* _NS_CONSTANTS_H_ */