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 |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs
index 6b992c9..3e4fbe8 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs
@@ -115,6 +115,13 @@
             //閲嶆柊鐧诲綍鍏ㄨ閫�
             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;
@@ -306,9 +313,9 @@
 #endif
 #if Android
                                 string userName = listHouse[0].Id;
-                                string uuid = "10F908BA-CA5A-4041-9D1A-382E6A004F74";
-                                string code = "T0001";
-                                string httpServer = "120.24.41.192";
+                                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
                             }
@@ -317,13 +324,14 @@
 #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 = "10F908BA-CA5A-4041-9D1A-382E6A004F74";
-                            string code = "T0001";
-                            string httpServer = "120.24.41.192";
+                            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
                         }

--
Gitblit v1.8.0