Merge branch 'temp-wxr' into wxr4

wxr

2021-05-12 12aa9d6bed791095123108eae5eac33e7e3f72bf

Merge branch 'temp-wxr' into wxr4

 HDL_ON/Common/UserInfo.cs

@@ -135,22 +135,6 @@
            WirteUserinfo(Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this)));
        }

        ///// <summary>
        ///// 退出登录重置参数
        ///// </summary>
        //public void LogoutReset()
        //{
        //    userName = "";
        //    ID = "";
        //    LoginTokenString = "";
        //    RefreshToken = "";
        //    userType = "USER_C";
        //    LastTime = DateTime.MinValue;
        //    headImagePagePath = "LoginIcon/2.png";//重置用户头像
        //}

        //public string SetLanguage = "";

        /// <summary>
        /// 软件解锁界面
        /// 1:启动时

 HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs

@@ -98,7 +98,7 @@
                //        {
                //            d.Add("on_off", "on");
                //        }
                //            fff = !fff;
                //        fff = !fff;
                //        DriverLayer.Control.Ins.SendWriteCommand(function, d);
                //        //System.Threading.Thread.Sleep(100);
                //    }