From ed386b0eaf15092b752afe0afa3677da67edff68 Mon Sep 17 00:00:00 2001 From: TianMaiCheng <746290578@qq.com> Date: Mon, 9 Mar 2026 10:38:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9B=E5=B0=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E7=9B=91=E6=8E=A7=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 增加 TCL 多个 电视 也能 息屏的功能 --- CRICS_V3_1124.suo | Bin 12780544 -> 12780544 bytes CommonEntity/TCLToken.cs | 1 + ConsoleApplication2/Program.cs | 2 + Dao/IHostRepository.cs | 2 +- Dao/Implement/HostRepository.cs | 15 ++++--- RCUHost/Implement/HostRegisterReceiver.cs | 4 +- RCUHost/Implement/HostServer.cs | 45 ++++++++++++-------- RCUHost/Implement/New_RoomStatusReceiver.cs | 32 ++++++++++++-- 8 files changed, 71 insertions(+), 30 deletions(-) diff --git a/CRICS_V3_1124.suo b/CRICS_V3_1124.suo index 159b91eff48d4fc8ef33e090c7e05c7331b62174..c552fa133a08b5e0918fcdb98f309559d953dd6d 100644 GIT binary patch delta 9064 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 LYTnXPRrY@XDc@p# delta 7606 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 Yk9>k0Kt4sPk%Nd2ImDdHYfAF}7gIaJsQ>@~ diff --git a/CommonEntity/TCLToken.cs b/CommonEntity/TCLToken.cs index bc10a32..71e0fd2 100644 --- a/CommonEntity/TCLToken.cs +++ b/CommonEntity/TCLToken.cs @@ -134,6 +134,7 @@ namespace CommonEntity tsa.@params = new PPP() { url = extra_params["url"] }; } + logger.Error("TCL send data" + Newtonsoft.Json.JsonConvert.SerializeObject(tsa)); request1.AddJsonBody(tsa); var QQQ = client1.Execute(request1); string ddd = QQQ.Content; diff --git a/ConsoleApplication2/Program.cs b/ConsoleApplication2/Program.cs index d8c0d5a..aa30911 100644 --- a/ConsoleApplication2/Program.cs +++ b/ConsoleApplication2/Program.cs @@ -301,6 +301,8 @@ namespace ConsoleApplication2 } static void Main(string[] args) { + byte[] ss111= Base64Url.Decode("qlUuAFQzU0E01oL4CIZhAQIABgAgAAAAAAAA/wICBwEAAAIbKgcCAAACGyp4Ig=="); + var vv1= Tools.ByteToString(ss111); #if AAA Console.WriteLine("aaaaaaaaaaaaa"); #endif diff --git a/Dao/IHostRepository.cs b/Dao/IHostRepository.cs index 6f340a1..4375b9a 100644 --- a/Dao/IHostRepository.cs +++ b/Dao/IHostRepository.cs @@ -174,6 +174,6 @@ namespace Dao /// /// /// - void SetModelAndLauncher(Host host, string lanIP, int lanPort, string model, string launcher, DateTime expireTime, DateTime setExpireTime); + void SetModelAndLauncher(Host host,string ConfigVersion,string software_version, string lanIP, int lanPort, string model, string launcher, DateTime expireTime, DateTime setExpireTime); } } diff --git a/Dao/Implement/HostRepository.cs b/Dao/Implement/HostRepository.cs index 602bc17..7e213bf 100644 --- a/Dao/Implement/HostRepository.cs +++ b/Dao/Implement/HostRepository.cs @@ -637,7 +637,7 @@ namespace Dao.Implement /// /// /// - public void SetModelAndLauncher(Host host, string lanIP, int lanPort, string model, string launcher, DateTime expireTime, DateTime setExpireTime) + public void SetModelAndLauncher(Host host,string ConfigVersion,string Version, string lanIP, int lanPort, string model, string launcher, DateTime expireTime, DateTime setExpireTime) { string HostNumberOnly = host.HostNumber; Host host_take = null; @@ -659,7 +659,7 @@ namespace Dao.Implement host_take.SubnetMask = host.SubnetMask; host_take.Gateway = host.Gateway; host_take.DNS = host.DNS; - host_take.Version = host.Version; + host_take.Version =Version; host_take.RunTime = host.RunTime; host_take.LauncherVersion = host.LauncherVersion; host_take.MAC = host.MAC; @@ -670,12 +670,15 @@ namespace Dao.Implement host_take.Season = host.Season; host_take.RoomNumber = host.RoomNumber; - host_take.Model = host.Model; + //host_take.Model = host.Model; + host_take.Model = model; + host_take.LauncherVersion = launcher; + host_take.ConfigVersion = ConfigVersion; host_take.UpgradeTime = host.UpgradeTime; #endregion } - string sql = "UPDATE tb_Hosts SET LanIP=?,LanPort=?,Model=?,LauncherVersion=?,ExpireTime=?,SetExpireTime=? WHERE ID=?"; + string sql = "UPDATE tb_Hosts SET LanIP=?,LanPort=?,Model=?,LauncherVersion=?,ExpireTime=?,SetExpireTime=?,ConfigVersion=?,Version=? WHERE ID=?"; IQuery query = Session.CreateSQLQuery(sql); query.SetString(0, lanIP); query.SetInt32(1, lanPort); @@ -683,7 +686,9 @@ namespace Dao.Implement query.SetString(3, launcher); query.SetDateTime(4, expireTime); query.SetDateTime(5, setExpireTime); - query.SetInt32(6, host.ID); + query.SetString(6, ConfigVersion); + query.SetString(7, Version); + query.SetInt32(8, host.ID); query.ExecuteUpdate(); } /// diff --git a/RCUHost/Implement/HostRegisterReceiver.cs b/RCUHost/Implement/HostRegisterReceiver.cs index 0706a3e..9af0f20 100644 --- a/RCUHost/Implement/HostRegisterReceiver.cs +++ b/RCUHost/Implement/HostRegisterReceiver.cs @@ -182,7 +182,7 @@ namespace RCUHost.Implement hostRCU.HotelCode = hotel_code.ToString(); hostRCU.HostID = host_id; hostRCU.RoomTypeID = roomtype_id; - hostRCU.ConfigVersion = setting_version.Substring(0, 5); + hostRCU.ConfigVersion = setting_version.Substring(0, 6); var TTT = new Tuple(host, hostRCU.ConfigVersion); Task.Factory.StartNew((State) => @@ -261,7 +261,7 @@ namespace RCUHost.Implement hostRCU.RoomTypeRemark = roomtype_remark; hostRCU.UpdateTime = DateTime.Now; - HostRepository.SetModelAndLauncher(host, lan_ip, lan_port, model, launcher_version, hostRCU.ExpireTime, hostRCU.SetExpireTime); + HostRepository.SetModelAndLauncher(host, hostRCU.ConfigVersion, software_version, lan_ip, lan_port, model, launcher_version, hostRCU.ExpireTime, hostRCU.SetExpireTime); HostRCURepository.SaveOrUpdate(hostRCU); diff --git a/RCUHost/Implement/HostServer.cs b/RCUHost/Implement/HostServer.cs index 9b25380..251823b 100644 --- a/RCUHost/Implement/HostServer.cs +++ b/RCUHost/Implement/HostServer.cs @@ -604,22 +604,23 @@ namespace RCUHost.Implement if (VVV.CmdType == 0x01) { + //后面出问题了，这个功能先不用 //升级之后，会上报注册指令，不能被跳过 - string Key = "Upgrade_UpdateSQL_" + hostnumber1; - object OOO1 = MemoryCacheHelper.Get(Key); - if (OOO1 == null) - { - //string RegisterKey2 = "SearchHostFilter"; + //string Key = "Upgrade_UpdateSQL_" + hostnumber1; + //object OOO1 = MemoryCacheHelper.Get(Key); + //if (OOO1 == null) + //{ + //string RegisterKey2 = "SearchHostFilter"; - //上报注册指令太快会被拦截 - //string KKK = "RegisterKey_" + hostnumber1; - //object OOO = MemoryCacheHelper.Get(KKK); - //if (OOO != null) - //{ - // RCUHost.RCUHostCommon.tools.LanJieData(RegisterKey2, hotelCode); - // return; - //} - } + //上报注册指令太快会被拦截 + //string KKK = "RegisterKey_" + hostnumber1; + //object OOO = MemoryCacheHelper.Get(KKK); + //if (OOO != null) + //{ + // RCUHost.RCUHostCommon.tools.LanJieData(RegisterKey2, hotelCode); + // return; + //} + //} } @@ -2170,10 +2171,12 @@ namespace RCUHost.Implement if (aaa == 01) { 是否取电 = true; + 是否取电_Int = 1; } else if (aaa == 02) { 是否取电 = false; + 是否取电_Int = 2; } } else @@ -2339,6 +2342,10 @@ namespace RCUHost.Implement var LiangDu = reader.ReadBytes(4); Bright_Va = (int)LiangDu[0]; } + if (Bright_Va == -1 || Bright_Va == 0) + { + Bright_Va = 100; + } var CarbonVIP_NoFilter = CarbonVIP; byte[] carbon_enum = new byte[] { 0x01, 0x02 }; @@ -2351,10 +2358,12 @@ namespace RCUHost.Implement if (!string.IsNullOrEmpty(HostID)) { string KKey = CacheKey.HostModalStatus_Prefix + "_" + HostID + "_" + "054000001"; - //var OldHostModal = CSRedisCacheHelper.Get_Partition(KKey); - //OldHostModal.Status = CarbonVIP; - - //CSRedisCacheHelper.Set_Partition(KKey,OldHostModal); + var OldHostModal = CSRedisCacheHelper.Get_Partition(KKey); + if (OldHostModal != null) + { + OldHostModal.Status = CarbonVIP; + CSRedisCacheHelper.Set_Partition(KKey, OldHostModal); + } StringBuilder sb = new StringBuilder(); diff --git a/RCUHost/Implement/New_RoomStatusReceiver.cs b/RCUHost/Implement/New_RoomStatusReceiver.cs index 6821c8e..28ca251 100644 --- a/RCUHost/Implement/New_RoomStatusReceiver.cs +++ b/RCUHost/Implement/New_RoomStatusReceiver.cs @@ -556,7 +556,20 @@ namespace RCUHost.Implement //004000022 if (device.Value.Address.Equals("004000022")) { - TCLCommon.SendData(hotelcode, roomnum, TCLcuid, skillid, "SLEEP"); + if (TCLcuid.Contains(",")) + { + string[] cid = TCLcuid.Split(','); + foreach (string ccc111 in cid) + { + TCLCommon.SendData(hotelcode, roomnum, ccc111, skillid, "SLEEP"); + //不加这一行，调用不成功，应该是TCL那边的接口有限制 + Thread.Sleep(500); + } + } + else + { + TCLCommon.SendData(hotelcode, roomnum, TCLcuid, skillid, "SLEEP"); + } } //if (hostModal.Modal.Name.Equals("睡眠息屏")) //{ @@ -565,7 +578,18 @@ namespace RCUHost.Implement //呼叫前台 if (hostModal.Modal != null && hostModal.Modal.ModalAddress.Equals("004000023")) { - TCLCommon.SendData(hotelcode, roomnum, TCLcuid, skillid, "SIP"); + if (TCLcuid.Contains(",")) + { + string[] cid = TCLcuid.Split(','); + foreach (string item in cid) + { + TCLCommon.SendData(hotelcode, roomnum, item, skillid, "SIP"); + } + } + else + { + TCLCommon.SendData(hotelcode, roomnum, TCLcuid, skillid, "SIP"); + } } //if (hotelcode.Equals("1085")) @@ -582,10 +606,10 @@ namespace RCUHost.Implement Dictionary ddd = new Dictionary(); if (!string.IsNullOrEmpty(ebell_rtsp)) { - ddd.Add("url",ebell_rtsp); + ddd.Add("url", ebell_rtsp); } - TCLCommon.SendData(hotelcode, roomnum, TCLcuid, skillid, "DOORBELL",0,ddd); + TCLCommon.SendData(hotelcode, roomnum, TCLcuid, skillid, "DOORBELL", 0, ddd); } }