Merge branch 'WJC' into temp-wxr

wxr

2021-03-16 9b44e30275621a48335fbea7b32b5065a2859c9c

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

@@ -134,7 +134,8 @@
                    if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
                    {
                        Method method = new Method();
                        var mqttdate = method.MqttDate(control.sid, 25);
                        Method.buttondata = "";
                        var mqttdate = method.MqttDate("按键", control.sid, 25);
                        if (mqttdate !=null)
                        {
                            //休眠是为显示引导界面
@@ -178,7 +179,7 @@
                    else
                    {
                        Method method = new Method();
                        method.ErrorShow(responsePackNew);
                        method.ErrorShow(responsePackNew, "");
                    }

                });