From 4ce5177289b1d34e467de9d8790836559cc5a09e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 18 十一月 2019 18:06:28 +0800
Subject: [PATCH] 合并了全部的代码
---
ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs | 195 +++++++++++++++++++-----------------------------
1 files changed, 78 insertions(+), 117 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
index 72d7fa7..1d8f197 100755
--- a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
@@ -73,7 +73,7 @@
private readonly int sleepSpan = 300;
- private FrameLayout itemView=new FrameLayout();
+ private FrameLayout itemView = new FrameLayout();
/// <summary>
/// floorBtn
/// </summary>
@@ -320,7 +320,7 @@
{
case 0:
//姝ゅ睘鎬ц〃鏄庡綋鍓嶄寒搴︾▼搴�
- dimmableLight.Level = attriButeList[0].AttriButeData ;
+ dimmableLight.Level = attriButeList[0].AttriButeData;
dimmableLight.LastDateTime = DateTime.Now;
(rowFL.GetChildren(0) as FunctionMainView).IsSelected = true;
(rowFL.GetChildren(0) as FunctionMainView).StatuButton.Text = deviceUI.GetDeviceStatu();
@@ -393,7 +393,7 @@
#region topview
var topFrameLayout = new FrameLayout()
{
- Y=Application.GetRealHeight(60),
+ Y = Application.GetRealHeight(60),
Height = Application.GetRealHeight(127),
BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor,
};
@@ -411,13 +411,13 @@
floorBtn = new Button
{
- X=floor.Right,
- Width=Application.GetRealWidth(500),
- Height=Application.GetRealHeight(100),
+ X = floor.Right,
+ Width = Application.GetRealWidth(500),
+ Height = Application.GetRealHeight(100),
Gravity = Gravity.CenterVertical,
- TextAlignment =TextAlignment.CenterLeft,
- TextColor=ZigbeeColor.Current.GXCTextColor,
- Text=Config.Instance.Home.GetCurrentFloorName
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = ZigbeeColor.Current.GXCTextColor,
+ Text = Config.Instance.Home.GetCurrentFloorName
};
topFrameLayout.AddChidren(floorBtn);
@@ -428,13 +428,13 @@
Height = Application.GetMinRealAverage(69),
Gravity = Gravity.CenterVertical,
UnSelectedImagePath = "Item/Message.png",
- SelectedImagePath="Item/MessageSelected.png"
+ SelectedImagePath = "Item/MessageSelected.png"
};
topFrameLayout.AddChidren(messageBtn);
var residecneName = new Button()
{
- X=Application.GetRealWidth(CommonFormResouce.X_Left),
+ X = Application.GetRealWidth(CommonFormResouce.X_Left),
Y = Application.GetRealHeight(161),
Width = Application.GetRealWidth(700),
Height = Application.GetRealHeight(95),
@@ -443,9 +443,9 @@
TextSize = 24,
TextColor = ZigbeeColor.Current.GXCTextBlackColor
};
- if(Config.Instance.Home.IsOthreShare)
+ if (Config.Instance.Home.IsOthreShare)
{
- residecneName.Text = $"({Language.StringByID(R.MyInternationalizationString.Shared)}){Config.Instance.Home.Name}";
+ residecneName.Text = $"{Config.Instance.Home.Name}";
}
AddChidren(residecneName);
@@ -513,7 +513,7 @@
var scrolView = new VerticalScrolViewLayout()
{
Y = changeHomeBtn.Bottom,
- Height = Application.GetMinRealAverage(305-10)
+ Height = Application.GetMinRealAverage(305 - 10)
};
changeHomeFL.AddChidren(scrolView);
@@ -533,7 +533,7 @@
scrolView.AddChidren(rowView);
var pointBtn = new Device.CommonForm.SelectedStatuButton()
{
- X=Application.GetRealWidth(80),
+ X = Application.GetRealWidth(80),
Width = Application.GetMinRealAverage(80),
Height = Application.GetMinRealAverage(80),
Gravity = Gravity.CenterVertical,
@@ -552,9 +552,9 @@
SelectedTextColor = ZigbeeColor.Current.GXCTextBlackColor,
IsSelected = home.Id == Config.Instance.Home.Id
};
- if(home.IsOthreShare)
+ if (home.IsOthreShare)
{
- nameBtn.Text = $"({Language.StringByID(R.MyInternationalizationString.Shared)}){home.Name}";
+ nameBtn.Text = $"{home.Name}";
}
rowView.AddChidren(nameBtn);
@@ -570,9 +570,9 @@
nameBtn.IsSelected = true;
residecneName.Text = home.Name;
- if(home.IsOthreShare)
+ if (home.IsOthreShare)
{
- nameBtn.Text = $"({Language.StringByID(R.MyInternationalizationString.Shared)}){home.Name}";
+ nameBtn.Text = $"{home.Name}";
}
clickCheckBtn = pointBtn;
clickNameBtn = nameBtn;
@@ -591,7 +591,7 @@
residecneName.Text = home.Name;
if (home.IsOthreShare)
{
- residecneName.Text = nameBtn.Text = $"({Language.StringByID(R.MyInternationalizationString.Shared)}){home.Name}";
+ residecneName.Text = nameBtn.Text = $"{home.Name}";
}
}
else
@@ -613,7 +613,7 @@
#endregion
- if(CanBindGateway()==false)
+ if (CanBindGateway() == false)
{
var roomPageView = new PageLayout()
{
@@ -627,69 +627,20 @@
AddChidren(roomPageView);
//褰撳墠鎴块棿
- if (Shared.Common.Room.CanInitAllRoom == true)
+ //Room.CurrentRoom = Room.CurrentRoom == null ? Room.Lists[0] : Room.CurrentRoom;
+ var rList = Room.CurrentRoom.GetRoomsByCurrentFloorIdAppendLoveRoom();
+ Room.CurrentRoom = rList[0];
+ foreach (var room in rList)
{
- //Room.CurrentRoom = Room.CurrentRoom == null ? Room.Lists[0] : Room.CurrentRoom;
- Room.CurrentRoom = Room.Lists[0];
- foreach (var room in Room.CurrentRoom.GetRoomsByCurrentFloorIdAppendLoveRoom())
- {
- var roomBackView = new FrameLayout()
- {
- BackgroundImagePath = room.BackgroundImage
- };
- roomPageView.AddChidren(roomBackView);
- var roomBG = new Button()
- {
- //UnSelectedImagePath = "Room/HomeBG.png",
- UnSelectedImagePath = room.BackgroundImage
- };
- roomBackView.AddChidren(roomBG);
- var roomName = new Button()
- {
- X = Application.GetRealWidth(20),
- Y = Application.GetRealHeight(20),
- Width = Application.GetRealWidth(500),
- Height = Application.GetRealHeight(80),
- Text = room.Name,
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = ZigbeeColor.Current.GXCTextWhiteColor,
- TextSize = 18,
- };
- roomBackView.AddChidren(roomName);
- var roomListBtn = new Device.CommonForm.SelectedStatuButton()
- {
- X = roomPageView.Width - Application.GetRealWidth(100 + 20),
- Y = Application.GetRealHeight(20),
- Width = Application.GetMinRealAverage(100),
- Height = Application.GetMinRealAverage(100),
- UnSelectedImagePath = "Item/List.png",
- };
- roomBackView.AddChidren(roomListBtn);
-
- roomListBtn.MouseUpEventHandler += (send, e) =>
- {
- var editRoom = new Device.Room.EditRoom();
- HomePage.Instance.AddChidren(editRoom);
- HomePage.Instance.PageIndex += 1;
- editRoom.Show(room);
- editRoom.action += () =>
- {
- Show();
- };
- };
- }
- }
- else
- {
- Room.CurrentRoom = Room.Lists[0];
var roomBackView = new FrameLayout()
{
- BackgroundImagePath = "Room/r0.png"
+ BackgroundImagePath = room.BackgroundImage
};
roomPageView.AddChidren(roomBackView);
var roomBG = new Button()
{
UnSelectedImagePath = "Room/HomeBG.png",
+ //UnSelectedImagePath = room.BackgroundImage
};
roomBackView.AddChidren(roomBG);
var roomName = new Button()
@@ -698,30 +649,44 @@
Y = Application.GetRealHeight(20),
Width = Application.GetRealWidth(500),
Height = Application.GetRealHeight(80),
- Text = Language.StringByID(R.MyInternationalizationString.Favorite),
+ Text = room.Name,
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.GXCTextWhiteColor,
- TextSize = 18
+ TextSize = 18,
};
roomBackView.AddChidren(roomName);
- var roomListBtn = new Button()
+ var roomListBtn = new Device.CommonForm.SelectedStatuButton()
{
X = roomPageView.Width - Application.GetRealWidth(100 + 20),
Y = Application.GetRealHeight(20),
Width = Application.GetMinRealAverage(100),
Height = Application.GetMinRealAverage(100),
- UnSelectedImagePath = "Item/List.png"
+ UnSelectedImagePath = "Item/List.png",
};
roomBackView.AddChidren(roomListBtn);
+
+ roomListBtn.MouseUpEventHandler += (send, e) =>
+ {
+ var editRoom = new Device.Room.EditRoom();
+ HomePage.Instance.AddChidren(editRoom);
+ HomePage.Instance.PageIndex += 1;
+ editRoom.Show(room);
+ editRoom.action += () =>
+ {
+ Show();
+ };
+ };
}
+
+
var functionSceneView = new FrameLayout()
{
Y = Application.GetRealHeight(861),
- Width=Application.GetRealWidth(832),
+ Width = Application.GetRealWidth(832),
Height = Application.GetRealHeight(167),
- Gravity=Gravity.CenterHorizontal,
- BackgroundImagePath="Item/SceneFunctionBG.png"
+ Gravity = Gravity.CenterHorizontal,
+ BackgroundImagePath = "Item/SceneFunctionBG.png"
};
AddChidren(functionSceneView);
@@ -759,7 +724,7 @@
Y = functionSceneView.Bottom,
Height = Application.GetRealHeight(750),
Gravity = Gravity.CenterHorizontal,
- BackgroundColor=ZigbeeColor.Current.GXCGrayBackgroundColor
+ BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor
};
AddChidren(functionSceneBodyView);
@@ -783,7 +748,7 @@
roomPageView.PageChange += (sender, e) =>
{
//鍒囨崲褰撳墠鎴块棿
- Room.CurrentRoom = Room.CurrentRoom == null ? Room.Lists[0] : Room.Lists[roomPageView.PageIndex];
+ Room.CurrentRoom = rList[roomPageView.PageIndex];
RefreshBodyView();
};
}
@@ -802,10 +767,6 @@
/// </summary>
public void RefreshBodyView()
{
- if (Room.CanInitAllRoom == false)
- {
- return;
- }
functionSceneBodyView.RemoveAll();
if (functionBtn.IsSelected)
{
@@ -822,7 +783,7 @@
/// </summary>
/// <param name="sender"></param>
/// <param name="mouseEventArgs"></param>
- public void SelectFloor(object sender,MouseEventArgs mouseEventArgs)
+ public void SelectFloor(object sender, MouseEventArgs mouseEventArgs)
{
var floorFL = new Phone.Device.Category.SelectFloor();
AddChidren(floorFL);
@@ -957,11 +918,11 @@
var noFunctionTip = new Button()
{
- Y=noFunction.Bottom,
+ Y = noFunction.Bottom,
Height = Application.GetRealHeight(200),
- Text = Language.StringByID(R.MyInternationalizationString.NoFunction).Replace("{\\r\\n}","\r\n"),
+ Text = Language.StringByID(R.MyInternationalizationString.NoFunction).Replace("{\\r\\n}", "\r\n"),
TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
- IsMoreLines=true
+ IsMoreLines = true
};
functionSceneBodyView.AddChidren(noFunctionTip);
}
@@ -985,9 +946,9 @@
else
{
deviceVerticalScrolViewLayout = new VerticalScrolViewLayout { };
-
+
functionSceneBodyView.AddChidren(deviceVerticalScrolViewLayout);
- for(int i=0;i<deviceList.Count;i++)
+ for (int i = 0; i < deviceList.Count; i++)
{
int t = i % 2;
int tt = i / 2;
@@ -1019,8 +980,8 @@
if (e1)
{
Room.CurrentRoom.DeleteDevice(device.FileName);
- //RefreshBodyView();
- deviceVerticalScrolViewLayout.RemoveViewByTag((sender as Button).Tag);
+ //RefreshBodyView();
+ deviceVerticalScrolViewLayout.RemoveViewByTag((sender as Button).Tag);
}
};
};
@@ -1175,14 +1136,14 @@
}
}
- var lightView = new FunctionMainView(xx,yy);
+ var lightView = new FunctionMainView(xx, yy);
itemView.AddChidren(lightView);
lightView.Init();
lightView.SetDeviceImage(device.IconPath, device.OnlineIconPath);
lightView.SetStatuText(device.GetDeviceStatu());
lightView.SetDeviceName(device.CommonDevice.DeviceEpointName);
- lightView.IsSelected = light.OnOffStatus==1;
- lightView.SetCollect(Room.CurrentRoom.IsCollectInRoom(Room.CurrentRoom,device.FileName));
+ lightView.IsSelected = light.OnOffStatus == 1;
+ lightView.SetCollect(Room.CurrentRoom.IsCollectInRoom(Room.CurrentRoom, device.FileName));
var dev = Room.LoveRoomDeviceUIFilePathList.Find((obj) => obj == device.FileName);
if (dev == null)
@@ -1665,7 +1626,7 @@
lightView.CardBG.MouseUpEventHandler += (sender, e) =>
{
- var userDoorLockPage = new UserDoorLockPage(Room.CurrentRoom,device);
+ var userDoorLockPage = new UserDoorLockPage(Room.CurrentRoom, device);
HomePage.Instance.AddChidren(userDoorLockPage);
HomePage.Instance.PageIndex += 1;
userDoorLockPage.Show();
@@ -1720,11 +1681,11 @@
functionSceneBodyView.AddChidren(noScene);
var noScenceTip = new Button()
{
- Y=noScene.Bottom,
+ Y = noScene.Bottom,
Height = Application.GetRealHeight(200),
- Text =Language.StringByID(R.MyInternationalizationString.NoScene).Replace("{\\r\\n}","\r\n"),
+ Text = Language.StringByID(R.MyInternationalizationString.NoScene).Replace("{\\r\\n}", "\r\n"),
TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
- IsMoreLines=true
+ IsMoreLines = true
};
functionSceneBodyView.AddChidren(noScenceTip);
}
@@ -1748,7 +1709,7 @@
{
var sceneScrolView = new VerticalScrolViewLayout { };
functionSceneBodyView.AddChidren(sceneScrolView);
- for(int i=0;i<sceneList.Count;i++)
+ for (int i = 0; i < sceneList.Count; i++)
{
var scene = sceneList[i];
int xx = 43 + i % 2 * (20 + 487);
@@ -1781,7 +1742,7 @@
}
else
{
- sceneView.SetTimeText(scene.SceneDelayTime.ToString());
+ sceneView.SetTimeText(CommonFormResouce.GetTimeString(scene.SceneDelayTime));
}
sceneView.TimeButton.MouseUpEventHandler += (sender, e) =>
@@ -1793,7 +1754,7 @@
timeSelect.TimeAction = (t) =>
{
scene.SceneDelayTime = t;
- if(t>0)
+ if (t > 0)
{
sceneView.SetTimeText(CommonFormResouce.GetTimeString(scene.SceneDelayTime));
}
@@ -1808,15 +1769,15 @@
//璋冪敤鍦烘櫙
EventHandler<MouseEventArgs> sceneUpHandler = async (sender, e) =>
{
- //1鎴愬姛 0澶辫触
- //鍚庨潰琛ヤ笂鐩稿叧鎻愮ず
- // Error鍙傛暟鍚箟
- //<para>1锛氱綉鍏虫棤娉曡В鏋愬懡浠ゆ暟鎹��</para>
- //<para>2锛氬崗璋冨櫒姝ｅ湪鍗囩骇鎴栧浠�/鎭㈠鏁版嵁
- //<para>3锛氭搷浣滆澶�/缁�/鍦烘櫙涓嶅瓨鍦�</para>
- //<para>4锛氬叾浠栭敊璇�</para>
- //<para>5锛氭暟鎹紶杈撻敊璇紙鍦ㄦ煇娆″鎴风鍚戠綉鍏冲彂閫佹暟鎹殑杩囩▼涓紝缃戝叧鍦ㄥ悎鐞嗘椂闂磋寖鍥村唴鎺ユ敹瀹㈡埛绔暟鎹笉瀹屾暣瀵艰嚧璇ラ敊璇彂鐢熴�傚瀹㈡埛绔悜缃戝叧涓�娆″彂閫�100涓瓧鑺傜殑鏁版嵁锛屼絾缃戝叧绛夊緟鎺ユ敹浜嗕竴绉掑彧鎺ユ敹浜�80涓瓧鑺傘�傚彂鐢熻閿欒锛岀綉鍏冲皢涓诲姩鍏抽棴瀹㈡埛绔繛鎺ワ級</para>
- var sceneOpenAllData = await ZigBee.Device.Scene.ControlSceneAsync(scene.Id, scene.SceneDelayTime);
+ //1鎴愬姛 0澶辫触
+ //鍚庨潰琛ヤ笂鐩稿叧鎻愮ず
+ // Error鍙傛暟鍚箟
+ //<para>1锛氱綉鍏虫棤娉曡В鏋愬懡浠ゆ暟鎹��</para>
+ //<para>2锛氬崗璋冨櫒姝ｅ湪鍗囩骇鎴栧浠�/鎭㈠鏁版嵁
+ //<para>3锛氭搷浣滆澶�/缁�/鍦烘櫙涓嶅瓨鍦�</para>
+ //<para>4锛氬叾浠栭敊璇�</para>
+ //<para>5锛氭暟鎹紶杈撻敊璇紙鍦ㄦ煇娆″鎴风鍚戠綉鍏冲彂閫佹暟鎹殑杩囩▼涓紝缃戝叧鍦ㄥ悎鐞嗘椂闂磋寖鍥村唴鎺ユ敹瀹㈡埛绔暟鎹笉瀹屾暣瀵艰嚧璇ラ敊璇彂鐢熴�傚瀹㈡埛绔悜缃戝叧涓�娆″彂閫�100涓瓧鑺傜殑鏁版嵁锛屼絾缃戝叧绛夊緟鎺ユ敹浜嗕竴绉掑彧鎺ユ敹浜�80涓瓧鑺傘�傚彂鐢熻閿欒锛岀綉鍏冲皢涓诲姩鍏抽棴瀹㈡埛绔繛鎺ワ級</para>
+ var sceneOpenAllData = await ZigBee.Device.Scene.ControlSceneAsync(scene.Id, scene.SceneDelayTime);
if (sceneOpenAllData == null || sceneOpenAllData.sceneOpenData == null)
{
return;
@@ -1866,7 +1827,7 @@
sceneView.CollectButton.MouseUpEventHandler += collectionEvent;
sceneView.MouseUpEventHandler += sceneUpHandler;
- sceneView.SceneIcon.MouseUpEventHandler+= sceneUpHandler;
+ sceneView.SceneIcon.MouseUpEventHandler += sceneUpHandler;
sceneView.SceneNameButton.MouseUpEventHandler += sceneUpHandler;
}
--
Gitblit v1.8.0