Merge branch 'dev-tzy' into temp-wxr

wxr

2021-03-16 fab43407e01474cc4f7b1d0f4b5e43ce1a038ce4

 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs

@@ -8,7 +8,7 @@
    {
        public AddButton()
        {
            Tag = "Pir";
            Tag = "PirView";
        }
        public void Show(Control control)
        {
@@ -134,7 +134,7 @@
                    if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
                    {
                        Method method = new Method();
                        var mqttdate = method.MqttDate(control.sid, 20);
                        var mqttdate = method.MqttDate(control.sid, 25);
                        if (mqttdate !=null)
                        {
                            //休眠是为显示引导界面
@@ -170,7 +170,7 @@
                        else
                        {
                            replication.RemView();
                            new Intelligence.Automation.LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.tianjiashibai));
                            new TipPopView().FlashingBox(Language.StringByID(StringId.tianjiashibai));

                        }