From 5a5a2b696866f947b6025d26c3302e8ffef46435 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 11 一月 2021 16:11:20 +0800
Subject: [PATCH] 2021-01-11 1.更新MQTT连接和本地搜索网关方法。2.子账号相关接口完善
---
Crabtree/SmartHome/UI/SimpleControl/CommonPage.cs | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/CommonPage.cs b/Crabtree/SmartHome/UI/SimpleControl/CommonPage.cs
index ac206b1..e354ea1 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/CommonPage.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/CommonPage.cs
@@ -4,10 +4,19 @@
using System.Text;
using System.Collections.Generic;
using Shared.SimpleControl.Phone;
-using service.hdlcontrol.com_WebServiceAirQuality;
+//using service.hdlcontrol.com_WebServiceAirQuality;
namespace Shared.SimpleControl
{
+ public class AirQuality
+ {
+ public string city;
+ public string airQTemp;
+ public string airQHumidity;
+ public string airQAirPM25;
+ public string airQAirWeather;
+ }
+
public static class CommonPage
{
public static AirQuality AirQuality;
@@ -26,7 +35,7 @@
//127.0.0.1
if (ip == "0.0.0.0") {
try {
- ip = System.Net.Dns.GetHostEntry ("homeautomation.havells.com").AddressList [0].ToString ();
+ ip = System.Net.Dns.GetHostEntry ("smarth-api.havells.com").AddressList [0].ToString ();
} catch { }
}
return new System.Net.IPEndPoint (System.Net.IPAddress.Parse (ip), 9999);
@@ -1243,7 +1252,7 @@
common.isMixBox = true;
} else {
Application.RunOnMainThread (() => {
- MainPage.Loading.Start ("Search for device:" + devcieTempName);
+ //MainPage.Loading.Start ("Search for device:" + devcieTempName);
++searchTotal;
GuideSettingGateway.InitSearchDeviceList (common);
for (int k = 1; k <= common.LoopCount; k++) {
@@ -1280,6 +1289,9 @@
//2020-07-03 濡傛灉鏄孩澶栨ā鍧楃被鍨嬶紝澶囨敞涓虹┖鐨勮瘽锛岄粯璁や负TV鍚嶅瓧
if (deviceType1 == DeviceType.InfraredMode) {
devcieLoopName = "TV " + usefullBytes [2].ToString ();
+ } else if (deviceType1 == DeviceType.ACInfrared) {
+ //2020-08-28 濡傛灉鏄孩澶栫┖璋冪被鍨嬶紝澶囨敞涓虹┖鐨勮瘽锛岄粯璁や负AC鍚嶅瓧
+ devcieLoopName = "AC " + usefullBytes [2].ToString ();
}
byte [] ddd = CommonPage.MyEncodingGB2312.GetBytes (devcieLoopName);
byte [] newddd = new byte [20];
--
Gitblit v1.8.0