From 276757e23a57126d0af9ff734c493961eedeb622 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 30 十二月 2020 17:34:02 +0800
Subject: [PATCH] 2020-12-30-2
---
ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs | 119 ++++++++++++++++++++---------------------------------------
1 files changed, 40 insertions(+), 79 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs
index 6cbfce2..91c65a7 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs
@@ -30,7 +30,7 @@
Common.Logic.CurrentLogic.LogicName = logicName;
if (Common.Logic.CurrentLogic.Conditions.Count == 1)
{
- ConditionView(false, frameLayout);
+ ConditionView(false, frameLayout,null);
}
else
{
@@ -1118,90 +1118,50 @@
/// <summary>
/// 涓庢垨鏉′欢甯冨眬鐣岄潰鐨勬柟娉�
/// </summary>
- /// <param name="edit"></param>
- /// <param name="frameLayout"></param>
- public void ConditionView(bool edit, FrameLayout frameLayout)
+ /// <param name="edit">琛ㄧず鏄惁缂栬緫</param>
+ /// <param name="frameLayout">鏄剧ず鍦ㄥ摢涓晫闈�</param>
+ /// <param name="button">鏄剧ず閫変腑鏂囨湰</param>
+ public void ConditionView(bool edit, FrameLayout frameLayout,Button button)
{
- #region ------缁勫悎鏉′欢鐣岄潰甯冨眬閮ㄥ垎
- var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicTranslucentColor };
- frameLayout.AddChidren(flMain);
- CompleteView completeView = new CompleteView();
- flMain.AddChidren(completeView.Show(2));
- completeView.Btntitle.TextID = MyInternationalizationString.condition;
- EventHandler<MouseEventArgs> clickcancel = (sender, e) =>
- {
- UserView.HomePage.Instance.ScrollEnabled = true;
- flMain.RemoveFromParent();
- };
- flMain.MouseUpEventHandler += clickcancel;
- completeView.Btncancel.MouseUpEventHandler += clickcancel;
-
- //婊¤冻鎵�鏈夋潯浠�
- mFunView allFunView = new mFunView();
- allFunView.frameLayout.Y = Application.GetRealHeight(140 + 20);
- completeView.Show(2).AddChidren(allFunView.Show());
- allFunView.titleBtn.TextID = MyInternationalizationString.Allconditions;
- //婊¤冻鍏朵腑涓�涓潯浠�
- mFunView ormFunview = new mFunView();
- ormFunview.frameLayout.Y = allFunView.frameLayout.Bottom;
- completeView.Show(2).AddChidren(ormFunview.Show());
- ormFunview.titleBtn.TextID = MyInternationalizationString.anycondition;
- ormFunview.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
- #endregion
-
- ///婊¤冻鎵�鏈夋潯浠剁偣鍑讳簨浠�
- allFunView.clickviewBtn.MouseUpEventHandler += (sedner, e) =>
- {
- allFunView.selectedIconBtn.Visible = true;
- ormFunview.selectedIconBtn.Visible = false;
- allFunView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
- ormFunview.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
- };
- ///婊¤冻鍏朵腑涓�涓潯浠剁偣鍑讳簨浠�
- ormFunview.clickviewBtn.MouseUpEventHandler += (sedner, e) =>
- {
- allFunView.selectedIconBtn.Visible = false;
- ormFunview.selectedIconBtn.Visible = true;
- allFunView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
- ormFunview.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
- };
-
+
+ string stateText = "";
if (edit)
{
- if (Common.Logic.CurrentLogic.Relationship == 0)
- {
- allFunView.selectedIconBtn.Visible = true;
- ormFunview.selectedIconBtn.Visible = false;
- allFunView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
- ormFunview.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
- }
- else
- {
- allFunView.selectedIconBtn.Visible = false;
- ormFunview.selectedIconBtn.Visible = true;
- allFunView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
- ormFunview.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
- }
- }
- completeView.Btncomplete.MouseUpEventHandler += (sender, e) =>
- {
- if (!allFunView.selectedIconBtn.Visible && !ormFunview.selectedIconBtn.Visible)
- {
- ///鍙互鎻愮ず鏈�変腑鐘舵�侊紱
- return;
- }
- flMain.RemoveFromParent();
- if (allFunView.selectedIconBtn.Visible)
+ switch (Common.Logic.CurrentLogic.Relationship)
+ {
+ case 0:
+ {
+ stateText = Language.StringByID(MyInternationalizationString.Allconditions);
+ }
+ break;
+ case 1:
+ {
+ stateText = Language.StringByID(MyInternationalizationString.anycondition);
+ }
+ break;
+ }
+
+ }
+
+ PublicInterface publicInterface = new PublicInterface();
+ var list = publicInterface.GetViewList("缁勫悎鏉′欢");
+ publicInterface.SingleSelectionShow(frameLayout, list, MyInternationalizationString.condition, stateText, (str) =>
+ {
+ //鏄剧ず閫変腑鏂囨湰
+ if (button!=null) {
+ button.Text = Language.StringByID(MyInternationalizationString.followingconditions)+ str;
+ }
+ if (str == Language.StringByID(MyInternationalizationString.Allconditions))
{
Common.Logic.CurrentLogic.Relationship = 0;
}
- if (ormFunview.selectedIconBtn.Visible)
+ else if (str == Language.StringByID(MyInternationalizationString.anycondition))
{
- Common.Logic.CurrentLogic.Relationship = 1;
+ Common.Logic.CurrentLogic.Relationship = 1;
}
if (edit)
{
@@ -1209,10 +1169,6 @@
{
Send.LogicControlSwitch(Common.Logic.CurrentLogic);
}
- var logicCommunalPage = new LogicCommunalPage();
- UserView.HomePage.Instance.AddChidren(logicCommunalPage);
- UserView.HomePage.Instance.PageIndex += 1;
- logicCommunalPage.Show(() => { });
}
else
{
@@ -1221,7 +1177,12 @@
UserView.HomePage.Instance.PageIndex += 1;
addLogicPage.Show();
}
- };
+
+ });
+
+
+
+
}
}
--
Gitblit v1.8.0