Skip to content

Commit 10b7801

Browse files
committed
Новый релиз
1 parent 4c51da2 commit 10b7801

163 files changed

Lines changed: 5166 additions & 6449 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

OneScriptClientServer/OneScriptClientServer/BoolMessage.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
11
using ScriptEngine.Machine.Contexts;
2+
using Hik.Communication.Scs.Communication.Messages;
23

34
namespace oscs
45
{
56
public class BoolMessage
67
{
78
public CsBoolMessage dll_obj;
8-
public Hik.Communication.Scs.Communication.Messages.ScsBoolMessage M_BoolMessage;
9+
public ScsBoolMessage M_BoolMessage;
910

1011
public BoolMessage()
1112
{
12-
M_BoolMessage = new Hik.Communication.Scs.Communication.Messages.ScsBoolMessage();
13+
M_BoolMessage = new ScsBoolMessage();
1314
}
1415

15-
public BoolMessage(Hik.Communication.Scs.Communication.Messages.ScsBoolMessage p1)
16+
public BoolMessage(ScsBoolMessage p1)
1617
{
1718
M_BoolMessage = p1;
1819
}
1920

2021
public BoolMessage(System.Boolean p1)
2122
{
22-
M_BoolMessage = new Hik.Communication.Scs.Communication.Messages.ScsBoolMessage(p1);
23+
M_BoolMessage = new ScsBoolMessage(p1);
2324
}
2425

2526
public System.Boolean BoolVal
@@ -28,7 +29,7 @@ public System.Boolean BoolVal
2829
set { M_BoolMessage.BoolVal = value; }
2930
}
3031

31-
public Hik.Communication.Scs.Communication.Messages.ScsBoolMessage M_Obj
32+
public ScsBoolMessage M_Obj
3233
{
3334
get { return M_BoolMessage; }
3435
}
@@ -82,6 +83,5 @@ public string MessageId
8283
{
8384
get { return Base_obj.MessageId; }
8485
}
85-
8686
}
8787
}

OneScriptClientServer/OneScriptClientServer/ByteMessage.cs

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
using ScriptEngine.Machine.Contexts;
2+
using ScriptEngine.HostedScript.Library.Binary;
3+
using Hik.Communication.Scs.Communication.Messages;
24

