TangShanKaiPing
wanggang 6 years ago
parent 6b7fa1f1c7
commit 9718a4b3a3

@ -22,7 +22,7 @@ namespace Demo
#endif
Task.Factory.StartNew(async () =>
{
using (var server = new WebServer("http://*:80"))
using (var server = new WebServer("http://*:5000"))
{
var assembly = typeof(App).Assembly;
server.RegisterModule(new ResourceFilesModule(assembly, "Demo.wwwroot"));

@ -13,7 +13,7 @@ namespace Demo
NavigationPage.SetHasNavigationBar(this, false);
this.webView.Navigating += WebView_Navigating;
this.webView.Navigated += WebView_Navigated;
this.webView.Source = $"http://localhost/index.html";
this.webView.Source = $"http://localhost:5000/index.html";
}
private void WebView_Navigating(object sender, WebNavigatingEventArgs e)

@ -34,7 +34,7 @@ img.shot.zoom {
max-width:none;
max-height: none;
}
.list.media-list{
.block .list{
margin:0;
}
@ -58,3 +58,13 @@ img.shot.zoom {
.videoContainer table {
margin: 0 auto;
}
.device-desktop.with-modal-dialog .page-content {
overflow: auto;
}
* {
-webkit-touch-callout: none;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 394 B

@ -832,23 +832,23 @@
<tr>
<td></td>
<td></td>
<td><a href="javascript:;" v-on:mouseup="call('28stopturn')" v-on:mousedown="call('26up')"><img src="images/up.png" /></a></td>
<td><a href="javascript:;" v-on:mouseup="call('28stopturn')" v-on:mouseleave="call('28stopturn')" v-on:mousedown="call('26up')"><img src="images/up.png" /></a></td>
<td></td>
<td></td>
</tr>
<tr>
<td></td>
<td><a href="javascript:;" v-on:mouseup="call('28stopturn')" v-on:mousedown="call('24left')"><img src="images/left.png" /></a></td>
<td><a href="javascript:;" v-on:mouseup="call('28stopturn')" v-on:mouseleave="call('28stopturn')" v-on:mousedown="call('24left')"><img src="images/left.png" /></a></td>
<td></td>
<td><a href="javascript:;" v-on:mouseup="call('28stopturn')" v-on:mousedown="call('25right')"><img src="images/right.png" /></a></td>
<td><a href="javascript:;" v-on:mouseup="call('28stopturn')" v-on:mouseleave="call('28stopturn')" v-on:mousedown="call('25right')"><img src="images/right.png" /></a></td>
<td></td>
</tr>
<tr>
<td><a href="javascript:;" v-on:mouseup="call('28stopturn')" v-on:mousedown="call('21zoomin')"><img src="images/zoomin.png" /></a></td>
<td><a href="javascript:;" v-on:mouseup="call('28stopturn')" v-on:mouseleave="call('28stopturn')" v-on:mousedown="call('21zoomin')"><img src="images/zoomin.png" /></a></td>
<td></td>
<td><a href="javascript:;" v-on:mouseup="call('28stopturn')" v-on:mousedown="call('27down')"><img src="images/down.png" /></a></td>
<td><a href="javascript:;" v-on:mouseup="call('28stopturn')" v-on:mouseleave="call('28stopturn')" v-on:mousedown="call('27down')"><img src="images/down.png" /></a></td>
<td></td>
<td><a href="javascript:;" v-on:mouseup="call('28stopturn')" v-on:mousedown="call('22zoomout')"><img src="images/zoomout.png" /></a></td>
<td><a href="javascript:;" v-on:mouseup="call('28stopturn')" v-on:mouseleave="call('28stopturn')" v-on:mousedown="call('22zoomout')"><img src="images/zoomout.png" /></a></td>
</tr>
</table>
</div>

@ -0,0 +1,20 @@
package com.dsideal.iot.controllers;
import com.dsideal.iot.models.ApiResponse;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
@Api(tags = "71洞庭湖系列网络锁")
@RequestMapping("/lock2")
@RestController
@CrossOrigin
public class Lock2Controller extends BaseDeviceController {
@ApiOperation(value = "解锁")
@GetMapping(value = "21open", produces = MediaType.APPLICATION_JSON_VALUE)
public ApiResponse open(@ApiParam(required = true, value = "设备ID") @RequestParam String id) {
return super.sendControl(id, "111");
}
}

@ -479,7 +479,23 @@ public class DeviceMessageCallback extends BaseMessageCallback implements Messag
}
}
model.Data.add(new DataModel(DataType.Text, "status", "状态", value, null, null, 0));
} else if (deviceName.equals("墙面插座")) {
} else if (deviceName.equals("洞庭湖系列网络锁")) {
String key = epData;
String value = null;
Map<String, String> map = new HashMap() {{
put("0808010901", "解锁");
put("0808000003", "解锁");
put("0808000000", "解锁");
put("0102", "上锁");
}};
if (map.containsKey(key)) {
value = map.get(key);
} else {
value = "其他";
}
model.Data.add(new DataModel(DataType.Text, "status", "状态", value, null, null, 0));
}
else if (deviceName.equals("墙面插座")) {
Map<String, String> map = new HashMap() {{
put("0", "关");
put("1", "开");

@ -90,6 +90,13 @@
"path": "lock",
"icon":"door"
},
"Bg": {
"deviceName": "洞庭湖系列网络锁",
"categoryName": "安防",
"categoryNumber": "10",
"path": "lock2",
"icon":"door"
},
"80": {
"deviceName": "一路可调窗帘",
"categoryName": "电器",

Loading…
Cancel
Save