合并

wxr

2021-11-30 e75ccccb370b47305c6eadb321efb27c86cdd28b

 HDL_ON/Common/HDLCommon.cs

@@ -426,6 +426,10 @@
                    DB_ResidenceData.Instance.EixtAccount();
                    //4.注销HDLSIP账号登录 2021-08-20
                    HDLLinphone.Current.LogoutAllAccount();
#if __IOS__
                    //5.清空Siri共享数据信息
                    new Other.SkipControl().SetData(false, "", "", "","");
#endif
                }
                catch (Exception ex)
                {
@@ -483,6 +487,11 @@
                        }
                        MainPage.CurPageIndex = 9999;
                        MainPage.UserBasePage.ChooseCollection();
#if __IOS__
                        var sdm = new SiriKit.SceneDateManager();
                        sdm.RegionUrl = DB_ResidenceData.Instance.CurrentRegion.regionUrl;
                        sdm.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
#endif
                    }
                }
                //Dialog
@@ -522,9 +531,9 @@

        }

        #endregion
#endregion

        #region ■ 常用方法_______________________
#region ■ 常用方法_______________________
        /// <summary>
        /// 设置下划线按钮状态
        /// 统一封装设置方法
@@ -597,9 +606,9 @@
                Control.Ins.SearchLoaclGateway();
            }
        }
        #endregion
#endregion

        #region 跳转打开萤石云方法
#region 跳转打开萤石云方法

        /// <summary>
        /// 获取子账号token并跳转设备列表页面
@@ -701,6 +710,6 @@
            { IsBackground = true }.Start();
        }

        #endregion
#endregion
    }
}