chenxiangxue
/
FuZhou_Custom_BulkCargo_3D
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: chenxiangxue:e9dfdbceba0829fd0245a8aa20f000ec88e03895
Branches Tags
chenxiangxue:master
chenxiangxue:backup_6.26
..
compare: chenxiangxue:beff5a816e7cbb1d8886d01d66c32e1ba05fc7c4
Branches Tags
chenxiangxue:master
chenxiangxue:backup_6.26

No commits in common. "e9dfdbceba0829fd0245a8aa20f000ec88e03895" and "beff5a816e7cbb1d8886d01d66c32e1ba05fc7c4" have entirely different histories.
e9dfdbceba ... beff5a816e

2 changed files with 54 additions and 136 deletions
Show Stats Expand all files Collapse all files

187
BulkCargo_UnityProject/Assets/Fonts/UIFont/SourceHanSansCN-Regular SDF.asset
View File

File diff suppressed because one or more lines are too long

3
BulkCargo_UnityProject/Assets/Scripts/wj/Table&Chart/VideoPage/VideoWebPage.cs
View File

@ -77,8 +77,7 @@ public class VideoWebPage : PanelBase
//T_BAS_CAMERA.CameraID, DeviceBase.T_BAS_CAMERA.CUSTOMS_CODE, DeviceBase.T_BAS_CAMERA.MONITOR_ID
//var _url = ApiManager.Instance.ApiDic["VideoWebUrl"].Replace("IP", CallForTest.instance.ServerIP) +"?id=" + _T_BAS_CAMERA.CameraID + "&CobCustomId=" + _T_BAS_CAMERA.CUSTOMS_CODE + "&EnterpriseCode=" + _T_BAS_CAMERA.MONITOR_ID;
//var _url = ApiManager.Instance.ApiDic["VideoWebUrl"].Replace("IP", "456ao87726.goho.co:13650") + "?id=" + _T_BAS_CAMERA.CameraID + "&CobCustomId=" + _T_BAS_CAMERA.CUSTOMS_CODE + "&EnterpriseCode=" + _T_BAS_CAMERA.MONITOR_ID;
//var _url = ApiManager.Instance.ApiDic["VideoWebUrl"] + "?id=" + _T_BAS_CAMERA.CameraID + "&CobCustomId=" + _T_BAS_CAMERA.CUSTOMS_CODE + "&EnterpriseCode=" + _T_BAS_CAMERA.MONITOR_ID;
var _url = ApiManager.Instance.ApiDic["VideoWebUrl"] + "?CameraUuid=" + _T_BAS_CAMERA.MEMO;
var _url = ApiManager.Instance.ApiDic["VideoWebUrl"] + "?id=" + _T_BAS_CAMERA.CameraID + "&CobCustomId=" + _T_BAS_CAMERA.CUSTOMS_CODE + "&EnterpriseCode=" + _T_BAS_CAMERA.MONITOR_ID;
WebPage.Url = _url;
//WebPage.Url = "www.baidu.com";
}