| .vs/HDL_APP_Project/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/DAL/Server/HttpUtil.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,29 +1,35 @@ <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/ConditionDeviceFunList.cs"> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs"> <Files> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs" Line="201" Column="65" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs" Line="41" Column="68" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs" Line="93" Column="28" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs" Line="618" Column="19" /> <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="203" Column="61" /> <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="155" Column="18" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs" Line="229" Column="40" /> </Files> <Pads> <Pad Id="ProjectPad"> <State name="__root__"> <Node name="HDL_APP_Project" expanded="True"> <Node name="HDL_ON" expanded="True"> <Node name="DAL" expanded="True"> <Node name="Server" expanded="True" /> </Node> <Node name="UI" expanded="True"> <Node name="UI1-Login" expanded="True" /> <Node name="UI2" expanded="True"> <Node name="3-Intelligence" expanded="True"> <Node name="Automation" expanded="True"> <Node name="ConditionDeviceFunList.cs" selected="True" /> </Node> <Node name="Automation" expanded="True" /> </Node> <Node name="4-PersonalCenter" expanded="True"> <Node name="PirDevice" expanded="True" /> <Node name="FuntionControlView" expanded="True"> <Node name="Video" expanded="True"> <Node name="VideoMainView.cs" selected="True" /> </Node> </Node> </Node> </Node> </Node> <Node name="HDL-ON_Android" expanded="True"> <Node name="Assets" expanded="True" /> </Node> </Node> </State> HDL_ON/DAL/Server/HttpUtil.cs
@@ -153,7 +153,7 @@ { urlHead = OnAppConfig.Instance.RequestHttpsHost; } //"https://test-gz.hdlcontrol.com"; urlHead="https://test-gz.hdlcontrol.com"; //"https://bahrain-gateway.hdlcontrol.com"; //urlHead="https://china-gateway.hdlcontrol.com"; string requestFullUrl = urlHead + apiPath; HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs
@@ -1,4 +1,5 @@ using System; using System.Collections.Generic; using Shared; namespace HDL_ON.UI.UI2.Intelligence.Automation { HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -297,6 +297,22 @@ inputView.btnState.Text = str; } break; case SPK.SenesorMegahealth: { foreach (var dic in dicList) { string value = dic["value"]; if (value == "fall") { inputView.btnState.Text = Language.StringByID(StringId.diedao); } else { inputView.btnState.Text = Language.StringByID(StringId.wuren); } } } break; } } HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
@@ -164,14 +164,13 @@ logicIfon.Add("pushConfigs", pushConfigsArray); logicjArray.Add(logicIfon); var jObject = new JObject { { "homeId", LogicMethod.HomeId }, { "logics", logicjArray } }; responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_Add); responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_Add,5); //如果是token过期则刷新token if (responsePackNew.Code == StateCode.TOKEN_EXPIRED) { RefreshToken(); AddLogic(logic); } Console.WriteLine("添加逻辑===" + logicjArray); } catch (Exception e) { @@ -275,7 +274,7 @@ logicjArray.Add(logicIfon); var jObject = new JObject { { "homeId", LogicMethod.HomeId }, { "logics", logicjArray } }; responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_Update); responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_Update,5); //如果是token过期则刷新token if (responsePackNew.Code == StateCode.TOKEN_EXPIRED) { HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
@@ -35,8 +35,8 @@ pageView.AddChidren(view1); var view2 = new FrameLayout(); pageView.AddChidren(view2); View1(view1, listVideo, video); View2(view2, listCall, video); ViewFrameLayout1(view1, listVideo, video); ViewFrameLayout2(view2, listCall, video); Button btn11 = new Button { X = Application.GetRealWidth(170), @@ -113,8 +113,10 @@ /// <param name="view1">父控件</param> /// <param name="list">门口机列表</param> /// <param name="videoClouds">当前的可视对讲</param> void View1(FrameLayout view1, List<FlVideo> list, VideoClouds videoClouds) void ViewFrameLayout1(FrameLayout view1, List<FlVideo> list, VideoClouds videoClouds) { #region 布局界面 var bjFl = new FrameLayout { @@ -220,17 +222,16 @@ #region var fLayout = new FrameLayout { Width = Application.GetRealWidth(50), Width = Application.GetRealWidth(96), Height = Application.GetRealWidth(48), X = Application.GetRealWidth(31 + (58 + 50) * j), X = Application.GetRealWidth(20 + (26 + 28 + 42) * j), Y = Application.GetRealHeight(20 + (48 + 24) * line), }; fL.AddChidren(fLayout); var iconBtn = new Button { X = Application.GetRealWidth(11), Gravity=Gravity.CenterHorizontal, Width = Application.GetRealWidth(28), Height = Application.GetRealWidth(28), UnSelectedImagePath = "VideoIcon/weiqiangji.png", @@ -240,7 +241,8 @@ var deviceNameBtn = new Button { Y = iconBtn.Bottom + Application.GetRealHeight(6), Width = Application.GetRealWidth(50), X = Application.GetRealWidth(6), Width = Application.GetRealWidth(96-12), Height = Application.GetRealHeight(14), TextSize = TextSize.Text10, TextColor = CSS.CSS_Color.TextualColor, @@ -306,7 +308,7 @@ /// <param name="view2">父控件</param> /// <param name="listCall">通话记录列表</param> /// <param name="video">当前的可视对讲</param> void View2(FrameLayout view2, List<CallView> listCall, VideoClouds video) void ViewFrameLayout2(FrameLayout view2, List<CallView> listCall, VideoClouds video) { var bjFl = new FrameLayout
