Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google

wxr

2024-09-27 acc8caee31c4be90bd38d1af18136b0e84f6fe94

 HDL_ON/Entity/FunctionList.cs

@@ -111,7 +111,7 @@
        /// <returns></returns>
        public List<Function> GetAcstParentList()
        {
            return Functions.FindAll((obj) => obj.spk == SPK.AcstParent);//.OrderByDescending(o=>o.controlCounter).ToList()
            return Functions.FindAll((obj) => obj.spk == SPK.AcstParent);
        }

        /// <summary>
@@ -122,6 +122,28 @@
        public List<Function> GetAcstSubList()
        {
            return Functions.FindAll((obj) => obj.spk == SPK.AcstSub);
        }
        /// <summary>
        /// 绿建科技系统
        /// 热水器列表
        /// </summary>
        /// <returns></returns>
        public List<Function> GetWaterHeaterJinmaoList()
        {
            return Functions.FindAll((obj) => obj.spk == SPK.WaterHeaterJinmao);
        }
        /// <summary>
        /// 金茂光伏储能
        /// </summary>
        /// <returns></returns>
        public List<Function> GetInverterJinmaoList()
        {
            var tempList = Functions.FindAll((obj) => obj.spk == SPK.InverterJinmao);
            foreach(var device in tempList)
            {
                device.collect = true;
            }
            return tempList;
        }

        /// <summary>
@@ -143,6 +165,15 @@
            return Functions.FindAll((obj) => spkList.Contains(obj.spk));
        }
        /// <summary>
        /// 序列列表
        /// </summary>
        /// <returns></returns>
        public List<Function> GetSeries()
        {
            return Functions.FindAll((obj) => obj.spk == SPK.CommonSeries);
        }

        /// <summary>
        /// 窗帘列表
        /// </summary>
        public List<Function> GetCurtainList()
@@ -163,15 +194,6 @@
        public List<Function> GetDoorLockList()
        {
            var spkList = SPK.GetDoorLockSPKList();
            return Functions.FindAll((obj) => spkList.Contains(obj.spk));
        }
        /// <summary>
        /// 获取萤石视频门锁
        /// </summary>
        /// <returns></returns>
        public List<Function> GetVideoDoorLockList()
        {
            var spkList = SPK.GetVideoDoorLockSPKList();
            return Functions.FindAll((obj) => spkList.Contains(obj.spk));
        }

@@ -212,8 +234,8 @@
            var spkList = SPK.ElectricalSpkList();
            return Functions.FindAll((obj) => spkList.Contains(obj.spk));
        }
    
      


        /// <summary>
        /// 红外宝列表
        /// </summary>
@@ -221,7 +243,7 @@
        {
            return Functions.FindAll((obj) => obj.spk == SPK.IrModule);
        }
#endregion
        #endregion

        /// <summary>
        /// 音乐列表
@@ -263,6 +285,8 @@
                SPK.SensorSmoke,
                SPK.SensorWater,
                SPK.SensorGas,
                SPK.SensorDryContact,
                SPK.SensorDryContact2,
            };

            return Functions.FindAll((obj) => spkList.Contains(obj.spk));
@@ -283,7 +307,7 @@
        {
            get
            {
                if(_OtherBrandFunction == null)
                if (_OtherBrandFunction == null)
                {
                    _OtherBrandFunction = new List<Function>();
                    var spkList = SPK.GetAll3tySPK();
@@ -351,9 +375,9 @@
                    {
                        //检测重复
                        var same = Functions.FindAll((obj) => obj.deviceId == tempFunction.deviceId);
                        if(same!= null)
                        if (same != null)
                        {
                            foreach(var sameTemp in same)
                            foreach (var sameTemp in same)
                            {
                                Functions.Remove(sameTemp);
                            }
@@ -425,7 +449,7 @@
            {
            }
            else
            { 
            {
                switch (brandType)
                {
                    case SPK.BrandType.Hdl:
@@ -492,11 +516,11 @@
        /// <summary>
        /// 功能绑定房间
        /// </summary>
        public string FunctionsBindRooms(List<string> roomIds,List<string> deviceIds)
        public string FunctionsBindRooms(List<string> roomIds, List<string> deviceIds)
        {
            var pm = new HttpServerRequest();
            var pack = pm.BindDeviceToRoom(deviceIds, roomIds);
            if(pack.Code == StateCode.SUCCESS)
            if (pack.Code == StateCode.SUCCESS)
            {

            }
@@ -510,7 +534,7 @@
        /// <summary>
        /// 删除场景
        /// </summary>
        public void DeleteScene(Scene scene,bool upSevser)
        public void DeleteScene(Scene scene, bool upSevser)
        {
            if (upSevser)
            {
@@ -538,6 +562,10 @@
        /// </summary>
        public void DeleteFunction(Function delTemp)
        {
            if(delTemp == null)
            {
                return;
            }
            Functions.Remove(Functions.Find((obj) => obj.deviceId == delTemp.deviceId));
            FileUtlis.Files.DeleteFile(delTemp.savePath);
        }
@@ -577,14 +605,14 @@
        {
            if (lockReadFunctionStatus)
            {
                MainPage.Log($"多次进入--返回");
                MainPage.Log($"多次进入--返回1");
                return;
            }
            new Thread(() =>
            {
                if (lockReadFunctionStatus)
                {
                    MainPage.Log($"多次进入--返回");
                    MainPage.Log($"多次进入--返回2");
                    return;
                }
                MainPage.Log($"进入--读取");
@@ -593,7 +621,7 @@
                {
                    Read3tyFunctionStatus();

                    if(DriverLayer.Control.Ins.GatewayOnline_Local)
                    if (DriverLayer.Control.Ins.GatewayOnline_Local)
                    {

                        //List<Function> functions = GetDeviceFunctionList(SPK.BrandType.Hdl);
@@ -657,12 +685,12 @@
                    MainPage.Log($"结束--读取");
                }

                

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

#region 场景相关
        #region 场景相关
        /// <summary>
        /// 添加场景
        /// </summary>
@@ -694,10 +722,10 @@
            }
            return revPack.Code;
        }
#endregion
        #endregion

#region 收藏功能
     
        #region 收藏功能

        /// <summary>
        /// 收藏场景
        /// </summary>
@@ -722,14 +750,14 @@
            return result;
        }

#endregion
        #endregion


#region 
       
        #region 


#endregion

        #endregion
    }

}