From acb2b278663952ce555b06a2e821f359225f15e0 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 10 七月 2020 09:41:15 +0800
Subject: [PATCH] 备份
---
ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs | 57 +++++++--------------------------------------------------
1 files changed, 7 insertions(+), 50 deletions(-)
diff --git a/Home0630/Shared/Phone/CommonForm/EditorCommonForm.cs b/ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs
old mode 100644
new mode 100755
similarity index 88%
rename from Home0630/Shared/Phone/CommonForm/EditorCommonForm.cs
rename to ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs
index 669e6c7..ff1b7c6
--- a/Home0630/Shared/Phone/CommonForm/EditorCommonForm.cs
+++ b/ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs
@@ -21,15 +21,15 @@
/// <summary>
/// TopMenuFrameLayout
/// </summary>
- public FrameLayout topMenuFrameLayout = null;
+ public NormalFrameLayout topMenuFrameLayout = null;
/// <summary>
/// TopFrameLayout
/// </summary>
- public FrameLayout topFrameLayout = null;
+ public NormalFrameLayout topFrameLayout = null;
/// <summary>
/// bodyFrameLayout
/// </summary>
- public FrameLayout bodyFrameLayout = null;
+ public NormalFrameLayout bodyFrameLayout = null;
/// <summary>
/// 宸︽粦浣胯兘
/// </summary>
@@ -102,14 +102,14 @@
}
//TopMenuFrameLayout鍋氭垚
- topMenuFrameLayout = new FrameLayout();
+ topMenuFrameLayout = new NormalFrameLayout();
topMenuFrameLayout.Height = ControlCommonResourse.TopMenuFrameHeight;
topMenuFrameLayout.BackgroundColor = UserCenterColor.Current.TopFrameLayout;
topMenuFrameLayout.Name = "topMenuFrameLayout";
this.AddChidren(topMenuFrameLayout);
//TopFrameLayout鍋氭垚
- topFrameLayout = new FrameLayout();
+ topFrameLayout = new NormalFrameLayout();
topFrameLayout.Height = ControlCommonResourse.TopFrameHeight;
topFrameLayout.BackgroundColor = UserCenterColor.Current.TopFrameLayout;
topFrameLayout.Y = topMenuFrameLayout.Bottom;
@@ -169,7 +169,7 @@
{
bodyFrameLayout.RemoveAll();
}
- bodyFrameLayout = new FrameLayout();
+ bodyFrameLayout = new NormalFrameLayout();
bodyFrameLayout.Height = ControlCommonResourse.BodyFrameHeight;
bodyFrameLayout.Y = topFrameLayout.Bottom;
bodyFrameLayout.BackgroundColor = UserCenterColor.Current.BodyFrameLayout;
@@ -439,51 +439,8 @@
//绉婚櫎杩斿洖閿�
var back = (BackViewControl)topFrameLayout.GetTagByKey("btnBack");
return back;
- }
-
- #region 鈻� 鏄剧ず閫夋嫨璁惧鐫＄湢鏃堕棿_______________
- /// <summary>
- /// 褰撳墠閫夋嫨鐨勫姛鑳界被鍨嬬储寮�
- /// </summary>
- private int nowSelectNo = 0;
- /// <summary>
- /// 鏄剧ず閫夋嫨璁惧鐫＄湢鏃堕棿鐨勭晫闈�
- /// </summary>
- private void ShowSelectDeviceFunctionListForm()
- {
- //鏄剧ず鍒楄〃
- var listText = new List<string>();
- listText.Add("15s");
- listText.Add("1min");
- listText.Add("5min");
- //鏍囬:閫夋嫨鍔熻兘绫诲瀷
- var title = Language.StringByID(R.MyInternationalizationString.uSelectFunctionType);
-
- var form = new BottomItemSelectForm();
- form.CancelCallEvent = true;//鍏佽鍙栨秷
- form.AddForm(title, listText, nowSelectNo);
- form.FinishSelectEvent += (selectNo) =>
- {
- // if (selectNo == nowSelectNo)
- // {
- // //閫夋嫨鐨勬槸鐩稿悓鐨�
- // return;
- // }
- // //-1:閫夋嫨鍙栨秷
- // this.Text = selectNo == -1 ? string.Empty : listText[selectNo];
- // nowSelectNo = selectNo;
-
- // //璁板綍璧峰綋鍓嶉�夋嫨鐨勫姛鑳界被鍨�
- // this.RefreshDfunctionType();
-
- // //璁惧鏀瑰彉鍔熻兘绫诲瀷鐨勮瘽,涓婚〉闇�瑕侀噸鏂板埛鏂�
- // UserView.UserPage.Instance.RefreshForm = true;
-
- // //璋冪敤鍥炶皟鍑芥暟
- // this.FinishSelectEvent?.Invoke(nowSelectNo);
- };
}
- #endregion
+
#endregion
}
}
--
Gitblit v1.8.0