请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

 ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs

old mode 100644
new mode 100755
File was renamed from ZigbeeApp20200414/Shared/Phone/Device/Logic/AddLogicPage.cs
@@ -27,7 +27,7 @@
            var middle = new FrameLayout
            {
                Y = view.topRowLayout.Bottom,
                Height = Application.GetRealHeight(1925 - 184),
                Height = Application.GetRealHeight(Method.H - 184),
                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
            };
            this.AddChidren(middle);
@@ -335,8 +335,7 @@
            #endregion
            string strname = "";
            //到达地点点击事件
            athomeView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
            {
            athomeView.clickviewBtn.MouseUpEventHandler += (sender, e) => {

                strname = athomeView.titleBtn.Text;
                leaveView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
@@ -345,8 +344,7 @@
                athomeView.selectedIconBtn.Visible = true;
            };
            //离开地点点击事件
            leaveView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
            {
            leaveView.clickviewBtn.MouseUpEventHandler += (sender, e) => {
                strname = leaveView.titleBtn.Text;
                leaveView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                athomeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
@@ -521,8 +519,7 @@
            timeView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
            #endregion
            //立即执行点击事件
            timepointView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
            {
            timepointView.clickviewBtn.MouseUpEventHandler += (sender, e) => {

                timeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
                timepointView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
@@ -530,8 +527,7 @@
                timepointView.selectedIconBtn.Visible = true;
            };
            //时间范围点击事件
            timeView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
            {
            timeView.clickviewBtn.MouseUpEventHandler += (sender, e) => {
                timeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                timepointView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
                timeView.selectedIconBtn.Visible = true;