Merge branch 'dev' into dev-temp

hxb

2022-08-29 9a4629512ccf8359efd88671c9317c3cc7faf0c8

 ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs

@@ -335,10 +335,11 @@
                    }
                    //打开人脸管理页面
#if iOS



                    Shared.IOS.HDLFVSDK.Video.ShowFaceManagement();
#endif


#if Android

                    Com.Evoyohome.Sphonelibs.Global.Global.OpenFaceManageActivity(Application.Activity);
#endif
                };

            }



@@ -452,6 +453,10 @@
#if iOS

                Shared.IOS.HDLFVSDK.Video.ShowDeviceList();
#endif
#if Android

                Com.Evoyohome.Sphonelibs.Global.Global.OpenIntercomActivity(Application.Activity);
#endif
            };



            if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)