From b6a40d6b4398dc5d4c923388447033049ce0b289 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Tue, 29 Oct 2019 14:24:43 +0800 Subject: [PATCH] update Former-commit-id: ca7194fd0ce4f6fb4f65a5d78d0ad49de7719401 --- projects/IoTCenter/iotcenter.db | Bin 573440 -> 573440 bytes .../StreamingAssets/wwwroot/lib/linq.js.meta | 8 ++++++++ .../wwwroot/lib/linq.js/linq.min.js.meta | 7 +++++++ .../Assets/StreamingAssets/wwwroot/node.html | 2 +- .../StreamingAssets/wwwroot/node.html.meta | 7 +++++++ projects/IoTNode/iotnode.db | Bin 516096 -> 516096 bytes 6 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/linq.js.meta create mode 100644 projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/linq.js/linq.min.js.meta create mode 100644 projects/IoTClient/Assets/StreamingAssets/wwwroot/node.html.meta diff --git a/projects/IoTCenter/iotcenter.db b/projects/IoTCenter/iotcenter.db index 2e6cc5f617b19db2a3438816da19dd0547359471..4d3711fec043454e05f9039ce40aa81d47064cf0 100644 GIT binary patch delta 103 zcmZo@P;LOC7RDB)7UmX~7S=6noCb_a)42@Tc5x>%ND50bGB9v(gicTJW>T5{*?>u( zC7qEcboy+2w$$z2hHN)^r>EF68E>C%&!#tzi&K;V2!P5%rw6JqtF(W<%eMXVU3T6_ E0F2}vKmY&$ delta 102 zcmZo@P;LOC7RDB)7UmX~7S=6noCb{Q)42@Tc5$aMND50bGB9v(gicTJW>T5{*?`HE zjgcpmL7I2^JbNai?Foi#EPRZ*+f(h?66SGnh%x{HP<80^Kow?{_Rn|Owtv3M&ie=e D5AqtG diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/linq.js.meta b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/linq.js.meta new file mode 100644 index 00000000..9604b5b1 --- /dev/null +++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/linq.js.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e84ceda1fa28213429ba8fda16968da3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/linq.js/linq.min.js.meta b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/linq.js/linq.min.js.meta new file mode 100644 index 00000000..7eaba1b6 --- /dev/null +++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/linq.js/linq.min.js.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b5195d9490dd0c14192ae95f63335895 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/node.html b/projects/IoTClient/Assets/StreamingAssets/wwwroot/node.html index 9c4bad27..52b54d9b 100644 --- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/node.html +++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/node.html @@ -103,7 +103,7 @@ var number = $('#camera').val(); if (number) { var device = Enumerable.from(vm.model.Devices).where(function (o) { return o.Number === number; }).firstOrDefault(); - var url = Enumerable.from(device.Data).where(o => o.Name === '主码流flv').firstOrDefault().Value; + var url = Enumerable.from(device.Data).where(o => o.Name === '子码流flv').firstOrDefault().Value; var hasPtz = Enumerable.from(device.Data).where(o => o.Name === '缩放支持').firstOrDefault() if (hasPtz && hasPtz.Value === '是') { $('#ptz').show(); diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/node.html.meta b/projects/IoTClient/Assets/StreamingAssets/wwwroot/node.html.meta new file mode 100644 index 00000000..a142fa84 --- /dev/null +++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/node.html.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3ecf584f100988c4b8e209469533e867 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/projects/IoTNode/iotnode.db b/projects/IoTNode/iotnode.db index 79fc6e8e94d4b694299926c9cfd5e7c5fabce9e4..0a8b591734fc3a160bbf6ae176798e216d4e17fd 100644 GIT binary patch delta 111 zcmZoTAm0E)EsQNpEzB(}Ev#GEI29OmwsR@4B{DG{*`A}sc7SoZiX~I#_NgjtF)Y(R zS}+;6t7x)qSJ7mD$;Q~SozH+hoP$wmdYT2h-1LKc8Mke>vSjZT;o=l!00It<(9r1# Orx{hYfA(ePodf_w;vi}O delta 162 zcmZoTAm0E)EsQNpEzB(}Ev#GEI29NTw{t15B{DId+@7Pvc7Ty5Bl(gTx9{na_GeQ!yln61nqH{FrqZsW$+lfZll>(d