Merge branch 'dev' into lss

lss

2022-05-17 ae86b09b30621e1a8512c6bcdd7e22e9c67a5402

 HDL_ON/Entity/Function/Function.cs

@@ -556,6 +556,13 @@
                SaveFunctionFile();
                if (pack.Code == StateCode.SUCCESS)
                {
                    if (UI.RoomPage.bodyView != null)
                    {
                        Application.RunOnMainThread(() =>
                        {
                            UI.RoomPage.bodyView.ReLoadPage();
                        });
                    }
                }
                else
                {
@@ -709,12 +716,8 @@
            sendDataObj.time_stamp = Utlis.GetTimestamp();
            var acd = new AlinkDoorlockStatus();
            acd.sid = sid;
            acd.user_id = userId;
            acd.user_id = extStr;
            acd.ext_str = extStr;
#if DEBUG
            acd.user_id = "013";
            acd.ext_str = "999999";
#endif
            sendDataObj.objects.Add(acd);
            return sendDataObj;
        }