HDL-ON_Android/Assets/Language.ini
@@ -627,17 +627,13 @@ 1154=Transferring to User, Please Wait… 1155={0} has become a residential administrator 1156=The residence data will be deleted from your account 1157=Fail to migrate 1157=Fail to transfer 1158=Please try again 1159=Admin authority migration 1160=Your admin authority is being migrated to other members 1161=1.Your data (cloud data) of the residence will be{0}migratedto the new administrator{0}2.Your data will be exchanged with the target member{0}and your permission will be changed to the target{0}member 1162=Confirm 1163=No members to choose 1164=Confirm admin authority migration from {0} to {1} 1165=Migrate successfully 1166=Fail to migrate 1167=Migrate successfully, And your permissions will become normal members 4000=Video intercom 4001=Call record @@ -1699,15 +1695,8 @@ 1156=该住宅的信息将在您的账号中删除 1157=过户失败 1158=请重新尝试 1159=管理员权限转移 1160=您将转移您的管理员权限给其他成员 1161=1.该住宅您的管理员数据（云端数据）将全部转移给新的{0}管理员{0}2.您的数据将会与目标成员互换，您的权限将变更为目标{0}成员的权限 1162=确认转移 1163=检测不到可供选择的成员 1164=确认转移{0}的管理员权限给账号{1} 1165=迁移成功 1166=迁移失败 1167=迁移成功，您的权限将变为普通成员 4000=可视对讲 4001=通话记录 HDL-ON_iOS/Resources/Language.ini
@@ -439,6 +439,7 @@ 453=Alarm mute 454=Deployment information 455=The name can not be blank. 456=Canvas 457=Energy consumption 458=Date @@ -626,17 +627,13 @@ 1154=Transferring to User, Please Wait… 1155={0} has become a residential administrator 1156=The residence data will be deleted from your account 1157=Fail to migrate 1157=Fail to transfer 1158=Please try again 1159=Admin authority migration 1160=Your admin authority is being migrated to other members 1161=1.Your data (cloud data) of the residence will be{0}migratedto the new administrator{0}2.Your data will be exchanged with the target member{0}and your permission will be changed to the target{0}member 1162=Confirm 1163=No members to choose 1164=Confirm admin authority migration from {0} to {1} 1165=Migrate successfully 1166=Fail to migrate 1167=Migrate successfully, And your permissions will become normal members 4000=Video intercom 4001=Call record @@ -1698,15 +1695,8 @@ 1156=该住宅的信息将在您的账号中删除 1157=过户失败 1158=请重新尝试 1159=管理员权限转移 1160=您将转移您的管理员权限给其他成员 1161=1.该住宅您的管理员数据（云端数据）将全部转移给新的{0}管理员{0}2.您的数据将会与目标成员互换，您的权限将变更为目标{0}成员的权限 1162=确认转移 1163=检测不到可供选择的成员 1164=确认转移{0}的管理员权限给账号{1} 1165=迁移成功 1166=迁移失败 1167=迁移成功，您的权限将变为普通成员 4000=可视对讲 4001=通话记录 HDL_ON/Common/R.cs
@@ -1201,6 +1201,7 @@ /// 请重新尝试 /// </summary> public const int PleaseTryAgain = 1158; <<<<<<< HEAD /// <summary> /// 管理员权限转移 /// </summary> @@ -1237,6 +1238,9 @@ /// 迁移成功，您的权限将变为普通成员 /// </summary> public const int TransferreSuccessMsg1 = 1167; ======= >>>>>>> parent of 3861152e (Merge branch 'tzy2' into newBranch1) public const int keshiduijiang = 4000; public const int tonghuajilu = 4001; HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -727,24 +727,6 @@ return result != null && result.Code == StateCode.SUCCESS; } /// <summary> /// 管理员权限迁移 /// </summary> /// <param name="i_childAccountId">成员账号id</param> /// <returns></returns> public bool AdminAuthorityMigration(string i_childAccountId) { var pra2 = new { homeId = DB_ResidenceData.Instance.CurrentRegion.id, childAccountId = i_childAccountId }; var requestJson = HttpUtil.GetSignRequestJson(pra2); var result = HttpUtil.RequestHttpsPost(NewAPI.API_Post_AdminAuthorityMigration, requestJson); return result != null && result.Code == StateCode.SUCCESS; } #region 新数据分享 /// <summary> /// 添加分享 HDL_ON/DAL/Server/NewAPI.cs
@@ -115,10 +115,6 @@ /// 过户 /// </summary> public const string API_Post_TransferResidence = "/home-wisdom/app/home/transfer"; /// <summary> /// 管理员权限迁移 /// </summary> public const string API_Post_AdminAuthorityMigration = "/home-wisdom/app/home/ownerConvert"; #endregion
@@ -24,9 +24,6 @@ <Compile Include="$(MSBuildThisFileDirectory)UI\UI0-Stan\Logic\HdlBluetoothIOSLogic.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI0-Stan\Logic\HdlCheckLogic.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI0-Stan\Logic\HdlCommonLogic.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\RoomListManage\Transfer\AdminMigrationMemberConfirmPage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\RoomListManage\Transfer\AdminMigrationMemberListPage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\RoomListManage\Transfer\AdminMigrationResultPage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\RoomListManage\Transfer\TransferingResidencePage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\RoomListManage\Transfer\TransferResidenceResultPage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\DoorLock\DoorLockAlwaysOnManagerPage.cs" /> @@ -112,6 +109,7 @@ <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\FoolHeating\FloorHeatingPageBLL.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\FoolHeating\FloorHeatingPage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Panel\PanelPage.cs" /> <<<<<<< HEAD <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\1ContorlPage\AirFreshControlPage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\1ContorlPage\AcControlPage_AddIrButton.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\1ContorlPage\AcControlPage.cs" /> @@ -139,6 +137,56 @@ <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Light\RGBPage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Light\RelayPage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\1-HomePage\HomePageBLL.cs" /> ======= <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\SearchDevice\SearchDevicePage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\SearchDevice\VoicePanelScenePage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Entity\Device\DeviceModule.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Entity\Device\SBK_SceneListObj.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\SearchDevice\VoicePanelSettingPage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\SearchDevice\VoicePanelSceneListPage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)DAL\Server\NewAPI.cs" /> <Compile Include="$(MSBuildThisFileDirectory)DAL\Server\HttpUtil.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Common\Utlis.cs" /> <Compile Include="$(MSBuildThisFileDirectory)DAL\Server\IMessageCommon.cs" /> <Compile Include="$(MSBuildThisFileDirectory)DAL\Server\NewApiRes.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AccountBindInfo\NewBindAccountPage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AccountBindInfo\NewBindVerificationCodePage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Common\HDLCommon.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Common\Constant.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI0-Public\Widget\TextButton.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI1-Login\SelectServerDialog.cs" /> <Compile Include="$(MSBuildThisFileDirectory)DAL\DriverLayer\Control.cs" /> <Compile Include="$(MSBuildThisFileDirectory)DAL\DriverLayer\Control_TcpClient.cs" /> <Compile Include="$(MSBuildThisFileDirectory)DAL\DriverLayer\Control_TcpServer.cs" /> <Compile Include="$(MSBuildThisFileDirectory)DAL\DriverLayer\Control_Udp.cs" /> <Compile Include="$(MSBuildThisFileDirectory)DAL\DriverLayer\CRC.cs" /> <Compile Include="$(MSBuildThisFileDirectory)DAL\DriverLayer\Packet.cs" /> <Compile Include="$(MSBuildThisFileDirectory)DAL\DriverLayer\Target.cs" /> <Compile Include="$(MSBuildThisFileDirectory)DAL\DriverLayer\UdpSocket.cs" /> <Compile Include="$(MSBuildThisFileDirectory)DAL\DriverLayer\A_Protocol_Common.cs" /> <Compile Include="$(MSBuildThisFileDirectory)DAL\Mqtt\MqttClient.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\MyQRCodePage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI0-Public\Widget\ListCellView.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI0-Public\Widget\UpdateTipDialog.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\MyServerInfoPage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AboutOn\AboutOnPage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AboutOn\FunctionIntroductionPage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AboutOn\ComplaintsPage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI0-Public\Widget\EmptyTipView.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI0-Public\Widget\LineView.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI0-Public\Widget\ConfirmDialog.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI0-Public\Widget\WebViewDialog.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\GetSupport\FAQHelpPage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI0-Public\Widget\ListIconCellView.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\GetSupport\QuestionListPage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\GetSupport\GetSupportPage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\RoomListManage\Transfer\TransferConfirmPage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI0-Public\Widget\ConfirmButton.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\RoomListManage\Transfer\AdminMigrationConfirmPage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\RoomListManage\Transfer\TransferInputPage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\RoomListManage\Transfer\AdminMigrationInputPage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\RoomListManage\Transfer\TransferUserConfirmPage.cs" /> >>>>>>> parent of 3861152e (Merge branch 'tzy2' into newBranch1) <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\1-HomePage\MessageCenterPage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\1-HomePage\HomePage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\3-Intelligence\IntelligencePage.cs" /> HDL_ON/UI/UI0-Stan/Logic/HdlCheckLogic.cs
@@ -46,7 +46,7 @@ /// <param name="addTopFrame">验证界面是否添加头部Frame(只对手势密码和数字密码有效)</param> /// <param name="successEvent">验证成功之后的回调函数,失败不会回调(0:没有设置有验证 1:验证成功）</param> /// <param name="loadPageBeforEvent">加载指定解锁认证界面之前的事件,0:取消当前验证并切换到其他方式,1:数字密码,2:手势密码,3:指纹密码,4:面容ID</param> public void CheckUnlockSecurity(bool addTopFrame, Action<int> successEvent, Action<int> loadPageBeforEvent = null) public void CheckUnlockSecurity(bool addTopFrame, Action<int> successEvent, Action<string> loadPageBeforEvent = null) { //验证指纹和面容id都使用指纹验证 if (UserInfo.Current.appUnlockType.Contains("3") || UserInfo.Current.appUnlockType.Contains("4")) @@ -58,7 +58,7 @@ if (type == TouchIDUtils.TouchIDSupperType.TouchID) { //通知使用指纹验证 loadPageBeforEvent?.Invoke(3); loadPageBeforEvent?.Invoke("3"); //Touch ID验证 TouchIDUtils.Instance.OnHDLTouchIDStateBackEvent += (sender2, e2) => @@ -77,7 +77,7 @@ else if (e2 == TouchIDUtils.TouchIDState.InputPassword) { //通知取消了验证,切换为其他验证 loadPageBeforEvent?.Invoke(0); loadPageBeforEvent?.Invoke("0"); //使用密码或者手势密码解锁认证 this.CheckUnlockSecurityByPassword(addTopFrame, successEvent, loadPageBeforEvent); @@ -108,12 +108,12 @@ /// <param name="addTopFrame">验证界面是否添加头部Frame(只对手势密码和数字密码有效)</param> /// <param name="successEvent">验证成功之后的回调函数,失败不会回调(0:没有设置有验证 1:验证成功）</param> /// <param name="loadPageBeforEvent">加载指定解锁认证界面之前的事件,1:数字密码,2:手势密码,3:指纹密码,4:面容ID</param> private void CheckUnlockSecurityByPassword(bool addTopFrame, Action<int> successEvent, Action<int> loadPageBeforEvent = null) private void CheckUnlockSecurityByPassword(bool addTopFrame, Action<int> successEvent, Action<string> loadPageBeforEvent = null) { if (UserInfo.Current.appUnlockType.Contains("1")) { //通知使用数字密码验证 loadPageBeforEvent?.Invoke(1); loadPageBeforEvent?.Invoke("1"); //显示数字密码解锁认证界面 this.ShowAppNumPasswordSecurityForm(addTopFrame, successEvent); @@ -121,7 +121,7 @@ else if (UserInfo.Current.appUnlockType.Contains("2")) { //通知使用手势密码验证 loadPageBeforEvent?.Invoke(2); loadPageBeforEvent?.Invoke("2"); //显示手势密码解锁认证界面 this.ShowAppGestureSecurityForm(addTopFrame, successEvent); HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/MiniRemoteControl/AddThirdPartyDeviceMenuListPage.cs
@@ -7,7 +7,7 @@ namespace HDL_ON.UI { /// <summary> /// 添加第三方设备的菜单列表界面(已废弃) /// 添加第三方设备的菜单列表界面 /// </summary> public class AddThirdPartyDeviceMenuListPage : EditorCommonForm { HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
@@ -282,11 +282,7 @@ Height = Application.GetRealHeight(65), BackgroundColor = CSS_Color.MainBackgroundColor, }; if (DB_ResidenceData.Instance.CurrentRegion.isOtherShare == false) { //是主账号本人才能显示这个菜单 contentView.AddChidren(administratorPermissionMigrationRow); } //contentView.AddChidren(administratorPermissionMigrationRow); btnAdministratorPermissionMigrationTitle = new Button() { HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePageBLL.cs
@@ -157,8 +157,10 @@ { EventHandler<MouseEventArgs> eventHandler = (sender, e) => { var form = new AdminMigrationConfirmPage(); form.AddForm(); var skipPage = new AdminMigrationConfirmPage(); MainPage.BasePageView.AddChidren(skipPage); skipPage.LoadPage(); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; }; administratorPermissionMigrationRow.MouseUpEventHandler = eventHandler; @@ -174,8 +176,8 @@ { EventHandler<MouseEventArgs> eventHandler = (sender, e) => { var form = new TransferConfirmPage(); form.AddForm(); var from = new TransferConfirmPage(); from.AddForm(); }; transferRow.MouseUpEventHandler = eventHandler; HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/Transfer/AdminMigrationConfirmPage.cs
@@ -1,95 +1,140 @@ using System; using Shared; using HDL_ON.UI.CSS; using HDL_ON.Stan; namespace HDL_ON.UI { /// <summary> /// 管理员权限迁移确认提醒界面 /// </summary> public class AdminMigrationConfirmPage : EditorCommonForm public class AdminMigrationConfirmPage : FrameLayout { #region ■ 变量声明___________________________ #endregion #region ■ 初始化_____________________________ /// <summary> /// 画面显示(底层会固定调用此方法，借以完成画面创建) /// /// </summary> public void ShowForm() { //管理员权限转移 base.SetTitleText(Language.StringByID(StringId.AdminAuthorityTransfer)); FrameLayout bodyView; //初始化中部信息 this.InitMiddleFrame(); public AdminMigrationConfirmPage() { bodyView = this; } /// <summary> /// 初始化中部信息 /// /// </summary> private void InitMiddleFrame() public void LoadPage() { //清空bodyFrame this.ClearBodyFrame(); BackgroundColor = CSS_Color.MainBackgroundColor; //账号自己的头像 var btnHeadImage = new ImageView(); btnHeadImage.X = Application.GetRealWidth(48); btnHeadImage.Y = Application.GetRealHeight(32); btnHeadImage.Width = Application.GetRealWidth(84); btnHeadImage.Height = Application.GetRealWidth(84); btnHeadImage.Radius = (uint)Application.GetRealWidth(42); btnHeadImage.ImagePath = UserInfo.Current.headImagePagePath; bodyFrameLayout.AddChidren(btnHeadImage); new TopViewDiv(bodyView, Language.StringByID(StringId.AdministratorPermissionMigration)).LoadTopView(); //箭头 var btnArrow = new PicViewControl(84, 32); btnArrow.X = btnHeadImage.Right + Application.GetRealWidth(12); btnArrow.Y = Application.GetRealHeight(58); btnArrow.UnSelectedImagePath = "PersonalCenter/Transfer.png"; bodyFrameLayout.AddChidren(btnArrow); //一个默认头像 var btnHead2 = new IconViewControl(102); btnHead2.X = btnArrow.Right + Application.GetRealWidth(3); btnHead2.Y = Application.GetRealHeight(26); btnHead2.UnSelectedImagePath = "PersonalCenter/Head.png"; bodyFrameLayout.AddChidren(btnHead2); //您将转移您的管理员权限给其他成员 this.AddListMsgControls(bodyFrameLayout, Language.StringByID(StringId.AdminAuthorityTransferMag1), CSS_FontSize.SubheadingFontSize, CSS_Color.FirstLevelTitleColor, Application.GetRealHeight(23), btnHead2.Bottom + Application.GetRealHeight(12)); //请注意: var btnAttention = new NormalViewControl(200, 18, true); btnAttention.X = HdlControlResourse.XXLeft; btnAttention.Y = btnHeadImage.Bottom + Application.GetRealHeight(84); btnAttention.TextID = StringId.Attention; btnAttention.TextSize = CSS_FontSize.PromptFontSize_FirstLevel; btnAttention.TextColor = CSS_Color.FirstLevelTitleColor; bodyFrameLayout.AddChidren(btnAttention); //1.该住宅您的管理员数据（云端数据）将全部转移给新的管理员 //2.您的数据将会与目标成员互换，您的权限将变更为目标成员的权限 var listContr = this.AddListMsgControls(bodyFrameLayout, Language.StringByID(StringId.AdminAuthorityTransferMag2), CSS_FontSize.PromptFontSize_FirstLevel, CSS_Color.TextualColor, Application.GetRealHeight(18), btnAttention.Bottom + Application.GetRealHeight(8), TextAlignment.CenterLeft); //确认转移 var btnConfirm = new BottomClickButton(220); btnConfirm.Y = listContr[listContr.Count - 1].Bottom + Application.GetRealHeight(75); btnConfirm.TextID = StringId.ConfirmTransfer2; bodyFrameLayout.AddChidren(btnConfirm); btnConfirm.ButtonClickEvent += (sender, e) => #region 头像 FrameLayout headView = new FrameLayout() { var form = new AdminMigrationMemberListPage(); form.AddForm(); Y = Application.GetRealHeight(72), Height = Application.GetRealHeight(132), }; bodyView.AddChidren(headView); ImageView myHeadImage = new ImageView() { X = Application.GetRealWidth(48), Y = Application.GetRealHeight(96), Width = Application.GetRealWidth(84), Height = Application.GetRealWidth(84), Radius = (uint)Application.GetRealWidth(42), ImagePath = UserInfo.Current.headImagePagePath, Gravity = Gravity.CenterVertical, }; headView.AddChidren(myHeadImage); ImageView transferImage = new ImageView() { X = Application.GetRealWidth(144), Y = Application.GetRealHeight(96), Width = Application.GetRealWidth(84), Height = Application.GetRealWidth(32), ImagePath = "PersonalCenter/Transfer.png", Gravity = Gravity.Center, }; headView.AddChidren(transferImage); ImageView otherHeadImage = new ImageView() { X = Application.GetRealWidth(231), Y = Application.GetRealHeight(96), Width = Application.GetRealWidth(101), Height = Application.GetRealWidth(101), ImagePath = "PersonalCenter/Head.png", Gravity = Gravity.CenterVertical, }; headView.AddChidren(otherHeadImage); #endregion var btnTip = new Button() { Y = headView.Bottom, X = Application.GetRealWidth(16), Width = Application.GetRealWidth(343), Height = Application.GetRealHeight(22), TextAlignment = TextAlignment.Center, TextColor = CSS_Color.FirstLevelTitleColor, TextSize = CSS_FontSize.SubheadingFontSize, Text = "您将转移您的管理员权限给其他HDL账号", }; bodyView.AddChidren(btnTip); //请注意 var btnPleaseNote = new Button() { Y = btnTip.Bottom + Application.GetRealHeight(38), X = Application.GetRealWidth(16), Width = Application.GetRealWidth(343), Height = Application.GetRealHeight(17), TextAlignment = TextAlignment.CenterLeft, TextColor = CSS_Color.FirstLevelTitleColor, TextSize = CSS_FontSize.PromptFontSize_FirstLevel, Text = "请注意：", }; bodyView.AddChidren(btnPleaseNote); //请注意的内容 var btnPleaseNoteStr = new Button() { Y = btnPleaseNote.Bottom + Application.GetRealHeight(8), X = Application.GetRealWidth(16), Width = Application.GetRealWidth(343), Height = Application.GetRealHeight(170), TextAlignment = TextAlignment.TopLeft, TextColor = CSS_Color.TextualColor, TextSize = CSS_FontSize.PromptFontSize_FirstLevel, IsMoreLines = true, Text = "1.该住宅您的管理员数据（云端数据）将全部转移给新的管理员 \n\n2.新的管理员可以选择不保留原有住宅成员的数据,其他成员将会不能使用 \n\n3.在转移后，您若需要成为家庭成员，由新的管理员设置 \n\n4.接收方账号为有效的HDL账号 \n\n5.接收方账号与转移方账号不可为同一个账号 (绑定的其他登录)", }; bodyView.AddChidren(btnPleaseNoteStr); // var btnConfirm = new ConfirmButton() { Y = Application.GetRealHeight(583), Text = "确认转移", }; bodyView.AddChidren(btnConfirm); btnConfirm.MouseUpEventHandler = (sender, e) => { //Utlis.ShowTip("暂不支持"); var skipPage = new AdminMigrationInputPage(); MainPage.BasePageView.AddChidren(skipPage); skipPage.LoadPage(); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; }; } #endregion } } HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/Transfer/AdminMigrationInputPage.cs
New file @@ -0,0 +1,150 @@ using System; using Shared; using HDL_ON.UI.CSS; namespace HDL_ON.UI { /// <summary> /// 管理员转移输入账号界面 /// </summary> public class AdminMigrationInputPage : FrameLayout { /// <summary> /// /// </summary> FrameLayout bodyView; public AdminMigrationInputPage() { bodyView = this; } /// <summary> /// /// </summary> public void LoadPage() { BackgroundColor = CSS_Color.BackgroundColor; new TopViewDiv(bodyView, Language.StringByID(StringId.AdministratorPermissionMigration)).LoadTopView(); #region 账号填写 var accountView = new FrameLayout() { Y = Application.GetRealHeight(72), Height = Application.GetRealHeight(50), BackgroundColor = CSS_Color.MainBackgroundColor }; bodyView.AddChidren(accountView); var btnAccountIcon = new Button() { X = Application.GetRealWidth(16), Gravity = Gravity.CenterVertical, Width = Application.GetMinRealAverage(24), Height = Application.GetMinRealAverage(24), UnSelectedImagePath = "LoginIcon/AccountIcon.png", }; accountView.AddChidren(btnAccountIcon); var etAccount = new EditText() { X = Application.GetRealWidth(52), Width = Application.GetRealWidth(307), TextAlignment = TextAlignment.CenterLeft, TextColor = CSS_Color.FirstLevelTitleColor, TextSize = CSS_FontSize.TextFontSize, PlaceholderTextColor = CSS_Color.PromptingColor1, PlaceholderText = "请输入接收方账号", }; accountView.AddChidren(etAccount); var btnLine = new Button() { BackgroundColor = CSS_Color.DividingLineColor, Height = Application.GetRealHeight(1), Y = accountView.Height - Application.GetRealHeight(1), X = Application.GetRealWidth(16), Width = Application.GetRealWidth(343), }; accountView.AddChidren(btnLine); #endregion #region 账号填写 var accountConfirmView = new FrameLayout() { Y = accountView.Bottom, Height = Application.GetRealHeight(50), BackgroundColor = CSS_Color.MainBackgroundColor }; bodyView.AddChidren(accountConfirmView); var btnAccountConfirmIcon = new Button() { X = Application.GetRealWidth(16), Gravity = Gravity.CenterVertical, Width = Application.GetMinRealAverage(24), Height = Application.GetMinRealAverage(24), UnSelectedImagePath = "LoginIcon/AccountIcon.png", }; accountConfirmView.AddChidren(btnAccountConfirmIcon); var etAccountConfirm = new EditText() { X = Application.GetRealWidth(52), Width = Application.GetRealWidth(307), TextAlignment = TextAlignment.CenterLeft, TextColor = CSS_Color.FirstLevelTitleColor, TextSize = CSS_FontSize.TextFontSize, PlaceholderTextColor = CSS_Color.PromptingColor1, PlaceholderText = "请再次输入接收方账号", }; accountConfirmView.AddChidren(etAccountConfirm); //var btnLine2 = new Button() //{ // BackgroundColor = CSS_Color.DividingLineColor, // Height = Application.GetRealHeight(1), // Y = accountConfirmView.Height - Application.GetRealHeight(1), //}; //accountConfirmView.AddChidren(btnLine2); #endregion var btnTip = new Button() { Y = accountConfirmView.Bottom + Application.GetRealHeight(12), X = Application.GetRealWidth(16), Width = Application.GetRealWidth(343), TextAlignment = TextAlignment.TopLeft, TextColor = CSS_Color.AuxiliaryColor2, TextSize = CSS_FontSize.PromptFontSize_FirstLevel, Text = "*请确认账号无误，在数据转移过程中不可取消操作", IsMoreLines = true }; bodyView.AddChidren(btnTip); var btnConfirm = new ConfirmButton() { Y = Application.GetRealHeight(251), Text = "转移", }; bodyView.AddChidren(btnConfirm); Button btnEmailOption = new Button() { Y = btnConfirm.Bottom + Application.GetRealWidth(6), Width = Application.GetRealWidth(220), Height = Application.GetRealWidth(32), TextSize = CSS_FontSize.TextFontSize, TextColor = CSS_Color.MainColor, Gravity = Gravity.CenterHorizontal, TextAlignment = TextAlignment.Center, Text = "扫描二维码迁移" }; bodyView.AddChidren(btnEmailOption); } } } HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/Transfer/AdminMigrationMemberConfirmPage.cs
File was deleted HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/Transfer/AdminMigrationMemberListPage.cs
File was deleted HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/Transfer/AdminMigrationResultPage.cs
File was deleted HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/Transfer/TransferUserConfirmPage.cs
@@ -99,23 +99,8 @@ //如果设置有安全验证,则需要验证 HdlCheckLogic.Current.CheckUnlockSecurity(true, (div) => { //如果没有设置有安全验证 if (div == 0) { //确认过户{0}的管理员账号给账号{1} string msg = Language.StringByID(StringId.TransferreConfirmMsg2).Replace("{0}", Entity.DB_ResidenceData.Instance.CurrentRegion.homeName); msg = msg.Replace("{1}", btnName.Text); HdlMessageLogic.Current.ShowMassage(ShowMsgType.Confirm, Language.StringByID(StringId.TransferreConfirmMsg2), () => { var form = new TransferingResidenceForm(); form.AddForm(this.accountInfo); }); } else { var form = new TransferingResidenceForm(); form.AddForm(this.accountInfo); } var form = new TransferingResidenceForm(); form.AddForm(this.accountInfo); }); };
