请合并最新多功能面板代码

xm

2020-07-21 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d

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

old mode 100755
new mode 100644
@@ -144,9 +144,6 @@


            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);

@@ -159,12 +156,12 @@
                    break;

                }

            }

            if (memberInfoRes == null)

            {

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

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

                this.ShowMassage(ShowMsgType.Tip, msg);

                return;

            if (memberInfoRes == null)
            {
                //出现意外情况,数据丢失
                string msg = Language.StringByID(R.MyInternationalizationString.uUnKnownErrorAndLostData);
                this.ShowMassage(ShowMsgType.Tip, msg);
                return;
            }



            string iconPath = System.IO.Path.Combine(UserCenterResourse.AccountOption.UserPictruePath, memberInfoRes.DistributedMark + ".png");