From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"

---
 HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs |  135 +++++++++++++++++++++++++++++---------------
 1 files changed, 89 insertions(+), 46 deletions(-)

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
index 5f5c102..ef3bb73 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
@@ -52,6 +52,9 @@
             viewLayout.AddChidren(addInputTextView.FLayoutView(46, 12));
             ///婊¤冻浠ヤ笅鏉′欢鐨刅iew
             LogicView.LogicTypeTitleView titleCondition = new LogicView.LogicTypeTitleView();
+            titleCondition.btnText.Width = Application.GetRealWidth(300);
+            titleCondition.btnText.Height = Application.GetRealHeight(28);
+            titleCondition.btnText.IsMoreLines = true;
             titleCondition.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
             titleCondition.btnText.TextID = StringId.andCondition;
             viewLayout.AddChidren(titleCondition.FLayoutView());
@@ -111,24 +114,35 @@
             #region  鎵ц鎺ㄩ�� 鍙戦�侀�氱煡
             ///涓婁笅闂撮殧12鍍忕礌
             viewLayout.AddChidren(new FrameLayout { Height = Application.GetRealHeight(12) });
-            /////鎵ц鎺ㄩ�乮ew
-            //LogicView.LogicTypeTitleView push = new LogicView.LogicTypeTitleView();
-            //push.frameLayout.Height = Application.GetRealHeight(50);
-            //push.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
-            //push.btnText.TextID = StringId.push;
-            //push.btnNextIcon.Width = Application.GetMinRealAverage(36);
-            //push.btnNextIcon.Height = Application.GetMinRealAverage(36);
-            //push.btnNextIcon.X = Application.GetRealWidth(305);
-            //push.btnNextIcon.UnSelectedImagePath = "LogicIcon/off.png";
-            //push.btnNextIcon.SelectedImagePath = "LogicIcon/on.png";
-            //viewLayout.AddChidren(push.FLayoutView());
-            /////鍙戦�侀�氱煡View        
-            //LogicView.LogicTypeTitleView notification = new LogicView.LogicTypeTitleView();
-            //notification.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerBottomLeft | HDLUtils.RectCornerBottomRight);
-            //notification.btnText.TextID = StringId.notification;
-            //viewLayout.AddChidren(notification.FLayoutView());
-            /////涓婁笅闂撮殧62鍍忕礌
-            //viewLayout.AddChidren(new FrameLayout { Height = Application.GetRealHeight(62) });
+            ///鎵ц鎺ㄩ�乮ew
+            LogicView.LogicTypeTitleView push = new LogicView.LogicTypeTitleView();
+            push.frameLayout.Height = Application.GetRealHeight(50);
+            push.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
+            push.btnText.TextID = StringId.push;
+            push.btnNextIcon.Width = Application.GetRealWidth(36);
+            push.btnNextIcon.Height = Application.GetRealWidth(36);
+            push.btnNextIcon.X = Application.GetRealWidth(305);
+            push.btnNextIcon.UnSelectedImagePath = "LogicIcon/off.png";
+            push.btnNextIcon.SelectedImagePath = "LogicIcon/on.png";
+            push.btnClick.Width = Application.GetRealWidth(305);
+            viewLayout.AddChidren(push.FLayoutView());
+            ///鍙戦�侀�氱煡View        
+            LogicView.LogicTypeTitleView notification = new LogicView.LogicTypeTitleView();
+            notification.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerBottomLeft | HDLUtils.RectCornerBottomRight);
+            notification.btnText.TextID = StringId.notification;
+            notification.btnLine.BackgroundColor = CSS.CSS_Color.textWhiteColor;
+            viewLayout.AddChidren(notification.FLayoutView());
+            //鏄剧ず涔嬪墠鎺ㄩ�佸紑鍏崇姸鎬�
+            if (Logic.currlogic.noticeConfig.enable)
+            {
+                push.btnNextIcon.IsSelected = true;
+            }
+            else
+            {
+                push.btnNextIcon.IsSelected = false;
+            }
+            ///涓婁笅闂撮殧62鍍忕礌
+            viewLayout.AddChidren(new FrameLayout { Height = Application.GetRealHeight(40) });
             #endregion
 
             #region  淇濆瓨
@@ -176,10 +190,40 @@
             {
                 DateMethod(cyclicTitle.btnText);
             };
