1.0.0-beta.1227

Former-commit-id: 6c3901fef44a34903887978400f91345c85d7552

projects/IoTClient/Assets/StreamingAssets/wwwroot/device.html

@@ -20,7 +20,7 @@
                 </f7-col>
                 <f7-page>
                     <f7-navbar :title="model?model.Name:'节点'">
-                        <a v-if="model" :href="'product.html?number='+model.Product.Number" slot="nav-left" class="link external"><i class="icon icon-back"></i></a>
+                        <a v-if="model" :href="'product.html?number='+model.Product.Number" slot="nav-left" class="link external"><i class="icon icon-back"></i>返回</a>
                     </f7-navbar>
                     <div id="template">
                         <style>

projects/IoTClient/Assets/StreamingAssets/wwwroot/js/page.js

@@ -1,9 +1,9 @@
 //
-var version = '1.0.0-rc.106';
+var version = '1.0.0-beta.1227';
 var isDebug = isDebug || false;
 var useSignalR = useSignalR || false;
 var userAgent = navigator.userAgent;
-var isApp = userAgent.indexOf('isapp') !== 0;
+var isApp = userAgent.indexOf('isapp') !== -1||location.href.indexOf('file://') !== -1;
 var isAndroid = userAgent.indexOf('isandroid')!==-1;
 var isIos=userAgent.indexOf('isiphone')!==-1;
 //
@@ -476,10 +476,10 @@ function UpdateCamera() {
 		if (flvjs.isSupported) {
 			if(isApp&&!isAndroid)
 			{
-				playFlv(video);
+				playHls(video);
 			}
 			else{
-				playHls(video);
+				playFlv(video); 
 			}
 		}
 		else {
@@ -487,7 +487,7 @@ function UpdateCamera() {
 		}
 	}
 }
-function playHls(videoElement) {
+function playHls(video) {
 	var number = $('#camera').val();
 	var device = vm.model.Devices
 		? Enumerable.from(vm.model.Devices).where(function (o) { return o.Number === number; }).firstOrDefault()

projects/IoTClient/Assets/StreamingAssets/wwwroot/node.html

@@ -20,7 +20,7 @@
                 </f7-col>
                 <f7-page>
                     <f7-navbar :title="model?model.Name:'节点'">
-                        <a href="nodes.html" slot="nav-left" class="link external"><i class="icon icon-back"></i></a>
+                        <a href="nodes.html" slot="nav-left" class="link external"><i class="icon icon-back"></i>返回</a>
                     </f7-navbar>
                     <div id="template">
                         <style>

projects/IoTClient/Assets/StreamingAssets/wwwroot/product.html

@@ -17,7 +17,7 @@
             <f7-view main>
                 <f7-page>
                     <f7-navbar :title="model?model.Name:'产品'">
-                        <a href="index.html" slot="nav-left" class="link external"><i class="icon icon-back"></i></a>
+                        <a href="index.html" slot="nav-left" class="link external"><i class="icon icon-back"></i>返回</a>
                     </f7-navbar>
                     <div class="row" v-if="model">
                         <div class="col-100" v-if="HasBatchCommand()">

projects/IoTClient/Assets/StreamingAssets/wwwroot/user.html

@@ -38,7 +38,7 @@
                             <button class="col button" type="submit" v-on:click="logout">退出</button>
                         </div>
                     </div>
-                    <div>v {{version}}</div>
+                    <div class="block block-strong" style="text-align:center;">version {{version}}</div>
                     <f7-toolbar tabbar labels position="bottom">
                         <a href="index.html" class="tab-link external">
                             <i class="icon icon f7-icons">house</i>

projects/IoTClient/ProjectSettings/GraphicsSettings.asset

@@ -39,6 +39,7 @@ GraphicsSettings:
   - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}

projects/IoTNode/DeviceServices/FBee/ClusterId.cs

@@ -10,6 +10,7 @@
         humidity = 0x0405,
         voltage = 0x0001,
         socket = 0x0702,
-        SummationDivisor = 0x0b04
+        SummationDivisor = 0x0b04,
+        doorlock = 0x0101
     }
 }

