From e96e11d6f8b965ea522c983e040d41e3b9ef105a Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 18 五月 2020 21:33:19 +0800
Subject: [PATCH] 2020-05-18-4
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs | 146 ++++++++++++++++++++++++------------------------
1 files changed, 73 insertions(+), 73 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs
index 7098e3d..3cf0c4f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using Microsoft.AppCenter.Crashes;
using Shared.Common;
-using Shared.Phone.Device.Light;
using Shared.Phone.UserCenter.Device;
using ZigBee.Device;
using static ZigBee.Device.BindObj;
@@ -10,19 +9,8 @@
namespace Shared.Phone.UserCenter.DeviceBind
{
- public class AddScenePage : BindCommonLayout, ZigBee.Common.IStatus
+ public class AddScenePage : BindCommonLayout
{
- /// <summary>
- /// 鎸夐敭妯″紡鎺ユ敹
- /// </summary>
- /// <param name="common">Common.</param>
- public void Changed(CommonDevice common)
- {
- Shared.Application.RunOnMainThread(() =>
- {
- });
- }
-
/// 鏋勯�犲嚱鏁�
/// </summary>
/// <param name="doorLock"></param>
@@ -87,20 +75,20 @@
{
RemoveFromParent();
};
- this.btnTitle.Width = Application.GetRealWidth(1080 - 161 - 200 - 58);
+ this.btnTitle.Width = Application.GetRealWidth(1080 - 161 - 300);
this.btnBack.MouseUpEventHandler += eHandlerBack;
this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack;
this.MidFrameLayout(this);
var btnAddFrameLayout = new FrameLayout
{
- X = Application.GetRealWidth(830),
+ X = Application.GetRealWidth(619),
};
this.titleFrameLayout.AddChidren(btnAddFrameLayout);
btnFloorText = new Button
{
- Width = Application.GetRealWidth(110),
+ Width = Application.GetRealWidth(300 - 69 - 58),
X = Application.GetRealWidth(15),
Text = Language.StringByID(R.MyInternationalizationString.FirstFloor),
TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
@@ -110,26 +98,36 @@
};
btnAddFrameLayout.AddChidren(btnFloorText);
+ var btnBindDownFrameLayout = new FrameLayout
+ {
+ Width = Application.GetMinReal(69 + 58),
+ X = Application.GetRealWidth(300 - 69 - 58),
+ };
+ btnAddFrameLayout.AddChidren(btnBindDownFrameLayout);
+
var btnBindDown = new Button
{
- Height = Application.GetRealHeight(69),
- Width = Application.GetRealWidth(69),
- X = Application.GetRealWidth(200 - 77),
+ Height = Application.GetMinReal(69),
+ Width = Application.GetMinReal(69),
UnSelectedImagePath = "BindPic/BindDown.png",
Gravity = Gravity.CenterVertical,
};
- btnAddFrameLayout.AddChidren(btnBindDown);
- btnBindDown.MouseDownEventHandler += (sender, e) =>
+ btnBindDownFrameLayout.AddChidren(btnBindDown);
+
+ EventHandler<MouseEventArgs> eHandlerBindDown = (sender, e) =>
{
SideslipFramelayout();
};
+ btnBindDown.MouseDownEventHandler += eHandlerBindDown;
+ btnBindDownFrameLayout.MouseDownEventHandler += eHandlerBindDown;
+
if (Common.Config.Instance.Home.FloorDics.Count == 0)
{
btnAddFrameLayout.Width = 0;
}
else
{
- btnAddFrameLayout.Width = Application.GetRealWidth(200);
+ btnAddFrameLayout.Width = Application.GetRealWidth(300);
}
MidFrameLayoutContent(btnFloorText);
}
@@ -185,8 +183,8 @@
//鑾峰彇妤煎眰
dicFloor = HdlRoomLogic.Current.GetFloorSortList();
currentKey.currentSelectFloorId = BindInfo.GetCurrentSelectFloorId();
- btnFloorText.Text = BindInfo.GetCurrentSelectFloorIdName();
-
+ btnFloorText.Text = BindInfo.GetCurrentSelectFloorIdName();
+
var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
if (Common.Config.Instance.Home.FloorDics.Count == 0)
{
@@ -374,18 +372,7 @@
var dev = new AddedDeviceBindResponseAllData();
dev = await currentKey.AddDeviceBindAsync(addBindeDev);
- if (dev.addedDeviceBindResponseData == null)
- {
- Application.RunOnMainThread(() =>
- {
- CommonPage.Loading.Hide();
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
- });
- btnFinifh.Enable = true;
- btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
- return;
- }
- else
+ if (dev != null && dev.addedDeviceBindResponseData != null)
{
if (dev.addedDeviceBindResponseData.Result == 0)
{
@@ -446,6 +433,17 @@
return;
}
}
+ else
+ {
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Hide();
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
+ });
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ return;
+ }
}
}
catch { }
@@ -495,8 +493,8 @@
var btnRoomFrameLayout = new FrameLayout
{
- Height = Application.GetRealHeight(159),
- Width = Application.GetRealWidth(255),
+ Height = Application.GetMinReal(159),
+ Width = Application.GetMinReal(255),
Y = Application.GetRealHeight(23),
X = Application.GetRealWidth(5),
BackgroundImagePath = "Item/RoomIconBackground.png",
@@ -615,9 +613,9 @@
{
X = Application.GetMinRealAverage(58),
Y = Application.GetMinRealAverage(46),
- Width = Application.GetMinRealAverage(81),
- Height = Application.GetMinRealAverage(81),
- UnSelectedImagePath = "Scene/SceneIcon.png",// scene.IconPath,
+ Width = Application.GetMinReal(81),
+ Height = Application.GetMinReal(81),
+ UnSelectedImagePath = "Scene/SceneIcon.png",// scene.IconPath,
};
rowLayout.AddChidren(devicePic);
@@ -633,8 +631,8 @@
var btnChoose = new Button()
{
- Width = Application.GetRealWidth(60),
- Height = Application.GetRealHeight(60),
+ Width = Application.GetMinReal(60),
+ Height = Application.GetMinReal(60),
X = Application.GetRealWidth(861 + 81),
Y = Application.GetRealHeight(35),
SelectedImagePath = "DoorLock/SelectedIcon.png",
@@ -773,8 +771,7 @@
var sidelipFrameLayout = new FrameLayout()
{
- Height = Application.GetRealHeight(783),
- Width = Application.GetRealWidth(449),
+ Width = Application.GetMinReal(449),
Y = Application.GetRealHeight(161),
X = Application.GetRealWidth(596),
BackgroundImagePath = "DoorLock/SideslipPic.png",
@@ -798,17 +795,19 @@
var sidelipVerticalScrolViewLayout = new VerticalScrolViewLayout()
{
Height = Application.GetRealHeight(600),
- Y = btnSelectFloor.Bottom,
+ Y = btnSelectFloor.Bottom + Application.GetRealHeight(45),
};
sidelipFrameLayout.AddChidren(sidelipVerticalScrolViewLayout);
Button oldbutton = null;
Button oldbuttonText = null;
+ int count = 0;
foreach (var floorId in dicFloor.Keys)
{
+ count++;
var rowFrameLayout = new RowLayout()
{
- Height = Application.GetRealHeight(150),
+ Height = Application.GetRealHeight(152),
LineColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
X = Application.GetRealWidth(81),
};
@@ -816,9 +815,9 @@
var btnAllMethod = new Button()
{
- Width = Application.GetRealWidth(81),
- Height = Application.GetRealHeight(81),
- Y = Application.GetRealHeight(55),
+ Width = Application.GetMinReal(81),
+ Height = Application.GetMinReal(81),
+ Gravity = Gravity.CenterVertical,
UnSelectedImagePath = "Floor/Floor.png",
SelectedImagePath = "Floor/FloorSelected.png",
};
@@ -829,7 +828,7 @@
Width = Application.GetRealWidth(311),
Height = Application.GetRealHeight(58),
X = Application.GetRealWidth(92),
- Y = Application.GetRealHeight(69),
+ Gravity = Gravity.CenterVertical,
TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
TextSize = 14,
TextAlignment = TextAlignment.CenterLeft,
@@ -869,9 +868,9 @@
btnMethodText.IsSelected = true;
oldbuttonText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
oldbuttonText.IsBold = true;
- }
-
- //鑾峰彇妤煎眰瀵瑰簲鐨勬埧闂�
+ }
+
+ //鑾峰彇妤煎眰瀵瑰簲鐨勬埧闂�
var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
foreach (var room in listAllRoom)
{
@@ -910,6 +909,19 @@
rowFrameLayout.MouseUpEventHandler += hander;
btnMethodText.MouseUpEventHandler += hander;
}
+
+ if (count == 0)
+ {
+ sidelipFrameLayout.Height = 0;
+ }
+ else if (count <= 4 && count > 0)
+ {
+ sidelipFrameLayout.Height = Application.GetRealHeight(180) + count * Application.GetRealHeight(150);
+ }
+ else
+ {
+ sidelipFrameLayout.Height = Application.GetMinReal(780);
+ }
}
/// <summary>
@@ -918,8 +930,8 @@
/// <returns></returns>
List<SceneUI> GetALlDispalyRoomSceneList()
{
- currentKeyAllRoomSceneList.Clear();
- // 鑾峰彇鎵�鏈夋埧闂�
+ currentKeyAllRoomSceneList.Clear();
+ // 鑾峰彇鎵�鏈夋埧闂�
var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
foreach (var room in listAllRoom)
{
@@ -935,7 +947,7 @@
}
foreach (var sceneId in room.ListSceneId)
- {
+ {
var scene = HdlSceneLogic.Current.GetSceneUIBySceneId(sceneId);
if (scene == null)
{
@@ -956,10 +968,10 @@
var tempSceneUIList = new List<SceneUI>();
foreach (var sceneId in curRoom.ListSceneId)
{
- var scene = HdlSceneLogic.Current.GetSceneUIBySceneId(sceneId);
- if (scene == null)
- {
- continue;
+ var scene = HdlSceneLogic.Current.GetSceneUIBySceneId(sceneId);
+ if (scene == null)
+ {
+ continue;
}
var gwSc = gwCurScenesList.Find(obj => (obj.ScenesId == sceneId));
if (gwSc != null)
@@ -968,18 +980,6 @@
}
}
return tempSceneUIList;
- }
-
- public void DeviceInfoChange(CommonDevice common, string typeTag)
- {
- }
-
- public void ChangedILogicStatus(ZigBee.Device.Logic logic)
- {
- }
-
- public void ChangedISceneStatus(Scene scene)
- {
}
}
}
--
Gitblit v1.8.0