2019.12.25

gxc

2019-12-25 944b87b6bcccb095cd73f13f4410fb20faf48f74

2019.12.25

 ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml

@@ -2,15 +2,20 @@
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.M7BBB18B19152766" />
  <MonoDevelop.Ide.ItemProperties.GateWay.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.8c0bdb303f25d82c2a42fb8bfca449bfaca00260" />
  <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/CommonForm/RoomButton.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/CommonForm/RoomMainView.cs">
    <Files>
      <File FileName="Shared/R.cs" Line="2042" Column="35" />
      <File FileName="GateWay.Droid/Assets/Language.ini" />
      <File FileName="Shared/Phone/Device/Category/Category.cs" Line="1702" Column="41" />
      <File FileName="Shared/Phone/Device/Category/SelectDevice.cs" Line="314" Column="36" />
      <File FileName="Shared/Common/Device.cs" Line="1587" Column="23" />
      <File FileName="Shared/Phone/Device/Category/Category.cs" Line="1617" Column="112" />
      <File FileName="Shared/Phone/Device/Category/SelectDevice.cs" />
      <File FileName="Shared/Common/Device.cs" />
      <File FileName="Shared/Phone/Device/CommonForm/RoomButton.cs" Line="7" Column="15" />
      <File FileName="Shared/Phone/Device/Category/SelectScene.cs" Line="198" Column="1" />
      <File FileName="Shared/Phone/Device/Category/SelectScene.cs" />
      <File FileName="Shared/Common/DeviceUI.cs" Line="468" Column="99" />
      <File FileName="Shared/Phone/UserView/UserHomeView.cs" Line="699" Column="35" />
      <File FileName="Shared/Phone/Device/CommonForm/RoomView.cs" Line="260" Column="21" />
      <File FileName="Shared/Phone/Device/Room/RoomManagement.cs" Line="173" Column="45" />
      <File FileName="Shared/Phone/Device/CommonForm/RoomMainView.cs" Line="30" Column="16" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -23,11 +28,9 @@
              <Node name="Common" expanded="True" />
              <Node name="Phone" expanded="True">
                <Node name="Device" expanded="True">
                  <Node name="Category" expanded="True" />
                  <Node name="CommonForm" expanded="True">
                    <Node name="RoomButton.cs" selected="True" />
                    <Node name="RoomMainView.cs" selected="True" />
                  </Node>
                  <Node name="Curtain" expanded="True" />
                  <Node name="Room" expanded="True" />
                </Node>
                <Node name="UserCenter" expanded="True">

 ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide

Binary files differ

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

@@ -1600,6 +1600,48 @@
                                    delBtn.MouseUpEventHandler += delEvent;
                                }
                            }
                            else if (deviceUI.CommonDevice.Type == DeviceType.IASZone)
                            {
                                var deviceTypeRowLayout = new RowLayout()
                                {
                                    Height = Application.GetRealHeight(129 + 35),
                                    LineColor = ZigbeeColor.Current.GXCBackgroundColor,
                                    Tag = deviceUI
                                };
                                deviceListScrolView.AddChidren(deviceTypeRowLayout);

                                var deviceRow = new CategoryFunctionRow(0, 35);
                                deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
                                deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
                                deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
                                deviceRow.IsSelected = (deviceUI.CommonDevice as IASZone).iASInfo?.Alarm1 == 1;
                                deviceRow.HideSwitchBtn(true);
                                deviceTypeRowLayout.AddChidren(deviceRow);

                                deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
                                {
                                    var userDoorLockPage = new UserDoorLockPage(curRoom, deviceUI);
                                    HomePage.Instance.AddChidren(userDoorLockPage);
                                    HomePage.Instance.PageIndex += 1;
                                    userDoorLockPage.Show();
                                };

                                var editBtn = new CommonForm.RowLayoutEditButton()
                                {
                                    Tag = deviceUI
                                };
                                var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
                                {
                                    Tag = deviceUI
                                };
                                if (curRoom.IsSharedRoom == false)
                                {
                                    deviceTypeRowLayout.AddRightView(editBtn);
                                    editBtn.MouseUpEventHandler += deviceDetailHandler;
                                    deviceTypeRowLayout.AddRightView(delBtn);
                                    delBtn.MouseUpEventHandler += delEvent;
                                }
                            }
                            else
                            {
                                var deviceTypeRowLayout = new RowLayout()
@@ -1614,7 +1656,6 @@
                                deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
                                deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
                                //deviceRow.SetOnLineStatu(deviceUI.CommonDevice.IsOnline == 1);

                                deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
                                deviceRow.HideSwitchBtn(true);
                                deviceTypeRowLayout.AddChidren(deviceRow);

 ZigbeeApp/Shared/Phone/Device/CommonForm/RoomMainView.cs

@@ -23,6 +23,10 @@
        /// </summary>
        public Button ClickBtn;
        /// <summary>
        /// 是否可以触发点击事件
        /// </summary>
        public bool CanClick = true;
        /// <summary>
        /// RoomMainView
        /// </summary>
        /// <param name="x"></param>
@@ -81,13 +85,7 @@

            ClickBtn = new Button { };
            AddChidren(ClickBtn);
            ClickBtn.MouseUpEventHandler += (sender, e) =>
            {
                CommonPage.Instance.CloseLeftMenu();
                Common.Room.CurrentRoom = room;
                Config.Instance.Home.CurrentFloorId = room.FloorId;
                UserPage.Instance.Fresh();
            };
            
        }

        /// <summary>

 ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs

