From: snickersun <snickersun@qq.com>
Date: Fri, 4 Sep 2020 16:11:51 +0000 (+0800)
Subject: 登录问题发现时端口提供错误！设置正确后即可连通。
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=91e679b8bf408c22849d6a32b1d7d2a31b4d8c68;p=protocol_srv.git

登录问题发现时端口提供错误！设置正确后即可连通。
---

diff --git a/app/src/main/java/com/ic/protocols/protocol_mqtt.java b/app/src/main/java/com/ic/protocols/protocol_mqtt.java
index 4197bbee..c3135b8b 100644
--- a/app/src/main/java/com/ic/protocols/protocol_mqtt.java
+++ b/app/src/main/java/com/ic/protocols/protocol_mqtt.java
@@ -35,12 +35,15 @@ public class protocol_mqtt {
     private static final String CMDEND = "]";
     private static final String CMDSPLIT = ",";
 
-    public static final String defaultServerIP = "47.106.237.76";
+    public static final String defaultTestServerIP = "47.106.237.76";
+    public static final String defaultServerIP = "106.54.13.16";
     public static final int defaultServerPort = 1883;
 
     public static final String projName = "WBG100";
     public static final String protocolVersion = "v1";
     public static final String mqttKey = "QWER15WTF156OQRT1230";
+    public static final String username="yq_watch";
+    public static final String passwd="1234567";
     public static String MQTT_CLIENT_TOPIC_HEADER = "";
 
     public enum CMD_TYPE {
diff --git a/app/src/main/java/com/ic/protocols/protocol_mqtt_client.java b/app/src/main/java/com/ic/protocols/protocol_mqtt_client.java
index bc834c43..fcbc8516 100644
--- a/app/src/main/java/com/ic/protocols/protocol_mqtt_client.java
+++ b/app/src/main/java/com/ic/protocols/protocol_mqtt_client.java
@@ -191,8 +191,8 @@ public class protocol_mqtt_client {
 
                 ICLogger.i("attemptConnectMqtt");
                 mClient.setHost(host);
-                mClient.setUsername("yq_watch");
-                mClient.setPassword("123456");
+                mClient.setUsername(protocol_mqtt.username);
+                mClient.setPassword(protocol_mqtt.passwd);
                 mClient.setPort(port);
                 mClient.setIdentifier(identifier);
                 mClient.setKeepAlive(cycle_inSeconds);