添加了写入功能类型

黄学彪

2020-07-01 304dca51c28183a9dfc192c6b93ea1c00bdd5d97

 ZigbeeApp/Shared/Common/Device.cs

@@ -123,12 +123,6 @@


                if (device == null || device.CurrentGateWayId == null)

                {

#if DEBUG

                    //调查,为什么它会把全部设备删掉？

                    string file1 = UserCenterLogic.CombinePath(file);

                    string file2 = UserCenterLogic.CombinePath("Back_" + file);

                    System.IO.File.Copy(file1, file2, true);

#endif

                    //失效的文件，没有网关id的都删除掉

                    Global.DeleteFilebyHomeId(file);

                    continue;

@@ -143,12 +137,6 @@
                    }

                    else

                    {

#if DEBUG

                        //调查,为什么它会把全部设备删掉？

                        string file1 = UserCenterLogic.CombinePath(file);

                        string file2 = UserCenterLogic.CombinePath("Back_" + file);

                        System.IO.File.Copy(file1, file2, true);

#endif

                        //如果是主人,或者管理员,那么这个文件是非法的,直接删除

                        Global.DeleteFilebyHomeId(file);

                        continue;

@@ -211,7 +199,7 @@
            var listGateway = HdlGatewayLogic.Current.GetAllLocalGateway();

            foreach (var gateway in listGateway)

            {

                string gwId = HdlGatewayLogic.Current.GetGatewayId(gateway);

                string gwId = gateway.GwId;

                if (listId.Contains(gwId) == false)

                {

                    //这个网关对于当前这个成员来说是非法的

@@ -242,7 +230,7 @@
            listDevice.AddRange(list);



            //获取这个网关的本地所有设备

            string gwID = HdlGatewayLogic.Current.GetGatewayId(zbGateway);

            string gwID = zbGateway.GwId;

            List<CommonDevice> listLocalDevices = this.GetDeviceByGatewayID(gwID);

            //获取ota设备

            foreach (var ota in this.dicOTADevice.Values)

@@ -261,6 +249,7 @@
            }



            //添加设备的缓存

            var listDriveDevice = new List<CommonDevice>();

            for (int i = 0; i < listDevice.Count; i++)

            {

                var device = listDevice[i];

@@ -279,24 +268,27 @@
                }

                //获取设备的固定属性

                HdlDeviceFixedAttributeLogic.Current.SetAllFixedAttributeToDevice(device);

            }



            for (int i = 0; i < listDevice.Count; i++)

            {

                var device = listDevice[i];

                //对未命名的虚拟设备重新命名

                if (device.DriveCode > 0 && this.GetSimpleEpointName(device) == string.Empty)

                {

                    //根据设备类型获取名称

                    var dName = this.GetDeviceObjectText(new List<CommonDevice>() { device }, false);

                    //在端点名字的后面附加【回路】字样

                    dName += "(" + device.DeviceEpoint + Language.StringByID(R.MyInternationalizationString.uDeviceCircuit) + ")";



                    HdlThreadLogic.Current.RunThread(() =>

                    {

                        this.ReName(device, dName, ShowErrorMode.NO);

                    });

                    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);

                    }

                });

            }



            //只有完全获取的时候,才会去处理删除的问题

@@ -990,13 +982,20 @@
        public List<CommonDevice> GetMutilfunctionPanelByMac(List<CommonDevice> listDevice, bool sort = true)

        {

            //和彪哥、设备和产品部同事确认：

            //简约多功能面板[不显示多余的回路，只显示携带的2个继电器和1个温湿度传感器

            //简约多功能面板[不显示多余的回路，只显示携带的2个继电器，1个温度传感器，1个湿度传感器

            var list = new List<CommonDevice>();

            foreach (var dev in listDevice)

            {

                if (dev.Type == DeviceType.TemperatureSensor)

                {

                    if (dev.DeviceEpoint == 64)

                    {

                        list.Add(dev);

                    }

                }

                else if (dev.Type == DeviceType.FreshAirHumiditySensor)

                {

                    if (dev.DeviceEpoint == 65)

                    {

                        list.Add(dev);

                    }

@@ -1020,6 +1019,40 @@
                return -1;

            });



            return list;

        }



        /// <summary>

        /// 根据MAC地址,获取新风、简约环境面板全部回路的设备对象

        /// </summary>

        /// <param name="listDevice"></param>

        /// <returns></returns>

        public List<CommonDevice> GetPanelMatchEpointByMac(List<CommonDevice> listDevice, bool sort = true)

        { 
            var list = new List<CommonDevice>();

            foreach (var dev in listDevice)

            {

                if (dev.Type == DeviceType.TemperatureSensor)

                {

                    list.Add(dev);

                }

                else if (dev.Type == DeviceType.FreshAirHumiditySensor)

                {

                    list.Add(dev);

                }  
            }

            if (sort == false)

            {

                return list;

            } 
            list.Sort((obj1, obj2) => {



                if (obj1.DeviceEpoint > obj2.DeviceEpoint)

                {

                    return 1;

                }

                return -1;

            }); 
            return list;

        }



