From 58d4ef9af9c906acf2e9f65a3e65092363c8e1cd Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 24 八月 2023 17:42:49 +0800
Subject: [PATCH] 2023年08月24日17:42:25
---
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | 2
HDL-ON_iOS/Resources/Phone/AksIcon/like.png | 0
HDL-ON_iOS/Resources/Phone/HisenseTv/electricaltvhisense.png | 0
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 33 +++
HDL-ON_iOS/HDL-ON_iOS.csproj | 14 +
HDL_ON/UI/UI2/2-Classification/RoomPage.cs | 3
HDL-ON_iOS/Resources/Phone/HisenseTv/kaiguan.png | 0
HDL-ON_iOS/Resources/Phone/HisenseTv/shouye.png | 0
HDL-ON_iOS/Resources/Phone/AksIcon/aks.png | 0
HDL-ON_iOS/Resources/Phone/HisenseTv/on.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/electricaltvhisense_blue.png | 0
HDL-ON_iOS/Resources/Phone/HisenseTv/onbj.png | 0
HDL-ON_Android/HDL-ON_Android.csproj | 2
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | 1
HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs | 34 ++--
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_BrandFunctionListPage.cs | 7
HDL-ON_iOS/Resources/Language.ini | 163 ++++++++++++++++++++
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 2
HDL_ON/Common/Utlis.cs | 28 ++
HDL-ON_Android/Assets/Phone/HisenseTv/electricaltvhisense.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricaltvhisense_blue.png | 0
HDL_ON/UI/MainPage.cs | 4
HDL-ON_iOS/Resources/Phone/HisenseTv/yingliangjian.png | 0
HDL-ON_iOS/Resources/Phone/HisenseTv/offbj.png | 0
HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTvPage.cs | 62 ++++---
HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/electricaltvhisense.png | 0
HDL-ON_iOS/Resources/Phone/HisenseTv/caidan.png | 0
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 59 +++----
HDL-ON_iOS/Resources/Phone/HisenseTv/yingliangjia.png | 0
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 32 +++
HDL_ON/DAL/Server/HttpUtil.cs | 4
HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs | 4
HDL-ON_iOS/Resources/Phone/HisenseTv/offtvbj.png | 0
33 files changed, 355 insertions(+), 99 deletions(-)
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricaltvhisense_blue.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricaltvhisense_blue.png
new file mode 100644
index 0000000..1e204f8
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricaltvhisense_blue.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/HisenseTv/electricaltvhisense.png b/HDL-ON_Android/Assets/Phone/HisenseTv/electricaltvhisense.png
new file mode 100644
index 0000000..1e204f8
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/HisenseTv/electricaltvhisense.png
Binary files differ
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 33669a4..d50df05 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -589,6 +589,8 @@
<AndroidAsset Include="Assets\Phone\HisenseTv\shouye.png" />
<AndroidAsset Include="Assets\Phone\HisenseTv\yingliangjia.png" />
<AndroidAsset Include="Assets\Phone\HisenseTv\yingliangjian.png" />
+ <AndroidAsset Include="Assets\Phone\HisenseTv\electricaltvhisense.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricaltvhisense_blue.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index f3b64b4..f86192f 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1617,6 +1617,16 @@
<BundleResource Include="Resources\h5\static\img\equal-plant-ic.7ef6befa.png" />
<BundleResource Include="Resources\h5\static\img\coal-save-ic.6c5fd125.png" />
<BundleResource Include="Resources\h5\static\font\SourceHanSansCN-Normal.otf" />
+ <BundleResource Include="Resources\Phone\HisenseTv\on.png" />
+ <BundleResource Include="Resources\Phone\HisenseTv\yingliangjian.png" />
+ <BundleResource Include="Resources\Phone\HisenseTv\caidan.png" />
+ <BundleResource Include="Resources\Phone\HisenseTv\kaiguan.png" />
+ <BundleResource Include="Resources\Phone\HisenseTv\offtvbj.png" />
+ <BundleResource Include="Resources\Phone\HisenseTv\offbj.png" />
+ <BundleResource Include="Resources\Phone\HisenseTv\electricaltvhisense.png" />
+ <BundleResource Include="Resources\Phone\HisenseTv\yingliangjia.png" />
+ <BundleResource Include="Resources\Phone\HisenseTv\shouye.png" />
+ <BundleResource Include="Resources\Phone\HisenseTv\onbj.png" />
<BundleResource Include="Resources\Phone\AksIcon\ykq_right_selected.png" />
<BundleResource Include="Resources\Phone\AksIcon\ykq_kuaijin_selected.png" />
<BundleResource Include="Resources\Phone\AksIcon\xia.png" />
@@ -1684,6 +1694,7 @@
<BundleResource Include="Resources\Phone\AksIcon\zdyxia2.png" />
<BundleResource Include="Resources\Phone\AksIcon\ykq_pindaojian_selected.png" />
<BundleResource Include="Resources\Phone\AksIcon\ykq_kuaitui.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\like.png" />
<BundleResource Include="Resources\Phone\AksIcon\zuo_selected.png" />
<BundleResource Include="Resources\Phone\AksIcon\ykq_xia.png" />
<BundleResource Include="Resources\Phone\AksIcon\ykq_kuaijin.png" />
@@ -1726,6 +1737,7 @@
<BundleResource Include="Resources\Phone\AksIcon\xiangshang.png" />
<BundleResource Include="Resources\Phone\AksIcon\yingyinzhongkong2.png" />
<BundleResource Include="Resources\Phone\AksIcon\yinliangjia.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\aks.png" />
<BundleResource Include="Resources\Phone\AksIcon\ykq_bofan_selected.png" />
<BundleResource Include="Resources\Phone\AksIcon\ykq_dengguang_selected.png" />
<BundleResource Include="Resources\Phone\AksIcon\xia_selected.png" />
@@ -1737,6 +1749,8 @@
<BundleResource Include="Resources\Phone\AksIcon\yule.png" />
<BundleResource Include="Resources\Phone\AksIcon\tingzhi.png" />
<BundleResource Include="Resources\Phone\AksIcon\zdyyou2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricaltvhisense_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricaltvhisense.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 75c5e2b..e68e18a 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -1227,6 +1227,39 @@
8512=Serial number
8513=Model
+8701=Home theatre
+8702=Player
+8703=Amplifier
+8704=Virtual remote control
+8705=Allmov
+8706=TIMING
+8707=Open
+8708=Off
+8709=Vocal tract
+8710=All around
+8711=Storehouse
+8712=Subtitle
+8713=Have already collected
+8714=A Collection for the Future
+8715=Synthesize
+8716=Video Introduction
+8717=Score
+8718=Play now
+8719=Conform action
+8720=Channel
+8721=Control
+
+8801=Home page
+8802=Power off
+8803=Volume
+8804=Setting
+8805=Unmute
+8806=Signal source
+8807=Power off
+8808=Power on
+8809=Stripping equipment
+
+
@@ -2578,9 +2611,37 @@
8512=搴忓垪鍙�
8513=鍨嬪彿
+8701=瀹跺涵褰遍櫌
+8702=鎾斁鍣�
+8703=鍔熸斁
+8704=铏氭嫙閬ユ帶鍣�
+8705=褰卞簱
+8706=鏃跺簭鍣�
+8707=寮�
+8708=鍏�
+8709=澹伴亾
+8710=涓婁竴閮�
+8711=杩涘嚭浠�
+8712=瀛楀箷
+8713=宸叉敹钘�
+8714=鏈敹钘�
+8715=缁煎悎
+8716=褰辩墖浠嬬粛
+8717=璇勫垎
+8718=绔嬪嵆鎾斁
+8719=涓嬩竴閮�
+8720=棰戦亾
+8721=鎺у埗
-
-
+8801=棣栭〉
+8802=鍏虫満
+8803=闊抽噺
+8804=璁剧疆
+8805=瑙ｉ櫎闈欓煶
+8806=淇″彿婧�
+8807=宸插叧鏈�
+8808=寮�鏈�
+8809=瑙ｇ粦璁惧
@@ -3919,6 +3980,38 @@
8512=Serial number
8513=Model
+8701=Home theatre
+8702=Player
+8703=Amplifier
+8704=Virtual remote control
+8705=Allmov
+8706=TIMING
+8707=Open
+8708=Off
+8709=Vocal tract
+8710=All around
+8711=Storehouse
+8712=Subtitle
+8713=Have already collected
+8714=A Collection for the Future
+8715=Synthesize
+8716=Video Introduction
+8717=Score
+8718=Play now
+8719=Conform action
+8720=Channel
+8721=Control
+
+8801=Home page
+8802=Power off
+8803=Volume
+8804=Setting
+8805=Unmute
+8806=Signal source
+8807=Power off
+8808=Power on
+8809=Stripping equipment
+
@@ -5252,6 +5345,38 @@
8511=Door opener
8512=Serial number
8513=Model
+
+8701=Home theatre
+8702=Player
+8703=Amplifier
+8704=Virtual remote control
+8705=Allmov
+8706=TIMING
+8707=Open
+8708=Off
+8709=Vocal tract
+8710=All around
+8711=Storehouse
+8712=Subtitle
+8713=Have already collected
+8714=A Collection for the Future
+8715=Synthesize
+8716=Video Introduction
+8717=Score
+8718=Play now
+8719=Conform action
+8720=Channel
+8721=Control
+
+8801=Home page
+8802=Power off
+8803=Volume
+8804=Setting
+8805=Unmute
+8806=Signal source
+8807=Power off
+8808=Power on
+8809=Stripping equipment
9000=Inicio sesi贸n con un nuevo n煤mero de tel茅fono celular
9001=Inicie sesi贸n con una nueva direcci贸n de correo el茅ctr贸nico
@@ -6591,6 +6716,40 @@
8512=Serial number
8513=Model
+8701=Home theatre
+8702=Player
+8703=Amplifier
+8704=Virtual remote control
+8705=Allmov
+8706=TIMING
+8707=Open
+8708=Off
+8709=Vocal tract
+8710=All around
+8711=Storehouse
+8712=Subtitle
+8713=Have already collected
+8714=A Collection for the Future
+8715=Synthesize
+8716=Video Introduction
+8717=Score
+8718=Play now
+8719=Conform action
+8720=Channel
+8721=Control
+
+8801=Home page
+8802=Power off
+8803=Volume
+8804=Setting
+8805=Unmute
+8806=Signal source
+8807=Power off
+8808=Power on
+8809=Stripping equipment
+
+
+
diff --git a/HDL-ON_iOS/Resources/Phone/AksIcon/aks.png b/HDL-ON_iOS/Resources/Phone/AksIcon/aks.png
new file mode 100644
index 0000000..1def0ae
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/AksIcon/aks.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/AksIcon/like.png b/HDL-ON_iOS/Resources/Phone/AksIcon/like.png
new file mode 100644
index 0000000..b8ae243
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/AksIcon/like.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/electricaltvhisense_blue.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/electricaltvhisense_blue.png
new file mode 100644
index 0000000..1e204f8
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/electricaltvhisense_blue.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/electricaltvhisense.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/electricaltvhisense.png
new file mode 100644
index 0000000..d6e3852
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/electricaltvhisense.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/HisenseTv/caidan.png b/HDL-ON_iOS/Resources/Phone/HisenseTv/caidan.png
new file mode 100644
index 0000000..f4fe166
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/HisenseTv/caidan.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/HisenseTv/electricaltvhisense.png b/HDL-ON_iOS/Resources/Phone/HisenseTv/electricaltvhisense.png
new file mode 100644
index 0000000..1e204f8
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/HisenseTv/electricaltvhisense.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/HisenseTv/kaiguan.png b/HDL-ON_iOS/Resources/Phone/HisenseTv/kaiguan.png
new file mode 100644
index 0000000..53ba654
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/HisenseTv/kaiguan.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/HisenseTv/offbj.png b/HDL-ON_iOS/Resources/Phone/HisenseTv/offbj.png
new file mode 100644
index 0000000..823db9a
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/HisenseTv/offbj.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/HisenseTv/offtvbj.png b/HDL-ON_iOS/Resources/Phone/HisenseTv/offtvbj.png
new file mode 100644
index 0000000..c4335fc
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/HisenseTv/offtvbj.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/HisenseTv/on.png b/HDL-ON_iOS/Resources/Phone/HisenseTv/on.png
new file mode 100644
index 0000000..5ce77d3
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/HisenseTv/on.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/HisenseTv/onbj.png b/HDL-ON_iOS/Resources/Phone/HisenseTv/onbj.png
new file mode 100644
index 0000000..0e424cf
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/HisenseTv/onbj.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/HisenseTv/shouye.png b/HDL-ON_iOS/Resources/Phone/HisenseTv/shouye.png
new file mode 100644
index 0000000..3542edb
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/HisenseTv/shouye.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/HisenseTv/yingliangjia.png b/HDL-ON_iOS/Resources/Phone/HisenseTv/yingliangjia.png
new file mode 100644
index 0000000..268d70b
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/HisenseTv/yingliangjia.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/HisenseTv/yingliangjian.png b/HDL-ON_iOS/Resources/Phone/HisenseTv/yingliangjian.png
new file mode 100644
index 0000000..31369e7
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/HisenseTv/yingliangjian.png
Binary files differ
diff --git a/HDL_ON/Common/Utlis.cs b/HDL_ON/Common/Utlis.cs
index 13a4af0..956fc06 100644
--- a/HDL_ON/Common/Utlis.cs
+++ b/HDL_ON/Common/Utlis.cs
@@ -20,11 +20,29 @@
#endif
}
- /// <summary>
- /// 寮圭獥鎻愮ず
- /// </summary>
- /// <param name="mes"></param>
- public static void ShowAlertOnMainThread(string mes)
+ /// <summary>
+ /// 鍏ㄥ眬鎵撳嵃
+ /// </summary>
+ /// <param name="tag">鎻忚堪淇℃伅</param>
+ /// <param name="url">璇锋眰鍦板潃(鍙互鏍规嵁鍦板潃杩囨护璇ユ暟鎹�)</param>
+ /// <param name="content">淇℃伅鍐呭</param>
+ public static void WriteLine(string tag,string url,string content)
+ {
+#if DEBUG
+ if (url == "")
+ {
+ return;
+ }
+ string text = tag + "======" + url + "\r\n" + content;
+ Console.WriteLine(text);
+#endif
+ }
+
+ /// <summary>
+ /// 寮圭獥鎻愮ず
+ /// </summary>
+ /// <param name="mes"></param>
+ public static void ShowAlertOnMainThread(string mes)
{
Application.RunOnMainThread(() => {
new Alert("", mes, Language.StringByID(StringId.Close)).Show();
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 18f78a5..9d02ee4 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -208,8 +208,8 @@
request.AddUrlSegment(data.Key, data.Value.ToString());
}
}
-
IRestResponse response = client.Execute(request);
+ HDL_ON.Utlis.WriteLine("鍙戦��", requestFullUrl, response.Request.Body?.Value.ToString());
if (response.StatusCode == HttpStatusCode.OK)
{
try
@@ -227,7 +227,7 @@
revertObj.Data = "";
}
//*****涓�浜涘垽绌哄鐞�*****************
-
+ HDL_ON.Utlis.WriteLine("鎺ユ敹", requestFullUrl, response.Content);
return revertObj;
}
catch (Exception ex)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index df9b511..17b3e99 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -122,7 +122,9 @@
SPK.PanelSocket,SPK.ElectricSocket,
SPK.MechanicalArm,SPK.IpCam_Imou,
SPK.GroupControl,
- SPK.AvMusic,SPK.MusicStandard
+ //SPK.AvMusic,
+ //SPK.MusicStandard,
+ //SPK.ElectricalTvHisense
};
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index 63e0a38..ef701da 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -352,7 +352,7 @@
case SPK.ElectricalTvHisense:
{
//娴蜂俊鐢佃
- var form = new UI2.FuntionControlView.HisenseTV.HisenseTvPage(function, btnName, btnFromFloor, comerom, action);
+ var form = new UI2.FuntionControlView.HisenseTV.HisenseTvPage(function, btnName, btnFromFloor,btnCollectionIcon, comerom, action);
MainPage.BasePageView.AddChidren(form);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
form.Show();
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index 649b4c8..a601904 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -566,6 +566,7 @@
btnSwitch.IsSelected = !btnSwitch.IsSelected;
});
}
+
function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
Dictionary<string, string> d = new Dictionary<string, string>();
if (function.spk == SPK.LightDimming || function.spk == SPK.LightRGB)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index f7fe3ad..9a9f97e 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -186,8 +186,6 @@
else if (titleId == StringId.Electric)
{
functionList.AddRange(FunctionList.List.GetElectricals());
- functionList.Add(new Function { spk = SPK.ElectricalTvHisense, name = "娴蜂俊鐢佃1",sid="123456789"});
- functionList.Add(new Function { spk = SPK.ElectricalTvHisense, name = "娴蜂俊鐢佃2", sid = "1234567890" });
}
else if (titleId == StringId.EnvironmentalScience)
{
@@ -307,9 +305,37 @@
functionListView.AddChidren(functionDiv);
}
+ else if (function.spk == SPK.ElectricalTvHisense)
+ {
+ Action deviceDelAction = () =>
+ {
+ //鍒犻櫎璁惧鎴愬姛鍚庢洿鏂癠I
+ if (functionListView==null) {
+ return;
+ }
+ functionListView.RemoveAll();
+ showList.Remove(function);//鍏堢Щ闄�
+ ShowFunctionRow(showList,isAppend);
+
+ };
+ var functionDiv = new FunctionControlZone(function, deviceDelAction)
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Width = Application.GetRealWidth(343),
+ Height = Application.GetRealHeight(96),
+ Radius = (uint)Application.GetMinRealAverage(12),
+ BorderColor = 0x00FFFFFF,
+ BorderWidth = 1,
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ Tag = function.spk + function.sid
+ };
+ functionDiv.LoadFunctionDiv();
+ functionDiv.OrderEvent = OrderEvent;
+ functionListView.AddChidren(functionDiv);
+ }
else
{
- var functionDiv = new FunctionControlZone(function,null)
+ var functionDiv = new FunctionControlZone(function, null)
{
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(343),
diff --git a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
index 9d374a2..09bfa7e 100644
--- a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
@@ -121,9 +121,10 @@
}
else
{
+
var functionDiv = new FunctionControlZone(function, () =>
{
- this.ReLoadPage();
+ this.ReLoadPage(); //鍒犻櫎璁惧鍚庨噸鏂板埛鏂癠I
})
{
Gravity = Gravity.CenterHorizontal,
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index e8e8b0f..193eb02 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -1488,19 +1488,31 @@
case SPK.ElectricalTvHisense:
{
string on_off = GetKeyValue("on_off", dicList);
+ string volumet = GetKeyValue("set_volume", dicList);
string signal = GetKeyValue("signal", dicList);
if (!string.IsNullOrEmpty(on_off))
{
- if (on_off == "1")
+ if (on_off == "on")
{
stateStr = Language.StringByID(StringId.onLogic);
}
else
{
stateStr = Language.StringByID(StringId.offLogic);
+ //濡傛灉鍏充簡锛屽叾瀹冨睘鎬т笉鏄剧ず
+ break;
}
}
+ if (!string.IsNullOrEmpty(stateStr))
+ {
+ stateStr += ",";
+ }
+ if (!string.IsNullOrEmpty(volumet))
+ {
+ stateStr += Language.StringByID(StringId.yinliang)+ volumet;
+ }
+
if (!string.IsNullOrEmpty(stateStr))
{
stateStr += ",";
@@ -2492,12 +2504,12 @@
{
switch (value)
{
- case "1":
+ case "on":
{
button1.Text = Language.StringByID(StringId.onLogic);
}
break;
- case "0":
+ case "off":
{
button1.Text = Language.StringByID(StringId.offLogic);
}
@@ -2505,14 +2517,25 @@
}
}
break;
- case "signal":
+
+ case "set_volume":
{
if (button2 == null)
{
//鎬曡皟璇曡蒋浠朵贡涓婁笢瑗垮鑷存姏寮傚父
break;
}
- button2.Text = value.Replace("_", " ");
+ button2.Text = value;
+ }
+ break;
+ case "signal":
+ {
+ if (button3 == null)
+ {
+ //鎬曡皟璇曡蒋浠朵贡涓婁笢瑗垮鑷存姏寮傚父
+ break;
+ }
+ button3.Text = value.Replace("_", " ");
}
break;
}
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index 5f147c0..baf20b9 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -189,7 +189,7 @@
list.AddRange(list2);
list.AddRange(FunctionList.List.groupControls);
#if DEBUG
- GetTestDevice(ref list, true);
+ //GetTestDevice(ref list, true);
#endif
return list;
}
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index 9c88669..63b9cac 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -812,15 +812,15 @@
LogicView.FunTypeView switchView = new LogicView.FunTypeView();
switchView.btnText.TextID = StringId.switchLogic;
fLayout.AddChidren(switchView.FLayoutView());
- /////闊抽噺
- //LogicView.FunTypeView volView = new LogicView.FunTypeView();
- //volView.frameLayout.Y = switchView.frameLayout.Bottom;
- //volView.btnText.TextID = StringId.yinliang;
- //fLayout.AddChidren(volView.FLayoutView());
+ ///闊抽噺
+ LogicView.FunTypeView volView = new LogicView.FunTypeView();
+ volView.frameLayout.Y = switchView.frameLayout.Bottom;
+ volView.btnText.TextID = StringId.yinliang;
+ fLayout.AddChidren(volView.FLayoutView());
///淇″彿婧�
LogicView.FunTypeView sourceView = new LogicView.FunTypeView();
- sourceView.frameLayout.Y = switchView.frameLayout.Bottom;
+ sourceView.frameLayout.Y = volView.frameLayout.Bottom;
sourceView.btnText.TextID = StringId.xinhaoyuan;
fLayout.AddChidren(sourceView.FLayoutView());
@@ -833,22 +833,22 @@
{
SwitchViewMethod(device, switchView.btnState, 2);
};
- /////闊抽噺鐐瑰嚮浜嬩欢
- //volView.btnClick.MouseUpEventHandler += (sender, e) =>
- //{
- // selectedState = device.spk + "_volume";
- // //new LogicView.TipPopView { }.InputBox(StringId.volumeMusic, volView.btnState.Text, (value) =>
- // //{
+ ///闊抽噺鐐瑰嚮浜嬩欢
+ volView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ //selectedState = device.spk + "_volume";
+ //new LogicView.TipPopView { }.InputBox(StringId.volumeMusic, volView.btnState.Text, (value) =>
+ //{
- // // //鐣岄潰鏄剧ず閫変腑鍊�
- // // volView.btnState.Text = value;
- // // //鏁版嵁灏佽
- // // AddDictionary("volume", value);//闊抽噺
- // //}, 0, 100);
+ // //鐣岄潰鏄剧ず閫変腑鍊�
+ // volView.btnState.Text = value;
+ // //鏁版嵁灏佽
+ // AddDictionary("setvolume", value);//闊抽噺
+ //}, 0, 100);
- // BrightnessMethod(device, volView.btnState, volView.btnText.Text);
+ BrightnessMethod(device, volView.btnState, volView.btnText.Text);
- //};
+ };
///淇″彿婧愮偣鍑讳簨浠�
sourceView.btnClick.MouseUpEventHandler += (sender, e) =>
@@ -882,7 +882,7 @@
if (edit)
{
//鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
- GetEditDeviceState(device, index, switchView.btnState, sourceView.btnState, null, null);
+ GetEditDeviceState(device, index, switchView.btnState, volView.btnState, sourceView.btnState, null);
}
#endregion
@@ -1107,19 +1107,6 @@
}
break;
- case SPK.ElectricalTvHisense:
- {
- if (id == StringId.onLogic)
- {
- value = "1";
- }
- else
- {
- value = "0";
- }
- }
- break;
-
}
//鏁版嵁灏佽
@@ -1169,6 +1156,12 @@
}
}
break;
+ case SPK.ElectricalTvHisense:
+ {
+ keyVlaue = "set_volume";
+ }
+ break;
+
}
//鏁版嵁灏佽
AddDictionary(keyVlaue, brightnesValue);
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
index 08bfede..631167f 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
@@ -1866,8 +1866,8 @@
public SceneFunctionInfoEditPage(Scene s, SceneFunction fc,Action action)
{
- bodyView = this;
- scene = s;
+ bodyView = this;
+ scene = s;
sceneFunction = fc.localFunction.ConvertSceneFunction();
foreach(var ll in sceneFunction.status)
{
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_BrandFunctionListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_BrandFunctionListPage.cs
index 0fbb6de..bb118a5 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_BrandFunctionListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_BrandFunctionListPage.cs
@@ -121,7 +121,7 @@
Y = Application.GetRealHeight(667 - 80),
Height = Application.GetRealHeight(90),
Radius = (uint)Application.GetRealWidth(22),
- Visible = false,
+ //Visible =false,
};
bodyView.AddChidren(optionView);
@@ -147,7 +147,7 @@
{
if (pack.Code == StateCode.SUCCESS)
{
- btnComfirm.Visible = false;
+ optionView.Visible = false;
}
}
//var pack = http.Set3tyIotFunctionToHouse(function.deviceId, "0", brand_Iot.companyId);
@@ -327,7 +327,8 @@
btnCheckIcon.IsSelected = function.collect = true;
optionList.Add(function.deviceId);
}
- optionView.Visible = true;
+
+ optionView.Visible =true;
};
if (function.homeId == DB_ResidenceData.Instance.CurrentRegion.id )
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
index efdd128..4080a14 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
@@ -465,6 +465,7 @@
EventHandler<MouseEventArgs> ClickEvent = (sener, e) =>
{
+
new HDL_ON.UI.Music.View.TipView().TipBox(-1, StringId.AreYouSureToDeleteThisDevice, () =>
{
UI2.FuntionControlView.VideoDoorLock.VideDoorLockSend.Current.DelDevice(this.function, (isBool) =>
@@ -521,7 +522,7 @@
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.WarningColor,
TextSize = CSS_FontSize.SubheadingFontSize,
- TextID = StringId.DeleteDevice,
+ TextID = StringId.jiebangshebei,
Radius = (uint)Application.GetRealWidth(22),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
@@ -529,29 +530,30 @@
EventHandler<MouseEventArgs> ClickEvent = (sener, e) =>
{
+
new HDL_ON.UI.Music.View.TipView().TipBox(-1, StringId.AreYouSureToDeleteThisDevice, () =>
{
- HDL_ON.UI.UI2.FuntionControlView.HisenseTV.Send.Current.DelDevice(this.function.deviceId, (isBool) =>
- {
- Application.RunOnMainThread(() =>
+ HDL_ON.UI.UI2.FuntionControlView.HisenseTV.Send.Current.DelDevice(this.function.deviceId, (isBool) =>
{
- if (!isBool)
+ Application.RunOnMainThread(() =>
{
- new Tip()
+ if (!isBool)
{
- CloseTime = 1,
- Text = Language.StringByID(StringId.delFail),
- Direction = AMPopTipDirection.None,
- }.Show(bodyView);
- return;
- }
+ new Tip()
+ {
+ CloseTime = 1,
+ Text = Language.StringByID(StringId.delFail),
+ Direction = AMPopTipDirection.None,
+ }.Show(bodyView);
+ return;
+ }
//鍒犻櫎鏈湴鏂囦欢
UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DeleteFunction(this.function);
- this.RemoveFromParent();
- this.actionDel?.Invoke();
- });
+ this.RemoveFromParent();
+ this.actionDel?.Invoke();
+ });
- });
+ });
});
};
diff --git a/HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTvPage.cs b/HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTvPage.cs
index 0b3d646..e939fda 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTvPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTvPage.cs
@@ -29,6 +29,11 @@
/// </summary>
private Button btnRoomName;
/// <summary>
+ /// 涓婁竴绾х晫闈㈢殑鏀惰棌鎺т欢
+ /// </summary>
+ private Button btnCollectionIcon;
+
+ /// <summary>
/// 澶撮儴甯冨眬
/// </summary>
private TopView topView;
@@ -83,12 +88,14 @@
/// </summary>
/// <param name="function">璁惧</param>
/// <param name="btnDeviceName">涓婁竴绾х晫闈㈢殑璁惧鍚嶅瓧鎺т欢(娉�:涓嶈兘浼爊ull,娌℃湁鍙互浼爊ew Button())</param>
- /// <param name="btnRoomName">涓婁竴绾х晫闈㈢殑鎴块棿鍚嶅瓧鎺т欢(娉�:涓嶈兘浼爊ull,娌℃湁鍙互浼爊ew Button())</param>
- public HisenseTvPage(Function function, Button btnDeviceName, Button btnRoomName, CommonMethod.Comerom comerom, Action action)
+ /// <param name="btnRoomName">涓婁竴绾х晫闈㈢殑鎴块棿鍚嶅瓧鎺т欢(娉�:涓嶈兘浼爊ull,娌℃湁鍙互浼爊ew Button())</param>
+ /// <param name="btnCollectionIcon">涓婁竴绾х晫闈㈢殑鎴块棿鍚嶅瓧鎺т欢(娉�:涓嶈兘浼爊ull,娌℃湁鍙互浼爊ew Button())</param>
+ public HisenseTvPage(Function function, Button btnDeviceName, Button btnRoomName, Button btnCollectionIcon, CommonMethod.Comerom comerom, Action action)
{
this.device = function;
this.btnDeviceName = btnDeviceName;
this.btnRoomName = btnRoomName;
+ this.btnCollectionIcon = btnCollectionIcon;
this.comerom = comerom;
this.action = action;
@@ -159,6 +166,8 @@
{
btnOpenCollectIcon.IsSelected = this.device.collect = !btnOpenCollectIcon.IsSelected;
this.device.CollectFunction();
+ btnCloseCollectIcon.IsSelected = btnOpenCollectIcon.IsSelected;
+ this.btnCollectionIcon.IsSelected = btnOpenCollectIcon.IsSelected;
};
//棣栭〉
@@ -169,7 +178,7 @@
//鍏虫満
kaiguanFL.SetClickListener((fl, btnImage, btnText) =>
{
- ControlCommand(HisenseTVFunctionalAttributeConstant.on_off, "0", (isBool) =>
+ ControlCommand(HisenseTVFunctionalAttributeConstant.on_off, "off", (isBool) =>
{
if (isBool)
{
@@ -291,11 +300,13 @@
{
btnCloseCollectIcon.IsSelected = this.device.collect = !btnCloseCollectIcon.IsSelected;
this.device.CollectFunction();
+ btnOpenCollectIcon.IsSelected = btnCloseCollectIcon.IsSelected;
+ this.btnCollectionIcon.IsSelected = btnCloseCollectIcon.IsSelected;
};
//寮�鏈�
clickBtn.MouseDownEventHandler += (sen, e) =>
{
- ControlCommand(HisenseTVFunctionalAttributeConstant.on_off, "1", (isBool) =>
+ ControlCommand(HisenseTVFunctionalAttributeConstant.on_off, "on", (isBool) =>
{
if (isBool)
{
@@ -331,7 +342,7 @@
catch { }
}
/// <summary>
- /// 鍒濆鏁版嵁
+ /// 鍒濆鍖栨暟鎹�
/// </summary>
private void ReadData()
{
@@ -743,29 +754,32 @@
this.AddChidren(topView.TopFLayoutView());
}
/// <summary>
- /// 鏍规嵁璁惧寮�鍏崇姸鎬佹樉绀烘寚瀹氭樉绀虹晫闈�
+ /// 鏍规嵁璁惧寮�鍏崇姸鎬佹樉绀烘寚瀹氱晫闈�
/// (杩涙潵鐨勬椂鍊欑敤鍒�)
/// </summary>
/// <returns></returns>
private void CurrentAssignPage()
{
+ CommonMethod.Current.MainThread(() =>
+ {
- if (this.device == null)
- {
- vv.Visible = false;
- baseCloseFFL.Visible = true;
- return;
- }
- if (this.device.GetAttrState("on_off") == "on")
- {
- vv.Visible = true;
- baseCloseFFL.Visible = false;
- }
- else
- {
- vv.Visible = false;
- baseCloseFFL.Visible = true;
- }
+ if (this.device == null)
+ {
+ vv.Visible = false;
+ baseCloseFFL.Visible = true;
+ return;
+ }
+ if (this.device.GetAttrState("on_off") == "on" || this.device.GetAttrState("on_off") == "1")
+ {
+ vv.Visible = true;
+ baseCloseFFL.Visible = false;
+ }
+ else
+ {
+ vv.Visible = false;
+ baseCloseFFL.Visible = true;
+ }
+ });
}
@@ -875,7 +889,7 @@
{
EventHandler<MouseEventArgs> DownClick = (sender, e) =>
{
- this.BackgroundColor = 0xFFF2F3F7;
+ //this.BackgroundColor = 0xFFF2F3F7;
action?.Invoke(this, btnImage, btnText);
};
this.MouseDownEventHandler += DownClick;
@@ -885,7 +899,7 @@
EventHandler<MouseEventArgs> UpClick = (sender, e) =>
{
- this.BackgroundColor = 0x00000000;
+ //this.BackgroundColor = 0x00000000;
};
this.MouseUpEventHandler += UpClick;
btnImage.MouseUpEventHandler += UpClick;
--
Gitblit v1.8.0