From 9a4629512ccf8359efd88671c9317c3cc7faf0c8 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期一, 29 八月 2022 16:46:40 +0800
Subject: [PATCH] Merge branch 'dev' into dev-temp
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs
index 5be3a2e..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;
-using Shared.IOS.HDLFVSDK;
namespace Shared.Phone.UserCenter
{
/// <summary>
@@ -116,6 +114,13 @@
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
@@ -306,6 +311,13 @@
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 {
@@ -315,6 +327,13 @@
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();
}
--
Gitblit v1.8.0