.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,23 +1,24 @@ <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/Entity/Function/Sensor.cs"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-001844A93ED0802E" /> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/MainPage.cs"> <Files> <File FileName="HDL_ON/Entity/FunctionList.cs" Line="601" Column="30" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs" /> <File FileName="HDL-ON_iOS/AppDelegate.cs" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" /> <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs" /> <File FileName="HDL_ON/Entity/Function/Function.cs" Line="181" Column="27" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs" /> <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs" /> <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionPage.cs" /> <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs" /> <File FileName="HDL_ON/Common/HDLCommon.cs" /> <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="589" Column="1" /> <File FileName="HDL_ON/Entity/Function/Sensor.cs" Line="93" Column="19" /> <File FileName="HDL_ON/Entity/Function/AC.cs" Line="343" Column="14" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" Line="425" Column="124" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneLocationPage.cs" Line="90" Column="64" /> <File FileName="HDL_ON/UI/UI0-Public/PublicAssmebly.cs" Line="633" Column="44" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs" Line="140" Column="36" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs" Line="419" Column="30" /> <File FileName="HDL_ON/Entity/Function/Scene.cs" Line="416" Column="1" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs" Line="145" Column="18" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs" Line="148" Column="62" /> <File FileName="HDL_ON/Entity/Function/Function.cs" Line="194" Column="37" /> <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="925" Column="10" /> <File FileName="HDL_ON/UI/BindingResidence/BindingResidencePage.cs" Line="107" Column="15" /> <File FileName="HDL_ON/Common/HDLCommon.cs" Line="315" Column="43" /> <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="184" Column="39" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs" Line="196" Column="58" /> <File FileName="HDL_ON/Entity/DB_ResidenceData.cs" Line="124" Column="48" /> <File FileName="HDL_ON/UI/MainPage.cs" Line="29" Column="55" /> </Files> <Pads> <Pad Id="ProjectPad"> @@ -28,26 +29,25 @@ <Node name="DAL" expanded="True"> <Node name="DriverLayer" expanded="True" /> <Node name="Mqtt" expanded="True" /> <Node name="Server" expanded="True" /> </Node> <Node name="Entity" expanded="True"> <Node name="Function" expanded="True"> <Node name="Sensor.cs" selected="True" /> </Node> </Node> <Node name="Entity" expanded="True" /> <Node name="UI" expanded="True"> <Node name="BindingResidence" expanded="True" /> <Node name="UI2" expanded="True"> <Node name="2-Classification" expanded="True" /> <Node name="3-Intelligence" expanded="True"> <Node name="Scene" expanded="True" /> </Node> <Node name="FuntionControlView" expanded="True"> <Node name="Light" expanded="True" /> </Node> <Node name="4-PersonalCenter" expanded="True" /> </Node> <Node name="MainPage.cs" selected="True" /> </Node> </Node> <Node name="HDL-ON_iOS" expanded="True" /> </Node> </State> </Pad> <Pad Id="MonoDevelop.Debugger.WatchPad"> <State> <Value>commandDictionary</Value> <Value>scenefunction.localFunction</Value> </State> </Pad> </Pads> @@ -58,9 +58,12 @@ <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.DebuggingService.Breakpoints> <BreakpointStore /> <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="726" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/DriverLayer/Control.cs" relfile="HDL_ON/DAL/DriverLayer/Control.cs" line="186" column="1" /> </BreakpointStore> </MonoDevelop.Ide.DebuggingService.Breakpoints> <MultiItemStartupConfigurations /> </Properties> HDL_ON/Common/HDLCommon.cs
@@ -311,7 +311,7 @@ { //加载Loading效果 var waitPage = new Loading(); MainPage.BasePageView.AddChidren(waitPage); MainPage.BaseView.AddChidren(waitPage); waitPage.Start(Language.StringByID(StringId.PleaseWait)); new Thread(() => HDL_ON/DAL/DriverLayer/Control.cs
@@ -225,8 +225,6 @@ //本地搜索不到网关 if (!Ins.IsRemote) { //连接mqtt前，先断开--2020-12-21 DAL.Mqtt.MqttClient.DisConnectRemote(); Ins.IsRemote = true; DAL.Mqtt.MqttClient.InitState(); } @@ -264,7 +262,7 @@ /// <returns></returns> public void SendWriteCommand(Function function, Dictionary<string, string> commandDictionary) { function.usageCount++; function.controlCounter++; function.refreshTime = DateTime.Now; //如果是控制调光的开时，亮度值不能为0 HDL_ON/Entity/DB_ResidenceData.cs
@@ -126,8 +126,9 @@ ///切换住宅清空前住宅缓存自动化列表； HDL_ON.UI.UI2.Intelligence.Automation.Logic.LogicList.Clear(); if (MainPage.IsRemote) if (DriverLayer.Control.Ins.IsRemote) { DriverLayer.Control.Ins.IsRemote = false; DAL.Mqtt.MqttClient.DisConnectRemote("退出登录，或者切换住宅"); } } HDL_ON/Entity/Function/AC.cs
@@ -252,15 +252,14 @@ min = 16, }; } if (_trait_temp.curValue.ToString() == "{}") _trait_temp.curValue = 16; } //if (_trait_temp.curValue.ToString().Length > 3) if (_trait_temp.curValue.ToString() == "{}") { double vv = 16; Double.TryParse(_trait_temp.curValue.ToString(),out vv); _trait_temp.curValue = Convert.ToInt32(vv); _trait_temp.curValue = 16; } double vv = 16; Double.TryParse(_trait_temp.curValue.ToString(), out vv); _trait_temp.curValue = Convert.ToInt32(vv); return _trait_temp; } } @@ -285,9 +284,9 @@ min = 0, }; } if (_trait_swting.curValue.ToString() == "{}") _trait_swting.curValue = "up"; } if (_trait_swting.curValue.ToString() == "{}") _trait_swting.curValue = "up"; return _trait_swting; } } @@ -333,14 +332,13 @@ min = 0, }; } if (_trait_IndoorTemp.curValue.ToString() == "{}") _trait_IndoorTemp.curValue = 0; } //if (_trait_IndoorTemp.curValue.ToString().Length > 3) if (_trait_IndoorTemp.curValue.ToString() == "{}") { var vv = Convert.ToDouble(_trait_IndoorTemp.curValue); _trait_IndoorTemp.curValue = Convert.ToInt32(vv); _trait_IndoorTemp.curValue = 0; } var vv = Convert.ToDouble(_trait_IndoorTemp.curValue); _trait_IndoorTemp.curValue = Convert.ToInt32(vv); return _trait_IndoorTemp; } } HDL_ON/Entity/Function/FloorHeating.cs
@@ -182,15 +182,15 @@ max = 30, min = 0, }; if (_trait_IndoorTemp.curValue.ToString() == "{}") _trait_IndoorTemp.curValue = "0"; } } //if (_trait_IndoorTemp.curValue.ToString().Length > 3) if (_trait_IndoorTemp.curValue.ToString() == "{}") { _trait_IndoorTemp.curValue = "0"; } var vv = Convert.ToDouble(_trait_IndoorTemp.curValue); _trait_IndoorTemp.curValue = Convert.ToInt32(vv).ToString(); } return _trait_IndoorTemp; } } HDL_ON/Entity/Function/Function.cs
@@ -191,7 +191,7 @@ /// <summary> /// 使用次数 /// </summary> public double usageCount = 0; public double controlCounter = 0; /// <summary> /// 使用频率 /// </summary> @@ -199,7 +199,7 @@ { get { return usageCount / 7; return controlCounter / 7; } } /// <summary> HDL_ON/Entity/FunctionList.cs
@@ -207,7 +207,7 @@ } try { deviceFunctionList = deviceFunctionList.OrderByDescending(o => o.usageCount).ToList(); deviceFunctionList = deviceFunctionList.OrderByDescending(o => o.controlCounter).ToList(); } catch (Exception ex) { HDL_ON/UI/BindingResidence/BindingResidencePage.cs
@@ -104,12 +104,11 @@ var page = new MyQRCodePage(); AddChidren(page); page.LoadPage(true); //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; }; btnLogout.MouseUpEventHandler = (sender, e) => { MainPage.GoLoginPage(UserInfo.Current); HDLCommon.Current.Logout(); }; }
@@ -44,10 +44,10 @@ /// 无登录模式 /// </summary> public static bool NoLoginMode = false; /// <summary> /// 远程模式 /// </summary> public static bool IsRemote = false; ///// <summary> ///// 远程模式 ///// </summary> //public static bool IsRemote = false; /// <summary> /// 网络连接状态 /// 0:无网络 HDL_ON/UI/UI0-Public/PublicAssmebly.cs
@@ -623,7 +623,8 @@ var btnConfrim = new Button() { Width = Application.GetRealWidth(320), X = Application.GetRealWidth(160), Width = Application.GetRealWidth(160), TextAlignment = TextAlignment.CenterRight, TextColor = CSS_Color.MainColor, TextSize = CSS_FontSize.TextFontSize, HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -129,21 +129,8 @@ Radius = (uint)Application.GetRealWidth(3), }; topView.AddChidren(btnLinkStateTip); if (Control.Ins.GatewayOnline) { if (Control.Ins.IsRemote) { bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipRemote; } else { bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.MainColor; } } else { bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipFail; } //更新链接状态icon颜色 LoadEvent_CheckLinkStatus(); btnResidenceName = new Button() { HDL_ON/UI/UI2/2-Classification/FunctionPage.csold mode 100755 new mode 100644
@@ -105,7 +105,7 @@ { functionList.AddRange(FunctionList.List.sensorsEnvironmentalScience); } functionList.OrderByDescending(o => o.usageCount).ToList(); functionList.OrderByDescending(o => o.controlCounter).ToList(); ShowFunctionRow(functionList);
@@ -270,7 +270,6 @@ }; sceneDelayRow.AddChidren(btnSceneDelayTitle); btnSceneDelayTitle.MouseUpEventHandler = (sender, e) => { Action<string> action = (obj) => { HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
@@ -415,7 +415,8 @@ var scenefunction = scene.functions[i]; if (scenefunction.localFunction == null) { scene.functions.Remove(scenefunction); scene.functions.Remove(scenefunction); continue; } i++; var row = new RowLayout() HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneLocationPage.csold mode 100755 new mode 100644
@@ -45,17 +45,6 @@ }; contentView.AddChidren(roomView); Button btnRoomText = new Button() { X = Application.GetRealWidth(16), Width = Application.GetRealWidth(280), TextSize = CSS_FontSize.SubheadingFontSize, TextColor = CSS_Color.FirstLevelTitleColor, TextAlignment = TextAlignment.CenterLeft, Text = room.floorName + room.roomName, }; roomView.AddChidren(btnRoomText); Button btnChoose = new Button() { X = Application.GetRealWidth(331), @@ -67,7 +56,19 @@ Tag = "ChooseIcon" }; roomView.AddChidren(btnChoose); if(scene.roomIds.Contains(room.roomId)) Button btnRoomText = new Button() { X = Application.GetRealWidth(16), //Width = Application.GetRealWidth(280), TextSize = CSS_FontSize.SubheadingFontSize, TextColor = CSS_Color.FirstLevelTitleColor, TextAlignment = TextAlignment.CenterLeft, Text = room.floorName + room.roomName, }; roomView.AddChidren(btnRoomText); if (scene.roomIds.Contains(room.roomId)) { btnChoose.IsSelected = true; lastButton = btnChoose; @@ -86,7 +87,7 @@ }; roomView.AddChidren(btnLine); LoadEvent_ChangeSceneLocation(room, btnChoose); LoadEvent_ChangeSceneLocation(room, btnRoomText); } } HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
@@ -147,12 +147,12 @@ OpenAngle = 160, ThumbImagePath = aC.trait_on_off.curValue.ToString() == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png", ThumbImageHeight = Application.GetRealWidth(50), ProgressBarColor = CSS_Color.MainColor,//: CSS_Color.PromptingColor2, // 0xFFFC9C04 : CSS_Color.PromptingColor2, ProgressBarColor = CSS_Color.MainColor, OfflineProgressBarColor = CSS_Color.PromptingColor2, IsOffline = aC.trait_on_off.curValue.ToString() == "on", IsOffline = aC.trait_on_off.curValue.ToString() == "off", MinValue = 16, MaxValue = 32, IsClickable = aC.trait_on_off.curValue.ToString() == "on", //IsClickable = aC.trait_on_off.curValue.ToString() == "on", ArcColor = CSS_Color.BackgroundColor, Progress = Convert.ToInt32(aC.trait_temp.curValue), #if __IOS__ HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs
@@ -24,13 +24,13 @@ return; } updataTime = DateTime.Now; bodyView.arcBar.ProgressBarColor = bodyView.aC.trait_on_off.curValue.ToString() == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2; bodyView.arcBar.IsOffline = bodyView.aC.trait_on_off.curValue.ToString() != "on"; bodyView.btnTemp.Text = uAc.trait_temp.curValue.ToString(); bodyView.btnIndoorTemp.Text = Language.StringByID(StringId.IndoorTemp) + Convert.ToInt32(Convert.ToDouble(uAc.trait_IndoorTemp.curValue)) + "°C"; bodyView.btnMode.UnSelectedImagePath = uAc.curModeImage; bodyView.btnWindSpeed.UnSelectedImagePath = uAc.curFanImage; bodyView.btnSwitch.IsSelected = uAc.trait_on_off.curValue.ToString() == "on"; if (uAc.refreshTime.AddMilliseconds(1000) < DateTime.Now) if (uAc.refreshTime.AddMilliseconds(500) < DateTime.Now) { bodyView.arcBar.Progress = Convert.ToInt32(Convert.ToDouble(uAc.trait_temp.curValue)); } @@ -77,6 +77,10 @@ { btnMinus.MouseUpEventHandler = (sender, e) => { if (aC.trait_on_off.curValue.ToString() == "off") { return; } var temp = Convert.ToInt32(aC.trait_temp.curValue); if (temp < 17) { @@ -93,8 +97,12 @@ }; btnPlus.MouseUpEventHandler = (sender, e) => { if (aC.trait_on_off.curValue.ToString() == "off") { return; } var temp = Convert.ToInt32(aC.trait_temp.curValue); if (temp > 37) if (temp > 31) { return; } @@ -112,7 +120,7 @@ { aC.trait_temp.curValue = arcBar.Progress.ToString(); btnTemp.Text = aC.trait_temp.curValue.ToString(); System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>(); System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>(); d.Add(FunctionAttributeKey.SetTemp, aC.trait_temp.curValue.ToString()); Control.Ins.SendWriteCommand(aC, d); }; @@ -129,10 +137,18 @@ { btnMode.MouseUpEventHandler = (sender, e) => { if (aC.trait_on_off.curValue.ToString() == "off") { return; } LoadDiv_ChangeModeView(); }; btnWindSpeed.MouseUpEventHandler = (sender, e) => { if (aC.trait_on_off.curValue.ToString() == "off") { return; } LoadDiv_ChangeFanView(); };
@@ -145,10 +145,10 @@ ThumbImageHeight = Application.GetRealWidth(50), ProgressBarColor = CSS_Color.MainColor ,//: CSS_Color.PromptingColor2, // 0xFFFC9C04 : CSS_Color.PromptingColor2, OfflineProgressBarColor = CSS_Color.PromptingColor2, IsOffline = fh.trait_on_off.curValue.ToString() == "on", IsOffline = fh.trait_on_off.curValue.ToString() == "off", MinValue = 5, MaxValue = 35, IsClickable = fh.trait_on_off.curValue.ToString() == "on", //IsClickable = fh.trait_on_off.curValue.ToString() == "on", ArcColor = CSS_Color.BackgroundColor, Progress = Convert.ToInt32(fh.trait_temp.curValue), #if __IOS__ HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
@@ -79,6 +79,11 @@ { btnMinus.MouseUpEventHandler = (sender, e) => { if(fh.trait_on_off.curValue.ToString() == "off") { return; } var temp = Convert.ToInt32(fh.trait_temp.curValue); if (temp < Convert.ToInt32(fh.trait_temp.min)) { @@ -94,6 +99,10 @@ }; btnPlus.MouseUpEventHandler = (sender, e) => { if (fh.trait_on_off.curValue.ToString() == "off") { return; } var temp = Convert.ToInt32(fh.trait_temp.curValue); if (temp > Convert.ToInt32(fh.trait_temp.max)) { @@ -130,6 +139,10 @@ { btnMode.MouseUpEventHandler = (sender, e) => { if (fh.trait_on_off.curValue.ToString() == "off") { return; } LoadDiv_ChangeModeView(); };
