？？？？？？？

黄学彪

2020-03-23 cc0d80c7d86c6d0167269b3408c4b30c24ce84e9

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

@@ -37,7 +37,13 @@
            //清空bodyFrame

            this.ClearBodyFrame();

            var listDevice = Common.LocalDevice.Current.GetDevicesByMac(i_deviceMac);
            var listDevice = Common.LocalDevice.Current.GetDevicesByMac(i_deviceMac);

            var oTADevice = Common.LocalDevice.Current.GetOTADevice(i_deviceMac);
            if (listDevice.Count == 0)

            {

                //针对单纯只有一个200端点的设备

                listDevice.Add(oTADevice);

            }

            var listView = new VerticalListControl(12);
            listView.BackgroundColor = UserCenterColor.Current.White;
@@ -76,18 +82,25 @@
                rowImage.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uImageId), 400);

                rowImage.AddMostRightView(otaDevice.ImgTypeId.ToString(), 400);

                rowImage.AddBottomLine();

            }

            //固件版本

            var oTADevice = Common.LocalDevice.Current.GetOTADevice(listDevice[0].DeviceAddr);

            }



            if (oTADevice != null)

            {

                //固件版本

                var rowVersion = new FrameRowControl(listView.rowSpace / 2);

                rowVersion.UseClickStatu = false;

                listView.AddChidren(rowVersion);

                rowVersion.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uFirmwareVersion), 400);

                rowVersion.AddMostRightView(Common.LocalDevice.Current.AppendVersion(oTADevice.ImgVersion), 600);

                rowVersion.AddBottomLine();



                //硬件版本

                var rowHard = new FrameRowControl(listView.rowSpace / 2);

                rowHard.UseClickStatu = false;

                listView.AddChidren(rowHard);

                rowHard.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uHardwareVersion), 400);

                rowHard.AddMostRightView(oTADevice.HwVersion.ToString(), 600);

                rowHard.AddBottomLine();

            }



            //序列号