CrabtreeOn,印度客户定制APP,迁移2.0平台版本
JLChen
2021-02-24 50b7b7a486f56fab27c83b59eb45673c6d9f0935
Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaSettingPage.cs
@@ -196,7 +196,7 @@
                    #endregion
                    #region 
                    || typeString.ToString () == DeviceType.FanModule.ToString ()
                    //|| typeString.ToString () == DeviceType.UniversalDevice.ToString ()
                    || typeString.ToString () == DeviceType.UniversalDevice.ToString ()
                    #endregion
                    );
                });
@@ -286,6 +286,7 @@
                        } else if (deviceFilePath.Contains ("CurtainModel")) {
                            deviceFilePath = deviceFilePath.Replace ("CurtainModel", "CurtainModule");
                        }
                        Common commonDevice = Newtonsoft.Json.JsonConvert.DeserializeObject<Common> (System.Text.Encoding.UTF8.GetString (commonBytes));
                        if (commonDevice.Type == DeviceType.OnePortBus || commonDevice.Type == DeviceType.OnePortWirelessFR || commonDevice.Type == DeviceType.OnePortMqttFR || commonDevice.Type == DeviceType.RCU
                            || commonDevice.Type == DeviceType.A31MusicModel || commonDevice.Type == DeviceType.MusicA31) {
@@ -430,7 +431,7 @@
            //下拉列表的数据源(选项为设备类型有关)
            List<string> typeTemp = new List<string>{
                    Language.StringByID(R.MyInternationalizationString.All),
                    Language.StringByID(R.MyInternationalizationString.Scenes),
                    //Language.StringByID(R.MyInternationalizationString.Scenes),
                    Language.StringByID(R.MyInternationalizationString.Lights),
                    //Language.StringByID(R.MyInternationalizationString.AC),
                    Language.StringByID(R.MyInternationalizationString.Curtains),
@@ -442,7 +443,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),
                };