Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

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

@@ -48,36 +48,61 @@
            var rowName = new FrameRowControl(listView.rowSpace / 2);
            rowName.UseClickStatu = false;
            listView.AddChidren(rowName);
            rowName.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uDeviceName), 300);
            rowName.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uDeviceName), 400);
            rowName.AddMostRightView(Common.LocalDevice.Current.GetDeviceObjectText(listDevice), 600);
            rowName.AddBottomLine();



            //设备型号

            string strModel = listDevice[0].DriveCode > 0 ? Language.StringByID(R.MyInternationalizationString.uVirtualDriveDevice) : listDevice[0].ModelIdentifier;

            if (strModel == string.Empty)

            {

                //无法识别

                strModel = Language.StringByID(R.MyInternationalizationString.uUnDistinguish);

            }

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

            rowType.UseClickStatu = false;
            listView.AddChidren(rowType);
            rowType.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uModelIdentifier), 300);
            rowType.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uModelIdentifier), 400);
            rowType.AddMostRightView(strModel, 600);
            rowType.AddBottomLine();

            //固件版本

            //镜像ID
            var otaDevice = Common.LocalDevice.Current.GetOTADevice(listDevice[0].DeviceAddr);
            if (otaDevice != null)

            {

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

                rowImage.UseClickStatu = false;

                listView.AddChidren(rowImage);

                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), 300);

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

            }



            //序列号

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

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



@@ -94,7 +119,7 @@
            var rowProtuct = new FrameRowControl(listView.rowSpace / 2);

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

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