2020-11-23 1.检测更新Dialog实现。2.新绑定手机号增加国家区域选择UI

JLChen

2020-11-23 0138387222867fb6259599959772f38f69863404

 HDL_ON/DAL/Server/HttpServerRequest.cs

@@ -68,29 +68,29 @@

        }

        public string GetRequestResultMsg(string resultCode)
        {
            string result = "";
            switch (resultCode.ToUpper())
            {
                case "USERNAMEORPWDERROR":
                    result = Language.StringByID(StringId.LoginFailed_AccountOrPasswordError);
                    break;
                case "ACCOUNTNOEXISTS":
                    result = Language.StringByID(StringId.ACCOUNTNOEXISTS);
                    break;
                case "SENDFAIL":
                    result = Language.StringByID(StringId.FailedToSendVerificationCode);
                    break;
                case "EXIST":
                    result = Language.StringByID(StringId.AccountAlreadyUse);
                    break;
                case "Self:Net_Error":
                    result = Language.StringByID(StringId.NetworkAnomaly);
                    break;
            }
            return result;
        }
        //public string GetRequestResultMsg(string resultCode)
        //{
        //    string result = "";
        //    switch (resultCode.ToUpper())
        //    {
        //        case "USERNAMEORPWDERROR":
        //            result = Language.StringByID(StringId.LoginFailed_AccountOrPasswordError);
        //            break;
        //        case "ACCOUNTNOEXISTS":
        //            result = Language.StringByID(StringId.ACCOUNTNOEXISTS);
        //            break;
        //        case "SENDFAIL":
        //            result = Language.StringByID(StringId.FailedToSendVerificationCode);
        //            break;
        //        case "EXIST":
        //            result = Language.StringByID(StringId.AccountAlreadyUse);
        //            break;
        //        case "Self:Net_Error":
        //            result = Language.StringByID(StringId.NetworkAnomaly);
        //            break;
        //    }
        //    return result;
        //}

        #region ■ 通用请求接口_______________________
        /// <summary>
@@ -112,15 +112,15 @@
        {
            var requestJson = HttpUtil.GetSignRequestJson(new RefreshTokenObj()
            {
                refreshToken =  UserInfo.Current.refreshToken,
                refreshToken = UserInfo.Current.refreshToken,
            });
            var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_Login, requestJson);
            if (revertObj.Code.ToUpper() == StateCode.SUCCESS)
            {
                var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes>(revertObj.Data.ToString());
                 UserInfo.Current.loginTokenString = revertData.headerPrefix + revertData.accessToken;
                 UserInfo.Current.lastTime = DateTime.Now;
                 UserInfo.Current.SaveUserInfo();
                UserInfo.Current.loginTokenString = revertData.headerPrefix + revertData.accessToken;
                UserInfo.Current.lastTime = DateTime.Now;
                UserInfo.Current.SaveUserInfo();
                return true;
            }
            return false;
@@ -260,7 +260,7 @@
        /// <returns></returns>
        public ResponsePackNew ValidatorCode(VerifyType verifyType, string account, string code, bool isPhone, bool verifySuccessFail = true)
        {
            var requestObj = new VerifyCodeCheckObj() { verifyCode = code, verifyType = (int)verifyType , verifySuccessFail = verifySuccessFail };
            var requestObj = new VerifyCodeCheckObj() { verifyCode = code, verifyType = (int)verifyType, verifySuccessFail = verifySuccessFail };
            if (isPhone)
            {
                //手机
@@ -289,26 +289,26 @@
            if (resultObj.Code == StateCode.SUCCESS)
            {
                var info = Newtonsoft.Json.JsonConvert.DeserializeObject<MemberInfoRes>(resultObj.Data.ToString());
                 UserInfo.Current.userEmailInfo = info.memberEmail;
                 UserInfo.Current.userMobileInfo = info.memberPhone;
                 UserInfo.Current.userName = info.memberName;
                 UserInfo.Current.areaCode = info.memberPhonePrefix;
                UserInfo.Current.userEmailInfo = info.memberEmail;
                UserInfo.Current.userMobileInfo = info.memberPhone;
                UserInfo.Current.userName = info.memberName;
                UserInfo.Current.areaCode = info.memberPhonePrefix;
                //是否需要获取头像
                if (bGetHeadImage)
                {
                    var headImageBytes = DownHeadImage();
                    if (headImageBytes != null)
                    if (headImageBytes != null && headImageBytes.Length > 0)
                    {
                         UserInfo.Current.headImagePageBytes = headImageBytes;
                        UserInfo.Current.headImagePageBytes = headImageBytes;
                        FileStream fs = null;
                        try
                        {
                             UserInfo.Current.headImagePageBytes = headImageBytes;
                            UserInfo.Current.headImagePageBytes = headImageBytes;
                            var filePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal) + "/", "headImage.png");
                            fs = new FileStream(filePath, FileMode.Create, FileAccess.Write);
                            fs.Write(headImageBytes, 0, headImageBytes.Length);
                            fs.Flush();
                             UserInfo.Current.headImagePagePath = filePath;
                            UserInfo.Current.headImagePagePath = filePath;
                        }
                        catch (Exception ex)
                        {
@@ -325,7 +325,7 @@
                    }
                }

                 UserInfo.Current.SaveUserInfo();
                UserInfo.Current.SaveUserInfo();
                MainPage.Log("获取用户信息成功。");
            }

@@ -396,10 +396,11 @@
        /// <returns></returns>
        public ResponsePackNew EditUserName(string userName)
        {
           var requestJson = HttpUtil.GetSignRequestJson(new UpdateMemberNameRes() {
               memberName = userName
           });
           return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_UpdateMemberInfo, requestJson);
            var requestJson = HttpUtil.GetSignRequestJson(new UpdateMemberNameRes()
            {
                memberName = userName
            });
            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_UpdateMemberInfo, requestJson);
        }

        /// <summary>
