2019-12-24-02

WJC

2019-12-24 0480792bde7bcf770290ba3414bd615e563e7b43

 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs

@@ -36,6 +36,7 @@
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                TextID = MyInternationalizationString.userlist,
                IsBold = true,
                //Text = "选择用户",
            };
            topRowLayout.AddChidren(titleName);
@@ -86,6 +87,7 @@
                    {
                        ///从列表移除当前门锁全部的旧数据；
                        Send.LockList.Remove(Send.LockList[i]);
                        i--;
                    }
                }
                Read();
@@ -98,7 +100,7 @@
        /// <summary>
        /// 读取当前门锁的云端数据；
        /// </summary>
        public async void Read()
        public void Read()
        {
            bool d = false;
            string macport = Send.CurrentDoorLock.DeviceAddr + "_" + Send.CurrentDoorLock.DeviceEpoint.ToString();
@@ -114,18 +116,30 @@
            CommonPage.Loading.Start();
            if (!d)
            {
                var allMemberslist = await Send.AllMembers(Send.CurrentDoorLock.DeviceAddr);
                Send.LockList.AddRange(allMemberslist);

                CommonPage.Loading.Start();
                new System.Threading.Thread(async () =>
                {
                    var allMemberslist = await Send.AllMembers(macport);
                    Send.LockList.AddRange(allMemberslist);
                    Application.RunOnMainThread(() =>
                    {
                        CommonPage.Loading.Hide();
                    });
                })
                { IsBackground = true }.Start();

            }
            UserAllView(macport);
            CommonPage.Loading.Hide();

        }
        /// <summary>
        /// 显示所有用户
        /// </summary>
        public void UserAllView(string macport)
        {

            middle.RemoveAll();
            for (int i = 0; i < Send.LockList.Count; i++)
            {
                var user = Send.LockList[i];
@@ -432,8 +446,8 @@
                    if (conditionsIndex == -1)
                    {
                        var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                                               Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
                                               Language.StringByID(MyInternationalizationString.complete));
                                               Language.StringByID(MyInternationalizationString.usertip),
                                               Language.StringByID(MyInternationalizationString.confrim));
                        alert.Show();
                        return;
                    }