代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

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

@@ -259,6 +259,11 @@
        /// <param name="pra">请求的参数</param>

        public static bool CheckNotEorrorMsg(ResponsePack revertObj, string RequestName, List<string> listNotShowError = null, object pra = null)

        {

            if (listNotShowError != null && listNotShowError.Contains("NotCheck") == true)

            {

                //不检测

                return true;

            }

            if (revertObj == null)

            {

                Application.RunOnMainThread(() =>

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

            formTemp.CloseForm();

            UserCenterResourse.DicActionForm.Remove(formName);

            formTemp = null;



            return true;

        }

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

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

                //移除画面

                var formTemp = UserCenterResourse.DicActionForm[formName];

                UserCenterResourse.DicActionForm.Remove(formName);

                formTemp = null;

            }

        }



@@ -615,8 +617,7 @@
            //关闭所有接收

            HdlGatewayReceiveLogic.Current.RemoveAllEvent();

            //清除升级列表

            FirmwareUpdateResourse.dicDeviceUpdateList.Clear();

            FirmwareUpdateResourse.dicGatewayUpdateList.Clear();

            FirmwareUpdateResourse.dicUpdateList.Clear();



            HdlThreadLogic.Current.RunThread(async () =>

            {

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

            //APP缓存加载开始

            UserCenterResourse.Option.AppCanSignout = false;

            //还原远程连接变量

            ZigBee.Device.ZbGateway.AllowRemoteCtrl = true;



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

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

@@ -815,7 +818,7 @@
                try

                {

                    //断开远程Mqtt连接

                    ZigBee.Device.ZbGateway.DisConnectRemoteMqttClient();

                    await ZigBee.Device.ZbGateway.DisConnectRemoteMqttClient();

                }

                catch { }



@@ -872,9 +875,6 @@
                    //同步云端的网关id，如果本地拥有云端不存在的id，则表示应该被换绑了，直接删除

                    HdlGatewayLogic.Current.SynchronizeDbGateway();

                }



                //初始化住宅对象

                Common.Config.Instance.Home = House.GetHouseByHouseId(Common.Config.Instance.HomeId);



                //初始化房间(郭雪城那边不做处理,需要这里特殊执行一步)

                Room.RefreshAllRoomByLocation();

@@ -1231,24 +1231,28 @@
        /// <returns></returns>

        public static string EncryptPassword(string keys, string strPsw)

        {

            if (strPsw == string.Empty)

            try

            {

                return strPsw;

                if (strPsw == string.Empty)

                {

                    return strPsw;

                }

                var des = new System.Security.Cryptography.DESCryptoServiceProvider();

                byte[] inputByteArray = Encoding.Default.GetBytes(strPsw);

                des.Key = ASCIIEncoding.ASCII.GetBytes(keys);

                des.IV = ASCIIEncoding.ASCII.GetBytes(keys);

                var ms = new System.IO.MemoryStream();

                var cs = new System.Security.Cryptography.CryptoStream(ms, des.CreateEncryptor(), System.Security.Cryptography.CryptoStreamMode.Write);

                cs.Write(inputByteArray, 0, inputByteArray.Length);

                cs.FlushFinalBlock();

                StringBuilder ret = new StringBuilder();

                foreach (byte b in ms.ToArray())

                {

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

                }

                return ret.ToString().ToLower();

            }

            var des = new System.Security.Cryptography.DESCryptoServiceProvider();

            byte[] inputByteArray = Encoding.Default.GetBytes(strPsw);

            des.Key = ASCIIEncoding.ASCII.GetBytes(keys);

            des.IV = ASCIIEncoding.ASCII.GetBytes(keys);

            var ms = new System.IO.MemoryStream();

            var cs = new System.Security.Cryptography.CryptoStream(ms, des.CreateEncryptor(), System.Security.Cryptography.CryptoStreamMode.Write);

            cs.Write(inputByteArray, 0, inputByteArray.Length);

            cs.FlushFinalBlock();

            StringBuilder ret = new StringBuilder();

            foreach (byte b in ms.ToArray())

            {

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

            }

            return ret.ToString();

            catch { return strPsw; }

        }



        /// <summary>

@@ -1258,29 +1262,33 @@
        /// <returns></returns>

        public static string DecryptPassword(string keys, string strPsw)

        {

            if (strPsw == string.Empty)

            try

            {

                return strPsw;

                if (strPsw == string.Empty)

                {

                    return strPsw;

                }

                var des = new System.Security.Cryptography.DESCryptoServiceProvider();



                byte[] inputByteArray = new byte[strPsw.Length / 2];

                for (int x = 0; x < strPsw.Length / 2; x++)

                {

                    int i = (Convert.ToInt32(strPsw.Substring(x * 2, 2), 16));

                    inputByteArray[x] = (byte)i;

                }



                des.Key = ASCIIEncoding.ASCII.GetBytes(keys);

                des.IV = ASCIIEncoding.ASCII.GetBytes(keys);

                var ms = new System.IO.MemoryStream();

                var cs = new System.Security.Cryptography.CryptoStream(ms, des.CreateDecryptor(), System.Security.Cryptography.CryptoStreamMode.Write);

                cs.Write(inputByteArray, 0, inputByteArray.Length);

                cs.FlushFinalBlock();



                StringBuilder ret = new StringBuilder();



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

            }

            var des = new System.Security.Cryptography.DESCryptoServiceProvider();



            byte[] inputByteArray = new byte[strPsw.Length / 2];

            for (int x = 0; x < strPsw.Length / 2; x++)

            {

                int i = (Convert.ToInt32(strPsw.Substring(x * 2, 2), 16));

                inputByteArray[x] = (byte)i;

            }



            des.Key = ASCIIEncoding.ASCII.GetBytes(keys);

            des.IV = ASCIIEncoding.ASCII.GetBytes(keys);

            var ms = new System.IO.MemoryStream();

            var cs = new System.Security.Cryptography.CryptoStream(ms, des.CreateDecryptor(), System.Security.Cryptography.CryptoStreamMode.Write);

            cs.Write(inputByteArray, 0, inputByteArray.Length);

            cs.FlushFinalBlock();



            StringBuilder ret = new StringBuilder();



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

            catch { return strPsw; }

        }

        #endregion