From 4f7dc681e1a0142b7419d30e07241a71ef915476 Mon Sep 17 00:00:00 2001 From: Hieromon Ikasamo Date: Sat, 24 Nov 2018 22:46:29 +0900 Subject: [PATCH] Supports AutoConnectAux --- src/AutoConnectAux.cpp | 99 +++++++++++++++++++++++++++---- src/AutoConnectAux.h | 15 ++++- src/AutoConnectElement.h | 5 +- src/AutoConnectElementBasis.h | 32 ++++++++++ src/AutoConnectElementBasisImpl.h | 22 +++++++ src/AutoConnectElementJson.h | 33 ++++++++++- src/AutoConnectElementJsonImpl.h | 30 +++++++++- src/AutoConnectPage.cpp | 3 + 8 files changed, 218 insertions(+), 21 deletions(-) diff --git a/src/AutoConnectAux.cpp b/src/AutoConnectAux.cpp index aa19702..7b1ed15 100644 --- a/src/AutoConnectAux.cpp +++ b/src/AutoConnectAux.cpp @@ -77,7 +77,7 @@ AutoConnectAux::~AutoConnectAux() { */ void AutoConnectAux::add(AutoConnectElement& addon) { _addonElm.push_back(addon); - AC_DBG("%s placed on %s\n", addon.name.length() ? addon.name.c_str() : "*nonamed*", uri()); + AC_DBG("%s placed on %s\n", addon.name.length() ? addon.name.c_str() : "*noname", uri()); } /** @@ -258,6 +258,10 @@ AutoConnectElement* AutoConnectAux::_createElement(const JsonObject& json) { AutoConnectInput* cert_elm = new AutoConnectInput; return reinterpret_cast(cert_elm); } + case AC_Radio: { + AutoConnectRadio* cert_elm = new AutoConnectRadio; + return reinterpret_cast(cert_elm); + } case AC_Select: { AutoConnectSelect* cert_elm = new AutoConnectSelect; return reinterpret_cast(cert_elm); @@ -274,18 +278,87 @@ AutoConnectElement* AutoConnectAux::_createElement(const JsonObject& json) { return elm; } +/** + * Constructs an AutoConnectAux instance by reading all the + * AutoConnectElements of the specified URI from the elements defined JSON. + * @param in AutoConnectAux element data which is described by JSON. + * @param uri AutoConnectAux uri to be loaded. + * @return true The element collection successfully loaded. + * @return false Invalid JSON data occurred. + */ +bool AutoConnectAux::load(const char* in, const String uri) { + DynamicJsonBuffer jsonBuffer; + JsonObject& jb = jsonBuffer.parseObject(in); + return _load(jb, uri); +} + +bool AutoConnectAux::load(const __FlashStringHelper* in, const String uri) { + DynamicJsonBuffer jsonBuffer; + JsonObject& jb = jsonBuffer.parseObject(in); + return _load(jb, uri); +} + +bool AutoConnectAux::load(Stream& in, const String uri) { + DynamicJsonBuffer jsonBuffer; + JsonObject& jb = jsonBuffer.parseObject(in); + return _load(jb, uri); +} + +bool AutoConnectAux::_load(JsonObject& jb, const String uri) { + bool rc = jb.success(); + if (rc) { + JsonArray& aux = jb[AUTOCONNECT_JSON_KEY_AUX]; + if ((rc = aux.success())) { + rc = false; + for (JsonObject& page : aux) { + const String j_uri = page.get(F(AUTOCONNECT_JSON_KEY_URI)); + if (uri == j_uri) { + AC_DBG("Loading %s\n", j_uri.c_str()); + _title = page.get(F(AUTOCONNECT_JSON_KEY_TITLE)); + _menu = page.get(F(AUTOCONNECT_JSON_KEY_MENU)); + _uriStr = j_uri; + setUri(_uriStr.c_str()); + (void)_loadElement(jb, "*"); + rc = true; + break; + } + } + } + } + return rc; +} + /** * Load element specified by the name parameter from the stream * described by JSON. Usually, the Stream is specified a storm file of * SD or SPIFFS. The Stream must be opened before invoking the function. * @param in Reference of the Stream which contains the parameter * file described by JSON. - * @param name The element name to be loaded. + * @param name The element name to be loaded. '*'specifies that all + * elements are to be loaded. * @return A reference of loaded AutoConnectElement instance. */ +AutoConnectElement& AutoConnectAux::loadElement(const char* in, const String name) { + DynamicJsonBuffer jsonBuffer; + JsonObject& jb = jsonBuffer.parseObject(in); + return _loadElement(jb, name); +} + +AutoConnectElement& AutoConnectAux::loadElement(const __FlashStringHelper* in, const String name) { + DynamicJsonBuffer jsonBuffer; + JsonObject& jb = jsonBuffer.parseObject(in); + return _loadElement(jb, name); +} + AutoConnectElement& AutoConnectAux::loadElement(Stream& in, const String name) { DynamicJsonBuffer jsonBuffer; JsonObject& jb = jsonBuffer.parseObject(in); + return _loadElement(jb, name); +} + +AutoConnectElement& AutoConnectAux::_loadElement(JsonObject& jb, const String name) { + AutoConnectElement* auxElm = nullptr; + bool wc = name == "*"; if (!jb.success()) return _nullElement(); @@ -295,38 +368,39 @@ AutoConnectElement& AutoConnectAux::loadElement(Stream& in, const String name) { return _nullElement(); for (JsonObject& page : aux) { - if (page["uri"].as() == String(uri())) { + if (page[AUTOCONNECT_JSON_KEY_URI].as() == String(uri())) { JsonArray& element = page[AUTOCONNECT_JSON_KEY_ELEMENT]; for (JsonObject& elm : element) { - if (name.equalsIgnoreCase(elm.get(F(AUTOCONNECT_JSON_KEY_NAME)))) { + String elmName = elm.get(F(AUTOCONNECT_JSON_KEY_NAME)); + if (wc || name.equalsIgnoreCase(elmName)) { // The specified element is defined in the JSON stream. // Loads from JSON object. const String inType = elm[AUTOCONNECT_JSON_KEY_TYPE].as(); - AutoConnectElement* auxElm = _getElement(name); + auxElm = _getElement(elmName); // The element is not created yet, create new one. if (!auxElm) { if ((auxElm = _createElement(elm))) { - AC_DBG("%s<%d> of %s created\n", name.c_str(), (int)(auxElm->typeOf()), uri()); + AC_DBG("%s<%d> of %s created\n", elmName.c_str(), (int)(auxElm->typeOf()), uri()); add(*auxElm); // Insert to AutoConnect } else { - AC_DBG("%s unknown element type\n", name.c_str()); - return _nullElement(); + AC_DBG("%s unknown element type\n", elmName.c_str()); + continue; } } if (auxElm->loadElement(elm)) { - AC_DBG("%s<%d> of %s loaded\n", name.c_str(), (int)auxElm->typeOf(), uri()); + AC_DBG("%s<%d> of %s loaded\n", auxElm->name.c_str(), (int)auxElm->typeOf(), uri()); } else { // Element type mismatch - AC_DBG("Type of %s element mismatched\n", name.c_str()); - return _nullElement(); + AC_DBG("Type of %s element mismatched\n", elmName.c_str()); + continue; } } } } } - return _nullElement(); + return auxElm ? *auxElm : _nullElement(); } /** @@ -387,6 +461,7 @@ const ACElement_t AutoConnectAux::_asElementType(const String type) { { AUTOCONNECT_JSON_TYPE_ACCHECKBOX, AC_Checkbox }, { AUTOCONNECT_JSON_TYPE_ACELEMENT, AC_Element }, { AUTOCONNECT_JSON_TYPE_ACINPUT, AC_Input }, + { AUTOCONNECT_JSON_TYPE_ACRADIO, AC_Radio }, { AUTOCONNECT_JSON_TYPE_ACSELECT, AC_Select }, { AUTOCONNECT_JSON_TYPE_ACSUBMIT, AC_Submit }, { AUTOCONNECT_JSON_TYPE_ACTEXT, AC_Text } diff --git a/src/AutoConnectAux.h b/src/AutoConnectAux.h index d49c8f7..eb95364 100644 --- a/src/AutoConnectAux.h +++ b/src/AutoConnectAux.h @@ -10,11 +10,14 @@ #ifndef _AUTOCONNECTAUX_H_ #define _AUTOCONNECTAUX_H_ +#include "AutoConnectDefs.h" #include #include #include +#ifdef AUTOCONNECT_USE_JSON +#include +#endif #include -#include "AutoConnectDefs.h" #include "AutoConnectElement.h" class AutoConnect; @@ -57,7 +60,12 @@ class AutoConnectAux : public PageBuilder { void on(const AuxHandlerFunctionT handler, const AutoConnectExitOrder_t order = AC_EXIT_AHEAD) { _handler = handler; _order = order; } /**< Set user handler */ #ifdef AUTOCONNECT_USE_JSON - AutoConnectElement& loadElement(Stream& in, const String name); + bool load(const char* in, const String uri); + bool load(const __FlashStringHelper* in, const String uri); + bool load(Stream& in, const String uri); + AutoConnectElement& loadElement(const char* in, const String name = "*"); + AutoConnectElement& loadElement(const __FlashStringHelper* in, const String name = "*"); + AutoConnectElement& loadElement(Stream& in, const String name = "*"); size_t saveElement(Stream& out, const AutoConnectElement& element); #endif @@ -70,6 +78,8 @@ class AutoConnectAux : public PageBuilder { const String _injectMenu(PageArgument& args); #ifdef AUTOCONNECT_USE_JSON + bool _load(JsonObject& in, const String uri); + AutoConnectElement& _loadElement(JsonObject& in, const String name); AutoConnectElement* _createElement(const JsonObject& json); AutoConnectElement* _getElement(const String name); static const ACElement_t _asElementType(const String type); @@ -78,6 +88,7 @@ class AutoConnectAux : public PageBuilder { String _title; /**< A title of the page */ bool _menu; /**< Switch for menu displaying */ + String _uriStr; /**< uri as String */ AutoConnectElementVT _addonElm; /**< A vector set of AutoConnectElements placed on this auxiliary page */ std::unique_ptr _next; /**< Auxiliary pages chain list */ std::unique_ptr _ac; /**< Hosted AutoConnect instance */ diff --git a/src/AutoConnectElement.h b/src/AutoConnectElement.h index ef88467..2fa9883 100644 --- a/src/AutoConnectElement.h +++ b/src/AutoConnectElement.h @@ -11,15 +11,14 @@ #define _AUTOCONENCTELEMENT_H_ #include "AutoConnectElementBasis.h" -//#include "AutoConnectElementBasisImpl.h" #ifdef AUTOCONNECT_USE_JSON #include #include "AutoConnectElementJson.h" -//#include "AutoConnectElementJsonImpl.h" using AutoConnectElement = AutoConnectElementJson; using AutoConnectButton = AutoConnectButtonJson; using AutoConnectCheckbox = AutoConnectCheckboxJson; using AutoConnectInput = AutoConnectInputJson; +using AutoConnectRadio = AutoConnectRadioJson; using AutoConnectSelect = AutoConnectSelectJson; using AutoConnectSubmit = AutoConnectSubmitJson; using AutoConnectText = AutoConnectTextJson; @@ -28,6 +27,7 @@ using AutoConnectElement = AutoConnectElementBasis; using AutoConnectButton = AutoConnectButtonBasis; using AutoConnectCheckbox = AutoConnectCheckboxBasis; using AutoConnectInput = AutoConnectInputBasis; +using AutoConnectRadio = AutoConnectRadioBasis; using AutoConnectSelect = AutoConnectSelectBasis; using AutoConnectSubmit = AutoConnectSubmitBasis; using AutoConnectText = AutoConnectTextBasis; @@ -42,6 +42,7 @@ using AutoConnectText = AutoConnectTextBasis; #define ACButton(n, ...) AutoConnectButton n(#n, ##__VA_ARGS__) #define ACCheckbox(n, ...) AutoConnectCheckbox n(#n, ##__VA_ARGS__) #define ACInput(n, ...) AutoConnectInput n(#n, ##__VA_ARGS__) +#define ACRadio(n, ...) AutoConnectRadio n(#n, ##__VA_ARGS__) #define ACSelect(n, ...) AutoConnectSelect n(#n, ##__VA_ARGS__) #define ACSubmit(n, ...) AutoConnectSubmit n(#n, ##__VA_ARGS__) #define ACText(n, ...) AutoConnectText n(#n, ##__VA_ARGS__) diff --git a/src/AutoConnectElementBasis.h b/src/AutoConnectElementBasis.h index bac2bf6..f26cf26 100644 --- a/src/AutoConnectElementBasis.h +++ b/src/AutoConnectElementBasis.h @@ -18,12 +18,18 @@ typedef enum { AC_Checkbox, AC_Element, AC_Input, + AC_Radio, AC_Select, AC_Submit, AC_Text, AC_Unknown } ACElement_t; /**< AutoConnectElement class type */ +typedef enum { + AC_Horizontal, + AC_Vertical +} ACArrange_t; /**< The element arrange order */ + /** * AutoConnectAux element base. * Placed a raw text that can be added by user sketch. @@ -103,6 +109,32 @@ class AutoConnectInputBasis : virtual public AutoConnectElementBasis { String label; /**< A label for a subsequent input box */ }; +/** + * Radio-button arrangement class, a part of AutoConnectAux element. + * Place a group of radio-button items and selectable mark checked. + * @param name Radio-button name string. + * @param options Array of value collection. + * @param label A label string that follows radio-buttons group. + * @param checked Index of check marked item. + */ +class AutoConnectRadioBasis : virtual public AutoConnectElementBasis { + public: + explicit AutoConnectRadioBasis(const char* name = "", std::vector values = {}, const char* label = "", const ACArrange_t order = AC_Vertical, const uint8_t checked = 0) : AutoConnectElementBasis(name, ""), _values(values), label(label), order(order), checked(checked) { + _type = AC_Radio; + } + virtual ~AutoConnectRadioBasis() {} + const String toHTML(void) const; + void option(const String value) { _values.push_back(value); } + void empty(void) { _values.clear(); } + + String label; /**< A label for a subsequent radio buttons */ + ACArrange_t order; /**< layout order */ + uint8_t checked; /**< Index of check marked item */ + + protected: + std::vector _values; /**< Items in a group */ +}; + /** * Selection-box arrangement class, A part of AutoConnectAux element. * Place a optionally labeled Selection-box that can be added by user sketch. diff --git a/src/AutoConnectElementBasisImpl.h b/src/AutoConnectElementBasisImpl.h index 6292fb5..c550516 100644 --- a/src/AutoConnectElementBasisImpl.h +++ b/src/AutoConnectElementBasisImpl.h @@ -62,6 +62,28 @@ const String AutoConnectInputBasis::toHTML(void) const { return html; } +/** +* Generate an HTML element with an