Remote Assist

Assets/Scenes/Player.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.4465782, g: 0.49641252, b: 0.5748167, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -15914,9 +15914,9 @@ RectTransform:
   m_Father: {fileID: 7150456489567944649}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 130, y: 60}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: 130, y: 190}
   m_SizeDelta: {x: 100, y: 50}
   m_Pivot: {x: 1, y: 1}
 --- !u!114 &671366626
@@ -45413,9 +45413,9 @@ RectTransform:
   m_Father: {fileID: 7150456489567944649}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 480, y: 190}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: 130, y: 255}
   m_SizeDelta: {x: 100, y: 50}
   m_Pivot: {x: 1, y: 1}
 --- !u!114 &1836445052
@@ -57023,8 +57023,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -30, y: -9}
-  m_SizeDelta: {x: 100, y: 40}
+  m_AnchoredPosition: {x: -5, y: -105.1}
+  m_SizeDelta: {x: 99, y: 40}
   m_Pivot: {x: 1, y: 1}
 --- !u!114 &7150456487918508353
 MonoBehaviour:
@@ -57219,7 +57219,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &7150456488041873546
 RectTransform:
   m_ObjectHideFlags: 0
@@ -57422,7 +57422,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 228.79694}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0}
 --- !u!114 &7150456488086696777
 MonoBehaviour:
@@ -57489,7 +57489,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!1 &7150456488098416274
 GameObject:
   m_ObjectHideFlags: 0
@@ -57524,9 +57524,9 @@ RectTransform:
   m_Father: {fileID: 7150456489567944649}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 130, y: -120}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: 130, y: 10}
   m_SizeDelta: {x: 100, y: 50}
   m_Pivot: {x: 1, y: 0}
 --- !u!114 &7150456488098416276
@@ -58144,9 +58144,9 @@ RectTransform:
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 1089, y: 590}
+  m_SizeDelta: {x: -10, y: 0}
   m_Pivot: {x: 0, y: 0}
 --- !u!114 &7150456488228975560
 MonoBehaviour:
@@ -59208,7 +59208,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &7150456488924132819
 RectTransform:
   m_ObjectHideFlags: 0
@@ -60536,7 +60536,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &7150456489398360863
 RectTransform:
   m_ObjectHideFlags: 0
@@ -60968,7 +60968,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &7150456489567944649
 RectTransform:
   m_ObjectHideFlags: 0
@@ -60989,9 +60989,9 @@ RectTransform:
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 5, y: 5}
-  m_SizeDelta: {x: 700, y: 130}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -18, y: 5}
+  m_SizeDelta: {x: -334, y: -534}
   m_Pivot: {x: 0, y: 0}
 --- !u!114 &7150456489567944650
 MonoBehaviour:
@@ -61365,9 +61365,9 @@ RectTransform:
   m_Father: {fileID: 7150456489567944649}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 130, y: -5}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: 130, y: 125}
   m_SizeDelta: {x: 100, y: 50}
   m_Pivot: {x: 1, y: 1}
 --- !u!114 &7150456489654599155
@@ -62508,7 +62508,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &7150456490016195676
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Scripts/Net/Client.cs

@@ -10,11 +10,10 @@ using System;
 using System.IO;
 using UnityEngine.UI;
 public enum RemoteAssistCMD { videoCallRequest, callStop, audioCallRequest, messageSend, imageSend, SMOPP_TASK_INFO };
+public enum ImageCMD { receiveImage, streamStart, streamStop, receiveVideo, pause, unpause };
 public class Client : MonoBehaviour
 {
-    const byte PING_PACKET = 30;
-
-    enum ImageCMD { receiveImage, streamStart, streamStop, receiveImageRemoteAssist };
+    const byte PING_PACKET = 30;      
     
     Texture2D textureReceived;
     public GameObject UserInfo;
@@ -1016,8 +1015,21 @@ public class Client : MonoBehaviour
         SendEnqueue(data);
     }
 
+    public static void ImageStreamControlCommandSend(uint accid, ImageCMD cmd)
+    {
+        MemoryStream ms = new MemoryStream();
+        ms.WriteByte((byte) cmd);
+        BinaryWriter bw = new BinaryWriter(ms);
+        bw.Write(accid);
+        //ms.Write(bdata, 0, bdata.Length);
+        //Debug.Log("imagesend bytes "+ms.ToArray().Length);
+        var data = ConstructVariablePacket(55, ms.ToArray());
+        SendEnqueue(data);
+    }
+
     public void ImageSend(byte[] bdata, uint targetAccountId)
     {
+        print("ImageSend " + targetAccountId);
         MemoryStream ms = new MemoryStream();              
         ms.WriteByte((byte)ImageCMD.receiveImage);
         ms.Write(BitConverter.GetBytes(targetAccountId), 0, 4);

Assets/Scripts/RemoteAssist/RemoteClickAction.cs

@@ -230,7 +230,7 @@ public class RemoteClickAction : MonoBehaviour, IVideoCallSession
         drawToolsCanvas_.SetActive(true);
         drawCanvas_.SetActive(true);
         state_ = STATE.DRAWING;
-        Client.instance.ImageStreamStopSend(SessionCallerId);
+        Client.ImageStreamControlCommandSend(SessionCallerId, ImageCMD.pause);
     }
     public void OnHangup()
     {
@@ -315,7 +315,7 @@ public class RemoteClickAction : MonoBehaviour, IVideoCallSession
         m2Texture.Apply();
 
         byte[] compress = m2Texture.EncodeToJPG(90);
-        File.WriteAllBytes("test.jpg", compress);
+        //File.WriteAllBytes("test.jpg", compress);
 
         if (session_ != null)
         {