From 1e0014f5c2e2fe1cfaaacfb2bebe8adc577bc944 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 14 五月 2020 18:01:26 +0800
Subject: [PATCH] 2020-05-14-3
---
HDL_ON/UI/UI0-Public/PublicAssmebly.cs | 289 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 193 insertions(+), 96 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
index 66f14fc..cb4721e 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
@@ -1,4 +1,5 @@
锘縰sing System;
+using System.Collections.Generic;
using System.Threading;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
@@ -8,12 +9,63 @@
{
public partial class PublicAssmebly
{
+
+ 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)
+ {
+ btnConfirm.MouseUpEventHandler += (sender, e) =>
+ {
+ btnConfirm.IsSelected = false;
+
+ if (string.IsNullOrEmpty(editText.Text.Trim()) || list.Contains(editText.Text.Trim()))
+ {
+ string tipMsgString = "";
+ if (string.IsNullOrEmpty(editText.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,
+ IsMoreLines = true,
+ TextAlignment = TextAlignment.CenterLeft,
+ };
+ contentView.AddChidren(btnTip);
+
+ return;
+ }
+
+
+ callBackAction(editText.Text.Trim());
+ dialog.Close();
+ };
+ }
+
+
/// <summary>
/// 鍔犺浇淇敼鍙傛暟鐨勫皬寮圭獥
/// 淇濆瓨鎸夐挳浜嬩欢闇�瑕佸皢
/// </summary>
/// <param name="callBackAction">鍥炶皟鍑芥暟</param>
- public void LoadDialog_EditParater(int titleId, string editParater, Action<string> callBackAction)
+ public void LoadDialog_EditParater(int titleId, string editParater, Action<string> callBackAction, int errorId_IsNullOrEmpty, int errorId_ContainsPar, List<string> baseList)
{
Dialog dialog = new Dialog()
{
@@ -116,66 +168,106 @@
dialog.Show();
- btnCancel.MouseDownEventHandler += (sender, e) => {
+ btnCancel.MouseDownEventHandler += (sender, e) =>
+ {
btnCancel.IsSelected = true;
};
- btnCancel.MouseUpEventHandler += (sender, e) => {
+ btnCancel.MouseUpEventHandler += (sender, e) =>
+ {
btnCancel.IsSelected = false;
dialog.Close();
};
- btnConfirm.MouseDownEventHandler += (sender, e) => {
+ btnConfirm.MouseDownEventHandler += (sender, e) =>
+ {
btnConfirm.IsSelected = true;
};
- 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);
+ 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()))
- {
- // tipMsgString = Language.StringByID(StringId.FloorNameCannotBeEmpty);
- return;
- }
+ // 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);
+ // }
- 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;
+ // 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);
+ // 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;
- }
+ // return;
+ // }
- callBackAction(etParater.Text.Trim());
- }
+ // //闇�瑕佹彁绀洪敊璇俊鎭湪绐楀彛寮圭獥涔嬩笂鐨�
+ // 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 (titleId == StringId.RoomName || titleId == StringId.ChangeName || titleId == StringId.ResidenceName || titleId == StringId.UesrName)
- {
- if (editParater != etParater.Text.Trim())
- {
- callBackAction(etParater.Text.Trim());
- }
- }
- dialog.Close();
- };
+ // 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();
+ //};
}
@@ -185,7 +277,7 @@
/// 淇濆瓨鎸夐挳浜嬩欢闇�瑕佸皢
/// </summary>
/// <param name="callBackAction">鍥炶皟鍑芥暟</param>
- public void LoadDialog_EditParater(int titleId, int tipTitleId, string editParater, Action<string> callBackAction)
+ 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()
{
@@ -301,66 +393,70 @@
dialog.Show();
- btnCancel.MouseDownEventHandler += (sender, e) => {
+ btnCancel.MouseDownEventHandler += (sender, e) =>
+ {
btnCancel.IsSelected = true;
};
- btnCancel.MouseUpEventHandler += (sender, e) => {
+ btnCancel.MouseUpEventHandler += (sender, e) =>
+ {
btnCancel.IsSelected = false;
dialog.Close();
};
- btnConfirm.MouseDownEventHandler += (sender, e) => {
+ btnConfirm.MouseDownEventHandler += (sender, e) =>
+ {
btnConfirm.IsSelected = true;
};
- 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);
+ 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 (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;
+ // 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);
- 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;
+ // }
- return;
- }
+ // callBackAction(etParater.Text.Trim());
+ // }
- callBackAction(etParater.Text.Trim());
- }
-
- if (titleId == StringId.RoomName || titleId == StringId.ChangeName || titleId == StringId.ResidenceName || titleId == StringId.UesrName || titleId == StringId.addNewList)
- {
- if (editParater != etParater.Text.Trim())
- {
- callBackAction(etParater.Text.Trim());
- }
- }
- dialog.Close();
- };
+ // if (titleId == StringId.RoomName || titleId == StringId.ChangeName || titleId == StringId.ResidenceName || titleId == StringId.UesrName)
+ // {
+ // if (editParater != etParater.Text.Trim())
+ // {
+ // callBackAction(etParater.Text.Trim());
+ // }
+ // }
+ // dialog.Close();
+ //};
}
@@ -531,7 +627,8 @@
dialog.Show();
- new Thread(() => {
+ new Thread(() =>
+ {
Thread.Sleep(1500);
Application.RunOnMainThread(() =>
{
--
Gitblit v1.8.0