20201223-99

wei

2020-12-23 271faaf6664166dc368639b9f2e577f63f901be5

 HDL_ON/Common/ApiUtlis.cs

@@ -19,7 +19,7 @@
        {
            get
            {
                if(apiUtlis == null)
                if (apiUtlis == null)
                {
                    apiUtlis = new ApiUtlis();
                }
@@ -33,7 +33,7 @@
        {
            get
            {
                if(httpRequest == null)
                if (httpRequest == null)
                {
                    httpRequest = new HttpServerRequest();
                }
@@ -47,7 +47,7 @@
        {
            bool result = DB_ResidenceData.Instance.HomeGateway.gatewayStatus;

            if(!result)
            if (!result)
            {

            }
@@ -131,9 +131,12 @@
                    {
                        MainPage.Log($"读取房间信息成功");
                        var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<SpatialApiPack>(roomResult.Data.ToString());
                        if (revData != null)
                        if (revData == null)
                        {
                            SpatialInfo.CurrentSpatial.UpdateSpatialList(revData.list, OptionType.Cover);
                            revData = new SpatialApiPack();
                        }
                        {
                            SpatialInfo.CurrentSpatial.UpdateSpatialList(revData.list);
                        }
                    }
                    else
@@ -146,7 +149,10 @@
                    {
                        MainPage.Log($"读取设备信息成功");
                        var deviceList = Newtonsoft.Json.JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString());
                        if (deviceList != null)
                        if (deviceList == null)
                        {
                            deviceList = new DevcieApiPack();
                        }
                        {
                            if (FunctionList.List.GetDeviceFunctionList().Count > 0)
                            {
@@ -169,12 +175,13 @@
                                        i++;
                                        if (localFunction.modifyTime != newFunction.modifyTime)
                                        {
                                            //可优化
                                            localFunction.name = newFunction.name;
                                            localFunction.collect = newFunction.collect;
                                            localFunction.modifyTime = newFunction.modifyTime;
                                            localFunction.roomIds = newFunction.roomIds;
                                            localFunction.bus = newFunction.bus;
                                            localFunction.SaveFunctionData(false);
                                            localFunction.SaveFunctionFile();
                                        }
                                        deviceList.list.Remove(newFunction);//操作完的数据清理掉，剩下的就是新增的功能
                                    }
@@ -183,7 +190,7 @@
                            //处理剩下的新增功能
                            foreach (var newFunction in deviceList.list)
                            {
                                newFunction.SaveFunctionData(false);
                                newFunction.SaveFunctionFile();
                                FunctionList.List.IniFunctionList(newFunction.savePath);
                            }
                        }
@@ -199,7 +206,10 @@
                    {
                        MainPage.Log($"读取场景数据成功");
                        var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(pack.Data.ToString());
                        if (sceneList != null)
                        if (sceneList == null)
                        {
                            sceneList = new List<Scene>();
                        }
                        {
                            for (int i = 0; i < FunctionList.List.scenes.Count;)
                            {
@@ -305,4 +315,4 @@
            { IsBackground = true }.Start();
        }
    }
}
}