Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswEditorForm.cs

@@ -27,6 +27,10 @@
        /// 列表的桌布控件

        /// </summary>

        private FrameLayout frameTable = null;

        /// <summary>

        /// 当前的联系人列表

        /// </summary>

        private List<ZigBee.Device.Safeguard.PushTargetInfo> listPhoneData = null;



        #endregion



@@ -82,6 +86,7 @@
            btnPassword.TextSize = 24;

            btnPassword.TextColor = 0xfffc744b;

            btnPassword.Text = i_password;

            btnPassword.IsBold = true;

            frameback.AddChidren(btnPassword);



            //初始化列表控件

@@ -150,7 +155,7 @@


                HdlThreadLogic.Current.RunMain(() =>

                {

                    var listPhoneData = new List<ZigBee.Device.Safeguard.PushTargetInfo>();

                    this.listPhoneData = new List<ZigBee.Device.Safeguard.PushTargetInfo>();

                    //联系人

                    var rowContact = new FrameRowControl(listview.rowSpace / 2);

                    rowContact.UseClickStatu = false;

@@ -257,6 +262,16 @@
            if (result == true)

            {

                rowContact.RemoveFromParent();



                //移除缓存

                string checkKeys = areaCode + "-" + phone;

                for (int i = 0; i < this.listPhoneData.Count; i++)

                {

                    if (listPhoneData[i].PushNumber == checkKeys)

                    {

                        listPhoneData.RemoveAt(i);

                    }

                }

            }

        }