.vs/HDL_APP_Project/xs/.DS_StoreBinary files differ
.vs/HDL_APP_Project/xs/sqlite3/storage.ideBinary files differ
.vs/HDL_APP_Project/xs/sqlite3/storage.ide-shmBinary files differ
.vs/HDL_APP_Project/xs/sqlite3/storage.ide-walBinary files differ
HDL-ON_Android/Assets/Language.ini
@@ -491,6 +491,13 @@ 7054=暂停 7055=亮度 7056=百分比 7057=模式 7058=制冷 7059=制热 7060=自动 7061=除湿
@@ -2,6 +2,7 @@ //------------------------------------------------------------------------------ // <auto-generated> // This code was generated by a tool. // Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -14,7 +15,7 @@ { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")] [System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")] public partial class Resource {
@@ -484,8 +484,13 @@ public const int stop= 7054; public const int brightnesLogic= 7055; public const int percentum = 7056; public const int modeLogic = 7057; public const int coolLogic= 7058; public const int heatingLogic = 7059; public const int autoLogic = 7060; public const int dehumidifyLogic = 7061; #region LE新增 /// <summary> HDL_ON/Entity/Enumerative/MyEnum.cs
@@ -63,11 +63,18 @@ Dimmer = 0x0202, /// <summary> /// 色温 /// cct /// </summary> ColorTemperature = 0x0203, RGB = 0x0204, Curtain = 0x0301, /// <summary> /// 开合帘 /// </summary> MotorCurtain = 0x0303, /// <summary> /// 卷帘 /// </summary> RollingShutter = 0x0304, AC = 0x0401, FloorHeating = 0x0402, @@ -96,7 +103,7 @@ /// <summary> /// 开合帘 /// </summary> TrietexCurtain = 0x0104, TrietexCurtain = 0x0104, /// <summary> /// 卷帘 /// </summary> HDL_ON/HDL_ON.projitems
@@ -251,7 +251,7 @@ <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\3-Intelligence\Automation\TargetDeviceFunList.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\3-Intelligence\Automation\LogicView\brightnessView.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\3-Intelligence\Automation\LogicView\FunTypeView.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\3-Intelligence\Automation\LogicView\ModeView.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\3-Intelligence\Automation\LogicView\CheckView.cs" /> </ItemGroup> <ItemGroup> <Folder Include="$(MSBuildThisFileDirectory)UI\" /> HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/CheckView.cs
New file @@ -0,0 +1,73 @@ using System; using Shared; namespace HDL_ON.UI.UI2.Intelligence.Automation.LogicView { public class CheckView { /// <summary> /// 主控件View /// </summary> public FrameLayout frameLayout = new FrameLayout { Height = Application.GetRealHeight(50), }; /// <summary> /// 文本描述 /// </summary> public Button btnText = new Button { TextSize = TextSize.text16, Width = Application.GetRealWidth(130), Height = Application.GetRealHeight(20), TextColor = CSS.CSS_Color.textColor, X = Application.GetRealWidth(20), Gravity = Gravity.CenterVertical, TextAlignment = TextAlignment.CenterLeft, }; /// <summary> /// 图标 /// </summary> public Button btnCheckIcon = new Button { Width = Application.GetMinRealAverage(28), Height = Application.GetMinRealAverage(28), UnSelectedImagePath = "LogicIcon/weekoff.png", SelectedImagePath = "LogicIcon/weekon.png", X = Application.GetRealWidth(303), Gravity=Gravity.CenterVertical, }; /// <summary> /// 线 /// </summary> public Button btnLine = new Button { Width = Application.GetRealWidth(303), X = Application.GetRealWidth(20), Height = 1, BackgroundColor = CSS.CSS_Color.viewLine, }; public Button btnClick = new Button { Height = Application.GetRealHeight(50), }; /// <summary> /// View的方法 /// </summary> /// <returns></returns> public FrameLayout FLayoutView() { frameLayout.AddChidren(btnText); frameLayout.AddChidren(btnCheckIcon); btnLine.Y = frameLayout.Height - 1; frameLayout.AddChidren(btnLine); frameLayout.AddChidren(btnClick); return frameLayout; } } } HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/DateView.cs
@@ -69,14 +69,6 @@ frameLayout.AddChidren(btnCancel); frameLayout.AddChidren(btnConfirm); fLayout.AddChidren(frameLayout); ////界面点击事件 //fLayout.MouseUpEventHandler += (sender, e1) => //{ // //移除fLayout界面 // fLayout.RemoveFromParent(); //}; //取消点击事件 } } } HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/ModeView.cs
File was deleted HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
@@ -231,7 +231,7 @@ List<string> logicIdList = new List<string>(); //获取逻辑ID列表 var idStr = Send.getLogicIdList(); if (idStr.Code == "0" && idStr.Data != null) if (idStr.Code == "0" && idStr.Data != null&& idStr.Data.ToString()!="") { var date = Newtonsoft.Json.JsonConvert.SerializeObject(idStr.Data); var dateList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Date>>(date); HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -81,12 +81,84 @@ LogicView.FunTypeView curtainSwitchView = new LogicView.FunTypeView(); curtainSwitchView.btnText.TextID = StringId.switchLogic; fLayout.AddChidren(curtainSwitchView.FLayoutView()); ///模式 LogicView.FunTypeView acModehView = new LogicView.FunTypeView(); acModehView.frameLayout.Y = curtainSwitchView.frameLayout.Bottom; acModehView.btnText.TextID = StringId.modeLogic; fLayout.AddChidren(acModehView.FLayoutView()); #endregion #region 点击事件 ///开关点击事件 curtainSwitchView.btnClick.MouseUpEventHandler += (sender, e) => { SwitchViewMethod(device, curtainSwitchView.btnState, 2); }; acModehView.btnClick.MouseUpEventHandler += (sender, e) => { List<string> modeStr = new List<string> { Language.StringByID(StringId.coolLogic), Language.StringByID(StringId.heatingLogic), Language.StringByID(StringId.autoLogic), Language.StringByID(StringId.dehumidifyLogic), }; FrameLayout frame = new FrameLayout { BackgroundColor = CSS.CSS_Color.viewTrans60lucence, }; this.AddChidren(frame); LogicView.DateView modeView = new LogicView.DateView(); modeView.btnTitle.TextID = StringId.modeLogic; modeView.FLayoutView(frame, modeStr.Count); modeView.btnCancel.MouseUpEventHandler += (sender2, e2) => { frame.RemoveFromParent(); }; ///定义一个Btn记录选中状态 Button checkBtn = new Button{ Tag = "unknown", }; for (int i = 0; i < modeStr.Count; i++) { LogicView.CheckView modeTypeView = new LogicView.CheckView(); modeTypeView.frameLayout.Y = Application.GetRealHeight(56 + 50 * i); modeView.frameLayout.AddChidren(modeTypeView.FLayoutView()); modeTypeView.btnText.Text = modeStr[i]; modeTypeView.btnClick.Tag = modeStr[i];//标记 if (acModehView.btnState.Text == modeStr[i]) { //显示之前的选中状态 checkBtn.IsSelected = false; modeTypeView.btnCheckIcon.IsSelected = true; checkBtn = modeTypeView.btnCheckIcon; checkBtn.Tag = modeTypeView.btnClick.Tag.ToString(); } //星期的点击事件 modeTypeView.btnClick.MouseUpEventHandler += (sender1, e1) => { checkBtn.IsSelected = false; modeTypeView.btnCheckIcon.IsSelected = true; checkBtn = modeTypeView.btnCheckIcon; checkBtn.Tag = modeTypeView.btnClick.Tag.ToString(); }; } modeView.btnConfirm.MouseUpEventHandler += (sender1,e1) => { if (checkBtn.Tag.ToString()== "unknown") { return; } Dictionary<string, string> dic = new Dictionary<string, string>(); LogicMethod.dictionary(dic, "key", "mode"); string keyVlaue = "mode"; LogicMethod.dictionary(dic, "value", GetModeValueString(checkBtn.Tag.ToString())); acModehView.btnState.Text = checkBtn.Tag.ToString(); selectedState = device.functionType + "_mode"; AddDictionaryData(dicSateteList, keyVlaue, dic); RemView(frame); }; }; if (edit) { @@ -140,6 +212,24 @@ }; #endregion } private string GetModeValueString(string text) { string modeStr = ""; if (text == Language.StringByID(StringId.coolLogic)) { modeStr = "cool"; } else if (text == Language.StringByID(StringId.heatingLogic)) { modeStr = "heat"; } else if (text == Language.StringByID(StringId.autoLogic)) { modeStr = "auto"; } else if (text == Language.StringByID(StringId.dehumidifyLogic)) { modeStr = "dry"; } return modeStr; } /// <summary> ///开关=界面 @@ -575,5 +665,6 @@ } } }
