能测试添加, 能获取

This commit is contained in:
zogodo
2019-12-26 21:39:48 +08:00
parent f8a4404614
commit 764cfcfd94
5 changed files with 32 additions and 5 deletions

View File

@@ -200,7 +200,7 @@ exit:
static int HttpGetTasks(httpd_request_t *req) static int HttpGetTasks(httpd_request_t *req)
{ {
pTimedTask pt = (pTimedTask)malloc(sizeof(struct TimedTask)); pTimedTask pt = (pTimedTask)malloc(sizeof(struct TimedTask));
pt->time = time(NULL); pt->time = time(NULL) + 5;
pt->socket_idx = 5; pt->socket_idx = 5;
pt->on = 0; pt->on = 0;
AddTask(pt); AddTask(pt);

View File

@@ -77,6 +77,11 @@
</div> </div>
</fieldset> </fieldset>
<fieldset class="task">
<legend>Timed Task</legend>
<button onclick="GetTimedTask()">Test</button>
</fieldset>
<fieldset class="chart"> <fieldset class="chart">
<legend>Power Status</legend> <legend>Power Status</legend>
<table class="pw"> <table class="pw">
@@ -437,6 +442,19 @@ function GetSysLog() {
}); });
} }
function GetTimedTask() {
HttpGet("/task", function (re) {
alert(re);
});
}
function AddTimedTask() {
var sec = document.getElementById("task_time").value;
HttpPost("/task", function (re) {
alert(re);
}, sec);
}
</script> </script>
</body> </body>
</html> </html>

File diff suppressed because one or more lines are too long

View File

@@ -177,6 +177,10 @@ int application_start(void)
UserRelaySet(task_top->socket_idx, task_top->on); UserRelaySet(task_top->socket_idx, task_top->on);
DelFirstTask(); DelFirstTask();
} }
else
{
os_log("task_top[%u]");
}
mico_thread_msleep(1000); mico_thread_msleep(1000);
} }

View File

@@ -88,15 +88,20 @@ bool DelTask(int time)
char* GetTaskStr() char* GetTaskStr()
{ {
char* str = (char*)malloc(sizeof(char)*task_count * 40); char* str = (char*)malloc(sizeof(char)*task_count * 52);
pTimedTask tmp_tsk = task_top; pTimedTask tmp_tsk = task_top;
char* tmp_str = str; char* tmp_str = str;
tmp_str[0] = '['; tmp_str[0] = '[';
tmp_str++; tmp_str++;
while (tmp_tsk) while (tmp_tsk)
{ {
sprintf(tmp_str, "{time:%d,socket_index:%d,on:%d},", char buffer[26];
tmp_tsk->time, tmp_tsk->socket_idx, tmp_tsk->on); struct tm* tm_info;
tm_info = localtime(&tmp_tsk->time);
strftime(buffer, 26, "%Y-%m-%d %H:%M:%S", tm_info);
sprintf(tmp_str, "{time:'%s',socket_index:%d,on:%d},",
buffer, tmp_tsk->socket_idx, tmp_tsk->on);
tmp_str += strlen(tmp_str); tmp_str += strlen(tmp_str);
tmp_tsk = tmp_tsk->next; tmp_tsk = tmp_tsk->next;
} }