From d8545fbd1b36a6766c57c987e5d89862b470fed9 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 03 九月 2020 09:46:29 +0800
Subject: [PATCH] 2020-09-03 1.修改风扇默认为关状态。2.Alexa添加设备时，去掉空调和通用开关选择添加支持。 3.场景增加通用开关添加和发送控制支持，Alexa 的场景同样增加通用开关的支持。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/TV/UserTVAddCustomChannel.cs | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/TV/UserTVAddCustomChannel.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/TV/UserTVAddCustomChannel.cs
index f21d35a..ee62327 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/TV/UserTVAddCustomChannel.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/TV/UserTVAddCustomChannel.cs
@@ -67,9 +67,9 @@
EditText etChannelName = new EditText () {
Width = Application.GetRealWidth (550),
X = Application.GetRealWidth (60),
- PlaceholderText = Language.StringByID (R.MyInternationalizationString.ChannelName),
PlaceholderTextColor = SkinStyle.Current.PlaceholderTextColor,
- TextColor = SkinStyle.Current.TextColor1,
+ PlaceholderText = Language.StringByID (R.MyInternationalizationString.ChannelName),
+ TextColor = SkinStyle.Current.TextColor1,
TextSize =15,
};
channelNameView.AddChidren (etChannelName);
@@ -100,8 +100,8 @@
EditText etChannelNumber = new EditText () {
X = Application.GetRealWidth (60),
Width = Application.GetRealWidth (550),
- PlaceholderText = Language.StringByID (R.MyInternationalizationString.ChannelNumber),
PlaceholderTextColor = SkinStyle.Current.PlaceholderTextColor,
+ PlaceholderText = Language.StringByID (R.MyInternationalizationString.ChannelNumber),
TextColor =SkinStyle.Current.TextColor1,
TextSize = 15,
};
@@ -148,8 +148,8 @@
Height = Application.GetRealHeight (90),
TextColor = SkinStyle.Current.TextColor1,
TextID = R.MyInternationalizationString.TakePhoto,
- UnSelectedImagePath = "TV/TV3_photo.png",
- SelectedImagePath = "TV/TV3_photo_on.png",
+ //UnSelectedImagePath = "TV/TV3_photo.png",
+ //SelectedImagePath = "TV/TV3_photo_on.png",
X = pictureRightLine.Right,
};
middleView.AddChidren (btnTakePictrue);
@@ -170,14 +170,15 @@
Height = btnTakePictrue.Height,
TextID = R.MyInternationalizationString.SelectPicture,
TextColor = SkinStyle.Current.TextColor1,
- UnSelectedImagePath = "TV/TV3_photo.png",
- SelectedImagePath = "TV/TV3_photo_on.png",
+
+ //UnSelectedImagePath = "TV/TV3_photo.png",
+ //SelectedImagePath = "TV/TV3_photo_on.png",
};
middleView.AddChidren (btnSelectPictrue);
var pid = Guid.NewGuid ();
btnTakePictrue.MouseUpEventHandler += (sender, e) => {
- btnTakePictrue.IsSelected = true;
- btnSelectPictrue.IsSelected = false;
+ //btnTakePictrue.IsSelected = true;
+ //btnSelectPictrue.IsSelected = false;
pid = Guid.NewGuid ();
Camera.TakePicture ((obj) => {
if (obj != null) {
@@ -187,8 +188,8 @@
};
btnSelectPictrue.MouseUpEventHandler += (sender, e) => {
- btnTakePictrue.IsSelected = false ;
- btnSelectPictrue.IsSelected = true;
+ //btnTakePictrue.IsSelected = false ;
+ //btnSelectPictrue.IsSelected = true;
pid = Guid.NewGuid ();
Camera.SelectPicture ((obj) => {
if (obj != null) {
--
Gitblit v1.8.0