合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 ZigbeeApp/Shared/Phone/UserView/HomePage.cs

old mode 100755
new mode 100644
@@ -53,28 +53,30 @@
            if (Config.Instance.IsLogin)
            {
                //显示启动页
                this.ShowLoginLoadView();
                CommonPage.Loading.Start();

                UserCenter.HdlThreadLogic.Current.RunThread(() =>
                {

                    //登录

                    var loginSuccess = LoginByPWDAsync(Config.Instance.Account, Config.Instance.Password);



                    //登录成功,或者没有网络都可以登录

                    if (loginSuccess == 1 || loginSuccess == 2)

                    {

                        var homes = UserCenter.HdlResidenceLogic.Current.GetHomeListsFromDb();

                        var homes = UserCenter.HdlResidenceLogic.Current.GetHomeListsFromDb(true);

                        //刷新个人中心的内存及线程

                        UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();

                        bool result = UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();

                        //启动ZigBee

                        ZigBee.Common.Application.Init();



                        UserCenter.HdlThreadLogic.Current.RunMain(() =>

                        {

                            CommonPage.Instance.RemoveViewByTag("Login");

                            UserPage.Instance.ReFreshControl();

                            CommonPage.Loading.Hide();

                            if (result == true)

                            {

                                //false:开启了调试功能

                                UserPage.Instance.ReFreshControl();

                            }

                        });

                    }

                    else

@@ -104,16 +106,6 @@
            }
        }

        /// <summary>

        /// 显示启动页

        /// </summary>
        public void ShowLoginLoadView()
        {
            var loginLoad = new LoginLoading { };
            CommonPage.Instance.AddChidren(loginLoad);
            loginLoad.Show();
        }

        /// <summary>
        /// 1:登录成功 0:密码错误 -1:其他异常 2:无法联网
        /// </summary>
@@ -128,9 +120,7 @@
            var requestObj = new SendDataToServer.LoginObj

            {

                Account = account,

                Password = password,

                Source = source,

                Company = company

                Password = password

            };

            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);

            //登陆接口特殊,需要快一点访问,设置3秒超时

@@ -155,7 +145,12 @@
                Config.Instance.LoginToken = revertData.Token;

                //上报设备ID

                CommonPage.Instance.PushRegID();

                isLoginSuccess = 1;

                isLoginSuccess = 1;

//#if iOS

//                //初始化全视通
//                Shared.IOS.HDLFVSDK.Video.Init("",revertData.UserID.ToString());
//#endif

            }

            else if (stateCodeStr == "YOUDATANOISLOCALREGION")

            {

@@ -187,6 +182,11 @@
                //账号不存在

                isLoginSuccess = 0;

            }
            else if (stateCodeStr == "BERESTRICT")
            {
                //此账号无权登录
                isLoginSuccess = 0;
            }
            return isLoginSuccess;
        }
    }