GitHub/zTC1
1
0
Fork 0
mirror of https://github.com/oopuuu/zTC1.git synced 2025-12-12 13:08:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

合并 js css

Browse Source
This commit is contained in:
zogodo
2020-02-21 16:44:40 +08:00
parent f6c6bfb61b
commit f533c6dc89
5 changed files with 7649 additions and 7597 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
TC1/http_server/app_httpd.c
View File

@@ -126,45 +126,17 @@ static int HttpGetAssets(httpd_request_t *req)
int total_sz = 0;
const unsigned char* file_data = NULL;
const char* content_type = HTTP_CONTENT_JS_ZIP;
if (strcmp(file_name + 8, "jquery.js") == 0)
if (strcmp(file_name + 8, "js_pack.js") == 0)
{
total_sz = sizeof(web_jquery_min_js);
file_data = web_jquery_min_js;
total_sz = sizeof(js_pack);
file_data = js_pack;
}
else if (strcmp(file_name + 8, "angular.js") == 0)
else if (strcmp(file_name + 8, "css_pack.css") == 0)
{
total_sz = sizeof(web_angular_min_js);
file_data = web_angular_min_js;
}
if (strcmp(file_name + 8, "material.js") == 0)
{
total_sz = sizeof(web_material_min_js);
file_data = web_material_min_js;
}
else if (strcmp(file_name + 8, "styles.css") == 0)
{
total_sz = sizeof(web_styles_css);
file_data = web_styles_css;
total_sz = sizeof(css_pack);
file_data = css_pack;
content_type = HTTP_CONTENT_CSS_ZIP;
}
else if (strcmp(file_name + 8, "material.css") == 0)
{
total_sz = sizeof(web_material_cyan_light_blue_min_css);
file_data = web_material_cyan_light_blue_min_css;
content_type = HTTP_CONTENT_CSS_ZIP;
}
else if (strcmp(file_name + 8, "roboto.css") == 0)
{
total_sz = sizeof(web_roboto_css);
file_data = web_roboto_css;
content_type = HTTP_CONTENT_CSS_ZIP;
}
//else if (strcmp(file_name + 8, "icon.css") == 0)
//{
// total_sz = sizeof(web_icon_css);
// file_data = web_icon_css;
// content_type = HTTP_CONTENT_CSS_ZIP;
//}
if (total_sz == 0) return err;

93
TC1/http_server/web/demo.html
View File

