diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/dnomaid/mqtt/global/Constants.java b/app/src/main/java/com/dnomaid/mqtt/global/Constants.java index 6f83219..b4b76b2 100644 --- a/app/src/main/java/com/dnomaid/mqtt/global/Constants.java +++ b/app/src/main/java/com/dnomaid/mqtt/global/Constants.java @@ -1,7 +1,5 @@ package com.dnomaid.mqtt.global; -import com.dnomaid.mqtt.R; - public interface Constants { String ID= "Dnomaid"; String STAT_PREFIX =ID+"/stat"; diff --git a/app/src/main/java/com/dnomaid/mqtt/global/Notify.java b/app/src/main/java/com/dnomaid/mqtt/global/Notify.java index 2753cc6..1adebe3 100644 --- a/app/src/main/java/com/dnomaid/mqtt/global/Notify.java +++ b/app/src/main/java/com/dnomaid/mqtt/global/Notify.java @@ -1,15 +1,3 @@ -/******************************************************************************* - * Copyright (c) 1999, 2014 IBM Corp. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and Eclipse Distribution License v1.0 which accompany this distribution. - * - * The Eclipse Public License is available at - * http://www.eclipse.org/legal/epl-v10.html - * and the Eclipse Distribution License is available at - * http://www.eclipse.org/org/documents/edl-v10.php. - */ package com.dnomaid.mqtt.global; import android.content.Context; diff --git a/app/src/main/java/com/dnomaid/mqtt/global/Status.java b/app/src/main/java/com/dnomaid/mqtt/global/Status.java index b98154e..e853ae5 100644 --- a/app/src/main/java/com/dnomaid/mqtt/global/Status.java +++ b/app/src/main/java/com/dnomaid/mqtt/global/Status.java @@ -41,6 +41,4 @@ public boolean isConnectedOrConnecting() { public String getMessageArrived() { return messageArrived; } public void setMessageArrived(String messageArrived) { this.messageArrived = messageArrived; } - - } \ No newline at end of file diff --git a/app/src/main/java/com/dnomaid/mqtt/topic/json/XiaomiZNCZ04LM.java b/app/src/main/java/com/dnomaid/mqtt/topic/json/XiaomiZNCZ04LM.java index b8b8ebc..d728015 100644 --- a/app/src/main/java/com/dnomaid/mqtt/topic/json/XiaomiZNCZ04LM.java +++ b/app/src/main/java/com/dnomaid/mqtt/topic/json/XiaomiZNCZ04LM.java @@ -1,7 +1,6 @@ package com.dnomaid.mqtt.topic.json; public class XiaomiZNCZ04LM { - //{"consumption":0.21,"current":0,"energy":0.21,"linkquality":78,"power":0,"state":"OFF","temperature":17,"voltage":230} //{"consumer_connected":true,"consumption":0.83,"current":0,"energy":0.83,"linkquality":23,"power":0,"state":"OFF","temperature":17,"voltage":230} private Boolean consumer_connected; private Double consumption; diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cd83aa4..7af3a50 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,6 +1,6 @@ MqttDnomaid - + Server Port @@ -34,12 +34,12 @@ Clean Session - Client connecting... + Client connecting___ Client error connecting Already connecting! - Connecting... + Connecting___ You are not connecting - Disconnecting... + Disconnecting___ Already disconnected Client connected successfully "onCreate SQLiteDatabase"