35
namespace oscs
46
{
57
public class ByteMessage
68
{
79
public CsByteMessage dll_obj;
8-
public Hik.Communication.Scs.Communication.Messages.ScsRawDataMessage M_ByteMessage;
10+
public ScsRawDataMessage M_ByteMessage;
911

1012
public ByteMessage(byte[] p1 = null)
1113
{
12-
M_ByteMessage = new Hik.Communication.Scs.Communication.Messages.ScsRawDataMessage(p1);
14+
M_ByteMessage = new ScsRawDataMessage(p1);
1315
}
1416

15-
public ByteMessage(Hik.Communication.Scs.Communication.Messages.ScsRawDataMessage p1)
17+
public ByteMessage(ScsRawDataMessage p1)
1618
{
1719
M_ByteMessage = p1;
1820
}
1921

20-
public Hik.Communication.Scs.Communication.Messages.ScsRawDataMessage M_Obj
22+
public ScsRawDataMessage M_Obj
2123
{
2224
get { return M_ByteMessage; }
2325
}
@@ -42,7 +44,7 @@ public string RepliedMessageId
4244
[ContextClass ("КсСообщениеБайты", "CsByteMessage")]
4345
public class CsByteMessage : AutoContext<CsByteMessage>
4446
{
45-
public CsByteMessage(ScriptEngine.HostedScript.Library.Binary.BinaryDataContext p1)
47+
public CsByteMessage(BinaryDataContext p1)
4648
{
4749
ByteMessage ByteMessage1 = new ByteMessage();
4850
ByteMessage1.dll_obj = this;
@@ -57,7 +59,7 @@ public CsByteMessage()
5759
Base_obj = ByteMessage1;
5860
}
5961

60-
public CsByteMessage(oscs.ByteMessage p1)
62+
public CsByteMessage(ByteMessage p1)
6163
{
6264
ByteMessage ByteMessage1 = p1;
6365
ByteMessage1.dll_obj = this;
@@ -67,17 +69,16 @@ public CsByteMessage(oscs.ByteMessage p1)
6769
public ByteMessage Base_obj;
6870

6971
[ContextProperty("Данные", "MessageData")]
70-
public ScriptEngine.HostedScript.Library.Binary.BinaryDataContext MessageData
72+
public BinaryDataContext MessageData
7173
{
72-
get { return new ScriptEngine.HostedScript.Library.Binary.BinaryDataContext(Base_obj.MessageData); }
73-
set { Base_obj.MessageData = ((ScriptEngine.HostedScript.Library.Binary.BinaryDataContext)value).Buffer; }
74+
get { return new BinaryDataContext(Base_obj.MessageData); }
75+
set { Base_obj.MessageData = ((BinaryDataContext)value).Buffer; }
7476
}
7577

7678
[ContextProperty("Идентификатор", "MessageId")]
7779
public string MessageId
7880
{
7981
get { return Base_obj.MessageId; }
8082
}
81-
8283
}
8384
}
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
using System;
2+
using ScriptEngine.Machine;
3+
using ScriptEngine.Machine.Contexts;
4+
using ScriptEngine.HostedScript.Library;
5+
using ScriptEngine.HostedScript.Library.Binary;
6+
using System.Collections.Generic;
7+
8+
namespace oscs
9+
{
10+
[Serializable]
11+
public class ClientInfo
12+
{
13+
public string ClientGuid { get; set; }
14+
public string ClientName { get; set; }
15+
public oscs.Collection Tag { get; set; }
16+
17+
public ClientInfo(string p1, string p2, oscs.Collection p3)
18+
{
19+
ClientGuid = p1;
20+
ClientName = p2;
21+
Tag = p3;
22+
}
23+
}
24+
25+
[ContextClass("КсИнформацияКлиента", "CsClientInfo")]
26+
public class CsClientInfo : AutoContext<CsClientInfo>
27+
{
28+
private oscs.Collection tag;
29+
30+
public CsClientInfo(string clientGuid, string clientName, oscs.Collection collection)
31+
{
32+
ClientInfo ClientInfo1 = new ClientInfo(clientGuid, clientName, collection);
33+
ClientGuid = clientGuid;
34+
ClientName = clientName;
35+
tag = new oscs.Collection(collection);
36+
}
37+
38+
[ContextProperty("ГуидКлиента", "ClientGuid")]
39+
public string ClientGuid { get; set; }
40+
41+
[ContextProperty("ИмяКлиента", "ClientName")]
42+
public string ClientName { get; set; }
43+
44+
[ContextProperty("Метка", "Tag")]
45+
public StructureImpl Tag
46+
{
47+
get
48+
{
49+
StructureImpl StructureImpl1 = new StructureImpl();
50+
foreach (KeyValuePair<string, object> DictionaryEntry in tag)
51+
{
52+
if (DictionaryEntry.Value.GetType() == typeof(System.Byte[]))
53+
{
54+
StructureImpl1.Insert(DictionaryEntry.Key, new BinaryDataContext((System.Byte[])DictionaryEntry.Value));
55+
}
56+
else
57+
{
58+
StructureImpl1.Insert(DictionaryEntry.Key, ValueFactory.Create((dynamic)DictionaryEntry.Value));
59+
}
60+
}
61+
return StructureImpl1;
62+
}
63+
}
64+
}
65+
}
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
using System;
2+
using System.Collections.Generic;
3+
4+
namespace oscs
5+
{
6+
[Serializable]
7+
public class Collection
8+
{
9+
private Dictionary<string, object> M_Collection;
10+
11+
public Collection()
12+
{
13+
M_Collection = new Dictionary<string, object>();
14+
}
15+
16+
public Collection(Dictionary<string, object> p1)
17+
{
18+
M_Collection = p1;
19+
}
20+
21+
public Collection(oscs.Collection p1)
22+
{
23+
M_Collection = p1.M_Collection;
24+
}
25+
26+
public int Count
27+
{
28+
get
29+
{
30+
int count = 0;
31+
foreach (KeyValuePair<string, object> DictionaryEntry in M_Collection)
32+
{
33+
count = count + 1;
34+
}
35+
return count;
36+
}
37+
}
38+
39+
public object this[string index]
40+
{
41+
get { return M_Collection[index]; }
42+
}
43+
44+
public System.Collections.IEnumerator GetEnumerator()
45+
{
46+
return M_Collection.GetEnumerator();
47+
}
48+
49+
public void Add(string key, object item)
50+
{
51+
M_Collection.Add(key, item);
52+
}
53+
54+
public void Remove(string index)
55+
{
56+
M_Collection.Remove(index);
57+
}
58+
}
59+
}

OneScriptClientServer/OneScriptClientServer/DateTimeMessage.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
11
using System;
22
using ScriptEngine.Machine.Contexts;
3+
using Hik.Communication.Scs.Communication.Messages;
34

45
namespace oscs
56
{
67
public class DateTimeMessage
78
{
89
public CsDateTimeMessage dll_obj;
9-
public Hik.Communication.Scs.Communication.Messages.ScsDateTimeMessage M_DateTimeMessage;
10+
public ScsDateTimeMessage M_DateTimeMessage;
1011

1112
public DateTimeMessage()
1213
{
13-
M_DateTimeMessage = new Hik.Communication.Scs.Communication.Messages.ScsDateTimeMessage();
14+
M_DateTimeMessage = new ScsDateTimeMessage();
1415
}
1516

1617
public DateTimeMessage(DateTime p1)
1718
{
18-
M_DateTimeMessage = new Hik.Communication.Scs.Communication.Messages.ScsDateTimeMessage(p1);
19+
M_DateTimeMessage = new ScsDateTimeMessage(p1);
1920
}
2021

21-
public DateTimeMessage(Hik.Communication.Scs.Communication.Messages.ScsDateTimeMessage p1)
22+
public DateTimeMessage(ScsDateTimeMessage p1)
2223
{
2324
M_DateTimeMessage = p1;
2425
}
@@ -29,7 +30,7 @@ public DateTime DateVal
2930
set { M_DateTimeMessage.DateVal = value; }
3031
}
3132

32-
public Hik.Communication.Scs.Communication.Messages.ScsDateTimeMessage M_Obj
33+
public ScsDateTimeMessage M_Obj
3334
{
3435
get { return M_DateTimeMessage; }
3536
}
@@ -83,6 +84,5 @@ public string MessageId
8384
{
8485
get { return Base_obj.MessageId; }
8586
}
86-
8787
}
8888
}
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
using ScriptEngine.Machine.Contexts;
2+
using ScriptEngine.Machine;
3+
using ScriptEngine.HostedScript.Library;
4+
5+
namespace oscs
6+
{
7+
public class DoAtClientArgs : oscs.EventArgs
8+
{
9+
public new CsDoAtClientArgs dll_obj;
10+
private string methodName;
11+
private ArrayImpl parametersArray;
12+
13+
public DoAtClientArgs(string p1, ArrayImpl p2)
14+
{
15+
methodName = p1;
16+
parametersArray = p2;
17+
}
18+
19+
public string MethodName
20+
{
21+
get { return methodName; }
22+
set { methodName = value; }
23+
}
24+
25+
public ArrayImpl ParametersArray
26+
{
27+
get { return parametersArray; }
28+
set { parametersArray = value; }
29+
}
30+
}
31+
32+
[ContextClass ("КсВыполнитьНаКлиентеАрг", "CsDoAtClientArgs")]
33+
public class CsDoAtClientArgs : AutoContext<CsDoAtClientArgs>
34+
{
35+
public CsDoAtClientArgs(DoAtClientArgs p1)
36+
{
37+
DoAtClientArgs DoAtClientArgs1 = p1;
38+
DoAtClientArgs1.dll_obj = this;
39+
Base_obj = DoAtClientArgs1;
40+
}
41+
42+
public DoAtClientArgs Base_obj;
43+
44+
[ContextProperty("Действие", "EventAction")]
45+
public DelegateAction EventAction
46+
{
47+
get { return Base_obj.EventAction; }
48+
set { Base_obj.EventAction = value; }
49+
}
50+
51+
[ContextProperty("ИмяМетода", "MethodName")]
52+
public string MethodName
53+
{
54+
get { return Base_obj.MethodName; }
55+
}
56+
57+
[ContextProperty("МассивПараметров", "ParametersArray")]
58+
public ArrayImpl ParametersArray
59+
{
60+
get { return Base_obj.ParametersArray; }
61+
}
62+
63+
[ContextProperty("Отправитель", "Sender")]
64+
public IValue Sender
65+
{
66+
get { return Base_obj.Sender.dll_obj; }
67+
}
68+
}
69+
}

0 commit comments

Comments
 (0)