合并了新代码

黄学彪

2020-08-11 26d1cdf2f5246c1ad7890e6740444c4a6a80e6fb

 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs

@@ -375,6 +375,24 @@
        {
            midVerticalScrolViewLayout.RemoveAll();
            curBindTypeList = MutilfunctionPanelMethod.GetMatchBindList(curBindType);
            //注意！同个按键端点如果支持绑定多种功能类型，需要注意如下处理
            //当更换设备功能类型后
            // 绑定的开关、插座、灯光所用的按键回路互相关联，所以这里重新获取将这三种类型的其他2种，为了获取正确的开关、插座、灯光绑定的个数
            switch (curBindType)
            {
                case 1:
                    MutilfunctionPanelMethod.GetMatchBindList(2);
                    MutilfunctionPanelMethod.GetMatchBindList(3);
                    break;
                case 2:
                    MutilfunctionPanelMethod.GetMatchBindList(1);
                    MutilfunctionPanelMethod.GetMatchBindList(3);
                    break;
                case 3:
                    MutilfunctionPanelMethod.GetMatchBindList(1);
                    MutilfunctionPanelMethod.GetMatchBindList(2);
                    break;
            }
            int curIndex = 0;
            for (int i = 0; i < curBindTypeList.Count; i++)
            {
@@ -633,7 +651,7 @@
                                    RefreshBindListUI();
                                    midVerticalScrolViewLayout.EndHeaderRefreshing();
                                    CommonPage.Loading.Hide();
                                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007_1" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                                });
                                break;
                            }
@@ -756,7 +774,7 @@
                    {
                        Application.RunOnMainThread(() =>
                        {
                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5003" + ")", Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
                            CommonPage.Loading.Hide();
                        });
                        return;
@@ -785,7 +803,7 @@
                                    {
                                        Application.RunOnMainThread(() =>
                                        {
                                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
                                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.uDeviceDeleteFail) + "(" + "5003_8" + ")", Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
                                            CommonPage.Loading.Hide();
                                        });
                                        return;
@@ -796,7 +814,7 @@
                            {
                                Application.RunOnMainThread(() =>
                                {
                                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
                                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5003_9" + ")", Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
                                    CommonPage.Loading.Hide();
                                });
                                return;