From 4d4c937c29f44a3e68254119d986f346904270c7 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 26 九月 2023 15:00:18 +0800
Subject: [PATCH] Merge branch 'wjc' into Dev-Branch
---
HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs | 81 +++++++++++
HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs | 4
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeMultiFramLayout.cs | 1
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 50 +++---
HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs | 4
HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTvPage.cs | 3
HDL-ON_iOS/Resources/Phone/LogicIcon/ganjiedian.png | 0
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 34 ++++
HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTVFunctionalAttributeConstant.cs | 6
HDL_ON/UI/UI2/FuntionControlView/Aks/Entity/RemoteControlEntity.cs | 2
HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs | 4
HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs | 6
HDL-ON_Android/Assets/Phone/LogicIcon/ganjiedian.png | 0
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 14 +
HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs | 3
HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs | 176 ++++++++----------------
HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs | 6
17 files changed, 234 insertions(+), 160 deletions(-)
diff --git a/HDL-ON_Android/Assets/Phone/LogicIcon/ganjiedian.png b/HDL-ON_Android/Assets/Phone/LogicIcon/ganjiedian.png
new file mode 100644
index 0000000..f9afde7
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/LogicIcon/ganjiedian.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/LogicIcon/ganjiedian.png b/HDL-ON_iOS/Resources/Phone/LogicIcon/ganjiedian.png
new file mode 100644
index 0000000..f9afde7
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/LogicIcon/ganjiedian.png
Binary files differ
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 98000c6..f1ec56c 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -1509,22 +1509,21 @@
break;
case SPK.ElectricalTvHisense:
{
- string on_off = GetKeyValue("on_off", dicList);
+ string on = GetKeyValue("wol", dicList);
+ string off = GetKeyValue("on_off", dicList);
string volumet = GetKeyValue("set_volume", dicList);
string signal = GetKeyValue("signal", dicList);
- if (!string.IsNullOrEmpty(on_off))
- {
- if (on_off == "on")
- {
- stateStr = Language.StringByID(StringId.onLogic);
- }
- else
- {
- stateStr = Language.StringByID(StringId.offLogic);
- //濡傛灉鍏充簡锛屽叾瀹冨睘鎬т笉鏄剧ず
- break;
- }
+ if (!string.IsNullOrEmpty(off))
+ {
+ stateStr = Language.StringByID(StringId.offLogic);
+ //濡傛灉鍏充簡锛屽叾瀹冨睘鎬т笉鏄剧ず
+ break;
+ }
+
+ if (!string.IsNullOrEmpty(on))
+ {
+ stateStr = Language.StringByID(StringId.onLogic);
}
if (!string.IsNullOrEmpty(stateStr))
{
@@ -2525,19 +2524,22 @@
{
case "on_off":
{
- switch (value)
+ if (value == "off")
{
- case "on":
- {
- button1.Text = Language.StringByID(StringId.onLogic);
- }
- break;
- case "off":
- {
- button1.Text = Language.StringByID(StringId.offLogic);
- }
- break;
+ button1.Text = Language.StringByID(StringId.offLogic);
+
}
+
+ }
+ break;
+ case "wol":
+ {
+ if (value == "on")
+ {
+ button1.Text = Language.StringByID(StringId.onLogic);
+
+ }
+
}
break;
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index 8954694..3031525 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -361,7 +361,7 @@
}
else if (SPK.SensorPm10 == device.spk
|| SPK.SensorPirHold == device.spk
- || SPK.SensorLight == device.spk)
+ )
{
return "LogicIcon/sensor.png";
}
@@ -370,7 +370,15 @@
{
return "FunctionIcon/DoorLock/DoorLock.png";
}
-
+ else if (SPK.SensorDryContact == device.spk
+ || SPK.SensorDryContact2 == device.spk)
+ {
+ return "LogicIcon/ganjiedian.png";
+ }
+ else if (SPK.SensorLight == device.spk)
+ {
+ return "LogicIcon/lightloguc.png";
+ }
//LogicIcon/heatlogic.png"
return $"FunctionIcon/Icon/{device.IconName}.png";
@@ -1223,7 +1231,7 @@
//妯℃嫙璁惧
var functions = new List<Function> {
new Entity.Function { sid = "1234567890", name = "鍏夌収浼犳劅鍣�", spk = Entity.SPK.SensorLight },
- new Entity.Function { sid = "1234567891", name = "鎻掑骇", spk = Entity.SPK.PanelSocket },
+ new Entity.Function { sid = "1234567891", name = "骞茶妭鐐�", spk = Entity.SPK.SensorDryContact },
new Entity.Function { sid = "1234567892", name = "绱ф�ユ眰鍔╀紶鎰熷櫒", spk = Entity.SPK.SensorHelp },
//new Entity.Function { sid = "12345678933456", name = "闂ㄩ攣", spk = Entity.SPK.DoorLock },
// new Entity.Function { sid = "1234567895444", name = "瑙嗛闂ㄩ攣", spk = Entity.SPK.VideoDoorLock },
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
index 0edb7a4..97fb64a 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
@@ -1,11 +1,92 @@
锘縰sing System;
using System.Collections.Generic;
using System.Linq;
+using System.Reflection;
using Shared;
namespace HDL_ON.UI.UI2.Intelligence.Automation
{
public class PublicInterface
{
+
+ /// <summary>
+ /// 鍗曢�夋嫨
+ /// </summary>
+ /// <param name="frame">鏄剧ず鍦ㄥ摢涓晫闈㈢殑鐖舵帶浠�</param>
+ /// <param name="list">鏄剧ず鏁版嵁婧�</param>
+ /// <param name="titleText"></param>
+ /// <param name="stateText">涔嬪墠鐘舵�佹枃鏈�</param>
+ /// <param name="action">杩斿洖鍊�</param>
+ /// <param name="textSize">鏄剧ず鏂囨湰瀛椾綋澶у皬</param>
+ public void SingleSelectionShow(FrameLayout frame, List<FuntionControlView.Aks.Entity.RemoteControlEntity> list, string titleText, string stateText, Action<int> action, int textSize = LogicView.TextSize.text14)
+ {
+ if (list == null)
+ {
+ return;
+ }
+ FrameLayout frameLayout = new FrameLayout
+ {
+ BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
+ };
+ frame.AddChidren(frameLayout);
+
+ LogicView.DateView view = new LogicView.DateView();
+ view.btnTitle.Text = titleText;
+ view.FLayoutView(frameLayout, list.Count);
+ view.btnCancel.MouseUpEventHandler += (sender, e) =>
+ {
+ //绉婚櫎fLayout鐣岄潰
+ frameLayout.RemoveFromParent();
+ };
+ ///瀹氫箟涓�涓狟tn璁板綍閫変腑鐘舵��
+ Button checkBtn = new Button
+ {
+ Tag = "unknown",
+ };
+ for (int i = 0; i < list.Count; i++)
+ {
+ FuntionControlView.Aks.Entity.RemoteControlEntity remoteControl = list[i];
+ LogicView.CheckView checkView = new LogicView.CheckView();
+ checkView.frameLayout.Y = Application.GetRealHeight(56 + 50 * i);
+ checkView.btnText.TextSize = textSize;
+ view.frameLayout.AddChidren(checkView.FLayoutView());
+ checkView.btnText.Text = remoteControl.name;
+ checkView.btnClick.Tag = i;//鏍囪
+
+ if (stateText == remoteControl.name)
+ {
+ //鏄剧ず涔嬪墠鐨勯�変腑鐘舵��
+ checkBtn.IsSelected = false;
+ checkView.btnCheckIcon.IsSelected = true;
+ checkBtn = checkView.btnCheckIcon;
+ checkBtn.Tag = checkView.btnClick.Tag.ToString();
+ }
+ //鐐瑰嚮浜嬩欢
+ checkView.btnClick.MouseUpEventHandler += (sender1, e1) =>
+ {
+ checkBtn.IsSelected = false;
+ checkView.btnCheckIcon.IsSelected = true;
+ checkBtn = checkView.btnCheckIcon;
+ checkBtn.Tag = checkView.btnClick.Tag.ToString();
+ };
+
+ }
+ view.btnConfirm.MouseUpEventHandler += (sender1, e1) =>
+ {
+ if (checkBtn.Tag.ToString() == "unknown")
+ {
+ return;
+ }
+ var index = int.Parse(checkBtn.Tag.ToString());
+ if (index > list.Count)
+ {
+ index = 0;
+ }
+ action(index);
+ //绉婚櫎fLayout鐣岄潰
+ frameLayout.RemoveFromParent();
+ };
+
+ }
/// <summary>
/// 鍗曢�夋嫨
/// </summary>
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index a9274cb..93dd086 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -22,6 +22,10 @@
/// </summary>
private Button btnDelay =null;
/// <summary>
+ /// 褰撳墠璁惧
+ /// </summary>
+ private Function device;
+ /// <summary>
/// 瀹氫箟涓�涓褰曢�変腑璁惧鐘舵�佸垪琛紱
/// </summary>
private List<Dictionary<string, string>> dicSateteList = new List<Dictionary<string, string>>();
@@ -32,6 +36,7 @@
public void Show(Entity.Function device, int index, bool edit)
{
#region 鐣岄潰甯冨眬
+ this.device = device;
this.BackgroundColor = CSS.CSS_Color.viewMiddle;
LogicView.TopView topView = new LogicView.TopView();
this.AddChidren(topView.FLayoutView());
@@ -1091,6 +1096,7 @@
}
break;
}
+
//鐣岄潰鏄剧ず閫変腑鍊�
button.TextID = id;
selectedState = device.spk + "_" + value;
@@ -1111,6 +1117,15 @@
if (button.Name == "colorful")
{
key = "colorful";
+ }
+
+ }
+ break;
+ case SPK.ElectricalTvHisense:
+ {
+ if ("on" == value)
+ {
+ key = "wol";
}
}
@@ -1301,6 +1316,22 @@
/// <returns></returns>
private void AddDictionaryList(string key, Dictionary<string, string> dictionary)
{
+
+ if (this.device.spk == SPK.ElectricalTvHisense)
+ {
+ //鐗规畩澶勭悊
+ if (key == "on_off")
+ {
+ key = "wol";
+ }
+ else if (key == "wol")
+ {
+ key = "on_off";
+ }
+
+ }
+
+
int indexValue = -1;
for (int i = 0; i < dicSateteList.Count; i++)
{
@@ -1326,7 +1357,8 @@
dicSateteList.Add(dictionary);
}
- }
+ }
+
/// <summary>
/// 娣诲姞鐩爣
/// </summary>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs
index 40156ef..1642d9c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs
@@ -10,6 +10,7 @@
using HDL_ON.UI.UI2.Intelligence.Automation;
using System.Linq;
using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
+using System.Reflection;
namespace HDL_ON.UI.UI2.FuntionControlView.Aks
{
@@ -64,8 +65,12 @@
/// 璁板綍褰撳墠璁惧
/// </summary>
public IntType currnetIntType= IntType.none;
+ /// <summary>
+ /// 璁板綍褰撳墠閫夋嫨鐨勭储寮曞��
+ /// </summary>
+ public int indexValue = -1;
-
+
public VerticalScrolViewLayout vv;
#endregion
@@ -196,16 +201,19 @@
if (this.remoteControlList.Count > 0)
{
- if (string.IsNullOrEmpty(this.GetValueString(IntType.Player)))
- {
- //榛樿鍙栫涓�浣�
- this.SwitchUI((IntType)this.remoteControlList[0].type);
- }
- else
+ if (this.isExistType(IntType.Player))
{
//鏈夋挱鏀剧被鍨嬮仴鎺у櫒浼樺厛鏄剧ず
this.SwitchUI(IntType.Player);
}
+ else
+ {
+ //榛樿鍙栫涓�浣�
+ this.indexValue = 0;
+ var type = (IntType)this.remoteControlList[this.indexValue].type;
+ this.SwitchUI(type);
+ }
+
}
});
@@ -213,14 +221,15 @@
});
}
/// <summary>
- /// 鍒囨崲鐣岄潰(1 = 鎾斁鍣�,2 = 鍔熸斁,3 = 鐢佃,4 = 鏈洪《鐩�,5 = 鎶曞奖浠�,6 = 涓囪兘閬ユ帶鍣�)
+ /// 鐣岄潰鏄剧ず(1 = 鎾斁鍣�,2 = 鍔熸斁,3 = 鐢佃,4 = 鏈洪《鐩�,5 = 鎶曞奖浠�,6 = 涓囪兘閬ユ帶鍣�)
/// </summary>
private void SwitchUI(IntType type)
{
- if (this.currnetIntType == type)
- {
- return;
- }
+ //if (this.currnetIntType == type)
+ //{
+ // //鍘绘帀鍒ゆ柇绫诲瀷,鍥犱负鍙兘瀛樺湪澶氫釜鍚岀被鍨�
+ // return;
+ //}
if (IntType.none == type)
{
return;
@@ -230,12 +239,12 @@
return;
}
this.vv.RemoveAll();
- this.currnetIntType = type;
+ var remoteContro = this.remoteControlList[this.indexValue];
switch (type)
{
case IntType.Player:
{
- MusicPage musicPage = new MusicPage(GetRemoteControl((int)IntType.Player),this.sequencerList);
+ MusicPage musicPage = new MusicPage(remoteContro, this.sequencerList);
this.vv.AddChidren(musicPage);
musicPage.Show();
musicPage.action += (deviceType) =>
@@ -246,7 +255,7 @@
break;
case IntType.HiFi:
{
- GfPage gfPage = new GfPage(GetRemoteControl((int)IntType.HiFi), this.sequencerList);
+ GfPage gfPage = new GfPage(remoteContro, this.sequencerList);
this.vv.AddChidren(gfPage);
gfPage.Show();
gfPage.action += (deviceType) =>
@@ -259,7 +268,7 @@
case IntType.TV:
{
- TvPage tvPage = new TvPage(GetRemoteControl((int)IntType.TV), this.sequencerList);
+ TvPage tvPage = new TvPage(remoteContro, this.sequencerList);
this.vv.AddChidren(tvPage);
tvPage.Show();
tvPage.action += (deviceType) =>
@@ -270,7 +279,7 @@
break;
case IntType.STB:
{
- JdhPage jdhPage = new JdhPage(GetRemoteControl((int)IntType.STB), this.sequencerList);
+ JdhPage jdhPage = new JdhPage(remoteContro, this.sequencerList);
this.vv.AddChidren(jdhPage);
jdhPage.Show();
jdhPage.action += (deviceType) =>
@@ -281,7 +290,7 @@
break;
case IntType.Projector:
{
- TyyPage tyyPage = new TyyPage(GetRemoteControl((int)IntType.Projector), this.sequencerList);
+ TyyPage tyyPage = new TyyPage(remoteContro, this.sequencerList);
this.vv.AddChidren(tyyPage);
tyyPage.Show();
tyyPage.action += (deviceType) =>
@@ -293,7 +302,7 @@
case IntType.Control:
{
- YkqPage ykqPage = new YkqPage(GetRemoteControl((int)IntType.Control), this.sequencerList);
+ YkqPage ykqPage = new YkqPage(remoteContro, this.sequencerList);
this.vv.AddChidren(ykqPage);
ykqPage.Show();
ykqPage.action += (deviceType) =>
@@ -308,43 +317,29 @@
}
/// <summary>
- /// 閫変腑绫诲瀷寮规(1 = 鎾斁鍣�,2 = 鍔熸斁,3 = 鐢佃,4 = 鏈洪《鐩�,5 = 鎶曞奖浠�,6 = 涓囪兘閬ユ帶鍣�)
+ /// 鐣岄潰鍒囨崲(1 = 鎾斁鍣�,2 = 鍔熸斁,3 = 鐢佃,4 = 鏈洪《鐩�,5 = 鎶曞奖浠�,6 = 涓囪兘閬ユ帶鍣�)
/// </summary>
private void SelectedType()
{
- var deviceTypeList = GetTypeDictionary().Values.ToList();
+ var deviceTypeList = GetRemoteControlList();
///涔嬪墠鐨勭姸鎬佹枃鏈�
- string ccurrnetDeviceStr= this.GetValueString(this.currnetIntType);
+ string ccurrnetDeviceStr = "";
+ if (indexValue!=-1&& indexValue< deviceTypeList.Count) {
+ ccurrnetDeviceStr= deviceTypeList[indexValue].name;
+ }
PublicInterface conditionView = new PublicInterface();
- conditionView.SingleSelectionShow(this, deviceTypeList, "璁惧閫夋嫨", ccurrnetDeviceStr
- , (valueStr) =>
+ conditionView.SingleSelectionShow(this, deviceTypeList,"璁惧閫夋嫨", ccurrnetDeviceStr
+ , (index) =>
{
- //鐣岄潰鏄剧ず閫変腑鍊�
- var intType = this.GetKeyIntType(valueStr);
- this.SwitchUI(intType);
+ var remoteControl = deviceTypeList[index];
+ this.indexValue = index;
+ this.currnetIntType = (IntType)remoteControl.type;
+ this.SwitchUI((IntType)remoteControl.type);
});
}
- /// <summary>
- /// 鏌ユ壘閬ユ帶鍣�
- /// </summary>
- /// <param name="type">(1 = 鎾斁鍣�,2 = 鍔熸斁,3 = 鐢佃,4 = 鏈洪《鐩�,5 = 鎶曞奖浠�,6 = 涓囪兘閬ユ帶鍣�)</param>
- /// <returns>涓嶄細涓簄ull</returns>
- private RemoteControlEntity GetRemoteControl(int type)
- {
- if (this.remoteControlList == null || this.remoteControlList.Count == 0)
- {
- return new RemoteControlEntity();
- }
- var re = this.remoteControlList.Find((o) => o.type == type);
- if (re == null)
- {
- re = new RemoteControlEntity();
- }
- //re.deviceId = this.device.deviceId;
- return re;
- }
+
public enum IntType
@@ -380,92 +375,39 @@
}
/// <summary>
- /// 鍒濆鍖栧瓧鍏�
+ /// 鑾峰彇閬ユ帶鍣ㄥ垪琛�
/// </summary>
/// <returns></returns>
- private Dictionary<IntType, string> GetTypeDictionary()
+ private List<RemoteControlEntity> GetRemoteControlList()
{
if (this.remoteControlList == null || this.remoteControlList.Count == 0)
{
- return new Dictionary<IntType, string>();
+ return new List<RemoteControlEntity>();
}
- var dic = new Dictionary<IntType, string>();
- foreach (var o in this.remoteControlList)
- {
- switch (o.type)
- {
- case (int)IntType.Player:
- {
- dic.Add(IntType.Player, Language.StringByID(StringId.bofangqi));
- }
- break;
- case (int)IntType.HiFi:
- {
- dic.Add(IntType.HiFi, Language.StringByID(StringId.gongfan));
- }
- break;
- case (int)IntType.TV:
- {
- dic.Add(IntType.TV, Language.StringByID(StringId.dianshi));
- }
- break;
-
- case (int)IntType.STB:
- {
- dic.Add(IntType.STB, Language.StringByID(StringId.jidinghe));
- }
- break;
- case (int)IntType.Projector:
- {
- dic.Add(IntType.Projector, Language.StringByID(StringId.touyingyi));
- }
- break;
- case (int)IntType.Control:
- {
- dic.Add(IntType.Control, Language.StringByID(StringId.xuniyaokongqi));
- }
- break;
- }
- }
- return dic;
+ return this.remoteControlList;
}
+
/// <summary>
- /// 鑾峰彇璁惧绫诲瀷
+ /// 鏄惁瀛樺湪绫诲瀷
/// </summary>
- /// <param name="value">(1 = 鎾斁鍣�,2 = 鍔熸斁,3 = 鐢佃,4 = 鏈洪《鐩�,5 = 鎶曞奖浠�,6 = 涓囪兘閬ユ帶鍣�)</param>
+ /// <param name="type">(1 = 鎾斁鍣�,2 = 鍔熸斁,3 = 鐢佃,4 = 鏈洪《鐩�,5 = 鎶曞奖浠�,6 = 涓囪兘閬ユ帶鍣�)</param>
/// <returns></returns>
- private IntType GetKeyIntType(string value)
+ private bool isExistType(IntType type)
{
- var dic = this.GetTypeDictionary();
- foreach (var d in dic)
+
+ var remoteControls = this.GetRemoteControlList();
+ for (int i = 0; i < remoteControls.Count; i++)
{
- if (d.Value == value)
+ var re = remoteControls[i];
+ if ((IntType)re.type == type)
{
- return d.Key;
+ this.indexValue = i;
+ return true;
}
- }
- return IntType.none;
- }
- /// <summary>
- /// 鑾峰彇璁惧鍚嶇О
- /// </summary>
- /// <param name="key">(1 = 鎾斁鍣�,2 = 鍔熸斁,3 = 鐢佃,4 = 鏈洪《鐩�,5 = 鎶曞奖浠�,6 = 涓囪兘閬ユ帶鍣�)</param>
- /// <returns></returns>
- private string GetValueString(IntType key)
- {
- var dic = this.GetTypeDictionary();
- foreach (var d in dic)
- {
- if (d.Key == key)
- {
- return d.Value;
- }
- }
- return "";
- }
-
-
+ }
+ return false;
+ }
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeMultiFramLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeMultiFramLayout.cs
index bf51486..174f53b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeMultiFramLayout.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeMultiFramLayout.cs
@@ -95,6 +95,7 @@
TextColor = MusicColor.TextColor,
TextAlignment = TextAlignment.CenterRight,
Gravity = Gravity.CenterVertical,
+ Padding=new Padding(0,0,0,0),
IsMoreLines = true,
};
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/Entity/RemoteControlEntity.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/Entity/RemoteControlEntity.cs
index 467373a..5dcbb8c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/Entity/RemoteControlEntity.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/Entity/RemoteControlEntity.cs
@@ -21,7 +21,7 @@
///5 = 鎶曞奖浠�
///6 = 涓囪兘閬ユ帶鍣�
/// </summary>
- public int type;
+public int type;
/// <summary>
/// 閬ユ帶鍣╥d
/// </summary>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs
index 36cb1b6..30cf3a9 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs
@@ -86,7 +86,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = MusicColor.TextColor,
TextSize = TextSize.Text16,
- TextID = StringId.gongfan,
+ Text= this.remoteControl.name,
IsBold = true,
};
this.AddChidren(btnTitle);
@@ -111,7 +111,7 @@
typeMultiFramLayout = new TypeMultiFramLayout();
typeMultiFramLayout.multiFramLayout.Gravity = Gravity.Center;
typeMultiFramLayout.AddView(cornerBottomFram);
- typeMultiFramLayout.btnBottonRightName.TextID = StringId.gongfan;
+ typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name;
this.AdjustRealHeight(16);
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs
index f728d57..d19cc78 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs
@@ -136,7 +136,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = MusicColor.TextColor,
TextSize = TextSize.Text16,
- TextID = StringId.jidinghe,
+ Text= this.remoteControl.name,
IsBold = true,
};
this.AddChidren(btnTitle);
@@ -176,6 +176,7 @@
SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
TextSize = TextSize.Text16,
TextID = StringId.pindao,
+ Padding = new Padding(0, 0, 0, 0),
};
leftLayout.AddChidren(leftBtnTitle);
@@ -218,6 +219,7 @@
SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
TextSize = TextSize.Text16,
TextID = StringId.kongzhi,
+ Padding = new Padding(0, 0, 0, 0),
};
rightLayout.AddChidren(rightBtnTitle);
@@ -269,7 +271,7 @@
typeMultiFramLayout = new TypeMultiFramLayout();
typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
typeMultiFramLayout.AddView(cornerBottomFram);
- typeMultiFramLayout.btnBottonRightName.TextID = StringId.jidinghe;
+ typeMultiFramLayout.btnBottonRightName.Text=this.remoteControl.name;
//鍒濆鍊�
leftBtnTitle.IsSelected = true;
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs
index 8eed69d..7f36165 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs
@@ -124,7 +124,8 @@
TextSize = TextSize.Text16,
//TextID = StringId.bofangqi,
Text = this.remoteControl.name,
- IsBold=true,
+ Padding = new Padding(0, 0, 0, 0),
+ IsBold =true,
};
this.AddChidren(btnTitle);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs
index 73371b2..479e23d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs
@@ -140,7 +140,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = MusicColor.TextColor,
TextSize = TextSize.Text16,
- TextID = StringId.dianshi,
+ Text= this.remoteControl.name,
IsBold = true,
};
this.AddChidren(btnTitle);
@@ -180,6 +180,7 @@
SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
TextSize = TextSize.Text16,
TextID = StringId.pindao,
+ Padding = new Padding(0, 0, 0, 0),
};
leftLayout.AddChidren(leftBtnTitle);
@@ -222,6 +223,7 @@
SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
TextSize = TextSize.Text16,
TextID = StringId.kongzhi,
+ Padding = new Padding(0, 0, 0, 0),
};
rightLayout.AddChidren(rightBtnTitle);
@@ -273,7 +275,7 @@
typeMultiFramLayout = new TypeMultiFramLayout();
typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
typeMultiFramLayout.AddView(cornerBottomFram);
- typeMultiFramLayout.btnBottonRightName.TextID = StringId.dianshi;
+ typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name;
//鍒濆鍊�
leftBtnTitle.IsSelected = true;
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs
index b1ba864..3b4fac9 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs
@@ -123,7 +123,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = MusicColor.TextColor,
TextSize = TextSize.Text16,
- TextID = StringId.touyingyi,
+ Text= this.remoteControl.name,
IsBold = true,
};
this.AddChidren(btnTitle);
@@ -150,7 +150,7 @@
typeMultiFramLayout = new TypeMultiFramLayout();
typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
typeMultiFramLayout.AddView(cornerBottomFram);
- typeMultiFramLayout.btnBottonRightName.TextID = StringId.touyingyi;
+ typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name;
this.AdjustRealHeight(16);
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
index a9fa05b..270b1e6 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
@@ -387,7 +387,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = MusicColor.TextColor,
TextSize = TextSize.Text16,
- TextID = StringId.xuniyaokongqi,
+ Text= this.remoteControl.name,
IsBold = true,
};
this.AddChidren(btnTitle);
@@ -1084,7 +1084,7 @@
typeMultiFramLayout = new TypeMultiFramLayout();
typeMultiFramLayout.multiFramLayout.Y = Application.GetRealHeight(16);
typeMultiFramLayout.AddView(cornerBottomFram);
- typeMultiFramLayout.btnBottonRightName.TextID = StringId.xuniyaokongqi;
+ typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name;
this.AdjustRealHeight(16);
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTVFunctionalAttributeConstant.cs b/HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTVFunctionalAttributeConstant.cs
index ae31775..7200e98 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTVFunctionalAttributeConstant.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTVFunctionalAttributeConstant.cs
@@ -7,7 +7,11 @@
public class HisenseTVFunctionalAttributeConstant
{
/// <summary>
- /// 寮�鍏�(value:0-鍏�/1-寮�)
+ /// 缃戠粶鍞ら啋(value:on)
+ /// </summary>
+ public const string wol = "wol";
+ /// <summary>
+ /// 鍏�(value:0-鍏�/1-寮�)
/// </summary>
public const string on_off = "on_off";
/// <summary>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTvPage.cs b/HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTvPage.cs
index 83623d5..4f2258c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTvPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTvPage.cs
@@ -168,8 +168,7 @@
//寮�鏈�
kaijiFL.SetClickListener((fl, btnImage, btnText) =>
{
- //Send.Current.Open("b7686438");
- ControlCommand(HisenseTVFunctionalAttributeConstant.on_off, "on");
+ ControlCommand(HisenseTVFunctionalAttributeConstant.wol, "on");
});
//鍏虫満
--
Gitblit v1.8.0