+            ///鏄惁瑕佹帹閫佺偣鍑讳簨浠�
+            push.btnNextIcon.MouseUpEventHandler += (sender, e) =>
+            {
+                //璐﹀彿鍒楄〃涓虹┖榛樿鎺ㄩ�佸綋鍓嶈处鍙�
+                if (Logic.currlogic.pushConfigs.Count == 0)
+                {
+                    //鍒濆鍖栧璞�
+                    PushConfigs pushConfigs = new PushConfigs();
+                    //榛樿娣诲姞鎺ㄩ�佸綋鍓嶈处鍙�
+                    pushConfigs.pushTarget.Add(UserInfo.Current.ID);
+                    Logic.currlogic.pushConfigs.Add(pushConfigs);
+                }
+                push.btnNextIcon.IsSelected = !push.btnNextIcon.IsSelected;
+                if (push.btnNextIcon.IsSelected)
+                {
+                    Logic.currlogic.noticeConfig.enable = true;
+                }
+                else
+                {
+                    Logic.currlogic.noticeConfig.enable = false;
+                }
+            };
+            ///杈撳叆鎺ㄩ�佹枃鏈�
+            notification.btnClick.MouseUpEventHandler += (sender, e) =>
+            {
+                InputPushText inputPushText = new InputPushText();
+                MainPage.BasePageView.AddChidren(inputPushText);
+                inputPushText.Show();
+                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+            };
             ///淇濆瓨鐐瑰嚮浜嬩欢
             saveView.btnClick.MouseUpEventHandler += (sender, e) =>
             {
-                if (Logic.currlogic.input.Count == 0&& Logic.currlogic.output.Count == 0)
+                if (Logic.currlogic.input.Count == 0 && Logic.currlogic.output.Count == 0)
                 {
                     new LogicView.TipPopView().TipBox(StringId.tip, StringId.conditioncNullOrtargetNull);
                     return;
@@ -204,7 +248,8 @@
                     {
                         list.Add(logic.name);
                     }
-                    new LogicView.TipPopView().InputBox(StringId.editName, InterfaceDsplaysLogic.GetLogicName(Logic.currlogic), StringId.nameNull, StringId.NameAlreadyExists, list, (logicName) =>
+                    new LogicView.TipPopView().InputBox(StringId.editName, InpOrOutLogicMethod.GetLogicName(Logic.currlogic), StringId.nameNull, StringId.NameAlreadyExists, list, (logicName, view
+                        ) =>
                     {
                         Logic.currlogic.name = logicName;
                         Logic.currlogic.sid = LogicMethod.NewSid();
@@ -267,7 +312,7 @@
                         })
                         { IsBackground = true }.Start();
 
-                    });
+                    }, () => { });
 
                 }
                 else
@@ -297,7 +342,7 @@
                                 {
                                     new LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.gatewayNotOnline));
                                 }
-                                else 
+                                else
                                 {
                                     new LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.saveFail));
                                 }
@@ -457,33 +502,30 @@
         /// <param name="button">鏄剧ず鏂囨湰</param>
         public void WeekMethod(FrameLayout fLayout, Button button)
         {
-            List<string> weekStr = new List<string> {
-             Language.StringByID(StringId.monday),
-             Language.StringByID(StringId.tuesday),
-             Language.StringByID(StringId.wednesday),
-             Language.StringByID(StringId.thursday),
-             Language.StringByID(StringId.friday),
-             Language.StringByID(StringId.saturday),
-             Language.StringByID(StringId.sunday),
-            };
-
             //瀹氫箟涓�涓眬閮╳eekList鍒楄〃鐢ㄦ潵璁板綍閫変腑鏁版嵁;
             List<string> weekStateList = new List<string>();
-            weekStateList.Clear();
+
+            PublicInterface weekView = new PublicInterface();
             if (Logic.currlogic.cycle.type == "week")
             {
-                var list = InterfaceDsplaysLogic.GetWeekString(Logic.currlogic.cycle.value, "int");
+                //鏁版嵁杞崲
+                var list = weekView.GetWeekString(Logic.currlogic.cycle.value, "int");
                 //鍔犺浇涔嬪墠淇濆瓨鐨勬暟鎹�
                 weekStateList.AddRange(list);
             }
-            PublicInterface weekView = new PublicInterface();
-            weekView.MultiSelectShow(fLayout, weekStr, Language.StringByID(StringId.cyclic), weekStateList
+            var weekListStr = weekView.GetViewList("week");
+            weekView.MultiSelectShow(fLayout, weekListStr, Language.StringByID(StringId.cyclic), weekStateList
                , (list) =>
                {
-                   var statelist = InterfaceDsplaysLogic.GetWeekString(list, "str");
+
+                   //閫変腑鏁版嵁澶勭悊
+                   var statelist = weekView.GetWeekString(list, "str");
+                   string textStr = MainView.GetWeekString(statelist);
+                   //鏄剧ず閫変腑鏁版嵁
+                   button.Text = textStr;
+                   //灏佽鏁版嵁
                    Logic.currlogic.cycle.type = "week";
                    Logic.currlogic.cycle.value = statelist;
-                   button.Text = MainView.GetWeekString(statelist);
 
                });
         }
@@ -498,9 +540,13 @@
             PublicInterface weekView = new PublicInterface();
             weekView.MonSelectShow(fLayout, Logic.currlogic, (monList) =>
                 {
+                    //閫変腑鏁版嵁澶勭悊
+                    string textStr = MainView.GetMonString(monList);
+                    //鏄剧ず閫変腑鏁版嵁
+                    button.Text = textStr;
+                    //灏佽鏁版嵁
                     Logic.currlogic.cycle.type = "mon";
                     Logic.currlogic.cycle.value = monList;
-                    button.Text = MainView.GetMonString(monList);
                 });
 
         }
@@ -510,19 +556,17 @@
         /// <param name="button">鏄剧ず鏂囨湰</param>
         public void AndOrMethod(Button button)
         {
-            List<string> strList = new List<string> {
-             Language.StringByID(StringId.andCondition),
-             Language.StringByID(StringId.orCondition),
-            };
+
             ///涔嬪墠鐨勭姸鎬佹枃鏈�
             string currCondition = button.Text;
-
             PublicInterface conditionView = new PublicInterface();
+            var strList = conditionView.GetViewList("andor");
             conditionView.SingleSelectionShow(this, strList, Language.StringByID(StringId.meetTheCondition), currCondition
                , (stateValue) =>
                {
                    //鐣岄潰鏄剧ず閫変腑鍊�
                    button.Text = stateValue;
+                   //灏佽鏁版嵁
                    if (stateValue == Language.StringByID(StringId.orCondition))
                    {
                        Logic.currlogic.relation = "or";
@@ -536,8 +580,7 @@
 
 
         }
-       
-       
+      
 
     }
 }

--
Gitblit v1.8.0