From a023039e525469ef33bf0324d17d3e954e6b29d7 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 16 三月 2021 17:54:20 +0800
Subject: [PATCH] 兼容温总的添加红外宝
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs | 263 ++++++++--------------------------------------------
1 files changed, 41 insertions(+), 222 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
index cfa6492..57fa14e 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
@@ -10,7 +10,6 @@
public PirMain()
{
Tag = "PirMain";
-
}
/// <summary>
/// 涓存椂鍌ㄥ瓨璁惧绫诲瀷鍒楄〃
@@ -28,117 +27,10 @@
middFLayout.Y = Application.GetRealHeight(64);
middFLayout.Height = Application.GetRealHeight(667 - 64);
this.AddChidren(middFLayout);
-
- FrameLayout pirDeviceFLayout = new FrameLayout();
- pirDeviceFLayout.Y = Application.GetRealHeight(12);
- pirDeviceFLayout.X = Application.GetRealWidth(16);
- pirDeviceFLayout.Width = Application.GetRealWidth(343);
- pirDeviceFLayout.Height = Application.GetRealHeight(187);
- pirDeviceFLayout.BackgroundColor = CSS.CSS_Color.view;
- pirDeviceFLayout.Radius = (uint)Application.GetRealHeight(12);
- middFLayout.AddChidren(pirDeviceFLayout);
-
- //璁惧绠＄悊
- Button text1Btn = new Button
- {
- Y = Application.GetRealHeight(11),
- X = Application.GetRealWidth(16),
- Width = Application.GetRealWidth(120),
- Height = Application.GetRealHeight(20),
- TextSize = TextSize.text14,
- TextColor = CSS.CSS_Color.textConfirmColor,
- TextAlignment = TextAlignment.CenterLeft,
- TextID = StringId.shebeigaunli,
- IsBold = true,
- };
- pirDeviceFLayout.AddChidren(text1Btn);
-
-
- Button pirIcon = new Button
- {
- Y = Application.GetRealHeight(47),
- X = Application.GetRealWidth(28),
- Width = Application.GetRealWidth(66),
- Height = Application.GetRealWidth(66),
- UnSelectedImagePath = "PirIcon/Infraredtreasure.png",
- };
- pirDeviceFLayout.AddChidren(pirIcon);
-
- //mini鏅鸿兘閬ユ帶鍣�
- Button text2Btn = new Button
- {
- Y = Application.GetRealHeight(70),
- X = Application.GetRealWidth(112),
- Width = Application.GetRealWidth(120),
- Height = Application.GetRealHeight(20),
- TextSize = TextSize.text14,
- TextColor = CSS.CSS_Color.textTipColor,
- TextAlignment = TextAlignment.CenterLeft,
- Text = "mini鏅鸿兘閬ユ帶鍣�",
- };
- pirDeviceFLayout.AddChidren(text2Btn);
-
- //绾㈠瀹濇暟閲�
- Button numberDeviceBtn = new Button
- {
- Y = Application.GetRealHeight(137),
- X = Application.GetRealWidth(32),
- Width = Application.GetRealWidth(100),
- Height = Application.GetRealHeight(20),
- TextSize = TextSize.text14,
- TextColor = CSS.CSS_Color.textColor,
- TextAlignment = TextAlignment.CenterLeft,
- Text = "1" + Language.StringByID(StringId.ge),
- IsBold = true,
- };
- pirDeviceFLayout.AddChidren(numberDeviceBtn);
- //褰撳墠绾㈠閬ユ帶璁惧
- Button numberDeviceTextBtn = new Button
- {
- Y = numberDeviceBtn.Bottom + Application.GetRealHeight(4),
- X = Application.GetRealWidth(32),
- Width = Application.GetRealWidth(100),
- Height = Application.GetRealHeight(14),
- TextSize = TextSize.text10,
- TextColor = CSS.CSS_Color.textCancelColor,
- TextAlignment = TextAlignment.CenterLeft,
- TextID = StringId.dangqianhongwaishebei,
- };
- pirDeviceFLayout.AddChidren(numberDeviceTextBtn);
- //鎵�鏈夌孩澶栧疂鐨勯仴鎺у櫒鏁伴噺
- Button currDeviceNumberControlBtn = new Button
- {
- Y = Application.GetRealHeight(137),
- X = Application.GetRealWidth(198),
- Width = Application.GetRealWidth(80),
- Height = Application.GetRealHeight(20),
- TextSize = TextSize.text14,
- TextColor = CSS.CSS_Color.textColor,
- TextAlignment = TextAlignment.CenterLeft,
- Text = "1" + Language.StringByID(StringId.ge),
- IsBold = true,
- };
- pirDeviceFLayout.AddChidren(currDeviceNumberControlBtn);
- //宸叉坊鍔犻仴鎺у櫒
- Button currDeviceNumberControlTextBtn = new Button
- {
- Y = currDeviceNumberControlBtn.Bottom + Application.GetRealHeight(4),
- X = Application.GetRealWidth(198),
- Width = Application.GetRealWidth(80),
- Height = Application.GetRealHeight(14),
- TextSize = TextSize.text10,
- TextColor = CSS.CSS_Color.textCancelColor,
- TextAlignment = TextAlignment.CenterLeft,
- TextID = StringId.yitianjiayaokongqi,
- };
- pirDeviceFLayout.AddChidren(currDeviceNumberControlTextBtn);
- ///绾㈠瀹濈偣鍑讳簨浠�
- FrameLayout clickFLayout = new FrameLayout();
- pirDeviceFLayout.AddChidren(clickFLayout);
-
-
+ View.MainView mainView = new View.MainView();
+ mainView.Show(middFLayout);
FrameLayout deviceListFLayout = new FrameLayout();
- deviceListFLayout.Y = pirDeviceFLayout.Bottom + Application.GetRealHeight(12);
+ deviceListFLayout.Y = mainView.pirDeviceFLayout.Bottom + Application.GetRealHeight(12);
deviceListFLayout.X = Application.GetRealWidth(16);
deviceListFLayout.Width = Application.GetRealWidth(343);
deviceListFLayout.Height = Application.GetRealHeight(328);
@@ -172,18 +64,6 @@
Text = "mini鏅鸿兘閬ユ帶鍣�",
};
deviceListFLayout.AddChidren(deviceNameBtn);
- if (Pir.pirDeviceList.Count != 0)
- {
- Pir.currPir = Pir.pirDeviceList[0];
- int sum = 0;
- for (int i = 0; i < Pir.pirDeviceList.Count; i++)
- {
- sum += Pir.pirDeviceList[i].FunctioList.Count;
- }
- deviceNameBtn.Text = Pir.pirDeviceList[0].name;
- numberDeviceBtn.Text = Pir.pirDeviceList.Count.ToString() + Language.StringByID(StringId.ge);
- currDeviceNumberControlBtn.Text = sum.ToString() + Language.StringByID(StringId.ge);
- }
//涓嬫媺鍥炬爣
var dropdownIconBtn = new Button
@@ -195,94 +75,24 @@
UnSelectedImagePath = "PirIcon/dropdown.png",
};
deviceListFLayout.AddChidren(dropdownIconBtn);
+ #endregion
- deviceNameBtn.MouseUpEventHandler += (sender, e) =>
+ if (Pir.pirDeviceList.Count != 0)
{
-
- #region 鍖哄煙寮规鐣岄潰
- FrameLayout fLayout = new FrameLayout
- {
- BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
- };
- this.AddChidren(fLayout);
- fLayout.MouseUpEventHandler += (sender1, e1) =>
- {
- fLayout.RemoveFromParent();
- };
-
- FrameLayout iconFLyout = new FrameLayout
- {
- X = Application.GetRealWidth(205),
- Y = Application.GetRealHeight(314),
- Width = Application.GetRealWidth(160),
- Height = Application.GetRealHeight(21 + 44),
- //BackgroundImagePath = "LogicIcon/bjicon.png",
- };
- fLayout.AddChidren(iconFLyout);
-
- FrameLayout textFLyout = new FrameLayout
- {
- X = Application.GetRealWidth(8),
- Y = Application.GetRealHeight(14),
- Width = Application.GetRealWidth(144),
- Height = Application.GetRealHeight(44),
- };
- VerticalScrolViewLayout vv = new VerticalScrolViewLayout
- {
- X = Application.GetRealWidth(8),
- Y = Application.GetRealHeight(14),
- Width = Application.GetRealWidth(144),
- Height = Application.GetRealHeight(44 * 4),
- };
-
- if (Pir.pirDeviceList.Count > 4)
- {
- iconFLyout.Height = Application.GetRealHeight(21 + 44 * 4);
- iconFLyout.AddChidren(vv);
- iconFLyout.BackgroundImagePath = "PirIcon/4.png";
- }
- else
- {
-
- iconFLyout.AddChidren(textFLyout);
- iconFLyout.Height = Application.GetRealHeight(21 + 44 * Pir.pirDeviceList.Count);
- textFLyout.Height = Application.GetRealHeight(44 * Pir.pirDeviceList.Count);
- iconFLyout.BackgroundImagePath = $"PirIcon/{Pir.pirDeviceList.Count}.png";
- }
- #endregion
-
+ //榛樿绗竴涓孩澶栧疂
+ Pir.currPir = Pir.pirDeviceList[0];
+ int sum = 0;
for (int i = 0; i < Pir.pirDeviceList.Count; i++)
{
- var pirJson = Pir.pirDeviceList[i];
- View.PirNameView pirNameView = new View.PirNameView();
- if (Pir.pirDeviceList.Count > 4)
- {
- vv.AddChidren(pirNameView.FLayoutView());
- }
- else
- {
- pirNameView.frameLayout.Y = Application.GetRealHeight(i * 44);
- textFLyout.AddChidren(pirNameView.FLayoutView());
- }
- pirNameView.btnName.Text = pirJson.name;
- pirNameView.btnClick.Tag = pirJson;
- pirNameView.btnClick.MouseUpEventHandler += (sender2, e2) =>
- {
- fLayout.RemoveFromParent();
- deviceNameBtn.Text = pirJson.name;
- Pir.currPir = pirJson;
-
- };
- if (Pir.pirDeviceList.Count - 1 == i)
- {
- ///鏀瑰彉鏈�鍚庨偅鏉′竴涓嚎鐨勯鑹�,鐣岄潰鏄剧ず鏁堟灉浣滅敤;
- pirNameView.btnLine.BackgroundColor = CSS.CSS_Color.view;
- }
+ //鏌ユ壘
+ sum += Pir.pirDeviceList[i].FunctioList.Count;
}
-
- };
- ///
- clickFLayout.MouseUpEventHandler += (sender, e) =>
+ deviceNameBtn.Text = Pir.pirDeviceList[0].name;
+ mainView.numberDeviceBtn.Text = Pir.pirDeviceList.Count.ToString() + Language.StringByID(StringId.ge);
+ mainView.currDeviceNumberControlBtn.Text = sum.ToString() + Language.StringByID(StringId.ge);
+ }
+ ///璁惧绠＄悊鐨勭偣鍑讳簨浠�
+ mainView.clickBtn.MouseUpEventHandler += (sender, e) =>
{
DeviceSet deviceSet = new DeviceSet();
@@ -292,21 +102,30 @@
if (Pir.currPir != null)
{
deviceNameBtn.Text = Pir.currPir.name;
- deviceNameBtn.Text = Pir.pirDeviceList[0].name;
- numberDeviceBtn.Text = Pir.pirDeviceList.Count.ToString() + Language.StringByID(StringId.ge);
+ mainView.numberDeviceBtn.Text = Pir.pirDeviceList.Count.ToString() + Language.StringByID(StringId.ge);
}
int sum = 0;
for (int i = 0; i < Pir.pirDeviceList.Count; i++)
{
sum += Pir.pirDeviceList[i].FunctioList.Count;
}
- currDeviceNumberControlBtn.Text = sum.ToString() + Language.StringByID(StringId.ge);
+ mainView.currDeviceNumberControlBtn.Text = sum.ToString() + Language.StringByID(StringId.ge);
});
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
- #endregion
+ ///绾㈠鍚嶇О鐨勭偣鍑讳簨浠�
+ deviceNameBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ View.HeigthChangeView heigthChangeView = new View.HeigthChangeView();
+ heigthChangeView.Show(this, Pir.pirDeviceList, (pirJson) =>
+ {
+ deviceNameBtn.Text = pirJson.name;
+ Pir.currPir = pirJson;
+ });
+ };
+
int line = 0;
for (int i = 1, j = 0; i <= 7; i++, j++)
{
@@ -367,11 +186,11 @@
{
if (DeviceTypeList.Count == 0)
{
- GetDeviceTypeList(true,() =>
- {
- DeviceTypeViewClick(if_value);
+ GetDeviceTypeList(true, () =>
+ {
+ DeviceTypeViewClick(if_value);
- });
+ });
}
else
{
@@ -380,14 +199,13 @@
}
};
}
- GetDeviceTypeList(false,() => { });
-
}
/// <summary>
/// 璁惧杩涘叆涓嬩竴绾ф柟娉�
/// </summary>
/// <param name="if_value"></param>
- void DeviceTypeViewClick(int if_value) {
+ private void DeviceTypeViewClick(int if_value)
+ {
var strings = GetTypeString(if_value).Split('-');
var jobDeviceType = DeviceTypeList.Find((c) => c.deviceType == strings[0]);
if (jobDeviceType == null)
@@ -587,7 +405,7 @@
/// </summary>
/// <param name="tag">鏍囪瘑瑕佷笉瑕佹彁绀猴紙true=鎻愮ず锛�</param>
/// <param name="action">鍥炶皟鍑芥暟</param>
- private void GetDeviceTypeList(bool tag,Action action)
+ public void GetDeviceTypeList(bool tag, Action action)
{
PirSend.GetDeviceTypesList(this, (responsePackNew) =>
{
@@ -614,9 +432,10 @@
}
else
{
- if (tag) {
+ if (tag)
+ {
Method method = new Method();
- method.ErrorShow(responsePackNew,"");
+ method.ErrorShow(responsePackNew, "");
}
}
}, "", "璁惧绫诲瀷鍒楄〃");
@@ -624,7 +443,7 @@
/// <summary>
/// 璇诲彇绾㈠璁惧绫诲瀷鐨勫搧鐗屽垪琛�
/// </summary>
- private void GetBrandList(string id, Action<List<Brand>> actionBrand)
+ public void GetBrandList(string id, Action<List<Brand>> actionBrand)
{
List<Brand> brandList = new List<Brand>();
PirSend.GetDeviceTypesList(this, (responsePackNew) =>
@@ -653,7 +472,7 @@
else
{
Method method = new Method();
- method.ErrorShow(responsePackNew,"");
+ method.ErrorShow(responsePackNew, "");
}
}, id, "鍝佺墝鍒楄〃");
}
--
Gitblit v1.8.0