Merge branch 'WJC' into temp-wxr

wxr

2021-03-16 9b44e30275621a48335fbea7b32b5065a2859c9c

 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,11 +134,12 @@
                    if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
                    {
                        Method method = new Method();
                        var mqttdate = method.MqttDate(control.sid, 20);
                        if (mqttdate !=null)
                        Method.buttondata = "";
                        var mqttdate = method.MqttDate("按键", control.sid, 25);
                        if (mqttdate != null)
                        {
                            //休眠是为显示引导界面
                           // System.Threading.Thread.Sleep(3000);
                            // System.Threading.Thread.Sleep(3000);
                            //移除添加按钮引导界面
                            replication.RemView();
                            var buttonName = control.status.Find((c) => c.value == buttonObj.value);
@@ -170,15 +171,15 @@
                        else
                        {
                            replication.RemView();
                            new Intelligence.Automation.LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.tianjiashibai));
                            new TipPopView().FlashingBox(Language.StringByID(StringId.tianjiashibai));

                        }
                     

                    }
                    else
                    {
                        Method method = new Method();
                        method.ErrorShow(responsePackNew);
                        method.ErrorShow(responsePackNew, "");
                    }

                });