Update

DnomaidGit · Mar 9, 2021 · 9cc0c14 · 9cc0c14
1 parent 2f25dab
commit 9cc0c14
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 21 deletions.
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git 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
@@ -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
@@ -41,6 +41,4 @@ public boolean isConnectedOrConnecting() {
     public String getMessageArrived() { return messageArrived; }
     public void setMessageArrived(String messageArrived) { this.messageArrived = messageArrived; }
 
-
-
 }
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
@@ -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
@@ -1,6 +1,6 @@
 <resources>
     <string name="app_name">MqttDnomaid</string>
-    <string name="empty"></string>
+    <string name="empty"> </string>
     <!-- Fragment -->
     <string name="serverText">Server</string>
     <string name="portText">Port</string>
@@ -34,12 +34,12 @@
     <!-- ContentDescription -->
     <string name="contentDescriptionCleanSession">Clean Session</string>
     <!-- Notify -->
-    <string name="client_connecting">Client connecting...</string>
+    <string name="client_connecting">Client connecting___</string>
     <string name="client_error_connecting">Client error connecting</string>
     <string name="alreadyConnecting">Already connecting!</string>
-    <string name="connecting___">Connecting...</string>
+    <string name="connecting___">Connecting___</string>
     <string name="notConnecting">You are not connecting</string>
-    <string name="disconnecting___">Disconnecting...</string>
+    <string name="disconnecting___">Disconnecting___</string>
     <string name="alreadyDisconnected">Already disconnected</string>
     <string name="clientConnectedSuccessfully">Client connected successfully</string>
     <string name="onCreateSQLiteDatabase">"onCreate SQLiteDatabase"</string>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -41,6 +41,4 @@ public boolean isConnectedOrConnecting() {
		public String getMessageArrived() { return messageArrived; }
		public void setMessageArrived(String messageArrived) { this.messageArrived = messageArrived; }



		}