JLChen
2020-11-13 1209d93632b447823caf371dea5ccf030ab20434
2020-11-13 1.更新
26个文件已修改
953 ■■■■■ 已修改文件
.vs/HDL_APP_Project/xs/UserPrefs.xml 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/DAL/Server/HttpServerRequest.cs 152 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/DAL/Server/HttpUtil.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/DAL/Server/IMessageCommon.cs 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/DAL/Server/NewApiRes.cs 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/Entity/ResponseEntity/RegionInfoRes.cs 227 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/MainPage.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI1-Login/LoginPage.cs 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI1-Login/LoginPageBLL.cs 231 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI1-Login/RegisterPage.cs 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI1-Login/RegisterPageBLL.cs 128 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/BindAccountPage.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/VerificationCodePage.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPageBLL.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPageBLL.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordPage.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordVerificationCodePage.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePageBLL.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,14 +1,10 @@
<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI1-Login/LoginPageBLL.cs">
    <Files>
      <File FileName="HDL_ON/UI/UI1-Login/RegisterPageBLL.cs" Line="405" Column="45" />
      <File FileName="HDL_ON/UI/UI1-Login/RegisterPage.cs" Line="1" Column="1" />
      <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="100" Column="50" />
      <File FileName="HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs" Line="419" Column="16" />
      <File FileName="HDL_ON/DAL/Server/IMessageCommon.cs" Line="223" Column="21" />
      <File FileName="HDL_ON/UI/UI0-Public/PublicAssmebly.cs" Line="477" Column="52" />
      <File FileName="HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs" Line="14" Column="17" />
      <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="436" Column="1" IsPinned="True" />
      <File FileName="HDL_ON/UI/UI1-Login/LoginPageBLL.cs" Line="1042" Column="1" />
      <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="1" Column="1" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -20,9 +16,12 @@
              </Node>
              <Node name="UI" expanded="True">
                <Node name="UI1-Login" expanded="True">
                  <Node name="ForgetPasswordPageBLL.cs" selected="True" />
                  <Node name="LoginPageBLL.cs" selected="True" />
                </Node>
              </Node>
            </Node>
            <Node name="HDL-ON_iOS" expanded="True">
              <Node name="References" expanded="True" />
            </Node>
          </Node>
        </State>
@@ -46,7 +45,6 @@
      <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/ON+/HDL_ON/DAL/Net/Mqtt_A_Protocol.cs" relfile="HDL_ON/DAL/Net/Mqtt_A_Protocol.cs" line="163" column="1" />
      <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/ON+/HDL_ON/DriverLayer/Control_Udp_Bus.cs" relfile="HDL_ON/DriverLayer/Control_Udp_Bus.cs" line="694" column="1" />
      <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/ON+/HDL_ON/DriverLayer/Control_TcpServer.cs" relfile="HDL_ON/DriverLayer/Control_TcpServer.cs" line="197" column="1" />
      <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/ON+/HDL_ON/DAL/Server/HttpUtil.cs" relfile="HDL_ON/DAL/Server/HttpUtil.cs" line="225" column="1" />
    </BreakpointStore>
  </MonoDevelop.Ide.DebuggingService.Breakpoints>
  <MultiItemStartupConfigurations />
HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -114,7 +114,7 @@
                refreshToken = MainPage.LoginUser.refreshToken,
            });
            var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_Login, requestJson);
            if (revertObj.Code.ToUpper() == HttpUtil.SUCCESS_CODE)
            if (revertObj.Code.ToUpper() == StateCode.SUCCESS)
            {
                var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes>(revertObj.Data.ToString());
                MainPage.LoginUser.loginTokenString = revertData.headerPrefix + revertData.accessToken;
@@ -140,7 +140,7 @@
        /// <summary>
        /// 通用 发送验证码方法
        /// </summary>
        /// <param name="verifyType">1:注册 2:找回密码 3:登陆 4:绑定</param>
        /// <param name="verifyType">1:注册 2:找回密码 3:绑定4:验证码登陆 5:敏感数据</param>
        /// <param name="account">邮箱或者手机号</param>
        /// <param name="isPhone">是否手机</param>
        /// <param name="phoneZoneCode">手机国家区号</param>
@@ -326,7 +326,7 @@
            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(d);
            var revertObj = RequestHttps($"{severAddress}/ZigbeeUsers/GetAccountInfo", requestJson, true);
            if (revertObj.StateCode.ToUpper() == HttpUtil.SUCCESS_CODE)
            if (revertObj.StateCode.ToUpper() == StateCode.SUCCESS)
            {
                var dataStr = JObject.FromObject(revertObj.ResponseData);
                //"DistributedMark": "96439601-fd26-4768-8440-1d9dfa32c109",  < !--帐号Id-- >
@@ -424,63 +424,39 @@
        /// <summary>
        /// 获取住宅列表
        /// </summary>
        public string GetHomePager()
        public string GetHomePager(HomeTypeEnum homeType = HomeTypeEnum.ALL)
        {
            string jsonString = "{" +
                                "\"RequestVersion\":" + "\"" + MainPage.VersionString + "\"" + "," +
                                "\"RequestSource\":" + "\"" + "2" + "\"" + "," +
                                "\"HomeType\":" + "\"" + "1" + "\"" + "," +
                                "\"LoginAccessToken\":" + "\"" + MainPage.LoginUser.loginTokenString + "\"" +
                                "}";
            var responsePack = RequestHttps($"{severAddress}/App/GetHomePager", jsonString, false);
            if (responsePack.StateCode.ToUpper() == HttpUtil.SUCCESS_CODE)
            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new GetHomeListObj() { homeType = homeType.ToString() });
            var resultObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_Gethomepager, requestJson);
            if(resultObj.Code == StateCode.SUCCESS)
            {
                var dataStr = JObject.FromObject(responsePack.ResponseData);
                //没有住宅
                if (dataStr.GetValue("PageData").ToString() == "[]")
                {
                var homeList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<RegionInfoResNew>>(resultObj.Data.ToString());
                if (homeList == null || homeList.Count == 0) {
                }
                else
                {
                    //{
                    // {
                    //  "Id": "1107487",
                    //  "HomeStatus": 2,
                    //  "UserGuid": "22980",
                    //  "Name": "啊",
                    //  "Address": null,
                    //  "Longitude": 0.0,
                    //  "Latitude": 0.0,
                    //  "RegionName": null,
                    //  "Company": null,
                    //  "ContactPerson": null,
                    //  "ContactPersonPhone": null,
                    //  "Remarks": null,
                    //  "ChangeDate": null,
                    //  "AccountType": 0,
                    //  "CreatedOnUtc": "2020-05-27T06:52:03",
                    //  "IsOthreShare": false,
                    //  "MainUserDistributedMark": null,
                    //  "HomeGateways": [
                    //    {
                    //      "GatewayUniqueId": "4E47323347591243"
                    //    }
                    //  ]
                    //}}
                    MainPage.LoginUser.regionList = new List<RegionInfoRes>();
                    foreach (var jsonData in dataStr.GetValue("PageData"))
                    foreach (var mHome in homeList)
                    {
                        var homeJsonStr = JObject.FromObject(jsonData);
                        var home = new RegionInfoRes()
                        {
                            RegionID = homeJsonStr.GetValue("Id").ToString(),
                            RegionName = homeJsonStr.GetValue("RegionName").ToString(),
                            Name = homeJsonStr.GetValue("Name").ToString(),
                            Address = homeJsonStr.GetValue("Address").ToString(),
                            IsOthreShare = (bool)homeJsonStr.GetValue("IsOthreShare"),
                            homeGateways = Newtonsoft.Json.JsonConvert.DeserializeObject<List<HomeGateways>>(homeJsonStr.GetValue("HomeGateways").ToString()),
                            RegionID = mHome.Id,
                            Name = mHome.homeName,
                            IsOthreShare = mHome.IsOtherShare,
                            accountType = mHome.accountType,
                            isRemoteControl = mHome.isRemoteControl,
                            longitude = mHome.longitude,
                            latitude = mHome.latitude,
                            deliverstatus = mHome.deliverstatus,
                            homeType = mHome.homeType,
                            regionUrl = mHome.regionUrl,
                            emqUrl = mHome.emqUrl,
                            homeRegionName = mHome.homeRegionName,
                            homeRegionId = mHome.homeRegionId,
                            Address = mHome.homeAddress,
                        };
                        if (home.IsOthreShare)
                        {
@@ -495,8 +471,82 @@
                    DB_ResidenceData.residenceData.SaveResidenceData();
                    MainPage.LoginUser.SaveUserInfo();
                }
            }
            return responsePack.StateCode;
            return resultObj.Code;
            //string jsonString = "{" +
            //                    "\"RequestVersion\":" + "\"" + MainPage.VersionString + "\"" + "," +
            //                    "\"RequestSource\":" + "\"" + "2" + "\"" + "," +
            //                    "\"HomeType\":" + "\"" + "1" + "\"" + "," +
            //                    "\"LoginAccessToken\":" + "\"" + MainPage.LoginUser.loginTokenString + "\"" +
            //                    "}";
            //var responsePack = RequestHttps($"{severAddress}/App/GetHomePager", jsonString, false);
            //if (responsePack.StateCode.ToUpper() == StateCode.SUCCESS_CODE)
            //{
            //    var dataStr = JObject.FromObject(responsePack.ResponseData);
            //    //没有住宅
            //    if (dataStr.GetValue("PageData").ToString() == "[]")
            //    {
            //    }
            //    else
            //    {
            //        //{
            //        // {
            //        //  "Id": "1107487",
            //        //  "HomeStatus": 2,
            //        //  "UserGuid": "22980",
            //        //  "Name": "啊",
            //        //  "Address": null,
            //        //  "Longitude": 0.0,
            //        //  "Latitude": 0.0,
            //        //  "RegionName": null,
            //        //  "Company": null,
            //        //  "ContactPerson": null,
            //        //  "ContactPersonPhone": null,
            //        //  "Remarks": null,
            //        //  "ChangeDate": null,
            //        //  "AccountType": 0,
            //        //  "CreatedOnUtc": "2020-05-27T06:52:03",
            //        //  "IsOthreShare": false,
            //        //  "MainUserDistributedMark": null,
            //        //  "HomeGateways": [
            //        //    {
            //        //      "GatewayUniqueId": "4E47323347591243"
            //        //    }
            //        //  ]
            //        //}}
            //        MainPage.LoginUser.regionList = new List<RegionInfoRes>();
            //        foreach (var jsonData in dataStr.GetValue("PageData"))
            //        {
            //            var homeJsonStr = JObject.FromObject(jsonData);
            //            var home = new RegionInfoRes()
            //            {
            //                RegionID = homeJsonStr.GetValue("Id").ToString(),
            //                RegionName = homeJsonStr.GetValue("RegionName").ToString(),
            //                Name = homeJsonStr.GetValue("Name").ToString(),
            //                Address = homeJsonStr.GetValue("Address").ToString(),
            //                IsOthreShare = (bool)homeJsonStr.GetValue("IsOthreShare"),
            //                homeGateways = Newtonsoft.Json.JsonConvert.DeserializeObject<List<HomeGateways>>(homeJsonStr.GetValue("HomeGateways").ToString()),
            //            };
            //            if (home.IsOthreShare)
            //            {
            //                continue;
            //            }
            //            MainPage.LoginUser.regionList.Add(home);
            //            if (string.IsNullOrEmpty(DB_ResidenceData.residenceData.CurReginID))
            //            {
            //                DB_ResidenceData.residenceData.CurReginID = MainPage.LoginUser.regionList[0].RegionID;
            //            }
            //        }
            //        DB_ResidenceData.residenceData.SaveResidenceData();
            //        MainPage.LoginUser.SaveUserInfo();
            //    }
            //}
            //return responsePack.StateCode;
        }
        /// <summary>
        /// 编辑住宅信息
HDL_ON/DAL/Server/HttpUtil.cs
@@ -12,10 +12,6 @@
    public class HttpUtil
    {
        #region HttpUtil 全局常量
        /// <summary>
        /// 请求成功的状态码
        /// </summary>
        public const string SUCCESS_CODE = "0";
        ///// <summary>
        ///// API_HTTPS
        ///// </summary>
HDL_ON/DAL/Server/IMessageCommon.cs
@@ -9,6 +9,7 @@
    /// </summary>
    public class IMessageCommon
    {
        /// <summary>
        /// 接口类的返回信息
        /// </summary>
@@ -67,9 +68,9 @@
            //stateCodeDic["10001"] = HDL_ON.StringId.uOperationFailed;
            ////登录失败,账号或者密码错误
            //stateCodeDic["10008"] = HDL_ON.StringId.Accountorpassworderro;
            ////账号不存在
            //stateCodeDic["10010"] = HDL_ON.StringId.uNoLogin;
            stateCodeDic["10008"] = HDL_ON.StringId.LoginFailed_AccountOrPasswordError;
            //账号不存在
            stateCodeDic[StateCode.ACCOUNT_NOT_EXIST] = HDL_ON.StringId.AccountNotExist;
            //#endregion
            ////return;
@@ -244,4 +245,20 @@
            catch { }
        }
    }
    /// <summary>
    /// 常用状态码管理
    /// </summary>
    public class StateCode
    {
        /// <summary>
        /// 请求成功的状态码
        /// </summary>
        public const string SUCCESS = "0";
        /// <summary>
        /// 账号不存在的错误码
        /// </summary>
        public const string ACCOUNT_NOT_EXIST = "10010";
    }
}
HDL_ON/DAL/Server/NewApiRes.cs
@@ -1019,9 +1019,10 @@
    /// </summary>
    public enum HomeTypeEnum
    {
        ZIGBEE,
        ZIGBEE = 1,
        BUSPRO,
        A
        A,
        ALL
    }
    /// <summary>
@@ -1034,26 +1035,30 @@
    }
    /// <summary>
    /// VerifyType
    /// 发送验证码功能类型
    /// </summary>
    public enum VerifyType
    {
        /// <summary>
        /// 注册
        /// 用户注册
        /// </summary>
        REGISTER = 1,
        REGISTER_USER = 1,
        /// <summary>
        /// 忘记密码
        /// </summary>
        FORGOTPASSWORD,
        FIND_PASSWORD,
        /// <summary>
        /// 登录
        /// 验证码登陆
        /// </summary>
        LOGIN,
        REGISTER_USER_SYSTEM,
        /// <summary>
        /// 绑定
        /// 验证码登陆
        /// </summary>
        BIND,
        VERIFY_LOGIN,
        /// <summary>
        /// 敏感数据验证
        /// </summary>
        SENSITIVE_DATA,
    }
    /// <summary>
HDL_ON/Entity/ResponseEntity/RegionInfoRes.cs
@@ -3,48 +3,201 @@
namespace HDL_ON
{
    [Serializable]
    public class RegionInfoRes
    {
        public string RegionID { get; set; }
    //[Serializable]
    //public class RegionInfoRes
    //{
    //    public string RegionID { get; set; }
        /// <summary>
        /// 区域名称(如:广州、深圳等)
        /// </summary>
        public string RegionName { get; set; }
        /// <summary>
        /// 住宅名称
        /// </summary>
        public string Name { get;set; }
        /// <summary>
        /// 住宅地址
        /// </summary>
        public string Address { get; set; }
    //    /// <summary>
    //    /// 区域名称(如:广州、深圳等)
    //    /// </summary>
    //    public string RegionName { get; set; }
    //    /// <summary>
    //    /// 住宅名称
    //    /// </summary>
    //    public string Name { get;set; }
    //    /// <summary>
    //    /// 住宅地址
    //    /// </summary>
    //    public string Address { get; set; }
        //{
        // {
        //  "Id": "1107487",
        //  "HomeStatus": 2,
        //  "UserGuid": "22980",
        //  "Name": "啊",
        //  "Address": null,
        //  "Longitude": 0.0,
        //  "Latitude": 0.0,
        //  "RegionName": null,
        //  "Company": null,
        //  "ContactPerson": null,
        //  "ContactPersonPhone": null,
        //  "Remarks": null,
        //  "ChangeDate": null,
          //"AccountType": 0,
        //  "CreatedOnUtc": "2020-05-27T06:52:03",
        public bool IsOthreShare = false;
        //  "MainUserDistributedMark": null,
        public List<HomeGateways> homeGateways = new List<HomeGateways>();
    }
    //    //{
    //    // {
    //    //  "Id": "1107487",
    //    //  "HomeStatus": 2,
    //    //  "UserGuid": "22980",
    //    //  "Name": "啊",
    //    //  "Address": null,
    //    //  "Longitude": 0.0,
    //    //  "Latitude": 0.0,
    //    //  "RegionName": null,
    //    //  "Company": null,
    //    //  "ContactPerson": null,
    //    //  "ContactPersonPhone": null,
    //    //  "Remarks": null,
    //    //  "ChangeDate": null,
    //      //"AccountType": 0,
    //    //  "CreatedOnUtc": "2020-05-27T06:52:03",
    //    public bool IsOthreShare = false;
    //    //  "MainUserDistributedMark": null,
    //    public List<HomeGateways> homeGateways = new List<HomeGateways>();
    //}
    public class HomeGateways
    {
        public string GatewayUniqueId = "";
    }
    [Serializable]
    public class RegionInfoRes
    {
        /// <summary>
        /// 住宅ID
        /// </summary>
        public string RegionID { get; set; }
        /// <summary>
        /// 住宅名称
        /// </summary>
        public string Name { get; set; }
        /// <summary>
        /// 住宅地址
        /// </summary>
        public string Address { get; set; }
        /// <summary>
        /// 是否为其他主用户分享过来的住宅
        /// </summary>
        public bool IsOthreShare = false;
        /// <summary>
        ///
        /// </summary>
        public List<HomeGateways> homeGateways = new List<HomeGateways>();
        //2020-11-13 新增
        /// <summary>
        /// 仅子账号登陆的时候使用,当【IsOthreShare】为"true",
        /// 子账户类型 1.ORDINARY 2.DEBUG 3.ADMIN
        /// </summary>
        public string accountType;
        /// <summary>
        /// 是否支持远程
        /// </summary>
        public bool isRemoteControl;
        /// <summary>
        /// 经度
        /// </summary>
        public double longitude;
        /// <summary>
        /// 纬度
        /// </summary>
        public double latitude;
        /// <summary>
        /// 交付状态
        /// </summary>
        public string deliverstatus;
        /// <summary>
        /// 住宅类型 Zigbee, Buspro, A
        /// </summary>
        public string homeType;
        /// <summary>
        ///
        /// </summary>
        public string createonutc;
        /// <summary>
        /// 区域服务器
        /// </summary>
        public string regionUrl;
        /// <summary>
        /// 区域服务器
        /// </summary>
        public string emqUrl;
        /// <summary>
        /// 住宅区域Id
        /// </summary>
        public string homeRegionId;
        /// <summary>
        /// 住宅区域名字
        /// </summary>
        public string homeRegionName;
        ///// <summary>
        ///// 是否绑定网关
        ///// </summary>
        //public bool isBindGateway;
    }
    /// <summary>
    /// 新云端住宅列表返回字段
    /// </summary>
    [Serializable]
    public class RegionInfoResNew
    {
        /// <summary>
        /// 住宅ID
        /// </summary>
        public string Id;
        /// <summary>
        /// 住宅名字
        /// </summary>
        public string homeName;
        /// <summary>
        /// 是否为其他主用户分享过来的住宅
        /// </summary>
        public bool IsOtherShare;
        /// <summary>
        /// 仅子账号登陆的时候使用,当【IsOthreShare】为"true",
        /// 子账户类型 1.ORDINARY 2.DEBUG 3.ADMIN
        /// </summary>
        public string accountType;
        /// <summary>
        /// 是否支持远程
        /// </summary>
        public bool isRemoteControl;
        /// <summary>
        /// 住宅空间结构Id
        /// </summary>
        public string structId;
        /// <summary>
        /// 经度
        /// </summary>
        public double longitude;
        /// <summary>
        /// 纬度
        /// </summary>
        public double latitude;
        /// <summary>
        /// 交付状态
        /// </summary>
        public string deliverstatus;
        /// <summary>
        /// 住宅类型 Zigbee, Buspro, A
        /// </summary>
        public string homeType;
        /// <summary>
        ///
        /// </summary>
        public string createonutc;
        /// <summary>
        /// 区域服务器
        /// </summary>
        public string regionUrl;
        /// <summary>
        /// 区域服务器
        /// </summary>
        public string emqUrl;
        /// <summary>
        /// 住宅区域Id
        /// </summary>
        public string homeRegionId;
        /// <summary>
        /// 住宅区域名字
        /// </summary>
        public string homeRegionName;
        ///// <summary>
        ///// 是否绑定网关
        ///// </summary>
        //public bool isBindGateway;
        /// <summary>
        /// 住宅地址
        /// </summary>
        public string homeAddress;
    }
}
HDL_ON/UI/MainPage.cs
@@ -185,5 +185,16 @@
#endif
        }
        /// <summary>
        /// 弹窗提示
        /// </summary>
        /// <param name="mes"></param>
        public static void ShowAlertOnMainThread(string mes)
        {
            Application.RunOnMainThread(() => {
                new Alert("", mes, Language.StringByID(StringId.Close)).Show();
            });
        }
    }
}
HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs
@@ -225,24 +225,25 @@
                X = Application.GetRealWidth(9),
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = CSS_Color.FirstLevelTitleColor,
                Text = "+86",
                Text = "+" + phoneZoneCode,
                TextSize = CSS_FontSize.TextFontSize,
            };
            //跳转国家区号选择界面
            EventHandler<MouseEventArgs> eHandler = (sender, e) => {
                JLCountrycode.CountryCodeView.Current.Show((countryName, code) => {
                    if (!string.IsNullOrEmpty(code))
                    {
                        phoneZoneCode = code;
                        btnGlobalRoaming.Text = "+" + phoneZoneCode;
                    }
                });
            };
            btnGlobalRoaming.MouseUpEventHandler += eHandler;
            if (accountType == 0)
            {
                accountView.AddChidren(btnGlobalRoaming);
                EventHandler<MouseEventArgs> eHandler = (sender, e) => {
                    JLCountrycode.CountryCodeView.Current.Show((countryName, code) => {
                        if (!string.IsNullOrEmpty(code))
                        {
                            phoneZoneCode = code;
                            btnGlobalRoaming.Text = "+" + phoneZoneCode;
                        }
                    });
                };
                btnGlobalRoaming.MouseUpEventHandler += eHandler;
            }
            etAccount = new EditText()
HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs
@@ -305,7 +305,7 @@
                    {
                        //1.先检查账号是否注册过
                        var result = pm.GetRegionByAccount(account);
                        if (result.Code != HttpUtil.SUCCESS_CODE)
                        if (result.Code != StateCode.SUCCESS)
                        {
                            IMessageCommon.Current.ShowErrorInfoAlter(NewAPI.API_POST_GetRegionByAccount, result.Code);
                            return;
@@ -344,14 +344,14 @@
                            //2.1请求获取验证码
                            if (registerType == 1)//邮箱
                            {
                                resultObj = pm.VerificationCodeSend(VerifyType.FORGOTPASSWORD, account);
                                resultObj = pm.VerificationCodeSend(VerifyType.FIND_PASSWORD, account);
                            }
                            else
                            {
                                resultObj = pm.VerificationCodeSend(VerifyType.FORGOTPASSWORD, account, true, phoneZoneCode);
                                resultObj = pm.VerificationCodeSend(VerifyType.FIND_PASSWORD, account, true, phoneZoneCode);
                            }
                            if (resultObj.Code != HttpUtil.SUCCESS_CODE)
                            if (resultObj.Code != StateCode.SUCCESS)
                            {
                                // 提示错误
                                IMessageCommon.Current.ShowErrorInfoAlter(NewAPI.API_POST_Verification_Send, resultObj.Code);
@@ -404,7 +404,7 @@
                // 忘记密码
                var isPhone = registerType == 0;
                var resultObj = pm.ForgetPassword(account, password, verCode, isPhone);
                if (resultObj.Code == HttpUtil.SUCCESS_CODE)
                if (resultObj.Code == StateCode.SUCCESS)
                {
                    Application.RunOnMainThread(() =>
                    {
HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -150,6 +150,10 @@
        /// </summary>
        string registerPhone;
        string registerEmail;
        /// <summary>
        /// 手机区号
        /// </summary>
        string phoneZoneCode = "86";
        /// <summary>
        /// 加载视图
@@ -230,12 +234,27 @@
                Width = Application.GetRealWidth(65),
                TextAlignment = TextAlignment.Center,
                TextColor = CSS_Color.FirstLevelTitleColor,
                Text = "+86",
                Text = "+" + phoneZoneCode,
                TextSize = CSS_FontSize.TextFontSize,
                Enable = false,
                Enable = true,
            };
            //跳转国家区号选择界面
            EventHandler<MouseEventArgs> eHandler = (sender, e) => {
                JLCountrycode.CountryCodeView.Current.Show((countryName, code) => {
                    if (!string.IsNullOrEmpty(code))
                    {
                        phoneZoneCode = code;
                        btnGlobalRoaming.Text = "+" + phoneZoneCode;
                    }
                });
            };
            btnGlobalRoaming.MouseUpEventHandler += eHandler;
            if (loginType == 0)
            {
                accountView.AddChidren(btnGlobalRoaming);
            }
            btnDividingLineVertical_AccountView = new Button()
            {
HDL_ON/UI/UI1-Login/LoginPageBLL.cs
@@ -65,82 +65,137 @@
                        btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
                        return;
                    }
                    btnGetVerificationCode.IsSelected = false ;
                    btnGetVerificationCode.TextColor = CSS_Color.PromptingColor1;
                    int time = 60;
                    new Thread(() =>
                    {
                        while (time > 0)
                        //1.先检查账号是否注册过
                        var result = pm.GetRegionByAccount(account);
                        if (result.Code != StateCode.SUCCESS)
                        {
                            time--;
                            Application.RunOnMainThread(() =>
                            {
                                btnGetVerificationCode.Text = time.ToString() + "s";
                            });
                            Thread.Sleep(1000);
                            IMessageCommon.Current.ShowErrorInfoAlter(NewAPI.API_POST_GetRegionByAccount, result.Code);
                            return;
                        }
                        Application.RunOnMainThread(() =>
                        {
                            btnGetVerificationCode.IsSelected = true;
                            btnGetVerificationCode.TextID = StringId.GetVerificationCode;
                        });
                    })
                    { IsBackground = true }.Start();
                    new Thread(() =>
                    {
                        //获取验证码
                        var result = pm.GetLoginVerCode(phoneNumber);
                        if (result.StateCode.ToUpper() == HttpUtil.SUCCESS_CODE)
                        {
                        }
                        //登录失败
                        else
                        {
                            string tipStr = "Sever erorr";
                            switch (result.StateCode.ToUpper())
                            {
                                case "USERNAMEORPWDERROR":
                                    tipStr = Language.StringByID(StringId.LoginFailed_AccountOrPasswordError);
                                    Application.RunOnMainThread(() =>
                                    {
                                        btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
                                        btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
                                    });
                                    break;
                                case "ACCOUNTNOEXISTS":
                                    tipStr = Language.StringByID(StringId.ACCOUNTNOEXISTS);
                                    Application.RunOnMainThread(() =>
                                    {
                                        btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
                                        btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
                                    });
                                    break;
                                case "SENDFAIL":
                                    tipStr = Language.StringByID(StringId.FailedToSendVerificationCode);
                                    Application.RunOnMainThread(() =>
                                    {
                                        btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
                                        btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
                                    });
                                    break;
                                case "Self:Net_Error":
                                    tipStr = Language.StringByID(StringId.NetworkAnomaly);
                                    break;
                            }
                            Application.RunOnMainThread(() =>
                            {
                                //提示原因
                                var tip = new Tip()
                                {
                                    Text = tipStr,
                                    CloseTime = 1,
                                    Direction = AMPopTipDirection.None
                                };
                                tip.Show(bodyView);
                                btnGetVerificationCode.IsSelected = false;
                                btnGetVerificationCode.TextColor = CSS_Color.PromptingColor1;
                            });
                            new Thread(() =>
                            {
                                while (time > 0)
                                {
                                    time--;
                                    Application.RunOnMainThread(() =>
                                    {
                                        btnGetVerificationCode.Text = time.ToString() + "s";
                                    });
                                    Thread.Sleep(1000);
                                }
                                Application.RunOnMainThread(() =>
                                {
                                    btnGetVerificationCode.IsSelected = true;
                                    btnGetVerificationCode.TextID = StringId.GetVerificationCode;
                                });
                            })
                            { IsBackground = true }.Start();
                            //2.1请求获取验证码
                            var resultObj = pm.VerificationCodeSend(VerifyType.VERIFY_LOGIN, account, true, phoneZoneCode);
                            if (resultObj.Code != StateCode.SUCCESS)
                            {
                                //2.2请求获取验证码失败
                                Application.RunOnMainThread(() =>
                                {
                                    btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
                                    btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
                                });
                                // 提示错误
                                IMessageCommon.Current.ShowErrorInfoAlter(NewAPI.API_POST_Verification_Send, resultObj.Code);
                            }
                        }
                    })
                    { IsBackground = true }.Start();
                    //    btnGetVerificationCode.IsSelected = false ;
                    //    btnGetVerificationCode.TextColor = CSS_Color.PromptingColor1;
                    //    int time = 60;
                    //    new Thread(() =>
                    //    {
                    //        while (time > 0)
                    //        {
                    //            time--;
                    //            Application.RunOnMainThread(() =>
                    //            {
                    //                btnGetVerificationCode.Text = time.ToString() + "s";
                    //            });
                    //            Thread.Sleep(1000);
                    //        }
                    //        Application.RunOnMainThread(() =>
                    //        {
                    //            btnGetVerificationCode.IsSelected = true;
                    //            btnGetVerificationCode.TextID = StringId.GetVerificationCode;
                    //        });
                    //    })
                    //    { IsBackground = true }.Start();
                    //    new Thread(() =>
                    //    {
                    //        //获取验证码
                    //        var result = pm.GetLoginVerCode(phoneNumber);
                    //        if (result.StateCode.ToUpper() == StateCode.SUCCESS_CODE)
                    //        {
                    //        }
                    //        //登录失败
                    //        else
                    //        {
                    //            string tipStr = "Sever erorr";
                    //            switch (result.StateCode.ToUpper())
                    //            {
                    //                case "USERNAMEORPWDERROR":
                    //                    tipStr = Language.StringByID(StringId.LoginFailed_AccountOrPasswordError);
                    //                    Application.RunOnMainThread(() =>
                    //                    {
                    //                        btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
                    //                        btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
                    //                    });
                    //                    break;
                    //                case "ACCOUNTNOEXISTS":
                    //                    tipStr = Language.StringByID(StringId.ACCOUNTNOEXISTS);
                    //                    Application.RunOnMainThread(() =>
                    //                    {
                    //                        btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
                    //                        btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
                    //                    });
                    //                    break;
                    //                case "SENDFAIL":
                    //                    tipStr = Language.StringByID(StringId.FailedToSendVerificationCode);
                    //                    Application.RunOnMainThread(() =>
                    //                    {
                    //                        btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
                    //                        btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
                    //                    });
                    //                    break;
                    //                case "Self:Net_Error":
                    //                    tipStr = Language.StringByID(StringId.NetworkAnomaly);
                    //                    break;
                    //            }
                    //            Application.RunOnMainThread(() =>
                    //            {
                    //                //提示原因
                    //                var tip = new Tip()
                    //                {
                    //                    Text = tipStr,
                    //                    CloseTime = 1,
                    //                    Direction = AMPopTipDirection.None
                    //                };
                    //                tip.Show(bodyView);
                    //            });
                    //        }
                    //    })
                    //    { IsBackground = true }.Start();
                }
            };
        }
@@ -522,6 +577,18 @@
            {
                try
                {
                    //如果是账号密码登录,先检查一次账号是否注册过
                    if (logintMode == 0)
                    {
                        //1.先检查账号是否注册过
                        var result = pm.GetRegionByAccount(account);
                        if (result.Code != StateCode.SUCCESS)
                        {
                            IMessageCommon.Current.ShowErrorInfoAlter(NewAPI.API_POST_GetRegionByAccount, result.Code);
                            return;
                        }
                    }
                    //登录
                    var loginResult = LoadMethod_Login();
                    if( !string.IsNullOrEmpty (verAccount))//验证登录账号
@@ -831,6 +898,11 @@
                                MainPage.GoUserPage();
                            });
                        }
                        else
                        {
                            //2020-11-13 待确认
                            MainPage.ShowAlertOnMainThread("登录失败,请先添加住宅。");
                        }
                    }
                }
                catch (Exception ex)
