diff --git a/CRICS_V3_1124.suo b/CRICS_V3_1124.suo index ceb19bf..159b91e 100644 Binary files a/CRICS_V3_1124.suo and b/CRICS_V3_1124.suo differ diff --git a/ConsoleApplication1/Program.cs b/ConsoleApplication1/Program.cs index 83c7859..a7fc5ea 100644 --- a/ConsoleApplication1/Program.cs +++ b/ConsoleApplication1/Program.cs @@ -566,6 +566,16 @@ namespace ConsoleApplication1 static void Main(string[] args) { + + string RoomNUMBER = CSRedisCacheHelper.HMGet(5, CacheKey.RoomNumber_HostNumber, "254008128102")[0]; + Console.WriteLine("房间号:" + RoomNUMBER); + Console.ReadLine(); + int XiaoShu_BuFen = 0; + float xiaoshu_l = 0.0f; + + XiaoShu_BuFen = 5; + xiaoshu_l = (float)XiaoShu_BuFen / 10; + SetBlockData(); Console.ReadLine(); diff --git a/RCUHost/Implement/HostServer.cs b/RCUHost/Implement/HostServer.cs index 79e0239..9b25380 100644 --- a/RCUHost/Implement/HostServer.cs +++ b/RCUHost/Implement/HostServer.cs @@ -2120,7 +2120,7 @@ namespace RCUHost.Implement bool 是否取电 = false; ushort 是否取电_Int = 0; int 是否插卡 = 0; - if (Version == 0x02 || Version == 0x03) + if (Version == 0x02 || Version == 0x03 || Version == 0x04) { BitArray bit_a = new BitArray(new byte[] { TakeCardStatus }); bool b0 = bit_a.Get(0); @@ -2505,7 +2505,7 @@ namespace RCUHost.Implement { var XiaoShu = reader.ReadByte(); XiaoShu_BuFen = XiaoShu; - xiaoshu_l = XiaoShu_BuFen / 10; + xiaoshu_l = (float)XiaoShu_BuFen / 10; } if (true) @@ -2613,6 +2613,10 @@ namespace RCUHost.Implement }; string mns = Newtonsoft.Json.JsonConvert.SerializeObject(ns2); + if (hotelCode.Equals("2302")) + { + //logger.Error("宝镜推送:"+mns); + } CSRedisCacheHelper.Publish("redis-power", mns); #endregion