wanggang
/
iot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update

Browse Source 
Former-commit-id: 811c8d95714d296ae1f8135dd80f36d05edc387c
TangShanKaiPing
wanggang 5 years ago
parent 65c8fd83a3
commit 8b53826706
8 changed files with 72 additions and 21 deletions
Show Stats Download Patch File Download Diff File

4
projects/Infrastructure/Application/PagedList.cs
Unescape View File

@ -77,6 +77,10 @@ namespace Infrastructure.Application
public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
{
if (PageIndex < 1)
{
yield return new ValidationResult("当前页索引必须大于等于1");
}
if (PageSize > 1000)
{
yield return new ValidationResult("分页数量超出系统限制");

28
projects/Infrastructure/Views/Shared/_Paged.cshtml
Unescape View File

@ -3,18 +3,14 @@
var links = Model.GetPageIndexs();
var url = Url.Content("~") + this.Context.Request.Path + this.Context.Request.QueryString;
var pageIndexParam = "PageIndex";
var firstUrl = url.RemoveParam("PageIndex");
var prevUrl = Model.PageIndex - 1 == 1 ? firstUrl : url.SetParam(pageIndexParam, Model.PageIndex - 1);
var empty = "javascript:;";
var firstUrl = url.RemoveParam(pageIndexParam);
var prevUrl = Model.PageIndex - 1 >= 1 ? url.SetParam(pageIndexParam, Model.PageIndex - 1) : empty;
var lastUrl = Model.TotalCount > 0 ? url.SetParam(pageIndexParam, Model.PageCount()) : empty;
var nextUrl = Model.PageIndex + 1 <= Model.PageCount() ? url.SetParam(pageIndexParam, Model.PageIndex + 1) : empty;
<ul class="pagination pagination-sm m-0 float-right">
<li class="page-item"><a class="page-link" href="@firstUrl">首页</a></li>
@if (Model.HasPrev())
{
<li class="page-item"><a class="page-link" href="@url.SetParam(pageIndexParam,Model.PageIndex-1)">上一页</a></li>
}
else
{
<li class="page-item"><a class="page-link" href="javascript:;">上一页</a></li>
}
<li class="page-item"><a class="page-link" href="@prevUrl">上一页</a></li>
@foreach (var item in links)
{
if (item == Model.PageIndex)
@ -26,19 +22,11 @@
<li class="page-item"><a class="page-link" href="@url.SetParam(pageIndexParam,item)">@item</a></li>
}
}
@if (Model.HasNext())
{
<li class="page-item"><a class="page-link" href="@url.SetParam(pageIndexParam,Model.PageIndex+1)">下一页</a></li>
}
else
{
<li class="page-item"><a class="page-link" href="javascript:;">下一页</a></li>
}
<li class="page-item"><a class="page-link" href="@url.SetParam(pageIndexParam,Model.PageCount())">末页</a></li>
<li class="page-item"><a class="page-link" href="@nextUrl">下一页</a></li>
<li class="page-item"><a class="page-link" href="@lastUrl">末页</a></li>
<li class="page-item"><a class="page-link" href="javascript:;">@Model.PageIndex / @Model.PageCount()</a></li>
<li class="page-item">
@Html.DropDownListFor(o => Model.PageSize, Model.GetPageSizes().Select(o => new SelectListItem { Text = o.ToString(), Value = o.ToString() }), new { @class = "page-link" })
</li>
</ul>
}

1
projects/IoTCenter/wwwroot/lib/jswebrtc/jswebrtc.min.js vendored
View File

File diff suppressed because one or more lines are too long

18
projects/IoTCenter/wwwroot/lib/jswebrtc/player-via-html.html
Unescape View File

@ -0,0 +1,18 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>WebRTCPlayer</title>
<style type="text/css">
html, body {
background-color: #111;
text-align: center;
}
</style>
</head>
<body>
<div class="jswebrtc" data-url="webrtc://localhost/live/b57e867ae29d11b483864cbd8fd0f747"></div>
<script type="text/javascript" src="jswebrtc.min.js"></script>
</body>
</html>

6
projects/UserCenter/Areas/Admin/Controllers/UserController.cs
Unescape View File

@ -28,7 +28,11 @@ namespace UserCenter.Areas.Admin.Controllers
public override IQueryable<User> Query(SearchUserModel model, IQueryable<User> query)
{
return query.WhereIf(!model.IsDeleted, o => o.IsDeleted == null);
if (model.IsDeleted)
{
return query.Where(o => o.IsDeleted != null);
}
return query.Where(o => o.IsDeleted == null);
}
public override IQueryable<User> Include(IQueryable<User> query)

1
projects/lib/local/jswebrtc/dist/jswebrtc.min.js vendored
View File

File diff suppressed because one or more lines are too long

18
projects/lib/local/jswebrtc/examples/player-via-html.html
Unescape View File

@ -0,0 +1,18 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>WebRTCPlayer</title>
<style type="text/css">
html, body {
background-color: #111;
text-align: center;
}
</style>
</head>
<body>
<div class="jswebrtc" data-url="webrtc://localhost/live/b57e867ae29d11b483864cbd8fd0f747"></div>
<script type="text/javascript" src="jswebrtc.min.js"></script>
</body>
</html>

17
projects/lib/local/jswebrtc/examples/player-via-js.html
Unescape View File

@ -0,0 +1,17 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>WebRTCPlayer</title>
</head>
<body>
<video id="video-webrtc" controls></video>
<script type="text/javascript" src="../dist/jswebrtc.min.js"></script>
<script type="text/javascript">
var video = document.getElementById('video-webrtc');
var url = 'webrtc://osiii.com/live/livestream';
var player = new JSWebrtc.Player(url, { video: video, autoplay: true, onPlay: (obj) => { console.log("start play") } });
</script>
</body>
</html>
Write Preview
Loading…
Cancel
Save