合并了新代码

黄学彪

2019-12-12 7e863a33397f317ffc3ffd9288496d0e4f16aa66

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs

@@ -345,7 +345,6 @@
            var formTemp = UserCenterResourse.DicActionForm[formName];

            formTemp.CloseForm();

            UserCenterResourse.DicActionForm.Remove(formName);

            formTemp = null;



            return true;

        }

@@ -466,9 +465,7 @@
                //移除ID

                UserCenterResourse.listActionFormId.Remove(UserCenterResourse.DicActionForm[formName].FormID);

                //移除画面

                var formTemp = UserCenterResourse.DicActionForm[formName];

                UserCenterResourse.DicActionForm.Remove(formName);

                formTemp = null;

            }

        }



@@ -807,6 +804,8 @@
        {

            //APP缓存加载开始

            UserCenterResourse.Option.AppCanSignout = false;

            //还原远程连接变量

            ZigBee.Device.ZbGateway.AllowRemoteCtrl = true;



            //只有在住宅ID不一样的时候才做这个操作

            if (Common.Config.Instance.HomeId != UserCenterResourse.Option.OldHomeStringId