| .vs/HDL_APP_Project/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/Common/ApiUtlis.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/DAL/DriverLayer/Control.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/MainPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,12 +1,16 @@ <Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" /> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs"> <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"> <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="275" Column="64" /> <File FileName="HDL_ON/Entity/Room.cs" Line="442" Column="34" /> <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" /> </Files> <Pads> <Pad Id="ProjectPad"> @@ -15,7 +19,9 @@ <Node name="HDL_ON" expanded="True"> <Node name="Common" expanded="True" /> <Node name="DAL" expanded="True"> <Node name="DriverLayer" expanded="True" /> <Node name="DriverLayer" expanded="True"> <Node name="Control.cs" selected="True" /> </Node> <Node name="Mqtt" expanded="True" /> <Node name="Server" expanded="True" /> </Node> @@ -31,9 +37,7 @@ <Node name="Scene" expanded="True" /> </Node> <Node name="4-PersonalCenter" expanded="True" /> <Node name="FuntionControlView" expanded="True"> <Node name="ChooseRoomPageBLL.cs" selected="True" /> </Node> <Node name="FuntionControlView" expanded="True" /> </Node> </Node> </Node> @@ -56,7 +60,7 @@ <String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String> <String>Shared.IOS/Shared.IOS.csproj</String> </DisabledProjects> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" /> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" /> <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" /> <MonoDevelop.Ide.DebuggingService.Breakpoints> <BreakpointStore> HDL_ON/Common/ApiUtlis.cs
@@ -55,7 +55,7 @@ return result; } public bool DownloadDataComplete = false; public bool DownloadDataComplete = true; /// <summary> /// 下载数据 /// </summary> @@ -64,7 +64,7 @@ if (MainPage.InternetStatus == 0) return; //线程开始时间 var beginTime = DateTime.MinValue; var beginTime = DateTime.Now.AddSeconds(6); DownloadDataComplete = false; @@ -194,7 +194,7 @@ var pack = Ins.HttpRequest.GetSceneList(); if (pack.Code == StateCode.SUCCESS) { MainPage.Log($"读取场景数据成功");//:\r\n{pack.Data.ToString()}"); MainPage.Log($"读取场景数据成功"); var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(pack.Data.ToString()); if (sceneList != null) { @@ -249,7 +249,7 @@ { Application.RunOnMainThread(() => { beginTime = DateTime.Now; beginTime = DateTime.MinValue; DownloadDataComplete = true; waitPage.Hide(); waitPage.RemoveFromParent(); @@ -260,31 +260,32 @@ downloadDataThread.Start(); //网络卡顿，终止下载线程 new System.Threading.Thread(() => { while (beginTime.AddSeconds(6) > DateTime.Now) new System.Threading.Thread(() => { while (beginTime < DateTime.Now) { if(DownloadDataComplete) if (DownloadDataComplete) { break; } System.Threading.Thread.Sleep(100); } if (DownloadDataComplete) { //下载完成初始化数据 SpatialInfo.CurrentSpatial.Clear(); } else if (!DownloadDataComplete) { downloadDataThread.Abort(); Application.RunOnMainThread(() => { waitPage.Hide(); waitPage.RemoveFromParent(); }); } }) { IsBackground = true }.Start(); DownloadDataComplete = true; Application.RunOnMainThread(() => { waitPage.Hide(); waitPage.RemoveFromParent(); }); //初始化数据 //SpatialInfo.CurrentSpatial.Clear(); }) { IsBackground = true }.Start(); } } } HDL_ON/DAL/DriverLayer/Control.cs
@@ -241,7 +241,11 @@ { if (Ins.IsRemote || DB_ResidenceData.Instance.GatewayType == 1) { ControlAProtocolScene(scene); new System.Threading.Thread(() => { ControlAProtocolScene(scene); }) { IsBackground = true }.Start(); } else { HDL_ON/UI/MainPage.cs
@@ -158,7 +158,7 @@ //加载Loading效果 var waitPage = new Loading(); BaseView.AddChidren(waitPage); waitPage.Start(Language.StringByID(StringId.PleaseWait)); waitPage.Start("sdfghjkl");// (Language.StringByID(StringId.PleaseWait)); //当没有住宅时,不能让它往下走 if (UserInfo.Current.regionList.Count == 0)
