请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

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

@@ -42,7 +42,7 @@
            titleIcon.InitControl();

            titleIcon.ButtonClickEvent += (sender, e) =>

            {

                var menuContr = new TopRightMenuControl(2, 449);

                var menuContr = new TopRightMenuControl(2, 2);

                //扫描二维码

                string msg1 = Language.StringByID(R.MyInternationalizationString.uScanQRcode);

                menuContr.AddRowMenu(msg1, "Item/ScanQRcodeIcon.png", "Item/ScanQRcodeIconSelected.png", () =>

@@ -55,7 +55,10 @@
                        }

                        //搜索ID

                        this.SearchMemberInfo(qrCode);

                    });

                    }, 
                    Language.StringByID(R.MyInternationalizationString.uCancel),

                    Language.StringByID(R.MyInternationalizationString.uFlashlamp),

                    msg1);

                });

                //输入账号

                string msg2 = Language.StringByID(R.MyInternationalizationString.uInputAccount);

@@ -123,7 +126,7 @@
            btnAuthority.TextAlignment = TextAlignment.Center;

            btnAuthority.Y = btnName.Bottom + Application.GetRealHeight(10);

            btnAuthority.TextSize = 12;

            btnAuthority.TextColor = UserCenterColor.Current.TextGrayColor;

            btnAuthority.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnAuthority.Text = UserCenterResourse.UserInfo.AuthorityText;

            frameBack.AddChidren(btnAuthority);

        }

@@ -278,7 +281,7 @@
            listView.AddChidren(rowlayout);



            //成员头像图标

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

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

            var btnIcon = new ImageView();

            btnIcon.X = ControlCommonResourse.XXLeft;

            btnIcon.Gravity = Gravity.CenterVertical;

@@ -318,6 +321,23 @@
            };

        }



        /// <summary>

        /// 添加成员行(外部调用)

        /// </summary>

        /// <param name="info"></param>

        public void AddRowLayoutByOtherForm(MemberInfoRes info)

        {

            var myRow = listView.GetChildren(listView.ChildrenCount - 1);

            if (myRow != null)

            {

                //最后一行加底线

                ((FrameRowControl)myRow).AddBottomLine();

            }

            this.AddRowLayout(info, false);

            //调整列表控件的高度

            listView.AdjustRealHeight(Application.GetRealHeight(23));

        }



        #endregion



        #region ■ 获取成员头像_______________________

@@ -355,7 +375,7 @@
                    if (infoResult.HeadImage != null)

                    {

                        //写入头像内容

                        string iconPath = System.IO.Path.Combine(UserCenterResourse.Option.UserPictruePath, keys + ".png");

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

                        Shared.IO.FileUtils.WriteFileByBytes(iconPath, infoResult.HeadImage);

                        HdlThreadLogic.Current.RunMain(() =>

                        {

@@ -371,7 +391,7 @@
        #region ■ 删除指定行_________________________



        /// <summary>

        /// 删除指定行

        /// 删除指定行(外部调用)

        /// </summary>

        /// <param name="accountId"></param>

        public void DeleteRowByAccount(string accountId)

@@ -386,6 +406,9 @@
                if (row.MainKeys == accountId)

                {

                    row.RemoveFromParent();

                    //调整列表控件的高度

                    listView.AdjustRealHeight(Application.GetRealHeight(23));



                    break;

                }

            }

@@ -439,12 +462,6 @@
        {

            //清空共享文件夹

            HdlShardLogic.Current.ClearShardDirectory();



            this.listView.RemoveAll();

            listView.Height = bodyFrameLayout.Height - Application.GetRealHeight(567);



            //添加成员列表

            this.AddMemberListRowByData();



            return 1;

        }