projects/IoTNode/DeviceServices/FBee/DeviceId.cs

@@ -10,6 +10,7 @@ namespace IoTNode.DeviceServices.FBee
         {
             List.Add(new DeviceId { RawDeviceId = 0x0002, Name = "开关", CategoryName = "照明", CategoryNumber = "30", Icon = "switch" });
             List.Add(new DeviceId { RawDeviceId = 0x0009, Name = "插座", CategoryName = "电器", CategoryNumber = "20", Icon = "socket" });
+            List.Add(new DeviceId { RawDeviceId = 0x000a, Name = "门锁", CategoryName = "安防", CategoryNumber = "10", Icon = "lock" });
             List.Add(new DeviceId { RawDeviceId = 0x0051, Name = "智能插座", CategoryName = "电器", CategoryNumber = "20", Icon = "socket" });
             List.Add(new DeviceId { RawDeviceId = 0x0106, Name = "光强检测器", CategoryName = "监测", CategoryNumber = "40", Icon = "light" });
             List.Add(new DeviceId { RawDeviceId = 0x0163, Name = "红外转发器", CategoryName = "电器", CategoryNumber = "20", Icon = "control" });

projects/IoTNode/DeviceServices/FBee/FBeeService.cs

@@ -596,6 +596,9 @@ namespace IoTNode.DeviceServices.FBee
                             //deviceRepo.SaveChanges();
                             //var deviceDto = device.To<EditDeviceModel>();
                             //this.SendToServer(Methods.EditDevice, deviceDto);
+                            if (deviceId == 0x00a)
+                            {
+                            }
                             this.UpdateStatus(device);
                         }
                         else
@@ -645,6 +648,10 @@ namespace IoTNode.DeviceServices.FBee
             {
                 return "/Ir/";
             }
+            else if (deviceName == "门锁")
+            {
+                return "/Lock/";
+            }
             else
             {
                 return null;
@@ -1310,6 +1317,9 @@ namespace IoTNode.DeviceServices.FBee
                                 this.UpdateData(deviceRepo, device, device.CreateData(Keys.Electricity, electricity, DeviceDataType.Float, "电量", "kWh", timestamp: timestamp));
                             }
                         }
+                        else if (clusterId == ClusterId.doorlock)
+                        {
+                        }
                         if (deviceId == 0x0163)
                         {
                             if (props.ContainsKey(0x400a))

projects/gateway/src/main/resources/application.yml

@@ -13,13 +13,20 @@ logging:
 spring:
   cloud:
     gateway:
-      #globalcors:
-      #corsConfigurations:
-      #'[/**]':
-      #allowedOrigins: "*"
-      #allowedHeaders: "*"
-      #allowedMethods: "*"
       routes:
+        - id: SRS
+          uri: http://localhost:8080/
+          predicates:
+            - Path=/live/**
+          filters:
+            - StripPrefix=1
+            - PrefixPath=/live
+        - id: InfluxDB
+          uri: http://localhost:8086/
+          predicates:
+            - Path=/influxdb/**
+          filters:
+            - StripPrefix=1
         - id: UserCenter
           uri: http://localhost:8010/
           predicates:

publish/src/linux-x64/publish/apps/srs/conf/srs.conf

@@ -38,7 +38,7 @@ vhost __defaultVhost__ {
     dvr {
         enabled on;
         dvr_apply none;
-        dvr_path ../IoTCenter/wwwroot/video/[app]-[stream]-[timestamp].mp4;
+        dvr_path ./objs/nginx/html/[app].[stream].[timestamp].flv;;
         dvr_plan session;
         dvr_duration 300;
         dvr_wait_keyframe on;
@@ -46,6 +46,6 @@ vhost __defaultVhost__ {
     }
     http_hooks {
         enabled on;
-        on_dvr http://localhost:8011/App/OnDvr;
+        on_dvr http://localhost/IoTCenter/App/OnDvr;
     }
 }