Changeset 148 for uKadecot/trunk/tools/EcnlControllerUI/EcnlControllerUI
- Timestamp:
- Jan 8, 2016, 2:35:52 PM (8 years ago)
- Location:
- uKadecot/trunk/tools/EcnlControllerUI/EcnlControllerUI
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
uKadecot/trunk/tools/EcnlControllerUI/EcnlControllerUI/Control.cs
r108 r148 764 764 765 765 private Type InputType { get { return FieldContain.Input.GetType(); } } 766 766 767 private byte[] ToByteValue() 767 768 { … … 935 936 /// </summary> 936 937 public bool Changed { get { return !FieldContain.Input.Value.Equals(ToText(GetValue)); } } 938 937 939 public void GrpBoxChange(Element ele, jQueryEvent ev) 938 940 { … … 946 948 947 949 public EventHandlerDevicePropertyInfo KadecotSet; 950 948 951 public void SetGetValue(byte[] data) 949 952 { … … 1110 1113 public Icon ButtonIcon { get { return getIcon(); } set { base.Object.ToggleClass(getClass(value), true); } } 1111 1114 public string Href { get { return base.Object.GetAttribute("href"); } set { base.Object.Attribute("href", value); } } 1115 1112 1116 public enum Icon 1113 1117 { … … 1237 1241 public List<RadioInput> RadioList; 1238 1242 private bool _ControlGroup; 1243 1239 1244 public bool ControlGroup 1240 1245 { … … 1256 1261 1257 1262 private bool _Horizontal; 1263 1258 1264 public bool Horizontal 1259 1265 { … … 1275 1281 public UIRadioInput Radio; 1276 1282 public UILabel Label; 1283 1277 1284 public RadioInput(UILabel Label, UIRadioInput Radio) 1278 1285 { … … 1413 1420 1414 1421 public string Placeholder { get { return base.GetAttribute("placeholder"); } set { base.Attribute("placeholder", value); } } 1422 1415 1423 public JsDictionary DataOptions 1416 1424 { … … 1572 1580 : base("<li>") 1573 1581 { 1574 1575 1582 } 1576 1583 … … 1634 1641 : base("<a>") 1635 1642 { 1636 1637 1643 } 1638 1644 … … 1663 1669 : base("<h" + i.ToString() + ">") 1664 1670 { 1665 1666 1671 } 1667 1672 … … 1678 1683 : base("<img>") 1679 1684 { 1680 1681 1685 } 1682 1686 … … 1826 1830 { 1827 1831 public DeviceController DeviceController; 1832 1828 1833 public class UIDeviceInfo 1829 1834 { … … 2000 2005 info = new UIDiv(); 2001 2006 string identifer = ""; 2007 2002 2008 foreach (var node in NodeList) { 2003 2004 2009 var profile = node.Profile; 2005 2010 2006 2011 if (jQuery.Select("#" + "cl_node_" + identifer).Length > 0) 2007 2012 continue; 2013 2008 2014 UICollapsibleset col = new UICollapsibleset(node.Data.ToString()); 2009 2015 col.Id = "cl_node_" + identifer; … … 2013 2019 2014 2020 col.Append(listview); 2021 2015 2022 foreach (var item in node.Devices) { 2016 2017 2023 if (item.Profile) 2018 2024 continue; … … 2063 2069 public static string LoadingShow = "loading.show"; 2064 2070 public static string LoadingHide = "loading.hide"; 2065 /// <summary> 2066 /// 機器検索開始 2067 /// </summary> 2071 /// <summary>機器検索開始</summary> 2068 2072 public static string SearchStart = "search.start"; 2069 /// <summary> 2070 /// 機器検索終了 2071 /// </summary> 2073 /// <summary>機器検索終了</summary> 2072 2074 public static string SearchEnd = "search.end"; 2073 /// <summary> 2074 /// 機器検索エラー 2075 /// </summary> 2075 /// <summary>機器検索エラー</summary> 2076 2076 public static string SearchError = "search.error"; 2077 /// <summary> 2078 /// 入力画面作成開始 2079 /// </summary> 2077 /// <summary>入力画面作成開始</summary> 2080 2078 public static string PropertyWriteStart = "propertywrite.start"; 2081 /// <summary> 2082 /// 入力画面作成終了 2083 /// </summary> 2079 /// <summary>入力画面作成終了</summary> 2084 2080 public static string PropertyWriteEnd = "propertywrite.end"; 2085 2081 } -
uKadecot/trunk/tools/EcnlControllerUI/EcnlControllerUI/WampClient.cs
r108 r148 491 491 492 492 //deserialize 493 if (msg.data != null) { 494 data = WampDeserializer.Parse(msg.data); 495 } 496 else { 497 data = WampDeserializer.Parse((string)msg); 493 try { 494 if (msg.data != null) { 495 data = WampDeserializer.Parse(msg.data); 496 } 497 else { 498 data = WampDeserializer.Parse((string)msg); 499 } 500 } 501 catch { 502 data = null; 498 503 } 499 504 if (data == null) {
Note:
See TracChangeset
for help on using the changeset viewer.