|
@@ -40,18 +40,19 @@ public class HttpHelper : MonoBehaviour
|
|
|
|
|
|
void ChangeServerAddress()
|
|
|
{
|
|
|
- if (System.IO.File.Exists(Application.streamingAssetsPath + "/serverPath.json"))
|
|
|
- {
|
|
|
- string serverAddressContent = System.IO.File.ReadAllText(Application.streamingAssetsPath + "/serverPath.json");
|
|
|
- Debug.Log(serverAddressContent);
|
|
|
- DYServerAddress address = JsonConvert.DeserializeObject<DYServerAddress>(serverAddressContent);
|
|
|
- ServerAddress.YZTServerAddress = address.YZTServerAddress;
|
|
|
- ServerAddress.YZTServerPYAddress = address.YZTServerPYAddress;
|
|
|
- ServerAddress.Server_UploadPath = address.Server_UploadPath;
|
|
|
- ServerAddress.ModbusSeverAddress = address.ModbusSeverAddress;
|
|
|
- ServerAddress.ObsSeverAddress = address.ObsSeverAddress;
|
|
|
- ServerAddress.ObsSeverM3U8Address = address.ObsSeverM3U8Address;
|
|
|
- }
|
|
|
+ //if (System.IO.File.Exists(Application.streamingAssetsPath + "/serverPath.json"))
|
|
|
+ //{
|
|
|
+ // string serverAddressContent = System.IO.File.ReadAllText(Application.streamingAssetsPath + "/serverPath.json");
|
|
|
+ // Debug.Log(serverAddressContent);
|
|
|
+ // DYServerAddress address = JsonConvert.DeserializeObject<DYServerAddress>(serverAddressContent);
|
|
|
+ // ServerAddress.YZTServerAddress = address.YZTServerAddress;
|
|
|
+ // ServerAddress.YZTServerPYAddress = address.YZTServerPYAddress;
|
|
|
+ // ServerAddress.Server_UploadPath = address.Server_UploadPath;
|
|
|
+ // ServerAddress.ModbusSeverAddress = address.ModbusSeverAddress;
|
|
|
+ // ServerAddress.ObsSeverAddress = address.ObsSeverAddress;
|
|
|
+ // Debug.Log(ServerAddress.ObsSeverAddress);
|
|
|
+ // ServerAddress.ObsSeverM3U8Address = address.ObsSeverM3U8Address;
|
|
|
+ //}
|
|
|
}
|
|
|
|
|
|
|
|
@@ -489,6 +490,7 @@ public class HttpHelper : MonoBehaviour
|
|
|
{
|
|
|
bool successInternet = true;
|
|
|
string sendUrl = ServerAddress.API_GetDevicesInfo;
|
|
|
+ Debug.Log(ServerAddress.ObsSeverAddress);
|
|
|
sendUrl += "/34020000001180000001/channels?page=1&count=100";
|
|
|
Debug.Log(sendUrl);
|
|
|
UnityWebRequest requestData = UnityWebRequest.Get(sendUrl);
|
|
@@ -525,6 +527,7 @@ public class HttpHelper : MonoBehaviour
|
|
|
ObsData obsData = new ObsData();
|
|
|
string originName = serverObsDatas.list[i].name;
|
|
|
obsData.name = "补元-" + serverObsDatas.list[i].name;
|
|
|
+ //Debug.Log("111" + obsData.name);
|
|
|
if (GlobalData.obsCameraLib.TryGetValue(originName, out var value))
|
|
|
{
|
|
|
obsData.targetName = value;
|