2019-11-01-2

WJC

2019-11-01 6f16607efe766271c69a4f3f96fb928fe25f112c

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

@@ -15,7 +15,7 @@
        Dictionary<string, string> deviceConditionsInfo = new Dictionary<string, string>();
        Dictionary<string, string> userdictionary = new Dictionary<string, string>();

        public void Show(CommonDevice common, Dictionary<string, string> editdeviceConditionsInfo=null)
        public async void Show(CommonDevice common, Dictionary<string, string> editdeviceConditionsInfo=null)
        {
            if (!edit)
            {
@@ -45,7 +45,7 @@
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
                Width = Application.GetRealWidth(400),
                Width = Application.GetRealWidth(600),
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                TextID = MyInternationalizationString.userlist,
@@ -88,7 +88,11 @@
                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
            };
            this.AddChidren(middle);

            if (Send.UserList.Count == 0)
            {
                var allMemberslist = await Send.AllMembers(common.DeviceAddr);
                Send.UserList.AddRange(allMemberslist);
            }
            foreach (var user in Send.UserList)
            {

@@ -211,7 +215,7 @@
                    lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * user.UserIdMode.Count) + 20 + 50);
                    for (int i = 0; i < user.UserIdMode.Count; i++)
                    {
                        var userid = user.UserIdMode[i];
                        var userifon = user.UserIdMode[i];
                        var doorlockfra = new FrameLayout
                        {
                            Height = Application.GetRealHeight(160),
@@ -237,8 +241,7 @@
                        };
                        doorlockRow.AddChidren(doorlockBtn);
                        //(1按键/3卡/15指纹)
                        string[] s = userid.Split('_');
                        switch (s[1])
                        switch (userifon.OpenMode.ToString())
                        {
                            case "0":
                                {
@@ -286,8 +289,8 @@
                            {
                                deviceConditionsInfo.Remove("AttriButeData2");
                            }
                            deviceConditionsInfo.Add("AttriButeId", s[1]);
                            deviceConditionsInfo.Add("AttriButeData2", s[0]);
                            deviceConditionsInfo.Add("AttriButeId", userifon.OpenMode.ToString());
                            deviceConditionsInfo.Add("AttriButeData2", userifon.UserId);

                            if (userdictionary.ContainsKey("Account"))
                            {
@@ -303,7 +306,7 @@
                            }
                            userdictionary.Add("Account", Btntitle.Text+doorlockBtn.Text);
                            userdictionary.Add("Type", "1");
                            userdictionary.Add("UserId", s[0]);
                            userdictionary.Add("UserId", userifon.UserId);
                        };
                        doorlockRow.MouseUpEventHandler += doorlockclick;
                        doorlockBtn.MouseUpEventHandler += doorlockclick;
@@ -311,7 +314,7 @@
                        doorlockfra.MouseUpEventHandler += doorlockclick;
                        if (edit)
                        {
                            if (editdeviceConditionsInfo["AttriButeData2"] == s[1])
                            if (editdeviceConditionsInfo["AttriButeData2"] == userifon.OpenMode.ToString())
                            {
                                selectedIcon.Visible = false;
                                selectedIcon = doorlockSelected;
@@ -385,5 +388,6 @@

            }
        }

    }
}