上传版本

黄学彪

2020-04-29 b68cdc7e103a00d5df73e4b75603be8da1815b4a

 ZigbeeApp/Shared/Phone/MainPage/ListRoomViewFrom.cs

@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;

using Shared.Common;
using Shared.Phone.Device.Category;
using Shared.Phone.Device.CommonForm;
using Shared.Phone.UserCenter;

using Shared.Phone.UserView;
@@ -66,9 +65,6 @@
            //初始化中部控件
            this.InitBodyFrameLayout();

            //设置头部信息
            base.SetTitleText(Language.StringByID(R.MyInternationalizationString.RoomList));

            //初始化中部信息
            this.InitMiddleFrame();
        }
@@ -79,7 +75,11 @@
        private void InitTopFrame()

        {

            //初始化头部控件

            this.InitTopFrameLayout();
            this.InitTopFrameLayout();



            //设置头部信息

            base.SetTitleText(Language.StringByID(R.MyInternationalizationString.RoomList));

            //重置返回按键的事件
            var btnBack = this.GetBackButton();
            btnBack.ButtonClickEvent = null;
@@ -90,7 +90,10 @@
            };



            //获取楼层

            this.curFloorId = Config.Instance.Home.CurrentFloorId;

            if (this.curFloorId == string.Empty)

            {

                this.curFloorId = Config.Instance.Home.CurrentFloorId;

            }

            var dicFloor = HdlRoomLogic.Current.GetFloorSortList();

            if (dicFloor.Count == 0)

            {

@@ -112,7 +115,7 @@
            btnIconContr.ButtonClickEvent += (sender, e) =>

            {

                //楼层菜单

                var floors = new SelectFloor();

                var floors = new Category.SelectFloorForm();

                AddChidren(floors);

                floors.changeFloor = false;

                floors.CurFloorId = curFloorId;

@@ -236,7 +239,7 @@
        private void InitRoomCardControl(int XX, int YY)

        {

            //桌布控件

            var frameBack = new FrameLayoutControl();

            var frameBack = new FrameLayoutStatuControl();

            frameBack.X = XX;

            frameBack.Y = YY;

            frameBack.Width = this.GetPictrueRealSize(495);