@@ -1138,6 +1171,56 @@


        #endregion



        #region ■ 获取设备信息_______________________



        /// <summary>

        /// 读取单个端点回路设备信息

        /// </summary>

        /// <param name="device">设备对象</param>

        /// <returns></returns>

        public CommonDevice.DeviceInfoData ReadDeviceEpointDeviceInfo(CommonDevice device)

        {

            var jObject = new Newtonsoft.Json.Linq.JObject { { "DeviceAddr", device.DeviceAddr }, { "Epoint", device.DeviceEpoint }, { "Cluster_ID", 0 }, { "Command", 80 } };

            var result = HdlDeviceCommonLogic.Current.SendJobjectDataToGateway(device, "GetStatusRecord", jObject.ToString(), "GetStatusRecord_Respon");

            if (result.ErrorMsg != null || result.ErrorMsgDiv == 0)

            {

                return null;

            }

            var info = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.DeviceInfoData>(result.ReceiptData);

            return info;

        }



        #endregion



        #region ■ 设置设备功能类型___________________



        /// <summary>

        /// 设置设备功能类型到网关

        /// </summary>

        /// <param name="device">设备回路</param>

        /// <param name="functionType">功能类型</param>

        /// <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 (result.ErrorMsg != null || result.ErrorMsgDiv == 0)

            {

                return false;

            }

            var resultData = Newtonsoft.Json.Linq.JObject.Parse(result.ReceiptData);

            if (resultData.Property("Result") != null)

            {

                //0:修改成功 1:修改失败

                return resultData["Result"].ToString() == "0";

            }

            return false;

        }



        #endregion



        #region ■ 获取设备名称_______________________



        /// <summary>

@@ -1182,7 +1265,9 @@
            }



            if (device.Type == DeviceType.OnOffOutput

                || device.Type == DeviceType.DimmableLight || device.Type == DeviceType.ColorDimmableLight)

                || device.Type == DeviceType.DimmableLight 
                || device.Type == DeviceType.ColorDimmableLight

                || device.Type == DeviceType.ColorTemperatureLight)

            {

                //继电器,掉光器都叫回路

                return Language.StringByID(R.MyInternationalizationString.uDeviceCircuit) + epointNo;

@@ -1191,17 +1276,7 @@
            {

                //空调都叫室内机

                return Language.StringByID(R.MyInternationalizationString.uIndoorUnit) + epointNo;

            }

            else if (device.Type == DeviceType.FreshAir)

            {

                //新风面板中的按键叫新风

                return Language.StringByID(R.MyInternationalizationString.FreshAir);

            }

            else if (device.Type == DeviceType.FreshAirHumiditySensor)

            {

                //新风面板湿度传感器

                return Language.StringByID(R.MyInternationalizationString.HumiditySensor);

            }

            }  


            //获取设备类型

            var deviceInfoType = this.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });

