From d53e6af2c5f17838fa79659614b15a2a1f383399 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 31 三月 2023 10:04:58 +0800
Subject: [PATCH] 1
---
Crabtree/SmartHome/HDL/Common/HDLLinkUtlis.cs | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/Crabtree/SmartHome/HDL/Common/HDLLinkUtlis.cs b/Crabtree/SmartHome/HDL/Common/HDLLinkUtlis.cs
index 906b541..4beb6ca 100644
--- a/Crabtree/SmartHome/HDL/Common/HDLLinkUtlis.cs
+++ b/Crabtree/SmartHome/HDL/Common/HDLLinkUtlis.cs
@@ -122,9 +122,20 @@
/// 鐒跺悗涓婁紶oid銆乻id銆佷互鍙婂満鏅垪琛�
/// </summary>
/// <returns></returns>
- public void OneclickUpload ()
+ public void OneclickUpload (bool isMigrate = false)
{
- MainPage.Loading.Start ("Uploading device list...");
+ if (isMigrate) {
+ var res = false;
+ res = UploadOidAndSidList ();
+ if (res) {
+ res = GetFunctionList ();
+ if (res) {
+ res = UploadSecneList ();
+ }
+ }
+ return;
+ }
+ MainPage.Loading.Start ("Uploading...");
System.Threading.Tasks.Task.Run (() => {
try {
var res = false;
@@ -136,7 +147,7 @@
}
}
- if (!res) {
+ if (res) {
Utlis.ShowAlertOnMainThread (Language.StringByID (SimpleControl.R.MyInternationalizationString.SuccessfullySynchronizedToTheCloud));
} else {
Utlis.ShowAlertOnMainThread (Language.StringByID (SimpleControl.R.MyInternationalizationString.FailedToSyncToTheCloud));
@@ -653,6 +664,13 @@
IotCloud currentProject = new IotCloud ();
var list = GetAllDeviceList ();
ConvertOidListToIotStruct (UserConfig.Instance.CurrentRegion.Id, UserConfig.Instance.HomeGateway.gatewayId, list, ref currentProject);
+ //2022-06-21 13:10:07 mac涓嶈兘涓虹┖锛屽惁鍒欎簯绔湁闂
+ foreach (var bean in currentProject.modules.devices) {
+ if (string.IsNullOrEmpty (bean.mac)) {
+ bean.mac = bean.oid;
+ }
+ }
+
Utlis.WriteLine ("list: " + list.Count + "currentProject : " + currentProject.functions.devices.Count);
var revertObj = HttpServerRequest.Current.UploadDeviceOidList (currentProject.modules);
@@ -666,8 +684,8 @@
} else {
IMessageCommon.Current.ShowErrorInfoAlter (revertObj.Code);
}
- } catch {
-
+ } catch(Exception EX) {
+ Utlis.WriteLine ("catch: " + EX.ToString());
}
return res;
}
--
Gitblit v1.8.0