全部合并了代码，安卓和 IOS 都测试通过了

黄学彪

2019-11-13 8b9ce384b26c414db32f98e94e088f5334869c2d

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

@@ -39,9 +39,9 @@

            var listDevice = Common.LocalDevice.Current.GetDevicesByMac(i_deviceMac);

            var listView = new FrameListControl(12);
            var listView = new VerticalListControl(12);
            listView.BackgroundColor = UserCenterColor.Current.White;
            listView.Height = Application.GetRealHeight(876);
            listView.Height = bodyFrameLayout.Height;
            bodyFrameLayout.AddChidren(listView);

            //设备名称
@@ -94,6 +94,8 @@
            listView.AddChidren(rowProtuct);
            rowProtuct.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uManufacturerName), 300);
            rowProtuct.AddMostRightView(listDevice[0].ManufacturerName, 600);

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



        #endregion