From cf8848457367b5eec0ff7610222dc81757a62bac Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 08 一月 2021 17:49:15 +0800
Subject: [PATCH] 2021-1-8-1
---
HDL_ON/Entity/Function/Function.cs | 76 ++++++++++++++++++++++++++++++++++---
1 files changed, 69 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index da3c490..a41d3d2 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -1,5 +1,7 @@
锘縰sing System;
using System.Collections.Generic;
+using HDL_ON.Common;
+using HDL_ON.DAL.Server;
using HDL_ON.DriverLayer;
using Shared;
@@ -191,7 +193,7 @@
/// <summary>
/// 浣跨敤娆℃暟
/// </summary>
- public double usageCount = 0;
+ public double controlCounter = 0;
/// <summary>
/// 浣跨敤棰戠巼
/// </summary>
@@ -199,13 +201,73 @@
{
get
{
- return usageCount / 7;
+ return controlCounter / 7;
}
}
/// <summary>
/// 鍥哄畾鐨勫簭鍙�
/// </summary>
public int fixedSerialNumber = int.MaxValue;
+
+ /// <summary>
+ /// 鏀惰棌鍔熻兘
+ /// </summary>
+ public void CollectFunction()
+ {
+ var result = "";
+ //var waitPage = new Loading();
+
+ new System.Threading.Thread(() =>
+ {
+ if (collect)
+ {
+ result = ApiUtlis.Ins.HttpRequest.CollectDevice(deviceId).Code;
+ }
+ else
+ {
+ result = ApiUtlis.Ins.HttpRequest.CancelCollectDevice(deviceId).Code;
+ }
+ //鎻愮ず閿欒
+ if (result != StateCode.SUCCESS)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ collect = !collect;
+ IMessageCommon.Current.ShowErrorInfoAlter(result);
+ });
+ }
+ })
+ { IsBackground = true }.Start();
+ }
+ /// <summary>
+ /// 缂栬緫鍔熻兘缁戝畾鎴块棿淇℃伅
+ /// </summary>
+ public void EditBindRoomInfo(string roomId)
+ {
+ var result = "";
+
+ new System.Threading.Thread(() =>
+ {
+ if (collect)
+ {
+ result = ApiUtlis.Ins.HttpRequest.BindDeviceToRoom(new List<string>() { deviceId }, new List<string>() { roomId }).Code;
+ }
+ else
+ {
+ result = ApiUtlis.Ins.HttpRequest.UnbindDeviceToRoom(deviceId,roomId);
+ }
+ //鎻愮ず閿欒
+ if (result != StateCode.SUCCESS)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ collect = !collect;
+ IMessageCommon.Current.ShowErrorInfoAlter(result);
+ });
+ }
+ })
+ { IsBackground = true }.Start();
+ }
public string GetBusId()
{
@@ -261,22 +323,22 @@
{
if (upSevser)
{
- var pm = new DAL.Server.HttpServerRequest();
+ var pm = new HttpServerRequest();
var pack = pm.UpdataDevcieInfo(this);
- if (pack.Code == DAL.Server.StateCode.SUCCESS)
+ if (pack.Code == StateCode.SUCCESS)
{
var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
- Common.FileUtlis.Files.WriteFileByBytes(savePath, ssd);
+ FileUtlis.Files.WriteFileByBytes(savePath, ssd);
}
else
{
- Utlis.ShowTip(Language.StringByID(StringId.EditFunctionInfoFail) + "\r\nCode:" + pack.Code);
+ IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
}
}
else
{
var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
- Common.FileUtlis.Files.WriteFileByBytes(savePath, ssd);
+ FileUtlis.Files.WriteFileByBytes(savePath, ssd);
}
}
--
Gitblit v1.8.0