Merge branch 'feature/v2.5_极光推送' into feature/V2.6.0_google

wxr

2024-09-11 a3dfbcd5218270f9a75e6e32807b08215270b657

 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>
@@ -209,11 +231,11 @@
        /// </summary>
        public List<Function> GetElectricals()
        {
        var spkList = SPK.ElectricalSpkList();
            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>
        /// 音乐列表
@@ -285,7 +307,7 @@
        {
            get
            {
                if(_OtherBrandFunction == null)
                if (_OtherBrandFunction == null)
                {
                    _OtherBrandFunction = new List<Function>();
                    var spkList = SPK.GetAll3tySPK();
@@ -353,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);
                            }
@@ -427,7 +449,7 @@
            {
            }
            else
            { 
            {
                switch (brandType)
                {
                    case SPK.BrandType.Hdl:
@@ -494,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)
            {

            }
@@ -512,7 +534,7 @@
        /// <summary>
        /// 删除场景
        /// </summary>
        public void DeleteScene(Scene scene,bool upSevser)
        public void DeleteScene(Scene scene, bool upSevser)
        {
            if (upSevser)
            {
@@ -599,7 +621,7 @@
                {
                    Read3tyFunctionStatus();

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

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

                

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

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

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

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

#endregion
        #endregion


#region 
       
        #region 


#endregion

        #endregion
    }

}