2019.12.9

gxc

2019-12-09 9f1d51429ec86d618bcdb75aee505a57ae94db30

2019.12.9

 ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml

@@ -2,45 +2,34 @@
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.M7BBB18B19152766" />
  <MonoDevelop.Ide.ItemProperties.GateWay.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.8c0bdb303f25d82c2a42fb8bfca449bfaca00260" />
  <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Account/PhoneEmailForm.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Common/Room.cs">
    <Files>
      <File FileName="Shared/Common/CommonPage.cs" Line="163" Column="30" />
      <File FileName="Shared/Phone/UserCenter/CommonBase/Logic/HdlCheckLogic.cs" Line="88" Column="39" />
      <File FileName="Shared/Phone/Device/Account/AccountLogic.cs" Line="65" Column="38" />
      <File FileName="Shared/Phone/UserView/UserHomeView.cs" />
      <File FileName="Shared/Phone/Device/CommonForm/SceneMainView.cs" />
      <File FileName="Shared/R.cs" />
      <File FileName="GateWay.Droid/Assets/Language.ini" />
      <File FileName="Shared/Phone/Device/Account/AccountLogin.cs" Line="757" Column="13" />
      <File FileName="Shared/Phone/Device/Account/AccountLoginByCode.cs" Line="547" Column="10" />
      <File FileName="Shared/Phone/Device/Account/AccountRegister.cs" Line="17" Column="23" />
      <File FileName="Shared/Phone/Device/Account/PhoneEmailForm.cs" Line="97" Column="18" />
      <File FileName="Shared/Phone/UserView/UserHomeView.cs" Line="654" Column="51" />
      <File FileName="Shared/R.cs" Line="667" Column="18" />
      <File FileName="GateWay.Droid/Assets/Language.ini" Line="632" Column="18" />
      <File FileName="Shared/Common/House.cs" Line="1" Column="1" />
      <File FileName="Shared/Common/Room.cs" Line="647" Column="26" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="GateWay" expanded="True">
            <Node name="GateWay.Droid" expanded="True">
              <Node name="Assets" expanded="True">
                <Node name="Phone" expanded="True">
                  <Node name="Scene" expanded="True" />
                </Node>
              </Node>
              <Node name="Assets" expanded="True" />
            </Node>
            <Node name="Shared" expanded="True">
              <Node name="Common" expanded="True" />
              <Node name="Common" expanded="True">
                <Node name="Room.cs" selected="True" />
              </Node>
              <Node name="Phone" expanded="True">
                <Node name="Device" expanded="True">
                  <Node name="Account" expanded="True">
                    <Node name="PhoneEmailForm.cs" selected="True" />
                  </Node>
                  <Node name="CommonForm" expanded="True" />
                  <Node name="Account" expanded="True" />
                  <Node name="Category" expanded="True" />
                  <Node name="DeviceLogic" expanded="True" />
                </Node>
                <Node name="UserCenter" expanded="True">
                  <Node name="CommonBase" expanded="True">
                    <Node name="Logic" expanded="True" />
                  </Node>
                  <Node name="CommonBase" expanded="True" />
                </Node>
                <Node name="UserView" expanded="True" />
              </Node>

 ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide

Binary files differ

 ZigbeeApp/GateWay.Droid/Assets/Language.ini

@@ -626,10 +626,10 @@
10113=请再次输入密码
10114=发送验证码成功，请注意查收
10115=确定
10116=该账号已注册，可直接登录
10116=该用户已存在，可直接登录
10117=提供的参数错误
10118=两次密码不一致
10119=验证码错误
10118=确认密码不一致，请重新输入
10119=验证码错误，请重新输入
10120=请求服务器失败
10121=恭喜注册成功！
10122=即将自动登录
@@ -650,6 +650,8 @@
10137=住宅名称为空
10138=邮箱错误，请重新输入
10139=手机号错误，请重新输入
10140=请输入长度为6-13个字符的密码
10141=你已被强制下线！


10150=改房间名称已存在
@@ -661,7 +663,7 @@
10156=发送验证码失败
10157=网关不在线

0160=已是最新版本
10160=已是最新版本
10161=更新
10162=更新内容
10163=更新失败

 ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs

