~wjc/HomeApp.git

			@@ -99,7 +99,7 @@
			this.dicDeviceEpoint.Clear();

			//初始化设备枚举
			this.InitDeviceModelIdEnum();
			this.InitDeviceModelIdEnum();

			//获取本地全部的设备文件
			List<string> listFile = this.GetAllDeviceFile();
			@@ -565,7 +565,7 @@
			//如果当前是虚拟住宅
			if (Common.Config.Instance.Home.IsVirtually == true)
			{
			return Phone.ModelData.DeviceModelDataLogic.Current.ReDeviceMacName(device, macName, "MacRename");
			return Phone.TemplateData.TemplateDeviceDataLogic.Current.ReDeviceMacName(device, macName);
			}

			//获取编辑设备Mac名字的命令字符
			@@ -576,7 +576,7 @@
			return null;
			}
			//加缓存
			Phone.ModelData.DeviceModelDataLogic.Current.ReDeviceMacName(device, macName, "MacRename");
			Phone.TemplateData.TemplateDeviceDataLogic.Current.ReDeviceMacName(device, macName);

			var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.RenameDeviceMacNameData>(result.ReceiptData);
			return new CommonDevice.RenameDeviceMacNameAllData { renameDeviceMacNameData = tempData };
			@@ -593,7 +593,7 @@
			//如果当前是虚拟住宅
			if (Common.Config.Instance.Home.IsVirtually == true)
			{
			return Phone.ModelData.DeviceModelDataLogic.Current.ReDeviceEpointName(device, deviceName, "DeviceRename");
			return Phone.TemplateData.TemplateDeviceDataLogic.Current.ReDeviceEpointName(device, deviceName);
			}
			//获取编辑设备端点名字的命令字符
			var sendData = this.GetReDeviceEpointNameCommandText(device.DeviceAddr, device.DeviceEpoint, deviceName);
			@@ -603,7 +603,7 @@
			return null;
			}
			//加缓存
			Phone.ModelData.DeviceModelDataLogic.Current.ReDeviceEpointName(device, deviceName, "DeviceRename");
			Phone.TemplateData.TemplateDeviceDataLogic.Current.ReDeviceEpointName(device, deviceName);

			var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.DeviceRenameResponseData>(result.ReceiptData);
			return new CommonDevice.DeviceRenameAllData { deviceRenameData = tempData };
			@@ -885,7 +885,7 @@
			return false;
			}
			//温湿度传感器没有定位功能
			if (myTypeInfo.ConcreteType == DeviceConcreteType.Sensor_TemperatrueHumidity)
			if (myTypeInfo.ConcreteType == DeviceConcreteType.Sensor_TemperatureHumidity)
			{
			return false;
			}
			@@ -1386,6 +1386,16 @@
			//面板的温度探头叫面板名字+温度
			return deviceInfoType.DeviceDefultName + Language.StringByID(R.MyInternationalizationString.uTemperature);
			}
			else if (((TemperatureSensor)device).SensorDiv == 1)
			{
			//温度传感器
			return Language.StringByID(R.MyInternationalizationString.TemperatureSensor);
			}
			else if (((TemperatureSensor)device).SensorDiv == 2)
			{
			//湿度传感器
			return Language.StringByID(R.MyInternationalizationString.HumiditySensor);
			}
			}
			//其他情况,使用它的默认名称
			return deviceInfoType.DeviceDefultName + epointNo;
			@@ -1420,7 +1430,7 @@
			/// <param name="device">设备对象</param>
			/// <param name="macName">Mac名字</param>
			/// <returns></returns>
			private void SetMacName(CommonDevice device, string macName)
			public void SetMacName(CommonDevice device, string macName)
			{
			device.DeviceName = macName;
			}
			@@ -1431,7 +1441,7 @@
			/// <param name="device">设备对象</param>
			/// <param name="epointName">端点名字</param>
			/// <returns></returns>
			private void SetEpointName(CommonDevice device, string epointName)
			public void SetEpointName(CommonDevice device, string epointName)
			{
			device.DeviceEpointName = epointName;
			}
			@@ -2079,14 +2089,14 @@
			//设置传感器具体的类型
			info.BeloneType = DeviceBeloneType.A温湿度传感器;
			info.ConcreteText = this.dicDeviceModelIdEnum["A411"].A官方名字;
			info.ConcreteType = DeviceConcreteType.Sensor_TemperatrueHumidity;
			info.ConcreteType = DeviceConcreteType.Sensor_TemperatureHumidity;
			}
			else if (temperatrue == true && humidity == false)
			{
			//设置传感器具体的类型
			info.BeloneType = DeviceBeloneType.A温度传感器;
			info.ConcreteText = this.dicDeviceModelIdEnum["A412"].A官方名字;
			info.ConcreteType = DeviceConcreteType.Sensor_Temperatrue;
			info.ConcreteType = DeviceConcreteType.Sensor_Temperature;
			}
			else if (temperatrue == false && humidity == true)
			{
			@@ -2187,12 +2197,6 @@
			//门窗传感器
			info.ConcreteType = DeviceConcreteType.Sensor_DoorWindow;
			info.ConcreteText = Language.StringByID(R.MyInternationalizationString.uSensorDoorWindow);
			}
			else if (iasZone.IasDeviceType == 541)
			{
			//球型移动传感器
			info.ConcreteType = DeviceConcreteType.Sensor_SphericalMotion;
			info.ConcreteText = this.dicDeviceModelIdEnum["MSPIRB-ZB.10"].A官方名字;
			}
			}

			@@ -2877,14 +2881,8 @@
			/// <param name="device">设置源设备对象</param>
			public void SetDeviceInfoToMain(CommonDevice mainDevice, CommonDevice device)
			{
			if (string.IsNullOrEmpty(device.DeviceInfo.MacName) == false)
			{
			mainDevice.DeviceName = device.DeviceInfo.MacName;
			}
			if (string.IsNullOrEmpty(device.DeviceInfo.DeviceName) == false)
			{
			mainDevice.DeviceEpointName = device.DeviceInfo.DeviceName;
			}
			mainDevice.DeviceName = device.DeviceInfo.MacName;
			mainDevice.DeviceEpointName = device.DeviceInfo.DeviceName;
			mainDevice.CurrentGateWayId = device.CurrentGateWayId;
			mainDevice.ZigbeeType = device.DeviceInfo.ZigbeeType;
			mainDevice.IsOnline = device.DeviceInfo.IsOnline;
			@@ -3399,9 +3397,9 @@
			/// </summary>
			Sensor_PMTwoPointFive = 1307,
			/// <summary>
			/// 温湿度传感器
			/// 温湿度传感器(这个单词拼错了,但是错了就错了呗,就这样了)
			/// </summary>
			Sensor_TemperatrueHumidity = 1308,
			Sensor_TemperatureHumidity = 1308,

			/// <summary>
			/// 运动传感器
			@@ -3412,9 +3410,9 @@
			/// </summary>
			Sensor_Keyfob = -1307,
			/// <summary>
			/// 温度传感器
			/// 温度传感器(这个单词拼错了,但是错了就错了呗,就这样了)
			/// </summary>
			Sensor_Temperatrue = -1309,
			Sensor_Temperature = -1309,
			/// <summary>
			/// 湿度传感器
			/// </summary>