| .vs/HDL_APP_Project/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| .vs/HDL_APP_Project/xs/sqlite3/storage.ide | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| .vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_Android/Assets/.DS_Store | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_iOS/Resources/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/Entity/Enumerative/MyEnum.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/Entity/FunctionList.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,16 +1,19 @@ <Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.D4411691-F5B8-40F4-97C1-964F33115DBC" /> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs"> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs"> <Files> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs" Line="20" Column="71" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs" Line="1123" Column="58" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" Line="478" Column="44" /> <File FileName="HDL-ON_Android/Assets/Language.ini" Line="507" Column="1" /> <File FileName="HDL-ON_Android/Assets/Language.ini" Line="490" Column="14" /> <File FileName="HDL_ON/Common/R.cs" Line="495" Column="43" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/FunTypeView.cs" Line="5" Column="18" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs" Line="48" Column="46" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs" Line="70" Column="18" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs" Line="73" Column="35" /> <File FileName="HDL_ON/Entity/Enumerative/MyEnum.cs" Line="6" Column="17" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs" Line="1" Column="1" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs" Line="523" Column="80" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs" Line="28" Column="66" /> <File FileName="HDL_ON/Entity/FunctionList.cs" Line="116" Column="52" /> <File FileName="HDL_ON/UI/MainPage.cs" Line="188" Column="1" /> </Files> <Pads> <Pad Id="ProjectPad"> @@ -25,7 +28,7 @@ <Node name="UI2" expanded="True"> <Node name="3-Intelligence" expanded="True"> <Node name="Automation" expanded="True"> <Node name="InpOrOutLogicMethod.cs" selected="True" /> <Node name="LogicMethod.cs" selected="True" /> </Node> </Node> </Node> @@ -34,6 +37,9 @@ <Node name="HDL-ON_Android" expanded="True"> <Node name="Assets" expanded="True" /> </Node> <Node name="HDL-ON_iOS" expanded="True"> <Node name="Resources" expanded="True" /> </Node> </Node> </State> </Pad> .vs/HDL_APP_Project/xs/sqlite3/storage.ideBinary files differ
.vs/HDL_APP_Project/xs/sqlite3/storage.ide-walBinary files differ
HDL-ON_Android/Assets/.DS_StoreBinary files differ
HDL-ON_iOS/Resources/Language.ini
@@ -490,6 +490,18 @@ 7054=暂停 7055=亮度 7056=百分比 7057=模式 7058=制冷 7059=制热 7060=自动 7061=除湿 7062=温度 7063=风速 7064=白天 7065=夜晚 7066=离开 7067=一般 7068=时间 9000=请使用新的手机账号登录APP HDL_ON/Entity/Enumerative/MyEnum.cs
@@ -65,17 +65,17 @@ /// 色温 /// cct /// </summary> ColorTemperature = 0x0203, ColorTemperature= 0x0203, RGB = 0x0204, Curtain = 0x0301, /// <summary> /// 开合帘 /// </summary> MotorCurtain = 0x0303, MotorCurtain= 0x0303, /// <summary> /// 卷帘 /// </summary> RollingShutter = 0x0304, RollingShutter= 0x0304, AC = 0x0401, FloorHeating = 0x0402, @@ -96,18 +96,9 @@ /// RGBW /// </summary> RGBW = 0x0102, /// <summary> /// CCT灯 /// </summary> CCT = 0x0103, /// <summary> /// 开合帘 /// </summary> TrietexCurtain = 0x0104, /// <summary> /// 卷帘 /// </summary> RollerCurtain = 0x0105, }
@@ -111,6 +111,11 @@ var functionDataBytes = FileUtils.ReadFile(filePath); var functionDataString = System.Text.Encoding.UTF8.GetString(functionDataBytes); var tempFunction = Newtonsoft.Json.JsonConvert.DeserializeObject<Function>(functionDataString); if (tempFunction == null) { FileUtils.DeleteFile(filePath); return; } if (tempFunction.DeleteSign) { //todo 删除云端数据 20201203--App不能删除功能数据 HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -46,12 +46,12 @@ case FunctionType.Dimmer: case FunctionType.RGB: case FunctionType.RGBW: case FunctionType.CCT: case FunctionType.ColorTemperature: case FunctionType.Relay: //窗帘 case FunctionType.Curtain: case FunctionType.RollerCurtain: case FunctionType.TrietexCurtain: case FunctionType.RollingShutter: case FunctionType.MotorCurtain: //空调 case FunctionType.AC: //地热 @@ -166,12 +166,12 @@ case FunctionType.Dimmer: case FunctionType.RGB: case FunctionType.RGBW: case FunctionType.CCT: case FunctionType.ColorTemperature: case FunctionType.Relay: //窗帘 case FunctionType.Curtain: case FunctionType.RollerCurtain: case FunctionType.TrietexCurtain: case FunctionType.RollingShutter: case FunctionType.MotorCurtain: //空调 case FunctionType.AC: //地热 HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -67,12 +67,12 @@ case FunctionType.Dimmer: case FunctionType.RGB: case FunctionType.RGBW: case FunctionType.CCT: case FunctionType.ColorTemperature: case FunctionType.Relay: //窗帘 case FunctionType.Curtain: case FunctionType.RollerCurtain: case FunctionType.TrietexCurtain: case FunctionType.RollingShutter: case FunctionType.MotorCurtain: //空调 case FunctionType.AC: //地热 @@ -214,7 +214,7 @@ break; case FunctionType.RGB: case FunctionType.RGBW: case FunctionType.CCT: case FunctionType.ColorTemperature: case FunctionType.Dimmer: { string on_off = GetKeyValue("on_off", dicList); @@ -275,8 +275,8 @@ targetView.btnState.Text = stateStr; } break; case FunctionType.TrietexCurtain: case FunctionType.RollerCurtain: case FunctionType.MotorCurtain: case FunctionType.RollingShutter: {//开关灯 string on_off = GetKeyValue("on_off", dicList); string brightness = GetKeyValue("brightness", dicList); HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -129,81 +129,7 @@ /// <returns></returns> public static List<HDL_ON.Entity.Function> GetGatewayDeviceList() { List<HDL_ON.Entity.Function> list = new List<Entity.Function>(); for (int i=0;i<10;i++) { HDL_ON.Entity.Function function = new Entity.Function(); switch (i) { case 0: { function.sid = "1234560001212121020182"; function.name ="灯光"; list.Add(function); } break; case 1: { function.sid = "1234560001212121030182"; function.name = "窗帘"; list.Add(function); } break; case 2: { function.sid = "1234560001212121040182"; function.name = "空调"; list.Add(function); } break; case 3: { function.sid = "1234560001212121010282"; function.name = "RGBW"; list.Add(function); } break; case 4: { function.sid = "1234560001212121010382"; function.name = "CCT灯"; list.Add(function); } break; case 5: { function.sid = "1234560001212121010482"; function.name = "开合帘"; list.Add(function); } break; case 6: { function.sid = "1234560001212121010582"; function.name = "卷帘"; list.Add(function); } break; case 7: { function.sid = "1234560001212121040282"; function.name = "地热"; list.Add(function); } break; case 8: { function.sid = "1234560001212121020282"; function.name = "调关"; list.Add(function); } break; case 9: { function.sid = "1234560001212121020482"; function.name = "RGB"; list.Add(function); } break; } } return list; //return HDL_ON.Entity.DB_ResidenceData.functionList.GetAllFunction(); return HDL_ON.Entity.DB_ResidenceData.functionList.GetAllFunction(); } /// <summary> /// 获取网关场景列表 @@ -310,15 +236,15 @@ case FunctionType.Relay: case FunctionType.RGB: case FunctionType.RGBW: case FunctionType.CCT: case FunctionType.ColorTemperature: case FunctionType.Dimmer: { strPath = "LogicIcon/lightloguc.png"; } break; case FunctionType.Curtain: case FunctionType.RollerCurtain: case FunctionType.TrietexCurtain: case FunctionType.RollingShutter: case FunctionType.MotorCurtain: { strPath = "LogicIcon/curtainlogic.png"; } @@ -346,13 +272,13 @@ { List<string> deviceStrTypeList = new List<string>(); deviceStrTypeList.Clear(); var lightjosn = deviceList.Find((device) => device.functionType == FunctionType.Relay || device.functionType == FunctionType.Dimmer|| device.functionType == FunctionType.CCT || device.functionType == FunctionType.RGB|| device.functionType == FunctionType.RGBW); var lightjosn = deviceList.Find((device) => device.functionType == FunctionType.Relay || device.functionType == FunctionType.Dimmer|| device.functionType == FunctionType.ColorTemperature || device.functionType == FunctionType.RGB|| device.functionType == FunctionType.RGBW); if (lightjosn != null) { deviceStrTypeList.Add(Language.StringByID(StringId.Lights)); } var curtainjosn = deviceList.Find((device) => device.functionType ==FunctionType.Curtain|| device.functionType == FunctionType.TrietexCurtain|| device.functionType == FunctionType.RollerCurtain); var curtainjosn = deviceList.Find((device) => device.functionType ==FunctionType.Curtain|| device.functionType == FunctionType.MotorCurtain|| device.functionType == FunctionType.RollingShutter); if (curtainjosn != null) { deviceStrTypeList.Add(Language.StringByID(StringId.Curtain)); @@ -385,13 +311,13 @@ functionTypeList.Add(FunctionType.Dimmer); functionTypeList.Add(FunctionType.RGB); functionTypeList.Add(FunctionType.RGBW); functionTypeList.Add(FunctionType.CCT); functionTypeList.Add(FunctionType.ColorTemperature); } else if (deviceType == Language.StringByID(StringId.Curtain)) { functionTypeList.Add(FunctionType.Curtain); functionTypeList.Add(FunctionType.RollerCurtain); functionTypeList.Add(FunctionType.TrietexCurtain); functionTypeList.Add(FunctionType.RollingShutter); functionTypeList.Add(FunctionType.MotorCurtain); } else if (deviceType == Language.StringByID(StringId.AC)) { @@ -417,10 +343,10 @@ deviceTypeList.Add(FunctionType.RGB); deviceTypeList.Add(FunctionType.RGBW); deviceTypeList.Add(FunctionType.Dimmer); deviceTypeList.Add(FunctionType.CCT); deviceTypeList.Add(FunctionType.ColorTemperature); deviceTypeList.Add(FunctionType.Curtain); deviceTypeList.Add(FunctionType.RollerCurtain); deviceTypeList.Add(FunctionType.TrietexCurtain); deviceTypeList.Add(FunctionType.RollingShutter); deviceTypeList.Add(FunctionType.MotorCurtain); deviceTypeList.Add(FunctionType.AC); deviceTypeList.Add(FunctionType.FloorHeating); } @@ -431,10 +357,10 @@ deviceTypeList.Add(FunctionType.RGB); deviceTypeList.Add(FunctionType.RGBW); deviceTypeList.Add(FunctionType.Dimmer); deviceTypeList.Add(FunctionType.CCT); deviceTypeList.Add(FunctionType.ColorTemperature); deviceTypeList.Add(FunctionType.Curtain); deviceTypeList.Add(FunctionType.RollerCurtain); deviceTypeList.Add(FunctionType.TrietexCurtain); deviceTypeList.Add(FunctionType.RollingShutter); deviceTypeList.Add(FunctionType.MotorCurtain); deviceTypeList.Add(FunctionType.AC); deviceTypeList.Add(FunctionType.FloorHeating); } HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
@@ -9,23 +9,23 @@ { public class Send { ///// <summary> ///// 住宅ID ///// </summary> //public static string homeId = Entity.DB_ResidenceData.residenceData.CurReginID; ///// <summary> ///// 网关ID ///// </summary> //public static string gatewayId = DriverLayer.Control.Ins.GatewayId; /// <summary> /// 住宅ID /// </summary> public static string homeId = "1333723044544233473"; public static string homeId = Entity.DB_ResidenceData.residenceData.CurReginID; /// <summary> /// 网关ID /// </summary> public static string gatewayId = "1333723647223775233"; public static string gatewayId = DriverLayer.Control.Ins.GatewayId; ///// <summary> ///// 住宅ID ///// </summary> //public static string homeId = "1333723044544233473"; ///// <summary> ///// 网关ID ///// </summary> //public static string gatewayId = "1333723647223775233"; /// <summary> /// 获取逻辑ID列表 HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -49,7 +49,7 @@ case FunctionType.Dimmer: case FunctionType.RGB: case FunctionType.RGBW: case FunctionType.CCT: case FunctionType.ColorTemperature: { //2表示(开，关)功能 SwitchBrightnessView(fLayout, device, index, edit, 2); @@ -68,8 +68,8 @@ SwitchView(fLayout, device, index, edit, 3); } break; case FunctionType.TrietexCurtain: case FunctionType.RollerCurtain: case FunctionType.MotorCurtain: case FunctionType.RollingShutter: { //3表示(开，关，暂停)功能 SwitchBrightnessView(fLayout, device, index, edit, 3); @@ -664,7 +664,7 @@ ///亮度 LogicView.FunTypeView brightnessView = new LogicView.FunTypeView(); brightnessView.frameLayout.Y = lightSwitchView.frameLayout.Bottom; if (device.functionType == FunctionType.TrietexCurtain || device.functionType == FunctionType.RollerCurtain) if (device.functionType == FunctionType.MotorCurtain || device.functionType == FunctionType.RollingShutter) { brightnessView.btnText.TextID = StringId.percentum; @@ -887,7 +887,7 @@ case FunctionType.Dimmer: case FunctionType.RGB: case FunctionType.RGBW: case FunctionType.CCT: case FunctionType.ColorTemperature: { foreach (var dic in dicList) { @@ -943,8 +943,8 @@ } } break; case FunctionType.TrietexCurtain: case FunctionType.RollerCurtain: case FunctionType.MotorCurtain: case FunctionType.RollingShutter: { foreach (var dic in dicList)
