请合并最新代码（优化设备不支持的功能）

xm

2019-12-20 3291885285dfd5d4f665c20676307878dc3163bc

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

old mode 100644
new mode 100755
@@ -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

@@ -1231,6 +1230,8 @@
        /// <returns></returns>

        public static string EncryptPassword(string keys, string strPsw)

        {

            try

            {

            if (strPsw == string.Empty)

            {

                return strPsw;

@@ -1248,7 +1249,9 @@
            {

                ret.AppendFormat("{0:X2}", b);

            }

            return ret.ToString();

                return ret.ToString().ToLower();

            }

            catch { return strPsw; }

        }



        /// <summary>

@@ -1257,6 +1260,8 @@
        /// <param name="strPsw"></param>

        /// <returns></returns>

        public static string DecryptPassword(string keys, string strPsw)

        {

            try

        {

            if (strPsw == string.Empty)

            {

@@ -1282,6 +1287,8 @@


            return System.Text.Encoding.Default.GetString(ms.ToArray());

        }

            catch { return strPsw; }

        }

        #endregion



        #region ■ 文件保存和读取_____________________