| HDL-ON_Android/Application.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_Android/Assets/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_iOS/Resources/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/Common/R.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/Transfer/TransferResidenceResultPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/Transfer/TransferingResidencePage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
HDL-ON_Android/Application.cs
@@ -104,8 +104,6 @@ { Language.CurrentLanguage = "English"; } Language.CurrentLanguage = "English"; //获取极光推送ID GetJPushRegistrationID(activity);
@@ -596,7 +596,11 @@ 1151=The account does not exist. 1152=Fail to Transfer Ownership to Yourself 1153=Terminate 1154=正在过户给用户,请稍后... 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 transfer 1158=Please try again 5000=Music 5001=Group @@ -1468,6 +1472,10 @@ 1152=不能自己过户给自己 1153=终止 1154=正在过户给用户,请稍后... 1155=用户{0}已经成为住宅行管理员 1156=该住宅的信息将在您的账号中删除 1157=过户失败 1158=请重新尝试 4000=可视对讲 4001=通话记录 HDL-ON_iOS/Resources/Language.ini
@@ -73,11 +73,11 @@ 72=The address of the residence 73=Floor Management 74=Room Management 75=Administrator migration 76=Administrator privilege migration 75=Admin Migration 76=Privilege Migration 77=Debugging privilege 78=The administrator is migrated to other user. 79=All of the data for the residence is migrated to new user. 79=All residence data are migrated to new user. 80=Allow the staff to visit your home remotely 81=Floor 82=Add floor @@ -585,7 +585,22 @@ 1140=Expire time should not be more than 72 hours 1141=Expire time should not be less than 1 hour 1142=Fail to set, please try again 1143=Fail to verify administrator ID, please log in again account 1144=Your residence is being migrated to other HDL 1145=Note: 1146=1. All of your residence data will be migrate to new user.{0}2. After migration, original member will be{0}automatically unbound from this residence.{0}3. The new account is a valid HDL one.{0}4. The account from receiver cannot be the same{0}as that from migration side. 1147=Confirm 1148=Input receiver's account 1149=Profile 1150=Confirm admin migration from {0} to {1} 1151=The account does not exist. 1152=Fail to Transfer Ownership to Yourself 1153=Terminate 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 transfer 1158=Please try again 5000=Music 5001=Group @@ -1445,6 +1460,22 @@ 1140=失效时间不能大于72小时 1141=失效时间不能小于1小时 1142=常开模式关闭设置失效，请重试 1143=管理员身份验证失败,请重新登录 1144=您的住宅将过户给其他HDL账号 1145=请注意： 1146=1.该住宅您的数据（云端数据）将全部转移给新的户主{0}2.过户后，原有的成员将自动解绑该住宅{0}3.新户主账号为有效的HDL账号{0}4.接收方账号与转移方账号不可为同一个账号 1147=确认过户 1148=请输入接收方账号 1149=个人资料 1150=确认过户{0}的管理员账号给账号{1} 1151=目标账号并不存在 1152=不能自己过户给自己 1153=终止 1154=正在过户给用户,请稍后... 1155=用户{0}已经成为住宅行管理员 1156=该住宅的信息将在您的账号中删除 1157=过户失败 1158=请重新尝试 4000=可视对讲 4001=通话记录 HDL_ON/Common/R.cs
@@ -1086,7 +1086,23 @@ /// <summary> /// 正在过户给用户,请稍后... /// </summary> public const int IsTransferingPleaseWaitting = 1154; public const int IsTransferingPleaseWaitting = 1154; /// <summary> /// 用户{0}已经成为住宅行管理员 /// </summary> public const int CongratulationsXXBecomingNNAdministrator = 1155; /// <summary> /// 该住宅的信息将在您的账号中删除 /// </summary> public const int ResidenceDataWillBeDeletedFromYourAccount = 1156; /// <summary> /// 过户失败 /// </summary> public const int TransferFail = 1157; /// <summary> /// 请重新尝试 /// </summary> public const int PleaseTryAgain = 1158; public const int keshiduijiang = 4000; HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
@@ -282,7 +282,7 @@ Height = Application.GetRealHeight(65), BackgroundColor = CSS_Color.MainBackgroundColor, }; contentView.AddChidren(administratorPermissionMigrationRow); //contentView.AddChidren(administratorPermissionMigrationRow); btnAdministratorPermissionMigrationTitle = new Button() { HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/Transfer/TransferResidenceResultPage.cs
@@ -2,6 +2,7 @@ using Shared; using HDL_ON.UI.CSS; using HDL_ON.Stan; using System.Collections.Generic; namespace HDL_ON.UI { @@ -24,16 +25,16 @@ /// <summary> /// 画面显示(底层会固定调用此方法，借以完成画面创建) /// </summary> /// <param name="i_accountResult">对方账号信息</param> /// <param name="i_accountInfo">用户对象信息</param> /// <param name="i_success">是否成功</param> public void ShowForm(AccountInfoResult i_accountResult, bool i_success) public void ShowForm(AccountInfoResult i_accountInfo, bool i_success) { this.ScrollLeftEnabled = false; //过户 base.SetTitleText(Language.StringByID(StringId.Transfer)); //初始化中部信息 this.InitMiddleFrame(); this.InitMiddleFrame(i_accountInfo, i_success); //移除返回键 base.RemoveBackButton(); @@ -42,14 +43,56 @@ /// <summary> /// 初始化中部信息 /// </summary> private void InitMiddleFrame() /// <param name="i_accountInfo">用户对象信息</param> /// <param name="i_success">是否成功</param> private void InitMiddleFrame(AccountInfoResult i_accountInfo, bool i_success) { //清空bodyFrame this.ClearBodyFrame(); //确认 //图片 var btnPictrue = new PicViewControl(180, 180); btnPictrue.Y = Application.GetRealHeight(32); btnPictrue.Gravity = Gravity.CenterHorizontal; btnPictrue.UnSelectedImagePath = i_success == true ? "Public/TipIcon_Successfully.png" : "Public/TipIcon_Failed.png"; bodyFrameLayout.AddChidren(btnPictrue); List<NormalViewControl> listContr = null; if (i_success == true) { //用户{0}已经成为住宅行管理员 string strMsg = Language.StringByID(StringId.CongratulationsXXBecomingNNAdministrator).Replace("{0}", i_accountInfo.MemberName); listContr = this.AddListMsgControls(bodyFrameLayout, strMsg, CSS_FontSize.SubheadingFontSize, CSS_Color.MainColor, Application.GetRealHeight(24), btnPictrue.Bottom + Application.GetRealHeight(16)); //该住宅的信息将在您的账号中删除 var btnMsg2 = new NormalViewControl(bodyFrameLayout.Width - HdlControlResourse.XXLeft * 2, Application.GetRealHeight(18), false); btnMsg2.Y = listContr[listContr.Count - 1].Bottom + Application.GetRealHeight(8); btnMsg2.TextAlignment = TextAlignment.Center; btnMsg2.Gravity = Gravity.CenterHorizontal; btnMsg2.TextSize = CSS_FontSize.PromptFontSize_FirstLevel; btnMsg2.TextID = StringId.ResidenceDataWillBeDeletedFromYourAccount; bodyFrameLayout.AddChidren(btnMsg2); } else { //过户失败 string strMsg = Language.StringByID(StringId.TransferFail); listContr = this.AddListMsgControls(bodyFrameLayout, strMsg, CSS_FontSize.SubheadingFontSize, CSS_Color.AuxiliaryColor2, Application.GetRealHeight(24), btnPictrue.Bottom + Application.GetRealHeight(16)); //请重新尝试 var btnMsg2 = new NormalViewControl(bodyFrameLayout.Width - HdlControlResourse.XXLeft * 2, Application.GetRealHeight(18), false); btnMsg2.Y = listContr[listContr.Count - 1].Bottom + Application.GetRealHeight(8); btnMsg2.TextAlignment = TextAlignment.Center; btnMsg2.Gravity = Gravity.CenterHorizontal; btnMsg2.TextSize = CSS_FontSize.PromptFontSize_FirstLevel; btnMsg2.TextID = StringId.PleaseTryAgain; bodyFrameLayout.AddChidren(btnMsg2); } //完成 var btnConfirm = new BottomClickButton(220); btnConfirm.TextID = StringId.Complete; btnConfirm.Y = Application.GetRealHeight(337); btnConfirm.TextID = i_success == true ? StringId.Complete : StringId.Retry; bodyFrameLayout.AddChidren(btnConfirm); btnConfirm.ButtonClickEvent += (sender, e) => { HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/Transfer/TransferingResidencePage.cs
@@ -48,31 +48,34 @@ //清空bodyFrame this.ClearBodyFrame(); //住宅的图标 var btnHouseIcon = new PicViewControl(93, 93); btnHouseIcon.Y = Application.GetRealHeight(127); btnHouseIcon.X = Application.GetRealWidth(48); btnHouseIcon.BackgroundColor = CSS_Color.MainColor; bodyFrameLayout.AddChidren(btnHouseIcon); //住宅名字 (以中间为基准,左右间距16) var btnHouseName = new NormalViewControl(bodyFrameLayout.Width / 2 - Application.GetRealWidth(16 * 2), Application.GetRealHeight(48), false); btnHouseName.X = Application.GetRealWidth(16); btnHouseName.Y = btnHouseIcon.Bottom + Application.GetRealHeight(10); btnHouseName.IsBold = true; btnHouseName.IsMoreLines = true; btnHouseName.TextAlignment = TextAlignment.TopCenter; btnHouseName.TextSize = CSS_FontSize.SubheadingFontSize; btnHouseName.Text = Entity.DB_ResidenceData.Instance.CurrentRegion.homeName; bodyFrameLayout.AddChidren(btnHouseName); //主人的图标 var btnAdminIcon = new ImageView(); btnAdminIcon.Y = Application.GetRealHeight(112); btnAdminIcon.X = Application.GetRealWidth(48); btnAdminIcon.Height = this.GetPictrueRealSize(70); btnAdminIcon.Width = this.GetPictrueRealSize(70); btnAdminIcon.Radius = (uint)this.GetPictrueRealSize(70) / 2; btnAdminIcon.ImagePath = UserInfo.Current.headImagePagePath; bodyFrameLayout.AddChidren(btnAdminIcon); //主人名字 (以中间为基准,左右间距16) var btnAdminName = new NormalViewControl((btnAdminIcon.Right + btnAdminIcon.X) - HdlControlResourse.XXLeft * 2, Application.GetRealHeight(48), false); btnAdminName.X = HdlControlResourse.XXLeft; btnAdminName.Y = btnAdminIcon.Bottom + Application.GetRealHeight(10); btnAdminName.IsBold = true; btnAdminName.IsMoreLines = true; btnAdminName.TextAlignment = TextAlignment.TopCenter; btnAdminName.TextSize = CSS_FontSize.SubheadingFontSize; btnAdminName.Text = string.IsNullOrEmpty(UserInfo.Current.userName) == true ? UserInfo.Current.AccountString : UserInfo.Current.userName; bodyFrameLayout.AddChidren(btnAdminName); //头像 var imageByte = ImageUtlis.Current.ReadFile(this.accountResult.MemberHeadIcon); var btnUserIcon = new ImageView(); btnUserIcon.Y = btnHouseIcon.Y; btnUserIcon.X = bodyFrameLayout.Width - Application.GetRealWidth(48) - this.GetPictrueRealSize(93); btnUserIcon.Height = this.GetPictrueRealSize(93); btnUserIcon.Width = this.GetPictrueRealSize(93); btnUserIcon.Radius = (uint)this.GetPictrueRealSize(93) / 2; btnUserIcon.Y = btnAdminIcon.Y; btnUserIcon.X = bodyFrameLayout.Width - Application.GetRealWidth(48) - this.GetPictrueRealSize(70); btnUserIcon.Height = this.GetPictrueRealSize(70); btnUserIcon.Width = this.GetPictrueRealSize(70); btnUserIcon.Radius = (uint)this.GetPictrueRealSize(70) / 2; if (imageByte != null && imageByte.Length > 0) { btnUserIcon.ImageBytes = imageByte; @@ -84,9 +87,9 @@ bodyFrameLayout.AddChidren(btnUserIcon); //昵称 (以中间为基准,左右间距50) var btnName = new NormalViewControl(btnHouseName.Width, btnHouseName.Height, false); btnName.X = bodyFrameLayout.Width - btnHouseName.X - btnHouseName.Width; btnName.Y = btnHouseName.Y; var btnName = new NormalViewControl(btnAdminName.Width, btnAdminName.Height, false); btnName.X = bodyFrameLayout.Width - btnAdminName.X - btnAdminName.Width; btnName.Y = btnAdminName.Y; btnName.IsBold = true; btnName.IsMoreLines = true; btnName.TextAlignment = TextAlignment.TopCenter; @@ -95,11 +98,11 @@ bodyFrameLayout.AddChidren(btnName); //开启连接的假想动画效果线程 this.StartConcetionAnimeteThread(btnHouseIcon.Right + Application.GetRealWidth(10)); this.StartConcetionAnimeteThread(btnAdminIcon.Right + Application.GetRealWidth(16)); //终止 var btnCancel = new BottomClickButton(); btnCancel.Y = Application.GetRealHeight(392); btnCancel.Y = Application.GetRealHeight(519); btnCancel.TextID = StringId.Terminate; bodyFrameLayout.AddChidren(btnCancel); btnCancel.ButtonClickEvent += (sender, e) => @@ -109,7 +112,6 @@ //初始化消息控件 this.InitMsgControl(); } #endregion @@ -123,23 +125,23 @@ { //生成点号图样 int pointXX = XX; int pointWidth = Application.GetRealWidth(6); int pointSpace = Application.GetRealWidth(5); for (int i = 0; i < 7; i++) int pointWidth = Application.GetRealWidth(4); int pointSpace = Application.GetRealWidth(9); for (int i = 0; i < 9; i++) { var btnPoint = new NormalViewControl(pointWidth, Application.GetRealHeight(4), false); btnPoint.Radius = (uint)Application.GetRealHeight(4) / 2; btnPoint.BackgroundColor = 0xffd5d5d5; btnPoint.Y = Application.GetRealHeight(170); var btnPoint = new NormalViewControl(pointWidth, pointWidth, false); btnPoint.Radius = (uint)pointWidth / 2; btnPoint.BackgroundColor = CSS_Color.PromptingColor1; btnPoint.Y = Application.GetRealHeight(144); btnPoint.X = pointXX; bodyFrameLayout.AddChidren(btnPoint); pointXX = btnPoint.Right + Application.GetRealWidth(5); pointXX = btnPoint.Right + pointSpace; } var listPoint = new List<int>(); //跳动的间距 int jumpSpace = pointWidth + pointSpace; for (int i = 0; i < 7; i++) for (int i = 0; i < 9; i++) { //X轴+Index*(图标大小+间距) listPoint.Add(XX + i * jumpSpace); @@ -147,9 +149,9 @@ var btnRound = new IconViewControl(8); btnRound.Radius = (uint)btnRound.IconSize / 2; btnRound.BackgroundColor = CSS_Color.AuxiliaryColor2; btnRound.BackgroundColor = CSS_Color.MainColor; btnRound.X = listPoint[0] - (btnRound.IconSize - pointWidth) / 2; btnRound.Y = Application.GetRealHeight(169); btnRound.Y = Application.GetRealHeight(142); bodyFrameLayout.AddChidren(btnRound); HdlThreadLogic.Current.RunThread(() => @@ -258,7 +260,7 @@ //正在过户给用户,请稍后... var btnMsg = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(20), false); btnMsg.Y = Application.GetRealHeight(300); btnMsg.Y = Application.GetRealHeight(288); btnMsg.TextAlignment = TextAlignment.Center; btnMsg.TextSize = CSS_FontSize.PromptFontSize_FirstLevel; btnMsg.Text = msg;
