From 2be70a32d2a8c517bd9868fb60913fcc843e66fe Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 13 五月 2020 11:21:32 +0800
Subject: [PATCH] 上传代码
---
ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs | 113 ++++++++------------------------------------------------
1 files changed, 17 insertions(+), 96 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs b/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
index d4b37b1..198566a 100755
--- a/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
@@ -131,7 +131,7 @@
//搴旇鏄痓ody鍚�
this.bodyFrameLayout = new FrameLayout();
bodyFrameLayout.Y = topFrameLayout.Bottom;
- bodyFrameLayout.Height = Application.GetRealHeight(1549);
+ bodyFrameLayout.Height = this.Height - topFrameLayout.Bottom;
bodyFrameLayout.BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor;
this.AddChidren(bodyFrameLayout);
@@ -182,7 +182,7 @@
//鐩墠涓嶇煡閬撻儹闆煄鐨勮繖涓叿浣撴斁鍦ㄥ摢涓殑浣嶇疆
this.functionSceneAutoBodyView = new FrameLayout();
functionSceneAutoBodyView.Y = frameSwitchBack.Bottom;
- functionSceneAutoBodyView.Height = Application.GetRealHeight(1423);
+ functionSceneAutoBodyView.Height = bodyFrameLayout.Height - frameSwitchBack.Bottom;
bodyFrameLayout.AddChidren(functionSceneAutoBodyView);
//鍦烘櫙,鍔熻兘,鑷姩鍖栫殑鍒囨崲鎺т欢
@@ -334,7 +334,9 @@
var dicGroupDevice = this.GetAllGroupDevice(room);
if (dicGroupDevice.Count == 0)
{
- this.ShowNoFunctionTip();
+ //娌℃湁鍔熻兘{0}璇峰湪涓汉涓績--璁惧绠＄悊澶勬坊鍔�
+ string[] arryMsg = Language.StringByID(R.MyInternationalizationString.NoFunction).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
+ this.ShowNotDataImage(functionSceneBodyView, arryMsg);
return;
}
@@ -431,35 +433,6 @@
}
}
- /// <summary>
- /// 鎻愮ず娌℃湁鍔熻兘
- /// </summary>
- private void ShowNoFunctionTip()
- {
- var noFunction = new Button()
- {
- Y = Application.GetRealHeight(320),
- Width = this.GetPictrueRealSize(757),
- Height = this.GetPictrueRealSize(435),
- UnSelectedImagePath = "Item/NoFunction.png",
- Gravity = Gravity.CenterHorizontal
- };
- functionSceneBodyView.AddChidren(noFunction);
-
- var noFunctionTip = new Button()
- {
- Y = noFunction.Bottom + Application.GetRealHeight(32),
- Height = Application.GetRealHeight(200),
- Width = Application.GetRealWidth(700),
- Gravity = Gravity.CenterHorizontal,
- Text = Language.StringByID(R.MyInternationalizationString.NoFunction).Replace("{\\r\\n}", "\r\n"),
- TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
- TextAlignment = TextAlignment.Center,
- IsMoreLines = true
- };
- functionSceneBodyView.AddChidren(noFunctionTip);
- }
-
#endregion
#region 鈻� 鍒濆鍖栬澶囧垪琛ㄦ帶浠禵________________
@@ -528,6 +501,11 @@
else if (device.Type == DeviceType.FreshAir)
{
cardContr = new Controls.DeviceFreshAirRowControl();
+ }
+ // PM2.5
+ else if (device.Type == DeviceType.PMSensor)
+ {
+ cardContr = new Controls.DevicePmSensorRowControl();
}
//褰╃伅(璋冨厜鍣�)
else if (device.Type == DeviceType.DimmableLight)
@@ -621,7 +599,9 @@
}
if (listScene.Count == 0)
{
- this.ShowNoSceneTip();
+ //娌℃湁鍦烘櫙{0}璇风偣鍑诲彸涓婅娣诲姞
+ string[] arryMsg = Language.StringByID(R.MyInternationalizationString.NoScene).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
+ this.ShowNotDataImage(functionSceneBodyView, arryMsg);
return;
}
@@ -759,36 +739,6 @@
});
}
- /// <summary>
- /// 鏄剧ず娌℃湁鍦烘櫙
- /// </summary>
- private void ShowNoSceneTip()
- {
- var noFunction = new Button()
- {
- Y = Application.GetRealHeight(320),
- Width = this.GetPictrueRealSize(757),
- Height = this.GetPictrueRealSize(435),
- UnSelectedImagePath = "Item/NoFunction.png",
- Gravity = Gravity.CenterHorizontal
- };
- functionSceneBodyView.AddChidren(noFunction);
-
- var noScenceTip = new Button()
- {
- Y = noFunction.Bottom + Application.GetRealHeight(32),
- Height = Application.GetRealHeight(200),
- Width = Application.GetRealWidth(700),
- Gravity = Gravity.CenterHorizontal,
- Text = Language.StringByID(R.MyInternationalizationString.NoScene).Replace("{\\r\\n}", "\r\n"),
- TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
- TextAlignment = TextAlignment.Center,
- IsMoreLines = true
- };
- functionSceneBodyView.AddChidren(noScenceTip);
- }
-
-
#endregion
#region 鈻� 涓�鑸澶囩姸鎬佷笂鎶__________________
@@ -809,16 +759,9 @@
{
//鍒锋柊鍗＄墖淇℃伅
var locadevice = LocalDevice.Current.GetDevice(mainKeys);
- if (report.DeviceStatusReport.CluterID == 513 && report.DeviceStatusReport.AttriBute[0].AttributeId == 28)
- {
- //绌鸿皟鏄壒娈婄殑,瀹冪殑寮�鍏虫槸灞炴�т笂鎶ユ潵鐫�.宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍙嶉
- this.dicDeviceRowControl[mainKeys].SetHadGetResponeResultStatu();
- }
- if (report.DeviceStatusReport.CluterID == 514 && report.DeviceStatusReport.AttriBute[0].AttributeId == 0)
- {
- //鏂伴鏄壒娈婄殑,瀹冪殑寮�鍏虫槸灞炴�т笂鎶ユ潵鐫�.宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍙嶉
- this.dicDeviceRowControl[mainKeys].SetHadGetResponeResultStatu();
- }
+ //宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍙嶉 2020.05.09:鍒犻櫎Ack涓婚
+ this.dicDeviceRowControl[mainKeys].SetHadGetResponeResultStatu();
+ //鍒锋柊鎺т欢
this.dicDeviceRowControl[mainKeys].RefreshControlInfo(locadevice);
}
}, ShowErrorMode.NO);
@@ -836,23 +779,6 @@
bool bolOnline = LocalDevice.Current.CheckDeviceIsOnline(report);
this.dicDeviceRowControl[mainKeys].SetRowOnlineStatu(bolOnline);
return;
- }
-
- }, ShowErrorMode.NO);
- });
-
- //璁惧鎺у埗鍙嶉涓婃姤
- HdlGatewayReceiveLogic.Current.AddAttributeEvent("UserHomeViewDeviceRespone", ReceiveComandDiv.A鑺傜偣鎺у埗鍙嶉, (report) =>
- {
- HdlThreadLogic.Current.RunMain(() =>
- {
- string mainKeys = LocalDevice.Current.GetDeviceMainKeys(report);
- if (this.dicDeviceRowControl.ContainsKey(mainKeys) == true)
- {
- //璁惧鍗＄墖
- var deviceCardContr = this.dicDeviceRowControl[mainKeys];
- //宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍙嶉
- deviceCardContr.SetHadGetResponeResultStatu();
}
}, ShowErrorMode.NO);
@@ -923,14 +849,9 @@
string path1 = string.Empty;
string path2 = string.Empty;
//鑾峰彇鍥剧墖
- LocalDevice.Current.GetDeviceObjectIcon(typeInfo.ConcreteType, ref path1, ref path2);
+ LocalDevice.Current.GetDeviceFunctionTypeMenuIcon(typeInfo.ConcreteType, ref path1, ref path2);
dic[typeInfo.BeloneTextId].IconPath = path1;
dic[typeInfo.BeloneTextId].IconPathSelected = path2;
- if (device.Type == DeviceType.FreshAir)
- {
- dic[typeInfo.BeloneTextId].IconPath = "Device/FreshAirEpoint.png";
- dic[typeInfo.BeloneTextId].IconPathSelected = "Device/FreshAirEpointSelected.png";
- }
dic[typeInfo.BeloneTextId].TextId = typeInfo.BeloneTextId;
}
dic[typeInfo.BeloneTextId].listDeviceKeys.Add(LocalDevice.Current.GetDeviceMainKeys(device));
--
Gitblit v1.8.0