20201211

wei

2020-12-11 488efb508eb0648773fe7b68e810e04bcd7ca075

 HDL_ON/Entity/DB_ResidenceData.cs

@@ -29,14 +29,14 @@
                }
                else
                {
                    var curRegion = UserInfo.Current.regionList.Find((obj) => obj.RegionID == CurReginID);
                    var curRegion = UserInfo.Current.regionList.Find((obj) => obj.RegionID == UserInfo.Current.CurReginID);
                    if (curRegion == null)
                    {
                        if (UserInfo.Current.regionList != null && UserInfo.Current.regionList.Count > 0)
                        {
                            CurReginID = UserInfo.Current.regionList[0].RegionID;
                            UserInfo.Current.CurReginID = UserInfo.Current.regionList[0].RegionID;
                            //恢复备份
                            HDLCommon.Current.RestoreHomeBackup(CurReginID);
                            //HDLCommon.Current.RestoreHomeBackup(CurReginID);

                            return UserInfo.Current.regionList[0];
                        }
@@ -45,12 +45,6 @@
                            return new RegionInfoRes();
                        }
                    }

                    //if (curRegion == null)
                    //{
                    //    CurReginID =  UserInfo.Current.regionList[0].RegionID;
                    //    return  UserInfo.Current.regionList[0];
                    //}
                    return curRegion;
                }
            }
@@ -87,10 +81,6 @@
        //    }
        //}
        /// <summary>
        /// 当前选择的住宅索引
        /// </summary>
        public string CurReginID = "";
        /// <summary>
        /// 功能类型列表
        /// </summary>
        public List<ShowFunction> functionTypeList = new List<ShowFunction>();
@@ -104,7 +94,7 @@
                {
                    try
                    {
                        var residenceDataBytes = FileUtils.ReadFile("DB_ResidenceData");
                        var residenceDataBytes = Common.FileUtlis.Files.ReadFile("DB_ResidenceData");
                        var userConfigString = System.Text.Encoding.UTF8.GetString(residenceDataBytes);
                        DB_ResidenceData temp = null;

@@ -133,27 +123,6 @@
                                });
                            instance.SaveResidenceData();
                        }

                        new Light()
                        {
                            sid = "030101123456780202010005ABCD",
                            name = "灯光1",
                            attributes = new List<FunctionAttributes>() {
                                        new FunctionAttributes { key="on_off", max=100,min = 0, value= new List<string> { "on","off"} },
                                        },
                            roomIds = new List<string>() { "0001" },
                            bus_Data = new BusData
                            {
                                addresses = "2A06",
                                loopId = 1,
                            },
                        }.SaveFunctionData();


                       
                       


                    }
                    catch (Exception ex)
                    {
@@ -176,6 +145,7 @@
            Rooms = null;
            ins_OidList = null;
            functionList = null;
            HomeGateway = null;
            if (MainPage.IsRemote)
            {
                DAL.Mqtt.MqttClient.DisConnectRemote("退出登录，或者切换住宅");
@@ -272,7 +242,7 @@
            if (this == null || this.residecenInfo == null)
                return;
            var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
            FileUtils.WriteFileByBytes("DB_ResidenceData", ssd);
            Common.FileUtlis.Files.WriteFileByBytes("DB_ResidenceData", ssd);
            MainPage.Log("Save DB_ResidenceData");
        }

@@ -304,42 +274,6 @@
            }
        }

        /// <summary>
        /// 刷新住宅里面的搜索设备状态
        /// </summary>
        public void RefreshResidenceFunctionStatus()
        {
            new Thread(() =>
            {
                try
                {
                    foreach (var function in functionList.GetAllDeviceFunctionList())
                    {
                        Thread.Sleep(100);
                        switch (function.functionCategory)
                        {
                            case FunctionCategory.Light:
                            case FunctionCategory.Electrical:
                            case FunctionCategory.SwitchDevice:
                            case FunctionCategory.Curtain:
                            case FunctionCategory.Thermostat:
                                if (DB_ResidenceData.residenceData.GatewayType == 0)
                                {
                                    DriverLayer.Control.Ins.SendReadCommand(function);
                                }
                                break;
                        }
                    }
                }
                catch (Exception ex)
                {
                    MainPage.Log($"Refresh Residence Function Status Error : {ex.Message}");
                }
            })
            { IsBackground = true }.Start();
        }


        #endregion

        #region oid列表 a协议转bus协议控制使用
@@ -355,7 +289,7 @@
            {
                if (ins_OidList == null)
                {
                    var bytes = FileUtils.ReadFile(OidSavePathName);
                    var bytes = Common.FileUtlis.Files.ReadFile(OidSavePathName);
                    if (bytes == null || bytes.Length == 0)
                    {
                        ins_OidList = new List<FunctionOid>();
@@ -391,7 +325,7 @@
        {
            var oidBytes = System.Text.Encoding.UTF8.GetBytes(oidJsonString);

            FileUtils.WriteFileByBytes(OidSavePathName, oidBytes);
            Common.FileUtlis.Files.WriteFileByBytes(OidSavePathName, oidBytes);
        }

        #endregion