From 4c17caa61bc3b0a05a2b303bccdfedfbf3853f6d Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期二, 24 十一月 2020 15:58:10 +0800 Subject: [PATCH] 2020-11-24 1.优化登录界面失败提示。 --- /dev/null | 168 ---------------------------- HDL-ON_Android/Assets/Language.ini | 47 +++++++ HDL_ON/UI/UI1-Login/LoginPageBLL.cs | 98 +++++++-------- .vs/HDL_APP_Project/xs/UserPrefs.xml | 27 ++- 4 files changed, 106 insertions(+), 234 deletions(-) diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml index 0d780be..69180b1 100644 --- a/.vs/HDL_APP_Project/xs/UserPrefs.xml +++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml @@ -1,13 +1,14 @@ 锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default"> - <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.08FD445C-3EE8-4ED2-BF28-B42ADD0DA92C" /> - <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Server/HttpServerRequest.cs"> + <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" /> + <MonoDevelop.Ide.Workbench ActiveDocument="HDL-ON_Android/Assets/Language.ini"> <Files> <File FileName="HDL_ON/DAL/Server/NewAPI.cs" Line="1" Column="1" /> - <File FileName="HDL_ON/UI/UI1-Login/RegisterPage.cs" Line="58" Column="35" /> - <File FileName="HDL_ON/UI/UI1-Login/RegisterPageBLL.cs" Line="611" Column="46" /> - <File FileName="HDL_ON/UI/UI1-Login/SelectServerDialog.cs" Line="43" Column="100" /> - <File FileName="HDL_ON/UI/UI1-Login/LoginPageBLL.cs" Line="1029" Column="1" /> - <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="868" Column="42" /> + <File FileName="HDL_ON/UI/UI1-Login/LoginPageBLL.cs" Line="1140" Column="2" /> + <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="1" Column="1" /> + <File FileName="HDL_ON/UI/UI0-Public/WebViewDialog.cs" Line="1" Column="1" /> + <File FileName="HDL_ON/UI/UI1-Login/SelectServerDialog.cs" Line="60" Column="39" /> + <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="22" Column="7" /> + <File FileName="HDL-ON_Android/Assets/Language.ini" Line="467" Column="1" /> </Files> <Pads> <Pad Id="ProjectPad"> @@ -16,9 +17,7 @@ <Node name="HDL_ON" expanded="True"> <Node name="Common" expanded="True" /> <Node name="DAL" expanded="True"> - <Node name="Server" expanded="True"> - <Node name="HttpServerRequest.cs" selected="True" /> - </Node> + <Node name="Server" expanded="True" /> </Node> <Node name="UI" expanded="True"> <Node name="CSS" expanded="True" /> @@ -34,6 +33,12 @@ </Node> </Node> </Node> + </Node> + <Node name="HDL-ON_Android" expanded="True"> + <Node name="Assets" expanded="True"> + <Node name="Language.ini" selected="True" /> + </Node> + <Node name="Properties" expanded="True" /> </Node> <Node name="HDL-ON_iOS" expanded="True"> <Node name="Resources" expanded="True"> @@ -53,7 +58,7 @@ <String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String> <String>Shared.IOS/Shared.IOS.csproj</String> </DisabledProjects> - <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" /> + <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" /> <MonoDevelop.Ide.ItemProperties.HDL-ON__Android AndroidDesignerPreferredTheme="AppTheme" AndroidDesignerPreferredDevice="Nexus 4" PreferredExecutionTarget="Android.364c4b3158493098" /> <MonoDevelop.Ide.DebuggingService.Breakpoints> <BreakpointStore> diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini index c631567..2dd941c 100644 --- a/HDL-ON_Android/Assets/Language.ini +++ b/HDL-ON_Android/Assets/Language.ini @@ -13,6 +13,12 @@ 14=Register 42=Network anomaly +10001=Failed to request the server, please try again later! +10002=System maintenance, please try again later! +10003=Login failed, please add a home first! +10004=Account already exists + + [Chinese] 1=鐧诲綍 2=鎵嬫満鍙风櫥褰� @@ -301,8 +307,8 @@ 285=缁戝畾鎵嬫満鍙� 286=缁戝畾鎵嬫満鎴愬姛 287=缁戝畾鎵嬫満澶辫触 -288=鎵嬫満鍙蜂慨鏀� -289=瑙g粦鎵嬫満鍙� +288=淇敼缁戝畾鎵嬫満 +289=瑙i櫎鎵嬫満缁戝畾 290=璇诲彇鍘嗗彶鏁版嵁澶辫触 291=鏆傛棤宸叉敹钘忕殑鍦烘櫙 292=鍏充簬ON @@ -371,6 +377,11 @@ 355=鍏充簬 356=鐗堟湰鍙� 357=姝ゅ姛鑳芥殏鏈紑鏀撅紒 +358=鐢佃瘽: +359=閭: +360=闈㈡澘鍦烘櫙 +361=鏈坊鍔� +362=鍏ㄩ�� 5000=闊充箰 5001=缁勫悎 @@ -421,3 +432,35 @@ 5046=璋冭妭闊抽噺 5047=浣犳墜鏈烘殏鏈畨瑁�"QQ闊充箰"{\r\n}璇峰墠寰�鎵嬫満鍟嗗満瀹夎 +9000=璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP +9001=璇蜂娇鐢ㄦ柊鐨勯偖绠辫处鍙风櫥褰旳PP +9002=鐧诲綍鎵嬫満淇敼瀹屾垚 +9003=鐧诲綍鎵嬫満缁戝畾瀹屾垚 +9004=鐧诲綍閭淇敼瀹屾垚 +9005=鐧诲綍閭缁戝畾瀹屾垚 +9006=楠岃瘉鐮佸彲鑳戒細寤惰繜锛岃鍐嶇瓑涓�浼� +9007=鍐嶇瓑涓�浼� +9008=杩斿洖 +9009=涓嶆効鎰忛�忛湶濮撳悕鐨勭敤鎴� +9010=鏂板瘑鐮� +9011=鍐嶆杈撳叆鏂板瘑鐮� +9012=鍚屾剰 +9013=鐢ㄦ埛鍗忚 +9014=闅愮鏀跨瓥 +9015=鍜� +9016=璇峰厛闃呰骞跺悓鎰忋�婄敤鎴峰崗璁�嬪拰銆婇殣绉佹斂绛栥�� +9017=纭閫�鍑虹櫥褰曪紵 +9018=璇烽�夋嫨鍥藉/鍖哄煙 +9019=绔嬪嵆鏇存柊 +9020=浠ュ悗鍐嶈 +9021=鍥藉/鍦板尯 + + + +10000=鏃犳晥鐧诲綍瀵嗛挜锛岃閲嶆柊鐧诲綍锛� +10001=璇锋眰鏈嶅姟鍣ㄥけ璐ワ紝璇风◢鍚庡啀璇曪紒 +10002=绯荤粺缁存姢涓�,璇风◢鍚庡啀璇�! +10003=鐧诲綍澶辫触锛岃鍏堟坊鍔犱綇瀹咃紒 +10004=璐﹀彿宸插瓨鍦� +10005=楠岃瘉鐮佸彂閫侀绻侊紝璇风◢鍚庡啀璇曪紒 +10006=绛惧悕閿欒 diff --git "a/HDL_ON/DAL/Server/HttpServerRequest\347\232\204\345\211\257\346\234\254.cs" "b/HDL_ON/DAL/Server/HttpServerRequest\347\232\204\345\211\257\346\234\254.cs" deleted file mode 100644 index 894adaa..0000000 --- "a/HDL_ON/DAL/Server/HttpServerRequest\347\232\204\345\211\257\346\234\254.cs" +++ /dev/null @@ -1,168 +0,0 @@ -锘� - #region 娉ㄥ唽銆佺櫥褰曢儴鍒� - /// <summary> - /// 璐﹀彿鐧诲綍-浣跨敤瀵嗙爜 - /// </summary> - //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/Login"; - - /// <summary> - /// 楠岃瘉鐮佺櫥褰� - /// </summary> - //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/LoginValidCode - - /// <summary> - /// 鎵嬫満鍙风爜娉ㄥ唽 - /// </summary> - //https://global.hdlcontrol.com/HangZhouHdlCloudApi/SignIn - - ///鑾峰彇鍖哄煙浠g爜 - //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/GetAreaCode - - /// <summary> - /// 楠岃瘉鐭俊鎴栬�呴偖绠遍獙璇佺爜锛屼箣鍚庢敞鍐� - /// </summary> - //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/ValidataCodeAndRegisterAccount - - - /// <summary> - /// 鑾峰彇娉ㄥ唽楠岃瘉鐮� - /// </summary> - //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/RegisterSendVerCode - - /// <summary> - /// 鑾峰彇鐧诲綍楠岃瘉鐮� - /// </summary> - //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/LoginSendVerCode - - /// <summary> - /// 鍙戦�侀獙璇佺爜 - /// </summary> - //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/LoginSendVerCode - - /// <summary> - /// 楠岃瘉楠岃瘉鐮� - /// </summary> - //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/ValidatorCode - - /// <summary> - /// 閲嶈瀵嗙爜 - /// </summary> - //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/ResetPassword - #endregion - - #region 涓汉淇℃伅閮ㄥ垎 - /// <summary> - /// 鑾峰彇鐢ㄦ埛淇℃伅 - /// </summary> - //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/GetAccountInfo - - /// <summary> - /// 鏇存柊鐢ㄦ埛鏄电О - /// </summary> - //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/UpdateUserName - - /// <summary> - /// 鏇存柊鐢ㄦ埛澶村儚 - /// </summary> - //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/UpdateHeadImage - - /// <summary> - /// 鏇存敼缁戝畾璐︽埛鐨勯偖绠辨垨鑰呮墜鏈哄彿 - /// </summary> - //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/BindAccount - #endregion - - #region 浣忓畢閮ㄥ垎 - /// <summary> - /// 鑾峰彇浣忓畢鍒楄〃 - /// </summary> - //https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetHomePager - /// <summary> - /// 缂栬緫浣忓畢淇℃伅 - /// </summary> - //https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/EditHome - - /// <summary> - /// 鑾峰彇浣忓畢涓嬬殑鎴愬憳璐﹀彿 - /// </summary> - //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/GetSubAccountByDistributedMark - - /// <summary> - /// 鍒犻櫎浣忓畢涓嬬殑鎴愬憳璐﹀彿 - /// </summary> - //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/DeletedSubAccount - - /// <summary> - /// 淇敼瀛愯处鍙锋樀绉� - /// </summary> - //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/EditSubAccountNickName - /// <summary> - /// 淇敼瀛愯处鍙峰垱寤哄満鏅潈闄� - /// </summary> - //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/ChangeCreateSceneState - - /// <summary> - /// 鑾峰彇浣忓畢涓嬪瓙璐﹀彿鐨勫叡浜暟鎹垪琛� - /// </summary> - //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeDataShare/GetShareDataBySubAccount - - /// <summary> - /// 鑾峰彇浣忓畢涓嬪瓙璐﹀彿鐨勫叡浜暟鎹� - /// </summary> - //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeDataShare/GetOneShareData - - /// <summary> - /// 澧炲姞鍏变韩鏁版嵁鍒楄〃 - /// </summary> - //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeDataShare/AddShareData - - /// <summary> - /// 澧炲姞鍏变韩鏁版嵁 - /// </summary> - //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeDataShare/EditShareData - - /// <summary> - /// 鍒犻櫎鍏变韩鏁版嵁 - /// </summary> - //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeDataShare/DeleteShareData - /// <summary> - /// 鍒犻櫎瀛愯处鍙峰綋鍓嶄綇瀹呯殑鎵�鏈夊叡浜暟鎹� - /// </summary> - //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeDataShare/DeleteShareData - - /// <summary> - /// 缁戝畾瀛愯处鍙峰埌浣忓畢涓� - /// </summary> - //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/BindSubAccount - - /// <summary> - /// 鑾峰彇浣忓畢涓嬬殑鎴愬憳璐﹀彿 - /// </summary> - //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/GetSubAccountInfo - #endregion - - #region 鑾峰彇澶╂皵閮ㄥ垎 - /// <summary> - /// 鑾峰彇鎸囧畾缁忕含搴︾殑鍩庡競淇℃伅 - /// </summary> - //string url = $"https://developer.hdlcontrol.com/Weather/Weather/FindCity/?lon={lon}&lat={lat}"; - //url = $"https://developer.hdlcontrol.com/Weather/Weather/GetAirQualityAndWeather/?cid={MainPage.cityInfo.cid}"; - - #endregion - - #region 澶囦唤閮ㄥ垎 - /// <summary> - /// 鑾峰彇浣忓畢澶囦唤鍒楄〃 - /// </summary> - //var revertObj = RequestHttps("https://developer.hdlcontrol.com/api/GetUserFolder - - /// <summary> - /// 鑾峰彇澶囦唤鏂囦欢鍒楄〃 - /// </summary> - //var revertObj = RequestHttps("https://developer.hdlcontrol.com/api/UserBackupList - - /// <summary> - /// 鑾峰彇澶囦唤鎴块棿鏁版嵁 - /// </summary> - //var revertObj = RequestHttps("https://developer.hdlcontrol.com/api/BackupDetail - #endregion diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs index 4758565..a2ad46f 100644 --- a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs +++ b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs @@ -93,6 +93,7 @@ if (result.Code != StateCode.SUCCESS) { IMessageCommon.Current.ShowErrorInfoAlter(result.Code); + ShowBtnAccountViewBottomLineError(); return; } else @@ -319,8 +320,8 @@ //if (btnGetVerificationCode.Parent != null) //{ - //btnGetVerificationCode.RemoveFromParent(); - btnGetVerificationCode.Visible = false; + //btnGetVerificationCode.RemoveFromParent(); + btnGetVerificationCode.Visible = false; //} //闅愯棌瀵嗙爜 etPassword.SecureTextEntry = true; @@ -351,8 +352,8 @@ btnPasswordIcon.IsSelected = false; //if (btnGetVerificationCode.Parent != null) //{ - //btnGetVerificationCode.RemoveFromParent(); - btnGetVerificationCode.Visible = false; + //btnGetVerificationCode.RemoveFromParent(); + btnGetVerificationCode.Visible = false; //} //闅愯棌瀵嗙爜 etPassword.SecureTextEntry = true; @@ -568,7 +569,7 @@ { btnLogin.IsSelected = false; } - if (Regex.IsMatch(account, @"^[1]+\d{10}") )//&& account.Length == 11) + if (Regex.IsMatch(account, @"^[1]+\d{10}"))//&& account.Length == 11) { btnGetVerificationCode.IsSelected = true; btnGetVerificationCode.TextColor = CSS_Color.MainBackgroundColor; @@ -610,6 +611,7 @@ if (result.Code != StateCode.SUCCESS) { IMessageCommon.Current.ShowErrorInfoAlter(result.Code); + ShowBtnAccountViewBottomLineError(); return; } else @@ -621,7 +623,7 @@ //鐧诲綍 var loginResult = LoadMethod_Login(); - if( !string.IsNullOrEmpty (verAccount))//楠岃瘉鐧诲綍璐﹀彿 + if (!string.IsNullOrEmpty(verAccount))//楠岃瘉鐧诲綍璐﹀彿 { Application.RunOnMainThread(() => { @@ -657,7 +659,7 @@ OnAppConfig.Instance.RefreshUserConfig(); DB_ResidenceData.InitRoomFunction(); } - if ( UserInfo.Current.userEmailInfo == "464027401@qq.com") + if (UserInfo.Current.userEmailInfo == "464027401@qq.com") { DB_ResidenceData.residenceData.floors.Add(new Floor() { name = "1F", sid = "09888" }); var r111 = new Room() { sid = "0001", name = "Room-1", floorId = "09888", backgroundImage = "Classification/Room/Roombg.png" }; @@ -932,8 +934,8 @@ { //2020-11-13 寰呯‘璁� //鑾峰彇浣忓畢澶辫触锛岄噸鏂版爣璁颁负鏈櫥褰曠姸鎬� - UserInfo.Current.lastTime = DateTime.MinValue; - UserInfo.Current.SaveUserInfo(); + UserInfo.Current.lastTime = DateTime.MinValue; + UserInfo.Current.SaveUserInfo(); //鐧诲綍澶辫触锛岃鍏堟坊鍔犱綇瀹咃紒 Utlis.ShowAlertOnMainThread(Language.StringByID(StringId.FailedGetHomeList)); } @@ -1011,54 +1013,30 @@ //鐧诲綍澶辫触 else { - //2020-11-13 寰呬慨鏀� - string tipStr = "Sever erorr"; - switch (loginResult.Code) - { - case "ValidCodeAndPhoneNoEqual": - tipStr = Language.StringByID(StringId.VerificationCodeError); - Application.RunOnMainThread(() => - { - btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2; - btnPasswordViewBottomLine.Height = Application.GetRealHeight(2); - }); - break; - case "USERNAMEORPWDERROR": - tipStr = Language.StringByID(StringId.LoginFailed_AccountOrPasswordError); - Application.RunOnMainThread(() => - { - btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2; - btnPasswordViewBottomLine.Height = Application.GetRealHeight(2); - }); - break; - case "ACCOUNTNOEXISTS": - tipStr = Language.StringByID(StringId.ACCOUNTNOEXISTS); - Application.RunOnMainThread(() => - { - btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2; - btnAccountViewBottomLine.Height = Application.GetRealHeight(2); - }); - break; - case "NoRecord": - tipStr = Language.StringByID(StringId.PlsGetTheVerificationCode); - break; - case "Self:Net_Error": - tipStr = Language.StringByID(StringId.NetworkAnomaly); - break; - } //璐﹀彿鎴栬�呭瘑鐮侀敊璇� Application.RunOnMainThread(() => { - waitPage.Hide(); - //鎻愮ず鍘熷洜 - var tip = new Tip() + if (loginResult.Code == "10008") { - Text = tipStr, - CloseTime = 1, - Direction = AMPopTipDirection.None - }; - tip.Show(bodyView); + //鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒 + btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2; + btnPasswordViewBottomLine.Height = Application.GetRealHeight(2); + } + else if (loginResult.Code == "10010") + { + //鐢ㄦ埛涓嶅瓨鍦� + btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2; + btnAccountViewBottomLine.Height = Application.GetRealHeight(2); + } + else if (loginResult.Code == "14") + { + btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2; + btnPasswordViewBottomLine.Height = Application.GetRealHeight(2); + } + waitPage.Hide(); }); + + IMessageCommon.Current.ShowErrorInfoAlter(loginResult.Code); } return result; } @@ -1073,7 +1051,8 @@ if (responsePack == StateCode.SUCCESS) { //2020-11-13 寰呯‘璁わ紝娌℃湁浣忓畢锛屼笉绠楃櫥褰曟垚鍔� - if ( UserInfo.Current.regionList != null && UserInfo.Current.regionList.Count > 0){ + if (UserInfo.Current.regionList != null && UserInfo.Current.regionList.Count > 0) + { result = true; } //result = true; @@ -1144,5 +1123,18 @@ }; } + + /// <summary> + /// 鐢ㄦ埛涓嶅瓨鍦� + /// </summary> + void ShowBtnAccountViewBottomLineError() + { + Application.RunOnMainThread(() => + { + //鐢ㄦ埛涓嶅瓨鍦� + btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2; + btnAccountViewBottomLine.Height = Application.GetRealHeight(2); + }); + } } } \ No newline at end of file -- Gitblit v1.8.0