合并代码

黄学彪

2020-01-09 fa6bcb2e9907772480f99205f36ec2a1ce735a22

 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs

@@ -219,25 +219,25 @@
                        unLockMethod.Show();
                    }
                    else if (currentIndex == 1)
                    { 
                    {
                        if (!btnRight.IsSelected)
                        {
                            FreezeUser(true); 
                            FreezeUser(true);
                        }
                        else
                        {
                            FreezeUser(false); 
                            FreezeUser(false);
                        }
                    }
                    else if (currentIndex == 2)
                    { 
                    {
                        if (!btnRight.IsSelected)
                        {
                            HasRemoteUnlockAccessMethod(true); 
                            HasRemoteUnlockAccessMethod(true);
                        }
                        else
                        {
                            HasRemoteUnlockAccessMethod(false); 
                            HasRemoteUnlockAccessMethod(false);
                        }
                    }
                };
@@ -299,8 +299,8 @@
                            foreach (var curDoorLockUser in curAccountDoorLockUserList)

                            {

                                // 账户中没有门锁用户

                                if (curDoorLockUser.DoorLockLocalUserId == null || curDoorLockUser.DoorLockLocalUserId == "")

                                { 
                                if (string.IsNullOrEmpty(curDoorLockUser.DoorLockLocalUserId))

                                {

                                }

                                else

                                {

@@ -325,16 +325,16 @@
                            }

                            //冻结/解冻用户

                            int count1 = tempGroupId.Count;
                            if (tempGroupId.Count==1)
                            if (tempGroupId.Count == 1)
                            {
                                foreach (var a in tempGroupId)
                                {
                                    if(a.Count ==0)
                                    if (a.Count == 0)
                                    {
                                        count1 = 0;
                                        break;
                                    }
                                } 
                                }
                            }
                            int count2 = 0;

@@ -357,8 +357,8 @@
                                    else if (resultData.defaultControlResponseData.status == 33)
                                    {
                                        count2++;
                                    } 
                                    System.Threading.Thread.Sleep(1000); 
                                    }
                                    System.Threading.Thread.Sleep(1000);
                                }
                                else
                                {
@@ -370,7 +370,7 @@
                                }
                                tempCount++;
                            }
                            

                            // 批量冻结门锁中的账户后，准备冻结云端账户
                            if (count2 == count1)
                            {
@@ -565,7 +565,7 @@
                        });

                    }

                });

            }; 
            };
        }

        //是否给子账户拥有远程开锁的条件
@@ -761,7 +761,7 @@
                        });
                    }
                });
            }; 
            };
        }

        #region ◆ 接口实现__________________________