From 9f1d51429ec86d618bcdb75aee505a57ae94db30 Mon Sep 17 00:00:00 2001 From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local> Date: 星期一, 09 十二月 2019 11:11:19 +0800 Subject: [PATCH] 2019.12.9 --- ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs | 60 +++++++++++ ZigbeeApp/Shared/Phone/Device/Account/AccountLogic.cs | 22 ++++ ZigbeeApp/Shared/Phone/Device/Category/SelectDevice.cs | 1 ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs | 9 + ZigbeeApp/GateWay.Droid/Assets/Language.ini | 10 + ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs | 1 ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 37 ++---- ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0 ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs | 9 + ZigbeeApp/Shared/R.cs | 28 +++-- ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs | 77 ++++++++++++-- 11 files changed, 193 insertions(+), 61 deletions(-) diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml index 3602fb6..6a0d51b 100644 --- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml +++ b/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> diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide index 7e798fe..b05070d 100644 --- a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide +++ b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide Binary files differ diff --git a/ZigbeeApp/GateWay.Droid/Assets/Language.ini b/ZigbeeApp/GateWay.Droid/Assets/Language.ini index 1808677..bfa7c45 100755 --- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini +++ b/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=鏇存柊澶辫触 diff --git a/ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs b/ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs index 2a07059..9a7efab 100644 --- a/ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs +++ b/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 { diff --git a/ZigbeeApp/Shared/Phone/Device/Account/AccountLogic.cs b/ZigbeeApp/Shared/Phone/Device/Account/AccountLogic.cs index 5199260..534233a 100644 --- a/ZigbeeApp/Shared/Phone/Device/Account/AccountLogic.cs +++ b/ZigbeeApp/Shared/Phone/Device/Account/AccountLogic.cs @@ -64,9 +64,9 @@ /// <param name="phone">鎵嬫満鍙�</param> /// <param name="zoneCode">鍖哄彿</param> /// <returns></returns> - public bool CheckPhoneWithZone(string phone,string zoneCode) + public bool CheckPhoneWithZone(string phone, string zoneCode) { - if(zoneCode=="86") + if (zoneCode == "86") { var regex = new Regex(CommonPage.PhoneRegexStr); return regex.IsMatch(phone); @@ -79,5 +79,23 @@ } #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 } } diff --git a/ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs b/ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs index ff9b5c3..da5814b 100644 --- a/ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs +++ b/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; - //鍏堝垽鏂�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; + 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(); (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 } } \ No newline at end of file diff --git a/ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs b/ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs index 040cc07..01c2e9c 100644 --- a/ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs +++ b/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, diff --git a/ZigbeeApp/Shared/Phone/Device/Category/SelectDevice.cs b/ZigbeeApp/Shared/Phone/Device/Category/SelectDevice.cs index 96c797f..da0dedc 100644 --- a/ZigbeeApp/Shared/Phone/Device/Category/SelectDevice.cs +++ b/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) => { diff --git a/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs b/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs index 55a51f1..fca2cd7 100644 --- a/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs +++ b/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs @@ -278,6 +278,7 @@ tempFunctionTypeBtn = new FunctionButton(); + tempFunctionTypeBtn.Init("", ""); foreach (var deviceType in Common.Room.AllRoomDeviceTypeList) { diff --git a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs index b6746a7..adce2b8 100644 --- a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs +++ b/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 }; - topFrameLayout.AddChidren(floorBtn); + + if(Config.Instance.Home.FloorDics.Count>0) + { + topFrameLayout.AddChidren(floor); + topFrameLayout.AddChidren(floorBtn); + } + var messageBtn = new Button() { diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs index 1078a12..a2d5a4f 100644 --- a/ZigbeeApp/Shared/R.cs +++ b/ZigbeeApp/Shared/R.cs @@ -586,6 +586,7 @@ public const int Favorite = 10001; + /// <summary> /// 鎵嬫満鍙� /// </summary> @@ -650,20 +651,20 @@ /// 纭畾 /// </summary> public const int Confrim = 10115; - /// <summary> - /// 璇ヨ处鍙峰凡娉ㄥ唽锛屽彲鐩存帴鐧诲綍 - /// </summary> - public const int AccountHasBeenRegistered = 10116; + /// <summary> + /// 璇ョ敤鎴峰凡瀛樺湪锛屽彲鐩存帴鐧诲綍 + /// </summary> + public const int AccountHasBeenRegistered = 10116; /// <summary> /// 鎻愪緵鐨勫弬鏁伴敊璇� /// </summary> public const int PARAMETEROREMPTY = 10117; + /// <summary> + /// 纭瀵嗙爜涓嶄竴鑷达紝璇烽噸鏂拌緭鍏� + /// </summary> + public const int TwoPasswordInconsistency = 10118; /// <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> -- Gitblit v1.8.0