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

1.0.0-rc.102

Browse Source 
Former-commit-id: 6c3ebb543a41d4e89029da9741db134ec034f6e7
TangShanKaiPing
wanggang 6 years ago
parent fea02b9974
commit 527fcc1b3d
13 changed files with 71 additions and 49 deletions
Show Stats Download Patch File Download Diff File

1
projects/Infrastructure/Views/Shared/DisplayTemplates/Cron.cshtml
Unescape View File

@ -0,0 +1 @@
@Html.TextBox(null, null, new { @class = "form-control cron", @style = "display:none;" })

35
projects/Infrastructure/wwwroot/js/site.js
Unescape View File

@ -141,22 +141,25 @@ function InitControls() {
language: "zh-CN" language: "zh-CN"
}); });
// //
$('input.cron').jqCron({ $('input.cron').each(function () {
lang: 'cn', $(this).jqCron({
enabled_year: false, lang: 'cn',
enabled_minute: true, enabled_year: false,
multiple_dom: true, enabled_minute: true,
multiple_month: true, multiple_dom: true,
multiple_mins: true, multiple_month: true,
multiple_dow: true, multiple_mins: true,
multiple_time_hours: true, multiple_dow: true,
multiple_time_minutes: true, multiple_time_hours: true,
bind_method: { multiple_time_minutes: true,
set: function ($element, value) { default_value: $(this).val().substr(2),
$element.val('0 ' + value); bind_method: {
} set: function ($element, value) {
}, $element.val('0 ' + value);
no_reset_button: false }
},
no_reset_button: false
});
}); });
} }
function InitEditor() { function InitEditor() {

2
projects/IoTCenter/appsettings.json
Unescape View File

@ -1,5 +1,5 @@
{ {
"version": "1.0.0-rc.101", "version": "1.0.0-rc.102",
"Logging": { "Logging": {
"LogLevel": { "LogLevel": {
"Default": "Warning", "Default": "Warning",

2
projects/IoTClient/.gitignore vendored
Unescape View File

@ -3,4 +3,4 @@ Temp
Library Library
Logs Logs
Packages Packages
Obj [oO]bj

30
projects/IoTClient/Assets/StreamingAssets/wwwroot/device.html
Unescape View File

@ -543,20 +543,20 @@
</f7-view> </f7-view>
</f7-app> </f7-app>
</div> </div>
<script type="text/javascript" src="lib/signalr/signalr.min.js"></script> <script src="lib/signalr/signalr.min.js"></script>
<script type="text/javascript" src="lib/axios/axios.min.js"></script> <script src="lib/axios/axios.min.js"></script>
<script type="text/javascript" src="lib/urijs/URI.min.js"></script> <script src="lib/urijs/URI.min.js"></script>
<script type="text/javascript" src="lib/linq/linq.min.js"></script> <script src="lib/linq/linq.min.js"></script>
<script type="text/javascript" src="lib/jquery/jquery.min.js"></script> <script src="lib/jquery/jquery.min.js"></script>
<script type="text/javascript" src="lib/jquery-validation/jquery.validate.min.js"></script> <script src="lib/jquery-validation/jquery.validate.min.js"></script>
<script type="text/javascript" src="lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"></script> <script src="lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"></script>
<script type="text/javascript" src="lib/vue/vue.min.js"></script> <script src="lib/vue/vue.min.js"></script>
<script type="text/javascript" src="lib/framework7/js/framework7.bundle.min.js"></script> <script src="lib/framework7/js/framework7.bundle.min.js"></script>
<script type="text/javascript" src="lib/framework7/js/framework7-vue.bundle.min.js"></script> <script src="lib/framework7/js/framework7-vue.bundle.min.js"></script>
<script type="text/javascript" src="lib/flv.js/flv.min.js"></script> <script src="lib/flv.js/flv.min.js"></script>
<script type="text/javascript" src="lib/chart.js/Chart.bundle.min.js"></script> <script src="lib/chart.js/Chart.bundle.min.js"></script>
<script type="text/javascript" src="lib/toastr/toastr.min.js"></script> <script src="lib/toastr/toastr.min.js"></script>
<script type="text/javascript" src="js/page.js"></script> <script src="js/page.js"></script>
<script type="text/javascript" src="js/device.js"></script> <script src="js/device.js"></script>
</body> </body>
</html> </html>

BIN
projects/IoTClient/Assets/StreamingAssets/wwwroot/js/app.js
View File

Binary file not shown.

1
projects/IoTClient/Assets/StreamingAssets/wwwroot/js/page.js
Unescape View File

@ -1,4 +1,5 @@
// //
var version = '1.0.0-rc.101';
var isDebug = isDebug || false; var isDebug = isDebug || false;
var useSignalR = useSignalR || false; var useSignalR = useSignalR || false;
var isApp = location.href.indexOf('http') !== 0; var isApp = location.href.indexOf('http') !== 0;

8
projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/chart.js.meta
Unescape View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: e118ff1c5752f5c488e67784e6c1aed9
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

7
projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/chart.js/Chart.bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
projects/IoTClient/Assets/StreamingAssets/wwwroot/js/app.js.meta → projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/chart.js/Chart.bundle.min.js.meta
Unescape View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 2680ef27656dc5d4db3e7a9b29bee66b guid: d7872965a1fa8cf4e92ef7aea1244d2b
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
userData: userData:

29
projects/IoTClient/Assets/StreamingAssets/wwwroot/product.html
Unescape View File

@ -56,19 +56,20 @@
</f7-view> </f7-view>
</f7-app> </f7-app>
</div> </div>
<script type="text/javascript" src="lib/signalr/signalr.min.js"></script> <script src="lib/signalr/signalr.min.js"></script>
<script type="text/javascript" src="lib/axios/axios.min.js"></script> <script src="lib/axios/axios.min.js"></script>
<script type="text/javascript" src="lib/urijs/URI.min.js"></script> <script src="lib/urijs/URI.min.js"></script>
<script type="text/javascript" src="lib/linq/linq.min.js"></script> <script src="lib/linq/linq.min.js"></script>
<script type="text/javascript" src="lib/jquery/jquery.min.js"></script> <script src="lib/jquery/jquery.min.js"></script>
<script type="text/javascript" src="lib/jquery-validation/jquery.validate.min.js"></script> <script src="lib/jquery-validation/jquery.validate.min.js"></script>
<script type="text/javascript" src="lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"></script> <script src="lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"></script>
<script type="text/javascript" src="lib/vue/vue.min.js"></script> <script src="lib/vue/vue.min.js"></script>
<script type="text/javascript" src="lib/framework7/js/framework7.bundle.min.js"></script> <script src="lib/framework7/js/framework7.bundle.min.js"></script>
<script type="text/javascript" src="lib/framework7/js/framework7-vue.bundle.min.js"></script> <script src="lib/framework7/js/framework7-vue.bundle.min.js"></script>
<script type="text/javascript" src="lib/flv.js/flv.min.js"></script> <script src="lib/flv.js/flv.min.js"></script>
<script type="text/javascript" src="lib/toastr/toastr.min.js"></script> <script src="lib/chart.js/Chart.bundle.min.js"></script>
<script type="text/javascript" src="js/page.js"></script> <script src="lib/toastr/toastr.min.js"></script>
<script type="text/javascript" src="js/product.js"></script> <script src="js/page.js"></script>
<script src="js/product.js"></script>
</body> </body>
</html> </html>

1
projects/IoTClient/iotclient.apk.REMOVED.git-id
Unescape View File

@ -0,0 +1 @@
a1f050f1d4d523789cd185a274a199295c7f02d5

2
projects/IoTNode/appsettings.json
Unescape View File

@ -1,5 +1,5 @@
{ {
"version": "1.0.0-rc.101", "version": "1.0.0-rc.102",
"Logging": { "Logging": {
"LogLevel": { "LogLevel": {
"Default": "Warning", "Default": "Warning",

Write Preview
Loading…
Cancel
Save