changeset 41:0cd765be9693

update
author riono <e165729@ie.u-ryukyu.ac.jp>
date Tue, 25 May 2021 17:31:17 +0900
parents 7276e3429c99
children ce46626dddb1
files Test/RewritingTest/MessagepackTest.cs datagear/command/PutCommand.cs datagear/command/RemotePeedCommand.cs datagear/dg/DataGear.cs datagear/dg/MessagePackDataGear.cs
diffstat 5 files changed, 36 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/Test/RewritingTest/MessagepackTest.cs	Tue May 25 03:02:38 2021 +0900
+++ b/Test/RewritingTest/MessagepackTest.cs	Tue May 25 17:31:17 2021 +0900
@@ -1,4 +1,5 @@
 using System;
+using Christie_net.datagear;
 using Christie_net.datagear.dg;
 using MessagePack;
 
@@ -25,12 +26,31 @@
         message.foo = 10;
         message.data = MessagePackSerializer.Serialize(100);
 
-        byte[] bytes = MessagePackSerializer.Serialize(message);
-        MessagepackTest mes = MessagePackSerializer.Deserialize<MessagepackTest>(bytes);
+        SerializeObj<MessagepackTest> obj = new SerializeObj<MessagepackTest>();
+        byte[] slie = obj.SerializeFunc(message);
+
+        var desli = obj.DeserializeFunc(slie);
 
+        MessagepackTest test = (MessagepackTest) desli;
+        Console.WriteLine("varl;" + test.foo);
 
-        int data = MessagePackSerializer.Deserialize<int>(mes.data);
-        Console.WriteLine(data);
+        // byte[] bytes = MessagePackSerializer.Serialize(message);
+        // MessagepackTest mes = MessagePackSerializer.Deserialize<MessagepackTest>(bytes);
+        //
+        //
+        // int data = MessagePackSerializer.Deserialize<int>(mes.data);
+        //Console.WriteLine(data);
     }
  }
+
+public class SerializeObj <T> {
+    
+    public byte[] SerializeFunc(T data) {
+        return MessagePackSerializer.Serialize(data);
+    }
+
+    public object DeserializeFunc(byte[] data) {
+        return MessagePackSerializer.Deserialize<T>(data);
+    }
+}
 }
\ No newline at end of file
--- a/datagear/command/PutCommand.cs	Tue May 25 03:02:38 2021 +0900
+++ b/datagear/command/PutCommand.cs	Tue May 25 17:31:17 2021 +0900
@@ -5,7 +5,7 @@
 using MessagePack;
 
 namespace Christie_net.datagear.command {
-public class PutCommand : Command{
+public class PutCommand : Command {
     public PutCommand(CommandBuilder cb) : base(cb) {
         this.clazz = dg.GetClazz();
     }
@@ -26,7 +26,9 @@
             // stream.Write(dataSize);
             // stream.Write(data);
 
-            byte[] data = new MessagePackDataGear<object>(dg.GetData()).GetMessagePack();
+            var dgData = dg.GetData();
+            
+            byte[] data = new MessagePackDataGear<RTCommand>(dg.GetData() as RTCommand).GetMessagePack();
             byte[] command = MessagePackSerializer.Serialize(CreateRemoteMessage(data));
 
             // Debug
--- a/datagear/command/RemotePeedCommand.cs	Tue May 25 03:02:38 2021 +0900
+++ b/datagear/command/RemotePeedCommand.cs	Tue May 25 17:31:17 2021 +0900
@@ -1,7 +1,7 @@
 using System.IO;
 
 namespace Christie_net.datagear.command {
-public class RemotePeedCommand : Command{
+public class RemotePeedCommand : Command {
     public RemotePeedCommand(CommandBuilder cb) : base(cb) { }
 
     public override void Execute() {
--- a/datagear/dg/DataGear.cs	Tue May 25 03:02:38 2021 +0900
+++ b/datagear/dg/DataGear.cs	Tue May 25 17:31:17 2021 +0900
@@ -8,6 +8,8 @@
     public DataGear(T data) {
         SetClazz(data.GetType());
         SetData(data);
+        
+        Console.WriteLine("type:"  + data.GetType());
     }
 
     public DataGear(Type clazz) {
--- a/datagear/dg/MessagePackDataGear.cs	Tue May 25 03:02:38 2021 +0900
+++ b/datagear/dg/MessagePackDataGear.cs	Tue May 25 17:31:17 2021 +0900
@@ -1,4 +1,5 @@
 using System;
+using Christie_net.Test.Example.RemoteTake;
 using MessagePack;
 
 namespace Christie_net.datagear.dg {
@@ -14,6 +15,7 @@
     public MessagePackDataGear(Type clazz) : base(clazz) { }
 
     public MessagePackDataGear(byte[] messagePack, Type clazz) : base(clazz) {
+        Console.WriteLine("call");
         this.messagePack = messagePack;
     }
 
@@ -22,7 +24,9 @@
             return messagePack;
         try {
             // Debug
-            Console.WriteLine("data:" + data.GetType());
+            Console.WriteLine("data:" + data);
+            Console.WriteLine();
+            
             messagePack = MessagePackSerializer.Serialize(data);
            
             SetDataSize(messagePack.Length);