From 3e4e108d0c6317edb18bbf9c41419fd6d6a0eebb Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 28 十一月 2019 17:53:10 +0800
Subject: [PATCH] 2019-11-28-2
---
ZigbeeApp/Shared/Phone/UserView/HomePage.cs | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
old mode 100755
new mode 100644
index c3ae6f1..0ba8d94
--- a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
@@ -4,10 +4,11 @@
namespace Shared.Phone.UserView
{
/// <summary>
- /// Home page.
+ /// Home page.绗簩鐗堝憖
/// </summary>
public class HomePage : PageLayout
{
+
static HomePage homePage;
/// <summary>
/// Gets the instance.
@@ -29,6 +30,7 @@
/// </summary>
public void InitPage()
{
+
if (0 < ChildrenCount)
{
return;
@@ -62,15 +64,15 @@
{
new System.Threading.Thread(async () =>
{
+ //鍚姩ZigBee
ZigBee.Common.Application.Init();
-
//鐧诲綍鎴愬姛
var homes = await House.GetHomeLists();
//鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
- Room.canInitAllRoom = true;
+ Room.CanInitAllRoom = true;
Room.InitAllRoom();
Application.RunOnMainThread(() =>
@@ -94,6 +96,7 @@
//鐧诲綍澶辫触锛屼篃鐩存帴杩涘叆涓婚〉
new System.Threading.Thread(async () =>
{
+ //鍚姩ZigBee
ZigBee.Common.Application.Init();
//鐧诲綍鎴愬姛
@@ -102,7 +105,7 @@
//鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
- Room.canInitAllRoom = true;
+ Room.CanInitAllRoom = true;
Room.InitAllRoom();
Application.RunOnMainThread(() =>
@@ -166,11 +169,9 @@
var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.UserLoginRes>(revertObj.ResponseData.ToString());
var revertData = responseDataObj;
- Config.Instance.UserID = revertData.UserID;
- Config.Instance.MasterID = revertData.MainUserID;
- Config.Instance.AccountType = revertData.UserType;
Config.Instance.Account = revertData.Account;
Config.Instance.Password = password;
+ Config.Instance.MD5PWD = revertData.MD5PWD;
Config.Instance.Guid = revertData.Guid;
Config.Instance.MqttKey = revertData.MqttKey;
Config.Instance.LoginDateTime = DateTime.Now;
--
Gitblit v1.8.0