Browse Source

适配yuanni

胡佳骏 1 year ago
parent
commit
0d2e66a5e3

+ 1 - 0
Assets/GHZScritps/AgoraVideoJo.cs

@@ -13,6 +13,7 @@ public class AgoraVideoJo : MonoBehaviour
     IEnumerator JoinChannel(float times)
     {
         yield return new WaitForSeconds(times);
+        if(DeviceType.type!="YuanNi")
         AgoraRTCManager.Instance.JoinChannel();
 
       //  AppManager.Instance.MeshPoint.SetActive(true);

+ 6 - 7
Assets/Studio/_4ShowScene/ConsoleFunctionModule/DlgScripts/ConsoleDlg.cs

@@ -127,7 +127,7 @@ namespace ShadowStudio.UI
             }
             yield return null;
 
-            if (DeviceType.type == "LeiNiao")
+            if (DeviceType.type == "LeiNiao"|| DeviceType.type == "YuanNi")
             {
                 VuforiaManagerSpace.Instance.Vuforia.gameObject.SetActive(false);
                 VuforiaManagerSpace.Instance.NoVuforia.gameObject.SetActive(true);
@@ -136,15 +136,14 @@ namespace ShadowStudio.UI
             {
                 VuforiaManagerSpace.Instance.NoVuforia.gameObject.SetActive(false);
                 VuforiaManagerSpace.Instance.Vuforia.gameObject.SetActive(true);
+                vufora_camera = VuforiaManagerSpace.Instance.VuforiaCamera;
+                InitScan();
 
             }
-            vufora_camera = VuforiaManagerSpace.Instance.VuforiaCamera;
-            InitScan();
         }
-
         private void InitScan()
         {
-            if (DeviceType.type == "Phone")
+            if (DeviceType.type == "Phone"|| DeviceType.type == "LeiNiao" || DeviceType.type == "YuanNi")
             {
             }
             else
@@ -158,7 +157,7 @@ namespace ShadowStudio.UI
 
         public void ClickOnScan()
         {
-            if(DeviceType.type== "Phone")
+            if(DeviceType.type== "Phone" || DeviceType.type == "LeiNiao" || DeviceType.type == "YuanNi")
             {
                 return;
             }
@@ -217,7 +216,7 @@ namespace ShadowStudio.UI
 
         public void CloseScan()
         {
-            if (DeviceType.type == "Phone")
+            if (DeviceType.type == "Phone" || DeviceType.type == "LeiNiao" || DeviceType.type == "YuanNi")
             { 
                 return;
             }