| .vs/HDL_APP_Project/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_iOS/HDL-ON_iOS.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/DAL/Server/HttpUtil.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/AddOutputInputView.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeView.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,25 +1,17 @@ <Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-000929D421E8802E" /> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs"> <Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.FE1D0763-7181-4B0C-AB18-E30AA773A6FA" /> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs"> <Files> <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="275" Column="53" /> <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="30" Column="10" /> <File FileName="HDL-ON_Android/Assets/Language.ini" /> <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="637" Column="53" /> <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs" Line="402" Column="64" /> <File FileName="HDL_ON/UI/MainPage.cs" Line="275" Column="45" /> <File FileName="HDL_ON/UI/UI2/UserPageBLL.cs" Line="6" Column="26" /> <File FileName="HDL_ON/UI/UI2/UserPage.cs" Line="571" Column="7" /> <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="101" Column="16" /> <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="599" Column="27" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs" Line="249" Column="22" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs" Line="238" Column="25" /> <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs" Line="94" Column="26" /> <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="123" Column="1" /> <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="16" Column="22" /> <File FileName="HDL_ON/Entity/Room.cs" Line="111" Column="43" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" Line="244" Column="1" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs" Line="186" Column="39" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs" Line="336" Column="27" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" Line="92" Column="38" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs" Line="645" Column="50" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/AddOutputInputView.cs" Line="88" Column="54" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs" Line="116" Column="23" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs" Line="48" Column="59" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeView.cs" Line="298" Column="26" /> <File FileName="HDL_ON/Common/R.cs" Line="1376" Column="27" /> <File FileName="../EvoyoHomeNewCloud/ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs" Line="1462" Column="32" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs" Line="169" Column="37" /> </Files> <Pads> <Pad Id="ProjectPad"> @@ -28,16 +20,20 @@ <Node name="HDL_ON" expanded="True"> <Node name="Common" expanded="True" /> <Node name="DAL" expanded="True"> <Node name="DriverLayer" expanded="True" /> <Node name="Server" expanded="True" /> </Node> <Node name="Entity" expanded="True" /> <Node name="UI" expanded="True"> <Node name="CSS" expanded="True" /> <Node name="UI2" expanded="True"> <Node name="3-Intelligence" expanded="True"> <Node name="Automation" expanded="True"> <Node name="AddLogic.cs" selected="True" /> <Node name="LogicView" expanded="True" /> <Node name="Send.cs" selected="True" /> </Node> </Node> <Node name="4-PersonalCenter" expanded="True" /> </Node> </Node> </Node> @@ -55,17 +51,14 @@ <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.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" /> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" /> <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.4b65c4650918" /> <MonoDevelop.Ide.DebuggingService.Breakpoints> <BreakpointStore> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" line="34" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs" line="118" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs" line="546" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Common/ApiUtlis.cs" relfile="HDL_ON/Common/ApiUtlis.cs" line="117" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" line="255" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" line="327" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs" line="191" column="1" /> <Breakpoint file="/Users/jlchen/Desktop/wjc/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" line="34" column="1" /> <Breakpoint file="/Users/jlchen/Desktop/wjc/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs" line="118" column="1" /> <Breakpoint file="/Users/jlchen/Desktop/wjc/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs" line="546" column="1" /> <Breakpoint file="/Users/jlchen/Desktop/wjc/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" line="327" column="1" /> </BreakpointStore> </MonoDevelop.Ide.DebuggingService.Breakpoints> <MultiItemStartupConfigurations /> HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -27,7 +27,7 @@ <MtouchDebug>true</MtouchDebug> <CodesignKey>iPhone Developer</CodesignKey> <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC";-w</MtouchExtraArgs> <CodesignProvision>On+Dev-20210428-1</CodesignProvision> <CodesignProvision>On+Dev-20210616-1</CodesignProvision> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' "> <DebugType>none</DebugType> HDL_ON/DAL/Server/HttpUtil.cs
@@ -18,8 +18,8 @@ /// 公共域名就近解析 /// /// </summary> public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com"; //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com"; public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm /// <summary> /// RegionMark /// </summary> HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs
@@ -47,7 +47,7 @@ delayView.frameLayout.Y = sceneView.frameLayout.Bottom; delayView.btnText.TextID = StringId.delayLogic; delayView.btnIcon.UnSelectedImagePath = "LogicIcon/time.png"; //viewLayout.AddChidren(delayView.FLayoutView()); viewLayout.AddChidren(delayView.FLayoutView()); #endregion #region 所有点击事件 HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -639,6 +639,8 @@ targetView.btnClick.Tag = outputTarget.sid; ///条件状态数组 List<Dictionary<string, string>> dicList = outputTarget.status as List<Dictionary<string, string>>; //显示状态值 string stateStr = ""; //显示输出条件各种类型状态 switch (outputTarget.target_type) { @@ -652,8 +654,7 @@ targetView.btnText.Text = device.name; //改变设备名称显示控件宽度 targetView.btnText.Width = Application.GetRealWidth(80); //第一个变量显示状态值 string stateStr = ""; //区别不同设备，显示不同设备状态 switch (device.spk) { @@ -673,7 +674,6 @@ stateStr = Language.StringByID(StringId.offLogic); } } targetView.btnState.Text = stateStr; } break; case SPK.LightRGB: @@ -699,7 +699,7 @@ { stateStr = brightness + "%"; } targetView.btnState.Text = stateStr; } break; case SPK.CurtainSwitch: @@ -728,7 +728,6 @@ break; } } targetView.btnState.Text = stateStr; } break; case SPK.AcStandard: @@ -820,11 +819,11 @@ } if (on_off != "" && on_off == "off") { targetView.btnState.Text = Language.StringByID(StringId.offLogic); stateStr = Language.StringByID(StringId.offLogic); } else { targetView.btnState.Text = stateStr.TrimEnd(','); stateStr = stateStr.TrimEnd(','); } @@ -918,11 +917,11 @@ } if (on_off != "" && on_off == "off") { targetView.btnState.Text = Language.StringByID(StringId.offLogic); stateStr = Language.StringByID(StringId.offLogic); } else { targetView.btnState.Text = stateStr.TrimEnd(','); stateStr = stateStr.TrimEnd(','); } } @@ -937,7 +936,7 @@ targetView.btnIcon.UnSelectedImagePath = "LogicIcon/scene.png"; targetView.btnNextIcon.Visible = false; //显示场景名称 targetView.btnText.Text = scene.name; stateStr = scene.name; } break; case "3": @@ -946,10 +945,19 @@ foreach (var dic in dicList) { string value = dic["value"]; targetView.btnText.Text = value; stateStr = value; } } break; } if (outputTarget.target_type == "1") { targetView.btnState.Text =new InpOrOutLogicMethod { }.GetTimeText(outputTarget.delay) + stateStr; } else { targetView.btnText.Text = new InpOrOutLogicMethod { }.GetTimeText(outputTarget.delay)+ stateStr; } //再次编辑条件状态点击事件 targetView.btnClick.MouseUpEventHandler += (sen, e) => @@ -997,6 +1005,25 @@ } break; } }; //延时点击事件 targetView.btnDelay.MouseUpEventHandler += (sen, e) => { InpOrOutLogicMethod inpOrOutLogicMethod = new InpOrOutLogicMethod(); inpOrOutLogicMethod.Delayed(thisView, outputTarget, (value) => { outputTarget.delay = value.ToString(); if (outputTarget.target_type == "1") { targetView.btnState.Text = new InpOrOutLogicMethod { }.GetTimeText(outputTarget.delay) + stateStr; } else { targetView.btnText.Text = new InpOrOutLogicMethod { }.GetTimeText(outputTarget.delay) + stateStr; } }); }; ///删除控件 targetView.btnDel.MouseUpEventHandler += (sender, e) => @@ -1585,5 +1612,104 @@ catch { } return name; } /// <summary> /// 延时时间方法 /// </summary> /// <param name="fLayout">在哪个界面显示</param> /// <param name="edit">（true=编辑；false=新建）</param> /// <param name="index">编辑条件的索引</param> private void Delayed(FrameLayout thisFLayout, Output output,Action<int>action) { FrameLayout fLayout = new FrameLayout { BackgroundColor = CSS.CSS_Color.viewTrans60lucence, }; thisFLayout.AddChidren(fLayout); LogicView.TimeView timePointView = new LogicView.TimeView(); timePointView.FLayoutView(fLayout); EventHandler<MouseEventArgs> RemovefLayout = (sender, e1) => { //移除fLayout界面 fLayout.RemoveFromParent(); }; //取消点击事件 timePointView.btnCancel.MouseUpEventHandler += RemovefLayout; //加载数据界面的设置方法(列表互不联动) timePointView.mUIPickerView.setNPicker(timePointView.GetmStringList(), timePointView.GetsStringList(), null); //默认初始选中状态 timePointView.mUIPickerView.setCurrentItems(0, 5, 0); //定义一个局部变量记录选中时间 int timepoint = 5; if (output.delay != "0") { int intValue = int.Parse(output.delay); var m = intValue / 60; var s = intValue % 60; string timeValue = m.ToString() + ":" + s.ToString(); int mIndex = timePointView.GetValueIndex(timeValue, 0, 1, timePointView.GetmIntList()); int sIndex = timePointView.GetValueIndex(timeValue, 1, 0, timePointView.GetmIntList()); //更新初始状态 timePointView.mUIPickerView.setCurrentItems(mIndex, sIndex, 0); timepoint = intValue; } //选中时间回调方法,时间变化一次回调一次 timePointView.mUIPickerView.OnSelectChangeEvent += (index1, index2, index3) => { string minuet = timePointView.GethStringList0()[index1].Split(' ')[0]; string second = timePointView.GetmStringList()[index2].Split(' ')[0]; int minuetIntValue = int.Parse(minuet); int secondIntValue = int.Parse(second); timepoint = minuetIntValue*60+secondIntValue; }; //确定点击事件 timePointView.btnConfirm.MouseUpEventHandler += (sender, e3) => { if (timepoint==0) { //提示 return; } fLayout.RemoveFromParent(); action(timepoint); }; } /// <summary> /// 获取时间文本描述 /// </summary> /// <param name="strTimeValue">时间值（单位s秒）</param> /// <returns></returns> private string GetTimeText(string strTimeValue) { var timeValue = int.Parse(strTimeValue); string state = ""; var minutes = timeValue / 60; var seconds = timeValue % 60; if (minutes != 0) { if (seconds == 0) { state = minutes.ToString() + Language.StringByID(StringId.minute); } else { state = minutes.ToString() + Language.StringByID(StringId.minute) + seconds.ToString() + Language.StringByID(StringId.s); } } else { if (seconds != 0) { state = seconds.ToString() + Language.StringByID(StringId.s); } } return state; } } } HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs
@@ -112,6 +112,10 @@ /// </summary> public string sid = ""; /// <summary> /// 逻辑输出目标延时间(单位用秒) /// </summary> public string delay = "0"; /// <summary> /// 逻辑输出目标类型 /// 设备=1; /// 场景=2; HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/AddOutputInputView.cs
@@ -7,11 +7,11 @@ /// <summary> /// 主控件View /// </summary> public FrameLayout frameLayout= new FrameLayout public FrameLayout frameLayout = new FrameLayout { Height = Application.GetRealHeight(44), Width = Application.GetRealWidth(343), BackgroundColor= CSS.CSS_Color.view, BackgroundColor = CSS.CSS_Color.view, X = Application.GetRealWidth(LogicView.TextSize.left16), }; @@ -23,28 +23,28 @@ Height = Application.GetRealHeight(43), Width = Application.GetRealWidth(343), LineColor = CSS.CSS_Color.viewTranslucence, SubViewWidth=Application.GetRealWidth(68), SubViewWidth = Application.GetRealWidth(68), }; /// <summary> /// （条件或者目标）图标 /// </summary> public Button btnIcon= new Button public Button btnIcon = new Button { Width= Application.GetRealWidth(28), Height =Application.GetRealWidth(28), Width = Application.GetRealWidth(28), Height = Application.GetRealWidth(28), //Y = Application.GetRealHeight(8), X = Application.GetRealWidth(TextSize.left12), }; /// <summary> /// （条件或者目标）文本描述 /// </summary> public Button btnText= new Button public Button btnText = new Button { TextSize = TextSize.text14, Width = Application.GetRealWidth(250), Height = Application.GetRealHeight(20), TextColor= CSS.CSS_Color.textColor, TextColor = CSS.CSS_Color.textColor, //Y=Application.GetRealHeight(12), X = Application.GetRealWidth(52), }; @@ -58,9 +58,9 @@ Width = Application.GetRealWidth(130), Height = Application.GetRealHeight(17), TextColor = CSS.CSS_Color.textCancelColor, Y=Application.GetRealHeight(14), Y = Application.GetRealHeight(14), X = Application.GetRealWidth(165), TextAlignment=TextAlignment.CenterRight, TextAlignment = TextAlignment.CenterRight, }; /// <summary> @@ -81,13 +81,26 @@ /// </summary> public Button btnLine = new Button { Width=Application.GetRealWidth(279), Y = Application.GetRealHeight(44-1), Width = Application.GetRealWidth(279), Y = Application.GetRealHeight(44 - 1), X = Application.GetRealWidth(52), Height = 1, BackgroundColor = CSS.CSS_Color.viewLine, }; /// <summary> /// 延时 /// </summary> public Button btnDelay = new Button { BackgroundColor = CSS.CSS_Color.AuxiliaryColor1, TextID = StringId.delayLogic, TextSize = LogicView.TextSize.text16, TextColor = CSS.CSS_Color.view, }; /// <summary> /// 删除 /// </summary> public Button btnDel = new Button { BackgroundColor = CSS.CSS_Color.textRedColor, @@ -95,7 +108,6 @@ TextSize = LogicView.TextSize.text16, TextColor = CSS.CSS_Color.view, }; public Button btnClick = new Button { Height = Application.GetRealHeight(44), @@ -117,12 +129,13 @@ rowLayout.AddChidren(btnText); rowLayout.AddChidren(btnState); rowLayout.AddChidren(btnNextIcon); rowLayout.AddRightView(btnDelay); rowLayout.AddRightView(btnDel); rowLayout.AddChidren(btnClick); btnLine.Y = frameLayout.Height - 1; frameLayout.AddChidren(btnLine); } } } HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeView.cs
@@ -72,7 +72,6 @@ /// </summary> /// <returns></returns> public void FLayoutView(FrameLayout fLayout) //public void FLayoutView(FrameLayout fLayout, string currState, Action<string> action) { fLayout.AddChidren(frameLayout); @@ -80,7 +79,6 @@ frameLayout.AddChidren(btnCancel); frameLayout.AddChidren(btnConfirm); frameLayout.AddChidren(btnLine); //TimePoint(fLayout, action,currState); } /// <summary> /// 选中时间的方法 @@ -248,6 +246,32 @@ return mList; } /// <summary> /// 获取60秒列表 /// </summary> /// <returns></returns> public List<string> GetsStringList() { //初始化列表 var mList = new List<string>(); for (int i = 0; i < 60; i++) { if (i < 10) { var a = "0" + i.ToString(); //添加数据 mList.Add(a + " " + Language.StringByID(StringId.s)); } else { //添加数据 mList.Add(i.ToString() + " " + Language.StringByID(StringId.s)); } } return mList; } /// <summary> /// 获取023小时列表 HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
@@ -114,6 +114,7 @@ { var outputTypeJOb = new JObject { }; outputTypeJOb.Add("sid", dictionary.sid); outputTypeJOb.Add("delay", dictionary.delay); outputTypeJOb.Add("target_type", dictionary.target_type); var statusArray = new JArray { }; foreach (var dic in dictionary.status) @@ -226,6 +227,7 @@ { var outputTypeJOb = new JObject { }; outputTypeJOb.Add("sid", dictionary.sid); outputTypeJOb.Add("delay", dictionary.delay); outputTypeJOb.Add("target_type", dictionary.target_type); var statusArray = new JArray { }; foreach (var dic in dictionary.status)
