~wxr/OnPro.git - Gitblit

			@@ -560,6 +560,10 @@
			private Function ConvertFunctionObject()
			{
			var localFunction = FunctionList.List.GetDeviceFunctionList().Find((obj) => obj.sid == sid);
			if(localFunction == null)
			{
			localFunction = FunctionList.List.groupControls.Find((obj) => obj.sid == sid);
			}
			return localFunction;
			}

			@@ -629,7 +633,12 @@
			return sceneFunctionInfo;
			}


			/// <summary>
			/// 设备
			/// 场景 =scene
			/// 群控=5
			/// </summary>
			public string type = "0";
			}

			/// <summary>
			@@ -663,7 +672,7 @@
			text = Language.StringByID(StringId.Brightness);
			break;
			case FunctionAttributeKey.RGB:
			text = Language.StringByID(StringId.ColorValue);
			text = "RGB";// Language.StringByID(StringId.ColorValue);
			break;
			case FunctionAttributeKey.Mode:
			text = Language.StringByID(StringId.Mode);
			@@ -706,7 +715,7 @@
			/// </summary>
			public string GetUintString()
			{
			if (!string.IsNullOrEmpty(UintString))
			if (!string.IsNullOrEmpty(UintString) && UintString!= "{}")
			{
			return UintString;
			}
			@@ -751,6 +760,7 @@
			text = catchString == "true" ? Language.StringByID(StringId.Defense) : Language.StringByID(StringId.Undefense);
			break;
			case FunctionAttributeKey.OnOff:
			case FunctionAttributeKey.Colorful:
			text = catchString == "on" ? Language.StringByID(StringId.On) : Language.StringByID(StringId.OFF);
			break;
			case FunctionAttributeKey.SetTemp: