请合并，门锁和晾衣架第一版代码

xm

2020-12-10 3aa397ab145382935492b11c1f18c9634e69910b

 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs

old mode 100755
new mode 100644
@@ -261,7 +261,7 @@
                btnPosition.ButtonClickEvent += (sender, e) =>

                {

                    //定位

                    Common.LocalDevice.Current.SetFixedPositionCommand(listdevice[0]);

          Common.LocalDevice.Current.SetFixedPositionCommand(listdevice[0], true);
                };

            }



@@ -493,6 +493,16 @@
                var form = new DeviceMacInfoEditorForm();

                form.AddForm(device.DeviceAddr);

            }

      else if (deviceEnumInfo.BeloneType == DeviceBeloneType.A晾衣架)
      {
        var form = new DeviceMacInfoEditorForm();
        form.AddForm(device.DeviceAddr);
      }
      else if (deviceEnumInfo.BeloneType == DeviceBeloneType.A空气质量)
      {
        var form = new DeviceMacInfoEditorForm();
        form.AddForm(device.DeviceAddr);
      }
            else if (deviceEnumInfo.BeloneType == DeviceBeloneType.A窗帘)

            {

                var form = new DeviceMacInfoEditorForm();

@@ -710,7 +720,7 @@
            }

            //如果是在线的

            var nowGateway = HdlGatewayLogic.Current.GetLocalGateway(GatewayResourse.NowSelectGatewayId);

            if (HdlGatewayLogic.Current.CheckGatewayOnlineByFlag(nowGateway) == true)

      if (HdlGatewayLogic.Current.CheckGatewayOnlineByMemory(nowGateway) == true)
            {

                //检测广播到的这个网关是否拥有住宅ID

                ZbGateway realWay = null;

@@ -742,7 +752,7 @@
            }



            //获取全部设备

            int result = LocalDevice.Current.SetDeviceToMemmoryByGateway(nowGateway, false);

      int result = LocalDevice.Current.SetDeviceToMemmoryByGateway(nowGateway.GwId, false);
            if (this.Parent == null)

            {

                return;

@@ -783,7 +793,7 @@
                {

                    if (this.gatewayViewRow != null && this.gatewayViewRow.zbGatewayId == selectGwId)

                    {

                        bool online = HdlGatewayLogic.Current.CheckGatewayOnlineByFlag(zbGateway);

                  bool online = HdlGatewayLogic.Current.CheckGatewayOnlineByMemory(zbGateway);
                        //刷新控件在线状态

                        this.gatewayViewRow?.RefreshOnlineStatu();

                        //根据网关在线状态刷新设备在线状态

@@ -1271,7 +1281,7 @@
                {

                    btnName.Text = HdlGatewayLogic.Current.GetGatewayName(zbway);

                    //在线状态

                    this.isOnline = HdlGatewayLogic.Current.CheckGatewayOnlineByFlag(zbway);

          this.isOnline = HdlGatewayLogic.Current.CheckGatewayOnlineByMemory(zbway);
                    if (this.isOnline == false)

                    {

                        btnName.TextColor = UserCenterColor.Current.TextGrayColor1;

@@ -1340,7 +1350,7 @@
                    return;

                }

                //在线状态

                bool statu = HdlGatewayLogic.Current.CheckGatewayOnlineByFlag(zbway);

        bool statu = HdlGatewayLogic.Current.CheckGatewayOnlineByMemory(zbway);
                if (this.isOnline != statu)

                {

                    this.isOnline = statu;

@@ -1397,7 +1407,7 @@
                btnName.Height = Application.GetRealHeight(60);

                btnName.TextSize = 15;

                btnName.Y = Application.GetRealHeight(57);

                btnName.Text = "小度小度";

        btnName.Text = "智能音箱";


                this.AddRightArrow();

                this.AddMostRightView("", 300, false).Name = "smartSoundLayout";