2020-06-016

wxr

2020-06-16 f6fd8acd7c53c44187e70b4709443318a628f4b5

 HDL_ON/UI/UI0-Public/PublicAssmebly.cs

@@ -116,16 +116,23 @@
                X = Application.GetRealWidth(12),
                Width = Application.GetRealWidth(182),
                Text = editParater,
                TextColor = CSS.CSS_Color.FirstLevelTitleColor,
                TextSize = CSS.CSS_FontSize.TextFontSize,
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = CSS_FontSize.TextFontSize,
            };
            editView.AddChidren(etParater);

            etParater.TextChangeEventHandler = (sender, e) => {
                if(etParater.Text.Length > 20)
                {
                    etParater.Text = etParater.Text.Remove(20);
                }
            };

            Button btnLine = new Button()
            {
                Y = Application.GetRealHeight(128),
                Height = Application.GetRealHeight(1),
                BackgroundColor = CSS.CSS_Color.DividingLineColor,
                BackgroundColor = CSS_Color.DividingLineColor,
            };
            contentView.AddChidren(btnLine);

@@ -182,92 +189,6 @@
            };
            EditParaterEvent(btnConfirm, errorId_IsNullOrEmpty, errorId_ContainsPar, baseList, etParater, callBackAction,
                contentView, btnLine, btnBottomLine, btnCancel, editView, dialog);
            //btnConfirm.MouseUpEventHandler += (sender, e) =>
            //{
            //    btnConfirm.IsSelected = false;

            //    if (string.IsNullOrEmpty(etParater.Text.Trim())|| list.Contains(etParater.Text.Trim()))
            //    {
            //        string tipMsgString = "";
            //        if (string.IsNullOrEmpty(etParater.Text.Trim()))
            //        {
            //            tipMsgString = Language.StringByID(errorId_IsNullOrEmpty);
            //        }
            //        else
            //        {
            //            tipMsgString = Language.StringByID(errorId_ContainsPar);
            //        }

            //        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;
            //    }

            //    //需要提示错误信息在窗口弹窗之上的
            //    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();
            //};

        }


@@ -583,7 +504,7 @@
        /// </summary>
        /// <param name="msg"></param>
        /// <param name="isWhite"></param>
        public void TipMsgAutoClose(string msg,bool isWhite)
        public void TipMsgAutoClose(string msg,bool isWhite,int closeTime = 1500)
        {
            Dialog dialog = new Dialog()
            {
@@ -624,7 +545,7 @@
            dialog.Show();

            new Thread(() => {
                Thread.Sleep(1500);
                Thread.Sleep(closeTime);
                Application.RunOnMainThread(() =>
                {
                    dialog.Close();