Browse Source

更新 向控制台发送邀请 , 获取设备唯一标识

DGJ 1 year ago
parent
commit
99318f074c

+ 1 - 0
Assets/LangChaoRTC/Plugins/Android/AndroidManifest.xml

@@ -15,6 +15,7 @@
     </application>
 
   <uses-permission android:name="android.permission.RECORD_AUDIO" />
+  <uses-permission android:name="android.permission.READ_PHONE_STATE" />
   <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
   <uses-permission android:name="android.permission.WRITE_SETTINGS"
           tools:ignore="ProtectedPermissions" />

+ 21 - 7
Assets/Scenes/LangChaoDemo2.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44402242, g: 0.49316543, b: 0.5722324, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -1729,7 +1729,6 @@ Transform:
   - {fileID: 284870649}
   - {fileID: 855958479}
   - {fileID: 972518865}
-  - {fileID: 1564295168}
   - {fileID: 1677004746}
   m_Father: {fileID: 0}
   m_RootOrder: 1
@@ -5981,7 +5980,7 @@ GameObject:
   - component: {fileID: 480063034}
   - component: {fileID: 480063033}
   m_Layer: 0
-  m_Name: SceneTag (1)
+  m_Name: SceneTag
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -7727,6 +7726,7 @@ GameObject:
   - component: {fileID: 587736017}
   - component: {fileID: 587736016}
   - component: {fileID: 587736020}
+  - component: {fileID: 587736021}
   m_Layer: 5
   m_Name: Canvas
   m_TagString: Untagged
@@ -7834,6 +7834,18 @@ MonoBehaviour:
   text1: {fileID: 1512136079}
   text2: {fileID: 87624463}
   text3: {fileID: 469901235}
+--- !u!114 &587736021
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 587736014}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5bb9db1dc91e60b48b2ba5b39613dd69, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &593984218
 GameObject:
   m_ObjectHideFlags: 0
@@ -20696,6 +20708,7 @@ MonoBehaviour:
   username: u@unity3
   password: 
   rid: mqttx_b4c02ddc
+  clientId: 
   account: 
   roomId: 
   email: 
@@ -21850,12 +21863,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1564295166}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 1.9853742, y: 1.2190526, z: 2.1616204}
+  m_LocalPosition: {x: 1.9853742, y: 1.2190526, z: 1.8616204}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 102144601}
-  m_RootOrder: 4
+  m_Father: {fileID: 973110132107938479}
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1564295169
 MonoBehaviour:
@@ -22599,7 +22612,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 102144601}
-  m_RootOrder: 5
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1677450786
 GameObject:
@@ -28496,6 +28509,7 @@ RectTransform:
   - {fileID: 1016915733}
   - {fileID: 6973250901236105079}
   - {fileID: 886478843}
+  - {fileID: 1564295168}
   m_Father: {fileID: 1322676406}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

+ 3 - 3
Assets/Scripts/MQTT/MQTTManager.cs

