合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs

@@ -144,16 +144,15 @@


            if (string.IsNullOrEmpty(resultValue) == true)

            {

                //出现未知错误,数据丢失

                string msg = Language.StringByID(R.MyInternationalizationString.uUnKnownError);

                this.ShowMassage(ShowMsgType.Tip, msg);

                return;

            }

            List<MemberInfoRes> listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<List<MemberInfoRes>>(resultValue);

            MemberInfoRes memberInfoRes = null;

            foreach (var info in listInfo)

            {

                if (info.Account == memberResult.Account)

                //当账号绑定了邮箱时,它返回的是邮箱账号

                if (info.Account == memberResult.Account

                    || info.Account == memberResult.Email)

                {

                    memberInfoRes = info;

                    break;

@@ -161,8 +160,8 @@
            }

            if (memberInfoRes == null)

            {

                //出现未知错误,数据丢失

                string msg = Language.StringByID(R.MyInternationalizationString.uUnKnownError);

                //出现意外情况,数据丢失

                string msg = Language.StringByID(R.MyInternationalizationString.uUnKnownErrorAndLostData);

                this.ShowMassage(ShowMsgType.Tip, msg);

                return;

            }