@@ -16,6 +16,12 @@
        /// </summary>
        public Action action;

        FrameLayout roomNameBackground;

        FrameLayout roomTemperatureBackground;

        Button roomListBtn;

        public override void RemoveFromParent()

        {

            HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");

@@ -58,7 +64,7 @@
            };
            roomBackView.AddChidren(roomImg);

            var roomNameBackground = new FrameLayout
            roomNameBackground = new FrameLayout
            {
                X = Application.GetRealWidth(29),
                Y = Application.GetRealHeight(282),
@@ -79,7 +85,7 @@
            roomNameBackground.AddChidren(roomName);


            var roomTemperatureBackground = new FrameLayout
            roomTemperatureBackground = new FrameLayout
            {
                X = Application.GetRealWidth(29),
                Y = Application.GetRealHeight(374),
@@ -224,7 +230,7 @@
            }


            var roomListBtn = new Button()
            roomListBtn = new Button()
            {
                X = roomBackView.Width - Application.GetRealWidth(100 + 20),
                Y = Application.GetRealHeight(20),
@@ -247,5 +253,13 @@
                };
            };
        }

        /// <summary>
        /// HideName
        /// </summary>
        public void HideName(bool statu)
        {
            roomNameBackground.Visible = roomTemperatureBackground.Visible = roomListBtn.Visible = !statu;
        }
    }
}

 ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs

@@ -33,10 +33,17 @@
            }
        }

        /// <summary>
        /// 是否可以触发点击事件--是否可以跳转主页房间
        /// </summary>
        public bool CanClick = true;

        #endregion


        public Action action;



        public override void RemoveFromParent()
        {
@@ -168,6 +175,17 @@
                    roomView.Init(this,room);
                    roomView.SetRoomName(room.Name);
                    roomView.SetRoomIcon(room.BackgroundImage);
                    roomView.ClickBtn.MouseUpEventHandler += (sender, e) =>
                    {
                        if (CanClick == false)
                        {
                            return;
                        }
                        CommonPage.Instance.CloseLeftMenu();
                        Common.Room.CurrentRoom = room;
                        Config.Instance.Home.CurrentFloorId = room.FloorId;
                        UserPage.Instance.Fresh();
                    };
                }
                else
                {
@@ -200,6 +218,10 @@
        /// <param name="mouseEventArgs"></param>
        private void ShowUnallocatedRoom_MouseUpEvent(object sender,MouseEventArgs mouseEventArgs)
        {
            if(CanClick==false)
            {
                return;
            }
            var unalloctedRoom = new UnallocatedRoom();
            AddChidren(unalloctedRoom);
            unalloctedRoom.Show();

 ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs

@@ -696,6 +696,7 @@
                    var roomView = new Device.CommonForm.RoomView(0, 0);
                    roomPageView.AddChidren(roomView);
                    roomView.Init(room);
                    roomView.HideName(true);
                    roomView.action += () =>
                    {
                        Show();
@@ -703,6 +704,11 @@
                }
                var curIndex = rList.FindIndex((obj) => obj.Id == Room.CurrentRoom.Id);
                roomPageView.PageIndex = curIndex;
                if (roomPageView.GetChildren(roomPageView.PageIndex) != null)
                {
                    (roomPageView.GetChildren(roomPageView.PageIndex) as RoomView).HideName(false);
                    
                }

                var functionSceneView = new FrameLayout()
                {
@@ -782,9 +788,22 @@

                roomPageView.PageChange += (sender, e) =>
                {
                    if(roomPageView.GetChildren(roomPageView.PageIndex - 1) !=null)
                    {
                        (roomPageView.GetChildren(roomPageView.PageIndex - 1) as RoomView).HideName(true);
                    }
                    if (roomPageView.GetChildren(roomPageView.PageIndex + 1) != null)
                    {
                        (roomPageView.GetChildren(roomPageView.PageIndex + 1) as RoomView).HideName(true);
                    }
                    if (roomPageView.GetChildren(roomPageView.PageIndex) != null)
                    {
                        (roomPageView.GetChildren(roomPageView.PageIndex) as RoomView).HideName(false);
                    }
                    //切换当前房间
                    Room.CurrentRoom = rList[roomPageView.PageIndex];
                    RefreshBodyView();
                    
                };
            }
            else