@@ -1218,12 +1293,19 @@
                    return Language.StringByID(R.MyInternationalizationString.uDeviceBelongId16) + epointNo;

                }

            }

            else if (device.Type == DeviceType.FreshAirHumiditySensor)

            {

                //新风面板/简约多功能/简约环境面板湿度传感器

                return Language.StringByID(deviceInfoType.DefultNameId) + Language.StringByID(R.MyInternationalizationString.HumiditySensor);

            }

            else if (device.Type == DeviceType.TemperatureSensor)

            {

                if (deviceInfoType.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir)

                if (deviceInfoType.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir

                    || deviceInfoType.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment

                    || deviceInfoType.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)

                {

                    //新风面板中的Thermostat为温度传感器

                    return Language.StringByID(R.MyInternationalizationString.TemperatureSensor);

                    //新风面板/简约多功能/简约环境面板 温度传感器

                    return Language.StringByID(deviceInfoType.DefultNameId) + Language.StringByID(R.MyInternationalizationString.TemperatureSensor);

                }

                else if (deviceInfoType.BeloneType == DeviceBeloneType.A按键面板)

                {

@@ -1246,6 +1328,11 @@
            if (string.IsNullOrEmpty(dName) == false)

            {

                return dName;

            }

            if (this.IsMiniLight(device) == true)

            {

                //Mini夜灯

                return Language.StringByID(R.MyInternationalizationString.uMiniNightLight);

            }



            //获取设备类型

@@ -1996,6 +2083,14 @@
                info.ConcreteType = DeviceConcreteType.Sensor_PMTwoPointFive;

                info.ObjectTypeNameId = 60000;//传感器

            }

            //16色温灯

            else if (dicType.ContainsKey(DeviceType.ColorTemperatureLight) == true)

            {

                info.ConcreteTextId = R.MyInternationalizationString.uDeviceModelId20000;

                info.BeloneType = DeviceBeloneType.A彩灯;

                info.ConcreteType = DeviceConcreteType.ColorLight_Temperature;

                info.ObjectTypeNameId = 60007;//调光模块

            }



            int value = (int)info.BeloneType;

            if (dicDeviceAllNameID.ContainsKey("uDeviceBelongId" + value) == true)

@@ -2380,7 +2475,8 @@
            if (i_device.Type == DeviceType.OnOffOutput || i_device.Type == DeviceType.AirSwitch)

            {

                //2020.03.23追加式样:未指定类型的继电器,不显示

                if (i_device.DfunctionType == DeviceFunctionType.A未定义)

                if (i_device.DfunctionType == DeviceFunctionType.A未定义

                    || i_device.DfunctionType == DeviceFunctionType.A不指定)

                {

                    return false;

                }

@@ -2403,6 +2499,11 @@
                    return false;

                }

            }

            else if (i_device.Type == DeviceType.FreshAirHumiditySensor)

            {

                //新风的湿度传感器不显示

                return false;

            }

            return true;

        }



@@ -2423,7 +2524,7 @@
        /// <returns></returns>

        public bool IsMiniLight(CommonDevice device)

        {

            return device.DeviceAddr == "3737363534333231";

            return device.DriveCode != 0 && device.Type == DeviceType.ColorTemperatureLight;

        }



        /// <summary>

@@ -2470,16 +2571,22 @@
        /// <returns></returns>

        public string AppendVersion(int versionValue)

        {

            //10101 3个byte  显示为：ver.1.01.01

            //中间那个byte为奇数时，代表是测试版本,在显示最新版本时,不需要显示，但是在历史版本那里可以显示

            //中间那个byte为偶数时, 代表是正式版本



            //直接是10进制

            string txt10 = Convert.ToString(versionValue).PadLeft(4, '0');

            //这个是小数点前面的值

            int value1 = Convert.ToInt32(txt10.Substring(0, txt10.Length - 2));

            //这个是小数点后面的值

            int value2 = Convert.ToInt32(txt10.Substring(txt10.Length - 2, 2));

            string txt10 = Convert.ToString(versionValue).PadLeft(6, '0');

            //这个是第一位

            int value1 = Convert.ToInt32(txt10.Substring(0, 2));

            //这个是第二位

            string value2 = txt10.Substring(2, 2);

            //这个是第三位

            string value3 = txt10.Substring(4, 2);



            //Ver.

            string ver = Language.StringByID(R.MyInternationalizationString.uVersionAbbreviation);

            return ver + value1 + "." + value2.ToString().PadLeft(2, '0');

            return ver + value1 + "." + value2 + "." + value3;

        }



        /// <summary>

@@ -2531,7 +2638,7 @@
                {

                    //不无视时间,返回本地设备列表

                    statu = 1;

                    return this.GetDeviceByGatewayID(HdlGatewayLogic.Current.GetGatewayId(zbGateway));

                    return this.GetDeviceByGatewayID(zbGateway.GwId);

                }

            }

            zbGateway.LastDateTime = DateTime.Now;

@@ -2555,7 +2662,7 @@
            //是否达成中断的时机

            bool canBreak = false;

            //网关ID

            string gatewayID = HdlGatewayLogic.Current.GetGatewayId(zbGateway);

            string gatewayID = zbGateway.GwId;

            //超时时间

            int TimeOut = 0;

            //设备总数

