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/Login/AccountLoginForm.cs | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs b/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
old mode 100755
new mode 100644
index 25cb57f..7975199
--- a/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
+++ b/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
@@ -1110,6 +1110,7 @@
CommonPage.Instance.FailureToServer();
CommonPage.Loading.Hide();
});
+ HdlLogLogic.Current.WriteLog(-1, "鐧婚檰鏃�,娌＄綉缁�");
return;
}
var stateCodeStr = revertObj.StateCode.ToUpper();
@@ -1136,8 +1137,15 @@
bool result = UserCenterLogic.InitUserCenterMenmoryAndThread();
//鍚姩ZigBee
- ZigBee.Common.Application.Init();
-
+ ZigBee.Common.Application.Init();
+
+//#if iOS
+
+// //鍒濆鍖栧叏瑙嗛��
+// Shared.IOS.HDLFVSDK.Video.Init("", revertData.UserID.ToString());
+
+//#endif
+
HdlThreadLogic.Current.RunMain(() =>
{
CommonPage.Loading.Hide();
@@ -1223,9 +1231,9 @@
});
}
- #endregion
+#endregion
- #region 鈻� 涓�鑸柟娉昣__________________________
+#region 鈻� 涓�鑸柟娉昣__________________________
/// <summary>
/// 妫�娴嬮殣绉佸崗璁�
@@ -1243,6 +1251,6 @@
return true;
}
- #endregion
+#endregion
}
}
--
Gitblit v1.8.0