Merge branch 'CJL' into NewFilePath

wxr

2020-12-14 55bd5c4ccb56cbd3c10e6b170aaab20d7023c139

Merge branch 'CJL' into NewFilePath

 HDL-ON_Android/Assets/Language.ini

@@ -565,6 +565,7 @@
9046=修改成功!
9047=您的密码已经修改生效，请重新登录
9048=使用账号密码登录
9049=密码连续输错次数已达到10次,用户已被锁定,请次日0点后再登陆

10000=无效登录密钥，请重新登录！
10001=请求服务器失败，请稍后再试！

 HDL-ON_iOS/Resources/Language.ini

@@ -565,6 +565,7 @@
9046=修改成功!
9047=您的密码已经修改生效，请重新登录
9048=使用账号密码登录
9049=密码连续输错次数已达到10次,用户已被锁定,请次日0点后再登陆

10000=无效登录密钥，请重新登录！
10001=请求服务器失败，请稍后再试！

 HDL_ON/Common/R.cs

@@ -709,7 +709,10 @@
        /// 使用账号密码登录
        /// </summary>
        public const int LogWithAccountAndPassword = 9048;

        /// <summary>
        /// 密码连续输错次数已达到10次,用户已被锁定,请次日0点后再登陆
        /// </summary>
        public const int AccountLoginLock = 9049;

        #region 网络请求响应错误提示信息
        /// <summary>

 HDL_ON/DAL/Server/HttpServerRequest.cs

@@ -492,7 +492,8 @@
                        UserInfo.Current.regionList.Add(home);
                    }
                    //住宅被删除
                    if (UserInfo.Current.regionList.Find((obj) => obj.RegionID == DB_ResidenceData.Instance.CurrentRegion.RegionID) == null)
                    var findHome = UserInfo.Current.regionList.Find((obj) => obj.RegionID == DB_ResidenceData.Instance.CurrentRegion.RegionID);
                    if (findHome == null)
                    {
                        Shared.Application.RunOnMainThread(() =>
                        {
@@ -509,6 +510,9 @@
                    }
                    else
                    {
                        //刷新当前住宅
                        DB_ResidenceData.Instance.CurrentRegion = findHome;
                        DB_ResidenceData.Instance.SaveResidenceData();
                        UserInfo.Current.SaveUserInfo();
                        //刷新一次住宅网关
                        GetHomeGatewayList();

 HDL_ON/DAL/Server/IMessageCommon.cs

@@ -107,6 +107,8 @@
            //stateCodeDic["10017"] = StringId.10017;
            ////租户不存在
            //stateCodeDic["10018"] = StringId.10018;
            //密码连续输错次数已达到10次,用户已被锁定,请次日0点后再登陆
            stateCodeDic["10019"] = StringId.AccountLoginLock;

            ////枚举类型错误
            //stateCodeDic["11003"] = StringId.11003;

 HDL_ON/Entity/DB_ResidenceData.cs

@@ -7,6 +7,7 @@

namespace HDL_ON.Entity
{
    [System.Serializable]
    public class DB_ResidenceData
    {
        public DB_ResidenceData()
@@ -18,7 +19,8 @@
        /// </summary>
        public string MasterToken;

        RegionInfoRes _residecenInfo;
        //RegionInfoRes _residecenInfo;
        RegionInfoRes _residecenInfo = new RegionInfoRes();
        /// <summary>
        /// 住宅基础信息
        /// </summary>

 HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs

@@ -163,7 +163,8 @@
                    {
                        var regionId = (string)btnHomeName.Tag;
                        dialog.Close();
                        LoadEvent_ChangeCurHome(UserInfo.Current.regionList.Find((obj) => obj.RegionID == regionId));
                        //LoadEvent_ChangeCurHome(UserInfo.Current.regionList.Find((obj) => obj.RegionID == regionId));
                        LoadEvent_ChangeCurHome(home);
                        LoadContentView();
                    };
                }