From 40f46f32cb00f4304a691d4f027a76a13a9ebb6d Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 16 十二月 2019 15:11:36 +0800
Subject: [PATCH] 2019.12.16

---
 ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs |  191 +++++++++++++++++++++--------------------------
 1 files changed, 85 insertions(+), 106 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
index 03ff3a0..a26095e 100644
--- a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
@@ -426,7 +426,10 @@
                 Gravity = Gravity.CenterVertical,
                 UnSelectedImagePath = "Item/Floor.png"
             };
-            topFrameLayout.AddChidren(floor);
+            if (Config.Instance.Home.FloorDics.Count > 0)
+            {
+                topFrameLayout.AddChidren(floor);
+            }
 
             floorBtn = new Button
             {
@@ -438,7 +441,10 @@
                 TextColor = ZigbeeColor.Current.GXCTextColor,
                 Text = Config.Instance.Home.GetCurrentFloorName
             };
-            topFrameLayout.AddChidren(floorBtn);
+            if (Config.Instance.Home.FloorDics.Count > 0)
+            {
+                topFrameLayout.AddChidren(floorBtn);
+            }
 
             var messageBtn = new Button()
             {
@@ -460,7 +466,8 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 Text = Config.Instance.Home.Name ?? Language.StringByID(R.MyInternationalizationString.TheResidenceNameNull),
                 TextSize = 24,
-                TextColor = ZigbeeColor.Current.GXCTextBlackColor
+                TextColor = ZigbeeColor.Current.GXCTextBlackColor,
+                IsBold=true
             };
             if (Config.Instance.Home.IsOthreShare)
             {
@@ -476,7 +483,7 @@
                 var tempHomeBtn = send as Button;
                 if (Config.Instance.HomeFilePathList.Count == 0)
                 {
-                    var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.CurrentlyTheUserIshHouseIsEmptyPleaseBuildANewHouseFirst), Language.StringByID(R.MyInternationalizationString.Close), Language.StringByID(R.MyInternationalizationString.OK));
+                    var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.CurrentlyTheUserIshHouseIsEmptyPleaseBuildANewHouseFirst), Language.StringByID(R.MyInternationalizationString.Close), Language.StringByID(R.MyInternationalizationString.Confrim));
                     alert.Show();
                     alert.ResultEventHandler += (senderHouse, eHouse) =>
                     {
@@ -503,7 +510,7 @@
                         Y = Application.GetRealHeight(248),
                         Width = Application.GetMinRealAverage(449),
                         Height = Application.GetMinRealAverage(478),
-                        UnSelectedImagePath = "Item/SelectHouse"
+                        UnSelectedImagePath = "Item/SelectHouse.png"
                     };
                     closeBGview.AddChidren(bg);
 
@@ -511,8 +518,8 @@
                     {
                         X = Application.GetRealWidth(35),
                         Y = Application.GetRealHeight(271),
-                        Height = Application.GetRealHeight(449),
-                        Width = Application.GetRealWidth(440),
+                        Height = Application.GetMinRealAverage(449),
+                        Width = Application.GetMinRealAverage(440),
                         Radius = CommonPage.BigFormRadius,
                         BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
                     };
@@ -624,23 +631,25 @@
             //娑堟伅
             messageBtn.MouseUpEventHandler += (send, e) =>
             {
-               
+
             };
 
             #endregion
 
             if (CanBindGateway() == false)
             {
-                var roomPageView = new PageLayout()
+
+                var roomPageView = new HorizontalPages()
                 {
                     Y = Application.GetRealHeight(302),
-                    Width = Application.GetRealWidth(CommonPage.AppRealWidth - CommonPage.XLeft * 2),
-                    Height = Application.GetMinRealAverage(roomPageView_Height),
-                    Radius = CommonPage.BigFormRadius,
-                    Gravity = Gravity.CenterHorizontal,
-                    IsShowPoint = false
+                    Width = Application.GetRealWidth(CommonPage.AppRealWidth),
+                    Height = Application.GetRealHeight(478),
                 };
                 AddChidren(roomPageView);
+                //绐佸嚭杈硅窛
+                roomPageView.TCBJ = Application.GetRealWidth(112);
+                //涓や釜page涔嬮棿鐨勯棿璺�
+                roomPageView.JMBJ = Application.GetRealWidth(69);
 
                 //褰撳墠鎴块棿
                 //Room.CurrentRoom = Room.CurrentRoom == null ? Room.Lists[0] : Room.CurrentRoom;
@@ -648,49 +657,12 @@
                 Room.CurrentRoom = rList[0];
                 foreach (var room in rList)
                 {
-                    var roomBackView = new FrameLayout()
+                    var roomView = new Device.CommonForm.RoomView(0, 0);
+                    roomPageView.AddChidren(roomView);
+                    roomView.Init(room);
+                    roomView.action += () =>
                     {
-                        BackgroundImagePath = room.BackgroundImage
-                    };
-                    roomPageView.AddChidren(roomBackView);
-                    if (room.BackgroundImageType != 0)
-                    {
-                        roomBackView.BackgroundImagePath = System.IO.Path.Combine(Config.Instance.FullPath, room.BackgroundImage);
-                    }
-
-                    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) =>
-                    {
-                        CommonPage.Instance.IsDrawerLockMode = true;
-                        var editRoom = new Device.Room.EditRoom();
-                        HomePage.Instance.AddChidren(editRoom);
-                        HomePage.Instance.PageIndex += 1;
-                        editRoom.Show(room);
-                        editRoom.action += () =>
-                        {
-                            Show();
-                        };
+                        Show();
                     };
                 }
 
