2019.12.9

gxc

2019-12-09 9f1d51429ec86d618bcdb75aee505a57ae94db30

 ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs

@@ -426,7 +426,6 @@
                Gravity = Gravity.CenterVertical,
                UnSelectedImagePath = "Item/Floor.png"
            };
            topFrameLayout.AddChidren(floor);

            floorBtn = new Button
            {
@@ -438,7 +437,13 @@
                TextColor = ZigbeeColor.Current.GXCTextColor,
                Text = Config.Instance.Home.GetCurrentFloorName
            };
            topFrameLayout.AddChidren(floorBtn);

            if(Config.Instance.Home.FloorDics.Count>0)
            {
                topFrameLayout.AddChidren(floor);
                topFrameLayout.AddChidren(floorBtn);
            }


            var messageBtn = new Button()
            {
@@ -476,7 +481,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) =>
                    {
@@ -1020,7 +1025,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;
@@ -1046,7 +1051,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 +1660,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)
                    {