新版本

黄学彪

2020-05-19 e747e6d8524e3146bb48dc304a713f309966b1c6

 ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/ChooseKeyModePage.cs

@@ -127,7 +127,7 @@
                    //1、清空所有目标
                    if (currentKey.bindList != null)
                    {
                        var bindResult = await currentKey.ClearBindInfoAsync();
                        var bindResult = HdlDeviceBindLogic.Current.ClearBindInfoAsync(currentKey);
                        if (bindResult != null && bindResult.clearBindInfoResponseData != null)
                        {
                            if (bindResult.clearBindInfoResponseData.Result != 0)
@@ -164,43 +164,43 @@
                    switch (currentModeID)
                    {
                        case 100:
                            temp = await currentKey.ConfigureHdlKeyValueAsync(Panel.KeyMode.OnOff_On);
                            temp = HdlDeviceBindLogic.Current.ConfigureHdlKeyValueAsync(currentKey, Panel.KeyMode.OnOff_On);
                            break;
                        case 101:
                            temp = await currentKey.ConfigureHdlKeyValueAsync(Panel.KeyMode.OnOff_oFF);
                            temp = HdlDeviceBindLogic.Current.ConfigureHdlKeyValueAsync(currentKey, Panel.KeyMode.OnOff_oFF);
                            break;
                        case 102:
                            temp = await currentKey.ConfigureHdlKeyValueAsync(Panel.KeyMode.OnOff_OnOff);
                            temp = HdlDeviceBindLogic.Current.ConfigureHdlKeyValueAsync(currentKey, Panel.KeyMode.OnOff_OnOff);
                            break;
                        case 200:
                            temp = await currentKey.ConfigureHdlKeyValueAsync(Panel.KeyMode.Level_Step_Up);
                            temp = HdlDeviceBindLogic.Current.ConfigureHdlKeyValueAsync(currentKey, Panel.KeyMode.Level_Step_Up);
                            break;
                        case 201:
                            temp = await currentKey.ConfigureHdlKeyValueAsync(Panel.KeyMode.Level_Step_Down);
                            temp = HdlDeviceBindLogic.Current.ConfigureHdlKeyValueAsync(currentKey, Panel.KeyMode.Level_Step_Down);
                            break;
                        case 203:
                            temp = await currentKey.ConfigureHdlKeyValueAsync(Panel.KeyMode.Level_Up);
                            temp = HdlDeviceBindLogic.Current.ConfigureHdlKeyValueAsync(currentKey, Panel.KeyMode.Level_Up);
                            break;
                        case 204:
                            temp = await currentKey.ConfigureHdlKeyValueAsync(Panel.KeyMode.Level_Down);
                            temp = HdlDeviceBindLogic.Current.ConfigureHdlKeyValueAsync(currentKey, Panel.KeyMode.Level_Down);
                            break;
                        case 205:
                            temp = await currentKey.ConfigureHdlKeyValueAsync(Panel.KeyMode.Level_Up_Down);
                            temp = HdlDeviceBindLogic.Current.ConfigureHdlKeyValueAsync(currentKey, Panel.KeyMode.Level_Up_Down);
                            break;
                        case 300:
                            temp = await currentKey.ConfigureHdlKeyValueAsync(Panel.KeyMode.Wcd_Up);
                            temp = HdlDeviceBindLogic.Current.ConfigureHdlKeyValueAsync(currentKey, Panel.KeyMode.Wcd_Up);
                            break;
                        case 301:
                            temp = await currentKey.ConfigureHdlKeyValueAsync(Panel.KeyMode.Wcd_Down);
                            temp = HdlDeviceBindLogic.Current.ConfigureHdlKeyValueAsync(currentKey, Panel.KeyMode.Wcd_Down);
                            break;
                        case 302:
                            temp = await currentKey.ConfigureHdlKeyValueAsync(Panel.KeyMode.Wcd_Stop);
                            temp = HdlDeviceBindLogic.Current.ConfigureHdlKeyValueAsync(currentKey, Panel.KeyMode.Wcd_Stop);
                            break;
                        case 303:
                            temp = await currentKey.ConfigureHdlKeyValueAsync(Panel.KeyMode.Wcd_Up_Stop);
                            temp = HdlDeviceBindLogic.Current.ConfigureHdlKeyValueAsync(currentKey, Panel.KeyMode.Wcd_Up_Stop);
                            break;
                        case 304:
                            temp = await currentKey.ConfigureHdlKeyValueAsync(Panel.KeyMode.Wcd_Down_Stop);
                            temp = HdlDeviceBindLogic.Current.ConfigureHdlKeyValueAsync(currentKey, Panel.KeyMode.Wcd_Down_Stop);
                            break;
                    }
                    if (temp != null && temp.setWritableValueResponData != null)
@@ -243,7 +243,7 @@
                            }

                            var dev = new AddedDeviceBindResponseAllData();
                            dev = await currentKey.AddDeviceBindAsync(addBindeDev);
                            dev = HdlDeviceBindLogic.Current.AddDeviceBindAsync(addBindeDev);
                            if (dev != null && dev.addedDeviceBindResponseData != null)
                            {
                                if (dev.addedDeviceBindResponseData.Result == 0)
@@ -410,6 +410,13 @@
        {
            return System.Threading.Tasks.Task.Run(async () =>
             {
                 //如果当前是虚拟住宅
                 if (Common.Config.Instance.Home.IsVirtually == true)
                 {
                     typeDetailModeList.Clear();
                     return new List<int>() { 100, 101, 102 };
                 }

                 Application.RunOnMainThread(() =>
                 {
                     CommonPage.Loading.Start();
@@ -466,6 +473,13 @@
        {
            return System.Threading.Tasks.Task.Run(async () =>
            {
                //如果当前是虚拟住宅
                if (Common.Config.Instance.Home.IsVirtually == true)
                {
                    typeDetailModeList.Clear();
                    return new List<int>() { 200, 201, 203, 204, 205 };
                }

                Application.RunOnMainThread(() =>
                {
                    CommonPage.Loading.Start();
@@ -537,6 +551,17 @@
            return System.Threading.Tasks.Task.Run(async () =>
            {
                typeDetailModeList.Clear();
                //如果当前是虚拟住宅
                if (Common.Config.Instance.Home.IsVirtually == true)
                {
                    Application.RunOnMainThread(() =>
                    {
                        CommonPage.Loading.Hide();
                    });
                    typeDetailModeList.Clear();
                    return new List<int>() { 300, 301, 302, 303, 304 };
                }

                List<int> result3 = new List<int> { };
                try
                {