1

wxr

2020-12-15 1ecba3f7432912d4eb7637355f4dfae676059e00

 HDL_ON/DAL/Server/HttpServerRequest.cs

@@ -491,31 +491,44 @@
                        };
                        UserInfo.Current.regionList.Add(home);
                    }
                    //住宅被删除
                    var findHome = UserInfo.Current.regionList.Find((obj) => obj.RegionID == DB_ResidenceData.Instance.CurrentRegion.RegionID);
                    if (findHome == null)
                    {
                        Shared.Application.RunOnMainThread(() =>
                        {
                            DB_ResidenceData.Instance.SetCurrentRegion(0);
                            GetHomeGatewayList();
                            DB_ResidenceData.Instance.SaveResidenceData();
                            UserInfo.Current.SaveUserInfo();
                            Action action = () =>
                            {
                                MainPage.GoUserPage();
                            };
                            new UI.PublicAssmebly().TipMsg(StringId.Tip, StringId.ResidenceDeletedSwitchToAnotherResidence, action);
                        });
                    }
                    else
                    //-------如果账号是首次登录
                    if (DB_ResidenceData.Instance.CurrentRegion == null || string.IsNullOrEmpty(DB_ResidenceData.Instance.CurrentRegion.RegionID))
                    {
                        //刷新当前住宅
                        DB_ResidenceData.Instance.CurrentRegion = findHome;
                        DB_ResidenceData.Instance.CurrentRegion = UserInfo.Current.regionList[0];
                        DB_ResidenceData.Instance.SaveResidenceData();
                        UserInfo.Current.SaveUserInfo();
                        //刷新一次住宅网关
                        GetHomeGatewayList();
                    }
                    else
                    {
                        //住宅被删除
                        var findHome = UserInfo.Current.regionList.Find((obj) => obj.RegionID == DB_ResidenceData.Instance.CurrentRegion.RegionID);
                        if (findHome == null)
                        {
                            Shared.Application.RunOnMainThread(() =>
                            {
                                DB_ResidenceData.Instance.CurrentRegion = UserInfo.Current.regionList[0];
                                GetHomeGatewayList();
                                DB_ResidenceData.Instance.SaveResidenceData();
                                UserInfo.Current.SaveUserInfo();
                                Action action = () =>
                                {
                                    MainPage.GoUserPage();
                                };
                                new UI.PublicAssmebly().TipMsg(StringId.Tip, StringId.ResidenceDeletedSwitchToAnotherResidence, action);
                            });
                        }
                        else
                        {
                            //刷新当前住宅
                            DB_ResidenceData.Instance.CurrentRegion = findHome;
                            DB_ResidenceData.Instance.SaveResidenceData();
                            UserInfo.Current.SaveUserInfo();
                            //刷新一次住宅网关
                            GetHomeGatewayList();
                        }
                    }
                }
            }
@@ -572,8 +585,12 @@
                                DB_ResidenceData.Instance.HomeGateway = mHomeGatewayRes[0];
                                if(mHomeGatewayRes[0].gatewayStatus == "ON_LINE")
                                {
                                    DriverLayer.Control.Ins.IsRemote = true;
                                    //DriverLayer.Control.Ins.IsRemote = true;
                                    DriverLayer.Control.Ins.GatewayOnline = true;
                                }
                                else
                                {
                                    DriverLayer.Control.Ins.GatewayOnline = false;
                                }
                                DB_ResidenceData.Instance.SaveResidenceData();
                                return;
@@ -1900,7 +1917,7 @@
            d.Add("userSceneIds",new List<string>() { seceneId });

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetSecneList, requestJson);
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetSecneInfo, requestJson);
        }
        /// <summary>
        /// 添加场景