Browse Source

фикс теста картинки

Rimmon 5 years ago
parent
commit
cff20b0d62
1 changed files with 18 additions and 18 deletions
  1. 18 18
      Assets/Scripts/Net/Client.cs

+ 18 - 18
Assets/Scripts/Net/Client.cs

@@ -913,11 +913,11 @@ public class Client : MonoBehaviour
     public void ImageSend(byte[] bdata)
     {
         MemoryStream ms = new MemoryStream();              
-        ms.WriteByte((byte)ImageCMD.streamStop);
-        BinaryWriter bw = new BinaryWriter(ms);
-        bw.Write(1);
+        ms.WriteByte((byte)ImageCMD.receiveImage);
+        //BinaryWriter bw = new BinaryWriter(ms);
+        //bw.Write(1);
 
-        //ms.Write(bdata, 0, bdata.Length);
+        ms.Write(bdata, 0, bdata.Length);
         //Debug.Log("imagesend bytes "+ms.ToArray().Length);
         var data = ConstructVariablePacket(55, ms.ToArray());
         SendEnqueue(data);
@@ -941,7 +941,7 @@ public class Client : MonoBehaviour
             //{
         if (GUI.Button(new Rect(250, 280, 160, 64), "Start Stream Image!"))
         {
-            ImageStreamStartSend(4);
+            //ImageStreamStartSend(4);
             //var rawimg = GameObject.Find("UserRawImage");
             //if (rawimg != null)
             //{
@@ -966,22 +966,22 @@ public class Client : MonoBehaviour
             ////var rawimg = GameObject.Find("RawImage");
             //if (rawimg != null)
             //{
-            //print("rawimg not null");
-            //var testimg = (Texture2D)Resources.Load("Image/photo_2020-04-15_15-40-54.jpg", typeof(Texture2D));
-            //FileStream fs = File.Open("test" + filesaved + ".jpg", FileMode.CreateNew);
-            //fs.Write(newbuf, 0, newbuf.Length);
-            //print("fbytes1 ");
-            //var fbytes = File.ReadAllBytes("Assets/Resources/Image/photo_2020-04-15_15-40-54.jpg");
-            //print("fbytes " + fbytes.Length);
-            //ImageSend(fbytes);
-            //    rawimg.GetComponent<RawImage>().material.mainTexture = testimg;
+            //    print("rawimg not null");
+                //var testimg = (Texture2D)Resources.Load("Image/photo_2020-04-15_15-40-54.jpg", typeof(Texture2D));
+                //FileStream fs = File.Open("test" + filesaved + ".jpg", FileMode.CreateNew);
+                //fs.Write(newbuf, 0, newbuf.Length);
+                //print("fbytes1 ");
+                var fbytes = File.ReadAllBytes("Assets/Resources/Image/photo_2020-04-15_15-40-54.jpg");
+                print("fbytes " + fbytes.Length);
+                ImageSend(fbytes);
+                //rawimg.GetComponent<RawImage>().material.mainTexture = testimg;
 
-            //    }
-            //    //       Zone.LoadByLocationId(22);
-            //    //Wall.LoadWallsByLocationId(1);
-            //    //Wall.SaveAll();
             //}
+            //       Zone.LoadByLocationId(22);
+            //Wall.LoadWallsByLocationId(1);
+            //Wall.SaveAll();
         }
+    
     }
     #endregion
 }