| DLL/Shared.Droid.dll | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_Android/Assets/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_Android/Properties/AndroidManifest.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_iOS/Resources/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/Common/R.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/DAL/Server/HttpServerRequest.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/MainPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI1-Login/LoginPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI1-Login/LoginPageBLL.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockSelectTimePage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
DLL/Shared.Droid.dllBinary files differ
HDL-ON_Android/Assets/Language.ini
@@ -611,7 +611,10 @@ 624=Triggered range 625=Residential unbound 626=After unbinding the residence, the residence will be removed from your account. Are you sure you want to proceed? 627=The set time needs to be later than the current time 627=The set time needs to be later than the current time. 628=Temporary password validity period cannot be greater than 24 hours. 629=Successfully unbound the residence. 2532=Visitor Invitation Record @@ -1892,7 +1895,8 @@ 625=住宅解绑 626=住宅解绑之后，住宅将会从你的账号中移除，确定要操作吗？ 627=设置的时间需要晚于当前时间 628=临时密码有效期不能大于24小时。 629=住宅解绑成功。 2532=访客邀请记录 2533=访客管理 @@ -3170,7 +3174,10 @@ 624=Triggered range 625=Residential unbound 626=After unbinding the residence, the residence will be removed from your account. Are you sure you want to proceed? 627=The set time needs to be later than the current time 627=The set time needs to be later than the current time. 628=Temporary password validity period cannot be greater than 24 hours. 629=Successfully unbound the residence. 2532=Visitor Invitation Record @@ -4444,7 +4451,10 @@ 624=Triggered range 625=Residential unbound 626=After unbinding the residence, the residence will be removed from your account. Are you sure you want to proceed? 627=The set time needs to be later than the current time 627=The set time needs to be later than the current time. 628=Temporary password validity period cannot be greater than 24 hours. 629=Successfully unbound the residence. @@ -5708,7 +5718,9 @@ 624=Triggered range 625=Residential unbound 626=After unbinding the residence, the residence will be removed from your account. Are you sure you want to proceed? 627=The set time needs to be later than the current time 627=The set time needs to be later than the current time. 628=Temporary password validity period cannot be greater than 24 hours. 629=Successfully unbound the residence.
@@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.7.6" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202305231"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.8.0" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202306011"> <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" /> <uses-permission android:name="android.permission.RECEIVE_SMS" /> <!--友盟--> HDL-ON_iOS/Resources/Language.ini
@@ -611,7 +611,10 @@ 624=Triggered range 625=Residential unbound 626=After unbinding the residence, the residence will be removed from your account. Are you sure you want to proceed? 627=The set time needs to be later than the current time 627=The set time needs to be later than the current time. 628=Temporary password validity period cannot be greater than 24 hours. 629=Successfully unbound the residence. 2532=Visitor Invitation Record @@ -1892,7 +1895,8 @@ 625=住宅解绑 626=住宅解绑之后，住宅将会从你的账号中移除，确定要操作吗？ 627=设置的时间需要晚于当前时间 628=临时密码有效期不能大于24小时。 629=住宅解绑成功。 2532=访客邀请记录 2533=访客管理 @@ -3170,7 +3174,10 @@ 624=Triggered range 625=Residential unbound 626=After unbinding the residence, the residence will be removed from your account. Are you sure you want to proceed? 627=The set time needs to be later than the current time 627=The set time needs to be later than the current time. 628=Temporary password validity period cannot be greater than 24 hours. 629=Successfully unbound the residence. 2532=Visitor Invitation Record @@ -4444,7 +4451,10 @@ 624=Triggered range 625=Residential unbound 626=After unbinding the residence, the residence will be removed from your account. Are you sure you want to proceed? 627=The set time needs to be later than the current time 627=The set time needs to be later than the current time. 628=Temporary password validity period cannot be greater than 24 hours. 629=Successfully unbound the residence. @@ -5708,7 +5718,9 @@ 624=Triggered range 625=Residential unbound 626=After unbinding the residence, the residence will be removed from your account. Are you sure you want to proceed? 627=The set time needs to be later than the current time 627=The set time needs to be later than the current time. 628=Temporary password validity period cannot be greater than 24 hours. 629=Successfully unbound the residence.
@@ -5,6 +5,14 @@ public static class StringId { /// <summary> /// 住宅解绑成功 /// </summary> public const int SuccessfullyUnboundTheResidence = 629; /// <summary> /// 临时密码有效期不能大于24小时 /// </summary> public const int TempPwdValidityTip = 628; /// <summary> /// 设置的时间需要晚于当前时间 /// </summary> public const int TempPwdSettingTip = 627; HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -715,7 +715,7 @@ public ResponsePackNew RollBack() { var d = new Dictionary<string, object>(); d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id); d.Add("houseId", DB_ResidenceData.Instance.CurrentRegion.id); d.Add("communityId", DB_ResidenceData.Instance.CurrentRegion.communityId); d.Add("flowRecordContent", "onPro交付回滚"); d.Add("projectFlowRecordActionEnum", "DELIVERY_ROLLBACK"); HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@ /// <summary> /// 版本号 /// </summary> public static string VersionString = "1.7.6"; public static string VersionString = "1.8.0"; ///// <summary> ///// 客户端类型 ///// </summary> @@ -136,8 +136,8 @@ { _RoomNotSupportFunctionList = new List<string>(); _RoomNotSupportFunctionList.Add(SPK.EnergyStandard); _RoomNotSupportFunctionList.Add(SPK.MusicStandard); _RoomNotSupportFunctionList.Add(SPK.AvMusic); //_RoomNotSupportFunctionList.Add(SPK.MusicStandard); //_RoomNotSupportFunctionList.Add(SPK.AvMusic); _RoomNotSupportFunctionList.Add(SPK.AirSwitch); _RoomNotSupportFunctionList.Add(SPK.ElectricEnergy); //_RoomNotSupportFunctionList.Add(SPK.OtherCommon); HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -24,10 +24,42 @@ pm = new HttpServerRequest(); #if __ANDROID__ BaseActivity.HideKeyboardEvent = () => { Application.RunOnMainThread(() => if (this.Y != 0) { this.Y = 0; }); Application.RunOnMainThread(() => { try { this.Y = 0; } catch { } }); } }; BaseActivity.ShowKeyboardEvent = () => { try { if (etPassword.Foucs) { new Thread(() => { for (var i = 0; i < 10; i++) { Application.RunOnMainThread(() => { try { this.Y = 0 - Application.GetRealHeight(10 * i); } catch { } }); Thread.Sleep(10); } }) { IsBackground = true }.Start(); } } catch { } }; BaseActivity.SmsAction = (message) => { Console.WriteLine($"接收到短信："+ message); @@ -69,6 +101,7 @@ BaseActivity.HideKeyboardEvent = () => { }; BaseActivity.ShowKeyboardEvent = () => { }; BaseActivity.SmsAction = (sms) => { }; #endif base.RemoveFromParent(); @@ -253,7 +286,6 @@ //return; if (b) { //etAccount.Text = "13375012446";//测试服务器 //etAccount.Text = "1033326940@qq.com"; //etAccount.Text = "18022428438";//wjc //etAccount.Text = "13602944661";//kx @@ -282,6 +314,7 @@ etAccount.Text = "13549566666"; etAccount.Text = "18316672920"; etAccount.Text = "support7@hdlautomation.com"; etAccount.Text = "13375012446";//测试服务器 } else { HDL_ON/UI/UI1-Login/LoginPageBLL.cs
@@ -445,17 +445,19 @@ { btnPasswordViewBottomLine.BackgroundColor = CSS_Color.MainColor; btnPasswordViewBottomLine.Height = Application.GetRealHeight(2); new Thread(() => { for(var i = 0; i < 10; i++) { Application.RunOnMainThread(() => { this.Y = 0-Application.GetRealHeight(10 * i); }); Thread.Sleep(10); } }) { IsBackground = true }.Start(); #if __IOS__ new Thread(() => { for(var i = 0; i < 10; i++) { Application.RunOnMainThread(() => { this.Y = 0-Application.GetRealHeight(10 * i); }); Thread.Sleep(10); } }) { IsBackground = true }.Start(); var sst = etPassword.MyTextContentType; Console.WriteLine(sst); etPassword.SetTextContentTypeToOneTimeCode(); HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
@@ -395,6 +395,80 @@ LoadEvent_SkipAdminMigrationConfirmPage(); LoadEvent_SkipTransferConfirmPage(); var btnRollBack = new Button() { Y = Application.GetRealHeight(623), Height = Application.GetRealHeight(50), TextAlignment = TextAlignment.Center, TextSize = CSS_FontSize.SubheadingFontSize, TextColor = CSS_Color.AuxiliaryColor2, TextID = StringId.RollBack, BackgroundColor = CSS_Color.MainBackgroundColor, }; bodyView.AddChidren(btnRollBack); if (MainPage.Increase) { btnRollBack.Y = Application.GetRealHeight(613); btnRollBack.Height = Application.GetRealHeight(50); bodyView.AddChidren(new Button() { Y = Application.GetRealHeight(663), Height = Application.GetRealHeight(20), BackgroundColor = CSS_Color.MainBackgroundColor }); } btnRollBack.MouseUpEventHandler += (sender, e) => { Action okAction = () => { var waitPage = new Loading(); this.AddChidren(waitPage); waitPage.Start(""); new System.Threading.Thread(() => { try { var pack = Common.ApiUtlis.Ins.HttpRequest.RollBack(); Application.RunOnMainThread(() => { if (pack != null) { if (pack.Code == StateCode.SUCCESS) { new PublicAssmebly().TipMsg(StringId.Tip, StringId.SuccessfullyUnboundTheResidence, () => { Common.ApiUtlis.Ins.HttpRequest.GetHomePager(); }); } else { IMessageCommon.Current.ShowErrorInfoAlter(pack.Code); } } }); } catch (Exception ex) { MainPage.Log($"住宅回滚异常：{ex.Message}"); } finally { Application.RunOnMainThread(() => { try { waitPage.Hide(); waitPage.RemoveFromParent(); waitPage = null; } catch { } }); } }) { IsBackground = true }.Start(); }; new ConfirmDialog().ShowDialog(StringId.Tip, StringId.RollBackTipMsg, okAction); }; } #region 调试权限 @@ -565,72 +639,6 @@ break; case "ACCEPTANCE"://验收 btnHouseStatusTipTitle.Text += " : " + Language.StringByID(StringId.ACCEPTANCE); var btnRollBack = new Button() { Y = Application.GetRealHeight(623), Height = Application.GetRealHeight(50), TextAlignment = TextAlignment.Center, TextSize = CSS_FontSize.SubheadingFontSize, TextColor = CSS_Color.AuxiliaryColor2, TextID = StringId.RollBack, BackgroundColor = CSS_Color.MainBackgroundColor, }; bodyView.AddChidren(btnRollBack); if (MainPage.Increase) { btnRollBack.Y = Application.GetRealHeight(613); btnRollBack.Height = Application.GetRealHeight(50); bodyView.AddChidren(new Button() { Y = Application.GetRealHeight(663), Height = Application.GetRealHeight(20), BackgroundColor = CSS_Color.MainBackgroundColor }); } btnRollBack.MouseUpEventHandler += (sender, e) => { Action okAction = () => { var waitPage = new Loading(); this.AddChidren(waitPage); waitPage.Start(""); new System.Threading.Thread(() => { try { var pack = Common.ApiUtlis.Ins.HttpRequest.RollBack(); Application.RunOnMainThread(() => { if (pack != null) { if (pack.Code == StateCode.SUCCESS) { Common.ApiUtlis.Ins.HttpRequest.GetHomePager(); } else { IMessageCommon.Current.ShowErrorInfoAlter(pack.Code); } } }); } catch (Exception ex) { MainPage.Log($"住宅回滚异常：{ex.Message}"); } finally { Application.RunOnMainThread(() => { try { waitPage.Hide(); waitPage.RemoveFromParent(); waitPage = null; } catch { } }); } }) { IsBackground = true }.Start(); }; new ConfirmDialog().ShowDialog(StringId.Tip, StringId.RollBackTipMsg, okAction); }; break; case "To_Be_Accepted"://待验收 HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs
@@ -856,6 +856,12 @@ HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, Language.StringByID(StringId.EffectiveTimeMustBeOverFailureTime)); return false; } if ((endTime - startTime).TotalHours>=24) { //临时密码有效期不能大于24小时 HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, Language.StringByID(StringId.TempPwdValidityTip)); return false; } return true; } @@ -887,34 +893,43 @@ /// </summary> private void RefreshFormStatu() { //如果不在线 if (this.doorLockData.IsOnline == false) try { //开锁图片 this.picLockControl.UnSelectedImagePath = "FunctionIcon/DoorLock/LockPictrue2.png"; //连接状态 this.btnOnlineIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/UnConnect.png"; this.btnOnlineView.Text = this.dicText["未连接"]; this.btnOnlineView.TextColor = CSS_Color.AuxiliaryColor2; //常开模式图标 if (this.btnNormallyOpenIcon != null) //如果不在线 if (this.doorLockData.IsOnline == false) { this.btnNormallyOpenIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/NormallyOpenIcon2.png"; //开锁图片 this.picLockControl.UnSelectedImagePath = "FunctionIcon/DoorLock/LockPictrue2.png"; //连接状态 this.btnOnlineIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/UnConnect.png"; this.btnOnlineView.Text = this.dicText["未连接"]; this.btnOnlineView.TextColor = CSS_Color.AuxiliaryColor2; //常开模式图标 if (this.btnNormallyOpenIcon != null) { this.btnNormallyOpenIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/NormallyOpenIcon2.png"; } } else { //开锁图片 this.picLockControl.UnSelectedImagePath = this.doorLockData.Open == true ? "FunctionIcon/DoorLock/UnLockPictrue3.png" : "FunctionIcon/DoorLock/LockPictrue1.png"; //连接状态 this.btnOnlineIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/Connect.png"; this.btnOnlineView.Text = this.dicText["已连接"]; this.btnOnlineView.TextColor = CSS_Color.PromptingColor1; //常开模式图标 if (this.btnNormallyOpenIcon != null) { this.btnNormallyOpenIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/NormallyOpenIcon1.png"; } } this.seekBarVoiceControl.Progress = this.doorLockData.Voice; this.btnVoicePersent.Text = this.doorLockData.Voice.ToString(); } else catch (Exception ex) { //开锁图片 this.picLockControl.UnSelectedImagePath = this.doorLockData.Open == true ? "FunctionIcon/DoorLock/UnLockPictrue3.png" : "FunctionIcon/DoorLock/LockPictrue1.png"; //连接状态 this.btnOnlineIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/Connect.png"; this.btnOnlineView.Text = this.dicText["已连接"]; this.btnOnlineView.TextColor = CSS_Color.PromptingColor1; //常开模式图标 if (this.btnNormallyOpenIcon != null) { this.btnNormallyOpenIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/NormallyOpenIcon1.png"; } MainPage.Log($"界面更新异常，门锁:{ex.Message}"); } }
@@ -175,7 +175,7 @@ { if (TimeCheck) { if (DateTime.Now > this.selectDateTime) if (DateTime.Now > this.selectDateTime.AddMinutes(1)) { new PublicAssmebly().TipMsg(StringId.Tip, StringId.TempPwdSettingTip); throw new Exception("stop");
