2020.06.12

lss

2020-06-12 9c16d3614d9b88c637f967518a329f239fcd3aaf

 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;
@@ -45,11 +51,20 @@
            bodyFrameLayout.AddChidren(listView);

            //设备名称
            var myInfoType = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);
            var rowName = new FrameRowControl(listView.rowSpace / 2);
            rowName.UseClickStatu = false;
            listView.AddChidren(rowName);
            rowName.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uDeviceName), 400);
            rowName.AddMostRightView(Common.LocalDevice.Current.GetDeviceObjectText(listDevice), 600);
            rowName.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uDeviceName), 400);

            if (Common.LocalDevice.Current.IsMiniLight(listDevice[0]) == true)

            {

                //mini夜灯

                rowName.AddMostRightView(Language.StringByID(R.MyInternationalizationString.uMiniNightLight), 600);

            }

            else

            {

                rowName.AddMostRightView(Language.StringByID(myInfoType.ConcreteTextId), 600);

            }

            rowName.AddBottomLine();



            //设备型号

@@ -76,9 +91,8 @@
                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)

            {

                //固件版本