~wjc/HomeApp.git

			@@ -165,6 +165,14 @@
			this.DeleteGatewayFileByMemberModel();
			//初始化物理设备所属房间的记录
			this.InitRealDeviceRoomId();

			#if DEBUG
			if (UserCenterResourse.HideOption.CenterHideMenu == 1)
			{
			//检测一些代码配置(debug)
			this.CheckOhtherSettion();
			}
			#endif
			}

			/// <summary>
			@@ -196,6 +204,38 @@
			{
			//这个网关对于当前这个成员来说是非法的
			HdlGatewayLogic.Current.DeleteGatewayFile(gwId);
			}
			}
			}

			/// <summary>
			/// 检测一些代码配置(debug)
			/// </summary>
			private void CheckOhtherSettion()
			{
			foreach (var item in Enum.GetValues(typeof(DeviceType)))
			{
			string itemName = item.ToString();
			int itemValue = (int)item;
			if (itemName == "UnKown" \|\| itemName == "ZbGateway")
			{
			continue;
			}
			var device = this.NewDeviceObjectByDeviceId((DeviceType)itemValue);
			string strMsg = string.Empty;
			if (device == null)
			{
			strMsg = itemName + "没有实装(1)";
			}
			device = CommonDevice.CommonDeviceByByteString(itemName, "{}");
			if (device == null)
			{
			strMsg += "\r\n" + itemName + "没有实装(2)";
			}
			if (strMsg != string.Empty)
			{
			this.ShowErrorMsg(strMsg);
			return;
			}
			}
			}
			@@ -260,7 +300,10 @@
			dicExist.Remove(maikey);
			}
			//获取设备的固定属性
			HdlDeviceFixedAttributeLogic.Current.SetAllFixedAttributeToDevice(device);
			if (HdlDeviceFixedAttributeLogic.Current.SetAllFixedAttributeToDevice(device) == true)
			{
			System.Threading.Thread.Sleep(200);
			}
			//对未命名的虚拟设备重新命名
			if (device.DriveCode > 0 && this.GetSimpleEpointName(device) == string.Empty)
			{
			@@ -382,6 +425,12 @@
			public void AddVirtualDeviceToMemory(CommonDevice device)
			{
			string mainKeys = this.GetDeviceMainKeys(device);
			if (device is OTADevice)
			{
			this.dicOTADevice[mainKeys] = (OTADevice)device;
			device.ReSave();
			return;
			}
			this.dicAllDevice[mainKeys] = device;

			//设备回路收集
			@@ -762,6 +811,8 @@
			this.dicDeviceEpoint[device.DeviceAddr].Remove(device.DeviceEpoint);
			}
			}
			//删除模板数据
			Phone.TemplateData.TemplateCommonLogic.Current.DeleteDevice(device);

			//删除设备文件
			string filePath = device.FilePath;
			@@ -847,13 +898,25 @@
			/// <summary>
			/// 发送定位指令到设备
			/// </summary>
			/// <param name="device"></param>
			public void SetFixedPositionCommand(CommonDevice device)
			/// <param name="device">设备回路</param>
			/// <param name="isRealDevice">是否是定位真实设备</param>
			public void SetFixedPositionCommand(CommonDevice device, bool isRealDevice = false)
			{
			//如果当前住宅不是虚拟住宅
			if (Common.Config.Instance.Home.IsVirtually == false)
			{
			device.IdentifyControl(device.DeviceAddr, device.DeviceEpoint, 5);
			int epoint = device.DeviceEpoint;
			//如果是定位真实设备的话
			if (isRealDevice == true)
			{
			var myType = this.GetMyDeviceEnumInfo(new List<CommonDevice> { device });
			if (myType.ConcreteType == DeviceConcreteType.DimmableLight_OneLoad)
			{
			//一路调光器需要发8回路
			epoint = 8;
			}
			}
			device.IdentifyControl(device.DeviceAddr, epoint, 5);
			}
			}

			@@ -1275,10 +1338,15 @@
			/// <returns></returns>
			public bool SendDeviceFunctionTypeToGateway(CommonDevice device, DeviceFunctionType functionType)
			{
			var jObject = new Newtonsoft.Json.Linq.JObject { { "DeviceAddr", device.DeviceAddr }, { "Epoint", device.DeviceEpoint }, { "Cluster_ID", 0 }, { "Command", 110 } };
			var data = new Newtonsoft.Json.Linq.JObject { { "FunctionType", (int)functionType } };
			jObject.Add("Data", data);
			var result = HdlDeviceCommonLogic.Current.SendJobjectDataToGateway(device, "Device/SetEPDeviceFunctionType", jObject.ToString(), "Device/SetEPDeviceFunctionTypeRespon");
			//如果是虚拟住宅
			if (Common.Config.Instance.Home.IsVirtually == true)
			{
			device.DfunctionType = functionType;
			return true;
			}
			//获取命令字符
			var sendCommond = this.GetDeviceFunctionTypeCommandText(device, functionType);
			var result = HdlDeviceCommonLogic.Current.SendJobjectDataToGateway(device, "Device/SetEPDeviceFunctionType", sendCommond, "Device/SetEPDeviceFunctionTypeRespon");
			if (result.ErrorMsg != null \|\| result.ErrorMsgDiv == 0)
			{
			return false;
			@@ -1290,6 +1358,20 @@
			return resultData["Result"].ToString() == "0";
			}
			return false;
			}

			/// <summary>
			/// 获取更改设备功能类型的命令文本
			/// </summary>
			/// <param name="device"></param>
			/// <param name="functionType"></param>
			/// <returns></returns>
			public string GetDeviceFunctionTypeCommandText(CommonDevice device, DeviceFunctionType functionType)
			{
			var jObject = new Newtonsoft.Json.Linq.JObject { { "DeviceAddr", device.DeviceAddr }, { "Epoint", device.DeviceEpoint }, { "Cluster_ID", 0 }, { "Command", 110 } };
			var data = new Newtonsoft.Json.Linq.JObject { { "FunctionType", (int)functionType } };
			jObject.Add("Data", data);
			return jObject.ToString();
			}

			#endregion
			@@ -1364,7 +1446,7 @@
			else
			{
			var infoContent = this.GetDeviceModelIdNameInfo("A419");
			return infoContent != null ? infoContent.A官方名字 : string.Empty;
			return infoContent != null ? infoContent.A官方名字 + epointNo : string.Empty;
			}
			}
			else if (device.Type == DeviceType.FreshAirHumiditySensor)
			@@ -1376,9 +1458,10 @@
			{
			if (deviceInfoType.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir
			\|\| deviceInfoType.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment
			\|\| deviceInfoType.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment
			\|\| deviceInfoType.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
			{
			//新风面板/简约多功能/简约环境面板温度传感器
			//新风面板/简约多功能/简约/方悦环境面板温度传感器
			return deviceInfoType.DeviceDefultName + Language.StringByID(R.MyInternationalizationString.TemperatureSensor);
			}
			else if (deviceInfoType.BeloneType == DeviceBeloneType.A按键面板)
			@@ -1657,30 +1740,36 @@
			/// <summary>
			/// 获取【设备功能类型】的菜单图标
			/// </summary>
			/// <param name="specificType">自定义设备类型</param>
			/// <param name="deviceEnumInfo">自定义设备类型</param>
			/// <param name="unSelectPath">图片地址</param>
			/// <param name="selectPath">图片地址</param>
			/// <returns></returns>
			public void GetDeviceFunctionTypeMenuIcon(DeviceConcreteType specificType, ref string unSelectPath, ref string selectPath)
			public void GetDeviceFunctionTypeMenuIcon(DeviceEnumInfo deviceEnumInfo, ref string unSelectPath, ref string selectPath)
			{
			//新风小模块
			if (specificType == DeviceConcreteType.Relay_FangyueFreshAirModul)
			if (deviceEnumInfo.ConcreteType == DeviceConcreteType.Relay_FangyueFreshAirModul)
			{
			unSelectPath = "Device/FreshAirEpoint.png";
			selectPath = "Device/FreshAirEpointSelected.png";
			return;
			}
			//PM2.5空气质量传感器
			else if (specificType == DeviceConcreteType.Sensor_PMTwoPointFive)
			else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.Sensor_PMTwoPointFive)
			{
			unSelectPath = "Device/AirQualitySensorEpoint.png";
			selectPath = "Device/AirQualitySensorEpointSelected.png";
			return;
			}
			else if (deviceEnumInfo.BeloneType == DeviceBeloneType.A窗帘)
			{
			unSelectPath = "ZigeeLogic/curtain.png";
			selectPath = "ZigeeLogic/selectedcurtain.png";
			return;
			}
			//上面需要特殊处理

			//获取【设备类型】的图标
			this.GetDeviceObjectIcon(specificType, ref unSelectPath, ref selectPath);
			this.GetDeviceObjectIcon(deviceEnumInfo.ConcreteType, ref unSelectPath, ref selectPath);
			}

			/// <summary>
			@@ -2235,19 +2324,18 @@
			/// <param name="saveRoadDevice">如果只有一个回路,是否把回路的房间一起修改</param>
			public void SaveRealDeviceRoomId(List<CommonDevice> listDevice, string roomId, bool saveRoadDevice = true)
			{
			if (listDevice == null)
			if (listDevice == null \|\| listDevice.Count == 0)
			{
			return;
			}
			//如果设备只有一个回路，如果改变了真实设备区域，则它的回路的区域也一起改了
			if (saveRoadDevice == true && listDevice != null && listDevice.Count == 1)
			if (saveRoadDevice == true && listDevice.Count == 1)
			{
			if (listDevice[0] is OTADevice)
			if ((listDevice[0] is OTADevice) == false)
			{
			//单纯只是Ota设备则不处理
			return;
			//ota设备不需要处理
			HdlRoomLogic.Current.ChangedRoom(listDevice[0], roomId, false);
			}
			HdlRoomLogic.Current.ChangedRoom(listDevice[0], roomId, false);
			}
			bool save = false;
			if (roomId == string.Empty)
			@@ -2633,7 +2721,7 @@
			{
			HdlThreadLogic.Current.RunMain(() =>
			{
			var contr = new ShowMsgControl(ShowMsgType.Error, msg);
			var contr = new ShowMsgControl(Phone.ShowMsgType.Error, msg);
			contr.Show();
			});
			}
			@@ -2646,7 +2734,7 @@
			{
			HdlThreadLogic.Current.RunMain(() =>
			{
			var contr = new ShowMsgControl(ShowMsgType.Tip, msg);
			var contr = new ShowMsgControl(Phone.ShowMsgType.Tip, msg);
			contr.Show();
			});
			}
			@@ -2741,12 +2829,30 @@
			var localDevice = this.GetDevice(mainkeys);
			var tempDevice = localDevice == null ? device : localDevice;

			//如果这个设备ID变更了的话
			bool typeNotEquals = localDevice != null && deviceID != localDevice.Type;
			if (typeNotEquals == true)
			{
			//重新New这个对象
			typeNotEquals = this.ReNewDeviceOnTypeIsChanged(localDevice, deviceID);
			//重新再次获取对象
			tempDevice = this.GetDevice(mainkeys);
			}

			//刷新属性
			this.SetDeviceInfoToMain(tempDevice, device);
			if (this.RefreshDeviceFunctionType(tempDevice, device, false) == true)
			{
			//需要发送功能类型给网关
			listFucDevice.Add(tempDevice);
			}
			if (typeNotEquals == true)
			{
			//重新生成缓存
			tempDevice.ReSave();
			HdlAutoBackupLogic.AddOrEditorFile(tempDevice.FilePath);
			//全部主页菜单需要刷新
			Phone.UserView.UserPage.Instance.RefreshAllForm = true;
			}
			}
			}
			@@ -2838,6 +2944,45 @@
			return listDevice;
			}

			/// <summary>
			/// 在设备Type变更时,重新New这个设备对象(仅限在刷新设备列表使用,并且本地需要存在)
			/// </summary>
			/// <param name="oldLocalDevice">原来的本地对象</param>
			/// <param name="newDeviceType">新的设备Type</param>
			private bool ReNewDeviceOnTypeIsChanged(CommonDevice oldLocalDevice, DeviceType newDeviceType)
			{
			//先获取本地这个旧设备对象的json
			string oldFile = System.IO.Path.Combine(Config.Instance.FullPath, oldLocalDevice.FilePath);
			var deviceData = HdlFileLogic.Current.ReadFileTextContent(oldFile);
			if (deviceData == null)
			{
			//应该不会
			return false;
			}
			//根据新Type重新New对象
			var newDevice = CommonDevice.CommonDeviceByByteString(newDeviceType.ToString(), deviceData);
			if (newDevice == null)
			{
			//好像有点可能
			return false;
			}
			//删除本地文件
			HdlFileLogic.Current.DeleteFile(oldFile);
			HdlAutoBackupLogic.DeleteFile(oldLocalDevice.FilePath);

			//重新生成文件
			if (newDevice.IsCustomizeImage == false)
			{
			newDevice.IconPath = string.Empty;
			}
			string mainkey = this.GetDeviceMainKeys(newDevice);
			lock (dicAllDevice)
			{
			this.dicAllDevice[mainkey] = newDevice;
			}
			return true;
			}

			#endregion

			#region ■ 创建新设备对象相关_________________
			@@ -2890,6 +3035,7 @@
			mainDevice.IasDeviceType = device.DeviceInfo.DeviceType;
			mainDevice.Profile = device.DeviceInfo.Profile;
			mainDevice.Type = device.Type;
			mainDevice.DeviceID = (int)device.Type;

			//固件版本
			mainDevice.ImgVersion = device.DeviceInfo.ImgVersion;
			@@ -2965,6 +3111,8 @@
			else if (deviceType == DeviceType.FreshAirHumiditySensor) { device = new HumiditySensor(); }
			else if (deviceType == DeviceType.ColorTemperatureLight) { device = new ColorTemperatureLight(); }
			else if (deviceType == DeviceType.Buzzer) { device = new Buzzer(); }
			else if (deviceType == DeviceType.Transverter) { device = new Transverter(); }
			else if (deviceType == DeviceType.DimmerSwitch) { device = new DimmerSwitch(); }
			else if (deviceType == DeviceType.OtaDevice \|\| deviceType == DeviceType.OtaPanelDevice) { device = new OTADevice(); }
			else { return null; }

			@@ -3007,7 +3155,7 @@
			mainDevice.IconPath = "Device/Light.png";
			}
			mainDevice.DfunctionType = DeviceFunctionType.A灯光;
			if (device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A灯光)
			if (device.DeviceInfo != null && device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A灯光)
			{
			//调光器固定灯光
			if (sendFucType == true)
			@@ -3025,7 +3173,7 @@
			mainDevice.IconPath = "Device/ColorLightTemperature.png";
			}
			mainDevice.DfunctionType = DeviceFunctionType.A灯光;
			if (device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A灯光)
			if (device.DeviceInfo != null && device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A灯光)
			{
			//色温灯固定灯光
			if (sendFucType == true)
			@@ -3044,7 +3192,7 @@
			if (mainDevice.DfunctionType == DeviceFunctionType.A未定义)
			{
			mainDevice.DfunctionType = DeviceFunctionType.A灯光;
			if (device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A灯光)
			if (device.DeviceInfo != null && device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A灯光)
			{
			//继电器默认为灯光
			if (sendFucType == true)
			@@ -3064,7 +3212,7 @@
			if (mainDevice.DfunctionType == DeviceFunctionType.A未定义)
			{
			mainDevice.DfunctionType = DeviceFunctionType.A开关;
			if (device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A开关)
			if (device.DeviceInfo != null && device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A开关)
			{
			//空气开关默认为开关
			if (sendFucType == true)
			@@ -3083,7 +3231,7 @@
			mainDevice.IconPath = "Device/ColorLight.png";
			}
			mainDevice.DfunctionType = DeviceFunctionType.A灯光;
			if (device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A灯光)
			if (device.DeviceInfo != null && device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A灯光)
			{
			//彩灯默认为开关
			if (sendFucType == true)
			@@ -3434,7 +3582,19 @@
			/// 方悦新风小模块镜像id：2310
			/// </summary>
			Relay_FangyueFreshAirModul = 2310,

			/// <summary>
			/// 国标3路10A继电器小模块镜像id：2311(临时)
			/// </summary>
			Relay_NationalThreeLoadTenA = 2311,
			/// <summary>
			/// 欧标2路5A继电器小模块镜像id：2312(临时)
			/// </summary>
			Relay_EuropeanTwoLoadFiveA = 2312,
			/// <summary>
			/// 欧标14路干接点小模块镜像id：2313(临时)
			/// </summary>
			Relay_EuropeanFourteenLoadDryContact = 2313,

			//=========★★调光器类(2500-2799)★★=========
			/// <summary>
			/// 调光器