From 2bec9c838d2d688025698de8ec1de401ffd7dd1f Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期二, 11 八月 2020 14:13:55 +0800 Subject: [PATCH] 20200811 --- HDL_ON/UI/UI0-Public/PublicAssmebly.cs | 196 +----------------------------------------------- 1 files changed, 6 insertions(+), 190 deletions(-) diff --git a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs index 4fd89a5..a358172 100644 --- a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs +++ b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs @@ -11,7 +11,7 @@ { void EditParaterEvent(Button btnConfirm, int errorId_IsNullOrEmpty, int errorId_ContainsPar, List<string> list, EditText editText, Action<string> callBackAction, - FrameLayout contentView, Button btnLine, Button btnBottomLine, Button btnCancel, FrameLayout editView, Dialog dialog) + FrameLayout contentView, Button btnLine, Button btnBottomLine, Button btnCancel, FrameLayout editView, Dialog dialog,int titleId) { var btnTip = new Button() @@ -31,6 +31,10 @@ //btnConfirm.IsSelected = false; if (string.IsNullOrEmpty(editText.Text.Trim()) || list.Contains(editText.Text.Trim())) { + if(titleId == StringId.ModifyMemberNickname) + { + return; + } string tipMsgString = ""; if (string.IsNullOrEmpty(editText.Text.Trim())) { @@ -189,196 +193,8 @@ // btnConfirm.IsSelected = true; //}; EditParaterEvent(btnConfirm, errorId_IsNullOrEmpty, errorId_ContainsPar, baseList, etParater, callBackAction, - contentView, btnLine, btnBottomLine, btnCancel, editView, dialog); + contentView, btnLine, btnBottomLine, btnCancel, editView, dialog,titleId); } - - - ///// <summary> - ///// 鍔犺浇淇敼鍙傛暟鐨勫皬寮圭獥 - ///// 淇濆瓨鎸夐挳浜嬩欢闇�瑕佸皢 - ///// </summary> - ///// <param name="callBackAction">鍥炶皟鍑芥暟</param> - //public void LoadDialog_EditParater(int titleId,int tipTitleId, string editParater, Action<string> callBackAction, int errorId_IsNullOrEmpty, int errorId_ContainsPar, List<string> baseList) - //{ - // Dialog dialog = new Dialog() - // { - // BackgroundColor = CSS_Color.DialogTransparentColor1, - // }; - - // FrameLayout contentView = new FrameLayout() - // { - // Gravity = Gravity.Center, - // Width = Application.GetRealWidth(270), - // Height = Application.GetRealHeight(192), - // BackgroundColor = CSS.CSS_Color.MainBackgroundColor, - // BorderColor = 0x00000000, - // BorderWidth = 0, - // Radius = (uint)Application.GetMinRealAverage(10), - // }; - // dialog.AddChidren(contentView); - - // Button btnTitle = new Button() - // { - // Y = Application.GetRealHeight(10), - // Height = Application.GetRealHeight(42), - // TextColor = CSS.CSS_Color.MainColor, - // TextSize = CSS.CSS_FontSize.SubheadingFontSize, - // TextAlignment = TextAlignment.Center, - // IsBold = true, - // TextID = titleId, - // }; - // contentView.AddChidren(btnTitle); - - // Button btnTipTitle = new Button() - // { - // Gravity = Gravity.CenterHorizontal, - // Y = btnTitle.Bottom + Application.GetRealHeight(8), - // Width = Application.GetRealWidth(222), - // Height = Application.GetRealHeight(17+16), - // TextID = tipTitleId, - // TextAlignment = TextAlignment.CenterLeft, - // TextColor = CSS_Color.TextualColor, - // TextSize = CSS_FontSize.PromptFontSize_FirstLevel, - // }; - // contentView.AddChidren(btnTipTitle); - - // FrameLayout editView = new FrameLayout() - // { - // Gravity = Gravity.CenterHorizontal, - // Y = btnTipTitle.Bottom, - // Width = Application.GetRealWidth(222), - // Height = Application.GetRealHeight(40), - // BackgroundColor = CSS.CSS_Color.BackgroundColor, - // BorderColor = 0x00000000, - // BorderWidth = 0, - // Radius = (uint)Application.GetMinRealAverage(4), - // }; - // contentView.AddChidren(editView); - - // EditText etParater = new EditText() - // { - // X = Application.GetRealWidth(12), - // Width = Application.GetRealWidth(182), - // Text = editParater, - // TextColor = CSS.CSS_Color.FirstLevelTitleColor, - // TextSize = CSS.CSS_FontSize.TextFontSize, - // }; - // editView.AddChidren(etParater); - - // Button btnLine = new Button() - // { - // Y = Application.GetRealHeight(153), - // Width = Application.GetRealWidth(270/2), - // Height = Application.GetRealHeight(1), - // BackgroundColor = CSS_Color.DividingLineColor, - // }; - // contentView.AddChidren(btnLine); - - // Button btnCancel = new Button() - // { - // Y = btnLine.Bottom, - // Width = Application.GetRealWidth(134), - // Height = Application.GetRealHeight(43+1), - // TextAlignment = TextAlignment.Center, - // TextColor = CSS_Color.TextualColor, - // TextSize = CSS_FontSize.SubheadingFontSize, - // //SelectedTextColor = CSS_Color.MainBackgroundColor, - // //SelectedBackgroundColor = CSS_Color.MainColor, - // TextID = StringId.Cancel, - // }; - // contentView.AddChidren(btnCancel); - - // Button btnBottomLine = new Button() - // { - // X = btnCancel.Right, - // Y = btnLine.Bottom, - // Height = Application.GetRealHeight(43), - // Width = Application.GetRealWidth(1), - // BackgroundColor = CSS_Color.DividingLineColor, - // }; - // //contentView.AddChidren(btnBottomLine); - - // Button btnConfirm = new Button() - // { - // X = btnBottomLine.Right, - // Y = btnLine.Y, - // Width = Application.GetRealWidth(135), - // Height = Application.GetRealHeight(43), - // TextAlignment = TextAlignment.Center, - // //TextColor = CSS_Color.TextualColor, - // //TextSize = CSS_FontSize.SubheadingFontSize, - // TextColor = CSS_Color.MainBackgroundColor, - // BackgroundColor = CSS_Color.MainColor, - // TextID = StringId.Confirm, - // }; - // contentView.AddChidren(btnConfirm); - - // dialog.Show(); - - // //btnCancel.MouseDownEventHandler += (sender, e) => { - // // btnCancel.IsSelected = true; - // //}; - // btnCancel.MouseUpEventHandler += (sender, e) => { - // //btnCancel.IsSelected = false; - // dialog.Close(); - // }; - // //btnConfirm.MouseDownEventHandler += (sender, e) => { - // // btnConfirm.IsSelected = true; - // //}; - // EditParaterEvent(btnConfirm, errorId_IsNullOrEmpty, errorId_ContainsPar, baseList, etParater, callBackAction, - // contentView, btnLine,btnBottomLine, btnCancel, editView, dialog); - // //btnConfirm.MouseUpEventHandler += (sender, e) => - // //{ - // // btnConfirm.IsSelected = false; - // // //闇�瑕佹彁绀洪敊璇俊鎭湪绐楀彛寮圭獥涔嬩笂鐨� - // // if ((titleId == StringId.EditFloorName && etParater.Text.Trim() != editParater) || titleId == StringId.AddFloors) - // // { - // // var tipMsgString = titleId == StringId.EditFloorName ? Language.StringByID(StringId.AddFloorFailed_FloorAlreadyExist) : Language.StringByID(StringId.AddFloorFailed_FloorAlreadyExist); - - // // if (string.IsNullOrEmpty(etParater.Text.Trim())) - // // { - // // tipMsgString = Language.StringByID(StringId.FloorNameCannotBeEmpty); - // // return; - // // } - - // // if (DB_ResidenceData.residenceData.floors.Contains(etParater.Text.Trim())) - // // { - // // contentView.Height = Application.GetRealHeight(183); - // // btnLine.Y = Application.GetRealHeight(139); - // // btnBottomLine.Y = btnLine.Bottom; - // // btnCancel.Y = btnLine.Bottom; - // // btnConfirm.Y = btnLine.Bottom; - - // // var btnTip = new Button() - // // { - // // X = editView.X, - // // Y = editView.Bottom, - // // Width = Application.GetRealWidth(182), - // // Height = Application.GetRealHeight(30), - // // Text = tipMsgString, - // // TextColor = CSS_Color.WarningColor, - // // TextSize = CSS_FontSize.TextFontSize, - // // }; - // // contentView.AddChidren(btnTip); - - // // return; - // // } - - // // callBackAction(etParater.Text.Trim()); - // // } - - // // if (titleId == StringId.RoomName || titleId == StringId.ChangeName || titleId == StringId.ResidenceName || titleId == StringId.UesrName) - // // { - // // if (editParater != etParater.Text.Trim()) - // // { - // // callBackAction(etParater.Text.Trim()); - // // } - // // } - // // dialog.Close(); - // //}; - - //} - /// <summary> /// 鍔犺浇鎻愮ず寮圭獥 -- Gitblit v1.8.0