@@ -2692,7 +2799,7 @@
        /// <returns></returns>

        private CommonDevice NewDeviceObjectByDeviceId(DeviceType deviceType, Newtonsoft.Json.Linq.JObject jobject, ZbGateway zbGateway)

        {

            string gwId = HdlGatewayLogic.Current.GetGatewayId(zbGateway);

            string gwId = zbGateway.GwId;



            //根据设备类型创建设备对象的实例

            CommonDevice device = this.NewDeviceObjectByDeviceId(deviceType);

@@ -2784,11 +2891,15 @@
                if (mainDevice.IsCustomizeImage == false)

                {

                    mainDevice.IconPath = "Device/Light.png";

                    if (this.IsMiniLight(mainDevice) == true)

                    {

                        //mini夜灯

                        mainDevice.IconPath = "Device/MiniNightLight.png";

                    }

                }

            }

            //如果是色温灯

            else if (mainDevice.Type == DeviceType.ColorTemperatureLight)

            {

                mainDevice.DfunctionType = DeviceFunctionType.A灯光;

                if (mainDevice.IsCustomizeImage == false)

                {

                    mainDevice.IconPath = "Device/ColorLightTemperature.png";

                }

            }

            //如果是三路继电器的回路的话,默认为灯光

@@ -2844,10 +2955,13 @@
            //根据设备类型创建设备对象的实例

            if (deviceType == DeviceType.ColorDimmableLight) { device = new ColorDimmableLight(); }

            else if (deviceType == DeviceType.DimmableLight) { device = new DimmableLight(); }

            else if (deviceType == DeviceType.ColorDimmerSwitch) { device = new ColorDimmerSwitch(); }

            else if (deviceType == DeviceType.LevelControlSwitch) { device = new LevelControlSwitch(); }

            else if (deviceType == DeviceType.OnOffSwitch) { device = new Panel(); }

            else if (deviceType == DeviceType.OnOffOutput) { device = new ToggleLight(); }

            else if (deviceType == DeviceType.AirSwitch) { device = new AirSwitch(); }

            else if (deviceType == DeviceType.WindowCoveringDevice) { device = new Rollershade(); }

            else if (deviceType == DeviceType.WindowCoveringController) { device = new WindowCoveringController(); }

            else if (deviceType == DeviceType.IASZone) { device = new IASZone(); }

            else if (deviceType == DeviceType.Repeater) { device = new Repeater(); }

            else if (deviceType == DeviceType.Thermostat) { device = new AC(); }

@@ -2856,6 +2970,8 @@
            else if (deviceType == DeviceType.TemperatureSensor) { device = new TemperatureSensor(); }

            else if (deviceType == DeviceType.PMSensor) { device = new PMSensor(); }

            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.OtaDevice || deviceType == DeviceType.OtaPanelDevice) { device = new OTADevice(); }

            else { return null; }



@@ -2960,7 +3076,7 @@
            this.dicDeviceModelIdEnum["MSPIR01/M-ZB.10"] = "1303-1200-60000";//红外传感器

            this.dicDeviceModelIdEnum["MSW01/M-ZB.10"] = "1304-1200-60000";//水浸传感器

            this.dicDeviceModelIdEnum["MBU01/M-ZB.10"] = "1305-1200-60000";//紧急按键

            this.dicDeviceModelIdEnum["MGCD01/ZB.10"] = "1306-1200-60000";//吸顶燃气传感器

            this.dicDeviceModelIdEnum["MGCD01/M-ZB.10"] = "1306-1200-60000";//吸顶燃气传感器



            //PM2.5空气质量传感器 【该设备属于第三方设备，没有镜像ID】

            this.dicDeviceModelIdEnum["MSPM25/M-ZB.10"] = "1307-1200-60000";//PM2.5空气质量传感器 

@@ -3123,6 +3239,7 @@
        /// 简约环境面板

        /// </summary>

        ButtonPanel_SimpleEnvironment = 230,



        //=========★★PIR传感器类(1200-1299)★★=========

        /// <summary>

        /// 传感器

@@ -3231,6 +3348,10 @@
        /// 彩灯

        /// </summary>

        ColorLight = -10,

        /// <summary>

        /// 色温灯(它的镜像ID未定,暂定20000)

        /// </summary>

        ColorLight_Temperature = 20000,



        //=========★★空调(3600-3899)★★=========

        /// <summary>