@@ -17,10 +17,13 @@
<meta name="msapplication-TileImage" content="http://119.23.191.79/tc1/images/touch/ms-touch-icon-144x144-precomposed.png">
<meta name="msapplication-TileColor" content="#3372DF">
<link rel="shortcut icon" href="http://119.23.191.79/tc1/images/favicon.png">
<!--
<link rel="stylesheet" href="/assets/roboto.css">
<!-- <link rel="stylesheet" href="/assets/icon.css"> -->
<link rel="stylesheet" href="/assets/icon.css">
<link rel="stylesheet" href="/assets/material.css">
<link rel="stylesheet" href="/assets/styles.css">
-->
<link rel="stylesheet" href="/assets/css_pack.css">
</head>
<body>
<div class="demo-layout mdl-layout mdl-js-layout mdl-layout--fixed-drawer mdl-layout--fixed-header">
@@ -65,6 +68,7 @@
</div>
</header>
<nav class="demo-navigation mdl-navigation mdl-color--blue-grey-800">
<a class="mdl-navigation__link" href="javascript:ShowPage(0);"><i class="mdl-color-text--blue-grey-400 material-icons" role="presentation">home</i>Home0</a>
<a class="mdl-navigation__link" href="javascript:ShowPage(1);"><i class="mdl-color-text--blue-grey-400 material-icons" role="presentation">home</i>Home</a>
<a class="mdl-navigation__link" href="javascript:ShowPage(2);"><i class="mdl-color-text--blue-grey-400 material-icons" role="presentation">inbox</i>Inbox</a>
<a class="mdl-navigation__link" href="javascript:ShowPage(3);"><i class="mdl-color-text--blue-grey-400 material-icons" role="presentation">delete</i>Trash</a>
@@ -81,6 +85,84 @@
<main class="mdl-layout__content mdl-color--grey-100">
<div class="mdl-grid demo-content">
<div id="page0" class="page demo-cards mdl-cell mdl-cell--4-col mdl-cell--8-col-tablet mdl-grid mdl-grid--no-spacing">
<div class="demo-options mdl-card mdl-color--deep-purple-500 mdl-shadow--2dp mdl-cell mdl-cell--4-col mdl-cell--3-col-tablet mdl-cell--12-col-desktop">
<div class="mdl-card__supporting-text mdl-color-text--blue-grey-50">
<h3>Power Control</h3>
<ul class="demo-list-control mdl-list">
<li class="mdl-list__item">
<span class="mdl-color-text--blue-grey-50 mdl-list__item-primary-content">
Socket-1
</span>
<span class="mdl-list__item-secondary-action">
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="list-switch-1">
<input type="checkbox" id="list-switch-1" class="mdl-switch__input" checked />
</label>
</span>
</li>
<li class="mdl-list__item">
<span class="mdl-color-text--blue-grey-50 mdl-list__item-primary-content">
Socket-2
</span>
<span class="mdl-list__item-secondary-action">
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="list-switch-2">
<input type="checkbox" id="list-switch-2" class="mdl-switch__input" checked />
</label>
</span>
</li>
<li class="mdl-list__item">
<span class="mdl-color-text--blue-grey-50 mdl-list__item-primary-content">
Socket-3
</span>
<span class="mdl-list__item-secondary-action">
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="list-switch-3">
<input type="checkbox" id="list-switch-3" class="mdl-switch__input" checked />
</label>
</span>
</li>
<li class="mdl-list__item">
<span class="mdl-color-text--blue-grey-50 mdl-list__item-primary-content">
Socket-4
</span>
<span class="mdl-list__item-secondary-action">
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="list-switch-4">
<input type="checkbox" id="list-switch-4" class="mdl-switch__input" checked />
</label>
</span>
</li>
<li class="mdl-list__item">
<span class="mdl-color-text--blue-grey-50 mdl-list__item-primary-content">
Socket-5
</span>
<span class="mdl-list__item-secondary-action">
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="list-switch-5">
<input type="checkbox" id="list-switch-5" class="mdl-switch__input" checked />
</label>
</span>
</li>
<li class="mdl-list__item">
<span class="mdl-color-text--blue-grey-50 mdl-list__item-primary-content">
Socket-6
</span>
<span class="mdl-list__item-secondary-action">
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="list-switch-6">
<input type="checkbox" id="list-switch-6" class="mdl-switch__input" checked />
</label>
</span>
</li>
</ul>
</div>
</div>
</div>
<div id="page1" class="page demo-charts mdl-color--white mdl-shadow--2dp mdl-cell mdl-cell--12-col mdl-grid">
<svg fill="currentColor" width="200px" height="200px" viewBox="0 0 1 1" class="demo-chart mdl-cell mdl-cell--4-col mdl-cell--3-col-desktop">
<use xlink:href="#piechart" mask="url(#piemask)" />
@@ -167,8 +249,8 @@
<i class="material-icons">location_on</i>
</div>
</div>
</div>
</div>
</main>
</div>
@@ -219,14 +301,17 @@
</g>
</defs>
</svg>
<!--
<script type="text/javascript" src="/assets/material.js"></script>
<script type="text/javascript" src="/assets/jquery.js"></script>
<script>
-->
<script type="text/javascript" src="/assets/js_pack.js"></script>
<script>
function ShowPage(id) {
$(".page").hide();
$("#page"+id).show();
}
ShowPage(2);
ShowPage(0);
</script>
</body>
</html>

22
TC1/http_server/web/icon.css Normal file
View File

@@ -0,0 +1,22 @@
/* icon.css */
@font-face {
font-family: 'Material Icons';
font-style: normal;
font-weight: 400;
src: url(https://fonts.gstatic.com/s/materialicons/v48/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2) format('woff2');
}
.material-icons {
font-family: 'Material Icons';
font-weight: normal;
font-style: normal;
font-size: 24px;
line-height: 1;
letter-spacing: normal;
text-transform: none;
display: inline-block;
white-space: nowrap;
word-wrap: normal;
direction: ltr;
-webkit-font-feature-settings: 'liga';
-webkit-font-smoothing: antialiased;
}

15089
TC1/http_server/web_data.c
View File

File diff suppressed because it is too large Load Diff

2
TC1/main.h
View File

@@ -14,7 +14,7 @@
#define wifi_log(M, ...) do { custom_log("WIFI", M, ##__VA_ARGS__); web_log("WIFI", M, ##__VA_ARGS__) } while(0)
#define power_log(M, ...) do { custom_log("POWER", M, ##__VA_ARGS__); web_log("POWER", M, ##__VA_ARGS__) } while(0)
#define VERSION "v1.0.30"
#define VERSION "v1.0.31"
#define TYPE 1
#define TYPE_NAME "zTC1"