@@ -714,7 +686,9 @@
                     TextColor = ZigbeeColor.Current.GXCTextGrayColor3,
                     SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor,
                     TextID = R.MyInternationalizationString.Scence,
-                    IsSelected = false
+                    IsSelected = true,
+                    TextSize=16,
+                    IsBold=true
                 };
                 functionSceneView.AddChidren(sceneBtn);
 
@@ -728,7 +702,8 @@
                     TextColor = ZigbeeColor.Current.GXCTextGrayColor3,
                     SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor,
                     TextID = R.MyInternationalizationString.Function,
-                    IsSelected = false
+                    IsSelected = false,
+                    TextSize=14
                 };
                 functionSceneView.AddChidren(functionBtn);
 
@@ -747,6 +722,10 @@
                 {
                     sceneBtn.IsSelected = false;
                     functionBtn.IsSelected = true;
+                    sceneBtn.TextSize = 14;
+                    sceneBtn.IsBold = false;
+                    functionBtn.TextSize = 16;
+                    functionBtn.IsBold = true;
                     RefreshBodyView();
                 };
                 //閫夋嫨鍦烘櫙鍒嗘爮
@@ -754,6 +733,10 @@
                 {
                     functionBtn.IsSelected = false;
                     sceneBtn.IsSelected = true;
+                    sceneBtn.TextSize = 16;
+                    sceneBtn.IsBold = true;
+                    functionBtn.TextSize = 14;
+                    functionBtn.IsBold = false;
                     RefreshBodyView();
                 };
 
@@ -935,7 +918,7 @@
             {
                 Y = noFunction.Bottom,
                 Height = Application.GetRealHeight(200),
-                Text = Language.StringByID(R.MyInternationalizationString.NoFunction).Replace("{\\r\\n}", "\r\n"),
+                Text = Language.StringByID(R.MyInternationalizationString.NoFunction_Tip).Replace("{\\r\\n}", "\r\n"),
                 TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
                 IsMoreLines = true
             };
@@ -1049,7 +1032,7 @@
                                 zbGateway.ReportAction += UpdateDeviceControllStatu;
                                 AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, device.CommonDevice);
 
-                                (device.CommonDevice as Rollershade).CurtainUpDownStopControl(1);
+                                (device.CommonDevice as Rollershade).CurtainUpDownStopControl(0);
 
                                 ((sender as Button).Parent as FunctionMainView).SetStatuText(CommonFormResouce.GetSwitchStatu(true));
                                 ((sender as Button).Parent as FunctionMainView).IsSelected = true;
@@ -1075,7 +1058,7 @@
                                 zbGateway.ReportAction += UpdateDeviceControllStatu;
                                 AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, device.CommonDevice);
 
-                                (device.CommonDevice as Rollershade).CurtainUpDownStopControl(0);
+                                (device.CommonDevice as Rollershade).CurtainUpDownStopControl(1);
 
                                 ((sender as Button).Parent as FunctionMainView).SetStatuText(CommonFormResouce.GetSwitchStatu(false));
                                 ((sender as Button).Parent as FunctionMainView).IsSelected = false;
@@ -1655,7 +1638,7 @@
             {
                 Y = noScene.Bottom,
                 Height = Application.GetRealHeight(200),
-                Text = Language.StringByID(R.MyInternationalizationString.NoScene).Replace("{\\r\\n}", "\r\n"),
+                Text = Language.StringByID(R.MyInternationalizationString.NoScene_Tip).Replace("{\\r\\n}", "\r\n"),
                 TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
                 IsMoreLines = true
             };
