新云端代码Ver1.2

黄学彪

2020-12-16 0d9f64668fd7350d6a21fd157e32009a96d98134

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

@@ -37,8 +37,8 @@
            //清空bodyFrame

            this.ClearBodyFrame();

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

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

            var oTADevice = HdlDeviceCommonLogic.Current.GetOTADevice(i_deviceMac);

            if (listDevice.Count == 0)

            {

                //针对单纯只有一个200端点的设备

@@ -51,12 +51,12 @@
            bodyFrameLayout.AddChidren(listView);

            //设备名称
            var myInfoType = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);
            var myInfoType = HdlDeviceCommonLogic.Current.GetMyDeviceEnumInfo(listDevice);

            var rowName = new FrameRowControl(listView.rowSpace / 2);
            rowName.UseClickStatu = false;
            listView.AddChidren(rowName);
            rowName.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uDeviceName), 400);

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

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

            {

                //mini夜灯

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

@@ -82,7 +82,7 @@
            rowType.AddBottomLine();

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

            if (otaDevice != null)

            {

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

@@ -100,7 +100,7 @@
                rowVersion.UseClickStatu = false;

                listView.AddChidren(rowVersion);

                rowVersion.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uFirmwareVersion), 400);

                rowVersion.AddMostRightView(Common.LocalDevice.Current.AppendVersion(oTADevice.ImgVersion), 600);

                rowVersion.AddMostRightView(HdlDeviceCommonLogic.Current.AppendVersion(oTADevice.ImgVersion), 600);

                rowVersion.AddBottomLine();



                //硬件版本

@@ -117,7 +117,7 @@
            rowSerial.UseClickStatu = false;
            listView.AddChidren(rowSerial);
            rowSerial.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uSerialNumber), 400);

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

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

            {

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

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

@@ -138,7 +138,7 @@

            //制造商

            string strProtuct = listDevice[0].ManufacturerName;

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

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

            {

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

            }