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

JLChen

2020-09-03 d8545fbd1b36a6766c57c987e5d89862b470fed9

 Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaSettingPage.cs

@@ -187,16 +187,16 @@
                    || typeString.ToString () == DeviceType.CurtainTrietex.ToString ()
                    #endregion
                    #region ac
                    || typeString.ToString () == DeviceType.ACPanel.ToString ()
                    || typeString.ToString () == DeviceType.ACDevice.ToString ()
                    || typeString.ToString () == DeviceType.ACInfrared.ToString ()
                    || typeString.ToString () == DeviceType.ACCoolmaster.ToString ()
                    || typeString.ToString () == DeviceType.CustomAC.ToString ()
                    || typeString.ToString () == DeviceType.HVAC.ToString ()
                    //|| typeString.ToString () == DeviceType.ACPanel.ToString ()
                    //|| typeString.ToString () == DeviceType.ACDevice.ToString ()
                    //|| typeString.ToString () == DeviceType.ACInfrared.ToString ()
                    //|| typeString.ToString () == DeviceType.ACCoolmaster.ToString ()
                    //|| typeString.ToString () == DeviceType.CustomAC.ToString ()
                    //|| typeString.ToString () == DeviceType.HVAC.ToString ()
                    #endregion
                    #region 
                    || typeString.ToString () == DeviceType.FanModule.ToString ()
                    || typeString.ToString () == DeviceType.UniversalDevice.ToString ()
                    //|| typeString.ToString () == DeviceType.UniversalDevice.ToString ()
                    #endregion
                    );
                });
@@ -379,6 +379,8 @@
                            btnChoose.AddTag ("DeviceFilePath", deviceFilePath);
                            deviceRow.AddChidren (btnChoose);

                          

                            btnChoose.MouseUpEventHandler += (sendere, ee) => {
                                btnChoose.IsSelected = !btnChoose.IsSelected;
                                if (btnChoose.IsSelected) {
@@ -399,10 +401,17 @@
                                }
                            };

                            //2020-07-23 如果匹配则判断是否添加真正的路径
                            if (btnChoose.IsSelected) {
                                if (!roomDeviceFilePathList.Contains (filePath)) {
                                    roomDeviceFilePathList.Add (filePath);
                            if (selectedDeviceType == "Scene") {
                                //string [] str = filePath.Split ('_');
                                var sceneName = str [str.Length - 2];//倒数第一位为场景名
                                btnChoose.IsSelected = showList.Contains (sceneName);
                                btnChoose.Enable = !btnChoose.IsSelected;
                            } else {
                                //2020-07-23 如果匹配则判断是否添加真正的路径
                                if (btnChoose.IsSelected) {
                                    if (!roomDeviceFilePathList.Contains (filePath)) {
                                        roomDeviceFilePathList.Add (filePath);
                                    }
                                }
                            }

@@ -423,7 +432,7 @@
                    Language.StringByID(R.MyInternationalizationString.All),
                    Language.StringByID(R.MyInternationalizationString.Scenes),
                    Language.StringByID(R.MyInternationalizationString.Lights),
                    Language.StringByID(R.MyInternationalizationString.AC),
                    //Language.StringByID(R.MyInternationalizationString.AC),
                    Language.StringByID(R.MyInternationalizationString.Curtains),
                    //Language.StringByID(R.MyInternationalizationString.FoolHeat),
                    //Language.StringByID(R.MyInternationalizationString.FreshAir),
@@ -433,7 +442,7 @@
                    //Language.StringByID (R.MyInternationalizationString.LogicModule),
                    //Language.StringByID(R.MyInternationalizationString.ElectricalControl),
                    //Language.StringByID (R.MyInternationalizationString.MusicModel),
                    Language.StringByID (R.MyInternationalizationString.UniversalDevice),
                    //Language.StringByID (R.MyInternationalizationString.UniversalDevice),
                    //Language.StringByID (R.MyInternationalizationString.Sensor),
                };