int mediaVolume;
std::string bssid;
Json data;
- data.set(NULL, STATS_APP_ID, appId);
+ data.set(NULL, KEY_APP_ID, appId);
if (ctx::system_info::getAudioJackState(&audioJack))
- data.set(NULL, STATS_AUDIO_JACK, audioJack);
+ data.set(NULL, KEY_AUDIO_JACK, audioJack);
if (ctx::system_info::getVolume(&systemVolume, &mediaVolume)) {
- data.set(NULL, STATS_SYSTEM_VOLUME, systemVolume);
- data.set(NULL, STATS_MEDIA_VOLUME, mediaVolume);
+ data.set(NULL, KEY_SYSTEM_VOLUME, systemVolume);
+ data.set(NULL, KEY_MEDIA_VOLUME, mediaVolume);
}
if (ctx::system_info::getWifiBssid(bssid))
- data.set(NULL, STATS_BSSID, bssid);
+ data.set(NULL, KEY_BSSID, bssid);
__dbManager.insert(0, APP_TABLE_USAGE_LOG, data, NULL);
}
std::stringstream query;
query <<
"UPDATE " APP_TABLE_USAGE_LOG \
- " SET " STATS_DURATION " = strftime('%s', 'now') - " STATS_UNIV_TIME \
- " WHERE " STATS_COL_ROW_ID " = (" \
- "SELECT MAX(" STATS_COL_ROW_ID ") FROM " APP_TABLE_USAGE_LOG \
- " WHERE " STATS_APP_ID " = '" << appId << "'" \
- " AND " STATS_DURATION " = 0)";
+ " SET " KEY_DURATION " = strftime('%s', 'now') - " KEY_UNIV_TIME \
+ " WHERE " KEY_COL_ROW_ID " = (" \
+ "SELECT MAX(" KEY_COL_ROW_ID ") FROM " APP_TABLE_USAGE_LOG \
+ " WHERE " KEY_APP_ID " = '" << appId << "'" \
+ " AND " KEY_DURATION " = 0)";
__dbManager.execute(0, query.str().c_str(), NULL);
}
std::stringstream query;
query << "DELETE FROM " APP_TABLE_USAGE_LOG " WHERE " \
- STATS_UNIV_TIME " < strftime('%s', 'now') - " << LOG_RETENTION_PERIOD;
+ KEY_UNIV_TIME " < strftime('%s', 'now') - " << LOG_RETENTION_PERIOD;
__dbManager.execute(0, query.str().c_str(), NULL);
}
#ifndef _CONTEXT_STATS_APP_TYPES_H_
#define _CONTEXT_STATS_APP_TYPES_H_
-#include "../shared/CommonTypes.h"
+#include "../shared/ProviderTypes.h"
#define APP_HISTORY_PRIV "apphistory.read"
#define APP_SUBJ_LOGGER "stats/app/logger"
whereClause << StatsDbHandleBase::createWhereClause(filter);
- if (filter.get(NULL, STATS_BSSID, &bssid))
- whereClause << " AND " STATS_BSSID " = '" << bssid << "'";
+ if (filter.get(NULL, KEY_BSSID, &bssid))
+ whereClause << " AND " KEY_BSSID " = '" << bssid << "'";
- if (filter.get(NULL, STATS_AUDIO_JACK, &audioJack))
- whereClause << " AND " STATS_AUDIO_JACK " = " << audioJack;
+ if (filter.get(NULL, KEY_AUDIO_JACK, &audioJack))
+ whereClause << " AND " KEY_AUDIO_JACK " = " << audioJack;
return whereClause.str();
}
std::string timeOfDay;
std::string appId;
- if (!filter.get(NULL, STATS_APP_ID, &appId)) {
+ if (!filter.get(NULL, KEY_APP_ID, &appId)) {
_E("Invalid parameter");
return "";
}
- if (filter.get(NULL, STATS_DAY_OF_WEEK, &weekStr))
- filterCleaned.set(NULL, STATS_DAY_OF_WEEK, weekStr);
+ if (filter.get(NULL, KEY_DAY_OF_WEEK, &weekStr))
+ filterCleaned.set(NULL, KEY_DAY_OF_WEEK, weekStr);
- if (filter.get(NULL, STATS_TIME_OF_DAY, &timeOfDay))
- filterCleaned.set(NULL, STATS_TIME_OF_DAY, timeOfDay);
+ if (filter.get(NULL, KEY_TIME_OF_DAY, &timeOfDay))
+ filterCleaned.set(NULL, KEY_TIME_OF_DAY, timeOfDay);
std::string whereClause = createWhereClause(filterCleaned);
query <<
"INSERT INTO " APP_TEMP_USAGE_FREQ \
- " SELECT " STATS_APP_ID ", COUNT(*) AS " STATS_TOTAL_COUNT \
+ " SELECT " KEY_APP_ID ", COUNT(*) AS " KEY_TOTAL_COUNT \
" FROM " APP_TABLE_USAGE_LOG \
" WHERE " << whereClause <<
- " GROUP BY " STATS_APP_ID ";";
+ " GROUP BY " KEY_APP_ID ";";
query <<
- "INSERT OR IGNORE INTO " APP_TEMP_USAGE_FREQ " (" STATS_APP_ID ")" \
+ "INSERT OR IGNORE INTO " APP_TEMP_USAGE_FREQ " (" KEY_APP_ID ")" \
" VALUES ('" << appId << "');";
query <<
- "SELECT S." STATS_APP_ID ", S." STATS_TOTAL_COUNT ", 1+COUNT(lesser." STATS_TOTAL_COUNT ") AS " STATS_RANK \
+ "SELECT S." KEY_APP_ID ", S." KEY_TOTAL_COUNT ", 1+COUNT(lesser." KEY_TOTAL_COUNT ") AS " KEY_RANK \
" FROM " APP_TEMP_USAGE_FREQ " AS S" \
" LEFT JOIN " APP_TEMP_USAGE_FREQ " AS lesser" \
- " ON S." STATS_TOTAL_COUNT " < lesser." STATS_TOTAL_COUNT \
- " WHERE S." STATS_APP_ID " = '" << appId << "'";
+ " ON S." KEY_TOTAL_COUNT " < lesser." KEY_TOTAL_COUNT \
+ " WHERE S." KEY_APP_ID " = '" << appId << "'";
return query.str();
}
std::stringstream query;
int limit = DEFAULT_LIMIT;
- filter.get(NULL, STATS_RESULT_SIZE, &limit);
+ filter.get(NULL, KEY_RESULT_SIZE, &limit);
query <<
- "SELECT " STATS_APP_ID ", " \
- "COUNT(*) AS " STATS_TOTAL_COUNT ", " \
- "SUM(" STATS_DURATION ") AS " STATS_TOTAL_DURATION ", " \
- "MAX(" STATS_UNIV_TIME ") AS " STATS_LAST_TIME \
+ "SELECT " KEY_APP_ID ", " \
+ "COUNT(*) AS " KEY_TOTAL_COUNT ", " \
+ "SUM(" KEY_DURATION ") AS " KEY_TOTAL_DURATION ", " \
+ "MAX(" KEY_UNIV_TIME ") AS " KEY_LAST_TIME \
" FROM " APP_TABLE_USAGE_LOG \
" WHERE " << createWhereClauseWithDeviceStatus(filter) <<
- " GROUP BY " STATS_APP_ID \
- " ORDER BY MAX(" STATS_UNIV_TIME ") DESC" \
+ " GROUP BY " KEY_APP_ID \
+ " ORDER BY MAX(" KEY_UNIV_TIME ") DESC" \
" LIMIT " << limit;
return query.str();
std::stringstream query;
int limit = DEFAULT_LIMIT;
- filter.get(NULL, STATS_RESULT_SIZE, &limit);
+ filter.get(NULL, KEY_RESULT_SIZE, &limit);
query <<
- "SELECT " STATS_APP_ID ", " \
- "COUNT(*) AS " STATS_TOTAL_COUNT ", " \
- "SUM(" STATS_DURATION ") AS " STATS_TOTAL_DURATION ", " \
- "MAX(" STATS_UNIV_TIME ") AS " STATS_LAST_TIME \
+ "SELECT " KEY_APP_ID ", " \
+ "COUNT(*) AS " KEY_TOTAL_COUNT ", " \
+ "SUM(" KEY_DURATION ") AS " KEY_TOTAL_DURATION ", " \
+ "MAX(" KEY_UNIV_TIME ") AS " KEY_LAST_TIME \
" FROM " APP_TABLE_USAGE_LOG \
" WHERE " << createWhereClauseWithDeviceStatus(filter) <<
- " GROUP BY " STATS_APP_ID \
+ " GROUP BY " KEY_APP_ID \
" ORDER BY COUNT(*) DESC" \
" LIMIT " << limit;
std::stringstream query;
int limit = DEFAULT_LIMIT;
- filter.get(NULL, STATS_RESULT_SIZE, &limit);
+ filter.get(NULL, KEY_RESULT_SIZE, &limit);
query <<
- "SELECT i." STATS_APP_ID ", " \
- "COUNT(u." STATS_DURATION ") AS " STATS_TOTAL_COUNT ", " \
- "IFNULL(SUM(u." STATS_DURATION "),0) AS " STATS_TOTAL_DURATION ", " \
- "IFNULL(MAX(u." STATS_UNIV_TIME "),-1) AS " STATS_LAST_TIME \
+ "SELECT i." KEY_APP_ID ", " \
+ "COUNT(u." KEY_DURATION ") AS " KEY_TOTAL_COUNT ", " \
+ "IFNULL(SUM(u." KEY_DURATION "),0) AS " KEY_TOTAL_DURATION ", " \
+ "IFNULL(MAX(u." KEY_UNIV_TIME "),-1) AS " KEY_LAST_TIME \
" FROM " APP_TABLE_REMOVABLE_APP " i LEFT OUTER JOIN (" \
" SELECT * FROM " APP_TABLE_USAGE_LOG \
" WHERE " << createWhereClauseWithDeviceStatus(filter) << ") u" \
- " ON i." STATS_APP_ID " = u." STATS_APP_ID \
- " GROUP BY i." STATS_APP_ID \
- " ORDER BY " STATS_TOTAL_COUNT " ASC" \
+ " ON i." KEY_APP_ID " = u." KEY_APP_ID \
+ " GROUP BY i." KEY_APP_ID \
+ " ORDER BY " KEY_TOTAL_COUNT " ASC" \
" LIMIT " << limit;
return query.str();
std::string valStr;
int val;
- jsonResult.get(NULL, STATS_APP_ID, &valStr);
- results.set(NULL, STATS_APP_ID, valStr);
- jsonResult.get(NULL, STATS_TOTAL_COUNT, &val);
- results.set(NULL, STATS_TOTAL_COUNT, val);
- jsonResult.get(NULL, STATS_RANK, &val);
- results.set(NULL, STATS_RANK, val);
+ jsonResult.get(NULL, KEY_APP_ID, &valStr);
+ results.set(NULL, KEY_APP_ID, valStr);
+ jsonResult.get(NULL, KEY_TOTAL_COUNT, &val);
+ results.set(NULL, KEY_TOTAL_COUNT, val);
+ jsonResult.get(NULL, KEY_RANK, &val);
+ results.set(NULL, KEY_RANK, val);
reqProvider->replyToRead(reqFilter, error, results);
}
Json data;
DatabaseManager dbManager;
- data.set(NULL, STATS_APP_ID, appId);
+ data.set(NULL, KEY_APP_ID, appId);
return dbManager.insert(0, APP_TABLE_REMOVABLE_APP, data, NULL);
}
if (__lastEventType == PACKAGE_MANAGER_EVENT_TYPE_INSTALL) {
Json data;
- data.set(NULL, STATS_APP_ID, appId);
+ data.set(NULL, KEY_APP_ID, appId);
dbManager.insert(0, APP_TABLE_REMOVABLE_APP, data, NULL);
} else if (__lastEventType == PACKAGE_MANAGER_EVENT_TYPE_UNINSTALL) {
dbManager.execute(0, __createDeletionQuery(APP_TABLE_REMOVABLE_APP, appId).c_str(), NULL);
{
std::stringstream query;
query << "DELETE FROM " << tableName;
- query << " WHERE " STATS_APP_ID " = '" << appId << "'";
+ query << " WHERE " KEY_APP_ID " = '" << appId << "'";
return query.str();
}
static Json __latest;
SocialStatusCall::SocialStatusCall() :
- BasicProvider(SOCIAL_ST_SUBJ_CALL)
+ BasicProvider(SUBJ_STATE_CALL)
{
__handleList.count = 0;
__handleList.handle = NULL;
switch (notiId) {
case TELEPHONY_NOTI_VOICE_CALL_STATUS_IDLE:
case TELEPHONY_NOTI_VIDEO_CALL_STATUS_IDLE:
- data.set(NULL, SOCIAL_ST_STATE, SOCIAL_ST_IDLE);
+ data.set(NULL, KEY_STATE, VAL_IDLE);
break;
case TELEPHONY_NOTI_VOICE_CALL_STATUS_ACTIVE:
case TELEPHONY_NOTI_VIDEO_CALL_STATUS_ACTIVE:
- data.set(NULL, SOCIAL_ST_STATE, SOCIAL_ST_ACTIVE);
+ data.set(NULL, KEY_STATE, VAL_ACTIVE);
break;
case TELEPHONY_NOTI_VOICE_CALL_STATUS_ALERTING:
case TELEPHONY_NOTI_VIDEO_CALL_STATUS_ALERTING:
- data.set(NULL, SOCIAL_ST_STATE, SOCIAL_ST_ALERTING);
+ data.set(NULL, KEY_STATE, VAL_ALERTING);
break;
case TELEPHONY_NOTI_VOICE_CALL_STATUS_INCOMING:
case TELEPHONY_NOTI_VIDEO_CALL_STATUS_INCOMING:
- data.set(NULL, SOCIAL_ST_STATE, SOCIAL_ST_INCOMING);
+ data.set(NULL, KEY_STATE, VAL_INCOMING);
break;
/* // Ignore below cases
case TELEPHONY_NOTI_VOICE_CALL_STATUS_HELD:
case TELEPHONY_NOTI_VOICE_CALL_STATUS_ACTIVE:
case TELEPHONY_NOTI_VOICE_CALL_STATUS_ALERTING:
case TELEPHONY_NOTI_VOICE_CALL_STATUS_INCOMING:
- data.set(NULL, SOCIAL_ST_TYPE, SOCIAL_ST_VOICE);
+ data.set(NULL, KEY_TYPE, VAL_VOICE);
break;
case TELEPHONY_NOTI_VIDEO_CALL_STATUS_IDLE:
case TELEPHONY_NOTI_VIDEO_CALL_STATUS_ACTIVE:
case TELEPHONY_NOTI_VIDEO_CALL_STATUS_ALERTING:
case TELEPHONY_NOTI_VIDEO_CALL_STATUS_INCOMING:
- data.set(NULL, SOCIAL_ST_TYPE, SOCIAL_ST_VIDEO);
+ data.set(NULL, KEY_TYPE, VAL_VIDEO);
break;
/* // Ignore below cases
case TELEPHONY_NOTI_VOICE_CALL_STATUS_HELD:
// Address
std::string address;
if (__getCallAddress(callList[i], address)) {
- data.set(NULL, SOCIAL_ST_ADDRESS, address);
+ data.set(NULL, KEY_ADDRESS, address);
break;
}
}
switch (st) {
case TELEPHONY_CALL_STATUS_ACTIVE:
- state = SOCIAL_ST_ACTIVE;
+ state = VAL_ACTIVE;
break;
case TELEPHONY_CALL_STATUS_HELD:
- state = SOCIAL_ST_HELD;
+ state = VAL_HELD;
break;
case TELEPHONY_CALL_STATUS_DIALING:
- state = SOCIAL_ST_DIALING;
+ state = VAL_DIALING;
break;
case TELEPHONY_CALL_STATUS_ALERTING:
- state = SOCIAL_ST_ALERTING;
+ state = VAL_ALERTING;
break;
case TELEPHONY_CALL_STATUS_INCOMING:
- state = SOCIAL_ST_INCOMING;
+ state = VAL_INCOMING;
break;
default:
- state = SOCIAL_ST_IDLE;
+ state = VAL_IDLE;
}
IF_FAIL_RETURN_TAG(!state.empty(), false, _W, "State is empty");
switch (t) {
case TELEPHONY_CALL_TYPE_VOICE:
- type = SOCIAL_ST_VOICE;
+ type = VAL_VOICE;
break;
case TELEPHONY_CALL_TYPE_VIDEO:
- type = SOCIAL_ST_VIDEO;
+ type = VAL_VIDEO;
break;
default:
_E("Unknown type: %d", t);
telephony_call_get_call_list(handle, &count, &callList);
// Default data
- data->set(NULL, SOCIAL_ST_STATE, SOCIAL_ST_IDLE);
+ data->set(NULL, KEY_STATE, VAL_IDLE);
// Held & Dialing are ignored
for (unsigned int i = 0; i < count; i++) {
std::string state;
if (__getCallState(callList[i], state)) {
// Skip Held & Dialing
- if (state.compare(SOCIAL_ST_HELD) == 0 || state.compare(SOCIAL_ST_DIALING) == 0)
+ if (state.compare(VAL_HELD) == 0 || state.compare(VAL_DIALING) == 0)
continue;
- data->set(NULL, SOCIAL_ST_STATE, state);
+ data->set(NULL, KEY_STATE, state);
}
// Call type
std::string type;
if (__getCallType(callList[i], type)) {
- data->set(NULL, SOCIAL_ST_MEDIUM, type);
+ data->set(NULL, KEY_MEDIUM, type);
}
// Address
std::string address;
if (__getCallAddress(callList[i], address)) {
- data->set(NULL, SOCIAL_ST_ADDRESS, address);
+ data->set(NULL, KEY_ADDRESS, address);
}
- if (state == SOCIAL_ST_ACTIVE) {
+ if (state == VAL_ACTIVE) {
break;
}
}
bool ret = true;
Json data;
- data.set(NULL, SOCIAL_ST_STATE, SOCIAL_ST_IDLE);
+ data.set(NULL, KEY_STATE, VAL_IDLE);
for (unsigned int i = 0; i < __handleList.count; i++) {
telephony_sim_state_e state;
#define _CONTEXT_SOCIAL_STATUS_CALL_H_
#include <telephony.h>
-#include "../shared/SocialTypes.h"
+#include "../shared/ProviderTypes.h"
#include "../shared/BasicProvider.h"
namespace ctx {
using namespace ctx;
SocialStatusContacts::SocialStatusContacts() :
- BasicProvider(SOCIAL_ST_SUBJ_CONTACTS),
+ BasicProvider(SUBJ_STATE_CONTACTS),
__latestMyProfile(0),
__latestPerson(0)
{
return;
}
- std::string view = (STR_EQ(viewUri, _contacts_my_profile._uri)? SOCIAL_ST_MY_PROFILE : SOCIAL_ST_PERSON);
+ std::string view = (STR_EQ(viewUri, _contacts_my_profile._uri)? VAL_MY_PROFILE : VAL_PERSON);
IF_FAIL_VOID_TAG(!__isConsecutiveChange(viewUri), _D, "Ignore consecutive db change: %s", view.c_str());
Json data;
- data.set(NULL, SOCIAL_ST_EVENT, SOCIAL_ST_CHANGED);
- data.set(NULL, SOCIAL_ST_TYPE, view);
+ data.set(NULL, KEY_EVENT, VAL_CHANGED);
+ data.set(NULL, KEY_TYPE, view);
publish(NULL, ERR_NONE, data);
}
#define _CONTEXT_SOCIAL_STATUS_CONTACTS_H_
#include <contacts.h>
-#include "../shared/SocialTypes.h"
+#include "../shared/ProviderTypes.h"
#include "../shared/BasicProvider.h"
namespace ctx {
using namespace ctx;
SocialStatusEmail::SocialStatusEmail() :
- BasicProvider(SOCIAL_ST_SUBJ_EMAIL),
+ BasicProvider(SUBJ_STATE_EMAIL),
__dbusSignalId(-1),
__dbusWatcher(DBusType::SESSION)
{
//TODO: Check if this signal actually means that there are new mails
_D("sub type: %d, gi1: %d, gc: %s, gi2: %d, gi3: %d", subType, gi1, gc, gi2, gi3);
Json dataUpdated;
- dataUpdated.set(NULL, SOCIAL_ST_EVENT, SOCIAL_ST_RECEIVED);
+ dataUpdated.set(NULL, KEY_EVENT, VAL_RECEIVED);
publish(NULL, ERR_NONE, dataUpdated);
} else if (subType == NOTI_SEND_FINISH) {
_D("sub type: %d, gi1: %d, gc: %s, gi2: %d, gi3: %d", subType, gi1, gc, gi2, gi3);
Json dataUpdated;
- dataUpdated.set(NULL, SOCIAL_ST_EVENT, SOCIAL_ST_SENT);
+ dataUpdated.set(NULL, KEY_EVENT, VAL_SENT);
publish(NULL, ERR_NONE, dataUpdated);
}
}
#define _CONTEXT_SOCIAL_STATUS_EMAIL_H_
#include <DBusSignalWatcher.h>
-#include "../shared/SocialTypes.h"
+#include "../shared/ProviderTypes.h"
#include "../shared/BasicProvider.h"
namespace ctx {
using namespace ctx;
DeviceStatusHeadphone::DeviceStatusHeadphone() :
- BasicProvider(DEVICE_ST_SUBJ_HEADPHONE),
+ BasicProvider(SUBJ_STATE_HEADPHONE),
__connected(false),
__audioJackState(RUNTIME_INFO_AUDIO_JACK_STATUS_UNCONNECTED),
__btAudioState(false),
void DeviceStatusHeadphone::__generateDataPacket(Json* data)
{
- data->set(NULL, DEVICE_ST_IS_CONNECTED, __connected ? DEVICE_ST_TRUE : DEVICE_ST_FALSE);
+ data->set(NULL, KEY_IS_CONNECTED, __connected ? VAL_TRUE : VAL_FALSE);
switch (__audioJackState) {
case RUNTIME_INFO_AUDIO_JACK_STATUS_CONNECTED_3WIRE:
- data->set(NULL, DEVICE_ST_TYPE, DEVICE_ST_NORMAL);
+ data->set(NULL, KEY_TYPE, VAL_NORMAL);
break;
case RUNTIME_INFO_AUDIO_JACK_STATUS_CONNECTED_4WIRE:
- data->set(NULL, DEVICE_ST_TYPE, DEVICE_ST_HEADSET);
+ data->set(NULL, KEY_TYPE, VAL_HEADSET);
break;
default:
if (__btAudioState)
- data->set(NULL, DEVICE_ST_TYPE, DEVICE_ST_BLUETOOTH);
+ data->set(NULL, KEY_TYPE, VAL_BLUETOOTH);
break;
}
}
#include <glib.h>
#include <runtime_info.h>
#include <bluetooth.h>
-#include "../shared/SystemTypes.h"
+#include "../shared/ProviderTypes.h"
#include "../shared/BasicProvider.h"
namespace ctx {
std::string weekStr;
std::string timeOfDay;
- if (filter.get(NULL, STATS_DAY_OF_WEEK, &weekStr))
- filterCleaned.set(NULL, STATS_DAY_OF_WEEK, weekStr);
+ if (filter.get(NULL, KEY_DAY_OF_WEEK, &weekStr))
+ filterCleaned.set(NULL, KEY_DAY_OF_WEEK, weekStr);
- if (filter.get(NULL, STATS_TIME_OF_DAY, &timeOfDay))
- filterCleaned.set(NULL, STATS_TIME_OF_DAY, timeOfDay);
+ if (filter.get(NULL, KEY_TIME_OF_DAY, &timeOfDay))
+ filterCleaned.set(NULL, KEY_TIME_OF_DAY, timeOfDay);
std::string whereClause = createWhereClause(mediaType, filterCleaned);
std::stringstream query;
query <<
- "SELECT IFNULL(COUNT(*),0) AS " STATS_TOTAL_COUNT \
+ "SELECT IFNULL(COUNT(*),0) AS " KEY_TOTAL_COUNT \
" FROM " MEDIA_TABLE_NAME \
" WHERE " << whereClause;
Json results;
int val;
- jsonResult.get(NULL, STATS_TOTAL_COUNT, &val);
- results.set(NULL, STATS_TOTAL_COUNT, val);
+ jsonResult.get(NULL, KEY_TOTAL_COUNT, &val);
+ results.set(NULL, KEY_TOTAL_COUNT, val);
reqProvider->replyToRead(reqFilter, error, results);
}
data.set(NULL, CX_MEDIA_TYPE, mediaType);
if (ctx::system_info::getAudioJackState(&audioJack))
- data.set(NULL, STATS_AUDIO_JACK, audioJack);
+ data.set(NULL, KEY_AUDIO_JACK, audioJack);
if (ctx::system_info::getVolume(&systemVolume, &mediaVolume)) {
- data.set(NULL, STATS_SYSTEM_VOLUME, systemVolume);
- data.set(NULL, STATS_MEDIA_VOLUME, mediaVolume);
+ data.set(NULL, KEY_SYSTEM_VOLUME, systemVolume);
+ data.set(NULL, KEY_MEDIA_VOLUME, mediaVolume);
}
__dbManager.insert(0, MEDIA_TABLE_NAME, data, NULL);
#ifndef _CONTEXT_STATS_MEDIA_TYPES_H_
#define _CONTEXT_STATS_MEDIA_TYPES_H_
-#include "../shared/CommonTypes.h"
+#include "../shared/ProviderTypes.h"
#define MEDIA_HISTORY_PRIV "mediahistory.read"
#define MEDIA_SUBJ_LOGGER "stats/media/logger"
using namespace ctx;
SocialStatusMessage::SocialStatusMessage() :
- BasicProvider(SOCIAL_ST_SUBJ_MESSAGE),
+ BasicProvider(SUBJ_STATE_MESSAGE),
__messageHandle(NULL)
{
}
case MSG_TYPE_SMS_REJECT :
case MSG_TYPE_SMS_ETWS_PRIMARY :
case MSG_TYPE_SMS :
- data.set(NULL, SOCIAL_ST_TYPE, SOCIAL_ST_SMS);
+ data.set(NULL, KEY_TYPE, VAL_SMS);
break;
case MSG_TYPE_MMS_NOTI :
case MSG_TYPE_MMS_JAVA :
case MSG_TYPE_MMS :
- data.set(NULL, SOCIAL_ST_TYPE, SOCIAL_ST_MMS);
+ data.set(NULL, KEY_TYPE, VAL_MMS);
break;
default :
_W("Unknown message type");
return;
}
- data.set(NULL, SOCIAL_ST_EVENT, SOCIAL_ST_RECEIVED);
- data.set(NULL, SOCIAL_ST_ADDRESS, address);
+ data.set(NULL, KEY_EVENT, VAL_RECEIVED);
+ data.set(NULL, KEY_ADDRESS, address);
publish(NULL, ERR_NONE, data);
}
#include <msg.h>
#include <msg_transport.h>
-#include "../shared/SocialTypes.h"
+#include "../shared/ProviderTypes.h"
#include "../shared/BasicProvider.h"
namespace ctx {
+++ /dev/null
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
- *
- * 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.
- */
-
-#ifndef _CONTEXT_STATS_COMMON_TYPES_H_
-#define _CONTEXT_STATS_COMMON_TYPES_H_
-
-#define LOG_RETENTION_PERIOD 7776000 /* 90 days in secs */
-
-#define DEFAULT_TIMESPAN 30
-#define DEFAULT_LIMIT 10
-
-#define STATS_QUERY_RESULT "QueryResult"
-#define STATS_RESULT_SIZE "ResultSize"
-#define STATS_COL_ROW_ID "rowId"
-
-#define STATS_TIMESPAN "TimeSpan"
-#define STATS_START_TIME "StartTime"
-#define STATS_END_TIME "EndTime"
-#define STATS_LAST_TIME "LastTime"
-#define STATS_TOTAL_COUNT "TotalCount"
-#define STATS_AVERAGE_COUNT "AvgCount"
-#define STATS_DURATION "Duration"
-#define STATS_TOTAL_DURATION "TotalDuration"
-#define STATS_DAY_OF_WEEK "DayOfWeek"
-#define STATS_HOUR_OF_DAY "HourOfDay"
-#define STATS_TIME_OF_DAY "TimeOfDay"
-#define STATS_TOTAL_COUNT "TotalCount"
-#define STATS_APP_ID "AppId"
-#define STATS_PKG_ID "PkgId"
-#define STATS_AUDIO_JACK "AudioJack"
-#define STATS_SYSTEM_VOLUME "SystemVolume"
-#define STATS_MEDIA_VOLUME "MediaVolume"
-#define STATS_BSSID "BSSID"
-#define STATS_UNIV_TIME "UTC"
-#define STATS_LOCAL_TIME "LocalTime"
-#define STATS_RANK "Rank"
-
-#define STATS_SUN "Sun"
-#define STATS_MON "Mon"
-#define STATS_TUE "Tue"
-#define STATS_WED "Wed"
-#define STATS_THU "Thu"
-#define STATS_FRI "Fri"
-#define STATS_SAT "Sat"
-#define STATS_WEEKDAY "Weekday"
-#define STATS_WEEKEND "Weekend"
-
-enum StatsDayOfWeek_e {
- STATS_DAY_OF_WEEK_WEEKDAY = 1,
- STATS_DAY_OF_WEEK_WEEKEND,
- STATS_DAY_OF_WEEK_ALL,
- STATS_DAY_OF_WEEK_SUN,
- STATS_DAY_OF_WEEK_MON,
- STATS_DAY_OF_WEEK_TUE,
- STATS_DAY_OF_WEEK_WED,
- STATS_DAY_OF_WEEK_THU,
- STATS_DAY_OF_WEEK_FRI,
- STATS_DAY_OF_WEEK_SAT,
-};
-
-#define TRIG_DEF_RANK "\"Rank\":{\"type\":\"integer\",\"min\":1}"
-#define TRIG_DEF_TOTAL_COUNT "\"TotalCount\":{\"type\":\"integer\",\"min\":0}"
-#define TRIG_DEF_TIME_OF_DAY "\"TimeOfDay\":{\"type\":\"string\"}"
-#define TRIG_DEF_DAY_OF_WEEK "\"DayOfWeek\":{\"type\":\"string\",\"values\":[\"Mon\",\"Tue\",\"Wed\",\"Thu\",\"Fri\",\"Sat\",\"Sun\",\"Weekday\",\"Weekend\"]}"
-
-#endif /* End of _CONTEXT_STATS_COMMMON_TYPES_ */
#include <sstream>
#include <Types.h>
-#include "CommonTypes.h"
+#include "ProviderTypes.h"
#include "DbHandleBase.h"
#define DAY_OF_WEEK(SECOND) "CAST(strftime('%w', " SECOND ", 'unixepoch') AS INTEGER)"
#define HOUR_OF_DAY(SECOND) "CAST(strftime('%H', " SECOND ", 'unixepoch') AS INTEGER)"
+/* TODO: replace these macros */
+#define STATS_SUN "Sun"
+#define STATS_MON "Mon"
+#define STATS_TUE "Tue"
+#define STATS_WED "Wed"
+#define STATS_THU "Thu"
+#define STATS_FRI "Fri"
+#define STATS_SAT "Sat"
+#define STATS_WEEKDAY "Weekday"
+#define STATS_WEEKEND "Weekend"
+
+enum StatsDayOfWeek_e {
+ STATS_DAY_OF_WEEK_WEEKDAY = 1,
+ STATS_DAY_OF_WEEK_WEEKEND,
+ STATS_DAY_OF_WEEK_ALL,
+ STATS_DAY_OF_WEEK_SUN,
+ STATS_DAY_OF_WEEK_MON,
+ STATS_DAY_OF_WEEK_TUE,
+ STATS_DAY_OF_WEEK_WED,
+ STATS_DAY_OF_WEEK_THU,
+ STATS_DAY_OF_WEEK_FRI,
+ STATS_DAY_OF_WEEK_SAT,
+};
+
+
using namespace ctx;
StatsDbHandleBase::StatsDbHandleBase(ContextProvider *provider) :
std::string weekStr;
std::string timeOfDay;
- if (filter.get(NULL, STATS_DAY_OF_WEEK, &weekStr)) {
+ if (filter.get(NULL, KEY_DAY_OF_WEEK, &weekStr)) {
// In case of string (from Trigger)
if (weekStr == STATS_WEEKDAY) {
week = STATS_DAY_OF_WEEK_WEEKDAY;
}
} else {
// In case of integer (from History)
- filter.get(NULL, STATS_DAY_OF_WEEK, &week);
+ filter.get(NULL, KEY_DAY_OF_WEEK, &week);
}
switch(week) {
case STATS_DAY_OF_WEEK_WEEKDAY:
- whereClause << "(" DAY_OF_WEEK(STATS_LOCAL_TIME) " > 0 AND " DAY_OF_WEEK(STATS_LOCAL_TIME) " < 6) AND ";
+ whereClause << "(" DAY_OF_WEEK(KEY_LOCAL_TIME) " > 0 AND " DAY_OF_WEEK(KEY_LOCAL_TIME) " < 6) AND ";
break;
case STATS_DAY_OF_WEEK_WEEKEND:
- whereClause << "(" DAY_OF_WEEK(STATS_LOCAL_TIME) " = 0 OR " DAY_OF_WEEK(STATS_LOCAL_TIME) " = 6) AND ";
+ whereClause << "(" DAY_OF_WEEK(KEY_LOCAL_TIME) " = 0 OR " DAY_OF_WEEK(KEY_LOCAL_TIME) " = 6) AND ";
break;
case STATS_DAY_OF_WEEK_SUN:
case STATS_DAY_OF_WEEK_MON:
case STATS_DAY_OF_WEEK_THU:
case STATS_DAY_OF_WEEK_FRI:
case STATS_DAY_OF_WEEK_SAT:
- whereClause << DAY_OF_WEEK(STATS_LOCAL_TIME) " = " << week - STATS_DAY_OF_WEEK_SUN << " AND ";
+ whereClause << DAY_OF_WEEK(KEY_LOCAL_TIME) " = " << week - STATS_DAY_OF_WEEK_SUN << " AND ";
break;
default:
break;
}
- if (filter.get(NULL, STATS_APP_ID, &appId))
- whereClause << STATS_APP_ID " = '" << appId << "' AND ";
+ if (filter.get(NULL, KEY_APP_ID, &appId))
+ whereClause << KEY_APP_ID " = '" << appId << "' AND ";
- if (filter.get(NULL, STATS_START_TIME, &start))
- whereClause << STATS_UNIV_TIME " >= " << start << " AND ";
+ if (filter.get(NULL, KEY_START_TIME, &start))
+ whereClause << KEY_UNIV_TIME " >= " << start << " AND ";
- if (filter.get(NULL, STATS_END_TIME, &end))
- whereClause << STATS_UNIV_TIME " <= " << end << " AND ";
+ if (filter.get(NULL, KEY_END_TIME, &end))
+ whereClause << KEY_UNIV_TIME " <= " << end << " AND ";
- if (filter.get(NULL, STATS_TIME_OF_DAY, &timeOfDay)) {
+ if (filter.get(NULL, KEY_TIME_OF_DAY, &timeOfDay)) {
size_t pivot = timeOfDay.find('-');
if (pivot != std::string::npos) {
std::string from = timeOfDay.substr(0, pivot);
std::string to = timeOfDay.substr(pivot + 1);
- whereClause << "(" HOUR_OF_DAY(STATS_LOCAL_TIME) " >= " << from \
- << " AND " HOUR_OF_DAY(STATS_LOCAL_TIME) " < " << to << ") AND ";
+ whereClause << "(" HOUR_OF_DAY(KEY_LOCAL_TIME) " >= " << from \
+ << " AND " HOUR_OF_DAY(KEY_LOCAL_TIME) " < " << to << ") AND ";
}
}
- filter.get(NULL, STATS_TIMESPAN, ×pan);
- whereClause << STATS_UNIV_TIME " > strftime('%s', 'now', '-" << timespan <<" day')";
+ filter.get(NULL, KEY_TIMESPAN, ×pan);
+ whereClause << KEY_UNIV_TIME " > strftime('%s', 'now', '-" << timespan <<" day')";
return whereClause.str();
}
std::stringstream query;
int limit = DEFAULT_LIMIT;
- filter.get(NULL, STATS_RESULT_SIZE, &limit);
+ filter.get(NULL, KEY_RESULT_SIZE, &limit);
query <<
"SELECT " \
- HOUR_OF_DAY(STATS_LOCAL_TIME) " AS " STATS_HOUR_OF_DAY ", COUNT(*) AS " STATS_TOTAL_COUNT \
+ HOUR_OF_DAY(KEY_LOCAL_TIME) " AS " KEY_HOUR_OF_DAY ", COUNT(*) AS " KEY_TOTAL_COUNT \
" FROM " << tableName << \
" WHERE " << whereClause << \
- " GROUP BY " HOUR_OF_DAY(STATS_LOCAL_TIME) \
- " ORDER BY " STATS_TOTAL_COUNT " DESC" \
+ " GROUP BY " HOUR_OF_DAY(KEY_LOCAL_TIME) \
+ " ORDER BY " KEY_TOTAL_COUNT " DESC" \
" LIMIT " << limit;
return query.str();
std::stringstream query;
query <<
- "SELECT ( SELECT " STATS_AUDIO_JACK \
+ "SELECT ( SELECT " KEY_AUDIO_JACK \
" FROM " << tableName << \
" WHERE " << whereClause << \
- " GROUP BY " STATS_AUDIO_JACK \
- " ORDER BY count(" STATS_AUDIO_JACK ") DESC" \
- " LIMIT 1 ) AS " STATS_AUDIO_JACK \
- ", ( SELECT " STATS_SYSTEM_VOLUME \
+ " GROUP BY " KEY_AUDIO_JACK \
+ " ORDER BY count(" KEY_AUDIO_JACK ") DESC" \
+ " LIMIT 1 ) AS " KEY_AUDIO_JACK \
+ ", ( SELECT " KEY_SYSTEM_VOLUME \
" FROM " << tableName << \
" WHERE " << whereClause << \
- " GROUP BY " STATS_SYSTEM_VOLUME \
- " ORDER BY count(" STATS_SYSTEM_VOLUME ") DESC" \
- " LIMIT 1 ) AS " STATS_SYSTEM_VOLUME \
- ", ( SELECT " STATS_MEDIA_VOLUME \
+ " GROUP BY " KEY_SYSTEM_VOLUME \
+ " ORDER BY count(" KEY_SYSTEM_VOLUME ") DESC" \
+ " LIMIT 1 ) AS " KEY_SYSTEM_VOLUME \
+ ", ( SELECT " KEY_MEDIA_VOLUME \
" FROM " << tableName << \
" WHERE " << whereClause << \
- " GROUP BY " STATS_MEDIA_VOLUME \
- " ORDER BY count(" STATS_MEDIA_VOLUME ") DESC" \
- " LIMIT 1 ) AS " STATS_MEDIA_VOLUME;
+ " GROUP BY " KEY_MEDIA_VOLUME \
+ " ORDER BY count(" KEY_MEDIA_VOLUME ") DESC" \
+ " LIMIT 1 ) AS " KEY_MEDIA_VOLUME;
return query.str();
}
for(auto vecJsonPos = vecJson.begin(); vecJsonPos != vecJsonEnd; ++vecJsonPos) {
Json originJson = *vecJsonPos;
- jsonResult.append(NULL, STATS_QUERY_RESULT, originJson);
+ jsonResult.append(NULL, KEY_QUERY_RESULT, originJson);
}
}
reqProvider->replyToRead(reqFilter, ERR_OPERATION_FAILED, dummy);
}
} else {
- Json results = "{\"" STATS_QUERY_RESULT "\":[]}";
+ Json results = "{\"" KEY_QUERY_RESULT "\":[]}";
__jsonVectorToArray(records, results);
reqProvider->replyToRead(reqFilter, error, results);
}
SO_EXPORT bool ctx::initDeviceContextProvider()
{
- registerProvider<DeviceStatusAlarm>(DEVICE_ST_SUBJ_ALARM, NULL);
- registerProvider<DeviceStatusTime>(DEVICE_ST_SUBJ_TIME, NULL);
+ registerProvider<DeviceStatusAlarm>(SUBJ_STATE_ALARM, NULL);
+ registerProvider<DeviceStatusTime>(SUBJ_STATE_TIME, NULL);
- registerProvider<DeviceStatusWifi>(DEVICE_ST_SUBJ_WIFI, PRIV_NETWORK);
- registerProvider<DeviceStatusHeadphone>(DEVICE_ST_SUBJ_HEADPHONE, NULL);
+ registerProvider<DeviceStatusWifi>(SUBJ_STATE_WIFI, PRIV_NETWORK);
+ registerProvider<DeviceStatusHeadphone>(SUBJ_STATE_HEADPHONE, NULL);
- registerProvider<DeviceStatusCharger>(DEVICE_ST_SUBJ_CHARGER, NULL);
- registerProvider<DeviceStatusGps>(DEVICE_ST_SUBJ_GPS, NULL);
- registerProvider<DeviceStatusUsb>(DEVICE_ST_SUBJ_USB, NULL);
- registerProvider<DeviceStatusBattery>(DEVICE_ST_SUBJ_BATTERY, NULL);
- registerProvider<DeviceStatusPsmode>(DEVICE_ST_SUBJ_PSMODE, NULL);
+ registerProvider<DeviceStatusCharger>(SUBJ_STATE_CHARGER, NULL);
+ registerProvider<DeviceStatusGps>(SUBJ_STATE_GPS, NULL);
+ registerProvider<DeviceStatusUsb>(SUBJ_STATE_USB, NULL);
+ registerProvider<DeviceStatusBattery>(SUBJ_STATE_BATTERY, NULL);
+ registerProvider<DeviceStatusPsmode>(SUBJ_STATE_PSMODE, NULL);
registerProvider<StationaryActivityProvider>(CTX_ACTIVITY_SUBJ_STATIONARY, NULL);
registerProvider<WalkingActivityProvider>(CTX_ACTIVITY_SUBJ_WALKING, NULL);
registerProvider<InVehicleActivityProvider>(CTX_ACTIVITY_SUBJ_IN_VEHICLE, NULL);
#ifdef _MOBILE_
- registerProvider<SocialStatusCall>(SOCIAL_ST_SUBJ_CALL, PRIV_TELEPHONY);
- registerProvider<SocialStatusEmail>(SOCIAL_ST_SUBJ_EMAIL, NULL);
- registerProvider<SocialStatusMessage>(SOCIAL_ST_SUBJ_MESSAGE, PRIV_MESSAGE);
- registerProvider<SocialStatusContacts>(SOCIAL_ST_SUBJ_CONTACTS, PRIV_CONTACT);
+ registerProvider<SocialStatusCall>(SUBJ_STATE_CALL, PRIV_TELEPHONY);
+ registerProvider<SocialStatusEmail>(SUBJ_STATE_EMAIL, NULL);
+ registerProvider<SocialStatusMessage>(SUBJ_STATE_MESSAGE, PRIV_MESSAGE);
+ registerProvider<SocialStatusContacts>(SUBJ_STATE_CONTACTS, PRIV_CONTACT);
/* Create context providers, which need to be initiated before being subscribed */
/*
--- /dev/null
+/*
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ *
+ * 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.
+ */
+
+#ifndef _CONTEXT_PROVIDER_TYPES_H_
+#define _CONTEXT_PROVIDER_TYPES_H_
+
+
+/* FW-wide Data Logger Parameters */
+#define LOG_RETENTION_PERIOD 7776000 /* 90 days in secs */
+
+
+/* FW-wide Default Values */
+#define DEFAULT_TIMESPAN 30
+#define DEFAULT_LIMIT 10
+
+
+/* Subjects */
+#define SUBJ_STATE_BATTERY "system/battery"
+#define SUBJ_STATE_CHARGER "system/charger"
+#define SUBJ_STATE_HEADPHONE "system/headphone"
+#define SUBJ_STATE_WIFI "system/wifi"
+#define SUBJ_STATE_USB "system/usb"
+#define SUBJ_STATE_GPS "system/gps"
+#define SUBJ_STATE_PSMODE "system/psmode"
+#define SUBJ_STATE_ALARM "device/alarm"
+#define SUBJ_STATE_TIME "device/time"
+
+#define SUBJ_STATE_CALL "social/call"
+#define SUBJ_STATE_EMAIL "social/email"
+#define SUBJ_STATE_MESSAGE "social/message"
+#define SUBJ_STATE_CONTACTS "social/contacts"
+
+
+/* Data & Option Keys */
+#define KEY_QUERY_RESULT "QueryResult"
+#define KEY_RESULT_SIZE "ResultSize"
+#define KEY_COL_ROW_ID "rowId"
+#define KEY_TIMESPAN "TimeSpan"
+#define KEY_START_TIME "StartTime"
+#define KEY_END_TIME "EndTime"
+#define KEY_LAST_TIME "LastTime"
+#define KEY_TOTAL_COUNT "TotalCount"
+#define KEY_AVERAGE_COUNT "AvgCount"
+#define KEY_DURATION "Duration"
+#define KEY_TOTAL_DURATION "TotalDuration"
+#define KEY_DAY_OF_WEEK "DayOfWeek"
+#define KEY_HOUR_OF_DAY "HourOfDay"
+#define KEY_TIME_OF_DAY "TimeOfDay"
+#define KEY_TOTAL_COUNT "TotalCount"
+#define KEY_APP_ID "AppId"
+#define KEY_PKG_ID "PkgId"
+#define KEY_AUDIO_JACK "AudioJack"
+#define KEY_SYSTEM_VOLUME "SystemVolume"
+#define KEY_MEDIA_VOLUME "MediaVolume"
+#define KEY_BSSID "BSSID"
+#define KEY_UNIV_TIME "UTC"
+#define KEY_LOCAL_TIME "LocalTime"
+#define KEY_RANK "Rank"
+
+#define KEY_EVENT "Event"
+#define KEY_STATE "State"
+#define KEY_TYPE "Type"
+#define KEY_LEVEL "Level"
+#define KEY_BSSID "BSSID"
+#define KEY_MEDIUM "Medium"
+#define KEY_ADDRESS "Address"
+#define KEY_IS_CONNECTED "IsConnected"
+#define KEY_IS_ENABLED "IsEnabled"
+#define KEY_IS_CHARGING "IsCharging"
+#define KEY_DETECTED "Detected"
+#define KEY_TIME_OF_DAY "TimeOfDay"
+#define KEY_DAY_OF_WEEK "DayOfWeek"
+#define KEY_DAY_OF_MONTH "DayOfMonth"
+
+
+/* Data & Option Values */
+#define VAL_TRUE 1
+#define VAL_FALSE 0
+#define VAL_ENTER "Enter"
+#define VAL_EXIT "Exit"
+#define VAL_DISABLED "Disabled"
+#define VAL_CONNECTED "Connected"
+#define VAL_UNCONNECTED "Unconnected"
+#define VAL_SEARCHING "Searching"
+#define VAL_EMPTY "Empty"
+#define VAL_CRITICAL "Critical"
+#define VAL_LOW "Low"
+#define VAL_NORMAL "Normal"
+#define VAL_HIGH "High"
+#define VAL_FULL "Full"
+#define VAL_HEADSET "Headset"
+#define VAL_BLUETOOTH "Bluetooth"
+#define VAL_IDLE "Idle"
+#define VAL_CONNECTING "Connecting"
+#define VAL_CONNECTED "Connected"
+#define VAL_HELD "Held"
+#define VAL_DIALING "Dialing"
+#define VAL_VOICE "Voice"
+#define VAL_VIDEO "Video"
+#define VAL_SENT "Sent"
+#define VAL_RECEIVED "Received"
+#define VAL_SMS "SMS"
+#define VAL_MMS "MMS"
+#define VAL_MY_PROFILE "MyProfile"
+#define VAL_PERSON "Person"
+#define VAL_CHANGED "Changed"
+
+#define VAL_ACTIVE VAL_CONNECTED
+#define VAL_ALERTING VAL_CONNECTING
+#define VAL_INCOMING VAL_CONNECTING
+
+
+/* Json Formats */
+#define TRIG_DEF_RANK "\"Rank\":{\"type\":\"integer\",\"min\":1}"
+#define TRIG_DEF_TOTAL_COUNT "\"TotalCount\":{\"type\":\"integer\",\"min\":0}"
+#define TRIG_DEF_TIME_OF_DAY "\"TimeOfDay\":{\"type\":\"string\"}"
+#define TRIG_DEF_DAY_OF_WEEK "\"DayOfWeek\":{\"type\":\"string\",\"values\":[\"Mon\",\"Tue\",\"Wed\",\"Thu\",\"Fri\",\"Sat\",\"Sun\",\"Weekday\",\"Weekend\"]}"
+#define TRIG_BOOL_ITEM_DEF(sbj) "\"" sbj "\":{\"type\":\"integer\",\"min\":0,\"max\":1}"
+
+
+#endif /* _CONTEXT_PROVIDER_TYPES_H_ */
+++ /dev/null
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
- *
- * 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.
- */
-
-#ifndef _CONTEXT_SOCIAL_STATUS_TYPES_H_
-#define _CONTEXT_SOCIAL_STATUS_TYPES_H_
-
-// Subject
-#define SOCIAL_ST_SUBJ_CALL "social/call"
-#define SOCIAL_ST_SUBJ_EMAIL "social/email"
-#define SOCIAL_ST_SUBJ_MESSAGE "social/message"
-#define SOCIAL_ST_SUBJ_CONTACTS "social/contacts"
-
-// Data Key
-#define SOCIAL_ST_STATE "State"
-#define SOCIAL_ST_EVENT "Event"
-#define SOCIAL_ST_TYPE "Type"
-#define SOCIAL_ST_MEDIUM "Medium"
-#define SOCIAL_ST_ADDRESS "Address"
-
-// Data Values
-#define SOCIAL_ST_IDLE "Idle"
-#define SOCIAL_ST_CONNECTING "Connecting"
-#define SOCIAL_ST_CONNECTED "Connected"
-#define SOCIAL_ST_ACTIVE SOCIAL_ST_CONNECTED
-#define SOCIAL_ST_HELD "Held"
-#define SOCIAL_ST_DIALING "Dialing"
-#define SOCIAL_ST_ALERTING SOCIAL_ST_CONNECTING
-#define SOCIAL_ST_INCOMING SOCIAL_ST_CONNECTING
-#define SOCIAL_ST_VOICE "Voice"
-#define SOCIAL_ST_VIDEO "Video"
-#define SOCIAL_ST_SENT "Sent"
-#define SOCIAL_ST_RECEIVED "Received"
-#define SOCIAL_ST_SMS "SMS"
-#define SOCIAL_ST_MMS "MMS"
-#define SOCIAL_ST_MY_PROFILE "MyProfile"
-#define SOCIAL_ST_PERSON "Person"
-#define SOCIAL_ST_CHANGED "Changed"
-
-#endif //_CONTEXT_SOCIAL_STATUS_TYPES_H
+++ /dev/null
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
- *
- * 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.
- */
-
-#ifndef _DEVICE_SYSTEM_STATUS_TYPES_H_
-#define _DEVICE_SYSTEM_STATUS_TYPES_H_
-
-// Subject
-#define DEVICE_ST_SUBJ_BATTERY "system/battery"
-#define DEVICE_ST_SUBJ_CHARGER "system/charger"
-#define DEVICE_ST_SUBJ_HEADPHONE "system/headphone"
-#define DEVICE_ST_SUBJ_WIFI "system/wifi"
-#define DEVICE_ST_SUBJ_USB "system/usb"
-#define DEVICE_ST_SUBJ_GPS "system/gps"
-#define DEVICE_ST_SUBJ_PSMODE "system/psmode"
-#define DEVICE_ST_SUBJ_ALARM "device/alarm"
-#define DEVICE_ST_SUBJ_TIME "device/time"
-
-// Data Key
-#define DEVICE_ST_EVENT "Event"
-#define DEVICE_ST_STATE "State"
-#define DEVICE_ST_TYPE "Type"
-#define DEVICE_ST_LEVEL "Level"
-#define DEVICE_ST_BSSID "BSSID"
-#define DEVICE_ST_IS_CONNECTED "IsConnected"
-#define DEVICE_ST_IS_ENABLED "IsEnabled"
-#define DEVICE_ST_IS_CHARGING "IsCharging"
-#define DEVICE_ST_DETECTED "Detected"
-#define DEVICE_ST_TIME_OF_DAY "TimeOfDay"
-#define DEVICE_ST_DAY_OF_WEEK "DayOfWeek"
-#define DEVICE_ST_DAY_OF_MONTH "DayOfMonth"
-
-// Data Value
-#define DEVICE_ST_TRUE 1
-#define DEVICE_ST_FALSE 0
-#define DEVICE_ST_ENTER "Enter"
-#define DEVICE_ST_EXIT "Exit"
-#define DEVICE_ST_DISABLED "Disabled"
-#define DEVICE_ST_CONNECTED "Connected"
-#define DEVICE_ST_UNCONNECTED "Unconnected"
-#define DEVICE_ST_SEARCHING "Searching"
-#define DEVICE_ST_EMPTY "Empty"
-#define DEVICE_ST_CRITICAL "Critical"
-#define DEVICE_ST_LOW "Low"
-#define DEVICE_ST_NORMAL "Normal"
-#define DEVICE_ST_HIGH "High"
-#define DEVICE_ST_FULL "Full"
-#define DEVICE_ST_HEADSET "Headset"
-#define DEVICE_ST_BLUETOOTH "Bluetooth"
-
-#define TRIG_BOOL_ITEM_DEF(sbj) "\"" sbj "\":{\"type\":\"integer\",\"min\":0,\"max\":1}"
-
-#endif //_DEVICE_SYSTEM_STATUS_TYPES_H_
std::stringstream query;
int limit = DEFAULT_LIMIT;
- filter.get(NULL, STATS_RESULT_SIZE, &limit);
+ filter.get(NULL, KEY_RESULT_SIZE, &limit);
query <<
"SELECT " SOCIAL_ADDRESS ", " \
- "COUNT(*) AS " STATS_TOTAL_COUNT ", " \
- "SUM(" STATS_DURATION ") AS " STATS_TOTAL_DURATION ", " \
- "MAX(" STATS_UNIV_TIME ") AS " STATS_LAST_TIME \
+ "COUNT(*) AS " KEY_TOTAL_COUNT ", " \
+ "SUM(" KEY_DURATION ") AS " KEY_TOTAL_DURATION ", " \
+ "MAX(" KEY_UNIV_TIME ") AS " KEY_LAST_TIME \
" FROM " SOCIAL_TABLE_CONTACT_LOG \
" WHERE " << createWhereClause(filter) <<
" GROUP BY " SOCIAL_ADDRESS \
return "";
}
- if (filter.get(NULL, STATS_DAY_OF_WEEK, &weekStr))
- filterCleaned.set(NULL, STATS_DAY_OF_WEEK, weekStr);
+ if (filter.get(NULL, KEY_DAY_OF_WEEK, &weekStr))
+ filterCleaned.set(NULL, KEY_DAY_OF_WEEK, weekStr);
- if (filter.get(NULL, STATS_TIME_OF_DAY, &timeOfDay))
- filterCleaned.set(NULL, STATS_TIME_OF_DAY, timeOfDay);
+ if (filter.get(NULL, KEY_TIME_OF_DAY, &timeOfDay))
+ filterCleaned.set(NULL, KEY_TIME_OF_DAY, timeOfDay);
std::stringstream query;
query <<
"INSERT INTO " SOCIAL_TEMP_CONTACT_FREQ \
- " SELECT " SOCIAL_ADDRESS ", COUNT(*) AS " STATS_TOTAL_COUNT \
+ " SELECT " SOCIAL_ADDRESS ", COUNT(*) AS " KEY_TOTAL_COUNT \
" FROM " SOCIAL_TABLE_CONTACT_LOG \
" WHERE " << createWhereClause(filterCleaned) <<
" GROUP BY " SOCIAL_ADDRESS ";";
" VALUES ('" << address << "');";
query <<
- "SELECT S." SOCIAL_ADDRESS ", S." STATS_TOTAL_COUNT ", 1+COUNT(lesser." STATS_TOTAL_COUNT ") AS " STATS_RANK \
+ "SELECT S." SOCIAL_ADDRESS ", S." KEY_TOTAL_COUNT ", 1+COUNT(lesser." KEY_TOTAL_COUNT ") AS " KEY_RANK \
" FROM " SOCIAL_TEMP_CONTACT_FREQ " AS S" \
" LEFT JOIN " SOCIAL_TEMP_CONTACT_FREQ " AS lesser" \
- " ON S." STATS_TOTAL_COUNT " < lesser." STATS_TOTAL_COUNT \
+ " ON S." KEY_TOTAL_COUNT " < lesser." KEY_TOTAL_COUNT \
" WHERE S." SOCIAL_ADDRESS " = '" << address << "'";
jsonResult.get(NULL, SOCIAL_ADDRESS, &valStr);
results.set(NULL, SOCIAL_ADDRESS, valStr);
- jsonResult.get(NULL, STATS_TOTAL_COUNT, &val);
- results.set(NULL, STATS_TOTAL_COUNT, val);
- jsonResult.get(NULL, STATS_RANK, &val);
- results.set(NULL, STATS_RANK, val);
+ jsonResult.get(NULL, KEY_TOTAL_COUNT, &val);
+ results.set(NULL, KEY_TOTAL_COUNT, val);
+ jsonResult.get(NULL, KEY_RANK, &val);
+ results.set(NULL, KEY_RANK, val);
reqProvider->replyToRead(reqFilter, error, results);
}
void ctx::ContactLogAggregator::aggregateContactLog()
{
__dbManager.execute(0,
- "SELECT IFNULL(MAX(" STATS_UNIV_TIME "),0) AS " STATS_LAST_TIME \
+ "SELECT IFNULL(MAX(" KEY_UNIV_TIME "),0) AS " KEY_LAST_TIME \
", (strftime('%s', 'now', 'localtime')) - (strftime('%s', 'now')) AS " TIME_DIFFERENCE \
" FROM " SOCIAL_TABLE_CONTACT_LOG, this);
}
IF_FAIL_VOID_TAG(!records.empty(), _E, "Invalid query result");
int lastTime = 0;
- records[0].get(NULL, STATS_LAST_TIME, &lastTime);
+ records[0].get(NULL, KEY_LAST_TIME, &lastTime);
records[0].get(NULL, TIME_DIFFERENCE, &__timeDiff);
_D("Last Time: %d / Local - UTC: %d", lastTime, __timeDiff);
data.set(NULL, SOCIAL_ADDRESS, address);
data.set(NULL, SOCIAL_PHONE_LOG_TYPE, logType);
- data.set(NULL, STATS_DURATION, duration);
- data.set(NULL, STATS_UNIV_TIME, accessTime);
- data.set(NULL, STATS_LOCAL_TIME, accessTime + __timeDiff);
+ data.set(NULL, KEY_DURATION, duration);
+ data.set(NULL, KEY_UNIV_TIME, accessTime);
+ data.set(NULL, KEY_LOCAL_TIME, accessTime + __timeDiff);
__dbManager.insert(0, SOCIAL_TABLE_CONTACT_LOG, data, NULL);
{
std::stringstream query;
query << "DELETE FROM " SOCIAL_TABLE_CONTACT_LOG " WHERE " \
- STATS_UNIV_TIME " < strftime('%s', 'now') - " << LOG_RETENTION_PERIOD;
+ KEY_UNIV_TIME " < strftime('%s', 'now') - " << LOG_RETENTION_PERIOD;
__dbManager.execute(0, query.str().c_str(), NULL);
}
#ifndef _CONTEXT_STATS_SOCIAL_TYPES_H_
#define _CONTEXT_STATS_SOCIAL_TYPES_H_
-#include "../shared/CommonTypes.h"
+#include "../shared/ProviderTypes.h"
#define SOCIAL_HISTORY_PRIV "callhistory.read"
#define SOCIAL_SUBJ_LOGGER "stats/contact/logger"
using namespace ctx;
DeviceStatusBattery::DeviceStatusBattery()
- : BasicProvider(DEVICE_ST_SUBJ_BATTERY)
+ : BasicProvider(SUBJ_STATE_BATTERY)
{
}
IF_FAIL_VOID(levelString);
Json dataRead;
- dataRead.set(NULL, DEVICE_ST_LEVEL, levelString);
+ dataRead.set(NULL, KEY_LEVEL, levelString);
bool chargingState = false;
int ret = device_battery_is_charging(&chargingState);
IF_FAIL_VOID_TAG(ret == DEVICE_ERROR_NONE, _E, "Getting state failed");
- dataRead.set(NULL, DEVICE_ST_IS_CHARGING, chargingState ? DEVICE_ST_TRUE : DEVICE_ST_FALSE);
+ dataRead.set(NULL, KEY_IS_CHARGING, chargingState ? VAL_TRUE : VAL_FALSE);
publish(NULL, ERR_NONE, dataRead);
}
{
switch (level) {
case DEVICE_BATTERY_LEVEL_EMPTY:
- return DEVICE_ST_EMPTY;
+ return VAL_EMPTY;
case DEVICE_BATTERY_LEVEL_CRITICAL:
- return DEVICE_ST_CRITICAL;
+ return VAL_CRITICAL;
case DEVICE_BATTERY_LEVEL_LOW:
- return DEVICE_ST_LOW;
+ return VAL_LOW;
case DEVICE_BATTERY_LEVEL_HIGH:
- return DEVICE_ST_NORMAL;
+ return VAL_NORMAL;
case DEVICE_BATTERY_LEVEL_FULL:
{
device_battery_get_percent(&percent);
if (percent == 100) {
- return DEVICE_ST_FULL;
+ return VAL_FULL;
} else {
- return DEVICE_ST_HIGH;
+ return VAL_HIGH;
}
break;
}
const char* levelString = __transToString(level);
IF_FAIL_RETURN(levelString, ERR_OPERATION_FAILED);
- dataRead.set(NULL, DEVICE_ST_LEVEL, levelString);
+ dataRead.set(NULL, KEY_LEVEL, levelString);
bool chargingState = false;
ret = device_battery_is_charging(&chargingState);
IF_FAIL_RETURN(ret == DEVICE_ERROR_NONE, ERR_OPERATION_FAILED);
- dataRead.set(NULL, DEVICE_ST_IS_CHARGING, chargingState ? DEVICE_ST_TRUE : DEVICE_ST_FALSE);
+ dataRead.set(NULL, KEY_IS_CHARGING, chargingState ? VAL_TRUE : VAL_FALSE);
replyToRead(NULL, ERR_NONE, dataRead);
return ERR_NONE;
#include <device/callback.h>
#include <device/battery.h>
-#include "../shared/SystemTypes.h"
+#include "../shared/ProviderTypes.h"
#include "../shared/BasicProvider.h"
namespace ctx {
using namespace ctx;
DeviceStatusCharger::DeviceStatusCharger() :
- DeviceStatusRuntimeInfo(DEVICE_ST_SUBJ_CHARGER, RUNTIME_INFO_KEY_CHARGER_CONNECTED)
+ DeviceStatusRuntimeInfo(SUBJ_STATE_CHARGER, RUNTIME_INFO_KEY_CHARGER_CONNECTED)
{
}
IF_FAIL_VOID_TAG(ret == RUNTIME_INFO_ERROR_NONE, _E, "Getting runtime info failed");
Json dataRead;
- dataRead.set(NULL, DEVICE_ST_IS_CONNECTED, chargerStatus ? DEVICE_ST_TRUE : DEVICE_ST_FALSE);
+ dataRead.set(NULL, KEY_IS_CONNECTED, chargerStatus ? VAL_TRUE : VAL_FALSE);
publish(NULL, ERR_NONE, dataRead);
}
int ret = runtime_info_get_value_bool(RUNTIME_INFO_KEY_CHARGER_CONNECTED, &chargerStatus);
IF_FAIL_RETURN_TAG(ret == RUNTIME_INFO_ERROR_NONE, ERR_OPERATION_FAILED, _E, "Getting runtime info failed");
- dataRead.set(NULL, DEVICE_ST_IS_CONNECTED, chargerStatus ? DEVICE_ST_TRUE : DEVICE_ST_FALSE);
+ dataRead.set(NULL, KEY_IS_CONNECTED, chargerStatus ? VAL_TRUE : VAL_FALSE);
replyToRead(NULL, ERR_NONE, dataRead);
return ERR_NONE;
{
switch (gpsStatus) {
case RUNTIME_INFO_GPS_STATUS_DISABLED:
- return DEVICE_ST_DISABLED;
+ return VAL_DISABLED;
case RUNTIME_INFO_GPS_STATUS_SEARCHING:
- return DEVICE_ST_SEARCHING;
+ return VAL_SEARCHING;
case RUNTIME_INFO_GPS_STATUS_CONNECTED:
- return DEVICE_ST_CONNECTED;
+ return VAL_CONNECTED;
default:
_E("Unknown GPS status: %d", gpsStatus);
}
DeviceStatusGps::DeviceStatusGps() :
- DeviceStatusRuntimeInfo(DEVICE_ST_SUBJ_GPS, RUNTIME_INFO_KEY_GPS_STATUS)
+ DeviceStatusRuntimeInfo(SUBJ_STATE_GPS, RUNTIME_INFO_KEY_GPS_STATUS)
{
}
const char* stateStr = __getStatusString(gpsStatus);
IF_FAIL_VOID(stateStr);
- dataRead.set(NULL, DEVICE_ST_STATE, stateStr);
+ dataRead.set(NULL, KEY_STATE, stateStr);
publish(NULL, ERR_NONE, dataRead);
}
const char* stateStr = __getStatusString(gpsStatus);
IF_FAIL_RETURN(stateStr, ERR_OPERATION_FAILED);
- dataRead.set(NULL, DEVICE_ST_STATE, stateStr);
+ dataRead.set(NULL, KEY_STATE, stateStr);
replyToRead(NULL, ERR_NONE, dataRead);
return ERR_NONE;
using namespace ctx;
DeviceStatusPsmode::DeviceStatusPsmode() :
- BasicProvider(DEVICE_ST_SUBJ_PSMODE)
+ BasicProvider(SUBJ_STATE_PSMODE)
{
}
status = vconf_keynode_get_int(node);
IF_FAIL_VOID_TAG(status >= 0, _E, "Getting state failed");
- dataRead.set(NULL, DEVICE_ST_IS_ENABLED, status == 0 ? DEVICE_ST_FALSE : DEVICE_ST_TRUE);
+ dataRead.set(NULL, KEY_IS_ENABLED, status == 0 ? VAL_FALSE : VAL_TRUE);
publish(NULL, ERR_NONE, dataRead);
}
IF_FAIL_RETURN(ret == VCONF_OK, ERR_OPERATION_FAILED);
Json dataRead;
- dataRead.set(NULL, DEVICE_ST_IS_ENABLED, mode == 0 ? DEVICE_ST_FALSE : DEVICE_ST_TRUE);
+ dataRead.set(NULL, KEY_IS_ENABLED, mode == 0 ? VAL_FALSE : VAL_TRUE);
replyToRead(NULL, ERR_NONE, dataRead);
return ERR_NONE;
#define _DEVICE_SYSTEM_STATUS_POWER_SAVING_MODE_H_
#include <vconf.h>
-#include "../shared/SystemTypes.h"
+#include "../shared/ProviderTypes.h"
#include "../shared/BasicProvider.h"
namespace ctx {
#define _DEVICE_SYSTEM_STATUS_RUNTIME_INFO_BASE_H_
#include <runtime_info.h>
-#include "../shared/SystemTypes.h"
+#include "../shared/ProviderTypes.h"
#include "../shared/BasicProvider.h"
namespace ctx {
using namespace ctx;
DeviceStatusUsb::DeviceStatusUsb() :
- DeviceStatusRuntimeInfo(DEVICE_ST_SUBJ_USB, RUNTIME_INFO_KEY_USB_CONNECTED)
+ DeviceStatusRuntimeInfo(SUBJ_STATE_USB, RUNTIME_INFO_KEY_USB_CONNECTED)
{
}
IF_FAIL_VOID_TAG(ret == RUNTIME_INFO_ERROR_NONE, _E, "Getting runtime info failed");
Json dataRead;
- dataRead.set(NULL, DEVICE_ST_IS_CONNECTED, status ? DEVICE_ST_TRUE : DEVICE_ST_FALSE);
+ dataRead.set(NULL, KEY_IS_CONNECTED, status ? VAL_TRUE : VAL_FALSE);
publish(NULL, ERR_NONE, dataRead);
}
int ret = runtime_info_get_value_bool(RUNTIME_INFO_KEY_USB_CONNECTED, &status);
IF_FAIL_RETURN_TAG(ret == RUNTIME_INFO_ERROR_NONE, ERR_OPERATION_FAILED, _E, "Getting runtime info failed");
- dataRead.set(NULL, DEVICE_ST_IS_CONNECTED, status ? DEVICE_ST_TRUE : DEVICE_ST_FALSE);
+ dataRead.set(NULL, KEY_IS_CONNECTED, status ? VAL_TRUE : VAL_FALSE);
replyToRead(NULL, ERR_NONE, dataRead);
return ERR_NONE;
using namespace ctx;
DeviceStatusAlarm::DeviceStatusAlarm()
- : ContextProvider(DEVICE_ST_SUBJ_ALARM)
+ : ContextProvider(SUBJ_STATE_ALARM)
{
}
int dow = __getArrangedDayOfWeek(option);
int time;
- for (int i = 0; option.getAt(NULL, DEVICE_ST_TIME_OF_DAY, i, &time); i++) {
+ for (int i = 0; option.getAt(NULL, KEY_TIME_OF_DAY, i, &time); i++) {
__add(time, dow);
}
int dow = __getArrangedDayOfWeek(option);
int time;
- for (int i = 0; option.getAt(NULL, DEVICE_ST_TIME_OF_DAY, i, &time); i++) {
+ for (int i = 0; option.getAt(NULL, KEY_TIME_OF_DAY, i, &time); i++) {
__remove(time, dow);
}
int dow = 0;
std::string tempDay;
- for (int i = 0; option.getAt(NULL, DEVICE_ST_DAY_OF_WEEK, i, &tempDay); i++) {
+ for (int i = 0; option.getAt(NULL, KEY_DAY_OF_WEEK, i, &tempDay); i++) {
dow |= TimerManager::dowToInt(tempDay);
}
_D("Requested day of week (%#x)", dow);
Json dataRead;
int resultTime = hour * 60 + min;
std::string resultDay = TimerManager::dowToStr(dayOfWeek);
- dataRead.set(NULL, DEVICE_ST_TIME_OF_DAY, resultTime);
- dataRead.set(NULL, DEVICE_ST_DAY_OF_WEEK, resultDay);
+ dataRead.set(NULL, KEY_TIME_OF_DAY, resultTime);
+ dataRead.set(NULL, KEY_DAY_OF_WEEK, resultDay);
for (auto it = __optionSet.begin(); it != __optionSet.end(); ++it) {
Json option = (**it);
{
bool ret = false;
int optionTime;
- for (int i = 0; option.getAt(NULL, DEVICE_ST_TIME_OF_DAY, i, &optionTime); i++){
+ for (int i = 0; option.getAt(NULL, KEY_TIME_OF_DAY, i, &optionTime); i++){
if (time == optionTime) {
ret = true;
break;
IF_FAIL_RETURN(ret, false);
std::string optionDay;
- for (int i = 0; option.getAt(NULL, DEVICE_ST_DAY_OF_WEEK, i, &optionDay); i++){
+ for (int i = 0; option.getAt(NULL, KEY_DAY_OF_WEEK, i, &optionDay); i++){
if (day == optionDay) {
return true;
}
#include <set>
#include <TimerManager.h>
#include <ContextProvider.h>
-#include "../shared/SystemTypes.h"
+#include "../shared/ProviderTypes.h"
namespace ctx {
using namespace ctx;
DeviceStatusTime::DeviceStatusTime() :
- BasicProvider(DEVICE_ST_SUBJ_TIME)
+ BasicProvider(SUBJ_STATE_TIME)
{
}
std::string dayOfWeek = TimerManager::dowToStr(0x01 << timeInfo.tm_wday);
Json dataRead;
- dataRead.set(NULL, DEVICE_ST_DAY_OF_MONTH, dayOfMonth);
- dataRead.set(NULL, DEVICE_ST_DAY_OF_WEEK, dayOfWeek);
- dataRead.set(NULL, DEVICE_ST_TIME_OF_DAY, minuteOfDay);
+ dataRead.set(NULL, KEY_DAY_OF_MONTH, dayOfMonth);
+ dataRead.set(NULL, KEY_DAY_OF_WEEK, dayOfWeek);
+ dataRead.set(NULL, KEY_TIME_OF_DAY, minuteOfDay);
_I("Time: %02d:%02d, Day of Week: %s, Day of Month: %d", timeInfo.tm_hour, timeInfo.tm_min, dayOfWeek.c_str(), dayOfMonth);
#define _DEVICE_SYSTEM_STATUS_TIME_H_
#include "../shared/BasicProvider.h"
-#include "../shared/SystemTypes.h"
+#include "../shared/ProviderTypes.h"
namespace ctx {
using namespace ctx;
DeviceStatusWifi::DeviceStatusWifi() :
- BasicProvider(DEVICE_ST_SUBJ_WIFI),
+ BasicProvider(SUBJ_STATE_WIFI),
__lastState(UNKNOWN),
__isInitialized(false),
__isActivated(false),
{
switch (__lastState) {
case DISABLED:
- data->set(NULL, DEVICE_ST_STATE, DEVICE_ST_DISABLED);
+ data->set(NULL, KEY_STATE, VAL_DISABLED);
break;
case UNCONNECTED:
- data->set(NULL, DEVICE_ST_STATE, DEVICE_ST_UNCONNECTED);
+ data->set(NULL, KEY_STATE, VAL_UNCONNECTED);
break;
case CONNECTED:
- data->set(NULL, DEVICE_ST_STATE, DEVICE_ST_CONNECTED);
- data->set(NULL, DEVICE_ST_BSSID, __bssid);
+ data->set(NULL, KEY_STATE, VAL_CONNECTED);
+ data->set(NULL, KEY_BSSID, __bssid);
break;
default:
#include <string>
#include <wifi.h>
#include "../shared/BasicProvider.h"
-#include "../shared/SystemTypes.h"
+#include "../shared/ProviderTypes.h"
namespace ctx {