代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

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

@@ -77,17 +77,25 @@
                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();

            }



            //序列号