Boonlive_RD_Web/Web_CRICS_Server_VS2010_Prod
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TCL电子猫眼

Browse Source
This commit is contained in:
TianMaiCheng
2026-02-27 15:53:42 +08:00
parent 6196311cb7
commit 10e3a135dd
12 changed files with 128 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WebSite/Controllers/HostController.cs
View File

@@ -1185,6 +1185,8 @@ namespace WebSite.Controllers
host_take.DisableStartTime = entity.DisableStartTime;
host_take.DisableEndTime = entity.DisableEndTime;
host_take.IsWelcomeDisableTime = entity.IsWelcomeDisableTime;
host_take.EBell_RSTP = entity.EBell_RSTP;
host_take.EBell_TV_duration = entity.EBell_TV_duration;
}
//天猫的发现设备

55
WebSite/Controllers/IoTController.cs
View File

@@ -47,16 +47,20 @@ namespace WebSite.Controllers
/// <returns></returns>
private bool CheckGetPower(Host host)
{
bool JieGuo = false;
bool Result = BBB(host);
try
{
string KKK1 = CacheKey.TakeCardOnLine + "_" + host.HostNumber;
CommonEntity.DataTongJi.MTakeCardData Chaka = CSRedisCacheHelper.Get_Partition<CommonEntity.DataTongJi.MTakeCardData>(KKK1, 5);
byte isChaKa = 0x02;
if (Chaka != null)
{
string KeyFilter1 = "NEWDiff";
string KeyFilter2 = "OLDDiff";
isChaKa = Chaka.Status;
if (Chaka.Status == 0x01 && Result == false)
{
RCUHost.RCUHostCommon.tools.LanJieData(KeyFilter1, host.SysHotel.Code);
@@ -67,18 +71,25 @@ namespace WebSite.Controllers
RCUHost.RCUHostCommon.tools.LanJieData(KeyFilter2, host.SysHotel.Code);
}
Result = Result || Chaka.Status == 0x01;
if (Result == true)
{
return true;
}
}
bool NewResult = Result || Chaka.Status == 0x01;
if (NewResult == true)
{
JieGuo = true;
return true;
}
else
{
JieGuo = false;
return false;
}
}
catch (Exception ex)
{
JieGuo = false;
logger.Error("取电数据不同" + ex.Message);
}
return Result;
return JieGuo;
}
public static bool BBB(Host host)
{
@@ -7433,7 +7444,7 @@ namespace WebSite.Controllers
{
var action = item.action;
var name = item.applianceName;
//var area = item.area;
var area = item.area;
List<HostModal> q1 = new List<HostModal>();
if (name.Equals("灯"))
{
@@ -7441,10 +7452,10 @@ namespace WebSite.Controllers
}
else
{
//if (!string.IsNullOrEmpty(area))
//{
// name = area+ name;
//}
if (!string.IsNullOrEmpty(area))
{
name = area + name;
}
q1 = hostModals.Where(A => A.Modal.Name.Equals(name) || A.Modal.AliasName.Equals(name)).ToList();
}
if (q1 != null && q1.Count > 0)
@@ -7478,12 +7489,12 @@ namespace WebSite.Controllers
{
var action = item.action;
var name = item.applianceName;
//var area = item.area;
var area = item.area;
var value = item.value;
//if (!string.IsNullOrEmpty(area))
//{
// name = area + name;
//}
if (!string.IsNullOrEmpty(area))
{
name = area + name;
}
var q1 = hostModals.Where(A => A.Modal.Type == DeviceType.AirConditioner && (A.Modal.Name.Equals(name) || A.Modal.AliasName.Equals(name)));
foreach (var item_inter in q1)
@@ -7564,12 +7575,12 @@ namespace WebSite.Controllers
{
var action = item.action;
var name = item.applianceName;
//var area = item.area;
var area = item.area;
int hid = int.Parse(hotelid);
//if (!string.IsNullOrEmpty(area))
//{
// name = area + name;
//}
if (!string.IsNullOrEmpty(area))
{
name = area + name;
}
var scene = RoomTypeSceneManager.LoadAll().Where(A => A.HotelID == hid && A.Name.Equals(name)).FirstOrDefault();
if (scene != null)
{
@@ -7623,7 +7634,7 @@ namespace WebSite.Controllers
public string action { get; set; }
public string applianceName { get; set; }
public string value { get; set; }
//public string area { get; set; }
public string area { get; set; }
}
public class TV_ResponseData
{

2
WebSite/Controllers/SysHotelController.cs
View File

@@ -351,6 +351,8 @@ namespace WebSite.Controllers
{
Host TakeOut = null;
string HostNumberOnly = item.HostNumber;
string XiaoDuKongZhiKey = CacheKey.XiaoDuYuYin + "_" + item.XiaoDuCUID;
HttpContext.Cache.Remove(XiaoDuKongZhiKey);
string Key = CacheKey.HostInfo_Key_HostNumber + "_" + HostNumberOnly;
object obj = MemoryCacheHelper.Get(Key);
if (obj != null)

30
WebSite/Views/Host/SmartVoiceBinding.ascx
View File

@@ -133,5 +133,35 @@
labelposition="left" value="<%= Model.DisableEndTime %>" />
</td>
</tr>
<tr>
<th>
<label for="idebell_rtsp">
电子门铃视频流地址：</label>
</th>
<td colspan="3">
<input id="idebell_rtsp" name="EBell_RSTP" class="easyui-validatebox textbox text"
data-options="validType:length[0,300]" value="<%: Model.EBell_RSTP %>" style="width: 416px;" />
</td>
</tr>
<tr>
<%--<td></td>--%>
<td colspan="4">
<label style="color: #808080;">
e.g. rtsp://192.168.1.115:554/user=admin&password=&channel=1&stream=0.sdp?
</label>
</td>
</tr>
<tr>
<th>
<label for="id_ebell_displaytime">
门铃视频显示时间：</label>
</th>
<td colspan="2">
<input id="id_ebell_displaytime" name="EBell_TV_duration" class="easyui-validatebox textbox text"
value="<%: Model.EBell_TV_duration %>" style="width: 100px;" />毫秒
</td>
</tr>
</table>
</form>