());
- }
- String propertyValue = (sep >= 0) ? decodePercent(e.substring(sep + 1)) : null;
- if (propertyValue != null) {
- parms.get(propertyName).add(propertyValue);
- }
- }
- }
- return parms;
- }
-
- // ------------------------------------------------------------------------------- //
- //
- // Threading Strategy.
- //
- // ------------------------------------------------------------------------------- //
-
- /**
- * Pluggable strategy for asynchronously executing requests.
- *
- * @param asyncRunner new strategy for handling threads.
- */
- public void setAsyncRunner(AsyncRunner asyncRunner) {
- this.asyncRunner = asyncRunner;
- }
-
- // ------------------------------------------------------------------------------- //
- //
- // Temp file handling strategy.
- //
- // ------------------------------------------------------------------------------- //
-
- /**
- * Pluggable strategy for creating and cleaning up temporary files.
- *
- * @param tempFileManagerFactory new strategy for handling temp files.
- */
- public void setTempFileManagerFactory(TempFileManagerFactory tempFileManagerFactory) {
- this.tempFileManagerFactory = tempFileManagerFactory;
- }
-
- /**
- * HTTP Request methods, with the ability to decode a String back to its enum value.
- */
- public enum Method {
- GET, PUT, POST, DELETE, HEAD, OPTIONS;
-
- static Method lookup(String method) {
- for (Method m : Method.values()) {
- if (m.toString().equalsIgnoreCase(method)) {
- return m;
- }
- }
- return null;
- }
- }
-
- /**
- * Pluggable strategy for asynchronously executing requests.
- */
- public interface AsyncRunner {
- void exec(Runnable code);
- }
-
- /**
- * Factory to create temp file managers.
- */
- public interface TempFileManagerFactory {
- TempFileManager create();
- }
-
- // ------------------------------------------------------------------------------- //
-
- /**
- * Temp file manager.
- *
- * Temp file managers are created 1-to-1 with incoming requests, to create and cleanup
- * temporary files created as a result of handling the request.
- */
- public interface TempFileManager {
- TempFile createTempFile() throws Exception;
-
- void clear();
- }
-
- /**
- * A temp file.
- *
- * Temp files are responsible for managing the actual temporary storage and cleaning
- * themselves up when no longer needed.
- */
- public interface TempFile {
- OutputStream open() throws Exception;
-
- void delete() throws Exception;
-
- String getName();
- }
-
- /**
- * Default threading strategy for NanoHttpd.
- *
- * By default, the server spawns a new Thread for every incoming request. These are set
- * to daemon status, and named according to the request number. The name is
- * useful when profiling the application.
- */
- public static class DefaultAsyncRunner implements AsyncRunner {
- private long requestCount;
-
- @Override
- public void exec(Runnable code) {
- ++requestCount;
- Thread t = new Thread(code);
- t.setDaemon(true);
- t.setName("NanoHttpd Request Processor (#" + requestCount + ")");
- t.start();
- }
- }
-
- /**
- * Default strategy for creating and cleaning up temporary files.
- *
- *
This class stores its files in the standard location (that is,
- * wherever java.io.tmpdir points to). Files are added
- * to an internal list, and deleted when no longer needed (that is,
- * when clear() is invoked at the end of processing a
- * request).
- */
- public static class DefaultTempFileManager implements TempFileManager {
- private final String tmpdir;
- private final List tempFiles;
-
- public DefaultTempFileManager() {
- tmpdir = System.getProperty("java.io.tmpdir");
- tempFiles = new ArrayList();
- }
-
- @Override
- public TempFile createTempFile() throws Exception {
- DefaultTempFile tempFile = new DefaultTempFile(tmpdir);
- tempFiles.add(tempFile);
- return tempFile;
- }
-
- @Override
- public void clear() {
- for (TempFile file : tempFiles) {
- try {
- file.delete();
- } catch (Exception ignored) {
- }
- }
- tempFiles.clear();
- }
- }
-
- /**
- * Default strategy for creating and cleaning up temporary files.
- *
- *
By default, files are created by File.createTempFile() in
- * the directory specified.
- */
- public static class DefaultTempFile implements TempFile {
- private File file;
- private OutputStream fstream;
-
- public DefaultTempFile(String tempdir) throws IOException {
- file = File.createTempFile("NanoHTTPD-", "", new File(tempdir));
- fstream = new FileOutputStream(file);
- }
-
- @Override
- public OutputStream open() throws Exception {
- return fstream;
- }
-
- @Override
- public void delete() throws Exception {
- safeClose(fstream);
- file.delete();
- }
-
- @Override
- public String getName() {
- return file.getAbsolutePath();
- }
- }
-
- /**
- * HTTP response. Return one of these from serve().
- */
- public static class Response {
- /**
- * HTTP status code after processing, e.g. "200 OK", HTTP_OK
- */
- private IStatus status;
- /**
- * MIME type of content, e.g. "text/html"
- */
- private String mimeType;
- /**
- * Data of the response, may be null.
- */
- private InputStream data;
- /**
- * Headers for the HTTP response. Use addHeader() to add lines.
- */
- private Map header = new HashMap();
- /**
- * The request method that spawned this response.
- */
- private Method requestMethod;
- /**
- * Use chunkedTransfer
- */
- private boolean chunkedTransfer;
- /**
- * Content length.
- */
- private int contentLength = -1;
-
- /**
- * Default constructor: response = HTTP_OK, mime = MIME_HTML and your supplied message
- */
- public Response(String msg) {
- this(Status.OK, MIME_HTML, msg);
- }
-
- /**
- * Basic constructor.
- */
- public Response(IStatus status, String mimeType, InputStream data) {
- this.status = status;
- this.mimeType = mimeType;
- this.data = data;
- }
-
- /**
- * Convenience method that makes an InputStream out of given text.
- */
- public Response(IStatus status, String mimeType, String txt) {
- this.status = status;
- this.mimeType = mimeType;
- try {
- this.data = txt != null ? new ByteArrayInputStream(txt.getBytes("UTF-8")) : null;
- } catch (java.io.UnsupportedEncodingException uee) {
- uee.printStackTrace();
- }
- }
-
- /**
- * Adds given line to the header.
- */
- public void addHeader(String name, String value) {
- header.put(name, value);
- }
-
- public String getHeader(String name) {
- return header.get(name);
- }
-
- public void setContentLength(final int length) {
- this.contentLength = length;
- }
-
- private int getContentLength() throws IOException {
- if (contentLength < 0) {
- return this.data.available();
- }
- return contentLength;
- }
-
- /**
- * Sends given response to the socket.
- */
- protected void send(OutputStream outputStream) {
- String mime = mimeType;
- SimpleDateFormat gmtFrmt = new SimpleDateFormat("E, d MMM yyyy HH:mm:ss 'GMT'", Locale.US);
- gmtFrmt.setTimeZone(TimeZone.getTimeZone("GMT"));
-
- try {
- if (status == null) {
- throw new Error("sendResponse(): Status can't be null.");
- }
- PrintWriter pw = new PrintWriter(outputStream);
- pw.print("HTTP/1.1 " + status.getDescription() + " \r\n");
-
- if (mime != null) {
- pw.print("Content-Type: " + mime + "\r\n");
- }
-
- if (header == null || header.get("Date") == null) {
- pw.print("Date: " + gmtFrmt.format(new Date()) + "\r\n");
- }
-
- if (header != null) {
- for (String key : header.keySet()) {
- String value = header.get(key);
- pw.print(key + ": " + value + "\r\n");
- }
- }
-
- sendConnectionHeaderIfNotAlreadyPresent(pw, header);
-
- if (requestMethod != Method.HEAD && chunkedTransfer) {
- sendAsChunked(outputStream, pw);
- } else {
- int pending = data != null ? getContentLength() : 0;
- sendContentLengthHeaderIfNotAlreadyPresent(pw, header, pending);
- pw.print("\r\n");
- pw.flush();
- sendAsFixedLength(outputStream, pending);
- }
- outputStream.flush();
- safeClose(data);
- } catch (IOException ioe) {
- // Couldn't write? No can do.
- }
- }
-
- protected void sendContentLengthHeaderIfNotAlreadyPresent(PrintWriter pw, Map header, int size) {
- if (!headerAlreadySent(header, "content-length")) {
- pw.print("Content-Length: "+ size +"\r\n");
- }
- }
-
- protected void sendConnectionHeaderIfNotAlreadyPresent(PrintWriter pw, Map header) {
- if (!headerAlreadySent(header, "connection")) {
- pw.print("Connection: keep-alive\r\n");
- }
- }
-
- private boolean headerAlreadySent(Map header, String name) {
- boolean alreadySent = false;
- for (String headerName : header.keySet()) {
- alreadySent |= headerName.equalsIgnoreCase(name);
- }
- return alreadySent;
- }
-
- private void sendAsChunked(OutputStream outputStream, PrintWriter pw) throws IOException {
- pw.print("Transfer-Encoding: chunked\r\n");
- pw.print("\r\n");
- pw.flush();
- int BUFFER_SIZE = 16 * 1024;
- byte[] CRLF = "\r\n".getBytes();
- byte[] buff = new byte[BUFFER_SIZE];
- int read;
- while ((read = data.read(buff)) > 0) {
- outputStream.write(String.format("%x\r\n", read).getBytes());
- outputStream.write(buff, 0, read);
- outputStream.write(CRLF);
- }
- outputStream.write(String.format("0\r\n\r\n").getBytes());
- }
-
- private void sendAsFixedLength(OutputStream outputStream, int pending) throws IOException {
- if (requestMethod != Method.HEAD && data != null) {
- int BUFFER_SIZE = 16 * 1024;
- byte[] buff = new byte[BUFFER_SIZE];
- while (pending > 0) {
- int read = data.read(buff, 0, ((pending > BUFFER_SIZE) ? BUFFER_SIZE : pending));
- if (read <= 0) {
- break;
- }
- outputStream.write(buff, 0, read);
- pending -= read;
- }
- }
- }
-
- public IStatus getStatus() {
- return status;
- }
-
- public void setStatus(Status status) {
- this.status = status;
- }
-
- public String getMimeType() {
- return mimeType;
- }
-
- public void setMimeType(String mimeType) {
- this.mimeType = mimeType;
- }
-
- public InputStream getData() {
- return data;
- }
-
- public void setData(InputStream data) {
- this.data = data;
- }
-
- public Method getRequestMethod() {
- return requestMethod;
- }
-
- public void setRequestMethod(Method requestMethod) {
- this.requestMethod = requestMethod;
- }
-
- public void setChunkedTransfer(boolean chunkedTransfer) {
- this.chunkedTransfer = chunkedTransfer;
- }
-
- public interface IStatus {
- int getRequestStatus();
- String getDescription();
- }
-
- /**
- * Some HTTP response status codes
- */
- public enum Status implements IStatus {
- SWITCH_PROTOCOL(101, "Switching Protocols"), OK(200, "OK"), CREATED(201, "Created"), ACCEPTED(202, "Accepted"), NO_CONTENT(204, "No Content"), PARTIAL_CONTENT(206, "Partial Content"), REDIRECT(301,
- "Moved Permanently"), NOT_MODIFIED(304, "Not Modified"), BAD_REQUEST(400, "Bad Request"), UNAUTHORIZED(401,
- "Unauthorized"), FORBIDDEN(403, "Forbidden"), NOT_FOUND(404, "Not Found"), METHOD_NOT_ALLOWED(405, "Method Not Allowed"), RANGE_NOT_SATISFIABLE(416,
- "Requested Range Not Satisfiable"), INTERNAL_ERROR(500, "Internal Server Error");
- private final int requestStatus;
- private final String description;
-
- Status(int requestStatus, String description) {
- this.requestStatus = requestStatus;
- this.description = description;
- }
-
- @Override
- public int getRequestStatus() {
- return this.requestStatus;
- }
-
- @Override
- public String getDescription() {
- return "" + this.requestStatus + " " + description;
- }
- }
- }
-
- public static final class ResponseException extends Exception {
-
- private final Response.Status status;
-
- public ResponseException(Response.Status status, String message) {
- super(message);
- this.status = status;
- }
-
- public ResponseException(Response.Status status, String message, Exception e) {
- super(message, e);
- this.status = status;
- }
-
- public Response.Status getStatus() {
- return status;
- }
- }
-
- /**
- * Default strategy for creating and cleaning up temporary files.
- */
- private class DefaultTempFileManagerFactory implements TempFileManagerFactory {
- @Override
- public TempFileManager create() {
- return new DefaultTempFileManager();
- }
- }
-
- /**
- * Handles one session, i.e. parses the HTTP request and returns the response.
- */
- public interface IHTTPSession {
- void execute() throws IOException;
-
- Map getParms();
-
- Map getHeaders();
-
- /**
- * @return the path part of the URL.
- */
- String getUri();
-
- String getQueryParameterString();
-
- Method getMethod();
-
- InputStream getInputStream();
-
- CookieHandler getCookies();
-
- /**
- * Adds the files in the request body to the files map.
- * @arg files - map to modify
- */
- void parseBody(Map files) throws IOException, ResponseException;
- }
-
- protected class HTTPSession implements IHTTPSession {
- public static final int BUFSIZE = 8192;
- private final TempFileManager tempFileManager;
- private final OutputStream outputStream;
- private PushbackInputStream inputStream;
- private int splitbyte;
- private int rlen;
- private String uri;
- private Method method;
- private Map parms;
- private Map headers;
- private CookieHandler cookies;
- private String queryParameterString;
-
- public HTTPSession(TempFileManager tempFileManager, InputStream inputStream, OutputStream outputStream) {
- this.tempFileManager = tempFileManager;
- this.inputStream = new PushbackInputStream(inputStream, BUFSIZE);
- this.outputStream = outputStream;
- }
-
- public HTTPSession(TempFileManager tempFileManager, InputStream inputStream, OutputStream outputStream, InetAddress inetAddress) {
- this.tempFileManager = tempFileManager;
- this.inputStream = new PushbackInputStream(inputStream, BUFSIZE);
- this.outputStream = outputStream;
- String remoteIp = inetAddress.isLoopbackAddress() || inetAddress.isAnyLocalAddress() ? "127.0.0.1" : inetAddress.getHostAddress().toString();
- headers = new HashMap();
-
- headers.put("remote-addr", remoteIp);
- headers.put("http-client-ip", remoteIp);
- }
-
- @Override
- public void execute() throws IOException {
- try {
- // Read the first 8192 bytes.
- // The full header should fit in here.
- // Apache's default header limit is 8KB.
- // Do NOT assume that a single read will get the entire header at once!
- byte[] buf = new byte[BUFSIZE];
- splitbyte = 0;
- rlen = 0;
- {
- int read = -1;
- try {
- read = inputStream.read(buf, 0, BUFSIZE);
- } catch (Exception e) {
- safeClose(inputStream);
- safeClose(outputStream);
- throw new SocketException("NanoHttpd Shutdown");
- }
- if (read == -1) {
- // socket was been closed
- safeClose(inputStream);
- safeClose(outputStream);
- throw new SocketException("NanoHttpd Shutdown");
- }
- while (read > 0) {
- rlen += read;
- splitbyte = findHeaderEnd(buf, rlen);
- if (splitbyte > 0)
- break;
- read = inputStream.read(buf, rlen, BUFSIZE - rlen);
- }
- }
-
- if (splitbyte < rlen) {
- inputStream.unread(buf, splitbyte, rlen - splitbyte);
- }
-
- parms = new HashMap();
- if(null == headers) {
- headers = new HashMap();
- }
-
- // Create a BufferedReader for parsing the header.
- BufferedReader hin = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(buf, 0, rlen)));
-
- // Decode the header into parms and header java properties
- Map pre = new HashMap();
- decodeHeader(hin, pre, parms, headers);
-
- method = Method.lookup(pre.get("method"));
- if (method == null) {
- throw new ResponseException(Response.Status.BAD_REQUEST, "BAD REQUEST: Syntax error.");
- }
-
- uri = pre.get("uri");
-
- cookies = new CookieHandler(headers);
-
- // Ok, now do the serve()
- Response r = serve(this);
- if (r == null) {
- throw new ResponseException(Response.Status.INTERNAL_ERROR, "SERVER INTERNAL ERROR: Serve() returned a null response.");
- } else {
- cookies.unloadQueue(r);
- r.setRequestMethod(method);
- r.send(outputStream);
- }
- } catch (SocketException e) {
- // throw it out to close socket object (finalAccept)
- throw e;
- } catch (SocketTimeoutException ste) {
- throw ste;
- } catch (IOException ioe) {
- Response r = new Response(Response.Status.INTERNAL_ERROR, MIME_PLAINTEXT, "SERVER INTERNAL ERROR: IOException: " + ioe.getMessage());
- r.send(outputStream);
- safeClose(outputStream);
- } catch (ResponseException re) {
- Response r = new Response(re.getStatus(), MIME_PLAINTEXT, re.getMessage());
- r.send(outputStream);
- safeClose(outputStream);
- } finally {
- tempFileManager.clear();
- }
- }
-
- @Override
- public void parseBody(Map files) throws IOException, ResponseException {
- RandomAccessFile randomAccessFile = null;
- BufferedReader in = null;
- try {
-
- randomAccessFile = getTmpBucket();
-
- long size;
- if (headers.containsKey("content-length")) {
- size = Integer.parseInt(headers.get("content-length"));
- } else if (splitbyte < rlen) {
- size = rlen - splitbyte;
- } else {
- size = 0;
- }
-
- // Now read all the body and write it to f
- byte[] buf = new byte[512];
- while (rlen >= 0 && size > 0) {
- rlen = inputStream.read(buf, 0, (int)Math.min(size, 512));
- size -= rlen;
- if (rlen > 0) {
- randomAccessFile.write(buf, 0, rlen);
- }
- }
-
- // Get the raw body as a byte []
- ByteBuffer fbuf = randomAccessFile.getChannel().map(FileChannel.MapMode.READ_ONLY, 0, randomAccessFile.length());
- randomAccessFile.seek(0);
-
- // Create a BufferedReader for easily reading it as string.
- InputStream bin = new FileInputStream(randomAccessFile.getFD());
- in = new BufferedReader(new InputStreamReader(bin));
-
- // If the method is POST, there may be parameters
- // in data section, too, read it:
- if (Method.POST.equals(method)) {
- String contentType = "";
- String contentTypeHeader = headers.get("content-type");
-
- StringTokenizer st = null;
- if (contentTypeHeader != null) {
- st = new StringTokenizer(contentTypeHeader, ",; ");
- if (st.hasMoreTokens()) {
- contentType = st.nextToken();
- }
- }
-
- if ("multipart/form-data".equalsIgnoreCase(contentType)) {
- // Handle multipart/form-data
- if (!st.hasMoreTokens()) {
- throw new ResponseException(Response.Status.BAD_REQUEST, "BAD REQUEST: Content type is multipart/form-data but boundary missing. Usage: GET /example/file.html");
- }
-
- String boundaryStartString = "boundary=";
- int boundaryContentStart = contentTypeHeader.indexOf(boundaryStartString) + boundaryStartString.length();
- String boundary = contentTypeHeader.substring(boundaryContentStart, contentTypeHeader.length());
- if (boundary.startsWith("\"") && boundary.endsWith("\"")) {
- boundary = boundary.substring(1, boundary.length() - 1);
- }
-
- decodeMultipartData(boundary, fbuf, in, parms, files);
- } else {
- String postLine = "";
- StringBuilder postLineBuffer = new StringBuilder();
- char pbuf[] = new char[512];
- int read = in.read(pbuf);
- while (read >= 0 && !postLine.endsWith("\r\n")) {
- postLine = String.valueOf(pbuf, 0, read);
- postLineBuffer.append(postLine);
- read = in.read(pbuf);
- }
- postLine = postLineBuffer.toString().trim();
- // Handle application/x-www-form-urlencoded
- if ("application/x-www-form-urlencoded".equalsIgnoreCase(contentType)) {
- decodeParms(postLine, parms);
- } else if (postLine.length() != 0) {
- // Special case for raw POST data => create a special files entry "postData" with raw content data
- files.put("postData", postLine);
- }
- }
- } else if (Method.PUT.equals(method)) {
- files.put("content", saveTmpFile(fbuf, 0, fbuf.limit()));
- }
- } finally {
- safeClose(randomAccessFile);
- safeClose(in);
- }
- }
-
- /**
- * Decodes the sent headers and loads the data into Key/value pairs
- */
- private void decodeHeader(BufferedReader in, Map pre, Map parms, Map headers)
- throws ResponseException {
- try {
- // Read the request line
- String inLine = in.readLine();
- if (inLine == null) {
- return;
- }
-
- StringTokenizer st = new StringTokenizer(inLine);
- if (!st.hasMoreTokens()) {
- throw new ResponseException(Response.Status.BAD_REQUEST, "BAD REQUEST: Syntax error. Usage: GET /example/file.html");
- }
-
- pre.put("method", st.nextToken());
-
- if (!st.hasMoreTokens()) {
- throw new ResponseException(Response.Status.BAD_REQUEST, "BAD REQUEST: Missing URI. Usage: GET /example/file.html");
- }
-
- String uri = st.nextToken();
-
- // Decode parameters from the URI
- int qmi = uri.indexOf('?');
- if (qmi >= 0) {
- decodeParms(uri.substring(qmi + 1), parms);
- uri = decodePercent(uri.substring(0, qmi));
- } else {
- uri = decodePercent(uri);
- }
-
- // If there's another token, it's protocol version,
- // followed by HTTP headers. Ignore version but parse headers.
- // NOTE: this now forces header names lowercase since they are
- // case insensitive and vary by client.
- if (st.hasMoreTokens()) {
- String line = in.readLine();
- while (line != null && line.trim().length() > 0) {
- int p = line.indexOf(':');
- if (p >= 0)
- headers.put(line.substring(0, p).trim().toLowerCase(Locale.US), line.substring(p + 1).trim());
- line = in.readLine();
- }
- }
-
- pre.put("uri", uri);
- } catch (IOException ioe) {
- throw new ResponseException(Response.Status.INTERNAL_ERROR, "SERVER INTERNAL ERROR: IOException: " + ioe.getMessage(), ioe);
- }
- }
-
- /**
- * Decodes the Multipart Body data and put it into Key/Value pairs.
- */
- private void decodeMultipartData(String boundary, ByteBuffer fbuf, BufferedReader in, Map parms,
- Map files) throws ResponseException {
- try {
- int[] bpositions = getBoundaryPositions(fbuf, boundary.getBytes());
- int boundarycount = 1;
- String mpline = in.readLine();
- while (mpline != null) {
- if (!mpline.contains(boundary)) {
- throw new ResponseException(Response.Status.BAD_REQUEST, "BAD REQUEST: Content type is multipart/form-data but next chunk does not start with boundary. Usage: GET /example/file.html");
- }
- boundarycount++;
- Map item = new HashMap();
- mpline = in.readLine();
- while (mpline != null && mpline.trim().length() > 0) {
- int p = mpline.indexOf(':');
- if (p != -1) {
- item.put(mpline.substring(0, p).trim().toLowerCase(Locale.US), mpline.substring(p + 1).trim());
- }
- mpline = in.readLine();
- }
- if (mpline != null) {
- String contentDisposition = item.get("content-disposition");
- if (contentDisposition == null) {
- throw new ResponseException(Response.Status.BAD_REQUEST, "BAD REQUEST: Content type is multipart/form-data but no content-disposition info found. Usage: GET /example/file.html");
- }
- StringTokenizer st = new StringTokenizer(contentDisposition, ";");
- Map disposition = new HashMap();
- while (st.hasMoreTokens()) {
- String token = st.nextToken().trim();
- int p = token.indexOf('=');
- if (p != -1) {
- disposition.put(token.substring(0, p).trim().toLowerCase(Locale.US), token.substring(p + 1).trim());
- }
- }
- String pname = disposition.get("name");
- pname = pname.substring(1, pname.length() - 1);
-
- String value = "";
- if (item.get("content-type") == null) {
- while (mpline != null && !mpline.contains(boundary)) {
- mpline = in.readLine();
- if (mpline != null) {
- int d = mpline.indexOf(boundary);
- if (d == -1) {
- value += mpline;
- } else {
- value += mpline.substring(0, d - 2);
- }
- }
- }
- } else {
- if (boundarycount > bpositions.length) {
- throw new ResponseException(Response.Status.INTERNAL_ERROR, "Error processing request");
- }
- int offset = stripMultipartHeaders(fbuf, bpositions[boundarycount - 2]);
- String path = saveTmpFile(fbuf, offset, bpositions[boundarycount - 1] - offset - 4);
- files.put(pname, path);
- value = disposition.get("filename");
- value = value.substring(1, value.length() - 1);
- do {
- mpline = in.readLine();
- } while (mpline != null && !mpline.contains(boundary));
- }
- parms.put(pname, value);
- }
- }
- } catch (IOException ioe) {
- throw new ResponseException(Response.Status.INTERNAL_ERROR, "SERVER INTERNAL ERROR: IOException: " + ioe.getMessage(), ioe);
- }
- }
-
- /**
- * Find byte index separating header from body. It must be the last byte of the first two sequential new lines.
- */
- private int findHeaderEnd(final byte[] buf, int rlen) {
- int splitbyte = 0;
- while (splitbyte + 3 < rlen) {
- if (buf[splitbyte] == '\r' && buf[splitbyte + 1] == '\n' && buf[splitbyte + 2] == '\r' && buf[splitbyte + 3] == '\n') {
- return splitbyte + 4;
- }
- splitbyte++;
- }
- return 0;
- }
-
- /**
- * Find the byte positions where multipart boundaries start.
- */
- private int[] getBoundaryPositions(ByteBuffer b, byte[] boundary) {
- int matchcount = 0;
- int matchbyte = -1;
- List matchbytes = new ArrayList();
- for (int i = 0; i < b.limit(); i++) {
- if (b.get(i) == boundary[matchcount]) {
- if (matchcount == 0)
- matchbyte = i;
- matchcount++;
- if (matchcount == boundary.length) {
- matchbytes.add(matchbyte);
- matchcount = 0;
- matchbyte = -1;
- }
- } else {
- i -= matchcount;
- matchcount = 0;
- matchbyte = -1;
- }
- }
- int[] ret = new int[matchbytes.size()];
- for (int i = 0; i < ret.length; i++) {
- ret[i] = matchbytes.get(i);
- }
- return ret;
- }
-
- /**
- * Retrieves the content of a sent file and saves it to a temporary file. The full path to the saved file is returned.
- */
- private String saveTmpFile(ByteBuffer b, int offset, int len) {
- String path = "";
- if (len > 0) {
- FileOutputStream fileOutputStream = null;
- try {
- TempFile tempFile = tempFileManager.createTempFile();
- ByteBuffer src = b.duplicate();
- fileOutputStream = new FileOutputStream(tempFile.getName());
- FileChannel dest = fileOutputStream.getChannel();
- src.position(offset).limit(offset + len);
- dest.write(src.slice());
- path = tempFile.getName();
- } catch (Exception e) { // Catch exception if any
- throw new Error(e); // we won't recover, so throw an error
- } finally {
- safeClose(fileOutputStream);
- }
- }
- return path;
- }
-
- private RandomAccessFile getTmpBucket() {
- try {
- TempFile tempFile = tempFileManager.createTempFile();
- return new RandomAccessFile(tempFile.getName(), "rw");
- } catch (Exception e) {
- throw new Error(e); // we won't recover, so throw an error
- }
- }
-
- /**
- * It returns the offset separating multipart file headers from the file's data.
- */
- private int stripMultipartHeaders(ByteBuffer b, int offset) {
- int i;
- for (i = offset; i < b.limit(); i++) {
- if (b.get(i) == '\r' && b.get(++i) == '\n' && b.get(++i) == '\r' && b.get(++i) == '\n') {
- break;
- }
- }
- return i + 1;
- }
-
- /**
- * Decodes parameters in percent-encoded URI-format ( e.g. "name=Jack%20Daniels&pass=Single%20Malt" ) and
- * adds them to given Map. NOTE: this doesn't support multiple identical keys due to the simplicity of Map.
- */
- private void decodeParms(String parms, Map p) {
- if (parms == null) {
- queryParameterString = "";
- return;
- }
-
- queryParameterString = parms;
- StringTokenizer st = new StringTokenizer(parms, "&");
- while (st.hasMoreTokens()) {
- String e = st.nextToken();
- int sep = e.indexOf('=');
- if (sep >= 0) {
- p.put(decodePercent(e.substring(0, sep)).trim(),
- decodePercent(e.substring(sep + 1)));
- } else {
- p.put(decodePercent(e).trim(), "");
- }
- }
- }
-
- @Override
- public final Map getParms() {
- return parms;
- }
-
- public String getQueryParameterString() {
- return queryParameterString;
- }
-
- @Override
- public final Map getHeaders() {
- return headers;
- }
-
- @Override
- public final String getUri() {
- return uri;
- }
-
- @Override
- public final Method getMethod() {
- return method;
- }
-
- @Override
- public final InputStream getInputStream() {
- return inputStream;
- }
-
- @Override
- public CookieHandler getCookies() {
- return cookies;
- }
- }
-
- public static class Cookie {
- private String n, v, e;
-
- public Cookie(String name, String value, String expires) {
- n = name;
- v = value;
- e = expires;
- }
-
- public Cookie(String name, String value) {
- this(name, value, 30);
- }
-
- public Cookie(String name, String value, int numDays) {
- n = name;
- v = value;
- e = getHTTPTime(numDays);
- }
-
- public String getHTTPHeader() {
- String fmt = "%s=%s; expires=%s";
- return String.format(fmt, n, v, e);
- }
-
- public static String getHTTPTime(int days) {
- Calendar calendar = Calendar.getInstance();
- SimpleDateFormat dateFormat = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss z", Locale.US);
- dateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
- calendar.add(Calendar.DAY_OF_MONTH, days);
- return dateFormat.format(calendar.getTime());
- }
- }
-
- /**
- * Provides rudimentary support for cookies.
- * Doesn't support 'path', 'secure' nor 'httpOnly'.
- * Feel free to improve it and/or add unsupported features.
- *
- * @author LordFokas
- */
- public class CookieHandler implements Iterable {
- private HashMap cookies = new HashMap();
- private ArrayList queue = new ArrayList();
-
- public CookieHandler(Map httpHeaders) {
- String raw = httpHeaders.get("cookie");
- if (raw != null) {
- String[] tokens = raw.split(";");
- for (String token : tokens) {
- String[] data = token.trim().split("=");
- if (data.length == 2) {
- cookies.put(data[0], data[1]);
- }
- }
- }
- }
-
- @Override public Iterator iterator() {
- return cookies.keySet().iterator();
- }
-
- /**
- * Read a cookie from the HTTP Headers.
- *
- * @param name The cookie's name.
- * @return The cookie's value if it exists, null otherwise.
- */
- public String read(String name) {
- return cookies.get(name);
- }
-
- /**
- * Sets a cookie.
- *
- * @param name The cookie's name.
- * @param value The cookie's value.
- * @param expires How many days until the cookie expires.
- */
- public void set(String name, String value, int expires) {
- queue.add(new Cookie(name, value, Cookie.getHTTPTime(expires)));
- }
-
- public void set(Cookie cookie) {
- queue.add(cookie);
- }
-
- /**
- * Set a cookie with an expiration date from a month ago, effectively deleting it on the client side.
- *
- * @param name The cookie name.
- */
- public void delete(String name) {
- set(name, "-delete-", -30);
- }
-
- /**
- * Internally used by the webserver to add all queued cookies into the Response's HTTP Headers.
- *
- * @param response The Response object to which headers the queued cookies will be added.
- */
- public void unloadQueue(Response response) {
- for (Cookie cookie : queue) {
- response.addHeader("Set-Cookie", cookie.getHTTPHeader());
- }
- }
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/CastOptionsProvider.java b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/CastOptionsProvider.java
deleted file mode 100755
index 86388332d4..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/CastOptionsProvider.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2016 Google Inc. All Rights Reserved.
- *
- * 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.
- */
-
-package org.deviceconnect.android.deviceplugin.chromecast;
-
-import android.content.Context;
-
-import com.google.android.gms.cast.MediaMetadata;
-import com.google.android.gms.cast.framework.CastOptions;
-import com.google.android.gms.cast.framework.OptionsProvider;
-import com.google.android.gms.cast.framework.SessionProvider;
-import com.google.android.gms.cast.framework.media.ImagePicker;
-import com.google.android.gms.common.images.WebImage;
-
-import java.util.List;
-
-/**
- * Implements {@link OptionsProvider} to provide {@link CastOptions}.
- */
-public class CastOptionsProvider implements OptionsProvider {
-
- @Override
- public CastOptions getCastOptions(Context context) {
- return new CastOptions.Builder()
- .setReceiverApplicationId(context.getString(R.string.application_id))
- .build();
- }
-
- @Override
- public List getAdditionalSessionProviders(Context appContext) {
- return null;
- }
-
- private static class ImagePickerImpl extends ImagePicker {
-
- @Override
- public WebImage onPickImage(MediaMetadata mediaMetadata, int type) {
- if ((mediaMetadata == null) || !mediaMetadata.hasImages()) {
- return null;
- }
- List images = mediaMetadata.getImages();
- if (images.size() == 1) {
- return images.get(0);
- } else {
- if (type == ImagePicker.IMAGE_TYPE_MEDIA_ROUTE_CONTROLLER_DIALOG_BACKGROUND) {
- return images.get(0);
- } else {
- return images.get(1);
- }
- }
- }
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/ChromeCastApplication.java b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/ChromeCastApplication.java
deleted file mode 100644
index a66dee7148..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/ChromeCastApplication.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.deviceconnect.android.deviceplugin.chromecast;
-
-import android.app.Application;
-
-import org.deviceconnect.android.deviceplugin.chromecast.core.ChromeCastController;
-import org.deviceconnect.android.deviceplugin.chromecast.core.ChromeCastDiscovery;
-
-/**
- * ChromeCas Applicationクラス.
- * @author NTT DOCOMO, INC.
- */
-public class ChromeCastApplication extends Application {
- /** Chromecast Discovery. */
- private ChromeCastDiscovery mDiscovery;
- /** Chromecast Application. */
- private ChromeCastController mController;
-
- public void initialize() {
- String appId = getString(R.string.application_id);
-
- if (mDiscovery == null) {
- mDiscovery = new ChromeCastDiscovery(this);
-
- }
- if (mController == null) {
- mController = new ChromeCastController(this, appId);
- }
- }
-
- @Override
- public void onTerminate() {
- super.onTerminate();
- if (mController != null) {
- mController.teardown();
- }
- }
-
- /**
- * ChromeCastを制御するクラスを返す.
- * @return
- */
- public ChromeCastController getController() {
- return mController;
- }
-
- /**
- * ChromeCastを探索するクラスを返す.
- * @return
- */
- public ChromeCastDiscovery getDiscovery() {
- return mDiscovery;
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/ChromeCastDeviceService.java b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/ChromeCastDeviceService.java
deleted file mode 100644
index 81a3e43d96..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/ChromeCastDeviceService.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.deviceconnect.android.deviceplugin.chromecast;
-
-import com.google.android.gms.cast.CastDevice;
-
-import org.deviceconnect.android.deviceplugin.chromecast.profile.ChromeCastCanvasProfile;
-import org.deviceconnect.android.deviceplugin.chromecast.profile.ChromeCastMediaPlayerProfile;
-import org.deviceconnect.android.deviceplugin.chromecast.profile.ChromeCastNotificationProfile;
-import org.deviceconnect.android.service.DConnectService;
-import org.deviceconnect.profile.ServiceDiscoveryProfileConstants;
-
-/**
- * Chromecast device service.
- *
- * @author NTT DOCOMO, INC.
- */
-public class ChromeCastDeviceService extends DConnectService {
-
- private ChromeCastMediaPlayerProfile mMediaPlayerProfile;
-
- public ChromeCastDeviceService(final CastDevice cast) {
- super(cast.getDeviceId());
- setName(getDeviceName(cast.getFriendlyName()));
- setNetworkType(ServiceDiscoveryProfileConstants.NetworkType.WIFI);
- mMediaPlayerProfile = new ChromeCastMediaPlayerProfile();
- addProfile(new ChromeCastCanvasProfile());
- addProfile(new ChromeCastNotificationProfile());
- addProfile(mMediaPlayerProfile);
- }
-
- public ChromeCastMediaPlayerProfile getMediaPlayerProfile() {
- return mMediaPlayerProfile;
- }
- private String getDeviceName(final String name) {
- return String.format("Chromecast (%1$s)", name);
- }
-
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/ChromeCastProvider.java b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/ChromeCastProvider.java
deleted file mode 100755
index 92c7d35529..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/ChromeCastProvider.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- ChromeCastProvider.java
- Copyright (c) 2014 NTT DOCOMO,INC.
- Released under the MIT license
- http://opensource.org/licenses/mit-license.php
- */
-package org.deviceconnect.android.deviceplugin.chromecast;
-
-import android.app.Service;
-
-import org.deviceconnect.android.message.DConnectMessageServiceProvider;
-
-/**
- * サービスプロバイダー (Chromecast).
- *
- * リクエストメッセージを受信し、レスポンスメッセージを送信するサービス
- *
- *
- * @param Service
- * @author NTT DOCOMO, INC.
- */
-public class ChromeCastProvider extends DConnectMessageServiceProvider {
-
- @SuppressWarnings("unchecked")
- @Override
- protected Class getServiceClass() {
- Class clazz = ChromeCastService.class;
- return (Class) clazz;
- }
-
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/ChromeCastService.java b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/ChromeCastService.java
deleted file mode 100755
index 15ed772246..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/ChromeCastService.java
+++ /dev/null
@@ -1,464 +0,0 @@
-/*
- ChromeCastService.java
- Copyright (c) 2014 NTT DOCOMO,INC.
- Released under the MIT license
- http://opensource.org/licenses/mit-license.php
- */
-package org.deviceconnect.android.deviceplugin.chromecast;
-
-import android.content.BroadcastReceiver;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-
-import com.google.android.gms.cast.Cast;
-import com.google.android.gms.cast.CastDevice;
-import com.google.android.gms.cast.MediaInfo;
-import com.google.android.gms.cast.MediaStatus;
-import com.google.android.gms.cast.RemoteMediaPlayer.MediaChannelResult;
-import com.google.android.gms.common.api.GoogleApiClient;
-import com.google.android.gms.common.api.Status;
-
-import org.deviceconnect.android.deviceplugin.chromecast.core.ChromeCastController;
-import org.deviceconnect.android.deviceplugin.chromecast.core.ChromeCastDiscovery;
-import org.deviceconnect.android.deviceplugin.chromecast.core.ChromeCastHttpServer;
-import org.deviceconnect.android.deviceplugin.chromecast.core.ChromeCastMediaPlayer;
-import org.deviceconnect.android.deviceplugin.chromecast.core.ChromeCastMessage;
-import org.deviceconnect.android.deviceplugin.chromecast.profile.ChromeCastServiceDiscoveryProfile;
-import org.deviceconnect.android.deviceplugin.chromecast.profile.ChromeCastSystemProfile;
-import org.deviceconnect.android.event.Event;
-import org.deviceconnect.android.event.EventManager;
-import org.deviceconnect.android.event.cache.db.DBCacheController;
-import org.deviceconnect.android.message.DConnectMessageService;
-import org.deviceconnect.android.message.MessageUtils;
-import org.deviceconnect.android.profile.MediaPlayerProfile;
-import org.deviceconnect.android.profile.SystemProfile;
-import org.deviceconnect.android.service.DConnectService;
-import org.deviceconnect.android.service.DConnectServiceListener;
-import org.deviceconnect.message.DConnectMessage;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * メッセージサービス (Chromecast).
- *
- * Chromecastデバイスプラグインのサービス
- *
- * @author NTT DOCOMO, INC.
- */
-public class ChromeCastService extends DConnectMessageService implements
- ChromeCastMediaPlayer.Callbacks,
- ChromeCastMessage.Callbacks,
- ChromeCastDiscovery.Callbacks,
- ChromeCastController.Result,
- DConnectServiceListener {
-
- /**
- * Chromecastのサーバポート.
- */
- private static final int SERVER_PORT = 38088;
-
- /** Chromecast MediaPlayer. */
- private ChromeCastMediaPlayer mMediaPlayer;
- /** Chromecast Message. */
- private ChromeCastMessage mMessage;
- /** ChromecastHttpServer. */
- private ChromeCastHttpServer mServer;
- /** StatusChange時のServiceId. */
- private String mServiceIdOnStatusChange = null;
- /** MediaPlayerのステータスアップデートフラグ. */
- private boolean mEnableCastMediaPlayerStatusUpdate = false;
- /**
- * ChromeCastが接続完了してからレスポンスを返すためのCallbackを返す.
- * @author NTT DOCOMO, INC.
- */
- public interface Callback {
- /**
- * レスポンス.
- * @param connected true : 接続されている, false : 接続されていない
- */
- void onResponse(final boolean connected);
- }
-
- @Override
- public void onCreate() {
- super.onCreate();
- ChromeCastApplication app = (ChromeCastApplication) getApplication();
- app.initialize();
- app.getDiscovery().setCallbacks(this);
- app.getController().setResult(this);
- String appMsgUrn = getString(R.string.application_message_urn);
-
- int portCount = 0;
- while (portCount < 500) { // Portを決定する
- try {
- mServer = new ChromeCastHttpServer(this, "0.0.0.0", SERVER_PORT + portCount);
- mServer.start();
- break;
- } catch (IOException e) {
- portCount++;
- }
- }
-
- mMediaPlayer = new ChromeCastMediaPlayer(app.getController());
- mMediaPlayer.setCallbacks(this);
- mMessage = new ChromeCastMessage(app.getController(), appMsgUrn);
- mMessage.setCallbacks(this);
-
- EventManager.INSTANCE.setController(new DBCacheController(this));
- addProfile(new ChromeCastServiceDiscoveryProfile(getServiceProvider()));
-
- }
-
- @Override
- public void onDestroy() {
- mServer.stop();
-
- super.onDestroy();
- }
-
- @Override
- protected SystemProfile getSystemProfile() {
- return new ChromeCastSystemProfile();
- }
-
- @Override
- public void onServiceAdded(final DConnectService service) {
- if (BuildConfig.DEBUG) {
- Log.i("TEST", "onServiceAdded: " + service.getName());
- }
- // NOP.
- }
-
- @Override
- public void onServiceRemoved(final DConnectService service) {
- if (BuildConfig.DEBUG) {
- Log.i("TEST", "onServiceRemoved: " + service.getName());
- }
- ChromeCastApplication app = (ChromeCastApplication) getApplication();
- if (app != null) {
- app.getController().teardown();
- }
- }
-
- @Override
- public void onStatusChange(final DConnectService service) {
- if (BuildConfig.DEBUG) {
- Log.i("TEST", "onStatusChange: " + service.getName());
- }
- // NOP.
- }
-
- @Override
- protected void onManagerUninstalled() {
- // Managerアンインストール検知時の処理。
- if (BuildConfig.DEBUG) {
- Log.i("TEST", "Plug-in : onManagerUninstalled");
- }
- ChromeCastApplication app = (ChromeCastApplication) getApplication();
- if (app != null) {
- app.getController().teardown();
- }
- }
-
- @Override
- protected void onManagerTerminated() {
- // Manager正常終了通知受信時の処理。
- if (BuildConfig.DEBUG) {
- Log.i("TEST", "Plug-in : onManagerTerminated");
- }
- }
-
- @Override
- protected void onManagerEventTransmitDisconnected(String sessionKey) {
- // ManagerのEvent送信経路切断通知受信時の処理。
- if (BuildConfig.DEBUG) {
- Log.i("TEST", "Plug-in : onManagerEventTransmitDisconnected");
- }
- if (sessionKey != null) {
- EventManager.INSTANCE.removeEvents(sessionKey);
- } else {
- EventManager.INSTANCE.removeAll();
- }
-
- }
-
- @Override
- protected void onDevicePluginReset() {
- // Device Plug-inへのReset要求受信時の処理。
- if (BuildConfig.DEBUG) {
- Log.i("TEST", "Plug-in : onDevicePluginReset");
- }
- resetPluginResource();
- }
-
- /**
- * リソースリセット処理.
- */
- private void resetPluginResource() {
- /* 全イベント削除. */
- EventManager.INSTANCE.removeAll();
- onCastDeviceUnselected(null);
- }
-
-
- /**
- * ChromeCastDiscoveryを返す.
- * @return ChromeCastDiscovery
- */
- public ChromeCastDiscovery getChromeCastDiscovery() {
- ChromeCastApplication app = (ChromeCastApplication) getApplication();
- if (app == null) {
- return null;
- }
- return app.getDiscovery();
- }
-
- /**
- * ChromeCastMediaPlayerを返す.
- * @return ChromeCastMediaPlayer
- */
- public ChromeCastMediaPlayer getChromeCastMediaPlayer() {
- return mMediaPlayer;
- }
- /**
- * ChromeCastMessageを返す.
- * @return ChromeCastMessage
- */
- public ChromeCastMessage getChromeCastMessage() {
- return mMessage;
- }
- /**
- * ChromeCastHttpServerを返す.
- * @return ChromeCastHttpServer
- */
- public ChromeCastHttpServer getChromeCastHttpServer() {
- return mServer;
- }
-
- /**
- * StatusChange通知を有効にする.
- *
- * @param response レスポンス
- * @param serviceId デバイスを識別するID
- */
- public void registerOnStatusChange(final Intent response, final String serviceId) {
- mServiceIdOnStatusChange = serviceId;
- mEnableCastMediaPlayerStatusUpdate = true;
- response.putExtra(DConnectMessage.EXTRA_RESULT, DConnectMessage.RESULT_OK);
- response.putExtra(DConnectMessage.EXTRA_VALUE, "Register OnStatusChange event");
- sendResponse(response);
- }
-
- /**
- * StatusChange通知を無効にする.
- *
- * @param response レスポンス
- */
- public void unregisterOnStatusChange(final Intent response) {
- mServiceIdOnStatusChange = null;
- mEnableCastMediaPlayerStatusUpdate = false;
- response.putExtra(DConnectMessage.EXTRA_RESULT, DConnectMessage.RESULT_OK);
- response.putExtra(DConnectMessage.EXTRA_VALUE, "Unregister OnStatusChange event");
- sendResponse(response);
- }
-
- @Override
- public void onChromeCastMediaPlayerStatusUpdate(final MediaStatus status) {
-
- MediaInfo info = status.getMediaInfo();
- ChromeCastDeviceService service = (ChromeCastDeviceService) getServiceProvider().getService(mServiceIdOnStatusChange);
- if (service == null) {
- return;
- }
- String playStatusString = service.getMediaPlayerProfile().getPlayStatus(status.getPlayerState());
-
- if (mEnableCastMediaPlayerStatusUpdate) {
- List events = EventManager.INSTANCE.getEventList(mServiceIdOnStatusChange,
- MediaPlayerProfile.PROFILE_NAME, null,
- MediaPlayerProfile.ATTRIBUTE_ON_STATUS_CHANGE);
-
- for (int i = 0; i < events.size(); i++) {
- Event event = events.get(i);
-
- Intent intent = EventManager.createEventMessage(event);
- MediaPlayerProfile.setAttribute(intent,
- MediaPlayerProfile.ATTRIBUTE_ON_STATUS_CHANGE);
- Bundle mediaPlayer = new Bundle();
- MediaPlayerProfile.setStatus(mediaPlayer, playStatusString);
- if (info != null) {
- MediaPlayerProfile.setMediaId(mediaPlayer, info.getContentId());
- MediaPlayerProfile.setMIMEType(mediaPlayer, info.getContentType());
- } else {
- MediaPlayerProfile.setMediaId(mediaPlayer, "");
- MediaPlayerProfile.setMIMEType(mediaPlayer, "");
- }
- MediaPlayerProfile.setPos(mediaPlayer, (int) status.getStreamPosition() / 1000);
- MediaPlayerProfile.setVolume(mediaPlayer, status.getStreamVolume());
- MediaPlayerProfile.setMediaPlayer(intent, mediaPlayer);
- sendEvent(intent, event.getAccessToken());
- }
- }
- }
-
- /**
- * ステータスに基づいて、レスポンスする.
- * @param response レスポンス
- * @param result Chromecastからの状態
- * @param message Chromecastの状態
- */
- private void onChromeCastResult(final Intent response, final Status result, final String message) {
- if (result == null) {
- MessageUtils.setIllegalDeviceStateError(response, message);
- } else {
- if (result.isSuccess()) {
- response.putExtra(DConnectMessage.EXTRA_RESULT, DConnectMessage.RESULT_OK);
- } else {
- if (message == null) {
- MessageUtils.setIllegalDeviceStateError(response);
- } else {
- MessageUtils.setIllegalDeviceStateError(response, message + " is error");
- }
- }
- }
- sendResponse(response);
- }
- @Override
- public void onChromeCastMediaPlayerResult(final Intent response,
- final MediaChannelResult result, final String message) {
- if (result == null) {
- MessageUtils.setIllegalDeviceStateError(response, message);
- sendResponse(response);
- } else {
- onChromeCastResult(response, result.getStatus(), message);
- }
- }
- @Override
- public void onChromeCastMessageResult(final Intent response, final Status result, final String message) {
- onChromeCastResult(response, result, message);
- }
-
- @Override
- public void onCastDeviceUpdate(final ArrayList devices) {
- if (BuildConfig.DEBUG) {
- Log.d("TEST", "onCastDeviceUpdate#");
- }
- if (devices.size() == 0) {
- if (BuildConfig.DEBUG) {
- Log.d("TEST", "size:0");
- }
- ChromeCastApplication app = (ChromeCastApplication) getApplication();
-
- if (app.getController() != null) {
- app.getController().teardown();
- }
- }
- }
-
-
- @Override
- public void onCastDeviceSelected(final CastDevice selectedDevice) {
- if (BuildConfig.DEBUG) {
- Log.d("TEST", "onCastDeviceSelected#" + selectedDevice.getDeviceId());
- }
- ChromeCastApplication app = (ChromeCastApplication) getApplication();
- if (app == null) {
- return;
- }
-
- CastDevice currentDevice = app.getController().getSelectedDevice();
- if (currentDevice != null) {
- DConnectService castService = getServiceProvider().getService(currentDevice.getDeviceId());
- if (castService == null) {
- castService = new ChromeCastDeviceService(currentDevice);
- getServiceProvider().addService(castService);
- }
- castService.setOnline(true);
- if (!currentDevice.getDeviceId().equals(selectedDevice.getDeviceId())) {
- app.getController().setSelectedDevice(selectedDevice);
- app.getController().reconnect();
- } else {
- app.getController().connect();
- }
- } else {
- app.getController().setSelectedDevice(selectedDevice);
- app.getController().connect();
- }
- }
-
- @Override
- public void onCastDeviceUnselected(final CastDevice unselectedDevice) {
- if (BuildConfig.DEBUG) {
- Log.d("TEST", "onCastDeviceUnselected#start");
- }
- ChromeCastApplication app = (ChromeCastApplication) getApplication();
-
- if (app == null) {
- return;
- }
- CastDevice currentDevice = unselectedDevice;
- if (currentDevice == null) {
- if (app.getController().getSelectedDevice() == null) {
- return;
- }
- currentDevice = app.getController().getSelectedDevice();
- }
- if (BuildConfig.DEBUG) {
- Log.d("TEST", "onCastDeviceUnselected#start+ " + currentDevice.getDeviceId());
- }
-
- DConnectService castService = getServiceProvider().getService(currentDevice.getDeviceId());
- if (castService != null) {
- castService.setOnline(false);
- }
- app.getController().teardown();
- }
-
-
- @Override
- public synchronized void onChromeCastConnected() {
- ChromeCastApplication app = (ChromeCastApplication) getApplication();
- if (app != null) {
- CastDevice currentDevice = app.getController().getSelectedDevice();
- DConnectService castService = getServiceProvider().getService(currentDevice.getDeviceId());
- if (castService == null) {
- castService = new ChromeCastDeviceService(currentDevice);
- getServiceProvider().addService(castService);
- }
- castService.setOnline(true);
- }
- }
-
-
-
- /**
- * 選択されたChromeCastと接続する.
- * @param serviceId サービスID
- * @param callback 非同期処理用Callback
- */
- public synchronized void connectChromeCast(final String serviceId,
- final Callback callback) {
- ChromeCastApplication app = (ChromeCastApplication) getApplication();
- if (app == null) {
- callback.onResponse(false);
- return;
- }
-
- if (app.getDiscovery().getSelectedDevice() != null) {
- // Whether application that had been started before whether other apps
- try {
- GoogleApiClient client = app.getController().getGoogleApiClient();
- if (client == null || (!client.isConnected())) {
- // Request in connection queuing
- callback.onResponse(false);
- return;
- }
- callback.onResponse(true);
- } catch (IllegalStateException e) {
- callback.onResponse(false);
- }
- }
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/core/AppLocalMediaFile.java b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/core/AppLocalMediaFile.java
deleted file mode 100644
index 75787de60d..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/core/AppLocalMediaFile.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- AppLocalMediaFile.java
- Copyright (c) 2019 NTT DOCOMO,INC.
- Released under the MIT license
- http://opensource.org/licenses/mit-license.php
- */
-package org.deviceconnect.android.deviceplugin.chromecast.core;
-
-import android.content.Context;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-public class AppLocalMediaFile implements MediaFile {
-
- final File mFile;
-
- public AppLocalMediaFile(final File file) {
- mFile = file;
- }
-
- @Override
- public String getName() {
- return mFile.getName();
- }
-
- @Override
- public InputStream open(final Context context) throws IOException {
- return new FileInputStream(mFile);
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/core/ChromeCastController.java b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/core/ChromeCastController.java
deleted file mode 100755
index 8283e46a1d..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/core/ChromeCastController.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
- ChromeCastApplication.java
- Copyright (c) 2014 NTT DOCOMO,INC.
- Released under the MIT license
- http://opensource.org/licenses/mit-license.php
- */
-package org.deviceconnect.android.deviceplugin.chromecast.core;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.util.Log;
-
-import com.google.android.gms.cast.Cast;
-import com.google.android.gms.cast.Cast.ApplicationConnectionResult;
-import com.google.android.gms.cast.CastDevice;
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.api.GoogleApiClient;
-import com.google.android.gms.common.api.ResultCallback;
-import com.google.android.gms.common.api.Status;
-
-import org.deviceconnect.android.deviceplugin.chromecast.BuildConfig;
-
-import java.util.ArrayList;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Chromecast Controller クラス.
- *
- * アプリケーションIDに対応したReceiverアプリのコントロール
- *
- * @author NTT DOCOMO, INC.
- */
-public class ChromeCastController implements
- GoogleApiClient.ConnectionCallbacks,
- GoogleApiClient.OnConnectionFailedListener {
- /** ロックオブジェクト. */
-// private final Object mLockObj = new Object();
-
- /** 出力するログのタグ名. */
- private static final String TAG = ChromeCastController.class.getSimpleName();
- /** 選択したデバイスの情報. */
- private CastDevice mSelectedDevice;
- /** GoogleAPIClient. */
- private GoogleApiClient mApiClient;
- /** Castのリスナー. */
- private Cast.Listener mCastListener;
- /** コンテキスト. */
- private Context mContext;
- /** アプリID. */
- private String mAppId;
- /** ChromecastAttach/Detach用のコールバック群. */
- private ArrayList mCallbacks;
- /** Chromecast接続完了用のコールバック群. */
- private Result mResult;
- /** Application接続フラグ. */
- private boolean mIsApplicationDisconnected = false;
-
- /**
- * Chromecastとの接続結果を通知するコールバックのインターフェース.
- *
- * @author NTT DOCOMO, INC.
- */
- public interface Result {
- /**
- * ChromeCastと接続されたことを通知する。
- */
- void onChromeCastConnected();
-
- }
- /**
- * ChromecastAttach/Detachイベントを通知するコールバックのインターフェース.
- * @author NTT DOCOMO, INC.
- */
- public interface Callbacks {
- /**
- * Chromecast Applicationにアタッチする.
- */
- void onAttach();
-
- /**
- * Chromecast Applicationにデタッチする.
- */
- void onDetach();
- }
-
- /**
- * コンストラクタ.
- *
- * @param context コンテキスト
- * @param appId ReceiverアプリのアプリケーションID
- */
- public ChromeCastController(final Context context, final String appId) {
- this.mContext = context;
- this.mAppId = appId;
- this.mSelectedDevice = null;
- mCallbacks = new ArrayList();
- }
-
- @Override
- public void onConnected(final Bundle connectionHint) {
- if (BuildConfig.DEBUG) {
- Log.d(TAG, "onConnected:");
- }
-
- if (mApiClient == null) {
- return;
- }
-
- if (connectionHint != null && connectionHint.getBoolean(Cast.EXTRA_APP_NO_LONGER_RUNNING)) {
- teardown();
- } else {
- launchApplication();
- }
- }
-
- @Override
- public void onConnectionSuspended(final int cause) {
- if (BuildConfig.DEBUG) {
- Log.d(TAG, "onConnectionSuspended$cause: " + cause);
- }
- }
-
- @Override
- public void onConnectionFailed(final ConnectionResult result) {
- if (BuildConfig.DEBUG) {
- Log.d(TAG, "onConnectionFailed$result: " + result.toString());
- }
- teardown();
- }
-
- /**
- * GoogleApiClientを取得する.
- *
- * 接続に失敗した場合にはnullを返却します。
- *
- * @return GoogleApiClient
- */
- public GoogleApiClient getGoogleApiClient() {
- if (!mApiClient.isConnected()) {
- // 一度切断する
- mApiClient.disconnect();
-
- Cast.CastOptions.Builder apiOptionsBuilder =
- new Cast.CastOptions.Builder(mSelectedDevice, mCastListener);
- mApiClient = new GoogleApiClient.Builder(mContext)
- .addApi(Cast.API, apiOptionsBuilder.build())
- .addConnectionCallbacks(this)
- .addOnConnectionFailedListener(this)
- .build();
- ConnectionResult result = mApiClient.blockingConnect(30, TimeUnit.SECONDS);
- if (!result.isSuccess()) {
- return null;
- }
- }
- return mApiClient;
- }
-
-
- /**
- * コールバックを登録する.
- *
- * @param callbacks 追加するコールバック
- */
- public void addCallbacks(final Callbacks callbacks) {
- this.mCallbacks.add(callbacks);
- }
-
- /**
- * 接続完了を通知するコールバックを登録する.
- *
- * @param result コールバック
- */
- public void setResult(final Result result) {
- this.mResult = result;
- }
-
- /**
- * Chromecastデバイスをセットする.
- *
- * @param selectedDevice 選択したChromecastのデバイス
- */
- public void setSelectedDevice(final CastDevice selectedDevice) {
- this.mSelectedDevice = selectedDevice;
- }
-
- /**
- * Chromecastデバイスを取得する.
- *
- * @return CastDevice
- */
- public CastDevice getSelectedDevice() {
- return mSelectedDevice;
- }
-
- /**
- * GooglePlayServiceに接続し、Receiverアプリケーションを起動する.
- *
- */
- public void connect() {
- if (mApiClient != null && mIsApplicationDisconnected) {
- mIsApplicationDisconnected = false;
- launchApplication();
- }
-
- if (mApiClient == null) {
- mIsApplicationDisconnected = false;
-
- mCastListener = new Cast.Listener() {
- @Override
- public void onApplicationDisconnected(final int statusCode) {
- if (BuildConfig.DEBUG) {
- Log.d(TAG, "onApplicationDisconnected$statusCode: " + statusCode);
- }
- mIsApplicationDisconnected = true;
- }
- @Override
- public void onApplicationStatusChanged() {
- if (BuildConfig.DEBUG) {
- Log.d(TAG, "onApplicationStatusChanged");
- }
- }
- };
-
- Cast.CastOptions.Builder apiOptionsBuilder =
- new Cast.CastOptions.Builder(mSelectedDevice, mCastListener);
- mApiClient = new GoogleApiClient.Builder(mContext)
- .addApi(Cast.API, apiOptionsBuilder.build())
- .addConnectionCallbacks(this)
- .addOnConnectionFailedListener(this)
- .build();
- mApiClient.connect();
- }
- }
-
- /**
- * Receiverアプリケーションを終了し、GooglePlayServiceから切断し、再接続する.
- *
- */
- public void reconnect() {
- stopApplication(true);
- }
-
- /**
- * Receiverアプリケーションを終了し、GooglePlayServiceから切断する.
- *
- */
- public void teardown() {
- stopApplication(false);
- }
-
- /**
- * Receiverアプリケーションを起動する.
- *
- */
- private void launchApplication() {
- if (mApiClient != null && mApiClient.isConnected()) {
- Cast.CastApi.launchApplication(mApiClient, mAppId)
- .setResultCallback((result) -> {
- Status status = result.getStatus();
- if (status.isSuccess()) {
- if (BuildConfig.DEBUG) {
- Log.d(TAG, "launchApplication$onResult: Success");
- }
- for (int i = 0; i < mCallbacks.size(); i++) {
- mCallbacks.get(i).onAttach();
- }
-
- } else {
- if (BuildConfig.DEBUG) {
- Log.d(TAG, "launchApplication$onResult: Fail");
- }
- teardown();
- }
- if (mResult != null) {
- mResult.onChromeCastConnected();
- }
- });
- }
- }
-
- /**
- * Receiverアプリケーションを停止する.
- *
- * 停止後、再接続することもできる
- *
- */
- private void stopApplication(final boolean isReconect) {
- if (mApiClient != null && mApiClient.isConnected()) {
- Cast.CastApi.stopApplication(mApiClient).setResultCallback((result) -> {
- if (result.getStatus().isSuccess()) {
- if (BuildConfig.DEBUG) {
- Log.d(TAG, "stopApplication$onResult: Success");
- }
-
- for (int i = 0; i < mCallbacks.size(); i++) {
- mCallbacks.get(i).onDetach();
- }
-
- mApiClient.disconnect();
- mApiClient = null;
- mSelectedDevice = null;
- if (isReconect) {
- launchApplication();
- }
- } else {
- if (BuildConfig.DEBUG) {
- Log.d(TAG, "stopApplication$onResult: Fail");
- }
- }
- });
- }
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/core/ChromeCastDiscovery.java b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/core/ChromeCastDiscovery.java
deleted file mode 100755
index a146cee4c4..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/core/ChromeCastDiscovery.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- ChromeCastDiscovery.java
- Copyright (c) 2014 NTT DOCOMO,INC.
- Released under the MIT license
- http://opensource.org/licenses/mit-license.php
- */
-package org.deviceconnect.android.deviceplugin.chromecast.core;
-
-import android.content.Context;
-import android.util.Log;
-
-import com.google.android.gms.cast.CastDevice;
-import com.google.android.gms.cast.framework.CastContext;
-import com.google.android.gms.cast.framework.CastSession;
-import com.google.android.gms.cast.framework.SessionManagerListener;
-
-import org.deviceconnect.android.deviceplugin.chromecast.BuildConfig;
-
-import java.util.ArrayList;
-
-/**
- * Chromecast Discovery クラス.
- *
- *
- * ReceiverアプリのアプリケーションIDに対応した、Chromecastデバイスを探索する
- *
- * @author NTT DOCOMO, INC.
- */
-public class ChromeCastDiscovery {
-
- /** 出力するログのタグ名. */
- private static final String TAG = ChromeCastDiscovery.class.getSimpleName();
- /** 選択されたデバイス. */
- private CastDevice mSelectedDevice;
- /** Chromecastとの接続状態を通知するコールバック. */
- private Callbacks mCallbacks;
- /** Route名のリスト. */
- private ArrayList mRouteNames;
-
- /**
- * Chromecastとの接続状態を通知するコールバックのインターフェース.
- * @author NTT DOCOMO, INC.
- */
- public interface Callbacks {
- /**
- * Chromecastデバイスの探索状態（発見or消失した場合）を通知する.
- * @param devices デバイス名のリスト
- */
- void onCastDeviceUpdate(final ArrayList devices);
- /**
- * Chromecastデバイスが選択されたときに通知する.
- *
- * @param selectedDevice 選択されたデバイス
- */
- void onCastDeviceSelected(final CastDevice selectedDevice);
- /**
- * Chromecastデバイスが非選択されたときに通知する.
- * @param unselectedDevice 選択されたデバイス
- */
- void onCastDeviceUnselected(final CastDevice unselectedDevice);
- }
-
- /**
- * コールバックを登録する.
- *
- * @param callbacks コールバック
- */
- public void setCallbacks(final Callbacks callbacks) {
- this.mCallbacks = callbacks;
- }
-
- /**
- * ChromeCastとの接続を管理する.
- */
- private CastContext mCastContext;
- /**
- * onEndingを通るかどうか.
- */
- private boolean mIsEnding;
-
- private SessionManagerListener mSessionListener = new SessionManagerListener() {
-
- @Override
- public void onSessionStarting(CastSession castSession) {
- if (BuildConfig.DEBUG) {
- Log.d(TAG, "================================>");
- Log.d(TAG, "SessionManagerListener.onSessionStarting");
- Log.d(TAG, "<================================");
- }
- synchronized (this) {
- CastDevice device = castSession.getCastDevice();
- if (device != null) {
- mRouteNames.add(device);
- }
- }
- mCallbacks.onCastDeviceUpdate(mRouteNames);
- }
-
- @Override
- public void onSessionStarted(CastSession castSession, String s) {
- if (BuildConfig.DEBUG) {
- Log.d(TAG, "================================>");
- Log.d(TAG, "SessionManagerListener.onSessionStarted");
- Log.d(TAG, "<================================");
- }
- mSelectedDevice = castSession.getCastDevice();
- mCallbacks.onCastDeviceSelected(mSelectedDevice);
- }
-
- @Override
- public void onSessionStartFailed(CastSession castSession, int i) {
- if (BuildConfig.DEBUG) {
- Log.d(TAG, "================================>");
- Log.d(TAG, "SessionManagerListener.onSessionStartFailed");
- Log.d(TAG, "<================================");
- }
- }
-
- @Override
- public void onSessionEnding(CastSession castSession) {
- if (BuildConfig.DEBUG) {
- Log.d(TAG, "================================>");
- Log.d(TAG, "SessionManagerListener.onSessionEnding");
- Log.d(TAG, "<================================");
- }
- mCallbacks.onCastDeviceUpdate(mRouteNames);
- mIsEnding = true;
- }
-
- @Override
- public void onSessionEnded(CastSession castSession, int i) {
- if (BuildConfig.DEBUG) {
- Log.d(TAG, "================================>");
- Log.d(TAG, "SessionManagerListener.onSessionEnded");
- Log.d(TAG, "<================================");
- }
- // WiFiをOFFにしたのちにChromeCastへリクエストを送ると、onSessionEndingが呼ばれずにこのメソッドが呼ばれる。
- if (mIsEnding) {
- mCallbacks.onCastDeviceUnselected(mSelectedDevice);
- mSelectedDevice = null;
- }
- mIsEnding = false;
- }
-
- @Override
- public void onSessionResuming(CastSession castSession, String s) {
- if (BuildConfig.DEBUG) {
- Log.d(TAG, "================================>");
- Log.d(TAG, "SessionManagerListener.onSessionResuming");
- Log.d(TAG, "<================================");
- }
- }
-
- @Override
- public void onSessionResumed(CastSession castSession, boolean b) {
- if (BuildConfig.DEBUG) {
- Log.d(TAG, "================================>");
- Log.d(TAG, "SessionManagerListener.onSessionResumed: " + b);
- Log.d(TAG, "<================================");
- }
- mSelectedDevice = castSession.getCastDevice();
- mCallbacks.onCastDeviceSelected(mSelectedDevice);
- }
-
- @Override
- public void onSessionResumeFailed(CastSession castSession, int i) {
- if (BuildConfig.DEBUG) {
- Log.d(TAG, "================================>");
- Log.d(TAG, "SessionManagerListener.onSessionResumeFailed");
- Log.d(TAG, "<================================");
- }
- }
-
- @Override
- public void onSessionSuspended(CastSession castSession, int i) {
- if (BuildConfig.DEBUG) {
- Log.d(TAG, "================================>");
- Log.d(TAG, "SessionManagerListener.onSessionSuspended");
- Log.d(TAG, "<================================");
- }
- mCallbacks.onCastDeviceUnselected(mSelectedDevice);
- }
- };
-
- /**
- * コンストラクタ.
- *
- * ReceiverアプリのアプリケーションIDに対応した、Chromecastデバイスの探索を開始する.
- *
- *
- * @param context コンテキスト
- */
- public ChromeCastDiscovery(final Context context) {
- mCastContext = CastContext.getSharedInstance(context);
- mIsEnding = false;
- setListener();
- mRouteNames = new ArrayList<>();
- }
-
- /**
- * Listenerを登録する.
- */
- private void setListener() {
- mCastContext.getSessionManager().removeSessionManagerListener(mSessionListener, CastSession.class);
- mCastContext.getSessionManager().addSessionManagerListener(
- mSessionListener, CastSession.class);
- }
-
-
- /**
- * 選択されたChromecastデバイスを返す.
- *
- * @return 選択されたデバイス
- */
- public CastDevice getSelectedDevice() {
- return mSelectedDevice;
- }
-
- /**
- * 接続可能なChromecastデバイスのデバイス名のリストを返す.
- *
- * @return デバイス名のリスト
- */
- public ArrayList getDeviceNames() {
- return mRouteNames;
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/core/ChromeCastHttpServer.java b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/core/ChromeCastHttpServer.java
deleted file mode 100755
index afdaa2bcd9..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/core/ChromeCastHttpServer.java
+++ /dev/null
@@ -1,342 +0,0 @@
-/*
- ChromeCastHttpServer.java
- Copyright (c) 2014 NTT DOCOMO,INC.
- Released under the MIT license
- http://opensource.org/licenses/mit-license.php
- */
-package org.deviceconnect.android.deviceplugin.chromecast.core;
-
-import android.content.Context;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-
-import org.deviceconnect.android.deviceplugin.chromecast.BuildConfig;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.SocketException;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Logger;
-
-import fi.iki.elonen.NanoHTTPD;
-
-/**
- * Chromecast HttpServer クラス.
- *
- *
- * HttpServer機能を提供
- * @author NTT DOCOMO, INC.
- */
-public class ChromeCastHttpServer extends NanoHTTPD {
-
- /** Local IP Address prefix. */
- private static final String PREFIX_LOCAL_IP = "192.168.";
- enum NetworkStatus
- {
- OFF, WIFI, MOBILE, WIMAX, BLUETOOTH, ETHERNET;
- }
- /** Logger. */
- private final Logger mLogger = Logger.getLogger("chromecast.dplugin");
-
- /** The List of media files. */
- private final List mFileList = new ArrayList();
-
- private Context mContext;
- /**
- * コンストラクタ.
- *
- * @param host ipアドレス
- * @param port ポート番号
- */
- public ChromeCastHttpServer(final Context context, final String host, final int port) {
- super(host, port);
- mContext = context;
- }
-
- /**
- * クライアントに応答する.
- *
- * @param session セッション
- * @return レスポンス
- */
- public Response serve(final IHTTPSession session) {
- mLogger.info("Received HTTP request: " + session.getUri());
-
- Map header = session.getHeaders();
- String uri = session.getUri();
- return respond(Collections.unmodifiableMap(header), session, uri);
- }
-
- /**
- * 指定されたファイルを公開する.
- *
- * @param file 公開するファイル
- * @return 公開用URI
- */
- public String exposeFile(final MediaFile file) {
- synchronized (mFileList) {
- mFileList.add(file);
- }
- String address = getIpAddress();
- if (address == null) {
- return null;
- }
- return "http://" + address + ":" + getListeningPort() + "/" + file.getName();
- }
-
- /**
- * クライアントをチェックする.
- *
- * @param headers ヘッダー
- * @return 有効か否か (true: 有効, false: 無効)
- */
- private boolean checkRemote(final Map headers) {
- String remoteAddr = headers.get("remote-addr");
- try {
- InetAddress addr = InetAddress.getByName(remoteAddr);
- return addr.isSiteLocalAddress();
- } catch (UnknownHostException e) {
- if (BuildConfig.DEBUG) {
- e.printStackTrace();
- }
- return false;
- }
- }
-
- /**
- * クライアントへのレスポンスを作成する.
- *
- * @param headers ヘッダー
- * @param session セッション
- * @param uri ファイルのURI
- * @return レスポンス
- */
- private Response respond(final Map headers, final IHTTPSession session, final String uri) {
- if (!checkRemote(headers)) {
- return createResponse(Response.Status.FORBIDDEN, NanoHTTPD.MIME_PLAINTEXT, "");
- }
-
- MediaFile mediaFile = findFile(uri);
- if (mediaFile == null) {
- mLogger.info("File not found: URI=" + uri);
- return createResponse(Response.Status.NOT_FOUND, NanoHTTPD.MIME_PLAINTEXT, "");
- }
- mLogger.info("Found File: " + mediaFile.getName());
-
- Response response = serveFile(headers, mediaFile, "");
- if (response == null) {
- return createResponse(Response.Status.NOT_FOUND, NanoHTTPD.MIME_PLAINTEXT, "");
- }
- return response;
- }
-
- /**
- * 指定したURIで公開しているファイルを検索する.
- *
- * @param uri ファイル公開用URI
- * @return 検索により見つかったファイル. 見つからなかった場合はnull
- */
- private MediaFile findFile(final String uri) {
- synchronized (mFileList) {
- for (MediaFile file : mFileList) {
- mLogger.info(" - " + file.getName());
- if (uri.equals("/" + file.getName())) {
- return file;
- }
- }
- }
- return null;
- }
-
- /**
- * レスポンスを作成する.
- *
- * @param status ステータス
- * @param mimeType MIMEタイプ
- * @param message メッセージ (InputStream)
- * @param length 送信するデータ長
- * @return レスポンス
- */
- private Response createResponse(final Response.Status status,
- final String mimeType,
- final InputStream message,
- final int length) {
- Response res = new Response(status, mimeType, message);
- res.setContentLength(length);
- res.addHeader("Accept-Ranges", "bytes");
- return res;
- }
-
- /**
- * レスポンスを作成する.
- *
- * @param status ステータス
- * @param mimeType MIMEタイプ
- * @param message メッセージ (String)
- * @return レスポンス
- */
- private Response createResponse(final Response.Status status,
- final String mimeType,
- final String message) {
- Response res = new Response(status, mimeType, message);
- res.addHeader("Accept-Ranges", "bytes");
- return res;
- }
-
- /**
- * IPアドレスを取得する.
- *
- * @return IPアドレス
- */
- private String getIpAddress() {
- try {
- Enumeration networkInterfaces = NetworkInterface
- .getNetworkInterfaces();
- LinkedList localAddresses = new LinkedList();
- while (networkInterfaces.hasMoreElements()) {
- NetworkInterface networkInterface = networkInterfaces
- .nextElement();
- Enumeration ipAddrs = networkInterface
- .getInetAddresses();
- while (ipAddrs.hasMoreElements()) {
- InetAddress ip = ipAddrs.nextElement();
- String ipStr = ip.getHostAddress();
-
- mLogger.info("Searching IP Address: Address=" + ipStr
- + " isLoopback=" + ip.isLoopbackAddress()
- + " isSiteLocal=" + ip.isSiteLocalAddress());
- NetworkStatus status = NetworkStatus.OFF;
-
- NetworkInfo info = ((ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE)).getActiveNetworkInfo();
-
- if ( info != null )
- {
- if ( info.isConnected() )
- {
- switch ( info.getType() )
- {
- case ConnectivityManager.TYPE_WIFI: // Wifi
- status = NetworkStatus.WIFI;
- break;
- case ConnectivityManager.TYPE_MOBILE_DUN: // Mobile 3G
- case ConnectivityManager.TYPE_MOBILE_HIPRI:
- case ConnectivityManager.TYPE_MOBILE_MMS:
- case ConnectivityManager.TYPE_MOBILE_SUPL:
- case ConnectivityManager.TYPE_MOBILE:
- status = NetworkStatus.MOBILE;
- break;
- case ConnectivityManager.TYPE_BLUETOOTH: // Bluetooth
- status = NetworkStatus.BLUETOOTH;
- break;
- case ConnectivityManager.TYPE_ETHERNET: // Ethernet
- status = NetworkStatus.ETHERNET;
- break;
- }
- }
- }
- // ipv6を除外
- if (ipStr.indexOf("127.0.0.1") == -1
- && ipStr.indexOf("::") == -1 && (status == NetworkStatus.WIFI
- || status == NetworkStatus.ETHERNET)) {
- localAddresses.addFirst(ip);
- }
- }
- }
- if (localAddresses.size() == 0) {
- return null;
- }
- return localAddresses.get(0).getHostAddress();
- } catch (SocketException e) {
- if (BuildConfig.DEBUG) {
- e.printStackTrace();
- }
- }
- return null;
- }
-
- /**
- * ファイルのレスポンスを作成する.
- *
- * @param header ヘッダー
- * @param file ファイル
- * @param mime MIMEタイプ
- * @return レスポンス
- */
- Response serveFile(final Map header, final MediaFile file, final String mime) {
-
- Response res;
- try {
- InputStream in = file.open(mContext);
-
- long fileLen = in.available();
- String etag = Integer.toHexString((file.getName() + "" + fileLen).hashCode());
-
- long startFrom = 0;
- long endAt = -1;
- String range = header.get("range");
- if (range != null) {
- if (range.startsWith("bytes=")) {
- range = range.substring("bytes=".length());
- int minus = range.indexOf('-');
- try {
- if (minus > 0) {
- startFrom = Long.parseLong(range
- .substring(0, minus));
- endAt = Long.parseLong(range.substring(minus + 1));
- }
- } catch (NumberFormatException ignored) {
- if (BuildConfig.DEBUG) {
- ignored.printStackTrace();
- }
- }
- }
- }
-
- if (range != null && startFrom >= 0) {
- if (startFrom >= fileLen) {
- res = createResponse(Response.Status.RANGE_NOT_SATISFIABLE, NanoHTTPD.MIME_PLAINTEXT, "");
- res.addHeader("Content-Range", "bytes 0-0/" + fileLen);
- res.addHeader("ETag", etag);
- } else {
- if (endAt < 0) {
- endAt = fileLen - 1;
- }
- long newLen = endAt - startFrom + 1;
- if (newLen < 0) {
- newLen = 0;
- }
-
- in.skip(startFrom);
- res = createResponse(Response.Status.PARTIAL_CONTENT, mime, in, (int) newLen);
- res.addHeader("Content-Length", "" + newLen);
- res.addHeader("Content-Range", "bytes " + startFrom + "-" + endAt + "/" + fileLen);
- res.addHeader("ETag", etag);
- }
- } else {
- if (etag.equals(header.get("if-none-match"))) {
- res = createResponse(Response.Status.NOT_MODIFIED, mime, "");
- } else {
- res = createResponse(Response.Status.OK, mime, in, in.available());
- res.addHeader("Content-Length", "" + fileLen);
- res.addHeader("ETag", etag);
- }
- }
- } catch (IOException ioe) {
- res = createResponse(Response.Status.FORBIDDEN, NanoHTTPD.MIME_PLAINTEXT, "");
- }
-
- return res;
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/core/ChromeCastMediaPlayer.java b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/core/ChromeCastMediaPlayer.java
deleted file mode 100755
index f37b7b6239..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/core/ChromeCastMediaPlayer.java
+++ /dev/null
@@ -1,392 +0,0 @@
-/*
- ChromeCastMediaPlayer.java
- Copyright (c) 2014 NTT DOCOMO,INC.
- Released under the MIT license
- http://opensource.org/licenses/mit-license.php
- */
-package org.deviceconnect.android.deviceplugin.chromecast.core;
-
-import android.content.Intent;
-import android.webkit.MimeTypeMap;
-
-import com.google.android.gms.cast.Cast;
-import com.google.android.gms.cast.MediaInfo;
-import com.google.android.gms.cast.MediaMetadata;
-import com.google.android.gms.cast.MediaStatus;
-import com.google.android.gms.cast.RemoteMediaPlayer;
-import com.google.android.gms.cast.RemoteMediaPlayer.MediaChannelResult;
-import com.google.android.gms.common.api.ResultCallback;
-
-import org.deviceconnect.android.deviceplugin.chromecast.BuildConfig;
-
-import java.util.Locale;
-
-/**
- * Chromecast MediaPlayer クラス.
- *
- *
- * MediaPlayer機能を提供する
- *
- * @author NTT DOCOMO, INC.
- */
-public class ChromeCastMediaPlayer implements ChromeCastController.Callbacks {
-
- /** Chromecast Controller. */
- private ChromeCastController mController;
- /** RemoteMediaPlayer. */
- private RemoteMediaPlayer mRemoteMediaPlayer;
- /** Chromecastの再生状態を受け取るコールバック. */
- private Callbacks mCallbacks;
- /** Chromecastのファイルロード有効フラグ. */
- private boolean mIsLoadEnable = false;
-
- /**
- * Chromecastの再生状態を通知するためのコールバックのインターフェース.
- * @author NTT DOCOMO, INC.
- */
- public interface Callbacks {
- /**
- * 再生状態を通知する.
- *
- * @param status メディアのステータス
- */
- void onChromeCastMediaPlayerStatusUpdate(final MediaStatus status);
- /**
- * 再生処理の結果を通知する.
- *
- * @param response レスポンス
- * @param result 再生処理結果
- * @param message 再生処理のステータス
- */
- void onChromeCastMediaPlayerResult(final Intent response,
- final MediaChannelResult result, final String message);
- }
-
- /**
- * コールバックを登録する.
- *
- * @param callbacks コールバック
- */
- public void setCallbacks(final Callbacks callbacks) {
- this.mCallbacks = callbacks;
- }
-
- /**
- * コンストラクタ.
- *
- * @param controller ChromeCastApplication
- */
- public ChromeCastMediaPlayer(final ChromeCastController controller) {
- mController = controller;
- mController.addCallbacks(this);
- }
-
- /**
- * デバイスが有効か否かを返す.
- * @return デバイスが有効か否か（有効: true, 無効: false）
- */
- public boolean isDeviceEnable() {
- try {
- return (mController.getGoogleApiClient() != null);
- } catch (IllegalStateException e) {
- if (BuildConfig.DEBUG) {
- e.printStackTrace();
- }
- return false;
- }
- }
- @Override
- public void onAttach() {
- mRemoteMediaPlayer = new RemoteMediaPlayer();
- mRemoteMediaPlayer.setOnStatusUpdatedListener(() -> {
- if (mRemoteMediaPlayer.getMediaStatus() == null) {
- return;
- }
- mCallbacks.onChromeCastMediaPlayerStatusUpdate(mRemoteMediaPlayer.getMediaStatus());
- });
- mRemoteMediaPlayer.setOnMetadataUpdatedListener(() -> {
- });
-
- try {
- Cast.CastApi.setMessageReceivedCallbacks(mController.getGoogleApiClient(),
- mRemoteMediaPlayer.getNamespace(), mRemoteMediaPlayer);
- } catch (Exception e) {
- if (BuildConfig.DEBUG) {
- e.printStackTrace();
- }
- }
- }
-
- @Override
- public void onDetach() {
- if (mRemoteMediaPlayer != null) {
- try {
- Cast.CastApi.removeMessageReceivedCallbacks(mController.getGoogleApiClient(),
- mRemoteMediaPlayer.getNamespace());
- } catch (Exception e) {
- if (BuildConfig.DEBUG) {
- e.printStackTrace();
- }
- }
- mRemoteMediaPlayer = null;
- }
- }
-
- /**
- * メディアをロードする.
- *
- * @param response レスポンス
- * @param url メディアのURL
- * @param title メディアのタイトル
- */
- public void load(final Intent response, final String url, final String title) {
- MediaInfo mediaInfo;
-
- MediaMetadata mediaMetadata = new MediaMetadata(MediaMetadata.MEDIA_TYPE_MOVIE);
- mediaMetadata.putString(MediaMetadata.KEY_TITLE, title);
- String ext = MimeTypeMap.getFileExtensionFromUrl(url).toLowerCase(Locale.getDefault());
- String mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(ext);
- if (mimeType == null || mimeType.isEmpty()) {
- mimeType = "application/octet-stream";
- }
- mediaInfo = new MediaInfo.Builder(url).setContentType(mimeType)
- .setStreamType(MediaInfo.STREAM_TYPE_BUFFERED)
- .setMetadata(mediaMetadata).build();
- if (mRemoteMediaPlayer != null) {
- try {
- mRemoteMediaPlayer
- .load(mController.getGoogleApiClient(), mediaInfo, false)
- .setResultCallback((result) -> {
- if (result.getStatus().isSuccess()) {
- mIsLoadEnable = true;
- } else {
- mIsLoadEnable = false;
- }
- mCallbacks.onChromeCastMediaPlayerResult(response, result, "load");
- });
- } catch (Exception e) {
- if (BuildConfig.DEBUG) {
- e.printStackTrace();
- }
- mCallbacks.onChromeCastMediaPlayerResult(response, null, "load");
- }
- }
- }
-
- /**
- * メディアをプレイする.
- *
- * @param response レスポンス
- */
- public void play(final Intent response) {
- MediaInfo mediaInfo = null;
- if (mIsLoadEnable) {
- mediaInfo = mRemoteMediaPlayer.getMediaInfo();
- }
-
- try {
- if (mRemoteMediaPlayer != null) {
- mRemoteMediaPlayer.load(mController.getGoogleApiClient(), mediaInfo, true).setResultCallback(
- (result) -> {
- mCallbacks.onChromeCastMediaPlayerResult(response, result, "load");
- });
- }
- } catch (Exception e) {
- if (BuildConfig.DEBUG) {
- e.printStackTrace();
- }
- mCallbacks.onChromeCastMediaPlayerResult(response, null, "load");
- }
- }
-
- /**
- * メディアをレジュームする.
- *
- * @param response レスポンス
- */
- public void resume(final Intent response) {
- try {
- if (mRemoteMediaPlayer != null) {
- mRemoteMediaPlayer.play(mController.getGoogleApiClient()).setResultCallback(
- (result) -> {
- mCallbacks.onChromeCastMediaPlayerResult(response, result,null);
- });
- }
- } catch (Exception e) {
- if (BuildConfig.DEBUG) {
- e.printStackTrace();
- }
- mCallbacks.onChromeCastMediaPlayerResult(response, null, null);
- }
- }
-
- /**
- * メディアを停止する.
- *
- * @param response レスポンス
- */
- public void stop(final Intent response) {
- try {
- if (mRemoteMediaPlayer != null) {
- mRemoteMediaPlayer.stop(mController.getGoogleApiClient()).setResultCallback(
- (result) -> {
- mCallbacks.onChromeCastMediaPlayerResult(response, result,null);
- });
- }
- } catch (Exception e) {
- if (BuildConfig.DEBUG) {
- e.printStackTrace();
- }
- mCallbacks.onChromeCastMediaPlayerResult(response, null, null);
- }
- }
-
- /**
- * メディアを一時停止する.
- *
- * @param response レスポンス
- */
- public void pause(final Intent response) {
- try {
- if (mRemoteMediaPlayer != null) {
- mRemoteMediaPlayer.pause(mController.getGoogleApiClient()).setResultCallback(
- (result) -> {
- mCallbacks.onChromeCastMediaPlayerResult(response, result,null);
- });
- }
- } catch (Exception e) {
- if (BuildConfig.DEBUG) {
- e.printStackTrace();
- }
- mCallbacks.onChromeCastMediaPlayerResult(response, null, null);
- }
- }
- /**
- * メディアをミュートする.
- *
- * @param response レスポンス
- * @param mute ミュートするか否か (true: ミュートON, false: ミュートOFF)
- */
- public void setMute(final Intent response, final boolean mute) {
- try {
- if (mRemoteMediaPlayer != null) {
- mRemoteMediaPlayer
- .setStreamMute(mController.getGoogleApiClient(), mute)
- .setResultCallback(
- (result) -> {
- mCallbacks.onChromeCastMediaPlayerResult(response, result,null);
- });
- }
- } catch (Exception e) {
- if (BuildConfig.DEBUG) {
- e.printStackTrace();
- }
- mCallbacks.onChromeCastMediaPlayerResult(response, null, null);
- }
- }
-
- /**
- * メディアのミュートの状態を取得する.
- *
- * @param response レスポンス
- * @return ミュート状態 (1:ミュートON, 0: ミュートOFF)
- */
- public int getMute(final Intent response) {
- if (mRemoteMediaPlayer == null) {
- return -1;
- }
- if (mRemoteMediaPlayer.getMediaStatus().isMute()) {
- return 1;
- } else {
- return 0;
- }
- }
-
- /**
- * メディアのボリュームを設定する.
- *
- * @param response レスポンス
- * @param volume ボリューム (0.0 <= volume <= 1.0)
- */
- public void setVolume(final Intent response, final double volume) {
- try {
- if (mRemoteMediaPlayer != null) {
- mRemoteMediaPlayer
- .setStreamVolume(mController.getGoogleApiClient(), volume)
- .setResultCallback((result) -> {
- mCallbacks.onChromeCastMediaPlayerResult(response, result,
- null);
- });
- }
- } catch (Exception e) {
- if (BuildConfig.DEBUG) {
- e.printStackTrace();
- }
- mCallbacks.onChromeCastMediaPlayerResult(response, null, null);
- }
- }
-
- /**
- * メディアのボリュームを取得する.
- *
- * @param response レスポンス
- * @return volume ボリューム (0 <= volume <= 1.0, -1: エラー)
- */
- public double getVolume(final Intent response) {
- if (mRemoteMediaPlayer != null) {
- return mRemoteMediaPlayer.getMediaStatus().getStreamVolume();
- } else {
- return -1;
- }
- }
-
- /**
- * メディアのシークを設定する.
- *
- * @param response レスポンス
- * @param pos ポジション
- */
- public void setSeek(final Intent response, final long pos) {
- try {
- if (mRemoteMediaPlayer != null) {
- mRemoteMediaPlayer
- .seek(mController.getGoogleApiClient(), pos)
- .setResultCallback((result) -> {
- mCallbacks.onChromeCastMediaPlayerResult(response, result,null);
- });
- }
- } catch (Exception e) {
- if (BuildConfig.DEBUG) {
- e.printStackTrace();
- }
- mCallbacks.onChromeCastMediaPlayerResult(response, null, null);
- }
- }
-
- /**
- * メディアのシークを取得する.
- *
- * @param response レスポンス
- * @return pos ポジション (-1: エラー)
- */
- public long getSeek(final Intent response) {
- if (mRemoteMediaPlayer != null) {
- return mRemoteMediaPlayer.getApproximateStreamPosition();
- } else {
- return -1;
- }
- }
-
- /**
- * メディアの状態を取得する.
- *
- * @return status メディアの状態
- */
- public MediaStatus getMediaStatus() {
- if (mRemoteMediaPlayer != null) {
- return mRemoteMediaPlayer.getMediaStatus();
- } else {
- return null;
- }
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/core/ChromeCastMessage.java b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/core/ChromeCastMessage.java
deleted file mode 100755
index bf30cd4217..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/core/ChromeCastMessage.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- ChromeCastMessage.java
- Copyright (c) 2014 NTT DOCOMO,INC.
- Released under the MIT license
- http://opensource.org/licenses/mit-license.php
- */
-package org.deviceconnect.android.deviceplugin.chromecast.core;
-
-import android.content.Intent;
-
-import com.google.android.gms.cast.Cast;
-import com.google.android.gms.cast.Cast.MessageReceivedCallback;
-import com.google.android.gms.cast.CastDevice;
-import com.google.android.gms.common.api.ResultCallback;
-import com.google.android.gms.common.api.Status;
-
-import org.deviceconnect.android.deviceplugin.chromecast.BuildConfig;
-
-/**
- * Chromecast Message クラス.
- *
- *
- * メッセージ機能を提供する
- *
- * @author NTT DOCOMO, INC.
- */
-public class ChromeCastMessage implements ChromeCastController.Callbacks {
-
- /** Message Channel. */
- private MessageChannel mMessageChannel;
- /** Chromecast Application. */
- private ChromeCastController mApplication;
- /** メッセージの宛先. */
- private String mUrn = null;
- /** メッセージのコールバック. */
- private Callbacks mCallbacks;
-
- /**
- * Chromecastでのメッセージの受信状況を通知する.
- *
- * @author NTT DOCOMO, INC.
- *
- */
- private class MessageChannel implements MessageReceivedCallback {
-
- /**
- * メッセージの宛先.
- */
- private String mUrn = null;
-
- /**
- * コンストラクタ.
- *
- * @param urn メッセージの宛先(名前空間)
- */
- public MessageChannel(final String urn) {
- this.mUrn = urn;
- }
-
- /**
- * メッセージの宛先(名前空間)を取得する.
- *
- * @return 名前空間
- */
- public String getNamespace() {
- return mUrn;
- }
-
- @Override
- public void onMessageReceived(final CastDevice castDevice, final String namespace, final String message) {
- }
- }
-
- /**
- * Chromecastでのメッセージ処理の結果を通知するコールバックのインターフェース.
- *
- * @author NTT DOCOMO, INC.
- */
- public interface Callbacks {
- /**
- * メッセージ処理の結果を通知する.
- *
- * @param response レスポンス
- * @param result メッセージ処理結果
- * @param message メッセージ処理のステータス
- */
- void onChromeCastMessageResult(final Intent response, final Status result, final String message);
- }
-
- /**
- * コールバックを登録する.
- *
- * @param callbacks コールバック
- */
- public void setCallbacks(final Callbacks callbacks) {
- this.mCallbacks = callbacks;
- }
-
- /**
- * コンストラクタ.
- *
- * @param application ChromeCastApplication
- * @param urn メッセージの宛先(名前空間)
- */
- public ChromeCastMessage(final ChromeCastController application, final String urn) {
- this.mApplication = application;
- this.mApplication.addCallbacks(this);
- this.mUrn = urn;
- }
-
- /**
- * デバイスが有効か否かを返す.
- *
- * @return デバイスが有効か否か（有効: true, 無効: false）
- */
- public boolean isDeviceEnable() {
- try {
- return (mApplication.getGoogleApiClient() != null);
- } catch (IllegalStateException e) {
- if (BuildConfig.DEBUG) {
- e.printStackTrace();
- }
- return false;
- }
- }
- @Override
- public void onAttach() {
- mMessageChannel = new MessageChannel(this.mUrn);
- try {
- Cast.CastApi.setMessageReceivedCallbacks(mApplication.getGoogleApiClient(),
- mMessageChannel.getNamespace(), mMessageChannel);
- } catch (Exception e) {
- if (BuildConfig.DEBUG) {
- e.printStackTrace();
- }
- }
- }
-
- @Override
- public void onDetach() {
- if (mMessageChannel != null) {
- try {
- Cast.CastApi.removeMessageReceivedCallbacks(mApplication.getGoogleApiClient(),
- mMessageChannel.getNamespace());
- } catch (Exception e) {
- if (BuildConfig.DEBUG) {
- e.printStackTrace();
- }
- }
- mMessageChannel = null;
- }
- }
-
- /**
- * メッセージを送信する.
- *
- * @param response レスポンス
- * @param message メッセージ
- */
- public void sendMessage(final Intent response, final String message) {
- try {
- if (mApplication.getGoogleApiClient() != null && mMessageChannel != null) {
- Cast.CastApi.sendMessage(mApplication.getGoogleApiClient(),
- mMessageChannel.getNamespace(), message)
- .setResultCallback((result) -> {
- mCallbacks.onChromeCastMessageResult(response, result, null);
- });
- }
- } catch (Exception e) {
- mCallbacks.onChromeCastMessageResult(response, null, null);
- }
- }
-
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/core/MediaFile.java b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/core/MediaFile.java
deleted file mode 100644
index 080dd13587..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/core/MediaFile.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- MediaFile.java
- Copyright (c) 2015 NTT DOCOMO,INC.
- Released under the MIT license
- http://opensource.org/licenses/mit-license.php
- */
-package org.deviceconnect.android.deviceplugin.chromecast.core;
-
-
-import android.content.Context;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * Media file.
- * @author NTT DOCOMO, INC.
- */
-public interface MediaFile {
-
- /**
- * Get the name to expose a media file.
- * @return the path to expose a media file
- */
- String getName();
-
- /**
- * メディアの内容を取得するための入力ストリームを開く.
- *
- * @param context コンテキスト
- * @return 入力ストリーム
- * @throws IOException 入力ストリームの取得に失敗した場合
- */
- InputStream open(Context context) throws IOException;
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/core/MediaStoreContent.java b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/core/MediaStoreContent.java
deleted file mode 100644
index b8c27aba6a..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/core/MediaStoreContent.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- MediaStoreContent.java
- Copyright (c) 2019 NTT DOCOMO,INC.
- Released under the MIT license
- http://opensource.org/licenses/mit-license.php
- */
-package org.deviceconnect.android.deviceplugin.chromecast.core;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-public class MediaStoreContent implements MediaFile {
-
- private final Uri mMediaUri;
-
- public MediaStoreContent(final Uri mediaUri) {
- if (mediaUri.getPathSegments() == null) {
- throw new IllegalArgumentException("mediaUri has no mediaId");
- }
- mMediaUri = mediaUri;
- }
-
- @Override
- public String getName() {
- return mMediaUri.getLastPathSegment();
- }
-
- @Override
- public InputStream open(final Context context) throws IOException {
- ContentResolver resolver = context.getContentResolver();
- return resolver.openInputStream(mMediaUri);
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/core/package-info.java b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/core/package-info.java
deleted file mode 100755
index 21a4a11f51..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/core/package-info.java
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- org.deviceconnect.android.deviceplugin.chromecast.core
- Copyright (c) 2014 NTT DOCOMO,INC.
- Released under the MIT license
- http://opensource.org/licenses/mit-license.php
- */
-
-/**
- * Chromecastの管理を行う.
- */
-package org.deviceconnect.android.deviceplugin.chromecast.core;
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/package-info.java b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/package-info.java
deleted file mode 100755
index 5327c14a83..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/package-info.java
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- org.deviceconnect.android.deviceplugin.chromecast
- Copyright (c) 2014 NTT DOCOMO,INC.
- Released under the MIT license
- http://opensource.org/licenses/mit-license.php
- */
-
-/**
- * Device Connect Chromecast DevicePlugin の基本クラスを提供する.
- */
-package org.deviceconnect.android.deviceplugin.chromecast;
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/profile/ChromeCastCanvasProfile.java b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/profile/ChromeCastCanvasProfile.java
deleted file mode 100644
index cde03fa17b..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/profile/ChromeCastCanvasProfile.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- ChromeCastCanvasProfile.java
- Copyright (c) 2015 NTT DOCOMO,INC.
- Released under the MIT license
- http://opensource.org/licenses/mit-license.php
- */
-package org.deviceconnect.android.deviceplugin.chromecast.profile;
-
-import android.content.Intent;
-import android.webkit.URLUtil;
-
-import org.deviceconnect.android.deviceplugin.chromecast.ChromeCastService;
-import org.deviceconnect.android.deviceplugin.chromecast.core.AppLocalMediaFile;
-import org.deviceconnect.android.deviceplugin.chromecast.core.ChromeCastDiscovery;
-import org.deviceconnect.android.deviceplugin.chromecast.core.ChromeCastHttpServer;
-import org.deviceconnect.android.deviceplugin.chromecast.core.ChromeCastMessage;
-import org.deviceconnect.android.deviceplugin.chromecast.core.MediaFile;
-import org.deviceconnect.android.message.MessageUtils;
-import org.deviceconnect.android.profile.CanvasProfile;
-import org.deviceconnect.android.profile.api.DConnectApi;
-import org.deviceconnect.android.profile.api.DeleteApi;
-import org.deviceconnect.android.profile.api.PostApi;
-import org.deviceconnect.message.DConnectMessage;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.logging.Logger;
-
-/**
- * Canvas Profile (Chromecast).
- *
- * @author NTT DOCOMO, INC.
- */
-public class ChromeCastCanvasProfile extends CanvasProfile implements ChromeCastConstants {
-
- /**
- * Error message when Chromecast is not enabled.
- */
- private static final String ERROR_MESSAGE_DEVICE_NOT_ENABLED = "Chromecast is not enabled.";
-
- /**
- * Prefix of image file name.
- */
- private static final String PREFIX = "dConnectDeviceChromecast_";
-
- /**
- * The instance of {@link java.text.SimpleDateFormat}.
- */
- private static final SimpleDateFormat FORMAT = new SimpleDateFormat("yyyyMMddHHmmss");
-
- /**
- * Logger.
- */
- private final Logger mLogger = Logger.getLogger("chromecast.dplugin");
-
-
-
- public ChromeCastCanvasProfile() {
- addApi(mPostDrawImageApi);
- addApi(mDeleteDrawImageApi);
- }
-
- /**
- * Generates an image file name.
- *
- * @return an image file name
- */
- private static String generateFileName() {
- Date timestamp = new Date(System.currentTimeMillis());
- return PREFIX + FORMAT.format(timestamp);
- }
-
- private final DConnectApi mPostDrawImageApi = new PostApi() {
- @Override
- public String getAttribute() {
- return CanvasProfile.ATTRIBUTE_DRAW_IMAGE;
- }
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- final String mimeType = CanvasProfile.getMIMEType(request);
- final String serviceId = getServiceID(request);
- final byte[] data = CanvasProfile.getData(request);
- final String uri = CanvasProfile.getURI(request);
- final double x = CanvasProfile.getX(request);
- final double y = CanvasProfile.getY(request);
- final String mode = CanvasProfile.getMode(request);
- ((ChromeCastService) getContext()).connectChromeCast(serviceId, (connected) -> {
- if (!connected) {
- MessageUtils.setIllegalDeviceStateError(response, "The chromecast is not in local network.");
- sendResponse(response);
- return;
- }
- if (data == null && uri == null) {
- MessageUtils.setInvalidRequestParameterError(response, "data is not specified.");
- sendResponse(response);
- return;
- }
- if (mimeType != null && !mimeType.contains("image")) {
- MessageUtils.setInvalidRequestParameterError(response,
- "Unsupported mimeType: " + mimeType);
- sendResponse(response);
- return;
- }
-
- if (uri != null && !URLUtil.isHttpsUrl(uri) && !URLUtil.isHttpUrl(uri)) {
- MessageUtils.setInvalidRequestParameterError(response, "uri is not invalid.");
- sendResponse(response);
- return;
- }
-
- try {
- String path;
- if (data != null) {
- path = exposeImage(data, mimeType);
- } else {
- path = uri;
- }
-
- mLogger.info("Exposed image: URL=" + path);
- if (path == null) {
- MessageUtils.setUnknownError(response, "The host device is not in local network.");
- sendResponse(response);
- return;
- }
- ChromeCastMessage app = ((ChromeCastService) getContext()).getChromeCastMessage();
- if (!isDeviceEnable(response, app)) {
- sendResponse(response);
- return;
- }
- JSONObject json = new JSONObject();
- json.put(KEY_FUNCTION, FUNCTION_POST_IMAGE);
- json.put(KEY_URL, path);
- json.put(KEY_MODE, mode);
- json.put(KEY_X, x);
- json.put(KEY_Y, y);
- String message = json.toString();
- mLogger.info("Send message successfully: " + message);
- setResult(response, DConnectMessage.RESULT_OK);
- app.sendMessage(response, message);
- } catch (IOException e) {
- MessageUtils.setUnknownError(response, "Failed to deploy image to Chromecast.");
- sendResponse(response);
- } catch (Exception e) {
- MessageUtils.setUnknownError(response, e.getMessage());
- sendResponse(response);
- }
- });
- return false;
- }
- };
- /**
- * Expose an image.
- *
- * @param data the binary data of an image
- * @param mimeType the mime type of an image
- * @return the path of the exposed image
- * @throws IOException if the specified image could not be exposed.
- */
- private String exposeImage(final byte[] data, final String mimeType) throws IOException {
- if (data == null) {
- throw new IllegalArgumentException("data is null.");
- }
- File file = saveFile(generateFileName(), data);
- return getHttpServer().exposeFile(new AppLocalMediaFile(file));
- }
-
- /**
- * Save binary data on local file system.
- *
- * @param fileName filename
- * @param data binary data
- * @return stored file
- * @throws IOException if the specified binary data could not be stored.
- */
- private File saveFile(final String fileName, final byte[] data) throws IOException {
- File dir = getContext().getFilesDir();
- File file = new File(dir, generateFileName());
- if (!file.exists()) {
- if (!file.createNewFile()) {
- throw new IOException("File is not be stored: " + fileName);
- }
- }
- FileOutputStream fos = new FileOutputStream(file);
- try {
- fos.write(data);
- fos.flush();
- } finally {
- fos.close();
- }
- return file;
- }
-
- /**
- * Gets HTTP server to expose images.
- *
- * @return an instance of {@link ChromeCastHttpServer}
- */
- private ChromeCastHttpServer getHttpServer() {
- return ((ChromeCastService) getContext()).getChromeCastHttpServer();
- }
-
- private final DConnectApi mDeleteDrawImageApi = new DeleteApi() {
- @Override
- public String getAttribute() {
- return CanvasProfile.ATTRIBUTE_DRAW_IMAGE;
- }
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- final String serviceId = getServiceID(request);
- ((ChromeCastService) getContext()).connectChromeCast(serviceId, (connected) -> {
- if (!connected) {
- MessageUtils.setIllegalDeviceStateError(response, "The chromecast is not in local network.");
- sendResponse(response);
- return;
- }
- ChromeCastMessage app = ((ChromeCastService) getContext()).getChromeCastMessage();
- if (!isDeviceEnable(response, app)) {
- sendResponse(response);
- return;
- }
- try {
- JSONObject json = new JSONObject();
- json.put(KEY_FUNCTION, FUNCTION_DELETE_IMAGE);
- app.sendMessage(response, json.toString());
- } catch (JSONException e) {
- MessageUtils.setUnknownError(response);
- sendResponse(response);
- }
- });
- return false;
- }
- };
- /**
- * デバイスが有効か否かを返す
- * Chromecastのメディア操作を提供する
- *
- * @author NTT DOCOMO, INC.
- */
-public class ChromeCastMediaPlayerProfile extends MediaPlayerProfile {
-
- /** イベントの登録・解除に失敗したときのエラーコード. */
- private static final int ERROR_VALUE_IS_NULL = 100;
- private static final String SAMPLE_URL = "https://github.com/DeviceConnect/DeviceConnect-Android/wiki/sphero_demo.MOV";
- /** １ミリ秒. */
- private static final int MILLISECOND = 1000;
- /** Chromecastの再生状態がバッファリング中であることを表す. */
- private static final String MESSAGE_BUFFERING = "buffering";
- /** Chromecastの再生状態がstop状態であることを表す. */
- private static final String MESSAGE_STOP = "stop";
- /** Chromecastの再生状態がpause状態であることを表す. */
- private static final String MESSAGE_PAUSED = "pause";
- /** Chromecastの再生状態がplay状態であることを表す. */
- private static final String MESSAGE_PALYING = "play";
- /** Chromecastの再生状態がunknownであることを表す. */
- private static final String MESSAGE_UNKNOWN = "unknown";
- /** Chromecastが有効になっていない時のエラーメッセージ. */
- private static final String ERROR_MESSAGE_DEVICE_NOT_ENABLE = "Device is not enable";
- /** Chromecastに再生するメディアファイルが設定されていない時のエラーメッセージ. */
- private static final String ERROR_MESSAGE_MEDIA_NOT_SELECTED = "Media is not selected";
- /** Chromecastの再生状態がない場合のエラーメッセージ. */
- private static final String ERROR_MESSAGE_PLAYSTATE_IS_NOT = "Playstate is not";
- /** メディアファイルのPlay時のエラーメッセージ. */
- private static final String ERROR_MESSAGE_MEDIA_PLAY = ERROR_MESSAGE_PLAYSTATE_IS_NOT
- + " " + MESSAGE_STOP + " or " + MESSAGE_PAUSED;
- /** メディアファイルのResume時のエラーメッセージ. */
- private static final String ERROR_MESSAGE_MEDIA_RESUME = ERROR_MESSAGE_PLAYSTATE_IS_NOT
- + " " + MESSAGE_PAUSED;
- /** メディアファイルのStop時のエラーメッセージ. */
- private static final String ERROR_MESSAGE_MEDIA_STOP = ERROR_MESSAGE_PLAYSTATE_IS_NOT
- + " " + MESSAGE_PALYING + " or " + MESSAGE_PAUSED + " or " + MESSAGE_BUFFERING;
- /** メディアファイルのPause時のエラーメッセージ. */
- private static final String ERROR_MESSAGE_MEDIA_PAUSE = ERROR_MESSAGE_PLAYSTATE_IS_NOT
- + " " + MESSAGE_PALYING;
- /** メディアファイルがMute設定時のエラーメッセージ. */
- private static final String ERROR_MESSAGE_MEDIA_MUTE = ERROR_MESSAGE_PLAYSTATE_IS_NOT
- + " " + MESSAGE_PALYING + " or " + MESSAGE_PAUSED;
- /** メディアファイルのVolume変更時のエラーメッセージ. */
- private static final String ERROR_MESSAGE_MEDIA_VOLUME = ERROR_MESSAGE_MEDIA_MUTE;
- /** メディアファイルのSeek変更時のエラーメッセージ. */
- private static final String ERROR_MESSAGE_MEDIA_SEEK = ERROR_MESSAGE_MEDIA_MUTE;
-
- /** メディア情報の{@link java.util.Comparator}のマップ. */
- private static final Map COMPARATORS = new HashMap();
-
- /** 比較をしない{@link java.util.Comparator}. */
- private static final Comparator NOT_COMPARATOR = new Comparator() {
- @Override
- public int compare(final Bundle a, final Bundle b) {
- return 0;
- }
- };
-
- static {
- COMPARATORS.put(PARAM_TYPE, new ParamComparator(PARAM_TYPE));
- COMPARATORS.put(PARAM_LANGUAGE, new ParamComparator(PARAM_LANGUAGE));
- COMPARATORS.put(PARAM_MEDIA_ID, new ParamComparator(PARAM_MEDIA_ID));
- COMPARATORS.put(PARAM_MIME_TYPE, new ParamComparator(PARAM_MIME_TYPE));
- COMPARATORS.put(PARAM_TITLE, new ParamComparator(PARAM_TITLE));
- COMPARATORS.put(PARAM_DURATION, new ParamComparator(PARAM_DURATION));
- }
-
- public ChromeCastMediaPlayerProfile() {
- addApi(mGetMediaApi);
- addApi(mPutMediaApi);
- addApi(mGetSeekApi);
- addApi(mPutSeekApi);
- addApi(mGetVolumeApi);
- addApi(mPutMuteApi);
- addApi(mGetMuteApi);
- addApi(mDeleteMuteApi);
- addApi(mPutPauseApi);
- addApi(mPutPlayApi);
- addApi(mPutResumeApi);
- addApi(mPutStopApi);
- addApi(mPutVolumeApi);
- addApi(mPutOnStatusChangeApi);
- addApi(mDeleteOnStatusChangeApi);
- addApi(mGetMediaListApi);
- addApi(mGetPlayStatusApi);
- }
-
- /**
- * 指定したパラメータに対する{@link java.util.Comparator}を返す.
- *
- * @param paramName パラメータ名
- * @param isAsc 昇順である場合はtrue、そうでなければfalse
- * @return {@link java.util.Comparator}
- */
- private static Comparator findComparator(final String paramName, final boolean isAsc) {
- ParamComparator comparator = COMPARATORS.get(paramName);
- if (comparator != null) {
- comparator.setOrder(isAsc);
- return comparator;
- }
- return NOT_COMPARATOR;
- }
-
- /**
- * 再生状態を文字列に変換する.
- *
- * @param playState 再生状態
- * @return 再生状態の文字列を返す
- */
- public String getPlayStatus(final int playState) {
- switch (playState) {
- case MediaStatus.PLAYER_STATE_BUFFERING:
- return MESSAGE_BUFFERING;
- case MediaStatus.PLAYER_STATE_IDLE:
- return MESSAGE_STOP;
- case MediaStatus.PLAYER_STATE_PAUSED:
- return MESSAGE_PAUSED;
- case MediaStatus.PLAYER_STATE_PLAYING:
- return MESSAGE_PALYING;
- case MediaStatus.PLAYER_STATE_UNKNOWN:
- default:
- return MESSAGE_UNKNOWN;
- }
- }
-
- /**
- * サービスからChromeCastMediaPlayerを取得する.
- * @return ChromeCastMediaPlayer
- */
- private ChromeCastMediaPlayer getChromeCastMediaPlayer() {
- return ((ChromeCastService) getContext()).getChromeCastMediaPlayer();
- }
- /**
- * サービスからChromeCastDiscoveryrを取得する.
- * @return ChromeCastDiscovery
- */
- private ChromeCastDiscovery getChromeCastDiscovery() {
- return ((ChromeCastService) getContext()).getChromeCastDiscovery();
- }
- /**
- * デバイスが有効か否かを返すnull）
- */
- private MediaStatus getMediaStatus(final Intent response, final ChromeCastMediaPlayer app) {
- MediaStatus status = app.getMediaStatus();
- if (status == null) {
- MessageUtils.setIllegalDeviceStateError(response, ERROR_MESSAGE_MEDIA_NOT_SELECTED);
- }
- return status;
- }
-
- private final DConnectApi mPutPlayApi = new PutApi() {
- @Override
- public String getAttribute() {
- return MediaPlayerProfile.ATTRIBUTE_PLAY;
- }
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- final String serviceId = getServiceID(request);
- ((ChromeCastService) getContext()).connectChromeCast(serviceId,
- (connected) -> {
- if (!connected) {
- MessageUtils.setIllegalDeviceStateError(response, "The chromecast is not in local network.");
- sendResponse(response);
- return;
- }
- ChromeCastMediaPlayer app = getChromeCastMediaPlayer();
- if (!isDeviceEnable(response, app)) {
- sendResponse(response);
- return;
- }
-
- MediaStatus status = getMediaStatus(response, app);
- if (status == null) {
- sendResponse(response);
- return;
- }
-
- if (status.getPlayerState() == MediaStatus.PLAYER_STATE_PLAYING) {
- setResult(response, DConnectMessage.RESULT_OK);
- sendResponse(response);
- return;
- }
- if (status.getPlayerState() == MediaStatus.PLAYER_STATE_IDLE) {
- app.play(response);
- } else if (status.getPlayerState() == MediaStatus.PLAYER_STATE_PAUSED) {
- app.resume(response);
- } else {
- MessageUtils.setIllegalDeviceStateError(response, ERROR_MESSAGE_MEDIA_PLAY);
- sendResponse(response);
- }
- });
- return false;
- }
- };
- private final DConnectApi mPutResumeApi = new PutApi() {
- @Override
- public String getAttribute() {
- return MediaPlayerProfile.ATTRIBUTE_RESUME;
- }
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- final String serviceId = getServiceID(request);
- ((ChromeCastService) getContext()).connectChromeCast(serviceId, (connected) -> {
- if (!connected) {
- MessageUtils.setIllegalDeviceStateError(response, "The chromecast is not in local network.");
- sendResponse(response);
- return;
- } ChromeCastMediaPlayer app = getChromeCastMediaPlayer();
- if (!isDeviceEnable(response, app)) {
- sendResponse(response);
- return;
- }
- MediaStatus status = getMediaStatus(response, app);
- if (status == null) {
- sendResponse(response);
- return;
- }
-
- if (status.getPlayerState() == MediaStatus.PLAYER_STATE_PLAYING) {
- setResult(response, DConnectMessage.RESULT_OK);
- sendResponse(response);
- return;
- }
- if (status.getPlayerState() == MediaStatus.PLAYER_STATE_PAUSED) {
- app.resume(response);
- } else {
- MessageUtils.setIllegalDeviceStateError(response, ERROR_MESSAGE_MEDIA_RESUME);
- sendResponse(response);
- }
- });
- return false;
- }
- };
-
-
- private final DConnectApi mPutStopApi = new PutApi() {
- @Override
- public String getAttribute() {
- return MediaPlayerProfile.ATTRIBUTE_STOP;
- }
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- final String serviceId = getServiceID(request);
- ((ChromeCastService) getContext()).connectChromeCast(serviceId, (connected) -> {
- if (!connected) {
- MessageUtils.setIllegalDeviceStateError(response, "The chromecast is not in local network.");
- sendResponse(response);
- return;
- } ChromeCastMediaPlayer app = getChromeCastMediaPlayer();
- if (!isDeviceEnable(response, app)) {
- sendResponse(response);
- return;
- }
- MediaStatus status = getMediaStatus(response, app);
- if (status == null) {
- sendResponse(response);
- return;
- }
-
- if (status.getPlayerState() == MediaStatus.PLAYER_STATE_IDLE) {
- setResult(response, DConnectMessage.RESULT_OK);
- sendResponse(response);
- return;
- }
- if (status.getPlayerState() == MediaStatus.PLAYER_STATE_PLAYING
- || status.getPlayerState() == MediaStatus.PLAYER_STATE_PAUSED
- || status.getPlayerState() == MediaStatus.PLAYER_STATE_BUFFERING) {
- app.stop(response);
- } else {
- MessageUtils.setIllegalDeviceStateError(response, ERROR_MESSAGE_MEDIA_STOP);
- sendResponse(response);
- }
- });
- return false;
- }
- };
- private final DConnectApi mPutPauseApi = new PutApi() {
- @Override
- public String getAttribute() {
- return MediaPlayerProfile.ATTRIBUTE_PAUSE;
- }
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- final String serviceId = getServiceID(request);
- ((ChromeCastService) getContext()).connectChromeCast(serviceId, (connected) -> {
- if (!connected) {
- MessageUtils.setIllegalDeviceStateError(response, "The chromecast is not in local network.");
- sendResponse(response);
- return;
- } ChromeCastMediaPlayer app = getChromeCastMediaPlayer();
- if (!isDeviceEnable(response, app)) {
- sendResponse(response);
- return;
- }
- MediaStatus status = getMediaStatus(response, app);
- if (status == null) {
- sendResponse(response);
- return;
- }
-
- if (status.getPlayerState() == MediaStatus.PLAYER_STATE_PAUSED) {
- setResult(response, DConnectMessage.RESULT_OK);
- sendResponse(response);
- return;
- }
- app.pause(response);
- });
- return false;
- }
- };
- /**
- * メディアをミュートする list, final String filter,
- final String orderBy) {
- Uri uri = null;
-
- if (mediaType.equals("Video")) {
- uri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
- } else if (mediaType.equals("Audio")) {
- uri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
- } else if (mediaType.equals("Image")) {
- uri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
- }
- ContentResolver resolver = this.getContext().getApplicationContext().getContentResolver();
- Cursor cursor = resolver.query(uri, null, filter, null, orderBy);
- if (cursor != null) {
- if (cursor.moveToFirst()) {
- do {
- Bundle medium = new Bundle();
- setMediaInformation(mediaType, medium, cursor);
- list.add(medium);
- } while (cursor.moveToNext());
- }
- cursor.close();
- }
- }
-
- /**
- * メディア情報をリストアップする.
- *
- * @param mediaType メディアタイプ
- * @param list リスト
- * @param query クエリー
- * @param mimeType MIMEタイプ
- * @param orders ソートオーダー
- */
- private void listupMedia(final String mediaType, final List list, final String query,
- final String mimeType, final String[] orders) {
- String filter = "";
- String orderBy;
-
- if (mimeType != null) {
- String key = null;
- if (mediaType.equals("Video")) {
- key = MediaStore.Video.Media.MIME_TYPE;
- } else if (mediaType.equals("Audio")) {
- key = MediaStore.Audio.Media.MIME_TYPE;
- } else if (mediaType.equals("Image")) {
- key = MediaStore.Images.Media.MIME_TYPE;
- }
- filter = "" + key + "='" + mimeType + "'";
- }
- if (query != null) {
- if (!filter.equals("")) {
- filter += " AND ";
- }
- if (mediaType.equals("Video")) {
- filter += "(" + MediaStore.Video.Media.TITLE + " LIKE '%" + query + "%')";
- } else if (mediaType.equals("Audio")) {
- filter += "(" + MediaStore.Audio.Media.TITLE + " LIKE '%" + query + "%'";
- filter += " OR " + MediaStore.Audio.Media.COMPOSER + " LIKE '%" + query + "%')";
- } else if (mediaType.equals("Image")) {
- filter += "(" + MediaStore.Images.Media.TITLE + " LIKE '%" + query + "%')";
- }
- }
-
- if (orders != null) {
- orderBy = orders[0] + " " + orders[1];
- } else {
- orderBy = "title asc";
- }
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
- final String filt = filter;
- final String order = orderBy;
- PermissionUtility.requestPermissions(getContext(), new Handler(Looper.getMainLooper()),
- new String[]{Manifest.permission.READ_EXTERNAL_STORAGE},
- new PermissionUtility.PermissionRequestCallback() {
- @Override
- public void onSuccess() {
-
- listupMedia(mediaType, list, filt, order);
- }
-
- @Override
- public void onFail(@NonNull String deniedPermission) {
- }
- });
- } else {
- listupMedia(mediaType, list, filter, orderBy);
- }
- }
-
- /**
- * デバイス内のメディアを全検索する.
- * @param query 検索するタイトル
- * @param mimeType マイムタイプ
- * @param orders ソート
- * @return 検索結果
- */
- private List findAllMedia(final String query, final String mimeType,
- final String[] orders) {
- List list = new ArrayList();
- listupMedia("Video", list, query, mimeType, orders);
- Bundle medium = new Bundle();
- setType(medium, "Video");
- setLanguage(medium, "Language");
- setMediaId(medium, SAMPLE_URL);
- setMIMEType(medium, "video/quicktime");
- setTitle(medium, "Title: Sample");
- setDuration(medium, 9999);
- Bundle creatorVideo = new Bundle();
- setCreator(creatorVideo, "Creator: Sample");
- setCreators(medium, new Bundle[]{creatorVideo});
- list.add(medium);
-
- return list;
- }
-
- /**
- * 指定したメディアの情報を取得する.
- * @param mediaId メディアID
- * @return メディア情報
- */
- private Bundle getMedia(final String mediaId) {
- List list = findAllMedia(null, null, null);
- for (Bundle b : list) {
- String id = b.getString(PARAM_MEDIA_ID);
- if (id.equals(mediaId)) {
- return b;
- }
- }
- return null;
- }
-
- /**
- * 指定したメディアを保有しているかどうかをチェックする.
- * @param mediaId メディアID
- * @return 保有している場合はtrue、そうでない場合はfalse
- */
- private boolean hasMedia(final String mediaId) {
- return getMedia(mediaId) != null;
- }
-
- private final DConnectApi mGetMediaListApi = new GetApi() {
- @Override
- public String getAttribute() {
- return MediaPlayerProfile.ATTRIBUTE_MEDIA_LIST;
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- final String serviceId = getServiceID(request);
- final String query = MediaPlayerProfile.getQuery(request);
- final String mimeType = MediaPlayerProfile.getMIMEType(request);
- final String[] orders = MediaPlayerProfile.getOrder(request);
- final Integer offset = MediaPlayerProfile.getOffset(request);
- final Integer limit = MediaPlayerProfile.getLimit(request);
- ((ChromeCastService) getContext()).connectChromeCast(serviceId,(connected) -> {
- if (!connected) {
- MessageUtils.setIllegalDeviceStateError(response, "The chromecast is not in local network.");
- sendResponse(response);
- return;
- }
- // パラメータの型チェック
- Bundle b = request.getExtras();
- if (b.getString(PARAM_LIMIT) != null) {
- if (parseInteger(b.get(PARAM_LIMIT)) == null) {
- MessageUtils.setInvalidRequestParameterError(response);
- sendResponse(response);
- return;
- }
- }
- if (b.getString(PARAM_OFFSET) != null) {
- if (parseInteger(b.get(PARAM_OFFSET)) == null) {
- MessageUtils.setInvalidRequestParameterError(response);
- sendResponse(response);
- return;
- }
- }
-
- // パラメータの範囲チェック
- if (orders != null && orders.length != 2) {
- MessageUtils.setInvalidRequestParameterError(response, "order is invalid.");
- sendResponse(response);
- return;
- }
- final int offsetValue;
- if (offset != null) {
- if (offset >= 0) {
- offsetValue = offset;
- } else {
- MessageUtils.setInvalidRequestParameterError(response, "offset is negative.");
- sendResponse(response);
- return;
- }
- } else {
- offsetValue = 0;
- }
- if (limit != null && limit < 0) {
- MessageUtils.setInvalidRequestParameterError(response, "limit is negative.");
- sendResponse(response);
- return;
- }
-
- Comparator comparator = null;
- if (orders != null) {
- boolean isAsc;
- Order o = Order.getInstance(orders[1]);
- switch (o) {
- case ASC:
- isAsc = true;
- break;
- case DSEC:
- isAsc = false;
- break;
- default:
- MessageUtils.setInvalidRequestParameterError(response, "order is invalid.");
- sendResponse(response);
- return;
- }
- comparator = findComparator(orders[0], isAsc);
- }
- // メディアリストのソート
- List foundMedia = findAllMedia(query, mimeType, orders);
- if (comparator != null) {
- Collections.sort(foundMedia, comparator);
- }
-
- final int limitValue = limit != null ? limit : foundMedia.size();
- int endIndex = offsetValue + limitValue;
- if (endIndex > foundMedia.size()) {
- endIndex = foundMedia.size();
- }
-
- List result;
- if (offsetValue < foundMedia.size()) {
- result = foundMedia.subList(offsetValue, endIndex);
- } else {
- result = new ArrayList();
- }
-
- setCount(response, result.size());
- setMedia(response, result.toArray(new Bundle[result.size()]));
- setResult(response, DConnectMessage.RESULT_OK);
- sendResponse(response);
- });
- return false;
- }
- };
-
- private final DConnectApi mPutOnStatusChangeApi = new PutApi() {
- @Override
- public String getAttribute() {
- return MediaPlayerProfile.ATTRIBUTE_ON_STATUS_CHANGE;
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- final String serviceId = getServiceID(request);
- ((ChromeCastService) getContext()).connectChromeCast(serviceId,(connected) -> {
- if (!connected) {
- MessageUtils.setIllegalDeviceStateError(response, "The chromecast is not in local network.");
- sendResponse(response);
- return;
- }
- EventError error = EventManager.INSTANCE.addEvent(request);
- if (error == EventError.NONE) {
- ((ChromeCastService) getContext()).registerOnStatusChange(response,
- serviceId);
- } else {
- MessageUtils.setError(response, ERROR_VALUE_IS_NULL, "Can not register event.");
- sendResponse(response);
- }
- });
- return false;
- }
- };
- private final DConnectApi mDeleteOnStatusChangeApi = new DeleteApi() {
- @Override
- public String getAttribute() {
- return MediaPlayerProfile.ATTRIBUTE_ON_STATUS_CHANGE;
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- final String serviceId = getServiceID(request);
- ((ChromeCastService) getContext()).connectChromeCast(serviceId, (connected) -> {
- if (!connected) {
- MessageUtils.setIllegalDeviceStateError(response, "The chromecast is not in local network.");
- sendResponse(response);
- return;
- }
- EventError error = EventManager.INSTANCE.removeEvent(request);
- if (error == EventError.NONE) {
- ((ChromeCastService) getContext()).unregisterOnStatusChange(response);
- } else {
- MessageUtils.setError(response, ERROR_VALUE_IS_NULL, "Can not unregister event.");
- sendResponse(response);
- }
- });
- return false;
- }
- };
-
-
- /**
- * パラメータ比較クラス.
- */
- private static class ParamComparator implements Comparator {
-
- /** 比較するパラメータ名. */
- private final String mParamName;
- /** 昇順であることを示すフラグ. */
- private boolean mIsAsc;
-
- /**
- * コンストラクタ.
- *
- * @param paramName パラメータ名
- */
- ParamComparator(final String paramName) {
- mParamName = paramName;
- }
-
- /**
- * ソート順を設定する.
- * @param isAsc 昇順である場合はtrue、そうでなければfalse
- */
- public void setOrder(final boolean isAsc) {
- mIsAsc = isAsc;
- }
-
- @SuppressWarnings({ "rawtypes", "unchecked" })
- @Override
- public int compare(final Bundle a, final Bundle b) {
- Object va = a.get(mParamName);
- Object vb = b.get(mParamName);
- if (!mIsAsc) {
- Object vt = va;
- va = vb;
- vb = vt;
- }
- if (va == null && vb == null) {
- return 0;
- }
- if (va != null && vb == null) {
- return -1;
- }
- if (va == null && vb != null) {
- return 1;
- }
- if (va.getClass() != vb.getClass()) {
- return 0;
- }
- if (va instanceof Comparable && !(vb instanceof Comparable)) {
- return -1;
- }
- if (!(va instanceof Comparable) && vb instanceof Comparable) {
- return 1;
- }
- if (!(va instanceof Comparable) && !(vb instanceof Comparable)) {
- return 0;
- }
- if (va instanceof Comparable && !(vb instanceof Comparable)) {
- return -1;
- }
- if (!(va instanceof Comparable) && vb instanceof Comparable) {
- return 1;
- }
- return ((Comparable) va).compareTo(vb);
- }
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/profile/ChromeCastNotificationProfile.java b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/profile/ChromeCastNotificationProfile.java
deleted file mode 100755
index 4cb5f0c74f..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/profile/ChromeCastNotificationProfile.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- ChromeCastNotificationProfile.java
- Copyright (c) 2014 NTT DOCOMO,INC.
- Released under the MIT license
- http://opensource.org/licenses/mit-license.php
- */
-package org.deviceconnect.android.deviceplugin.chromecast.profile;
-
-import android.content.Intent;
-
-import org.deviceconnect.android.deviceplugin.chromecast.ChromeCastService;
-import org.deviceconnect.android.deviceplugin.chromecast.core.ChromeCastMessage;
-import org.deviceconnect.android.message.MessageUtils;
-import org.deviceconnect.android.profile.NotificationProfile;
-import org.deviceconnect.android.profile.api.DConnectApi;
-import org.deviceconnect.android.profile.api.DeleteApi;
-import org.deviceconnect.android.profile.api.PostApi;
-import org.deviceconnect.message.DConnectMessage;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- * Notification プロファイル (Chromecast).
- *
- * Chromecastのノーティフィケーションの操作機能を提供する
- *
- * @author NTT DOCOMO, INC.
- */
-public class ChromeCastNotificationProfile extends NotificationProfile implements ChromeCastConstants {
- /** Chromecastが無効になっているときのエラーメッセージ. */
- private static final String ERROR_MESSAGE_DEVICE_NOT_ENABLED = "Chromecast is not enabled.";
-
- /** 通知ID. 全リクエストに対して共通. */
- private static final String COMMON_ID = "dConnectDeviceChromeCast";
-
- public ChromeCastNotificationProfile() {
- addApi(mPostNotificationApi);
- addApi(mDeleteNotificationApi);
- }
-
-
- /**
- * デバイスが有効か否かを返す
- * Chromecastの検索機能を提供する
- *
- * @author NTT DOCOMO, INC.
- */
-public class ChromeCastServiceDiscoveryProfile extends ServiceDiscoveryProfile {
-
- /**
- * コンストラクタ.
- *
- * @param provider プロファイルプロバイダ
- */
- public ChromeCastServiceDiscoveryProfile(final DConnectServiceProvider provider) {
- super(provider);
- addApi(mServiceDiscoveryApi);
- }
-
- private final DConnectApi mServiceDiscoveryApi = new GetApi() {
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- ChromeCastDiscovery discovery = ((ChromeCastService) getContext()).getChromeCastDiscovery();
- List disappeared = getServiceProvider().getServiceList();
- for (int i = 0; i < discovery.getDeviceNames().size(); i++) {
-
- CastDevice cast = discovery.getDeviceNames().get(i);
- DConnectService castService = getServiceProvider().getService(cast.getDeviceId());
- if (castService == null) {
- castService = new ChromeCastDeviceService(cast);
- getServiceProvider().addService(castService);
- } else {
- for (int j = 0; j < disappeared.size(); j++) {
- DConnectService cache = disappeared.get(j);
- if (cache.getId().equals(castService.getId())) {
- disappeared.remove(j);
- break;
- }
- }
- }
- }
-
- // レスポンス作成.
- appendServiceList(response);
-
- return true;
- }
- };
-
- private String getDeviceName(final String name) {
- return getContext().getResources().getString(R.string.device_name, name);
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/profile/ChromeCastSystemProfile.java b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/profile/ChromeCastSystemProfile.java
deleted file mode 100755
index ec4d5ea4f5..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/profile/ChromeCastSystemProfile.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- ChromeCastSystemProfile.java
- Copyright (c) 2014 NTT DOCOMO,INC.
- Released under the MIT license
- http://opensource.org/licenses/mit-license.php
- */
-package org.deviceconnect.android.deviceplugin.chromecast.profile;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-
-import org.deviceconnect.android.deviceplugin.chromecast.setting.ChromeCastServiceListActivity;
-import org.deviceconnect.android.event.EventManager;
-import org.deviceconnect.android.message.MessageUtils;
-import org.deviceconnect.android.profile.SystemProfile;
-import org.deviceconnect.android.profile.api.DConnectApi;
-import org.deviceconnect.android.profile.api.DeleteApi;
-import org.deviceconnect.message.DConnectMessage;
-
-/**
- * System プロファイル (Chromecast).
- *
- * Chromecastのシステム情報を提供する
- *
- * @author NTT DOCOMO, INC.
- */
-public class ChromeCastSystemProfile extends SystemProfile {
- public ChromeCastSystemProfile() {
- addApi(mDeleteEventsApi);
- }
-
- @Override
- protected Class getSettingPageActivity(final Intent request, final Bundle param) {
- return ChromeCastServiceListActivity.class;
- }
-
- private final DConnectApi mDeleteEventsApi = new DeleteApi() {
- @Override
- public String getAttribute() {
- return ATTRIBUTE_EVENTS;
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- String sessionKey = getSessionKey(request);
- if (sessionKey == null || sessionKey.length() == 0) {
- MessageUtils.setInvalidRequestParameterError(response);
- } else if (EventManager.INSTANCE.removeEvents(sessionKey)) {
- setResult(response, DConnectMessage.RESULT_OK);
- } else {
- MessageUtils.setUnknownError(response);
- }
-
- return true;
- }
- };
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/profile/package-info.java b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/profile/package-info.java
deleted file mode 100755
index e65082850c..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/profile/package-info.java
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- org.deviceconnect.android.deviceplugin.chromecast.profile
- Copyright (c) 2014 NTT DOCOMO,INC.
- Released under the MIT license
- http://opensource.org/licenses/mit-license.php
- */
-
-/**
- * Device Connect Chromecast DevicePlugin Profiles.
- */
-package org.deviceconnect.android.deviceplugin.chromecast.profile;
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/setting/ChromeCastServiceListActivity.java b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/setting/ChromeCastServiceListActivity.java
deleted file mode 100644
index cb6d5439c4..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/setting/ChromeCastServiceListActivity.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.deviceconnect.android.deviceplugin.chromecast.setting;
-
-import android.app.Activity;
-import android.content.res.TypedArray;
-import android.graphics.Color;
-import android.os.Bundle;
-import androidx.appcompat.widget.Toolbar;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-
-import org.deviceconnect.android.deviceplugin.chromecast.ChromeCastApplication;
-import org.deviceconnect.android.deviceplugin.chromecast.ChromeCastService;
-import org.deviceconnect.android.deviceplugin.chromecast.R;
-import org.deviceconnect.android.message.DConnectMessageService;
-import org.deviceconnect.android.service.DConnectService;
-import org.deviceconnect.android.ui.activity.DConnectServiceListActivity;
-
-/**
- * Chromecastサービス一覧画面.
- * @author NTT DOCOMO, INC.
- */
-
-public class ChromeCastServiceListActivity extends DConnectServiceListActivity {
-
- @Override
- public void onCreate(final Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- Toolbar toolbar = new Toolbar(this);
- toolbar.setTitle(R.string.activity_service_list_title);
- toolbar.setTitleTextColor(Color.parseColor("#FFFFFF"));
- toolbar.setBackgroundColor(Color.parseColor("#00a0e9"));
- addContentView(toolbar, new Toolbar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
- toolbar.setNavigationIcon(R.drawable.close_icon);
- toolbar.setNavigationOnClickListener((view) -> {
- finish();
- });
- LinearLayout layout = findViewById(R.id.fragment_container);
- final TypedArray styledAttributes = getTheme().obtainStyledAttributes(new int[]{android.R.attr.actionBarSize});
- int actionBarSize = (int) styledAttributes.getDimension(0, 0);
- layout.setPadding(0, actionBarSize, 0, 0);
- }
-
- @Override
- protected Class getMessageServiceClass() {
- return ChromeCastService.class;
- }
-
- @Override
- protected Class getSettingManualActivityClass() {
- return ChromeCastSettingFragmentActivity.class;
- }
- @Override
- public void onServiceRemoved(final DConnectService service) {
- super.onServiceRemoved(service);
- ChromeCastApplication application = (ChromeCastApplication) getApplication();
- if (application != null) {
- //ChromeCastのサービスが削除されたタイミングでChromeCastControllerを初期化する
- application.getController().reconnect();
-
- }
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/setting/ChromeCastSettingFragmentActivity.java b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/setting/ChromeCastSettingFragmentActivity.java
deleted file mode 100755
index 54a3d82b84..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/setting/ChromeCastSettingFragmentActivity.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- ChromeCastSettingFragmentActivity.java
- Copyright (c) 2014 NTT DOCOMO,INC.
- Released under the MIT license
- http://opensource.org/licenses/mit-license.php
- */
-package org.deviceconnect.android.deviceplugin.chromecast.setting;
-
-import android.os.Bundle;
-import android.os.Handler;
-import androidx.fragment.app.Fragment;
-import android.view.Menu;
-import android.view.MenuItem;
-
-import com.google.android.gms.cast.framework.CastButtonFactory;
-import com.google.android.gms.cast.framework.IntroductoryOverlay;
-
-import org.deviceconnect.android.deviceplugin.chromecast.R;
-
-import java.util.ArrayList;
-
-/**
- * チュートリアル画面（ステップ）.
- *
- * 画面を作成する
- *
- *
- * @author NTT DOCOMO, INC.
- */
-public class ChromeCastSettingFragmentActivity extends DConnectSettingCompatPageFragmentActivity {
-
- /** ページUI用Fragment. */
- private ArrayList mFragments;
- private MenuItem mediaRouteMenuItem;
- private IntroductoryOverlay mIntroductoryOverlay;
- /**
- * コンストラクタ.
- */
- public ChromeCastSettingFragmentActivity() {
- mFragments = new ArrayList<>();
- mFragments.add(new ChromeCastSettingFragmentPage1());
- mFragments.add(new ChromeCastSettingFragmentPage2());
- mFragments.add(new ChromeCastSettingFragmentPage3());
- }
- @Override
- public void onCreate(final Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- }
- @Override
- public int getPageCount() {
- return mFragments.size();
- }
-
- @Override
- public Fragment createPage(final int position) {
- return mFragments.get(position);
- }
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- super.onCreateOptionsMenu(menu);
- getMenuInflater().inflate(R.menu.browse, menu);
- mediaRouteMenuItem = CastButtonFactory.setUpMediaRouteButton(this, menu,
- R.id.media_route_menu_item);
- showIntroductoryOverlay();
- return true;
- }
-
-
- /**
- * 説明を表示.
- */
- private void showIntroductoryOverlay() {
- if (mIntroductoryOverlay != null) {
- mIntroductoryOverlay.remove();
- }
- new Handler().postDelayed(() -> {
- if ((mediaRouteMenuItem != null) && mediaRouteMenuItem.isVisible()) {
- mIntroductoryOverlay = new IntroductoryOverlay.Builder(
- ChromeCastSettingFragmentActivity.this, mediaRouteMenuItem)
- .setTitleText(getString(R.string.introducing_cast))
- .setOverlayColor(R.color.primary)
- .setSingleTime()
- .setOnOverlayDismissedListener(
- () -> {
- mIntroductoryOverlay = null;
- })
- .build();
- mIntroductoryOverlay.show();
- }
- }, 500);
- }
-
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/setting/ChromeCastSettingFragmentPage1.java b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/setting/ChromeCastSettingFragmentPage1.java
deleted file mode 100755
index d806c9d09a..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/setting/ChromeCastSettingFragmentPage1.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- ChromeCastSettingFragmentPage1.java
- Copyright (c) 2014 NTT DOCOMO,INC.
- Released under the MIT license
- http://opensource.org/licenses/mit-license.php
- */
-package org.deviceconnect.android.deviceplugin.chromecast.setting;
-
-import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import org.deviceconnect.android.deviceplugin.chromecast.R;
-
-/**
- * チュートリアル画面.
- *
- * 画面を作成する
- *
- * Chromecastの接続
- *
- * @author NTT DOCOMO, INC.
- */
-public class ChromeCastSettingFragmentPage1 extends Fragment {
- @Override
- public View onCreateView(final LayoutInflater inflater,
- final ViewGroup container, final Bundle savedInstanceState) {
- View root = inflater.inflate(R.layout.chromecast_settings_step_1, container, false);
- return root;
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/setting/ChromeCastSettingFragmentPage2.java b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/setting/ChromeCastSettingFragmentPage2.java
deleted file mode 100755
index 7fc03eed14..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/setting/ChromeCastSettingFragmentPage2.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- ChromeCastSettingFragmentPage2.java
- Copyright (c) 2014 NTT DOCOMO,INC.
- Released under the MIT license
- http://opensource.org/licenses/mit-license.php
- */
-package org.deviceconnect.android.deviceplugin.chromecast.setting;
-
-import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import org.deviceconnect.android.deviceplugin.chromecast.R;
-
-/**
- * チュートリアル画面.
- *
- * 画面を作成する
- *
- * 電源の接続
- *
- * @author NTT DOCOMO, INC.
- */
-public class ChromeCastSettingFragmentPage2 extends Fragment {
- @Override
- public View onCreateView(final LayoutInflater inflater,
- final ViewGroup container, final Bundle savedInstanceState) {
- View root = inflater.inflate(R.layout.chromecast_settings_step_2, container, false);
- return root;
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/setting/ChromeCastSettingFragmentPage3.java b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/setting/ChromeCastSettingFragmentPage3.java
deleted file mode 100755
index cf5fe22e8f..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/setting/ChromeCastSettingFragmentPage3.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- ChromeCastSettingFragmentPage3.java
- Copyright (c) 2014 NTT DOCOMO,INC.
- Released under the MIT license
- http://opensource.org/licenses/mit-license.php
- */
-package org.deviceconnect.android.deviceplugin.chromecast.setting;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.net.Uri;
-import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.LinearLayout.LayoutParams;
-
-import org.deviceconnect.android.deviceplugin.chromecast.BuildConfig;
-import org.deviceconnect.android.deviceplugin.chromecast.R;
-
-/**
- * チュートリアル画面.
- *
- * 画面を作成する
- *
- * Chromecastの設定
- *
- * @author NTT DOCOMO, INC.
- */
-public class ChromeCastSettingFragmentPage3 extends Fragment {
- /** Chromecastアプリのパッケージ名. */
- private static final String PACKAGE_NAME = "com.google.android.apps.chromecast.app";
- /** バッジの横サイズ. */
- private int mBadgeWidth = 0;
- /** バッジの縦サイズ. */
- private int mBadgeHeight = 0;
-
-
- /**
- * Chromecast App (Google) のインストール状態を調べる.
- *
- * @param context コンテキスト
- * @return インストール状態 （true: インストールされている, false: インストールされていない）
- */
- private boolean isApplicationInstalled(final Context context) {
- boolean installed = false;
- try {
- context.getPackageManager().getPackageInfo(PACKAGE_NAME, PackageManager.GET_META_DATA);
- installed = true;
- } catch (NameNotFoundException e) {
- if (BuildConfig.DEBUG) {
- e.printStackTrace();
- }
- }
- return installed;
- }
-
- /**
- * Chromecast App (Google) のインストール状態に応じて、Buttonの背景を変更する.
- *
- * @param button ボタン
- */
- private void changeButtonBackground(final Button button) {
- if (isApplicationInstalled(button.getContext())) {
- button.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
- button.setBackgroundResource(R.drawable.button_blue);
- button.setText(getResources().getString(R.string.chromecast_settings_step_3_button));
- } else {
- button.setLayoutParams(new LayoutParams(mBadgeWidth, mBadgeHeight));
- button.setBackgroundResource(R.drawable.button_google_play);
- button.setText("");
- }
- }
-
- @Override
- public void onStart() {
- super.onStart();
- changeButtonBackground(getActivity().findViewById(R.id.buttonChromecastSettingApp));
- }
-
- @Override
- public View onCreateView(final LayoutInflater inflater,
- final ViewGroup container, final Bundle savedInstanceState) {
- View rootView = inflater.inflate(R.layout.chromecast_settings_step_3, container, false);
- Button button = rootView.findViewById(R.id.buttonChromecastSettingApp);
- button.setOnClickListener((v) -> {
- Intent intent;
- if (isApplicationInstalled(v.getContext())) {
- intent = v.getContext().getPackageManager().getLaunchIntentForPackage(PACKAGE_NAME);
- } else {
- intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + PACKAGE_NAME));
- }
- startActivity(intent);
- });
-
- Bitmap image = BitmapFactory.decodeResource(getResources(), R.drawable.button_google_play);
- mBadgeWidth = image.getWidth();
- mBadgeHeight = image.getHeight();
- image.recycle();
-
- return rootView;
- }
-
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/setting/DConnectSettingCompatPageFragmentActivity.java b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/setting/DConnectSettingCompatPageFragmentActivity.java
deleted file mode 100755
index 5ef980da77..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/setting/DConnectSettingCompatPageFragmentActivity.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- DConnectSettingPageFragmentActivity.java
- Copyright (c) 2014 NTT DOCOMO,INC.
- Released under the MIT license
- http://opensource.org/licenses/mit-license.php
- */
-package org.deviceconnect.android.deviceplugin.chromecast.setting;
-
-import android.graphics.Color;
-import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import androidx.viewpager.widget.ViewPager;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-
-import org.deviceconnect.android.R;
-import org.deviceconnect.android.ui.adapter.DConnectFragmentPagerAdapter;
-import org.deviceconnect.android.ui.adapter.DConnectPageCreater;
-
-/**
- * デバイスプラグイン設定画面用 ベースフラグメントアクティビティ.
- * @author NTT DOCOMO, INC.
- */
-public abstract class DConnectSettingCompatPageFragmentActivity extends AppCompatActivity implements
- DConnectPageCreater {
-
- /**
- * ページ用のビューページャー.
- */
- private ViewPager mViewPager;
-
- /**
- * ViewPagerを持つレイアウトを自動的に設定する.
- * サブクラスでオーバーライドする場合は setContentView を実行しないこと 。
- *
- * @param savedInstanceState パラメータ
- * @see android.app.Activity#onCreate(Bundle)
- */
- @Override
- protected void onCreate(final Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_setting_page);
-
- mViewPager = (ViewPager) findViewById(R.id.setting_pager);
- mViewPager.setAdapter(new DConnectFragmentPagerAdapter(getSupportFragmentManager(), this));
- Toolbar toolbar = new Toolbar(this);
- toolbar.setTitle(org.deviceconnect.android.deviceplugin.chromecast.R.string.activity_setting_page_title);
- toolbar.setBackgroundColor(Color.parseColor("#00a0e9"));
- toolbar.setTitleTextColor(Color.parseColor("#FFFFFF"));
- addContentView(toolbar, new Toolbar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
- toolbar.setNavigationIcon(org.deviceconnect.android.deviceplugin.chromecast.R.drawable.close_icon);
- toolbar.setNavigationOnClickListener((view) -> {
- finish();
- });
- setSupportActionBar(toolbar);
- }
-
- @Override
- public boolean onOptionsItemSelected(final MenuItem item) {
-
- if (item.getItemId() == android.R.id.home) {
- finish();
- return true;
- }
-
- return super.onOptionsItemSelected(item);
- }
-
- /**
- * ViewPagerを取得する.
- *
- * @return ViewPagerのインスタンス
- */
- protected ViewPager getViewPager() {
- return mViewPager;
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/setting/package-info.java b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/setting/package-info.java
deleted file mode 100755
index 7c33ed3bd4..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/setting/package-info.java
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- org.deviceconnect.android.deviceplugin.chromecast.setting
- Copyright (c) 2014 NTT DOCOMO,INC.
- Released under the MIT license
- http://opensource.org/licenses/mit-license.php
- */
-
-/**
- * Device Connect Chromecast DevicePlugin Setting UI.
- */
-package org.deviceconnect.android.deviceplugin.chromecast.setting;
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/drawable-hdpi/ic_launcher.png b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100755
index a3a7f4794e..0000000000
Binary files a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/drawable-mdpi/ic_launcher.png b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100755
index a3a7f4794e..0000000000
Binary files a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/drawable-xhdpi/button_blue.xml b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/drawable-xhdpi/button_blue.xml
deleted file mode 100755
index a2c51ba7bd..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/drawable-xhdpi/button_blue.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
- -
-
-
-
-
-
- -
-
-
-
-
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/drawable-xhdpi/button_circle_blue.xml b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/drawable-xhdpi/button_circle_blue.xml
deleted file mode 100755
index b0b1e809d8..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/drawable-xhdpi/button_circle_blue.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- -
-
-
-
-
-
-
-
- -
-
-
-
-
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/drawable-xhdpi/button_circle_red.xml b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/drawable-xhdpi/button_circle_red.xml
deleted file mode 100755
index 98e828aa8a..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/drawable-xhdpi/button_circle_red.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
- -
-
-
-
-
-
- -
-
-
-
-
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/drawable-xhdpi/button_google_play.png b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/drawable-xhdpi/button_google_play.png
deleted file mode 100755
index 649e782e02..0000000000
Binary files a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/drawable-xhdpi/button_google_play.png and /dev/null differ
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/drawable-xhdpi/button_red.xml b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/drawable-xhdpi/button_red.xml
deleted file mode 100755
index d59801b1f0..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/drawable-xhdpi/button_red.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- -
-
-
-
-
-
- -
-
-
-
-
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/drawable-xhdpi/chromecast_img01.png b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/drawable-xhdpi/chromecast_img01.png
deleted file mode 100755
index 31d03c3d12..0000000000
Binary files a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/drawable-xhdpi/chromecast_img01.png and /dev/null differ
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/drawable-xhdpi/chromecast_img02.png b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/drawable-xhdpi/chromecast_img02.png
deleted file mode 100755
index 4455ce83a4..0000000000
Binary files a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/drawable-xhdpi/chromecast_img02.png and /dev/null differ
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/drawable-xhdpi/chromecast_img03.png b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/drawable-xhdpi/chromecast_img03.png
deleted file mode 100755
index 8f05ab95eb..0000000000
Binary files a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/drawable-xhdpi/chromecast_img03.png and /dev/null differ
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/drawable-xhdpi/ic_launcher.png b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100755
index a3a7f4794e..0000000000
Binary files a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/drawable-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100755
index a3a7f4794e..0000000000
Binary files a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/layout/chromecast_settings_step_1.xml b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/layout/chromecast_settings_step_1.xml
deleted file mode 100755
index 13248c3abb..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/layout/chromecast_settings_step_1.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/layout/chromecast_settings_step_2.xml b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/layout/chromecast_settings_step_2.xml
deleted file mode 100755
index 6a7ab5e96c..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/layout/chromecast_settings_step_2.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/layout/chromecast_settings_step_3.xml b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/layout/chromecast_settings_step_3.xml
deleted file mode 100755
index 2ea8aff590..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/layout/chromecast_settings_step_3.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/menu/browse.xml b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/menu/browse.xml
deleted file mode 100755
index 44b7f0c1ef..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/menu/browse.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/values-ja/strings.xml b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/values-ja/strings.xml
deleted file mode 100755
index 4c6703375a..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/values-ja/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/values-v11/styles.xml b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/values-v11/styles.xml
deleted file mode 100755
index cc7b3128b5..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/values-v11/styles.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/values-v14/styles.xml b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/values-v14/styles.xml
deleted file mode 100755
index d581045ffc..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/values-v14/styles.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/values-w820dp/dimens.xml b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/values-w820dp/dimens.xml
deleted file mode 100755
index f3e70203b9..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/values-w820dp/dimens.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
- 64dp
-
-
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/values/color.xml b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/values/color.xml
deleted file mode 100755
index b185f1d715..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/values/color.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- #00a0e9
- - #ffffff
- - #666666
- #03A9F4
-
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/values/dimens.xml b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/values/dimens.xml
deleted file mode 100755
index 2a849ff36a..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
- 16dp
- 16dp
- 24dp
- 5dp
- 20sp
- 16sp
-
-
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/values/strings.xml b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/values/strings.xml
deleted file mode 100755
index ef3e307920..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
- Chromecast (Device Connect Device Plug-in)
- Chromecast (%1$s)
- Chromecast 2.0.0
- [YOUR APPLICATION ID]
- urn:x-cast:com.name.space.chromecast.test.receiver
- [1/3] Chromecastの接続
- Chromecast をテレビの HDMI 入力端子につなぎます。
- [2/3] 電源の接続
- 電源ケーブルの一方の端を Chromecast に差し込み、もう一方の端を電源アダプターに差し込んでから、近くの電源コンセントにつなぎます。
- テレビにUSB ポートがある場合は直接差し込んで Chromecast に給電することもできます。
- [3/3] Chromecastの設定
- Chromecast を初めて使用する際には以下のボタンをタップしてセットアップをしてください。
- " Chromecast アプリを起動 "
- Chromecast のセットアップが完了しましたら右上のボタンを押して、使用するChromeCastと接続してください。
- " Wifi を再起動 "
-
- Play on
- Settings
- キャストするChromeCastを選んでください。
-
-
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/values/styles.xml b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/values/styles.xml
deleted file mode 100755
index c615f8aa65..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/xml/network_security_config.xml b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/xml/network_security_config.xml
deleted file mode 100644
index dca93c079e..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/xml/network_security_config.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/xml/org_deviceconnect_android_deviceplugin_chromecast.xml b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/xml/org_deviceconnect_android_deviceplugin_chromecast.xml
deleted file mode 100755
index 4e1d4d969b..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/xml/org_deviceconnect_android_deviceplugin_chromecast.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/build.gradle b/dConnectDevicePlugin/dConnectDeviceChromeCast/build.gradle
deleted file mode 100644
index de97774e01..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/build.gradle
+++ /dev/null
@@ -1,17 +0,0 @@
-
-buildscript {
- repositories {
- google()
- jcenter()
- }
- dependencies {
- classpath 'com.android.tools.build:gradle:3.6.2'
- }
-}
-
-allprojects {
- repositories {
- jcenter()
- google()
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/gradle.properties b/dConnectDevicePlugin/dConnectDeviceChromeCast/gradle.properties
deleted file mode 100644
index 0d089abc76..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/gradle.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-storeFile=キーストアのファイル名
-storePassword=キーストアのパスワード
-keyAlias=エイリアス名
-keyPassword=エイリアスのパスワード
-android.useAndroidX=true
-android.enableJetifier=true
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/gradle/wrapper/gradle-wrapper.jar b/dConnectDevicePlugin/dConnectDeviceChromeCast/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 13372aef5e..0000000000
Binary files a/dConnectDevicePlugin/dConnectDeviceChromeCast/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/gradle/wrapper/gradle-wrapper.properties b/dConnectDevicePlugin/dConnectDeviceChromeCast/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 6751739880..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Tue Apr 14 15:43:18 JST 2020
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/gradlew b/dConnectDevicePlugin/dConnectDeviceChromeCast/gradlew
deleted file mode 100755
index 9d82f78915..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/gradlew
+++ /dev/null
@@ -1,160 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-## Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
- echo "$*"
-}
-
-die ( ) {
- echo
- echo "$*"
- echo
- exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
- CYGWIN* )
- cygwin=true
- ;;
- Darwin* )
- darwin=true
- ;;
- MINGW* )
- msys=true
- ;;
-esac
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
- # IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
- else
- JAVACMD="$JAVA_HOME/bin/java"
- fi
- if [ ! -x "$JAVACMD" ] ; then
- die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
- fi
-else
- JAVACMD="java"
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ] ; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
- MAX_FD="$MAX_FD_LIMIT"
- fi
- ulimit -n $MAX_FD
- if [ $? -ne 0 ] ; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
- GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
- APP_HOME=`cygpath --path --mixed "$APP_HOME"`
- CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
- JAVACMD=`cygpath --unix "$JAVACMD"`
-
- # We build the pattern for arguments to be converted via cygpath
- ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
- SEP=""
- for dir in $ROOTDIRSRAW ; do
- ROOTDIRS="$ROOTDIRS$SEP$dir"
- SEP="|"
- done
- OURCYGPATTERN="(^($ROOTDIRS))"
- # Add a user-defined pattern to the cygpath arguments
- if [ "$GRADLE_CYGPATTERN" != "" ] ; then
- OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
- fi
- # Now convert the arguments - kludge to limit ourselves to /bin/sh
- i=0
- for arg in "$@" ; do
- CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
- CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
-
- if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
- eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
- else
- eval `echo args$i`="\"$arg\""
- fi
- i=$((i+1))
- done
- case $i in
- (0) set -- ;;
- (1) set -- "$args0" ;;
- (2) set -- "$args0" "$args1" ;;
- (3) set -- "$args0" "$args1" "$args2" ;;
- (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
- (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
- (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
- esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
- JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/gradlew.bat b/dConnectDevicePlugin/dConnectDeviceChromeCast/gradlew.bat
deleted file mode 100644
index aec99730b4..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/gradlew.bat
+++ /dev/null
@@ -1,90 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/lint.xml b/dConnectDevicePlugin/dConnectDeviceChromeCast/lint.xml
deleted file mode 100755
index 09b0cef56b..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/lint.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/proguard-project.txt b/dConnectDevicePlugin/dConnectDeviceChromeCast/proguard-project.txt
deleted file mode 100755
index f2fe1559a2..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/settings.gradle b/dConnectDevicePlugin/dConnectDeviceChromeCast/settings.gradle
deleted file mode 100644
index e7b4def49c..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceChromeCast/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-include ':app'
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/.gitignore b/dConnectDevicePlugin/dConnectDeviceFaBo/.gitignore
deleted file mode 100644
index c6cbe562a4..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-*.iml
-.gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
-.DS_Store
-/build
-/captures
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/README.md b/dConnectDevicePlugin/dConnectDeviceFaBo/README.md
deleted file mode 100644
index 9e8eb2662d..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/README.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# FaBoプラグイン
-
-このFaBoプラグインでは、FaBoのShieldに接続して、GPIOなどの操作を行うための機能を提供します。
-
-また、GPIOを仮想化して、light、temperatureといったプロファイルに機能をマッピングして使用することもできます。
-
-## 開発環境
-Android Studio 2.2.1以上
-
-## ビルドマニュアル
-- [FaBoビルドマニュアル](https://github.com/DeviceConnect/DeviceConnect-Android/wiki/FaBo-Build)
-
-## サポートするプロファイル
-
-* gpio
-* fabo
-* driveController
-* light
-* temperature
-* vibration
-* keyEvent
-* humidity
-* illuminance
-* deviceOrientation
-* proximity
-* atmosphericPressure
-
-## 関連ページ
-- [fabo](http://fabo.io/)
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/.gitignore b/dConnectDevicePlugin/dConnectDeviceFaBo/app/.gitignore
deleted file mode 100644
index 796b96d1c4..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/build.gradle b/dConnectDevicePlugin/dConnectDeviceFaBo/app/build.gradle
deleted file mode 100644
index b6c8eef391..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/build.gradle
+++ /dev/null
@@ -1,75 +0,0 @@
-apply plugin: 'com.android.library'
-// Create github.properties in root project folder file with
-// gpr.usr=GITHUB_USER_ID
-// gpr.key=PERSONAL_ACCESS_TOKEN
-def githubPropertiesFile = rootProject.file("github.properties")
-def githubProperties = new Properties()
-if (githubPropertiesFile.exists()) {
- githubProperties.load(new FileInputStream(githubPropertiesFile))
-}
-
-android {
- compileSdkVersion 29
-
- def getVersionName = { ->
- def version
- if (System.getProperty('os.name').toLowerCase().contains('windows')) {
- version = ["cmd", "/c", "git describe --tags --long"].execute().in.text.trim()
- } else {
- version = ["sh", "-c", "git describe --tags --long"].execute().in.text.trim()
- }
- version = version.empty ? "2.1.0" : version
- return "${version}"
- }
-
- defaultConfig {
- minSdkVersion 16
- targetSdkVersion 29
- versionCode 1
- versionName getVersionName()
- }
-
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
- }
- }
-
- packagingOptions {
- exclude 'META-INF/DEPENDENCIES'
- exclude 'META-INF/LICENSE'
- exclude 'META-INF/NOTICE'
- exclude 'META-INF/NOTICE.txt'
- exclude 'META-INF/LICENSE.txt'
- exclude 'META-INF/DEPENDENCIES.txt'
- }
-
-
- tasks.withType(JavaCompile) {
- options.encoding = 'UTF-8'
- }
- compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
- }
- repositories {
- maven {
- name = "DeviceConnect-Android"
- url = uri("https://maven.pkg.github.com/DeviceConnect/DeviceConnect-Android")
-
- credentials {
- username = System.getenv("GPR_USER") ?: githubProperties['gpr.usr']
- password = System.getenv("GPR_API_KEY") ?: githubProperties['gpr.key']
- }
- }
- }
-}
-
-dependencies {
- implementation fileTree(include: '*.jar', dir: 'libs')
- implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.4'
- testImplementation 'junit:junit:4.12'
- androidTestImplementation 'androidx.test.ext:junit:1.1.1'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/proguard-rules.pro b/dConnectDevicePlugin/dConnectDeviceFaBo/app/proguard-rules.pro
deleted file mode 100644
index f24ffff2ad..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/proguard-rules.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /Users/sasakiakira/Library/Android/sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/androidTest/java/org/deviceconnect/android/deviceplugin/fabo/ApplicationTest.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/androidTest/java/org/deviceconnect/android/deviceplugin/fabo/ApplicationTest.java
deleted file mode 100644
index bfa2de5e95..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/androidTest/java/org/deviceconnect/android/deviceplugin/fabo/ApplicationTest.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo;
-
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.runner.RunWith;
-
-/**
- * Testing Fundamentals
- */
-@RunWith(AndroidJUnit4.class)
-public class ApplicationTest {
- public ApplicationTest() {
- }
-}
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/AndroidManifest.xml b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/AndroidManifest.xml
deleted file mode 100644
index d3f8a33bf3..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/assets/api/driveController.json b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/assets/api/driveController.json
deleted file mode 100644
index 567e0b938b..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/assets/api/driveController.json
+++ /dev/null
@@ -1,220 +0,0 @@
-{
- "swagger": "2.0",
- "basePath": "/gotapi/driveController",
- "info": {
- "title": "DriveController Profile",
- "version": "2.0.0",
- "description": "スマートデバイスの駆動処理を提供するAPI。"
- },
- "consumes": [
- "application/x-www-form-urlencoded",
- "multipart/form-data"
- ],
- "paths": {
- "/move": {
- "post": {
- "x-type": "one-shot",
- "summary": "スマートデバイスを指定された方向に移動開始する。",
- "description": "",
- "parameters": [
- {
- "name": "serviceId",
- "description": "サービスID。取得対象スマートデバイス",
- "in": "formData",
- "required": true,
- "type": "string"
- },
- {
- "name": "angle",
- "description": "角度。デバイスの方向 (degree) events = EventManager.INSTANCE.getEventList(FaBoGPIOProfile.PROFILE_NAME,
- FaBoGPIOProfile.ATTRIBUTE_ON_CHANGE);
- for (Event event : events) {
- if (event.getOrigin().equals(origin)) {
- String serviceId = event.getServiceId();
- Iterator serviceIds = mServiceIdStore.iterator();
- while (serviceIds.hasNext()) {
- String tmpServiceId = (String) serviceIds.next();
- if (tmpServiceId.equals(serviceId)) {
- serviceIds.remove();
- }
- }
- }
- }
- } else {
- resetPluginResource();
- }
- }
-
- @Override
- protected void onDevicePluginReset() {
- // Device Plug-inへのReset要求受信時の処理.
- if (DEBUG) {
- mLogger.info("Plug-in : onDevicePluginReset");
- }
- resetPluginResource();
- }
-
- @Override
- protected SystemProfile getSystemProfile() {
- return new FaBoSystemProfile();
- }
-
- /**
- * FaBoを操作するクラスを取得します.
- * @return FaBoDeviceControlのインスタンス
- */
- protected abstract FaBoDeviceControl createFaBoDeviceControl();
-
- /**
- * FaBoを操作するためのクラスを取得します.
- * @return FaBoを操作するクラス
- */
- public FaBoDeviceControl getFaBoDeviceControl() {
- return mFaBoDeviceControl;
- }
-
- /**
- * FaBoDeviceControlを初期化します.
- */
- private void initFaBoDeviceControl() {
- mFaBoDeviceControl = createFaBoDeviceControl();
- mFaBoDeviceControl.setOnFaBoDeviceControlListener(new FaBoDeviceControl.OnFaBoDeviceControlListener() {
- @Override
- public void onConnected() {
- startWatchFirmata();
- setOnline(true);
- sendResultToActivity(FaBoConst.SUCCESS_CONNECT_FIRMATA);
- }
-
- @Override
- public void onDisconnected() {
- endWatchFirmata();
- setOnline(false);
- }
-
- @Override
- public void onFailedConnected() {
- setOnline(false);
- sendResultToActivity(FaBoConst.FAILED_CONNECT_ARDUINO);
- }
- });
- mFaBoDeviceControl.initialize();
- }
-
- /**
- * リソースリセット処理.
- */
- private void resetPluginResource() {
- EventManager.INSTANCE.removeAll();
-
- if (mFaBoDeviceControl != null) {
- mFaBoDeviceControl.destroy();
- }
- initFaBoDeviceControl();
- }
-
- /**
- * テスト用仮想データ.
- */
- private void createTestData() {
- if (mDBHelper.getServiceDataList().isEmpty()) {
- ServiceData serviceData = new ServiceData();
- serviceData.setName("RobotCar(Mouse)");
- serviceData.setServiceId("mouse_service_id");
-
- ProfileData profileData = new ProfileData();
- profileData.setServiceId("mouse_service_id");
- profileData.setType(ProfileData.Type.I2C_MOUSE_DRIVE_CONTROLLER);
- serviceData.addProfileData(profileData);
-
- mDBHelper.addServiceData(serviceData);
- }
- }
-
- /**
- * 仮想サービスのデータをDBに追加します.
- * @param serviceData 追加する仮想サービスのデータ
- * @return 追加したVirtualService
- */
- public VirtualService addServiceData(final ServiceData serviceData) {
- String serviceId = mDBHelper.createServiceId();
- serviceData.setServiceId(serviceId);
- boolean result = mDBHelper.addServiceData(serviceData) >= 0;
- if (result) {
- VirtualService service = VirtualServiceFactory.createService(serviceData);
- service.setOnline(FaBoConst.STATUS_FABO_RUNNING == mFaBoDeviceControl.getStatus());
- getServiceProvider().addService(service);
- return service;
- }
- return null;
- }
-
- /**
- * 仮想サービスのデータを更新します.
- * @param serviceData 更新する仮想サービスのデータ
- * @return 更新したVirtualService
- */
- public VirtualService updateServiceData(final ServiceData serviceData) {
- boolean result = mDBHelper.updateServiceData(serviceData) >= 0;
- if (result) {
- DConnectService service = getServiceProvider().getService(serviceData.getServiceId());
- if (service != null && service instanceof VirtualService) {
- service.setName(serviceData.getName());
- ((VirtualService)service).setServiceData(serviceData);
-
- // プロファイルを一度全て削除してから、プロファイルを追加します
- for (DConnectProfile p : service.getProfileList()) {
- if (canRemoveProfile(p.getProfileName())) {
- service.removeProfile(p);
- }
- }
-
- for (ProfileData p : serviceData.getProfileDataList()) {
- DConnectProfile profile = VirtualServiceFactory.createProfile(p);
- if (profile != null) {
- service.addProfile(profile);
- profile.setContext(this);
- }
- }
- return ((VirtualService) service);
- }
- }
- return null;
- }
-
- /**
- * 仮想サービスのデータを削除します.
- * @param serviceData 削除する仮想サービスのデータ
- */
- public void removeServiceData(final ServiceData serviceData) {
- getServiceProvider().removeService(serviceData.getServiceId());
- mDBHelper.removeServiceData(serviceData);
- }
-
- /**
- * 指定されたvidに対応する仮想サービスデータを取得します.
- *
- * 指定されたvidに対応する仮想サービスが存在しない場合にはnullを返却します.
- *
- * @param vid 仮想サービスデータのID
- * @return ServiceDataのインスタンス
- */
- public ServiceData getServiceData(final String vid) {
- return mDBHelper.getServiceData(vid);
- }
-
- /**
- * 削除できるプロファイルか確認を行う.
- * @param profileName 削除できるかを確認するプロファイル名
- * @return 削除できる場合はtrue、それ以外はfalse
- */
- private boolean canRemoveProfile(final String profileName) {
- return !"serviceInformation".equalsIgnoreCase(profileName);
- }
-
- /**
- * 仮想サービスの初期化を行います.
- */
- private void initVirtualService() {
- if (DEBUG) {
- Log.i(TAG, "------------------------------------");
- Log.i(TAG, "Create virtual service list.");
- Log.i(TAG, "------------------------------------");
- }
-
- mDBHelper = new VirtualServiceDBHelper(getApplicationContext());
- createTestData();
-
- List serviceDataList = mDBHelper.getServiceDataList();
- for (ServiceData serviceData : serviceDataList) {
- DConnectService service = VirtualServiceFactory.createService(serviceData);
- getServiceProvider().addService(service);
- }
- }
-
- /**
- * DConnectServiceのOnline状況を設定します.
- *
- * @param online オンライン状態
- */
- private void setOnline(final boolean online) {
- for (DConnectService service : getServiceProvider().getServiceList()) {
- service.setOnline(online);
- }
- }
-
- /**
- * Activityにメッセージを返信する.
- *
- * @param resultId 結果のID.
- */
- private void sendResultToActivity(final int resultId) {
- Intent intent = new Intent(FaBoConst.DEVICE_TO_ARDUINO_OPEN_USB_RESULT);
- intent.putExtra("resultId", resultId);
- sendBroadcast(intent);
- }
-
- /**
- * 値監視用のThread.
- */
- private void startWatchFirmata() {
- if (mWatchFirmataThread == null) {
- mWatchFirmataThread = new WatchFirmataThread();
- mWatchFirmataThread.start();
- }
- }
-
- /**
- * Threadを停止.
- */
- private void endWatchFirmata() {
- if (mWatchFirmataThread != null) {
- mWatchFirmataThread.stopWatchFirmata();
- mWatchFirmataThread = null;
- }
- }
-
- /**
- * ServiceIDを保持する.
- */
- private List mServiceIdStore = new ArrayList<>();
-
- /**
- * onChangeイベントの登録.
- *
- * @param serviceId 現在接続中のデバイスプラグインのServiceId.
- */
- public void registerOnChange(final String serviceId) {
- mServiceIdStore.add(serviceId);
- }
-
- /**
- * onChangeイベントの削除.
- */
- public void unregisterOnChange(final String serviceId) {
- Iterator serviceIds = mServiceIdStore.iterator();
- while (serviceIds.hasNext()) {
- String tmpServiceId = (String) serviceIds.next();
- if (tmpServiceId.equals(serviceId)) {
- serviceIds.remove();
- }
- }
- }
-
- /**
- * 監視用スレッド.
- */
- private class WatchFirmataThread extends Thread {
- /**
- * 監視スレッド停止フラグ.
- */
- private boolean mStopFlag;
-
- @Override
- public void run() {
- if (DEBUG) {
- Log.i(TAG, "---------------------------------");
- Log.i(TAG, "Start watch a fragment_fabo_firmata.");
- Log.i(TAG, "---------------------------------");
- }
-
- while (!mStopFlag) {
- for (int s = 0; s < mServiceIdStore.size(); s++) {
- String serviceId = mServiceIdStore.get(s);
- List events = EventManager.INSTANCE.getEventList(serviceId,
- FaBoGPIOProfile.PROFILE_NAME, null, FaBoGPIOProfile.ATTRIBUTE_ON_CHANGE);
-
- for (Event event : events) {
- Bundle pins = new Bundle();
- for (FaBoShield.Pin pin : FaBoShield.Pin.values()) {
- if (getFaBoDeviceControl().isPinSupported(pin)) {
- switch (pin.getMode()) {
- case GPIO_IN:
- pins.putInt(pin.getPinNames()[1], getFaBoDeviceControl().getDigital(pin).getValue());
- break;
- case ANALOG:
- pins.putInt(pin.getPinNames()[1], getFaBoDeviceControl().getAnalog(pin));
- break;
- }
- }
- }
-
- if (pins.size() > 0) {
- // Eventに値をおくる.
- Intent intent = EventManager.createEventMessage(event);
- intent.putExtra("pins", pins);
- sendEvent(intent, event.getAccessToken());
- }
- }
- }
-
- try {
- Thread.sleep(30);
- } catch (InterruptedException e) {
- break;
- }
- }
-
- if (DEBUG) {
- Log.i(TAG, "---------------------------------");
- Log.i(TAG, "Stop watch a fragment_fabo_firmata.");
- Log.i(TAG, "---------------------------------");
- }
- }
-
- /**
- * 監視用スレッドを停止します.
- */
- void stopWatchFirmata() {
- mStopFlag = true;
- interrupt();
- }
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/FaBoDeviceControl.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/FaBoDeviceControl.java
deleted file mode 100644
index 948048b1ed..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/FaBoDeviceControl.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.device;
-
-import org.deviceconnect.android.deviceplugin.fabo.param.FaBoShield;
-
-/**
- * FaBoデバイスを操作するためのインターフェース.
- */
-public interface FaBoDeviceControl {
- /**
- * FaBoデバイスの初期化を行います.
- */
- void initialize();
-
- /**
- * FaBoデバイスとの接続を破棄します.
- */
- void destroy();
-
- /**
- * 指定されたピンがサポートされているか確認を行います.
- * @param pin サポートされているか確認するピン
- * @return サポートされている場合はtrue、それ以外はfalse
- */
- boolean isPinSupported(final FaBoShield.Pin pin);
-
- /**
- * アナログピンに対して書き込みを行います.
- * @param pin アナログピン
- * @param value 書き込む値
- */
- void writeAnalog(final FaBoShield.Pin pin, final int value);
-
- /**
- * デジタルピンに対して書き込みを行います.
- * @param pin デジタルピン
- * @param hl 書き込む値(HIGH or LOW)
- */
- void writeDigital(final FaBoShield.Pin pin, final FaBoShield.Level hl);
-
- /**
- * アナログピンのデータを取得します.
- * @param pin アナログピン
- * @return アナログ値
- */
- int getAnalog(final FaBoShield.Pin pin);
-
- /**
- * デジタルピンのデータを取得します.
- * @param pin デジタルピン
- * @return デジタル値
- */
- FaBoShield.Level getDigital(final FaBoShield.Pin pin);
-
- /**
- * 各PINのモードを設定します.
- * @param pin ピン
- * @param mode モード
- */
- void setPinMode(final FaBoShield.Pin pin, final FaBoShield.Mode mode);
-
- /**
- * FaBoデバイスの接続状態を取得します.
- * @return 接続状態
- */
- int getStatus();
-
- /**
- * RobotCarを操作するためのインターフェースを取得します.
- * @return IRobotCarを実装したクラス
- */
- IRobotCar getRobotCar();
-
- /**
- * MouseCarを操作するためのインターフェースを取得します.
- * @return IMouseCarを実装したクラス
- */
- IMouseCar getMouseCar();
-
- /**
- * ADXL345を操作するためのインターフェースを取得します.
- * @return IADXL345を実装したクラス
- */
- IADXL345 getADXL345();
-
- /**
- * ADT7410を操作するためのインターフェースを取得します.
- * @return IADT7410を実装したクラス
- */
- IADT7410 getADT7410();
-
- /**
- * HTS221を操作するためのインターフェースを取得します.
- * @return IHTS221を実装したクラス
- */
- IHTS221 getHTS221();
-
- /**
- * VCNL4010を操作するためのインターフェースを取得します.
- * @return VCNL4010を実装したクラス
- */
- IVCNL4010 getVCNL4010();
-
- /**
- * ISL29034を操作するためのインターフェースを取得します.
- * @return ISL29034を実装したクラス
- */
- IISL29034 getISL29034();
-
- /**
- * MPL115を操作するためのインターフェースを取得します.
- * @return MPL115を実装したクラス
- */
- IMPL115 getMPL115();
-
- /**
- * LIDARLite v3を操作するためのインターフェースを取得します.
- * @return ILIDARLiteV3を実装したクラス
- */
- ILIDARLiteV3 getLIDARLite();
-
- /**
- * FaBoデバイスの接続状態通知リスナーを設定します.
- * @param listener リスナー
- */
- void setOnFaBoDeviceControlListener(final OnFaBoDeviceControlListener listener);
-
- /**
- * GPIOのイベント通知リスナーを追加します.
- * @param listener 追加するリスナー
- */
- void addOnGPIOListener(final OnGPIOListener listener);
-
- /**
- * GPIOのイベント通知リスナーを削除します.
- * @param listener 削除するリスナー
- */
- void removeOnGPIOListener(final OnGPIOListener listener);
-
- /**
- * FaBoデバイスの接続状態を通知するためのリスナー.
- */
- interface OnFaBoDeviceControlListener {
- /**
- * FaBoが接続された時のイベントを通知します.
- */
- void onConnected();
-
- /**
- * FaBoが切断された時のイベントを通知します.
- */
- void onDisconnected();
-
- /**
- * 接続に失敗した時のイベントを通知します.
- */
- void onFailedConnected();
- }
-
- /**
- * GPIOのイベントを通知するリスナー.
- */
- interface OnGPIOListener {
- /**
- * アナログのデータを受信したことを通知します.
- */
- void onAnalog();
-
- /**
- * デジタルのデータを受信したことを通知します.
- */
- void onDigital();
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/IADT7410.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/IADT7410.java
deleted file mode 100644
index 1e6ae3123a..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/IADT7410.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.device;
-
-/**
- * ADT7410を操作するためのインターフェース.
- */
-public interface IADT7410 {
-
- /**
- * ADT7410の温度センサーを取得します.
- * @param listener 取得した温度を通知するリスナー
- */
- void read(final OnADT7410Listener listener);
-
- /**
- * ADT7410の温度センサーを開始します.
- * @param listener 取得した温度を通知するリスナー
- */
- void startRead(final OnADT7410Listener listener);
-
- /**
- * ADT7410の温度センサーを停止します.
- * @param listener 取得した温度を通知するリスナー
- */
- void stopRead(final OnADT7410Listener listener);
-
- /**
- * ADT7410からのデータを受け取るリスナー.
- */
- interface OnADT7410Listener {
- /**
- * 温度センサー開始成功通知を受け取ります.
- */
- void onStarted();
-
- /**
- * 温度センサーを受け取ります.
- * @param temperature 温度
- */
- void onData(final double temperature);
-
- /**
- * 温度センサーでエラーが発生したことを受け取ります.
- * @param message
- */
- void onError(final String message);
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/IADXL345.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/IADXL345.java
deleted file mode 100644
index 3dfc7006a4..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/IADXL345.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.device;
-
-/**
- * ADXL345を操作するためのインターフェース.
- */
-public interface IADXL345 {
-
- /**
- * ADXL345の加速度を取得します.
- * @param listener 加速度の通知を受けるリスナー
- */
- void read(final OnADXL345Listener listener);
-
- /**
- * ADXL345の加速度センサーを開始します.
- * @param listener 加速度の通知を受けるリスナー
- */
- void startRead(final OnADXL345Listener listener);
-
- /**
- * ADXL345の加速度センサーを停止します.
- * @param listener 加速度の通知を受けるリスナー
- */
- void stopRead(final OnADXL345Listener listener);
-
- /**
- * ADXL345からのデータを受け取るリスナー.
- */
- interface OnADXL345Listener {
- /**
- * 加速度センサー開始成功通知を受け取ります.
- */
- void onStarted();
-
- /**
- * 加速度センサーを受け取ります.
- * @param x x軸の加速度
- * @param y y軸の加速度
- * @param z z軸の加速度
- */
- void onData(final double x, final double y, final double z);
-
- /**
- * 加速度センサーでエラーが発生したことを受け取ります.
- * @param message エラーメッセージ
- */
- void onError(final String message);
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/IHTS221.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/IHTS221.java
deleted file mode 100644
index 10d70fb8aa..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/IHTS221.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.device;
-
-/**
- * HTS221を操作するためのインターフェース.
- */
-public interface IHTS221 {
- /**
- * HTS221から湿度の取得を行います.
- * @param callback 湿度のデータを通知するコールバック
- */
- void readHumidity(final OnHumidityCallback callback);
-
- /**
- * HTS221の温度の取得を行います.
- * @param callback 温度のデータを通知するコールバック
- */
- void readTemperature(final OnTemperatureCallback callback);
-
- /**
- * 湿度のデータを通知するコールバック.
- */
- interface OnHumidityCallback {
- void onHumidity(final double humidity);
- void onError(final String message);
- }
-
- /**
- * 温度のデータを通知するコールバック.
- */
- interface OnTemperatureCallback {
- void onTemperature(final double temperature);
- void onError(final String message);
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/IISL29034.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/IISL29034.java
deleted file mode 100644
index a45a5f62c3..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/IISL29034.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.device;
-
-/**
- * ISL29034を操作するためのインターフェース.
- */
-public interface IISL29034 {
- /**
- * 照度センサー値を取得します.
- * @param lightListener 照度センサー値を受け取るリスナー
- */
- void read(final OnAmbientLightListener lightListener);
-
- /**
- * 照度センサー値の連続取得を開始します.
- * @param lightListener 照度センサー値を受け取るリスナー
- */
- void startRead(final OnAmbientLightListener lightListener);
-
- /**
- * 照度センサー値の連続取得を停止します.
- * @param lightListener 照度センサー値を受け取るリスナー
- */
- void stopRead(final OnAmbientLightListener lightListener);
-
- /**
- * 照度センサー値の通知を行うリスナー.
- */
- interface OnAmbientLightListener {
- /**
- * 照度センサーの開始成功通知を受け取ります.
- */
- void onStarted();
-
- /**
- * 照度センサー値の通知を受け取ります.
- * @param lux 照度
- */
- void onData(final double lux);
-
- /**
- * 照度センサー値の取得失敗通知を受け取ります.
- * @param message エラーメッセージ
- */
- void onError(final String message);
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/ILIDARLiteV3.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/ILIDARLiteV3.java
deleted file mode 100644
index 9e9c004aab..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/ILIDARLiteV3.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.device;
-
-/**
- * ILIDARLiteV3を操作するためのインターフェース.
- */
-public interface ILIDARLiteV3 {
-
- /**
- * LIDARLite v3から距離を取得します.
- * @param listener 加速度の通知を受けるリスナー
- */
- void read(final OnLIDARLiteListener listener);
-
- /**
- * LIDARLite v3から距離センサーを開始します.
- * @param listener 加速度の通知を受けるリスナー
- */
- void startRead(final OnLIDARLiteListener listener);
-
- /**
- * LIDARLite v3から距離センサーを停止します.
- * @param listener 加速度の通知を受けるリスナー
- */
- void stopRead(final OnLIDARLiteListener listener);
-
-
- /**
- * LIDARLite v3からのデータを受け取るリスナー.
- */
- interface OnLIDARLiteListener {
- /**
- * 距離センサー開始成功通知を受け取ります.
- */
- void onStarted();
-
- /**
- * 距離センサーを受け取ります.
- * @param distance 距離
- */
- void onData(final int distance);
-
- /**
- * 距離センサーでエラーが発生したことを受け取ります.
- * @param message エラーメッセージ
- */
- void onError(final String message);
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/IMPL115.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/IMPL115.java
deleted file mode 100644
index 147fb6b5cc..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/IMPL115.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.device;
-
-/**
- * MPL115を操作するためのインターフェース.
- */
-public interface IMPL115 {
- /**
- * 気圧センサーの値を取得します.
- * @param listener 値を受け取るリスナー
- */
- void readAtmosphericPressure(final OnAtmosphericPressureListener listener);
-
- /**
- * 気圧センサーの値を受け取るリスナー.
- */
- interface OnAtmosphericPressureListener {
- /**
- * 気圧の値を受け取ります.
- * @param hpa 気圧(ヘクトパスカル)
- * @param temperature 温度
- */
- void onData(final double hpa, final double temperature);
-
- /**
- * 気圧の取得に失敗通知を受け取ります.
- * @param message エラーメッセージ
- */
- void onError(final String message);
- }
-
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/IMouseCar.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/IMouseCar.java
deleted file mode 100644
index 186219346e..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/IMouseCar.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.device;
-
-/**
- * マウス型RobotCarを操作するためのインターフェース.
- */
-public interface IMouseCar {
- /**
- * Mouse move.
- *
- * 左右のスピードを変えて回転します。
- *
- * @param leftSpeed 移動するスピード(-1.0〜1.0)
- * @param rightSpeed 移動するスピード(-1.0〜1.0)
- */
- void move(final float rightSpeed, final float leftSpeed);
-
- /**
- * 停止します.
- */
- void stop();
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/IRobotCar.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/IRobotCar.java
deleted file mode 100644
index e7d4767433..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/IRobotCar.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.device;
-
-/**
- * RobotCarを操作するためのインターフェース.
- */
-public interface IRobotCar {
- /**
- * ハンドルを切ります.
- * @param direction 向き(-1.0〜1.0)
- */
- void turnHandle(final float direction);
-
- /**
- * 移動します.
- * @param speed 移動するスピード(-1.0〜1.0)
- */
- void move(final float speed);
-
- /**
- * 停止します.
- */
- void stop();
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/IVCNL4010.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/IVCNL4010.java
deleted file mode 100644
index cdd2c39193..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/IVCNL4010.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.device;
-
-/**
- * VCNL4010を操作するためのインターフェース.
- */
-public interface IVCNL4010 {
-
- /**
- * 近距離センサーの値を取得します.
- * @param listener 通知を受け取るリスナー
- */
- void readProximity(final OnProximityListener listener);
-
- /**
- * 近距離センサー値の連続取得を開始します.
- * @param listener 通知を受け取るリスナー
- */
- void startProximity(final OnProximityListener listener);
-
- /**
- * 近距離センサー値の連続取得を停止します.
- * @param listener 通知を受け取るリスナー
- */
- void stopProximity(final OnProximityListener listener);
-
- /**
- * 照度センサーの値を取得します.
- */
- void readAmbientLight(final OnAmbientLightListener listener);
-
- /**
- * 照度センサー値の連続取得を開始します.
- */
- void startAmbientLight(final OnAmbientLightListener listener);
-
- /**
- * 照度センサー値の連続取得を停止します.
- */
- void stopAmbientLight(final OnAmbientLightListener listener);
-
- /**
- * 近距離センサー値の通知を受けるリスナー.
- */
- interface OnProximityListener {
- /**
- * 近距離センサーの開始通知を受け取ります.
- */
- void onStarted();
-
- /**
- * 近距離センサー値を受け取ります.
- * @param proximity 距離
- */
- void onData(final boolean proximity);
-
- /**
- * 近距離センサー値の取得失敗通知を受け取ります.
- * @param message エラーメッセージ
- */
- void onError(final String message);
- }
-
- interface OnAmbientLightListener {
- void onStarted();
- void onData(final double ambient);
- void onError(final String message);
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/param/FaBoConst.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/param/FaBoConst.java
deleted file mode 100644
index fdbcebece8..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/param/FaBoConst.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- FaBoConst.java
- Copyright (c) 2014 NTT DOCOMO,INC.
- Released under the MIT license
- http://opensource.org/licenses/mit-license.php
- */
-package org.deviceconnect.android.deviceplugin.fabo.param;
-
-/**
- * FaBoデバイスプラグインの汎用定数.
- */
-public class FaBoConst {
-
- /** Command of open usb. */
- public static final String DEVICE_TO_ARDUINO_OPEN_USB
- = "org.deviceconnect.gpio.usb.open";
-
- /** Command of check usb. */
- public static final String DEVICE_TO_ARDUINO_CHECK_USB
- = "org.deviceconnect.gpio.usb.check";
-
- /** Command of check usb. */
- public static final String DEVICE_TO_ARDUINO_CHECK_USB_RESULT
- = "org.deviceconnect.gpio.usb.check.result";
-
- /** Command of close usb. */
- public static final String DEVICE_TO_ARDUINO_CLOSE_USB
- = "org.deviceconnect.gpio.usb.close";
-
- /** Result of usb connection. */
- public static final String DEVICE_TO_ARDUINO_OPEN_USB_RESULT
- = "org.deviceconnect.gpio.usb.open.result";
-
- /** USBが未接続. */
- public static final int CAN_NOT_FIND_USB = 1;
-
- /** USBに接続失敗. */
- public static final int FAILED_OPEN_USB = 2;
-
- /** Arduinoに接続成功. */
- public static final int SUCCESS_CONNECT_ARDUINO = 3;
-
- /** Arduinoに接続失敗. */
- public static final int FAILED_CONNECT_ARDUINO = 4;
-
- /** Firmataに接続成功. */
- public static final int SUCCESS_CONNECT_FIRMATA = 5;
-
- /** Firmataに接続失敗. */
- public static final int FAILED_CONNECT_FIRMATA = 6;
-
- /** 停止中. */
- public static final int STATUS_FABO_NOCONNECT = 101;
-
- /** 初期化中. */
- public static final int STATUS_FABO_INIT = 102;
-
- /** 起動中. */
- public static final int STATUS_FABO_RUNNING = 103;
-
- /** ACTIVITY非表示. */
- public static final int STATUS_ACTIVITY_PAUSE = 201;
-
- /** ACTIVITY表示. */
- public static final int STATUS_ACTIVITY_DISPLAY = 202;
-
-
-}
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/param/FaBoShield.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/param/FaBoShield.java
deleted file mode 100644
index 2e637c41eb..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/param/FaBoShield.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
- ArduinoUno.java
- Copyright (c) 2014 NTT DOCOMO,INC.
- Released under the MIT license
- http://opensource.org/licenses/mit-license.php
- */
-package org.deviceconnect.android.deviceplugin.fabo.param;
-
-import static org.deviceconnect.android.deviceplugin.fabo.param.FaBoShield.Mode.ANALOG;
-import static org.deviceconnect.android.deviceplugin.fabo.param.FaBoShield.Mode.GPIO_OUT;
-
-/**
- * FaBoShieldのPin情報.
- */
-public class FaBoShield {
- // pin modes
- public static final byte PIN_MODE_GPIO_IN = (byte) 0x00;
- public static final byte PIN_MODE_GPIO_OUT = (byte) 0x01;
- public static final byte PIN_MODE_ANALOG = (byte) 0x02;
- public static final byte PIN_MODE_PWM = (byte) 0x03;
- public static final byte PIN_MODE_SERVO = (byte) 0x04;
-
- // PORT0
- public final static int BIT_D0 = (int)0x0001; // 00000000 00000001
- public final static int BIT_D1 = (int)0x0002; // 00000000 00000010
- public final static int BIT_D2 = (int)0x0004; // 00000000 00000100
- public final static int BIT_D3 = (int)0x0008; // 00000000 00001000
- public final static int BIT_D4 = (int)0x0010; // 00000000 00010000
- public final static int BIT_D5 = (int)0x0020; // 00000000 00100000
- public final static int BIT_D6 = (int)0x0040; // 00000000 01000000
- public final static int BIT_D7 = (int)0x0100; // 00000001 00000000
-
- // PORT1
- public final static int BIT_D8 = (int)0x0001; // 00000000 00000001
- public final static int BIT_D9 = (int)0x0002; // 00000000 00000010
- public final static int BIT_D10 = (int)0x0004; // 00000000 00000100
- public final static int BIT_D11 = (int)0x0008; // 00000000 00001000
- public final static int BIT_D12 = (int)0x0010; // 00000000 00010000
- public final static int BIT_D13 = (int)0x0020; // 00000000 00100000
- public final static int BIT_A0 = (int)0x0040; // 00000000 01000000
- public final static int BIT_A1 = (int)0x0100; // 00000001 00000000
-
- // PORT2
- public final static int BIT_A2 = (int)0x0001; // 00000000 00000001
- public final static int BIT_A3 = (int)0x0002; // 00000000 00000010
- public final static int BIT_A4 = (int)0x0004; // 00000000 00000100
- public final static int BIT_A5 = (int)0x0008; // 00000000 00001000
-
- // PORT0
- public final static int PORT_D0 = 0;
- public final static int PORT_D1 = 0;
- public final static int PORT_D2 = 0;
- public final static int PORT_D3 = 0;
- public final static int PORT_D4 = 0;
- public final static int PORT_D5 = 0;
- public final static int PORT_D6 = 0;
- public final static int PORT_D7 = 0;
-
- // PORT1
- public final static int PORT_D8 = 1;
- public final static int PORT_D9 = 1;
- public final static int PORT_D10 = 1;
- public final static int PORT_D11 = 1;
- public final static int PORT_D12 = 1;
- public final static int PORT_D13 = 1;
- public final static int PORT_A0 = 1;
- public final static int PORT_A1 = 1;
-
- // PORT2
- public final static int PORT_A2 = 2;
- public final static int PORT_A3 = 2;
- public final static int PORT_A4 = 2;
- public final static int PORT_A5 = 2;
-
- // PIN NO
- public final static int PIN_NO_D0 = 0;
- public final static int PIN_NO_D1 = 1;
- public final static int PIN_NO_D2 = 2;
- public final static int PIN_NO_D3 = 3;
- public final static int PIN_NO_D4 = 4;
- public final static int PIN_NO_D5 = 5;
- public final static int PIN_NO_D6 = 6;
- public final static int PIN_NO_D7 = 7;
- public final static int PIN_NO_D8 = 8;
- public final static int PIN_NO_D9 = 9;
- public final static int PIN_NO_D10 = 10;
- public final static int PIN_NO_D11 = 11;
- public final static int PIN_NO_D12 = 12;
- public final static int PIN_NO_D13 = 13;
- public final static int PIN_NO_A0 = 14;
- public final static int PIN_NO_A1 = 15;
- public final static int PIN_NO_A2 = 16;
- public final static int PIN_NO_A3 = 17;
- public final static int PIN_NO_A4 = 18;
- public final static int PIN_NO_A5 = 19;
-
- /**
- * ピンの設定レベル.
- */
- public enum Level {
- /**
- * HIGHレベル.
- */
- HIGH(1, "HIGH"),
-
- /**
- * LOWレベル.
- */
- LOW(0, "LOW");
-
- private int mValue;
- private String mName;
-
- Level(final int value, final String name) {
- mValue = value;
- mName = name;
- }
-
- public int getValue() {
- return mValue;
- }
-
- public String getName() {
- return mName;
- }
-
- public static Level getLevel(final int value) {
- for (Level level : values()) {
- if (level.getValue() == value) {
- return level;
- }
- }
- return null;
- }
- }
-
- /**
- * ピンのモード.
- */
- public enum Mode {
- GPIO_IN(PIN_MODE_GPIO_IN, "GPIOIN"),
- GPIO_OUT(PIN_MODE_GPIO_OUT, "GPIOOUT"),
- ANALOG(PIN_MODE_ANALOG, "ANALOG"),
- PWM(PIN_MODE_PWM, "PWM"),
- SERVO(PIN_MODE_SERVO, "SERVO");
-
- private int mValue;
- private String mName;
-
- Mode(final int value, final String name) {
- mValue = value;
- mName = name;
- }
-
- public int getValue() {
- return mValue;
- }
-
- public String getName() {
- return mName;
- }
-
- public static Mode getMode(final int value) {
- for (Mode mode : values()) {
- if (mode.getValue() == value) {
- return mode;
- }
- }
- return null;
- }
- }
-
- /**
- * ピン情報の構造体.
- */
- public enum Pin {
- PIN_D0(PIN_NO_D0, PORT_D0, BIT_D0, GPIO_OUT, "0", "D0"),
- PIN_D1(PIN_NO_D1, PORT_D1, BIT_D1, GPIO_OUT, "1", "D1"),
- PIN_D2(PIN_NO_D2, PORT_D2, BIT_D2, GPIO_OUT, "2", "D2"),
- PIN_D3(PIN_NO_D3, PORT_D3, BIT_D3, GPIO_OUT, "3", "D3"),
- PIN_D4(PIN_NO_D4, PORT_D4, BIT_D4, GPIO_OUT, "4", "D4"),
- PIN_D5(PIN_NO_D5, PORT_D5, BIT_D5, GPIO_OUT, "5", "D5"),
- PIN_D6(PIN_NO_D6, PORT_D6, BIT_D6, GPIO_OUT, "6", "D6"),
- PIN_D7(PIN_NO_D7, PORT_D7, BIT_D7, GPIO_OUT, "7", "D7"),
- PIN_D8(PIN_NO_D8, PORT_D8, BIT_D8, GPIO_OUT, "8", "D8"),
- PIN_D9(PIN_NO_D9, PORT_D9, BIT_D9, GPIO_OUT, "9", "D9"),
- PIN_D10(PIN_NO_D10, PORT_D10, BIT_D10, GPIO_OUT, "10", "D10"),
- PIN_D11(PIN_NO_D11, PORT_D11, BIT_D11, GPIO_OUT, "11", "D11"),
- PIN_D12(PIN_NO_D12, PORT_D12, BIT_D12, GPIO_OUT, "12", "D12"),
- PIN_D13(PIN_NO_D13, PORT_D13, BIT_D13, GPIO_OUT, "13", "D13"),
- PIN_A0(PIN_NO_A0, PORT_A0, BIT_A0, ANALOG, "14", "A0"),
- PIN_A1(PIN_NO_A1, PORT_A1, BIT_A1, ANALOG, "15", "A1"),
- PIN_A2(PIN_NO_A2, PORT_A2, BIT_A2, ANALOG, "16", "A2"),
- PIN_A3(PIN_NO_A3, PORT_A3, BIT_A3, ANALOG, "17", "A3"),
- PIN_A4(PIN_NO_A4, PORT_A4, BIT_A4, ANALOG, "18", "A4"),
- PIN_A5(PIN_NO_A5, PORT_A5, BIT_A5, ANALOG, "19", "A5");
-
- private final int mPinNumber;
- private final int mPort;
- private final int mBit;
- private final String[] mPinNames;
- private Mode mMode;
- private int mValue;
-
- Pin(final int pinNumber, final int port, final int bit, final Mode mode, final String... pinNames) {
- mPinNumber = pinNumber;
- mPort = port;
- mBit = bit;
- mMode = mode;
- mPinNames = pinNames;
- }
-
- /**
- * ピン番号を取得します.
- * @return ピン番号
- */
- public int getPinNumber() {
- return mPinNumber;
- }
-
- /**
- * 値を保持するための配列番号を取得します.
- * @return
- */
- public int getPort() {
- return mPort;
- }
-
- /**
- * デジタル値を格納するビットを取得します.
- * @return デジタル値を格納するビット
- */
- public int getBit() {
- return mBit;
- }
-
- /**
- * ピンの名前を取得します.
- * @return ピンの名前
- */
- public String[] getPinNames() {
- return mPinNames;
- }
-
- /**
- * ピンのモードを取得します.
- * @return ピンのモード
- */
- public Mode getMode() {
- return mMode;
- }
-
- /**
- * ピンのモードを設定します.
- * @param mode ピンのモード
- */
- public void setMode(final Mode mode) {
- mMode = mode;
- }
-
- /**
- * ピンの値を取得します.
- * @return ピンの値
- */
- public int getValue() {
- return mValue;
- }
-
- /**
- * ピンの値を設定します.
- * @param value ピンの値
- */
- public void setValue(final int value) {
- mValue = value;
- }
-
- /**
- * ピン番号からPinのインスタンスを取得します.
- * @param number ピン番号
- * @return Pinのインスタンス
- */
- public static Pin getPin(final int number) {
- for (Pin pin : values()) {
- if (pin.getPinNumber() == number) {
- return pin;
- }
- }
- return null;
- }
-
- /**
- * ピンの名前からPinのインスタンスを取得します.
- * @param pinName ピン名
- * @return Pinのインスタンス
- */
- public static Pin getPin(final String pinName) {
- for (Pin pin : values()) {
- if (pin.getPinNames()[1].equalsIgnoreCase(pinName)) {
- return pin;
- }
- }
- return null;
- }
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/profile/FaBoGPIOProfile.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/profile/FaBoGPIOProfile.java
deleted file mode 100644
index 055e5dbeec..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/profile/FaBoGPIOProfile.java
+++ /dev/null
@@ -1,402 +0,0 @@
-/*
-FaBoGPIOProfile
-Copyright (c) 2014 NTT DOCOMO,INC.
-Released under the MIT license
-http://opensource.org/licenses/mit-license.php
-*/
-package org.deviceconnect.android.deviceplugin.fabo.profile;
-
-import android.content.Intent;
-
-import org.deviceconnect.android.deviceplugin.fabo.FaBoDeviceService;
-import org.deviceconnect.android.deviceplugin.fabo.device.FaBoDeviceControl;
-import org.deviceconnect.android.deviceplugin.fabo.param.FaBoShield;
-import org.deviceconnect.android.event.EventError;
-import org.deviceconnect.android.event.EventManager;
-import org.deviceconnect.android.message.MessageUtils;
-import org.deviceconnect.android.profile.GPIOProfile;
-import org.deviceconnect.android.profile.api.DeleteApi;
-import org.deviceconnect.android.profile.api.GetApi;
-import org.deviceconnect.android.profile.api.PostApi;
-import org.deviceconnect.android.profile.api.PutApi;
-
-import static org.deviceconnect.message.DConnectMessage.RESULT_OK;
-
-/**
- * GPIO Profile.
- * @author NTT DOCOMO, INC.
- */
-public class FaBoGPIOProfile extends GPIOProfile {
-
- private void addGetAnalogApi(final FaBoShield.Pin pin) {
- // GET /gpio/analog/{pinName}
- switch (pin) {
- case PIN_A0:
- case PIN_A1:
- case PIN_A2:
- case PIN_A3:
- case PIN_A4:
- case PIN_A5:
- for (final String pinName : pin.getPinNames()) {
- addApi(new GetApi() {
- @Override
- public String getInterface() {
- return INTERFACE_ANALOG;
- }
-
- @Override
- public String getAttribute() {
- return pinName;
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- if (!isOnline()) {
- MessageUtils.setIllegalDeviceStateError(response, "FaBo device is not connected.");
- } else {
- if (getFaBoDeviceControl().isPinSupported(pin)) {
- int value = getFaBoDeviceControl().getAnalog(pin);
- setValue(response, value);
- setResult(response, RESULT_OK);
- } else {
- MessageUtils.setNotSupportAttributeError(response, pin.getPinNames()[1] + " is not supported.");
- }
- }
- return true;
- }
- });
- }
- break;
- default:
- break;
- }
- }
-
- private void addGetDigitalApi(final FaBoShield.Pin pin) {
- // GET /gpio/digital/{pinName}
- switch (pin) {
- case PIN_D0:
- case PIN_D1:
- case PIN_D2:
- case PIN_D3:
- case PIN_D4:
- case PIN_D5:
- case PIN_D6:
- case PIN_D7:
- case PIN_D8:
- case PIN_D9:
- case PIN_D10:
- case PIN_D11:
- case PIN_D12:
- case PIN_D13:
- for (final String pinName : pin.getPinNames()) {
- addApi(new GetApi() {
- @Override
- public String getInterface() {
- return INTERFACE_DIGITAL;
- }
-
- @Override
- public String getAttribute() {
- return pinName;
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- if (!isOnline()) {
- MessageUtils.setIllegalDeviceStateError(response, "FaBo device is not connected.");
- } else {
- if (getFaBoDeviceControl().isPinSupported(pin)) {
- FaBoShield.Level value = getFaBoDeviceControl().getDigital(pin);
- setValue(response, value.getValue());
- setResult(response, RESULT_OK);
- } else {
- MessageUtils.setNotSupportAttributeError(response, pin.getPinNames()[1] + " is not support.");
- }
- }
- return true;
- }
- });
- }
- break;
- default:
- break;
- }
- }
-
- private void addPostExportApi(final FaBoShield.Pin pin) {
- // POST /gpio/export/{pinName}
- for (final String pinName : pin.getPinNames()) {
- addApi(new PostApi() {
- @Override
- public String getInterface() {
- return INTERFACE_EXPORT;
- }
-
- @Override
- public String getAttribute() {
- return pinName;
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- if (!isOnline()) {
- MessageUtils.setIllegalDeviceStateError(response, "FaBo device is not connected.");
- } else {
- if (getFaBoDeviceControl().isPinSupported(pin)) {
- Integer modeValue = parseInteger(request, "mode");
- if (modeValue != null) {
- FaBoShield.Mode mode = FaBoShield.Mode.getMode(modeValue);
- if (mode != null) {
- getFaBoDeviceControl().setPinMode(pin, mode);
- setMessage(response, pinName + "を" + mode.getName() + "モードに設定しました。");
- setResult(response, RESULT_OK);
- } else {
- MessageUtils.setInvalidRequestParameterError(response, "The value of mode must be defined 0-4.");
- }
- } else {
- MessageUtils.setInvalidRequestParameterError(response, "The value of mode is null.");
- }
- } else {
- MessageUtils.setNotSupportAttributeError(response, pin.getPinNames()[1] + " is not supported.");
- }
- }
- return true;
- }
- });
- }
- }
-
- private void addPostDigitalApi(final FaBoShield.Pin pin) {
- // POST /gpio/digital/{pinName}
- for (final String pinName : pin.getPinNames()) {
- addApi(new PostApi() {
- @Override
- public String getInterface() {
- return INTERFACE_DIGITAL;
- }
-
- @Override
- public String getAttribute() {
- return pinName;
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- if (!isOnline()) {
- MessageUtils.setIllegalDeviceStateError(response, "FaBo device is not connected.");
- } else {
- if (getFaBoDeviceControl().isPinSupported(pin)) {
- Integer hlValue = parseInteger(request, PARAM_VALUE);
- if (hlValue != null) {
- FaBoShield.Level level = FaBoShield.Level.getLevel(hlValue);
- if (level != null) {
- getFaBoDeviceControl().writeDigital(pin, level);
- setMessage(response, pinName + "の値を" + level.getName() + "(" + level.getValue() + ")に変更");
- setResult(response, RESULT_OK);
- } else {
- MessageUtils.setInvalidRequestParameterError(response, "Value must be defined 1 or 0.");
- }
- } else {
- MessageUtils.setInvalidRequestParameterError(response, "Value is null.");
- }
- } else {
- MessageUtils.setNotSupportAttributeError(response, pin.getPinNames()[1] + " is not supported.");
- }
- }
- return true;
- }
- });
- }
- }
-
- private void addPostAnalogApi(final FaBoShield.Pin pin) {
- // POST /gpio/analog/{pinName}
- switch (pin) {
- case PIN_D3:
- case PIN_D5:
- case PIN_D6:
- case PIN_D9:
- case PIN_D10:
- case PIN_D11:
- for (final String pinName : pin.getPinNames()) {
- addApi(new PostApi() {
- @Override
- public String getInterface() {
- return INTERFACE_ANALOG;
- }
-
- @Override
- public String getAttribute() {
- return pinName;
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- if (!isOnline()) {
- MessageUtils.setIllegalDeviceStateError(response, "FaBo device is not connected.");
- } else {
- if (getFaBoDeviceControl().isPinSupported(pin)) {
- Integer hlValue = parseInteger(request, PARAM_VALUE);
- if (hlValue != null) {
- if (hlValue >= 0 && hlValue <= 255) {
- getFaBoDeviceControl().writeAnalog(pin, hlValue);
- setResult(response, RESULT_OK);
- } else {
- MessageUtils.setInvalidRequestParameterError(response, "Value must be defined under 255.");
- }
- } else {
- MessageUtils.setInvalidRequestParameterError(response, "Value is null.");
- }
- } else {
- MessageUtils.setNotSupportAttributeError(response, pin.getPinNames()[1] + " is not supported.");
- }
- }
- return true;
- }
- });
- }
- break;
- default:
- break;
- }
- }
-
- private void addPutOnChangeApi() {
- // PUT /gpio/onChange
- addApi(new PutApi() {
- @Override
- public String getAttribute() {
- return ATTRIBUTE_ON_CHANGE;
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- EventError error = EventManager.INSTANCE.addEvent(request);
- if (EventError.NONE == error) {
- getFaBoDeviceService().registerOnChange(getServiceID(request));
- setResult(response, RESULT_OK);
- return true;
- } else {
- MessageUtils.setError(response, 100, "Failed add event.");
- return true;
- }
- }
- });
- }
-
- private void addPutDigitalApi(final FaBoShield.Pin pin) {
- // PUT /gpio/digital/{pinName}
- for (final String pinName : pin.getPinNames()) {
- addApi(new PutApi() {
- @Override
- public String getInterface() {
- return INTERFACE_DIGITAL;
- }
-
- @Override
- public String getAttribute() {
- return pinName;
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- if (!isOnline()) {
- MessageUtils.setIllegalDeviceStateError(response, "FaBo device is not connected.");
- } else {
- if (getFaBoDeviceControl().isPinSupported(pin)) {
- getFaBoDeviceControl().writeDigital(pin, FaBoShield.Level.HIGH);
- setMessage(response, pinName + "の値をHIGH(1)に変更");
- setResult(response, RESULT_OK);
- } else {
- MessageUtils.setNotSupportAttributeError(response, pin.getPinNames()[1] + " is not supported.");
- }
- }
- return true;
- }
- });
- }
- }
-
- private void addDeleteOnChangeApi() {
- // DELETE /gpio/onChange
- addApi(new DeleteApi() {
- @Override
- public String getAttribute() {
- return ATTRIBUTE_ON_CHANGE;
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- boolean result = EventManager.INSTANCE.removeEvents(getOrigin(request));
- if (result) {
- getFaBoDeviceService().unregisterOnChange(getServiceID(request));
- setResult(response, RESULT_OK);
- return true;
- } else {
- MessageUtils.setError(response, 100, "Failed delete event.");
- return true;
- }
- }
- });
- }
-
- private void addDeleteDigitalApi(final FaBoShield.Pin pin) {
- // DELETE /gpio/digital/{pinName}
- for (final String pinName : pin.getPinNames()) {
- addApi(new DeleteApi() {
- @Override
- public String getInterface() {
- return INTERFACE_DIGITAL;
- }
-
- @Override
- public String getAttribute() {
- return pinName;
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- if (!isOnline()) {
- MessageUtils.setIllegalDeviceStateError(response, "FaBo device is not connected.");
- } else {
- if (getFaBoDeviceControl().isPinSupported(pin)) {
- getFaBoDeviceControl().writeDigital(pin, FaBoShield.Level.LOW);
- setMessage(response, pinName + "の値をLOW(0)に変更");
- setResult(response, RESULT_OK);
- } else {
- MessageUtils.setNotSupportAttributeError(response, pin.getPinNames()[1] + " is not supported.");
- }
- }
- return true;
- }
- });
- }
- }
-
- public FaBoGPIOProfile() {
- for (FaBoShield.Pin pin : FaBoShield.Pin.values()) {
- addGetAnalogApi(pin);
- addGetDigitalApi(pin);
- addPostExportApi(pin);
- addPostDigitalApi(pin);
- addPostAnalogApi(pin);
- addPutDigitalApi(pin);
- addDeleteDigitalApi(pin);
- }
- addPutOnChangeApi();
- addDeleteOnChangeApi();
- }
-
- private boolean isOnline() {
- return getService().isOnline();
- }
-
- private FaBoDeviceControl getFaBoDeviceControl() {
- return getFaBoDeviceService().getFaBoDeviceControl();
- }
-
- private FaBoDeviceService getFaBoDeviceService() {
- return (FaBoDeviceService) getContext();
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/profile/FaBoProfile.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/profile/FaBoProfile.java
deleted file mode 100644
index d3736cbfc7..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/profile/FaBoProfile.java
+++ /dev/null
@@ -1,502 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.profile;
-
-import android.content.Intent;
-import android.os.Bundle;
-
-import org.deviceconnect.android.deviceplugin.fabo.FaBoDeviceService;
-import org.deviceconnect.android.deviceplugin.fabo.param.FaBoShield;
-import org.deviceconnect.android.deviceplugin.fabo.service.virtual.VirtualService;
-import org.deviceconnect.android.deviceplugin.fabo.service.virtual.db.ProfileData;
-import org.deviceconnect.android.deviceplugin.fabo.service.virtual.db.ProfileDataUtil;
-import org.deviceconnect.android.deviceplugin.fabo.service.virtual.db.ServiceData;
-import org.deviceconnect.android.message.MessageUtils;
-import org.deviceconnect.android.profile.DConnectProfile;
-import org.deviceconnect.android.profile.api.DeleteApi;
-import org.deviceconnect.android.profile.api.GetApi;
-import org.deviceconnect.android.profile.api.PostApi;
-import org.deviceconnect.android.profile.api.PutApi;
-import org.deviceconnect.android.service.DConnectService;
-import org.deviceconnect.message.DConnectMessage;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.deviceconnect.android.deviceplugin.fabo.param.FaBoShield.PIN_NO_A0;
-
-public class FaBoProfile extends DConnectProfile {
-
- public FaBoProfile() {
- // GET /gotapi/fabo/service
- addApi(new GetApi() {
- @Override
- public String getAttribute() {
- return "service";
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- List services = new ArrayList<>();
-
- for (DConnectService service : getFaBoDeviceService().getServiceProvider().getServiceList()) {
- if (service instanceof VirtualService) {
- ServiceData serviceData = ((VirtualService) service).getServiceData();
-
- Bundle serviceBundle = new Bundle();
- serviceBundle.putString("vid", serviceData.getServiceId());
- serviceBundle.putString("name", serviceData.getName());
-
- List profiles = new ArrayList<>();
- for (ProfileData p : serviceData.getProfileDataList()) {
- profiles.add(createProfileData(p));
- }
- serviceBundle.putParcelableArray("profiles", profiles.toArray(new Bundle[profiles.size()]));
-
- services.add(serviceBundle);
- }
- }
-
- response.putExtra("services", services.toArray(new Bundle[services.size()]));
- setResult(response, DConnectMessage.RESULT_OK);
- return true;
- }
- });
-
- // POST /gotapi/fabo/service
- addApi(new PostApi() {
- @Override
- public String getAttribute() {
- return "service";
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- String name = request.getStringExtra("name");
-
- ServiceData serviceData = new ServiceData();
- serviceData.setName(name);
-
- VirtualService s = getFaBoDeviceService().addServiceData(serviceData);
- if (s != null) {
- response.putExtra("vid", s.getServiceData().getServiceId());
- setResult(response, DConnectMessage.RESULT_OK);
- } else {
- MessageUtils.setUnknownError(response, "Failed to create a virtual service.");
- }
-
- return true;
- }
- });
-
- // PUT /gotapi/fabo/service
- addApi(new PutApi() {
- @Override
- public String getAttribute() {
- return "service";
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- String name = request.getStringExtra("name");
- String vid = request.getStringExtra("vid");
-
- ServiceData serviceData = getFaBoDeviceService().getServiceData(vid);
- if (serviceData == null) {
- MessageUtils.setInvalidRequestParameterError(response, "Not found the virtual service. vid=" + vid);
- } else {
- serviceData.setName(name);
-
- VirtualService s = getFaBoDeviceService().updateServiceData(serviceData);
- if (s != null) {
- setResult(response, DConnectMessage.RESULT_OK);
- } else {
- MessageUtils.setUnknownError(response, "Failed to create a virtual service.");
- }
- }
-
- return true;
- }
- });
-
- // DELETE /gotapi/fabo/service
- addApi(new DeleteApi() {
- @Override
- public String getAttribute() {
- return "service";
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- String vid = request.getStringExtra("vid");
-
- ServiceData serviceData = getFaBoDeviceService().getServiceData(vid);
- if (serviceData == null) {
- MessageUtils.setInvalidRequestParameterError(response, "Not found the virtual service. vid=" + vid);
- } else {
- getFaBoDeviceService().removeServiceData(serviceData);
- setResult(response, DConnectMessage.RESULT_OK);
- }
- return true;
- }
- });
-
- // GET /gotapi/fabo/profile
- addApi(new GetApi() {
- @Override
- public String getAttribute() {
- return "profile";
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- String vid = request.getStringExtra("vid");
-
- ServiceData serviceData = getFaBoDeviceService().getServiceData(vid);
- if (serviceData == null) {
- MessageUtils.setInvalidRequestParameterError(response, "Not found the virtual service. vid=" + vid);
- } else {
- List profiles = new ArrayList<>();
- for (ProfileData p : serviceData.getProfileDataList()) {
- profiles.add(createProfileData(p));
- }
- response.putExtra("profiles", profiles.toArray(new Bundle[profiles.size()]));
- setResult(response, DConnectMessage.RESULT_OK);
- }
-
- return true;
- }
- });
-
- // POST /gotapi/fabo/profile
- addApi(new PostApi() {
- @Override
- public String getAttribute() {
- return "profile";
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- String vid = request.getStringExtra("vid");
- Integer type = parseInteger(request, "type");
- String pins = request.getStringExtra("pins");
-
- ProfileData.Type profileType = ProfileData.Type.getType(type);
- ServiceData serviceData = getFaBoDeviceService().getServiceData(vid);
- List pinList = toPinList(pins);
- if (serviceData == null) {
- MessageUtils.setInvalidRequestParameterError(response, "Not found the virtual service.");
- } else if (pinList == null) {
- MessageUtils.setInvalidRequestParameterError(response, "Format of pins is invalid.");
- } else if (profileType == null) {
- MessageUtils.setInvalidRequestParameterError(response, "Not found the profile type.");
- } else if (profileType.getCategory() == ProfileData.Category.GPIO && pinList.isEmpty()) {
- MessageUtils.setInvalidRequestParameterError(response, "For GPIO, pins is required.");
- } else if (profileType.getCategory() == ProfileData.Category.GPIO && !ProfileDataUtil.isMultiChoicePin(profileType) && pinList.size() > 1) {
- MessageUtils.setInvalidRequestParameterError(response, "There is only one pin.");
- } else if (profileType.getCategory() == ProfileData.Category.GPIO && usedPin(serviceData, profileType, pinList)) {
- MessageUtils.setInvalidRequestParameterError(response, "pins already used in the " + serviceData.getName());
- } else if (profileType.getCategory() == ProfileData.Category.GPIO && !isPinsSupported(pinList)) {
- MessageUtils.setNotSupportAttributeError(response, "pins contains unsupported PIN.");
- } else if (profileType.getCategory() == ProfileData.Category.GPIO && !checkPinType(profileType, pinList)) {
- MessageUtils.setInvalidRequestParameterError(response, "Pins that can not be used are included.");
- } else if (containsProfile(serviceData, profileType)) {
- MessageUtils.setInvalidRequestParameterError(response, "This service already has the same profile.");
- } else {
- ProfileData p = new ProfileData();
- p.setServiceId(vid);
- p.setType(profileType);
- p.setPinList(pinList);
-
- serviceData.addProfileData(p);
-
- VirtualService s = getFaBoDeviceService().updateServiceData(serviceData);
- if (s != null) {
- setResult(response, DConnectMessage.RESULT_OK);
- } else {
- MessageUtils.setUnknownError(response, "Failed to update the service data.");
- }
- }
-
- return true;
- }
- });
-
- // PUT /gotapi/fabo/profile
- addApi(new PutApi() {
- @Override
- public String getAttribute() {
- return "profile";
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- String vid = request.getStringExtra("vid");
- Integer type = parseInteger(request, "type");
- String pins = request.getStringExtra("pins");
-
- ProfileData.Type profileType = ProfileData.Type.getType(type);
- ServiceData serviceData = getFaBoDeviceService().getServiceData(vid);
- List pinList = toPinList(pins);
- if (serviceData == null) {
- MessageUtils.setInvalidRequestParameterError(response, "Not found the virtual service.");
- } else if (pinList == null) {
- MessageUtils.setInvalidRequestParameterError(response, "Format of pins is invalid.");
- } else if (profileType == null) {
- MessageUtils.setInvalidRequestParameterError(response, "Not found the profile type.");
- } else if (profileType.getCategory() == ProfileData.Category.GPIO && pinList.isEmpty()) {
- MessageUtils.setInvalidRequestParameterError(response, "For GPIO, pins is required.");
- } else if (profileType.getCategory() == ProfileData.Category.GPIO && !ProfileDataUtil.isMultiChoicePin(profileType) && pinList.size() > 1) {
- MessageUtils.setInvalidRequestParameterError(response, "There is only one pin.");
- } else if (profileType.getCategory() == ProfileData.Category.GPIO && usedPin(serviceData, profileType, pinList)) {
- MessageUtils.setInvalidRequestParameterError(response, "pins already used in the " + serviceData.getName());
- } else if (profileType.getCategory() == ProfileData.Category.GPIO && !isPinsSupported(pinList)) {
- MessageUtils.setNotSupportAttributeError(response, "pins contains unsupported PIN.");
- } else if (profileType.getCategory() == ProfileData.Category.GPIO && !checkPinType(profileType, pinList)) {
- MessageUtils.setInvalidRequestParameterError(response, "Pins that can not be used are included.");
- } else if (!isSameProfile(serviceData, profileType) && containsProfile(serviceData, profileType)) {
- MessageUtils.setInvalidRequestParameterError(response, "This service already has the same profile.");
- } else {
- ProfileData p = new ProfileData();
- p.setServiceId(vid);
- p.setType(profileType);
- p.setPinList(pinList);
-
- serviceData.addProfileData(p);
-
- VirtualService s = getFaBoDeviceService().updateServiceData(serviceData);
- if (s != null) {
- setResult(response, DConnectMessage.RESULT_OK);
- } else {
- MessageUtils.setUnknownError(response, "Failed to update the service data.");
- }
- }
-
- return true;
- }
- });
-
- // DELETE /gotapi/fabo/profile
- addApi(new DeleteApi() {
- @Override
- public String getAttribute() {
- return "profile";
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- String vid = request.getStringExtra("vid");
- Integer type = parseInteger(request, "type");
-
- ProfileData.Type profileType = ProfileData.Type.getType(type);
- ServiceData serviceData = getFaBoDeviceService().getServiceData(vid);
- if (serviceData == null) {
- MessageUtils.setInvalidRequestParameterError(response, "Not found the virtual service.");
- } else if (profileType == null) {
- MessageUtils.setInvalidRequestParameterError(response, "Not found the profile type.");
- } else {
- ProfileData profileData = serviceData.getProfileData(profileType);
- if (profileData == null) {
- MessageUtils.setInvalidRequestParameterError(response, "Virtual service has not the " + type);
- } else {
- serviceData.removeProfileData(profileData);
-
- VirtualService s = getFaBoDeviceService().updateServiceData(serviceData);
- if (s != null) {
- setResult(response, DConnectMessage.RESULT_OK);
- } else {
- MessageUtils.setUnknownError(response, "Failed to update the service data.");
- }
- }
- }
-
- return true;
- }
- });
- }
-
- @Override
- public String getProfileName() {
- return "fabo";
- }
-
- /**
- * 指定されたサービスデータが指定されたプロファイルデータを持っているか確認します.
- *
- * Brickが異なっても同じプロファイルの場合には同じプロファイルとしてみなす。
- *
- * @param serviceData サービスデータ
- * @param type プロファイルタイプ
- * @return プロファイルデータを持っている場合はtrue、それ以外はfalse
- */
- private boolean containsProfile(final ServiceData serviceData, final ProfileData.Type type) {
- for (ProfileData profileData : serviceData.getProfileDataList()) {
- if (profileData.getType().getProfileName().equals(type.getProfileName())) {
- return true;
- }
- }
- return false;
- }
-
- /**
- * 同じプロファイルを持っているか確認を行います.
- *
- * Brickとプロファイル療法が同じ場合に同じプロファイルとみなす。
- *
- * @param serviceData サービスデータ
- * @param type プロファイルタイプ
- * @return 同じプロファイルを持つ場合はtrue、それ以外はfalse
- */
- private boolean isSameProfile(final ServiceData serviceData, final ProfileData.Type type) {
- for (ProfileData profileData : serviceData.getProfileDataList()) {
- if (profileData.getType() == type) {
- return true;
- }
- }
- return false;
- }
-
- /**
- * ListString[]に変換します.
- *
- * 引数にnullが指定された場合は、空の配列を返却します。
- *
- * @param list 変換前のリスト
- * @return 変換後int[]
- */
- private String[] toArray(final List list) {
- if (list == null) {
- return new String[0];
- }
- String[] b = new String[list.size()];
- for (int i = 0; i < list.size(); i++) {
- b[i] = FaBoShield.Pin.getPin(list.get(i)).getPinNames()[1];
- }
- return b;
- }
-
- /**
- * プロファイルデータ用のBundleを作成します.
- * @param p プロファイルデータ
- * @return プロファイルデータを格納したBundle
- */
- private Bundle createProfileData(final ProfileData p) {
- Bundle b = new Bundle();
- b.putInt("type", p.getType().getValue());
- b.putString("name", ProfileDataUtil.getProfileName(getContext(), p.getType()));
- b.putString("brick", p.getType().getBrick());
- b.putStringArray("pins", toArray(p.getPinList()));
- b.putString("category", p.getType().getCategory().getValue());
- return b;
- }
-
- /**
- * カンマ区切りで送られてきた文字列をListに変換します.
- * @param pins ピンのデータ
- * @return ピンのデータ
- */
- private List toPinList(final String pins) {
- if (pins == null || pins.isEmpty()) {
- return new ArrayList<>();
- }
- List pinList = new ArrayList<>();
- String[] split = pins.split(",");
- for (String s : split) {
- try {
- FaBoShield.Pin pin = FaBoShield.Pin.getPin(s);
- if (pin != null) {
- if (!pinList.contains(pin.getPinNumber())) {
- pinList.add(pin.getPinNumber());
- }
- } else {
- Integer i = Integer.parseInt(s);
- if (isPin(i) && !pinList.contains(i)) {
- pinList.add(i);
- } else {
- return null;
- }
- }
- } catch (NumberFormatException e) {
- return null;
- }
- }
- return pinList;
- }
-
- /**
- * 指定された番号がピンに存在するか確認します.
- * @param pin ピン番号
- * @return ピンが存在する場合はtrue、それ以外はfalse
- */
- private boolean isPin(final int pin) {
- return FaBoShield.Pin.getPin(pin) != null;
- }
-
- /**
- * 指定されたピンのリストがサポートされているか確認します.
- * @param pins 確認するピンのリスト
- * @return 全てのピンがサポートされている場合はtrue、それ以外はfalse
- */
- private boolean isPinsSupported(final List pins) {
- for (int pin : pins) {
- if (!isPinSupported(pin)) {
- return false;
- }
- }
- return true;
- }
-
- /**
- * 指定されたピンがサポートされているか確認します.
- * @param pinNum 確認するピン番号
- * @return サポートされている場合はtrue、それ以外はfalse
- */
- private boolean isPinSupported(final int pinNum) {
- FaBoShield.Pin pin = FaBoShield.Pin.getPin(pinNum);
- return pin != null && getFaBoDeviceService().getFaBoDeviceControl().isPinSupported(pin);
- }
-
- /**
- * ピンのタイプを確認します.
- * @param type ピンのタイプ
- * @param pins ピン
- * @return ピンのタイプが合って入ればtrue、それ以外はfalse
- */
- private boolean checkPinType(final ProfileData.Type type, final List pins) {
- ProfileDataUtil.PinType pinType = ProfileDataUtil.getPinType(type);
- for (int pin : pins) {
- switch (pinType) {
- case ANALOG:
- if (pin < PIN_NO_A0) {
- return false;
- }
- break;
- case DIGITAL:
- if (pin >= PIN_NO_A0) {
- return false;
- }
- break;
- }
- }
- return true;
- }
-
- /**
- * 指定されたピンが仮想サービスで使用されているか確認を行います。
- * @param serviceData 仮想サービスデータ
- * @param type プロファイルのタイプ
- * @param pins 確認を行うピンのリスト
- * @return 既に使用されている場合はtrue、それ以外はfalse
- */
- private boolean usedPin(final ServiceData serviceData, final ProfileData.Type type, final List pins) {
- ProfileData profileData = serviceData.getProfileData(type);
- for (Integer p : pins) {
- if ((profileData == null || !profileData.usedPin(p)) && serviceData.usedPin(p)) {
- return true;
- }
- }
- return false;
- }
-
- private FaBoDeviceService getFaBoDeviceService() {
- return (FaBoDeviceService) getContext();
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/profile/FaBoSystemProfile.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/profile/FaBoSystemProfile.java
deleted file mode 100644
index 64933bec3c..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/profile/FaBoSystemProfile.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-FaBoSystemProfile
-Copyright (c) 2014 NTT DOCOMO,INC.
-Released under the MIT license
-http://opensource.org/licenses/mit-license.php
-*/
-package org.deviceconnect.android.deviceplugin.fabo.profile;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-
-import org.deviceconnect.android.deviceplugin.fabo.setting.FaBoServiceListActivity;
-import org.deviceconnect.android.profile.SystemProfile;
-
-/**
- * FaBoデバイスプラグイン, System プロファイル.
- * @author NTT DOCOMO, INC.
- */
-public class FaBoSystemProfile extends SystemProfile {
-
- @Override
- protected Class getSettingPageActivity(final Intent request, final Bundle param) {
- return FaBoServiceListActivity.class;
- }
-
-}
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/FaBoService.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/FaBoService.java
deleted file mode 100644
index b91bbe9fb5..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/FaBoService.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.service;
-
-import org.deviceconnect.android.deviceplugin.fabo.profile.FaBoGPIOProfile;
-import org.deviceconnect.android.deviceplugin.fabo.profile.FaBoProfile;
-import org.deviceconnect.android.service.DConnectService;
-
-/**
- * FaBoを直接操作するためのサービス.
- */
-public class FaBoService extends DConnectService {
- /**
- * サービスを識別するID.
- */
- private static final String SERVICE_ID = "gpio_service_id";
-
- /**
- * サービス名.
- */
- private static final String DEVICE_NAME = "FaBo Device";
-
- /**
- * コンストラクタ.
- */
- public FaBoService() {
- super(SERVICE_ID);
- setName(DEVICE_NAME);
- setNetworkType(NetworkType.UNKNOWN);
- setOnline(true);
- addProfile(new FaBoGPIOProfile());
- addProfile(new FaBoProfile());
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/VirtualService.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/VirtualService.java
deleted file mode 100644
index 3bd0fbfab8..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/VirtualService.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.service.virtual;
-
-import org.deviceconnect.android.deviceplugin.fabo.service.virtual.db.ServiceData;
-import org.deviceconnect.android.service.DConnectService;
-
-/**
- * 仮想サービス.
- */
-public class VirtualService extends DConnectService {
-
- /**
- * 仮想サービスのデータ.
- */
- private ServiceData mServiceData;
-
- /**
- * コンストラクタ.
- * @param serviceData 仮想サービスデータ
- */
- VirtualService(final ServiceData serviceData) {
- super(serviceData.getServiceId());
- mServiceData = serviceData;
- }
-
- /**
- * 仮想サービスデータを取得します.
- * @return 仮想サービスデータ
- */
- public ServiceData getServiceData() {
- return mServiceData;
- }
-
- /**
- * サービスデータを設定します.
- * @param serviceData 設定するサービスデータ
- */
- public void setServiceData(final ServiceData serviceData) {
- mServiceData = serviceData;
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/VirtualServiceFactory.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/VirtualServiceFactory.java
deleted file mode 100644
index 2962aad88e..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/VirtualServiceFactory.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.service.virtual;
-
-import android.util.Log;
-
-import org.deviceconnect.android.deviceplugin.fabo.core.BuildConfig;
-import org.deviceconnect.android.deviceplugin.fabo.param.FaBoShield;
-import org.deviceconnect.android.deviceplugin.fabo.service.virtual.db.ProfileData;
-import org.deviceconnect.android.deviceplugin.fabo.service.virtual.db.ServiceData;
-import org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile.GPIOHumidityProfile;
-import org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile.GPIOIlluminanceProfile;
-import org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile.GPIOKeyEventProfile;
-import org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile.GPIOLightProfile;
-import org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile.GPIOProximityProfile;
-import org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile.GPIOTemperatureProfile;
-import org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile.GPIOVibrationProfile;
-import org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile.I2C3AxisDeviceOrientationProfile;
-import org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile.I2CAtmosphericPressureProfile;
-import org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile.I2CHumidityProfile;
-import org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile.I2CIlluminanceProfile;
-import org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile.I2CLIDARLiteProximityProfile;
-import org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile.I2CMouseCarDriveControllerProfile;
-import org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile.I2CProximityProfile;
-import org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile.I2CRobotCarDriveControllerProfile;
-import org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile.I2CTemperatureProfile;
-import org.deviceconnect.android.profile.DConnectProfile;
-import org.deviceconnect.profile.ServiceDiscoveryProfileConstants;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 仮想サービスを作成するためのファクトリークラス.
- */
-public final class VirtualServiceFactory {
- /**
- * デバッグフラグ.
- */
- private static final boolean DEBUG = BuildConfig.DEBUG;
-
- /**
- * デバッグ用タグ.
- */
- private static final String TAG = "FaBo";
-
- /**
- * 仮想サービスデータからDConnectServiceのインスタンスを作成します.
- * @param serviceData 仮想サービスデータ
- * @return DConnectServiceのインスタンス
- */
- public static VirtualService createService(final ServiceData serviceData) {
- if (DEBUG) {
- Log.d(TAG, "==========================");
- Log.d(TAG, "Create virtual service.");
- Log.d(TAG, "ID: " + serviceData.getServiceId());
- Log.d(TAG, "Name: " + serviceData.getName());
- }
-
- VirtualService service = new VirtualService(serviceData);
- service.setName(serviceData.getName());
- service.setNetworkType(ServiceDiscoveryProfileConstants.NetworkType.UNKNOWN);
- for (ProfileData p : serviceData.getProfileDataList()) {
- DConnectProfile profile = createProfile(p);
- if (profile != null) {
- service.addProfile(profile);
- }
- }
- if (DEBUG) {
- Log.d(TAG, "==========================");
- }
- return service;
- }
-
- /**
- * プロファイルデータからプロファイルを作成します.
- * @param profileData プロファイルデータ
- * @return DConnectProfileのインスタンス
- */
- public static DConnectProfile createProfile(final ProfileData profileData) {
- if (DEBUG) {
- Log.d(TAG, " Add " + profileData.getType());
- }
-
- switch (profileData.getType()) {
- case GPIO_LIGHT:
- return new GPIOLightProfile(conv(profileData.getPinList()));
-
- case GPIO_TEMPERATURE:
- return new GPIOTemperatureProfile(conv(profileData.getPinList()));
-
- case GPIO_VIBRATION:
- return new GPIOVibrationProfile(conv(profileData.getPinList()));
-
- case GPIO_ILLUMINANCE:
- return new GPIOIlluminanceProfile(conv(profileData.getPinList()));
-
- case GPIO_HUMIDITY:
- return new GPIOHumidityProfile(conv(profileData.getPinList()));
-
- case GPIO_KEY_EVENT:
- return new GPIOKeyEventProfile(conv(profileData.getPinList()));
-
- case GPIO_PROXIMITY:
- return new GPIOProximityProfile(conv(profileData.getPinList()));
-
- case I2C_MOUSE_DRIVE_CONTROLLER:
- return new I2CMouseCarDriveControllerProfile();
-
- case I2C_ROBOT_DRIVE_CONTROLLER:
- return new I2CRobotCarDriveControllerProfile();
-
- case I2C_3AXIS_DEVICE_ORIENTATION:
- return new I2C3AxisDeviceOrientationProfile();
-
- case I2C_TEMPERATURE:
- return new I2CTemperatureProfile();
-
- case I2C_HUMIDITY:
- return new I2CHumidityProfile();
-
- case I2C_PROXIMITY:
- return new I2CProximityProfile();
-
- case I2C_ILLUMINANCE:
- return new I2CIlluminanceProfile();
-
- case I2C_ATMOSPHERIC_PRESSURE:
- return new I2CAtmosphericPressureProfile();
-
- case I2C_LIDARLITE_PROXIMITY:
- return new I2CLIDARLiteProximityProfile();
-
- default:
- if (DEBUG) {
- Log.w(TAG, "Not found the profile.");
- Log.w(TAG, "ID: " + profileData.getServiceId());
- Log.w(TAG, "Type: " + profileData.getType());
- }
- break;
- }
- return null;
- }
-
- /**
- * ピン情報をArudinoUno.Pinのリストに変換します.
- * @param pins 変換前のピン情報
- * @return ArudinoUno.Pinのリスト
- */
- private static List conv(List pins) {
- List pinList = new ArrayList<>();
- for (Integer i : pins) {
- pinList.add(FaBoShield.Pin.getPin(i));
- }
- return pinList;
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/db/ProfileData.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/db/ProfileData.java
deleted file mode 100644
index 27e379bdf2..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/db/ProfileData.java
+++ /dev/null
@@ -1,374 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.service.virtual.db;
-
-
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * プロファイルデータ.
- */
-public class ProfileData implements Parcelable {
-
- /**
- * カテゴリ.
- */
- public enum Category {
- /**
- * GPIOを表すカテゴリー.
- */
- GPIO("GPIO"),
-
- /**
- * I2Cを表すカテゴリー.
- */
- I2C("I2C");
-
- private String mValue;
-
- Category(final String value) {
- mValue = value;
- }
-
- public String getValue() {
- return mValue;
- }
- }
-
- /**
- * 仮想サービスに登録するプロファイルのタイプ.
- */
- public enum Type {
- /**
- * GPIO用Lightプロファイル.
- *
- * Brick: #101
- *
- */
- GPIO_LIGHT(1, "#101", Category.GPIO, "light"),
-
- /**
- * GPIO用Temperatureプロファイル.
- *
- * Brick: #108
- *
- */
- GPIO_TEMPERATURE(2, "#108", Category.GPIO, "temperature"),
-
- /**
- * GPIO用Vibrationプロファイル.
- *
- * Brick: #105
- *
- */
- GPIO_VIBRATION(3, "#105", Category.GPIO, "vibration"),
-
- /**
- * GPIO用Illuminanceプロファイル.
- *
- * Brick: #109
- *
- */
- GPIO_ILLUMINANCE(4, "#109", Category.GPIO, "illuminace"),
-
- /**
- * GPIO用KeyEventプロファイル.
- *
- * Brick: #103
- *
- */
- GPIO_KEY_EVENT(5, "#103", Category.GPIO, "keyEvent"),
-
- /**
- * GPIO用Humidityプロファイル.
- *
- * Brick: #115
- *
- */
- GPIO_HUMIDITY(6, "#115", Category.GPIO, "humidity"),
-
- /**
- * GPIO用Proximityプロファイル.
- *
- * Brick: #1116
- *
- */
- GPIO_PROXIMITY(7, "#116", Category.GPIO, "proximity"),
-
- /**
- * I2C用RobotCar用DriveControllerプロファイル.
- */
- I2C_ROBOT_DRIVE_CONTROLLER(100, null, Category.I2C, "driveController"),
-
- /**
- * I2C用RobotCar(Mouse)用DriveControllerプロファイル.
- */
- I2C_MOUSE_DRIVE_CONTROLLER(101, null, Category.I2C, "driveController"),
-
- /**
- * I2C用DeviceOrientation(3axis)プロファイル.
- *
- * Brick: #201
- *
- */
- I2C_3AXIS_DEVICE_ORIENTATION(102, "#201", Category.I2C, "deviceOrientation"),
-
- /**
- * I2C用Temperatureプロファイル.
- *
- * Brick: #207
- *
- */
- I2C_TEMPERATURE(103, "#207", Category.I2C, "temperature"),
-
- /**
- * I2C用Humidityプロファイル.
- *
- * Brick: #208
- *
- */
- I2C_HUMIDITY(104, "#208", Category.I2C, "humidity"),
-
- /**
- * I2C用Proximityプロファイル.
- *
- * Brick: #205
- *
- */
- I2C_PROXIMITY(105, "#205", Category.I2C, "proximity"),
-
- /**
- * I2C用Illuminanceプロファイル.
- *
- * Brick: #217
- *
- */
- I2C_ILLUMINANCE(106, "#217", Category.I2C, "illuminace"),
-
- /**
- * I2C用AtmosphericPressureプロファイル.
- *
- * Brick: #204
- *
- */
- I2C_ATMOSPHERIC_PRESSURE(107, "#204", Category.I2C, "atmosphericPressure"),
-
- /**
- * I2C用Proximityプロファイル.
- *
- * Brick: #222
- *
- */
- I2C_LIDARLITE_PROXIMITY(108, "#222", Category.I2C, "proximity");
-
- /**
- * プロファイルの種別.
- */
- private int mValue;
-
- /**
- * BrickのID.
- */
- private String mBrick;
-
- /**
- * カテゴリ-.
- */
- private Category mCategory;
-
- /**
- * プロファイル名.
- */
- private String mProfileName;
-
- Type(final int value, final String brick, final Category category, final String profileName) {
- mValue = value;
- mBrick = brick;
- mCategory = category;
- mProfileName = profileName;
- }
-
- /**
- * プロファイルの種別を取得します.
- * @return プロファイルの種別
- */
- public int getValue() {
- return mValue;
- }
-
- /**
- * プロファイルが対応するBrick番号を取得します.
- * @return Brickを識別するID
- */
- public String getBrick() {
- return mBrick;
- }
-
- /**
- * プロファイルのカテゴリーを取得します.
- * @return CATEGORY_GPIO もしくは CATEGORY_I2C
- */
- public Category getCategory() {
- return mCategory;
- }
-
- /**
- * プロファイル名を取得します.
- * @return プロファイル名
- */
- public String getProfileName() {
- return mProfileName;
- }
-
- /**
- * 指定された値からプロファイルのタイプを取得します.
- * @param type プロファイルのタイプ
- * @return プロファイルタイプ
- */
- public static Type getType(final int type) {
- for (Type t : values()) {
- if (t.getValue() == type) {
- return t;
- }
- }
- return null;
- }
- }
-
- /**
- * プロファイルが属する仮想サービスのID.
- */
- private String mServiceId;
-
- /**
- * プロファイルタイプ.
- */
- private Type mType;
-
- /**
- * プロファイルが操作を行うピン一覧.
- */
- private List mPinList = new ArrayList<>();
-
- /**
- * コンストラクタ.
- */
- public ProfileData() {
- }
-
- /**
- * Parcelable用のコンストラクタ.
- * @param parcel Parcel
- */
- private ProfileData(final Parcel parcel) {
- mType = Type.getType(parcel.readInt());
- mServiceId = parcel.readString();
- parcel.readList(mPinList, ProfileData.class.getClassLoader());
- }
-
- /**
- * プロファイルが属するサービスIDを取得します.
- * @return サービスID
- */
- public String getServiceId() {
- return mServiceId;
- }
-
- /**
- * プロファイルが属するサービスIDを設定します.
- * @param serviceId サービスID
- */
- public void setServiceId(final String serviceId) {
- mServiceId = serviceId;
- }
-
- /**
- * プロファイルのタイプを取得します.
- * @return プロファイルのタイプ
- */
- public Type getType() {
- return mType;
- }
-
- /**
- * プロファイルのタイプを設定します.
- * @param type プロファイルのタイプ
- */
- public void setType(final Type type) {
- mType = type;
- }
-
- /**
- * プロファイルが操作するピンのリストを取得します.
- * @return プロファイルが操作するピンのリスト
- */
- public List getPinList() {
- return mPinList;
- }
-
- /**
- * プロファイルが操作するピンのリストを設定します.
- * @param pinList プロファイルが操作するピンのリスト
- */
- public void setPinList(final List pinList) {
- mPinList = pinList;
- }
-
- /**
- * プロファイルが操作するピンをリストに追加します.
- * @param pin 追加するピン
- */
- public void addPin(final int pin) {
- mPinList.add(pin);
- }
-
- public boolean usedPin(final int pin) {
- return mPinList.contains(pin);
- }
-
- @Override
- public int describeContents() {
- return 0;
- }
-
- @Override
- public void writeToParcel(final Parcel parcel, final int flags) {
- parcel.writeInt(mType.getValue());
- parcel.writeString(mServiceId);
- parcel.writeList(mPinList);
- }
-
- public static final Creator CREATOR = new Creator() {
- @Override
- public ProfileData createFromParcel(final Parcel source) {
- return new ProfileData(source);
- }
- @Override
- public ProfileData[] newArray(final int size) {
- return new ProfileData[size];
- }
- };
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + mType.getValue();
- result = prime * result + ((mServiceId == null) ? 0 : mServiceId.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(final Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null || getClass() != obj.getClass()) {
- return false;
- }
- ProfileData other = (ProfileData) obj;
- return mType == other.mType && mServiceId.equals(other.getServiceId());
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/db/ProfileDataUtil.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/db/ProfileDataUtil.java
deleted file mode 100644
index c2e15141aa..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/db/ProfileDataUtil.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.service.virtual.db;
-
-import android.content.Context;
-
-import org.deviceconnect.android.deviceplugin.fabo.core.R;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.deviceconnect.android.deviceplugin.fabo.service.virtual.db.ProfileData.Type.GPIO_HUMIDITY;
-import static org.deviceconnect.android.deviceplugin.fabo.service.virtual.db.ProfileData.Type.GPIO_ILLUMINANCE;
-import static org.deviceconnect.android.deviceplugin.fabo.service.virtual.db.ProfileData.Type.GPIO_KEY_EVENT;
-import static org.deviceconnect.android.deviceplugin.fabo.service.virtual.db.ProfileData.Type.GPIO_LIGHT;
-import static org.deviceconnect.android.deviceplugin.fabo.service.virtual.db.ProfileData.Type.GPIO_PROXIMITY;
-import static org.deviceconnect.android.deviceplugin.fabo.service.virtual.db.ProfileData.Type.GPIO_TEMPERATURE;
-import static org.deviceconnect.android.deviceplugin.fabo.service.virtual.db.ProfileData.Type.GPIO_VIBRATION;
-
-public final class ProfileDataUtil {
-
- private ProfileDataUtil() {}
-
- /**
- * プロファイルが使用できるピンのタイプを保持するマップ.
- */
- private static Map mPinTypeMap = new HashMap<>();
-
- /**
- * プロファイルが複数のピンの操作ができるのかを保持するマップ.
- */
- private static Map mMultiChoiceMap = new HashMap<>();
-
- static {
- mPinTypeMap.put(GPIO_LIGHT, PinType.DIGITAL);
- mPinTypeMap.put(GPIO_TEMPERATURE, PinType.ANALOG);
- mPinTypeMap.put(GPIO_VIBRATION, PinType.DIGITAL);
- mPinTypeMap.put(GPIO_ILLUMINANCE, PinType.ANALOG);
- mPinTypeMap.put(GPIO_KEY_EVENT, PinType.ALL);
- mPinTypeMap.put(GPIO_HUMIDITY, PinType.ANALOG);
- mPinTypeMap.put(GPIO_PROXIMITY, PinType.ANALOG);
-
- mMultiChoiceMap.put(GPIO_LIGHT, true);
- mMultiChoiceMap.put(GPIO_TEMPERATURE, false);
- mMultiChoiceMap.put(GPIO_VIBRATION, true);
- mMultiChoiceMap.put(GPIO_ILLUMINANCE, false);
- mMultiChoiceMap.put(GPIO_KEY_EVENT, true);
- mMultiChoiceMap.put(GPIO_HUMIDITY, false);
- mMultiChoiceMap.put(GPIO_PROXIMITY, false);
- }
-
- /**
- * プロファイルの名前を取得します.
- * @param context コンテキスト
- * @param type プロファイルのタイプ
- * @return プロファイル名
- */
- public static String getProfileName(final Context context, final ProfileData.Type type) {
- switch (type) {
- case GPIO_LIGHT:
- return context.getString(R.string.activity_fabo_virtual_gpio_light);
- case GPIO_TEMPERATURE:
- return context.getString(R.string.activity_fabo_virtual_gpio_temperature);
- case GPIO_VIBRATION:
- return context.getString(R.string.activity_fabo_virtual_gpio_vibration);
- case GPIO_ILLUMINANCE:
- return context.getString(R.string.activity_fabo_virtual_gpio_illuminance);
- case GPIO_KEY_EVENT:
- return context.getString(R.string.activity_fabo_virtual_gpio_key_event);
- case GPIO_HUMIDITY:
- return context.getString(R.string.activity_fabo_virtual_gpio_humidity);
- case GPIO_PROXIMITY:
- return context.getString(R.string.activity_fabo_virtual_gpio_proximity);
- case I2C_ROBOT_DRIVE_CONTROLLER:
- return context.getString(R.string.activity_fabo_virtual_i2c_robot_drivecontroller);
- case I2C_MOUSE_DRIVE_CONTROLLER:
- return context.getString(R.string.activity_fabo_virtual_i2c_mouse_drivecontroller);
- case I2C_3AXIS_DEVICE_ORIENTATION:
- return context.getString(R.string.activity_fabo_virtual_i2c_3axis_device_orientation);
- case I2C_TEMPERATURE:
- return context.getString(R.string.activity_fabo_virtual_i2c_temperature);
- case I2C_HUMIDITY:
- return context.getString(R.string.activity_fabo_virtual_i2c_humidity);
- case I2C_PROXIMITY:
- return context.getString(R.string.activity_fabo_virtual_i2c_proximity);
- case I2C_ILLUMINANCE:
- return context.getString(R.string.activity_fabo_virtual_i2c_illuminace);
- case I2C_ATMOSPHERIC_PRESSURE:
- return context.getString(R.string.activity_fabo_virtual_i2c_atmospheric_pressure);
- case I2C_LIDARLITE_PROXIMITY:
- return context.getString(R.string.activity_fabo_virtual_i2c_lidarlite_proximity);
- }
- return null;
- }
-
- /**
- * プロファイルが使用できるピンのタイプを取得します.
- * @param profileData プロファイルデータ
- * @return 使用できるピンのタイプ
- */
- public static PinType getPinType(final ProfileData profileData) {
- return mPinTypeMap.get(profileData.getType());
- }
-
-
- /**
- * プロファイルが使用できるピンのタイプを取得します.
- * @param type プロファイルタイプ
- * @return 使用できるピンのタイプ
- */
- public static PinType getPinType(final ProfileData.Type type) {
- return mPinTypeMap.get(type);
- }
-
- /**
- * プロファイルが複数のピンを使用できるかを確認します.
- * @param profileData プロファイルデータ
- * @return 複数選択できる場合はtrue、それ以外はfalse
- */
- public static boolean isMultiChoicePin(final ProfileData profileData) {
- return mMultiChoiceMap.get(profileData.getType());
- }
-
- /**
- * プロファイルが複数のピンを使用できるかを確認します.
- * @param type プロファイルデータ
- * @return 複数選択できる場合はtrue、それ以外はfalse
- */
- public static boolean isMultiChoicePin(final ProfileData.Type type) {
- return mMultiChoiceMap.get(type);
- }
-
-
- /**
- * プロファイルが使用できるピンのタイプ.
- */
- public enum PinType {
- /**
- * AnalogとDigitalの療法が使用できます.
- */
- ALL,
-
- /**
- * Analogが使用できます.
- */
- ANALOG,
-
- /**
- * Digitalが使用できます.
- */
- DIGITAL
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/db/ServiceData.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/db/ServiceData.java
deleted file mode 100644
index 70179ba881..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/db/ServiceData.java
+++ /dev/null
@@ -1,188 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.service.virtual.db;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 仮想サービスデータ.
- */
-public class ServiceData implements Parcelable {
- /**
- * 仮想サービスのID.
- */
- private String mServiceId;
-
- /**
- * 仮想サービスの名前.
- */
- private String mName;
-
- /**
- * 仮想サービスが保持するプロファイルデータ.
- */
- private List mProfileDataList = new ArrayList<>();
-
- /**
- * コンストラクタ.
- */
- public ServiceData() {
- }
-
- /**
- * Parcelable用のコンストラクタ.
- * @param parcel Parcel
- */
- private ServiceData(final Parcel parcel) {
- mServiceId = parcel.readString();
- mName = parcel.readString();
- parcel.readList(mProfileDataList, ServiceData.class.getClassLoader());
- }
-
- /**
- * サービスIDを取得します.
- * @return サービスID
- */
- public String getServiceId() {
- return mServiceId;
- }
-
- /**
- * サービスIDを設定します.
- * @param serviceId サービスID
- */
- public void setServiceId(final String serviceId) {
- mServiceId = serviceId;
- for (ProfileData p : mProfileDataList) {
- p.setServiceId(serviceId);
- }
- }
-
- /**
- * サービスの名前を取得します.
- * @return サービスの名前
- */
- public String getName() {
- return mName;
- }
-
- /**
- * サービスの名前を設定します.
- * @param name サービスの名前
- */
- public void setName(final String name) {
- mName = name;
- }
-
- /**
- * サービスが持つプロファイルのリストを取得します.
- * @return プロファイルのリスト
- */
- public List getProfileDataList() {
- return mProfileDataList;
- }
-
- public ProfileData getProfileData(final ProfileData.Type type) {
- for (ProfileData p : mProfileDataList) {
- if (p.getType() == type) {
- return p;
- }
- }
- return null;
- }
-
- /**
- * サービスが持つプロファイルのリストを設定します.
- * @param profileDataList プロファイルのリスト
- */
- public void setProfileDataList(final List profileDataList) {
- mProfileDataList = profileDataList;
- for (ProfileData p : mProfileDataList) {
- p.setServiceId(mServiceId);
- }
- }
-
- /**
- * サービスが持つプロファイルのリストに追加します.
- *
- * 既に同じプロファイルを持っている場合には、新しいプロファイルに置き換えます。
- *
- * @param profileData 追加するプロファイル
- */
- public void addProfileData(final ProfileData profileData) {
- if (mProfileDataList.contains(profileData)) {
- for (int i = 0; i < mProfileDataList.size(); i++) {
- if (mProfileDataList.get(i).equals(profileData)) {
- mProfileDataList.set(i, profileData);
- break;
- }
- }
- } else {
- mProfileDataList.add(profileData);
- }
- profileData.setServiceId(mServiceId);
- }
-
- /**
- * 削除します.
- * @param profileData
- */
- public void removeProfileData(final ProfileData profileData) {
- mProfileDataList.remove(profileData);
- }
-
- /**
- * 仮想サービスが使用しているピンの一覧を取得します.
- * @return ピンの一覧
- */
- public List getUsePins() {
- List pins = new ArrayList<>();
- for (ProfileData p : mProfileDataList) {
- for (Integer i : p.getPinList()) {
- pins.add(i);
- }
- }
- return pins;
- }
-
- /**
- * 指定されたピン番号が使用されているか確認を行います.
- * @param pinNumber 確認を行うピン番号
- * @return 使用されている場合にはtrue、それ以外はfalse
- */
- public boolean usedPin(final int pinNumber) {
- for (ProfileData p : mProfileDataList) {
- for (Integer i : p.getPinList()) {
- if (pinNumber == i) {
- return true;
- }
- }
- }
- return false;
- }
-
- @Override
- public int describeContents() {
- return 0;
- }
-
- @Override
- public void writeToParcel(final Parcel parcel, final int flags) {
- parcel.writeString(mServiceId);
- parcel.writeString(mName);
- parcel.writeList(mProfileDataList);
- }
-
- public static final Creator CREATOR = new Creator() {
- @Override
- public ServiceData createFromParcel(final Parcel source) {
- return new ServiceData(source);
- }
- @Override
- public ServiceData[] newArray(final int size) {
- return new ServiceData[size];
- }
- };
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/db/VirtualServiceDBHelper.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/db/VirtualServiceDBHelper.java
deleted file mode 100644
index 4ddf7c7553..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/db/VirtualServiceDBHelper.java
+++ /dev/null
@@ -1,382 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.service.virtual.db;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
-import android.provider.BaseColumns;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 仮想サービスのデータを管理します.
- */
-public class VirtualServiceDBHelper {
- /**
- * データベースを保持するファイル名.
- */
- private static final String DB_NAME = "virtual_service.db";
-
- /**
- * データベールのバージョン.
- */
- private static final int DB_VERSION = 1;
-
- private static final String TBL_SERVICE_NAME = "virtual_service_tbl";
- private static final String COL_SERVICE_ID = "serviceId";
- private static final String COL_SERVICE_NAME = "name";
-
- private static final String TBL_PROFILE_NAME = "virtual_profile_tbl";
- private static final String COL_PROFILE_SERVICE_ID = "serviceId";
- private static final String COL_PROFILE_TYPE = "type";
- private static final String COL_PROFILE_PIN = "pin";
-
- /**
- * pinを区切る文字列.
- */
- private static final String SEPARATOR = ",";
-
- /**
- * DBを操作するためのヘルパークラス.
- */
- private DBHelper mDBHelper;
-
- /**
- * コンストラクタ.
- * @param context コンテキスト
- */
- public VirtualServiceDBHelper(final Context context) {
- mDBHelper = new DBHelper(context);
- }
-
- /**
- * サービスIDを作成します.
- * @return サービスID
- */
- public String createServiceId() {
- return "fabo_" + getServiceBaseId() + "_service_id";
- }
-
- /**
- * DBに仮想サービスデータを追加します.
- * @param serviceData 追加を行うサービスデータ
- * @return 挿入したデータのrow情報
- */
- public long addServiceData(final ServiceData serviceData) {
- ContentValues values = new ContentValues();
- values.put(COL_SERVICE_ID, serviceData.getServiceId());
- values.put(COL_SERVICE_NAME, serviceData.getName());
-
- SQLiteDatabase db = mDBHelper.getWritableDatabase();
- try {
- long row = db.insert(TBL_SERVICE_NAME, null, values);
- if (row > 0) {
- for (ProfileData p : serviceData.getProfileDataList()) {
- addProfileData(p);
- }
- }
- return row;
- } finally {
- db.close();
- }
- }
-
- /**
- * DBから仮想サービスデータを削除します.
- * @param serviceData 削除を行うサービスデータ
- */
- public long removeServiceData(final ServiceData serviceData) {
- String whereClause = COL_SERVICE_ID + "=?";
- String[] whereArgs = {
- serviceData.getServiceId()
- };
-
- for (ProfileData p : serviceData.getProfileDataList()) {
- removeProfileData(p);
- }
-
- SQLiteDatabase db = mDBHelper.getWritableDatabase();
- try {
- return db.delete(TBL_SERVICE_NAME, whereClause, whereArgs);
- } finally {
- db.close();
- }
- }
-
- /**
- * 仮想サービスデータを更新します.
- * @param serviceData 更新する仮想サービスデータ
- * @return 更新したDBのカラム数
- */
- public long updateServiceData(final ServiceData serviceData) {
- ContentValues values = new ContentValues();
- values.put(COL_SERVICE_NAME, serviceData.getName());
-
- String whereClause = COL_SERVICE_ID + "=?";
- String[] whereArgs = {
- serviceData.getServiceId()
- };
-
-
- List old = getProfileDataList(serviceData.getServiceId());
-
- for (ProfileData p : serviceData.getProfileDataList()) {
- // アップデートに失敗した場合には、プロファイルが存在しなかった
- // 可能性があるので、追加処理を行っておく。
- if (updateProfileData(p) <= 0) {
- addProfileData(p);
- }
- old.remove(p);
- }
-
- // 削除されたプロファイルはDBからも削除しておく
- for (ProfileData p : old) {
- removeProfileData(p);
- }
-
- SQLiteDatabase db = mDBHelper.getWritableDatabase();
- try {
- return db.update(TBL_SERVICE_NAME, values, whereClause, whereArgs);
- } finally {
- db.close();
- }
- }
-
- /**
- * 指定された仮想サービスのIDに対応するサービスデータを取得します.
- * @param vid 仮想サービスのID
- * @return ServiceDataのインスタンス
- */
- public ServiceData getServiceData(final String vid) {
- String sql = "SELECT * FROM " + TBL_SERVICE_NAME + " WHERE " + COL_SERVICE_ID + "=?";
- String[] selectionArgs = {
- vid
- };
-
- SQLiteDatabase db = mDBHelper.getReadableDatabase();
- Cursor cursor = db.rawQuery(sql, selectionArgs);
- try {
- boolean next = cursor.moveToFirst();
- if (next) {
- ServiceData service = new ServiceData();
- service.setServiceId(cursor.getString(cursor.getColumnIndex(COL_SERVICE_ID)));
- service.setName(cursor.getString(cursor.getColumnIndex(COL_SERVICE_NAME)));
- service.setProfileDataList(getProfileDataList(service.getServiceId()));
- return service;
- }
- return null;
- } finally {
- cursor.close();
- db.close();
- }
- }
-
- /**
- * DBから仮想サービスデータのリストを取得します.
- *
- * 一つも登録されていない場合には、空のListを返却します。
- *
- * @return 仮想サービスデータのリスト
- */
- public List getServiceDataList() {
- String sql = "SELECT * FROM " + TBL_SERVICE_NAME;
- String[] selectionArgs = {};
-
- SQLiteDatabase db = mDBHelper.getReadableDatabase();
- Cursor cursor = db.rawQuery(sql, selectionArgs);
- try {
- List serviceDatas = new ArrayList<>();
- boolean next = cursor.moveToFirst();
- while (next) {
- ServiceData service = new ServiceData();
- service.setServiceId(cursor.getString(cursor.getColumnIndex(COL_SERVICE_ID)));
- service.setName(cursor.getString(cursor.getColumnIndex(COL_SERVICE_NAME)));
- service.setProfileDataList(getProfileDataList(service.getServiceId()));
- serviceDatas.add(service);
- next = cursor.moveToNext();
- }
- return serviceDatas;
- } finally {
- cursor.close();
- db.close();
- }
- }
-
- /**
- * プロファイルデータを追加します.
- * @param profileData 追加するプロファイルデータ
- */
- public long addProfileData(final ProfileData profileData) {
- ContentValues values = new ContentValues();
- values.put(COL_PROFILE_SERVICE_ID, profileData.getServiceId());
- values.put(COL_PROFILE_TYPE, profileData.getType().getValue());
- values.put(COL_PROFILE_PIN, convertList2String(profileData.getPinList()));
-
- SQLiteDatabase db = mDBHelper.getWritableDatabase();
- try {
- return db.insert(TBL_PROFILE_NAME, null, values);
- } finally {
- db.close();
- }
- }
-
- /**
- * プロファイルデータを削除します.
- * @param profileData 削除するプロファイルデータ
- */
- public long removeProfileData(final ProfileData profileData) {
- String whereClause = COL_PROFILE_SERVICE_ID + "=? AND " + COL_PROFILE_TYPE + "=?";
- String[] whereArgs = {
- profileData.getServiceId(),
- "" + profileData.getType().getValue()
- };
-
- SQLiteDatabase db = mDBHelper.getWritableDatabase();
- try {
- return db.delete(TBL_PROFILE_NAME, whereClause, whereArgs);
- } finally {
- db.close();
- }
- }
-
- /**
- * 指定されたプロファイルデータの情報を更新します.
- * @param profileData 更新するプロファイルデータ
- * @return 更新したDBのカラム数
- */
- public long updateProfileData(final ProfileData profileData) {
- ContentValues values = new ContentValues();
- values.put(COL_PROFILE_PIN, convertList2String(profileData.getPinList()));
-
- String whereClause = COL_PROFILE_SERVICE_ID + "=? AND " + COL_PROFILE_TYPE + "=?";
- String[] whereArgs = {
- profileData.getServiceId(),
- String.valueOf(profileData.getType().getValue())
- };
-
- SQLiteDatabase db = mDBHelper.getWritableDatabase();
- try {
- return db.update(TBL_PROFILE_NAME, values, whereClause, whereArgs);
- } finally {
- db.close();
- }
- }
-
- /**
- * 指定されたサービスIDに対応するDBからプロファイルデータのリストを取得します.
- *
- * 一つも登録されていない場合には、空のListを返却します。
- *
- * @param serviceId サービスID
- * @return プロファイルデータのリスト
- */
- public List getProfileDataList(final String serviceId) {
- String sql = "SELECT * FROM " + TBL_PROFILE_NAME + " WHERE " + COL_PROFILE_SERVICE_ID + "=?";
- String[] selectionArgs = { serviceId };
-
- SQLiteDatabase db = mDBHelper.getReadableDatabase();
- Cursor cursor = db.rawQuery(sql, selectionArgs);
- try {
- List profileDatas = new ArrayList<>();
- boolean next = cursor.moveToFirst();
- while (next) {
- ProfileData profile = new ProfileData();
- profile.setServiceId(cursor.getString(cursor.getColumnIndex(COL_PROFILE_SERVICE_ID)));
- profile.setType(ProfileData.Type.getType(cursor.getInt(cursor.getColumnIndex(COL_PROFILE_TYPE))));
- profile.setPinList(convertString2List(cursor.getString(cursor.getColumnIndex(COL_PROFILE_PIN))));
- profileDatas.add(profile);
- next = cursor.moveToNext();
- }
- return profileDatas;
- } finally {
- cursor.close();
- db.close();
- }
- }
-
- /**
- * サービスデータのテーブルにあるBaseColumns._IDの最大値を取得します.
- * @return テーブルにあるBaseColumns._IDの最大値
- */
- private int getServiceBaseId() {
- String sql = "SELECT * FROM " + TBL_SERVICE_NAME + " ORDER BY " + BaseColumns._ID + " DESC";
- SQLiteDatabase db = mDBHelper.getReadableDatabase();
- Cursor cursor = db.rawQuery(sql, null);
- try {
- if (cursor.moveToFirst()) {
- return cursor.getInt(cursor.getColumnIndex(BaseColumns._ID)) + 1;
- }
- } finally {
- cursor.close();
- db.close();
- }
- return 0;
- }
-
- private String convertList2String(final List pins) {
- StringBuilder sb = new StringBuilder();
- for (Integer str : pins) {
- if (sb.length() > 0) {
- sb.append(SEPARATOR);
- }
- sb.append(str);
- }
- return sb.toString();
- }
-
- private List convertString2List(final String str) {
- List list = new ArrayList<>();
- for (String s : str.split(SEPARATOR)) {
- try {
- list.add(Integer.parseInt(s));
- } catch (NumberFormatException e) {
- // do noting.
- }
- }
- return list;
- }
-
- /**
- * DB操作を行うためのヘルパークラス.
- */
- private class DBHelper extends SQLiteOpenHelper {
- /**
- * コンストラクタ.
- * @param context コンテキスト
- */
- DBHelper(final Context context) {
- super(context, DB_NAME, null, DB_VERSION);
- }
-
- @Override
- public void onCreate(final SQLiteDatabase db) {
- createDB(db);
- }
-
- @Override
- public void onUpgrade(final SQLiteDatabase db, final int oldVersion, final int newVersion) {
- db.execSQL("DROP TABLE IF EXISTS " + TBL_SERVICE_NAME);
- db.execSQL("DROP TABLE IF EXISTS " + TBL_PROFILE_NAME);
- createDB(db);
- }
-
- private void createDB(final SQLiteDatabase db) {
- String sql = "CREATE TABLE " + TBL_SERVICE_NAME + " ("
- + BaseColumns._ID + " INTEGER PRIMARY KEY, "
- + COL_SERVICE_ID + " TEXT NOT NULL, "
- + COL_SERVICE_NAME + " TEXT NOT NULL"
- + ");";
- db.execSQL(sql);
-
- String sql2 = "CREATE TABLE " + TBL_PROFILE_NAME + " ("
- + BaseColumns._ID + " INTEGER PRIMARY KEY, "
- + COL_PROFILE_SERVICE_ID + " TEXT NOT NULL, "
- + COL_PROFILE_TYPE + " INTEGER, "
- + COL_PROFILE_PIN + " TEXT NOT NULL"
- + ");";
- db.execSQL(sql2);
- }
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/BaseFaBoProfile.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/BaseFaBoProfile.java
deleted file mode 100644
index 82ac36deb2..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/BaseFaBoProfile.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile;
-
-import org.deviceconnect.android.deviceplugin.fabo.FaBoDeviceService;
-import org.deviceconnect.android.deviceplugin.fabo.device.FaBoDeviceControl;
-import org.deviceconnect.android.profile.DConnectProfile;
-
-abstract class BaseFaBoProfile extends DConnectProfile {
- /**
- * FaBoDeviceServiceを取得します.
- *
- * 返り値がnullになる場合には、プログラムがおかしいので注意。
- *
- * @return FaBoDeviceServiceのインスタンス
- */
- FaBoDeviceService getFaBoDeviceService() {
- return (FaBoDeviceService) getContext();
- }
-
-// /**
-// * 接続されているFaBoを操作するためのFaBoUsbManagerを取得します.
-// *
-// * 接続されていない場合にはnullを返却します。
-// *
-// * @return FaBoUsbManagerのインスタンス
-// */
-// FaBoUsbManager getFaBoUsbManager() {
-// return getFaBoDeviceService().getFaBoUsbManager();
-// }
-
- FaBoDeviceControl getFaBoDeviceControl() {
- return getFaBoDeviceService().getFaBoDeviceControl();
- }
-
- /**
- * Arduinoから渡されてくる値を変換します.
- * @param x Arduinoから取得した値
- * @param inMin Arduinoから取得できる最小値
- * @param inMax Arduinoから取得できる最大値
- * @param outMin 変換後の最小値
- * @param outMax 変換後の最大値
- * @return 変換された値
- */
- int calcArduinoMap(final int x, final int inMin, final int inMax, final int outMin, final int outMax) {
- return (x - inMin) * (outMax - outMin) / (inMax - inMin) + outMin;
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/FlashingExecutor.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/FlashingExecutor.java
deleted file mode 100644
index 6f1b89faa5..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/FlashingExecutor.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile;
-
-import java.util.Queue;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-
-class FlashingExecutor {
-
- /**
- * ライトの点灯・消灯タイミング通知リスナー.
- */
- interface LightControllable {
- /**
- * ライトの点灯・消灯の変更要求.
- *
- * CompleteListener#onComplete()を呼び出すと次の点滅処理を行います。
- *
- * @param isOn true: 点灯、false: 消灯
- * @param listener 点灯・消灯完了通知を行うリスナー
- */
- void changeLight(boolean isOn, CompleteListener listener);
- }
-
- /**
- * ライトの状態変更通知リスナー.
- */
- interface CompleteListener {
- /**
- * ライトの状態が変更できたことを通知します。
- */
- void onComplete();
- }
-
- private LightControllable mListener;
- private ScheduledExecutorService mFlashingService = Executors.newSingleThreadScheduledExecutor();
- private ScheduledFuture mLatestScheduledFuture;
- private Queue mFlashingQueue = new ConcurrentLinkedQueue();
- private boolean mIsOn = true;
- private int mLastIdentifier = 0;
-
- FlashingExecutor() {
- }
-
- synchronized void setLightControllable(LightControllable controllable) {
- mListener = controllable;
- }
-
- synchronized void start(long[] flashing) {
- cancelSchedule();
- updateQueue(flashing);
- setOn(true);
- schedule(new Runnable() {
- @Override
- public void run() {
- controlLight(this);
- }
- }, getNextFlashingInterval());
- }
-
- private synchronized void controlLight(final Runnable runnable) {
- if (mFlashingQueue.isEmpty()) {
- onFinish();
- }
- mLastIdentifier++;
- final int identifier = mLastIdentifier;
- LightControllable listener = getLightControllable();
- if (listener == null) {
- next(runnable, identifier);
- return;
- }
- listener.changeLight(isOn(), new CompleteListener() {
- @Override
- public void onComplete() {
- next(runnable, identifier);
- }
- });
- }
-
- private synchronized void next(Runnable runnable, int identifier) {
- //Return if other execution has been begin.
- if (mLastIdentifier != identifier) {
- return;
- }
- toggleOnOff();
- Long interval = getNextFlashingInterval();
- if (interval != null) {
- schedule(runnable, interval);
- } else {
- onFinish();
- }
- }
-
- private synchronized void onFinish() {
- mListener = null;
- mLatestScheduledFuture = null;
- }
-
- private synchronized LightControllable getLightControllable() {
- return mListener;
- }
-
- private synchronized void cancelSchedule() {
- if (mLatestScheduledFuture != null && !mLatestScheduledFuture.isCancelled()) {
- mLatestScheduledFuture.cancel(false);
- }
- }
-
- private synchronized void schedule(Runnable runnable, long interval) {
- mLatestScheduledFuture = mFlashingService.schedule(runnable, interval, TimeUnit.MILLISECONDS);
- }
-
- private synchronized void updateQueue(long[] flashing) {
- mFlashingQueue.clear();
- mFlashingQueue.add(0L);
- for (long value : flashing) {
- mFlashingQueue.add(value);
- }
- }
-
- private synchronized Long getNextFlashingInterval() {
- return mFlashingQueue.poll();
- }
-
- private synchronized void setOn(boolean isOn) {
- mIsOn = isOn;
- }
-
- private synchronized boolean isOn() {
- return mIsOn;
- }
-
- private synchronized void toggleOnOff() {
- mIsOn = !mIsOn;
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/GPIOHumidityProfile.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/GPIOHumidityProfile.java
deleted file mode 100644
index 8209638bdd..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/GPIOHumidityProfile.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile;
-
-import android.content.Intent;
-
-import org.deviceconnect.android.deviceplugin.fabo.param.FaBoShield;
-import org.deviceconnect.android.message.MessageUtils;
-import org.deviceconnect.android.profile.api.GetApi;
-import org.deviceconnect.message.DConnectMessage;
-
-import java.util.List;
-
-/**
- * GPIO用Humidityプロファイル.
- *
- * ID: #115
- */
-public class GPIOHumidityProfile extends BaseFaBoProfile {
- /**
- * Humidity操作を行うピンのリスト.
- */
- private List mPinList;
-
- public GPIOHumidityProfile(final List pinList) {
- mPinList = pinList;
-
- addApi(new GetApi() {
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- if (!getService().isOnline()) {
- MessageUtils.setIllegalDeviceStateError(response, "FaBo device is not connected.");
- } else {
- FaBoShield.Pin pin = mPinList.get(0);
-
- // TODO 要確認
- int value = getFaBoDeviceControl().getAnalog(pin);
- int humidity = value & 0xFFFF;
-
- response.putExtra("humidity", humidity / 100.0f);
- setResult(response, DConnectMessage.RESULT_OK);
- }
- return true;
- }
- });
- }
-
- @Override
- public String getProfileName() {
- return "humidity";
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/GPIOIlluminanceProfile.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/GPIOIlluminanceProfile.java
deleted file mode 100644
index 7c38fc1574..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/GPIOIlluminanceProfile.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile;
-
-import android.content.Intent;
-
-import org.deviceconnect.android.deviceplugin.fabo.param.FaBoShield;
-import org.deviceconnect.android.message.MessageUtils;
-import org.deviceconnect.android.profile.api.GetApi;
-import org.deviceconnect.message.DConnectMessage;
-
-import java.util.List;
-
-/**
- * GPIO用のIlluminanceプロファイル.
- *
- * ID: #109
- */
-public class GPIOIlluminanceProfile extends BaseFaBoProfile {
- /**
- * Illuminance操作を行うピンのリスト.
- */
- private List mPinList;
-
- public GPIOIlluminanceProfile(final List pinList) {
- mPinList = pinList;
-
- // GET /gotpai/illuminance
- addApi(new GetApi() {
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- if (!getService().isOnline()) {
- MessageUtils.setIllegalDeviceStateError(response, "FaBo device is not connected.");
- } else {
- FaBoShield.Pin pin = mPinList.get(0);
-
- int value = getFaBoDeviceControl().getAnalog(pin);
- value = 5000 - calcArduinoMap(value, 0, 2013, 0, 5000);
- value = value / 10;
-
- response.putExtra("illuminance", value);
-
- setResult(response, DConnectMessage.RESULT_OK);
- }
- return true;
- }
- });
- }
-
- @Override
- public String getProfileName() {
- return "illuminance";
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/GPIOKeyEventProfile.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/GPIOKeyEventProfile.java
deleted file mode 100644
index c8bd1cb024..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/GPIOKeyEventProfile.java
+++ /dev/null
@@ -1,363 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile;
-
-import android.content.Intent;
-import android.os.Bundle;
-
-import org.deviceconnect.android.deviceplugin.fabo.device.FaBoDeviceControl;
-import org.deviceconnect.android.deviceplugin.fabo.param.FaBoShield;
-import org.deviceconnect.android.event.Event;
-import org.deviceconnect.android.event.EventError;
-import org.deviceconnect.android.event.EventManager;
-import org.deviceconnect.android.message.MessageUtils;
-import org.deviceconnect.android.profile.api.DeleteApi;
-import org.deviceconnect.android.profile.api.PutApi;
-import org.deviceconnect.message.DConnectMessage;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * GPIO用のKeyEventプロファイル.
- *
- * ID: #103
- */
-public class GPIOKeyEventProfile extends BaseFaBoProfile {
-
- /**
- * KeyEvent操作を行うピンのリスト.
- */
- private List mPinList;
-
- /**
- * ピンの値を保持するためのMap.
- */
- private Map mValues = new HashMap<>();
-
- /**
- * コンストラクタ.
- *
- * @param pinList KeyEventに対応するPinのリスト
- */
- public GPIOKeyEventProfile(final List pinList) {
- mPinList = pinList;
-
- // PUT /gotapi/keyEvent/onDown
- addApi(new PutApi() {
- @Override
- public String getAttribute() {
- return "onDown";
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- EventError error = EventManager.INSTANCE.addEvent(request);
- switch (error) {
- case NONE:
- getFaBoDeviceControl().addOnGPIOListener(mOnGPIOListenerImpl);
- for (FaBoShield.Pin pin : mPinList) {
- if (pin.getMode() == FaBoShield.Mode.ANALOG) {
- mValues.put(pin, getFaBoDeviceControl().getAnalog(pin));
- } else {
- getFaBoDeviceControl().setPinMode(pin, FaBoShield.Mode.GPIO_IN);
- mValues.put(pin, getFaBoDeviceControl().getDigital(pin).getValue());
- }
- }
- setResult(response, DConnectMessage.RESULT_OK);
- break;
- default:
- MessageUtils.setUnknownError(response);
- break;
- }
- return true;
- }
- });
-
- // DELETE /gotapi/keyEvent/onDown
- addApi(new DeleteApi() {
- @Override
- public String getAttribute() {
- return "onDown";
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- EventError error = EventManager.INSTANCE.removeEvent(request);
- switch (error) {
- case NONE:
- if (isEmptyEvent()) {
- getFaBoDeviceControl().removeOnGPIOListener(mOnGPIOListenerImpl);
- }
- setResult(response, DConnectMessage.RESULT_OK);
- break;
- case NOT_FOUND:
- MessageUtils.setIllegalDeviceStateError(response, "Not register event.");
- break;
- default:
- MessageUtils.setUnknownError(response);
- break;
- }
- return true;
- }
- });
-
- // PUT /gotapi/keyEvent/onUp
- addApi(new PutApi() {
- @Override
- public String getAttribute() {
- return "onUp";
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- EventError error = EventManager.INSTANCE.addEvent(request);
- switch (error) {
- case NONE:
- getFaBoDeviceControl().addOnGPIOListener(mOnGPIOListenerImpl);
- for (FaBoShield.Pin pin : mPinList) {
- if (pin.getMode() == FaBoShield.Mode.ANALOG) {
- mValues.put(pin, getFaBoDeviceControl().getAnalog(pin));
- } else {
- getFaBoDeviceControl().setPinMode(pin, FaBoShield.Mode.GPIO_IN);
- mValues.put(pin, getFaBoDeviceControl().getDigital(pin).getValue());
- }
- }
- setResult(response, DConnectMessage.RESULT_OK);
- break;
- default:
- MessageUtils.setUnknownError(response);
- break;
- }
- return true;
- }
- });
-
- // DELETE /gotapi/keyEvent/onUp
- addApi(new DeleteApi() {
- @Override
- public String getAttribute() {
- return "onUp";
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- EventError error = EventManager.INSTANCE.removeEvent(request);
- switch (error) {
- case NONE:
- if (isEmptyEvent()) {
- getFaBoDeviceControl().removeOnGPIOListener(mOnGPIOListenerImpl);
- }
- setResult(response, DConnectMessage.RESULT_OK);
- break;
- case NOT_FOUND:
- MessageUtils.setIllegalDeviceStateError(response, "Not register event.");
- break;
- default:
- MessageUtils.setUnknownError(response);
- break;
- }
- return true;
- }
- });
-
- // PUT /gotapi/keyEvent/onKeyChange
- addApi(new PutApi() {
- @Override
- public String getAttribute() {
- return "onKeyChange";
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- EventError error = EventManager.INSTANCE.addEvent(request);
- switch (error) {
- case NONE:
- getFaBoDeviceControl().addOnGPIOListener(mOnGPIOListenerImpl);
- for (FaBoShield.Pin pin : mPinList) {
- if (pin.getMode() == FaBoShield.Mode.ANALOG) {
- mValues.put(pin, getFaBoDeviceControl().getAnalog(pin));
- } else {
- getFaBoDeviceControl().setPinMode(pin, FaBoShield.Mode.GPIO_IN);
- mValues.put(pin, getFaBoDeviceControl().getDigital(pin).getValue());
- }
- }
- setResult(response, DConnectMessage.RESULT_OK);
- break;
- default:
- MessageUtils.setUnknownError(response);
- break;
- }
- return true;
- }
- });
-
- // DELETE /gotapi/keyEvent/onKeyChange
- addApi(new DeleteApi() {
- @Override
- public String getAttribute() {
- return "onKeyChange";
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- EventError error = EventManager.INSTANCE.removeEvent(request);
- switch (error) {
- case NONE:
- if (isEmptyEvent()) {
- getFaBoDeviceControl().removeOnGPIOListener(mOnGPIOListenerImpl);
- }
- setResult(response, DConnectMessage.RESULT_OK);
- break;
- case NOT_FOUND:
- MessageUtils.setIllegalDeviceStateError(response, "Not register event.");
- break;
- default:
- MessageUtils.setUnknownError(response);
- break;
- }
- return true;
- }
- });
- }
-
- @Override
- public String getProfileName() {
- return "keyEvent";
- }
-
- /**
- * イベント登録が空か確認を行います.
- * @return イベント登録がされていない場合はtrue、それ以外はfalse
- */
- private boolean isEmptyEvent() {
- String serviceId = getService().getId();
-
- List events = EventManager.INSTANCE.getEventList(serviceId,
- "keyEvent", null, "onKeyChange");
- if (!events.isEmpty()) {
- return false;
- }
-
- events = EventManager.INSTANCE.getEventList(serviceId,
- "keyEvent", null, "onDown");
- if (!events.isEmpty()) {
- return false;
- }
-
- events = EventManager.INSTANCE.getEventList(serviceId,
- "keyEvent", null, "onUp");
-
- return events.isEmpty();
- }
-
- /**
- * KeyDownイベントを通知します.
- * @param pin Keyが押されたピン
- */
- private synchronized void notifyKeyDown(final FaBoShield.Pin pin) {
- String serviceId = getService().getId();
-
- {
- List events = EventManager.INSTANCE.getEventList(serviceId,
- "keyEvent", null, "onKeyChange");
- for (Event event : events) {
- Bundle keyEvent = new Bundle();
- keyEvent.putString("state", "down");
- keyEvent.putInt("id", pin.getPinNumber());
- keyEvent.putString("config", pin.getPinNames()[1]);
-
- Intent intent = EventManager.createEventMessage(event);
- intent.putExtra("keyevent", keyEvent);
- sendEvent(intent, event.getAccessToken());
- }
- }
-
- {
- List events = EventManager.INSTANCE.getEventList(serviceId,
- "keyEvent", null, "onDown");
- for (Event event : events) {
- Bundle keyEvent = new Bundle();
- keyEvent.putInt("id", pin.getPinNumber());
- keyEvent.putString("config", pin.getPinNames()[1]);
-
- Intent intent = EventManager.createEventMessage(event);
- intent.putExtra("keyevent", keyEvent);
- sendEvent(intent, event.getAccessToken());
- }
- }
- }
-
- /**
- * KeyUpイベントを通知します.
- * @param pin Keyが離されたピン
- */
- private synchronized void notifyKeyUp(final FaBoShield.Pin pin) {
- String serviceId = getService().getId();
- {
- List events = EventManager.INSTANCE.getEventList(serviceId,
- "keyEvent", null, "onKeyChange");
- for (Event event : events) {
- Bundle keyEvent = new Bundle();
- keyEvent.putString("state", "up");
- keyEvent.putInt("id", pin.getPinNumber());
- keyEvent.putString("config", pin.getPinNames()[1]);
-
- Intent intent = EventManager.createEventMessage(event);
- intent.putExtra("keyevent", keyEvent);
- sendEvent(intent, event.getAccessToken());
- }
- }
- {
- List events = EventManager.INSTANCE.getEventList(serviceId,
- "keyEvent", null, "onUp");
- for (Event event : events) {
- Bundle keyEvent = new Bundle();
- keyEvent.putInt("id", pin.getPinNumber());
- keyEvent.putString("config", pin.getPinNames()[1]);
-
- Intent intent = EventManager.createEventMessage(event);
- intent.putExtra("keyevent", keyEvent);
- sendEvent(intent, event.getAccessToken());
- }
- }
- }
-
- /**
- * GPIOの値変化の通知を受け取るリスナー.
- */
- private FaBoDeviceControl.OnGPIOListener mOnGPIOListenerImpl = new FaBoDeviceControl.OnGPIOListener() {
- @Override
- public void onAnalog() {
- for (FaBoShield.Pin pin : mPinList) {
- if (pin.getMode() == FaBoShield.Mode.ANALOG) {
- int oldValue = mValues.get(pin);
- int newValue = getFaBoDeviceControl().getAnalog(pin);
- if (oldValue < 10 && newValue > 1000) {
- notifyKeyDown(pin);
- } else if (oldValue > 1000 && newValue < 10) {
- notifyKeyUp(pin);
- }
- mValues.put(pin, newValue);
- }
- }
- }
-
- @Override
- public void onDigital() {
- for (FaBoShield.Pin pin : mPinList) {
- if (pin.getMode() != FaBoShield.Mode.ANALOG) {
- int oldValue = mValues.get(pin);
- int newValue = getFaBoDeviceControl().getDigital(pin).getValue();
- if (oldValue == 0 && newValue == 1) {
- notifyKeyDown(pin);
- } else if (oldValue == 1 && newValue == 0) {
- notifyKeyUp(pin);
- }
- mValues.put(pin, newValue);
- }
- }
- }
- };
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/GPIOLightProfile.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/GPIOLightProfile.java
deleted file mode 100644
index 2d3df91bd3..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/GPIOLightProfile.java
+++ /dev/null
@@ -1,249 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile;
-
-import android.content.Intent;
-import android.os.Bundle;
-
-import org.deviceconnect.android.deviceplugin.fabo.param.FaBoShield;
-import org.deviceconnect.android.message.MessageUtils;
-import org.deviceconnect.android.profile.api.DeleteApi;
-import org.deviceconnect.android.profile.api.GetApi;
-import org.deviceconnect.android.profile.api.PostApi;
-import org.deviceconnect.android.profile.api.PutApi;
-import org.deviceconnect.message.DConnectMessage;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * GPIO用のLightプロファイル.
- *
- * ID: #101
- */
-public class GPIOLightProfile extends BaseFaBoProfile {
-
- /**
- * ライト操作を行うピンのリスト.
- */
- private List mPinList;
-
- /**
- * ライトフラッシング管理マップ.
- */
- private final Map mFlashingMap = new HashMap<>();
-
- /**
- * コンストラクタ.
- * @param pinList ライトに対応するPinのリスト
- */
- public GPIOLightProfile(final List pinList) {
- mPinList = pinList;
-
- // GET /gotpai/light
- addApi(new GetApi() {
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- Bundle[] lightList = new Bundle[mPinList.size()];
- for (int i = 0; i < mPinList.size(); i++) {
- FaBoShield.Pin pin = mPinList.get(i);
- lightList[i] = new Bundle();
- lightList[i].putString("lightId", String.valueOf(pin.getPinNumber()));
- lightList[i].putString("name", pin.getPinNames()[1]);
- lightList[i].putBoolean("on", getFaBoDeviceControl().getDigital(pin) == FaBoShield.Level.HIGH);
- lightList[i].putString("config", "");
- }
- response.putExtra("lights", lightList);
- setResult(response, DConnectMessage.RESULT_OK);
- return true;
- }
- });
-
- // POST /gotpai/light
- addApi(new PostApi() {
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- return lightOn(request, response);
- }
- });
-
- // PUT /gotpai/light
- addApi(new PutApi() {
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- return lightOn(request, response);
- }
- });
-
- // DELETE /gotpai/light
- addApi(new DeleteApi() {
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- String lightId = request.getStringExtra("lightId");
-
- if (!getService().isOnline()) {
- MessageUtils.setIllegalDeviceStateError(response, "FaBo device is not connected.");
- } else if (mPinList.isEmpty()) {
- MessageUtils.setInvalidRequestParameterError(response, "Light does not exist.");
- } else {
- FaBoShield.Pin pin = findLight(lightId);
- if (pin != null) {
- sendLightOff(pin);
- setResult(response, DConnectMessage.RESULT_OK);
- } else {
- MessageUtils.setInvalidRequestParameterError(response, "Not found the light. lightId=" + lightId);
- }
- }
- return true;
- }
- });
- }
-
- @Override
- public String getProfileName() {
- return "light";
- }
-
- /**
- * LEDを点灯します.
- * @param request リクエスト
- * @param response レスポンス
- * @return 即座にレスポンスを返却するフラグ
- */
- private boolean lightOn(final Intent request, final Intent response) {
- String lightId = request.getStringExtra("lightId");
- Float brightness = parseFloat(request, "brightness");
-
- long[] flashing;
- try {
- flashing = getFlashing(request);
- } catch (Exception e) {
- MessageUtils.setInvalidRequestParameterError(response, "Format of flashing is invalid.");
- return true;
- }
-
- if (!getService().isOnline()) {
- MessageUtils.setIllegalDeviceStateError(response, "FaBo device is not connected.");
- } else if (mPinList.isEmpty()) {
- MessageUtils.setInvalidRequestParameterError(response, "Light does not exist.");
- } else {
- FaBoShield.Pin pin = findLight(lightId);
- if (pin != null) {
- if (flashing != null) {
- flashing(pin, flashing);
- } else {
- sendLightOn(pin);
- }
- setResult(response, DConnectMessage.RESULT_OK);
- } else {
- MessageUtils.setInvalidRequestParameterError(response, "Not found the light. lightId=" + lightId);
- }
- }
- return true;
- }
-
- /**
- * 点滅間隔を取得する.
- *
- * flashingが省略された場合にはnullを返却する。
- *
- * @param request リクエスト
- * @return 点滅間隔
- * @throws IllegalArgumentException flashingのフォーマットが不正な場合に発生
- */
- private static long[] getFlashing(final Intent request) {
- String flashing = request.getStringExtra("flashing");
- if (flashing == null) {
- return null;
- }
- if (flashing.length() == 0) {
- throw new IllegalArgumentException("flashing is invalid.");
- }
- String[] split = flashing.split(",");
- long[] list = new long[split.length];
- for (int i = 0; i < split.length; i++) {
- try {
- list[i] = Integer.parseInt(split[i]);
- if (list[i] <= 0) {
- throw new IllegalArgumentException("flashing is negative value.");
- }
- } catch (NumberFormatException e) {
- throw new IllegalArgumentException("flashing is invalid.");
- }
- }
- return list;
- }
-
- /**
- * 指定されたlightIdに対応するPinを取得します.
- *
- * 対応するPinが存在しない場合にはnullを返却します。
- *
- * @param lightId ライトID
- * @return 対応するPinのインスタンス
- */
- private FaBoShield.Pin findLight(final String lightId) {
- if (lightId == null) {
- return mPinList.get(0);
- }
- try {
- int id = Integer.parseInt(lightId);
- for (FaBoShield.Pin pin : mPinList) {
- if (id == pin.getPinNumber()) {
- return pin;
- }
- }
- return null;
- } catch (NumberFormatException e) {
- return null;
- }
- }
-
- /**
- * 指定されたPinのLEDを点滅させます.
- * @param pin ピン情報
- * @param flashing フラッシュ
- */
- private void flashing(final FaBoShield.Pin pin, final long[] flashing) {
- FlashingExecutor exe = mFlashingMap.get("" + pin.getPinNumber());
- if (exe == null) {
- exe = new FlashingExecutor();
- mFlashingMap.put("" + pin.getPinNumber(), exe);
- }
- exe.setLightControllable(new FlashingExecutor.LightControllable() {
- @Override
- public void changeLight(final boolean isOn, final FlashingExecutor.CompleteListener listener) {
- if (isOn) {
- sendLightOn(pin);
- } else {
- sendLightOff(pin);
- }
- listener.onComplete();
- }
- });
- exe.start(flashing);
- }
-
- /**
- * LEDを点灯します.
- * @param pin LEDが挿さっているピン
- */
- private void sendLightOn(final FaBoShield.Pin pin) {
- if (pin.getMode() != FaBoShield.Mode.GPIO_OUT) {
- getFaBoDeviceControl().setPinMode(pin, FaBoShield.Mode.GPIO_OUT);
- }
- getFaBoDeviceControl().writeDigital(pin, FaBoShield.Level.HIGH);
- }
-
- /**
- * LEDを消灯します.
- * @param pin LEDが挿さっているピン
- */
- private void sendLightOff(final FaBoShield.Pin pin) {
- if (pin.getMode() != FaBoShield.Mode.GPIO_OUT) {
- getFaBoDeviceControl().setPinMode(pin, FaBoShield.Mode.GPIO_OUT);
- }
- getFaBoDeviceControl().writeDigital(pin, FaBoShield.Level.LOW);
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/GPIOProximityProfile.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/GPIOProximityProfile.java
deleted file mode 100644
index cfadfe4c8f..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/GPIOProximityProfile.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile;
-
-import android.content.Intent;
-import android.os.Bundle;
-
-import org.deviceconnect.android.deviceplugin.fabo.device.FaBoDeviceControl;
-import org.deviceconnect.android.deviceplugin.fabo.param.FaBoShield;
-import org.deviceconnect.android.event.Event;
-import org.deviceconnect.android.event.EventError;
-import org.deviceconnect.android.event.EventManager;
-import org.deviceconnect.android.message.MessageUtils;
-import org.deviceconnect.android.profile.api.DeleteApi;
-import org.deviceconnect.android.profile.api.GetApi;
-import org.deviceconnect.android.profile.api.PutApi;
-import org.deviceconnect.message.DConnectMessage;
-
-import java.util.List;
-
-import static org.deviceconnect.android.event.EventManager.INSTANCE;
-
-/**
- * GPIO用のProximityプロファイル.
- *
- * 以下のFaBoのBrickに対応します。
- */
-public class GPIOProximityProfile extends BaseFaBoProfile {
- /**
- * Proximity操作を行うピンのリスト.
- */
- private List mPinList;
-
- /**
- * コンストラクタ.
- * @param pinList 操作を行うピンのリスト
- */
- public GPIOProximityProfile(final List pinList) {
- mPinList = pinList;
-
- // GET /gotapi/proximity/onDeviceProximity
- addApi(new GetApi() {
- @Override
- public String getAttribute() {
- return "onDeviceProximity";
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- FaBoShield.Pin pin = mPinList.get(0);
-
- int value = getFaBoDeviceControl().getAnalog(pin);
- value = calcArduinoMap(value, 0, 1023, 0, 5000);
- value = calcArduinoMap(value, 3200, 500, 5, 80);
-
- response.putExtra("proximity", createProximity(value));
- setResult(response, DConnectMessage.RESULT_OK);
- return true;
- }
- });
-
- // PUT /gotapi/proximity/onDeviceProximity
- addApi(new PutApi() {
- @Override
- public String getAttribute() {
- return "onDeviceProximity";
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- EventError error = INSTANCE.addEvent(request);
- switch (error) {
- case NONE:
- getFaBoDeviceControl().addOnGPIOListener(mOnGPIOListenerImpl);
- setResult(response, DConnectMessage.RESULT_OK);
- break;
- default:
- MessageUtils.setUnknownError(response);
- break;
- }
- return true;
- }
- });
-
- // DELETE /gotapi/proximity/onDeviceProximity
- addApi(new DeleteApi() {
- @Override
- public String getAttribute() {
- return "onDeviceProximity";
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- EventError error = INSTANCE.removeEvent(request);
- switch (error) {
- case NONE:
- if (isEmptyEvent()) {
- getFaBoDeviceControl().removeOnGPIOListener(mOnGPIOListenerImpl);
- }
- setResult(response, DConnectMessage.RESULT_OK);
- break;
- case NOT_FOUND:
- MessageUtils.setIllegalDeviceStateError(response, "Not register event.");
- break;
- default:
- MessageUtils.setUnknownError(response);
- break;
- }
- return true;
- }
- });
- }
-
- @Override
- public String getProfileName() {
- return "proximity";
- }
-
- /**
- * 登録されているイベントが空か確認します.
- * @return イベントが登録されていない場合はtrue、それ以外はfalse
- */
- private boolean isEmptyEvent() {
- String serviceId = getService().getId();
- List events = EventManager.INSTANCE.getEventList(serviceId,
- "proximity", null, "onDeviceProximity");
- return events.isEmpty();
- }
-
- /**
- * Proximityのオブジェクトを作成します.
- * @param value 距離
- * @return Proximityのオブジェクト
- */
- private Bundle createProximity(final int value) {
- Bundle proximity = new Bundle();
- proximity.putInt("min", 10);
- proximity.putInt("max", 80);
- proximity.putInt("value", value);
- return proximity;
- }
-
- /**
- * Arduinoから渡されてきた値をProximityとして通知します.
- * @param pin 値が渡されてきたピン
- */
- private void notifyProximity(final FaBoShield.Pin pin) {
- String serviceId = getService().getId();
-
- int value = getFaBoDeviceControl().getAnalog(pin);
- value = calcArduinoMap(value, 0, 1023, 0, 5000);
- value = calcArduinoMap(value, 3200, 500, 5, 80);
-
- // この範囲以外はデータおかしいので弾く
- if (value < 10 || value > 80) {
- return;
- }
-
- List events = EventManager.INSTANCE.getEventList(serviceId,
- "proximity", null, "onDeviceProximity");
- for (Event event : events) {
- Intent intent = EventManager.createEventMessage(event);
- intent.putExtra("proximity", createProximity(value));
- sendEvent(intent, event.getAccessToken());
- }
- }
-
- /**
- * GPIOの値変化の通知を受け取るリスナー.
- */
- private FaBoDeviceControl.OnGPIOListener mOnGPIOListenerImpl = new FaBoDeviceControl.OnGPIOListener() {
- @Override
- public void onAnalog() {
- for (FaBoShield.Pin pin : mPinList) {
- notifyProximity(pin);
- }
- }
-
- @Override
- public void onDigital() {
- }
- };
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/GPIOTemperatureProfile.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/GPIOTemperatureProfile.java
deleted file mode 100644
index cb4f31c97b..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/GPIOTemperatureProfile.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile;
-
-import android.content.Intent;
-
-import org.deviceconnect.android.deviceplugin.fabo.param.FaBoShield;
-import org.deviceconnect.android.message.MessageUtils;
-import org.deviceconnect.android.profile.api.GetApi;
-import org.deviceconnect.message.DConnectMessage;
-
-import java.util.List;
-
-/**
- * GPIO用のTemperatureプロファイル.
- *
- * 以下のFaBoのBrickに対応します。
- */
-public class GPIOTemperatureProfile extends BaseFaBoProfile {
- /**
- * Temperatureを取得するピン.
- */
- private List mPinList;
-
- /**
- * コンストラクタ.
- * @param pinList 操作を行うピンのリスト
- */
- public GPIOTemperatureProfile(final List pinList) {
- mPinList = pinList;
-
- // GET /gotpai/temperature
- addApi(new GetApi() {
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- final Integer type = parseInteger(request, "type");
-
- if (!getService().isOnline()) {
- MessageUtils.setIllegalDeviceStateError(response, "FaBo device is not connected.");
- } else {
- FaBoShield.Pin pin = mPinList.get(0);
-
- int value = getFaBoDeviceControl().getAnalog(pin);
- value = calcArduinoMap(value, 0, 1023, 0, 5000);
- value = calcArduinoMap(value, 300, 1600, -30, 100);
- value = Math.round(value * 10) / 10;
-
- if (type == null || type == 1) {
- response.putExtra("temperature", value);
- } else {
- response.putExtra("temperature", convertC2F(value));
- }
-
- setResult(response, DConnectMessage.RESULT_OK);
- }
- return true;
- }
- });
- }
-
- @Override
- public String getProfileName() {
- return "temperature";
- }
-
- /**
- * 摂氏を華氏に変換します.
- * @param temp 摂氏
- * @return 華氏
- */
- private double convertC2F(double temp) {
- return temp * 1.8 + 32;
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/GPIOVibrationProfile.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/GPIOVibrationProfile.java
deleted file mode 100644
index ab9c8bdf74..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/GPIOVibrationProfile.java
+++ /dev/null
@@ -1,217 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile;
-
-import android.content.Intent;
-
-import org.deviceconnect.android.deviceplugin.fabo.param.FaBoShield;
-import org.deviceconnect.android.message.MessageUtils;
-import org.deviceconnect.android.profile.api.DeleteApi;
-import org.deviceconnect.android.profile.api.PutApi;
-import org.deviceconnect.message.DConnectMessage;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * GPIO用のVibrationプロファイル.
- *
- * 以下のFaBoのBrickに対応します。
- */
-public class GPIOVibrationProfile extends BaseFaBoProfile {
-
- /**
- * 振動パターンで使われる区切り文字.
- *
- */
- private static final String VIBRATION_PATTERN_DELIM = ",";
-
- /**
- * バイブレーションに接続されているピンのリスト.
- */
- private List mPinList;
-
- /**
- * ライトフラッシング管理マップ.
- */
- private FlashingExecutor mFlashingExecutor;
-
- /**
- * コンストラクタ.
- * @param pinList 操作を行うピンのリスト
- */
- public GPIOVibrationProfile(final List pinList) {
- mPinList = pinList;
-
- // PUT /gotapi/vibration/vibrate
- addApi(new PutApi() {
- @Override
- public String getAttribute() {
- return "vibrate";
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- final long[] pattern = parsePattern(request);
-
- if (!getService().isOnline()) {
- MessageUtils.setIllegalDeviceStateError(response, "FaBo device is not connected.");
- } else if (mPinList.isEmpty()) {
- MessageUtils.setInvalidRequestParameterError(response, "Vibration does not exist.");
- } else {
- if (pattern != null) {
- flashing(pattern);
- } else {
- for (FaBoShield.Pin pin : mPinList) {
- sendVibrateOn(pin);
- }
- }
- setResult(response, DConnectMessage.RESULT_OK);
- }
- return true;
- }
- });
-
-
- // DELETE /gotapi/vibration/vibrate
- addApi(new DeleteApi() {
- @Override
- public String getAttribute() {
- return "vibrate";
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- if (!getService().isOnline()) {
- MessageUtils.setIllegalDeviceStateError(response, "FaBo device is not connected.");
- } else if (mPinList.isEmpty()) {
- MessageUtils.setInvalidRequestParameterError(response, "Vibration does not exist.");
- } else {
- for (FaBoShield.Pin pin : mPinList) {
- sendVibrateOff(pin);
- }
- setResult(response, DConnectMessage.RESULT_OK);
- }
- return true;
- }
- });
- }
-
- @Override
- public String getProfileName() {
- return "vibration";
- }
-
- /**
- * 鳴動パターンを文字列から解析し、数値の配列に変換する. values = new ArrayList();
- for (String time : times) {
- try {
- String valueStr = time.trim();
- if (valueStr.length() == 0) {
- if (values.size() != times.length - 1) {
- // 数値の間にスペースがある場合はフォーマットエラー
- // ex. 100, , 100
- values.clear();
- }
- break;
- }
- long value = Long.parseLong(time.trim());
- if (value < 0) {
- // 数値が負の値の場合はフォーマットエラー
- values.clear();
- break;
- }
- values.add(value);
- } catch (NumberFormatException e) {
- values.clear();
- mLogger.warning("Exception in the VibrationProfile#parsePattern() method. " + e.toString());
- break;
- }
- }
-
- if (values.size() != 0) {
- result = new long[values.size()];
- for (int i = 0; i < values.size(); i++) {
- result[i] = values.get(i);
- }
- }
- } else {
- try {
- long time = Long.parseLong(pattern);
- if (time >= 0) {
- result = new long[] {time};
- }
- } catch (NumberFormatException e) {
- mLogger.warning("Exception in the VibrationProfile#parsePattern() method. " + e.toString());
- }
- }
-
- return result;
- }
-
- /**
- * 指定されたPinのLEDを点滅させます.
- * @param flashing フラッシュ
- */
- private void flashing(final long[] flashing) {
- if (mFlashingExecutor == null) {
- mFlashingExecutor = new FlashingExecutor();
- }
- mFlashingExecutor.setLightControllable(new FlashingExecutor.LightControllable() {
- @Override
- public void changeLight(final boolean isOn, final FlashingExecutor.CompleteListener listener) {
- if (isOn) {
- for (FaBoShield.Pin pin : mPinList) {
- sendVibrateOn(pin);
- }
- } else {
- for (FaBoShield.Pin pin : mPinList) {
- sendVibrateOff(pin);
- }
- }
- listener.onComplete();
- }
- });
- mFlashingExecutor.start(flashing);
- }
-
- /**
- * Vibratorを振動させます.
- * @param pin Vibratorが挿さっているピン
- */
- private void sendVibrateOn(final FaBoShield.Pin pin) {
- if (pin.getMode() != FaBoShield.Mode.GPIO_OUT) {
- getFaBoDeviceControl().setPinMode(pin, FaBoShield.Mode.GPIO_OUT);
- }
- getFaBoDeviceControl().writeDigital(pin, FaBoShield.Level.HIGH);
- }
-
- /**
- * Vibratorの振動を止めます.
- * @param pin Vibratorが挿さっているピン
- */
- private void sendVibrateOff(final FaBoShield.Pin pin) {
- if (pin.getMode() != FaBoShield.Mode.GPIO_OUT) {
- getFaBoDeviceControl().setPinMode(pin, FaBoShield.Mode.GPIO_OUT);
- }
- getFaBoDeviceControl().writeDigital(pin, FaBoShield.Level.LOW);
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2C3AxisDeviceOrientationProfile.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2C3AxisDeviceOrientationProfile.java
deleted file mode 100644
index 2743c4443c..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2C3AxisDeviceOrientationProfile.java
+++ /dev/null
@@ -1,238 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile;
-
-import android.content.Intent;
-import android.os.Bundle;
-
-import org.deviceconnect.android.deviceplugin.fabo.device.IADXL345;
-import org.deviceconnect.android.event.Event;
-import org.deviceconnect.android.event.EventError;
-import org.deviceconnect.android.event.EventManager;
-import org.deviceconnect.android.message.MessageUtils;
-import org.deviceconnect.android.profile.api.DeleteApi;
-import org.deviceconnect.android.profile.api.GetApi;
-import org.deviceconnect.android.profile.api.PutApi;
-import org.deviceconnect.message.DConnectMessage;
-
-import java.util.List;
-
-/**
- * I2C用加速度センサープロファイル.
- *
- * 以下のFaBoのBrickに対応します。
- */
-public class I2C3AxisDeviceOrientationProfile extends BaseFaBoProfile {
-
- /**
- * イベントを送信するためのインターバル.
- */
- private long mInterval = 100;
-
- /**
- * 前回送信したイベントの時間.
- */
- private long mSendTime;
-
- /**
- * ADXL345からのデータを受け取るためのリスナー.
- */
- private IADXL345.OnADXL345Listener mOnADXL345Listener;
-
- public I2C3AxisDeviceOrientationProfile() {
- // GET /gotapi/deviceOrientation/onDeviceOrientation
- addApi(new GetApi() {
- @Override
- public String getAttribute() {
- return "onDeviceOrientation";
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- if (!getService().isOnline()) {
- MessageUtils.setIllegalDeviceStateError(response, "FaBo device is not connected.");
- } else {
- IADXL345 adxl345 = getFaBoDeviceControl().getADXL345();
- if (adxl345 != null) {
- adxl345.read(new IADXL345.OnADXL345Listener() {
- @Override
- public void onStarted() {
- }
-
- @Override
- public void onData(final double x, final double y, final double z) {
- response.putExtra("orientation", createOrientation(x, y, z));
- setResult(response, DConnectMessage.RESULT_OK);
- sendResponse(response);
- }
-
- @Override
- public void onError(final String message) {
- MessageUtils.setIllegalDeviceStateError(response, message);
- sendResponse(response);
- }
- });
- }
- }
- return false;
- }
- });
-
- // PUT /gotapi/deviceOrientation/onDeviceOrientation
- addApi(new PutApi() {
- @Override
- public String getAttribute() {
- return "onDeviceOrientation";
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- final IADXL345 adxl345 = getFaBoDeviceControl().getADXL345();
- if (!getService().isOnline()) {
- MessageUtils.setIllegalDeviceStateError(response, "FaBo device is not connected.");
- } else if (adxl345 == null) {
- MessageUtils.setNotSupportAttributeError(response, "Not support.");
- } else {
- Long interval = parseLong(request, "interval");
- if (interval != null) {
- mInterval = interval;
- } else {
- mInterval = 100;
- }
-
- boolean empty = isEmptyEvent();
-
- EventError error = EventManager.INSTANCE.addEvent(request);
- switch (error) {
- case NONE:
- if (empty) {
- mOnADXL345Listener = new IADXL345.OnADXL345Listener() {
- @Override
- public void onStarted() {
- setResult(response, DConnectMessage.RESULT_OK);
- sendResponse(response);
- }
-
- @Override
- public void onError(final String message) {
- MessageUtils.setIllegalDeviceStateError(response, message);
- sendResponse(response);
- EventManager.INSTANCE.removeEvent(request);
- adxl345.stopRead(mOnADXL345Listener);
- }
-
- @Override
- public void onData(final double x, final double y, final double z) {
- notifySensorEvent(x, y, z);
- }
- };
- adxl345.startRead(mOnADXL345Listener);
- return false;
- }
- setResult(response, DConnectMessage.RESULT_OK);
- break;
- default:
- MessageUtils.setUnknownError(response);
- break;
- }
- }
- return true;
- }
- });
-
- // DELETE /gotapi/deviceOrientation/onDeviceOrientation
- addApi(new DeleteApi() {
- @Override
- public String getAttribute() {
- return "onDeviceOrientation";
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- IADXL345 adxl345 = getFaBoDeviceControl().getADXL345();
- if (adxl345 == null) {
- MessageUtils.setNotSupportProfileError(response, "Not support");
- } else {
- EventError error = EventManager.INSTANCE.removeEvent(request);
- switch (error) {
- case NONE:
- if (isEmptyEvent()) {
- adxl345.stopRead(mOnADXL345Listener);
- }
- setResult(response, DConnectMessage.RESULT_OK);
- break;
- case NOT_FOUND:
- MessageUtils.setIllegalDeviceStateError(response, "Not register event.");
- break;
- default:
- MessageUtils.setUnknownError(response);
- break;
- }
- }
- return true;
- }
- });
- }
-
- @Override
- public String getProfileName() {
- return "deviceOrientation";
- }
-
- /**
- * イベント登録が空か確認を行う.
- * @return イベントが空の場合はtrue、それ以外はfalse
- */
- private boolean isEmptyEvent() {
- String serviceId = getService().getId();
- List events = EventManager.INSTANCE.getEventList(serviceId,
- "deviceOrientation", null, "onDeviceOrientation");
- return events.isEmpty();
- }
-
- /**
- * Orientationオブジェクトを作成します.
- * @param x x軸への加速度
- * @param y y軸への加速度
- * @param z z¥軸への加速度
- * @return Orientationオブジェクト
- */
- private Bundle createOrientation(final double x, final double y, final double z) {
- Bundle accelerationIncludingGravity = new Bundle();
- accelerationIncludingGravity.putDouble("x", x);
- accelerationIncludingGravity.putDouble("y", y);
- accelerationIncludingGravity.putDouble("z", z);
-
- Bundle orientation = new Bundle();
- orientation.putParcelable("accelerationIncludingGravity",
- accelerationIncludingGravity);
- return orientation;
- }
-
- /**
- * 加速度センサーの値を通知します.
- * @param x x軸への加速度
- * @param y y軸への加速度
- * @param z z¥軸への加速度
- */
- private void notifySensorEvent(final double x, final double y, final double z) {
- long interval = (System.currentTimeMillis() - mSendTime);
- if (interval >= mInterval) {
- String serviceId = getService().getId();
- List events = EventManager.INSTANCE.getEventList(serviceId,
- "deviceOrientation", null, "onDeviceOrientation");
-
- for (Event event : events) {
- Bundle orientation = createOrientation(x, y, z);
- orientation.putLong("interval", interval);
-
- Intent intent = EventManager.createEventMessage(event);
- intent.putExtra("orientation", orientation);
- sendEvent(intent, event.getAccessToken());
- }
-
- mSendTime = System.currentTimeMillis();
- }
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2C9AxisDeviceOrientationProfile.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2C9AxisDeviceOrientationProfile.java
deleted file mode 100644
index 0139fef102..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2C9AxisDeviceOrientationProfile.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile;
-
-import android.content.Intent;
-
-import org.deviceconnect.android.message.MessageUtils;
-import org.deviceconnect.android.profile.api.DeleteApi;
-import org.deviceconnect.android.profile.api.GetApi;
-import org.deviceconnect.android.profile.api.PutApi;
-
-/**
- * I2C用加速度センサープロファイル.
- *
- * 以下のFaBoのBrickに対応します。
- */
-public class I2C9AxisDeviceOrientationProfile extends BaseFaBoProfile {
-
- public I2C9AxisDeviceOrientationProfile() {
- // GET /gotapi/deviceOrientation/onDeviceOrientation
- addApi(new GetApi() {
- @Override
- public String getAttribute() {
- return "onDeviceOrientation";
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- MessageUtils.setNotSupportProfileError(response, "Not implements yet.");
- return true;
- }
- });
-
- // PUT /gotapi/deviceOrientation/onDeviceOrientation
- addApi(new PutApi() {
- @Override
- public String getAttribute() {
- return "onDeviceOrientation";
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- MessageUtils.setNotSupportProfileError(response, "Not implements yet.");
- return true;
- }
- });
-
- // DELETE /gotapi/deviceOrientation/onDeviceOrientation
- addApi(new DeleteApi() {
- @Override
- public String getAttribute() {
- return "onDeviceOrientation";
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- MessageUtils.setNotSupportProfileError(response, "Not implements yet.");
- return true;
- }
- });
- }
-
- @Override
- public String getProfileName() {
- return "deviceOrientation";
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2CAtmosphericPressureProfile.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2CAtmosphericPressureProfile.java
deleted file mode 100644
index 4bc929feaf..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2CAtmosphericPressureProfile.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile;
-
-import android.content.Intent;
-
-import org.deviceconnect.android.deviceplugin.fabo.device.IMPL115;
-import org.deviceconnect.android.message.MessageUtils;
-import org.deviceconnect.android.profile.api.GetApi;
-import org.deviceconnect.message.DConnectMessage;
-
-/**
- * I2C用気圧センサープロファイル.
- *
- * 以下のFaBoのBrickに対応します。
- */
-public class I2CAtmosphericPressureProfile extends BaseFaBoProfile {
- public I2CAtmosphericPressureProfile() {
- addApi(new GetApi() {
- @Override
- public boolean onRequest(Intent request, final Intent response) {
- IMPL115 mpl115 = getFaBoDeviceControl().getMPL115();
- if (!getService().isOnline()) {
- MessageUtils.setIllegalDeviceStateError(response, "FaBo device is not connected.");
- } else if (mpl115 == null) {
- MessageUtils.setNotSupportAttributeError(response, "Not support.");
- } else {
- mpl115.readAtmosphericPressure(new IMPL115.OnAtmosphericPressureListener() {
- @Override
- public void onData(double hpa, double temperature) {
- response.putExtra("atmosphericPressure", hpa);
- setResult(response, DConnectMessage.RESULT_OK);
- sendResponse(response);
- }
-
- @Override
- public void onError(String message) {
- MessageUtils.setIllegalDeviceStateError(response, message);
- sendResponse(response);
- }
- });
- return false;
- }
- return true;
- }
- });
- }
- @Override
- public String getProfileName() {
- return "atmosphericPressure";
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2CBarLightProfile.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2CBarLightProfile.java
deleted file mode 100644
index dff95c8dcc..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2CBarLightProfile.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile;
-
-/**
- * I2C用Lightプロファイル.
- *
- * ID: #403
- */
-public class I2CBarLightProfile extends BaseFaBoProfile {
- @Override
- public String getProfileName() {
- return "light";
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2CHumidityProfile.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2CHumidityProfile.java
deleted file mode 100644
index bdce8a99a2..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2CHumidityProfile.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile;
-
-import android.content.Intent;
-
-import org.deviceconnect.android.deviceplugin.fabo.device.IHTS221;
-import org.deviceconnect.android.message.MessageUtils;
-import org.deviceconnect.android.profile.api.GetApi;
-import org.deviceconnect.message.DConnectMessage;
-
-/**
- * I2C用Humidityプロファイル.
- *
- * ID: #208
- */
-public class I2CHumidityProfile extends BaseFaBoProfile {
-
- public I2CHumidityProfile() {
- // GET /gotapi/humidity
- addApi(new GetApi() {
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- IHTS221 hts221 = getFaBoDeviceControl().getHTS221();
- if (!getService().isOnline()) {
- MessageUtils.setIllegalDeviceStateError(response, "FaBo device is not connected.");
- } else if (hts221 == null) {
- MessageUtils.setNotSupportAttributeError(response, "Not support");
- } else {
- hts221.readHumidity(new IHTS221.OnHumidityCallback() {
- @Override
- public void onHumidity(final double humidity) {
- response.putExtra("humidity", humidity / 100.0);
- setResult(response, DConnectMessage.RESULT_OK);
- sendResponse(response);
- }
-
- @Override
- public void onError(final String message) {
- MessageUtils.setIllegalDeviceStateError(response, message);
- sendResponse(response);
- }
- });
- return false;
- }
- return true;
- }
- });
- }
-
- @Override
- public String getProfileName() {
- return "humidity";
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2CIlluminanceProfile.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2CIlluminanceProfile.java
deleted file mode 100644
index 78fa884c59..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2CIlluminanceProfile.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile;
-
-import android.content.Intent;
-
-import org.deviceconnect.android.deviceplugin.fabo.device.IISL29034;
-import org.deviceconnect.android.message.MessageUtils;
-import org.deviceconnect.android.profile.api.GetApi;
-import org.deviceconnect.message.DConnectMessage;
-
-/**
- * I2C用Illuminaceプロファイル.
- *
- * ID #217
- */
-public class I2CIlluminanceProfile extends BaseFaBoProfile {
-
- public I2CIlluminanceProfile() {
- // GET /gotpai/illuminance
- addApi(new GetApi() {
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- IISL29034 isl29034 = getFaBoDeviceControl().getISL29034();
- if (!getService().isOnline()) {
- MessageUtils.setIllegalDeviceStateError(response, "FaBo device is not connected.");
- } else if (isl29034 == null) {
- MessageUtils.setNotSupportAttributeError(response, "Not support.");
- } else {
- isl29034.read(new IISL29034.OnAmbientLightListener() {
- @Override
- public void onStarted() {
- }
-
- @Override
- public void onData(double lux) {
- response.putExtra("illuminance", lux);
- setResult(response, DConnectMessage.RESULT_OK);
- sendResponse(response);
- }
-
- @Override
- public void onError(String message) {
- MessageUtils.setIllegalDeviceStateError(response, message);
- sendResponse(response);
- }
- });
- return false;
- }
- return true;
- }
- });
- }
-
- @Override
- public String getProfileName() {
- return "illuminance";
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2CLIDARLiteProximityProfile.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2CLIDARLiteProximityProfile.java
deleted file mode 100644
index 6d63a3b48a..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2CLIDARLiteProximityProfile.java
+++ /dev/null
@@ -1,194 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile;
-
-import android.content.Intent;
-import android.os.Bundle;
-
-import org.deviceconnect.android.deviceplugin.fabo.device.ILIDARLiteV3;
-import org.deviceconnect.android.event.Event;
-import org.deviceconnect.android.event.EventError;
-import org.deviceconnect.android.event.EventManager;
-import org.deviceconnect.android.message.MessageUtils;
-import org.deviceconnect.android.profile.api.DeleteApi;
-import org.deviceconnect.android.profile.api.GetApi;
-import org.deviceconnect.android.profile.api.PutApi;
-import org.deviceconnect.message.DConnectMessage;
-
-import java.util.List;
-
-import static org.deviceconnect.android.event.EventManager.INSTANCE;
-
-public class I2CLIDARLiteProximityProfile extends BaseFaBoProfile {
- private ILIDARLiteV3.OnLIDARLiteListener mOnLIDARLiteListener;
-
- public I2CLIDARLiteProximityProfile() {
- // GET /gotapi/proximity/onUserProximity
- addApi(new GetApi() {
- @Override
- public String getAttribute() {
- return "onDeviceProximity";
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- ILIDARLiteV3 lidarLite = getFaBoDeviceControl().getLIDARLite();
- if (!getService().isOnline()) {
- MessageUtils.setIllegalDeviceStateError(response, "FaBo device is not connected.");
- } else if (lidarLite == null) {
- MessageUtils.setNotSupportAttributeError(response, "Not support.");
- } else {
- lidarLite.read(new ILIDARLiteV3.OnLIDARLiteListener() {
- @Override
- public void onStarted() {
- }
-
- @Override
- public void onData(final int distance) {
- response.putExtra("proximity", createProximity(distance));
- setResult(response, DConnectMessage.RESULT_OK);
- sendResponse(response);
- }
-
- @Override
- public void onError(final String message) {
- MessageUtils.setIllegalDeviceStateError(response, message);
- sendResponse(response);
- }
- });
- }
- return false;
- }
- });
-
-
- // PUT /gotapi/proximity/onUserProximity
- addApi(new PutApi() {
- @Override
- public String getAttribute() {
- return "onDeviceProximity";
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- final ILIDARLiteV3 lidarLite = getFaBoDeviceControl().getLIDARLite();
- if (!getService().isOnline()) {
- MessageUtils.setIllegalDeviceStateError(response, "FaBo device is not connected.");
- } else if (lidarLite == null) {
- MessageUtils.setNotSupportAttributeError(response, "Not support.");
- } else {
- boolean empty = isEmptyEvent();
- EventError error = INSTANCE.addEvent(request);
- switch (error) {
- case NONE:
- if (empty) {
- mOnLIDARLiteListener = new ILIDARLiteV3.OnLIDARLiteListener() {
- @Override
- public void onStarted() {
- setResult(response, DConnectMessage.RESULT_OK);
- sendResponse(response);
- }
-
- @Override
- public void onData(final int proximity) {
- notifyProximity(proximity);
- }
-
- @Override
- public void onError(final String message) {
- MessageUtils.setIllegalDeviceStateError(response, message);
- sendResponse(response);
- INSTANCE.removeEvent(request);
- lidarLite.stopRead(this);
-
- }
- };
- lidarLite.startRead(mOnLIDARLiteListener);
- return false;
- }
- setResult(response, DConnectMessage.RESULT_OK);
- break;
- default:
- MessageUtils.setUnknownError(response);
- break;
- }
- }
- return true;
- }
- });
-
- // DELETE /gotapi/proximity/onUserProximity
- addApi(new DeleteApi() {
- @Override
- public String getAttribute() {
- return "onDeviceProximity";
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- final ILIDARLiteV3 lidarLite = getFaBoDeviceControl().getLIDARLite();
- if (lidarLite == null) {
- MessageUtils.setNotSupportAttributeError(response, "Not support.");
- } else {
- EventError error = INSTANCE.removeEvent(request);
- switch (error) {
- case NONE:
- if (isEmptyEvent() && mOnLIDARLiteListener != null) {
- lidarLite.stopRead(mOnLIDARLiteListener);
- }
- setResult(response, DConnectMessage.RESULT_OK);
- break;
- case NOT_FOUND:
- MessageUtils.setIllegalDeviceStateError(response, "Not register event.");
- break;
- default:
- MessageUtils.setUnknownError(response);
- break;
- }
- }
- return true;
- }
- });
- }
-
- @Override
- public String getProfileName() {
- return "proximity";
- }
-
-
- /**
- * 登録されているイベントが空か確認します.
- * @return イベントが登録されていない場合はtrue、それ以外はfalse
- */
- private boolean isEmptyEvent() {
- String serviceId = getService().getId();
- List events = EventManager.INSTANCE.getEventList(serviceId,
- "proximity", null, "onDeviceProximity");
- return events.isEmpty();
- }
-
- /**
- * Proximityのオブジェクトを作成します.
- * @param value 距離
- * @return Proximityのオブジェクト
- */
- private Bundle createProximity(final int value) {
- Bundle proximity = new Bundle();
- proximity.putInt("value", value);
- return proximity;
- }
-
- /**
- * Arduinoから渡されてきた値をProximityとして通知します.
- * @param value 値が渡されてきたピン
- */
- private void notifyProximity(final int value) {
- String serviceId = getService().getId();
- List events = EventManager.INSTANCE.getEventList(serviceId,
- "proximity", null, "onDeviceProximity");
- for (Event event : events) {
- Intent intent = EventManager.createEventMessage(event);
- intent.putExtra("proximity", createProximity(value));
- sendEvent(intent, event.getAccessToken());
- }
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2CMatrixLightProfile.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2CMatrixLightProfile.java
deleted file mode 100644
index 30504d0515..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2CMatrixLightProfile.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile;
-
-/**
- * I2C用Lightプロファイル.
- *
- * ID: #404
- */
-public class I2CMatrixLightProfile extends BaseFaBoProfile {
- @Override
- public String getProfileName() {
- return "light";
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2CMouseCarDriveControllerProfile.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2CMouseCarDriveControllerProfile.java
deleted file mode 100644
index 0c41fd9fb4..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2CMouseCarDriveControllerProfile.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile;
-
-import android.content.Intent;
-
-import org.deviceconnect.android.deviceplugin.fabo.device.FaBoDeviceControl;
-import org.deviceconnect.android.deviceplugin.fabo.device.IMouseCar;
-import org.deviceconnect.android.message.MessageUtils;
-import org.deviceconnect.android.profile.api.DeleteApi;
-import org.deviceconnect.android.profile.api.PostApi;
-import org.deviceconnect.android.profile.api.PutApi;
-import org.deviceconnect.message.DConnectMessage;
-
-/**
- * RobotCar (Mouseタイプ)を操作するためのDriveControllerプロファイル.
- *
- * ID: #1201
- */
-public class I2CMouseCarDriveControllerProfile extends BaseFaBoProfile {
-
- /**
- * RobotCarの向きを保持します.
- *
- * この角度でRobotCarが回転します。
- *
- */
- private float mAngle = 0;
-
- /**
- * RobotCarの速度を保持します.
- */
- private float mSpeed = 0;
-
- /**
- * コンストラクタ.
- */
- public I2CMouseCarDriveControllerProfile() {
- // PUT /driveController/rotate
- addApi(new PutApi() {
- @Override
- public String getAttribute() {
- return "rotate";
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- Float angle = parseFloat(request, "angle");
-
- if (angle != null) {
- mAngle = angle;
- }
-
- FaBoDeviceControl mgr = getFaBoDeviceControl();
- if (!getService().isOnline() || mgr == null) {
- MessageUtils.setIllegalDeviceStateError(response);
- return true;
- }
-
- // 速度が入っている場合には動作しているの移動する
- if (mSpeed != 0) {
- moveRobotCar();
- }
-
- setResult(response, DConnectMessage.RESULT_OK);
- return true;
- }
- });
-
- // POST /driveController/move
- addApi(new PostApi() {
- @Override
- public String getAttribute() {
- return "move";
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- Float angle = parseFloat(request, "angle");
- Float speed = parseFloat(request, "speed");
-
- if (angle != null) {
- mAngle = angle;
- }
-
- if (speed != null) {
- mSpeed = speed;
- }
-
- FaBoDeviceControl mgr = getFaBoDeviceControl();
- if (!getService().isOnline() || mgr == null) {
- MessageUtils.setIllegalDeviceStateError(response);
- return true;
- }
-
- moveRobotCar();
-
- setResult(response, DConnectMessage.RESULT_OK);
- return true;
- }
- });
-
- // DELETE /driveController/stop
- addApi(new DeleteApi() {
- @Override
- public String getAttribute() {
- return "stop";
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
-
- // 停止したので速度を0にしておく
- mSpeed = 0;
-
- FaBoDeviceControl mgr = getFaBoDeviceControl();
- if (!getService().isOnline() || mgr == null) {
- MessageUtils.setIllegalDeviceStateError(response);
- return true;
- }
-
- IMouseCar mouseCar = mgr.getMouseCar();
- mouseCar.stop();
-
- setResult(response, DConnectMessage.RESULT_OK);
- return true;
- }
- });
- }
-
- @Override
- public String getProfileName() {
- return "driveController";
- }
-
- /**
- * RobotCar(Mouse)を移動させます.
- */
- private void moveRobotCar() {
- float speed_right;
- float speed_left;
- if (mAngle >= 0) {
- float gain = mAngle / 360.0f;
- speed_right = mSpeed;
- speed_left = mSpeed * (1 - gain);
- } else {
- float gain = -mAngle / 360.0f;
- speed_right = mSpeed * (1 - gain);
- speed_left = mSpeed;
- }
-
- FaBoDeviceControl mgr = getFaBoDeviceControl();
- IMouseCar mouseCar = mgr.getMouseCar();
- mouseCar.move(speed_right, speed_left);
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2COneLightProfile.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2COneLightProfile.java
deleted file mode 100644
index 0f3480fb77..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2COneLightProfile.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile;
-
-/**
- * I2C用Lightプロファイル.
- *
- * ID: #401
- */
-public class I2COneLightProfile extends BaseFaBoProfile {
- @Override
- public String getProfileName() {
- return "light";
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2CProximityProfile.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2CProximityProfile.java
deleted file mode 100644
index 9551c3f77d..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2CProximityProfile.java
+++ /dev/null
@@ -1,205 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile;
-
-import android.content.Intent;
-import android.os.Bundle;
-
-import org.deviceconnect.android.deviceplugin.fabo.device.IVCNL4010;
-import org.deviceconnect.android.event.Event;
-import org.deviceconnect.android.event.EventError;
-import org.deviceconnect.android.event.EventManager;
-import org.deviceconnect.android.message.MessageUtils;
-import org.deviceconnect.android.profile.api.DeleteApi;
-import org.deviceconnect.android.profile.api.GetApi;
-import org.deviceconnect.android.profile.api.PutApi;
-import org.deviceconnect.message.DConnectMessage;
-
-import java.util.List;
-
-import static org.deviceconnect.android.event.EventManager.INSTANCE;
-
-/**
- * I2C用Proximityプロファイル.
- *
- * ID: #205
- */
-public class I2CProximityProfile extends BaseFaBoProfile {
-
- /**
- * VCNL4010からの通知を受け取るリスナー.
- */
- private IVCNL4010.OnProximityListener mOnProximityListener;
-
- /**
- * コンストラクタ.
- */
- public I2CProximityProfile() {
- // GET /gotapi/proximity/onUserProximity
- addApi(new GetApi() {
- @Override
- public String getAttribute() {
- return "onUserProximity";
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- IVCNL4010 ivcnl4010 = getFaBoDeviceControl().getVCNL4010();
- if (!getService().isOnline()) {
- MessageUtils.setIllegalDeviceStateError(response, "FaBo device is not connected.");
- } else if (ivcnl4010 == null) {
- MessageUtils.setNotSupportAttributeError(response, "Not support.");
- } else {
- ivcnl4010.readProximity(new IVCNL4010.OnProximityListener() {
- @Override
- public void onStarted() {
- }
-
- @Override
- public void onData(final boolean proximity) {
- response.putExtra("proximity", createProximity(proximity));
- setResult(response, DConnectMessage.RESULT_OK);
- sendResponse(response);
- }
-
- @Override
- public void onError(String message) {
- MessageUtils.setIllegalDeviceStateError(response, message);
- sendResponse(response);
- }
- });
- }
- return false;
- }
- });
-
- // PUT /gotapi/proximity/onUserProximity
- addApi(new PutApi() {
- @Override
- public String getAttribute() {
- return "onUserProximity";
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- final IVCNL4010 ivcnl4010 = getFaBoDeviceControl().getVCNL4010();
- if (!getService().isOnline()) {
- MessageUtils.setIllegalDeviceStateError(response, "FaBo device is not connected.");
- } else if (ivcnl4010 == null) {
- MessageUtils.setNotSupportAttributeError(response, "Not support.");
- } else {
- boolean empty = isEmptyEvent();
- EventError error = INSTANCE.addEvent(request);
- switch (error) {
- case NONE:
- if (empty) {
- mOnProximityListener = new IVCNL4010.OnProximityListener() {
- @Override
- public void onStarted() {
- setResult(response, DConnectMessage.RESULT_OK);
- sendResponse(response);
- }
-
- @Override
- public void onData(final boolean proximity) {
- notifyProximity(proximity);
- }
-
- @Override
- public void onError(final String message) {
- MessageUtils.setIllegalDeviceStateError(response, message);
- sendResponse(response);
- EventManager.INSTANCE.removeEvent(request);
- ivcnl4010.stopProximity(mOnProximityListener);
-
- }
- };
- ivcnl4010.startProximity(mOnProximityListener);
- return false;
- }
- setResult(response, DConnectMessage.RESULT_OK);
- break;
- default:
- MessageUtils.setUnknownError(response);
- break;
- }
- }
- return true;
- }
- });
-
- // DELETE /gotapi/proximity/onUserProximity
- addApi(new DeleteApi() {
- @Override
- public String getAttribute() {
- return "onUserProximity";
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- IVCNL4010 ivcnl4010 = getFaBoDeviceControl().getVCNL4010();
- if (ivcnl4010 == null) {
- MessageUtils.setNotSupportAttributeError(response, "Not support.");
- } else {
- EventError error = INSTANCE.removeEvent(request);
- switch (error) {
- case NONE:
- if (isEmptyEvent() && mOnProximityListener != null) {
- ivcnl4010.stopProximity(mOnProximityListener);
- }
- setResult(response, DConnectMessage.RESULT_OK);
- break;
- case NOT_FOUND:
- MessageUtils.setIllegalDeviceStateError(response, "Not register event.");
- break;
- default:
- MessageUtils.setUnknownError(response);
- break;
- }
- }
- return true;
- }
- });
- }
- @Override
- public String getProfileName() {
- return "proximity";
- }
-
- /**
- * 登録されているイベントが空か確認します.
- * @return イベントが登録されていない場合はtrue、それ以外はfalse
- */
- private boolean isEmptyEvent() {
- String serviceId = getService().getId();
- List events = EventManager.INSTANCE.getEventList(serviceId,
- "proximity", null, "onUserProximity");
- return events.isEmpty();
- }
-
- /**
- * Proximityのオブジェクトを作成します.
- * @param value 距離
- * @return Proximityのオブジェクト
- */
- private Bundle createProximity(final boolean value) {
- Bundle proximity = new Bundle();
- proximity.putBoolean("near", value);
- return proximity;
- }
-
- /**
- * Arduinoから渡されてきた値をProximityとして通知します.
- * @param value 値が渡されてきたピン
- */
- private void notifyProximity(final boolean value) {
- String serviceId = getService().getId();
- List events = EventManager.INSTANCE.getEventList(serviceId,
- "proximity", null, "onUserProximity");
- for (Event event : events) {
- Intent intent = EventManager.createEventMessage(event);
- intent.putExtra("proximity", createProximity(value));
- sendEvent(intent, event.getAccessToken());
- }
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2CRingLightProfile.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2CRingLightProfile.java
deleted file mode 100644
index 4e1a45168a..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2CRingLightProfile.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile;
-
-/**
- * I2C用Lightプロファイル.
- *
- * ID: #402
- */
-public class I2CRingLightProfile extends BaseFaBoProfile {
- @Override
- public String getProfileName() {
- return "light";
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2CRobotCarDriveControllerProfile.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2CRobotCarDriveControllerProfile.java
deleted file mode 100644
index b4c7771f4b..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2CRobotCarDriveControllerProfile.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile;
-
-import android.content.Intent;
-
-import org.deviceconnect.android.deviceplugin.fabo.device.FaBoDeviceControl;
-import org.deviceconnect.android.deviceplugin.fabo.device.IRobotCar;
-import org.deviceconnect.android.message.MessageUtils;
-import org.deviceconnect.android.profile.api.DeleteApi;
-import org.deviceconnect.android.profile.api.PostApi;
-import org.deviceconnect.android.profile.api.PutApi;
-import org.deviceconnect.message.DConnectMessage;
-
-/**
- * RobotCar (Carタイプ)を操作するためのDriveControllerプロファイル.
- */
-public class I2CRobotCarDriveControllerProfile extends BaseFaBoProfile {
-
- /**
- * コンストラクタ.
- */
- public I2CRobotCarDriveControllerProfile() {
- // PUT /driveController/rotate
- addApi(new PutApi() {
- @Override
- public String getAttribute() {
- return "rotate";
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- Float angle = parseFloat(request, "angle");
-
- FaBoDeviceControl mgr = getFaBoDeviceControl();
- if (!getService().isOnline() || mgr == null) {
- MessageUtils.setIllegalDeviceStateError(response);
- return true;
- }
-
- IRobotCar robotCar = mgr.getRobotCar();
- if (angle != null) {
- robotCar.turnHandle(calcAngle(angle));
- }
-
- setResult(response, DConnectMessage.RESULT_OK);
- return true;
- }
- });
-
- // POST /driveController/move
- addApi(new PostApi() {
- @Override
- public String getAttribute() {
- return "move";
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- Float angle = parseFloat(request, "angle");
- Float speed = parseFloat(request, "speed");
-
- FaBoDeviceControl mgr = getFaBoDeviceControl();
- if (!getService().isOnline() || mgr == null) {
- MessageUtils.setIllegalDeviceStateError(response);
- return true;
- }
-
- IRobotCar robotCar = mgr.getRobotCar();
- if (speed != null) {
- if (speed == 0) {
- robotCar.stop();
- } else {
- robotCar.move(speed);
- }
- }
-
- if (angle != null) {
- robotCar.turnHandle(calcAngle(angle));
- }
-
- setResult(response, DConnectMessage.RESULT_OK);
- return true;
- }
- });
-
- // DELETE /driveController/stop
- addApi(new DeleteApi() {
- @Override
- public String getAttribute() {
- return "stop";
- }
-
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- FaBoDeviceControl mgr = getFaBoDeviceControl();
- if (!getService().isOnline() || mgr == null) {
- MessageUtils.setIllegalDeviceStateError(response);
- return true;
- }
-
- IRobotCar robotCar = mgr.getRobotCar();
- robotCar.stop();
- return true;
- }
- });
- }
-
- @Override
- public String getProfileName() {
- return "driveController";
- }
-
- /**
- * 角度(-360〜360)を-1.0〜1.0の範囲に変換します.
- * @param angle 角度
- * @return 返還後の値
- */
- private float calcAngle(final float angle) {
- if (angle > 360) {
- return 1.0f;
- }
- if (angle < -360) {
- return -1.0f;
- }
- return angle / 360.0f;
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2CTemperatureProfile.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2CTemperatureProfile.java
deleted file mode 100644
index 375e181d15..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/service/virtual/profile/I2CTemperatureProfile.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.service.virtual.profile;
-
-import android.content.Intent;
-
-import org.deviceconnect.android.deviceplugin.fabo.device.IADT7410;
-import org.deviceconnect.android.message.MessageUtils;
-import org.deviceconnect.android.profile.api.GetApi;
-import org.deviceconnect.message.DConnectMessage;
-
-/**
- * I2C用Temperatureプロファイル.
- *
- * ID: #207
- */
-public class I2CTemperatureProfile extends BaseFaBoProfile {
- /**
- * コンストラクタ.
- */
- public I2CTemperatureProfile() {
- // GET /gotpai/temperature
- addApi(new GetApi() {
- @Override
- public boolean onRequest(final Intent request, final Intent response) {
- final Integer type = parseInteger(request, "type");
- final IADT7410 adt = getFaBoDeviceControl().getADT7410();
- if (!getService().isOnline()) {
- MessageUtils.setIllegalDeviceStateError(response, "FaBo device is not connected.");
- } else if (adt == null) {
- MessageUtils.setNotSupportAttributeError(response, "Not support.");
- } else {
- adt.read(new IADT7410.OnADT7410Listener() {
- @Override
- public void onStarted() {
- }
-
- @Override
- public void onError(final String message) {
- MessageUtils.setIllegalDeviceStateError(response, message);
- sendResponse(response);
- }
-
- @Override
- public void onData(final double temperature) {
- if (type == null || type == 1) {
- response.putExtra("temperature", temperature);
- } else {
- response.putExtra("temperature", convertC2F(temperature));
- }
- setResult(response, DConnectMessage.RESULT_OK);
- sendResponse(response);
- }
- });
- return false;
- }
- return true;
- }
- });
- }
-
- @Override
- public String getProfileName() {
- return "temperature";
- }
-
- /**
- * 摂氏を華氏に変換します.
- * @param temp 摂氏
- * @return 華氏
- */
- private double convertC2F(double temp) {
- return temp * 1.8 + 32;
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/setting/FaBoPinListActivity.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/setting/FaBoPinListActivity.java
deleted file mode 100644
index b9852e07a1..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/setting/FaBoPinListActivity.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.setting;
-
-import android.app.ActionBar;
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.Button;
-
-import org.deviceconnect.android.deviceplugin.fabo.core.R;
-import org.deviceconnect.android.deviceplugin.fabo.service.virtual.db.ProfileData;
-import org.deviceconnect.android.deviceplugin.fabo.service.virtual.db.ProfileDataUtil;
-import org.deviceconnect.android.deviceplugin.fabo.setting.fragment.FaBoBasePinFragment;
-import org.deviceconnect.android.deviceplugin.fabo.setting.fragment.FaBoPinCheckBoxFragment;
-import org.deviceconnect.android.deviceplugin.fabo.setting.fragment.FaBoPinRadioGroupFragment;
-
-import java.util.List;
-
-/**
- * 使用するピンを選択するための画面を表示するActivity.
- */
-public class FaBoPinListActivity extends Activity {
-
- @Override
- protected void onCreate(final Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_fabo_pin_list);
-
- ActionBar actionBar = getActionBar();
- if (actionBar != null) {
- actionBar.setDisplayHomeAsUpEnabled(true);
- }
-
- setTitle(R.string.activity_fabo_virtual_service_pin_title);
-
- ProfileData p = getIntent().getParcelableExtra("profile");
- if (ProfileDataUtil.isMultiChoicePin(p)) {
- showPinFragment(new FaBoPinCheckBoxFragment());
- } else {
- showPinFragment(new FaBoPinRadioGroupFragment());
- }
-
- Button saveBtn = findViewById(R.id.activity_fabo_pin_save_btn);
- saveBtn.setOnClickListener((view) -> {
- savePinList();
- });
-
- // バックキーを押下された時を考慮してキャンセルを設定しておく
- setResult(RESULT_CANCELED, new Intent());
- }
-
- @Override
- public boolean onOptionsItemSelected(final MenuItem item) {
- switch(item.getItemId()) {
- case android.R.id.home:
- finish();
- return true;
- }
- return super.onOptionsItemSelected(item);
- }
-
- /**
- * ピンを選択するフラグメントを表示します.
- * @param fragment 表示するフラグメント
- */
- private void showPinFragment(final FaBoBasePinFragment fragment) {
- FragmentManager manager = getFragmentManager();
- FragmentTransaction transaction = manager.beginTransaction();
- transaction.replace(R.id.container, fragment);
- transaction.commit();
- }
-
- /**
- * ピンが一つも選択されていない場合にエラーダイアログを表示します.
- */
- private void showNoSelectPin() {
- new AlertDialog.Builder(this)
- .setTitle(R.string.activity_fabo_virtual_service_error_title)
- .setMessage(R.string.activity_fabo_virtual_service_pin_no_select_message)
- .setPositiveButton(R.string.activity_fabo_virtual_service_error_ok, null)
- .show();
- }
-
- /**
- * プロファイルで使用するピンのリストを返却します.
- */
- private void savePinList() {
- FaBoBasePinFragment fragment = (FaBoBasePinFragment) getFragmentManager().findFragmentById(R.id.container);
-
- List pins = fragment.getSelectedPins();
- if (pins.isEmpty()) {
- showNoSelectPin();
- } else {
- ProfileData p = getIntent().getParcelableExtra("profile");
- p.setPinList(pins);
-
- Intent intent = new Intent();
- intent.putExtra("profile", p);
- setResult(RESULT_OK, intent);
- finish();
- }
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/setting/FaBoProfileListActivity.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/setting/FaBoProfileListActivity.java
deleted file mode 100644
index 82006ef534..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/setting/FaBoProfileListActivity.java
+++ /dev/null
@@ -1,212 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.setting;
-
-import android.app.ActionBar;
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.BaseAdapter;
-import android.widget.ListView;
-import android.widget.TextView;
-
-import org.deviceconnect.android.deviceplugin.fabo.core.R;
-import org.deviceconnect.android.deviceplugin.fabo.service.virtual.db.ProfileData;
-import org.deviceconnect.android.deviceplugin.fabo.service.virtual.db.ProfileDataUtil;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * プロファイル一覧を表示するActivity.
- */
-public class FaBoProfileListActivity extends Activity {
- /**
- * リクエストコード.
- */
- private static final int REQUEST_CODE = 201;
-
- /**
- * プロファイルを表示するアダプタ.
- */
- private ProfileAdapter mProfileAdapter;
-
- @Override
- protected void onCreate(final Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_fabo_profile_list);
-
- ActionBar actionBar = getActionBar();
- if (actionBar != null) {
- actionBar.setDisplayHomeAsUpEnabled(true);
- }
-
- setTitle(R.string.activity_fabo_virtual_service_profile_title);
-
- Intent intent = getIntent();
- if (intent == null) {
- finish();
- return;
- }
-
- mProfileAdapter = new ProfileAdapter(getProfileTypes());
-
- ListView listView = findViewById(R.id.activity_fabo_profile_list_view);
- listView.setOnItemClickListener((adapterView, view, position, id) -> {
- ProfileData.Type type = (ProfileData.Type) mProfileAdapter.getItem(position);
- if (type.getValue() < 100) {
- openPinActivity(type.getValue());
- } else {
- selectedProfileData(type.getValue(), null);
- }
- });
- listView.setAdapter(mProfileAdapter);
-
- // バックキーを押下された時を考慮してキャンセルを設定しておく
- setResult(RESULT_CANCELED, new Intent());
- }
-
- @Override
- public boolean onOptionsItemSelected(final MenuItem item) {
- switch(item.getItemId()) {
- case android.R.id.home:
- finish();
- return true;
- }
- return super.onOptionsItemSelected(item);
- }
-
- @Override
- protected void onActivityResult(final int requestCode, final int resultCode, final Intent data) {
- switch (requestCode) {
- case REQUEST_CODE:
- if (resultCode == RESULT_OK) {
- ProfileData profileData = data.getParcelableExtra("profile");
- selectedProfileData(profileData);
- }
- break;
- }
- }
-
- /**
- * 追加できるプロファイルのリストを取得します.
- * @return 追加できるプロファイルリスト
- */
- private List getProfileTypes() {
- ArrayList profileDatas = getIntent().getParcelableArrayListExtra("profile");
- List typeList = new ArrayList<>();
- for (ProfileData.Type type : ProfileData.Type.values()) {
- if (!containsProfileData(profileDatas, type)) {
- typeList.add(type);
- }
- }
- return typeList;
- }
-
- /**
- * プロファイルのリストに指定されたプロファイルが存在するか確認します.
- * @param list プロファイルのリスト
- * @param type 確認するプロファイル
- * @return 存在する場合にはtrue、それ以外はfalse
- */
- private boolean containsProfileData(final List list, final ProfileData.Type type) {
- if (list == null) {
- return true;
- }
-
- for (ProfileData p : list) {
- if (p.getType().getProfileName().equals(type.getProfileName())) {
- return true;
- }
- }
- return false;
- }
-
- /**
- * 選択されたプロファイルデータを返却して、Activityを終了します.
- * @param profileType プロファイルタイプ
- * @param pins プロファイルが使用するピンのリスト
- */
- private void selectedProfileData(final int profileType, final List pins) {
- ProfileData profileData = new ProfileData();
- profileData.setType(ProfileData.Type.getType(profileType));
- if (pins != null) {
- profileData.setPinList(pins);
- }
- selectedProfileData(profileData);
- }
-
- /**
- * プロファイルデータを選択し、Activityを終了します.
- *
- * @param profileData 選択するプロファイルデータ
- */
- private void selectedProfileData(final ProfileData profileData) {
- Intent intent = new Intent();
- intent.putExtra("profile", profileData);
- setResult(RESULT_OK, intent);
- finish();
- }
-
- /**
- * GPIOのピン選択画面を開きます.
- *
- * @param profileType 送信するプロファイルデータ
- */
- private void openPinActivity(final int profileType) {
- ProfileData data = new ProfileData();
- data.setType(ProfileData.Type.getType(profileType));
-
- Intent intent = new Intent();
- intent.setClass(this, FaBoPinListActivity.class);
- intent.putExtra("profile", data);
- intent.putExtra("pins", getIntent().getIntegerArrayListExtra("pins"));
- startActivityForResult(intent, REQUEST_CODE);
- }
-
- /**
- * プロファイルを格納するアダプタ.
- */
- private class ProfileAdapter extends BaseAdapter {
-
- private List mTypeList;
-
- ProfileAdapter(final List typeList) {
- mTypeList = typeList;
- }
-
- @Override
- public int getCount() {
- return mTypeList.size();
- }
-
- @Override
- public Object getItem(final int position) {
- return mTypeList.get(position);
- }
-
- @Override
- public long getItemId(final int id) {
- return id;
- }
-
- @Override
- public View getView(final int position, View convertView, final ViewGroup parent) {
- if (convertView == null) {
- LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
- convertView = inflater.inflate(R.layout.item_fabo_profile, null);
- }
-
- ProfileData.Type type = (ProfileData.Type) getItem(position);
-
- TextView nameTV = (TextView) convertView.findViewById(R.id.item_fabo_profile_name);
- nameTV.setText(ProfileDataUtil.getProfileName(FaBoProfileListActivity.this, type));
-
- return convertView;
- }
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/setting/FaBoServiceListActivity.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/setting/FaBoServiceListActivity.java
deleted file mode 100644
index 2faaaab303..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/setting/FaBoServiceListActivity.java
+++ /dev/null
@@ -1,591 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.setting;
-
-import android.app.ActionBar;
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.BaseAdapter;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.TextView;
-
-import org.deviceconnect.android.deviceplugin.fabo.FaBoDeviceService;
-import org.deviceconnect.android.deviceplugin.fabo.core.R;
-import org.deviceconnect.android.deviceplugin.fabo.service.virtual.VirtualService;
-import org.deviceconnect.android.message.DConnectMessageService;
-import org.deviceconnect.android.service.DConnectService;
-import org.deviceconnect.android.service.DConnectServiceListener;
-import org.deviceconnect.android.service.DConnectServiceProvider;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * FaBoプラグインが管理するサービスのリストを表示するActivity.
- */
-public class FaBoServiceListActivity extends Activity {
-
- /**
- * プラグインのサービス.
- */
- private DConnectMessageService mMessageService;
-
- /**
- * DConnectServiceの状態を監視・管理するクラス.
- */
- private DConnectServiceProvider mProvider;
-
- /**
- * サービスとのバインド状態.
- */
- private boolean mIsBound;
-
- @Override
- protected void onCreate(final Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_service_list);
-
- ActionBar actionBar = getActionBar();
- if (actionBar != null) {
- actionBar.setDisplayHomeAsUpEnabled(true);
- actionBar.setDisplayOptions(0, ActionBar.DISPLAY_SHOW_HOME);
- actionBar.setTitle(R.string.activity_service_list_title);
- }
-
- bindMessageService();
- }
-
- @Override
- protected void onResume() {
- super.onResume();
- updateServiceList();
- }
-
- @Override
- protected void onDestroy() {
- unbindMessageService();
- super.onDestroy();
- }
-
- @Override
- public boolean onOptionsItemSelected(final MenuItem item) {
- if (item.getItemId() == android.R.id.home) {
- finish();
- return true;
- }
- return super.onOptionsItemSelected(item);
- }
-
- /**
- * DConnectMessageServiceとバインドします.
- */
- private void bindMessageService() {
- if (!mIsBound) {
- Intent intent = new Intent(getApplicationContext(), Util.getDConnectMessageServiceClass(this));
- bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
- }
- }
-
- /**
- * DConnectMessageServiceとアンバインドします.
- */
- private void unbindMessageService() {
- if (mIsBound) {
- unbindService(mConnection);
- mIsBound = false;
- }
- }
-
- /**
- * FaBoが持っているサービスを表示するフラグメントを表示します.
- */
- private void showViewerFragment() {
- FragmentManager mgr = getFragmentManager();
- FragmentTransaction transaction = mgr.beginTransaction();
- ViewerFragment fragment = new ViewerFragment();
- transaction.replace(R.id.fragment_container, fragment);
- transaction.commit();
- }
-
- /**
- * FaBoが持っているサービスを削除するフラグメントを表示します.
- */
- private void showRemoverFragment() {
- FragmentManager mgr = getFragmentManager();
- FragmentTransaction transaction = mgr.beginTransaction();
- RemoverFragment fragment = new RemoverFragment();
- transaction.replace(R.id.fragment_container, fragment);
- transaction.commit();
- }
-
- /**
- * FaBoが持っているサービスを管理するクラスを取得します.
- *
- * DConnectMessageServiceとバインドされていない場合にはnullを返却します.
- *
- * @return DConnectServiceProviderのインスタンス
- */
- private DConnectServiceProvider getProvider() {
- return mProvider;
- }
-
- /**
- * 指定されたリストを削除します.
- * @param services 削除するサービスリスト
- */
- private void removeServices(final List services) {
- for (DConnectService service : services) {
- mProvider.removeService(service.getId());
-
- if (service instanceof VirtualService) {
- FaBoDeviceService faBo = (FaBoDeviceService) mMessageService;
- faBo.removeServiceData(((VirtualService) service).getServiceData());
- }
- }
- }
-
- /**
- * VirtualServiceActivityを開きます.
- *
- * @param service 仮想サービス
- */
- private void openVirtualServiceActivity(final VirtualService service) {
- Intent intent = new Intent();
- intent.setClass(this, FaBoVirtualServiceActivity.class);
- if (service != null) {
- intent.putExtra("service", service.getServiceData());
- }
- startActivity(intent);
- }
-
- /**
- * DConnectMessageServiceとのバインドを状態のイベントを受け取るクラス.
- */
- private ServiceConnection mConnection = new ServiceConnection() {
- @Override
- public void onServiceConnected(final ComponentName name, final IBinder service) {
- runOnUiThread(() -> {
- mMessageService = ((DConnectMessageService.LocalBinder) service).getMessageService();
- mProvider = mMessageService.getServiceProvider();
- mProvider.addServiceListener(mDConnectServiceListener);
- mIsBound = true;
-
- showViewerFragment();
- });
- }
-
- @Override
- public void onServiceDisconnected(final ComponentName name) {
- mIsBound = false;
- mProvider.removeServiceListener(mDConnectServiceListener);
- mMessageService = null;
- }
- };
-
- /**
- * DConnectServiceの状態通知を受け取るリスナー.
- */
- private DConnectServiceListener mDConnectServiceListener = new DConnectServiceListener() {
- @Override
- public void onServiceAdded(final DConnectService service) {
- updateServiceList();
- }
-
- @Override
- public void onServiceRemoved(final DConnectService service) {
- updateServiceList();
- }
-
- @Override
- public void onStatusChange(final DConnectService service) {
- updateServiceList();
- }
- };
-
- /**
- * DConnectServiceのリスト更新を行います.
- */
- private void updateServiceList() {
- runOnUiThread(() -> {
- FragmentManager mgr = getFragmentManager();
- Fragment f = mgr.findFragmentById(R.id.fragment_container);
- if (f != null && f instanceof BaseFragment) {
- ((BaseFragment) f).notifyServiceStatusChange();
- }
- });
- }
-
- /**
- * DConnectServiceを表示するための基底フラグメント.
- */
- public static class BaseFragment extends Fragment {
- /**
- * 共通で使用するDConnectServiceのリストを管理するアダプタ.
- */
- protected ServiceListAdapter mListAdapter;
-
- /**
- * DConnectServiceの状態が変わったこと通知します.
- */
- protected void notifyServiceStatusChange() {
- mListAdapter.notifyDataSetChanged();
- }
-
- /**
- * DConnectServiceProviderのインスタンスを取得します.
- *
- * DConnectMessageServiceとバインドされていない場合にはnullを返却します.
- *
- * @return DConnectServiceProviderのインスタンス
- */
- protected DConnectServiceProvider getProvider() {
- return ((FaBoServiceListActivity) getActivity()).getProvider();
- }
- }
-
- /**
- * DConnectServiceを表示するためのフラグメント.
- */
- public static class ViewerFragment extends BaseFragment {
-
- @Override
- public View onCreateView(final LayoutInflater inflater, final ViewGroup container,
- final Bundle savedInstanceState) {
- setHasOptionsMenu(true);
-
- View root = inflater.inflate(R.layout.fragment_service_list_viewer, container, false);
-
- mListAdapter = new ServiceListAdapter(getActivity(), getProvider(), false);
-
- ListView listView = root.findViewById(R.id.activity_fabo_service_list_view);
- listView.setAdapter(mListAdapter);
- listView.setItemsCanFocus(true);
- listView.setClickable(true);
- listView.setOnItemClickListener((parent, view, position, id) -> {
- Object service = mListAdapter.getItem(position);
- if (service instanceof VirtualService) {
- openVirtualServiceActivity((VirtualService) service);
- }
- });
-
- Button newServiceButton = root.findViewById(R.id.activity_fabo_service_add_btn);
- newServiceButton.setOnClickListener((v) -> {
- openVirtualServiceActivity(null);
- });
-
- return root;
- }
-
- @Override
- public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
- super.onCreateOptionsMenu(menu, inflater);
- inflater.inflate(R.menu.menu_fabo_service_list_viewer, menu);
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- if (item.getItemId() == R.id.menu_fabo_service_remove) {
- showRemoverFragment();
- }
- return true;
- }
-
- /**
- * 仮想サービス管理Activityを表示します.
- * @param service 表示するサービス
- */
- private void openVirtualServiceActivity(final VirtualService service) {
- ((FaBoServiceListActivity) getActivity()).openVirtualServiceActivity(service);
- }
-
- /**
- * 仮想サービス削除用フラグメントを表示します.
- */
- private void showRemoverFragment() {
- ((FaBoServiceListActivity) getActivity()).showRemoverFragment();
- }
- }
-
- /**
- * DConnectServiceを削除するためのフラグメント.
- */
- public static class RemoverFragment extends BaseFragment implements ServiceListAdapter.OnStatusChangeListener {
- /**
- * 削除ボタン.
- */
- private Button mRemoveBtn;
-
- @Override
- public View onCreateView(final LayoutInflater inflater, final ViewGroup container,
- final Bundle savedInstanceState) {
- View root = inflater.inflate(R.layout.fragment_service_list_remover, container, false);
-
- mListAdapter = new ServiceListAdapter(getActivity(), getProvider(), true);
- mListAdapter.setOnStatusChangeListener(this);
-
- ListView listView = root.findViewById(R.id.activity_fabo_service_list_view);
- listView.setAdapter(mListAdapter);
- listView.setItemsCanFocus(true);
- listView.setClickable(true);
- listView.setOnItemClickListener((parent, view, position, id) -> {
- Object service = mListAdapter.getItem(position);
- if (service instanceof VirtualService) {
- VirtualService vs = (VirtualService) service;
- if (vs.isOnline()) {
- showOnlineDialog();
- } else {
- mListAdapter.toggleCheckBox((DConnectService) service);
- CheckBox checkBox = view.findViewById(R.id.activity_fabo_service_removal_checkbox);
- if (checkBox != null) {
- checkBox.toggle();
- }
- }
- } else {
- showImmortalDialog();
- }
- });
-
- Button cancelButton = root.findViewById(R.id.activity_fabo_service_cancel_btn);
- cancelButton.setOnClickListener((v) -> {
- showViewerFragment();
- });
-
- mRemoveBtn = (Button) root.findViewById(R.id.activity_fabo_service_remove_btn);
- mRemoveBtn.setOnClickListener((v) -> {
- showRemovalConfirmation();
- });
- mRemoveBtn.setEnabled(false);
-
- return root;
- }
-
- /**
- * 削除確認用ダイアログを表示します.
- */
- private void showRemovalConfirmation() {
- new AlertDialog.Builder(getActivity())
- .setTitle(R.string.activity_fabo_service_dialog_title_service_removal_confirmation)
- .setMessage(R.string.activity_fabo_service_dialog_message_service_removal_confirmation)
- .setCancelable(false)
- .setPositiveButton(R.string.activity_fabo_service_dialog_button_service_removal_ok,
- (dialog, which) -> {
- removeService();
- })
- .setNegativeButton(R.string.activity_fabo_service_dialog_button_service_removal_cancel, null)
- .create().show();
- }
-
- /**
- * オンラインのために削除できないことを通知するダイアログを表示します.
- */
- private void showOnlineDialog() {
- new AlertDialog.Builder(getActivity())
- .setTitle(R.string.activity_fabo_service_dialog_title_online)
- .setMessage(R.string.activity_fabo_service_dialog_message_online)
- .setCancelable(true)
- .setPositiveButton(R.string.activity_fabo_service_dialog_button_service_removal_ok, null)
- .create().show();
- }
-
- /**
- * FaBoServiceは削除できないので、エラーダイアログを表示します.
- */
- private void showImmortalDialog() {
- new AlertDialog.Builder(getActivity())
- .setTitle(R.string.activity_fabo_service_dialog_title_immortal)
- .setMessage(R.string.activity_fabo_service_dialog_message_immortal)
- .setCancelable(true)
- .setPositiveButton(R.string.activity_fabo_service_dialog_button_service_removal_ok, null)
- .create().show();
- }
-
- /**
- * DConnectServiceを削除します.
- */
- private void removeService() {
- ((FaBoServiceListActivity) getActivity()).removeServices(mListAdapter.getRemoveServices());
- mListAdapter.getRemoveServices().clear();
- showViewerFragment();
- }
-
- /**
- * DConnectService表示用フラグメントを表示します.
- */
- private void showViewerFragment() {
- ((FaBoServiceListActivity) getActivity()).showViewerFragment();
- }
-
- @Override
- public void onStatusChange(boolean flag) {
- mRemoveBtn.setEnabled(flag);
- }
- }
-
- /**
- * サービスリストを管理するアダプタ.
- */
- private static class ServiceListAdapter extends BaseAdapter {
- /**
- * DConnectServiceを管理するクラス.
- */
- private DConnectServiceProvider mProvider;
-
- /**
- * インフレータ.
- */
- private LayoutInflater mInflater;
-
- /**
- * CheckBoxの表示フラグ.
- *
- * trueの場合はCheckBoxを表示します。
- *
- */
- private boolean mHasCheckbox;
-
- /**
- * 削除用のCheckBoxの状態が変更されたことを通知するためのリスナー.
- */
- private OnStatusChangeListener mOnStatusChangeListener;
-
- /**
- * 削除するDConnectServiceを保持するリスト.
- */
- private final List mRemoveServices = new ArrayList<>();
-
- /**
- * コンストラクタ.
- * @param context コンテキスト
- * @param provider DConnectServiceを管理するクラス
- * @param hasCheckbox CheckBox表示の有無
- */
- ServiceListAdapter(final Context context, final DConnectServiceProvider provider, final boolean hasCheckbox) {
- mProvider = provider;
- mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
- mHasCheckbox = hasCheckbox;
- }
-
- /**
- * CheckBox状態変更通知リスナーを設定します.
- * @param listener リスナー
- */
- void setOnStatusChangeListener(final OnStatusChangeListener listener) {
- mOnStatusChangeListener = listener;
- }
-
- @Override
- public int getCount() {
- if (mProvider == null) {
- return 0;
- } else {
- return mProvider.getServiceList().size();
- }
- }
-
- @Override
- public Object getItem(final int position) {
- return mProvider.getServiceList().get(position);
- }
-
- @Override
- public long getItemId(final int position) {
- return position;
- }
-
- @Override
- public View getView(final int position, View convertView, ViewGroup viewGroup) {
- if (convertView == null) {
- convertView = mInflater.inflate(R.layout.item_fabo_service_list, null);
- }
-
- final DConnectService service = (DConnectService) getItem(position);
- convertView.setTag(service);
- convertView.setBackgroundResource(service.isOnline() ?
- R.color.service_list_item_background_online :
- R.color.service_list_item_background_offline);
-
- TextView statusView = convertView.findViewById(R.id.service_online_status);
- statusView.setText(service.isOnline() ?
- R.string.activity_fabo_service_online :
- R.string.activity_fabo_service_offline);
-
- TextView nameView = convertView.findViewById(R.id.service_name);
- nameView.setText(service.getName());
-
- CheckBox checkBox = convertView.findViewById(R.id.activity_fabo_service_removal_checkbox);
- checkBox.setVisibility(hasCheckbox(service) ? View.VISIBLE : View.GONE);
- checkBox.setChecked(mRemoveServices.contains(service));
-
- ImageView imageView = (ImageView) convertView.findViewById(R.id.activity_fabo_service_edit);
- imageView.setVisibility(hasImageView(service) ? View.VISIBLE : View.GONE);
-
- return convertView;
- }
-
- /**
- * 削除するDConnectServiceのリストを取得します.
- * @return 削除するDConnectServiceのリスト
- */
- private List getRemoveServices() {
- return mRemoveServices;
- }
-
- /**
- * 削除するDConnectServiceを切り替えます.
- * @param service 変更するDConnectService
- */
- private void toggleCheckBox(final DConnectService service) {
- if (!mRemoveServices.contains(service)) {
- mRemoveServices.add(service);
- } else {
- mRemoveServices.remove((service));
- }
-
- if (mOnStatusChangeListener != null) {
- mOnStatusChangeListener.onStatusChange(!mRemoveServices.isEmpty());
- }
- }
-
- /**
- * DConnectServiceのカラムにCheckBoxを表示するかを確認します.
- * @param service 確認するDConnectMessage
- * @return CheckBoxを表示する場合はtrue、それ以外はfalse
- */
- private boolean hasCheckbox(final DConnectService service) {
- return mHasCheckbox && !service.isOnline() && service instanceof VirtualService;
- }
-
- private boolean hasImageView(final DConnectService service) {
- return !mHasCheckbox && service instanceof VirtualService;
- }
-
- /**
- * CheckBoxの状態変更を通知するリスナー.
- */
- interface OnStatusChangeListener {
- /**
- * 状態変更があったことを通知します.
- * @param flag 削除するDConnectServiceがある場合にはtrue、ない場合にはfalse
- */
- void onStatusChange(final boolean flag);
- }
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/setting/FaBoVirtualServiceActivity.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/setting/FaBoVirtualServiceActivity.java
deleted file mode 100644
index c044e7def5..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/setting/FaBoVirtualServiceActivity.java
+++ /dev/null
@@ -1,429 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.setting;
-
-import android.app.ActionBar;
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import org.deviceconnect.android.deviceplugin.fabo.FaBoDeviceService;
-import org.deviceconnect.android.deviceplugin.fabo.core.R;
-import org.deviceconnect.android.deviceplugin.fabo.param.FaBoShield;
-import org.deviceconnect.android.deviceplugin.fabo.service.virtual.VirtualService;
-import org.deviceconnect.android.deviceplugin.fabo.service.virtual.db.ProfileData;
-import org.deviceconnect.android.deviceplugin.fabo.service.virtual.db.ProfileDataUtil;
-import org.deviceconnect.android.deviceplugin.fabo.service.virtual.db.ServiceData;
-import org.deviceconnect.android.message.DConnectMessageService;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 仮想サービスの設定を行うActivity.
- */
-public class FaBoVirtualServiceActivity extends Activity {
-
- /**
- * プロファイル追加リクエストコード.
- */
- private static final int REQUEST_CODE_ADD_PROFILE = 101;
-
- /**
- * プロファイル更新リクエストコード.
- */
- private static final int REQUEST_CODE_UPDATE_PROFILE = 102;
-
- /**
- * 新規作成フラグ.
- *
- * 新規作成の仮想サービスの場合はtrue、それ以外はfalse。
- *
- */
- private boolean mNewCreateFlag = false;
-
- /**
- * 仮想サービスデータ.
- */
- private ServiceData mServiceData;
-
- /**
- * FaBoDeviceServiceのインスタンス.
- */
- private FaBoDeviceService mFaBoDeviceService;
-
- /**
- * FaBoDeviceServiceにバインドフラグ.
- * trueの時は接続中
- */
- private boolean mIsBound;
-
- @Override
- protected void onCreate(final Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_fabo_virtual_service);
-
- ActionBar actionBar = getActionBar();
- if (actionBar != null) {
- actionBar.setDisplayHomeAsUpEnabled(true);
- }
-
- setTitle(R.string.activity_fabo_virtual_service_title);
-
- Intent intent = getIntent();
- if (intent != null) {
- mServiceData = intent.getParcelableExtra("service");
- }
-
- if (mServiceData == null) {
- mNewCreateFlag = true;
- mServiceData = new ServiceData();
- mServiceData.setName("New Service");
- }
-
- TextView serviceIdTV = findViewById(R.id.activity_fabo_service_id);
- serviceIdTV.setText(mServiceData.getServiceId());
-
- EditText serviceNameET = findViewById(R.id.activity_fabo_service_name);
- serviceNameET.setText(mServiceData.getName());
- serviceNameET.setOnKeyListener((view, keyCode, event) -> {
- if (event.getAction() == KeyEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_ENTER) {
- InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
- inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0);
- return true;
- }
- return false;
- });
-
- Button saveBtn = findViewById(R.id.activity_fabo_service_save_btn);
- saveBtn.setOnClickListener((view) -> {
- saveVirtualService();
- });
-
- Button addBtn = findViewById(R.id.activity_fabo_profile_add_btn);
- addBtn.setOnClickListener((view) -> {
- openProfileActivity();
- });
-
- LinearLayout profileLayout = findViewById(R.id.activity_fabo_profile_list);
- for (ProfileData profileData : mServiceData.getProfileDataList()) {
- View view = createProfileView(profileData);
- profileLayout.addView(view);
- }
- }
-
- @Override
- protected void onPause() {
- unbindMessageService();
- super.onPause();
- }
-
- @Override
- protected void onResume() {
- super.onResume();
- bindMessageService();
- }
-
- @Override
- public boolean onOptionsItemSelected(final MenuItem item) {
- switch (item.getItemId()) {
- case android.R.id.home:
- finish();
- return true;
- }
- return super.onOptionsItemSelected(item);
- }
-
- @Override
- protected void onActivityResult(final int requestCode, final int resultCode, final Intent data) {
- switch (requestCode) {
- case REQUEST_CODE_ADD_PROFILE:
- if (resultCode == RESULT_OK) {
- ProfileData profileData = data.getParcelableExtra("profile");
- mServiceData.addProfileData(profileData);
-
- View view = createProfileView(profileData);
- LinearLayout profileLayout = findViewById(R.id.activity_fabo_profile_list);
- profileLayout.addView(view);
- }
- break;
-
- case REQUEST_CODE_UPDATE_PROFILE:
- if (resultCode == RESULT_OK) {
- ProfileData profileData = data.getParcelableExtra("profile");
- List list = mServiceData.getProfileDataList();
- for (ProfileData pd : list) {
- if (pd.getType() == profileData.getType()) {
- pd.setPinList(profileData.getPinList());
- }
- }
- resetProfileLayout();
- }
- break;
- }
- }
-
- /**
- * サービスとバインドします.
- */
- private void bindMessageService() {
- if (!mIsBound) {
- Intent intent = new Intent(getApplicationContext(), Util.getDConnectMessageServiceClass(this));
- bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
- }
- }
-
- /**
- * サービスをアンバインドします.
- */
- private void unbindMessageService() {
- if (mIsBound) {
- unbindService(mConnection);
- mIsBound = false;
- }
- }
-
- /**
- * プロファイルのリストをを再設定します.
- */
- private void resetProfileLayout() {
- LinearLayout profileLayout = findViewById(R.id.activity_fabo_profile_list);
- profileLayout.removeAllViews();
-
- for (ProfileData profileData : mServiceData.getProfileDataList()) {
- View view = createProfileView(profileData);
- profileLayout.addView(view);
- }
- }
-
- /**
- * プロファイル選択画面を開きます.
- */
- private void openProfileActivity() {
- ArrayList list = new ArrayList<>();
- for (ProfileData p : mServiceData.getProfileDataList()) {
- list.add(p);
- }
- Intent intent = new Intent();
- intent.setClass(this, FaBoProfileListActivity.class);
- intent.putParcelableArrayListExtra("profile", list);
- intent.putIntegerArrayListExtra("pins", new ArrayList<>(getUsePins()));
- startActivityForResult(intent, REQUEST_CODE_ADD_PROFILE);
- }
-
- /**
- * プロファイルを表示するためのViewを作成します.
- *
- * @param profileData プロファイルデータ
- * @return プロファイルを表示するためのView
- */
- private View createProfileView(final ProfileData profileData) {
- LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
- View view = inflater.inflate(R.layout.item_fabo_profile_a, null);
- if (profileData.getType().getValue() < 100) {
- view.setOnClickListener((v) -> {
- openPinActivity(profileData);
- });
- }
- TextView nameTV = view.findViewById(R.id.item_fabo_profile_name);
- nameTV.setText(ProfileDataUtil.getProfileName(this, profileData.getType()));
-
- TextView pinsTV = view. findViewById(R.id.item_fabo_profile_pins);
- pinsTV.setText(createPinInfo(profileData));
-
- view.findViewById(R.id.item_fabo_remove_profile_btn).setOnClickListener((v) -> {
- showConfirmRemoveProfile(profileData);
- });
-
- return view;
- }
-
- /**
- * 使用しているピンの一覧を文字列にして取得します.
- * @param profileData プロファイル
- * @return ピンの一覧の文字列
- */
- private String createPinInfo(ProfileData profileData) {
- StringBuilder sb = new StringBuilder();
- for (Integer i : profileData.getPinList()) {
- if (sb.length() > 0) {
- sb.append(",");
- }
- FaBoShield.Pin pin = FaBoShield.Pin.getPin(i);
- if (pin != null) {
- sb.append(pin.getPinNames()[1]);
- }
- }
- return getString(R.string.activity_fabo_virtual_service_profile_pins, sb.toString());
- }
-
- /**
- * ピンの設定画面を開きます.
- *
- * @param profileData 設定画面
- */
- private void openPinActivity(final ProfileData profileData) {
- Intent intent = new Intent();
- intent.setClass(this, FaBoPinListActivity.class);
- intent.putExtra("profile", profileData);
- intent.putIntegerArrayListExtra("pins", new ArrayList<>(getUsePins()));
- startActivityForResult(intent, REQUEST_CODE_UPDATE_PROFILE);
- }
-
- /**
- * 仮想サービスで使用されているピンの一覧を取得します.
- * @return ピンの一覧
- */
- private List getUsePins() {
- return mServiceData.getUsePins();
- }
-
- /**
- * FaBoDeviceServiceと接続できていない場合のエラーダイアログを表示します.
- */
- private void showNotConnectServiceError() {
- new AlertDialog.Builder(this)
- .setTitle(R.string.activity_fabo_virtual_service_error_title)
- .setMessage(R.string.activity_fabo_virtual_service_not_bind)
- .setPositiveButton(R.string.activity_fabo_virtual_service_error_ok, null)
- .show();
- }
-
- /**
- * サービス名が登録されていない場合のエラーダイアログを表示します.
- */
- private void showNoNameError() {
- new AlertDialog.Builder(this)
- .setTitle(R.string.activity_fabo_virtual_service_error_title)
- .setMessage(R.string.activity_fabo_virtual_service_no_name)
- .setPositiveButton(R.string.activity_fabo_virtual_service_error_ok, null)
- .show();
- }
-
- /**
- * 文字数が長すぎる場合のエラーダイアログを表示します.
- */
- private void showTooLong() {
- new AlertDialog.Builder(this)
- .setTitle(R.string.activity_fabo_virtual_service_error_title)
- .setMessage(R.string.activity_fabo_virtual_service_name_too_long)
- .setPositiveButton(R.string.activity_fabo_virtual_service_error_ok, null)
- .show();
- }
-
- /**
- * プロファイルが登録されていない場合のエラーダイアログを表示します.
- */
- private void showNoProfileError() {
- new AlertDialog.Builder(this)
- .setTitle(R.string.activity_fabo_virtual_service_error_title)
- .setMessage(R.string.activity_fabo_virtual_service_no_select_message)
- .setPositiveButton(R.string.activity_fabo_virtual_service_error_ok, null)
- .show();
- }
-
- /**
- * ServiceDataの保存完了ダイアログを表示します.
- */
- private void showSaveServiceData() {
- new AlertDialog.Builder(this)
- .setTitle(R.string.activity_fabo_virtual_service_dialog_title)
- .setMessage(R.string.activity_fabo_virtual_service_save_message)
- .setPositiveButton(R.string.activity_fabo_virtual_service_error_ok,
- (dialogInterface, i) -> {
- finish();
- })
- .show();
- }
-
- /**
- * プロファイル削除確認ダイアログを表示します.
- * @param profileData 削除確認を行うプロファイルデータ
- */
- private void showConfirmRemoveProfile(final ProfileData profileData) {
- String name = ProfileDataUtil.getProfileName(this, profileData.getType());
- new AlertDialog.Builder(this)
- .setTitle(R.string.activity_fabo_virtual_service_remove_profile_title)
- .setMessage(getString(R.string.activity_fabo_virtual_service_remove_profile_message, name))
- .setPositiveButton(R.string.activity_fabo_virtual_service_error_ok,
- (dialogInterface, i) -> {
- mServiceData.removeProfileData(profileData);
- resetProfileLayout();
- })
- .setNegativeButton(R.string.activity_fabo_virtual_service_error_no, null)
- .show();
- }
-
- /**
- * ServiceDataの保存に失敗した場合のエラーダイアログを表示します.
- */
- private void showSaveServiceDataError() {
- new AlertDialog.Builder(this)
- .setTitle(R.string.activity_fabo_virtual_service_remove_profile_title)
- .setMessage(getString(R.string.activity_fabo_virtual_service_remove_error_message))
- .setPositiveButton(R.string.activity_fabo_virtual_service_error_ok, null)
- .show();
- }
-
- /**
- * 仮想サービスを保存します.
- */
- private void saveVirtualService() {
- if (mFaBoDeviceService == null) {
- showNotConnectServiceError();
- return;
- }
-
- EditText nameET = (EditText) findViewById(R.id.activity_fabo_service_name);
- String serviceName = nameET.getText().toString();
- if (serviceName.isEmpty()) {
- showNoNameError();
- } else if (serviceName.length() > 32) {
- showTooLong();
- } else if (mServiceData.getProfileDataList().isEmpty()) {
- showNoProfileError();
- } else {
- mServiceData.setName(serviceName);
-
- VirtualService service;
- if (mNewCreateFlag) {
- service = mFaBoDeviceService.addServiceData(mServiceData);
- } else {
- service = mFaBoDeviceService.updateServiceData(mServiceData);
- }
-
- if (service != null) {
- showSaveServiceData();
- } else {
- showSaveServiceDataError();
- }
- }
- }
-
- private ServiceConnection mConnection = new ServiceConnection() {
- @Override
- public void onServiceConnected(final ComponentName name, final IBinder service) {
- mFaBoDeviceService = (FaBoDeviceService) ((DConnectMessageService.LocalBinder) service).getMessageService();
- mIsBound = true;
- }
-
- @Override
- public void onServiceDisconnected(final ComponentName name) {
- mFaBoDeviceService = null;
- mIsBound = false;
- }
- };
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/setting/Util.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/setting/Util.java
deleted file mode 100644
index 04039f11b2..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/setting/Util.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.setting;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-
-import org.deviceconnect.android.message.DConnectMessageService;
-import org.deviceconnect.android.message.DConnectMessageServiceProvider;
-
-import java.lang.reflect.Method;
-
-final class Util {
- private Util() {
- }
-
- /**
- * デバイスプラグインに格納されるメタタグ名.
- */
- private static final String PLUGIN_META_DATA = "org.deviceconnect.android.deviceplugin";
-
- /**
- * DConnectMessageServiceのClassを取得します.
- *
- * Classが見つからなかった場合にはnullを返却します。
- *
- * @param context コンテキスト
- * @return DConnectMessageServiceのClass
- */
- static Class getDConnectMessageServiceClass(final Context context) {
- PackageManager pm = context.getPackageManager();
- try {
- PackageInfo packageInfo = pm.getPackageInfo(context.getPackageName(), PackageManager.GET_RECEIVERS);
- ActivityInfo[] receivers = packageInfo.receivers;
- if (receivers != null) {
- for (ActivityInfo receiver : receivers) {
- String packageName = receiver.packageName;
- String className = receiver.name;
-
- ComponentName component = new ComponentName(packageName, className);
- ActivityInfo receiverInfo = pm.getReceiverInfo(component, PackageManager.GET_META_DATA);
- if (receiverInfo.metaData != null) {
- Object value = receiverInfo.metaData.get(PLUGIN_META_DATA);
- if (value != null) {
- try {
- Class clazz = context.getClassLoader().loadClass(className);
- DConnectMessageServiceProvider obj = (DConnectMessageServiceProvider) clazz.newInstance();
- Method method = clazz.getDeclaredMethod("getServiceClass");
- method.setAccessible(true);
- return (Class) method.invoke(obj);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
- }
- }
- } catch (PackageManager.NameNotFoundException e) {
- e.printStackTrace();
- }
-
- return null;
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/setting/fragment/FaBoBasePinFragment.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/setting/fragment/FaBoBasePinFragment.java
deleted file mode 100644
index 1d40fea60a..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/setting/fragment/FaBoBasePinFragment.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.setting.fragment;
-
-import android.app.Fragment;
-
-import org.deviceconnect.android.deviceplugin.fabo.param.FaBoShield;
-import org.deviceconnect.android.deviceplugin.fabo.service.virtual.db.ProfileData;
-import org.deviceconnect.android.deviceplugin.fabo.service.virtual.db.ProfileDataUtil;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * ピンを選択するための画面を作成するための基底フラグメント.
- */
-public abstract class FaBoBasePinFragment extends Fragment {
-
- /**
- * 使用できるピンのリストを取得します.
- *
- * @return ピンのリスト
- */
- List getCanUsePinList() {
- List names = new ArrayList<>();
- for (FaBoShield.Pin pin : FaBoShield.Pin.values()) {
- if (checkCanUsePin(pin)) {
- names.add(pin);
- }
- }
- return names;
- }
-
- /**
- * 指定されたピンが使用できるか確認します.
- * @param pin 確認するピン
- * @return 使用できる場合はtrue、それ以外はfalse
- */
- private boolean checkCanUsePin(final FaBoShield.Pin pin) {
- ProfileDataUtil.PinType type = getPinType();
- if (type == ProfileDataUtil.PinType.ANALOG && pin.getPinNumber() > FaBoShield.PIN_NO_D13) {
- return true;
- } else if (type == ProfileDataUtil.PinType.DIGITAL && pin.getPinNumber() <= FaBoShield.PIN_NO_D13) {
- return true;
- }
- return type == ProfileDataUtil.PinType.ALL;
- }
-
- /**
- * 使用できるピンのタイプを取得します.
- *
- * @return ピンのタイプ
- */
- private ProfileDataUtil.PinType getPinType() {
- ProfileData p = getActivity().getIntent().getParcelableExtra("profile");
- return ProfileDataUtil.getPinType(p);
- }
-
-
- /**
- * 指定されたピンがmProfileDataに含まれているか確認します.
- * @param pin ピン
- * @return 含まれている場合はtrue、それ以外はfalse
- */
- protected boolean containsPin(final int pin) {
- ProfileData profileData = getActivity().getIntent().getParcelableExtra("profile");
- if (profileData == null) {
- return false;
- }
- for (int pinNum : profileData.getPinList()) {
- if (pin == pinNum) {
- return true;
- }
- }
- return false;
- }
-
- /**
- * 指定されたピンが使用されているかを確認します.
- * @param pin 使用されているか確認をするピン
- * @return 使用されている場合はtrue、それ以外はfalse
- */
- protected boolean usedPin(final int pin) {
- if (containsPin(pin)) {
- return false;
- }
- ArrayList pins = getActivity().getIntent().getIntegerArrayListExtra("pins");
- for (int p : pins) {
- if (p == pin) {
- return true;
- }
- }
- return false;
- }
-
- /**
- * 選択されているピンのリストを取得します.
- *
- * @return 選択されているピンのリスト
- */
- public abstract List getSelectedPins();
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/setting/fragment/FaBoPinCheckBoxFragment.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/setting/fragment/FaBoPinCheckBoxFragment.java
deleted file mode 100644
index c5e1afb611..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/setting/fragment/FaBoPinCheckBoxFragment.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.setting.fragment;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.CheckBox;
-import android.widget.ListView;
-
-import org.deviceconnect.android.deviceplugin.fabo.core.R;
-import org.deviceconnect.android.deviceplugin.fabo.param.FaBoShield;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 使用するピンを複数選択するためのフラグメント.
- */
-public class FaBoPinCheckBoxFragment extends FaBoBasePinFragment {
-
- /**
- * ピン情報を格納するアダプタ.
- *
- * FaBoShield.Pin.getPinNumber()の値を保持します.
- *
- */
- private MultiSelectPinAdapter mPinAdapter;
-
- @Override
- public View onCreateView(final LayoutInflater inflater, final ViewGroup container, final Bundle savedInstanceState) {
- View view = inflater.inflate(R.layout.fragment_fabo_pin_list, container, false);
-
- mPinAdapter = new MultiSelectPinAdapter();
-
- ListView listView = (ListView) view.findViewById(R.id.activity_fabo_pin_list_view);
- listView.setAdapter(mPinAdapter);
-
- return view;
- }
-
- @Override
- public List getSelectedPins() {
- ArrayList pins = new ArrayList<>();
- for (int i = 0; i < mPinAdapter.getCount(); i++) {
- if (mPinAdapter.mCheckedFlag.get(i)) {
- pins.add(((FaBoShield.Pin) mPinAdapter.getItem(i)).getPinNumber());
- }
- }
- return pins;
- }
-
- /**
- * 複数のピン選択するためのデータを格納するアダプタ.
- */
- private class MultiSelectPinAdapter extends BaseAdapter {
-
- /**
- * 選択状態を保持するリスト.
- */
- private List mCheckedFlag = new ArrayList<>();
-
- /**
- * ピンのリスト.
- */
- private List mPinList;
-
- /**
- * コンストラクタ.
- */
- MultiSelectPinAdapter() {
- mPinList = getCanUsePinList();
- for (int i = 0; i < getCount(); i++) {
- mCheckedFlag.add(containsPin(i));
- }
- }
-
- @Override
- public int getCount() {
- return mPinList.size();
- }
-
- @Override
- public Object getItem(final int position) {
- return mPinList.get(position);
- }
-
- @Override
- public long getItemId(final int id) {
- return id;
- }
-
- @Override
- public View getView(final int position, View convertView, final ViewGroup parent) {
- if (convertView == null) {
- LayoutInflater inflater = (LayoutInflater) getActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
- convertView = inflater.inflate(R.layout.item_fabo_check_box_pin, null);
- }
-
- FaBoShield.Pin pin = (FaBoShield.Pin) getItem(position);
-
- CheckBox checkBox = convertView.findViewById(R.id.item_fabo_check_box_pin);
- checkBox.setText(pin.getPinNames()[1]);
- checkBox.setChecked(mCheckedFlag.get(position));
- checkBox.setEnabled(!usedPin(pin.getPinNumber()));
- // CheckBox#setOnCheckedChangeListenerを使用するとListViewで
- // スクロールした時点でヘックが外れてしまう。
- // ここでは、その問題を回避するためにOnClickListenerを使用します。
- checkBox.setOnClickListener((view) -> {
- boolean isChecked = ((CheckBox) view).isChecked();
- mCheckedFlag.set(position, isChecked);
- });
-
- return convertView;
- }
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/setting/fragment/FaBoPinRadioGroupFragment.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/setting/fragment/FaBoPinRadioGroupFragment.java
deleted file mode 100644
index 6583480459..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/setting/fragment/FaBoPinRadioGroupFragment.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.setting.fragment;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CompoundButton;
-import android.widget.LinearLayout;
-import android.widget.RadioButton;
-import android.widget.RadioGroup;
-
-import org.deviceconnect.android.deviceplugin.fabo.core.R;
-import org.deviceconnect.android.deviceplugin.fabo.param.FaBoShield;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 使用するピンを1つだけ選択するためのフラグメント.
- */
-public class FaBoPinRadioGroupFragment extends FaBoBasePinFragment {
-
- /**
- * 選択されたPin.
- */
- private FaBoShield.Pin mSelectedPin;
-
- @Override
- public View onCreateView(final LayoutInflater inflater, final ViewGroup container, final Bundle savedInstanceState) {
- View view = inflater.inflate(R.layout.fragment_fabo_pin_group, container, false);
-
- List pins = getCanUsePinList();
-
- RadioGroup group = view.findViewById(R.id.activity_fabo_pin_layout);
- for (FaBoShield.Pin pin : pins) {
- group.addView(createRadioButton(inflater, pin),
- new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
- ViewGroup.LayoutParams.WRAP_CONTENT));
- }
-
- for (FaBoShield.Pin pin : pins) {
- if (containsPin(pin.getPinNumber())) {
- RadioButton radioButton = group.findViewWithTag(pin);
- radioButton.setChecked(true);
- mSelectedPin = pin;
- }
- }
-
- return view;
- }
-
- /**
- * ピンを選択するためのRadioButtonを作成します.
- * @param inflater インフレータ
- * @param pin ピン
- * @return RadioButtonのインスタンス
- */
- private RadioButton createRadioButton(final LayoutInflater inflater,final FaBoShield.Pin pin) {
- RadioButton radio = (RadioButton) inflater.inflate(R.layout.item_fabo_radio_button_pin, null, false);
- radio.setText(pin.getPinNames()[1]);
- radio.setTag(pin);
- radio.setEnabled(!usedPin(pin.getPinNumber()));
- radio.setOnCheckedChangeListener((compoundButton, b) -> {
- if (b) {
- mSelectedPin = pin;
- }
- });
- return radio;
- }
-
- @Override
- public List getSelectedPins() {
- List pins = new ArrayList<>();
- if (mSelectedPin != null) {
- pins.add(mSelectedPin.getPinNumber());
- }
- return pins;
- }
-}
-
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/profile/GPIOProfile.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/profile/GPIOProfile.java
deleted file mode 100644
index 94f0bd5852..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/profile/GPIOProfile.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.deviceconnect.android.profile;
-
-
-import android.content.Intent;
-
-import org.deviceconnect.profile.GPIOProfileConstants;
-
-public class GPIOProfile extends DConnectProfile implements GPIOProfileConstants {
-
- @Override
- public String getProfileName() {
- return PROFILE_NAME;
- }
-
- public static void setValue(final Intent message, final int value) {
- message.putExtra(PARAM_VALUE, value);
- }
-
- public static void setMessage(final Intent message, final String msg) {
- message.putExtra(PARAM_MSG, msg);
- }
-
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/profile/GPIOProfileConstants.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/profile/GPIOProfileConstants.java
deleted file mode 100644
index 3baee418fb..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/profile/GPIOProfileConstants.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.deviceconnect.profile;
-
-
-public interface GPIOProfileConstants extends DConnectProfileConstants {
-
- String PROFILE_NAME = "gpio";
-
- String INTERFACE_EXPORT = "export";
-
- String INTERFACE_DIGITAL = "digital";
-
- String INTERFACE_ANALOG = "analog";
-
- String ATTRIBUTE_ON_CHANGE = "onChange";
-
- String PARAM_VALUE = "value";
-
- String PARAM_MSG = "msg";
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/anim/decelerate_quint.xml b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/anim/decelerate_quint.xml
deleted file mode 100755
index 77eea6afdb..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/anim/decelerate_quint.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/anim/fragment_slide_left_exit.xml b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/anim/fragment_slide_left_exit.xml
deleted file mode 100755
index c317df2959..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/anim/fragment_slide_left_exit.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/anim/fragment_slide_right_enter.xml b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/anim/fragment_slide_right_enter.xml
deleted file mode 100755
index c04b58390e..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/anim/fragment_slide_right_enter.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/anim/fragment_slide_right_exit.xml b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/anim/fragment_slide_right_exit.xml
deleted file mode 100755
index f9ab739bf9..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/anim/fragment_slide_right_exit.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/drawable-hdpi/dconnect_icon.png b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/drawable-hdpi/dconnect_icon.png
deleted file mode 100644
index 35a40d9e4c..0000000000
Binary files a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/drawable-hdpi/dconnect_icon.png and /dev/null differ
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/drawable-mdpi/dconnect_icon.png b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/drawable-mdpi/dconnect_icon.png
deleted file mode 100644
index 871b14f757..0000000000
Binary files a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/drawable-mdpi/dconnect_icon.png and /dev/null differ
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/drawable-xhdpi/dconnect_icon.png b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/drawable-xhdpi/dconnect_icon.png
deleted file mode 100644
index 54775953e0..0000000000
Binary files a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/drawable-xhdpi/dconnect_icon.png and /dev/null differ
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/drawable-xxhdpi/dconnect_icon.png b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/drawable-xxhdpi/dconnect_icon.png
deleted file mode 100644
index b342dc3a3c..0000000000
Binary files a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/drawable-xxhdpi/dconnect_icon.png and /dev/null differ
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/drawable-xxhdpi/fabo_arrow.png b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/drawable-xxhdpi/fabo_arrow.png
deleted file mode 100644
index 7ba2cd2de3..0000000000
Binary files a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/drawable-xxhdpi/fabo_arrow.png and /dev/null differ
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/drawable/button_blue.xml b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/drawable/button_blue.xml
deleted file mode 100644
index b4510ed970..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/drawable/button_blue.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/drawable/button_blue_circle.xml b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/drawable/button_blue_circle.xml
deleted file mode 100644
index fe9fbc5df3..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/drawable/button_blue_circle.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
- -
-
-
-
-
-
- -
-
-
-
-
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/drawable/button_blue_text.xml b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/drawable/button_blue_text.xml
deleted file mode 100644
index 54e4d7945d..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/drawable/button_blue_text.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/drawable/button_red.xml b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/drawable/button_red.xml
deleted file mode 100644
index 53c16e2caf..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/drawable/button_red.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/drawable/divider.xml b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/drawable/divider.xml
deleted file mode 100644
index 067273ee7c..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/drawable/divider.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/layout/activity_fabo_pin_list.xml b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/layout/activity_fabo_pin_list.xml
deleted file mode 100644
index 166fc37a1e..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/layout/activity_fabo_pin_list.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/layout/activity_fabo_profile_list.xml b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/layout/activity_fabo_profile_list.xml
deleted file mode 100644
index 2fb7845a09..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/layout/activity_fabo_profile_list.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/layout/activity_fabo_virtual_service.xml b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/layout/activity_fabo_virtual_service.xml
deleted file mode 100644
index d32721ef25..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/layout/activity_fabo_virtual_service.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/layout/fragment_fabo_pin_group.xml b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/layout/fragment_fabo_pin_group.xml
deleted file mode 100644
index b0e9049fee..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/layout/fragment_fabo_pin_group.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/layout/fragment_fabo_pin_list.xml b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/layout/fragment_fabo_pin_list.xml
deleted file mode 100644
index 73de10f4c0..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/layout/fragment_fabo_pin_list.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/layout/fragment_service_list_remover.xml b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/layout/fragment_service_list_remover.xml
deleted file mode 100644
index d10cce6379..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/layout/fragment_service_list_remover.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/layout/fragment_service_list_viewer.xml b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/layout/fragment_service_list_viewer.xml
deleted file mode 100644
index 1ec1e07100..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/layout/fragment_service_list_viewer.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/layout/item_fabo_check_box_pin.xml b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/layout/item_fabo_check_box_pin.xml
deleted file mode 100644
index c312224942..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/layout/item_fabo_check_box_pin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/layout/item_fabo_profile.xml b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/layout/item_fabo_profile.xml
deleted file mode 100644
index b4c8cef878..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/layout/item_fabo_profile.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/layout/item_fabo_profile_a.xml b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/layout/item_fabo_profile_a.xml
deleted file mode 100644
index 2ba2aad9c6..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/layout/item_fabo_profile_a.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/layout/item_fabo_radio_button_pin.xml b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/layout/item_fabo_radio_button_pin.xml
deleted file mode 100644
index dee6aec1b9..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/layout/item_fabo_radio_button_pin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/menu/menu_fabo_service_list_viewer.xml b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/menu/menu_fabo_service_list_viewer.xml
deleted file mode 100644
index 717b1d5bdd..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/menu/menu_fabo_service_list_viewer.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/mipmap-hdpi/ic_launcher.png b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index cde69bccce..0000000000
Binary files a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/mipmap-mdpi/ic_launcher.png b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index c133a0cbd3..0000000000
Binary files a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index bfa42f0e7b..0000000000
Binary files a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 324e72cdd7..0000000000
Binary files a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index aee44e1384..0000000000
Binary files a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/raw/standardfirmata_hex b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/raw/standardfirmata_hex
deleted file mode 100644
index 001cd1ce88..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/raw/standardfirmata_hex
+++ /dev/null
@@ -1,764 +0,0 @@
-:100000000C9474000C949C000C949C000C949C0028
-:100010000C949C000C949C000C949C000C949C00F0
-:100020000C949C000C949C000C949C000C949307E2
-:100030000C949C000C949C000C949C000C949C00D0
-:100040000C9445100C949C000C9485130C94B713DD
-:100050000C949C000C949C000C949C000C949C00B0
-:100060000C94570B0C949C00D906F5061706F50660
-:100070008006F506F505A205F506F506F506F50672
-:10008000F506B904F5068805F506DC05000000084C
-:10009000000201000003040700000000000000004F
-:1000A000010204081020408001020408102001020F
-:1000B00004081020040404040404040402020202DC
-:1000C00002020303030303030000000025002800CD
-:1000D0002B0000000000240027002A001E04750ADF
-:1000E00036103A10E713701411241FBECFEFD8E07A
-:1000F000DEBFCDBF11E0A0E0B1E0E6ECFEE202C061
-:1001000005900D92AC3DB107D9F724E0ACEDB1E01C
-:1001100001C01D92AC3AB207E1F710E0C8EED0E0A2
-:1001200004C02297FE010E94E815CC3DD107C9F713
-:100130000E9480140C9461170C940000833008F026
-:1001400062C0482F440F440F440F485F453108F008
-:1001500044E1582F550F550F550F90E071E054179B
-:10016000E8F42EEF250F2231B0F4E52FF0E0DF01A7
-:10017000A756BD4F2C91223070F4972BEE0FFF1F26
-:10018000E259FD4F21E030E0A72FA62311F420E033
-:1001900030E031832083770F5F5FE1CF81110AC0A8
-:1001A0009C7FF8942BB1892F809582239623892BED
-:1001B0008BB928C08130C9F46923F89425B1892FFF
-:1001C0008F7380958223262F2F73822B85B988B158
-:1001D00062956695669563709295969596959370DF
-:1001E00090959823692B68B90DC09F70F89428B139
-:1001F000892F880F880F809582236923660F660FE9
-:10020000862B88B9789408950F931F93CF93DF932B
-:10021000EB01843180F5082F10E0F801E756FD4F1F
-:1002200090819330A1F0943031F582508231E0F426
-:10023000F801E551FE4F208130E0C901880F991F78
-:10024000820F931F81509E4F0E9430090DC0833052
-:1002500041F09BEF980F923020F097EF980F93307A
-:1002600018F4BE010E944911F801EE0FFF1FE25978
-:10027000FD4FD183C083DF91CF911F910F910895DE
-:10028000CF93C82F863058F54091B3025091B402F5
-:1002900021E030E0082E02C0220F331F0A94E2F75B
-:1002A000672B49F420953095242335233093B402ED
-:1002B0002093B30214C0242B352B3093B402209327
-:1002C000B3028091DC0181110AC08C2F0E942C1195
-:1002D000AC016C2F8BE993E0CF910C94FF0DCF9183
-:1002E0000895DB019A019091DD019C30D0F5409199
-:1002F000DE01682F70E0442369F0E42FF0E0E25261
-:10030000FE4F8081FB01E551FE4F808341504093B9
-:10031000DE0107C0FB01E551FE4F90839F5F909384
-:10032000DD01FB01E551FE4F1A161B067CF4121687
-:10033000130664F4408150E0CA01880F991F840FAE
-:10034000951FAD0181509E4F0C946B08208130E0C9
-:10035000C901880F991F820F931F81509E4F0C94E3
-:10036000E9086EE071E08BE993E00C948E0ECF9378
-:10037000DF93C82FD0E0C551DE4F288130E0C9019E
-:10038000880F991F820F931F81509E4F0E94EF0884
-:1003900088819091DD01891306C0882379F081500E
-:1003A0008093DD010BC0992349F0E091DE01EF5FFE
-:1003B000E093DE01F0E0E252FE4F80838FEF88830E
-:1003C000DF91CF9108951F93CF93DF93162FC82FFE
-:1003D000D0E0FE01EA56FD4F90811923C355DD4F51
-:1003E000411103C09881911741F0412F50E0682FCF
-:1003F0008BE993E00E94180E1883DF91CF911F9133
-:100400000895833020F5282F30E0F901E055FD4FA5
-:100410006083672BE1F0F901EA56FD4F908181116D
-:1004200003C069B16C7F0FC0813049F463B126B15C
-:1004300040E4249F900111246F73622B04C066B1C5
-:100440006C7366956695692341E00C94E301089509
-:100450008091B002882349F069B1809196026823A7
-:100460006C7F40E080E00E94E3018091B10288232C
-:1004700079F063B186B120E4829FC00111246F73CB
-:10048000682B80919702682340E081E00E94E3019D
-:100490008091B202882359F066B16C7366956695B7
-:1004A00080919802682340E082E00C94E301089573
-:1004B000109225028FEF80930A010895AF92BF92A8
-:1004C000DF92EF92FF920F931F93CF93DF9300D0B1
-:1004D000CDB7DEB7D82E5B01E82EF12C8701075689
-:1004E0001D4FF80180818F3709F402C1863049F42D
-:1004F00080912502882329F06630710511F00E9451
-:1005000058024EEF4D0D4231C0F484E0A816B104FC
-:10051000A1F0F701E551FE4F20812C3070F430E05E
-:10052000C901880F991F820F931F81509E4F4A83E4
-:100530000E9495094A818111C3C092EF9D0D9630AA
-:1005400078F461E070E0E2E0AE16B10411F060E032
-:1005500070E0892F4A8399830E94400199814A81E2
-:100560004231D8F4ED2DE695E695E6958D2D877010
-:10057000F0E0EA56FD4F21E030E0082E01C0220FE6
-:100580000A94EAF7A114B10421F48081822B8083BC
-:1005900004C02095808128232083F701EE0FFF1FE0
-:1005A000E259FD4F11821082F2E0AF16B104A1F0C2
-:1005B0003CF4A114B104F9F0AA94AB2851F16FC036
-:1005C000F4E0AF16B10409F448C084F1E6E0AE16D9
-:1005D000B10409F45CC063C0963008F089C04231B0
-:1005E00040F460E08D2D0E94D11160E08D2D0E94BD
-:1005F0000A1282E051C0423108F07AC060E08D2DCD
-:100600000E94D11160E08D2D0E940A12F801108223
-:100610006FC0423108F06CC060E08D2D0E940A125C
-:1006200061E08D2D0E94D11181E036C0F3E0DF162C
-:1006300049F08BEF8D0D823028F087EF8D0D8330E0
-:1006400008F056C061E08D2D0E94D11160E070E08D
-:100650008D2D0E94491183E01FC0423108F048C02F
-:1006600084E0F8018083F701E551FE4F80818F3FE0
-:1006700069F190E09C01220F331F280F391FC90137
-:1006800081509E4F0E949509811132C01FC08EEE8D
-:100690008D0D823068F586E0F801808329C062E222
-:1006A00071E08BE993E00F900F90DF91CF911F9154
-:1006B0000F91FF90EF90DF90BF90AF900C948E0E53
-:1006C0008D2D4A830E94B7014A8137CF4FEF5FEFEC
-:1006D0006FEF7FEF8D2D0F900F90DF91CF911F91D6
-:1006E0000F91FF90EF90DF90BF90AF900C9471014D
-:1006F0000F900F90DF91CF911F910F91FF90EF908E
-:10070000DF90BF90AF900895CF93C0E08EEE8C0F36
-:10071000823028F466E070E08C2F0E945E02CF5F8A
-:10072000C431A1F781E0809325028BED92E0CF9157
-:100730000C943B0A0F931F93CF93DF9381E0809338
-:10074000DC018091250281110E9458021092B002B2
-:10075000109296021092AD021092B102109297027E
-:100760001092AE021092B202109298021092AF0252
-:10077000CBEED1E010E00FEF82EF810F863018F45E
-:1007800062E070E002C061E070E0812F0E945E02D2
-:1007900009931F5F143181F71092B4021092B302D3
-:1007A0001092DE011092DD011092DC01DF91CF91F9
-:1007B0001F910F91089524E042E063E371E08BE91B
-:1007C00093E00E94260D44E051E060EE8BE993E057
-:1007D0000E949C0E4EE950E060E98BE993E00E9494
-:1007E0009C0E40E451E060EC8BE993E00E949C0E8B
-:1007F00041E052E060ED8BE993E00E949C0E4EE5F3
-:1008000052E064EF8BE993E00E949C0E45EA54E0CD
-:1008100060EF8BE993E00E94C70E4AE953E06FEF67
-:100820008BE993E00E94BF0E40E051EE60E070E083
-:100830008BE993E00E941F100C949A03CF93DF93EF
-:10084000CFEFD1E0CE010E944F08239682E0C33261
-:10085000D807C1F7DF91CF910895682F8BED92E013
-:100860000C94FC098BED92E00E94AC090895DF9294
-:10087000EF92FF920F931F93CF93DF93F82EEB012C
-:10088000D42E6F3F8FEF7807A9F06F2D8BED92E09C
-:100890000E94550A8C2F0E942D048BED92E00E943D
-:1008A000720A8091230290912402009729F00E94FD
-:1008B000E61002C0C0E0D0E04D2D6F2D8BED92E030
-:1008C0000E94520A0D2D10E08BED92E00E94A409C7
-:1008D000081719071CF467E471E009C08BED92E07A
-:1008E0000E94A4098017910734F464E671E08BE953
-:1008F00093E00E948E0EF0922602C093270268E2D7
-:10090000E62E62E0F62EC0E0D0E0C017D10784F0FA
-:1009100042E04D0D26E232E067E78BE993E0DF919C
-:10092000CF911F910F91FF90EF90DF900C94460EA6
-:100930008BED92E00E94A409892B51F30E943204AE
-:10094000F70181937F012196E0CFEF92FF920F9301
-:100950001F93CF93DF93162FEA0190E0FC01E95635
-:10096000F109E231F10508F040C2EC5CFF4F0C9454
-:10097000E6158981982F987185FF03C060E871E0C2
-:1009800056C08881983071F148F491112EC2682FB9
-:100990008BED92E00E94550A02E007C0903109F405
-:1009A00040C0983109F471C020C2011768F4FE01FB
-:1009B000E00FF11D9181808120E8929F8019112420
-:1009C0000E942D040E5FF1CF8BED92E00E94720A1F
-:1009D00086E490E0DF91CF911F910F91FF90EF900F
-:1009E0000C94E6104A816B81163069F430E8639FFD
-:1009F000B0011124640F711D9D814C8150E8959FB9
-:100A00004019112406C090E8699F401911246FEF26
-:100A10007FEFDF91CF911F910F91FF90EF900C949A
-:100A20003704E0910A01E73064F060EA71E08BE995
-:100A300093E0DF91CF911F910F91FF90EF900C9475
-:100A40008E0E9A812B81F0E8663061F42F9F900121
-:100A50001124290F311D4D819C8150E8459F90192B
-:100A6000112405C02F9F901911242FEF3FEFEF5F46
-:100A7000E0930A0144E0E402F0011124EA5BFD4F37
-:100A80008083328321839383B0C150910A0115166C
-:100A900034F440E0252F332727FD30950EC08FEF2B
-:100AA00080930A01A2C1EE0FFF1FEE0FFF1FEA5B4A
-:100AB000FD4F9081981719F14F5FE42FF0E02E174A
-:100AC0003F078CF740E01BC04830C0F4DF01AA0F9D
-:100AD000BB1FAA0FBB1FA65BBD4F8C91EE0FFF1F64
-:100AE000EE0FFF1FEA5BFD4F808311968D919C9165
-:100AF00012979283818313968C9183834F5FE42FA7
-:100B0000F0E02E173F0704F7515050930A016DC1D2
-:100B10002881898150E8859FC0011124820F911D91
-:100B2000009721F090932402809323028091250264
-:100B300081115BC1DF91CF911F910F91FF90EF90D9
-:100B40000C948403653008F450C118810981FA803F
-:100B5000EB80CC818EEF810F823108F046C1E12F0E
-:100B6000F0E0E551FE4FE081EC3060F4F0E0CF01C1
-:100B7000880F991F8E0F9F1F81509E4F0E949509CD
-:100B800081112FC180E8C89FA00111244E0D511D75
-:100B900090E8F99EB0011124600F711D812F0E9411
-:100BA000710164E070E0812FDF91CF911F910F916F
-:100BB000FF90EF900C945E02623008F416C1288119
-:100BC0008981E0E88E9FC0011124820F911D9093CE
-:100BD0000C0180930B010A9708F007C18AE090E0AE
-:100BE00090930C0180930B0100C1623008F4FDC0AA
-:100BF000698170E0123091F08A81F0E88F9FC00126
-:100C00001124682B792B133049F08B8190E090E40C
-:100C1000899F902D88271124682B792B8881DF915B
-:100C2000CF911F910F91FF90EF900C94040160EF12
-:100C30008BE993E00E94920E6CE68BE993E00E94B0
-:100C4000920ECEEF84EF8C0F863058F462E08BE981
-:100C500093E00E94920E6AE08BE993E00E94920E6C
-:100C60000DC0C13059F463E08BE993E00E94920E0D
-:100C700068E08BE993E00E94920E08C08DEF8C0F24
-:100C8000823088F389EF8C0F833068F3C23150F4DF
-:100C900064E08BE993E00E94920E6EE08BE993E0B2
-:100CA0000E94920E80EF8C0F823050F466E08BE948
-:100CB00093E00E94920E61E08BE993E00E94920E15
-:100CC0006FE78BE993E00E94920ECF5FC23169F12A
-:100CD000C23108F0B7CF60E08BE993E00E94920E3A
-:100CE00061E08BE993E00E94920E61E08BE993E072
-:100CF0000E94920E61E08BE993E00E94920EA2CFD7
-:100D0000662309F472C0C88160EF8BE993E00E940A
-:100D1000920E6EE68BE993E00E94920E6C2F8BE9A7
-:100D200093E00E94920EC43158F067EF8BE993E094
-:100D3000DF91CF911F910F91FF90EF900C94920E45
-:100D4000D0E0FE01E756FD4F60818BE993E00E9401
-:100D5000920ECC0FDD1F8E0102591D4FF8016081EC
-:100D60006F778BE993E00E94920EF80160817181A8
-:100D7000CB018078892B49F0660F672F661F770BB0
-:100D80006F778BE993E00E94920EC259DD4F688124
-:100D90007981CB018827907C892B39F2770F660BFC
-:100DA000770F762F661F6F778BE993E00E94920E84
-:100DB000BCCF60EF8BE993E00E94920E6AE68BE96C
-:100DC00093E00E94920EC2EFC63010F06FE701C0B0
-:100DD0006C2F8BE993E00E94920ECF5FC630A1F793
-:100DE000A4CF812F0E94B701CDCEDF91CF911F916B
-:100DF0000F91FF90EF9008958F929F92AF92BF92C4
-:100E0000CF92DF92EF92FF920F931F93CF93DF93D6
-:100E10000E9428028BE993E00E94860D892B29F01D
-:100E20008BE993E00E94F20EF5CF0E948F10609341
-:100E30006A0270936B0280936C0290936D02C09073
-:100E40006602D0906702E0906802F09069024091DB
-:100E50000B0150910C014A01A12CB12C8B019C017A
-:100E60000C191D092E093F0980169106A206B3062A
-:100E700008F04CC0D501C4018C0D9D1DAE1DBF1DD9
-:100E80008093660290936702A0936802B093690210
-:100E9000C9E9D2E012EF1630C0F488818230A9F49B
-:100EA0002091B3023091B402012E02C035952795EE
-:100EB0000A94E2F720FF09C0812F0E942C11AC0197
-:100EC000612F8BE993E00E94FF0D1F5F2196163082
-:100ED00011F780910A0187FD19C0C0E0EC2FF0E006
-:100EE00080910A01992787FD90958E179F0774F0CE
-:100EF000EE0FFF1FEE0FFF1FEA5BFD4F6181728156
-:100F0000438180810E943704CF5FE8CFDF91CF918A
-:100F10001F910F91FF90EF90DF90CF90BF90AF9017
-:100F20009F908F9008951F920F920FB60F921124E9
-:100F30002F933F934F935F936F937F938F939F93E1
-:100F4000AF93BF93EF93FF938091B60287FF05C0E5
-:100F500010928500109284001AC02091B6023327A7
-:100F600027FD30958091B50290E0281739077CF471
-:100F70008091B602992787FD9095FC01EE0FFF1F27
-:100F8000E80FF91FE954FD4F808186FD15C080915F
-:100F9000B6028F5F8093B6022091B602332727FDF9
-:100FA00030958091B50290E028173907BCF4809104
-:100FB000B6028C305CF112C08091B602992787FD91
-:100FC0009095FC01EE0FFF1FE80FF91FE954FD4F4C
-:100FD000808160E08F730E940A12D9CF80918400D3
-:100FE00090918500049680349C4918F480E49CE933
-:100FF00005C08091840090918500049690938900AB
-:10100000809388008FEF8093B60238C020918400CF
-:10101000309185008091B602992787FD9095FC015B
-:10102000EE0FFF1FE80FF91FE954FD4F81819281F8
-:10103000820F931F90938900809388008091B6025D
-:10104000992787FD9095FC01EE0FFF1FE80FF91F10
-:10105000E954FD4F808186FF11C08091B602992727
-:1010600087FD9095FC01EE0FFF1FE80FF91FE95473
-:10107000FD4F808161E08F730E940A12FF91EF9112
-:10108000BF91AF919F918F917F916F915F914F91A0
-:101090003F912F910F900FBE0F901F9018952091A8
-:1010A000B5022C30A0F431E0320F3093B502FC01D0
-:1010B0002083822F90E0FC01EE0FFF1FE80FF91F45
-:1010C000E954FD4F88EB9BE09283818308952FEFD5
-:1010D000FC0120830895DF92EF92FF920F931F93FC
-:1010E000CF93DF93EC01D62E7A01890188818C3071
-:1010F00008F066C061E08D2D0E94D1118881A82F73
-:10110000B0E0FD01EE0FFF1FEA0FFB1FE954FD4F9A
-:101110002D2D2F739081907C922B908360E272E052
-:101120006E197F0977FF02C06D5F7F4F75956795D8
-:1011300075956795698340E659E0401B510B57FF51
-:1011400002C04D5F5F4F55954795559547954A832A
-:101150006CE00E9499159CE0899FB001112420E069
-:1011600030E0A901460F571FFA01EE0FFF1FE40FF1
-:10117000F51FE954FD4F908196FD16C02F5F3F4F3C
-:101180002C30310571F781110FC01092800082E080
-:10119000809381001092850010928400B19A809112
-:1011A0006F00826080936F00888190E0FC01EE0FF9
-:1011B000FF1FE80FF91FE954FD4F80818064808391
-:1011C0008881DF91CF911F910F91FF90EF90DF9079
-:1011D000089520E639E040E252E00C946B08FC01EF
-:1011E000808190E0FC01EE0FFF1FE80FF91FE9542A
-:1011F000FD4F80818F7B80830895FC0180818C303E
-:1012000070F5918128E830E0291B310997FD33956D
-:10121000220F331F220F331F621773077CF0928156
-:1012200028E532E0291B310997FD3395220F331F42
-:10123000220F331F621773070CF49B0122503109F0
-:10124000220F331F4FB7F89490E0FC01EE0FFF1F01
-:10125000E80FF91FE954FD4F328321834FBF0895F2
-:101260004F925F926F927F92AF92BF92CF92DF9236
-:10127000EF92FF920F931F93CF93DF93EC016032B5
-:1012800082E078070CF040C077FD06C0653B710531
-:101290002CF064EB70E002C060E070E0898128E827
-:1012A00030E0281B310987FD3395220F331F220FB1
-:1012B000331F5901CC24B7FCC094DC2C882777FD60
-:1012C0008095982F2A8148E552E0421B510927FD5D
-:1012D0005395440F551F440F551F2A01662457FC90
-:1012E0006094762C7F926F925F924F9214EBE12E76
-:1012F000F12C00E010E020E030E0A9010E9441154F
-:101300000F900F900F900F90CE01DF91CF911F9112
-:101310000F91FF90EF90DF90CF90BF90AF907F90B4
-:101320006F905F904F900C94FD08FC01808190E0DD
-:10133000FC01EE0FFF1FE80FF91FE954FD4F8081FC
-:1013400086FB882780F9089580910B0390E0209117
-:101350000C03821B9109089520910C0380910B03CB
-:10136000281750F4E22FF0E0E35FFC4F808190E01B
-:101370002F5F20930C0308958FEF9FEF0895E09166
-:101380000C0380910B03E81730F4F0E0E35FFC4FAF
-:10139000808190E008958FEF9FEF08950895CF9298
-:1013A000DF92EF92FF920F931F93CF93DF937C0115
-:1013B000CB018A012091E702222389F0EB016B0126
-:1013C000C40ED51ECC15DD0569F06991D701ED91EC
-:1013D000FC910190F081E02DC7010995F3CF642FB6
-:1013E0000E942E0BC801DF91CF911F910F91FF90AA
-:1013F000EF90DF90CF900895CF93DF931F92CDB7FA
-:10140000DEB769832091E7022223D1F02091E80220
-:10141000203240F021E030E0FC013383228380E081
-:1014200090E015C08091E902E82FF0E0E651FD4F11
-:10143000998190838F5F8093E9028093E80205C0D1
-:1014400061E0CE0101960E942E0B81E090E00F90AA
-:10145000DF91CF910895FC011382128248EE53E090
-:1014600060E070E0448355836683778385EB91E089
-:1014700091838083089510920C0310920B031092B5
-:10148000E9021092E8020C94790A862F413208F0A2
-:1014900040E26DE073E00E94970A10920C03809383
-:1014A0000B03089521E00C94450A81E08093E70244
-:1014B00060930A031092E9021092E80208950F93D4
-:1014C000062F21E04091E8026AEE72E080910A0363
-:1014D0000E94DB0A1092E9021092E8021092E702E1
-:1014E0000F91089561E00C945F0A8BED92E00C94EB
-:1014F0002B0A10929A0381E080939803109297032D
-:1015000061E082E10E940A1261E083E10E940A1216
-:10151000E9EBF0E080818E7F808380818D7F808306
-:1015200088E48093B80085E48093BC00089541323C
-:1015300008F03FC090919A039111FCCF91E09093F5
-:101540009A03209398032FEF20932D031092720398
-:10155000240F209371039093990390919903880F1E
-:10156000892B8093990380919703813041F41092E5
-:101570009703809199038093BB0085EC01C085EEB1
-:101580008093BC0080919A038130E1F380917203D3
-:10159000841710F44091720323E733E0FB01D90173
-:1015A0008A2F821B841718F48D918193F9CF842F91
-:1015B000089580E008950F93413208F046C090915D
-:1015C0009A039111FCCF92E090939A0300939803B1
-:1015D0009FEF90932D031092720340937103FB01D0
-:1015E00063E773E0DB019A2F961B941718F491912F
-:1015F0009D93F9CF1092990390919903880F892BAD
-:101600008093990380919703813041F4109297035E
-:10161000809199038093BB0085EC01C085EE809397
-:10162000BC00222321F080919A038230E1F3809163
-:101630002D038F3F61F080912D03803251F0809116
-:101640002D03803341F483E007C081E005C080E0D2
-:1016500003C082E001C084E00F910895613298F4E4
-:1016600020919A03243089F460934F03FC0181E5B3
-:1016700093E0DC012A2F281B261718F421912D93C3
-:10168000F9CF80E0089581E0089582E0089585ED26
-:101690008093BC008091BC0084FDFCCF10929A0323
-:1016A000089585EC8093BC0010929A0308951F92D0
-:1016B0000F920FB60F9211242F933F934F935F9386
-:1016C0006F937F938F939F93AF93BF93EF93FF930A
-:1016D0008091B900887F803609F49CC068F5883213
-:1016E00009F45BC090F4803109F454C038F48823C5
-:1016F00009F4F5C0883009F44DC0F5C0883109F40B
-:101700004CC0803209F45DC0EEC0803409F468C07A
-:1017100048F4803309F455C0883309F0E4C080935D
-:101720002D03A8C0803509F44FC0883509F45DC089
-:10173000883409F0D8C0D5C0883909F4C6C0A8F4E7
-:10174000883709F467C038F4883609F463C08037F5
-:1017500009F460C0C8C0883809F4B7C0803909F4FA
-:101760005FC0803809F0BFC05BC0803B09F485C012
-:1017700038F4803A09F466C0883A09F47EC0B3C0F0
-:10178000803C09F4A6C0883C09F4A3C0883B09F456
-:1017900089C0A9C08091990310C090917203809173
-:1017A0007103981770F5E091720381E08E0F8093BA
-:1017B0007203F0E0ED58FC4F80818093BB0085EC14
-:1017C00085C080932D038DC0E091720381E08E0F60
-:1017D000809372038091BB00F0E0ED58FC4F808352
-:1017E00090917203809171036DC0E091720381E06A
-:1017F0008E0F809372038091BB00F0E0ED58FC4F98
-:1018000080838091980381116CC081E0809397035D
-:1018100084EA60C083E080939A0310922E03CFCFB6
-:1018200080912E03803208F050C0E0912E0381E0B9
-:101830008E0F80932E038091BB00F0E0E15DFC4FA2
-:101840008083BDCF80912E03803230F4E0912E034F
-:10185000F0E0E15DFC4F10820E94470B60912E0387
-:1018600070E0E0919303F09194038FE293E0099587
-:1018700010922E030E94510B36C084E080939A038D
-:101880001092500310924F03E0919503F09196034C
-:10189000099580914F03811105C081E080934F032A
-:1018A00010925103E091500381E08E0F809350031A
-:1018B000F0E0EF5AFC4F80818093BB009091500381
-:1018C00080914F03981708F47ACF85E88093BC0085
-:1018D0000AC085EC8093BC0010929A0304C0109259
-:1018E0002D030E94470BFF91EF91BF91AF919F9104
-:1018F0008F917F916F915F914F913F912F910F90B9
-:101900000FBE0F901F9018950F931F93CF93DF93E7
-:10191000EC018B0188819981DC01ED91FC916F775D
-:101920000190F081E02D099588819981DC01ED918C
-:10193000FC91B801660F672F661F770B6F770190D8
-:10194000F081E02DDF91CF911F910F910994DC017F
-:101950008D919C91DC01ED91FC910190F081E02D45
-:1019600060EF0994DC018D919C91DC01ED91FC917B
-:101970000190F081E02D67EF0994CF93DF93EC01A4
-:1019800088819981DC01ED91FC910190F081E02D3D
-:1019900069EF099588819981DC01ED91FC910190B5
-:1019A000F081E02D62E0099588819981DC01ED915B
-:1019B000FC910190F081E02D64E0DF91CF910994DA
-:1019C0001F93CF93DF93EC018A818823D9F1CE0155
-:1019D0000E94A70C88819981DC01ED91FC91019016
-:1019E000F081E02D69E7099588819981DC01ED910D
-:1019F000FC91AB81BC810190F081E02D6C91099547
-:101A000088819981DC01ED91FC91AB81BC810190D1
-:101A1000F081E02D11966C91099512E08A811817DA
-:101A200058F4EB81FC81E10FF11D608170E0CE0183
-:101A30000E94840C1F5FF2CFCE01DF91CF911F91E6
-:101A40000C94B20CDF91CF911F910895CF92DF9249
-:101A5000EF92FF920F931F93CF93DF938C01EB01D3
-:101A6000C42ED22E61EC71E0CE010E9447177C019A
-:101A70006FE270E0CE010E943C17009739F46CE5EC
-:101A800070E0CE010E943C17009711F0EC01219606
-:101A9000E114F10451F4FE0101900020E9F7EC1B80
-:101AA000EF5FD8011296EC9306C0EC1AFD0AE3949E
-:101AB000E394F801E282D80113968D919C911497DA
-:101AC0000E949E16F801E280F12CC70101960E9447
-:101AD0000616D80114969C938E931397FC01EE0D75
-:101AE000FF1D1082FC01C082D18212964C9150E001
-:101AF00042505109BE010296DF91CF911F910F9183
-:101B0000FF90EF90DF90CF900C942D17DC018D911A
-:101B10009C91DC01ED91FC910480F581E02D09940C
-:101B20000F931F93CF93DF93FC012085213749F05A
-:101B3000293709F049C0DF91CF911F910F910C9483
-:101B4000E00CFC01E95AFF4F0190F081E02D309745
-:101B500009F450C0DC01A75BBF4F4D915C919A0125
-:101B60002150310937FD9A01B90175956795062F06
-:101B700040E050E020E030E04E5F5F4F2017A0F4DF
-:101B8000EC01C40FD51F1F81DC01A20FB31F1896F3
-:101B90001C931897C885D0E8CD9F1019112418966A
-:101BA0001C932F5F3F4FE8CFDC01A60FB11D1796A6
-:101BB0002C911797222311F018961C920896DF910A
-:101BC000CF911F910F910994FC01E75AFF4F0190AB
-:101BD000F081E02D309771F0AC01475F5F4FDC0181
-:101BE000A75BBF4F6C916150822FDF91CF911F9106
-:101BF0000F910994DF91CF911F910F9108950F9349
-:101C00001F93CF93DF93EC018A0188819981DC01D6
-:101C1000ED91FC916F70606E0190F081E02D09955F
-:101C2000B801CE01DF91CF911F910F910C94840CDC
-:101C30000F931F93CF93DF93EC018A0188819981E1
-:101C4000DC01ED91FC916F7060690190F081E02DF5
-:101C5000099588819981DC01ED91FC91602F6F7766
-:101C60000190F081E02D099588819981DC01ED9149
-:101C7000FC91B801660F672F661F770B0190F0810A
-:101C8000E02DDF91CF911F910F910994CF92DF92B8
-:101C9000EF92FF920F931F93CF93DF9300D01F9289
-:101CA000CDB7DEB78C01F42E2A833B8369830E9473
-:101CB000A70CD8018D919C91DC01ED91FC910190D4
-:101CC000F081E02D698109952A81E22EC22E3B81A7
-:101CD000D32E8C2D8E198F1540F4F60161916F0172
-:101CE00070E0C8010E94840CF4CFC8010F900F90DF
-:101CF0000F90DF91CF911F910F91FF90EF90DF90A8
-:101D0000CF900C94B20C9A01FA0101900020E9F7EF
-:101D10003197E41BF50B4E2F0C94460EAB0161E797
-:101D20000C94830EDC018D919C91DC01ED91FC9172
-:101D30000190F081E02D0994603DB9F028F46039FC
-:101D400061F0603C71F00895603E19F0643F89F0E5
-:101D50000895FC01E55BFF4F0FC0FC01E35BFF4F03
-:101D60000BC0FC01E15BFF4F07C0FC01EF5AFF4FC6
-:101D700003C0FC01ED5AFF4F5183408308956F3F2C
-:101D800029F4FC01EB5AFF4F518340830895875A91
-:101D90009F4FFC01518340830895FC0115821682F8
-:101DA000178280E090E0DF01A80FB91F18961C92FF
-:101DB000019680349105B9F7DF01A85BBF4F1C92F3
-:101DC00011961D921C92EB5AFF4F0190F081E02D6D
-:101DD000309709F009940895FC011282148213824D
-:101DE0000C94CD0ECF93DF93EC0188819981DC01B7
-:101DF000ED91FC910680F781E02D0995FE01E85BED
-:101E0000FF4F20812223B1F0873F910531F41082EA
-:101E1000CE01DF91CF910C94900DFE01E75BFF4F57
-:101E200020813181C20FD31F88872F5F3F4F3183BD
-:101E300020839DC02D81222309F45EC08038910546
-:101E40000CF05AC09FEF920F9D83FE01E90FF11D28
-:101E5000808791118CC08E81882309F488C0803DD1
-:101E6000E9F148F48039E9F0803C09F043C0FE0113
-:101E7000E15BFF4F36C0803E19F0843F19F13AC054
-:101E8000FE01E55BFF4F0190F081E02D309791F16D
-:101E90008885698570E0B0E88B9F600D711D112405
-:101EA00027C0FE01E35BFF4F0190F081E02D3097EA
-:101EB00009F18885698570E090E8899F600D711D42
-:101EC000112416C0FE01ED5AFF4F0190F081E02D64
-:101ED000309781F0688570E089850BC0FE01EF5A6C
-:101EE000FF4F0190F081E02D309721F0688570E080
-:101EF0008F8109951E823BC0803F91052CF4282FCD
-:101F00002F702F83807F9927803E910521F154F413
-:101F1000803C910511F1803D9105F9F080399105E2
-:101F200031F519C0843F9105B1F054F4803F91051B
-:101F3000F1F481E08083C75BDF4F1982188217C0FC
-:101F4000893F910571F08F3F910589F4CE01DF91B2
-:101F5000CF910C94CD0E92E001C091E09D838E83D1
-:101F600006C08BE993E0DF91CF910C94BD0CDF911B
-:101F7000CF9108958F929F92AF92BF92CF92DF92AE
-:101F8000EF92FF921F93CF93DF93EB014A01690118
-:101F900061E08DE00E94D11110E0EE24D7FCE094C6
-:101FA000FE2CAA2497FCA094BA2C812F90E08C17C9
-:101FB0009D0794F4C701B6010E94BE1061E08DE058
-:101FC0000E940A12C501B4010E94BE1060E08DE0BB
-:101FD0000E940A121F5FE9CFDF91CF911F91FF90FE
-:101FE000EF90DF90CF90BF90AF909F908F9008952B
-:101FF000CF93DF93EC0161E08DE00E94D11122EDDF
-:1020000030E048E250E062E070E0CE010E94BA0F9A
-:102010006AEF70E080E090E00E94BE1022ED30E0B8
-:1020200048E250E064E070E0CE010E94BA0F6DE734
-:1020300070E080E090E0DF91CF910C94BE10CF93E0
-:10204000DF93EC0126E085E094E00E94231385E015
-:1020500094E099838883CE010E94F80FCE010E94FC
-:10206000BD0CCE01DF91CF910C94E00C8BE993E095
-:102070000C94EC0E0F9300E020E040E060E086EF6F
-:1020800093E00E9464140F9108951F920F920FB66F
-:102090000F9211242F933F938F939F93AF93BF93EE
-:1020A0008091FD039091FE03A091FF03B091000485
-:1020B0003091FC0323E0230F2D3720F40196A11D5E
-:1020C000B11D05C026E8230F0296A11DB11D209366
-:1020D000FC038093FD039093FE03A093FF03B09352
-:1020E00000048091010490910204A0910304B09136
-:1020F00004040196A11DB11D809301049093020474
-:10210000A0930304B0930404BF91AF919F918F916A
-:102110003F912F910F900FBE0F901F9018952FB7E2
-:10212000F8946091FD037091FE038091FF039091FC
-:1021300000042FBF08953FB7F89480910104909157
-:102140000204A0910304B091040426B5A89B05C025
-:102150002F3F19F00196A11DB11D3FBF6627782FB3
-:10216000892F9A2F620F711D811D911D42E0660F0C
-:10217000771F881F991F4A95D1F70895CF92DF9254
-:10218000EF92FF92CF93DF936B017C010E949B1033
-:10219000EB01C114D104E104F10489F00E94881517
-:1021A0000E949B106C1B7D0B683E734090F381E096
-:1021B000C81AD108E108F108C851DC4FEACFDF9115
-:1021C000CF91FF90EF90DF90CF90089582309105EE
-:1021D00038F0880F991F880F991F05970197F1F71D
-:1021E0000895789484B5826084BD84B5816084BD8F
-:1021F00085B5826085BD85B5816085BDEEE6F0E080
-:10220000808181608083E1E8F0E0108280818260DB
-:102210008083808181608083E0E8F0E0808181605C
-:102220008083E1EBF0E0808184608083E0EBF0E08C
-:10223000808181608083EAE7F0E080818460808330
-:1022400080818260808380818160808380818068DA
-:1022500080831092C10008958E3008F08E508770F0
-:1022600020910D0190E4299F90011124822B8093ED
-:102270007C0080917A00806480937A0080917A005B
-:1022800086FDFCCF809178002091790090E0922B20
-:1022900008951F93CF93DF93182FEB0161E00E9405
-:1022A000D111209711F460E004C0CF3FD10539F47B
-:1022B00061E0812FDF91CF911F910C940A12E12FE1
-:1022C000F0E0E457FF4FE491E330F9F048F4E130F7
-:1022D000B9F0E230A1F584B5806284BDC8BD34C0D8
-:1022E000E730E9F0E83019F1E43049F580918000F9
-:1022F000806280938000D0938B00C0938A0024C0BA
-:1023000084B5806884BDC7BD1FC08091800080688F
-:1023100080938000D0938900C093880015C080917D
-:10232000B00080688093B000C093B3000DC080916E
-:10233000B00080628093B000C093B40005C0C03884
-:10234000D1050CF0B5CFAFCFDF91CF911F9108959C
-:10235000833081F028F4813099F08230A1F0089523
-:102360008730A9F08830B9F08430D1F480918000B2
-:102370008F7D03C0809180008F77809380000895C7
-:1023800084B58F7702C084B58F7D84BD0895809118
-:10239000B0008F7703C08091B0008F7D8093B00034
-:1023A0000895CF93DF9390E0FC01E056FF4F249116
-:1023B000FC01EC54FF4F8491882349F190E0880F91
-:1023C000991FFC01EE52FF4FA591B49188539F4F86
-:1023D000FC01C591D4919FB7611108C0F8948C910C
-:1023E000209582238C93888182230AC0623051F425
-:1023F000F8948C91322F309583238C938881822B93
-:10240000888304C0F8948C91822B8C939FBFDF91BA
-:10241000CF9108950F931F93CF93DF931F92CDB762
-:10242000DEB7282F30E0F901E457FF4F8491F9011E
-:10243000E056FF4F1491F901EC54FF4F0491002333
-:10244000C9F0882321F069830E94A8116981E02FD7
-:10245000F0E0EE0FFF1FE853FF4FA591B4919FB737
-:10246000F8948C91611103C01095812301C0812BD8
-:102470008C939FBF0F90DF91CF911F910F91089583
-:10248000FC01818D228D90E0805C9F4F821B910921
-:102490008F7399270895FC01918D828D981731F0E3
-:1024A000828DE80FF11D858D90E008958FEF9FEFED
-:1024B0000895FC01918D828D981761F0828DDF0166
-:1024C000A80FB11D5D968C91928D9F5F9F73928F27
-:1024D00090E008958FEF9FEF08958DED93E1892BA4
-:1024E00049F080E090E0892B29F00E94DD138111F2
-:1024F0000C9400000895FC01848DDF01A80FB11D2C
-:10250000A35ABF4F2C91848D90E001968F73992729
-:10251000848FA689B7892C93A089B1898C91806416
-:102520008C93938D848D981306C00288F389E02DD7
-:1025300080818F7D80830895CF93DF93EC01888D18
-:102540008823C9F0EA89FB89808185FD05C0A889B7
-:10255000B9898C9186FD0FC00FB607FCF5CF80813D
-:1025600085FFF2CFA889B9898C9185FFEDCFCE0187
-:102570000E947B12E7CFDF91CF910895CF92DF9237
-:10258000FF920F931F93CF93DF931F92CDB7DEB7C8
-:102590006C0181E0D60158968C9358975B969C917C
-:1025A0005B975C968C915C97981307C05096ED9161
-:1025B000FC915197808185FD2EC0F601038D10E0BE
-:1025C0000F5F1F4F0F731127F02EF601848DF81245
-:1025D00011C00FB607FCF9CFD6015096ED91FC91D2
-:1025E0005197808185FFF1CFC60169830E947B12DC
-:1025F0006981EBCF838DE80FF11DE35AFF4F6083B4
-:10260000D6015B960C935B975296ED91FC91539794
-:10261000808180620CC0D6015696ED91FC9157974F
-:1026200060835096ED91FC91519780818064808306
-:1026300081E090E00F90DF91CF911F910F91FF907B
-:10264000DF90CF900895BF92CF92DF92EF92FF92EA
-:10265000CF93DF93EC016A017B01B22EE889F989FF
-:1026600082E08083411581EE580761057105A1F074
-:1026700060E079E08DE390E0A70196010E94A51546
-:1026800021503109410951095695479537952795AC
-:10269000211580E1380798F0E889F989108260E80F
-:1026A00074E88EE190E0A70196010E94A5152150E3
-:1026B0003109410951095695479537952795EC857C
-:1026C000FD853083EE85FF852083188EEC89FD899A
-:1026D000B082EA89FB89808180618083EA89FB89F5
-:1026E000808188608083EA89FB898081806880831B
-:1026F000EA89FB8980818F7D8083DF91CF91FF9074
-:10270000EF90DF90CF90BF9008951F920F920FB679
-:102710000F9211242F938F939F93EF93FF93E09148
-:102720001504F09116048081E0911B04F0911C04C3
-:1027300082FD12C0908180911E048F5F8F73209163
-:102740001F04821751F0E0911E04F0E0EB5FFB4F95
-:10275000958F80931E0401C08081FF91EF919F911E
-:102760008F912F910F900FBE0F901F9018951F9271
-:102770000F920FB60F9211242F933F934F935F93B5
-:102780006F937F938F939F93AF93BF93EF93FF9339
-:1027900085E094E00E947B12FF91EF91BF91AF9191
-:1027A0009F918F917F916F915F914F913F912F9169
-:1027B0000F900FBE0F901F90189585E094E00E9437
-:1027C000401221E0892B09F420E0822F0895109215
-:1027D00008041092070488EE93E0A0E0B0E0809334
-:1027E000090490930A04A0930B04B0930C048AECA0
-:1027F00091E0909306048093050485EC90E090931B
-:1028000012048093110484EC90E09093140480935C
-:10281000130480EC90E0909316048093150481ECEF
-:1028200090E0909318048093170482EC90E09093CA
-:102830001A048093190486EC90E090931C04809312
-:102840001B0410921E0410921F0410922004109278
-:1028500021040895AF92BF92CF92DF92EF92FF9240
-:102860000F931F93CF93DF936C017B01C0E0D0E007
-:1028700000E010E0F601EC0FFD1F4AE050E062813D
-:10288000C7010E943A155C016EE2C7010E94CD1497
-:102890008A0D9B1D080F191F2196C330D10551F7D2
-:1028A0004AE050E0F6016581C7010E943A15800FA9
-:1028B000911FDF91CF911F910F91FF90EF90DF90CB
-:1028C000CF90BF90AF9008950F93FC018AED91E0F7
-:1028D0009183808362834383248305830F910895CA
-:1028E0008AED91E09093A3048093A2041092A40433
-:1028F0001092A5041092A6041092A70408950895BA
-:102900000E94F1100E947F140E94DB03CDE6D2E109
-:102910000E94FC062097E1F30E946D12F9CFCF923E
-:10292000DF92EF92FF920F931F93CF93DF936C018F
-:102930007A01EB01E60EF71E00E010E0CE15DF0590
-:1029400061F06991D601ED91FC910190F081E02D4B
-:10295000C6010995080F191FF1CFC801DF91CF916A
-:102960001F910F91FF90EF90DF90CF900895611528
-:10297000710581F0DB010D900020E9F7AD014150B8
-:102980005109461B570BDC01ED91FC910280F3814C
-:10299000E02D099480E090E00895DC01ED91FC9138
-:1029A0000190F081E02D09948F929F92AF92BF9297
-:1029B000CF92DF92EF92FF920F931F93CF93DF930B
-:1029C000CDB7DEB7A1970FB6F894DEBF0FBECDBF6F
-:1029D0007C01C42EE52FCB01D22E19A221E02D15AA
-:1029E00010F02AE0D22E8E010F5D1F4F8D2C912CFE
-:1029F000A12CB12C6C2D7E2FA50194010E94A51550
-:102A00008C2DD29E80191124015011098A3014F4A2
-:102A1000805D01C0895CF801808321153105410585
-:102A2000510521F0C22EE32FCA01E4CFB801C7013E
-:102A30000E94B714A1960FB6F894DEBF0FBECDBFAB
-:102A4000DF91CF911F910F91FF90EF90DF90CF908A
-:102A5000BF90AF909F908F9008952115310541F45C
-:102A6000DC01ED91FC910190F081E02D642F09943F
-:102A70000C94D4149A01462F50E060E070E00C945E
-:102A80002D154F925F926F927F92AF92BF92CF922D
-:102A9000DF92EF92FF920F931F93CF93DF93CDB707
-:102AA000DEB729013A01621B730B840B950B298950
-:102AB0003A894B895C892A193B094C095D09298BA4
-:102AC0003A8B4B8B5C8B9B01AC0169897A898B8932
-:102AD0009C890E948915E418F50806091709A801C0
-:102AE00097010E94C7152A0D3B1D4C1D5D1DCA0193
-:102AF000B901DF91CF911F910F91FF90EF90DF907F
-:102B0000CF90BF90AF907F906F905F904F9008955F
-:102B10000895DB018F939F930E94EC15BF91AF91B5
-:102B2000A29F800D911DA39F900DB29F900D112427
-:102B30000895991B79E004C0991F961708F0961B19
-:102B4000881F7A95C9F780950895A1E21A2EAA1BCD
-:102B5000BB1BFD010DC0AA1FBB1FEE1FFF1FA2174D
-:102B6000B307E407F50720F0A21BB30BE40BF50B4A
-:102B7000661F771F881F991F1A9469F760957095D3
-:102B8000809590959B01AC01BD01CF010895052E64
-:102B900097FB1EF400940E94DE1557FD07D00E949B
-:102BA000A51507FC03D04EF40C94DE155095409506
-:102BB000309521953F4F4F4F5F4F089590958095E9
-:102BC000709561957F4F8F4F9F4F0895EE0FFF1FB8
-:102BD0000590F491E02D09940E94F715A59F900DA2
-:102BE000B49F900DA49F800D911D11240895A29F64
-:102BF000B001B39FC001A39F700D811D1124911DD1
-:102C0000B29F700D811D1124911D0895CF93DF9304
-:102C10008230910510F482E090E0E091AA04F091F6
-:102C2000AB0420E030E0A0E0B0E0309739F1408123
-:102C3000518148175907B8F04817590771F4828134
-:102C40009381109729F013969C938E9312972CC022
-:102C50009093AB048093AA0427C02115310531F06D
-:102C60004217530718F0A901DB0101C0EF019A01D7
-:102C7000BD01DF010280F381E02DD7CF21153105A1
-:102C8000F9F0281B390B2430310580F48A819B81AF
-:102C90006115710521F0FB019383828304C0909339
-:102CA000AB048093AA04FE01329644C0FE01E20FF9
-:102CB000F31F8193919322503109398328833AC0BD
-:102CC0002091A8043091A904232B41F42091020102
-:102CD000309103013093A9042093A80420910001AE
-:102CE000309101012115310541F42DB73EB74091D6
-:102CF000040150910501241B350BE091A804F091CB
-:102D0000A904E217F307A0F42E1B3F0B281739077D
-:102D100078F0AC014E5F5F4F2417350748F04E0F37
-:102D20005F1F5093A9044093A8048193919302C01C
-:102D3000E0E0F0E0CF01DF91CF910895CF93DF93F2
-:102D4000009709F487C0FC01329713821282C09168
-:102D5000AA04D091AB04209781F420813181280FFF
-:102D6000391F8091A8049091A9048217930779F5DF
-:102D7000F093A904E093A8046DC0DE0120E030E0E8
-:102D8000AE17BF0750F412964D915C9113979D01B9
-:102D90004115510509F1DA01F3CFB383A2834081D4
-:102DA0005181840F951F8A179B0771F48D919C9117
-:102DB0001197840F951F02969183808312968D91AF
-:102DC0009C911397938382832115310529F4F09305
-:102DD000AB04E093AA043EC0D9011396FC93EE9392
-:102DE00012974D915D91A40FB51FEA17FB0779F477
-:102DF00080819181840F951F0296D90111969C9331
-:102E00008E938281938113969C938E931297E0E028
-:102E1000F0E08A819B81009719F0FE01EC01F9CF67
-:102E2000CE01029628813981820F931F2091A80438
-:102E30003091A9042817390769F4309729F41092C2
-:102E4000AB041092AA0402C013821282D093A90488
-:102E5000C093A804DF91CF910895FB01DC0141509C
-:102E6000504048F001900D920020C9F701C01D921A
-:102E700041505040E0F70895FC0181E090E001905E
-:102E8000061609F4CF010020D1F701970895FB0140
-:102E900051915523A9F0BF01DC014D914517411116
-:102EA000E1F759F4CD010190002049F04D91401512
-:102EB0004111C9F3FB014111EFCF81E090E001978F
-:062EC0000895F894FFCF15
-:102EC6000000AC04800001000000FF1300014D610A
-:102ED6007820736572766F732061747461636865B8
-:102EE6006400556E6B6E6F776E2070696E206D6F25
-:102EF6006465005374616E646172644669726D61E3
-:102F060074612E696E6F004932433A20546F6F2008
-:102F16006D616E7920627974657320726563656987
-:102F2600766564004932433A20546F6F20666577B0
-:102F360020627974657320726563656976656400DD
-:102F460031302D6269742061646472657373696ED1
-:102F560067206E6F7420737570706F72746564008D
-:102F6600746F6F206D616E79207175657269657316
-:102F76000000000000FC09CF09A409AC09BF09CE76
-:102F8600092E6370700000000000BE128F144012FC
-:0C2F960059124B129C12000000002A147B
-:00000001FF
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/values-w820dp/dimens.xml b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/values-w820dp/dimens.xml
deleted file mode 100644
index 63fc816444..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/values-w820dp/dimens.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
- 64dp
-
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/values/anim.xml b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/values/anim.xml
deleted file mode 100644
index a6b3daec93..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/values/anim.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
-
- - #00a0e9
- - #ffffff
- - #666666
-
-
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/values/dimens.xml b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/values/dimens.xml
deleted file mode 100644
index 2bcf0d4ad2..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
- 16dp
- 16dp
- 24dp
- 5dp
- 20sp
- 16sp
-
-
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/values/strings.xml b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/values/strings.xml
deleted file mode 100644
index 2d85edefc2..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-
- FaBo (Device Connect Device Plug-in)
-
- サービスを追加
- キャンセル
- 削除
- オンライン
- オフライン
- No Name
-
- 確認
- 選択したサービスを削除しますか？
-
- はい
- いいえ
-
- 確認
- オンラインのサービスは削除することができません。\nFaBoとの接続を一度切ってから再度行なってください。
- 確認
- このサービスは削除することができません。
-
- 仮想サービス設定
- サービスID
- サービス名
- プロファイル
- 保存
- 決定
- 仮想サービスで使用するプロファイルを選択してください。
- プロファイルが使用するピンを選択してください。
- +
- 削除
- PIN: %1$s
-
- プロファイル設定
- ピン設定
-
- サービス
- 警告
- はい
- いいえ
- ピンが選択されていません。
- プロファイルが登録されていません。
- 名前が記入されていません。
- 名前が長すきます。
- 仮想サービスを保存しました。
- FaBoDeviceServiceにバインドされていません。\n設定画面から再起動をお願いします。
- 削除確認
- %1$sを削除して良いでしょうか？
- サービスの削除に失敗しました。
-
- Light(GPIO) #101
- Humidity(GPIO) #115
- KeyEvent(GPIO) #103
- Temperature(GPIO) #108
- Vibration(GPIO) #105
- Illuminace(GPIO) #109
- Proximity(GPIO) #116
- DriveController(RobotCar)
- DriveController(MouseCar)
- DeviceOrientation(3AXIS) #201
- Temperature(I2C) #207
- Humidity(I2C) #208
- Proximity(I2C) #205
- Illuminace(I2C) #217
- AtmosphericPressure(I2C) #204
- Proximity(I2C) LIDARLite v3
-
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/values/styles.xml b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/values/styles.xml
deleted file mode 100644
index 5460fc97c4..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/xml/device_filter.xml b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/xml/device_filter.xml
deleted file mode 100644
index 09e408aa85..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/xml/device_filter.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/xml/org_deviceconnect_android_deviceplugin_fabo.xml b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/xml/org_deviceconnect_android_deviceplugin_fabo.xml
deleted file mode 100644
index 1927e8232b..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/res/xml/org_deviceconnect_android_deviceplugin_fabo.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/test/java/org/deviceconnect/android/deviceplugin/fabo/ExampleUnitTest.java b/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/test/java/org/deviceconnect/android/deviceplugin/fabo/ExampleUnitTest.java
deleted file mode 100644
index b29d95075c..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/app/src/test/java/org/deviceconnect/android/deviceplugin/fabo/ExampleUnitTest.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * To work on unit tests, switch the Test Artifact in the Build Variants view.
- */
-public class ExampleUnitTest {
- @Test
- public void addition_isCorrect() throws Exception {
- assertEquals(4, 2 + 2);
- }
-}
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/build.gradle b/dConnectDevicePlugin/dConnectDeviceFaBo/build.gradle
deleted file mode 100644
index ab42e4ce2f..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/build.gradle
+++ /dev/null
@@ -1,25 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
-buildscript {
- repositories {
- google()
- jcenter()
- }
- dependencies {
- classpath 'com.android.tools.build:gradle:3.6.2'
-
- // NOTE: Do not place your application dependencies here; they belong
- // in the individual module build.gradle files
- }
-}
-
-allprojects {
- repositories {
- jcenter()
- google()
- }
-}
-
-task clean(type: Delete) {
- delete rootProject.buildDir
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/gradle.properties b/dConnectDevicePlugin/dConnectDeviceFaBo/gradle.properties
deleted file mode 100644
index 53587a3d07..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/gradle.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx10248m -XX:MaxPermSize=256m
-# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
-storeFile=キーストアのファイル名
-storePassword=キーストアのパスワード
-keyAlias=エイリアス名
-keyPassword=エイリアスのパスワード
-android.useAndroidX=true
-android.enableJetifier=true
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/gradle/wrapper/gradle-wrapper.jar b/dConnectDevicePlugin/dConnectDeviceFaBo/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 13372aef5e..0000000000
Binary files a/dConnectDevicePlugin/dConnectDeviceFaBo/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/gradle/wrapper/gradle-wrapper.properties b/dConnectDevicePlugin/dConnectDeviceFaBo/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index d11699e03f..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Tue Apr 14 15:51:28 JST 2020
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/gradlew b/dConnectDevicePlugin/dConnectDeviceFaBo/gradlew
deleted file mode 100755
index 9d82f78915..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/gradlew
+++ /dev/null
@@ -1,160 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-## Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
- echo "$*"
-}
-
-die ( ) {
- echo
- echo "$*"
- echo
- exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
- CYGWIN* )
- cygwin=true
- ;;
- Darwin* )
- darwin=true
- ;;
- MINGW* )
- msys=true
- ;;
-esac
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
- # IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
- else
- JAVACMD="$JAVA_HOME/bin/java"
- fi
- if [ ! -x "$JAVACMD" ] ; then
- die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
- fi
-else
- JAVACMD="java"
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ] ; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
- MAX_FD="$MAX_FD_LIMIT"
- fi
- ulimit -n $MAX_FD
- if [ $? -ne 0 ] ; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
- GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
- APP_HOME=`cygpath --path --mixed "$APP_HOME"`
- CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
- JAVACMD=`cygpath --unix "$JAVACMD"`
-
- # We build the pattern for arguments to be converted via cygpath
- ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
- SEP=""
- for dir in $ROOTDIRSRAW ; do
- ROOTDIRS="$ROOTDIRS$SEP$dir"
- SEP="|"
- done
- OURCYGPATTERN="(^($ROOTDIRS))"
- # Add a user-defined pattern to the cygpath arguments
- if [ "$GRADLE_CYGPATTERN" != "" ] ; then
- OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
- fi
- # Now convert the arguments - kludge to limit ourselves to /bin/sh
- i=0
- for arg in "$@" ; do
- CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
- CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
-
- if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
- eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
- else
- eval `echo args$i`="\"$arg\""
- fi
- i=$((i+1))
- done
- case $i in
- (0) set -- ;;
- (1) set -- "$args0" ;;
- (2) set -- "$args0" "$args1" ;;
- (3) set -- "$args0" "$args1" "$args2" ;;
- (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
- (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
- (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
- esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
- JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/gradlew.bat b/dConnectDevicePlugin/dConnectDeviceFaBo/gradlew.bat
deleted file mode 100644
index aec99730b4..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/gradlew.bat
+++ /dev/null
@@ -1,90 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/.gitignore b/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/.gitignore
deleted file mode 100644
index 796b96d1c4..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/build.gradle b/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/build.gradle
deleted file mode 100644
index 83487c7943..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/build.gradle
+++ /dev/null
@@ -1,82 +0,0 @@
-apply plugin: 'com.android.application'
-// Create github.properties in root project folder file with
-// gpr.usr=GITHUB_USER_ID
-// gpr.key=PERSONAL_ACCESS_TOKEN
-def githubPropertiesFile = rootProject.file("github.properties")
-def githubProperties = new Properties()
-if (githubPropertiesFile.exists()) {
- githubProperties.load(new FileInputStream(githubPropertiesFile))
-}
-android {
- compileSdkVersion 29
-
- def getVersionName = { ->
- def version
- if (System.getProperty('os.name').toLowerCase().contains('windows')) {
- version = ["cmd", "/c", "git describe --tags --long"].execute().in.text.trim()
- } else {
- version = ["sh", "-c", "git describe --tags --long"].execute().in.text.trim()
- }
- version = version.empty ? "2.1.0" : version
- return "${version}"
- }
-
- defaultConfig {
- applicationId "org.deviceconnect.android.deviceplugin.fabo"
- minSdkVersion 16
- targetSdkVersion 29
- versionCode 1
- versionName getVersionName()
-
- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
- }
-
- signingConfigs {
- releaseConfig {
- storeFile=file(project.properties.storeFile)
- storePassword=project.properties.storePassword
- keyAlias=project.properties.keyAlias
- keyPassword=project.properties.keyPassword
- }
- }
-
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
- signingConfig signingConfigs.releaseConfig
- }
- }
-
- tasks.withType(JavaCompile) {
- options.encoding = 'UTF-8'
- }
- compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
- }
- repositories {
- maven {
- name = "DeviceConnect-Android"
- url = uri("https://maven.pkg.github.com/DeviceConnect/DeviceConnect-Android")
-
- credentials {
- username = System.getenv("GPR_USER") ?: githubProperties['gpr.usr']
- password = System.getenv("GPR_API_KEY") ?: githubProperties['gpr.key']
- }
- }
- }
-}
-
-repositories {
- maven { url "https://raw.githubusercontent.com/FaBoPlatform/FaBo-Serial-Kit/master/repository/" }
- maven { url 'https://raw.githubusercontent.com/FaBoPlatform/STK500-Android/master/stk500/repository/' }
-}
-
-dependencies {
- implementation fileTree(dir: 'libs', include: ['*.jar'])
- implementation project(':app')
- implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.4'
- implementation 'io.fabo:serialkit:0.9.6'
- implementation 'io.fabo.android.stk500:stk500-aar:1.0.4'
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/proguard-rules.pro b/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/proguard-rules.pro
deleted file mode 100644
index 36d448c0fa..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/proguard-rules.pro
+++ /dev/null
@@ -1,25 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /Users/kobayashinobuo/Library/Android/sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/androidTest/java/org/deviceconnect/android/deviceplugin/fabo/ExampleInstrumentedTest.java b/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/androidTest/java/org/deviceconnect/android/deviceplugin/fabo/ExampleInstrumentedTest.java
deleted file mode 100644
index bd39284f67..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/androidTest/java/org/deviceconnect/android/deviceplugin/fabo/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumentation test, which will execute on an Android device.
- *
- * @see Testing documentation
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
- @Test
- public void useAppContext() throws Exception {
- // Context of the app under test.
- Context appContext = InstrumentationRegistry.getTargetContext();
-
- assertEquals("org.deviceconnect.android.deviceplugin.fabo", appContext.getPackageName());
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/AndroidManifest.xml b/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/AndroidManifest.xml
deleted file mode 100644
index 4f8b455870..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/FaBoArduinoDeviceProvider.java b/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/FaBoArduinoDeviceProvider.java
deleted file mode 100644
index 6b17a976cf..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/FaBoArduinoDeviceProvider.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- FaBoDeviceProvider.java
- Copyright (c) 2014 NTT DOCOMO,INC.
- Released under the MIT license
- http://opensource.org/licenses/mit-license.php
- */
-package org.deviceconnect.android.deviceplugin.fabo;
-
-import android.app.Service;
-
-import org.deviceconnect.android.message.DConnectMessageServiceProvider;
-
-/**
- * Device Connect Manager本体からのインテントを受信するクラス.
- * @author NTT DOCOMO, INC.
- * @param FaBoデバイスプラグインのプロファイルを公開するサービスのクラス
- */
-public class FaBoArduinoDeviceProvider extends DConnectMessageServiceProvider {
-
- @SuppressWarnings("unchecked")
- @Override
- protected Class getServiceClass() {
- Class clazz = (Class) FaBoArduinoDeviceService.class;
- return (Class) clazz;
- }
-}
\ No newline at end of file
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/FaBoArduinoDeviceService.java b/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/FaBoArduinoDeviceService.java
deleted file mode 100644
index 044d33812b..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/FaBoArduinoDeviceService.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- FaBoDeviceService.java
- Copyright (c) 2014 NTT DOCOMO,INC.
- Released under the MIT license
- http://opensource.org/licenses/mit-license.php
- */
-package org.deviceconnect.android.deviceplugin.fabo;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-
-import org.deviceconnect.android.deviceplugin.fabo.device.FaBoDeviceControl;
-import org.deviceconnect.android.deviceplugin.fabo.device.arduino.FaBoUsbDeviceControl;
-import org.deviceconnect.android.deviceplugin.fabo.setting.FaBoSettingActivity;
-import org.deviceconnect.android.profile.SystemProfile;
-
-/**
- * 本デバイスプラグインのプロファイルをDeviceConnectに登録するサービス.
- *
- * @author NTT DOCOMO, INC.
- */
-public class FaBoArduinoDeviceService extends FaBoDeviceService {
-
- /**
- * Local OAuthの設定を切り替えるアクション.
- */
- public static final String ACTION_SET_LOCAL_OAUTH = "org.deviceconnect.android.deviceplugin.fabo.ACTION_SET_LOCAL_OAUTH";
-
- /**
- * FaBoの設定を保持するクラス.
- */
- private FaBoSettings mFaBoSettings;
-
- @Override
- public void onCreate() {
- super.onCreate();
- mFaBoSettings = new FaBoSettings(this);
- setUseLocalOAuth(mFaBoSettings.isUseLocalOAuth());
- }
-
- @Override
- public void onDestroy() {
- mFaBoSettings = null;
- super.onDestroy();
- }
-
- @Override
- public int onStartCommand(final Intent intent, final int flags, final int startId) {
- if (intent != null && ACTION_SET_LOCAL_OAUTH.equals(intent.getAction())) {
- setUseLocalOAuth(mFaBoSettings.isUseLocalOAuth());
- }
-
- return super.onStartCommand(intent, flags, startId);
- }
-
- @Override
- protected FaBoDeviceControl createFaBoDeviceControl() {
- return new FaBoUsbDeviceControl(this);
- }
-
-
- @Override
- protected SystemProfile getSystemProfile() {
- return new FaBoSystemProfile();
- }
-
- /**
- * Arduino用のSystemプロファイル.
- */
- private class FaBoSystemProfile extends SystemProfile {
- @Override
- protected Class getSettingPageActivity(final Intent request, final Bundle param) {
- return FaBoSettingActivity.class;
- }
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/FaBoSettings.java b/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/FaBoSettings.java
deleted file mode 100644
index 9deac1d543..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/FaBoSettings.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-
-class FaBoSettings {
-
- /**
- * 情報を共有するプリファレンス.
- */
- private SharedPreferences mPreferences;
-
- /**
- * コンテキスト.
- */
- private Context mContext;
-
- /**
- * コンストラクタ.
- * @param context コンテキスト
- */
- FaBoSettings(final Context context) {
- mContext = context;
- mPreferences = context.getSharedPreferences(context.getPackageName() + "_preferences",
- Context.MODE_PRIVATE);
- }
-
- /**
- * Local OAuth使用フラグを取得します.
- *
- * @return Local OAuthを使用する場合はtrue、それ以外はfalse
- */
- boolean isUseLocalOAuth() {
- return mPreferences.getBoolean(mContext.getString(R.string.key_settings_security_local_oauth), false);
- }
-
- /**
- * Local OAuth使用フラグを設定します.
- *
- * @param flag 使用フラグ
- */
- void setUseLocalOAuth(final boolean flag) {
- SharedPreferences.Editor editor = mPreferences.edit();
- editor.putBoolean(mContext.getString(R.string.key_settings_security_local_oauth), flag);
- editor.apply();
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/ADT7410.java b/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/ADT7410.java
deleted file mode 100644
index 7244d67e69..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/ADT7410.java
+++ /dev/null
@@ -1,271 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.device.arduino;
-
-import org.deviceconnect.android.deviceplugin.fabo.device.IADT7410;
-
-import java.util.List;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.FirmataUtil.decodeByte;
-
-/**
- * ADT7410を操作するクラス.
- */
-class ADT7410 extends BaseI2C implements IADT7410 {
-
- /**
- * ADT7410のアドレス.
- */
- private static final byte ADT7410_DEVICE_ADDR = 0x48;
-
- /**
- * ADT7410のコンフィグ用のレジスタ.
- */
- private static final int REGISTER_CONFIG = 0x03;
-
- /**
- * ADT7410のデバイスID取得レジスタ.
- */
- private static final int DEVICE_REG = 0x0B;
-
- /**
- * ADT7410のデバイスID.
- */
- private static final int DEVICE_ID = 0x0C;
-
- /**
- * 16bitの分解度を定義.
- */
- private static final int BIT16_RESOLUTION = 0x80;
- private static final int BIT16_OP_MODE_1FAULT = 0x00;
-
- /**
- * ADXL実行カウント.
- */
- private int mRunningCount = 0;
-
- /**
- * 取得した値を通知するリスナ.
- */
- private final List mOnADT7410Listeners = new CopyOnWriteArrayList<>();
-
- @Override
- public void read(final OnADT7410Listener listener) {
- OnADT7410ListenerImpl impl = new OnADT7410ListenerImpl();
- impl.setListener(listener);
- impl.setOnceRead(true);
- impl.start();
- mOnADT7410Listeners.add(impl);
- }
-
- @Override
- public void startRead(final OnADT7410Listener listener) {
- OnADT7410ListenerImpl impl = new OnADT7410ListenerImpl();
- impl.setListener(listener);
- impl.setOnceRead(false);
- impl.start();
- mOnADT7410Listeners.add(impl);
- }
-
- @Override
- public void stopRead(final OnADT7410Listener listener) {
- OnADT7410ListenerImpl impl = get(listener);
- if (impl != null) {
- mOnADT7410Listeners.remove(impl);
- }
- stopRead();
- }
-
- // BaseI2C interface
-
- @Override
- byte getAddress() {
- return ADT7410_DEVICE_ADDR;
- }
-
- @Override
- void onReadData(final byte[] data) {
- int offset = 3;
- int register = decodeByte(data[offset++], data[offset++]);
- switch (register) {
- case DEVICE_REG:
- int deviceId = decodeByte(data[offset++], data[offset]);
- if ((deviceId & DEVICE_ID) != 0) {
- new Thread(new Runnable() {
- @Override
- public void run() {
- setADT7410();
- startRead(ADT7410_DEVICE_ADDR, REGISTER_CONFIG, 2);
- }
- }).start();
- } else {
- for (OnADT7410Listener listener : mOnADT7410Listeners) {
- listener.onError("ADT7410 is not connect.");
- }
- }
- break;
-
- case REGISTER_CONFIG:
- double temp = convertTemperature(FirmataUtil.decodeUShort2(data, offset));
- for (OnADT7410Listener listener : mOnADT7410Listeners) {
- listener.onData(temp);
- }
- break;
- }
- }
-
- /**
- * ADT7410の初期化を行います.
- */
- private void setADT7410() {
- write(ADT7410_DEVICE_ADDR, REGISTER_CONFIG, BIT16_RESOLUTION);
- }
-
- /**
- * センサーの値を摂氏に変換します.
- * @param value センサーの値
- * @return 摂氏
- */
- private double convertTemperature(int value) {
- if ((value & 0x8000) != 0) {
- value = value - 65536;
- }
- return value / 128.0;
- }
-
- /**
- * センサーの値の読み込みを開始します.
- */
- private void startRead() {
- mRunningCount++;
-
- if (mRunningCount == 1) {
- setI2CConfig();
- read(ADT7410_DEVICE_ADDR, DEVICE_REG, 1);
- }
- }
-
- /**
- * センサーの値の読み込みを停止します.
- */
- private void stopRead() {
- if (mRunningCount > 0) {
- mRunningCount--;
-
- if (mRunningCount == 0) {
- stopRead(ADT7410_DEVICE_ADDR, REGISTER_CONFIG);
- }
- }
- }
-
- /**
- * 指定されたリスナーをもつOnADXL345ListenerImplを取得します.
- * @param listener リスナー
- * @return OnADXL345ListenerImplのインスタンス
- */
- private OnADT7410ListenerImpl get(final OnADT7410Listener listener) {
- for (OnADT7410ListenerImpl impl : mOnADT7410Listeners) {
- if (impl.mListener == listener) {
- return impl;
- }
- }
- return null;
- }
-
- private class OnADT7410ListenerImpl implements OnADT7410Listener {
-
- /**
- * タイムアウトを監視するタイマー.
- */
- private Timer mTimer;
-
- /**
- * 通知を行うリスナー.
- */
- private OnADT7410Listener mListener;
-
- /**
- * 一度だけ読み込む場合.
- */
- private boolean mOnceRead;
-
- /**
- * 開始フラグ.
- */
- private boolean mStartFlag;
-
- /**
- * センサー開始とタイムアウト用のタイマーの開始を行います.
- */
- void start() {
- mTimer = new Timer();
- mTimer.schedule(new TimerTask() {
- @Override
- public void run() {
- onError("timeout");
- }
- }, 1000);
- startRead();
- }
-
- /**
- * リスナーを設定します.
- * @param listener リスナー
- */
- void setListener(final OnADT7410Listener listener) {
- mListener = listener;
- }
-
- /**
- * 一度だけ読み込みを行います.
- * @param onceRead フラグ
- */
- void setOnceRead(final boolean onceRead) {
- mOnceRead = onceRead;
- }
-
- /**
- * タイマーをキャンセルします.
- */
- void cancelTimer() {
- if (mTimer != null) {
- mTimer.cancel();
- mTimer = null;
- }
- }
-
- /**
- * 後始末処理を行います.
- */
- void onFinish() {
- cancelTimer();
- stopRead();
- mOnADT7410Listeners.remove(this);
- }
-
- @Override
- public void onStarted() {
- }
-
- @Override
- public void onData(double temperature) {
- if (!mStartFlag) {
- mStartFlag = true;
- cancelTimer();
- mListener.onStarted();
- }
- mListener.onData(temperature);
-
- if (mOnceRead) {
- onFinish();
- }
- }
-
- @Override
- public void onError(String message) {
- mListener.onError(message);
- onFinish();
- }
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/ADXL345.java b/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/ADXL345.java
deleted file mode 100644
index 06f5696f10..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/ADXL345.java
+++ /dev/null
@@ -1,282 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.device.arduino;
-
-import org.deviceconnect.android.deviceplugin.fabo.device.IADXL345;
-
-import java.util.List;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.FirmataUtil.decodeByte;
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.FirmataUtil.decodeShort;
-
-/**
- * ADXL345を操作するクラス.
- */
-class ADXL345 extends BaseI2C implements IADXL345 {
-
- /**
- * ADXL345のアドレス.
- */
- private static final byte ADXL345_DEVICE_ADDR = 0x53;
-
- /**
- * ADXL345のデバイスID取得レジスタ.
- */
- private static final int REGISTER_RA_DEVID = 0x0;
-
- /**
- * ADXL345のパワー設定レジスタ.
- */
- private static final int REGISTER_RA_POWER_CTL = 0x2D;
-
- /**
- * ADXL345のデータフォーマット設定レジスタ.
- */
- private static final int REGISTER_RA_DATA_FORMAT = 0x31;
-
- /**
- * ADXL345のデータ取得レジスタ.
- */
- private static final int REGISTER_RA_DATAX0 = 0x32;
-
- /**
- * ADXL345のデバイスID.
- */
- private static final int DEVICE_ID = 0xE5;
-
- /**
- * 13bitの分解能.
- */
- private static final double RESOLUTION = (16 + 16) / Math.pow(2, 13);
-
- /**
- * 取得した値を通知するリスナ.
- */
- private final List mOnADXL345Listeners = new CopyOnWriteArrayList<>();
-
- /**
- * ADXL実行カウント.
- */
- private int mRunningCount = 0;
-
- @Override
- public synchronized void read(final OnADXL345Listener listener) {
- OnADXL345ListenerImpl impl = new OnADXL345ListenerImpl();
- impl.setOnADXL345Listener(listener);
- impl.setOnceRead(true);
- impl.startADXL345();
- mOnADXL345Listeners.add(impl);
- }
-
- @Override
- public synchronized void startRead(final OnADXL345Listener listener) {
- OnADXL345ListenerImpl impl = new OnADXL345ListenerImpl();
- impl.setOnADXL345Listener(listener);
- impl.setOnceRead(false);
- impl.startADXL345();
- mOnADXL345Listeners.add(impl);
- }
-
- @Override
- public synchronized void stopRead(final OnADXL345Listener listener) {
- OnADXL345ListenerImpl impl = get(listener);
- if (impl != null) {
- mOnADXL345Listeners.remove(impl);
- }
- stopRead();
- }
-
- // BaseI2C interface
-
- @Override
- byte getAddress() {
- return ADXL345_DEVICE_ADDR;
- }
-
- @Override
- void onReadData(final byte[] data) {
- int offset = 3;
- int register = decodeByte(data[offset++], data[offset++]);
- if (register == REGISTER_RA_DEVID) {
- int deviceId = decodeByte(data[offset++], data[offset]);
- if (deviceId == DEVICE_ID) {
- new Thread(new Runnable() {
- @Override
- public void run() {
- setADXL345();
- startRead(ADXL345_DEVICE_ADDR, REGISTER_RA_DATAX0, 6);
- }
- }).start();
- } else {
- for (OnADXL345Listener listener : mOnADXL345Listeners) {
- listener.onError("ADXL345 is not connect.");
- }
- }
- } else if (register == REGISTER_RA_DATAX0) {
- int ax = decodeShort(data, offset);
- offset += 4;
- int ay = decodeShort(data, offset);
- offset += 4;
- int az = decodeShort(data, offset);
-
- double gx = convertResolution(ax);
- double gy = convertResolution(ay);
- double gz = convertResolution(az);
-
- for (OnADXL345Listener listener : mOnADXL345Listeners) {
- listener.onData(gx, gy, gz);
- }
- }
- }
-
- /**
- * ADXL345の初期化を行います.
- */
- private void setADXL345() {
- write(ADXL345_DEVICE_ADDR, REGISTER_RA_DATA_FORMAT, 0x0B);
- write(ADXL345_DEVICE_ADDR, REGISTER_RA_POWER_CTL, 0x08);
- }
-
- /**
- * センサーの値の読み込みを開始します.
- */
- private void startRead() {
- mRunningCount++;
-
- if (mRunningCount == 1) {
- setI2CConfig();
- read(ADXL345_DEVICE_ADDR, REGISTER_RA_DEVID, 1);
- }
- }
-
- /**
- * センサーの値の読み込みを停止します.
- */
- private void stopRead() {
- if (mRunningCount > 0) {
- mRunningCount--;
-
- if (mRunningCount == 0) {
- stopRead(ADXL345_DEVICE_ADDR, REGISTER_RA_DATAX0);
- }
- }
- }
-
- /**
- * 指定されたリスナーをもつOnADXL345ListenerImplを取得します.
- * @param listener リスナー
- * @return OnADXL345ListenerImplのインスタンス
- */
- private OnADXL345ListenerImpl get(final OnADXL345Listener listener) {
- for (OnADXL345ListenerImpl impl : mOnADXL345Listeners) {
- if (impl.mListener == listener) {
- return impl;
- }
- }
- return null;
- }
-
- /**
- * 加速度センサーの値を重力加速度に変換します.
- * @param data 加速度センサーからの値
- * @return 重力加速度
- */
- private double convertResolution(final int data) {
- return data * RESOLUTION;
- }
-
- /**
- * タイマー付きでADXL345のセンサー値を開始します.
- */
- private class OnADXL345ListenerImpl implements OnADXL345Listener {
- /**
- * タイムアウトを監視するタイマー.
- */
- private Timer mTimer;
-
- /**
- * 通知を行うリスナー.
- */
- private OnADXL345Listener mListener;
-
- /**
- * 一度だけ読み込む場合.
- */
- private boolean mOnceRead;
-
- /**
- * 開始フラグ.
- */
- private boolean mStartFlag;
-
- /**
- * ADXL345のセンサー開始とタイムアウト用のタイマーの開始を行います.
- */
- void startADXL345() {
- mTimer = new Timer();
- mTimer.schedule(new TimerTask() {
- @Override
- public void run() {
- onError("timeout");
- }
- }, 1000);
- startRead();
- }
-
- void setOnADXL345Listener(final OnADXL345Listener listener) {
- mListener = listener;
- }
-
- /**
- * 一度だけ読み込みを行います.
- * @param onceRead
- */
- void setOnceRead(final boolean onceRead) {
- mOnceRead = onceRead;
- }
-
- /**
- * タイマーをキャンセルします.
- */
- void cancelTimer() {
- if (mTimer != null) {
- mTimer.cancel();
- mTimer = null;
- }
- }
-
- /**
- * 後始末処理を行います.
- */
- void onFinish() {
- cancelTimer();
- stopRead();
- mOnADXL345Listeners.remove(this);
- }
-
- @Override
- public void onStarted() {
- }
-
- @Override
- public void onData(final double x, final double y, final double z) {
- if (!mStartFlag) {
- mStartFlag = true;
- cancelTimer();
- mListener.onStarted();
- }
- mListener.onData(x, y, z);
-
- if (mOnceRead) {
- onFinish();
- }
- }
-
- @Override
- public void onError(final String message) {
- mListener.onError(message);
- onFinish();
- }
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/BaseI2C.java b/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/BaseI2C.java
deleted file mode 100644
index 97767c4d0e..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/BaseI2C.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.device.arduino;
-
-
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.FirmataV32.END_SYSEX;
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.FirmataV32.I2C_CONFIG;
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.FirmataV32.I2C_READ;
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.FirmataV32.I2C_READ_CONTINUOUSLY;
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.FirmataV32.I2C_REQUEST;
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.FirmataV32.I2C_STOP_READING;
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.FirmataV32.I2C_WRITE;
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.FirmataV32.START_SYSEX;
-
-class BaseI2C {
-
- /**
- * Usbに接続されたデバイスを管理するクラス.
- */
- private FaBoUsbDeviceControl mFaBoDeviceControl;
-
- /**
- * FaBoDeviceControlのインスタンスを取得します.
- * @return FaBoDeviceControlのインスタンス
- */
- FaBoUsbDeviceControl getFaBoDeviceControl() {
- return mFaBoDeviceControl;
- }
-
- /**
- * FaBoDeviceControlのインスタンスを設定します.
- * @param controller FaBoDeviceControlのインスタンス
- */
- void setFaBoDeviceControl(final FaBoUsbDeviceControl controller) {
- mFaBoDeviceControl = controller;
- }
-
- /**
- * I2Cコンフィグを送信します.
- */
- void setI2CConfig() {
- byte[] config = {
- START_SYSEX,
- I2C_CONFIG,
- (byte) 0x00,
- (byte) 0x00,
- END_SYSEX
- };
- writeI2C(config);
- }
-
- /**
- * I2Cにデータを送信します.
- * @param data 送信するデータ
- */
- void writeI2C(final byte[] data) {
- getFaBoDeviceControl().writeI2C(data);
- }
-
- /**
- * 指定されたアドレスにSysex messageを送信します.
- * @param address アドレス
- * @param a 送信するデータ1
- * @param b 送信するデータ2
- */
- void write(final byte address, final int a, final int b) {
- byte[] config = {
- START_SYSEX,
- I2C_REQUEST,
- address,
- I2C_WRITE,
- (byte) (a & 0x7f),
- (byte) ((a >> 7) & 0x7f),
- (byte) (b & 0x7f),
- (byte) ((b >> 7) & 0x7f),
- END_SYSEX
- };
- writeI2C(config);
- }
-
- /**
- * 指定されたアドレスからデータを読み込みます.
- * @param address アドレス
- * @param register レジスタ
- * @param size 読み込むデータサイズ
- */
- void read(final byte address, final int register, final int size) {
- byte[] command = {
- START_SYSEX,
- I2C_REQUEST,
- address,
- I2C_READ,
- (byte) (register & 0x7f),
- (byte) ((register >> 7) & 0x7f),
- (byte) (size & 0x7f),
- (byte) ((size >> 7) & 0x7f),
- END_SYSEX
- };
- writeI2C(command);
- }
-
- /**
- * 指定されたアドレスからデータを読み込みを開始します.
- * @param address アドレス
- * @param register レジスタ
- * @param size 読み込むデータサイズ
- */
- void startRead(final byte address, final int register, final int size) {
- byte[] command = {
- START_SYSEX,
- I2C_REQUEST,
- address,
- I2C_READ_CONTINUOUSLY,
- (byte) (register & 0x7f),
- (byte) ((register >> 7) & 0x7f),
- (byte) (size & 0x7f),
- (byte) ((size >> 7) & 0x7f),
- END_SYSEX
- };
- writeI2C(command);
- }
-
- /**
- * 指定されたアドレスからデータを読み込みを停止します.
- * @param address アドレス
- * @param register レジスタ
- */
- void stopRead(final byte address, final int register) {
- byte[] command = {
- START_SYSEX,
- I2C_REQUEST,
- address,
- I2C_STOP_READING,
- (byte) (register & 0x7f),
- (byte) ((register >> 7) & 0x7f),
- END_SYSEX
- };
- writeI2C(command);
- }
-
- /**
- * I2Cのアドレスを取得します.
- * @return アドレス
- */
- byte getAddress() {
- return -1;
- }
-
- /**
- * I2Cから読み込まれたデータ.
- * @param data データ
- */
- void onReadData(final byte[] data) {}
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/FaBoUsbDeviceControl.java b/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/FaBoUsbDeviceControl.java
deleted file mode 100644
index 94c3c69273..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/FaBoUsbDeviceControl.java
+++ /dev/null
@@ -1,925 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.device.arduino;
-
-import android.app.PendingIntent;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.hardware.usb.UsbDevice;
-import android.hardware.usb.UsbManager;
-import android.os.Build;
-import android.os.Handler;
-import android.os.Looper;
-import android.util.Log;
-
-import org.deviceconnect.android.deviceplugin.fabo.BuildConfig;
-import org.deviceconnect.android.deviceplugin.fabo.device.FaBoDeviceControl;
-import org.deviceconnect.android.deviceplugin.fabo.device.IADT7410;
-import org.deviceconnect.android.deviceplugin.fabo.device.IADXL345;
-import org.deviceconnect.android.deviceplugin.fabo.device.IHTS221;
-import org.deviceconnect.android.deviceplugin.fabo.device.IISL29034;
-import org.deviceconnect.android.deviceplugin.fabo.device.ILIDARLiteV3;
-import org.deviceconnect.android.deviceplugin.fabo.device.IMPL115;
-import org.deviceconnect.android.deviceplugin.fabo.device.IMouseCar;
-import org.deviceconnect.android.deviceplugin.fabo.device.IRobotCar;
-import org.deviceconnect.android.deviceplugin.fabo.device.IVCNL4010;
-import org.deviceconnect.android.deviceplugin.fabo.param.FaBoShield;
-import org.deviceconnect.android.deviceplugin.fabo.param.FaBoConst;
-
-import java.io.ByteArrayOutputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import io.fabo.serialkit.FaBoUsbConst;
-import io.fabo.serialkit.FaBoUsbListenerInterface;
-import io.fabo.serialkit.FaBoUsbManager;
-
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.FirmataUtil.decodeByte;
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.FirmataV32.ANALOG_MESSAGE;
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.FirmataV32.DIGITAL_MESSAGE;
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.FirmataV32.END_SYSEX;
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.FirmataV32.REPORT_VERSION;
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.FirmataV32.START_SYSEX;
-import static org.deviceconnect.android.deviceplugin.fabo.param.FaBoConst.STATUS_FABO_INIT;
-
-/**
- * Usb経由でFaBoデバイスを操作するクラス.
- */
-public class FaBoUsbDeviceControl implements FaBoDeviceControl {
-
- /**
- * デバッグフラグ.
- */
- private static final boolean DEBUG = BuildConfig.DEBUG;
-
- /**
- * Tag.
- */
- private static final String TAG = "FaBo";
-
- /**
- * USB Serial Manager.
- */
- private FaBoUsbManager mFaBoUsbManager;
-
- /**
- * Port status.
- */
- private int[] mDigitalPortStatus = {0, 0, 0};
-
- /**
- * FirmataのVersion.
- */
- private static final int[] VERSION = {0x02, 0x05};
-
- /**
- * Statusを保持.
- */
- private int mStatus;
-
- /**
- * USB機器へのアクセス許可を行なっているかフラグ.
- */
- private boolean mRequestPermission;
-
- /**
- * GPIOの値変更通知リスナー.
- */
- private final List mOnGPIOListeners = new ArrayList<>();
-
- /**
- * FaBoデバイスの接続状態などを通知するリスナー.
- */
- private OnFaBoDeviceControlListener mOnFaBoDeviceControlListener;
-
- /**
- * コンテキスト.
- */
- private Context mContext;
-
- /**
- * sysex messageを解析中フラグ.
- *
- * sysex messageを解析している間はtrue、それ以外はfalse
- *
- */
- private boolean mParsingSysex;
-
- /**
- * Arduinoから送られてきたピン番号.
- */
- private int mChannel;
-
- /**
- * Arduinoから送られてきたコマンド.
- *
- * 以下のコマンドが存在します。
- * - DIGITAL_MESSAGE
- * - ANALOG_MESSAGE
- * - REPORT_ANALOG
- * - REPORT_DIGITAL
- *
- */
- private byte mCommand;
-
- /**
- * コマンドのデータカウント.
- */
- private int mWaitForData;
-
- /**
- * Arduinoから送られてきたデータを一時的に格納するバッファ.
- */
- private ByteArrayOutputStream mStoredInputData;
-
- /**
- * マウス型RobotCarを操作するクラス.
- */
- private MouseCar mMouseCar;
-
- /**
- * RobotCarを操作するクラス.
- */
- private RobotCar mRobotCar;
-
- /**
- * Brick #201 を操作するためのクラス.
- */
- private ADXL345 mADXL345;
-
- /**
- * Brick #207 を操作するためのクラス.
- */
- private ADT7410 mADT7410;
-
- /**
- * Brick #208 を操作するためのクラス.
- */
- private HTS221 mHTS221;
-
- /**
- * Brick #217 を操作するクラス.
- */
- private ISL29034 mISL29034;
-
- /**
- * Brick #204 を操作するクラス.
- */
- private MPL115 mMPL115;
-
- /**
- * Brick # 205 を操作するクラス.
- */
- private VCNL4010 mVCNL4010;
-
- /**
- * LIDARLite v3を操作するクラス.
- */
- private LIDARLiteV3 mLIDARLiteV3;
-
- /**
- * I2Cを格納するリスト.
- */
- private List mI2CList = new ArrayList<>();
-
- /**
- * コンストラクタ.
- * @param context コンテキスト
- */
- public FaBoUsbDeviceControl(final Context context) {
- mContext = context.getApplicationContext();
- }
-
- @Override
- public void initialize() {
- mStoredInputData = new ByteArrayOutputStream();
- mParsingSysex = false;
-
- // Set status.
- setStatus(FaBoConst.STATUS_FABO_NOCONNECT);
-
- // USBのEvent用のBroadcast Receiverを設定.
- IntentFilter filter = new IntentFilter();
- filter.addAction(FaBoConst.DEVICE_TO_ARDUINO_OPEN_USB);
- filter.addAction(FaBoConst.DEVICE_TO_ARDUINO_CHECK_USB);
- filter.addAction(FaBoConst.DEVICE_TO_ARDUINO_CLOSE_USB);
- filter.addAction(UsbManager.ACTION_USB_DEVICE_DETACHED);
- mContext.registerReceiver(mUsbEventReceiver, filter);
-
- initUsbDevice();
- initI2CSDevice();
- }
-
- @Override
- public void destroy() {
- mOnFaBoDeviceControlListener = null;
- mOnGPIOListeners.clear();
- mI2CList.clear();
- closeUsb();
- mContext.unregisterReceiver(mUsbEventReceiver);
- }
-
- @Override
- public boolean isPinSupported(final FaBoShield.Pin pin) {
- return true;
- }
-
- @Override
- public void writeAnalog(final FaBoShield.Pin pin, final int value) {
- byte[] bytes = new byte[5];
- bytes[0] = (byte) START_SYSEX;
- bytes[1] = (byte) (0x6F);
- bytes[2] = (byte) pin.getPinNumber();
- bytes[3] = (byte) value;
- bytes[4] = (byte) END_SYSEX;
- sendMessage(bytes);
- }
-
- @Override
- public void writeDigital(final FaBoShield.Pin pin, final FaBoShield.Level hl) {
- int port = pin.getPort();
- int pinBit = pin.getBit();
- if (hl == FaBoShield.Level.HIGH) {
- int status = getPortStatus(port) | pinBit;
- byte[] bytes = new byte[3];
- bytes[0] = (byte) (DIGITAL_MESSAGE | port);
- bytes[1] = (byte) (status & 0xFF);
- bytes[2] = (byte) ((status >> 8) & 0xFF);
- sendMessage(bytes);
- setPortStatus(port, status);
- } else if (hl == FaBoShield.Level.LOW) {
- int status = getPortStatus(port) & ~pinBit;
- byte[] bytes = new byte[3];
- bytes[0] = (byte) (DIGITAL_MESSAGE | port);
- bytes[1] = (byte) (status & 0xFF);
- bytes[2] = (byte) ((status >> 8) & 0xFF);
- sendMessage(bytes);
- setPortStatus(port, status);
- }
- }
-
- @Override
- public int getAnalog(final FaBoShield.Pin pin) {
- return pin.getValue();
- }
-
- @Override
- public FaBoShield.Level getDigital(final FaBoShield.Pin pin) {
- int port = pin.getPort();
- int pinBit = pin.getBit();
- int value = mDigitalPortStatus[port];
- if ((value & pinBit) == pinBit) {
- return FaBoShield.Level.HIGH;
- } else {
- return FaBoShield.Level.LOW;
- }
- }
-
- @Override
- public void setPinMode(final FaBoShield.Pin pin, final FaBoShield.Mode mode) {
- byte[] command = new byte[3];
- command[0] = (byte) (FirmataV32.SET_PIN_MODE);
- command[1] = (byte) (pin.getPinNumber());
- command[2] = (byte) (mode.getValue());
- sendMessage(command);
- pin.setMode(mode);
- }
-
- @Override
- public int getStatus() {
- return mStatus;
- }
-
- @Override
- public IRobotCar getRobotCar() {
- mRobotCar.setFaBoDeviceControl(this);
- return mRobotCar;
- }
-
- @Override
- public IMouseCar getMouseCar() {
- mMouseCar.setFaBoDeviceControl(this);
- return mMouseCar;
- }
-
- @Override
- public IADXL345 getADXL345() {
- mADXL345.setFaBoDeviceControl(this);
- return mADXL345;
- }
-
- @Override
- public IADT7410 getADT7410() {
- mADT7410.setFaBoDeviceControl(this);
- return mADT7410;
- }
-
- @Override
- public IHTS221 getHTS221() {
- mHTS221.setFaBoDeviceControl(this);
- return mHTS221;
- }
-
- @Override
- public IVCNL4010 getVCNL4010() {
- mVCNL4010.setFaBoDeviceControl(this);
- return mVCNL4010;
- }
-
- @Override
- public IISL29034 getISL29034() {
- mISL29034.setFaBoDeviceControl(this);
- return mISL29034;
- }
-
- @Override
- public IMPL115 getMPL115() {
- mMPL115.setFaBoDeviceControl(this);
- return mMPL115;
- }
-
- @Override
- public ILIDARLiteV3 getLIDARLite() {
- mLIDARLiteV3.setFaBoDeviceControl(this);
- return mLIDARLiteV3;
- }
-
- @Override
- public void setOnFaBoDeviceControlListener(final OnFaBoDeviceControlListener listener) {
- mOnFaBoDeviceControlListener = listener;
- }
-
- @Override
- public void addOnGPIOListener(final OnGPIOListener listener) {
- synchronized (mOnGPIOListeners) {
- if (!mOnGPIOListeners.contains(listener)) {
- mOnGPIOListeners.add(listener);
- }
- }
- }
-
- @Override
- public void removeOnGPIOListener(final OnGPIOListener listener) {
- synchronized (mOnGPIOListeners) {
- mOnGPIOListeners.remove(listener);
- }
- }
-
- /**
- * I2Cデバイスを初期化します.
- */
- private void initI2CSDevice() {
- mRobotCar = new RobotCar();
- mMouseCar = new MouseCar();
- mADXL345 = new ADXL345();
- mADT7410 = new ADT7410();
- mHTS221 = new HTS221();
- mVCNL4010 = new VCNL4010();
- mISL29034 = new ISL29034();
- mMPL115 = new MPL115();
- mLIDARLiteV3 = new LIDARLiteV3();
-
- mI2CList.add(mADXL345);
- mI2CList.add(mADT7410);
- mI2CList.add(mHTS221);
- mI2CList.add(mVCNL4010);
- mI2CList.add(mISL29034);
- mI2CList.add(mMPL115);
- mI2CList.add(mLIDARLiteV3);
- }
-
- /**
- * GPIOのPIN情報を初期化します.
- */
- private void initGPIO() {
- for (FaBoShield.Pin pin : FaBoShield.Pin.values()) {
- if (pin.getPinNumber() < FaBoShield.PIN_NO_A0) {
- pin.setMode(FaBoShield.Mode.GPIO_OUT);
- } else {
- pin.setMode(FaBoShield.Mode.ANALOG);
- }
- pin.setValue(0);
- }
-
- // Portの状態をすべて0(Low)にする.
- mDigitalPortStatus[0] = 0; // 0000 0000
- mDigitalPortStatus[1] = 0; // 0000 0000
- mDigitalPortStatus[2] = 0; // 0000 0000
- }
-
- /**
- * USBをOpenする.
- */
- private synchronized void openUsb(final UsbDevice usbDevice) {
- if (DEBUG) {
- Log.i(TAG, "----------------------------------------");
- Log.i(TAG, "Open USB.");
- Log.i(TAG, "DeviceName: " + usbDevice.getDeviceName());
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
- Log.i(TAG, "DeviceProductName: " + usbDevice.getProductName());
- }
- Log.i(TAG, "----------------------------------------");
- }
-
- mParsingSysex = false;
-
- if (mFaBoUsbManager != null) {
- mFaBoUsbManager.closeConnection();
- mFaBoUsbManager.checkDevice(usbDevice);
- mFaBoUsbManager.connection(usbDevice);
- } else {
- mFaBoUsbManager = new FaBoUsbManager(mContext);
- mFaBoUsbManager.setParameter(FaBoUsbConst.BAUNDRATE_57600,
- FaBoUsbConst.PARITY_NONE,
- FaBoUsbConst.STOP_1,
- FaBoUsbConst.FLOW_CONTROL_OFF,
- FaBoUsbConst.BITRATE_8);
- mFaBoUsbManager.setListener(mInterface);
- mFaBoUsbManager.checkDevice(usbDevice);
- mFaBoUsbManager.connection(usbDevice);
- }
- }
-
- /**
- * USBをClose.
- */
- private synchronized void closeUsb() {
- if (DEBUG) {
- Log.i(TAG, "----------------------------------------");
- Log.i(TAG, "Close USB.");
- Log.i(TAG, "----------------------------------------");
- }
-
- if (mFaBoUsbManager != null) {
- mFaBoUsbManager.closeConnection();
- mFaBoUsbManager.unregisterMyReceiver();
- mFaBoUsbManager = null;
- }
-
- setStatus(FaBoConst.STATUS_FABO_NOCONNECT);
-
- notifyDisconnectFaBoDevice();
-
- mRequestPermission = false;
- }
-
- /**
- * ステータスを変化する.
- *
- * @param status ステータス
- */
- private void setStatus(int status) {
- mStatus = status;
-
- if (DEBUG) {
- Log.i(TAG, "status:" + status);
- }
- }
-
- /**
- * シリアル通信を開始.
- */
- private void onDeviceStateChange() {
- setStatus(STATUS_FABO_INIT);
-
- // Arduinoの初期化が行われるまで少し待つ
- try {
- Thread.sleep(500);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
-
- // GPIOを格納しているクラスの初期化
- initGPIO();
-
- // FirmataのVersion取得のコマンドを送付
- byte command[] = { REPORT_VERSION };
- sendMessage(command);
-
- // 5秒たってFirmataを検出できない場合はエラー.
- Handler handler = new Handler(Looper.getMainLooper());
- handler.postDelayed(new Runnable() {
- @Override
- public void run() {
- if (mStatus == STATUS_FABO_INIT) {
- setStatus(FaBoConst.STATUS_FABO_NOCONNECT);
- if (mOnFaBoDeviceControlListener != null) {
- mOnFaBoDeviceControlListener.onFailedConnected();
- }
- }
- }
- }, 5000);
-
- // Statusをinitへ.
- setStatus(STATUS_FABO_INIT);
- }
-
- /**
- * Firmataの初期設定.
- */
- private void intFirmata() {
- if (DEBUG) {
- Log.i(TAG, "initFirmata");
- }
-
- byte[] command = new byte[2];
-
- try {
- Thread.sleep(100);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
-
- // AnalogPin A0-A5の値に変化があったら通知する設定をおこなう(Firmata)
- for (int analogPin = 0; analogPin < 7; analogPin++) {
- command[0] = (byte) (FirmataV32.REPORT_ANALOG + analogPin);
- command[1] = (byte) FirmataV32.ENABLE;
- sendMessage(command);
- try {
- Thread.sleep(100);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
-
- // Portのデジタル値に変化があったら通知する設定をおこなう(Firmata)
- for (int digitalPort = 0; digitalPort < 3; digitalPort++) {
- command[0] = (byte) (FirmataV32.REPORT_DIGITAL + digitalPort);
- command[1] = (byte) FirmataV32.ENABLE;
- sendMessage(command);
- try {
- Thread.sleep(100);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- }
-
- /**
- * Usbデバイスを初期化します.
- *
- * Usbに接続されたデバイスの中にFaboデバイスが存在した場合に接続を行います。
- * Faboデバイスの場合には何もしません。
- *
- */
- private void initUsbDevice() {
- if (DEBUG) {
- Log.i(TAG, "initUsbDevice");
- }
-
- notifyDisconnectFaBoDevice();
-
- setStatus(FaBoConst.STATUS_FABO_NOCONNECT);
-
- UsbManager manager = (UsbManager) mContext.getSystemService(Context.USB_SERVICE);
- HashMap deviceList = manager.getDeviceList();
-
- for (final UsbDevice device : deviceList.values()) {
- switch (device.getVendorId()) {
- case FaBoUsbConst.ARDUINO_UNO_VID:
- case FaBoUsbConst.ARDUINO_CC_UNO_VID:
- if (DEBUG) {
- Log.i(TAG, "Find device connecting arduino");
- }
- if (manager.hasPermission(device)) {
- openUsb(device);
- } else {
- Intent i = new Intent(FaBoConst.DEVICE_TO_ARDUINO_OPEN_USB);
- PendingIntent p = PendingIntent.getBroadcast(mContext, 0, i, 0);
- manager.requestPermission(device, p);
- }
- break;
-
- default:
- if (DEBUG) {
- Log.w(TAG, "Found the device that is not FaBo device.");
- Log.w(TAG, " VendorId: " + device.getVendorId());
- Log.w(TAG, " DeviceName: " + device.getDeviceName());
- }
- break;
- }
- }
- }
-
- /**
- * Broadcast receiver for usb event.
- */
- private BroadcastReceiver mUsbEventReceiver = new BroadcastReceiver() {
- @Override
- public void onReceive(final Context context, final Intent intent) {
- String action = intent.getAction();
- switch (action) {
- case FaBoConst.DEVICE_TO_ARDUINO_OPEN_USB: {
- mRequestPermission = false;
- UsbDevice device = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
- if (device != null) {
- UsbManager m = (UsbManager) mContext.getSystemService(Context.USB_SERVICE);
- if (m.hasPermission(device)) {
- openUsb(device);
- }
- }
- } break;
-
- case FaBoConst.DEVICE_TO_ARDUINO_CHECK_USB:
- case UsbManager.ACTION_USB_DEVICE_ATTACHED: {
- UsbDevice device = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
- if (device != null) {
- UsbManager m = (UsbManager) mContext.getSystemService(Context.USB_SERVICE);
- if (m.hasPermission(device)) {
- openUsb(device);
- } else {
- if (mRequestPermission) {
- // 既に許可のリクエストを投げている場合に処理しない
- return;
- }
- mRequestPermission = true;
-
- Intent i = new Intent(FaBoConst.DEVICE_TO_ARDUINO_OPEN_USB);
- PendingIntent p = PendingIntent.getBroadcast(context, 0, i, 0);
- m.requestPermission(device, p);
- }
- }
- } break;
-
- case FaBoConst.DEVICE_TO_ARDUINO_CLOSE_USB:
- case UsbManager.ACTION_USB_DEVICE_DETACHED:
- closeUsb();
- break;
- }
- }
- };
-
- /**
- * I2Cへの書き込みを行います.
- * @param buffer 書き込むバッファ
- */
- void writeI2C(final byte[] buffer) {
- sendMessage(buffer);
- }
-
- /**
- * メッセージの送信
- *
- * @param buf Byte型のメッセージ
- */
- private synchronized void sendMessage(final byte[] buf) {
- if (buf != null && mFaBoUsbManager != null) {
- mFaBoUsbManager.writeBuffer(buf);
- }
- }
-
- /**
- * Portの状態の保存.
- *
- * @param port Port番号
- * @param status Portのステータス
- */
- private void setPortStatus(final int port, final int status) {
- mDigitalPortStatus[port] = status;
- }
-
- /**
- * Portの状態の取得.
- *
- * @param port Port番号
- */
- private int getPortStatus(final int port) {
- return mDigitalPortStatus[port];
- }
-
- /**
- * FaBoデバイスと接続されたことを通知します.
- */
- private void notifyConnectFaBoDevice() {
- if (mOnFaBoDeviceControlListener != null) {
- mOnFaBoDeviceControlListener.onConnected();
- }
- }
-
- /**
- * FaBoデバイスが切断されたことを通知します.
- */
- private void notifyDisconnectFaBoDevice() {
- if (mOnFaBoDeviceControlListener != null) {
- mOnFaBoDeviceControlListener.onDisconnected();
- }
- }
-
- /**
- * アナログのピンデータが変更されたことを通知します.
- */
- private void notifyAnalog() {
- synchronized (mOnGPIOListeners) {
- for (OnGPIOListener l : mOnGPIOListeners) {
- l.onAnalog();
- }
- }
- }
-
- /**
- * デジタルのピンデータが変更されたことを通知します.
- */
- private void notifyDigital() {
- synchronized (mOnGPIOListeners) {
- for (OnGPIOListener l : mOnGPIOListeners) {
- l.onDigital();
- }
- }
- }
-
- /**
- * REPORT_VERIONの解析を行います.
- * @param data データ
- */
- private void reportVersion(final byte[] data) {
- if (DEBUG) {
- Log.i(TAG, "REPORT_VERSION");
- Log.i(TAG, " Version: " + data[0] + "." + data[1]);
- }
-
- if ((byte) (data[0] & 0xFF) == (byte) VERSION[0] && (byte) (data[1] & 0xFF) == (byte) VERSION[1]) {
- new Thread(new Runnable() {
- @Override
- public void run() {
- setStatus(FaBoConst.STATUS_FABO_RUNNING);
- intFirmata();
- notifyConnectFaBoDevice();
- }
- }).start();
- } else {
- if (DEBUG) {
- Log.w(TAG, "Not support version.");
- }
- }
- }
-
- /**
- * Arduinoから送られてきたアナログのデータを設定します.
- * @param port ピン番号
- * @param value 値
- */
- private void setAnalogData(final int port, final int value) {
- if (port < 7) {
- FaBoShield.Pin p = FaBoShield.Pin.getPin(port + 14);
- if (p != null) {
- p.setValue(value);
- }
- notifyAnalog();
- }
- }
-
- /**
- * Arduinoから送られてきたデジタルのデータを設定します.
- * @param port ピン番号
- * @param value 値
- */
- private void setDigitalData(final int port, final int value) {
- if (port < 3) {
- mDigitalPortStatus[port] = value;
- notifyDigital();
- }
- }
-
- /**
- * sysex messageを解析します.
- * @param data sysex messageのデータ
- */
- private void parseSysExMessage(final byte[] data) {
- switch (data[0]) {
- case FirmataV32.REPORT_FIRMWARE:
- break;
-
- case FirmataV32.I2C_REPLY:
- int offset = 1;
- int address = decodeByte(data[offset++], data[offset]);
- for (BaseI2C i2c : mI2CList) {
- if (address == i2c.getAddress()) {
- i2c.onReadData(data);
- }
- }
- break;
-
- case FirmataV32.STRING_DATA:
- if (DEBUG) {
- Log.i(TAG, "FirmataV32.STRING_DATA");
- Log.i(TAG, FirmataUtil.decodeString(data, 1, data.length));
- }
- break;
-
- default:
- if (DEBUG) {
- Log.e(TAG, "Unknown: " + data[0]);
- }
- break;
- }
- }
-
- /**
- * Arduinoから読み込んだデータを処理します.
- * @param inputData 読み込んだデータ
- */
- private void processInput(final byte inputData) {
- if (mParsingSysex) {
- if (inputData == END_SYSEX) {
- parseSysExMessage(mStoredInputData.toByteArray());
- mParsingSysex = false;
- } else {
- mStoredInputData.write(inputData);
- }
- } else if (mWaitForData > 0 && (inputData & 0x80) != 0x80) {
- mWaitForData--;
- mStoredInputData.write(inputData);
-
- if (mWaitForData == 0) {
- switch (mCommand) {
- case DIGITAL_MESSAGE:
- setDigitalData(mChannel, FirmataUtil.decodeByte(mStoredInputData.toByteArray()));
- break;
- case ANALOG_MESSAGE:
- setAnalogData(mChannel, FirmataUtil.decodeByte(mStoredInputData.toByteArray()));
- break;
- case REPORT_VERSION:
- reportVersion(mStoredInputData.toByteArray());
- break;
- }
- }
- } else {
- byte command;
- if ((inputData & 0xFF) < 0xF0) {
- command = (byte) (inputData & 0xF0);
- } else {
- command = inputData;
- }
-
- switch (command) {
- case START_SYSEX:
- mParsingSysex = true;
- mStoredInputData.reset();
- break;
-
- case DIGITAL_MESSAGE:
- case ANALOG_MESSAGE:
- case REPORT_VERSION:
- mWaitForData = 2;
- mStoredInputData.reset();
- mCommand = command;
- mChannel = (byte) (inputData & 0x0F);
- break;
- }
- }
- }
-
- /**
- * FaBoUsbManagerからの通知を受け取るリスナー.
- */
- private FaBoUsbListenerInterface mInterface = new FaBoUsbListenerInterface() {
-
- @Override
- public void onFind(final UsbDevice usbDevice, final int type) {
- if (DEBUG) {
- Log.i(TAG, "onFind:" + usbDevice.getDeviceName());
- Log.i(TAG, "onFind: type = " + type);
- }
- }
-
- @Override
- public void onStatusChanged(final UsbDevice usbDevice, final int status) {
- if (DEBUG) {
- Log.i(TAG, "onStatusChanged: status=" + status + " device=" + usbDevice.getDeviceName());
- }
-
- if (status == FaBoUsbConst.CONNECTED) {
- if (DEBUG) {
- Log.i(TAG, "onStatusChanged:CONNECTED");
- }
- onDeviceStateChange();
- }
- }
-
- @Override
- public void readBuffer(final int deviceId, final byte[] datas) {
-
-// if (DEBUG) {
-// final StringBuilder sb = new StringBuilder();
-// for (byte data : datas) {
-// sb.append(Integer.toHexString(data & 0xff));
-// sb.append(" ");
-// }
-// Log.i(TAG, " readBuffer: " + sb.toString());
-// }
-
- try {
- for (byte data : datas) {
- processInput(data);
- }
- } catch (OutOfMemoryError e) {
- mStoredInputData = new ByteArrayOutputStream();
- mParsingSysex = false;
- } catch (Exception e) {
- mStoredInputData.reset();
- mParsingSysex = false;
- }
- }
- };
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/FirmataUtil.java b/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/FirmataUtil.java
deleted file mode 100644
index 84f0d0f8e4..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/FirmataUtil.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.device.arduino;
-
-final class FirmataUtil {
-
- private FirmataUtil() {
- }
-
- /**
- * 送られてきたデータをbyteに変換して取得します.
- *
- * 2byteを1byteにします。
- *
- * @param buffer データ
- * @return byteデータ
- */
- static int decodeByte(final byte[] buffer) {
- return decodeByte(buffer, 0);
- }
-
- /**
- * 送られてきたデータをbyteに変換して取得します.
- *
- * 2byteを1byteにします。
- *
- * @param buffer データ
- * @param startIndex オフセット
- * @return byteデータ
- */
- static int decodeByte(final byte[] buffer, final int startIndex) {
- int offset = startIndex;
- return decodeByte(buffer[offset++], buffer[offset]);
- }
-
- /**
- * 下位ビットと上位ビットを合わせてbyteデータに変換します.
- * @param lsb 下位ビット
- * @param msb 上位ビット
- * @return byteデータ
- */
- static int decodeByte(final int lsb, final int msb) {
- return (msb << 7) + lsb;
- }
-
- /**
- * 送られてきたデータを文字列に変換して取得します.
- * @param buffer 送られてきたデータ
- * @param startIndex 開始位置
- * @param endIndex 修了位置
- * @return 文字列
- */
- static String decodeString(final byte[] buffer, final int startIndex, final int endIndex) {
- StringBuilder sb = new StringBuilder();
- int offset = startIndex;
- int length = (endIndex - startIndex + 1) / 2;
- for (int i = 0; i < length; i++) {
- sb.append((char) decodeByte(buffer[offset++], buffer[offset++]));
- }
- return sb.toString();
- }
-
- /**
- * 送られてきたデータをshortに変換して取得します.
- *
- * 4byteをshortにします。
- *
- *
- * リトルエンディアン.
- *
- * @param buffer 送られてきたデータ
- * @param startIndex 開始位置
- * @return shortデータ
- */
- static int decodeShort(final byte[] buffer, final int startIndex) {
- int offset = startIndex;
- byte lsb = (byte) (decodeByte(buffer[offset++], buffer[offset++]) & 0xFF);
- byte msb = (byte) (decodeByte(buffer[offset++], buffer[offset]) & 0xFF);
- return ((msb << 8) | (lsb & 0xFF));
- }
-
- /**
- * 送られてきたデータをshortに変換して取得します.
- *
- * 4byteをshortにします。
- *
- *
- * ビックエンディアン.
- *
- * @param buffer 送られてきたデータ
- * @param startIndex 開始位置
- * @return shortデータ
- */
- static int decodeShort2(final byte[] buffer, final int startIndex) {
- int offset = startIndex;
- byte lsb = (byte) (decodeByte(buffer[offset++], buffer[offset++]) & 0xFF);
- byte msb = (byte) (decodeByte(buffer[offset++], buffer[offset]) & 0xFF);
- return (lsb << 8 | (msb & 0xFF));
- }
-
- /**
- * 送られてきたデータをshortに変換して取得します.
- *
- * 4byteをunsigned shortにします。
- *
- *
- * ビックエンディアン.
- *
- * @param buffer 送られてきたデータ
- * @param startIndex 開始位置
- * @return shortデータ
- */
- static int decodeUShort2(final byte[] buffer, final int startIndex) {
- int offset = startIndex;
- byte lsb = (byte) (decodeByte(buffer[offset++], buffer[offset++]) & 0xFF);
- byte msb = (byte) (decodeByte(buffer[offset++], buffer[offset]) & 0xFF);
- return ((lsb & 0xFF) << 8 | (msb & 0xFF));
- }
-
- static int dataConv(final int data1, final int data2) {
- int value = data1 | (data2 << 8);
- if ((value & (1 << 16 - 1)) != 0) {
- value -= (1 << 16);
- }
- return value;
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/FirmataV32.java b/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/FirmataV32.java
deleted file mode 100644
index bc49dd9f35..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/FirmataV32.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- FirmataV32.java
- Copyright (c) 2014 NTT DOCOMO,INC.
- Released under the MIT license
- http://opensource.org/licenses/mit-license.php
- */
-package org.deviceconnect.android.deviceplugin.fabo.device.arduino;
-
-/**
- * Firmata version 3.2のCommand.
- *
- */
-class FirmataV32 {
-
- // Firmata Buadrate
- public static final int BAUDRATE = 57600;
-
- // message command bytes (128-255/0x80-0xFF)
-
- public static final byte DIGITAL_MESSAGE = (byte)0x90; // send data for a digital port (collection of 8 pins)
- public static final byte ANALOG_MESSAGE = (byte)0xE0; // send data for an analog pin (or PWM)
- public static final byte REPORT_ANALOG = (byte)0xC0; // enable analog input by pin #
- public static final byte REPORT_DIGITAL = (byte)0xD0; // enable digital input by port pair
-
- public static final byte SET_PIN_MODE = (byte)0xF4; // set a pin to INPUT/OUTPUT/PWM/etc
- public static final byte SET_DIGITAL_PIN_VALUE = (byte)0xF5; // set value of an individual digital pin
-
- public static final byte REPORT_VERSION = (byte)0xF9; // report protocol version
- public static final byte SYSTEM_RESET = (byte)0xFF; // reset from MIDI
-
- public static final byte START_SYSEX = (byte)0xF0; // start a MIDI Sysex message
- public static final byte END_SYSEX = (byte)0xF7; // end a MIDI Sysex message
-
- // extended command set using sysex (0-127/0x00-0x7F)
- // 0x00-0x0F reserved for user-defined commands
-
- public static final byte SERIAL_DATA = 0x60; // communicate with serial devices, including other boards
- public static final byte ENCODER_DATA = 0x61; // reply with encoders current positions
- public static final byte SERVO_CONFIG = 0x70; // set max angle, minPulse, maxPulse, freq
- public static final byte STRING_DATA = 0x71; // a string message with 14-bits per char
- public static final byte STEPPER_DATA = 0x72; // control a stepper motor
- public static final byte ONEWIRE_DATA = 0x73; // send an OneWire read/write/reset/select/skip/search request
- public static final byte SHIFT_DATA = 0x75; // a bitstream to/from a shift register
- public static final byte I2C_REQUEST = 0x76; // send an I2C read/write request
- public static final byte I2C_REPLY = 0x77; // a reply to an I2C read request
- public static final byte I2C_CONFIG = 0x78; // config I2C settings such as delay times and power pins
- public static final byte REPORT_FIRMWARE = 0x79; // report name and version of the firmware
- public static final byte EXTENDED_ANALOG = 0x6F; // analog write (PWM, Servo, etc) to any pin
- public static final byte PIN_STATE_QUERY = 0x6D; // ask for a pin's current mode and value
- public static final byte PIN_STATE_RESPONSE = 0x6E; // reply with pin's current mode and value
- public static final byte CAPABILITY_QUERY = 0x6B; // ask for supported modes and resolution of all pins
- public static final byte CAPABILITY_RESPONSE = 0x6C; // reply with supported modes and resolution
- public static final byte ANALOG_MAPPING_QUERY = 0x69; // ask for mapping of analog to pin numbers
- public static final byte ANALOG_MAPPING_RESPONSE = 0x6A; // reply with mapping info
- public static final byte SAMPLING_INTERVAL = 0x7A; // set the poll rate of the main loop
- public static final byte SCHEDULER_DATA = 0x7B; // send a createtask/deletetask/addtotask/schedule/querytasks/querytask request to the scheduler
- public static final byte SYSEX_NON_REALTIME = 0x7E; // MIDI Reserved for non-realtime messages
- public static final byte SYSEX_REALTIME = 0x7F; // MIDI Reserved for realtime messages
-
- // Param
- public static final byte DISABLE = (byte)0x00;
- public static final byte ENABLE = (byte)0x01;
-
- // I2C
- public static final byte I2C_WRITE = 0x00;
- public static final byte I2C_READ = 0x08;
- public static final byte I2C_READ_CONTINUOUSLY = 0x10;
- public static final byte I2C_STOP_READING = 0x18;
-}
-
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/HTS221.java b/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/HTS221.java
deleted file mode 100644
index ea71ca5cbf..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/HTS221.java
+++ /dev/null
@@ -1,526 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.device.arduino;
-
-import org.deviceconnect.android.deviceplugin.fabo.device.IHTS221;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Timer;
-import java.util.TimerTask;
-
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.FirmataUtil.decodeByte;
-
-class HTS221 extends BaseI2C implements IHTS221 {
-
- /**
- * HTS221のアドレス.
- */
- private static final byte HTS221_SLAVE_ADDRESS = 0x5F;
-
- /**
- * HTS221のデバイスID.
- */
- private static final int DEVICE_ID = 0xBC;
-
- // AV_CONF:AVGH
- // Averaged humidity samples configuration
- // AVGH_4 : 0b00000000
- private static final byte AVGH_4 = 0x00;
- // AVGH_8 : 0b00000001
- private static final byte AVGH_8 = 0x01;
- // AVGH_16 : 0b00000010
- private static final byte AVGH_16 = 0x02;
- // AVGH_32 : 0b00000011 // defalut
- private static final byte AVGH_32 = 0x03;
- // AVGH_64 : 0b00000100
- private static final byte AVGH_64 = 0x04;
- // AVGH_128 : 0b00000101
- private static final byte AVGH_128 = 0x05;
- // AVGH_256 : 0b00000110
- private static final byte AVGH_256 = 0x06;
- // AVGH_512 : 0b00000111
- private static final byte AVGH_512 = 0x07;
-
- // AV_CONF:AVGT
- // Averaged temperature samples configuration
- // AVGT_2 : 0b00000000
- private static final byte AVGT_2 = 0x00;
- // AVGT_4 : 0b00001000
- private static final byte AVGT_4 = 0x08;
- // AVGT_8 : 0b00010000
- private static final byte AVGT_8 = 0x10;
- // AVGT_16 : 0b00011000 // defalut
- private static final byte AVGT_16 = 0x18;
- // AVGT_32 : 0b00100000
- private static final byte AVGT_32 = 0x20;
- // AVGT_64 : 0b00101000
- private static final byte AVGT_64 = 0x28;
- // AVGT_128 : 0b00110000
- private static final byte AVGT_128 = 0x30;
- // AVGT_256 : 0b00111000
- private static final byte AVGT_256 = 0x38;
-
- // CTRL_REG1
- // Power Down control : 0b10000000
- private static final byte PD = (byte) 0x80;
- // Block Data Update control : 0b00000100
- private static final byte BDU = 0x04;
- // Output Data Rate : One Shot : 0b00000000
- private static final byte ODR_ONE = 0x00;
- // Output Data Rate : 1Hz : 0b00000001
- private static final byte ODR_1HZ = 0x01;
- // Output Data Rate : 7Hz : 0b00000010
- private static final byte ODR_7HZ = 0x02;
- // Output Data Rate : 12.5Hz : 0b00000011
- private static final byte ODR_125HZ = 0x03;
-
- // CTRL_REG2
- // Reboot memory content : 0b10000000
- private static final byte BOOT = (byte) 0x80;
- // Heater : 0b00000010
- private static final byte HEATER = 0x02;
- // One shot enable : 0b00000001
- private static final byte ONE_SHOT = 0x01;
-
- // CTRL_REG3
- // DRDY pin is no connect in FaBo Brick
- private static final byte CTRL_REG3_DEFAULT = 0x00;
-
- // REGISTER_STATUS_REG
- // Humidity Data Available
- private static final byte H_DA = 0x02;
- // Temperature Data Available
- private static final byte T_DA = 0x01;
-
- private static final int REGISTER_DEVICE_REG = 0x0F;
- private static final int REGISTER_AV_CONF = 0x10;
- private static final int REGISTER_CTRL_REG1 = 0x20;
- private static final int REGISTER_CTRL_REG2 = 0x21;
- private static final int REGISTER_CTRL_REG3 = 0x22;
- private static final int REGISTER_STATUS_REG = 0x27;
- private static final int REGISTER_HUMIDITY_OUT_L = 0x28;
- private static final int REGISTER_HUMIDITY_OUT_H = 0x29;
- private static final int REGISTER_TEMP_OUT_L = 0x2A;
- private static final int REGISTER_TEMP_OUT_H = 0x2B;
- private static final int REGISTER_H0_RH_X2 = 0x30;
- private static final int REGISTER_H1_RH_X2 = 0x31;
- private static final int REGISTER_T0_DEGC_X8 = 0x32;
- private static final int REGISTER_T1_DEGC_X8 = 0x33;
- private static final int REGISTER_T1_T0_MSB = 0x35;
- private static final int REGISTER_H0_T0_OUT_L = 0x36;
- private static final int REGISTER_H0_T0_OUT_H = 0x37;
- private static final int REGISTER_H1_T0_OUT_L = 0x3A;
- private static final int REGISTER_H1_T0_OUT_H = 0x3B;
- private static final int REGISTER_T0_OUT_L = 0x3C;
- private static final int REGISTER_T0_OUT_H = 0x3D;
- private static final int REGISTER_T1_OUT_L = 0x3E;
- private static final int REGISTER_T1_OUT_H = 0x3F;
-
- private List mOnHumidityCallbacks = new ArrayList<>();
- private List mOnTemperatureCallbacks = new ArrayList<>();
-
- private Humidity mHumidity = new Humidity();
- private Temperature mTemperature = new Temperature();
-
- @Override
- public synchronized void readHumidity(final OnHumidityCallback callback) {
- mOnHumidityCallbacks.add(callback);
-
- if (mHumidity.isMeasuring()) {
- return;
- }
- mHumidity.start();
- }
-
- @Override
- public synchronized void readTemperature(final OnTemperatureCallback callback) {
- mOnTemperatureCallbacks.add(callback);
-
- if (mTemperature.isMeasuring()) {
- return;
- }
- mTemperature.start();
- }
-
- @Override
- byte getAddress() {
- return HTS221_SLAVE_ADDRESS;
- }
-
- @Override
- synchronized void onReadData(final byte[] data) {
- int offset = 3;
- int register = decodeByte(data[offset++], data[offset]);
- switch (register) {
- case REGISTER_DEVICE_REG:
- mHumidity.onReadData(data, register);
- mTemperature.onReadData(data, register);
- break;
-
- // humidity
-
- case REGISTER_H0_RH_X2:
- case REGISTER_H1_RH_X2:
- case REGISTER_H0_T0_OUT_L:
- case REGISTER_H0_T0_OUT_H:
- case REGISTER_H1_T0_OUT_L:
- case REGISTER_H1_T0_OUT_H:
- case REGISTER_HUMIDITY_OUT_L:
- case REGISTER_HUMIDITY_OUT_H:
- mHumidity.onReadData(data, register);
- break;
-
- // temperature
-
- case REGISTER_T1_T0_MSB:
- case REGISTER_T0_DEGC_X8:
- case REGISTER_T1_DEGC_X8:
- case REGISTER_T0_OUT_L:
- case REGISTER_T0_OUT_H:
- case REGISTER_T1_OUT_L:
- case REGISTER_T1_OUT_H:
- case REGISTER_TEMP_OUT_L:
- case REGISTER_TEMP_OUT_H:
- mTemperature.onReadData(data, register);
- break;
-
- case REGISTER_STATUS_REG:
- break;
- }
- }
-
- private void powerOn() {
- write(HTS221_SLAVE_ADDRESS, REGISTER_CTRL_REG1, PD | ODR_1HZ);
- }
-
- private void configDevice() {
- write(HTS221_SLAVE_ADDRESS, REGISTER_AV_CONF, AVGH_32 | AVGT_16);
- }
-
- private int dataConv(int data1, int data2) {
- int value = (data1 & 0xff) | ((data2 & 0xff) << 8);
- if ((value & 0x8000) != 0) {
- value -= (1 << 16);
- }
- return value;
- }
-
- private abstract class HTSS221State {
-
- /**
- * 現在のステート.
- *
- * 現在、取得しているレジスタの番号になります。
- *
- */
- int mState = -1;
-
- /**
- * タイムアウトを監視するタイマー.
- */
- private Timer mTimer;
-
- /**
- * 湿度の計測中フラグ.
- * @return 計測中の場合にはtrue、それ以外はfalse
- */
- boolean isMeasuring() {
- return mState != -1;
- }
-
- /**
- * 湿度の計測を開始します.
- */
- void start() {
- setI2CConfig();
-
- mTimer = new Timer();
- mTimer.schedule(new TimerTask() {
- @Override
- public void run() {
- onError("timeout");
- }
- }, 1000);
-
- next(REGISTER_DEVICE_REG);
- }
-
- /**
- * 次のレジスタの値を取得します.
- * @param register 次に取得するレジスタ
- */
- void next(final int register) {
- mState = register;
- read(HTS221_SLAVE_ADDRESS, register, 1);
- }
-
- /**
- * エラーが発生した場合の処理を行います.
- * @param message エラーメッセージ
- */
- void onError(final String message) {
- onFinish();
- }
-
- /**
- * 後始末処理を行います.
- */
- void onFinish() {
- if (mTimer != null) {
- mTimer.cancel();
- mTimer = null;
- }
- mState = -1;
- }
-
- /**
- * HTS221から送られてきたデータを解析して、次のステップに進みます.
- * @param data 送られてきたデータ
- * @param register レジスタ番号
- */
- abstract void onReadData(final byte[] data, final int register);
- }
-
-
- /**
- * HTS221から湿度を取得するためのステートを管理するクラス.
- */
- private class Humidity extends HTSS221State {
-
- private int h0_rh_x2;
- private int h1_rh_x2;
- private int h0_t0_l;
- private int h0_t0_h;
- private int h1_t0_l;
- private int h1_t0_h;
-
- private int humidity_out_l;
- private int humidity_out_h;
-
- /**
- * HTS221から送られてきたデータを湿度に変換します.
- * @return 変換した湿度
- */
- private double convertHumidity() {
- int h_out = dataConv(humidity_out_l, humidity_out_h);
-
- double t_H0_rH = h0_rh_x2 / 2.0;
- double t_H1_rH = h1_rh_x2 / 2.0;
-
- int h0_t0_out = dataConv(h0_t0_l, h0_t0_h);
- int h1_t0_out = dataConv(h1_t0_l, h1_t0_h);
-
- return t_H0_rH + (t_H1_rH - t_H0_rH) * (h_out - h0_t0_out) / (h1_t0_out - h0_t0_out);
- }
-
- /**
- * 取得した湿度の値を配信します.
- */
- private void onReadHumidity() {
- double humidity = convertHumidity();
- for (OnHumidityCallback callback : mOnHumidityCallbacks) {
- callback.onHumidity(humidity);
- }
- mOnHumidityCallbacks.clear();
- onFinish();
- }
-
- @Override
- void onError(final String message) {
- for (OnHumidityCallback callback : mOnHumidityCallbacks) {
- callback.onError(message);
- }
- mOnHumidityCallbacks.clear();
- super.onError(message);
- }
-
- @Override
- void onReadData(final byte[] data, final int register) {
-
- if (mState != register) {
- // レジスタが一致しない場合には、不正なデータなので無視
- return;
- }
-
- int offset = 5;
- switch(register) {
- case REGISTER_DEVICE_REG:
- int deviceId = decodeByte(data[offset++], data[offset]);
- if (deviceId == DEVICE_ID) {
- powerOn();
- configDevice();
- next(REGISTER_H0_RH_X2);
- } else {
- onError("HTS221 is not connect.");
- }
- break;
-
- case REGISTER_H0_RH_X2:
- h0_rh_x2 = decodeByte(data[offset++], data[offset]);
- next(REGISTER_H1_RH_X2);
- break;
-
- case REGISTER_H1_RH_X2:
- h1_rh_x2 = decodeByte(data[offset++], data[offset]);
- next(REGISTER_H0_T0_OUT_L);
- break;
-
- case REGISTER_H0_T0_OUT_L:
- h0_t0_l = decodeByte(data[offset++], data[offset]);
- next(REGISTER_H0_T0_OUT_H);
- break;
-
- case REGISTER_H0_T0_OUT_H:
- h0_t0_h = decodeByte(data[offset++], data[offset]);
- next(REGISTER_H1_T0_OUT_L);
- break;
-
- case REGISTER_H1_T0_OUT_L:
- h1_t0_l = decodeByte(data[offset++], data[offset]);
- next(REGISTER_H1_T0_OUT_H);
- break;
-
- case REGISTER_H1_T0_OUT_H:
- h1_t0_h = decodeByte(data[offset++], data[offset]);
- next(REGISTER_HUMIDITY_OUT_L);
- break;
-
- case REGISTER_HUMIDITY_OUT_L:
- humidity_out_l = decodeByte(data[offset++], data[offset]);
- next(REGISTER_HUMIDITY_OUT_H);
- break;
-
- case REGISTER_HUMIDITY_OUT_H:
- humidity_out_h = decodeByte(data[offset++], data[offset]);
- onReadHumidity();
- break;
- }
- }
- }
-
- /**
- * HTS221から温度を取得するためのステートを管理するクラス.
- */
- private class Temperature extends HTSS221State {
-
- private int t1_t0_msb;
-
- private int t0_degc_x8;
- private int t1_degc_x8;
-
- private int t0_l;
- private int t0_h;
-
- private int t1_l;
- private int t1_h;
-
- private int temp_out_l;
- private int temp_out_h;
-
- /**
- * HTS221から送られてきたデータを温度に変換します.
- * @return 変換した温度
- */
- private double convertTemperature() {
- int t_out = dataConv(temp_out_l, temp_out_h);
-
- double t_T0_degC = t0_degc_x8 / 8.0;
- double t_T1_degC = t1_degc_x8 / 8.0;
-
- int t0_out = dataConv(t0_l, t0_h);
- int t1_out = dataConv(t1_l, t1_h);
-
- return t_T0_degC + (t_T1_degC - t_T0_degC) * (t_out - t0_out) / (t1_out - t0_out);
- }
-
- /**
- * 計測した結果を配信します.
- */
- private void onReadTemperature() {
- double temperature = convertTemperature();
- for (OnTemperatureCallback callback : mOnTemperatureCallbacks) {
- callback.onTemperature(temperature);
- }
- mOnTemperatureCallbacks.clear();
- onFinish();
- }
-
- @Override
- void onError(final String message) {
- for (OnTemperatureCallback callback : mOnTemperatureCallbacks) {
- callback.onError(message);
- }
- mOnTemperatureCallbacks.clear();
- super.onError(message);
- }
-
- @Override
- void onReadData(final byte[] data, final int register) {
-
- if (mState != register) {
- // レジスタが一致しない場合には、不正なデータなので無視
- return;
- }
-
- int offset = 5;
- switch (register) {
- case REGISTER_DEVICE_REG:
- int deviceId = decodeByte(data[offset++], data[offset]);
- if (deviceId == DEVICE_ID) {
- powerOn();
- configDevice();
- next(REGISTER_T1_T0_MSB);
- } else {
- onError("HTS221 is not connect.");
- }
- break;
-
- case REGISTER_T1_T0_MSB:
- t1_t0_msb = decodeByte(data[offset++], data[offset]);
- next(REGISTER_T0_DEGC_X8);
- break;
-
- case REGISTER_T0_DEGC_X8:
- int a = decodeByte(data[offset++], data[offset]);
- t0_degc_x8 = ((t1_t0_msb & 0x3) << 8) | a;
- next(REGISTER_T1_DEGC_X8);
- break;
-
- case REGISTER_T1_DEGC_X8:
- int b = decodeByte(data[offset++], data[offset]);
- t1_degc_x8 = ((t1_t0_msb & 0xC) << 6) | b;
- next(REGISTER_T0_OUT_L);
- break;
-
- case REGISTER_T0_OUT_L:
- t0_l = decodeByte(data[offset++], data[offset]);
- next(REGISTER_T0_OUT_H);
- break;
-
- case REGISTER_T0_OUT_H:
- t0_h = decodeByte(data[offset++], data[offset]);
- next(REGISTER_T1_OUT_L);
- break;
-
- case REGISTER_T1_OUT_L:
- t1_l = decodeByte(data[offset++], data[offset]);
- next(REGISTER_T1_OUT_H);
- break;
-
- case REGISTER_T1_OUT_H:
- t1_h = decodeByte(data[offset++], data[offset]);
- next(REGISTER_TEMP_OUT_L);
- break;
-
- case REGISTER_TEMP_OUT_L:
- temp_out_l = decodeByte(data[offset++], data[offset]);
- next(REGISTER_TEMP_OUT_H);
- break;
-
- case REGISTER_TEMP_OUT_H:
- temp_out_h = decodeByte(data[offset++], data[offset]);
- onReadTemperature();
- break;
- }
- }
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/ISL29034.java b/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/ISL29034.java
deleted file mode 100644
index edc9389d8c..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/ISL29034.java
+++ /dev/null
@@ -1,285 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.device.arduino;
-
-import org.deviceconnect.android.deviceplugin.fabo.device.IISL29034;
-
-import java.util.List;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.FirmataUtil.decodeByte;
-
-class ISL29034 extends BaseI2C implements IISL29034 {
-
- // ISL29034 I2C Slave Address
- private static final byte SLAVE_ADDRESS = 0x44;
-
- // ISL29034 Device ID(xx101xxx)
- private static final int DEVICE_ID = 0x28;
-
- // Register Addresses
- private static final int REG_CMD1 = 0x00;
- private static final int REG_CMD2 = 0x01;
- private static final int REG_DATA_L = 0x02;
- private static final int REG_DATA_H = 0x03;
- private static final int REG_ID = 0x0F;
-
- // Operation Mode
- private static final int OP_PWR_DOWN = 0x00; // Power-down the device(Default)
- private static final int OP_ALS_CONT = 0xA0; // Measures ALS continuously
-
- // FULL SCALE LUX RANGE
- private static final int FS_0 = 0x00; // 1,000(Default)
- private static final int FS_1 = 0x01; // 4,000
- private static final int FS_2 = 0x02; // 16,000
- private static final int FS_3 = 0x03; // 64,000
-
- // ADC RESOLUTION
- private static final int RES_16 = 0x00; // 16bit(Default)
- private static final int RES_12 = 0x04; // 12bit
- private static final int RES_8 = 0x08; // 8bit
- private static final int RES_4 = 0x0C; // 4bit
-
- private static final int ID_MASK = 0x38; // ISL29034 Device ID Mask(00111000)
-
- /**
- * ISL29034に設定する範囲.
- */
- private int mRange = FS_0;
-
- /**
- * ISL29034に設定する解像度.
- */
- private int mResolution = RES_4;
-
- /**
- * 通知するリスナーのリスト.
- */
- private final List mListeners = new CopyOnWriteArrayList<>();
-
- /**
- * 現在のステート.
- *
- * 現在、取得しているレジスタの番号になります。
- *
- */
- private int mState = -1;
-
- /**
- * タイムアウトを監視するタイマー.
- */
- private Timer mTimer;
-
- @Override
- public void read(final OnAmbientLightListener listener) {
- mListeners.add(listener);
-
- if (mState != -1) {
- return;
- }
- mState = REG_ID;
-
- mTimer = new Timer();
- mTimer.schedule(new TimerTask() {
- @Override
- public void run() {
- onError("timeout");
- }
- }, 1000);
-
- setI2CConfig();
- read(SLAVE_ADDRESS, REG_ID, 1);
- }
-
- @Override
- public void startRead(final OnAmbientLightListener listener) {
-
- }
-
- @Override
- public void stopRead(final OnAmbientLightListener listener) {
-
- }
-
- /**
- * 範囲の値を取得します.
- * @return 範囲
- */
- private int getRange() {
- switch (mRange) {
- case FS_0:
- return 1000;
- case FS_1:
- return 4000;
- case FS_2:
- return 16000;
- case FS_3:
- return 64000;
- default:
- return -1;
- }
- }
-
- /**
- * 解像度の値を取得します.
- * @return 解像度
- */
- private int getResolution() {
- switch (mResolution) {
- case RES_16:
- return 65535;
- case RES_12:
- return 4095;
- case RES_8:
- return 255;
- case RES_4:
- return 15;
- default:
- return -1;
- }
- }
-
- /**
- * ISL29034の設定を行います.
- */
- private void setISL29034() {
- setOperation(OP_ALS_CONT);
- setCMD2(FS_3, RES_16);
- }
-
- /**
- * Set Operation Mode.
- * @param config Operation Mode DEFAULT:Power-down the device
- */
- private void setOperation(int config) {
- write(SLAVE_ADDRESS, REG_CMD1, config);
- }
-
- /**
- * CMD2にrangeとresolutionを設定します.
- * @param range luxの範囲
- * @param resolution 解像度
- */
- private void setCMD2(final int range, final int resolution) {
- mRange = range;
- mResolution = resolution;
- mState = REG_CMD2;
- read(SLAVE_ADDRESS, REG_CMD2, 1);
- }
-
- /**
- * CMD2の設定をISL29034に送信します.
- * @param value ISL29034の設定
- */
- private void writeCMD2(byte value) {
- value &= 0xFC;
- value |= mRange;
-
- value &= 0xF3;
- value |= mResolution;
-
- write(SLAVE_ADDRESS, REG_CMD2, value);
- }
-
- /**
- * Analog to Digital Converterの値を読み込みます.
- */
- private void readADC() {
- mState = REG_DATA_L;
- read(SLAVE_ADDRESS, REG_DATA_L, 2);
- }
-
- /**
- * Analog to Digital Converterの値をluxに変換します.
- * @param adc Analog to Digital Converterの値
- * @return lux
- */
- private float convert(final int adc) {
- int range = getRange();
- int count = getResolution();
- return (range / (float) count) * adc;
- }
-
- /**
- * Luxの値を通知します.
- * @param adc Analog to Digital Converterの値
- */
- private void notifyLux(final int adc) {
- float lux = convert(adc);
- for (OnAmbientLightListener listener : mListeners) {
- listener.onData(lux);
- }
- mListeners.clear();
- mState = -1;
- cancelTimer();
- }
-
- /**
- * エラーが発生したことを通知します.
- * @param message エラーメッセージ
- */
- private void onError(final String message) {
- for (OnAmbientLightListener listener : mListeners) {
- listener.onError(message);
- }
- mListeners.clear();
- mState = -1;
- cancelTimer();
- }
-
- /**
- * タイマーをキャンセルします.
- */
- private void cancelTimer() {
- if (mTimer != null) {
- mTimer.cancel();
- mTimer = null;
- }
- }
-
- @Override
- byte getAddress() {
- return SLAVE_ADDRESS;
- }
-
- @Override
- void onReadData(final byte[] data) {
- int offset = 3;
- int register = decodeByte(data[offset++], data[offset++]);
- switch (register) {
- case REG_ID:
- int deviceId = decodeByte(data[offset++], data[offset]);
- if ((deviceId & ID_MASK) == DEVICE_ID) {
- new Thread(new Runnable() {
- @Override
- public void run() {
- setISL29034();
- }
- }).start();
- } else {
- onError("ISL29034 is not connect.");
- }
- break;
-
- case REG_CMD2:
- final int cmd = decodeByte(data[offset++], data[offset]);
- new Thread(new Runnable() {
- @Override
- public void run() {
- writeCMD2((byte) cmd);
- try {
- Thread.sleep(100);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- readADC();
- }
- }).start();
- break;
-
- case REG_DATA_L:
- notifyLux(FirmataUtil.decodeShort(data, offset));
- break;
- }
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/LIDARLiteV3.java b/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/LIDARLiteV3.java
deleted file mode 100644
index 33bedf34f6..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/LIDARLiteV3.java
+++ /dev/null
@@ -1,258 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.device.arduino;
-
-import org.deviceconnect.android.deviceplugin.fabo.device.ILIDARLiteV3;
-
-import java.util.List;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.FirmataUtil.decodeByte;
-
-class LIDARLiteV3 extends BaseI2C implements ILIDARLiteV3 {
-
- // I2C LIDARLite v3 Slave Address
- private static final byte SLAVE_ADDRESS = 0x62;
-
- private List mOnLIDARLiteListeners = new CopyOnWriteArrayList<>();
-
- @Override
- public void read(final OnLIDARLiteListener listener) {
- setI2CConfig();
- setLIDARLiteConfig(1);
-
- OnLIDARLiteListenerImpl impl = new OnLIDARLiteListenerImpl();
- impl.setListener(listener);
- impl.setOnceRead(true);
- impl.start();
- mOnLIDARLiteListeners.add(impl);
- }
-
- @Override
- public void startRead(final OnLIDARLiteListener listener) {
- setI2CConfig();
- setLIDARLiteConfig(1);
-
- OnLIDARLiteListenerImpl impl = new OnLIDARLiteListenerImpl();
- impl.setListener(listener);
- impl.setOnceRead(false);
- impl.start();
- mOnLIDARLiteListeners.add(impl);
- }
-
- @Override
- public void stopRead(final OnLIDARLiteListener listener) {
- OnLIDARLiteListenerImpl impl = get(listener);
- if (impl != null) {
- impl.stop();
- }
- }
-
- @Override
- byte getAddress() {
- return SLAVE_ADDRESS;
- }
-
- @Override
- void onReadData(byte[] data) {
- int offset = 3;
- int register = decodeByte(data[offset++], data[offset++]);
- switch (register) {
- case 0x8F:
- int distance = FirmataUtil.decodeUShort2(data, offset);
- for (OnLIDARLiteListener listener : mOnLIDARLiteListeners) {
- listener.onData(distance);
- }
-
- if (!mOnLIDARLiteListeners.isEmpty()) {
- // LIDARLiteは連続で読み込みができないので、
- // ここで、再度readを呼び出します。
- new Thread(new Runnable() {
- @Override
- public void run() {
- try {
- Thread.sleep(33);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- startRead();
- }
- }).start();
- }
- break;
- }
- }
-
- /**
- * 指定されたリスナーをもつOnLIDARLiteListenerImplを取得します.
- * @param listener リスナー
- * @return OnLIDARLiteListenerImplのインスタンス
- */
- private OnLIDARLiteListenerImpl get(final OnLIDARLiteListener listener) {
- for (OnLIDARLiteListenerImpl impl : mOnLIDARLiteListeners) {
- if (impl.mListener == listener) {
- return impl;
- }
- }
- return null;
- }
-
- /**
- * LIDARLite v3の設定を行います.
- * @param configuration 設定番号
- */
- private synchronized void setLIDARLiteConfig(final int configuration) {
- switch (configuration) {
- case 0: // Default mode, balanced performance
- write(SLAVE_ADDRESS, 0x02, 0x80); // Default
- write(SLAVE_ADDRESS, 0x04, 0x08); // Default
- write(SLAVE_ADDRESS, 0x1C, 0x00); // Default
- break;
-
- case 1: // Short range, high speed
- write(SLAVE_ADDRESS, 0x02, 0x1d);
- write(SLAVE_ADDRESS, 0x04, 0x08); // Default
- write(SLAVE_ADDRESS, 0x1c, 0x00); // Default
- break;
-
- case 2: // Default range, higher speed short range
- write(SLAVE_ADDRESS, 0x02, 0x80); // Default
- write(SLAVE_ADDRESS, 0x04, 0x00);
- write(SLAVE_ADDRESS, 0x1c, 0x00); // Default
- break;
-
- case 3: // Maximum range
- write(SLAVE_ADDRESS, 0x02, 0xff);
- write(SLAVE_ADDRESS, 0x04, 0x08); // Default
- write(SLAVE_ADDRESS, 0x1c, 0x00); // Default
- break;
-
- case 4: // High sensitivity detection, high erroneous measurements
- write(SLAVE_ADDRESS, 0x02, 0x80); // Default
- write(SLAVE_ADDRESS, 0x04, 0x08); // Default
- write(SLAVE_ADDRESS, 0x1c, 0x80);
- break;
-
- case 5: // Low sensitivity detection, low erroneous measurements
- write(SLAVE_ADDRESS, 0x02, 0x80); // Default
- write(SLAVE_ADDRESS, 0x04, 0x08); // Default
- write(SLAVE_ADDRESS, 0x1c, 0xb0);
- break;
- }
- }
-
- /**
- * センサーの値の読み込みを開始します.
- */
- private synchronized void startRead() {
- write(SLAVE_ADDRESS, 0x00, 0x04);
- try {
- Thread.sleep(3);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- read(SLAVE_ADDRESS, 0x8F, 2);
- }
-
- private class OnLIDARLiteListenerImpl implements OnLIDARLiteListener {
-
- /**
- * タイムアウトを監視するタイマー.
- */
- private Timer mTimer;
-
- /**
- * 通知を行うリスナー.
- */
- private OnLIDARLiteListener mListener;
-
- /**
- * 一度だけ読み込む場合.
- */
- private boolean mOnceRead;
-
- /**
- * 開始フラグ.
- */
- private boolean mStartFlag;
-
- /**
- * センサー開始とタイムアウト用のタイマーの開始を行います.
- */
- void start() {
- mTimer = new Timer();
- mTimer.schedule(new TimerTask() {
- @Override
- public void run() {
- onError("timeout");
- }
- }, 1000);
- startRead();
- }
-
- /**
- * リスナーを設定します.
- * @param listener リスナー
- */
- void setListener(final OnLIDARLiteListener listener) {
- mListener = listener;
- }
-
- /**
- * 一度だけ読み込みを行います.
- * @param onceRead trueの場合は1だけ読み込み、falseの場合は連続で読み込む
- */
- void setOnceRead(final boolean onceRead) {
- mOnceRead = onceRead;
- }
-
- /**
- * 停止フラグを設定します.
- */
- void stop() {
- onFinish();
- }
-
- /**
- * タイマーをキャンセルします.
- */
- void cancelTimer() {
- if (mTimer != null) {
- mTimer.cancel();
- mTimer = null;
- }
- }
-
- /**
- * 後始末処理を行います.
- */
- void onFinish() {
- cancelTimer();
- mOnLIDARLiteListeners.remove(this);
- }
-
- @Override
- public void onStarted() {
- }
-
- @Override
- public void onData(final int distance) {
- if (!mStartFlag) {
- mStartFlag = true;
- cancelTimer();
- mListener.onStarted();
- }
- mListener.onData(distance);
-
- if (mOnceRead) {
- onFinish();
- }
- }
-
- @Override
- public void onError(final String message) {
- mListener.onError(message);
- onFinish();
- }
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/MPL115.java b/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/MPL115.java
deleted file mode 100644
index ee6172e0e2..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/MPL115.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.device.arduino;
-
-import org.deviceconnect.android.deviceplugin.fabo.device.IMPL115;
-
-import java.util.List;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.FirmataUtil.decodeByte;
-
-class MPL115 extends BaseI2C implements IMPL115 {
-
- // MPL115A2 I2C slave address
- private static final byte SLAVE_ADDRESS = 0x60;
-
- // MPL115A2 Register Address
- private static final int PADC_MSB = 0x00;
- private static final int PADC_LSB = 0x01;
- private static final int TADC_MSB = 0x02;
- private static final int TACD_LSB = 0x03;
- private static final int A0_MSB = 0x04;
- private static final int A0_LSB = 0x05;
- private static final int B1_MSB = 0x06;
- private static final int B1_LSB = 0x07;
- private static final int B2_MSB = 0x08;
- private static final int B2_LSB = 0x09;
- private static final int C12_MSB = 0x0A;
- private static final int C12_LSB = 0x0B;
- private static final int CONVERT = 0x12;
-
- private List mOnAtmosphericPressureListeners = new CopyOnWriteArrayList<>();
-
- private float mA0;
- private float mB1;
- private float mB2;
- private float mC12;
-
- private Timer mTimer;
-
- private boolean mRunningFlag;
-
- @Override
- public void readAtmosphericPressure(final OnAtmosphericPressureListener listener) {
- mOnAtmosphericPressureListeners.add(listener);
-
- if (mRunningFlag) {
- return;
- }
- mRunningFlag = true;
-
- mTimer = new Timer();
- mTimer.schedule(new TimerTask() {
- @Override
- public void run() {
- onError("timeout");
- }
- }, 1000);
-
- setI2CConfig();
- readCoef();
- }
-
- // BaseI2C interface
-
- @Override
- byte getAddress() {
- return SLAVE_ADDRESS;
- }
-
- @Override
- void onReadData(final byte[] data) {
- int offset = 3;
- int register = decodeByte(data[offset++], data[offset++]);
- switch (register) {
- case A0_MSB: {
- int[] value = new int[8];
- for (int i = 0; i < value.length; i++) {
- value[i] = decodeByte(data[offset++], data[offset++]);
- }
- onReadCoef(value);
-
- new Thread(new Runnable() {
- @Override
- public void run() {
- readData();
- }
- }).start();
- } break;
-
- case PADC_MSB: {
- int[] value = new int[4];
- for (int i = 0; i < value.length; i++) {
- value[i] = decodeByte(data[offset++], data[offset++]);
- }
- onReadData(value);
- } break;
- }
- }
-
- private void cancelTimer() {
- if (mTimer != null) {
- mTimer.cancel();
- mTimer = null;
- }
- }
-
- private void onError(final String message) {
- cancelTimer();
-
- for (OnAtmosphericPressureListener listener : mOnAtmosphericPressureListeners) {
- listener.onError(message);
- }
- mRunningFlag = false;
- }
-
- private void readCoef() {
- read(SLAVE_ADDRESS, A0_MSB, 8);
- }
-
- private void onReadCoef(final int[] data) {
- mA0 = FirmataUtil.dataConv(data[1], data[0]) / (float) (1 << 3);
- mB1 = FirmataUtil.dataConv(data[3], data[2]) / (float) (1 << 13);
- mB2 = FirmataUtil.dataConv(data[5], data[4]) / (float) (1 << 14);
- mC12 = FirmataUtil.dataConv(data[7], data[6]) / (float) (1 << 24);
- }
-
- private void readData() {
- write(SLAVE_ADDRESS, CONVERT, 0x01);
- try {
- Thread.sleep(10);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- read(SLAVE_ADDRESS, PADC_MSB, 4);
- }
-
- private void onReadData(final int[] data) {
- int padc = ((data[0] << 8) | data[1]) >> 6;
- int tadc = ((data[2] << 8) | data[3]) >> 6;
-
- double pcomp = mA0 + (mB1 + mC12 * tadc) * padc + mB2 * tadc;
- double hpa = pcomp * ((1150.0 - 500.0) / 1023.0) + 500.0;
- double temp = 25.0 - (tadc - 512.0) / 5.35;
-
- for (OnAtmosphericPressureListener listener : mOnAtmosphericPressureListeners) {
- listener.onData(hpa, temp);
- }
- mOnAtmosphericPressureListeners.clear();
-
- cancelTimer();
-
- mRunningFlag = false;
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/MouseCar.java b/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/MouseCar.java
deleted file mode 100644
index dd8d44b0f1..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/MouseCar.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.device.arduino;
-
-import org.deviceconnect.android.deviceplugin.fabo.device.IMouseCar;
-
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.FirmataV32.END_SYSEX;
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.FirmataV32.I2C_REQUEST;
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.FirmataV32.I2C_WRITE;
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.FirmataV32.START_SYSEX;
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.RobotCarUtil.DRV8830_BACK;
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.RobotCarUtil.DRV8830_FORWARD;
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.RobotCarUtil.DRV8830_STOP;
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.RobotCarUtil.calcSpeed;
-
-/**
- * マウス型RobotCarを操作しるためのクラス.
- */
-class MouseCar extends BaseI2C implements IMouseCar {
- /**
- * 左側のモータへのアドレス.
- */
- private static final byte DRV8830_LEFT_ADDRESS = 0x64;
-
- /**
- * 右側のモータへのアドレス.
- */
- private static final byte DRV8830_RIGHT_ADDRESS = 0x63;
-
- @Override
- public void move(final float rightSpeed, final float leftSpeed) {
- setI2CConfig();
-
- int rightDir = 0;
- int leftDir = 0;
- float tmpLeftSpeed = 0;
- float tmpRightSpeed = 0;
-
- if (rightSpeed > 0) {
- rightDir = DRV8830_BACK;
- tmpRightSpeed = rightSpeed;
- } else if (rightSpeed < 0) {
- rightDir = DRV8830_FORWARD;
- tmpRightSpeed = -rightSpeed;
- }
-
- if (leftSpeed > 0) {
- leftDir = DRV8830_BACK;
- tmpLeftSpeed = leftSpeed;
- } else if (leftSpeed < 0) {
- leftDir = DRV8830_FORWARD;
- tmpLeftSpeed = -leftSpeed;
- }
-
- moveMotor((rightDir | ((calcSpeed(tmpRightSpeed) + 5) << 2)), (leftDir | ((calcSpeed(tmpLeftSpeed) + 5) << 2)));
- }
-
- /**
- * 停止します.
- */
- @Override
- public void stop() {
- setI2CConfig();
- moveMotor(DRV8830_STOP, DRV8830_STOP);
- }
-
- /**
- * モータの回転を送信します.
- * @param valueLeft 左側のモーター
- * @param valueRight 右側のモーター
- */
- private void moveMotor(final int valueLeft, final int valueRight) {
- byte[] commandDataLeft = {
- START_SYSEX,
- I2C_REQUEST,
- DRV8830_LEFT_ADDRESS,
- I2C_WRITE,
- 0x00,
- 0x00,
- (byte) (valueLeft & 0x7f),
- (byte) ((valueLeft >> 7) & 0x7f),
- END_SYSEX
- };
- getFaBoDeviceControl().writeI2C(commandDataLeft);
-
- byte[] commandDataRight = {
- START_SYSEX,
- I2C_REQUEST,
- DRV8830_RIGHT_ADDRESS,
- I2C_WRITE,
- 0x00,
- 0x00,
- (byte) (valueRight & 0x7f),
- (byte) ((valueRight >> 7) & 0x7f),
- END_SYSEX
- };
- getFaBoDeviceControl().writeI2C(commandDataRight);
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/RobotCar.java b/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/RobotCar.java
deleted file mode 100644
index e072cb60cb..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/RobotCar.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.device.arduino;
-
-import org.deviceconnect.android.deviceplugin.fabo.device.IRobotCar;
-
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.FirmataV32.END_SYSEX;
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.FirmataV32.I2C_REQUEST;
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.FirmataV32.I2C_WRITE;
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.FirmataV32.START_SYSEX;
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.RobotCarUtil.DRV8830_BACK;
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.RobotCarUtil.DRV8830_FORWARD;
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.RobotCarUtil.DRV8830_STOP;
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.RobotCarUtil.calcHandleDirection;
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.RobotCarUtil.calcSpeed;
-
-/**
- * RobotCarを操作するためのクラス.
- */
-class RobotCar extends BaseI2C implements IRobotCar {
- /**
- * モータへのアドレス.
- */
- private static final byte DRV8830_ADDRESS = 0x64;
-
- /**
- * サーボへのアドレス.
- */
- private static final byte EXTENDED_ANALOG = 0x6F;
-
- /**
- * ピン設定モード.
- */
- private static final byte SET_PIN_MODE = (byte)0xF4;
-
- @Override
- public void turnHandle(final float direction) {
- byte[] commandData = {
- SET_PIN_MODE,
- (byte) 0x09,
- (byte) 0x04
- };
- getFaBoDeviceControl().writeI2C(commandData);
-
- int pwm = calcHandleDirection(direction);
- byte pwmLsb = (byte)(pwm & 0x7f);
- byte pwmMsb = (byte)((pwm >> 7) & 0x7f);
- byte[] commandSend = {
- START_SYSEX,
- EXTENDED_ANALOG,
- 0x09,
- pwmLsb,
- pwmMsb,
- END_SYSEX
- };
- getFaBoDeviceControl().writeI2C(commandSend);
- }
-
- @Override
- public void move(final float speed) {
- setI2CConfig();
- if (speed > 0) {
- moveMotor((DRV8830_FORWARD | ((calcSpeed(speed) + 5) << 2)));
- } else {
- moveMotor((DRV8830_BACK | ((calcSpeed(speed) + 5) << 2)));
- }
- }
-
- @Override
- public void stop() {
- setI2CConfig();
- moveMotor(DRV8830_STOP);
- }
-
- /**
- * モータの回転を送信します.
- * @param value 送信する値
- */
- private void moveMotor(final int value) {
- setI2CConfig();
- byte[] commandData = {
- START_SYSEX,
- I2C_REQUEST,
- DRV8830_ADDRESS,
- I2C_WRITE,
- 0x00,
- 0x00,
- (byte) (value & 0x7f),
- (byte) ((value >> 7) & 0x7f),
- END_SYSEX
- };
- getFaBoDeviceControl().writeI2C(commandData);
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/RobotCarUtil.java b/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/RobotCarUtil.java
deleted file mode 100644
index cca690aa2f..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/RobotCarUtil.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.device.arduino;
-
-class RobotCarUtil {
- /**
- * モータの回転数の上限を定義.
- */
- private static final int MAX_MOTOR = 55;
-
- static final byte DRV8830_FORWARD = 0x01;
- static final byte DRV8830_BACK = 0x02;
- static final byte DRV8830_STOP = 0x00;
-
- /**
- * 0.0f〜1.0fの値を0〜55の値に変換します.
- * @param speed スピード(0.0f〜1.0f)
- * @return 0〜MAX_MOTORの値
- */
- static int calcSpeed(final float speed) {
- float tmp = Math.abs(speed);
- if (tmp > 1.0f) {
- return MAX_MOTOR;
- }
- return (int) (MAX_MOTOR * tmp);
- }
-
- /**
- * タイヤの回す角度を計算します。
- * @param x 回す値
- * @return 角度
- */
- static int calcHandleDirection(final float x) {
- return (int) (90 + x * 40);
- }
-}
diff --git a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/VCNL4010.java b/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/VCNL4010.java
deleted file mode 100644
index caea19b4d9..0000000000
--- a/dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/arduino/VCNL4010.java
+++ /dev/null
@@ -1,452 +0,0 @@
-package org.deviceconnect.android.deviceplugin.fabo.device.arduino;
-
-import org.deviceconnect.android.deviceplugin.fabo.device.IVCNL4010;
-
-import java.util.List;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import static org.deviceconnect.android.deviceplugin.fabo.device.arduino.FirmataUtil.decodeByte;
-
-class VCNL4010 extends BaseI2C implements IVCNL4010 {
- // I2C VCNL4010 Slave Address
- private static final byte SLAVE_ADDRESS = 0x13;
-
- // Product,Revision ID Value
- private static final int DEVICE_ID = 0x21;
-
- // Register Addresses
- private static final int REG_CMD = 0x80;
- private static final int DEVICE_REG = 0x81;
- private static final int REG_PROX_RATE = 0x82;
- private static final int REG_LED_CRNT = 0x83;
- private static final int REG_AMBI_PARM = 0x84;
- private static final int REG_AMBI_DATA_H = 0x85;
- private static final int REG_AMBI_DATA_L = 0x86;
- private static final int REG_PROX_DATA_H = 0x87;
- private static final int REG_PROX_DATA_L = 0x88;
- private static final int REG_INT_CTRL = 0x89;
- private static final int REG_INT_LOW_H = 0x8A;
- private static final int REG_INT_LOW_L = 0x8B;
- private static final int REG_INT_HIGH_H = 0x8C;
- private static final int REG_INT_HIGH_L= 0x8D;
- private static final int REG_INT_STAT = 0x8E;
- private static final int REG_PROX_ADJ = 0x8F;
-
- // Commands
- private static final int CMD_SELFTIMED_EN = 0x01;
- private static final int CMD_PROX_EN = 0x02;
- private static final int CMD_ALS_EN = 0x04;
- private static final int CMD_PROX_OD = 0x08;
- private static final int CMD_ALS_OD = 0x10;
- private static final int CMD_PROX_DRDY = 0x20;
- private static final int CMD_ALS_DRDY = 0x40;
-
- // Proximity Measurement Rate
- private static final int PROX_RATE_1 = 0x00;
- private static final int PROX_RATE_3 = 0x01;
- private static final int PROX_RATE_7 = 0x02;
- private static final int PROX_RATE_16 = 0x03;
- private static final int PROX_RATE_31 = 0x04;
- private static final int PROX_RATE_62 = 0x05;
- private static final int PROX_RATE_125 = 0x06;
- private static final int PROX_RATE_250 = 0x07;
-
- // Ambient Light Parameter
- private static final int AMBI_CONT_CONV_MODE = 0x80;
- private static final int AMBI_RATE_1 = 0x00;
- private static final int AMBI_RATE_2 = 0x10;
- private static final int AMBI_RATE_3 = 0x20;
- private static final int AMBI_RATE_4 = 0x30;
- private static final int AMBI_RATE_5 = 0x40;
- private static final int AMBI_RATE_6 = 0x50;
- private static final int AMBI_RATE_8 = 0x60;
- private static final int AMBI_RATE_10 = 0x70;
- private static final int AMBI_AUTO_OFFSET = 0x08;
- private static final int AMBI_AVE_NUM_1 = 0x00;
- private static final int AMBI_AVE_NUM_2 = 0x01;
- private static final int AMBI_AVE_NUM_4 = 0x02;
- private static final int AMBI_AVE_NUM_8 = 0x03;
- private static final int AMBI_AVE_NUM_16 = 0x04;
- private static final int AMBI_AVE_NUM_32 = 0x05;
- private static final int AMBI_AVE_NUM_64 = 0x06;
- private static final int AMBI_AVE_NUM_128 = 0x07;
-
- private static final double THRESHOLD = 1.8;
-
- private List mOnProximityListeners = new CopyOnWriteArrayList<>();
- private List mOnAmbientLightListeners = new CopyOnWriteArrayList<>();
-
- private Proximity mProximity = new Proximity();
- private Ambi mAmbi = new Ambi();
-
- @Override
- public void readProximity(final OnProximityListener listener) {
- mOnProximityListeners.add(new OnProximityListener() {
- @Override
- public void onStarted() {
- listener.onStarted();
- }
-
- @Override
- public void onData(final boolean proximity) {
- listener.onData(proximity);
- stopProximity(this);
- }
-
- @Override
- public void onError(final String message) {
- listener.onError(message);
- stopProximity(this);
- }
- });
- if (mProximity.isMeasuring()) {
- return;
- }
- mProximity.start();
- }
-
- @Override
- public void startProximity(final OnProximityListener listener) {
- if (!mOnProximityListeners.contains(listener)) {
- mOnProximityListeners.add(listener);
- }
-
- if (mProximity.isMeasuring()) {
- return;
- }
- mProximity.start();
- }
-
- @Override
- public void stopProximity(final OnProximityListener listener) {
- if (mProximity.isMeasuring()) {
- mProximity.stop();
- }
- mOnProximityListeners.remove(listener);
- }
-
- @Override
- public void readAmbientLight(final OnAmbientLightListener listener) {
- if (!mOnAmbientLightListeners.contains(listener)) {
- mOnAmbientLightListeners.add(listener);
- }
-
- if (mAmbi.isMeasuring()) {
- return;
- }
- mAmbi.start();
- }
-
- @Override
- public void startAmbientLight(final OnAmbientLightListener listener) {
- if (!mOnAmbientLightListeners.contains(listener)) {
- mOnAmbientLightListeners.add(listener);
- }
-
- }
-
- @Override
- public void stopAmbientLight(final OnAmbientLightListener listener) {
- if (mAmbi.isMeasuring()) {
- mAmbi.stop();
- }
- mOnAmbientLightListeners.remove(listener);
- }
-
- // BaseI2C interface
-
- @Override
- byte getAddress() {
- return SLAVE_ADDRESS;
- }
-
- @Override
- void onReadData(final byte[] data) {
- int offset = 3;
- int register = decodeByte(data[offset++], data[offset]);
- switch (register) {
- case DEVICE_REG:
- mProximity.onReadData(data, register);
- mAmbi.onReadData(data, register);
- break;
- case REG_PROX_DATA_H:
- mProximity.onReadData(data, register);
- break;
- case REG_AMBI_DATA_H:
- mAmbi.onReadData(data, register);
- break;
- }
- }
-
- /**
- * VCNL4010の設定を行います.
- */
- private void setVCNL4010() {
- setCommand(CMD_SELFTIMED_EN | CMD_PROX_EN | CMD_ALS_EN);
- setProxRate(PROX_RATE_250);
- setLedCurrent(20);
- setAmbiParm(AMBI_RATE_10 | AMBI_AUTO_OFFSET | AMBI_AVE_NUM_128);
- }
-
- /**
- * コマンドを送信します.
- * @param config 送信するコマンド設定
- */
- private void setCommand(final int config) {
- write(SLAVE_ADDRESS, REG_CMD, config);
- }
-
- /**
- * Proximityのレートを送信します.
- * @param config 送信するレート
- */
- private void setProxRate(final int config) {
- write(SLAVE_ADDRESS, REG_PROX_RATE, config);
- }
-
- /**
- * LED Currentの値を送信します.
- * @param config 送信する値
- */
- private void setLedCurrent(final int config) {
- write(SLAVE_ADDRESS, REG_LED_CRNT, config);
- }
-
- /**
- * Ambient Lightの設定を送信します.
- * @param config 送信する設定
- */
- private void setAmbiParm(final int config) {
- write(SLAVE_ADDRESS, REG_AMBI_PARM, config);
- }
-
- /**
- * 距離(cm)に変換します.
- * @param proximity センサーからの値
- * @return 距離(cm)
- */
- private double convert(final int proximity) {
- return 0.1 + ((65535 - proximity) / 65535.0) * 2.0;
- }
-
- /**
- * VCNL4010と通信する場合のステートを管理するクラス.
- */
- private abstract class VCNL4010State {
-
- /**
- * 現在のステート.
- *