From 944b87b6bcccb095cd73f13f4410fb20faf48f74 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期三, 25 十二月 2019 11:21:06 +0800
Subject: [PATCH] 2019.12.25
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs | 76 ++++++++++++++++++++++++--------------
1 files changed, 48 insertions(+), 28 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs
index 184c54c..299fbba 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs
@@ -170,27 +170,44 @@
{
//娓呯┖妗屽竷
this.frameTable.RemoveAll();
-
- var listView = new VerticalFrameControl(29);
- listView.Height = frameTable.Height;
- frameTable.AddChidren(listView);
-
HdlThreadLogic.Current.RunMainInThread(() =>
{
- if (this.frameTable == null)
+ if (lookRoom.SceneUIList.Count == 0)
{
+ //杩樻病鏈夋坊鍔犲満鏅摝
+ this.ShowNotDataImage(frameTable, Language.StringByID(R.MyInternationalizationString.uDoNotHadAddScenceMsg));
return;
}
+ var listView = new VerticalFrameControl(29);
+ listView.Height = frameTable.Height;
+ frameTable.AddChidren(listView);
+
foreach (var data in lookRoom.SceneUIList)
{
var frameContr = new FrameLayout();
frameContr.Height = Application.GetRealHeight(470);
+ frameContr.Gravity = Gravity.CenterHorizontal;
listView.AddChidrenFrame(frameContr);
+
//鍦烘櫙鍥剧墖
- var btnPic = new PicViewControl(878, 470, true);
- btnPic.Gravity = Gravity.CenterHorizontal;
- btnPic.UnSelectedImagePath = data.IconPath;
+ var btnPic = new ImageView();
+ btnPic.X = Application.GetRealWidth(179);
+ btnPic.Width = Application.GetRealWidth(844);
+ btnPic.Height = Application.GetRealHeight(420);
+ btnPic.ImagePath = data.IconPath;
+ btnPic.Radius = 8;
frameContr.AddChidren(btnPic);
+
+ var btnName = new NormalViewControl(251, 282, true);
+ btnName.X = ControlCommonResourse.XXLeft;
+ btnName.Y = Application.GetRealHeight(58);
+ btnName.BackgroundColor = 0xff333333;
+ btnName.Radius = 8;
+ btnName.Text = data.Name;
+ btnName.TextSize = 15;
+ btnName.TextColor = UserCenterColor.Current.White;
+ btnName.TextAlignment = TextAlignment.Center;
+ frameContr.AddChidren(btnName);
}
});
}
@@ -207,27 +224,30 @@
//娓呯┖妗屽竷
this.frameTable.RemoveAll();
- var frameBack = new FrameLayout();
- frameBack.X = ControlCommonResourse.XXLeft;
- frameBack.BackgroundColor = UserCenterColor.Current.White;
- frameBack.Width = bodyFrameLayout.Width;
- frameBack.Height = Application.GetRealHeight(1650);
- frameBack.Radius = (uint)Application.GetMinRealAverage(20);
- frameTable.AddChidren(frameBack);
-
- var listView = new VerticalListControl(23);
- listView.Y = Application.GetRealHeight(23);
- listView.Height = Application.GetRealHeight(1549 - 23);
- frameBack.AddChidren(listView);
-
HdlThreadLogic.Current.RunMainInThread(() =>
{
- if (listView == null)
- {
- return;
- }
//鑾峰彇鍒嗙粍鍚庣殑璁惧鍒楄〃
var dicGroupDevice = this.GetAllGroupDevice();
+ if (dicGroupDevice.Count == 0)
+ {
+ //杩樻病鏈夋坊鍔犺澶囧摝
+ this.ShowNotDataImage(frameTable, Language.StringByID(R.MyInternationalizationString.uDoNotHadAddDeviceMsg));
+ return;
+ }
+
+ var frameBack = new FrameLayout();
+ frameBack.X = ControlCommonResourse.XXLeft;
+ frameBack.BackgroundColor = UserCenterColor.Current.White;
+ frameBack.Width = bodyFrameLayout.Width;
+ frameBack.Height = Application.GetRealHeight(1650);
+ frameBack.Radius = 20;
+ frameTable.AddChidren(frameBack);
+
+ var listView = new VerticalListControl(23);
+ listView.Y = Application.GetRealHeight(23);
+ listView.Height = Application.GetRealHeight(1549 - 23);
+ frameBack.AddChidren(listView);
+
var dicData = new Dictionary<string, DeviceRowInfo>();
var listGwId = new List<string>();
foreach (var textId in dicGroupDevice.Keys)
@@ -370,7 +390,7 @@
/// <param name="dicData">浠ュ洖璺綔涓虹储寮曞幓鎸囧畾瀵硅薄</param>
private void StartCheckDeviceOnline(VerticalListControl listView, List<string> listGwId, Dictionary<string, DeviceRowInfo> dicData)
{
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
for (int i = 0; i < listGwId.Count; i++)
{
@@ -380,7 +400,7 @@
}
//杩欓噷涓昏鍙槸鑾峰彇鍦ㄧ嚎鐘舵��
var zbway = HdlGatewayLogic.Current.GetLocalGateway(listGwId[i]);
- var result = await Common.LocalDevice.Current.GetDeviceListFromGateway(zbway, false, (device) =>
+ var result = Common.LocalDevice.Current.GetDeviceListFromGateway(zbway, false, (device) =>
{
string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);
if (listView.Parent == null)
--
Gitblit v1.8.0