2020-03-25-1

WJC

2020-03-25 98c998ca98ee014266f65a517d672df0cd97f244

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

@@ -364,6 +364,30 @@
                doorlockSelected.MouseUpEventHandler += doorlockclick;
                doorlockfra.MouseUpEventHandler += doorlockclick;

                if (string.IsNullOrEmpty(doorlockBtn.Text))
                {
                    string strname = "";
                    switch (userifon.OpenMode)
                    {
                        case 0:
                            {
                                strname = Language.StringByID(MyInternationalizationString.lockpassword);
                            }
                            break;
                        case 3:
                            {
                                strname = Language.StringByID(MyInternationalizationString.ic);
                            }
                            break;
                        case 15:
                            {
                                strname = Language.StringByID(MyInternationalizationString.fingerprint);
                            }
                            break;
                    }
                    doorlockBtn.Text = userifon.UserId + strname;
                }

                if (edit && editdeviceConditionsInfo != null)
                {

@@ -391,7 +415,8 @@
                deviceConditionsInfo.Add("Range", "0");
                deviceConditionsInfo.Add("AttriButeId", openMode);
                deviceConditionsInfo.Add("AttriButeData2", userId);
                userdictionary.Add("Account", accountname);
                userdictionary.Add("Account", Config.Instance.Guid);
                userdictionary.Add("AccountName", accountname);
                userdictionary.Add("Type", "1");
                userdictionary.Add("UserId", userId);
                if (edit)
@@ -438,11 +463,11 @@
                        }
                    }
                    if (!addConditions)
                    {
                    {//没有存在数据新加
                        Common.Logic.CurrentLogic.Conditions.Add(deviceConditionsInfo);
                    }
                    if (!addAccounts)
                    {
                    {//没有存在数据新加
                        Common.Logic.CurrentLogic.Accounts.Add(userdictionary);
                    }
                }