2020-09-03 1.修改风扇默认为关状态。2.Alexa添加设备时，去掉空调和通用开关选择添加支持。 3.场景增加通用开关添加和发送控制支持，A...

JLChen

2020-09-03 d8545fbd1b36a6766c57c987e5d89862b470fed9

 Crabtree/SmartHome/UI/SimpleControl/Phone/System/SystemWirelessGateway.cs

@@ -176,7 +176,7 @@
                                textButton.Enable = false;
                                textButton.IsSelected = false;
                                MainPage.Loading.Hide ();
                                System.Console.WriteLine ("OnePortWirelessFR Remark Update");
                                Utlis.WriteLine ("OnePortWirelessFR Remark Update");
                            } else {
                                textButton.Enable = true;
                                textButton.IsSelected = true;
@@ -1103,8 +1103,8 @@
                                    return;
                                }

                                gatewayDevice.Remote_GroupName = etGroupName.Text = UserConfig.Instance.CurrentRegion.RegionName;
                                gatewayDevice.Remote_ProjectName = etProjectName.Text = UserConfig.Instance.CurrentRegion.RegionName;
                                gatewayDevice.Remote_GroupName = etGroupName.Text = UserConfig.Instance.CurrentRegion.Name;
                                gatewayDevice.Remote_ProjectName = etProjectName.Text = UserConfig.Instance.CurrentRegion.Name;
                                gatewayDevice.Remote_UserName = etUserName.Text = "Admin";
                                gatewayDevice.Remote_Password = etGatewayPassWrod.Text = etRemoteAutoPW.Text.Trim ();

@@ -1294,7 +1294,7 @@
                        };
                        spinnerband.AdapterStr = bandText;//.AddAdapter(bandText);
                        spinnerband.SelectedItemChanged += (sender, e) => {
                            System.Console.WriteLine (e);
                            Utlis.WriteLine (e);
                            gatewayDevice.WirelessBand = (byte)e;
                        };
                        flRadioParameterBody.AddChidren (spinnerband);
@@ -1370,7 +1370,7 @@
                        };
                        spinnerChannel.AdapterStr = channelTextSpinner;//.AddAdapter(channelTextSpinner);
                        spinnerChannel.SelectedItemChanged += (sender, e) => {
                            System.Console.WriteLine (e);
                            Utlis.WriteLine (e);
                            gatewayDevice.WirelessChannel = (byte)e;
                        };
                        flRadioParameterBody.AddChidren (spinnerChannel);
@@ -1437,7 +1437,7 @@
                            //    }
                            //}
                            //MainPage.Loading.Hide ();
                            //System.Console.WriteLine ("UpdateWirelessManage send.");
                            //Utlis.WriteLine ("UpdateWirelessManage send.");
                        };
                        #endregion

@@ -1982,7 +1982,7 @@
                            });
                        }
                    } catch (Exception ex) {
                        Console.WriteLine (ex.Message);
                        Utlis.WriteLine (ex.Message);
                    } finally {
                        Application.RunOnMainThread (() => {
                            MainPage.Loading.Hide ();
@@ -2156,13 +2156,13 @@
                    Common common = CommonPage.DeviceList [i];
                    if (common.Type == DeviceType.MusicModel)
                        continue;
                    //Console.WriteLine(common.DeviceID);
                    //Utlis.WriteLine(common.DeviceID);
                    if (common.SubnetID == subnetID && common.DeviceID != 0) {
                        int btnY = tipView.Y + (countDevcie + 1) * Application.GetRealHeight (80);

                        countDevcie++;
                        if (common.isMixBox) {
                            Console.WriteLine ("IsMixBox");
                            Utlis.WriteLine ("IsMixBox");
                            countDevcie--;
                            continue;
                        }
@@ -2399,7 +2399,7 @@

                        countDevcie++;
                        if (common.isMixBox) {
                            Console.WriteLine ("IsMixBox");
                            Utlis.WriteLine ("IsMixBox");
                            countDevcie--;
                            continue;
                        }
@@ -2489,7 +2489,7 @@
                        var common = listCommonEquipment [i];
                        if (common == null)
                            continue;
                        Console.WriteLine ("读取设备各个回路的具体信息，当前设备名称:" + common.Name + " 回路总数:" + common.LoopCount);
                        Utlis.WriteLine ("读取设备各个回路的具体信息，当前设备名称:" + common.Name + " 回路总数:" + common.LoopCount);
                        byte bigClass = common.BigClass;
                        byte minClass = common.MinClass;
                        int count = common.LoopCount;
@@ -2530,7 +2530,7 @@
                        );
                    }
                } catch (Exception ex) {
                    Console.WriteLine (ex.ToString ());
                    Utlis.WriteLine (ex.ToString ());
                } finally {
                    Application.RunOnMainThread (() => {
                        MainPage.Loading.Hide ();
@@ -2570,7 +2570,7 @@
                    ms.WriteByte (common.SubnetID);
                    ms.WriteByte (common.DeviceID);
                }
                Console.WriteLine ("搜索非网关设备，网络地址是:" + CommonPage.EndPoint.ToString ());
                Utlis.WriteLine ("搜索非网关设备，网络地址是:" + CommonPage.EndPoint.ToString ());
                Control control = new Control ();
                control.Send (new Target () {
                    IPEndPoint = CommonPage.EndPoint,