请合并最新多功能面板代码

xm

2020-07-21 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d

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

@@ -55,8 +55,16 @@
            var rowName = new FrameRowControl(listView.rowSpace / 2);
            rowName.UseClickStatu = false;
            listView.AddChidren(rowName);
            rowName.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uDeviceName), 400);
            rowName.AddMostRightView(Language.StringByID(myInfoType.ConcreteTextId), 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();



            //设备型号

@@ -121,11 +129,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));