@@ -426,7 +427,7 @@
        /// <returns></returns>
        public string BindAccount(string account, string code = "", bool isPhone = false)
        {
            var requestObj = new BindWithAccountObj() { verifyCode = code};
            var requestObj = new BindWithAccountObj() { verifyCode = code };
            if (isPhone)
            {
                //手机
@@ -448,7 +449,7 @@
        /// <returns></returns>
        public string UnBindAccount(bool isPhone)
        {
            var requestObj = new UnBindAccountObj() { unBindLabel = isPhone ? "PHONE": "EMAIL" };
            var requestObj = new UnBindAccountObj() { unBindLabel = isPhone ? "PHONE" : "EMAIL" };
            var requestJson = HttpUtil.GetSignRequestJson(requestObj);
            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_UnbindWithAccount, requestJson).Code;
        }
@@ -599,11 +600,11 @@
                homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
            };

            if(editId == 0)
            if (editId == 0)
            {
                requestObj.homeName = editName;
            }
            else if(editId == 1)
            else if (editId == 1)
            {
                requestObj.Address = editName;
            }
@@ -626,7 +627,7 @@
                var mHomeGatewayRes = Newtonsoft.Json.JsonConvert.DeserializeObject<List<HomeGatewayInfo>>(revertObj.Data.ToString());
                if (nowhomeId == DB_ResidenceData.residenceData.residecenInfo.RegionID)
                {
                    if(mHomeGatewayRes != null)
                    if (mHomeGatewayRes != null)
                    {
                        if (mHomeGatewayRes.Count > 0)
                        {
@@ -639,7 +640,7 @@
                        }
                        DB_ResidenceData.residenceData.SaveResidenceData();
                    }
                   

                    if (mHomeGatewayRes != null)
                    {
                        //Utlis.WriteLine ("获得当前住宅网关个数：" + mHomeGatewayRes.content.Count);
@@ -728,7 +729,7 @@
                homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
                childAccountId = childAccountId
            });
           return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Home_Share_FindAll, requestJson);
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Home_Share_FindAll, requestJson);

        }

@@ -813,7 +814,7 @@
                homeId = shareData.homeId,
                homeShareId = shareData.id
            });
           return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Home_Share_Delete, requestJson);
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Home_Share_Delete, requestJson);
            //Dictionary<string, string> d = new Dictionary<string, string>();
            //d.Add("DistributedMark", shareData.DistributedMark);
            //d.Add("HouseDistributedMark", shareData.HouseDistributedMark);
@@ -1126,32 +1127,32 @@
        #endregion

        #region 备份部分
        /// <summary>
        /// 获取住宅备份列表
        /// </summary>
        public Dictionary<int, string> GetRegionLastBackupId()
        {
            //Dialog dialog = new Dialog();
            //dialog.Show();
        ///// <summary>
        ///// 获取住宅备份列表
        ///// </summary>
        //public Dictionary<int, string> GetRegionLastBackupId()
        //{
        //    //Dialog dialog = new Dialog();
        //    //dialog.Show();

            Dictionary<int, string> backupList = new Dictionary<int, string>();
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("LevelID", DB_ResidenceData.residenceData.residecenInfo.RegionID);// 199200);
            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(d);
            var revertObj = RequestHttps("https://developer.hdlcontrol.com/api/GetUserFolder", requestJson, true);
            if (revertObj == null || revertObj.ResponseData == null)
            {
                return new Dictionary<int, string>();
            }
            var jt = Newtonsoft.Json.JsonConvert.DeserializeObject<List<JObject>>(revertObj.ResponseData.ToString());
            foreach (var j in jt)
            {
                var folderId = (int)j.GetValue("FolderID");
                var folderName = j.GetValue("FolderName").ToString();
                backupList.Add(folderId, folderName);
            }
            return backupList;
        }
        //    Dictionary<int, string> backupList = new Dictionary<int, string>();
        //    Dictionary<string, object> d = new Dictionary<string, object>();
        //    d.Add("LevelID", DB_ResidenceData.residenceData.residecenInfo.RegionID);// 199200);
        //    var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(d);
        //    var revertObj = RequestHttps("https://developer.hdlcontrol.com/api/GetUserFolder", requestJson, true);
        //    if (revertObj == null || revertObj.ResponseData == null)
        //    {
        //        return new Dictionary<int, string>();
        //    }
        //    var jt = Newtonsoft.Json.JsonConvert.DeserializeObject<List<JObject>>(revertObj.ResponseData.ToString());
        //    foreach (var j in jt)
        //    {
        //        var folderId = (int)j.GetValue("FolderID");
        //        var folderName = j.GetValue("FolderName").ToString();
        //        backupList.Add(folderId, folderName);
        //    }
        //    return backupList;
        //}

        /* 2020-09-01 弃用 恢复旧数据功能在bus软件上实现
        /// <summary>
@@ -1598,6 +1599,6 @@

        #endregion

   

    }
}