2019-11-21-2

WJC

2019-11-21 e1eefe4a1503f37c72641e401e2e61771c076b64

2019-11-21-2

修改过滤掉已被冻结成员的数据

 ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml

@@ -2,19 +2,20 @@
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.SelectDevice" />
  <MonoDevelop.Ide.ItemProperties.GateWay.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.913cb77b0eef11c9119c61a02bc00fec01bf67d6" />
  <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/MemberList.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/Send.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs" Line="334" Column="77" />
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs" Line="413" Column="18" />
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs" Line="330" Column="46" />
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs" Line="91" Column="12" />
      <File FileName="Shared/Phone/UserView/HomePage.cs" />
      <File FileName="Shared/Phone/Device/Logic/Send.cs" />
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="729" Column="45" />
      <File FileName="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs" />
      <File FileName="Shared/Common/CommonPage.cs" />
      <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" />
      <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="563" Column="67" />
      <File FileName="Shared/Phone/Device/Logic/DeviceStateCondition.cs" Line="1450" Column="54" />
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs" />
      <File FileName="Shared/Common/Logic.cs" />
      <File FileName="Shared/Phone/Device/Logic/MemberList.cs" Line="12" Column="16" />
      <File FileName="Shared/Phone/Device/Logic/MemberList.cs" Line="354" Column="76" />
      <File FileName="Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs" Line="1" Column="1" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -29,10 +30,13 @@
                <Node name="Device" expanded="True">
                  <Node name="Logic" expanded="True">
                    <Node name="DoorLockLogic" expanded="True" />
                    <Node name="MemberList.cs" selected="True" />
                    <Node name="Send.cs" selected="True" />
                  </Node>
                </Node>
                <Node name="UserCenter" expanded="True">
                  <Node name="CommonBase" expanded="True">
                    <Node name="Common" expanded="True" />
                  </Node>
                  <Node name="DoorLock" expanded="True" />
                </Node>
                <Node name="UserView" expanded="True" />

 ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide

Binary files differ

 ZigbeeApp/Shared/Phone/Device/Logic/Send.cs

@@ -731,6 +731,7 @@
            currUserIfon.CloudAccountId = Config.Instance.Guid;
            if (string.IsNullOrEmpty(UserCenter.UserCenterResourse.UserInfo.UserName))
            {
                ///如果昵称为空，此时，登陆账号为默认昵称；
                currUserIfon.UserName = UserCenter.UserCenterResourse.UserInfo.Account;
            }
            else
@@ -739,12 +740,18 @@
            }
            foreach (var o in AllUserIfon)
            {
                if (o.IsFreezeUser || string.IsNullOrEmpty(o.UserId))
                {
                    ///过滤掉冻结的成员和UserId为空的数据；
                    continue;
                }
                if (string.IsNullOrEmpty(currUserIfon.DoorLockMacPort))
                {
                    currUserIfon.DoorLockMacPort = o.DoorLockMacPort;
                }
                if (o.CloudAccountId == Config.Instance.Guid)
                {

                    UnlockingMode unlockingMode = new UnlockingMode();
                    unlockingMode.OpenMode = o.OpenMode;
                    unlockingMode.UserId = o.UserId;
@@ -770,6 +777,7 @@
                    userIfon.CloudAccountId = user.SubAccountDistributedMark;
                    if (string.IsNullOrEmpty(user.UserName))
                    {
                        ///如果昵称为空，此时，登陆账号为默认昵称；
                        userIfon.UserName = user.Account;

                    }
@@ -780,6 +788,11 @@
                    }
                    for (int j = 0; j < AllUserIfon.Count; j++)
                    {
                        if (AllUserIfon[j].IsFreezeUser || string.IsNullOrEmpty(AllUserIfon[j].UserId))
                        {
                            ///过滤掉冻结的成员和UserId为空的数据；
                            continue;
                        }
                        if (string.IsNullOrEmpty(userIfon.DoorLockMacPort))
                        {
                            userIfon.DoorLockMacPort = AllUserIfon[j].DoorLockMacPort;
@@ -835,6 +848,7 @@
                user.CloudAccountId = data["CloudAccountId"].ToString();
                user.DoorLockMacPort = data["DoorLockId"].ToString();
                user.ModeName = data["UserIdRemarks"].ToString();
                user.IsFreezeUser = Convert.ToBoolean(data["IsFreezeUser"].ToString());
                list.Add(user);
            }
            return list;
@@ -991,7 +1005,10 @@
            /// 用户昵称
            /// </summary>
            public string UserName = string.Empty;

            /// <summary>
            /// 是否冻结该成员（true已冻结）
            /// </summary>
            public bool IsFreezeUser;

        }

@@ -1034,6 +1051,10 @@
            /// 门锁Mac+Port,识别门锁；
            /// </summary>
            public string DoorLockMacPort = string.Empty;
            /// <summary>
            /// 是否冻结该成员（true已冻结）
            /// </summary>
            public bool IsFreezeUser;

        }