@@ -282,6 +282,23 @@
        /// <param name="mouseEventArgs"></param>
        private async void SendCode_MouseUpEventAsync(object sender, MouseEventArgs mouseEventArgs)
        {
            if (CheckAccount(account) == false)
            {
                return;
            }
            //先判断2次密码输入是否一致
            if (pwdRow.PasswrodET.Text.Trim() != pwdComfireRow.PasswrodET.Text.Trim())
            {
                errorBtn.TextID = R.MyInternationalizationString.TwoPasswordInconsistency;
                return;
            }

            if (AccountLogic.Instance.CheckPwdLength(pwdRow.PasswrodET.Text.Trim()) == false)
            {
                errorBtn.TextID = R.MyInternationalizationString.ThePWDLengthError;
                return;
            }

            (sender as Button).Enable = (sender as Button).IsSelected = false;
            CommonPage.Loading.Start();
            try
@@ -347,6 +364,35 @@
                CommonPage.Loading.Hide();
            }
        }


        /// <summary>
        /// CheckAccount
        /// </summary>
        /// <param name="accountStr"></param>
        /// <returns></returns>
        private bool CheckAccount(string accountStr)
        {
            errorBtn.Text = string.Empty;
            if (phoneEmailForm.SelectedEmail.IsSelected)
            {
                if (AccountLogic.Instance.CheckEmail(accountStr) == false)
                {
                    errorBtn.TextID = R.MyInternationalizationString.TheEmailError;
                    return false;
                }
            }
            else
            {
                if (AccountLogic.Instance.CheckPhoneWithZone(accountStr, CommonPage.PhoneZoneStr) == false)
                {
                    errorBtn.TextID = R.MyInternationalizationString.ThePhoneError;
                    return false;
                }
            }
            return true;
        }

        #endregion

        #region ◆ 确认修改__________________________
@@ -358,13 +404,23 @@
        /// <param name="mouseEventArgs"></param>
        private async void Reset(object sender,MouseEventArgs mouseEventArgs)
        {

            if (CheckAccount(account) == false)
            {
                return;
            }
            //先判断2次密码输入是否一致
            if (pwdRow.PasswrodET.Text.Trim() != pwdComfireRow.PasswrodET.Text.Trim())
            {
                var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.TwoPasswordInconsistency), Language.StringByID(R.MyInternationalizationString.Confrim));
                alert.Show();
                errorBtn.TextID = R.MyInternationalizationString.TwoPasswordInconsistency;
                return;
            }
            if (AccountLogic.Instance.CheckPwdLength(pwdRow.PasswrodET.Text.Trim()) == false)
            {
                errorBtn.TextID = R.MyInternationalizationString.ThePWDLengthError;
                return;
            }
           
            CommonPage.Loading.Start();
            try
            {

 ZigbeeApp/Shared/Phone/Device/Account/AccountLogic.cs

@@ -76,6 +76,24 @@
                var regex = new Regex(CommonPage.PhoneForForeignRegexStr);
                return regex.IsMatch(phone);
            }
        }

        #endregion

        #region ◆ 密码____________________________

        /// <summary>
        /// 检查密码长度合法性
        /// </summary>
        /// <param name="password"></param>
        /// <returns></returns>
        public bool CheckPwdLength(string password)
        {
            if (password.Trim().Length >= 6 && password.Trim().Length <= 13)
            {
                return true;
            }
            return false;
        }

        #endregion

 ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs

@@ -82,7 +82,6 @@
            //AddBody
            AddBodyView();


            //bind
            BindEvent();
        }
@@ -225,11 +224,11 @@
            }
            pwdRow = new PwdRowForm();
            pwdRow.Init(accountCodeFrameLayout, 29, 196);
            //pwdRow.PasswrodET.TextChangeEventHandler += Account_TextChange;
            pwdRow.PasswrodET.TextChangeEventHandler += Code_TextChange;

            pwdComfireRow = new PwdRowForm();
            pwdComfireRow.Init(accountCodeFrameLayout, 29, 363);
            //pwdComfireRow.PasswrodET.TextChangeEventHandler += Account_TextChange;
            pwdComfireRow.PasswrodET.TextChangeEventHandler += Code_TextChange;
            pwdComfireRow.SetPlaceholdText(Language.StringByID(R.MyInternationalizationString.PleaseComfirePWD));

            codeRow = new CodeForRegisterRowForm();
