2020-01-16 Version 2.50115-B3 1.优化MQTT连接。 2.增加本地通信加密。 3.增加配置网关提示语。 4.编辑定时器增...

JLChen

2020-01-16 8edf8fd9f5f7c29cc6302a8d46de06d391ed3657

 Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs

@@ -74,12 +74,14 @@
                TextAlignment = TextAlignment.CenterLeft,
                Radius = (uint)Application.GetRealHeight (0),
                TextColor = SkinStyle.Current.TextColor1,
                //Text = account,
#if DEBUG
                Text = "18926269190@189.cn"
                //Text = "721343314@qq.com"
#endif
                Text = account,

            };
#if DEBUG
            //Text = "18926269190@189.cn"
            etAccount.Text = "721343314@qq.com";
#endif

            accountView.AddChidren (etAccount);

            var userConfigBytes = IO.FileUtils.ReadFile ("AccountListDB");
@@ -93,6 +95,13 @@
            }
            var accountList = accountListDB.account;

            //自动填写账号
            if (string.IsNullOrEmpty (account)) {
                if (accountList.Count > 0) {
                    etAccount.Text = accountList [accountList.Count - 1];
                }

            }
            var accountListView = new VerticalScrolViewLayout () {
                Width = Application.GetRealWidth (500),
                Height = Application.GetRealHeight (85 * 2),
@@ -119,11 +128,12 @@
                TextAlignment = TextAlignment.CenterLeft,
                SecureTextEntry = true,
                TextColor = SkinStyle.Current.TextColor1,
#if DEBUG
                Text = "123456"
#endif
                //Text = password,

                Text = password,
            };
#if DEBUG
            etPasswrod.Text = "123456";
#endif
            passwrodView.AddChidren (etPasswrod);

            Button btnShowPassword = new Button () {
@@ -131,8 +141,8 @@
                Y = etPasswrod.Y + Application.GetRealHeight (12),
                Width = Application.GetRealWidth (73),
                Height = Application.GetRealHeight (60),
                UnSelectedImagePath = "CrabtreeAdd/ShowPW.png",
                SelectedImagePath = "CrabtreeAdd/HidePW.png",
                UnSelectedImagePath = "CrabtreeAdd/HidePW.png",
                SelectedImagePath = "CrabtreeAdd/ShowPW.png", 
                BorderColor = SkinStyle.Current.Transparent,
                BorderWidth = 2,
                Radius = 1
@@ -156,6 +166,10 @@
                NigelLoginPass++;
            };
#endif
            //if (accountList.Count > 0) {
            //    etAccount.Text = accountList [accountList.Count-1];
            //}

            etAccount.EditorEnterAction += (obj) => {
                Application.HideSoftInput ();
                etPasswrod.Foucs = true;
@@ -419,10 +433,16 @@
            var revertObj = MainPage.RequestHttps (API.Login, requestJson);
            if (revertObj.StateCode.ToUpper() == "SUCCESS") {

                if (!accountListDB.account.Contains (account)) {
                    accountListDB.account.Add (account);
                    accountListDB.SaveAccountListDB ();
                //if (!accountListDB.account.Contains (account)) {
                //    accountListDB.account.Add (account);
                //    accountListDB.SaveAccountListDB ();
                //}

                if (accountListDB.account.Contains (account)) {
                    accountListDB.account.Remove (account);
                }
                accountListDB.account.Add (account);
                accountListDB.SaveAccountListDB ();

                var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes> (revertObj.ResponseData.ToString ());
                var revertData = responseDataObj;
@@ -455,6 +475,7 @@
                    //    //当住宅为空时先提示用户新建住宅
                    //} else {
                    var revertRoomData = mResidenceRes.PageData;
  
                    if (UserConfig.Instance.CurrentRegion == null) {
                        if (revertRoomData != null && revertRoomData.Count > 0) {
                            var bFind = false;
@@ -494,16 +515,10 @@
                        } else {
                            //刷新住宅 解决子账号问题
                            UserConfig.Instance.CurrentRegion = findRoom;

                            Room.InitAllRoom ();
                        }


                    }


                

                    ////原方案
                    //GetAllBindGatewarysPagger (revertRoomData);
                    ////获取当前住宅网关方案
@@ -580,6 +595,7 @@
        {
            UserConfig.Instance.SaveUserConfig ();
            MainPage.LoginUser.LastTime = DateTime.Now;
            //MainPage.IsOtherDevicesLogin = false;

            if (UserConfig.Instance.CheckHomeGatewaysNotEmpty ()) {
                UserConfig.Instance.HomeLists = revertRoomData;