Merge branch 'Dev-Branch'

wxr

2023-06-06 592974441a4df95fffd9167c90192da1a390b1c2

 HDL_ON/Entity/FunctionList.cs

@@ -14,19 +14,20 @@
    {
        static FunctionList _FunctionList;

        public static void ClearData()
        {
            try
            {
                _FunctionList.Clear();
                _FunctionList = null;
            }
            catch (Exception ex)
            {
                MainPage.Log($"清理FunctionList异常:{ex.Message}");
                _FunctionList = null;
            }
        }
        //public static void ClearData()
        //{
        //    try
        //    {
        //        _FunctionList._IpCamImou = null;
        //        _FunctionList.ClearDatas();
        //        _FunctionList = null;
        //    }
        //    catch (Exception ex)
        //    {
        //        MainPage.Log($"清理FunctionList异常:{ex.Message}");
        //        _FunctionList = null;
        //    }
        //}

        public static FunctionList List
        {
@@ -55,6 +56,12 @@
        /// </summary>
        public List<Function> Functions = new List<Function>();
        /// <summary>
        /// 群控列表
        /// </summary>
        public List<GroupControl> groupControls = new List<GroupControl>();


        /// <summary>
        /// 机械臂列表
        /// </summary>
        /// <returns></returns>
@@ -75,7 +82,23 @@
                _IpCamImou = Functions.FindAll((obj) => obj.spk == SPK.IpCam_Imou);
                if (_IpCamImou.Count > 0)
                {
#if __IOS__
                    //初始化大华摄像头sdk
                    Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().InitSDKWithAppKey("HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", OnAppConfig.Instance.RequestHttpsHost);
                    Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().AccessToken = UserInfo.Current.LoginTokenString;
                    Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().RefreshToken = UserInfo.Current.RefreshToken;
                    Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
                    Console.WriteLine("token：" + UserInfo.Current.LoginTokenString);
                    Console.WriteLine("token：" + UserInfo.Current.RefreshToken);
                    Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().RefreshDeviceList();



#else
                    Com.Utils.HdlToLcUtils.Instance.InitData(Shared.Application.Activity, "HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", OnAppConfig.Instance.RequestHttpsHost);
                    Com.Utils.HdlToLcUtils.Instance.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
                    Com.Utils.HdlToLcUtils.Instance.Token = UserInfo.Current.AccessToken;
#endif
                }
            }
            return _IpCamImou;
@@ -88,7 +111,7 @@
        /// <returns></returns>
        public List<Function> GetAcstParentList()
        {
            return Functions.FindAll((obj) => obj.spk == SPK.AcstParent);
            return Functions.FindAll((obj) => obj.spk == SPK.AcstParent);//.OrderByDescending(o=>o.controlCounter).ToList()
        }

        /// <summary>
@@ -142,6 +165,15 @@
            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));
        }

        /// <summary>
        /// 新风列表
@@ -169,15 +201,7 @@
        /// </summary>
        public List<Function> InverterList()
        {
            //get
            //{
            //    return _inverterList;
            //}
            //set
            //{
            //    _inverterList = value;
            //}
            return Functions.FindAll((obj) => obj.spk == SPK.Inverter);
            return Functions.FindAll((obj) => obj.spk == SPK.Inverter || obj.spk == SPK.InverterRst);
        }
        #region 家电列表 electricals
        /// <summary>
@@ -197,7 +221,7 @@
        {
            return Functions.FindAll((obj) => obj.spk == SPK.IrModule);
        }
        #endregion
#endregion

        /// <summary>
        /// 音乐列表
@@ -234,6 +258,7 @@
            var spkList = new List<string>()
            {
                SPK.SensorPir,
                SPK.SensorPirHold,
                SPK.SensorDoorWindow,
                SPK.SensorSmoke,
                SPK.SensorWater,
@@ -325,16 +350,24 @@
                    if (checkRepeat == true)
                    {
                        //检测重复
                        for (int i = 0; i < Functions.Count; i++)
                        var same = Functions.FindAll((obj) => obj.deviceId == tempFunction.deviceId);
                        if(same!= null)
                        {
                            if (Functions[i].deviceId == tempFunction.deviceId)
                            foreach(var sameTemp in same)
                            {
                                //先移除掉再加
                                Functions.RemoveAt(i);
                                Functions.Add(tempFunction);
                                return;
                                Functions.Remove(sameTemp);
                            }
                        }
                        //for (int i = 0; i < Functions.Count; i++)
                        //{
                        //    if (Functions[i].deviceId == tempFunction.deviceId)
                        //    {
                        //        //先移除掉再加
                        //        Functions.RemoveAt(i);
                        //        Functions.Add(tempFunction);
                        //        return;
                        //    }
                        //}
                    }
                    Functions.Add(tempFunction);
                }
@@ -352,7 +385,7 @@
                    var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<SecurityAlarm>(dataString);
                    if (temp == null)
                    {
                        MainPage.Log("null");
                        MainPage.Log("SecurityData_null");
                        FileUtlis.Files.DeleteFile(filePath);
                        return;
                    }
@@ -438,14 +471,16 @@
        /// <summary>
        /// 清空设备功能列表
        /// </summary>
        public void Clear()
        public void ClearDatas()
        {
            try
            {
                _IpCamImou.Clear();
                _IpCamImou = null;
                _FunctionList.Clear();
                _FunctionList = null;
                if (_IpCamImou != null)
                {
                    _IpCamImou.Clear();
                    _IpCamImou = null;
                }
                _FunctionList = new FunctionList();
            }
            catch (Exception ex)
            {
@@ -627,7 +662,7 @@
            { IsBackground = true }.Start();
        }

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

        #region 收藏功能
#region 收藏功能
     
        /// <summary>
        /// 收藏场景
@@ -687,14 +722,14 @@
            return result;
        }

        #endregion 
#endregion


        #region 
#region 
       


        #endregion
#endregion
    }

}