@@ -251,6 +250,7 @@
            phoneEmailForm.SelectedEmail.MouseUpEventHandler += SelectPhoneOrEmail_MouseUpEvent;
            registerBtn.MouseUpEventHandler += Register;
            loginByAccountPWDBtn.MouseUpEventHandler += LoginByPWD;
            codeRow.VerificationCodeET.TextChangeEventHandler += Code_TextChange;
        }
        #endregion

@@ -262,6 +262,23 @@
        /// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
        private async void Register(object sender, MouseEventArgs mouseEventArgs)
        {
            if (CheckAccount(account) == false)
            {
                return;
            }
            //先判断2次密码输入是否一致
            if (pwdRow.PasswrodET.Text.Trim() != pwdComfireRow.PasswrodET.Text.Trim())
            {
                errorBtn.TextID = R.MyInternationalizationString.TwoPasswordInconsistency;
                return;
            }

            if (AccountLogic.Instance.CheckPwdLength(pwdRow.PasswrodET.Text.Trim()) == false)
            {
                errorBtn.TextID = R.MyInternationalizationString.ThePWDLengthError;
                return;
            }

            CommonPage.Loading.Start();
            try
            {
@@ -350,12 +367,10 @@
            errorBtn.Text = string.Empty;
            if ((sender as EditText).Text.Trim().Length > 0)
            {
                //IsRightAccount = true;
                codeRow.SendCodeBtn.Enable = codeRow.SendCodeBtn.IsSelected = true;
            }
            else
            {
                //IsRightAccount = false;
                codeRow.SendCodeBtn.Enable = codeRow.SendCodeBtn.IsSelected = false;
            }
            account = (sender as EditText).Text.Trim();
@@ -369,7 +384,7 @@
        private void Code_TextChange(object sender, string mouseEventArgs)
        {
            errorBtn.Text = string.Empty;
            if ((sender as EditText).Text.Trim().Length > 0)
            if (codeRow.VerificationCodeET.Text.Trim().Length > 0 && account.Trim().Length > 0 && pwdRow.PasswrodET.Text.Trim().Length > 0 && pwdComfireRow.PasswrodET.Text.Trim().Length > 0)
            {
                registerBtn.Enable = registerBtn.IsSelected = true;
            }
@@ -389,15 +404,23 @@
        /// <param name="mouseEventArgs"></param>
        private async void SendCode_MouseUpEventAsync(object sender, MouseEventArgs mouseEventArgs)
        {
            (sender as Button).Enable = (sender as Button).IsSelected = false;
            if (CheckAccount(account) == false)
            {
                return;
            }
            //先判断2次密码输入是否一致
            if (pwdRow.PasswrodET.Text.Trim() != pwdComfireRow.PasswrodET.Text.Trim())
            { 
                var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.TwoPasswordInconsistency), Language.StringByID(R.MyInternationalizationString.Confrim));
                alert.Show();
                codeRow.SendCodeBtn.Enable = codeRow.SendCodeBtn.IsSelected = false;
                errorBtn.TextID = R.MyInternationalizationString.TwoPasswordInconsistency;
                return;
            }

            if (AccountLogic.Instance.CheckPwdLength(pwdRow.PasswrodET.Text.Trim()) == false)
            {
                errorBtn.TextID = R.MyInternationalizationString.ThePWDLengthError;
                return;
            }

            CommonPage.Loading.Start();
            (sender as Button).Enable = (sender as Button).IsSelected = false;
            try
@@ -465,6 +488,34 @@
                CommonPage.Loading.Hide();
            }
        }

        /// <summary>
        /// CheckAccount
        /// </summary>
        /// <param name="accountStr"></param>
        /// <returns></returns>
        private bool CheckAccount(string accountStr)
        {
            errorBtn.Text = string.Empty;
            if (phoneEmailForm.SelectedEmail.IsSelected)
            {
                if (AccountLogic.Instance.CheckEmail(accountStr) == false)
                {
                    errorBtn.TextID = R.MyInternationalizationString.TheEmailError;
                    return false;
                }
            }
            else
            {
                if (AccountLogic.Instance.CheckPhoneWithZone(accountStr, CommonPage.PhoneZoneStr) == false)
                {
                    errorBtn.TextID = R.MyInternationalizationString.ThePhoneError;
                    return false;
                }
            }
            return true;
        }

        #endregion
    }
}

 ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs

@@ -282,7 +282,7 @@

            AccountET = new EditText()
            {
                X = Application.GetRealWidth(236),
                X = Application.GetRealWidth(222),
                Width = Application.GetRealWidth(700),
                Height = Application.GetRealHeight(Button_Height),
                Gravity = Gravity.CenterVertical,
@@ -305,6 +305,7 @@
            accountFL.AddChidren(accountLine);
        }
    }


    public class EmailLoginRowForm : FrameLayout
    {
@@ -346,7 +347,7 @@

            AccountET = new EditText()
            {
                X = Application.GetRealWidth(193),
                X = Application.GetRealWidth(222),
                Width = Application.GetRealWidth(700),
                Height = Application.GetRealHeight(Button_Height),
                Gravity = Gravity.CenterVertical,
@@ -473,7 +474,7 @@

            VerificationCodeET = new EditText()
            {
                X = Application.GetRealWidth(236),
                X = Application.GetRealWidth(222),
                Width = Application.GetRealWidth(350),
                Height = Application.GetRealHeight(Button_Height),
                Gravity = Gravity.CenterVertical,
@@ -862,7 +863,7 @@

            VerificationCodeET = new EditText()
            {
                X = Application.GetRealWidth(236),
                X = Application.GetRealWidth(222),
                Width = Application.GetRealWidth(300),
                Height = Application.GetRealHeight(Button_Height),
                Gravity = Gravity.CenterVertical,

 ZigbeeApp/Shared/Phone/Device/Category/SelectDevice.cs

@@ -302,6 +302,7 @@
                };
                functionSceneBodyView.AddChidren(deviceListScrolView);
                tempFunctionTypeBtn = new FunctionButton();
                tempFunctionTypeBtn.Init("","");

                EventHandler<MouseEventArgs> ShowSameTypeFunction = (object typeSender, MouseEventArgs mouseEventArgs) =>
                {

 ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs

@@ -278,6 +278,7 @@
                

                tempFunctionTypeBtn = new FunctionButton();
                tempFunctionTypeBtn.Init("", "");

                foreach (var deviceType in Common.Room.AllRoomDeviceTypeList)
                {

 ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs

@@ -426,7 +426,6 @@
                Gravity = Gravity.CenterVertical,
                UnSelectedImagePath = "Item/Floor.png"
            };
            topFrameLayout.AddChidren(floor);

            floorBtn = new Button
            {
@@ -438,7 +437,13 @@
                TextColor = ZigbeeColor.Current.GXCTextColor,
                Text = Config.Instance.Home.GetCurrentFloorName
            };

            if(Config.Instance.Home.FloorDics.Count>0)
            {
                topFrameLayout.AddChidren(floor);
            topFrameLayout.AddChidren(floorBtn);
            }


            var messageBtn = new Button()
            {

 ZigbeeApp/Shared/R.cs

@@ -586,6 +586,7 @@
        public const int Favorite = 10001;



        /// <summary>
        /// 手机号
        /// </summary>
@@ -651,7 +652,7 @@
        /// </summary>
        public const int Confrim = 10115;
        /// <summary>
        /// 该账号已注册，可直接登录
        /// 该用户已存在，可直接登录
        /// </summary>
        public const int AccountHasBeenRegistered = 10116;
        /// <summary>
@@ -659,11 +660,11 @@
        /// </summary>
        public const int PARAMETEROREMPTY = 10117;
        /// <summary>
        /// 两次密码不一致
        /// 确认密码不一致，请重新输入
        /// </summary>
        public const int TwoPasswordInconsistency = 10118;
        /// <summary>
        /// 验证码错误
        /// 验证码错误，请重新输入
        /// </summary>
        public const int VALIDCODEANDPHONENOEQUAL = 10119;
        /// <summary>
@@ -746,7 +747,14 @@
        /// 手机号错误，请重新输入
        /// </summary>
        public const int ThePhoneError = 10139;

        /// <summary>
        /// 请输入长度为6-13个字符的密码
        /// </summary>
        public const int ThePWDLengthError = 10140;
        /// <summary>
        /// 你已被强制下线！
        /// </summary>
        public const int YouHaveBeenSignOut = 10141;


        /// <summary>