From 298e3a5cc7044d9ebea12e6b7b61baa0f55d6f82 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Mon, 21 Sep 2020 19:39:04 +0200 Subject: [PATCH] cleanup --- .../nymeaappservice/androidbinder.cpp | 77 ------------------- 1 file changed, 77 deletions(-) diff --git a/androidservice/nymeaappservice/androidbinder.cpp b/androidservice/nymeaappservice/androidbinder.cpp index dd0159ea..b0213fc5 100644 --- a/androidservice/nymeaappservice/androidbinder.cpp +++ b/androidservice/nymeaappservice/androidbinder.cpp @@ -105,83 +105,6 @@ bool AndroidBinder::onTransact(int code, const QAndroidParcel &data, const QAndr engine->thingManager()->executeAction(thingId, actionTypeId, params); } -// switch (code) { -// case 0: { // Status request -// bool isReady = m_engine->jsonRpcClient()->connected() && !m_engine->thingManager()->fetchingData(); -// isReady = false; -// reply.handle().callMethod("writeBoolean", "(Z)V", isReady); -// if (isReady) { -// reply.handle().callMethod("writeString", "(Ljava/lang/String;)V", QAndroidJniObject::fromString(m_engine->jsonRpcClient()->currentHost()->name()).object()); -// } -// } break; -// case 1: {// Things request -// QVariantList thingsList; -// for (int i = 0; i < m_engine->thingManager()->things()->rowCount(); i++) { -// Device *thing = m_engine->thingManager()->things()->get(i); -// QVariantMap thingMap; -// thingMap.insert("id", thing->id()); -// thingMap.insert("name", thing->name()); -// thingMap.insert("className", thing->thingClass()->displayName()); -// thingMap.insert("interfaces", thing->thingClass()->interfaces()); -// QVariantList states; -// for (int j = 0; j < thing->states()->rowCount(); j++) { -// State *state = thing->states()->get(j); -// QVariantMap stateMap; -// stateMap.insert("stateTypeId", state->stateTypeId()); -// stateMap.insert("name", thing->thingClass()->stateTypes()->getStateType(state->stateTypeId())->name()); -// stateMap.insert("displayName", thing->thingClass()->stateTypes()->getStateType(state->stateTypeId())->displayName()); -// stateMap.insert("value", state->value()); -// states.append(stateMap); -// } -// thingMap.insert("states", states); -// QVariantList actions; -// for (int j = 0; j < thing->thingClass()->actionTypes()->rowCount(); j++) { -// ActionType *actionType = thing->thingClass()->actionTypes()->get(j); -// QVariantMap actionMap; -// actionMap.insert("actionTypeId", actionType->id()); -// actionMap.insert("name", actionType->name()); -// actionMap.insert("displayName", actionType->displayName()); -// actions.append(actionMap); -// } -// thingMap.insert("actions", actions); -// thingsList.append(thingMap); -// } -// QJsonDocument jsonDoc = QJsonDocument::fromVariant(thingsList); -// reply.handle().callMethod("writeString", "(Ljava/lang/String;)V", QAndroidJniObject::fromString(jsonDoc.toJson()).object()); -// } break; -// case 2: {// ExecuteAction -//// QString thingId = data.handle().callMethod("readString", "").toString(); -//// jstring atId = data.handle().callMethod("readString", ""); -//// QString actionTypeId = QAndroidJniObject::fromLocalRef(atId).toString(); -//// jstring p = data.handle().callMethod("readString", ""); -//// QString param = QAndroidJniObject::fromLocalRef(p).toString(); -// qDebug() << "ExecuteAction"; -// QString thingId = data.readData(); -// QString actionTypeId = data.readData(); -// QString param = data.readData(); -// qDebug() << "**** executeAction:" << thingId << actionTypeId << param; - -// // FIXME: Only works with state generated actions! -// QVariantMap paramMap; -// paramMap.insert("paramTypeId", actionTypeId); -// paramMap.insert("value", param); -// m_engine->thingManager()->executeAction(thingId, actionTypeId, {paramMap}); - -// } break; -//// default: -//// QAndroidBinder binder = data.readBinder(); - -//// qDebug() << TAG << ": onTransact() received non-name data" << data.readVariant(); -//// reply.writeVariant(QVariant("Cannot process this!")); - -//// // send back message -//// QAndroidParcel sendData, replyData; -//// sendData.writeVariant(QVariant("Send me only names!")); -//// binder.transact(0, sendData, &replyData); -//// qDebug() << TAG << ": onTransact() received " << replyData.readData(); - -//// break; -// } return false; }