@@ -870,7 +942,7 @@
                //调用验证码登录接口
                loginResult = pm.LoginValidCode(account, password);
            }
            if (loginResult.Code == HttpUtil.SUCCESS_CODE)
            if (loginResult.Code == StateCode.SUCCESS)
            {
                var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes>(loginResult.Data.ToString());
                MainPage.LoginUser = new UserInfo
@@ -897,7 +969,7 @@
            //登录失败
            else
            {
                //2020-11-12 待修改
                //2020-11-13 待修改
                string tipStr = "Sever erorr";
                switch (loginResult.Code)
                {
@@ -956,31 +1028,18 @@
        {
            var result = false;
            var responsePack = pm.GetHomePager();
            if (responsePack == HttpUtil.SUCCESS_CODE)
            if (responsePack == StateCode.SUCCESS)
            {
                result = true;
                //2020-11-13 待确认,没有住宅,不算登录成功
                if (MainPage.LoginUser.regionList != null && MainPage.LoginUser.regionList.Count > 0){
                    result = true;
                }
                //result = true;
            }
            else
            {
                var tipStr = "Server erorr";
                switch (responsePack)
                {
                    case "NoLogin":
                        tipStr = Language.StringByID(StringId.InvalidLoginCertificate);
                        break;
                }
                Application.RunOnMainThread(() =>
                {
                    //提示原因
                    var tip = new Tip()
                    {
                        Text = tipStr,
                        CloseTime = 1,
                        Direction = AMPopTipDirection.None
                    };
                    tip.Show(bodyView);
                });
                // 提示错误
                IMessageCommon.Current.ShowErrorInfoAlter(NewAPI.API_POST_Gethomepager, responsePack);
            }
            return result;
        }
HDL_ON/UI/UI1-Login/RegisterPage.cs
@@ -246,22 +246,22 @@
                Text = "+" + phoneZoneCode,
                TextSize = CSS_FontSize.TextFontSize,
            };
            //跳转国家区号选择界面
            EventHandler<MouseEventArgs> eHandler = (sender, e) => {
                JLCountrycode.CountryCodeView.Current.Show((countryName, code) => {
                    if (!string.IsNullOrEmpty(code))
                    {
                        phoneZoneCode = code;
                        btnGlobalRoaming.Text = "+" + phoneZoneCode;
                    }
                });
            };
            btnGlobalRoaming.MouseUpEventHandler += eHandler;
            if (accountType == 0)
            {
                accountView.AddChidren(btnGlobalRoaming);
                EventHandler<MouseEventArgs> eHandler = (sender, e) => {
                    JLCountrycode.CountryCodeView.Current.Show((countryName, code) => {
                        if (!string.IsNullOrEmpty(code))
                        {
                            phoneZoneCode = code;
                            btnGlobalRoaming.Text = "+" + phoneZoneCode;
                        }
                    });
                };
                btnGlobalRoaming.MouseUpEventHandler += eHandler;
            }
            //btnDividingLineVertical_AccountView = new Button()
@@ -677,7 +677,7 @@
            var result = false;
            //调用登录接口
            var loginResult = pm.LoginByPassword(account, password);
            if (loginResult.Code == HttpUtil.SUCCESS_CODE)
            if (loginResult.Code == StateCode.SUCCESS)
            {
                var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes>(loginResult.Data.ToString());
                MainPage.LoginUser = new UserInfo
@@ -715,7 +715,7 @@
        {
            var result = false;
            var responsePack = pm.GetHomePager();
            if (responsePack == HttpUtil.SUCCESS_CODE)
            if (responsePack == StateCode.SUCCESS)
            {
            }
            else
HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
@@ -369,49 +369,115 @@
            {
                if ((sender as Button).IsSelected)
                {
                    (sender as Button).IsSelected = false;
                    string account = etAccount.Text.Trim();
                    //短信发送间隔60s
                    int time = 60;
                    new Thread(() =>
                    {
                        while (time > 0)
                        //1.先检查账号是否注册过
                        var result = pm.GetRegionByAccount(account);
                        //2.账号不存在,才允许继续注册
                        if (result.Code == StateCode.ACCOUNT_NOT_EXIST)
                        {
                            time--;
                            //账号不存在 未注册允许发送验证码注册
                            Application.RunOnMainThread(() =>
                            {
                                (sender as Button).Text = time.ToString() + "s";
                                //短信发送间隔60s
                                (sender as Button).IsSelected = false;
                            });
                            Thread.Sleep(1000);
                        }
                        Application.RunOnMainThread(() =>
                        {
                           //回复获取短信按钮事件
                           (sender as Button).IsSelected = true;
                            (sender as Button).TextID = StringId.GetVerificationCode;
                        });
                    })
                    { IsBackground = true }.Start();
                    new Thread(() =>
                    {
                        ResponsePackNew resultObj;
                        // 获取验证码
                        if (registerType == 1)//邮箱
                        {
                             resultObj = pm.VerificationCodeSend(VerifyType.REGISTER, account);
                        }
                        else
                        {
                             resultObj = pm.VerificationCodeSend(VerifyType.REGISTER, account, true, phoneZoneCode);
                        }
                            //2.1 开始倒计时
                            new Thread(() =>
                            {
                                while (time > 0)
                                {
                                    time--;
                                    Application.RunOnMainThread(() =>
                                    {
                                        (sender as Button).Text = time.ToString() + "s";
                                    });
                                    Thread.Sleep(1000);
                                }
                                Application.RunOnMainThread(() =>
                                {
                                    //回复获取短信按钮事件
                                    (sender as Button).IsSelected = true;
                                    (sender as Button).TextID = StringId.GetVerificationCode;
                                });
                            })
                            { IsBackground = true }.Start();
                        if (resultObj.Code != HttpUtil.SUCCESS_CODE)
                            //2.2  获取验证码
                            ResponsePackNew resultObj;
                            if (registerType == 1)//邮箱
                            {
                                resultObj = pm.VerificationCodeSend(VerifyType.REGISTER_USER, account);
                            }
                            else
                            {
                                resultObj = pm.VerificationCodeSend(VerifyType.REGISTER_USER, account, true, phoneZoneCode);
                            }
                            if (resultObj.Code != StateCode.SUCCESS)
                            {
                                // 提示错误
                                IMessageCommon.Current.ShowErrorInfoAlter(NewAPI.API_POST_Verification_Send, resultObj.Code);
                            }
                        }else if (result.Code.ToUpper() == StateCode.SUCCESS)
                        {
                           // 提示错误
                           IMessageCommon.Current.ShowErrorInfoAlter(NewAPI.API_POST_Verification_Send, resultObj.Code);
                            //3.提示账号已存在,无法重复注册
                            MainPage.ShowAlertOnMainThread(Language.StringByID(StringId.AccountAlreadyUse));
                        } else
                        {
                            //4.提示其它异常错误
                            IMessageCommon.Current.ShowErrorInfoAlter(NewAPI.API_POST_GetRegionByAccount, result.Code);
                        }
                    })
                    { IsBackground = true }.Start();
                    //(sender as Button).IsSelected = false;
                    //string account = etAccount.Text.Trim();
                    ////短信发送间隔60s
                    //int time = 60;
                    //new Thread(() =>
                    //{
                    //    while (time > 0)
                    //    {
                    //        time--;
                    //        Application.RunOnMainThread(() =>
                    //        {
                    //            (sender as Button).Text = time.ToString() + "s";
                    //        });
                    //        Thread.Sleep(1000);
                    //    }
                    //    Application.RunOnMainThread(() =>
                    //    {
                    //       //回复获取短信按钮事件
                    //       (sender as Button).IsSelected = true;
                    //        (sender as Button).TextID = StringId.GetVerificationCode;
                    //    });
                    //})
                    //{ IsBackground = true }.Start();
                    //new Thread(() =>
                    //{
                    //    ResponsePackNew resultObj;
                    //    // 获取验证码
                    //    if (registerType == 1)//邮箱
                    //    {
                    //         resultObj = pm.VerificationCodeSend(VerifyType.REGISTER_USER, account);
                    //    }
                    //    else
                    //    {
                    //         resultObj = pm.VerificationCodeSend(VerifyType.REGISTER_USER, account, true, phoneZoneCode);
                    //    }
                    //    if (resultObj.Code != StateCode.SUCCESS_CODE)
                    //    {
                    //       // 提示错误
                    //       IMessageCommon.Current.ShowErrorInfoAlter(NewAPI.API_POST_Verification_Send, resultObj.Code);
                    //    }
                    //})
                    //{ IsBackground = true }.Start();
                }
            };
@@ -460,7 +526,7 @@
                    //校验验证码并注册账号
                    var isPhone = registerType == 0;
                    var validateSmsResult = pm.ValidataCodeAndRegister(account, password, verCode, isPhone);
                    if (validateSmsResult.Code == HttpUtil.SUCCESS_CODE)
                    if (validateSmsResult.Code == StateCode.SUCCESS)
                    {
                        //注册成功
                        //执行回调事件
HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/BindAccountPage.cs
@@ -142,7 +142,7 @@
                new System.Threading.Thread(() =>
                {
                    var result = new HttpServerRequest().BindAccount(account);
                    if (result.ToUpper() == HttpUtil.SUCCESS_CODE)
                    if (result.ToUpper() == StateCode.SUCCESS)
                    {
                        Application.RunOnMainThread(() =>
                        {
HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/VerificationCodePage.cs
@@ -492,7 +492,7 @@
                            });
                            var verAccount = optionType == 1 ? MainPage.LoginUser.userEmailInfo : MainPage.LoginUser.userMobileInfo;
                            var response = new HttpServerRequest().ValidatorCode(verAccount, etCode, MainPage.LoginUser.areaCode);
                            if (response.StateCode.ToUpper() == HttpUtil.SUCCESS_CODE)
                            if (response.StateCode.ToUpper() == StateCode.SUCCESS)
                            {
                                result = true;
                            }
@@ -550,7 +550,7 @@
                                        new Thread(() =>
                                        {
                                            var result2 = new DAL.Server.HttpServerRequest().BindAccount(account);
                                            if (result2 == HttpUtil.SUCCESS_CODE)
                                            if (result2 == StateCode.SUCCESS)
                                            {
                                                Application.RunOnMainThread(() =>
                                                {
@@ -587,7 +587,7 @@
                                        new Thread(() =>
                                        {
                                            var result2 = new DAL.Server.HttpServerRequest().BindAccount(account);
                                            if (result2 == HttpUtil.SUCCESS_CODE)
                                            if (result2 == StateCode.SUCCESS)
                                            {
                                                Application.RunOnMainThread(() =>
                                                {
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPageBLL.cs
@@ -163,7 +163,7 @@
        bool EditShareData(ShareData sd)
        {
            ResponsePack responePack = new HttpServerRequest().EditShareData(sd);
            if (responePack.StateCode.ToUpper() == HttpUtil.SUCCESS_CODE)
            if (responePack.StateCode.ToUpper() == StateCode.SUCCESS)
            {
                return true;
            }
@@ -180,7 +180,7 @@
        void LoadMethod_GetMemberSharedDataList(ResidenceMemberInfo info)
        {
            ResponsePack responePack = new HttpServerRequest().GetShareDataByMemberAccount(info.SubAccountDistributedMark);
            if (responePack.StateCode.ToUpper() == HttpUtil.SUCCESS_CODE)
            if (responePack.StateCode.ToUpper() == StateCode.SUCCESS)
            {
                var responeObj = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ShareData>>(responePack.ResponseData.ToString());
                info.CurResidenceShareDate = responeObj;
@@ -194,7 +194,7 @@
        {
            var result = false;
            ResponsePack responePack = new HttpServerRequest().GetResidenceMemberAccount();
            if (responePack.StateCode.ToUpper() == HttpUtil.SUCCESS_CODE)
            if (responePack.StateCode.ToUpper() == StateCode.SUCCESS)
            {
                memberList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ResidenceMemberInfo>>(responePack.ResponseData.ToString());
                foreach (var mInfo in memberList)
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs
@@ -131,7 +131,7 @@
        bool EditShareData(ShareData sd)
        {
            ResponsePack responePack = new HttpServerRequest().EditShareData(sd);
            if (responePack.StateCode.ToUpper() == HttpUtil.SUCCESS_CODE)
            if (responePack.StateCode.ToUpper() == StateCode.SUCCESS)
            {
                return true;
            }
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs
@@ -64,7 +64,7 @@
        {
            var result = false;
            ResponsePack responePack = new HttpServerRequest().GetResidenceMemberAccount();
            if (responePack.StateCode.ToUpper() == HttpUtil.SUCCESS_CODE)
            if (responePack.StateCode.ToUpper() == StateCode.SUCCESS)
            {
                var responeObj = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ResidenceMemberInfo>>(responePack.ResponseData.ToString());
                foreach (var mInfo in responeObj)
@@ -157,7 +157,7 @@
        void LoadMethod_GetMemberSharedDataList(ResidenceMemberInfo info)
        {
            ResponsePack responePack = new HttpServerRequest().GetShareDataByMemberAccount(info.SubAccountDistributedMark);
            if (responePack.StateCode.ToUpper() == HttpUtil.SUCCESS_CODE)
            if (responePack.StateCode.ToUpper() == StateCode.SUCCESS)
            {
                var responeObj = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ShareData>>(responePack.ResponseData.ToString());
                info.CurResidenceShareDate = responeObj;
@@ -175,7 +175,7 @@
        bool LoadMethod_GetMemberSharedData(ShareData sd)
        {
            ResponsePack responePack = new HttpServerRequest().GetShareData(sd.DistributedMark,sd.HouseDistributedMark);
            if (responePack.StateCode.ToUpper() == HttpUtil.SUCCESS_CODE)
            if (responePack.StateCode.ToUpper() == StateCode.SUCCESS)
            {
                sd.ShareDataBytes =  Newtonsoft.Json.JsonConvert.DeserializeObject<ShareData>(responePack.ResponseData.ToString()).ShareDataBytes;
                return true;
@@ -210,7 +210,7 @@
                        try
                        {
                            var responsePack = new HttpServerRequest().EditSubAccountNickName(str,mInfo.SubAccountDistributedMark);
                            if (responsePack.StateCode.ToUpper() == HttpUtil.SUCCESS_CODE)
                            if (responsePack.StateCode.ToUpper() == StateCode.SUCCESS)
                            {
                                Application.RunOnMainThread(() =>
                                {
@@ -274,7 +274,7 @@
                    try
                    {
                        var responsePack = new HttpServerRequest().ChangeCreateSceneState(DB_ResidenceData.residenceData.residecenInfo.RegionID, mInfo.SubAccountDistributedMark);
                        if (responsePack.StateCode.ToUpper() == HttpUtil.SUCCESS_CODE)
                        if (responsePack.StateCode.ToUpper() == StateCode.SUCCESS)
                        {
                            Application.RunOnMainThread(() =>
                            {
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPageBLL.cs
@@ -18,7 +18,7 @@
                Action action = () =>
                {
                    ResponsePack responePack = new HttpServerRequest().DeleteResidenceMemberAccount(memberInfo.SubAccountDistributedMark);
                    if (responePack.StateCode.ToUpper() == HttpUtil.SUCCESS_CODE)
                    if (responePack.StateCode.ToUpper() == StateCode.SUCCESS)
                    {
                        this.RemoveFromParent();
                        backAction();
HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
@@ -181,7 +181,7 @@
                        try
                        {
                            var responsePack = new HttpServerRequest().EditUserName(str);
                            if (responsePack.StateCode.ToUpper() == HttpUtil.SUCCESS_CODE)
                            if (responsePack.StateCode.ToUpper() == StateCode.SUCCESS)
                            {
                                MainPage.LoginUser.userName = str;
                                MainPage.LoginUser.SaveUserInfo();
HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordPage.cs
@@ -30,7 +30,7 @@
            var waitPage = new Loading();
            waitPage.Start("Please wait...");
            var resetResult = new HttpServerRequest().ResetPassword(MainPage.LoginUser.accountString, password, repeatPassword, 86);
            if (resetResult.StateCode.ToUpper() == HttpUtil.SUCCESS_CODE)
            if (resetResult.StateCode.ToUpper() == StateCode.SUCCESS)
            {
                Application.RunOnMainThread(() =>
                {
HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordVerificationCodePage.cs
@@ -476,7 +476,7 @@
                                act = new PublicAssmebly().TipLoadingMsgDialog(Language.StringByID(StringId.SavingPleaseWait));
                            });
                            var response = new HttpServerRequest().ValidatorCode(MainPage.LoginUser.userEmailInfo, etCode, MainPage.LoginUser.areaCode);
                            if (response.StateCode.ToUpper() == HttpUtil.SUCCESS_CODE)
                            if (response.StateCode.ToUpper() == StateCode.SUCCESS)
                            {
                                result = true;
                            }
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePageBLL.cs
@@ -45,7 +45,7 @@
                        {
                            var responsePack = new HttpServerRequest().EditResidenceInfo();
                            if (responsePack.StateCode.ToUpper() == HttpUtil.SUCCESS_CODE)
                            if (responsePack.StateCode.ToUpper() == StateCode.SUCCESS)
                            {
                                Application.RunOnMainThread(() =>
                                {
@@ -113,7 +113,7 @@
                    DB_ResidenceData.residenceData.residecenInfo.Address = str;
                    var responsePack = new DAL.Server.HttpServerRequest().EditResidenceInfo();
                    if (responsePack.StateCode.ToUpper() == HttpUtil.SUCCESS_CODE)
                    if (responsePack.StateCode.ToUpper() == StateCode.SUCCESS)
                    {
                        btnResidenceAddress.Text = str;
                        OnAppConfig.Instance.SaveUserConfig();
HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs
@@ -285,7 +285,7 @@
                    {
                        Action<string> action = (pw) => {
                            var resultObj = new HttpServerRequest().LoginByPassword(MainPage.LoginUser.accountString, pw);
                            if (resultObj.Code == HttpUtil.SUCCESS_CODE)
                            if (resultObj.Code == StateCode.SUCCESS)
                            {
                                OnAppConfig.Instance.appUnlockPasswrod = "";
                                OnAppConfig.Instance.appUnlockType = new System.Collections.Generic.List<string>();
HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs
@@ -369,7 +369,7 @@
                    {
                        Action<string> action = (pw) => {
                            var resultObj = new HttpServerRequest().LoginByPassword(MainPage.LoginUser.accountString, pw);
                            if (resultObj.Code.ToUpper() == HttpUtil.SUCCESS_CODE)
                            if (resultObj.Code.ToUpper() == StateCode.SUCCESS)
                            {
                                OnAppConfig.Instance.appUnlockPasswrod = "";
                                OnAppConfig.Instance.appUnlockType = new System.Collections.Generic.List<string>();
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
@@ -910,7 +910,7 @@
                        if (revertObj != null)
                        {
                            if (revertObj.StateCode == HttpUtil.SUCCESS_CODE)
                            if (revertObj.StateCode == StateCode.SUCCESS)
                            {
                                var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SensorPushHistoryRes>>(revertObj.ResponseData.ToString());