2019.11.28

gxc

2019-11-28 427d1c7ecd04b03419eae157e32fe3367d8dffea

 ZigbeeApp/Shared/Phone/Device/Category/Category.cs

@@ -625,9 +625,10 @@
            var floors = new SelectFloor ();
            AddChidren(floors);
            floors.Init(580,330,Direction.Right);
            floors.FloorAction += (floorName) =>
            floors.changeFloor = true;
            floors.FloorAction += (floorId) =>
            {
                floorBtn.Text = floorName;
                floorBtn.Text = Config.Instance.Home.GetFloorNameById(floorId);
                RefreshBodyView();
            };
        }
@@ -827,6 +828,7 @@
                    BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
                };
                functionSceneBodyView.AddChidren(functionTypeScrowView);
                //functionSceneBodyView.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerBottomLeft);

                deviceListScrolView = new VerticalScrolViewLayout
                {
@@ -837,6 +839,8 @@
                    BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
                };
                functionSceneBodyView.AddChidren(deviceListScrolView);
                //deviceListScrolView.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerTopLeft);

                tempFunctionTypeBtn = new FunctionButton();

                EventHandler<MouseEventArgs> ShowSameTypeFunction = (object typeSender, MouseEventArgs mouseEventArgs) =>
@@ -1572,6 +1576,8 @@
                    BorderWidth = 1
                };
                row.AddChidren(roomBtn);
                roomBtn.SetViewShadow(true,5);

                if (room.IsLove)
                {
                    roomBtn.IsSelected = true;
@@ -1641,6 +1647,7 @@
                    var sceneView = new SceneCategoryView(0, 0);
                    sceneScrolView.AddChidren(sceneView);
                    sceneView.Init(scene, room);
                    sceneView.SetViewShadow(true);
                    GetDelayScene(sceneScrolView);
                }
            }
@@ -1705,18 +1712,17 @@
                        {
                            if (delayScenesListResponseInfo.ScenesId == sceneView.scene.Id)
                            {
                                var times = delayScenesListResponseInfo.RemainTime;
                                sceneView.scene.RemainTime = times;
                                sceneView.scene.RemainTime = delayScenesListResponseInfo.RemainTime;
                                new System.Threading.Thread(() =>
                                {
                                    while (times > 0)
                                    while (sceneView.scene.RemainTime > 0)
                                    {
                                        System.Threading.Thread.Sleep(1000);
                                        Application.RunOnMainThread(() =>
                                        {
                                            sceneView.SetTimeText(CommonFormResouce.GetTimeString(times));
                                            sceneView.SetTimeText(CommonFormResouce.GetTimeString(sceneView.scene.RemainTime));
                                        });
                                        times -= 1;
                                        sceneView.scene.RemainTime -= 1;
                                    }
                                    Application.RunOnMainThread(() =>
                                    {