@@ -1684,7 +1667,7 @@
                 for (int i = 0; i < sceneList.Count; i++)
                 {
                     var scene = sceneList[i];
-                    int xx = 43 + i % 2 * (20 + 487);
+                    int xx = 33 + i % 2 * (40 + 487);
                     int yy = 14;
                     if (scene == null)
                     {
@@ -1713,63 +1696,59 @@
         /// GetDelayScene
         /// </summary>
         /// <param name="scrolViewLayout"></param>
-        private void GetDelayScene(VerticalScrolViewLayout scrolViewLayout)
+        private async void GetDelayScene(VerticalScrolViewLayout scrolViewLayout)
         {
-            new System.Threading.Thread(async () =>
-            {
-                var catDelaySceneResponseAllData = await Scene.CatDelaySceneAsync();
-                if (catDelaySceneResponseAllData == null)
-                {
-                    return;
-                }
-                var catDelaySceneResponseData = catDelaySceneResponseAllData.catDelaySceneResponseData;
-                if (catDelaySceneResponseData == null || catDelaySceneResponseData.DelayScenesList.Count == 0)
-                {
-                    return;
-                }
-                var delayList = catDelaySceneResponseData.DelayScenesList;
 
-                Application.RunOnMainThread(() =>
+            var catDelaySceneResponseAllData = await Scene.CatDelaySceneAsync();
+            if (catDelaySceneResponseAllData == null)
+            {
+                return;
+            }
+            var catDelaySceneResponseData = catDelaySceneResponseAllData.catDelaySceneResponseData;
+            if (catDelaySceneResponseData == null || catDelaySceneResponseData.DelayScenesList.Count == 0)
+            {
+                return;
+            }
+            var delayList = catDelaySceneResponseData.DelayScenesList;
+
+            for (int i = 0; scrolViewLayout != null && i < scrolViewLayout.ChildrenCount; i++)
+            {
+                var iView = scrolViewLayout.GetChildren(i) as FrameLayout;
+                for (int j = 0; iView != null && j < iView.ChildrenCount; j++)
                 {
-                    for (int i = 0; scrolViewLayout != null && i < scrolViewLayout.ChildrenCount; i++)
+                    var sceneView = iView.GetChildren(j) as SceneMainView;
+                    foreach (var delayScenesListResponseInfo in delayList)
                     {
-                        var iView = scrolViewLayout.GetChildren(i) as FrameLayout;
-                        for (int j = 0; iView != null && j < iView.ChildrenCount; j++)
+                        if (delayScenesListResponseInfo.ScenesId == sceneView.scene.Id)
                         {
-                            var sceneView = iView.GetChildren(j) as SceneMainView;
-                            foreach (var delayScenesListResponseInfo in delayList)
+                            var remainTime = delayScenesListResponseInfo.RemainTime;
+                            sceneView.scene.RemainTime = remainTime;
+
+                            if (remainTime > 0)
                             {
-                                if (delayScenesListResponseInfo.ScenesId == sceneView.scene.Id)
+                                new System.Threading.Thread(() =>
                                 {
-                                    var times = delayScenesListResponseInfo.RemainTime;
-                                    sceneView.scene.RemainTime = times;
-                                    new System.Threading.Thread(() =>
+                                    while (remainTime-- > 0)
                                     {
-                                        while (times > 0)
-                                        {
-                                            System.Threading.Thread.Sleep(1000);
-                                            Application.RunOnMainThread(() =>
-                                            {
-                                                sceneView.SetTimeText(CommonFormResouce.GetTimeString(times));
-                                            });
-                                            times -= 1;
-                                        }
+                                        System.Threading.Thread.Sleep(1000);
                                         Application.RunOnMainThread(() =>
                                         {
-                                            sceneView.SetTimeImage();
+                                            sceneView.SetTimeText(CommonFormResouce.GetTimeString(remainTime));
                                         });
-                                    })
-                                    { IsBackground = true }.Start();
-
-                                    break;
-                                }
+                                    }
+                                    Application.RunOnMainThread(() =>
+                                    {
+                                        sceneView.scene.RemainTime = 0;
+                                        sceneView.SetTimeImage();
+                                    });
+                                })
+                                { IsBackground = true }.Start();
                             }
-
+                            break;
                         }
                     }
-                });
-            })
-            { IsBackground = true }.Start();
+                }
+            }
         }
 
         #endregion

--
Gitblit v1.8.0