合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

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

@@ -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();

@@ -1009,7 +1019,7 @@
                        }

                    });

                }

            });

            }, ShowErrorMode.NO);

        }



        #endregion

@@ -1143,6 +1153,20 @@
        /// </summary>

        public override int FormActionAgainEvent()

        {

            if (GatewayResourse.AppOldSelectGatewayId != this.gatewayViewRow.zbGatewayId)

            {

                //这个网关被整掉了,需要重新初始化界面

                this.nowActionDeviceMac = null;

                this.oldShowRightMuneRow = null;

                //重新选择网关

                HdlGatewayLogic.Current.RefreshAppOldSelectGatewayId();



                //初始化界面

                this.InitMiddleFrame();



                return 1;

            }



            if (this.nowActionDeviceMac != null)

            {

                //刷新指定设备行的信息

@@ -1224,9 +1248,9 @@
            /// </summary>

            private NormalViewControl btnName = null;

            /// <summary>

            /// 在线状态

            /// 在线状态(初始状态为在线)

            /// </summary>

            public bool isOnline = false;

            public bool isOnline = true;



            /// <summary>

            /// 自定义网关控件

@@ -1271,11 +1295,11 @@
                {

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

                    //在线状态

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

                    if (this.isOnline == false)

                    {

                        btnName.TextColor = UserCenterColor.Current.TextGrayColor1;

                    }

                    //this.isOnline = HdlGatewayLogic.Current.CheckGatewayOnlineByMemory(zbway);

                    //if (this.isOnline == false)

                    //{

                    //    btnName.TextColor = UserCenterColor.Current.TextGrayColor1;

                    //}

                }

                else

                {