Merge branch 'NewFilePath' into CJL

JLChen

2021-02-05 0a8ec482a5ad10bf3cd7010c89630b42ecaca741

 HDL_ON/Entity/FunctionList.cs

old mode 100755
new mode 100644
@@ -75,12 +75,17 @@
                {

                    weepRobots = new List<WeepRobot>();

                }
                if(waterValveList == null)
                {
                    waterValveList = new List<Function>();
                }
                var list = new List<Function>();
                list.AddRange(fans);
                list.AddRange(switchSockets);
                list.AddRange(tVs);

                list.AddRange(airCleaners);

                list.AddRange(weepRobots);
                list.AddRange(waterValveList);
                return list;
            }
        }
@@ -104,6 +109,10 @@
        /// 扫地机器人列表
        /// </summary>
        public List<WeepRobot> weepRobots = new List<WeepRobot>();
        /// <summary>
        /// 水阀列表
        /// </summary>
        public List<Function> waterValveList = new List<Function>();

        #endregion
        /// <summary>
@@ -140,6 +149,7 @@
        /// <param name="filePath"></param>
        public void IniFunctionList(string filePath)
        {
            // todo 增加设备，增加功能进功能列表
            if (filePath.StartsWith("FunctionData_"))
            {
                var functionDataBytes = Common.FileUtlis.Files.ReadFile(filePath);
@@ -224,6 +234,11 @@
                            List.weepRobots.Add(tuyaWeepRobot);
                            deviceFunctionList.Add(tuyaWeepRobot);
                            break;
                        case SPK.ElectricTuyaWaterValve:
                            var tuyaWaterValve = Newtonsoft.Json.JsonConvert.DeserializeObject<Function>(functionDataString);
                            List.waterValveList.Add(tuyaWaterValve);
                            deviceFunctionList.Add(tuyaWaterValve);
                            break;
                        case SPK.SensorSmoke:
                        case SPK.SensorWater:
                        case SPK.SensorGas:
@@ -246,7 +261,7 @@
        /// <summary>
        /// 获取设备功能列表
        /// </summary>
        public List<Function> GetDeviceFunctionList()
        public List<Function> GetDeviceFunctionList(SPK.BrandType brandType = SPK.BrandType.All)
        {
            if (deviceFunctionList == null || deviceFunctionList.Count == 0)
            {
@@ -259,17 +274,50 @@
                deviceFunctionList.AddRange(sensorsEnvironmentalScience);
                deviceFunctionList.AddRange(sensorsArm);
                deviceFunctionList.AddRange(UI.Music.A31MusicModel.A31MusicModelList);
                try
                {
                    deviceFunctionList = deviceFunctionList.OrderByDescending(o => o.controlCounter).ToList();
                }
                catch (Exception ex)
                {
                    MainPage.Log($"设备功能排序异常：{ex.Message}");
                }
            }
            try

            List<Function> resultFunctions = new List<Function>();
            if (brandType == SPK.BrandType.All)
            {
                deviceFunctionList = deviceFunctionList.OrderByDescending(o => o.controlCounter).ToList();
            }
            catch (Exception ex)
            {
                MainPage.Log($"设备功能排序异常：{ex.Message}");
            else
            { 
                switch (brandType)
                {
                    case SPK.BrandType.Hdl:
                        foreach (var function in deviceFunctionList)
                        {
                            if (!SPK.Get3tySpk(SPK.BrandType.All3tyBrand).Contains(function.spk))
                            {
                                resultFunctions.Add(function);
                            }
                        }
                        break;

                    case SPK.BrandType.Tuya:
                        foreach (var function in deviceFunctionList)
                        {
                            if (SPK.Get3tySpk(SPK.BrandType.Tuya).Contains(function.spk))
                            {
                                resultFunctions.Add(function);
                            }
                        }
                        break;
                }
                return resultFunctions;
            }

            return deviceFunctionList;
        }

        /// <summary>
        /// 清空设备功能列表
        /// </summary>
@@ -517,6 +565,33 @@
        }

        bool lockReadFunctionStatus = false;

        /// <summary>
        /// 读取第三方设备状态
        /// </summary>
        public void Read3tyFunctionStatus()
        {
            //读取涂鸦设备状态
            if (GetDeviceFunctionList(SPK.BrandType.Tuya).Count > 0)
            {
                var page = new List<string>();
                int count = 0;
                foreach (var function in GetDeviceFunctionList(SPK.BrandType.Tuya))
                {
                    page.Add(function.deviceId);
                    count++;
                    if (count > 9)
                    {
                        DriverLayer.Control.Ins.ReadFunctionsInfo(page);
                        page.Clear();
                        count = 0;
                    }
                }
                DriverLayer.Control.Ins.ReadFunctionsInfo(page);
            }

        }

        /// <summary>
        /// 读取全部功能的状态
        /// </summary>
@@ -538,12 +613,14 @@
                lockReadFunctionStatus = true;
                try
                {
                    Read3tyFunctionStatus();

                    if (DriverLayer.Control.Ins.IsRemote)
                    {
                        var page = new List<string>();
                        int count = 0;

                        foreach (var function in GetDeviceFunctionList())
                        foreach (var function in GetDeviceFunctionList(SPK.BrandType.Hdl))
                        {
                            page.Add(function.deviceId);
                            count++;
@@ -558,7 +635,7 @@
                    }
                    else
                    {
                        foreach (var function in GetDeviceFunctionList())
                        foreach (var function in GetDeviceFunctionList(SPK.BrandType.Hdl))
                        {
                            switch (function.Spk_Prefix)
                            {
@@ -582,6 +659,8 @@
                    lockReadFunctionStatus = false;
                    MainPage.Log($"结束--读取");
                }

                
            })
            { IsBackground = true }.Start();
        }