From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs | 70 +++++++++++++++++++++++++++-------
1 files changed, 55 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs
index c27635b..3e4fbe8 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs
@@ -1,8 +1,6 @@
锘縰sing Shared.Common;
using System;
using System.Collections.Generic;
-using System.Text;
-
namespace Shared.Phone.UserCenter
{
/// <summary>
@@ -110,6 +108,21 @@
//鍏抽棴杩涘害鏉�
ProgressBar.Close();
+
+#if iOS
+ //閫�鍑虹櫥褰曞叏瑙嗛��
+ Shared.IOS.HDLFVSDK.Video.Logout();
+ //閲嶆柊鐧诲綍鍏ㄨ閫�
+ Shared.IOS.HDLFVSDK.Video.Init("", residenceId);
+#endif
+#if Android
+ string userName = residenceId;
+ string uuid = "0E6AD0F4-FC17-45B4-AB63-08DAD3B09516";
+ string code = "T0061";
+ string httpServer = "120.25.212.198";
+ Com.Evoyohome.Sphonelibs.Global.Global.Login(Application.Activity, userName, uuid, code, httpServer, null);
+#endif
+
return result;
}
@@ -293,7 +306,34 @@
{
Config.Instance.HomeId = listHouse[0].Id;
Config.Instance.Home = GetHouseByHouseId(listHouse[0].Id);
+#if iOS
+ //鍒濆鍖栧叏瑙嗛��
+
+ Shared.IOS.HDLFVSDK.Video.Init("", listHouse[0].Id);
+#endif
+#if Android
+ string userName = listHouse[0].Id;
+ string uuid = "0E6AD0F4-FC17-45B4-AB63-08DAD3B09516";
+ string code = "T0061";
+ string httpServer = "120.25.212.198";
+ Com.Evoyohome.Sphonelibs.Global.Global.Login(Application.Activity, userName, uuid, code, httpServer, null);
+#endif
}
+ }
+ else {
+#if iOS
+ Console.WriteLine(Config.Instance.HomeId);
+ //鍒濆鍖栧叏瑙嗛��
+
+ Shared.IOS.HDLFVSDK.Video.Init("", Config.Instance.HomeId);
+#endif
+#if Android
+ string userName = Config.Instance.HomeId;
+ string uuid = "0E6AD0F4-FC17-45B4-AB63-08DAD3B09516";
+ string code = "T0061";
+ string httpServer = "120.25.212.198";
+ Com.Evoyohome.Sphonelibs.Global.Global.Login(Application.Activity, userName, uuid, code, httpServer, null);
+#endif
}
Config.Instance.Save();
}
@@ -306,9 +346,9 @@
return Config.Instance.HomeFilePathList;
}
- #endregion
+#endregion
- #region 鈻� 鑾峰彇鏈湴浣忓畢鍒楄〃___________________
+#region 鈻� 鑾峰彇鏈湴浣忓畢鍒楄〃___________________
/// <summary>
/// 鑾峰彇鏈湴浣忓畢鍒楄〃
@@ -372,9 +412,9 @@
return this.SortHouse(listHome);
}
- #endregion
+#endregion
- #region 鈻� 浣忓畢鎺掑簭___________________________
+#region 鈻� 浣忓畢鎺掑簭___________________________
/// <summary>
/// 浣忓畢鎺掑簭
@@ -548,9 +588,9 @@
return maxLength;
}
- #endregion
+#endregion
- #region 鈻� 鍒犻櫎浣忓畢___________________________
+#region 鈻� 鍒犻櫎浣忓畢___________________________
/// <summary>
/// 鍒犻櫎浣忓畢
@@ -577,9 +617,9 @@
Config.Instance.Save();
}
- #endregion
+#endregion
- #region 鈻� 鑾峰彇璇ヤ綇瀹呯殑鏂囦欢鍒楄〃_______________
+#region 鈻� 鑾峰彇璇ヤ綇瀹呯殑鏂囦欢鍒楄〃_______________
/// <summary>
/// 閫氳繃銆恏ouseId銆戣幏鍙栬浣忓畢鐨勬枃浠跺垪琛�
@@ -604,9 +644,9 @@
return list;
}
- #endregion
+#endregion
- #region 鈻� 涓�鑸柟娉昣__________________________
+#region 鈻� 涓�鑸柟娉昣__________________________
/// <summary>
/// 鑾峰彇妤煎眰鍚嶇О
@@ -648,9 +688,9 @@
return $"House_{houseId}.json";
}
- #endregion
+#endregion
- #region 鈻� 缁撴瀯浣揰____________________________
+#region 鈻� 缁撴瀯浣揰____________________________
/// <summary>
/// 娣诲姞浣忓畢鐨勫惎鍔ㄥ弬鏁�
@@ -681,6 +721,6 @@
/// </summary>
public string Id = string.Empty;
}
- #endregion
+#endregion
}
}
--
Gitblit v1.8.0