From f441a3c49f8b5cedee3e4def6fbb448ef40eb9cb Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 10 六月 2020 14:46:58 +0800
Subject: [PATCH] Crabtree-ON 2020-06-10 基于最新HDL ON 优化问题，Crabtree-ONAPP部分功能同步修改优化调整 1. 增加大图片大文件上传处理. 2.远程连接交互提示，由原来的Loading修改成顶部Tip提示。 3.灯光全开、全关和场景控制多线程发送，和HDLON同样加锁处理。 4.Android ，判断移动网络失败，网络监测修复方法修改，后台前台切换优化。
---
Crabtree/SmartHome/UI/SimpleControl/MqttCommon.cs | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/MqttCommon.cs b/Crabtree/SmartHome/UI/SimpleControl/MqttCommon.cs
index a2f8a98..06bf05b 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/MqttCommon.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/MqttCommon.cs
@@ -65,6 +65,8 @@
System.Threading.Thread.Sleep (200);
if (!CommonPage.IsRemote) continue;
+ if (Control.IsEnterBackground) continue;
+
await StartCloudMqtt ();
await CheckingSubscribeTopics ();
} catch { }
@@ -78,7 +80,7 @@
IfNeedReadAllDeviceStatus = true;
bNeedStartTip = true;
IsGatewayOnline = false;
-
+ StartCloudMqtt ();
}
@@ -289,7 +291,7 @@
} catch (Exception ex) {
//Utlis.WriteLine ($"============>Mqtt 杩滅▼杩炴帴閫氳杩炴帴鍑哄紓甯�:{ex.Message}");
- MainPage.LoadingSetText ("Connect error, trying to reconnect.");
+ MainPage.LoadingTipShow ("Connect error, trying to reconnect.");
if (IfDEBUG) {
MainPage.ShowAlertOnMainThread ("error: " + ex.Message);
@@ -299,7 +301,9 @@
//鏈�缁堣閲婃斁杩炴帴鐘舵��
remoteMqttIsConnecting = false;
- MainPage.LoadingHide ();
+ MainPage.LoadingTipHide ();
+
+ //MainPage.LoadingHide ();
}
});
}
@@ -340,15 +344,15 @@
} else {
//Utlis.WriteLine ("============>Mqtt CurRemoteMACInfo null");
- MainPage.LoadingSetText ("Please wait, failed to get gateway parameters.");
+ MainPage.LoadingTipShow ("Please wait, failed to get gateway parameters.");
}
}
} else {
//Utlis.WriteLine ("============>Mqtt mqttInfoRequestResult_Obj null");
- MainPage.LoadingSetText ("Please wait, failed to get user parameters.");
- //MainPage.LoadingSetText ("Please wait, failed to get parameters.");
+ MainPage.LoadingTipShow ("Please wait, failed to get user parameters.");
+ //MainPage.LoadingTipShow ("Please wait, failed to get parameters.");
}
} catch {
@@ -356,7 +360,7 @@
} else {
//Utlis.WriteLine ("============>Mqtt GetInfo 澶辫触");
MainPage.AddTip ("Please wait, failed to get parameters.");
- //MainPage.LoadingSetText ("Please wait, failed to get parameters.");
+ //MainPage.LoadingTipShow ("Please wait, failed to get parameters.");
}
}
@@ -383,7 +387,7 @@
//--绗簩姝ワ細鑾峰彇褰撳墠浣忓垎浜畢缃戝叧淇℃伅骞惰繛鎺QTT
await GetSingleHomeGatewayPaggerAndMQTTConnectAsync ();
} else {
- MainPage.LoadingSetText ("Please wait, failed to get user parameters.");
+ MainPage.LoadingTipShow ("Please wait, failed to get user parameters.");
}
}
}
@@ -399,7 +403,7 @@
//鑾峰彇鍙傛暟鎴愬姛锛屽紑濮嬭繛鎺�...
//MainPage.AddTip ("Successfully obtained parameters, starting to connect...");
- MainPage.LoadingStart ("Please wait, connecting remotely...");
+ MainPage.LoadingTipShow ("Please wait, connecting remotely...");
//try {
// var url = mMqttInfo.connEmqDomainPort;
@@ -454,7 +458,7 @@
remoteIsConnected = true;
IsDisConnectingWithSendCatch = false;
- MainPage.LoadingSetText ("Remote connection succeeded.");
+ MainPage.LoadingTipShow ("Remote connection succeeded.");
//MainPage.AddTip ("Connection succeeded!");
//await MqttRemoteSend (new byte [] { 0 }, 1);
@@ -466,7 +470,7 @@
//options1 寮傚父鎻愮ず
//Console.WriteLine ("Connect error: " + ex.Message);
- MainPage.LoadingSetText ("Connect error.");
+ MainPage.LoadingTipShow ("Connect error.");
if (IfDEBUG) {
MainPage.ShowAlertOnMainThread ("Connect error: " + ex.Message);
@@ -492,7 +496,7 @@
bNeedStartTip = false;
if (CommonPage.IsRemote) {
//MainPage.AddTip ("Getting remote connection parameters...");
- MainPage.LoadingStart ("Please wait, getting connection parameters...");
+ MainPage.LoadingTipShow ("Please wait, getting connection parameters...");
}
}
}
@@ -591,7 +595,7 @@
CurRemoteMACInfo.aesKey = mGatewayRes.AesKey;
mqttEncryptKey = CurRemoteMACInfo.aesKey;
} else {
- MainPage.LoadingSetText ("Please wait, failed to get gateway parameters.");
+ MainPage.LoadingTipShow ("Please wait, failed to get gateway parameters.");
}
}
--
Gitblit v1.8.0