From 18b93d511dc764b469d7c4a7e755f7274f89cdb4 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 27 四月 2020 17:55:14 +0800
Subject: [PATCH] 2020-4-27-1
---
ZigbeeApp/Shared/Phone/Category/SelectFloorForm.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/SelectFloor.cs b/ZigbeeApp/Shared/Phone/Category/SelectFloorForm.cs
similarity index 90%
rename from ZigbeeApp/Shared/Phone/Device/Category/SelectFloor.cs
rename to ZigbeeApp/Shared/Phone/Category/SelectFloorForm.cs
index 8779c91..9c92d25 100755
--- a/ZigbeeApp/Shared/Phone/Device/Category/SelectFloor.cs
+++ b/ZigbeeApp/Shared/Phone/Category/SelectFloorForm.cs
@@ -2,9 +2,9 @@
using System.Collections.Generic;
using Shared.Common;
-namespace Shared.Phone.Device.Category
+namespace Shared.Phone.Category
{
- public class SelectFloor : FrameLayout
+ public class SelectFloorForm : FrameLayout
{
public Action<string> FloorAction;
@@ -22,7 +22,7 @@
/// <summary>
/// Init
/// </summary>
- public void Init(int x, int y, CommonForm.Direction direction = CommonForm.Direction.Left)
+ public void Init(int x, int y, Device.CommonForm.Direction direction = Device.CommonForm.Direction.Left)
{
dialogBackground = new Dialog
{
@@ -85,7 +85,7 @@
if (floorCount > 0)
{
string directStr = string.Empty;
- if (direction == CommonForm.Direction.Right)
+ if (direction == Device.CommonForm.Direction.Right)
{
directStr = "Right";
}
@@ -122,7 +122,7 @@
/// <param name="verticalScrolView"></param>
private void AddFloor(VerticalScrolViewLayout verticalScrolView, KeyValuePair<string, string> floor,bool isLast=false)
{
- var frow = new CommonForm.LeftIconButtonRow(449, 150);
+ var frow = new Device.CommonForm.LeftIconButtonRow(449, 150);
frow.Width = Application.GetMinRealAverage(449);
frow.Height = Application.GetMinRealAverage(150);
frow.Tag = floor.Key;
@@ -154,15 +154,15 @@
/// <param name="mouseEventArgs"></param>
private void SelectFloor_MouseUpEvent(object sender, MouseEventArgs mouseEventArgs)
{
- (sender as CommonForm.LeftIconButtonRow).IsSelected = true;
+ (sender as Device.CommonForm.LeftIconButtonRow).IsSelected = true;
if (changeFloor)
{
- Config.Instance.Home.CurrentFloorId = (sender as CommonForm.LeftIconButtonRow).Tag.ToString();
+ Config.Instance.Home.CurrentFloorId = (sender as Device.CommonForm.LeftIconButtonRow).Tag.ToString();
Config.Instance.Home.Save(false);
UserCenter.HdlRoomLogic.Current.RefreshRoomListView();
}
RemoveView();
- FloorAction?.Invoke((sender as CommonForm.LeftIconButtonRow).Tag.ToString());
+ FloorAction?.Invoke((sender as Device.CommonForm.LeftIconButtonRow).Tag.ToString());
}
--
Gitblit v1.8.0