合并代码

黄学彪

2020-01-09 fa6bcb2e9907772480f99205f36ec2a1ce735a22

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetySensorStatuControl.cs

@@ -119,6 +119,23 @@
            {

                return;

            }

            string strMsg = reportInfo.AlarmMsg;

            if (reportInfo.DemolishmenMsg != null)

            {

                //被拆报警

                strMsg = reportInfo.DemolishmenMsg;

            }

            else if (reportInfo.BatteryMsg != null)

            {

                //电池报警

                strMsg = reportInfo.BatteryMsg;

            }

            if (strMsg == null || strMsg == string.Empty)

            {

                //不是在册的报警消息

                return;

            }



            //在线状态的控件隐藏

            btnOnline.Visible = false;



@@ -138,18 +155,7 @@
                btnMsg.Y = Application.GetRealHeight(141);

                this.AddChidren(btnMsg);

            }

            if (reportInfo.DemolishmenMsg != null)

            {

                btnMsg.Text = reportInfo.DemolishmenMsg;

            }

            else if (reportInfo.BatteryMsg != null)

            {

                btnMsg.Text = reportInfo.BatteryMsg;

            }

            else

            {

                btnMsg.Text = reportInfo.AlarmMsg;

            }

            btnMsg.Text = strMsg;

        }



        #endregion