合并代码 ver.10086

黄学彪

2020-01-17 4b378188ce972df432b23d9cb73babb6cc0679c6

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs

@@ -349,7 +349,7 @@
            {

                return HttpConnectMode.Normal;

            }

            if (Config.Instance.isAdministrator == true)

            if (Config.Instance.Home.IsOthreShare == true)

            {

                return HttpConnectMode.Admin;

            }

@@ -955,8 +955,6 @@
            //获取本地记录的用户信息

            UserCenterResourse.UserInfo = GetUserInformationFromLocation();

            UserCenterResourse.UserInfo.UserIconFile = System.IO.Path.Combine(UserCenterResourse.Option.UserPictruePath, "Admin.png");

            //先根据本地缓存设置初始值

            Config.Instance.isAdministrator = UserCenterResourse.UserInfo.AuthorityNo != 1;



            //获取登录账号的信息

            var pra = new AccountInfoPra();

@@ -1153,7 +1151,6 @@
                return false;

            }



            Config.Instance.isAdministrator = true;

            //分享链接

            var info = JsonConvert.DeserializeObject<MemberAdministratorResult>(revertObj.ResponseData.ToString());

            Config.Instance.AdminRequestBaseUrl = info.RequestBaseUrl;

@@ -1254,7 +1251,7 @@
        public static string GetConnectMainToken()

        {

            //启用管理员权限

            if (Config.Instance.isAdministrator == true)

            if (Config.Instance.Home.IsOthreShare == true)

            {

                return Config.Instance.AdminRequestToken;

            }