~wjc/HomeApp.git

old mode 100644 new mode 100755

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

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

			//获取本地全部的设备文件
			List<string> listFile = this.GetAllDeviceFile();
			@@ -260,29 +260,18 @@
			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)
			{
			listDriveDevice.Add(device);
			}
			}
			if (listDriveDevice.Count > 0)
			{
			//如果虚拟设备还没有名字的话
			HdlThreadLogic.Current.RunThread(() =>
			{
			//如果不这样放在一个线程里,有可能对Dictionary产生影响
			foreach (var myDevice in listDriveDevice)
			{
			//根据设备类型获取名称
			var dName = this.GetDeviceObjectText(new List<CommonDevice>() { myDevice }, false);
			//在端点名字的后面附加【回路】字样
			dName += "(" + myDevice.DeviceEpoint + Language.StringByID(R.MyInternationalizationString.uDeviceCircuit) + ")";
			this.ReName(myDevice, dName, ShowErrorMode.NO);
			}
			});
			}
			//设置虚拟设备的默认名字
			this.SetDriveDeviceDefultName(listDriveDevice);

			//只有完全获取的时候,才会去处理删除的问题
			if (statu != 1)
			@@ -534,6 +523,42 @@
			return true;
			}

			/// <summary>
			/// 设置虚拟设备的默认名字
			/// </summary>
			/// <param name="listDriveDevice">虚拟设备列表</param>
			private void SetDriveDeviceDefultName(List<CommonDevice> listDriveDevice)
			{
			if (listDriveDevice.Count == 0)
			{
			return;
			}
			//如果虚拟设备还没有名字的话
			HdlThreadLogic.Current.RunThread(() =>
			{
			//如果不这样放在一个线程里,有可能对Dictionary产生影响
			foreach (var myDevice in listDriveDevice)
			{
			string dName = string.Empty;
			if (this.IsMiniLight(myDevice) == true)
			{
			//Mini夜灯
			dName = Language.StringByID(R.MyInternationalizationString.uMiniNightLight);
			}
			else
			{
			//根据设备类型获取名称
			dName = this.GetDeviceObjectText(new List<CommonDevice>() { myDevice }, false);
			//在端点名字的后面附加【回路】字样
			dName += "(" + myDevice.DeviceEpoint + Language.StringByID(R.MyInternationalizationString.uDeviceCircuit) + ")";
			}
			this.ReName(myDevice, dName, ShowErrorMode.NO);

			System.Threading.Thread.Sleep(100);
			}
			});
			}

			///<summary >
			/// 修改设备mac名称
			/// <para>macName:设备名称</para>
			@@ -543,7 +568,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名字的命令字符
			@@ -554,7 +579,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 };
			@@ -571,7 +596,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);
			@@ -581,7 +606,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 };
			@@ -847,9 +872,9 @@
			//门锁没有定位功能
			return false;
			}
			var myTypeInfo = this.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
			if (device.Type == DeviceType.IASZone)
			{
			var myTypeInfo = this.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
			if (myTypeInfo.ConcreteType == DeviceConcreteType.Sensor_Pir)
			{
			//传感器除了Pir都没有定位功能
			@@ -860,6 +885,11 @@
			//球型移动传感器虽然是电池设备,但是它有定位功能
			return true;
			}
			return false;
			}
			//温湿度传感器没有定位功能
			if (myTypeInfo.ConcreteType == DeviceConcreteType.Sensor_TemperatureHumidity)
			{
			return false;
			}

			@@ -1248,10 +1278,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;
			@@ -1263,6 +1298,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
			@@ -1349,15 +1398,26 @@
			{
			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按键面板)
			{
			//面板的温度探头叫面板名字+温度
			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);
			}
			}
			//其他情况,使用它的默认名称
			@@ -1393,7 +1453,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;
			}
			@@ -1404,7 +1464,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;
			}
			@@ -1854,7 +1914,8 @@
			info.ObjectTypeName = this.dicDeviceModelIdEnum["A418"].A类型名字;//调光模块
			}
			else if (info.BeloneType == DeviceBeloneType.A传感器
			\|\| device.Type == DeviceType.TemperatureSensor)
			\|\| device.Type == DeviceType.TemperatureSensor
			\|\| device.Type == DeviceType.FreshAirHumiditySensor)
			{
			//传感器合并
			info.ConcreteType = DeviceConcreteType.Sensor;
			@@ -2159,12 +2220,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官方名字;
			}
			}

			@@ -2563,7 +2618,7 @@
			{
			if (this.dicDeviceModelIdEnum.ContainsKey(strKey) == false)
			{
			return null;
			return new DeviceNameContent();
			}
			return this.dicDeviceModelIdEnum[strKey];
			}
			@@ -2707,15 +2762,32 @@
			listCheck.Add(mainkeys);
			//刷新一下本地缓存
			var localDevice = this.GetDevice(mainkeys);
			if (localDevice != null)
			var tempDevice = localDevice == null ? device : localDevice;

			//如果这个设备ID变更了的话
			bool typeNotEquals = localDevice != null && deviceID != localDevice.Type;
			if (typeNotEquals == true)
			{
			//刷新属性
			this.SetDeviceInfoToMain(localDevice, device);
			if (this.RefreshDeviceFunctionType(localDevice, device, false) == true)
			{
			//需要发送功能类型给网关
			listFucDevice.Add(localDevice);
			}
			//重新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;
			}
			}
			}
			@@ -2807,6 +2879,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 ■ 创建新设备对象相关_________________
			@@ -2850,14 +2961,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;
			@@ -2865,6 +2970,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;
			@@ -2890,6 +2996,8 @@
			mainDevice.InClusterList.AddRange(device.DeviceInfo.InClusterList);
			mainDevice.OutClusterList.Clear();
			mainDevice.OutClusterList.AddRange(device.DeviceInfo.OutClusterList);
			mainDevice.AttributeStatus.Clear();
			mainDevice.AttributeStatus.AddRange(device.DeviceInfo.AttributeStatus);

			//如果是温度传感器
			if (mainDevice.Type == DeviceType.TemperatureSensor)
			@@ -3167,6 +3275,7 @@
			this.dicPictrueShard["ButtonPanel_SimpleTwo"] = "ButtonPanel_Two";//简约2按键面板沿用 2按键的图标
			this.dicPictrueShard["IntelligentLocks_Sone"] = "IntelligentLocks_H06C";//S-one的门锁图片沿用 H06C的图标
			this.dicPictrueShard["Relay_FangyueFreshAirModul"] = "Relay_ThreeLoad";//方悦新风小模块图片沿用 3路继电器的图标
			this.dicPictrueShard["ButtonPanel_FourButtonScene"] = "ButtonPanel_Four";//简约4按键场景面板沿用 4按键面板的图标
			}

			/// <summary>
			@@ -3178,18 +3287,18 @@
			System.IO.StreamReader streamReader = null;
			var listText = new List<string>();
			try
			{
			#if iOS
			string textFile = Foundation.NSBundle.MainBundle.PathForResource("DeviceName.ini", null);
			streamReader = new System.IO.StreamReader(textFile, Encoding.UTF8);
			{
			#if iOS
			string textFile = Foundation.NSBundle.MainBundle.PathForResource("DeviceName.ini", null);
			streamReader = new System.IO.StreamReader(textFile, Encoding.UTF8);
			string text;
			while ((text = streamReader.ReadLine()) != null)
			{
			listText.Add(text.Trim());
			}
			return listText;
			#endif
			#if Android
			return listText;
			#endif
			#if Android
			var stream = Application.Activity.Assets.Open("DeviceName.ini");
			streamReader = new System.IO.StreamReader(stream, Encoding.UTF8);
			string text;
			@@ -3217,10 +3326,10 @@
			}
			}

			#endregion
			#endregion
			}

			#region ■ 自定义设备类型_________________________
			#region ■ 自定义设备类型_________________________

			/// <summary>
			/// <para>设备的具体【设备类型】,变量名可以作为【设备类型】图片,这个值是瞎写的,没什么特殊意义</para>
			@@ -3371,6 +3480,10 @@
			/// PM2.5空气质量传感器
			/// </summary>
			Sensor_PMTwoPointFive = 1307,
			/// <summary>
			/// 温湿度传感器(这个单词拼错了,但是错了就错了呗,就这样了)
			/// </summary>
			Sensor_TemperatureHumidity = 1308,

			/// <summary>
			/// 运动传感器
			@@ -3381,11 +3494,7 @@
			/// </summary>
			Sensor_Keyfob = -1307,
			/// <summary>
			/// 温湿度传感器
			/// </summary>
			Sensor_TemperatureHumidity = -1308,
			/// <summary>
			/// 温度传感器
			/// 温度传感器(这个单词拼错了,但是错了就错了呗,就这样了)
			/// </summary>
			Sensor_Temperature = -1309,
			/// <summary>
			@@ -3406,7 +3515,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>
			/// 调光器
			@@ -3595,5 +3716,5 @@
			A干接点 = 16,
			}

			#endregion
			#endregion
			}