Merge branch 'WJC' into wxr6

wxr

2021-06-09 34cac3d14e5243c2388b54da02f5aebeec555da8

 HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs

@@ -151,6 +151,7 @@
                            form1.AddForm(device);
                            form1.AddDeviceEvent = (functionObj) => {
                                refreshView.BeginHeaderRefreshing();
                                this.RemoveFromParent();
                            };
                            break;
                    }