合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

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

@@ -38,6 +38,12 @@
            this.ClearBodyFrame();

            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(myInfoType.ConcreteText, 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)

            {

                //固件版本

@@ -102,8 +116,16 @@
            var rowSerial = new FrameRowControl(listView.rowSpace / 2);

            rowSerial.UseClickStatu = false;
            listView.AddChidren(rowSerial);
            rowSerial.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uSerialNumber), 400);
            rowSerial.AddMostRightView(listDevice[0].SerialNumber != string.Empty ? listDevice[0].SerialNumber : listDevice[0].DeviceAddr, 600);
            rowSerial.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uSerialNumber), 400);

            if (Common.LocalDevice.Current.IsHdlDevice(listDevice[0]) == false)

            {

                //第三方设备固定使用Mac

                rowSerial.AddMostRightView(listDevice[0].DeviceAddr, 600);

            }
            else

            {

                rowSerial.AddMostRightView(listDevice[0].SerialNumber != string.Empty ? listDevice[0].SerialNumber : listDevice[0].DeviceAddr, 600);

            }
            rowSerial.AddBottomLine();



            //MAC

@@ -115,11 +137,15 @@
            rowMac.AddBottomLine();

            //制造商

            string strProtuct = listDevice[0].DriveCode > 0 ? "HDL" : listDevice[0].ManufacturerName;

            string strProtuct = listDevice[0].ManufacturerName;

            if (listDevice[0].DriveCode > 0 || Common.LocalDevice.Current.IsHdlDevice(listDevice[0]) == true)

            {

                strProtuct = "广州河东科技有限公司";

            }

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

            rowProtuct.UseClickStatu = false;
            listView.AddChidren(rowProtuct);
            rowProtuct.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uManufacturerName), 400);
            rowProtuct.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uManufacturerName), 600);
            rowProtuct.AddMostRightView(strProtuct, 600);

            listView.AdjustRealHeight(Application.GetRealHeight(23));