From bdb67e76871e6ad47c353cd0350a1ac04d913823 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 13:32:25 +0800
Subject: [PATCH] 20201223-5
---
HDL_ON/UI/BindingResidence/BindingResidencePage.cs | 2
HDL_ON/DAL/Server/NewAPI.cs | 2
HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs | 2
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs | 45 +----------
HDL_ON/Common/ApiUtlis.cs | 59 +++++++++-----
HDL_ON/UI/UI1-Login/LoginPageBLL.cs | 4
HDL_ON/Entity/DB_ResidenceData.cs | 2
HDL_ON/DAL/Server/HttpServerRequest.cs | 13 +-
.vs/HDL_APP_Project/xs/UserPrefs.xml | 32 +++++--
HDL_ON/UI/MainPage.cs | 24 ++---
10 files changed, 86 insertions(+), 99 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index e7870b3..86269d0 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,16 +1,23 @@
锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.94B44E9C-E1BC-4BF7-812E-FC71E9B623B2" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/DriverLayer/Control.cs">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Server/NewAPI.cs">
<Files>
<File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs" Line="273" Column="88" />
<File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs" Line="147" Column="24" />
- <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="270" Column="22" />
<File FileName="HDL_ON/Entity/Room.cs" Line="449" Column="47" />
<File FileName="HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs" Line="62" Column="51" />
- <File FileName="HDL_ON/UI/MainPage.cs" Line="212" Column="42" />
<File FileName="HDL_ON/UI/UI2/UserPage.cs" Line="129" Column="50" />
- <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="354" Column="62" />
- <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="364" Column="47" />
+ <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="248" Column="49" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs" Line="191" Column="21" />
+ <File FileName="HDL_ON/UI/MainPage.cs" Line="120" Column="57" />
+ <File FileName="HDL_ON/UI/BindingResidence/BindingResidencePage.cs" Line="129" Column="42" />
+ <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="2016" Column="87" />
+ <File FileName="HDL_ON/UI/UI1-Login/LoginPageBLL.cs" Line="633" Column="57" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs" Line="159" Column="48" />
+ <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="136" Column="37" />
+ <File FileName="HDL_ON/Entity/Function/Scene.cs" Line="294" Column="73" />
+ <File FileName="HDL_ON/DAL/Server/NewAPI.cs" Line="394" Column="90" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -19,17 +26,19 @@
<Node name="HDL_ON" expanded="True">
<Node name="Common" expanded="True" />
<Node name="DAL" expanded="True">
- <Node name="DriverLayer" expanded="True">
- <Node name="Control.cs" selected="True" />
- </Node>
+ <Node name="DriverLayer" expanded="True" />
<Node name="Mqtt" expanded="True" />
- <Node name="Server" expanded="True" />
+ <Node name="Server" expanded="True">
+ <Node name="NewAPI.cs" selected="True" />
+ </Node>
</Node>
<Node name="Entity" expanded="True">
<Node name="Function" expanded="True" />
</Node>
<Node name="UI" expanded="True">
+ <Node name="BindingResidence" expanded="True" />
<Node name="UI0-Public" expanded="True" />
+ <Node name="UI1-Login" expanded="True" />
<Node name="UI2" expanded="True">
<Node name="1-HomePage" expanded="True" />
<Node name="2-Classification" expanded="True" />
@@ -60,12 +69,13 @@
<String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
<MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
<Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI0-Public/PublicAssmebly.cs" relfile="HDL_ON/UI/UI0-Public/PublicAssmebly.cs" line="730" column="1" />
<Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs" line="315" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/Scene.cs" relfile="HDL_ON/Entity/Function/Scene.cs" line="288" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index d1aace8..24eac42 100644
--- a/HDL_ON/Common/ApiUtlis.cs
+++ b/HDL_ON/Common/ApiUtlis.cs
@@ -64,18 +64,21 @@
if (MainPage.InternetStatus == 0)
return;
//绾跨▼寮�濮嬫椂闂�
- var beginTime = DateTime.Now.AddSeconds(6);
+ var endTime = DateTime.Now.AddSeconds(6);
+
+ MainPage.Log($"寮�濮嬪悓姝ヤ簯绔暟鎹�");
DownloadDataComplete = false;
var waitPage = new Loading();
MainPage.BaseView.AddChidren(waitPage);
- waitPage.Start();
+ waitPage.Start(Language.StringByID(StringId.PleaseWait));
string code = StateCode.SUCCESS;
var downloadDataThread = new System.Threading.Thread(() =>
{
+ MainPage.Log($"杩涘叆璇诲彇浜戠鏁版嵁绾跨▼");
//===================鍒锋柊Token=======================
code = Ins.HttpRequest.RefreshToken();
if (code != StateCode.SUCCESS)
@@ -249,7 +252,8 @@
{
Application.RunOnMainThread(() =>
{
- beginTime = DateTime.MinValue;
+ MainPage.Log($"缁撴潫璇诲彇浜戠鏁版嵁绾跨▼");
+ endTime = DateTime.MinValue;
DownloadDataComplete = true;
waitPage.Hide();
waitPage.RemoveFromParent();
@@ -257,33 +261,46 @@
}
});
downloadDataThread.IsBackground = true;
+ downloadDataThread.Priority = System.Threading.ThreadPriority.Highest;
downloadDataThread.Start();
//缃戠粶鍗￠】锛岀粓姝笅杞界嚎绋�
new System.Threading.Thread(() =>
{
- while (beginTime < DateTime.Now)
+ try
{
- if (DownloadDataComplete)
+ while (endTime > DateTime.Now)
{
- break;
+ if (DownloadDataComplete)
+ {
+ break;
+ }
+ System.Threading.Thread.Sleep(100);
}
- System.Threading.Thread.Sleep(100);
- }
- if (!DownloadDataComplete)
- {
- downloadDataThread.Abort();
- }
- DownloadDataComplete = true;
- Application.RunOnMainThread(() =>
- {
- waitPage.Hide();
- waitPage.RemoveFromParent();
- });
- //鍒濆鍖栨暟鎹�
- //SpatialInfo.CurrentSpatial.Clear();
+ if (!DownloadDataComplete)
+ {
+ //downloadDataThread.Abort();
+ }
+ DownloadDataComplete = true;
+ Application.RunOnMainThread(() =>
+ {
+ waitPage.Hide();
+ waitPage.RemoveFromParent();
+ });
+ //鍒濆鍖栨暟鎹�
+ //SpatialInfo.CurrentSpatial.Clear();
-
+ }
+ catch { }
+ finally
+ {
+ #region 璇诲彇鏈湴鏁版嵁
+ //璇诲彇闊充箰淇℃伅
+ UI.Music.A31MusicModel.ReadMusicStates();
+ //鎼滅储缃戝叧
+ DriverLayer.Control.Ins.SearchLoaclGateway();
+ #endregion
+ }
})
{ IsBackground = true }.Start();
}
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index e31e88c..19c8c8a 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -503,7 +503,7 @@
UserInfo.Current.SaveUserInfo();
Action action = () =>
{
- MainPage.GoUserPage();
+ MainPage.GoUserPage(true);
};
new UI.PublicAssmebly().TipMsg(StringId.Tip, StringId.ResidenceDeletedSwitchToAnotherResidence, action);
});
@@ -553,11 +553,11 @@
/// <summary>
/// 鑾峰彇鍒锋柊褰撳墠浣忓畢鐨勭綉鍏冲垪琛�
/// </summary>
- public void GetHomeGatewayList()
+ public string GetHomeGatewayList()
{
try
{
- if (string.IsNullOrEmpty(DB_ResidenceData.Instance.CurrentRegion.RegionID)) return;
+ if (string.IsNullOrEmpty(DB_ResidenceData.Instance.CurrentRegion.RegionID)) return "";
var nowhomeId = DB_ResidenceData.Instance.CurrentRegion.RegionID;
var requestJson = HttpUtil.GetSignRequestJson(new HomeIdObj() { homeId = nowhomeId });
var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_GetGatewayList, requestJson);
@@ -571,7 +571,7 @@
if (mHomeGatewayRes.Count > 0)
{
DB_ResidenceData.Instance.HomeGateway = mHomeGatewayRes[0];
- if(mHomeGatewayRes[0].gatewayStatus)
+ if (mHomeGatewayRes[0].gatewayStatus)
{
//DriverLayer.Control.Ins.IsRemote = true;
DriverLayer.Control.Ins.GatewayOnline = true;
@@ -581,7 +581,7 @@
DriverLayer.Control.Ins.GatewayOnline = false;
}
DB_ResidenceData.Instance.SaveResidenceData();
- return;
+ return revertObj.Code;
}
}
//鍏朵綑鎯呭喌娓呯┖缃戝叧淇℃伅
@@ -593,10 +593,11 @@
{
//鎻愮ず閿欒
}
+ return revertObj.Code;
}
catch
{
-
+ return "";
}
}
/// <summary>
diff --git a/HDL_ON/DAL/Server/NewAPI.cs b/HDL_ON/DAL/Server/NewAPI.cs
index 8eb262f..8e13686 100644
--- a/HDL_ON/DAL/Server/NewAPI.cs
+++ b/HDL_ON/DAL/Server/NewAPI.cs
@@ -391,7 +391,7 @@
/// <summary>
/// 鍙栨秷鏀惰棌鍦烘櫙
/// </summary>
- public const string Api_Post_CancelCollectScene = "/home-wisdom/app/scene/cancelcollect";
+ public const string Api_Post_CancelCollectScene = "/home-wisdom/app/scene/cancelCollect";
#endregion
#region Kaede -- 鎴块棿鎺ュ彛____________________________
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 4bf0780..81306ec 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -121,6 +121,8 @@
instance = null;
ins_OidList = null;
HomeGateway = null;
+ //閲嶇疆缃戝叧鐘舵��
+ DriverLayer.Control.Ins.GatewayOnline = false;
SpatialInfo.CurrentSpatial.Clear();
FunctionList.List.Clear();
diff --git a/HDL_ON/UI/BindingResidence/BindingResidencePage.cs b/HDL_ON/UI/BindingResidence/BindingResidencePage.cs
index 16d9fdb..601d6d5 100644
--- a/HDL_ON/UI/BindingResidence/BindingResidencePage.cs
+++ b/HDL_ON/UI/BindingResidence/BindingResidencePage.cs
@@ -126,7 +126,7 @@
//璋冪敤On鍘熸潵鐨勬柟娉�,鍒锋柊浣忓畢鍒楄〃鍙婂叾缂撳瓨
pm.GetHomePager();
//璺宠浆椤甸潰----
- MainPage.GoUserPage(false, () =>
+ MainPage.GoUserPage(true, false, () =>
{
//鏄剧ず娆㈣繋鍥炲鐨勫脊绐楃晫闈�
var form = new WellcomToHomeForm();
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 324c146..c58e805 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -119,7 +119,7 @@
//{ IsBackground = true }.Start();
Common.ApiUtlis.Ins.DownloadData();
- GoUserPage(true);
+ GoUserPage(false,true);
}
}
}
@@ -153,12 +153,12 @@
/// </summary>
/// <param name="isFirstOpen">濡傛灉鏄涓�娆″惎鍔� 妫�娴嬫牎楠屽瘑鐮�</param>
/// <param name="pageShowEvent">涓婚〉鏄剧ず涔嬪悗瑙﹀彂鐨勪簨浠�(娌℃湁浣忓畢鐨勮瘽,鍒欎笉浼氳Е鍙�)</param>
- public static void GoUserPage(bool isFirstOpen = false, Action pageShowEvent = null)
+ public static void GoUserPage(bool downloadData , bool isFirstOpen = false, Action pageShowEvent = null)
{
//鍔犺浇Loading鏁堟灉
var waitPage = new Loading();
BaseView.AddChidren(waitPage);
- waitPage.Start("sdfghjkl");// (Language.StringByID(StringId.PleaseWait));
+ waitPage.Start(Language.StringByID(StringId.PleaseWait));
//褰撴病鏈変綇瀹呮椂,涓嶈兘璁╁畠寰�涓嬭蛋
if (UserInfo.Current.regionList.Count == 0)
@@ -227,11 +227,11 @@
MainPage.Log($"GoUserPage : {ex.Message}");
}finally
{
- Application.RunOnMainThread(() =>
- {
- ///鍒濆鍖朼pp鏁版嵁
- InitializationData();
- });
+ //Application.RunOnMainThread(() =>
+ //{
+ // ///鍒濆鍖朼pp鏁版嵁
+ // Common.ApiUtlis.Ins.DownloadData();
+ //});
}
}).Start();
}
@@ -239,7 +239,7 @@
/// <summary>
/// 鍒濆鍖朼pp鎵�闇�瑕佺殑鏁版嵁
/// </summary>
- public static void InitializationData()
+ public static void InitializationData1()
{
//new System.Threading.Thread(() =>
//{
@@ -276,12 +276,6 @@
//})
//{ IsBackground = true }.Start();
- #region 璇诲彇鏈湴鏁版嵁
- //璇诲彇闊充箰淇℃伅
- UI.Music.A31MusicModel.ReadMusicStates();
- //鎼滅储缃戝叧
- DriverLayer.Control.Ins.SearchLoaclGateway();
- #endregion
}
/// <summary>
diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
index cd43eee..942557a 100644
--- a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
@@ -598,7 +598,7 @@
if (verAccount == etPassword.Text.Trim())
{
//璺宠浆椤甸潰----
- MainPage.GoUserPage();
+ MainPage.GoUserPage(true);
return;
}
});
@@ -630,7 +630,7 @@
Application.RunOnMainThread(() =>
{
//璺宠浆椤甸潰----
- MainPage.GoUserPage();
+ MainPage.GoUserPage(true);
});
}
else
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs
index d133c7a..e666d72 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs
@@ -156,7 +156,7 @@
Application.RunOnMainThread(() =>
{
//璺宠浆椤甸潰----
- MainPage.GoUserPage(false, () =>
+ MainPage.GoUserPage(true, false, () =>
{
//鏄剧ず娆㈣繋鍥炲鐨勫脊绐楃晫闈�
var form = new WellcomToHomeForm();
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
old mode 100755
new mode 100644
index 331e653..f70d227
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
@@ -186,47 +186,10 @@
}
DB_ResidenceData.Instance.CurrentRegion = homeTemp;
DB_ResidenceData.Instance.SaveResidenceData();
- var waitPage = new Loading();
- bodyView.AddChidren(waitPage);
- waitPage.Start(Language.StringByID(StringId.PleaseWait));
- new System.Threading.Thread(() =>
- {
- try
- {
- DB_ResidenceData.Instance.EixtAccount();
- //鍒锋柊涓�娆′綇瀹呯綉鍏�
- new HttpServerRequest().GetHomeGatewayList();
-
- Application.RunOnMainThread(() =>
- {
- btnCurResidenceName.Text = DB_ResidenceData.Instance.CurrentRegion.Name;
- //閲嶇疆缃戝叧鐘舵��
- DriverLayer.Control.Ins.GatewayOnline = false;
- });
-
- //鎼滅储缃戝叧
- DriverLayer.Control.Ins.SearchLoaclGateway();
- }
- catch (Exception ex)
- {
- Application.RunOnMainThread(() =>
- {
- new Alert(Language.StringByID(StringId.Tip), Language.StringByID(StringId.OperationFailed),
- Language.StringByID(StringId.Close)).Show();
- });
- MainPage.Log(ex.Message);
- }
- finally
- {
- Application.RunOnMainThread(() =>
- {
- waitPage.Hide();
- waitPage.RemoveFromParent();
- MainPage.InitializationData();
- });
- }
- })
- { IsBackground = true }.Start();
+ btnCurResidenceName.Text = DB_ResidenceData.Instance.CurrentRegion.Name;
+ DB_ResidenceData.Instance.EixtAccount();
+ //鍒锋柊浣忓畢鏁版嵁
+ Common.ApiUtlis.Ins.DownloadData();
}
#endregion
--
Gitblit v1.8.0