@@ -168,8 +168,8 @@ public class MQTTManager : MonoSingleton<MQTTManager>,IController
 
                 if(obj["control"] !=null)
                 {
-                    string phone = obj["control"]["phone"].ToString();
-                    RTCRoomManager.Instance.controlPhone = phone;
+                    string id = obj["control"]["id"].ToString();
+                    RTCRoomManager.Instance.controlId = id;
                    
                     if(RTCRoomManager.Instance.rtcState != RTCEnum.OFF) // 当前已经在房间内 直接发送当前房间号
                     {
@@ -183,7 +183,7 @@ public class MQTTManager : MonoSingleton<MQTTManager>,IController
                         data["personnel"]["room"] = MQTTManager.Instance.room;
                         data["personnel"]["phone"] = MQTTManager.Instance.phone;
                         // 用MQTT 向中考发送邀请
-                        MQTTManager.Instance.PushMsg(MQTTManager.Instance.front + "online/" + phone, data.ToJson());
+                        MQTTManager.Instance.PushMsg(MQTTManager.Instance.front + "online/" + id, data.ToJson());
                     }
                     else // 不在房间内,创建房间后 发送邀请
                     {

+ 1 - 1
Assets/Scripts/RTC/GHZRTCCamera.cs

@@ -13,7 +13,7 @@ public class GHZRTCCamera : MonoSingleton<GHZRTCCamera>
 
         if(cam.fieldOfView>34)
         {
-            UILogManager.Instance.text3.text = cam.fieldOfView.ToString();
+        //    UILogManager.Instance.text3.text = cam.fieldOfView.ToString();
             cam.fieldOfView = 34;
         }
     }

+ 4 - 7
Assets/Scripts/RTC/RTCRoomManager.cs

@@ -19,7 +19,7 @@ public class RTCRoomManager : MonoSingleton<RTCRoomManager>, IController
 
     public RTCEnum rtcState;
 
-    public string controlPhone;
+    public string controlId;
 
     public JObject expertData;
     public JObject controlData;
@@ -112,7 +112,7 @@ public class RTCRoomManager : MonoSingleton<RTCRoomManager>, IController
             obj["personnel"]["room"] = MQTTManager.Instance.room;
             obj["personnel"]["phone"] = MQTTManager.Instance.phone;
             // 用MQTT 向中考发送邀请
-            MQTTManager.Instance.PushMsg(MQTTManager.Instance.front + "online/" + controlPhone, obj.ToJson());
+            MQTTManager.Instance.PushMsg(MQTTManager.Instance.front + "online/" + controlId, obj.ToJson());
 
         }
       
@@ -122,7 +122,7 @@ public class RTCRoomManager : MonoSingleton<RTCRoomManager>, IController
             JsonData data = new JsonData();
             data["roomId"] = mRTCRoomInfo.roomId.ToString();
             data["questionCategory"] = (int)question;
-
+            data["deviceUniqueId"] = SystemInfo.deviceUniqueIdentifier;
             Debug.Log("DGJ   =====>  " + data.ToJson());
 
             StartCoroutine(HttpTool.Instance.SendHttp(HttpActionLang.apply, data.ToJson(), message =>
@@ -137,9 +137,6 @@ public class RTCRoomManager : MonoSingleton<RTCRoomManager>, IController
                 }
             }));
         }
-       
-
-       
 
     }
     public void ExpertJonin(string identity)
@@ -315,7 +312,7 @@ public class RTCRoomManager : MonoSingleton<RTCRoomManager>, IController
     {
         expertView = null;
         mRTCRoomInfo = null;
-        controlPhone = "";
+        controlId = "";
       //  question = QuestionEnum.NetWork;
         expertData = null;
         controlData = null;

+ 49 - 0
Assets/Scripts/Tool/GetAndroidSNIEMI.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class GetAndroidSNIEMI : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+
+     
+
+        //AndroidJavaObject tm = new AndroidJavaObject("android.telephony.TelephonyManager");
+        //string imei = tm.Call<string>("getDeviceId");
+        //Debug.Log("IMEI: " + imei);
+        //  UILogManager.Instance.text3.text += tm;
+    
+        //AndroidJavaObject jo = new AndroidJavaObject("android.os.Build");
+        //string serial = jo.GetStatic<string>("SERIAL");
+        //Debug.Log("±¾»úµÄSNÂëΪ:" + serial);
+       // UILogManager.Instance.text3.text = serial;
+
+       
+
+     
+
+     
+
+      
+    }
+
+
+    float times = 11995;
+
+    // Update is called once per frame
+    void Update()
+    {
+        times += Time.deltaTime;
+        if (times>12000)
+        {
+            times = 0;
+            string androidID = SystemInfo.deviceUniqueIdentifier;
+            Debug.Log("Android ID: " + androidID);
+            UILogManager.Instance.text3.text = androidID;
+        }
+        
+    }
+}

+ 11 - 0
Assets/Scripts/Tool/GetAndroidSNIEMI.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5bb9db1dc91e60b48b2ba5b39613dd69
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: